diff --git a/datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php
index af2ce9438..f65b2ff51 100755
--- a/datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php
@@ -61,7 +61,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Location/Attribute:country+' => '',
 	'Class:Location/Attribute:physicaldevice_list' => 'Geräte',
 	'Class:Location/Attribute:physicaldevice_list+' => '',
-	'Class:Location/Attribute:person_list' => 'kontakte',
+	'Class:Location/Attribute:person_list' => 'Kontakte',
 	'Class:Location/Attribute:person_list+' => '',
 	'Class:Person' => 'Person',
 	'Class:Person+' => '',
@@ -293,7 +293,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Model/Attribute:type/Value:Phone+' => '',
 	'Class:Model/Attribute:physicaldevices_list' => 'Phyische Geräte',
 	'Class:Model/Attribute:physicaldevices_list+' => '',
-	'Class:NetworkDeviceType' => 'Netzerkgerätetyp',
+	'Class:NetworkDeviceType' => 'Netzwerkgerätetyp',
 	'Class:NetworkDeviceType+' => '',
 	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Netzwerkgeräte',
 	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => '',
@@ -1039,7 +1039,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:ConfigManagementOverview+' => 'Übersicht',
 	'Menu:Contact' => 'Kontakte',
 	'Menu:Contact+' => 'Kontakte',
-	'Menu:Contact:Count' => '%1$d kontakten',
+	'Menu:Contact:Count' => '%1$d Kontakte',
 	'Menu:Person' => 'Personen',
 	'Menu:Person+' => 'Alle Personen',
 	'Menu:Team' => 'Teams',
diff --git a/datamodels/2.x/itop-config/de.dict.itop-config.php b/datamodels/2.x/itop-config/de.dict.itop-config.php
index 230108aea..132cd5102 100644
--- a/datamodels/2.x/itop-config/de.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/de.dict.itop-config.php
@@ -31,10 +31,10 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'config-apply' => 'Anwenden',
 	'config-apply' => 'Anwenden (Ctrl+S)',
 	'config-cancel' => 'Zurücksetzen',
-    'config-saved' => 'Successfully recorded.~~',
+    'config-saved' => 'Erfolgreich gesprichert',
 	'config-confirm-cancel' => 'Ihre Änderungen werden nicht gespeichert.',
 	'config-no-change' => 'Keine Änderungen: Die Datei wurde nicht verändert.',
-    'config-reverted' => 'The configuration has been reverted.~~',
+    'config-reverted' => 'Die Konfiguration wurde zurückgesetzt',
 	'config-parse-error' => 'Zeile %2$d: %1$s.<br/>Die Datei wurde nicht aktualisiert.',
 	'config-current-line' => 'Editiere Zeile: %1$s',
 	));
diff --git a/datamodels/2.x/itop-portal-base/de.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/de.dict.itop-portal-base.php
index 74de012af..33f6ecbc3 100644
--- a/datamodels/2.x/itop-portal-base/de.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/de.dict.itop-portal-base.php
@@ -31,9 +31,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Page:Home' => 'Start',
 	'Page:GoPortalHome' => 'Startseite',
 	'Page:GoPreviousPage' => 'vorherige Seite',
-    'Page:ReloadPage' => 'Reload page~~',
+    'Page:ReloadPage' => 'Seite neu laden',
 	'Portal:Button:Submit' => 'Abschicken',
-    'Portal:Button:Apply' => 'Update~~',
+    'Portal:Button:Apply' => 'Anwenden',
 	'Portal:Button:Cancel' => 'Zurück',
 	'Portal:Button:Close' => 'Schließen',
 	'Portal:Button:Add' => 'Hinzu',
@@ -41,12 +41,12 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Portal:Button:Delete' => 'Löschen',
 	'Portal:EnvironmentBanner:Title' => 'Sie sind im Moment im <strong>%1$s</strong> Modus',
 	'Portal:EnvironmentBanner:GoToProduction' => 'Zurück zum PRODUCTION Modus',
-    'Error:HTTP:401' => 'Authentication~~',
+    'Error:HTTP:401' => 'Authentifizierung',
     'Error:HTTP:404' => 'Seite nicht gefunden.',
 	'Error:HTTP:500' => 'Oops! Es ist ein Fehler aufgetreten.',
 	'Error:HTTP:GetHelp' => 'Bitte kontaktieren Sie Ihren %1$s administrator falls das Problem öfter auftaucht.',
 	'Error:XHR:Fail' => 'Konnte Daten nicht laden, bitte kontaktieren Sie Ihren %1$s administrator',
-    'Portal:ErrorUserLoggedOut' => 'You are logged out and need to log in again in order to continue.~~',
+    'Portal:ErrorUserLoggedOut' => 'Sie sind ausgeloggt und müssen sich erneut einloggen, um fortfahren zu können.',
     'Portal:Datatables:Language:Processing' => 'Bitte warten...',
 	'Portal:Datatables:Language:Search' => 'Filter :',
 	'Portal:Datatables:Language:LengthMenu' => 'Anzahl _MENU_ Einträge pro Seite',
@@ -87,7 +87,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Brick:Portal:Browse:Name' => 'List durchgehen',
 	'Brick:Portal:Browse:Mode:List' => 'Liste',
 	'Brick:Portal:Browse:Mode:Tree' => 'Baum',
-    'Brick:Portal:Browse:Mode:Mosaic' => 'Mosaic~~',
+    'Brick:Portal:Browse:Mode:Mosaic' => 'Kachel',
 	'Brick:Portal:Browse:Action:Drilldown' => 'Drilldown',
 	'Brick:Portal:Browse:Action:View' => 'Details',
 	'Brick:Portal:Browse:Action:Edit' => 'Editieren',
@@ -102,18 +102,18 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Brick:Portal:Manage:Name' => 'Einträge managen',
 	'Brick:Portal:Manage:Table:NoData' => 'Kein Eintrag.',
-    'Brick:Portal:Manage:Table:ItemActions' => 'Actions~~',
-    'Brick:Portal:Manage:DisplayMode:list' => 'List~~',
-    'Brick:Portal:Manage:DisplayMode:pie-chart' => 'Pie Chart~~',
-    'Brick:Portal:Manage:DisplayMode:bar-chart' => 'Bar Chart',
-    'Brick:Portal:Manage:Others' => 'Others~~',
-    'Brick:Portal:Manage:All' => 'All~~',
-    'Brick:Portal:Manage:Group' => 'Group~~',
-    'Brick:Portal:Manage:fct:count' => 'Total~~',
-    'Brick:Portal:Manage:fct:sum' => 'Sum~~',
-    'Brick:Portal:Manage:fct:avg' => 'Average~~',
-    'Brick:Portal:Manage:fct:min' => 'Min~~',
-    'Brick:Portal:Manage:fct:max' => 'Max~~',
+    'Brick:Portal:Manage:Table:ItemActions' => 'Aktionen',
+	'Brick:Portal:Manage:DisplayMode:list' => 'List~~',
+	'Brick:Portal:Manage:DisplayMode:pie-chart' => 'Pie Chart~~',
+	'Brick:Portal:Manage:DisplayMode:bar-chart' => 'Bar Chart~~',
+	'Brick:Portal:Manage:Others' => 'Others~~',
+	'Brick:Portal:Manage:All' => 'All~~',
+	'Brick:Portal:Manage:Group' => 'Group~~',
+	'Brick:Portal:Manage:fct:count' => 'Total~~',
+	'Brick:Portal:Manage:fct:sum' => 'Sum~~',
+	'Brick:Portal:Manage:fct:avg' => 'Average~~',
+	'Brick:Portal:Manage:fct:min' => 'Min~~',
+	'Brick:Portal:Manage:fct:max' => 'Max~~',
 ));
 
 // ObjectBrick brick
@@ -131,12 +131,12 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 // CreateBrick brick
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Brick:Portal:Create:Name' => 'Schnelles Erstellen',
-    'Brick:Portal:Create:ChooseType' => 'Please, choose a type~~',
+    'Brick:Portal:Create:ChooseType' => 'Bitte wählen Sie einen Typ',
 ));
 
 // Filter brick
 Dict::Add('DE DE', 'German', 'Deutsch', array(
-    'Brick:Portal:Filter:Name' => 'Prefilter a brick~~',
-    'Brick:Portal:Filter:SearchInput:Placeholder' => 'eg. connect wifi~~',
-    'Brick:Portal:Filter:SearchInput:Submit' => 'Search~~',
+    'Brick:Portal:Filter:Name' => 'Brick vorfiltern',
+    'Brick:Portal:Filter:SearchInput:Placeholder' => 'z.B. connect wifi',
+    'Brick:Portal:Filter:SearchInput:Submit' => 'Suchen',
 ));
diff --git a/datamodels/2.x/itop-service-mgmt-provider/de.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/de.dict.itop-service-mgmt-provider.php
index 0d52855c6..03b3d9dcc 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/de.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/de.dict.itop-service-mgmt-provider.php
@@ -69,7 +69,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:ServiceFamily+' => '',
 	'Class:ServiceFamily/Attribute:name' => 'Name',
 	'Class:ServiceFamily/Attribute:name+' => '',
-	'Class:ServiceFamily/Attribute:icon' => 'Icon~~',
+	'Class:ServiceFamily/Attribute:icon' => 'Icon',
 	'Class:ServiceFamily/Attribute:icon+' => '',
 	'Class:Service' => 'Service',
 	'Class:Service+' => '',
@@ -93,7 +93,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Service/Attribute:status/Value:obsolete+' => '',
 	'Class:Service/Attribute:status/Value:production' => 'Produktion',
 	'Class:Service/Attribute:status/Value:production+' => '',
-	'Class:Service/Attribute:icon' => 'Icon~~',
+	'Class:Service/Attribute:icon' => 'Icon',
 	'Class:Service/Attribute:icon+' => '',
 	'Class:Service/Attribute:customercontracts_list' => 'Kunden-Verträge',
 	'Class:Service/Attribute:customercontracts_list+' => '',
@@ -248,7 +248,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:SLT+' => '',
 	'Menu:DeliveryModel' => 'Delivery-Modelle',
 	'Menu:DeliveryModel+' => '',
-	'Class:Contract' => 'Contract',
+	'Class:Contract' => 'Vertrag',
 	'Class:Contract+' => '',
 	'Class:Contract/Attribute:name' => 'Name',
 	'Class:Contract/Attribute:name+' => '',
diff --git a/datamodels/2.x/itop-service-mgmt/de.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/de.dict.itop-service-mgmt.php
index 641c9df9c..7dd54538f 100755
--- a/datamodels/2.x/itop-service-mgmt/de.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/de.dict.itop-service-mgmt.php
@@ -65,7 +65,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:ServiceFamily+' => '',
 	'Class:ServiceFamily/Attribute:name' => 'Name',
 	'Class:ServiceFamily/Attribute:name+' => '',
-	'Class:ServiceFamily/Attribute:icon' => 'Icon~~',
+	'Class:ServiceFamily/Attribute:icon' => 'Icon',
 	'Class:ServiceFamily/Attribute:icon+' => '',
 	'Class:ServiceFamily/Attribute:services_list' => 'Services',
 	'Class:ServiceFamily/Attribute:services_list+' => '',
@@ -91,7 +91,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Service/Attribute:status/Value:obsolete+' => '',
 	'Class:Service/Attribute:status/Value:production' => 'Produktion',
 	'Class:Service/Attribute:status/Value:production+' => '',
-	'Class:Service/Attribute:icon' => 'Icon~~',
+	'Class:Service/Attribute:icon' => 'Icon',
 	'Class:Service/Attribute:icon+' => '',
 	'Class:Service/Attribute:customercontracts_list' => 'Kunden-Verträge',
 	'Class:Service/Attribute:customercontracts_list+' => '',
diff --git a/dictionaries/de.dictionary.itop.core.php b/dictionaries/de.dictionary.itop.core.php
index e1c2674a1..60368e64d 100644
--- a/dictionaries/de.dictionary.itop.core.php
+++ b/dictionaries/de.dictionary.itop.core.php
@@ -181,20 +181,20 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:EventWebService/Attribute:log_error+' => 'Ergebnis der Fehler-Protokollierung',
 	'Class:EventWebService/Attribute:data' => 'Daten',
 	'Class:EventWebService/Attribute:data+' => 'Ergebnisdaten',
-	'Class:EventRestService' => 'REST/JSON call~~',
-	'Class:EventRestService+' => 'Trace of a REST/JSON service call~~',
-	'Class:EventRestService/Attribute:operation' => 'Operation~~',
-	'Class:EventRestService/Attribute:operation+' => 'Argument \'operation\'~~',
-	'Class:EventRestService/Attribute:version' => 'Version~~',
-	'Class:EventRestService/Attribute:version+' => 'Argument \'version\'~~',
-	'Class:EventRestService/Attribute:json_input' => 'Input~~',
-	'Class:EventRestService/Attribute:json_input+' => 'Argument \'json_data\'~~',
-	'Class:EventRestService/Attribute:code' => 'Code~~',
-	'Class:EventRestService/Attribute:code+' => 'Result code~~',
-	'Class:EventRestService/Attribute:json_output' => 'Response~~',
-	'Class:EventRestService/Attribute:json_output+' => 'HTTP response (json)~~',
-	'Class:EventRestService/Attribute:provider' => 'Provider~~',
-	'Class:EventRestService/Attribute:provider+' => 'PHP class implementing the expected operation~~',
+	'Class:EventRestService' => 'REST/JSON Call',
+	'Class:EventRestService+' => 'Trace eines REST/JSON-Calls',
+	'Class:EventRestService/Attribute:operation' => 'Operation',
+	'Class:EventRestService/Attribute:operation+' => 'Argument \'operation\'',
+	'Class:EventRestService/Attribute:version' => 'Version',
+	'Class:EventRestService/Attribute:version+' => 'Argument \'version\'',
+	'Class:EventRestService/Attribute:json_input' => 'Eingabe',
+	'Class:EventRestService/Attribute:json_input+' => 'Argument \'json_data\'',
+	'Class:EventRestService/Attribute:code' => 'Ergebniscode',
+	'Class:EventRestService/Attribute:code+' => 'Ergebniscode',
+	'Class:EventRestService/Attribute:json_output' => 'Antwort',
+	'Class:EventRestService/Attribute:json_output+' => 'HTTP Antwort (JSON)',
+	'Class:EventRestService/Attribute:provider' => 'Provider',
+	'Class:EventRestService/Attribute:provider+' => 'PHP-Klasse die die erwartete Operation implementiert',
 	'Class:EventLoginUsage' => 'Login Verwendung',
 	'Class:EventLoginUsage+' => '',
 	'Class:EventLoginUsage/Attribute:user_id' => 'Login',
diff --git a/dictionaries/de.dictionary.itop.ui.php b/dictionaries/de.dictionary.itop.ui.php
index 5d4720cbc..6ce532ff0 100644
--- a/dictionaries/de.dictionary.itop.ui.php
+++ b/dictionaries/de.dictionary.itop.ui.php
@@ -118,9 +118,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:User/Attribute:allowed_org_list+' => 'Der Endbenutzer ist berechtigt, die Daten der folgenden Organisationen zu sehen. Wenn keine Organisation zu sehen ist, gibt es keine Beschränkung.',
 	'Class:User/Error:LoginMustBeUnique' => 'Login-Namen müssen unterschiedlich sein - "%1s" benutzt diesen Login-Name bereits.',
 	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Mindestens ein Profil muss diesem Benutzer zugewiesen sein.',
-    'Class:User/Error:AtLeastOneOrganizationIsNeeded' => 'At least one organization must be assigned to this user.~~',
-    'Class:User/Error:OrganizationNotAllowed' => 'Organization not allowed.~~',
-    'Class:User/Error:UserOrganizationNotAllowed' => 'The user account does not belong to your allowed organizations.~~',
+    'Class:User/Error:AtLeastOneOrganizationIsNeeded' => 'Mindestens eine Organisation muss diesem Benutzer zugewiesen sein.',
+    'Class:User/Error:OrganizationNotAllowed' => 'Diese Organisation ist nicht erlaubt.',
+    'Class:User/Error:UserOrganizationNotAllowed' => 'Das Benutzerkonto gehört nicht zu den für Sie freigegebenen Organisationen',
     'Class:URP_Dimensions' => 'Dimension',
 	'Class:URP_Dimensions+' => 'Anwendungsdimension (Festlegen von Silos)',
 	'Class:URP_Dimensions/Attribute:name' => 'Name',
@@ -564,13 +564,13 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'UI:Schema:LifeCycleAttributeMustChange' => 'Muss ändern',
 	'UI:Schema:LifeCycleAttributeMustPrompt' => 'Benutzer wird zur Änderung des Wertes aufgefordert werden',
 	'UI:Schema:LifeCycleEmptyList' => 'Leere Liste',
-	'UI:Schema:ClassFilter' => 'Class:~~',
-	'UI:Schema:DisplayLabel' => 'Display:~~',
-	'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~',
-	'UI:Schema:DisplaySelector/Label' => 'Label~~',
-	'UI:Schema:DisplaySelector/Code' => 'Code~~',
-	'UI:Schema:Attribute/Filter' => 'Filter~~',
-	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
+	'UI:Schema:ClassFilter' => 'Klasse:',
+	'UI:Schema:DisplayLabel' => 'Label:',
+	'UI:Schema:DisplaySelector/LabelAndCode' => 'Label und Code',
+	'UI:Schema:DisplaySelector/Label' => 'Label',
+	'UI:Schema:DisplaySelector/Code' => 'Code',
+	'UI:Schema:Attribute/Filter' => 'Filter',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"',
 	'UI:LinksWidget:Autocomplete+' => 'Geben Sie die ersten 3 Buchstaben ein...',
 	'UI:Edit:TestQuery' => 'Query testen',
 	'UI:Combo:SelectValue' => '--- wählen Sie einen Wert ---',
@@ -957,17 +957,17 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'UI:DashboardEdit:DashletProperties' => 'Dashlet-Einstellungen',
 	'UI:Form:Property' => 'Einstellung',
 	'UI:Form:Value' => 'Wert',
-    'UI:DashletUnknown:Label' => 'Unknown~~',
-    'UI:DashletUnknown:Description' => 'Unknown dashlet (might have been uninstalled)~~',
-    'UI:DashletUnknown:RenderText:View' => 'Unable to render this dashlet.~~',
-    'UI:DashletUnknown:RenderText:Edit' => 'Unable to render this dashlet (class "%1$s"). Check with your administrator if it is still available.~~',
-    'UI:DashletUnknown:RenderNoDataText:Edit' => 'No preview available for this dashlet (class "%1$s").~~',
-    'UI:DashletUnknown:Prop-XMLConfiguration' => 'Configuration (shown as raw XML)~~',
+    'UI:DashletUnknown:Label' => 'Unbekannt',
+    'UI:DashletUnknown:Description' => 'Unbekanntes Dashlet (ggf. wurde es deinstalliert)',
+    'UI:DashletUnknown:RenderText:View' => 'Dieses Dashlet kann nicht dargestellt werden.',
+    'UI:DashletUnknown:RenderText:Edit' => 'Dieses Dashlet kann nicht dargestellt werden (Klasse "%1$s"). Bitte kontaktieren Sie Ihren Administrator, ob es noch verfügbar ist.',
+    'UI:DashletUnknown:RenderNoDataText:Edit' => 'Keine Vorschau für dieses Dashlet verfügbar (Klasse "%1$s").',
+    'UI:DashletUnknown:Prop-XMLConfiguration' => 'Konfiguration (Anzeige des XML als einfacher Text)',
 
-    'UI:DashletProxy:Label' => 'Proxy~~',
-    'UI:DashletProxy:Description' => 'Proxy dashlet~~',
-    'UI:DashletProxy:RenderNoDataText:Edit' => 'No preview available for this third-party dashlet (class "%1$s").~~',
-    'UI:DashletProxy:Prop-XMLConfiguration' => 'Configuration (shown as raw XML)~~',
+    'UI:DashletProxy:Label' => 'Proxy',
+    'UI:DashletProxy:Description' => 'Proxy Dashlet',
+    'UI:DashletProxy:RenderNoDataText:Edit' => 'Keine Vorschau für dieses externe Dashlet verfügbar (Klasse "%1$s").',
+    'UI:DashletProxy:Prop-XMLConfiguration' => 'Konfiguration (Anzeige des XML als einfacher Text)',
 	'UI:DashletPlainText:Label' => 'Text',
 	'UI:DashletPlainText:Description' => 'Reiner Text (ohne Formatierung)',
 	'UI:DashletPlainText:Prop-Text' => 'Text',
@@ -998,25 +998,25 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'UI:DashletGroupByTable:Description' => 'Liste (gruppiert nach einem Feld)',
 
     // New in 2.5
-    'UI:DashletGroupBy:Prop-Function' => 'Aggregation function~~',
-    'UI:DashletGroupBy:Prop-FunctionAttribute' => 'Function attribute~~',
-    'UI:DashletGroupBy:Prop-OrderDirection' => 'Direction~~',
-    'UI:DashletGroupBy:Prop-OrderField' => 'Order by~~',
-    'UI:DashletGroupBy:Prop-Limit' => 'Limit~~',
+    'UI:DashletGroupBy:Prop-Function' => 'Aggregatfunktion',
+    'UI:DashletGroupBy:Prop-FunctionAttribute' => 'Funktionsattribut',
+    'UI:DashletGroupBy:Prop-OrderDirection' => 'Richtung',
+    'UI:DashletGroupBy:Prop-OrderField' => 'Sortieren nach',
+    'UI:DashletGroupBy:Prop-Limit' => 'Limit',
 
-    'UI:DashletGroupBy:Order:asc' => 'Ascending~~',
-    'UI:DashletGroupBy:Order:desc' => 'Descending~~',
+    'UI:DashletGroupBy:Order:asc' => 'Aufsteigend',
+    'UI:DashletGroupBy:Order:desc' => 'Absteigend',
 
-    'UI:GroupBy:count' => 'Count~~',
-    'UI:GroupBy:count+' => 'Number of elements~~',
-    'UI:GroupBy:sum' => 'Sum~~',
-    'UI:GroupBy:sum+' => 'Sum of %1$s~~',
-    'UI:GroupBy:avg' => 'Average~~',
-    'UI:GroupBy:avg+' => 'Average of %1$s~~',
-    'UI:GroupBy:min' => 'Minimum~~',
-    'UI:GroupBy:min+' => 'Minimum of %1$s~~',
-    'UI:GroupBy:max' => 'Maximum~~',
-    'UI:GroupBy:max+' => 'Maximum of %1$s~~',
+    'UI:GroupBy:count' => 'Anzahl',
+    'UI:GroupBy:count+' => 'Anzahl der Elemente',
+    'UI:GroupBy:sum' => 'Suumme',
+    'UI:GroupBy:sum+' => 'Suumme von %1$s',
+    'UI:GroupBy:avg' => 'Durchschnitt',
+    'UI:GroupBy:avg+' => 'Durchschnitt von %1$s',
+    'UI:GroupBy:min' => 'Minimum',
+    'UI:GroupBy:min+' => 'Minimum von %1$s',
+    'UI:GroupBy:max' => 'Maximum',
+    'UI:GroupBy:max+' => 'Maximum von %1$s',
     // ---
 
 	'UI:DashletHeaderStatic:Label' => 'Header',
@@ -1175,123 +1175,123 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'UI:UploadNotSupportedInThisMode' => 'Die Modifizierung von Bildern oder Dateien wird in diesem Modus nicht unterstützt.',
 
     // Search form
-    'UI:Search:Toggle' => 'Minimize / Expand~~',
-    'UI:Search:AutoSubmit:DisabledHint' => 'Auto submit has been disabled for this class~~',
-    'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria~~',
+    'UI:Search:Toggle' => 'Ein-/Ausklappen',
+    'UI:Search:AutoSubmit:DisabledHint' => 'Automatische Eingabe für diese Klasse deaktiviert',
+    'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Kriterium hinzufügen',
     // - Add new criteria button
-    'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Recently used~~',
-    'UI:Search:AddCriteria:List:MostPopular:Title' => 'Most popular~~',
-    'UI:Search:AddCriteria:List:Others:Title' => 'Others~~',
-    'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'None yet.~~',
+    'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Kürzlich verwendet',
+    'UI:Search:AddCriteria:List:MostPopular:Title' => 'Am beliebtesten',
+    'UI:Search:AddCriteria:List:Others:Title' => 'Andere',
+    'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'Noch keine',
 
     // - Criteria titles
     //   - Default widget
-    'UI:Search:Criteria:Title:Default:Any' => '%1$s: Any~~',
-    'UI:Search:Criteria:Title:Default:Empty' => '%1$s is empty~~',
-    'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s is not empty~~',
-    'UI:Search:Criteria:Title:Default:Equals' => '%1$s equals %2$s~~',
-    'UI:Search:Criteria:Title:Default:Contains' => '%1$s contains %2$s~~',
-    'UI:Search:Criteria:Title:Default:StartsWith' => '%1$s starts with %2$s~~',
-    'UI:Search:Criteria:Title:Default:EndsWith' => '%1$s ends with %2$s~~',
-    'UI:Search:Criteria:Title:Default:RegExp' => '%1$s matches %2$s~~',
-    'UI:Search:Criteria:Title:Default:GreaterThan' => '%1$s > %2$s~~',
-    'UI:Search:Criteria:Title:Default:GreaterThanOrEquals' => '%1$s >= %2$s~~',
-    'UI:Search:Criteria:Title:Default:LessThan' => '%1$s < %2$s~~',
-    'UI:Search:Criteria:Title:Default:LessThanOrEquals' => '%1$s <= %2$s~~',
-    'UI:Search:Criteria:Title:Default:Different' => '%1$s ≠ %2$s~~',
-    'UI:Search:Criteria:Title:Default:Between' => '%1$s between [%2$s]~~',
-    'UI:Search:Criteria:Title:Default:BetweenDates' => '%1$s [%2$s]~~',
-    'UI:Search:Criteria:Title:Default:BetweenDates:All' => '%1$s: Any~~',
-    'UI:Search:Criteria:Title:Default:BetweenDates:From' => '%1$s from %2$s~~',
-    'UI:Search:Criteria:Title:Default:BetweenDates:Until' => '%1$s until %2$s~~',
-    'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: Any~~',
-    'UI:Search:Criteria:Title:Default:Between:From' => '%1$s from %2$s~~',
-    'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s up to %2$s~~',
+    'UI:Search:Criteria:Title:Default:Any' => '%1$s: Beliebig',
+    'UI:Search:Criteria:Title:Default:Empty' => '%1$s ist leer',
+    'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s ist nicht leer',
+    'UI:Search:Criteria:Title:Default:Equals' => '%1$s is gleich %2$s',
+    'UI:Search:Criteria:Title:Default:Contains' => '%1$s enthält %2$s',
+    'UI:Search:Criteria:Title:Default:StartsWith' => '%1$s startet mit %2$s',
+    'UI:Search:Criteria:Title:Default:EndsWith' => '%1$s endet mit %2$s',
+    'UI:Search:Criteria:Title:Default:RegExp' => '%1$s passt zu %2$s',
+    'UI:Search:Criteria:Title:Default:GreaterThan' => '%1$s > %2$s',
+    'UI:Search:Criteria:Title:Default:GreaterThanOrEquals' => '%1$s >= %2$s',
+    'UI:Search:Criteria:Title:Default:LessThan' => '%1$s < %2$s',
+    'UI:Search:Criteria:Title:Default:LessThanOrEquals' => '%1$s <= %2$s',
+    'UI:Search:Criteria:Title:Default:Different' => '%1$s ≠ %2$s',
+    'UI:Search:Criteria:Title:Default:Between' => '%1$s zwischen [%2$s]',
+    'UI:Search:Criteria:Title:Default:BetweenDates' => '%1$s [%2$s]',
+    'UI:Search:Criteria:Title:Default:BetweenDates:All' => '%1$s: Beliebig',
+    'UI:Search:Criteria:Title:Default:BetweenDates:From' => '%1$s von %2$s',
+    'UI:Search:Criteria:Title:Default:BetweenDates:Until' => '%1$s bis %2$s',
+    'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: Beliebig',
+    'UI:Search:Criteria:Title:Default:Between:From' => '%1$s von %2$s',
+    'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s bis %2$s',
     //   - Numeric widget
     //   None yet
     //   - DateTime widget
-    'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s~~',
+    'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s',
     //   - Enum widget
-    'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s~~',
-    'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s and %3$s others~~',
-    'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: Any~~',
+    'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s',
+    'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s und %3$s andere',
+    'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: Beliebig',
     //   - External key widget
-    'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s is defined~~',
-    'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s is not defined~~',
-    'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s~~',
-    'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s~~',
-    'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s and %3$s others~~',
-    'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: Any~~',
+    'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s ist definiert',
+    'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s ist nicht definiert',
+    'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s',
+    'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s',
+    'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s und %3$s andere',
+    'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: Beliebig',
     //   - Hierarchical key widget
-    'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s is defined~~',
-    'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s is not defined~~',
-    'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s~~',
-    'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s~~',
-    'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s and %3$s others~~',
-    'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: Any~~',
+    'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s ist definiert',
+    'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s ist nicht definiert',
+    'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s',
+    'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s',
+    'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s und %3$s andere',
+    'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: Beliebig',
 
     // - Criteria operators
     //   - Default widget
-    'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty~~',
-    'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty~~',
-    'UI:Search:Criteria:Operator:Default:Equals' => 'Equals~~',
-    'UI:Search:Criteria:Operator:Default:Between' => 'Between~~',
+    'UI:Search:Criteria:Operator:Default:Empty' => 'Ist leer',
+    'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Ist nicht leer',
+    'UI:Search:Criteria:Operator:Default:Equals' => 'Ist gleich',
+    'UI:Search:Criteria:Operator:Default:Between' => 'Ist zwischen',
     //   - String widget
-    'UI:Search:Criteria:Operator:String:Contains' => 'Contains~~',
-    'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with~~',
-    'UI:Search:Criteria:Operator:String:EndsWith' => 'Ends with~~',
-    'UI:Search:Criteria:Operator:String:RegExp' => 'Regular exp.~~',
+    'UI:Search:Criteria:Operator:String:Contains' => 'Enthält',
+    'UI:Search:Criteria:Operator:String:StartsWith' => 'Startet mit',
+    'UI:Search:Criteria:Operator:String:EndsWith' => 'Endet mit',
+    'UI:Search:Criteria:Operator:String:RegExp' => 'Reg. Ausdruck',
     //   - Numeric widget
-    'UI:Search:Criteria:Operator:Numeric:Equals' => 'Equals~~',
-    'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Greater~~',
-    'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Greater / equals~~',
-    'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Less~~',
-    'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Less / equals~~',
-    'UI:Search:Criteria:Operator:Numeric:Different' => 'Different~~',
+    'UI:Search:Criteria:Operator:Numeric:Equals' => 'Ist gleich',
+    'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Ist größer',
+    'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Ist größer / gleich',
+    'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Ist kleiner',
+    'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Ist kleiner / gleich',
+    'UI:Search:Criteria:Operator:Numeric:Different' => 'Ist ungleich',
 
     // - Other translations
-    'UI:Search:Value:Filter:Placeholder' => 'Filter...~~',
-    'UI:Search:Value:Search:Placeholder' => 'Search...~~',
-    'UI:Search:Value:Autocomplete:StartTyping' => 'Start typing for possible values.~~',
-    'UI:Search:Value:Autocomplete:Wait' => 'Please wait...~~',
-    'UI:Search:Value:Autocomplete:NoResult' => 'No result.~~',
-    'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none~~',
-    'UI:Search:Value:Toggler:CheckAllNoneFiltered' => 'Check all / none visibles~~',
+    'UI:Search:Value:Filter:Placeholder' => 'Filter...',
+    'UI:Search:Value:Search:Placeholder' => 'Suche...',
+    'UI:Search:Value:Autocomplete:StartTyping' => 'Geben Sie mögliche Werte ein.',
+    'UI:Search:Value:Autocomplete:Wait' => 'Bitte warten...',
+    'UI:Search:Value:Autocomplete:NoResult' => 'Kein Ergebnis',
+    'UI:Search:Value:Toggler:CheckAllNone' => 'Alles aus- / abwählen',
+    'UI:Search:Value:Toggler:CheckAllNoneFiltered' => 'Alle Sichtbaren aus- / abwählen',
 
     // - Widget other translations
-    'UI:Search:Criteria:Numeric:From' => 'From~~',
-    'UI:Search:Criteria:Numeric:Until' => 'To~~',
-    'UI:Search:Criteria:Numeric:PlaceholderFrom' => 'Any~~',
-    'UI:Search:Criteria:Numeric:PlaceholderUntil' => 'Any~~',
-    'UI:Search:Criteria:DateTime:From' => 'From~~',
-    'UI:Search:Criteria:DateTime:FromTime' => 'From~~',
-    'UI:Search:Criteria:DateTime:Until' => 'until~~',
-    'UI:Search:Criteria:DateTime:UntilTime' => 'until~~',
-    'UI:Search:Criteria:DateTime:PlaceholderFrom' => 'Any date~~',
-    'UI:Search:Criteria:DateTime:PlaceholderFromTime' => 'Any date~~',
-    'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Any date~~',
-    'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Any date~~',
-    'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => 'Children of the selected objects will be included.~~',
+    'UI:Search:Criteria:Numeric:From' => 'Von',
+    'UI:Search:Criteria:Numeric:Until' => 'Bis',
+    'UI:Search:Criteria:Numeric:PlaceholderFrom' => 'Beliebig',
+    'UI:Search:Criteria:Numeric:PlaceholderUntil' => 'Beliebig',
+    'UI:Search:Criteria:DateTime:From' => 'Von',
+    'UI:Search:Criteria:DateTime:FromTime' => 'Von',
+    'UI:Search:Criteria:DateTime:Until' => 'Bis',
+    'UI:Search:Criteria:DateTime:UntilTime' => 'Bis',
+    'UI:Search:Criteria:DateTime:PlaceholderFrom' => 'Beliebig',
+    'UI:Search:Criteria:DateTime:PlaceholderFromTime' => 'Beliebig',
+    'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Beliebig',
+    'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Beliebig',
+    'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => 'Kinderelemente ausgewählter Objekte werden berücksichtigt.',
 
-    'UI:Search:Criteria:Raw:Filtered' => 'Filtered~~',
-    'UI:Search:Criteria:Raw:FilteredOn' => 'Filtered on %1$s~~',
+    'UI:Search:Criteria:Raw:Filtered' => 'Gefiltert',
+    'UI:Search:Criteria:Raw:FilteredOn' => 'Gefiltert über %1$s',
 ));
 
 //
 // Expression to Natural language
 //
-Dict::Add('EN US', 'English', 'English', array(
-    'Expression:Operator:AND' => ' AND ~~',
-    'Expression:Operator:OR' => ' OR ~~',
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+    'Expression:Operator:AND' => ' UND ',
+    'Expression:Operator:OR' => ' ODER ',
 
-    'Expression:Unit:Short:DAY' => 'd~~',
-    'Expression:Unit:Short:WEEK' => 'w~~',
-    'Expression:Unit:Short:MONTH' => 'm~~',
-    'Expression:Unit:Short:YEAR' => 'y~~',
+    'Expression:Unit:Short:DAY' => 't',
+    'Expression:Unit:Short:WEEK' => 'w',
+    'Expression:Unit:Short:MONTH' => 'm',
+    'Expression:Unit:Short:YEAR' => 'j',
 
-    'Expression:Unit:Long:DAY' => 'day(s)~~',
-    'Expression:Unit:Long:HOUR' => 'hour(s)~~',
-    'Expression:Unit:Long:MINUTE' => 'minute(s)~~',
+    'Expression:Unit:Long:DAY' => 'Tag(e)',
+    'Expression:Unit:Long:HOUR' => 'Stunde(n)',
+    'Expression:Unit:Long:MINUTE' => 'Minute(n)',
 
-    'Expression:Verb:NOW' => 'now~~',
+    'Expression:Verb:NOW' => 'jetzt',
 ));