You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/08/23 11:29:45 UTC

svn commit: r688280 - in /ofbiz/trunk/applications/product: config/ProductUiLabels.xml webapp/catalog/category/CategoryTabBar.ftl

Author: jleroux
Date: Sat Aug 23 02:29:44 2008
New Revision: 688280

URL: http://svn.apache.org/viewvc?rev=688280&view=rev
Log:
Better French translations.
I also removed RollupShort which was same as Rollup for all languages

Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTabBar.ftl

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=688280&r1=688279&r2=688280&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sat Aug 23 02:29:44 2008
@@ -4181,7 +4181,7 @@
     <property key="PageTitleEditCategoryRollup">
         <value xml:lang="en">Edit Category Rollup</value>
         <value xml:lang="es">Editar jerarquía de una Categoría</value>
-        <value xml:lang="fr">Édition de la nomenclature de catégorie</value>
+        <value xml:lang="fr">Édition de la hiérarchie des catégorie</value>
         <value xml:lang="it">Aggiorna Categoria Arrivo</value>
         <value xml:lang="ro">Actualizeaza Categoria Sosire</value>
         <value xml:lang="ru">Изменить подчиненность категории</value>
@@ -4249,7 +4249,7 @@
     <property key="PageTitleEditFacilityGroupRollup">
         <value xml:lang="en">Edit Facility Group Rollup</value>
         <value xml:lang="es">Editar jerarquía de un Grupo de Almacén</value>
-        <value xml:lang="fr">Édition des nomenclatures du groupe de lieux de stockage</value>
+        <value xml:lang="fr">Édition de la hiérarchie du groupe de lieux de stockage</value>
         <value xml:lang="it">Aggiorna Gruppo Stabilimento Arrivo</value>
         <value xml:lang="ro">Actualizeaza Grup Compartiment Sosire</value>
         <value xml:lang="ru">Изменить подчиненность группы объектов</value>
@@ -7451,7 +7451,7 @@
     <property key="ProductCategoryRollupChildCategories">
         <value xml:lang="en">Category Rollup : Child Categories</value>
         <value xml:lang="es">Jerarquía de Categoría: Categorías hijas</value>
-        <value xml:lang="fr">Nomenclature : catégorie fille</value>
+        <value xml:lang="fr">Hiérarchie : catégorie fille</value>
         <value xml:lang="it">Categoria Arrivo : Categorie Figlie</value>
         <value xml:lang="ro">Categorie Sosire : Categorie Fice</value>
         <value xml:lang="ru">Подчиненность категории: подчиненные</value>
@@ -7461,7 +7461,7 @@
     <property key="ProductCategoryRollupParentCategories">
         <value xml:lang="en">Category Rollup : Parent Categories</value>
         <value xml:lang="es">Jerarquía de Categoría: Categorías padre</value>
-        <value xml:lang="fr">Nomenclature : catégorie parente</value>
+        <value xml:lang="fr">Hiérarchie : catégorie parente</value>
         <value xml:lang="it">Categoria Arrivo : Categorie Padri</value>
         <value xml:lang="ro">Categoria Sosire : Categorie Parinti</value>
         <value xml:lang="ru">Подчиненность категорий: родительские</value>
@@ -9274,7 +9274,7 @@
     <property key="ProductFacilityGroupRollupParentGroups">
         <value xml:lang="en">FacilityGroup Rollup : Parent Groups</value>
         <value xml:lang="es">Jerarquía de grupo de Almacén : Grupos padre</value>
-        <value xml:lang="fr">Nomenclature des groupes de lieux de stockage : groupes parents</value>
+        <value xml:lang="fr">Hiérarchie des groupes de lieux de stockage : groupes parents</value>
         <value xml:lang="it">Gruppo Stabilimento Arrivo : Gruppi Padri</value>
         <value xml:lang="ro">Grup Compartiment Sosire : Grup Parinti</value>
         <value xml:lang="ru">Подчиненность группы объектов: Родительские группы</value>
@@ -9945,7 +9945,7 @@
     </property>
     <property key="ProductGroupRollupChildGroupsAdd">
         <value xml:lang="en">Group Rollup : Add Child Groups</value>
-        <value xml:lang="fr">Nomenclature de groupe: ajouter des groupes descendants</value>
+        <value xml:lang="fr">Hiérarchie du groupe: ajouter des groupes descendants</value>
         <value xml:lang="it">Aggiungi Gruppo Stabilimento Arrivo : Gruppi Figlio</value>
         <value xml:lang="th">Group Rollup : Add Child Groups</value>
     </property>
@@ -15139,17 +15139,7 @@
     <property key="ProductRollup">
         <value xml:lang="en">Rollup</value>
         <value xml:lang="es">Jerarquía</value>
-        <value xml:lang="fr">Nomenclature</value>
-        <value xml:lang="it">Gerarchia</value>
-        <value xml:lang="ro">Sosire</value>
-        <value xml:lang="ru">Иерархия</value>
-        <value xml:lang="th">Rollup</value>
-        <value xml:lang="zh">汇总</value>
-    </property>
-    <property key="ProductRollupShort">
-        <value xml:lang="en">Rollup</value>
-        <value xml:lang="es">Jerarquía</value>
-        <value xml:lang="fr">Nomencl.</value>
+        <value xml:lang="fr">Hiérarchie</value>
         <value xml:lang="it">Gerarchia</value>
         <value xml:lang="ro">Sosire</value>
         <value xml:lang="ru">Иерархия</value>
@@ -15159,7 +15149,7 @@
     <property key="ProductRollups">
         <value xml:lang="en">Rollups</value>
         <value xml:lang="es">Jerarquía</value>
-        <value xml:lang="fr">Nomenclatures</value>
+        <value xml:lang="fr">Hiérarchies</value>
         <value xml:lang="it">Arrivi</value>
         <value xml:lang="ro">Sosiri</value>
         <value xml:lang="ru">Подчиненность</value>

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTabBar.ftl?rev=688280&r1=688279&r2=688280&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTabBar.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTabBar.ftl Sat Aug 23 02:29:44 2008
@@ -24,7 +24,7 @@
         <ul>
             <li><a href="<@o...@ofbizUrl>" class="${selectedClassMap.EditCategory?default(unselectedClassName)}">${uiLabelMap.ProductCategory}</a></li>
             <li><a href="<@o...@ofbizUrl>" class="${selectedClassMap.EditCategoryContent?default(unselectedClassName)}">${uiLabelMap.ProductCategoryContent}</a></li>
-            <li><a href="<@o...@ofbizUrl>" class="${selectedClassMap.EditCategoryRollup?default(unselectedClassName)}">${uiLabelMap.ProductRollupShort}</a></li>
+            <li><a href="<@o...@ofbizUrl>" class="${selectedClassMap.EditCategoryRollup?default(unselectedClassName)}">${uiLabelMap.ProductRollup}</a></li>
             <li><a href="<@o...@ofbizUrl>" class="${selectedClassMap.EditCategoryProducts?default(unselectedClassName)}">${uiLabelMap.ProductProducts}</a></li>
             <li><a href="<@o...@ofbizUrl>" class="${selectedClassMap.EditCategoryProdCatalogs?default(unselectedClassName)}">${uiLabelMap.ProductCatalogs}</a></li>
             <li><a href="<@o...@ofbizUrl>" class="${selectedClassMap.EditCategoryFeatureCats?default(unselectedClassName)}">${uiLabelMap.ProductFeatureCats}</a></li>