From de76498c6ad2512410dd07fbf251a061e056ea2c Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Thu, 18 Jul 2019 15:01:16 +0200
Subject: [PATCH] solving merge conflicts
---
.../_____LANGUAGE_EXTRA.aod | 219 +-----------------
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 16 +-
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 6 +-
3 files changed, 13 insertions(+), 228 deletions(-)
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 8e4084da65..f5f38ebd27 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -5001,9 +5001,6 @@
<entry>
<key>Milestones Status</key>
</entry>
- <entry>
- <key>New Notifications</key>
- </entry>
<entry>
<key>Serial letters</key>
</entry>
@@ -5013,223 +5010,9 @@
<entry>
<key>The contact is already a recipient!</key>
</entry>
- </keyValueMap>
- <font name="Dialog" style="0" size="11" />
- <sqlModels>
- <languageSql>
- <name>Data_alias</name>
- <alias>Data_alias</alias>
- <statements>
- <element>select AB_KEYWORD_ENTRY.TITLE from AB_KEYWORD_ENTRY
-union
-select AB_LANGUAGE.NAME_LATIN from AB_LANGUAGE
-union
-select AB_COUNTRYINFO.NAME_LATIN from AB_COUNTRYINFO
-union
-select AB_OBJECTRELATIONTYPE.RELATION_TITLE from AB_OBJECTRELATIONTYPE
-union
-select TITLE from CLASSIFICATIONSCORE
-union
-select SCORETYPE from CLASSIFICATIONTYPE
-union
-select distinct CLASSIFICATIONGROUP from CLASSIFICATIONTYPE
-union
-select AB_ATTRIBUTE.ATTRIBUTE_NAME from AB_ATTRIBUTE</element>
- </statements>
- </languageSql>
- </sqlModels>
-</language>
-</entry>
- <entry>
- <key>Guarantee</key>
- </entry>
- <entry>
- <key>%0 recipients will be added to the bulk mail.</key>
- </entry>
- <entry>
- <key>%0 new recipients will be added to the bulk mail.</key>
- </entry>
- <entry>
- <key>Remove recipients with advertising ban</key>
- </entry>
- <entry>
- <key>Serial letter</key>
- </entry>
- <entry>
- <key>%0 new recipients will be added to the serial letter.</key>
- </entry>
- <entry>
- <key>Download letter</key>
- </entry>
- <entry>
- <key>Add to serial letter</key>
- </entry>
- <entry>
- <key>The contact has an advertising ban for letters!</key>
- </entry>
- <entry>
- <key>one actitiy from mail created</key>
- </entry>
- <entry>
- <key>Missed call from %0 (%1) to %2</key>
- </entry>
- <entry>
- <key>%0 files ignored</key>
- </entry>
- <entry>
- <key>hours</key>
- </entry>
- <entry>
- <key>%0 activities from mails created</key>
- </entry>
- <entry>
- <key>one mail could not be linked automatically</key>
- </entry>
- <entry>
- <key>minutes</key>
- </entry>
- <entry>
- <key>%0 files imported</key>
- </entry>
- <entry>
- <key>Accepted call from %0 (%1) to %2, duration: %3</key>
- </entry>
- <entry>
- <key>We received data from</key>
- </entry>
- <entry>
- <key>one file ignored</key>
- </entry>
- <entry>
- <key>Unknown incoming call from %0 to %1</key>
- </entry>
- <entry>
- <key>All unlinked mails</key>
- </entry>
- <entry>
- <key>hour</key>
- </entry>
- <entry>
- <key>Missed call from %0 to %1</key>
- </entry>
- <entry>
- <key>Incoming call from %0 (%1) to %2</key>
- </entry>
- <entry>
- <key>import mails</key>
- </entry>
- <entry>
- <key>Unknown accepted call from %0 to %1, duration: %2</key>
- </entry>
- <entry>
- <key>Missed</key>
- </entry>
- <entry>
- <key>(drop mails here)</key>
- </entry>
- <entry>
- <key>minute</key>
- </entry>
- <entry>
- <key>Call from unknown</key>
- </entry>
- <entry>
- <key>Call from %0</key>
- </entry>
- <entry>
- <key>Download Mail</key>
- </entry>
- <entry>
- <key>Drop area for creating activities from mails</key>
- </entry>
- <entry>
- <key>All mails that could not automatically linked are displayed here</key>
- </entry>
- <entry>
- <key>second</key>
- </entry>
- <entry>
- <key>one file imported</key>
- </entry>
- <entry>
- <key>(or drop files here)</key>
- </entry>
- <entry>
- <key>Answered</key>
- </entry>
- <entry>
- <key>%0 mails could not be linked automatically</key>
- </entry>
- <entry>
- <key>seconds</key>
- </entry>
- <entry>
- <key>Link automatically</key>
- </entry>
- <entry>
- <key>Duplicatescan</key>
- </entry>
- <entry>
- <key>Use external Scanservice</key>
- </entry>
- <entry>
- <key>Filter Name</key>
- </entry>
<entry>
- <key>Target Entity</key>
- </entry>
- <entry>
- <key>Condition Configuration</key>
- </entry>
- <entry>
- <key>Characters to use</key>
- </entry>
- <entry>
- <key>Configuration name</key>
- </entry>
- <entry>
- <key>Export letter for selection</key>
- </entry>
- <entry>
- <key>Export letter</key>
- </entry>
- <entry>
- <key>Privacy agreement</key>
- </entry>
- <entry>
- <key>Sufficient guarantees</key>
- </entry>
- <entry>
- <key>HIGH</key>
- </entry>
- <entry>
- <key>NONE</key>
- </entry>
- <entry>
- <key>LOW</key>
- </entry>
- <entry>
- <key>MAX</key>
- </entry>
- <entry>
- <key>NORMAL</key>
- </entry>
- <entry>
- <key>Categorization</key>
- </entry>
- <entry>
- <key>Phase progression</key>
- </entry>
- <entry>
- <key>Occurrences</key>
- </entry>
- <entry>
- <key>Occurrence</key>
- </entry>
- <entry>
- <key>Milestones Phase</key>
+ <key>New Notifications</key>
</entry>
- <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 69d4432174..c4ec9abe34 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -78,6 +78,9 @@
<key>Serial letters</key>
<value>Serienbriefe</value>
</entry>
+ <entry>
+ <key>Categorization</key>
+ </entry>
<entry>
<key>Names</key>
<value>Namen</value>
@@ -90,6 +93,10 @@
<key>newsletter dispatch</key>
<value>Newsletterversand</value>
</entry>
+ <entry>
+ <key>The contact is already a recipient!</key>
+ <value>Der Kontakt ist bereits als Empfänger eingetragen!</value>
+ </entry>
<entry>
<key>Address data</key>
<value>Adressdaten</value>
@@ -98,10 +105,6 @@
<key>contract of sale</key>
<value>Kaufvertrag</value>
</entry>
- <entry>
- <key>The contact is already a recipient!</key>
- <value>Der Kontakt ist bereits als Empfänger eingetragen!</value>
- </entry>
<entry>
<key>DataPrivacy Use</key>
<value>Nutzung</value>
@@ -5948,6 +5951,7 @@
</entry>
<entry>
<key>Bulk mail was sent!</key>
+ <value></value>
</entry>
<entry>
<key>All selected participants already are in the campaign</key>
@@ -6130,6 +6134,7 @@
</entry>
<entry>
<key>The contact has an advertising ban for letters!</key>
+ <value>Der Kontakt hat ein Werbeverbot für Briefe!</value>
</entry>
<entry>
<key>one actitiy from mail created</key>
@@ -6293,9 +6298,6 @@
<entry>
<key>Download letter</key>
</entry>
- <entry>
- <key>Categorization</key>
- </entry>
<entry>
<key>Phase progression</key>
</entry>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index ff55354962..497b292e32 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -5050,9 +5050,6 @@
<entry>
<key>Milestones Status</key>
</entry>
- <entry>
- <key>New Notifications</key>
- </entry>
<entry>
<key>Serial letters</key>
</entry>
@@ -5062,6 +5059,9 @@
<entry>
<key>The contact is already a recipient!</key>
</entry>
+ <entry>
+ <key>New Notifications</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab