diff --git a/scm-webapp/src/main/webapp/resources/js/config/sonia.config.scmconfigpanel.js b/scm-webapp/src/main/webapp/resources/js/config/sonia.config.scmconfigpanel.js
index 79091bec1e..7ddc8fa317 100644
--- a/scm-webapp/src/main/webapp/resources/js/config/sonia.config.scmconfigpanel.js
+++ b/scm-webapp/src/main/webapp/resources/js/config/sonia.config.scmconfigpanel.js
@@ -50,7 +50,6 @@ Sonia.config.ScmConfigPanel = Ext.extend(Sonia.config.ConfigPanel,{
   errorMsgText: 'Could not load config.',
   errorSubmitMsgText: 'Could not submit config.',
   
-  // TODO i18n
   enableProxyText: 'Enable Proxy',
   proxyServerText: 'Proxy Server',
   proxyPortText: 'Proxy Port',
@@ -72,7 +71,6 @@ Sonia.config.ScmConfigPanel = Ext.extend(Sonia.config.ConfigPanel,{
   adminGroupsHelpText: 'Comma seperated list of groups with admin permissions.',
   adminUsersHelpText: 'Comma seperated list of users with admin permissions.',
   
-  // TODO i18n
   enableProxyHelpText: 'Enable Proxy',
   proxyServerHelpText: 'The proxy server',
   proxyPortHelpText: 'The proxy port',
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 d22dba179f..08ab9047c2 100644
--- a/scm-webapp/src/main/webapp/resources/js/i18n/de.js
+++ b/scm-webapp/src/main/webapp/resources/js/i18n/de.js
@@ -246,6 +246,13 @@ if (Sonia.config.ScmConfigPanel){
     sslPortText: 'SSL Port',
     adminGroupsText: 'Admin Gruppen',
     adminUsersText: 'Admin Benutzer',
+    
+    enableProxyText: 'Proxy aktivieren',
+    proxyServerText: 'Proxy Server',
+    proxyPortText: 'Proxy Port',
+    baseUrlText: 'Basis-URL',
+    forceBaseUrlText: 'Basis-URL forcieren',
+    
     submitText: 'Senden ...',
     loadingText: 'Laden ...',
     errorTitleText: 'Fehler',
@@ -264,7 +271,13 @@ if (Sonia.config.ScmConfigPanel){
     enableSSLHelpText: 'Aktiviere sichere Verbindungen über HTTPS.',
     sslPortHelpText: 'Der SSL-Port.',
     adminGroupsHelpText: 'Komma getrennte Liste von Gruppen mit Administrationsrechten.',
-    adminUsersHelpText: 'Komma getrennte Liste von Benutzern mit Administrationsrechten.'
+    adminUsersHelpText: 'Komma getrennte Liste von Benutzern mit Administrationsrechten.',
+    
+    enableProxyHelpText: 'Proxy-Einstellungen verwenden.',
+    proxyServerHelpText: 'Der Proxy-Server.',
+    proxyPortHelpText: 'Der Proxy-Port',
+    baseUrlHelpText: 'Die vollständige URL des Server, inclusive Context-Pfad z.B.: http://localhost:8080/scm.',
+    forceBaseUrlHelpText: 'Leitet alle Zugriffe die nicht von der Basis-URL kommen auf die Basis-URL um.'
   });
 
 }
diff --git a/scm-webapp/src/main/webapp/resources/js/rest/sonia.rest.panel.js b/scm-webapp/src/main/webapp/resources/js/rest/sonia.rest.panel.js
index 8ac1a8efd0..64727641be 100644
--- a/scm-webapp/src/main/webapp/resources/js/rest/sonia.rest.panel.js
+++ b/scm-webapp/src/main/webapp/resources/js/rest/sonia.rest.panel.js
@@ -32,7 +32,6 @@
 
 Sonia.rest.Panel = Ext.extend(Ext.Panel, {
   
-  // TODO i18n
   addText: 'Add',
   removeText: 'Remove',
   reloadText: 'Reload',