Merge branch 'staging' into svg

# Conflicts:
#	CHANGELOG.md

bauh/view/resources/locale/de

@@ -171,4 +171,5 @@ files=Dateien
 all_files=Alle Dateien
 file_chooser.title=Dateiauswahl
 message.file.not_exist=Datei existiert nicht
-message.file.not_exist.body=Die Datei {} scheint nicht zu existieren
+message.file.not_exist.body=Die Datei {} scheint nicht zu existieren
+development=Entwicklung

bauh/view/resources/locale/en

@@ -175,4 +175,5 @@ files=files
 all_files=all files
 file_chooser.title=File selector
 message.file.not_exist=File does not exist
-message.file.not_exist.body=The file {} seems not to exist
+message.file.not_exist.body=The file {} seems not to exist
+development=development

bauh/view/resources/locale/it

@@ -172,4 +172,5 @@ files=files
 all_files=tutti i files
 file_chooser.title=Selettore file
 message.file.not_exist=File non esiste
-message.file.not_exist.body=Il file {} sembra non esistere
+message.file.not_exist.body=Il file {} sembra non esistere
+development=sviluppo

bauh/view/util/translation.py

@@ -19,7 +19,10 @@ class I18n(dict):
             return self.current.__getitem__(item)
         except KeyError:
             if self.default:
-                return self.default.__getitem__(item)
+                try:
+                    return self.default.__getitem__(item)
+                except KeyError:
+                    return item
             else:
                 return item