svn commit: r1682641 [1/3] - in /ofbiz/branches/release14.12: ./ applications/order/config/OrderEntityLabels.xml applications/order/config/OrderErrorUiLabels.xml applications/order/config/OrderUiLabels.xml

[mbrohl]

Author: mbrohl
Date: Sat May 30 19:14:04 2015
New Revision: 1682641

URL: http://svn.apache.org/r1682641
Log:
Applied fix from trunk for revision: 1682633
===

New German translations and a lot of corrections for the Order Manager.

Modified:
    ofbiz/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/applications/order/config/OrderEntityLabels.xml
    ofbiz/branches/release14.12/applications/order/config/OrderErrorUiLabels.xml
    ofbiz/branches/release14.12/applications/order/config/OrderUiLabels.xml

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 30 19:14:04 2015
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633

Modified: ofbiz/branches/release14.12/applications/order/config/OrderEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/config/OrderEntityLabels.xml?rev=1682641&r1=1682640&r2=1682641&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/order/config/OrderEntityLabels.xml (original)
+++ ofbiz/branches/release14.12/applications/order/config/OrderEntityLabels.xml Sat May 30 19:14:04 2015
@@ -52,7 +52,7 @@
         <value xml:lang="zh_TW">已改正</value>
     </property>
     <property key="CustRequestResolution.description.IMPLEMENTED">
-        <value xml:lang="de">Umgesetzt</value>
+        <value xml:lang="de">Implementiert</value>
         <value xml:lang="en">Implemented</value>
         <value xml:lang="es">Implementado</value>
         <value xml:lang="fr">Implémentée</value>
@@ -421,7 +421,7 @@
         <value xml:lang="zh_TW">保修</value>
     </property>
     <property key="OrderBlacklistType.description.BLACKLIST_ADDRESS">
-        <value xml:lang="de">Blackliste Adressen</value>
+        <value xml:lang="de">Blacklist Adressen</value>
         <value xml:lang="en">Blacklist Address</value>
         <value xml:lang="es">Dirección bloqueada</value>
         <value xml:lang="fr">Mettre l'adresse en liste noire</value>
@@ -435,7 +435,7 @@
         <value xml:lang="zh_TW">位址黑名單</value>
     </property>
     <property key="OrderBlacklistType.description.BLACKLIST_CREDITCARD">
-        <value xml:lang="de">Blackliste Kreditkarte</value>
+        <value xml:lang="de">Blacklist Kreditkarte</value>
         <value xml:lang="en">Blacklist Credit Card</value>
         <value xml:lang="es">Tarjeta de crédito bloqueada</value>
         <value xml:lang="fr">Mettre la carte de crédit en liste noire</value>
@@ -449,7 +449,7 @@
         <value xml:lang="zh_TW">信用卡黑名單</value>
     </property>
     <property key="OrderBlacklistType.description.BLACKLIST_EMAIL">
-        <value xml:lang="de">Blackliste E-Mail</value>
+        <value xml:lang="de">Blacklist E-Mail</value>
         <value xml:lang="en">Blacklist Email</value>
         <value xml:lang="es">Email bloqueado</value>
         <value xml:lang="fr">Mettre l'addresse de courriel en liste noire</value>
@@ -463,7 +463,7 @@
         <value xml:lang="zh_TW">電子郵件黑名單</value>
     </property>
     <property key="OrderBlacklistType.description.BLACKLIST_PHONE">
-        <value xml:lang="de">Blackliste Telefon</value>
+        <value xml:lang="de">Blacklist Telefon</value>
         <value xml:lang="en">Blacklist Phone</value>
         <value xml:lang="es">Teléfono bloqueado</value>
         <value xml:lang="fr">Mettre le n° de téléphone en liste noire</value>
@@ -943,7 +943,7 @@
         <value xml:lang="zh_TW">數字責任履行履行失敗</value>
     </property>
     <property key="ReturnReason.description.RTN_MISSHIP_ITEM">
-        <value xml:lang="de">Falsch versandtes Element</value>
+        <value xml:lang="de">Falsch versandter Artikel</value>
         <value xml:lang="en">Mis-Shipped Item</value>
         <value xml:lang="es">Ítem mal enviado</value>
         <value xml:lang="fr">Ligne d'expédition manquante</value>
@@ -1196,7 +1196,7 @@
         <value xml:lang="zh_TW">完成</value>
     </property>
     <property key="WorkReqFulfType.description.WRF_TESTS">
-        <value xml:lang="de">führt Test durch</value>
+        <value xml:lang="de">Testet</value>
         <value xml:lang="en">Tests</value>
         <value xml:lang="es">Prueba</value>
         <value xml:lang="fr">Tests</value>