diff --git a/.liquibase/Data_alias/basic/2020.1.0/AlterTablesForTranslation/alter_init_ObjectRelation_typeTranslation.xml b/.liquibase/Data_alias/basic/2020.1.0/AlterTablesForTranslation/alter_init_ObjectRelation_typeTranslation.xml new file mode 100644 index 0000000000000000000000000000000000000000..e0a08e20f46d9d3c4f48b84335f6262cd2badbcd --- /dev/null +++ b/.liquibase/Data_alias/basic/2020.1.0/AlterTablesForTranslation/alter_init_ObjectRelation_typeTranslation.xml @@ -0,0 +1,10 @@ +<?xml version="1.1" encoding="UTF-8" standalone="no"?> +<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> + <changeSet author="b.ulrich" id="f06edc59-5799-4900-81f8-cce9a80c89a4"> + <update tableName="AB_OBJECTRELATIONTYPE"> + <column name="RELATION_TITLE" value="Grandchild of"/> + <where>AB_OBJECTRELATIONTYPEID='a2296f93-2371-4ab8-9f29-ef0795d1e9b2'</where> + </update> + </changeSet> +</databaseChangeLog> diff --git a/.liquibase/Data_alias/basic/2020.1.0/AlterTablesForTranslation/alter_init_SalesPricePoliticsTranslation.xml b/.liquibase/Data_alias/basic/2020.1.0/AlterTablesForTranslation/alter_init_SalesPricePoliticsTranslation.xml new file mode 100644 index 0000000000000000000000000000000000000000..6422a3695ffcc1f43551f1cc1a6cea8991ac4239 --- /dev/null +++ b/.liquibase/Data_alias/basic/2020.1.0/AlterTablesForTranslation/alter_init_SalesPricePoliticsTranslation.xml @@ -0,0 +1,10 @@ +<?xml version="1.1" encoding="UTF-8" standalone="no"?> +<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> + <changeSet author="b.ulrich" id="8ae53220-55c4-41b6-8436-d46d853adf44"> + <update tableName="AB_KEYWORD_ENTRY"> + <column name="TITLE" value="Subscription model"/> + <where>AB_KEYWORD_ENTRYID='c899faa1-6b89-4616-8640-cd2c8011d123'</where> + </update> + </changeSet> +</databaseChangeLog> diff --git a/.liquibase/Data_alias/basic/2020.1.0/AlterTablesForTranslation/alter_init_importFieldsTranslation.xml b/.liquibase/Data_alias/basic/2020.1.0/AlterTablesForTranslation/alter_init_importFieldsTranslation.xml new file mode 100644 index 0000000000000000000000000000000000000000..e90e207acae2cb5b36edf5f5e945f88d45de04d1 --- /dev/null +++ b/.liquibase/Data_alias/basic/2020.1.0/AlterTablesForTranslation/alter_init_importFieldsTranslation.xml @@ -0,0 +1,10 @@ +<?xml version="1.1" encoding="UTF-8" standalone="no"?> +<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> + <changeSet author="b.ulrich" id="f06edc59-5799-4900-81f8-cce9a80c89a4"> + <update tableName="AB_KEYWORD_ENTRY"> + <column name="TITLE" value="Linked In"/> + <where>AB_KEYWORD_ENTRYID='97e27378-e733-4629-b0c4-515faf89da7e'</where> + </update> + </changeSet> +</databaseChangeLog> diff --git a/.liquibase/Data_alias/basic/2020.1.0/AlterTablesForTranslation/changelog.xml b/.liquibase/Data_alias/basic/2020.1.0/AlterTablesForTranslation/changelog.xml new file mode 100644 index 0000000000000000000000000000000000000000..78d5caf3f7a97c9aa7548c0f98cdf8782f6772d5 --- /dev/null +++ b/.liquibase/Data_alias/basic/2020.1.0/AlterTablesForTranslation/changelog.xml @@ -0,0 +1,9 @@ +<?xml version="1.1" encoding="UTF-8" standalone="no"?> +<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> +<include file="alter_init_SalesPricePoliticsTranslation.xml" relativeToChangelogFile="true"/> +<include file="alter_init_ObjectRelation_typeTranslation.xml" relativeToChangelogFile="true"/> +<include file="alter_init_importFieldsTranslation.xml" relativeToChangelogFile="true"/> +</databaseChangeLog> + + diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml index d645e4d7517387737c784a556ad335b7321e7832..0dc682a20fd4453118694d54bf7be15d9b72f05e 100644 --- a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml +++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml @@ -88,7 +88,7 @@ <column name="HIERARCHY" valueNumeric="0"/> <column name="ICON" value="VAADIN:FAMILY"/> <column name="OBJECT_TYPE" value="PrivatePerson"/> - <column name="RELATION_TITLE" value="ankle of"/> + <column name="RELATION_TITLE" value="Grandchild of"/> <column name="RELATION_TYPE" value="f36c69c2-6d03-45ef-81a0-f9118ce3f4c6"/> <column name="SIDE" valueNumeric="2"/> </insert> diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod index cf1d52295cb80e2e8604039a05e471c3e3dd44cc..f6632a173eb5a0efa60679c5cf0cf5dce380f372 100644 --- a/entity/Appointment_entity/Appointment_entity.aod +++ b/entity/Appointment_entity/Appointment_entity.aod @@ -105,7 +105,7 @@ </entityActionField> <entityActionField> <name>tentative</name> - <title>tentative</title> + <title>Tentative</title> <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/tentative/onActionProcess.js</onActionProcess> <isMenuAction v="true" /> <iconId>VAADIN:chat</iconId> diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod index ea273c14be11cb4234c7ac5557e2d852433da2f6..325447f14b090878e5f194eca9c6083d2a0645f3 100644 --- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod +++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod @@ -54,7 +54,7 @@ </entityParameter> <entityField> <name>MIN_COUNT</name> - <title>Minimal count</title> + <title>Minimal Count</title> <contentType>NUMBER</contentType> <stateProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/min_count/stateProcess.js</stateProcess> <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/min_count/valueProcess.js</valueProcess> diff --git a/entity/ExportTemplate_entity/ExportTemplate_entity.aod b/entity/ExportTemplate_entity/ExportTemplate_entity.aod index 8a63a2b258ff6fc1e4145dbd01e35a4b0a9a91b8..76b8d5beb4ef5bbba6322d4f8fc63e25f66780d4 100644 --- a/entity/ExportTemplate_entity/ExportTemplate_entity.aod +++ b/entity/ExportTemplate_entity/ExportTemplate_entity.aod @@ -215,7 +215,6 @@ <dbRecordFieldMapping> <name>FIELDDELIMITER.value</name> <recordfield>EXPORTTEMPLATE.FIELDDELIMITER</recordfield> - <expression>%aditoprj%/entity/ExportTemplate_entity/recordcontainers/db/recordfieldmappings/fielddelimiter.value/expression.js</expression> </dbRecordFieldMapping> </recordFieldMappings> </dbRecordContainer> diff --git a/entity/ExportTemplate_entity/recordcontainers/db/recordfieldmappings/fielddelimiter.value/expression.js b/entity/ExportTemplate_entity/recordcontainers/db/recordfieldmappings/fielddelimiter.value/expression.js deleted file mode 100644 index 42513d0d9bac295eac2c6156d5d582b7e0b3ac37..0000000000000000000000000000000000000000 --- a/entity/ExportTemplate_entity/recordcontainers/db/recordfieldmappings/fielddelimiter.value/expression.js +++ /dev/null @@ -1,4 +0,0 @@ -import("system.translate"); -import("system.result"); - -result.string(translate.text("EXPORTTEMPLATE.FIELDLIMITER")); \ No newline at end of file diff --git a/entity/Leadimport_entity/Leadimport_entity.aod b/entity/Leadimport_entity/Leadimport_entity.aod index fdd1d6c5923311bdc781e1c85b225515053dc2e9..c93e9f8e136ec3b49148421046f5be2d3668b990 100644 --- a/entity/Leadimport_entity/Leadimport_entity.aod +++ b/entity/Leadimport_entity/Leadimport_entity.aod @@ -4,12 +4,12 @@ <majorModelMode>DISTRIBUTED</majorModelMode> <documentation>%aditoprj%/entity/Leadimport_entity/documentation.adoc</documentation> <icon>NEON:IMPORT</icon> - <title>Leadimport</title> + <title>Lead Import</title> <grantDeleteProcess>%aditoprj%/entity/Leadimport_entity/grantDeleteProcess.js</grantDeleteProcess> <contentTitleProcess>%aditoprj%/entity/Leadimport_entity/contentTitleProcess.js</contentTitleProcess> <iconId>NEON:IMPORT</iconId> <imageProcess>%aditoprj%/entity/Leadimport_entity/imageProcess.js</imageProcess> - <titlePlural>Leadimports</titlePlural> + <titlePlural>Lead Imports</titlePlural> <recordContainer>db</recordContainer> <entityFields> <entityProvider> @@ -297,7 +297,7 @@ </entityConsumer> <entityActionField> <name>LeadimportReset</name> - <title>Leadimport Reset</title> + <title>Lead Import Reset</title> <onActionProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js</onActionProcess> <iconId>VAADIN:ARROW_BACKWARD</iconId> <state>INVISIBLE</state> diff --git a/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js b/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js index 4be4f4e2d45935993f915109bda83fea018e879c..b3b5434170aa6509d402bd72d43622309ee9ab3a 100644 --- a/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js +++ b/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js @@ -37,7 +37,7 @@ newWhere("LEADIMPORT.LEADIMPORTID", leadimportId).updateData(true, "LEADIMPORT", * * @param {String} pTableName the tabele of deleteing Data of the Date of the Leadimport * @param {String} pleadimportId the ID of the current Leadimport - * @param {Date} pdateADayBefor 24 hours befor now + * @param {Date} pdateADayBefor 24 hours before now */ function _deleteData (pTableName, pleadimportId, pdateADayBefor) { diff --git a/entity/Notification_entity/entityfields/state/displayValueProcess.js b/entity/Notification_entity/entityfields/state/displayValueProcess.js index 29481035b2ba5db04af2462b345b16aea5e22e67..fcd088324b80387634096e3d62a49a2e82974495 100644 --- a/entity/Notification_entity/entityfields/state/displayValueProcess.js +++ b/entity/Notification_entity/entityfields/state/displayValueProcess.js @@ -7,18 +7,18 @@ var value = vars.get("$field.STATE"); switch(value) { case "SEEN": - result.string(translate.text("SEEN")); + result.string(translate.text("Seen")); break; case "CONFIRMED": - result.string(translate.text("CONFIRMED")); + result.string(translate.text("Confirmed")); break; case "TODELETE": - result.string(translate.text("TODELETE")); + result.string(translate.text("To Delete")); break; case "ARCHIVE": - result.string(translate.text("ARCHIVE")); + result.string(translate.text("Archive")); break; default: - result.string(translate.text("UNSEEN")); + result.string(translate.text("Unseen")); break; } \ No newline at end of file diff --git a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod index 24df85e48f0c19b0c914e21b4cba807d3e21438d..8172bd7ae2f1e98cb00ad6b74d4276d9b18df43a 100644 --- a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod +++ b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod @@ -19,7 +19,7 @@ </entityField> <entityField> <name>SOURCE_RELATION_TITLE</name> - <title>Relation type 1</title> + <title>Relation Type 1</title> <mandatory v="true" /> <displayValueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/source_relation_title/displayValueProcess.js</displayValueProcess> </entityField> @@ -95,7 +95,7 @@ </entityField> <entityField> <name>DEST_RELATION_TITLE</name> - <title>Relation type 2</title> + <title>Relation Type 2</title> <mandatoryProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_relation_title/mandatoryProcess.js</mandatoryProcess> <stateProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_relation_title/stateProcess.js</stateProcess> <displayValueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_relation_title/displayValueProcess.js</displayValueProcess> diff --git a/entity/Order_entity/entityfields/dunningtext/valueProcess.js b/entity/Order_entity/entityfields/dunningtext/valueProcess.js index 09aaffb4130def69b9f334577425015ae6a5d326..6ceea69e5f317f4fc7552b6dfc10011b0510adc7 100644 --- a/entity/Order_entity/entityfields/dunningtext/valueProcess.js +++ b/entity/Order_entity/entityfields/dunningtext/valueProcess.js @@ -1,3 +1,4 @@ +import("system.translate"); import("system.vars"); import("system.result"); import("system.neon"); @@ -8,7 +9,7 @@ if (vars.get("$this.value") == null){ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value")|| neon.OPERATINGSTATE_NEW ){ - result.string("Bitte zahlen Sie den ausstehenden Betrag, dies ist die erste/zweite Mahnung.") + result.string(translate.text("Please pay the outstanding amount,this is you first/second reminder.")) } } \ No newline at end of file diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index 4cb7e3bf850ae43abe84401796963e2c4459a9b1..4eb3e238d8efeec488c6c826e77974bb2a538e12 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -75,9 +75,6 @@ <entry> <key>Home address</key> </entry> - <entry> - <key>Type</key> - </entry> <entry> <key>Contacts</key> </entry> @@ -144,9 +141,6 @@ <entry> <key>Communication</key> </entry> - <entry> - <key>postcode</key> - </entry> <entry> <key>City</key> </entry> @@ -870,9 +864,6 @@ <entry> <key>title</key> </entry> - <entry> - <key>von</key> - </entry> <entry> <key>{$TASK_PRIORITY_LOW}</key> </entry> @@ -882,15 +873,9 @@ <entry> <key>Unit price</key> </entry> - <entry> - <key>type</key> - </entry> <entry> <key>{$TASK_PRIORITY_NONE}</key> </entry> - <entry> - <key>Termin</key> - </entry> <entry> <key>Angebot</key> </entry> @@ -1950,9 +1935,6 @@ <entry> <key>Combobox</key> </entry> - <entry> - <key>tentative</key> - </entry> <entry> <key>${NUMBER}</key> </entry> @@ -2010,9 +1992,6 @@ <entry> <key>Combobox Value</key> </entry> - <entry> - <key>relations</key> - </entry> <entry> <key>Time</key> </entry> @@ -2064,9 +2043,6 @@ <entry> <key>society</key> </entry> - <entry> - <key>ankle of</key> - </entry> <entry> <key>solicits</key> </entry> @@ -2205,24 +2181,15 @@ <entry> <key>&Aufgaben (%0)</key> </entry> - <entry> - <key>hoch</key> - </entry> <entry> <key>Abgesagt</key> </entry> - <entry> - <key>frei</key> - </entry> <entry> <key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key> </entry> <entry> <key>normal</key> </entry> - <entry> - <key>Termine von</key> - </entry> <entry> <key>Product content</key> </entry> @@ -2457,15 +2424,6 @@ <entry> <key>Successful</key> </entry> - <entry> - <key>Relation type 1</key> - </entry> - <entry> - <key>Relation type 2</key> - </entry> - <entry> - <key>Relation type</key> - </entry> <entry> <key>Context 1</key> </entry> @@ -2550,9 +2508,6 @@ <entry> <key>Analyses</key> </entry> - <entry> - <key>To-Do</key> - </entry> <entry> <key>Calendar</key> </entry> @@ -2673,24 +2628,15 @@ <entry> <key>Date value</key> </entry> - <entry> - <key>NUMBER VALUE</key> - </entry> <entry> <key>ID</key> </entry> <entry> <key>Keyword attribute relation Id</key> </entry> - <entry> - <key>Minimal count</key> - </entry> <entry> <key>Id</key> </entry> - <entry> - <key>Object 1 row Id</key> - </entry> <entry> <key>Side</key> </entry> @@ -2736,9 +2682,6 @@ <entry> <key>Int value</key> </entry> - <entry> - <key>Object 2 row Id</key> - </entry> <entry> <key>Source tablename Id</key> </entry> @@ -2754,12 +2697,6 @@ <entry> <key>Parent Id</key> </entry> - <entry> - <key>Task link Id</key> - </entry> - <entry> - <key>BOOL VALUE</key> - </entry> <entry> <key>Keyword attribute Id</key> </entry> @@ -2814,9 +2751,6 @@ <entry> <key>Object Relation Type</key> </entry> - <entry> - <key>Entry date</key> - </entry> <entry> <key>Object relation type 2</key> </entry> @@ -2826,9 +2760,6 @@ <entry> <key>Modification date</key> </entry> - <entry> - <key>Object Type</key> - </entry> <entry> <key>%0 from \"%1\" to \"%2\"</key> </entry> @@ -2865,9 +2796,6 @@ <entry> <key>Comments</key> </entry> - <entry> - <key>Task Id</key> - </entry> <entry> <key>Valid to</key> </entry> @@ -3033,9 +2961,6 @@ <entry> <key>Employees</key> </entry> - <entry> - <key>Todo</key> - </entry> <entry> <key>Days remaining</key> </entry> @@ -4134,9 +4059,6 @@ <entry> <key>{$TICKET_EDITOR}</key> </entry> - <entry> - <key>Support ticket</key> - </entry> <entry> <key>Modul group</key> </entry> @@ -4683,9 +4605,6 @@ <entry> <key>Texts</key> </entry> - <entry> - <key>keine Standard-E-Mail Büro vorhanden !</key> - </entry> <entry> <key>Choose payment address</key> </entry> @@ -4965,9 +4884,6 @@ <entry> <key>Show tickets where I am the editor</key> </entry> - <entry> - <key>Quick entry</key> - </entry> <entry> <key>Either or both a contact and a company must be specified</key> </entry> @@ -5208,9 +5124,6 @@ <entry> <key>Import errors</key> </entry> - <entry> - <key>task number</key> - </entry> <entry> <key>CRLF</key> </entry> @@ -5229,9 +5142,6 @@ <entry> <key>Inserted rows</key> </entry> - <entry> - <key>TestAttr</key> - </entry> <entry> <key>Office Properties</key> </entry> @@ -5273,9 +5183,6 @@ <entry> <key>Duplicate</key> </entry> - <entry> - <key>Leadimports</key> - </entry> <entry> <key>Is ID field</key> </entry> @@ -5393,9 +5300,6 @@ <entry> <key>Data imported. Contact not found.</key> </entry> - <entry> - <key>Möchten Sie den Import abbrechen?</key> - </entry> <entry> <key>From buildingnumber</key> </entry> @@ -5456,9 +5360,6 @@ <entry> <key> Info</key> </entry> - <entry> - <key>testing</key> - </entry> <entry> <key>Contact Owner</key> </entry> @@ -5477,18 +5378,12 @@ <entry> <key>Bug Ticket</key> </entry> - <entry> - <key>Ein Fehler ist aufgetreten beim Import dieses Datensatzes:\n</key> - </entry> <entry> <key>Salesproject source Id</key> </entry> <entry> <key>yearly series not specified</key> </entry> - <entry> - <key>Linked in</key> - </entry> <entry> <key>Organisation oder Person neu angelegt</key> </entry> @@ -5564,9 +5459,6 @@ <entry> <key>Supply and Disposal</key> </entry> - <entry> - <key>Nein</key> - </entry> <entry> <key>Data imported. Address could not be read.</key> </entry> @@ -5591,9 +5483,6 @@ <entry> <key>VIP-Customer</key> </entry> - <entry> - <key>Leadimport</key> - </entry> <entry> <key>Import logs</key> </entry> @@ -5612,9 +5501,6 @@ <entry> <key>Negotiations</key> </entry> - <entry> - <key>Zip</key> - </entry> <entry> <key>Residental Properties</key> </entry> @@ -5813,9 +5699,6 @@ <entry> <key>free</key> </entry> - <entry> - <key>finished</key> - </entry> <entry> <key>tentativ</key> </entry> @@ -5870,9 +5753,6 @@ <entry> <key>Desciption</key> </entry> - <entry> - <key>EA private task cannot be assigned to somebody else.</key> - </entry> <entry> <key>A private task cannot be assigned to somebody else.</key> </entry> @@ -5897,39 +5777,21 @@ <entry> <key>Campaign steps </key> </entry> - <entry> - <key>Kampagnenschritte</key> - </entry> <entry> <key>No transfer of private tasks possible!</key> </entry> - <entry> - <key>Kategorie</key> - </entry> <entry> <key>No authorization to postpone the task</key> </entry> - <entry> - <key>Kundenstammblatt</key> - </entry> <entry> <key>LinkedIn</key> </entry> - <entry> - <key>Mahnung</key> - </entry> <entry> <key>low</key> </entry> <entry> <key>Show only own</key> </entry> - <entry> - <key>niedrig</key> - </entry> - <entry> - <key>Nicht begonnen</key> - </entry> <entry> <key>Maximal Count</key> </entry> @@ -5960,39 +5822,15 @@ <entry> <key>My workflow tasks</key> </entry> - <entry> - <key>Seite</key> - </entry> - <entry> - <key>Senden per E-Mail</key> - </entry> <entry> <key>Manual</key> </entry> <entry> <key>Your changes may have an impact on the data privacy information (GDPR).\n Please update these.</key> </entry> - <entry> - <key>Vorläufig</key> - </entry> <entry> <key>Wichtigste Kennzahlen zu den Vertriebsprojekten.</key> </entry> - <entry> - <key>Vorschau</key> - </entry> - <entry> - <key>Zurückgestellt</key> - </entry> - <entry> - <key>Your changes may have an impact on the data privacy information (DSGVO).\n Please update these.</key> - </entry> - <entry> - <key>Verschieben auf Datum?</key> - </entry> - <entry> - <key>QuickEntry</key> - </entry> <entry> <key>Owner</key> </entry> @@ -6008,9 +5846,6 @@ <entry> <key>Test</key> </entry> - <entry> - <key>Test2</key> - </entry> <entry> <key>Trigger</key> </entry> @@ -6263,9 +6098,6 @@ <entry> <key>Templatename</key> </entry> - <entry> - <key>Export coloumns using a exporttemplate</key> - </entry> <entry> <key>Organisationname</key> </entry> @@ -6371,9 +6203,6 @@ <entry> <key>rights of access</key> </entry> - <entry> - <key>Leadimport Reset</key> - </entry> <entry> <key>Create notification</key> </entry> @@ -6632,9 +6461,6 @@ <entry> <key>me</key> </entry> - <entry> - <key>EXPORTTEMPLATE.FIELDLIMITER</key> - </entry> <entry> <key>Other Calendars</key> </entry> @@ -6681,10 +6507,193 @@ <key>Open modeler</key> </entry> <entry> - <key>New Visit Recommendation</key> + <key>Subscription model</key> + </entry> + <entry> + <key>Grandchild of</key> + </entry> + <entry> + <key>Article Number</key> + </entry> + <entry> + <key>Archive</key> + </entry> + <entry> + <key>BOOL VALUE</key> + </entry> + <entry> + <key>Support ticket</key> + </entry> + <entry> + <key>Type</key> + </entry> + <entry> + <key>Seite</key> + </entry> + <entry> + <key>Senden per E-Mail</key> + </entry> + <entry> + <key>von</key> + </entry> + <entry> + <key>Minimal count</key> + </entry> + <entry> + <key>Task link Id</key> + </entry> + <entry> + <key>Todo</key> + </entry> + <entry> + <key>Relation Type 1</key> + </entry> + <entry> + <key>Relation Type 2</key> + </entry> + <entry> + <key>Task Id</key> + </entry> + <entry> + <key>Zip</key> + </entry> + <entry> + <key>type</key> + </entry> + <entry> + <key>Object 2 row Id</key> + </entry> + <entry> + <key>Object Type</key> + </entry> + <entry> + <key>NUMBER VALUE</key> + </entry> + <entry> + <key>Object 1 row Id</key> + </entry> + <entry> + <key>relations</key> + </entry> + <entry> + <key>postcode</key> + </entry> + <entry> + <key>Please pay the outstanding amount,this is you first/second reminder.</key> + </entry> + <entry> + <key>Lead Import Reset</key> + </entry> + <entry> + <key>Linked in</key> + </entry> + <entry> + <key>Mahnung</key> + </entry> + <entry> + <key>Lead Imports</key> + </entry> + <entry> + <key>Kundenstammblatt</key> + </entry> + <entry> + <key>No Standard-E-Mail available!</key> + </entry> + <entry> + <key>Leadimport</key> + </entry> + <entry> + <key>EXPORTTEMPLATE.FIELDLIMITER</key> + </entry> + <entry> + <key>niedrig</key> + </entry> + <entry> + <key>Relation type 1</key> + </entry> + <entry> + <key>Relation type 2</key> + </entry> + <entry> + <key>Nicht begonnen</key> + </entry> + <entry> + <key>task number</key> + </entry> + <entry> + <key>Quick entry</key> + </entry> + <entry> + <key>hoch</key> + </entry> + <entry> + <key>Export coloumns using a exporttemplate</key> + </entry> + <entry> + <key>QuickEntry</key> + </entry> + <entry> + <key>Leadimports</key> + </entry> + <entry> + <key>keine Standard-E-Mail Büro vorhanden !</key> + </entry> + <entry> + <key>Entry date</key> + </entry> + <entry> + <key>Relation type</key> + </entry> + <entry> + <key>Kampagnenschritte</key> + </entry> + <entry> + <key>frei</key> + </entry> + <entry> + <key>Leadimport Reset</key> + </entry> + <entry> + <key>Offer status changed!</key> + </entry> + <entry> + <key>Möchten Sie den Import abbrechen?</key> + </entry> + <entry> + <key>finished</key> + </entry> + <entry> + <key>EA private task cannot be assigned to somebody else.</key> + </entry> + <entry> + <key>Ein Fehler ist aufgetreten beim Import dieses Datensatzes:\n</key> + </entry> + <entry> + <key>tentative</key> + </entry> + <entry> + <key>Nein</key> + </entry> + <entry> + <key>Termine von</key> + </entry> + <entry> + <key>Kategorie</key> + </entry> + <entry> + <key>Caimpaignsteps</key> + </entry> + <entry> + <key>Seen</key> + </entry> + <entry> + <key>Unseen</key> + </entry> + <entry> + <key>To Delete</key> </entry> <entry> - <key>Invalid file type; only .html, .eml and .txt are allowed</key> + <key>Linked In</key> </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index f8441c82f9052017e1c2877fb1bd7163dafd93f0..3aad8b75423f02a20b4c798522bb4084ef5f9e29 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -24,11 +24,9 @@ </entry> <entry> <key>Variables</key> - <value>Variablen</value> </entry> <entry> <key>Finished</key> - <value>Abgeschlossen</value> </entry> <entry> <key>Show my organisations</key> @@ -124,6 +122,9 @@ <key>Sender address</key> <value>Senderadresse</value> </entry> + <entry> + <key>Complete tasks</key> + </entry> <entry> <key>Data could not be imported.</key> <value>Daten konnten nicht importiert werden.</value> @@ -876,10 +877,6 @@ <key>Contact</key> <value>Kontakt</value> </entry> - <entry> - <key>Type</key> - <value>Typ</value> - </entry> <entry> <key>Contacts</key> <value>Kontakte</value> @@ -1216,10 +1213,6 @@ <key>Contract number</key> <value>Vertragsnummer</value> </entry> - <entry> - <key>Min. stock</key> - <value>Min.-Bestand</value> - </entry> <entry> <key>SP</key> <value>VK</value> @@ -1776,10 +1769,6 @@ <key>Show all salesprojects</key> <value>Alle Vertriebsprojekte anzeigen</value> </entry> - <entry> - <key>Abomodel</key> - <value>Abomodell</value> - </entry> <entry> <key>Show all tweets of ADITO</key> <value>Alle Tweets von ADITO anzeigen</value> @@ -1996,6 +1985,7 @@ </entry> <entry> <key>The order number already exists!</key> + <value>Die Bestellnummer existiert bereits!</value> </entry> <entry> <key>New activity</key> @@ -2129,9 +2119,6 @@ <key>title</key> <value>Titel</value> </entry> - <entry> - <key>von</key> - </entry> <entry> <key>{$TASK_PRIORITY_LOW}</key> <value>niedrig</value> @@ -2144,10 +2131,6 @@ <key>Unit price</key> <value>Einzelpreis</value> </entry> - <entry> - <key>type</key> - <value>Typ</value> - </entry> <entry> <key>Workflow instances</key> <value>Workflowinstanzen</value> @@ -2164,20 +2147,10 @@ <key>Appointment</key> <value>Termin</value> </entry> - <entry> - <key>Vorschau</key> - </entry> - <entry> - <key>Angebot</key> - </entry> <entry> <key>Salesdashboard</key> <value>Vertriebsdashboard</value> </entry> - <entry> - <key>details</key> - <value>details</value> - </entry> <entry> <key>Key figures</key> <value>Kennzahlen</value> @@ -3623,6 +3596,7 @@ </entry> <entry> <key>Text</key> + <value>Text</value> </entry> <entry> <key>Group</key> @@ -3668,7 +3642,7 @@ </entry> <entry> <key>The code number is not a valid number.</key> - <value>The code number is not a valid number.</value> + <value>Die Kennnummer ist keine gültige Nummer</value> </entry> <entry> <key>${SQL_LIB_UNSUPPORTED_DBTYPE} function: %0</key> @@ -3883,9 +3857,6 @@ <entry> <key>&Aufg / Term (%0/%1)</key> </entry> - <entry> - <key>Verschieben auf Datum?</key> - </entry> <entry> <key>niedrig</key> </entry> @@ -3903,9 +3874,6 @@ <key>True</key> <value>Ja</value> </entry> - <entry> - <key>Vorläufig</key> - </entry> <entry> <key>&Aufgaben (%0)</key> </entry> @@ -3913,12 +3881,6 @@ <key>hoch</key> <value></value> </entry> - <entry> - <key>Zurückgestellt</key> - </entry> - <entry> - <key>Abgesagt</key> - </entry> <entry> <key>frei</key> </entry> @@ -4184,9 +4146,6 @@ <key>Variable costs</key> <value>Variable Kosten</value> </entry> - <entry> - <key>To-Do</key> - </entry> <entry> <key>Calendar</key> <value>Kalender</value> @@ -4348,6 +4307,7 @@ </entry> <entry> <key>Timetracking Id</key> + <value>Zeiterfassungs ID</value> </entry> <entry> <key>Date value</key> @@ -4364,9 +4324,6 @@ <key>Keyword attribute relation Id</key> <value>Schlüsselwort-Attributsbeziehungen ID</value> </entry> - <entry> - <key>Minimal count</key> - </entry> <entry> <key>Id</key> <value>Identität</value> @@ -4459,10 +4416,6 @@ <entry> <key>Task link Id</key> </entry> - <entry> - <key>BOOL VALUE</key> - <value>booleanischer Wert</value> - </entry> <entry> <key>Keyword attribute Id</key> <value>Schlüsselwort Attribut ID</value> @@ -4565,6 +4518,7 @@ </entry> <entry> <key>the \"%0\" table is configured to get logged but this is the logging-stoarge itself and cannot be monitored</key> + <value>Die "% 0" -Tabelle ist so konfiguriert, dass sie protokolliert wird. Dies ist jedoch der Protokollierspeicher selbst und kann nicht überwacht werden</value> </entry> <entry> <key>Attribute usage Id</key> @@ -4663,6 +4617,7 @@ </entry> <entry> <key>Title suffix</key> + <value>Namenszusatz</value> </entry> <entry> <key>Step costs</key> @@ -4673,6 +4628,7 @@ </entry> <entry> <key>Min. Stock</key> + <value>Min. Bestand</value> </entry> <entry> <key>User</key> @@ -4707,9 +4663,6 @@ <entry> <key>Tablename Id</key> </entry> - <entry> - <key>Termin</key> - </entry> <entry> <key>rebuild Index</key> <value>Index wiederherstellen</value> @@ -4751,9 +4704,6 @@ <key>Employees</key> <value>Personal</value> </entry> - <entry> - <key>Todo</key> - </entry> <entry> <key>Days remaining</key> <value>Tage verbleibend</value> @@ -5846,9 +5796,11 @@ </entry> <entry> <key>ticket number</key> + <value>Ticketnummer</value> </entry> <entry> <key>AB_KEYWORD_ENTRYID (UID)</key> + <value>AB_KEYWORD_ENTRYID (UID)</value> </entry> <entry> <key>DATE_NEW_CONTACT</key> @@ -5894,9 +5846,11 @@ </entry> <entry> <key>Ticket</key> + <value>Ticket</value> </entry> <entry> <key>Tickets</key> + <value>Tickets</value> </entry> <entry> <key>PERSON_ID</key> @@ -6280,6 +6234,7 @@ </entry> <entry> <key>Test DuplicateSearch</key> + <value>Test Dubletten-Suche</value> </entry> <entry> <key>Unlinked e-mail</key> @@ -6532,10 +6487,6 @@ <key>Attributes must be unique!</key> <value>Attribute müssen eindeutig sein</value> </entry> - <entry> - <key>Appointment checkup</key> - <value>Termin Vorschau</value> - </entry> <entry> <key>Permissions without actions are invalid!</key> <value>Berechtigungen ohne Aktionen sind ungültig</value> @@ -6643,6 +6594,7 @@ </entry> <entry> <key>The replacement name has to be unique.</key> + <value>Der Ersatzname muss eindeutig sein</value> </entry> <entry> <key>Only .odt files are supported for bulkletters.</key> @@ -6725,6 +6677,7 @@ </entry> <entry> <key>Total time</key> + <value>Gesamtzeit</value> </entry> <entry> <key>Assembly</key> @@ -6778,6 +6731,7 @@ </entry> <entry> <key>Total VAT</key> + <value>gesamte Mehrwertsteuer</value> </entry> <entry> <key>DataPrivacy Use</key> @@ -6797,6 +6751,7 @@ </entry> <entry> <key>the number of your applications</key> + <value>Die Anzahl ihrer Anwendungen</value> </entry> <entry> <key>Salesproject forecast Id</key> @@ -6855,9 +6810,6 @@ <entry> <key>Set campaign step</key> </entry> - <entry> - <key>testing</key> - </entry> <entry> <key>Bug Ticket</key> </entry> @@ -6890,10 +6842,6 @@ <key>Internet</key> <value>Internet</value> </entry> - <entry> - <key>Zip</key> - <value>PLZ</value> - </entry> <entry> <key>Displays the amounts of my personal forecast and the turnover I have already made</key> </entry> @@ -7064,6 +7012,7 @@ </entry> <entry> <key>Warning</key> + <value>Warnung</value> </entry> <entry> <key>Standard street</key> @@ -7094,9 +7043,6 @@ <key>Inserted rows</key> <value>Eingefügte Datensätze</value> </entry> - <entry> - <key>TestAttr</key> - </entry> <entry> <key>Phone number</key> <value>Telefonnummer</value> @@ -7482,6 +7428,7 @@ </entry> <entry> <key>Ticket type</key> + <value>Tickettyp</value> </entry> <entry> <key>Child</key> @@ -7692,10 +7639,6 @@ Bitte Datumseingabe prüfen</value> <key>Abort</key> <value>Abbrechen</value> </entry> - <entry> - <key>Articlenumber</key> - <value>Artikelnummer</value> - </entry> <entry> <key>Tasks of</key> <value>Tasks of</value> @@ -7813,9 +7756,6 @@ Bitte Datumseingabe prüfen</value> <entry> <key>Test</key> </entry> - <entry> - <key>Test2</key> - </entry> <entry> <key>Trigger</key> <value>Auslöser</value> @@ -7830,9 +7770,6 @@ Bitte Datumseingabe prüfen</value> <entry> <key>The file must be a XML</key> </entry> - <entry> - <key>Your changes may have an impact on the data privacy information (DSGVO).\n Please update these.</key> - </entry> <entry> <key>Quick Entry</key> </entry> @@ -8083,9 +8020,6 @@ Bitte Datumseingabe prüfen</value> <key>Permission Dealer User</key> <value>Rechtegeber Benutzer</value> </entry> - <entry> - <key>Berechtigungen</key> - </entry> <entry> <key>permission dealer type</key> <value>Rechtegeber Typ</value> @@ -8554,9 +8488,103 @@ Bitte Datumseingabe prüfen</value> <entry> <key>me</key> </entry> + <entry> + <key>Abgesagt</key> + <key>me</key> + </entry> <entry> <key>Point of Contact</key> </entry> + <entry> + <key>Subscription model</key> + <value>Abomodell</value> + </entry> + <entry> + <key>Grandchild of</key> + <value>Enkel von</value> + </entry> + <entry> + <key>Angebot</key> + </entry> + <entry> + <key>Article Number</key> + <value>Artikelnummer</value> + </entry> + <entry> + <key>Archive</key> + <value>Archiviert</value> + </entry> + <entry> + <key>Appointment checkup</key> + </entry> + <entry> + <key>Articlenumber</key> + </entry> + <entry> + <key>Berechtigungen</key> + </entry> + <entry> + <key>BOOL VALUE</key> + </entry> + <entry> + <key>Lead Import Reset</key> + </entry> + <entry> + <key>Type</key> + </entry> + <entry> + <key>von</key> + </entry> + <entry> + <key>Minimal count</key> + </entry> + <entry> + <key>Todo</key> + </entry> + <entry> + <key>Relation Type 1</key> + </entry> + <entry> + <key>Relation Type 2</key> + </entry> + <entry> + <key>Min. stock</key> + </entry> + <entry> + <key>No Standard-E-Mail available!</key> + </entry> + <entry> + <key>details</key> + </entry> + <entry> + <key>Please pay the outstanding amount,this is you first/second reminder.</key> + </entry> + <entry> + <key>Zip</key> + </entry> + <entry> + <key>type</key> + </entry> + <entry> + <key>Lead Imports</key> + </entry> + <entry> + <key>Caimpaignsteps</key> + </entry> + <entry> + <key>Seen</key> + </entry> + <entry> + <key>Unseen</key> + <value>Neu</value> + </entry> + <entry> + <key>To Delete</key> + <value>Für Löschung vorgesehen</value> + </entry> + <entry> + <key>Linked In</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 c82644b7e20eb94d2af4df09aa2c830478e4806f..8e0292375382c75d7f7050687adc5bde5916bff2 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -85,9 +85,6 @@ <entry> <key>Home address</key> </entry> - <entry> - <key>Type</key> - </entry> <entry> <key>Contacts</key> </entry> @@ -155,9 +152,6 @@ <entry> <key>Communication</key> </entry> - <entry> - <key>postcode</key> - </entry> <entry> <key>City</key> </entry> @@ -891,9 +885,6 @@ <entry> <key>title</key> </entry> - <entry> - <key>von</key> - </entry> <entry> <key>{$TASK_PRIORITY_LOW}</key> <value>Low</value> @@ -905,16 +896,10 @@ <entry> <key>Unit price</key> </entry> - <entry> - <key>type</key> - </entry> <entry> <key>{$TASK_PRIORITY_NONE}</key> <value>None</value> </entry> - <entry> - <key>Termin</key> - </entry> <entry> <key>Angebot</key> </entry> @@ -1967,9 +1952,6 @@ <entry> <key>Combobox</key> </entry> - <entry> - <key>tentative</key> - </entry> <entry> <key>${NUMBER}</key> <value>Number</value> @@ -2027,9 +2009,6 @@ <entry> <key>Combobox Value</key> </entry> - <entry> - <key>relations</key> - </entry> <entry> <key>Time</key> </entry> @@ -2081,9 +2060,6 @@ <entry> <key>society</key> </entry> - <entry> - <key>ankle of</key> - </entry> <entry> <key>solicits</key> </entry> @@ -2221,24 +2197,15 @@ <entry> <key>&Aufgaben (%0)</key> </entry> - <entry> - <key>hoch</key> - </entry> <entry> <key>Abgesagt</key> </entry> - <entry> - <key>frei</key> - </entry> <entry> <key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key> </entry> <entry> <key>normal</key> </entry> - <entry> - <key>Termine von</key> - </entry> <entry> <key>Product content</key> </entry> @@ -2490,15 +2457,6 @@ <entry> <key>Object relation</key> </entry> - <entry> - <key>Relation type 1</key> - </entry> - <entry> - <key>Relation type 2</key> - </entry> - <entry> - <key>Relation type</key> - </entry> <entry> <key>Context 1</key> </entry> @@ -2586,9 +2544,6 @@ <entry> <key>Analyses</key> </entry> - <entry> - <key>To-Do</key> - </entry> <entry> <key>Calendar</key> </entry> @@ -2715,24 +2670,15 @@ <entry> <key>Date value</key> </entry> - <entry> - <key>NUMBER VALUE</key> - </entry> <entry> <key>ID</key> </entry> <entry> <key>Keyword attribute relation Id</key> </entry> - <entry> - <key>Minimal count</key> - </entry> <entry> <key>Id</key> </entry> - <entry> - <key>Object 1 row Id</key> - </entry> <entry> <key>Side</key> </entry> @@ -2778,9 +2724,6 @@ <entry> <key>Int value</key> </entry> - <entry> - <key>Object 2 row Id</key> - </entry> <entry> <key>Source tablename Id</key> </entry> @@ -2796,12 +2739,6 @@ <entry> <key>Parent Id</key> </entry> - <entry> - <key>Task link Id</key> - </entry> - <entry> - <key>BOOL VALUE</key> - </entry> <entry> <key>Keyword attribute Id</key> </entry> @@ -2856,9 +2793,6 @@ <entry> <key>Object Relation Type</key> </entry> - <entry> - <key>Entry date</key> - </entry> <entry> <key>Object relation type 2</key> </entry> @@ -2868,9 +2802,6 @@ <entry> <key>Modification date</key> </entry> - <entry> - <key>Object Type</key> - </entry> <entry> <key>%0 from \"%1\" to \"%2\"</key> </entry> @@ -2907,9 +2838,6 @@ <entry> <key>Comments</key> </entry> - <entry> - <key>Task Id</key> - </entry> <entry> <key>Valid to</key> </entry> @@ -3075,9 +3003,6 @@ <entry> <key>Employees</key> </entry> - <entry> - <key>Todo</key> - </entry> <entry> <key>Days remaining</key> </entry> @@ -4192,9 +4117,6 @@ <value>Editor </value> </entry> - <entry> - <key>Support ticket</key> - </entry> <entry> <key>Modul group</key> </entry> @@ -4741,9 +4663,6 @@ <entry> <key>Texts</key> </entry> - <entry> - <key>keine Standard-E-Mail Büro vorhanden !</key> - </entry> <entry> <key>Choose payment address</key> </entry> @@ -5023,9 +4942,6 @@ <entry> <key>Show tickets where I am the editor</key> </entry> - <entry> - <key>Quick entry</key> - </entry> <entry> <key>Either or both a contact and a company must be specified</key> </entry> @@ -5266,9 +5182,6 @@ <entry> <key>Import errors</key> </entry> - <entry> - <key>task number</key> - </entry> <entry> <key>CRLF</key> </entry> @@ -5287,9 +5200,6 @@ <entry> <key>Inserted rows</key> </entry> - <entry> - <key>TestAttr</key> - </entry> <entry> <key>Office Properties</key> </entry> @@ -5331,9 +5241,6 @@ <entry> <key>Duplicate</key> </entry> - <entry> - <key>Leadimports</key> - </entry> <entry> <key>Is ID field</key> </entry> @@ -5451,9 +5358,6 @@ <entry> <key>Data imported. Contact not found.</key> </entry> - <entry> - <key>Möchten Sie den Import abbrechen?</key> - </entry> <entry> <key>From buildingnumber</key> </entry> @@ -5514,9 +5418,6 @@ <entry> <key> Info</key> </entry> - <entry> - <key>testing</key> - </entry> <entry> <key>Contact Owner</key> </entry> @@ -5535,18 +5436,12 @@ <entry> <key>Bug Ticket</key> </entry> - <entry> - <key>Ein Fehler ist aufgetreten beim Import dieses Datensatzes:\n</key> - </entry> <entry> <key>Salesproject source Id</key> </entry> <entry> <key>yearly series not specified</key> </entry> - <entry> - <key>Linked in</key> - </entry> <entry> <key>Organisation oder Person neu angelegt</key> </entry> @@ -5622,9 +5517,6 @@ <entry> <key>Supply and Disposal</key> </entry> - <entry> - <key>Nein</key> - </entry> <entry> <key>Data imported. Address could not be read.</key> </entry> @@ -5649,9 +5541,6 @@ <entry> <key>VIP-Customer</key> </entry> - <entry> - <key>Leadimport</key> - </entry> <entry> <key>Import logs</key> </entry> @@ -5670,9 +5559,6 @@ <entry> <key>Negotiations</key> </entry> - <entry> - <key>Zip</key> - </entry> <entry> <key>Residental Properties</key> </entry> @@ -5871,9 +5757,6 @@ <entry> <key>free</key> </entry> - <entry> - <key>finished</key> - </entry> <entry> <key>tentativ</key> </entry> @@ -5928,9 +5811,6 @@ <entry> <key>Desciption</key> </entry> - <entry> - <key>EA private task cannot be assigned to somebody else.</key> - </entry> <entry> <key>A private task cannot be assigned to somebody else.</key> </entry> @@ -5955,39 +5835,21 @@ <entry> <key>Campaign steps </key> </entry> - <entry> - <key>Kampagnenschritte</key> - </entry> <entry> <key>No transfer of private tasks possible!</key> </entry> - <entry> - <key>Kategorie</key> - </entry> <entry> <key>No authorization to postpone the task</key> </entry> - <entry> - <key>Kundenstammblatt</key> - </entry> <entry> <key>LinkedIn</key> </entry> - <entry> - <key>Mahnung</key> - </entry> <entry> <key>low</key> </entry> <entry> <key>Show only own</key> </entry> - <entry> - <key>niedrig</key> - </entry> - <entry> - <key>Nicht begonnen</key> - </entry> <entry> <key>Maximal Count</key> </entry> @@ -6018,39 +5880,15 @@ <entry> <key>My workflow tasks</key> </entry> - <entry> - <key>Seite</key> - </entry> - <entry> - <key>Senden per E-Mail</key> - </entry> <entry> <key>Manual</key> </entry> <entry> <key>Your changes may have an impact on the data privacy information (GDPR).\n Please update these.</key> </entry> - <entry> - <key>Vorläufig</key> - </entry> <entry> <key>Wichtigste Kennzahlen zu den Vertriebsprojekten.</key> </entry> - <entry> - <key>Vorschau</key> - </entry> - <entry> - <key>Zurückgestellt</key> - </entry> - <entry> - <key>Your changes may have an impact on the data privacy information (DSGVO).\n Please update these.</key> - </entry> - <entry> - <key>Verschieben auf Datum?</key> - </entry> - <entry> - <key>QuickEntry</key> - </entry> <entry> <key>Owner</key> </entry> @@ -6066,9 +5904,6 @@ <entry> <key>Test</key> </entry> - <entry> - <key>Test2</key> - </entry> <entry> <key>Trigger</key> </entry> @@ -6325,9 +6160,6 @@ <entry> <key>Templatename</key> </entry> - <entry> - <key>Export coloumns using a exporttemplate</key> - </entry> <entry> <key>Organisationname</key> </entry> @@ -6422,9 +6254,6 @@ <entry> <key>rights of access</key> </entry> - <entry> - <key>Leadimport Reset</key> - </entry> <entry> <key>Create notification</key> </entry> @@ -6685,9 +6514,6 @@ <key>${FILTER_DYNAMIC_VALUE_ME}</key> <value>me</value> </entry> - <entry> - <key>EXPORTTEMPLATE.FIELDLIMITER</key> - </entry> <entry> <key>Other Calendars</key> </entry> @@ -6733,6 +6559,198 @@ <entry> <key>Open modeler</key> </entry> + <entry> + <key>Subscription model</key> + </entry> + <entry> + <key>Grandchild of</key> + </entry> + <entry> + <key>Article Number</key> + </entry> + <entry> + <key>Archive</key> + </entry> + <entry> + <key>BOOL VALUE</key> + </entry> + <entry> + <key>Support ticket</key> + </entry> + <entry> + <key>Type</key> + </entry> + <entry> + <key>Seite</key> + </entry> + <entry> + <key>Senden per E-Mail</key> + </entry> + <entry> + <key>von</key> + </entry> + <entry> + <key>Minimal count</key> + </entry> + <entry> + <key>Task link Id</key> + </entry> + <entry> + <key>Todo</key> + </entry> + <entry> + <key>Relation Type 1</key> + </entry> + <entry> + <key>Relation Type 2</key> + </entry> + <entry> + <key>Task Id</key> + </entry> + <entry> + <key>Zip</key> + </entry> + <entry> + <key>type</key> + </entry> + <entry> + <key>Object 2 row Id</key> + </entry> + <entry> + <key>Object Type</key> + </entry> + <entry> + <key>NUMBER VALUE</key> + </entry> + <entry> + <key>Object 1 row Id</key> + </entry> + <entry> + <key>relations</key> + </entry> + <entry> + <key>postcode</key> + </entry> + <entry> + <key>Please pay the outstanding amount,this is you first/second reminder.</key> + </entry> + <entry> + <key>Lead Import Reset</key> + </entry> + <entry> + <key>Linked in</key> + </entry> + <entry> + <key>Mahnung</key> + </entry> + <entry> + <key>Lead Imports</key> + </entry> + <entry> + <key>Kundenstammblatt</key> + </entry> + <entry> + <key>No Standard-E-Mail available!</key> + </entry> + <entry> + <key>Leadimport</key> + </entry> + <entry> + <key>EXPORTTEMPLATE.FIELDLIMITER</key> + </entry> + <entry> + <key>niedrig</key> + </entry> + <entry> + <key>Relation type 1</key> + </entry> + <entry> + <key>Relation type 2</key> + </entry> + <entry> + <key>Nicht begonnen</key> + </entry> + <entry> + <key>task number</key> + </entry> + <entry> + <key>Quick entry</key> + </entry> + <entry> + <key>hoch</key> + </entry> + <entry> + <key>Export coloumns using a exporttemplate</key> + </entry> + <entry> + <key>QuickEntry</key> + </entry> + <entry> + <key>Leadimports</key> + </entry> + <entry> + <key>keine Standard-E-Mail Büro vorhanden !</key> + </entry> + <entry> + <key>Entry date</key> + </entry> + <entry> + <key>Relation type</key> + </entry> + <entry> + <key>Kampagnenschritte</key> + </entry> + <entry> + <key>frei</key> + </entry> + <entry> + <key>Leadimport Reset</key> + </entry> + <entry> + <key>Offer status changed!</key> + </entry> + <entry> + <key>Möchten Sie den Import abbrechen?</key> + </entry> + <entry> + <key>finished</key> + </entry> + <entry> + <key>EA private task cannot be assigned to somebody else.</key> + </entry> + <entry> + <key>Ein Fehler ist aufgetreten beim Import dieses Datensatzes:\n</key> + </entry> + <entry> + <key>tentative</key> + </entry> + <entry> + <key>Nein</key> + </entry> + <entry> + <key>Termine von</key> + </entry> + <entry> + <key>Kategorie</key> + </entry> + <entry> + <key>Caimpaignsteps</key> + </entry> + <entry> + <key>Seen</key> + </entry> + <entry> + <key>Unseen</key> + </entry> + <entry> + <key>To Delete</key> + </entry> + <entry> + <key>Linked In</key> + </entry> + <entry> + <key>Open modeler</key> + </entry> <entry> <key>Organisation point Of Contact</key> </entry> diff --git a/neonContext/Appointment/Appointment.aod b/neonContext/Appointment/Appointment.aod index 653f321892a30e453c0038d8c2543e516780afc1..485827395993e514677cf55999de953a825ae1a4 100644 --- a/neonContext/Appointment/Appointment.aod +++ b/neonContext/Appointment/Appointment.aod @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1"> <name>Appointment</name> - <title>Termin</title> + <title>Appointment</title> <majorModelMode>DISTRIBUTED</majorModelMode> <documentation>%aditoprj%/neonContext/Appointment/documentation.adoc</documentation> <icon>VAADIN:CALENDAR</icon> diff --git a/neonContext/QuickEntry/QuickEntry.aod b/neonContext/QuickEntry/QuickEntry.aod index c05110cb01426f3445d08d1d95b5807f337a792e..47e6955f0bd28a7078580f9f0d2f5188fb5e3ea4 100644 --- a/neonContext/QuickEntry/QuickEntry.aod +++ b/neonContext/QuickEntry/QuickEntry.aod @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1"> <name>QuickEntry</name> - <title>Quick entry</title> + <title>Quick Entry</title> <majorModelMode>DISTRIBUTED</majorModelMode> <editView>QuickEntryEdit_view</editView> <entity>QuickEntry_entity</entity> diff --git a/neonView/AppointmentCheckUp_view/AppointmentCheckUp_view.aod b/neonView/AppointmentCheckUp_view/AppointmentCheckUp_view.aod index ecc8cedea39065f50fbfd3653913e42e81d41273..2f0e9199d4d5ce506786750e9240645d9517f6d3 100644 --- a/neonView/AppointmentCheckUp_view/AppointmentCheckUp_view.aod +++ b/neonView/AppointmentCheckUp_view/AppointmentCheckUp_view.aod @@ -5,7 +5,7 @@ <dashletConfigurations> <neonDashletConfiguration> <name>AppointmentCheckupDashletConfig</name> - <title>Appointment checkup</title> + <title>Appointment CheckUp</title> <description>Appointment checkup for the selected day</description> <fragment>Appointment/full</fragment> <storeRoles> diff --git a/neonView/CampaignStepLookup_view/CampaignStepLookup_view.aod b/neonView/CampaignStepLookup_view/CampaignStepLookup_view.aod index 0407f733e64b2af37df58bb17ec64bc719dc3f09..9f87ec7120123809f585d39d02f75e538b2765f0 100644 --- a/neonView/CampaignStepLookup_view/CampaignStepLookup_view.aod +++ b/neonView/CampaignStepLookup_view/CampaignStepLookup_view.aod @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6"> <name>CampaignStepLookup_view</name> - <title>Kampagnenschritte</title> + <title>Caimpaignsteps</title> <description></description> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> diff --git a/neonView/MyDashboardScoreCard_view/MyDashboardScoreCard_view.aod b/neonView/MyDashboardScoreCard_view/MyDashboardScoreCard_view.aod index 4c5dcc17f79bb62a11f3d51f8b4c2ddec039f0b9..723a24964e2f2b1d78bb42e38728212ea9c257c8 100644 --- a/neonView/MyDashboardScoreCard_view/MyDashboardScoreCard_view.aod +++ b/neonView/MyDashboardScoreCard_view/MyDashboardScoreCard_view.aod @@ -5,7 +5,7 @@ <dashletConfigurations> <neonDashletConfiguration> <name>Information</name> - <title>To-Do</title> + <title>ToDo</title> <description>Remaining tasks and appointments</description> <fragment>Analyses/full</fragment> <singleton v="true" /> diff --git a/neonView/OrganisationTaskAppointment_view/OrganisationTaskAppointment_view.aod b/neonView/OrganisationTaskAppointment_view/OrganisationTaskAppointment_view.aod index 88c3e5865058373d7ba590b0b3e458334beeb162..9fb952b77a2bad5dc51f3da28bb7353f40994d68 100644 --- a/neonView/OrganisationTaskAppointment_view/OrganisationTaskAppointment_view.aod +++ b/neonView/OrganisationTaskAppointment_view/OrganisationTaskAppointment_view.aod @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6"> <name>OrganisationTaskAppointment_view</name> - <title>To-Do</title> + <title>ToDo</title> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> <boxLayout> diff --git a/neonView/PersonTaskAppointment_view/PersonTaskAppointment_view.aod b/neonView/PersonTaskAppointment_view/PersonTaskAppointment_view.aod index 5fecd7a84707ec0318f3fa01f31270059df3b52e..d23833c4c20d8838144196a95c81cd8ec57fa29f 100644 --- a/neonView/PersonTaskAppointment_view/PersonTaskAppointment_view.aod +++ b/neonView/PersonTaskAppointment_view/PersonTaskAppointment_view.aod @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6"> <name>PersonTaskAppointment_view</name> - <title>To-Do</title> + <title>ToDo</title> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> <boxLayout> diff --git a/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod b/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod index d5db6f9b1c48f0d8c5e417d1401525a507bc088a..125b8e68227eb55b31d980298602ea778117f519 100644 --- a/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod +++ b/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6"> <name>QuickEntryEdit_view</name> - <title>Quick entry</title> + <title>Quick Entry</title> <majorModelMode>DISTRIBUTED</majorModelMode> <icon>VAADIN:WORKPLACE</icon> <quickEntry v="0" /> diff --git a/neonView/SupportTicketMain_view/SupportTicketMain_view.aod b/neonView/SupportTicketMain_view/SupportTicketMain_view.aod index 92384e5786f55eb937524d4c6e1472004e672618..529d000dc9df0098eb2e4ade7ef43fb483b06d04 100644 --- a/neonView/SupportTicketMain_view/SupportTicketMain_view.aod +++ b/neonView/SupportTicketMain_view/SupportTicketMain_view.aod @@ -16,7 +16,7 @@ <fixedDrawer v="true" /> <hideLabels v="false" /> <entityField>#ENTITY</entityField> - <title>details</title> + <title>Details</title> <fields> <entityFieldLink> <name>3f746e73-b8cd-4d08-b352-a2307e080410</name> diff --git a/neonView/TaskMain_view/TaskMain_view.aod b/neonView/TaskMain_view/TaskMain_view.aod index 81e98d5b2c14842ebf09b07ab583c53c1d8e1426..ad38b461f3fc3cf9f54cacc711137d64e6c816f7 100644 --- a/neonView/TaskMain_view/TaskMain_view.aod +++ b/neonView/TaskMain_view/TaskMain_view.aod @@ -16,7 +16,7 @@ <fixedDrawer v="true" /> <hideLabels v="false" /> <entityField>#ENTITY</entityField> - <title>details</title> + <title>Details</title> <fields> <entityFieldLink> <name>e95918f5-d21e-4c99-8d05-d70811aa3d89</name> diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js index 9c54aa258e3bc90f127e995c3b264db24dc838ff..b0bfefeff4221625ed37066bb16ef2963c6aa598 100644 --- a/process/Offer_lib/process.js +++ b/process/Offer_lib/process.js @@ -245,7 +245,7 @@ OfferUtils.buildOfferReport = function (pOfferID) "Articledescription" : translate.text("Article Description", language), "DeliveryConditions" : translate.text("Deliveryspecification", language), "Salutation" : letterSalutation, - "Articlenumber" : translate.text("Articlenumber", language), + "Articlenumber" : translate.text("Article Number", language), "OFFERAddr" : translate.text(offerData[0].trim(), language), "PlusSalestax" : translate.text("Plus Salestax", language), "Unitprice" : translate.text("Unitprice", language), diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js index 8da722d44ddb69fde7443347da47669cdb36d171..8c7da8b6647c80508b635b1466ce8f8966ccdc25 100644 --- a/process/Order_lib/process.js +++ b/process/Order_lib/process.js @@ -315,7 +315,7 @@ OrderUtils.buildOrderReport = function (pOrderID) "Articledescription" : translate.text("Article Description", language), "DeliveryConditions" : translate.text("Deliveryspecification", language), "OrderType" : KeywordUtils.getViewValue($KeywordRegistry.orderType(), orderData[15]), - "Articlenumber" : translate.text("Articlenumber", language), + "Articlenumber" : translate.text("Article Number", language), "SALESORDERAddr" : translate.text(orderData[0].trim(), language), "zzglUMST" : translate.text("Plus Salestax", language), "Unitprice" : translate.text("Unitprice", language), diff --git a/report/Salesorder_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js b/report/Salesorder_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js index 69fe966437c8dfb057e6a37c8a203475520bb80b..48fc7c800cd7d466c6f45973516ee02832f837da 100644 --- a/report/Salesorder_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js +++ b/report/Salesorder_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js @@ -10,7 +10,7 @@ var orgid = db.array(db.ROW, "select ORG_ID, LANG from RELATION where RELATIONID if (orgid[0].substr(0, 2) == '0 ') // Privatperson { var count = db.cell("select count(*) from COMM where medium_id = 3 and STANDARD = 1 and RELATION_ID = '" + details[1] + "'"); - if (count == "0") question.showMessage(translate.text("keine Standard-E-Mail Büro vorhanden !")); + if (count == "0") question.showMessage(translate.text("No Standard-E-Mail available!")); else sendAutoMail( translate.text(details[3]) + " " + details[0], details[1], details[4], details[2], details[5], relccid, [["SPNR", details[6]]], orgid[1] ); }