diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod index 760160b48633a0d5ba60e3d1ed1362c3df29645a..2604ccd28c995b820b47daae8e0b7b84cfe47368 100644 --- a/entity/Address_entity/Address_entity.aod +++ b/entity/Address_entity/Address_entity.aod @@ -76,7 +76,7 @@ </entityField> <entityField> <name>ZIP</name> - <title>postcode</title> + <title>Postcode</title> <consumer>ZipValidation</consumer> <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/zip/mandatoryProcess.js</mandatoryProcess> <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/zip/displayValueProcess.js</displayValueProcess> diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod index 3deaac46c3725d3856c46406a4a3509d020c2dc9..cbf0b4982a2ac2db2528b627411e81a996b86c12 100644 --- a/entity/CampaignStep_entity/CampaignStep_entity.aod +++ b/entity/CampaignStep_entity/CampaignStep_entity.aod @@ -36,7 +36,7 @@ </entityField> <entityField> <name>EMPLOYEE_CONTACT_ID</name> - <title>Zuständiger</title> + <title>Responsible</title> <consumer>Employees</consumer> <mandatory v="true" /> <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/employee_contact_id/valueProcess.js</valueProcess> @@ -49,7 +49,7 @@ </entityField> <entityField> <name>DATE_START</name> - <title>Beginn</title> + <title>Begin</title> <contentType>DATE</contentType> <resolution>DAY</resolution> <outputFormat>dd.MM.yyyy</outputFormat> @@ -61,7 +61,7 @@ </entityField> <entityField> <name>DATE_END</name> - <title>Ende</title> + <title>End</title> <contentType>DATE</contentType> <resolution>DAY</resolution> <outputFormat>dd.MM.yyyy</outputFormat> @@ -80,7 +80,7 @@ </entityField> <entityField> <name>SORTING</name> - <title>Reihenfolge</title> + <title>Sorting</title> <contentType>NUMBER</contentType> <mandatory v="true" /> <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/sorting/valueProcess.js</valueProcess> diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod index 8eef06dd4117e010c12cebccdab7227b932a3d17..bc66aa0b11770f09e072a4ee797552187a9309a9 100644 --- a/entity/Campaign_entity/Campaign_entity.aod +++ b/entity/Campaign_entity/Campaign_entity.aod @@ -33,7 +33,7 @@ </entityField> <entityField> <name>DATE_START</name> - <title>Beginn</title> + <title>Start</title> <contentType>DATE</contentType> <resolution>DAY</resolution> <outputFormat>dd.MM.YYYY</outputFormat> @@ -43,7 +43,7 @@ </entityField> <entityField> <name>DATE_END</name> - <title>Ende</title> + <title>End</title> <contentType>DATE</contentType> <resolution>DAY</resolution> <outputFormat>dd.MM.YYYY</outputFormat> diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod index 5a68a399215615d760cc5d8a5181ccd63c4ff4fb..3bc40b06f74c4113c62247b9a113451a842ba294 100644 --- a/entity/Document_entity/Document_entity.aod +++ b/entity/Document_entity/Document_entity.aod @@ -53,7 +53,7 @@ </entityField> <entityField> <name>BINDATA_UPLOAD</name> - <title>Datei</title> + <title>File</title> <contentType>FILE</contentType> <onValueChange>%aditoprj%/entity/Document_entity/entityfields/bindata_upload/onValueChange.js</onValueChange> <onValueChangeTypes> @@ -96,7 +96,7 @@ </entityField> <entityField> <name>DESCRIPTION</name> - <title>Beschreibung</title> + <title>Description</title> <contentType>LONG_TEXT</contentType> <onValueChangeTypes> <element>MASK</element> @@ -106,7 +106,7 @@ </entityField> <entityField> <name>KEYWORD</name> - <title>Schlüsselwort</title> + <title>Keyword</title> </entityField> <entityField> <name>ICON</name> @@ -114,7 +114,7 @@ </entityField> <entityField> <name>IS_MAIN_DOCUMENT</name> - <title>Hauptdokument</title> + <title>Main document</title> <contentType>BOOLEAN</contentType> <dropDownProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/dropDownProcess.js</dropDownProcess> <valueProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/valueProcess.js</valueProcess> diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod index 282e1d3b9dda9e3954c23e4541c0ca08478a8793..e10cb5ba733dc3fae5f0968d61d63df45b2089b4 100644 --- a/entity/Offer_entity/Offer_entity.aod +++ b/entity/Offer_entity/Offer_entity.aod @@ -75,7 +75,7 @@ </entityField> <entityField> <name>SALESPROJECT_ID</name> - <title>Salesproject</title> + <title>Sales Project</title> <consumer>Salesprojects</consumer> <linkedContext>Salesproject</linkedContext> <mandatoryProcess>%aditoprj%/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js</mandatoryProcess> @@ -544,7 +544,7 @@ </entityField> <entityField> <name>DELIVERYTERMS</name> - <title>Deliveryspecification</title> + <title>Delivery specification</title> <consumer>KeywordDeliveryTerm</consumer> <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js</valueProcess> <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/deliveryterms/displayValueProcess.js</displayValueProcess> diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod index d8140373febb384476c8c4bff0687c03c3ee9646..2028ae5749a7f34949e5abf2fffeb97754b622db 100644 --- a/entity/Person_entity/Person_entity.aod +++ b/entity/Person_entity/Person_entity.aod @@ -143,7 +143,7 @@ </entityField> <entityField> <name>ORGANISATION_ID</name> - <title>Firma</title> + <title>Company</title> <consumer>Organisations</consumer> <linkedContextProcess>%aditoprj%/entity/Person_entity/entityfields/organisation_id/linkedContextProcess.js</linkedContextProcess> <mandatory v="false" /> diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod index 91259a51f6f8838e54c3a7a7f2d2cde1a98d0084..65e4ecf1797689796955e21fbe08f3ee4f2f4c80 100644 --- a/entity/Salesproject_entity/Salesproject_entity.aod +++ b/entity/Salesproject_entity/Salesproject_entity.aod @@ -106,6 +106,7 @@ <contentType>NUMBER</contentType> <outputFormat>0</outputFormat> <inputFormat>0</inputFormat> + <searchable v="true" /> <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume/titleProcess.js</titleProcess> <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume/displayValueProcess.js</displayValueProcess> </entityField> diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod index 52b6e08f5f900d7c4c516ac246fa59ebad7207b0..6fc3eb7145cf3cd79f022332a86a248c16e65d75 100644 --- a/entity/Task_entity/Task_entity.aod +++ b/entity/Task_entity/Task_entity.aod @@ -41,7 +41,7 @@ </entityField> <entityField> <name>PRIORITY</name> - <title>priority</title> + <title>Priority</title> <consumer>KeywordPriorities</consumer> <mandatory v="true" /> <groupable v="true" /> diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index c3ec4e4577ff8dba91ff274fd35de086f9b84ee0..69ad79631e0dca0886da8335a1e492f7ce342c13 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -42,6 +42,10 @@ <key>Picture</key> <value>Bild</value> </entry> + <entry> + <key>Delivery specification</key> + <value>Lieferbedingung</value> + </entry> <entry> <key>Office staff</key> <value>Innendienst</value> @@ -74,6 +78,10 @@ <key>Entrydate (Day)</key> <value>Eingangsdatum (Tag)</value> </entry> + <entry> + <key>Priority</key> + <value>Priorität</value> + </entry> <entry> <key>Salesproject phases</key> <value>Vertriebsprojektphasen</value> @@ -470,7 +478,7 @@ <value>Kommunikation</value> </entry> <entry> - <key>postcode</key> + <key>Postcode</key> <value>Postleitzahl</value> </entry> <entry> @@ -1247,6 +1255,10 @@ <key>responsible</key> <value>verantwortlich</value> </entry> + <entry> + <key>Main document</key> + <value>Hauptdokument</value> + </entry> <entry> <key>False</key> <value>Nein</value> @@ -1281,6 +1293,9 @@ <entry> <key>Other</key> </entry> + <entry> + <key>Main Resp.</key> + </entry> <entry> <key>Show all sent offers</key> <value>Alle versendeten Angebote anzeigen</value> @@ -3182,6 +3197,10 @@ <key>Checkbox</key> <value>Checkbox</value> </entry> + <entry> + <key>Sales Dashboard</key> + <value>Vertriebsdashboard</value> + </entry> <entry> <key>Numeric value</key> <value>Zahlenwert</value> @@ -3866,6 +3885,7 @@ </entry> <entry> <key>[%0]%1 has to be a string or array but it is %2</key> + <value></value> </entry> <entry> <key>[%0]has now an incorrect length; estimated 2 elements but got %1</key> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index 6e1aa23643de1307711be9d1bef03ee9b9cdaf9d..accede788e67796bf7fbcb1e892f01d64506ecc8 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -521,7 +521,7 @@ </entry> <entry> <key>${EURO_SIGN}</key> - <value>?</value> + <value>€</value> </entry> <entry> <key>Planned</key> @@ -1004,7 +1004,7 @@ </entry> <entry> <key>{$TASK_STATUS}</key> - <value>status</value> + <value>Status</value> </entry> <entry> <key>Task</key> @@ -1014,14 +1014,14 @@ </entry> <entry> <key>{$TASK_REQUESTOR}</key> - <value>requestor</value> + <value>Requestor</value> </entry> <entry> <key>task number</key> </entry> <entry> <key>{$TASK_EDITOR}</key> - <value>editor</value> + <value>Editor</value> </entry> <entry> <key>description</key> @@ -1031,7 +1031,7 @@ </entry> <entry> <key>{$TASK_PRIORITY_HIGH}</key> - <value>high</value> + <value>High</value> </entry> <entry> <key>Seite</key> @@ -1056,14 +1056,14 @@ </entry> <entry> <key>{$TASK_PRIORITY_LOW}</key> - <value>low</value> + <value>Low</value> </entry> <entry> <key>Nur Eigene anzeigen</key> </entry> <entry> <key>{$TASK_PRIORITY_NORMAL}</key> - <value>normal</value> + <value>Normal</value> </entry> <entry> <key>Beschreibung</key> @@ -1082,7 +1082,7 @@ </entry> <entry> <key>{$TASK_PRIORITY_NONE}</key> - <value>none</value> + <value>None</value> </entry> <entry> <key>Termin</key> @@ -1160,6 +1160,7 @@ </entry> <entry> <key>${ADDRESS_STATE}</key> + <value>State</value> </entry> <entry> <key>Title (original language)</key>