svn commit: r1066050 - in /ofbiz/branches/release10.04: ./ applications/product/config/ProductUiLabels.xml

Author: jleroux
Date: Tue Feb  1 14:21:08 2011
New Revision: 1066050

URL: http://svn.apache.org/viewvc?rev=1066050&view=rev
Log:
"Applied fix from trunk for revision: 1066048" (conflicts handled by hand)
------------------------------------------------------------------------
r1066048 | jleroux | 2011-02-01 15:03:31 +0100 (mar., 01 févr. 2011) | 1 line

Fix subscription resource labels, add French
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/product/config/ProductUiLabels.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  1 14:21:08 2011
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990
 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060236,1060261,1060368,1060933,1061167,1061307,1061346,1061886,1061939,1062138,1062144,1062152,1063273,1064090,1064953,1064993,1065550
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990
 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060236,1060261,1060368,1060933,1061167,1061307,1061346,1061886,1061939,1062138,1062144,1062152,1063273,1064090,1064953,1064993,1065550,1066048

Modified: ofbiz/branches/release10.04/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/config/ProductUiLabels.xml?rev=1066050&r1=1066049&r2=1066050&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/release10.04/applications/product/config/ProductUiLabels.xml Tue Feb  1 14:21:08 2011
@@ -979,10 +979,11 @@
         <value xml:lang="zh">自动保存购物车</value>
     </property>
     <property key="FormFieldTitle_automaticExtend">
-        <value xml:lang="en">Automatic Extend</value>
-        <value xml:lang="fr">Extension automatique</value>
-        <value xml:lang="it">Estendi automaticamente</value>
-        <value xml:lang="zh">自动扩展</value>
+        <value xml:lang="en">The subscription will be extended at the end of the subscription period with a new order</value>
+        <value xml:lang="fr">Une nouvelle commande étendra l'abonnement à la fin de la période de souscription</value>
+        <value xml:lang="it">L'abbonamento sarà esteso alla fine del periodo con un nuovo ordine</value>
+        <value xml:lang="zh">在订阅结束时通过新建订单来延期的订阅</value>
+        <value xml:lang="zh_TW">在訂閱結束時通過新建訂單來延期的訂閱</value>
     </property>
     <property key="FormFieldTitle_availableFromDate">
         <value xml:lang="de">Verfügbar von Datum</value>
@@ -1112,13 +1113,13 @@
     </property>
     <property key="FormFieldTitle_canclAutmExtTime">
         <value xml:lang="en">The time period (before the end of the thruedate) after which the automatic extension of the subscription will be executed.</value>
-        <value xml:lang="it">Il periodo di tempo (prima della fine di thruedate) dopo che l'estensione automatica della sottoscrizione eseguita.</value>
+        <value xml:lang="fr">Durée (avant la date de fin) après laquelle l'abonn. sera automatiquement étendu</value>        
+        <value xml:lang="it">Il periodo di tempo (prima della data di termine) dopo che l'estensione automatica dell'abbonamento verrà eseguita.</value>
         <value xml:lang="zh">在要执行的订阅自动延期后的时间段(在结束日期结束前)</value>
     </property>
     <property key="FormFieldTitle_canclAutmExtTimeUomId">
-        <value xml:lang="en">The subscription will be extended at the end of the subscription period with a new order</value>
-        <value xml:lang="it">La sottoscrizione sarà estessa all fine del periodo della sottoscrizione con un nuovo ordine</value>
-        <value xml:lang="zh">在订阅结束时通过新建订单来延期的订阅</value>
+        <value xml:lang="en">Unit Of Measure used for the automatic extension of the subscription.</value>
+        <value xml:lang="fr">Unité de temps utilisée pour l'extension automatique de l'abonnement</value>        
     </property>
     <property key="FormFieldTitle_carrierId">
         <value xml:lang="de">Transportunternehmen ID</value>