You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2018/01/02 21:58:38 UTC
svn commit: r1819906 - in /ofbiz/ofbiz-framework/trunk:
applications/accounting/config/ applications/content/config/
applications/humanres/config/ applications/manufacturing/config/
applications/marketing/config/ applications/order/config/ applications...
Author: jamesyong
Date: Tue Jan 2 21:58:37 2018
New Revision: 1819906
URL: http://svn.apache.org/viewvc?rev=1819906&view=rev
Log:
Fixed: ID should be the abbreviation for identity in English
(OFBIZ-10131)
Replaced the word 'Id' with 'ID' in the *Labels.xml files for "en" locale.
Improved the logic for auto title so that labels generated for variables like productTypeId
will be 'Product Type ID' instead of 'Product Type Id'.
Thanks: Jacques for the review.
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingErrorUiLabels.xml
ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/ofbiz-framework/trunk/applications/content/config/ContentUiLabels.xml
ofbiz/ofbiz-framework/trunk/applications/humanres/config/HumanResUiLabels.xml
ofbiz/ofbiz-framework/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml
ofbiz/ofbiz-framework/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
ofbiz/ofbiz-framework/trunk/applications/marketing/config/MarketingUiLabels.xml
ofbiz/ofbiz-framework/trunk/applications/order/config/OrderErrorUiLabels.xml
ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml
ofbiz/ofbiz-framework/trunk/applications/party/config/PartyUiLabels.xml
ofbiz/ofbiz-framework/trunk/applications/product/config/ProductEntityLabels.xml
ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/ofbiz-framework/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml
ofbiz/ofbiz-framework/trunk/framework/common/config/TemporalExpressionUiLabels.xml
ofbiz/ofbiz-framework/trunk/framework/webtools/config/WebtoolsUiLabels.xml
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java
Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingErrorUiLabels.xml?rev=1819906&r1=1819905&r2=1819906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingErrorUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingErrorUiLabels.xml Tue Jan 2 21:58:37 2018
@@ -85,7 +85,7 @@
<property key="AccountingEftPartyNotAuthorized">
<value xml:lang="ar">دÙÙ٠طر٠${partyId} ÙÙØ³ اÙÙ
اÙÙ ÙØ·ÙÙØ© Ø§ÙØ¯Ùع ${paymentMethodId} ÙÙÙØ³ ÙØ¯ÙÙ ØµÙØ§ØÙØ© تغÙÙØ±Ùا</value>
<value xml:lang="de">Akteur Id ${partyId} ist nicht der Besitzer der Bezahlmethode ${paymentMethodId} und hat keine Berechtigung diese zu ändern.</value>
- <value xml:lang="en">Party Id ${partyId} is not the owner of payment method ${paymentMethodId} and does not have permission to change it.</value>
+ <value xml:lang="en">Party ID ${partyId} is not the owner of payment method ${paymentMethodId} and does not have permission to change it.</value>
<value xml:lang="it">Il soggetto ${partyId} non è il propretario del metodo di pagamento ${paymentMethodId} non hai il permesso per cambiarlo.</value>
<value xml:lang="ja">åå¼å
ID ${partyId} ã¯æ¯ææ¹æ³ ${paymentMethodId} ã®ææè
ã§ã¯ãªããã夿´ããæ¨©éãããã¾ããã</value>
<value xml:lang="nl">Partij ${partyId} is niet de eigenaar van betaalmethode ${paymentMethodId}, en heeft geen permissies tot wijzigen.</value>
@@ -424,7 +424,7 @@
<property key="AccountingGiftCardPartyNotAuthorized">
<value xml:lang="ar">دÙÙÙ Ø§ÙØ·Ø±Ù ${partyId} ÙÙØ³ Ù
اÙ٠طرÙÙØ© Ø§ÙØ¯Ùع ${paymentMethodId} ÙÙÙØ³ ÙØ¯ÙÙ ØµÙØ§ØÙØ© تغÙÙØ±Ùا</value>
<value xml:lang="de">Akteur Id ${partyId} ist nicht Besitzer der Zahlmethode ${paymentMethodId} und hat keine Berechtigung sie zu ändern.</value>
- <value xml:lang="en">Party Id ${partyId} is not the owner of payment method ${paymentMethodId} and does not have permission to change it.</value>
+ <value xml:lang="en">Party ID ${partyId} is not the owner of payment method ${paymentMethodId} and does not have permission to change it.</value>
<value xml:lang="it">Il soggetto ${partyId} non è il propretario del metodo di pagamento ${paymentMethodId} non hai il permesso per cambiarlo.</value>
<value xml:lang="ja">åå¼å
ID ${partyId} ã¯æ¯ææ¹æ³ ${paymentMethodId} ã®ææè
ã§ã¯ãªããã夿´ããæ¨©éãããã¾ããã</value>
<value xml:lang="pt">ID de Participante ${partyId} não é o proprietário do método de pagamento de ${paymentMethodId} e não têm permissão para alterá-lo.</value>
Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1819906&r1=1819905&r2=1819906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Jan 2 21:58:37 2018
@@ -654,7 +654,7 @@
<property key="AccountingAgreementId">
<value xml:lang="ar">دÙÙÙ Ø§ÙØ¥ØªÙاÙÙØ©</value>
<value xml:lang="de">Vereinbarungs-ID</value>
- <value xml:lang="en">Agreement Id</value>
+ <value xml:lang="en">Agreement ID</value>
<value xml:lang="es">Id acuerdo</value>
<value xml:lang="fr">Réf. de l'accord commercial</value>
<value xml:lang="hi-IN">à¤
नà¥à¤¬à¤à¤§ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
@@ -3880,7 +3880,7 @@
<property key="AccountingCreditCardUpdateWithoutPermission">
<value xml:lang="ar">دÙÙÙ Ø§ÙØ·Ø±Ù [${partyId}] ÙÙØ³ اÙÙ
اÙÙ ÙØ·Ø±ÙÙØ© Ø§ÙØ¯Ùع [${paymentMethodId}] ÙÙÙØ³ ÙØ¯ÙÙ Ø§ÙØµÙاØÙØ© ÙØªØºÙÙØ±Ùا.</value>
<value xml:lang="de">Benutzer [${partyId}] ist nicht der Besitzer der Zahlungsmethode [${paymentMethodId}] und hat keine Berechtigung diese zu ändern.</value>
- <value xml:lang="en">Party Id [${partyId}] is not the owner of payment method [${paymentMethodId}] and does not have permission to change it.</value>
+ <value xml:lang="en">Party ID [${partyId}] is not the owner of payment method [${paymentMethodId}] and does not have permission to change it.</value>
<value xml:lang="fr">L'acteur [${partyId}] n'est pas le possesseur de la méthode de paiement [${paymentMethodId}], il n'a pas les autorisations pour la changer</value>
<value xml:lang="it">Soggetto [${partyId}] non è il proprietario del metodo di pagamento [${paymentMethodId}] e non ha il permesso di cambiarlo.</value>
<value xml:lang="ja">åå¼å
ID [${partyId}] ã¯æ¯ææ¹æ³ [${paymentMethodId}] ãææãã¦ããªãããã夿´ããæ¨©éãããã¾ããã</value>
@@ -10905,7 +10905,7 @@
<property key="AccountingPartyIdFrom">
<value xml:lang="ar">دÙÙÙ Ø§ÙØ·Ø±Ù (Ù
Ù)</value>
<value xml:lang="de">Akteur-Nr von</value>
- <value xml:lang="en">Party Id From</value>
+ <value xml:lang="en">Party ID From</value>
<value xml:lang="es">Id Grupo Origen</value>
<value xml:lang="fr">Réf. acteur (de)</value>
<value xml:lang="hi-IN">पारà¥à¤à¥ à¤à¥à¤°à¤®à¤¾à¤à¤ सà¥</value>
@@ -10924,7 +10924,7 @@
<value xml:lang="ar">دÙÙÙ Ø§ÙØ·Ø±Ù (Ø¥ÙÙ)</value>
<value xml:lang="cs">PÅÃjemce</value>
<value xml:lang="de">Akteur-Nr zu</value>
- <value xml:lang="en">Party Id To</value>
+ <value xml:lang="en">Party ID To</value>
<value xml:lang="es">Id Grupo destino</value>
<value xml:lang="fr">Réf. acteur (à )</value>
<value xml:lang="hi-IN">पारà¥à¤à¥ à¤à¥à¤°à¤®à¤¾à¤à¤ à¤à¥</value>
@@ -13477,7 +13477,7 @@
<property key="AccountingProductId">
<value xml:lang="ar">دÙÙÙ Ø§ÙØ³Ùعة</value>
<value xml:lang="de">Produkt ID</value>
- <value xml:lang="en">Product Id</value>
+ <value xml:lang="en">Product ID</value>
<value xml:lang="es">Id Producto</value>
<value xml:lang="fr">Réf. produit</value>
<value xml:lang="hi-IN">à¤à¤¤à¥à¤ªà¤¾à¤¦ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
@@ -17108,7 +17108,7 @@
<property key="FormFieldTitle_agreementId">
<value xml:lang="ar">دÙÙÙ Ø§ÙØ¥ØªÙاÙÙØ©</value>
<value xml:lang="de">Vereinbarungs ID</value>
- <value xml:lang="en">Agreement Id</value>
+ <value xml:lang="en">Agreement ID</value>
<value xml:lang="es">Id Acuerdo</value>
<value xml:lang="fr">Réf. d'accord</value>
<value xml:lang="hi-IN">à¤
नà¥à¤¬à¤à¤§ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
@@ -17559,7 +17559,7 @@
<property key="FormFieldTitle_clientId">
<value xml:lang="ar">دÙÙÙ Ø§ÙØ¹Ù
ÙÙ</value>
<value xml:lang="de">Kunden Id</value>
- <value xml:lang="en">Client Id</value>
+ <value xml:lang="en">Client ID</value>
<value xml:lang="fr">Client</value>
<value xml:lang="hi-IN">à¤à¥à¤°à¤¾à¤¹à¤ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
<value xml:lang="it">Id client</value>
@@ -18791,7 +18791,7 @@
<property key="FormFieldTitle_groupId">
<value xml:lang="ar">دÙÙ٠اÙÙ
جÙ
ÙØ¹Ø©</value>
<value xml:lang="de">Gruppe Id</value>
- <value xml:lang="en">Group Id</value>
+ <value xml:lang="en">Group ID</value>
<value xml:lang="fr">Groupe</value>
<value xml:lang="hi-IN">समà¥à¤¹ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
<value xml:lang="it">Id gruppo</value>
@@ -18939,7 +18939,7 @@
</property>
<property key="FormFieldTitle_invoiceIdPrefix">
<value xml:lang="de">Rechnungsnummer Prefix</value>
- <value xml:lang="en">Invoice Id Prefix</value>
+ <value xml:lang="en">Invoice ID Prefix</value>
<value xml:lang="es">Id Prefijo Factura</value>
<value xml:lang="fr">Préfixe de facture</value>
<value xml:lang="hi-IN">à¤à¤ªà¤¸à¤°à¥à¤ à¤à¤¾à¤²à¤¾à¤¨ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
@@ -19383,7 +19383,7 @@
<property key="FormFieldTitle_merchantId">
<value xml:lang="ar">دÙÙÙ Ø§ÙØªØ§Ø¬Ø±</value>
<value xml:lang="de">Verkäufer Id</value>
- <value xml:lang="en">Merchant Id</value>
+ <value xml:lang="en">Merchant ID</value>
<value xml:lang="fr">Revendeur</value>
<value xml:lang="hi-IN">वà¥à¤¯à¤¾à¤ªà¤¾à¤°à¥ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
<value xml:lang="it">Codice negoziante</value>
@@ -19572,7 +19572,7 @@
</property>
<property key="FormFieldTitle_orderIdPrefix">
<value xml:lang="de">Bestell-Nr. Prefix</value>
- <value xml:lang="en">Order Id Prefix</value>
+ <value xml:lang="en">Order ID Prefix</value>
<value xml:lang="es">Id Prefijo de orden</value>
<value xml:lang="fr">Préfixe de commande</value>
<value xml:lang="hi-IN">à¤à¤ªà¤¸à¤°à¥à¤ à¤à¤¦à¥à¤¶ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
@@ -19975,7 +19975,7 @@
<property key="FormFieldTitle_paymentId">
<value xml:lang="ar">دÙÙÙ Ø§ÙØ¯Ùعة</value>
<value xml:lang="de">Zahlung Id</value>
- <value xml:lang="en">Payment Id</value>
+ <value xml:lang="en">Payment ID</value>
<value xml:lang="es">Id Pago</value>
<value xml:lang="fr">Réf. du paiement</value>
<value xml:lang="hi-IN">à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
@@ -20403,7 +20403,7 @@
<property key="FormFieldTitle_productId">
<value xml:lang="ar">دÙÙÙ Ø§ÙØ³Ùعة</value>
<value xml:lang="de">Produkt ID</value>
- <value xml:lang="en">Product Id</value>
+ <value xml:lang="en">Product ID</value>
<value xml:lang="es">Id Producto</value>
<value xml:lang="fr">Réf. produit</value>
<value xml:lang="hi-IN">à¤à¤¤à¥à¤ªà¤¾à¤¦ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
@@ -20540,7 +20540,7 @@
</property>
<property key="FormFieldTitle_quoteIdPrefix">
<value xml:lang="de">Angebotsnummer Prefix</value>
- <value xml:lang="en">Quote Id Prefix</value>
+ <value xml:lang="en">Quote ID Prefix</value>
<value xml:lang="es">Id Prefijo de Presupuesto</value>
<value xml:lang="fr">Préfixe de devis</value>
<value xml:lang="hi-IN">à¤à¤ªà¤¸à¤°à¥à¤ à¤à¥à¤(Quote) à¤à¥à¤°à¤®à¤¾à¤à¤</value>
@@ -20656,7 +20656,7 @@
<property key="FormFieldTitle_receiptId">
<value xml:lang="ar">دÙÙ٠اÙÙØµÙ</value>
<value xml:lang="de">Belegnummer</value>
- <value xml:lang="en">Receipt Id</value>
+ <value xml:lang="en">Receipt ID</value>
<value xml:lang="es">Id Recibo</value>
<value xml:lang="fr">Réf. du reçu</value>
<value xml:lang="hi-IN">रसà¥à¤¦ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
@@ -21020,7 +21020,7 @@
<property key="FormFieldTitle_shipmentId">
<value xml:lang="ar">دÙÙÙ Ø§ÙØ´ØÙØ©</value>
<value xml:lang="de">Versand-Nr.</value>
- <value xml:lang="en">Shipment Id</value>
+ <value xml:lang="en">Shipment ID</value>
<value xml:lang="es">Id EnvÃo</value>
<value xml:lang="fr">Réf. d'expédition</value>
<value xml:lang="hi-IN">शिपमà¥à¤à¤ à¤à¥à¤°à¤®à¤¾à¤à¤(ShipmentId)</value>
@@ -21038,7 +21038,7 @@
<property key="FormFieldTitle_sourceId">
<value xml:lang="ar">دÙÙ٠اÙÙ
صدر</value>
<value xml:lang="de">Quelle Id</value>
- <value xml:lang="en">Source Id</value>
+ <value xml:lang="en">Source ID</value>
<value xml:lang="fr">Réf. source</value>
<value xml:lang="hi-IN">सà¥à¤°à¥à¤¤ à¤à¥à¤°à¤®à¤¾à¤à¤(SourceId)</value>
<value xml:lang="it">Id sorgente</value>
@@ -21137,7 +21137,7 @@
<value xml:lang="ar">ÙÙ
Ø· ØªÙØ³Ù٠دÙÙÙ Ø§ÙØ¶Ø±Ø§Ø¦Ø¨</value>
<value xml:lang="cs">Vzor formátu DIÄ</value>
<value xml:lang="de">Steuer-Nr. Format-Pattern</value>
- <value xml:lang="en">Tax Id Format Pattern</value>
+ <value xml:lang="en">Tax ID Format Pattern</value>
<value xml:lang="es">Id Impuesto Formato Patrón</value>
<value xml:lang="fr">Format d'identifiant fiscal</value>
<value xml:lang="hi-IN">à¤à¥à¤à¥à¤¸ à¤à¥à¤°à¤®à¤¾à¤à¤ सà¥à¤µà¤°à¥à¤ª पà¥à¤à¤°à¥à¤¨</value>
@@ -21597,7 +21597,7 @@
<property key="FormFieldTitle_userId">
<value xml:lang="ar">دÙÙ٠اÙÙ
ستخدÙ
</value>
<value xml:lang="de">Benutzer Id</value>
- <value xml:lang="en">User Id</value>
+ <value xml:lang="en">User ID</value>
<value xml:lang="fr">Identifiant</value>
<value xml:lang="hi-IN">à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾ à¤à¥à¤°à¤®à¤¾à¤à¤(userId)</value>
<value xml:lang="it">Id utente</value>
Modified: ofbiz/ofbiz-framework/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/config/ContentUiLabels.xml?rev=1819906&r1=1819905&r2=1819906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/config/ContentUiLabels.xml Tue Jan 2 21:58:37 2018
@@ -966,7 +966,7 @@
<value xml:lang="zh-TW">å¨${serviceName}䏿°å»ºå
§å®¹æåºé¯</value>
</property>
<property key="ContentContentIdOrUploadFileIsMissing">
- <value xml:lang="en">Content Id or Upload file is missing.</value>
+ <value xml:lang="en">Content ID or Upload file is missing.</value>
<value xml:lang="fr">La référence du document ou le fichier à charger est manquant.</value>
<value xml:lang="it">Id contenuto o file da caricare è mancante.</value>
<value xml:lang="ja">ã³ã³ãã³ãIDã¾ãã¯ã¢ãããã¼ããã¡ã¤ã«ãæ£ããããã¾ããã</value>
@@ -3880,7 +3880,7 @@
<value xml:lang="ar">اÙÙ
ØØªÙ٠إÙÙ</value>
<value xml:lang="da">Indholds Id til</value>
<value xml:lang="de">Inhalt ID zu</value>
- <value xml:lang="en">Content Id To</value>
+ <value xml:lang="en">Content ID To</value>
<value xml:lang="fr">Contenu vers</value>
<value xml:lang="it">Contenuto A</value>
<value xml:lang="ja">ã³ã³ãã³ãID(å
)</value>
@@ -3965,7 +3965,7 @@
<property key="FormFieldTitle_coContentId">
<value xml:lang="da">Indholds Id</value>
<value xml:lang="de">Inhalt ID</value>
- <value xml:lang="en">Content Id</value>
+ <value xml:lang="en">Content ID</value>
<value xml:lang="fr">Contenu</value>
<value xml:lang="it">Contenuto</value>
<value xml:lang="ja">ã³ã³ãã³ãID</value>
@@ -4086,7 +4086,7 @@
<value xml:lang="ar">تعرÙ٠اÙÙ
ØØªÙÙ</value>
<value xml:lang="da">Indhold Id</value>
<value xml:lang="de">Inhalt ID</value>
- <value xml:lang="en">Content Id</value>
+ <value xml:lang="en">Content ID</value>
<value xml:lang="es">Código de contenido</value>
<value xml:lang="fr">Contenu</value>
<value xml:lang="it">Contenuto</value>
@@ -4104,7 +4104,7 @@
<value xml:lang="ar">Ù
ØØªÙÙ Ù
Ù</value>
<value xml:lang="da">Indhold Id fra</value>
<value xml:lang="de">Inhalt ID von</value>
- <value xml:lang="en">Content Id From</value>
+ <value xml:lang="en">Content ID From</value>
<value xml:lang="fr">Contenu depuis</value>
<value xml:lang="it">Codice Contenuto A</value>
<value xml:lang="ja">ã³ã³ãã³ãID(å
)</value>
@@ -4120,7 +4120,7 @@
<value xml:lang="ar">Ù
ØØªÙ٠إÙÙ</value>
<value xml:lang="da">Indhold Id fra</value>
<value xml:lang="de">Inhalt ID zu</value>
- <value xml:lang="en">Content Id To</value>
+ <value xml:lang="en">Content ID To</value>
<value xml:lang="fr">Contenu vers</value>
<value xml:lang="it">Codice Contenuto A</value>
<value xml:lang="ja">ã³ã³ãã³ãID(å
)</value>
@@ -4229,7 +4229,7 @@
</property>
<property key="FormFieldTitle_contentStatusId">
<value xml:lang="da">Status id</value>
- <value xml:lang="en">Status Id</value>
+ <value xml:lang="en">Status ID</value>
<value xml:lang="it">Stato</value>
<value xml:lang="ja">ã¹ãã¼ã¿ã¹ID</value>
<value xml:lang="nl">Status ID</value>
@@ -5448,7 +5448,7 @@
<value xml:lang="ar">تعرÙ٠اÙÙ
رجع</value>
<value xml:lang="da">Reference id</value>
<value xml:lang="de">Referenz ID</value>
- <value xml:lang="en">Reference Id</value>
+ <value xml:lang="en">Reference ID</value>
<value xml:lang="fr">Référence</value>
<value xml:lang="it">Numero Riferimento</value>
<value xml:lang="ja">åç
§ID</value>
@@ -5664,7 +5664,7 @@
<value xml:lang="ar">تعرÙÙ Ø§ÙØªØµÙÙØª</value>
<value xml:lang="da">Rundspørge id</value>
<value xml:lang="de">Befragung ID</value>
- <value xml:lang="en">Survey Id</value>
+ <value xml:lang="en">Survey ID</value>
<value xml:lang="es">Código de encuesta</value>
<value xml:lang="fr">Sondage</value>
<value xml:lang="it">Numero sondaggio</value>
Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/config/HumanResUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=1819906&r1=1819905&r2=1819906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/humanres/config/HumanResUiLabels.xml Tue Jan 2 21:58:37 2018
@@ -78,7 +78,7 @@
</property>
<property key="FormFieldTitle_applicationId">
<value xml:lang="de">Einsatzgebiet ID</value>
- <value xml:lang="en">Application Id</value>
+ <value xml:lang="en">Application ID</value>
<value xml:lang="fr">Demande d'emploi</value>
<value xml:lang="it">Numero Applicazione</value>
<value xml:lang="ja">ç³è«ID</value>
@@ -149,7 +149,7 @@
<value xml:lang="zh-TW">ç¦å©é¡åèå¥</value>
</property>
<property key="FormFieldTitle_budgetId">
- <value xml:lang="en">Budget Id</value>
+ <value xml:lang="en">Budget ID</value>
<value xml:lang="fr">Budget</value>
<value xml:lang="it">Codice Budget</value>
<value xml:lang="ja">äºç®ID</value>
@@ -675,7 +675,7 @@
<value xml:lang="zh-TW">äº¤ç°¡æ·æ¥æ</value>
</property>
<property key="FormFieldTitle_resumeId">
- <value xml:lang="en">Resume Id</value>
+ <value xml:lang="en">Resume ID</value>
<value xml:lang="fr">CV</value>
<value xml:lang="it">Rif. curriculum vitae</value>
<value xml:lang="ja">復帰ID</value>
@@ -1080,7 +1080,7 @@
</property>
<property key="HumanResApplicationId">
<value xml:lang="de">Einsatzgebiet ID</value>
- <value xml:lang="en">Application Id</value>
+ <value xml:lang="en">Application ID</value>
<value xml:lang="fr">Demande d'emploi</value>
<value xml:lang="it">Codice Applicazione</value>
<value xml:lang="ja">ç³è«ID</value>
@@ -1459,7 +1459,7 @@
<value xml:lang="zh-TW">è·ä½ç®¡ç</value>
</property>
<property key="HumanResEmployeePositionId">
- <value xml:lang="en">EmployeePosition Id</value>
+ <value xml:lang="en">EmployeePosition ID</value>
<value xml:lang="fr">Position d'employé</value>
<value xml:lang="it">Codice Posizione Impiegato</value>
<value xml:lang="ja">徿¥å¡è·ä½ID</value>
@@ -1567,7 +1567,7 @@
<value xml:lang="zh-TW">å¡å·¥è·ä½èå¥</value>
</property>
<property key="HumanResEmplPositionIdManagedBy">
- <value xml:lang="en">EmplPosition Id ManagedBy</value>
+ <value xml:lang="en">EmplPosition ID ManagedBy</value>
<value xml:lang="fr">Position "dirigée par"</value>
<value xml:lang="it">Codice Posizione Impiegato Gestita Da</value>
<value xml:lang="ja">徿¥å¡è·ä½ID(管çããã人)</value>
@@ -1578,7 +1578,7 @@
<value xml:lang="zh-TW">è·ä½ç®¡ç人</value>
</property>
<property key="HumanResEmplPositionIdReportingFrom">
- <value xml:lang="en">EmplPosition Id ReportingFrom</value>
+ <value xml:lang="en">EmplPosition ID ReportingFrom</value>
<value xml:lang="fr">Position "rapportant depuis"</value>
<value xml:lang="it">Codice Posizione Impiegato Stampato A</value>
<value xml:lang="ja">徿¥å¡è·ä½ID(å ±åããã人)</value>
@@ -1599,7 +1599,7 @@
<value xml:lang="zh-TW">ç´å¥çµæ§</value>
</property>
<property key="HumanResEmplPositionIdReportingTo">
- <value xml:lang="en">EmplPosition Id ReportingTo</value>
+ <value xml:lang="en">EmplPosition ID ReportingTo</value>
<value xml:lang="fr">Position "rapportant à "</value>
<value xml:lang="it">Codice Posizione Impiegato Stampato Da</value>
<value xml:lang="ja">徿¥å¡è·ä½ID(å ±åãã人)</value>
@@ -2519,7 +2519,7 @@
<value xml:lang="zh-TW">åé«ç¦å©</value>
</property>
<property key="HumanResPartyIdFrom">
- <value xml:lang="en">Party Id From</value>
+ <value xml:lang="en">Party ID From</value>
<value xml:lang="fr">Acteur de</value>
<value xml:lang="it">Codice Soggetto Da</value>
<value xml:lang="ja">åå¼å
ID(å
)</value>
@@ -2530,7 +2530,7 @@
<value xml:lang="zh-TW">ä¾èªåé«èå¥</value>
</property>
<property key="HumanResPartyIdTo">
- <value xml:lang="en">Party Id To</value>
+ <value xml:lang="en">Party ID To</value>
<value xml:lang="fr">Acteur à </value>
<value xml:lang="it">Codice Soggetto A</value>
<value xml:lang="ja">åå¼å
ID(å
)</value>
@@ -2768,7 +2768,7 @@
</property>
<property key="HumanResResumeId">
<value xml:lang="de">Lebenslauf ID</value>
- <value xml:lang="en">Resume Id</value>
+ <value xml:lang="en">Resume ID</value>
<value xml:lang="fr">CV</value>
<value xml:lang="it">Verifica</value>
<value xml:lang="ja">復帰ID</value>
Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml?rev=1819906&r1=1819905&r2=1819906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml Tue Jan 2 21:58:37 2018
@@ -380,7 +380,7 @@
<value xml:lang="zh-TW">é輸è³</value>
</property>
<property key="ManufacturingShipmentId">
- <value xml:lang="en">Shipment Id</value>
+ <value xml:lang="en">Shipment ID</value>
<value xml:lang="es">Código de EnvÃo</value>
<value xml:lang="fr">Réf. d'expédition</value>
<value xml:lang="it">Numero Spedizione</value>
Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=1819906&r1=1819905&r2=1819906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml Tue Jan 2 21:58:37 2018
@@ -208,7 +208,7 @@
</property>
<property key="FormFieldTitle_jobId">
<value xml:lang="de">Job-Nr.</value>
- <value xml:lang="en">Job Id</value>
+ <value xml:lang="en">Job ID</value>
<value xml:lang="es">Código del trabajo</value>
<value xml:lang="fr">Réf. du job</value>
<value xml:lang="it">Numero lavoro</value>
@@ -235,7 +235,7 @@
<value xml:lang="zh-TW">å·¥ä½å稱</value>
</property>
<property key="FormFieldTitle_lotId">
- <value xml:lang="en">Lot Id</value>
+ <value xml:lang="en">Lot ID</value>
<value xml:lang="fr">Réf. de lot</value>
<value xml:lang="it">Numero lotto</value>
<value xml:lang="ja">ãããID</value>
@@ -333,7 +333,7 @@
</property>
<property key="FormFieldTitle_productIdFor">
<value xml:lang="de">Produkt-Nr. für</value>
- <value xml:lang="en">Product Id For</value>
+ <value xml:lang="en">Product ID For</value>
<value xml:lang="es">Código de producto</value>
<value xml:lang="fr">Réf. de l'article pour</value>
<value xml:lang="it">Codice prodotto da</value>
@@ -348,7 +348,7 @@
</property>
<property key="FormFieldTitle_productIdIn">
<value xml:lang="de">Produkt-Nr. in</value>
- <value xml:lang="en">Product Id In</value>
+ <value xml:lang="en">Product ID In</value>
<value xml:lang="es">Código de producto en</value>
<value xml:lang="fr">Réf. de l'article dans</value>
<value xml:lang="it">Codice prodotto in</value>
@@ -362,7 +362,7 @@
<value xml:lang="zh-TW">ç¢åèå¥ä¾èª</value>
</property>
<property key="FormFieldTitle_productIdInSubst">
- <value xml:lang="en">Product Id In Subst</value>
+ <value xml:lang="en">Product ID In Subst</value>
<value xml:lang="es">Código de producto en sustitución</value>
<value xml:lang="fr">Réf. de l'article dans subst.</value>
<value xml:lang="it">Codice prodotto in sostituzione</value>
@@ -407,7 +407,7 @@
</property>
<property key="FormFieldTitle_ruleId">
<value xml:lang="de">Regel-Nr.</value>
- <value xml:lang="en">Rule Id</value>
+ <value xml:lang="en">Rule ID</value>
<value xml:lang="es">Código de regla</value>
<value xml:lang="fr">Réf. de règle</value>
<value xml:lang="it">Codice regola</value>
@@ -1208,7 +1208,7 @@
</property>
<property key="ManufacturingCalendarIdAlreadyExist">
<value xml:lang="de">Kalender-Nr. schon vorhanden</value>
- <value xml:lang="en">Calendar Id already exist</value>
+ <value xml:lang="en">Calendar ID already exist</value>
<value xml:lang="es">El código de calendario ya existe</value>
<value xml:lang="fr">Cette réf. de calendrier existe déja</value>
<value xml:lang="it">Codice calendario già esistente</value>
@@ -4386,7 +4386,7 @@
</property>
<property key="ManufacturingRequirementId">
<value xml:lang="de">Bedarfs-Nr.</value>
- <value xml:lang="en">Requirement Id</value>
+ <value xml:lang="en">Requirement ID</value>
<value xml:lang="es">Código de requisito</value>
<value xml:lang="fr">Réf. de besoin de fabrication</value>
<value xml:lang="it">Fabbisogno</value>
@@ -4505,7 +4505,7 @@
</property>
<property key="ManufacturingRoutingId">
<value xml:lang="de">Arbeitsplan-Nr.</value>
- <value xml:lang="en">Routing Id</value>
+ <value xml:lang="en">Routing ID</value>
<value xml:lang="es">Código de ruta</value>
<value xml:lang="fr">Réf. de gamme</value>
<value xml:lang="it">Codice ciclo</value>
Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/config/MarketingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=1819906&r1=1819905&r2=1819906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/marketing/config/MarketingUiLabels.xml Tue Jan 2 21:58:37 2018
@@ -709,7 +709,7 @@
</property>
<property key="MarketingContactListPartyId">
<value xml:lang="de">Teilnehmer ID</value>
- <value xml:lang="en">Party Id</value>
+ <value xml:lang="en">Party ID</value>
<value xml:lang="es">Código de participante</value>
<value xml:lang="fr">Réf. d'abonné à la liste de contact</value>
<value xml:lang="it">Codice membro lista contatti</value>
@@ -1457,7 +1457,7 @@
</property>
<property key="MarketingTrackingCodeGroupId">
<value xml:lang="de">Grouppen-ID</value>
- <value xml:lang="en">Group Id</value>
+ <value xml:lang="en">Group ID</value>
<value xml:lang="es">Grupo</value>
<value xml:lang="fr">Réf. du groupe</value>
<value xml:lang="it">Codice Gruppo</value>
@@ -1543,7 +1543,7 @@
</property>
<property key="MarketingTrackingCodeOrderOrderId">
<value xml:lang="de">Auftrags-Nr.</value>
- <value xml:lang="en">Order Id</value>
+ <value xml:lang="en">Order ID</value>
<value xml:lang="es">Código de orden</value>
<value xml:lang="fr">Réf. de l'ordre</value>
<value xml:lang="it">Numero Ordine</value>
@@ -1624,7 +1624,7 @@
</property>
<property key="MarketingTrackingCodeSubgroupId">
<value xml:lang="de">Untergruppen-ID</value>
- <value xml:lang="en">Sub-Group Id</value>
+ <value xml:lang="en">Sub-Group ID</value>
<value xml:lang="es">Sub-grupo</value>
<value xml:lang="fr">Réf. du sous-groupe</value>
<value xml:lang="it">Codice Sotto-Gruppo</value>
@@ -1777,7 +1777,7 @@
</property>
<property key="MarketingTrackingCodeVisitPartyId">
<value xml:lang="de">Tracking-Code Akteur</value>
- <value xml:lang="en">Party Id</value>
+ <value xml:lang="en">Party ID</value>
<value xml:lang="es">Participante</value>
<value xml:lang="fr">Réf. de l'acteur</value>
<value xml:lang="it">Codice Soggetto</value>
@@ -1804,7 +1804,7 @@
<value xml:lang="zh-TW">è§è²é¡åèå¥</value>
</property>
<property key="MarketingTrackingCodeVisitSessionId">
- <value xml:lang="en">Session Id</value>
+ <value xml:lang="en">Session ID</value>
<value xml:lang="es">Código de sesión</value>
<value xml:lang="fr">Réf. de la session</value>
<value xml:lang="it">Numero Sessione</value>
@@ -1817,7 +1817,7 @@
<value xml:lang="zh-TW">æ´»åèå¥</value>
</property>
<property key="MarketingTrackingCodeVisitSourceEnumId">
- <value xml:lang="en">Source Id</value>
+ <value xml:lang="en">Source ID</value>
<value xml:lang="es">Código de fuente de la visita</value>
<value xml:lang="fr">Réf. de l'origine</value>
<value xml:lang="it">Numero Origine</value>
@@ -1842,7 +1842,7 @@
</property>
<property key="MarketingTrackingCodeVisitVisitId">
<value xml:lang="de">Visit Id</value>
- <value xml:lang="en">Visit Id</value>
+ <value xml:lang="en">Visit ID</value>
<value xml:lang="es">Código de visita</value>
<value xml:lang="fr">Réf. de la visite</value>
<value xml:lang="it">Numero Visita</value>
@@ -1855,7 +1855,7 @@
<value xml:lang="zh-TW">æè¨ªèå¥</value>
</property>
<property key="MarketingTrackingCodeVisitVisitorId">
- <value xml:lang="en">Visitor Id</value>
+ <value xml:lang="en">Visitor ID</value>
<value xml:lang="es">Código de visitante</value>
<value xml:lang="fr">Réf. du visiteur</value>
<value xml:lang="it">Codice Visitatore</value>
Modified: ofbiz/ofbiz-framework/trunk/applications/order/config/OrderErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/config/OrderErrorUiLabels.xml?rev=1819906&r1=1819905&r2=1819906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/config/OrderErrorUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/config/OrderErrorUiLabels.xml Tue Jan 2 21:58:37 2018
@@ -1838,7 +1838,7 @@
<property key="OrderIdAlreadyExistsPleaseChooseAnother">
<value xml:lang="ar">دÙÙ٠أÙ
ر Ø§ÙØ¨Ùع\Ø§ÙØ´Ø±Ø§Ø¡ Ù
ØªÙØ§Ø¬Ø¯ Ù
Ø³Ø¨ÙØ§, ÙØ±Ø¬Ù Ø§Ø®ØªÙØ§Ø± دÙÙ٠آخر</value>
<value xml:lang="de">Auftragsnummer schon vorhanden, bitte eine andere angeben </value>
- <value xml:lang="en">Order Id already exists please choose another </value>
+ <value xml:lang="en">Order ID already exists please choose another </value>
<value xml:lang="fr">Cette réf. de commande existe déjà , SVP chjoisissez en une autre </value>
<value xml:lang="ja">注æIDã¯ãã§ã«åå¨ãã¾ããå¥ã®IDã鏿ãã¦ãã ãã </value>
<value xml:lang="pt-BR">ID de pedido já existe por favor escolha outro </value>
Modified: ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml?rev=1819906&r1=1819905&r2=1819906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml Tue Jan 2 21:58:37 2018
@@ -179,7 +179,7 @@
<property key="FormFieldTitle_configId">
<value xml:lang="ar">دÙÙÙ Ø§ÙØªÙÙÙÙ</value>
<value xml:lang="de">Konfigurations-ID</value>
- <value xml:lang="en">Config Id</value>
+ <value xml:lang="en">Config ID</value>
<value xml:lang="fr">Réf. de configuration</value>
<value xml:lang="it">Configurazione</value>
<value xml:lang="ja">è¨å®ID</value>
@@ -323,7 +323,7 @@
<property key="FormFieldTitle_deliverableId">
<value xml:lang="ar">دÙÙÙ Ø§ÙØªØ³ÙÙÙ
</value>
<value xml:lang="de">Lieferung ID</value>
- <value xml:lang="en">Deliverable Id</value>
+ <value xml:lang="en">Deliverable ID</value>
<value xml:lang="es">Código de envÃo</value>
<value xml:lang="fr">Réf. de livrable</value>
<value xml:lang="it">Codice consegna</value>
@@ -404,7 +404,7 @@
<property key="FormFieldTitle_externalId">
<value xml:lang="ar">Ø§ÙØ¯ÙÙÙ Ø§ÙØ®Ø§Ø±Ø¬Ù</value>
<value xml:lang="de">Externe ID</value>
- <value xml:lang="en">External Id</value>
+ <value xml:lang="en">External ID</value>
<value xml:lang="es">Código ident. externo</value>
<value xml:lang="fr">Réf. externe</value>
<value xml:lang="it">Codice esterno</value>
@@ -755,7 +755,7 @@
<property key="FormFieldTitle_orderId">
<value xml:lang="ar">دÙÙÙ Ø§ÙØ£Ù
ر</value>
<value xml:lang="de">Auftrag ID</value>
- <value xml:lang="en">Order Id</value>
+ <value xml:lang="en">Order ID</value>
<value xml:lang="es">Código de pedido</value>
<value xml:lang="fr">Réf. de commande</value>
<value xml:lang="it">Numero Ordine</value>
@@ -952,7 +952,7 @@
<value xml:lang="ar">دÙÙ٠عرض Ø§ÙØ³Ø¹Ø±</value>
<value xml:lang="de">Angebot ID</value>
<value xml:lang="de-CH">Offerte ID</value>
- <value xml:lang="en">Quote Id</value>
+ <value xml:lang="en">Quote ID</value>
<value xml:lang="es">Código de presupuesto</value>
<value xml:lang="fr">Réf. de devis</value>
<value xml:lang="it">Numero Preventivo</value>
@@ -1088,7 +1088,7 @@
<property key="FormFieldTitle_requirementId">
<value xml:lang="ar">دÙÙ٠اÙÙ
ØªØ·ÙØ¨</value>
<value xml:lang="de">Bedarf ID</value>
- <value xml:lang="en">Requirement Id</value>
+ <value xml:lang="en">Requirement ID</value>
<value xml:lang="es">Código de requisito</value>
<value xml:lang="fr">Réf. du besoin</value>
<value xml:lang="it">Numero Fabbisogno</value>
@@ -1436,7 +1436,7 @@
<property key="FormFieldTitle_terminalId">
<value xml:lang="ar">دÙÙ٠اÙÙ
ØØ·Ø©</value>
<value xml:lang="de">Terminal ID</value>
- <value xml:lang="en">Terminal Id</value>
+ <value xml:lang="en">Terminal ID</value>
<value xml:lang="es">Código de terminal</value>
<value xml:lang="fr">Réf. de terminal</value>
<value xml:lang="it">Numero Terminale</value>
@@ -1641,7 +1641,7 @@
<property key="FormFieldTitle_transactionId">
<value xml:lang="ar">دÙÙÙ Ø§ÙØ¹Ù
ÙÙØ©</value>
<value xml:lang="de">Transaktion ID</value>
- <value xml:lang="en">Transaction Id</value>
+ <value xml:lang="en">Transaction ID</value>
<value xml:lang="es">Código de transacción</value>
<value xml:lang="fr">Réf. de transaction</value>
<value xml:lang="it">Numero Transazione</value>
@@ -1709,7 +1709,7 @@
<property key="FormFieldTitle_visitId">
<value xml:lang="ar">دÙÙÙ Ø§ÙØ²Ùارة</value>
<value xml:lang="de">Webseiten Besuch ID</value>
- <value xml:lang="en">Visit Id</value>
+ <value xml:lang="en">Visit ID</value>
<value xml:lang="es">Código de visita</value>
<value xml:lang="fr">Réf. de visite</value>
<value xml:lang="it">Codice visita</value>
@@ -1726,7 +1726,7 @@
<property key="FormFieldTitle_visitorId">
<value xml:lang="ar">دÙÙÙ Ø§ÙØ²Ø§Ø¦Ø±</value>
<value xml:lang="de">Besucher ID</value>
- <value xml:lang="en">Visitor Id</value>
+ <value xml:lang="en">Visitor ID</value>
<value xml:lang="es">Código de visitante</value>
<value xml:lang="fr">Réf. de visiteur</value>
<value xml:lang="it">Codice visitatore</value>
@@ -7545,7 +7545,7 @@
<property key="OrderOrderId">
<value xml:lang="ar">دÙÙ٠أÙ
ر Ø§ÙØ¨Ùع\Ø§ÙØ´Ø±Ø§Ø¡</value>
<value xml:lang="de">Auftrag ID</value>
- <value xml:lang="en">Order Id</value>
+ <value xml:lang="en">Order ID</value>
<value xml:lang="es">Código de pedido</value>
<value xml:lang="fr">Réf. de commande</value>
<value xml:lang="it">Numero Ordine</value>
@@ -8455,7 +8455,7 @@
<value xml:lang="ar">دÙÙ٠عرض Ø§ÙØ³Ø¹Ø±</value>
<value xml:lang="de">Angebots-ID</value>
<value xml:lang="de-CH">Offert ID</value>
- <value xml:lang="en">Quote Id</value>
+ <value xml:lang="en">Quote ID</value>
<value xml:lang="es">Código de presupuesto</value>
<value xml:lang="fr">Réf. devis</value>
<value xml:lang="it">Numero Preventivo</value>
Modified: ofbiz/ofbiz-framework/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/config/PartyUiLabels.xml?rev=1819906&r1=1819905&r2=1819906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/config/PartyUiLabels.xml Tue Jan 2 21:58:37 2018
@@ -174,7 +174,7 @@
<property key="FormFieldTitle_communicationEventTypeId">
<value xml:lang="ar">دÙÙÙ ÙÙØ¹ Ø§ÙØ¥ØªØµØ§Ù</value>
<value xml:lang="de">Kommunikationsereignis Typ ID</value>
- <value xml:lang="en">Comm.Type Id</value>
+ <value xml:lang="en">Comm.Type ID</value>
<value xml:lang="es">Código Tipo de evento de comunicación</value>
<value xml:lang="fr">Type d'évènement de communication</value>
<value xml:lang="hi-IN">सà¤à¤à¤¾à¤° à¤à¤à¤¨à¤¾ पà¥à¤°à¤à¤¾à¤° à¤à¤¾ à¤à¥à¤°à¤®à¤¾à¤à¤(communicationEventTypeId)</value>
@@ -766,7 +766,7 @@
<property key="FormFieldTitle_memberId">
<value xml:lang="ar">دÙÙÙ Ø§ÙØ¹Ø¶Ù</value>
<value xml:lang="de">Mitglied ID</value>
- <value xml:lang="en">Member Id</value>
+ <value xml:lang="en">Member ID</value>
<value xml:lang="es">Código de miembro</value>
<value xml:lang="fr">Membre</value>
<value xml:lang="hi-IN">सदसà¥à¤¯ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
@@ -784,7 +784,7 @@
<property key="FormFieldTitle_messageId">
<value xml:lang="ar">دÙÙÙ Ø§ÙØ±Ø³Ø§ÙØ©</value>
<value xml:lang="de">Nachrichten ID</value>
- <value xml:lang="en">Message Id</value>
+ <value xml:lang="en">Message ID</value>
<value xml:lang="fr">Message</value>
<value xml:lang="hi-IN">सà¤à¤¦à¥à¤¶ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
<value xml:lang="it">Messaggio</value>
@@ -901,7 +901,7 @@
<property key="FormFieldTitle_noteId">
<value xml:lang="ar">دÙÙ٠اÙÙ
ÙØ§ØØ¸Ø©</value>
<value xml:lang="de">Notiz ID</value>
- <value xml:lang="en">Note Id</value>
+ <value xml:lang="en">Note ID</value>
<value xml:lang="es">Código Nota</value>
<value xml:lang="fr">Note</value>
<value xml:lang="hi-IN">नà¥à¤ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
@@ -1231,7 +1231,7 @@
<value xml:lang="ar">دÙÙÙ Ø§ÙØ·Ø±Ù</value>
<value xml:lang="cs">ID partnera</value>
<value xml:lang="de">Akteur ID</value>
- <value xml:lang="en">Party Id</value>
+ <value xml:lang="en">Party ID</value>
<value xml:lang="es">Id Grupo</value>
<value xml:lang="fr">Acteur</value>
<value xml:lang="hi-IN">पारà¥à¤à¥ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
@@ -7576,7 +7576,7 @@
<value xml:lang="ar">Ø¥ÙÙ Ø§ÙØ·Ø±Ù</value>
<value xml:lang="cs">PÅÃjemce</value>
<value xml:lang="de">Akteur ID an</value>
- <value xml:lang="en">Party Id To</value>
+ <value xml:lang="en">Party ID To</value>
<value xml:lang="es">Codigo Participante a</value>
<value xml:lang="fr">Acteur dest.</value>
<value xml:lang="hi-IN">पारà¥à¤à¥ à¤à¥à¤°à¤®à¤¾à¤à¤ à¤à¥</value>
@@ -11166,7 +11166,7 @@
<value xml:lang="ar">دÙÙ٠اÙÙ
ÙØªØ¬</value>
<value xml:lang="cs">ID produktu</value>
<value xml:lang="de">Produkt ID</value>
- <value xml:lang="en">Product Id</value>
+ <value xml:lang="en">Product ID</value>
<value xml:lang="es">Código de producto</value>
<value xml:lang="fr">Produit</value>
<value xml:lang="hi-IN">à¤à¤¤à¥à¤ªà¤¾à¤¦ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
@@ -12231,7 +12231,7 @@
<property key="PartySequenceId">
<value xml:lang="ar">دÙÙÙ Ø§ÙØªØ³ÙسÙ</value>
<value xml:lang="de">Folgenummer ID</value>
- <value xml:lang="en">Sequence Id</value>
+ <value xml:lang="en">Sequence ID</value>
<value xml:lang="es">Secuencia</value>
<value xml:lang="fr">Séquence</value>
<value xml:lang="hi-IN">à¤
नà¥à¤à¥à¤°à¤® à¤à¥à¤°à¤®à¤¾à¤à¤</value>
@@ -13723,7 +13723,7 @@
<value xml:lang="ar">دÙÙÙ Ø§ÙØ²Ùارة</value>
<value xml:lang="cs">Id návÅ¡tÄvy</value>
<value xml:lang="de">Besuchs Id</value>
- <value xml:lang="en">Visit Id</value>
+ <value xml:lang="en">Visit ID</value>
<value xml:lang="es">Código de visita</value>
<value xml:lang="fr">Ident. connexion</value>
<value xml:lang="it">Numero visita</value>
Modified: ofbiz/ofbiz-framework/trunk/applications/product/config/ProductEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/config/ProductEntityLabels.xml?rev=1819906&r1=1819905&r2=1819906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/config/ProductEntityLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/config/ProductEntityLabels.xml Tue Jan 2 21:58:37 2018
@@ -389,7 +389,7 @@
</property>
<property key="GoodIdentificationType.description.GOOGLE_ID">
<value xml:lang="de">Google Id</value>
- <value xml:lang="en">Google Id</value>
+ <value xml:lang="en">Google ID</value>
<value xml:lang="fr">Identifiant Google</value>
<value xml:lang="it">Codice Google</value>
<value xml:lang="ja">Google ID</value>
Modified: ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml?rev=1819906&r1=1819905&r2=1819906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml Tue Jan 2 21:58:37 2018
@@ -3536,7 +3536,7 @@
</property>
<property key="FormFieldTitle_aisleId">
<value xml:lang="de">Gang ID</value>
- <value xml:lang="en">Aisle Id</value>
+ <value xml:lang="en">Aisle ID</value>
<value xml:lang="es">Código de pasillo</value>
<value xml:lang="fr">Réf. d'allée du lieu de stockage</value>
<value xml:lang="it">Corridoio</value>
@@ -3643,7 +3643,7 @@
</property>
<property key="FormFieldTitle_areaId">
<value xml:lang="de">Gebiet ID</value>
- <value xml:lang="en">Area Id</value>
+ <value xml:lang="en">Area ID</value>
<value xml:lang="es">Código de área</value>
<value xml:lang="fr">Réf. de secteur du lieu de stockage</value>
<value xml:lang="it">Area</value>
@@ -4051,7 +4051,7 @@
</property>
<property key="FormFieldTitle_carrierId">
<value xml:lang="de">Transportunternehmen ID</value>
- <value xml:lang="en">carrier Id</value>
+ <value xml:lang="en">carrier ID</value>
<value xml:lang="es">Código de transportista</value>
<value xml:lang="fr">Réf. de transporteur</value>
<value xml:lang="it">Corriere</value>
@@ -4304,7 +4304,7 @@
</property>
<property key="FormFieldTitle_containerId">
<value xml:lang="de">Container ID</value>
- <value xml:lang="en">Container Id</value>
+ <value xml:lang="en">Container ID</value>
<value xml:lang="es">Código de contenedor</value>
<value xml:lang="fr">Réf. de contenant</value>
<value xml:lang="it">Codice Container</value>
@@ -4949,7 +4949,7 @@
</property>
<property key="FormFieldTitle_facilityId">
<value xml:lang="de">Einrichtung ID</value>
- <value xml:lang="en">Facility Id</value>
+ <value xml:lang="en">Facility ID</value>
<value xml:lang="es">Código de almacén</value>
<value xml:lang="fr">Lieu de stockage [Réf.]</value>
<value xml:lang="it">Codice stabilimento</value>
@@ -4964,7 +4964,7 @@
</property>
<property key="FormFieldTitle_facilityIdTo">
<value xml:lang="de">Einrichtung ID zu</value>
- <value xml:lang="en">Facility Id To</value>
+ <value xml:lang="en">Facility ID To</value>
<value xml:lang="es">Código de almacén destino</value>
<value xml:lang="fr">Réf. de lieu de stockage de destination</value>
<value xml:lang="it">Stabilimento Destinazione</value>
@@ -5057,7 +5057,7 @@
</property>
<property key="FormFieldTitle_geoId">
<value xml:lang="de">Geo ID</value>
- <value xml:lang="en">Geo Id</value>
+ <value xml:lang="en">Geo ID</value>
<value xml:lang="es">Código Lugar</value>
<value xml:lang="fr">Réf. géographique</value>
<value xml:lang="it">Codice Geografia</value>
@@ -5563,7 +5563,7 @@
</property>
<property key="FormFieldTitle_levelId">
<value xml:lang="de">Ebene ID</value>
- <value xml:lang="en">Level Id</value>
+ <value xml:lang="en">Level ID</value>
<value xml:lang="es">Código Nivel</value>
<value xml:lang="fr">Réf. de niveau</value>
<value xml:lang="it">Livello</value>
@@ -6277,7 +6277,7 @@
</property>
<property key="FormFieldTitle_positionId">
<value xml:lang="de">Position ID</value>
- <value xml:lang="en">Position Id</value>
+ <value xml:lang="en">Position ID</value>
<value xml:lang="es">Código de posición</value>
<value xml:lang="fr">réf. de position</value>
<value xml:lang="it">Posizione</value>
@@ -6606,7 +6606,7 @@
<property key="FormFieldTitle_productId">
<value xml:lang="cs">ID produktu</value>
<value xml:lang="de">Produkt ID</value>
- <value xml:lang="en">Product Id</value>
+ <value xml:lang="en">Product ID</value>
<value xml:lang="es">Código de producto</value>
<value xml:lang="fr">Réf. produit</value>
<value xml:lang="it">Codice prodotto</value>
@@ -7098,7 +7098,7 @@
</property>
<property key="FormFieldTitle_rejectionId">
<value xml:lang="de">Ablehnung ID</value>
- <value xml:lang="en">Rejection Id</value>
+ <value xml:lang="en">Rejection ID</value>
<value xml:lang="es">Código rechazo</value>
<value xml:lang="fr">Réf. rejet</value>
<value xml:lang="it">Rifiuto</value>
@@ -7395,7 +7395,7 @@
</property>
<property key="FormFieldTitle_returnId">
<value xml:lang="de">Retoure ID</value>
- <value xml:lang="en">Return Id</value>
+ <value xml:lang="en">Return ID</value>
<value xml:lang="es">Referencia de devolución</value>
<value xml:lang="fr">Réf. de retour</value>
<value xml:lang="it">Numero Reso</value>
@@ -7456,7 +7456,7 @@
</property>
<property key="FormFieldTitle_sectionId">
<value xml:lang="de">Abschnitt ID</value>
- <value xml:lang="en">Section Id</value>
+ <value xml:lang="en">Section ID</value>
<value xml:lang="es">Código sección</value>
<value xml:lang="fr">Réf. de section</value>
<value xml:lang="it">Sezione</value>
@@ -7510,7 +7510,7 @@
</property>
<property key="FormFieldTitle_sequenceId">
<value xml:lang="de">Sequenz ID</value>
- <value xml:lang="en">Sequence Id</value>
+ <value xml:lang="en">Sequence ID</value>
<value xml:lang="es">Nº sec.</value>
<value xml:lang="fr">Réf. séquence</value>
<value xml:lang="it">Numero Sequenza</value>
@@ -7863,7 +7863,7 @@
</property>
<property key="FormFieldTitle_subscriptionId">
<value xml:lang="de">Abonnement ID</value>
- <value xml:lang="en">Subscription Id</value>
+ <value xml:lang="en">Subscription ID</value>
<value xml:lang="es">Nº de suscripción</value>
<value xml:lang="fr">Réf. de l'abonnement</value>
<value xml:lang="it">Abbonamento n.</value>
@@ -18085,7 +18085,7 @@
</property>
<property key="ProductFeatureId">
<value xml:lang="de">Merkmal ID</value>
- <value xml:lang="en">Feature Id</value>
+ <value xml:lang="en">Feature ID</value>
<value xml:lang="es">Código de caracterÃstica</value>
<value xml:lang="fr">Réf. de la caractéristique</value>
<value xml:lang="it">Codice Caratteristica</value>
@@ -20845,7 +20845,7 @@
</property>
<property key="ProductLotId">
<value xml:lang="de">Los ID</value>
- <value xml:lang="en">Lot Id</value>
+ <value xml:lang="en">Lot ID</value>
<value xml:lang="es">Código de lote</value>
<value xml:lang="fr">Réf. du lot</value>
<value xml:lang="it">Numero Lotto</value>
@@ -25241,7 +25241,7 @@
<property key="ProductProductIdMissing">
<value xml:lang="cs">ID produktu je povinné</value>
<value xml:lang="de">Produkt ID ist erforderlich</value>
- <value xml:lang="en">Product Id is mandatory</value>
+ <value xml:lang="en">Product ID is mandatory</value>
<value xml:lang="es">Código del producto es obligatorio</value>
<value xml:lang="fr">Réf. produit obligatoire</value>
<value xml:lang="it">Codice prodotto è obbligatorio</value>
@@ -28343,7 +28343,7 @@
</property>
<property key="ProductSegmentGroupId">
<value xml:lang="de">Abschnitt ID</value>
- <value xml:lang="en">Segment Id</value>
+ <value xml:lang="en">Segment ID</value>
<value xml:lang="es">Código de segmento</value>
<value xml:lang="fr">Réf. de segment</value>
<value xml:lang="it">Codice Gruppo Segmento</value>
@@ -28357,7 +28357,7 @@
</property>
<property key="ProductSegmentGroupTypeId">
<value xml:lang="de">Typ ID</value>
- <value xml:lang="en">Type Id</value>
+ <value xml:lang="en">Type ID</value>
<value xml:lang="es">Código de tipo</value>
<value xml:lang="fr">Réf. de type de groupe de segment</value>
<value xml:lang="it">Tipo Gruppo Segmento</value>
@@ -28512,7 +28512,7 @@
</property>
<property key="ProductSeqId">
<value xml:lang="de">Seq. ID</value>
- <value xml:lang="en">Seq Id</value>
+ <value xml:lang="en">Seq ID</value>
<value xml:lang="es">Código sec.</value>
<value xml:lang="fr">Réf. séq.</value>
<value xml:lang="it">Codice Seq</value>
@@ -29002,7 +29002,7 @@
</property>
<property key="ProductShipmentId">
<value xml:lang="de">Lieferung ID</value>
- <value xml:lang="en">Shipment Id</value>
+ <value xml:lang="en">Shipment ID</value>
<value xml:lang="es">Código de envÃo</value>
<value xml:lang="fr">Réf. de l'expédition</value>
<value xml:lang="it">Numero Spedizione</value>
@@ -29872,7 +29872,7 @@
</property>
<property key="ProductStatusId">
<value xml:lang="de">Status ID</value>
- <value xml:lang="en">Status Id</value>
+ <value xml:lang="en">Status ID</value>
<value xml:lang="es">Código de estado</value>
<value xml:lang="fr">Réf. de statut</value>
<value xml:lang="it">Codice Stato</value>
@@ -30502,7 +30502,7 @@
</property>
<property key="ProductSuppliersId">
<value xml:lang="de">Lieferanten ID</value>
- <value xml:lang="en">Suppliers Id</value>
+ <value xml:lang="en">Suppliers ID</value>
<value xml:lang="es">Código de proveedores</value>
<value xml:lang="fr">Réf. fournisseurs</value>
<value xml:lang="it">Codice Fornitori</value>
@@ -31280,7 +31280,7 @@
</property>
<property key="ProductUomId">
<value xml:lang="de">MaÃeinheit Id</value>
- <value xml:lang="en">Uom Id</value>
+ <value xml:lang="en">Uom ID</value>
<value xml:lang="es">Código de UDM</value>
<value xml:lang="fr">Réf. de l'unité de mesure</value>
<value xml:lang="it">UdM</value>
Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=1819906&r1=1819905&r2=1819906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Tue Jan 2 21:58:37 2018
@@ -370,7 +370,7 @@
</property>
<property key="FormFieldTitle_productProductId">
<value xml:lang="de">Produkt ID</value>
- <value xml:lang="en">Product Id</value>
+ <value xml:lang="en">Product ID</value>
<value xml:lang="fr">Code article</value>
<value xml:lang="it">Codice prodotto</value>
<value xml:lang="ja">製åID</value>
@@ -647,7 +647,7 @@
</property>
<property key="FormFieldTitle_timesheetId">
<value xml:lang="de">Zeiterfassungs ID</value>
- <value xml:lang="en">Timesheet Id</value>
+ <value xml:lang="en">Timesheet ID</value>
<value xml:lang="fr">Feuille d'activité</value>
<value xml:lang="it">Codice timbratura</value>
<value xml:lang="ja">äºå®è¡¨ID</value>
@@ -686,7 +686,7 @@
</property>
<property key="FormFieldTitle_universalId">
<value xml:lang="de">Universelle ID</value>
- <value xml:lang="en">Universal Id</value>
+ <value xml:lang="en">Universal ID</value>
<value xml:lang="fr">Réf. universelle</value>
<value xml:lang="it">Codice universale</value>
<value xml:lang="ja">æ±ç¨ID</value>
@@ -3842,7 +3842,7 @@
</property>
<property key="WorkEffortPartyId">
<value xml:lang="de">Teilnehmer ID</value>
- <value xml:lang="en">Party Id</value>
+ <value xml:lang="en">Party ID</value>
<value xml:lang="es">Código del participante</value>
<value xml:lang="fr">Acteur</value>
<value xml:lang="it">Codice soggetto</value>
@@ -5301,7 +5301,7 @@
</property>
<property key="WorkEffortWorkEffortId">
<value xml:lang="de">Arbeitseinsatz ID</value>
- <value xml:lang="en">WorkEffort Id</value>
+ <value xml:lang="en">WorkEffort ID</value>
<value xml:lang="es">Código de esfuerzo de trabajo</value>
<value xml:lang="fr">Tâche</value>
<value xml:lang="it">Numero impegno di lavoro</value>
@@ -5315,7 +5315,7 @@
</property>
<property key="WorkEffortWorkEffortIdEmpty">
<value xml:lang="de">Arbeitseinsatz ID fehlt</value>
- <value xml:lang="en">WorkEffort Id is empty</value>
+ <value xml:lang="en">WorkEffort ID is empty</value>
<value xml:lang="es">El código del esfuerzo de trabajo está vacÃo</value>
<value xml:lang="fr">La réf. de tâche est vide</value>
<value xml:lang="it">Il codice impegno di lavoro è vuoto</value>
Modified: ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml?rev=1819906&r1=1819905&r2=1819906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml Tue Jan 2 21:58:37 2018
@@ -8389,7 +8389,7 @@
<value xml:lang="ar">دÙÙÙ Ø§ÙØ·Ø±Ù</value>
<value xml:lang="cs">Id partnera</value>
<value xml:lang="de">Akteur ID</value>
- <value xml:lang="en">Party Id</value>
+ <value xml:lang="en">Party ID</value>
<value xml:lang="es">Código del participante</value>
<value xml:lang="fr">Réf. de la personne</value>
<value xml:lang="hi-IN">पारà¥à¤à¥ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
@@ -10624,7 +10624,7 @@
<value xml:lang="zh-TW">åºèæ¸</value>
</property>
<property key="CommonSeqId">
- <value xml:lang="en">Sequence Id</value>
+ <value xml:lang="en">Sequence ID</value>
<value xml:lang="nl">Volg ID</value>
<value xml:lang="zh">åºå·</value>
</property>
Modified: ofbiz/ofbiz-framework/trunk/framework/common/config/TemporalExpressionUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/config/TemporalExpressionUiLabels.xml?rev=1819906&r1=1819905&r2=1819906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/config/TemporalExpressionUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/config/TemporalExpressionUiLabels.xml Tue Jan 2 21:58:37 2018
@@ -87,7 +87,7 @@
</property>
<property key="TemporalExpressionId">
<value xml:lang="de">Ausdrucks-Id</value>
- <value xml:lang="en">Expression Id</value>
+ <value xml:lang="en">Expression ID</value>
<value xml:lang="es">Id de la expresión</value>
<value xml:lang="fr">Réf. d'expression</value>
<value xml:lang="it">Espressione</value>
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=1819906&r1=1819905&r2=1819906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/config/WebtoolsUiLabels.xml Tue Jan 2 21:58:37 2018
@@ -4007,7 +4007,7 @@
</property>
<property key="WebtoolsParent">
<value xml:lang="de">Elternreferenz</value>
- <value xml:lang="en">Parent Id</value>
+ <value xml:lang="en">Parent ID</value>
<value xml:lang="fr">Réf. du parent</value>
<value xml:lang="it">Padre</value>
<value xml:lang="ja">ä¸ä½(親)ID</value>
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java?rev=1819906&r1=1819905&r2=1819906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java Tue Jan 2 21:58:37 2018
@@ -640,7 +640,16 @@ public class ModelFormField {
autoTitlewriter.append(curChar);
}
- return autoTitlewriter.toString();
+ String autoTitlewriterString = autoTitlewriter.toString();
+
+ // For English, ID is correct abbreviation for identity.
+ // So if a label ends with " Id", replace with " ID".
+ // If there is another locale that doesn't follow this rule, we can add condition for this locale to exempt from the change.
+ if (autoTitlewriterString.endsWith(" Id")){
+ autoTitlewriterString = autoTitlewriterString.subSequence(0, autoTitlewriterString.length() - 3) + " ID";
+ }
+
+ return autoTitlewriterString;
}
public String getTitleAreaStyle() {