diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_salary_coefficient.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_salary_coefficient.xml index a0c45f6990223c5c736b7c6cad3badb7a9718fa6..2277c94493bcdfe1cbfa63e84d09cc932a1df3f7 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_salary_coefficient.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_salary_coefficient.xml @@ -74,7 +74,7 @@ <dictionary> <item> <key> <string>description</string> </key> - <value> <string>A coefficient related to the salary classification of the person</string> </value> + <value> <string>Coefficient used to materialize different salary levels for persons who have the same qualification but not the same experience: such as 1.1 or 1.2 or 2.1 etc, the higher the figure, the higher the salary</string> </value> </item> <item> <key> <string>field_id</string> </key> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_collective_agreement_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_collective_agreement_title.xml index 18a6c79406fd0a1af853f6b24837892256f1b706..63bd236600a3962c18592c1211485b0551c0782a 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_collective_agreement_title.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_collective_agreement_title.xml @@ -77,7 +77,7 @@ <dictionary> <item> <key> <string>description</string> </key> - <value> <string>The name of the collective agreement applied in an organisation.</string> </value> + <value> <string>Global agreement that applies to certain types of companies, and define certain guidelines like for instance paid vacations etc, in France, Nexedi\'s collective agreement is called SYNTEC.</string> </value> </item> <item> <key> <string>field_id</string> </key> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox.xml index aba851b9a235c62c871c6c1878e1c1922b4a4734..e6fcb103c50de9c93aa6b5d34a96b81fb57ac5f1 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox.xml @@ -102,7 +102,7 @@ </tuple> <tuple> <string>base_price</string> - <string>Exchange Rage</string> + <string>Exchange Rate</string> </tuple> <tuple> <string>translated_validation_state_title</string> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_contact_listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_contact_listbox.xml index 4c03e75639d204230b32cdb2a74bcde511ed6b92..ebc398982c5fe38ecc2c5ad2d62b2ec12ff9db50 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_contact_listbox.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_contact_listbox.xml @@ -89,7 +89,7 @@ </tuple> <tuple> <string>translated_portal_type</string> - <string>Coordinate Type</string> + <string>Contact Type</string> </tuple> <tuple> <string>title</string> @@ -97,7 +97,7 @@ </tuple> <tuple> <string>translated_id</string> - <string>Coordinate Function</string> + <string>Contact Function</string> </tuple> <tuple> <string>asText</string> @@ -185,7 +185,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Coordinates</string> </value> + <value> <string>Contacts</string> </value> </item> <item> <key> <string>url_columns</string> </key> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_geographic_incorporate_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_geographic_incorporate_code.xml index 5bdf5b0dcb8734f44a7e8ed77ff3a3324d4bb2f3..a88da52d8b32898ae5cecdfb2a832e5f920ea8a1 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_geographic_incorporate_code.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_geographic_incorporate_code.xml @@ -74,7 +74,7 @@ <dictionary> <item> <key> <string>description</string> </key> - <value> <string>The geographic incorporate code of this organisation, sometimes derivated from corporate code</string> </value> + <value> <string>This is the official code of the city in which the company has been registered. Those codes can be found on different websites, depending upon the country needed. In France for instance, it is available on the INSEE website. (www.insee.fr)</string> </value> </item> <item> <key> <string>field_id</string> </key> @@ -90,7 +90,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Geographic Incorporate Code</string> </value> + <value> <string>Geographic Incorporation Code</string> </value> </item> </dictionary> </value> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_code.xml index cdfdaceaaf0ac326405b8fec312df82f2afbe9e1..7feaaf45265ca1ab2d2ac58d499ba7dd54a6997a 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_code.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_code.xml @@ -77,7 +77,7 @@ <dictionary> <item> <key> <string>description</string> </key> - <value> <string>The organisation code for social security.</string> </value> + <value> <string>The Organisation\'s National Identification Number</string> </value> </item> <item> <key> <string>field_id</string> </key> @@ -93,7 +93,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Social Code</string> </value> + <value> <string>National Identification Number</string> </value> </item> </dictionary> </value> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_extension.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_extension.xml index 269182426b2b40ffcbe0fb69f7415ec9d3f5a741..b9762972004e09b1572b2238f205b112ae19b1fb 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_extension.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_extension.xml @@ -78,7 +78,7 @@ <dictionary> <item> <key> <string>description</string> </key> - <value> <string>The telephone extension</string> </value> + <value> <string>The telephone number suffix (extension)</string> </value> </item> <item> <key> <string>display_width</string> </key> @@ -98,7 +98,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Extension</string> </value> + <value> <string>Suffix</string> </value> </item> </dictionary> </value> diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index 37e6f1741c6beff28585046f1038d9f2377b9514..1dd3380cdc803bdfe9a1dcb15f5825a018f1dcf6 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -515 \ No newline at end of file +516 \ No newline at end of file