diff --git a/scm-webapp/src/main/webapp/resources/js/i18n/de.js b/scm-webapp/src/main/webapp/resources/js/i18n/de.js
index 792c47ea24..8bc73d14b9 100644
--- a/scm-webapp/src/main/webapp/resources/js/i18n/de.js
+++ b/scm-webapp/src/main/webapp/resources/js/i18n/de.js
@@ -170,6 +170,7 @@ if (Sonia.config.ScmConfigPanel){
   Ext.override(Sonia.config.ScmConfigPanel,{
     titleText: 'Allgemeine Einstellung',
     servnameText: 'Servername',
+    dateFormatText: 'Datumsformat',
     enableForwardingText: 'Forwarding (mod_proxy) aktivieren',
     forwardPortText: 'Forward Port',
     pluginRepositoryText: 'Plugin-Repository',
@@ -182,9 +183,12 @@ if (Sonia.config.ScmConfigPanel){
     loadingText: 'Laden ...',
     errorTitleText: 'Fehler',
     errorMsgText: 'Die Konfiguration konnte nicht geladen werden.',
+    errorSubmitMsgText: 'Die Konfiguration konnte nicht gespeichert werden.',
 
     // help
     servernameHelpText: 'Der Name dieses Servers. Dieser Name wird Teil der Repository-URL.',
+    // TODO
+    dateFormatHelpText: 'JavaScript Datumsformat.',
     pluginRepositoryHelpText: 'Die URL des Plugin-Repositories.<br />Beschreibung der {Platzhalter}:\n\
       <br /><b>version</b> = SCM-Manager Version<br /><b>os</b> = Betriebssystem<br /><b>arch</b> = Architektur',
     enableForwardingHelpText: 'Apache mod_proxy Port-Forwarding aktivieren.',
diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.config.js b/scm-webapp/src/main/webapp/resources/js/sonia.config.js
index 73c838486e..2a21c6032f 100644
--- a/scm-webapp/src/main/webapp/resources/js/sonia.config.js
+++ b/scm-webapp/src/main/webapp/resources/js/sonia.config.js
@@ -101,7 +101,6 @@ Sonia.config.ScmConfigPanel = Ext.extend(Sonia.config.ConfigPanel,{
 
   titleText: 'General Settings',
   servnameText: 'Servername',
-  // TODO i18n
   dateFormatText: 'Date format',
   enableForwardingText: 'Enable forwarding (mod_proxy)',
   forwardPortText: 'Forward Port',
@@ -115,12 +114,11 @@ Sonia.config.ScmConfigPanel = Ext.extend(Sonia.config.ConfigPanel,{
   loadingText: 'Loading ...',
   errorTitleText: 'Error',
   errorMsgText: 'Could not load config.',
-  // TODO i18n
   errorSubmitMsgText: 'Could not submit config.',
 
   // help
   servernameHelpText: 'The name of this server. This name will be part of the repository url.',
-  // TODO i18n
+  // TODO
   dateFormatHelpText: 'JavaScript date format.',
   pluginRepositoryHelpText: 'The url of the plugin repository.<br />Explanation of the {placeholders}:\n\
   <br /><b>version</b> = SCM-Manager Version<br /><b>os</b> = Operation System<br /><b>arch</b> = Architecture',