Merge branch 'master' into plant-product-sorting

Conflicts: config/locales/cmn/nomenclatures.yml config/locales/fra/nomenclatures.yml config/locales/jpn/nomenclatures.yml config/locales/por/nomenclatures.yml config/locales/spa/nomenclatures.yml
ekylibre · Nov 6, 2016 · 2beaa60 · 2beaa60
2 parents 5f32341 + 1e7eb79
commit 2beaa60
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 9 deletions.
diff --git a/config/locales/arb/nomenclatures.yml b/config/locales/arb/nomenclatures.yml
@@ -2538,6 +2538,7 @@ arb:
         # reductible: "Reductible"
         saleable: "رائج"
         stock_account: "حساب الأسهم"
+        stock_movement_account: "حساب حركة الأسهم"
         storable: "القابل للتخزين"
     product_nature_variants:
       choices:

diff --git a/config/locales/cmn/nomenclatures.yml b/config/locales/cmn/nomenclatures.yml
@@ -2529,6 +2529,7 @@ cmn:
         # reductible: "Reductible"
         saleable: "可销售"
         stock_account: "股票账户"
+        stock_movement_account: "股票的走势帐户"
         storable: "可收纳"
     product_nature_variants:
       choices:
@@ -2971,7 +2972,7 @@ cmn:
         howard_walnut: "霍华德核桃"
         hydraulic_oil: "液压油"
         ichn_subsidies: "Ichn补贴"
-        # implanter: "Implanter"
+        implanter: "注入"
         infirmity_and_death_insurance: "虚弱和死亡保险"
         ink_cartridge: "墨盒"
         insecticide: "杀虫剂"
@@ -3423,7 +3424,7 @@ cmn:
         honey: "蜂蜜"
         horse_herd: "马畜群"
         hydraulic_oil: "液压油"
-        # implanter: "Implanter"
+        implanter: "注入"
         infirmity_and_death_insurance: "虚弱和死亡保险"
         insecticide: "杀虫剂"
         # inseminator: "Inseminator"

diff --git a/config/locales/deu/nomenclatures.yml b/config/locales/deu/nomenclatures.yml
@@ -2529,6 +2529,7 @@ deu:
         # reductible: "Reductible"
         saleable: "Verkaufsfähig"
         stock_account: "Auf Rechnung"
+        stock_movement_account: "Auf Bewegungskonto"
         storable: "Lagerfähig"
     product_nature_variants:
       choices:

diff --git a/config/locales/eng/nomenclatures.yml b/config/locales/eng/nomenclatures.yml
@@ -2531,7 +2531,7 @@ eng:
         reductible: "Reductible"
         saleable: "Saleable"
         stock_account: "Stock account"
-        # stock_movement_account: "Stock movement account"
+        stock_movement_account: "Stock movement account"
         storable: "Storable"
     product_nature_variants:
       choices:

diff --git a/config/locales/fra/nomenclatures.yml b/config/locales/fra/nomenclatures.yml
@@ -2681,6 +2681,7 @@ fra:
         reductible: "Peut présenter des réductions"
         saleable: "Vendable"
         stock_account: "Compte de stock"
+        stock_movement_account: "Compte mouvement de stock"
         storable: "Stockable"
     product_nature_variants:
       choices:

diff --git a/config/locales/ita/nomenclatures.yml b/config/locales/ita/nomenclatures.yml
@@ -2529,6 +2529,7 @@ ita:
         # reductible: "Reductible"
         saleable: "Vendibile"
         stock_account: "conto della"
+        stock_movement_account: "Conto movimento Archivio"
         storable: "riponibile"
     product_nature_variants:
       choices:

diff --git a/config/locales/jpn/nomenclatures.yml b/config/locales/jpn/nomenclatures.yml
@@ -2540,6 +2540,7 @@ jpn:
         # reductible: "Reductible"
         # saleable: "Saleable"
         stock_account: "資本勘定"
+        stock_movement_account: "在庫移動アカウント"
         storable: "Storableが"
     product_nature_variants:
       choices:
@@ -2982,7 +2983,7 @@ jpn:
         howard_walnut: "ハワードクルミ"
         hydraulic_oil: "油圧オイル"
         ichn_subsidies: "Ichn補助金"
-        # implanter: "Implanter"
+        implanter: "注入"
         infirmity_and_death_insurance: "病弱および死亡保険"
         ink_cartridge: "インクカートリッジ"
         insecticide: "殺虫剤"
@@ -3434,7 +3435,7 @@ jpn:
         honey: "蜂蜜"
         horse_herd: "馬の群れ"
         hydraulic_oil: "油圧オイル"
-        # implanter: "Implanter"
+        implanter: "注入"
         infirmity_and_death_insurance: "病弱および死亡保険"
         insecticide: "殺虫剤"
         inseminator: "人工受精を施す人"

diff --git a/config/locales/por/nomenclatures.yml b/config/locales/por/nomenclatures.yml
@@ -2529,6 +2529,7 @@ por:
         reductible: "Irredutível"
         saleable: "Vendável"
         stock_account: "Da conta"
+        stock_movement_account: "Conta da circulação"
         storable: "Armazenável"
     product_nature_variants:
       choices:
@@ -2971,7 +2972,7 @@ por:
         howard_walnut: "Howard noz"
         hydraulic_oil: "Óleo hidráulico"
         ichn_subsidies: "Subsídios Ichn"
-        # implanter: "Implanter"
+        implanter: "Implantador"
         infirmity_and_death_insurance: "Seguro de enfermidade e morte"
         ink_cartridge: "Carga de tinta"
         insecticide: "Inseticida"
@@ -3423,7 +3424,7 @@ por:
         honey: "Mel"
         horse_herd: "Rebanho do cavalo"
         hydraulic_oil: "Óleo hidráulico"
-        # implanter: "Implanter"
+        implanter: "Implantador"
         infirmity_and_death_insurance: "Seguro de enfermidade e morte"
         insecticide: "Inseticida"
         inseminator: "Inseminador"

diff --git a/config/locales/spa/nomenclatures.yml b/config/locales/spa/nomenclatures.yml
@@ -2535,6 +2535,7 @@ spa:
         reductible: "Reductible"
         saleable: "Vendible"
         stock_account: "De la cuenta"
+        stock_movement_account: "Cuenta el movimiento de la"
         storable: "Almacenable"
     product_nature_variants:
       choices:
@@ -2977,7 +2978,7 @@ spa:
         howard_walnut: "Howard nuez"
         hydraulic_oil: "Aceite hidráulico"
         ichn_subsidies: "Subsidios ICHN"
-        # implanter: "Implanter"
+        implanter: "Implantador"
         infirmity_and_death_insurance: "La enfermedad y la muerte de seguro"
         ink_cartridge: "Cartucho de tinta"
         insecticide: "Insecticida"
@@ -3429,7 +3430,7 @@ spa:
         honey: "Miel"
         horse_herd: "Caballada"
         hydraulic_oil: "Aceite hidráulico"
-        # implanter: "Implanter"
+        implanter: "Implantador"
         infirmity_and_death_insurance: "La enfermedad y la muerte de seguro"
         insecticide: "Insecticida"
         inseminator: "Inseminador"