diff --git a/.tx/config b/.tx/config
index 469fc4e635..838d153ebd 100644
--- a/.tx/config
+++ b/.tx/config
@@ -6,6 +6,7 @@ trans.pt = apps/converter/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/converter/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/converter/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/converter/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/converter/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-common]
 source_file = apps/common/locale/en/LC_MESSAGES/django.po
@@ -15,6 +16,7 @@ trans.pt = apps/common/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/common/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/common/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/common/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/common/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-permissions]
 source_file = apps/permissions/locale/en/LC_MESSAGES/django.po
@@ -24,6 +26,7 @@ trans.pt = apps/permissions/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/permissions/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/permissions/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/permissions/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/permissions/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-sources]
 source_file = apps/sources/locale/en/LC_MESSAGES/django.po
@@ -33,6 +36,7 @@ trans.pt = apps/sources/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/sources/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/sources/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/sources/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/sources/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-document_indexing]
 source_file = apps/document_indexing/locale/en/LC_MESSAGES/django.po
@@ -42,6 +46,7 @@ trans.pt = apps/document_indexing/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/document_indexing/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/document_indexing/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/document_indexing/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/document_indexing/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-user_management]
 source_file = apps/user_management/locale/en/LC_MESSAGES/django.po
@@ -51,6 +56,7 @@ trans.pt = apps/user_management/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/user_management/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/user_management/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/user_management/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/user_management/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-main]
 source_file = apps/main/locale/en/LC_MESSAGES/django.po
@@ -60,6 +66,7 @@ trans.pt = apps/main/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/main/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/main/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/main/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/main/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-ocr]
 source_file = apps/ocr/locale/en/LC_MESSAGES/django.po
@@ -69,6 +76,7 @@ trans.pt = apps/ocr/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/ocr/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/ocr/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/ocr/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/ocr/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-project_setup]
 source_file = apps/project_setup/locale/en/LC_MESSAGES/django.po
@@ -78,6 +86,7 @@ trans.pt = apps/project_setup/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/project_setup/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/project_setup/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/project_setup/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/project_setup/locale/de_DE/LC_MESSAGES/django.po
 
 [main]
 host = https://www.transifex.net
@@ -90,6 +99,7 @@ trans.pt = apps/folders/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/folders/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/folders/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/folders/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/folders/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-history]
 source_file = apps/history/locale/en/LC_MESSAGES/django.po
@@ -99,6 +109,7 @@ trans.pt = apps/history/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/history/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/history/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/history/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/history/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-dynamic_search]
 source_file = apps/dynamic_search/locale/en/LC_MESSAGES/django.po
@@ -108,6 +119,7 @@ trans.pt = apps/dynamic_search/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/dynamic_search/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/dynamic_search/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/dynamic_search/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/dynamic_search/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-smart_settings]
 source_file = apps/smart_settings/locale/en/LC_MESSAGES/django.po
@@ -117,6 +129,7 @@ trans.pt = apps/smart_settings/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/smart_settings/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/smart_settings/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/smart_settings/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/smart_settings/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-navigation]
 source_file = apps/navigation/locale/en/LC_MESSAGES/django.po
@@ -126,6 +139,7 @@ trans.pt = apps/navigation/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/navigation/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/navigation/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/navigation/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/navigation/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-tags]
 source_file = apps/tags/locale/en/LC_MESSAGES/django.po
@@ -135,6 +149,7 @@ trans.pt = apps/tags/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/tags/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/tags/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/tags/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/tags/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-documents]
 source_file = apps/documents/locale/en/LC_MESSAGES/django.po
@@ -144,6 +159,7 @@ trans.pt = apps/documents/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/documents/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/documents/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/documents/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/documents/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-project_tools]
 source_file = apps/project_tools/locale/en/LC_MESSAGES/django.po
@@ -153,6 +169,7 @@ trans.pt = apps/project_tools/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/project_tools/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/project_tools/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/project_tools/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/project_tools/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-linking]
 source_file = apps/linking/locale/en/LC_MESSAGES/django.po
@@ -162,6 +179,7 @@ trans.pt = apps/linking/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/linking/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/linking/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/linking/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/linking/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-document_comments]
 source_file = apps/document_comments/locale/en/LC_MESSAGES/django.po
@@ -171,6 +189,7 @@ trans.pt = apps/document_comments/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/document_comments/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/document_comments/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/document_comments/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/document_comments/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-metadata]
 source_file = apps/metadata/locale/en/LC_MESSAGES/django.po
@@ -180,6 +199,7 @@ trans.pt = apps/metadata/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/metadata/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/metadata/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/metadata/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/metadata/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-web_theme]
 source_file = apps/web_theme/locale/en/LC_MESSAGES/django.po
@@ -189,6 +209,7 @@ trans.pt = apps/web_theme/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/web_theme/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/web_theme/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/web_theme/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/web_theme/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-django_gpg]
 source_file = apps/django_gpg/locale/en/LC_MESSAGES/django.po
@@ -198,6 +219,7 @@ trans.pt = apps/django_gpg/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/django_gpg/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/django_gpg/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/django_gpg/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/django_gpg/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-document_signatures]
 source_file = apps/document_signatures/locale/en/LC_MESSAGES/django.po
@@ -207,6 +229,7 @@ trans.pt = apps/document_signatures/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/document_signatures/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/document_signatures/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/document_signatures/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/document_signatures/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-acls]
 source_file = apps/acls/locale/en/LC_MESSAGES/django.po
@@ -216,6 +239,7 @@ trans.pt = apps/acls/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/acls/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/acls/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/acls/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/acls/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-installation]
 source_file = apps/installation/locale/en/LC_MESSAGES/django.po
@@ -225,6 +249,7 @@ trans.pt = apps/installation/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/installation/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/installation/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/installation/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/installation/locale/de_DE/LC_MESSAGES/django.po
 
 [mayan-edms.apps-scheduler]
 source_file = apps/scheduler/locale/en/LC_MESSAGES/django.po
@@ -234,3 +259,4 @@ trans.pt = apps/scheduler/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/scheduler/locale/ru/LC_MESSAGES/django.po
 trans.it = apps/scheduler/locale/it/LC_MESSAGES/django.po
 trans.pl = apps/scheduler/locale/pl/LC_MESSAGES/django.po
+trans.de_DE = apps/scheduler/locale/de_DE/LC_MESSAGES/django.po
diff --git a/docs/credits/contributors.rst b/docs/credits/contributors.rst
index 1b34f42e0f..f76f27544b 100644
--- a/docs/credits/contributors.rst
+++ b/docs/credits/contributors.rst
@@ -69,6 +69,11 @@ Translations
 
   - mic (https://www.transifex.net/accounts/profile/mic/)
 
+* German
+
+  - Tetja Rediske
+  - Tilmann Sittig
+  
 
 Remote access for debugging
 ---------------------------
diff --git a/misc/compilemessages_all.sh b/misc/compilemessages_all.sh
index 673ab8f18c..4c948571a9 100755
--- a/misc/compilemessages_all.sh
+++ b/misc/compilemessages_all.sh
@@ -9,6 +9,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/converter
 $COMPILEMESSAGES -l pt
@@ -16,6 +17,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/documents
 $COMPILEMESSAGES -l pt
@@ -23,6 +25,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/document_comments
 $COMPILEMESSAGES -l pt
@@ -30,6 +33,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/document_indexing
 $COMPILEMESSAGES -l pt
@@ -37,6 +41,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/dynamic_search
 $COMPILEMESSAGES -l pt
@@ -44,6 +49,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/folders
 $COMPILEMESSAGES -l pt
@@ -51,6 +57,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/history
 $COMPILEMESSAGES -l pt
@@ -58,6 +65,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/linking
 $COMPILEMESSAGES -l pt
@@ -65,6 +73,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/main
 $COMPILEMESSAGES -l pt
@@ -72,6 +81,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/metadata
 $COMPILEMESSAGES -l pt
@@ -79,6 +89,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/navigation
 $COMPILEMESSAGES -l pt
@@ -86,6 +97,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/ocr
 $COMPILEMESSAGES -l pt
@@ -93,6 +105,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/permissions
 $COMPILEMESSAGES -l pt
@@ -100,6 +113,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/project_setup
 $COMPILEMESSAGES -l pt
@@ -107,6 +121,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/project_tools
 $COMPILEMESSAGES -l pt
@@ -114,6 +129,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/smart_settings
 $COMPILEMESSAGES -l pt
@@ -121,6 +137,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/sources
 $COMPILEMESSAGES -l pt
@@ -128,6 +145,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/tags
 $COMPILEMESSAGES -l pt
@@ -135,6 +153,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/user_management
 $COMPILEMESSAGES -l pt
@@ -142,6 +161,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/web_theme
 $COMPILEMESSAGES -l pt
@@ -149,6 +169,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/django_gpg
 $COMPILEMESSAGES -l pt
@@ -156,6 +177,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/document_signatures
 $COMPILEMESSAGES -l pt
@@ -163,6 +185,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/acls
 $COMPILEMESSAGES -l pt
@@ -170,6 +193,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/installation
 $COMPILEMESSAGES -l pt
@@ -177,6 +201,7 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
 
 cd $BASE/apps/scheduler
 $COMPILEMESSAGES -l pt
@@ -184,3 +209,4 @@ $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 $COMPILEMESSAGES -l it
 $COMPILEMESSAGES -l pl
+$COMPILEMESSAGES -l de_DE
diff --git a/misc/makemessages_all.sh b/misc/makemessages_all.sh
index 098d108041..bfab278af3 100755
--- a/misc/makemessages_all.sh
+++ b/misc/makemessages_all.sh
@@ -10,6 +10,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/converter
 $MAKEMESSAGES -l en
@@ -18,6 +19,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/documents
 $MAKEMESSAGES -l en
@@ -26,6 +28,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/document_comments
 $MAKEMESSAGES -l en
@@ -34,6 +37,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/document_indexing
 $MAKEMESSAGES -l en
@@ -42,6 +46,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/dynamic_search
 $MAKEMESSAGES -l en
@@ -50,6 +55,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/folders
 $MAKEMESSAGES -l en
@@ -58,6 +64,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/history
 $MAKEMESSAGES -l en
@@ -66,6 +73,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/linking
 $MAKEMESSAGES -l en
@@ -74,6 +82,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/main
 $MAKEMESSAGES -l en
@@ -82,6 +91,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/metadata
 $MAKEMESSAGES -l en
@@ -90,6 +100,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/navigation
 $MAKEMESSAGES -l en
@@ -98,6 +109,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/ocr
 $MAKEMESSAGES -l en
@@ -106,6 +118,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/permissions
 $MAKEMESSAGES -l en
@@ -114,6 +127,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/project_setup
 $MAKEMESSAGES -l en
@@ -122,6 +136,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/project_tools
 $MAKEMESSAGES -l en
@@ -130,6 +145,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/smart_settings
 $MAKEMESSAGES -l en
@@ -138,6 +154,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/sources
 $MAKEMESSAGES -l en
@@ -146,6 +163,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/tags
 $MAKEMESSAGES -l en
@@ -154,6 +172,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/user_management
 $MAKEMESSAGES -l en
@@ -162,6 +181,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/web_theme
 $MAKEMESSAGES -l en
@@ -170,6 +190,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/django_gpg
 $MAKEMESSAGES -l en
@@ -178,6 +199,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/document_signatures
 $MAKEMESSAGES -l en
@@ -186,6 +208,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/acls
 $MAKEMESSAGES -l en
@@ -194,6 +217,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/installation
 $MAKEMESSAGES -l en
@@ -202,6 +226,7 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
 
 cd $BASE/apps/scheduler
 $MAKEMESSAGES -l en
@@ -210,3 +235,4 @@ $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 $MAKEMESSAGES -l it
 $MAKEMESSAGES -l pl
+$MAKEMESSAGES -l de_DE
diff --git a/settings.py b/settings.py
index 3257e013f6..5913d464c9 100644
--- a/settings.py
+++ b/settings.py
@@ -2,6 +2,8 @@
 import os
 import sys
 
+ugettext = lambda s: s
+
 PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), './'))
 
 sys.path.append(os.path.join(PROJECT_ROOT, 'modules'))
@@ -42,11 +44,8 @@ TIME_ZONE = 'America/Puerto_Rico'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
-#LANGUAGE_CODE = 'en-us'
 LANGUAGE_CODE = 'en'
 
-ugettext = lambda s: s
-
 LANGUAGES = (
     ('en', ugettext('English')),
     ('es', ugettext('Spanish')),
@@ -54,6 +53,7 @@ LANGUAGES = (
     ('ru', ugettext('Russian')),
     ('it', ugettext('Italian')),
     ('pl', ugettext('Polish')),
+    ('de', ugettext('German')),
 )
 
 SITE_ID = 1