merge fixes

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>

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>

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>