diff --git a/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js b/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js
index d297c7d58bc7596a7d53b5f28fe72c5c1c5d8695..af5991c0cd552dd6b51fe8b99cf7e95139c84c5f 100644
--- a/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js
@@ -6,5 +6,5 @@ var cond = SqlCondition.begin()
                        .andPrepareVars("ACTIVITYLINK.OBJECT_ROWID", "$param.ObjectRowid_param")
                        .andPrepareVars("ACTIVITYLINK.OBJECT_TYPE", "$param.ObjectType_param");
 
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/conditionProcess.js b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
index 42b0bbbe10f5a743361ccfa2e425f8fc5876b24b..f8ca95a041f3a052a2e375692dcaa0bdf90d52f3 100644
--- a/entity/Activity_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
@@ -16,6 +16,6 @@ if(vars.exists("$param.OnlyInnate_param") && vars.get("$param.OnlyInnate_param")
     cond.andPrepare("ACTIVITY.CREATOR", vars.get("$sys.user"));
 }
 
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 var resCond = db.translateCondition(cond.build("1 = 1"));
 result.string(resCond);
diff --git a/entity/Address_entity/entityfields/country/displayValueProcess.js b/entity/Address_entity/entityfields/country/displayValueProcess.js
index 11851ccdb25e73e6a78bb0a0b2398b730fd3fd37..22c043fdc3d9ab8fbe1e9b67738a0f105ce7aaee 100644
--- a/entity/Address_entity/entityfields/country/displayValueProcess.js
+++ b/entity/Address_entity/entityfields/country/displayValueProcess.js
@@ -4,7 +4,7 @@ import("system.translate");
 import("system.result");
 import("Sql_lib");
 
-//TODO: temporary testing code
+//TODO: temporary testing code -> will be replaced with title-mechanic
 var isoCode = vars.get("$field.COUNTRY");
 var countryName  = db.cell(SqlCondition.begin().andPrepare("AB_COUNTRYINFO.ISO2", isoCode).buildSql("select AB_COUNTRYINFO.NAME_LATIN from AB_COUNTRYINFO"));
 countryName = translate.text(countryName);
diff --git a/entity/Address_entity/entityfields/zip/onValidation.js b/entity/Address_entity/entityfields/zip/onValidation.js
index 59eb04f1cd774a94fb81801ec515a4f40c063565..4ab5fababa786a02ee290896bd38c6b648fb2150 100644
--- a/entity/Address_entity/entityfields/zip/onValidation.js
+++ b/entity/Address_entity/entityfields/zip/onValidation.js
@@ -10,6 +10,6 @@ var zipCode = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.ZIP"));
 var message = "";
 var isValid = AddressValidationUtils.isValidZip(countryCode, zipCode);
 if (!isValid)
-    message = translate.text("ZIP code is not valid");//TODO: better message text
+    message = translate.text("The ZIP code does not match the format of the country.");
     
 result.string(message);
\ No newline at end of file
diff --git a/entity/AppointmentLink_entity/recordcontainers/db/conditionProcess.js b/entity/AppointmentLink_entity/recordcontainers/db/conditionProcess.js
index d07a6fc35d714eec0cb968234e7cf24d92dae098..c0867f5bcec0beae07f1db2a06ccb6b60cafd98a 100644
--- a/entity/AppointmentLink_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/AppointmentLink_entity/recordcontainers/db/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
 var cond = SqlCondition.begin()
                        .andPrepareVars("APPOINTMENTLINK.APPOINTMENT_ID", "$param.AppointmentId_param")
 
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index 04eb720905cfdf1867504834f6567659fad1eff9..9528f03da58191d446ec9514a6dae736045feddd 100644
--- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod
+++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
@@ -12,7 +12,7 @@
     <entityField>
       <name>OBJECT_TYPE</name>
       <title>Context</title>
-      <possibleItemsProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/object_type/possibleItemsProcess.js</possibleItemsProcess>
+      <consumer>Contexts</consumer>
     </entityField>
     <entityField>
       <name>AB_ATTRIBUTEUSAGEID</name>
@@ -55,6 +55,15 @@
       <searchable v="false" />
       <onValidation>%aditoprj%/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js</onValidation>
     </entityField>
+    <entityConsumer>
+      <name>Contexts</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Context_entity</entityName>
+        <fieldName>Context</fieldName>
+      </dependency>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/AttributeUsage_entity/entityfields/object_type/possibleItemsProcess.js b/entity/AttributeUsage_entity/entityfields/object_type/possibleItemsProcess.js
deleted file mode 100644
index ad26576d8fcb56cd2457297eaf71b6468ddd264f..0000000000000000000000000000000000000000
--- a/entity/AttributeUsage_entity/entityfields/object_type/possibleItemsProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-
-//TODO: when available, use a function to get the possible contexts
-result.object([["Organisation_context", "Org"]]);
\ No newline at end of file
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index ebf5d2c1bbe810dbf0a1f875147254a052b81088..4742ecca3f226ea5923f827616939df3a781e919 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -49,6 +49,12 @@
           <fieldName>Contexts</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>628bd4db-3b31-4337-88ac-1c000307836f</name>
+          <entityName>AttributeUsage_entity</entityName>
+          <fieldName>Contexts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
diff --git a/entity/Contract_entity/recordcontainers/db/conditionProcess.js b/entity/Contract_entity/recordcontainers/db/conditionProcess.js
index fc35ae3505e35b73098af771e3ae16ad94f63a11..e7df60028a23a6cdac4dc3ee7b8fa831cc7a1c7f 100644
--- a/entity/Contract_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Contract_entity/recordcontainers/db/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
 
 var cond = SqlCondition.begin().andPrepareVars("CONTRACT.CONTACT_ID", "$param.RelId_param");
 
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(cond.build("1 = 1"))); 
\ No newline at end of file
diff --git a/entity/Offer_entity/conditionProcess.js b/entity/Offer_entity/conditionProcess.js
index 7cab12160289270ffdc06a05fbcafde1151be07e..46b77172c421062e7a3ca794200ae6c992f04147 100644
--- a/entity/Offer_entity/conditionProcess.js
+++ b/entity/Offer_entity/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
 var cond = new SqlCondition();
 cond.andPrepareVars("OFFER.SALESPROJECT_ID", "$param.SalesprojectId_param");
 
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/conditionProcess.js b/entity/Offer_entity/recordcontainers/db/conditionProcess.js
index 7cab12160289270ffdc06a05fbcafde1151be07e..46b77172c421062e7a3ca794200ae6c992f04147 100644
--- a/entity/Offer_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Offer_entity/recordcontainers/db/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
 var cond = new SqlCondition();
 cond.andPrepareVars("OFFER.SALESPROJECT_ID", "$param.SalesprojectId_param");
 
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/conditionProcess.js b/entity/Order_entity/recordcontainers/db/conditionProcess.js
index d470d3cb07db83d573e4cd6e894eff89351cac12..11dd858114ebf04db6ef1e00f817003e5a0c2b7b 100644
--- a/entity/Order_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Order_entity/recordcontainers/db/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
 var cond = new SqlCondition();
 cond.andPrepareVars("SALESORDER.SALESPROJECT_ID", "$param.SalesprojectId_param");
 
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
index 0c6aae84bba48f30903a0a7d7d900d605992280a..6e3446d992205ac3fe28c2db4ab869102f71fa72 100644
--- a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
@@ -4,7 +4,7 @@ import("system.db");
 import("system.result");
 import("Sql_lib");
 
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(
                 SqlCondition.begin()
                             .andPrepareVars("ORGANISATION.ORGANISATIONID", "$param.ContactId_param")
diff --git a/entity/Person_entity/conditionProcess.js b/entity/Person_entity/conditionProcess.js
index a19303b9872d89bd503a36a2a3d9567f77f98868..0c7d6ef5de8bd86e31f3946d8927293186fe2c07 100644
--- a/entity/Person_entity/conditionProcess.js
+++ b/entity/Person_entity/conditionProcess.js
@@ -7,5 +7,5 @@ cond.andPrepareVars("CONTACT.ORGANISATION_ID", "$param.OrgId_param");
 cond.andPrepareVars("PERSON.CONTACT_ID", "$param.ContactId_param");
 
 //TODO; add OBJECT_ID (probably another param)
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/conditionProcess.js b/entity/Person_entity/recordcontainers/db/conditionProcess.js
index b65379fa6d403b265f33fea2fadb1d19b9cb272c..e8302d00414fecb5dee552bfcacb6ff20a4a7f77 100644
--- a/entity/Person_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Person_entity/recordcontainers/db/conditionProcess.js
@@ -6,5 +6,5 @@ var cond = new SqlCondition();
 cond.andPrepareVars("CONTACT.ORGANISATION_ID", "$param.OrgId_param");
 cond.andPrepareVars("PERSON.CONTACT_ID", "$param.ContactId_param");
 
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/conditionProcess.js b/entity/SalesprojectCompetition_entity/conditionProcess.js
index 7211c893151bd82720da39955215dc913e23d244..f28e2da06f6d02e7faa5dee5adb832f282dadf59 100644
--- a/entity/SalesprojectCompetition_entity/conditionProcess.js
+++ b/entity/SalesprojectCompetition_entity/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
 var cond = new SqlCondition();
 cond.andPrepareVars("SALESPROJECT_COMPETITION.SALESPROJECT_ID", "$param.SalesprojectId_param");
 
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/conditionProcess.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/conditionProcess.js
index 7211c893151bd82720da39955215dc913e23d244..f28e2da06f6d02e7faa5dee5adb832f282dadf59 100644
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/SalesprojectCompetition_entity/recordcontainers/db/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
 var cond = new SqlCondition();
 cond.andPrepareVars("SALESPROJECT_COMPETITION.SALESPROJECT_ID", "$param.SalesprojectId_param");
 
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectCycle_entity/conditionProcess.js b/entity/SalesprojectCycle_entity/conditionProcess.js
index be87512e0c943b8c20fe1f1e80875e199fbf8c5d..01636c9c6c0e376f52c0a692d6d6bd7e8d755e9b 100644
--- a/entity/SalesprojectCycle_entity/conditionProcess.js
+++ b/entity/SalesprojectCycle_entity/conditionProcess.js
@@ -6,5 +6,5 @@ import("Sql_lib");
 var cond = new SqlCondition();
 cond.andPrepareVars("SALESPROJECT_CYCLE.SALESPROJECT_ID", "$param.SalesprojectId_param");
 
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectCycle_entity/recordcontainers/db/conditionProcess.js b/entity/SalesprojectCycle_entity/recordcontainers/db/conditionProcess.js
index be87512e0c943b8c20fe1f1e80875e199fbf8c5d..01636c9c6c0e376f52c0a692d6d6bd7e8d755e9b 100644
--- a/entity/SalesprojectCycle_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/SalesprojectCycle_entity/recordcontainers/db/conditionProcess.js
@@ -6,5 +6,5 @@ import("Sql_lib");
 var cond = new SqlCondition();
 cond.andPrepareVars("SALESPROJECT_CYCLE.SALESPROJECT_ID", "$param.SalesprojectId_param");
 
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectForecast_entity/conditionProcess.js b/entity/SalesprojectForecast_entity/conditionProcess.js
index ab985582570e10b3e838ec36f7f0d225bc21f1d2..647c25565dad24ef03a9efcfd30688ff06124f4f 100644
--- a/entity/SalesprojectForecast_entity/conditionProcess.js
+++ b/entity/SalesprojectForecast_entity/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
 var cond = new SqlCondition();
 cond.andPrepareVars("SALESPROJECT_FORECAST.SALESPROJECT_ID", "$param.SalesprojectId_param");
 
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectForecast_entity/recordcontainers/db/conditionProcess.js b/entity/SalesprojectForecast_entity/recordcontainers/db/conditionProcess.js
index ab985582570e10b3e838ec36f7f0d225bc21f1d2..647c25565dad24ef03a9efcfd30688ff06124f4f 100644
--- a/entity/SalesprojectForecast_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/SalesprojectForecast_entity/recordcontainers/db/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
 var cond = new SqlCondition();
 cond.andPrepareVars("SALESPROJECT_FORECAST.SALESPROJECT_ID", "$param.SalesprojectId_param");
 
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/conditionProcess.js b/entity/SalesprojectMember_entity/conditionProcess.js
index d7a57bbf3f47f3082a2b6db23040612a3224c94e..bfd5554266b3eafe24dfbfcaba9c62957b4b6edb 100644
--- a/entity/SalesprojectMember_entity/conditionProcess.js
+++ b/entity/SalesprojectMember_entity/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
 var cond = new SqlCondition();
 cond.andPrepareVars("SALESPROJECT_MEMBER.SALESPROJECT_ID", "$param.SalesprojectId_param");
 
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/recordcontainers/db/conditionProcess.js b/entity/SalesprojectMember_entity/recordcontainers/db/conditionProcess.js
index d7a57bbf3f47f3082a2b6db23040612a3224c94e..bfd5554266b3eafe24dfbfcaba9c62957b4b6edb 100644
--- a/entity/SalesprojectMember_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/SalesprojectMember_entity/recordcontainers/db/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
 var cond = new SqlCondition();
 cond.andPrepareVars("SALESPROJECT_MEMBER.SALESPROJECT_ID", "$param.SalesprojectId_param");
 
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/conditionProcess.js b/entity/SalesprojectSource_entity/conditionProcess.js
index e319b875ebe8be3ed307ad2d140029378eb3e4a0..073fed32ea8fe5e90c22f5083a6d2bd22cdadf6a 100644
--- a/entity/SalesprojectSource_entity/conditionProcess.js
+++ b/entity/SalesprojectSource_entity/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
 var cond = new SqlCondition();
 cond.andPrepareVars("SALESPROJECT_SOURCE.SALESPROJECT_ID", "$param.SalesprojectId_param");
 
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/recordcontainers/db/conditionProcess.js b/entity/SalesprojectSource_entity/recordcontainers/db/conditionProcess.js
index e319b875ebe8be3ed307ad2d140029378eb3e4a0..073fed32ea8fe5e90c22f5083a6d2bd22cdadf6a 100644
--- a/entity/SalesprojectSource_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/SalesprojectSource_entity/recordcontainers/db/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
 var cond = new SqlCondition();
 cond.andPrepareVars("SALESPROJECT_SOURCE.SALESPROJECT_ID", "$param.SalesprojectId_param");
 
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Timetracking_entity/recordcontainers/db/conditionProcess.js b/entity/Timetracking_entity/recordcontainers/db/conditionProcess.js
index 78f4834ba957291f36dc11c14be72cbf03298c37..453de018514acca0b31ecd289b38c76bf3c1c0f8 100644
--- a/entity/Timetracking_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Timetracking_entity/recordcontainers/db/conditionProcess.js
@@ -4,7 +4,7 @@ import("system.db");
 import("system.result");
 import("Sql_lib");
 
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(SqlCondition.begin()
             .andPrepareVars("TIMETRACKING.OBJECT_ID", "$param.ObjectId_param")
             .andPrepareVars("TIMETRACKING.ROW_ID", "$param.RowId_param")
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index c1c8d1700a6f29e348e3a21a08aa7d2925d86e80..5491aec2874ba100e1e0827a9e2e115abe132f45 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -738,9 +738,6 @@
     <entry>
       <key>Native Name</key>
     </entry>
-    <entry>
-      <key>ZIP code is not valid</key>
-    </entry>
     <entry>
       <key>Rabatt</key>
     </entry>
@@ -2286,6 +2283,57 @@
     <entry>
       <key>SAL</key>
     </entry>
+    <entry>
+      <key>Checkbox</key>
+    </entry>
+    <entry>
+      <key>Numeric value</key>
+    </entry>
+    <entry>
+      <key>decline</key>
+    </entry>
+    <entry>
+      <key>Text</key>
+    </entry>
+    <entry>
+      <key>Group</key>
+    </entry>
+    <entry>
+      <key>Combobox</key>
+    </entry>
+    <entry>
+      <key>tentative</key>
+    </entry>
+    <entry>
+      <key>${NUMBER}</key>
+    </entry>
+    <entry>
+      <key>Name \&amp;quot;%0\&amp;quot; already used for container \&amp;quot;%1\&amp;quot;</key>
+    </entry>
+    <entry>
+      <key>CHAR_VALUE</key>
+    </entry>
+    <entry>
+      <key>Keyword Attribute</key>
+    </entry>
+    <entry>
+      <key>in</key>
+    </entry>
+    <entry>
+      <key>Keyword Attribute Values</key>
+    </entry>
+    <entry>
+      <key>Boolean value</key>
+    </entry>
+    <entry>
+      <key>accept</key>
+    </entry>
+    <entry>
+      <key>The ZIP code does not match the format of the country.</key>
+    </entry>
+    <entry>
+      <key>String value</key>
+    </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 65445eea66285151213f41a569765fca398c94b2..d3719f8ce7d16f4dfef96e8ca1d1cc0547152679 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1206,9 +1206,6 @@
     <entry>
       <key>Native Name</key>
     </entry>
-    <entry>
-      <key>ZIP code is not valid</key>
-    </entry>
     <entry>
       <key>Rabatt</key>
     </entry>
@@ -2638,6 +2635,58 @@
     <entry>
       <key>SAL</key>
     </entry>
+    <entry>
+      <key>Checkbox</key>
+    </entry>
+    <entry>
+      <key>Numeric value</key>
+    </entry>
+    <entry>
+      <key>decline</key>
+    </entry>
+    <entry>
+      <key>Text</key>
+    </entry>
+    <entry>
+      <key>Group</key>
+    </entry>
+    <entry>
+      <key>Combobox</key>
+    </entry>
+    <entry>
+      <key>tentative</key>
+    </entry>
+    <entry>
+      <key>${NUMBER}</key>
+    </entry>
+    <entry>
+      <key>Name \&amp;quot;%0\&amp;quot; already used for container \&amp;quot;%1\&amp;quot;</key>
+    </entry>
+    <entry>
+      <key>CHAR_VALUE</key>
+    </entry>
+    <entry>
+      <key>Keyword Attribute</key>
+    </entry>
+    <entry>
+      <key>in</key>
+    </entry>
+    <entry>
+      <key>Keyword Attribute Values</key>
+    </entry>
+    <entry>
+      <key>Boolean value</key>
+    </entry>
+    <entry>
+      <key>accept</key>
+    </entry>
+    <entry>
+      <key>The ZIP code does not match the format of the country.</key>
+      <value>Die Postleitzahl hat nicht das Format des ausgewählten Landes.</value>
+    </entry>
+    <entry>
+      <key>String value</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 ae7af90419dbdfe808f9464dccbeef705be97346..503b12c83b4add02c4a3ba24503112bba563a24f 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -747,9 +747,6 @@
     <entry>
       <key>Native Name</key>
     </entry>
-    <entry>
-      <key>ZIP code is not valid</key>
-    </entry>
     <entry>
       <key>Rabatt</key>
     </entry>
@@ -2308,6 +2305,57 @@
     <entry>
       <key>SAL</key>
     </entry>
+    <entry>
+      <key>Checkbox</key>
+    </entry>
+    <entry>
+      <key>Numeric value</key>
+    </entry>
+    <entry>
+      <key>decline</key>
+    </entry>
+    <entry>
+      <key>Text</key>
+    </entry>
+    <entry>
+      <key>Group</key>
+    </entry>
+    <entry>
+      <key>Combobox</key>
+    </entry>
+    <entry>
+      <key>tentative</key>
+    </entry>
+    <entry>
+      <key>${NUMBER}</key>
+    </entry>
+    <entry>
+      <key>Name \&amp;quot;%0\&amp;quot; already used for container \&amp;quot;%1\&amp;quot;</key>
+    </entry>
+    <entry>
+      <key>CHAR_VALUE</key>
+    </entry>
+    <entry>
+      <key>Keyword Attribute</key>
+    </entry>
+    <entry>
+      <key>in</key>
+    </entry>
+    <entry>
+      <key>Keyword Attribute Values</key>
+    </entry>
+    <entry>
+      <key>Boolean value</key>
+    </entry>
+    <entry>
+      <key>accept</key>
+    </entry>
+    <entry>
+      <key>The ZIP code does not match the format of the country.</key>
+    </entry>
+    <entry>
+      <key>String value</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 336d6b092bda8ab38166821c8d50c82ace586ceb..5edf76c7779d54bddc411de7cb54029b31b8bf2f 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
 <preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.3">
   <name>_____PREFERENCES_PROJECT</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <projectName>xRM-Basic2019</projectName>
+  <projectName>xRM-Basic5</projectName>
   <jditoMaxContentSize v="57671680" />
   <calendarCategoriesEvent>
     <entry>