diff --git a/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_opportunity_state.xml b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_opportunity_state.xml
index 68a4796df7a8f4973e556ba22608e44e33cb85fe..2558cea2418a57f876538e233d06df9cf20eb69c 100644
--- a/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_opportunity_state.xml
+++ b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_opportunity_state.xml
@@ -45,7 +45,7 @@
<key> <string>_keys</string> </key>
<value>
<list>
- <string>table_0</string>
+<string>table_0</string>
</list>
</value>
</item>
@@ -103,7 +103,7 @@
<value> <string encoding="cdata"><![CDATA[
<dtml-var table_0>.original_message = catalog.opportunity_state\n
- AND <dtml-var table_0>.message_context = "opportunity_state_title"\n
+ AND <dtml-var table_0>.message_context = "opportunity_state"\n
AND <dtml-var table_0>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string">\n
@@ -144,7 +144,7 @@
<value> <string encoding="cdata"><![CDATA[
<dtml-var table_0>.original_message = catalog.opportunity_state\n
- AND <dtml-var table_0>.message_context = "opportunity_state_title"\n
+ AND <dtml-var table_0>.message_context = "opportunity_state"\n
AND <dtml-var table_0>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string">\n
diff --git a/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_opportunity_state_title.catalog_keys.xml b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_opportunity_state_title.catalog_keys.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7d6996cb9cc91ab4fe5229d7497a904d6d982ee2
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_opportunity_state_title.catalog_keys.xml
@@ -0,0 +1,2 @@
+<catalog_method>
+</catalog_method>
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_opportunity_state_title.xml b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_opportunity_state_title.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a091ede7eecc28cd0a9cabe677d878bd4c870399
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_opportunity_state_title.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.ZSQLMethods.SQL</string>
+ <string>SQL</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_arg</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_data</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>table_0</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>_keys</string> </key>
+ <value>
+ <list>
+ <string>table_0</string>
+ </list>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>allow_simple_one_argument_traversal</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>arguments_src</string> </key>
+ <value> <string>table_0</string> </value>
+ </item>
+ <item>
+ <key> <string>cache_time_</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>class_file_</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>class_name_</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>connection_hook</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>connection_id</string> </key>
+ <value> <string>erp5_sql_connection</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>z_related_translated_opportunity_state_title</string> </value>
+ </item>
+ <item>
+ <key> <string>max_cache_</string> </key>
+ <value> <int>100</int> </value>
+ </item>
+ <item>
+ <key> <string>max_rows_</string> </key>
+ <value> <int>1000</int> </value>
+ </item>
+ <item>
+ <key> <string>src</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<dtml-var table_0>.original_message = catalog.opportunity_state\n
+ AND <dtml-var table_0>.message_context = "opportunity_state_title"\n
+ AND <dtml-var table_0>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string">\n
+
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>template</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+ </klass>
+ <none/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>__name__</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<string>
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>_vars</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>globals</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>raw</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<dtml-var table_0>.original_message = catalog.opportunity_state\n
+ AND <dtml-var table_0>.message_context = "opportunity_state_title"\n
+ AND <dtml-var table_0>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string">\n
+
+
+]]></string> </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_validation_state_title.catalog_keys.xml b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_validation_state_title.catalog_keys.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7d6996cb9cc91ab4fe5229d7497a904d6d982ee2
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_validation_state_title.catalog_keys.xml
@@ -0,0 +1,2 @@
+<catalog_method>
+</catalog_method>
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_validation_state_title.xml b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_validation_state_title.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c30fbe7f187390647c2368ddf4ec27131f6df17c
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_validation_state_title.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.ZSQLMethods.SQL</string>
+ <string>SQL</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_arg</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_data</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>table_0</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>_keys</string> </key>
+ <value>
+ <list>
+<string>table_0</string>
+ </list>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>allow_simple_one_argument_traversal</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>arguments_src</string> </key>
+ <value> <string>table_0</string> </value>
+ </item>
+ <item>
+ <key> <string>cache_time_</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>class_file_</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>class_name_</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>connection_hook</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>connection_id</string> </key>
+ <value> <string>erp5_sql_connection</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>z_related_translated_validation_state_title</string> </value>
+ </item>
+ <item>
+ <key> <string>max_cache_</string> </key>
+ <value> <int>100</int> </value>
+ </item>
+ <item>
+ <key> <string>max_rows_</string> </key>
+ <value> <int>1000</int> </value>
+ </item>
+ <item>
+ <key> <string>src</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<dtml-var table_0>.original_message = catalog.validation_state\n
+ AND <dtml-var table_0>.message_context = "validation_state_title"\n
+ AND <dtml-var table_0>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string">
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>template</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+ </klass>
+ <none/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>__name__</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<string>
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>_vars</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>globals</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>raw</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<dtml-var table_0>.original_message = catalog.validation_state\n
+ AND <dtml-var table_0>.message_context = "validation_state_title"\n
+ AND <dtml-var table_0>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string">
+
+]]></string> </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/CatalogRelatedKeyTemplateItem/related_key_list.xml b/product/ERP5/bootstrap/erp5_core/CatalogRelatedKeyTemplateItem/related_key_list.xml
index a73dc8f205cdb720d76a9c215f159bc53fb74a40..eaa7d71da068cb364f4bda4036ec29d8260c3b95 100644
--- a/product/ERP5/bootstrap/erp5_core/CatalogRelatedKeyTemplateItem/related_key_list.xml
+++ b/product/ERP5/bootstrap/erp5_core/CatalogRelatedKeyTemplateItem/related_key_list.xml
@@ -24,11 +24,11 @@
<key>stock_section_category_strict_membership_uid | category/category_uid/z_related_strict_membership_section_uid_from_stock</key>
<key>stock_section_category_uid | category/category_uid/z_related_section_uid_from_stock</key>
<key>translated_opportunity_state | translation/translated_message/z_related_translated_opportunity_state</key>
- <key>translated_opportunity_state_title | translation/translated_message/z_related_translated_opportunity_state</key>
+ <key>translated_opportunity_state_title | translation/translated_message/z_related_translated_opportunity_state_title</key>
<key>translated_portal_type | translation/translated_message/z_related_translated_portal_type</key>
- <key>translated_simulation_state | translation/translated_message/z_related_translated_simulation_state_title</key>
- <key>translated_simulation_state_title | translation/translated_message/z_related_translated_simulation_state</key>
+ <key>translated_simulation_state | translation/translated_message/z_related_translated_simulation_state</key>
+ <key>translated_simulation_state_title | translation/translated_message/z_related_translated_simulation_state_title</key>
<key>translated_validation_state | translation/translated_message/z_related_translated_validation_state</key>
- <key>translated_validation_state_title | translation/translated_message/z_related_translated_validation_state</key>
+ <key>translated_validation_state_title | translation/translated_message/z_related_translated_validation_state_title</key>
<key>variationCategory | category/category_uid/z_related_uid</key>
</key_list>
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 7730ef7f3e0586b9070623baed6032dff904c9ea..0fa6a7b088051e48b8dc94d598b7e324e6f691c9 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-89
\ No newline at end of file
+90
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_catalog_method_id_list b/product/ERP5/bootstrap/erp5_core/bt/template_catalog_method_id_list
index 6ca242ad402976aa79ff61a70fc447c9d8403cbf..cf3796054f0cc59789f058d7bba9a472230bbc1e 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/template_catalog_method_id_list
+++ b/product/ERP5/bootstrap/erp5_core/bt/template_catalog_method_id_list
@@ -82,10 +82,12 @@ erp5_mysql/z_related_strict_membership_payment_uid_from_stock
erp5_mysql/z_related_strict_membership_resource_uid_from_stock
erp5_mysql/z_related_strict_membership_section_uid_from_stock
erp5_mysql/z_related_translated_opportunity_state
+erp5_mysql/z_related_translated_opportunity_state_title
erp5_mysql/z_related_translated_portal_type
erp5_mysql/z_related_translated_simulation_state
erp5_mysql/z_related_translated_simulation_state_title
erp5_mysql/z_related_translated_validation_state
+erp5_mysql/z_related_translated_validation_state_title
erp5_mysql/z_related_uid
erp5_mysql/z_related_uid_or_parent_uid
erp5_mysql/z_reserve_uid
diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_catalog_related_key_list b/product/ERP5/bootstrap/erp5_core/bt/template_catalog_related_key_list
index 512dfb2c02b0f336da58426bd26e2023980b7326..1f5aff1af1a8cfdb0733828be2557a3d5e32446e 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/template_catalog_related_key_list
+++ b/product/ERP5/bootstrap/erp5_core/bt/template_catalog_related_key_list
@@ -1,19 +1,22 @@
item_resource_category_uid | category/category_uid/z_related_resource_uid_from_item
stock_section_category_strict_membership_uid | category/category_uid/z_related_strict_membership_section_uid_from_stock
predicate_uid | predicate/uid/z_related_predicate
-translated_opportunity_state_title | translation/translated_message/z_related_translated_opportunity_state
+translated_opportunity_state | translation/translated_message/z_related_translated_opportunity_state
+translated_opportunity_state_title | translation/translated_message/z_related_translated_opportunity_state_title
career_skill_title | category,catalog,catalog/title/z_related_career_skill
stock_payment_category_uid | category/category_uid/z_related_payment_uid_from_stock
explanation_portal_type | movement,catalog/portal_type/z_related_explanation
stock_payment_category_strict_membership_uid | category/category_uid/z_related_strict_membership_payment_uid_from_stock
stock_resource_category_strict_membership_uid | category/category_uid/z_related_strict_membership_resource_uid_from_stock
translated_portal_type | translation/translated_message/z_related_translated_portal_type
-translated_simulation_state_title | translation/translated_message/z_related_translated_simulation_state
-translated_simulation_state | translation/translated_message/z_related_translated_simulation_state_title
+translated_simulation_state | translation/translated_message/z_related_translated_simulation_state
+translated_simulation_state_title | translation/translated_message/z_related_translated_simulation_state_title
translated_opportunity_state | translation/translated_message/z_related_translated_opportunity_state
+translated_opportunity_state_title | translation/translated_message/z_related_translated_opportunity_state_title
career_skill_id | category,catalog,catalog/id/z_related_career_skill
item_node_category_uid | category/category_uid/z_related_node_uid_from_item
-translated_validation_state_title | translation/translated_message/z_related_translated_validation_state
+translated_validation_state | translation/translated_message/z_related_translated_validation_state
+translated_validation_state_title | translation/translated_message/z_related_translated_validation_state_title
stock_section_category_uid | category/category_uid/z_related_section_uid_from_stock
allowedRolesAndUsers | roles_and_users/allowedRolesAndUsers/z_related_security
stock_mirror_section_category_strict_membership_uid | category/category_uid/z_related_strict_membership_mirror_section_uid_from_stock