diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
index 4a1853bae..3cd6b5bc9 100644
--- a/app/i18n/de/conf.php
+++ b/app/i18n/de/conf.php
@@ -68,14 +68,14 @@ return array(
 			'portrait' => 'Hochformat',
 			'square' => 'Quadrat',
 		),
-		'timezone' => 'Time zone',	// TODO
+		'timezone' => 'Zeitzone',
 		'title' => 'Anzeige',
 		'website' => array(
-			'full' => 'Icon and name',	// TODO
-			'icon' => 'Icon only',	// TODO
-			'label' => 'Website',	// TODO
-			'name' => 'Name only',	// TODO
-			'none' => 'None',	// TODO
+			'full' => 'Icon und Name',
+			'icon' => 'Nur Icon',
+			'label' => 'Webseite',
+			'name' => 'Nur Name',
+			'none' => 'Keine',
 		),
 		'width' => array(
 			'content' => 'Inhaltsbreite',
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index fb35bc41c..4aa3327a4 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -198,7 +198,7 @@ return array(
 		'clipboard' => 'Zwischenablage',
 		'diaspora' => 'Diaspora*',	// IGNORE
 		'email' => 'E-Mail',
-		'email-webmail-firefox-fix' => 'Email (webmail - fix for Firefox)',	// TODO
+		'email-webmail-firefox-fix' => 'E-Mail (Webmail - Fix für Firefox)',
 		'facebook' => 'Facebook',	// IGNORE
 		'gnusocial' => 'GNU social',	// IGNORE
 		'jdh' => 'Journal du hacker',	// IGNORE
diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php
index b265c1b98..cbef9e0fb 100644
--- a/app/i18n/de/sub.php
+++ b/app/i18n/de/sub.php
@@ -99,8 +99,8 @@ return array(
 					'help' => 'Beispiel: <code>descendant::img/@src</code>',
 				),
 				'item_timeFormat' => array(
-					'_' => 'Custom date/time format',	// TODO
-					'help' => 'Optional. A format supported by <a href="https://php.net/datetime.createfromformat" target="_blank"><code>DateTime::createFromFormat()</code></a> such as <code>d-m-Y H:i:s</code>',	// TODO
+					'_' => 'Benutzerdefiniertes Datum/Zeit-Format',
+					'help' => 'Optional. Ein Format unterstützt von <a href="https://php.net/datetime.createfromformat" target="_blank"><code>DateTime::createFromFormat()</code></a>, wie zum Beispiel <code>d-m-Y H:i:s</code>',
 				),
 				'item_timestamp' => array(
 					'_' => 'Artikel-Datum',
@@ -122,7 +122,7 @@ return array(
 				'xpath' => 'XPath für:',
 			),
 			'rss' => 'RSS / Atom (Standard)',
-			'xml_xpath' => 'XML + XPath',	// TODO
+			'xml_xpath' => 'XML + XPath',	// IGNORE
 		),
 		'maintenance' => array(
 			'clear_cache' => 'Zwischenspeicher leeren',