From 4870d58d47dba55f63da1509316cfc51eab13a4e Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 16 Sep 2019 11:12:44 +0200
Subject: [PATCH] merge fixes
---
.../_____LANGUAGE_EXTRA.aod | 33 +++++++++++++++++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 33 +++++++++++++++++++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 33 +++++++++++++++++++
3 files changed, 99 insertions(+)
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index d2d3785cd3..3e689d4945 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -5061,6 +5061,39 @@
<entry>
<key>My tickets</key>
</entry>
+ <entry>
+ <key>Replacement name</key>
+ </entry>
+ <entry>
+ <key>The replacement name has to be unique.</key>
+ </entry>
+ <entry>
+ <key>Only .odt files are supported for bulkletters.</key>
+ </entry>
+ <entry>
+ <key>Preview</key>
+ </entry>
+ <entry>
+ <key>Action not supported</key>
+ </entry>
+ <entry>
+ <key>Wrong filetype for the current document template type and classification.</key>
+ </entry>
+ <entry>
+ <key>HTML template - Only for .html</key>
+ </entry>
+ <entry>
+ <key>Plaintext template - Only for .txt and .html</key>
+ </entry>
+ <entry>
+ <key>Use template attachments</key>
+ </entry>
+ <entry>
+ <key>My Turnover</key>
+ </entry>
+ <entry>
+ <key>My Forecast</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 27d0c0e54b..10867d3bdc 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -6393,13 +6393,46 @@
<key>Credit</key>
<value>Gutschrift</value>
</entry>
+ <entry>
+ <key>The replacement name has to be unique.</key>
+ </entry>
+ <entry>
+ <key>Only .odt files are supported for bulkletters.</key>
+ </entry>
<entry>
<key>Show tickets where I am editor</key>
</entry>
+ <entry>
+ <key>My Turnover</key>
+ </entry>
+ <entry>
+ <key>Wrong filetype for the current document template type and classification.</key>
+ </entry>
+ <entry>
+ <key>Use template attachments</key>
+ </entry>
<entry>
<key>My tickets</key>
<value>Meine Tickets</value>
</entry>
+ <entry>
+ <key>HTML template - Only for .html</key>
+ </entry>
+ <entry>
+ <key>Preview</key>
+ </entry>
+ <entry>
+ <key>My Forecast</key>
+ </entry>
+ <entry>
+ <key>Plaintext template - Only for .txt and .html</key>
+ </entry>
+ <entry>
+ <key>Action not supported</key>
+ </entry>
+ <entry>
+ <key>Replacement name</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 b3febb8ba3..8730ac8273 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -5105,12 +5105,45 @@
<entry>
<key>Credit</key>
</entry>
+ <entry>
+ <key>The replacement name has to be unique.</key>
+ </entry>
+ <entry>
+ <key>Only .odt files are supported for bulkletters.</key>
+ </entry>
<entry>
<key>Show tickets where I am editor</key>
</entry>
+ <entry>
+ <key>My Turnover</key>
+ </entry>
+ <entry>
+ <key>Wrong filetype for the current document template type and classification.</key>
+ </entry>
+ <entry>
+ <key>Use template attachments</key>
+ </entry>
<entry>
<key>My tickets</key>
</entry>
+ <entry>
+ <key>HTML template - Only for .html</key>
+ </entry>
+ <entry>
+ <key>Preview</key>
+ </entry>
+ <entry>
+ <key>My Forecast</key>
+ </entry>
+ <entry>
+ <key>Plaintext template - Only for .txt and .html</key>
+ </entry>
+ <entry>
+ <key>Action not supported</key>
+ </entry>
+ <entry>
+ <key>Replacement name</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab