From d8534c8630f0849f06e28fb788ff16b3a81d56b7 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Tue, 10 Feb 2009 11:57:22 +0000
Subject: [PATCH] * update several titles and descriptions of fields.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25507 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_base/Career_view/my_salary_coefficient.xml | 2 +-
.../my_collective_agreement_title.xml | 2 +-
.../portal_skins/erp5_base/Currency_view/listbox.xml | 2 +-
.../Entity_viewFieldLibrary/my_contact_listbox.xml | 6 +++---
.../my_geographic_incorporate_code.xml | 4 ++--
.../Organisation_viewFieldLibrary/my_social_code.xml | 4 ++--
.../Telephone_viewFieldLibrary/my_telephone_extension.xml | 4 ++--
bt5/erp5_base/bt/revision | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
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 a0c45f6990..2277c94493 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 18a6c79406..63bd236600 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 aba851b9a2..e6fcb103c5 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 4c03e75639..ebc398982c 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 5bdf5b0dcb..a88da52d8b 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 cdfdaceaaf..7feaaf4526 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 269182426b..b976297200 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 37e6f1741c..1dd3380cdc 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
--
2.30.9