diff --git a/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod b/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod index 98d6f79f1e2f78d8a6835d0bda7597adc34d1762..2a5c16c01b0d4a3d75a47c87fc84faae6fb16105 100644 --- a/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod +++ b/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod @@ -2,7 +2,7 @@ <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10"> <name>UnlinkedMailMappingWrapper_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> - <title>Link unlinked Mail</title> + <title>Link unlinked e-mail</title> <recordContainer>dummyJdito</recordContainer> <entityFields> <entityProvider> diff --git a/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod b/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod index cee2b108553e989977a9c2ee22c9d94a6397c635..7c228edfc1435f9156c678f264de362ff1ae2d2b 100644 --- a/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod +++ b/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod @@ -2,12 +2,12 @@ <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10"> <name>UnlinkedMail_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> - <title>Unlinked mail</title> + <title>Unlinked e-mail</title> <grantCreate v="false" /> <grantUpdate v="false" /> <iconId>VAADIN:AT</iconId> <imageProcess>%aditoprj%/entity/UnlinkedMail_entity/imageProcess.js</imageProcess> - <titlePlural>Unlinked mails</titlePlural> + <titlePlural>Unlinked e-mails</titlePlural> <recordContainer>db</recordContainer> <entityFields> <entityProvider> diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index 963ad88e40fd0da96715b8e37747bf80e5edd980..4f1b281b4a7ca8269eeb14697ddc0351372e7f93 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -3654,9 +3654,6 @@ <entry> <key>Search for new Entries</key> </entry> - <entry> - <key>Additional link</key> - </entry> <entry> <key>Salesproject member</key> </entry> @@ -5062,19 +5059,16 @@ <key>Write bulk mail</key> </entry> <entry> - <key>Unlinked mail</key> - </entry> - <entry> - <key>Additional links</key> + <key>Unlinked e-mail</key> </entry> <entry> <key>(optional) E-Mail to store in contact</key> </entry> <entry> - <key>Link unlinked Mail</key> + <key>Link unlinked e-mail</key> </entry> <entry> - <key>Link mail addresses to contacts</key> + <key>Link e-mail addresses to contacts</key> </entry> <entry> <key>${UNLINKEDMAILMAPPING_ADDITIONAL_LINKS}</key> diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index 043e8613fbb1a19b3f81bb5f6cc449fe7a6220e6..c383b7f75a6f3de7f000f45e3ad5a90f6404ea37 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -784,10 +784,6 @@ <key>Office address</key> <value>Firmenadresse</value> </entry> - <entry> - <key>Additional link</key> - <value>Zusätzliche Verknüpfung</value> - </entry> <entry> <key>Contact</key> <value>Kontakt</value> @@ -6369,7 +6365,7 @@ <key>Test DuplicateSearch</key> </entry> <entry> - <key>Unlinked mail</key> + <key>Unlinked e-mail</key> <value>Unverknüpfte E-Mail</value> </entry> <entry> @@ -6377,11 +6373,11 @@ <value>(optional) E-Mail bei Kontakt speichern</value> </entry> <entry> - <key>Link unlinked Mail</key> + <key>Link unlinked e-mail</key> <value>Verknüpfe E-Mail</value> </entry> <entry> - <key>Link mail addresses to contacts</key> + <key>Link e-mail addresses to contacts</key> <value>Verknüpfe E-Mail-Adressen zu Kontakten</value> </entry> <entry> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index 54212c0d30c43b03d62bd6dcb5a145608e32c813..0b02e24a5abd4dccd6388f8daa49814045529408 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -3703,9 +3703,6 @@ <entry> <key>Search for new Entries</key> </entry> - <entry> - <key>Additional link</key> - </entry> <entry> <key>Salesproject member</key> </entry> @@ -5111,19 +5108,16 @@ <key>Write bulk mail</key> </entry> <entry> - <key>Unlinked mail</key> - </entry> - <entry> - <key>Additional links</key> + <key>Unlinked e-mail</key> </entry> <entry> <key>(optional) E-Mail to store in contact</key> </entry> <entry> - <key>Link unlinked Mail</key> + <key>Link unlinked e-mail</key> </entry> <entry> - <key>Link mail addresses to contacts</key> + <key>Link e-mail addresses to contacts</key> </entry> <entry> <key>${UNLINKEDMAILMAPPING_ADDITIONAL_LINKS}</key> diff --git a/neonView/UnlinkedMailMappingWrapperMapping_view/UnlinkedMailMappingWrapperMapping_view.aod b/neonView/UnlinkedMailMappingWrapperMapping_view/UnlinkedMailMappingWrapperMapping_view.aod index d875da51f50f625acce4a14b9f3a7f10e28c303d..7cce6b8d744d27f349e35820e8953a38dac348b4 100644 --- a/neonView/UnlinkedMailMappingWrapperMapping_view/UnlinkedMailMappingWrapperMapping_view.aod +++ b/neonView/UnlinkedMailMappingWrapperMapping_view/UnlinkedMailMappingWrapperMapping_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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1"> <name>UnlinkedMailMappingWrapperMapping_view</name> - <title>Link mail addresses to contacts</title> + <title>Link e-mail addresses to contacts</title> <majorModelMode>DISTRIBUTED</majorModelMode> <isSmall v="true" /> <layout>