svn commit: r829087 - in /ofbiz/branches/release09.04: ./ applications/product/config/Pr
Locked
svn commit: r829087 - in /ofbiz/branches/release09.04: ./ applications/product/config/Pr
 
|
Author: jleroux
Date: Fri Oct 23 15:09:51 2009 New Revision: 829087 URL: http://svn.apache.org/viewvc?rev=829087&view=rev Log: "Applied fix from trunk for revision: 829085" ------------------------------------------------------------------------ r829085 | jleroux | 2009-10-23 17:03:40 +0200 (ven. 23 oct. 2009) | 1 ligne Small cleanup in labels for categ content ------------------------------------------------------------------------ Modified: ofbiz/branches/release09.04/ (props changed) ofbiz/branches/release09.04/applications/product/config/ProductUiLabels.xml ofbiz/branches/release09.04/applications/product/webapp/catalog/category/CategoryForms.xml ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryContent.ftl Propchange: ofbiz/branches/release09.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Oct 23 15:09:51 2009 @@ -1 +1 @@ -/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810 814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971 +/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810 814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085 Modified: ofbiz/branches/release09.04/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/config/ProductUiLabels.xml?rev=829087&r1=829086&r2=829087&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/branches/release09.04/applications/product/config/ProductUiLabels.xml Fri Oct 23 15:09:51 2009 @@ -2322,7 +2322,7 @@ <value xml:lang="de">Primäre Produktkategorie ID</value> <value xml:lang="en">Primary Product Category Id</value> <value xml:lang="es">Código CategorÃa de producto primaria</value> - <value xml:lang="fr">Réf. de première catégorie d'article</value> + <value xml:lang="fr">Réf. de première catégorie</value> <value xml:lang="it">Codice Categoria Primaria Prodotto</value> <value xml:lang="ro">Cod Categorie Primara Produs</value> <value xml:lang="ru">Ðод оÑновной каÑегоÑии пÑодÑкÑов</value> @@ -4182,7 +4182,7 @@ <value xml:lang="de">Kategorie Produktkataloge bearbeiten</value> <value xml:lang="en">Edit Category Product Catalogs</value> <value xml:lang="es">Editar Catálogos de Productos de una CategorÃa</value> - <value xml:lang="fr">Modification des liens catégories d'article - catalogue</value> + <value xml:lang="fr">Modification des liens catégories - catalogue</value> <value xml:lang="it">Aggiorna Categoria Prodotto Cataloghi</value> <value xml:lang="ru">ÐзмениÑÑ ÐºÐ°ÑегоÑÐ¸Ñ Ð¿ÑодÑкÑа каÑалогов</value> <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹à¸ªà¸´à¸à¸à¹à¸²</value> @@ -4192,7 +4192,7 @@ <value xml:lang="de">Kategorie Produkte bearbeiten</value> <value xml:lang="en">Edit Category Products</value> <value xml:lang="es">Editar Productos de una CategorÃa</value> - <value xml:lang="fr">Modification des catégories d'article</value> + <value xml:lang="fr">Modification des catégories</value> <value xml:lang="it">Aggiorna Categoria Prodotti</value> <value xml:lang="ro">Actualizeaza Categoria Produs</value> <value xml:lang="ru">ÐзмениÑÑ ÐºÐ°ÑегоÑÐ¸Ñ Ð¿ÑодÑкÑов</value> @@ -7612,6 +7612,10 @@ <value xml:lang="th">หัวà¸à¹à¸</value> <value xml:lang="zh">å 容</value> </property> + <property key="ProductCategoryDescription"> + <value xml:lang="en">Category Description</value> + <value xml:lang="fr">Description de la catégorie</value> + </property> <property key="ProductCategoryId"> <value xml:lang="de">Kategorie ID</value> <value xml:lang="en">Category ID</value> @@ -15028,7 +15032,7 @@ <value xml:lang="de">Produktkategorie Typ</value> <value xml:lang="en">Product Category Type</value> <value xml:lang="es">Tipo de CategorÃa de productos</value> - <value xml:lang="fr">Type de catégorie d'article</value> + <value xml:lang="fr">Type de catégorie</value> <value xml:lang="it">Tipo Categoria Prodotto</value> <value xml:lang="ro">Tip Categorie Produs</value> <value xml:lang="ru">Тип каÑегоÑии</value> @@ -15050,7 +15054,7 @@ <value xml:lang="de">Produkt Inhalttyp ID</value> <value xml:lang="en">Product Content Type Id</value> <value xml:lang="es">Código de tipo de configuración de producto</value> - <value xml:lang="fr">Type de contenu d'article</value> + <value xml:lang="fr">Type de contenu</value> <value xml:lang="it">Tipo Contenuto Prodotto</value> <value xml:lang="ro">Tip Continut Produs</value> <value xml:lang="ru">Тип конÑенÑа</value> @@ -15072,7 +15076,7 @@ <value xml:lang="de">Produktbeschreibung</value> <value xml:lang="en">Product Description</value> <value xml:lang="es">Descripción del producto</value> - <value xml:lang="fr">Description article</value> + <value xml:lang="fr">Description de l'article</value> <value xml:lang="it">Descrizione Prodotto</value> <value xml:lang="ro">Descriere Produs</value> <value xml:lang="ru">ÐпиÑание пÑодÑкÑа</value> Modified: ofbiz/branches/release09.04/applications/product/webapp/catalog/category/CategoryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/catalog/category/CategoryForms.xml?rev=829087&r1=829086&r2=829087&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/product/webapp/catalog/category/CategoryForms.xml (original) +++ ofbiz/branches/release09.04/applications/product/webapp/catalog/category/CategoryForms.xml Fri Oct 23 15:09:51 2009 @@ -43,7 +43,7 @@ header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="ProductCategoryContent"/> <field name="productCategoryId" map-name="productCategory"><hidden/></field> - <field name="contentId"> + <field name="contentId" title="${uiLabelMap.ProductContentId}"> <lookup target-form-name="LookupContent"/> </field> <field name="prodCatContentTypeId"> Modified: ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryContent.ftl?rev=829087&r1=829086&r2=829087&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryContent.ftl (original) +++ ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryContent.ftl Fri Oct 23 15:09:51 2009 @@ -41,7 +41,7 @@ <td width="74%"><input type="text" value="${(productCategory.categoryName)?if_exists}" name="categoryName" size="60" maxlength="60"/></td> </tr> <tr> - <td width="26%" align="right" class="label">${uiLabelMap.ProductProductDescription}</td> + <td width="26%" align="right" class="label">${uiLabelMap.ProductCategoryDescription}</td> <td> </td> <td width="74%" colspan="4" valign="top"> <textarea name="description" cols="60" rows="2">${(productCategory.description)?if_exists}</textarea> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |