From 3f53e2b6dde5f1e7455070313bf74283ffb5b6fe Mon Sep 17 00:00:00 2001
From: "d.lechner" <d.lechner@adito.de>
Date: Wed, 17 Apr 2019 10:00:51 +0200
Subject: [PATCH] Merge

---
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     |  45 ++++++++
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     | 106 +++++++++++++++---
 2 files changed, 137 insertions(+), 14 deletions(-)

diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index bce1b08a3f..632147d1e3 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -3693,6 +3693,51 @@
     <entry>
       <key>Would you like to clear the forecast and set the state to \"%0\"?</key>
     </entry>
+    <entry>
+      <key>Auïŋ―er Haus</key>
+    </entry>
+    <entry>
+      <key>Cïŋ―te d'Ivoire</key>
+    </entry>
+    <entry>
+      <key>Curaïŋ―ao</key>
+    </entry>
+    <entry>
+      <key>Benutzer auswïŋ―hlen</key>
+    </entry>
+    <entry>
+      <key>Bestïŋ―tigt</key>
+    </entry>
+    <entry>
+      <key>Zurïŋ―ckgestellt</key>
+    </entry>
+    <entry>
+      <key>ïŋ―land Islands</key>
+    </entry>
+    <entry>
+      <key>Kein Weitergeben von privaten Aufgaben mïŋ―glich!</key>
+    </entry>
+    <entry>
+      <key>Documentmanagement</key>
+    </entry>
+    <entry>
+      <key>Saint Barthïŋ―lemy</key>
+    </entry>
+    <entry>
+      <key>Rïŋ―union</key>
+    </entry>
+    <entry>
+      <key>Bitte Datumseingabe prïŋ―fen!</key>
+    </entry>
+    <entry>
+      <key>Schlïŋ―sselwort</key>
+    </entry>
+    <entry>
+      <key>Vorlïŋ―ufig</key>
+    </entry>
+    <entry>
+      <key>erledigt / zurïŋ―ckgestellt</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 5468bc8d7d..a64d87fef2 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2596,46 +2596,46 @@
       <key>New module</key>
     </entry>
     <entry>
-      <key>Côte d'Ivoire</key>
+      <key>Cïŋ―te d'Ivoire</key>
     </entry>
     <entry>
-      <key>Bitte Datumseingabe prüfen!</key>
+      <key>Bitte Datumseingabe prïŋ―fen!</key>
     </entry>
     <entry>
-      <key>Bestätigt</key>
+      <key>Bestïŋ―tigt</key>
     </entry>
     <entry>
-      <key>Vorläufig</key>
+      <key>Vorlïŋ―ufig</key>
     </entry>
     <entry>
-      <key>Saint Barthélemy</key>
+      <key>Saint Barthïŋ―lemy</key>
     </entry>
     <entry>
-      <key>erledigt / zurückgestellt</key>
+      <key>erledigt / zurïŋ―ckgestellt</key>
     </entry>
     <entry>
-      <key>Zurückgestellt</key>
+      <key>Zurïŋ―ckgestellt</key>
     </entry>
     <entry>
-      <key>Außer Haus</key>
+      <key>Auïŋ―er Haus</key>
     </entry>
     <entry>
-      <key>Benutzer auswählen</key>
+      <key>Benutzer auswïŋ―hlen</key>
     </entry>
     <entry>
-      <key>Åland Islands</key>
+      <key>ïŋ―land Islands</key>
     </entry>
     <entry>
-      <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
+      <key>Kein Weitergeben von privaten Aufgaben mïŋ―glich!</key>
     </entry>
     <entry>
-      <key>Curaįao</key>
+      <key>Curaïŋ―ao</key>
     </entry>
     <entry>
-      <key>Schlüsselwort</key>
+      <key>Schlïŋ―sselwort</key>
     </entry>
     <entry>
-      <key>Réunion</key>
+      <key>Rïŋ―union</key>
     </entry>
     <entry>
       <key>date of birth must not be in the future</key>
@@ -2875,6 +2875,84 @@
     <entry>
       <key>Documentmanagement</key>
     </entry>
+    <entry>
+      <key>Clear forecast and set state to \"%0\"?</key>
+    </entry>
+    <entry>
+      <key>CÃīte d'Ivoire</key>
+    </entry>
+    <entry>
+      <key>Document Template</key>
+    </entry>
+    <entry>
+      <key>Would you like to clear the forecast and set the state to \"%0\"?</key>
+    </entry>
+    <entry>
+      <key>Bitte Datumseingabe prÞfen!</key>
+    </entry>
+    <entry>
+      <key>Text Modular</key>
+    </entry>
+    <entry>
+      <key>Clear forecast and set state to '%0'?</key>
+    </entry>
+    <entry>
+      <key>Would you really like to clear the forecast and set the state to '%0'?</key>
+    </entry>
+    <entry>
+      <key>BestÃĪtigt</key>
+    </entry>
+    <entry>
+      <key>VorlÃĪufig</key>
+    </entry>
+    <entry>
+      <key>Saint BarthÃĐlemy</key>
+    </entry>
+    <entry>
+      <key>erledigt / zurÞckgestellt</key>
+    </entry>
+    <entry>
+      <key>This cannot be undone!</key>
+    </entry>
+    <entry>
+      <key>ZurÞckgestellt</key>
+    </entry>
+    <entry>
+      <key>Attachment</key>
+    </entry>
+    <entry>
+      <key>SalesprojectPhase</key>
+    </entry>
+    <entry>
+      <key>Außer Haus</key>
+    </entry>
+    <entry>
+      <key>Benutzer auswÃĪhlen</key>
+    </entry>
+    <entry>
+      <key>Åland Islands</key>
+    </entry>
+    <entry>
+      <key>Kein Weitergeben von privaten Aufgaben mÃķglich!</key>
+    </entry>
+    <entry>
+      <key>Days count</key>
+    </entry>
+    <entry>
+      <key>Curaçao</key>
+    </entry>
+    <entry>
+      <key>SchlÞsselwort</key>
+    </entry>
+    <entry>
+      <key>Letter</key>
+    </entry>
+    <entry>
+      <key>SalesprojectState</key>
+    </entry>
+    <entry>
+      <key>RÃĐunion</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
-- 
GitLab