fixed merge conflict for ja.yaml

config/locales/ca.yml

@@ -1075,12 +1075,13 @@ ca:
   sold: Venut
   sort_ordering: "Ordenació"
   special_instructions: "Instruccions especials"
-  spree: 
   spree/order: 
     coupon_code: Coupon Code
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Check for Spree security and release alerts"
   spree_alert_not_checking: "Not checking for Spree security and release alerts"

config/locales/cs-CZ.yml

@@ -1074,12 +1074,13 @@ cs-CZ:
   sold: "Prodáno"
   sort_ordering: "Třídit uspořádání"
   special_instructions: "Special Instructions"
-  spree: 
   spree/order: 
     coupon_code: Coupon Code
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Check for Spree security and release alerts"
   spree_alert_not_checking: "Not checking for Spree security and release alerts"

config/locales/de-CH.yml

@@ -1074,12 +1074,13 @@ de-CH:
   sold: Verkauft
   sort_ordering: "Sortierreihenfolge"
   special_instructions: "Special Instructions"
-  spree: 
   spree/order: 
     coupon_code: Coupon Code
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Check for Spree security and release alerts"
   spree_alert_not_checking: "Not checking for Spree security and release alerts"

config/locales/de.yml

@@ -1074,12 +1074,13 @@ de:
   sold: Ausverkauft
   sort_ordering: "Sortierung"
   special_instructions: "Spezielle Anweisungen"
-  spree: 
   spree/order: 
     coupon_code: "Aktions-Code"
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Überprüfe auf Spree Sicherheits- und Veröffentlichungshinweise"
   spree_alert_not_checking: "Überprüfe nicht auf Spree Sicherheits- und Veröffentlichungshinweise"

config/locales/en-AU.yml

@@ -1074,12 +1074,13 @@ en-AU:
   sold: Sold
   sort_ordering: "Sort ordering"
   special_instructions: "Special Instructions"
-  spree: 
   spree/order: 
     coupon_code: Coupon Code
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Check for Spree security and release alerts"
   spree_alert_not_checking: "Not checking for Spree security and release alerts"

config/locales/en-GB.yml

@@ -1074,12 +1074,13 @@ en-GB:
   sold: Sold
   sort_ordering: "Sort ordering"
   special_instructions: "Special Instructions"
-  spree: 
   spree/order: 
     coupon_code: Coupon Code
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Check for Spree security and release alerts"
   spree_alert_not_checking: "Not checking for Spree security and release alerts"

config/locales/en-IN.yml

@@ -1074,12 +1074,13 @@ en-IN:
   sold: Sold
   sort_ordering: "Sort ordering"
   special_instructions: "Special Instructions"
-  spree: 
   spree/order: 
     coupon_code: Coupon Code
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Check for Spree security and release alerts"
   spree_alert_not_checking: "Not checking for Spree security and release alerts"

config/locales/en-NZ.yml

@@ -1074,12 +1074,13 @@ en-NZ:
   sold: Sold
   sort_ordering: "Sort ordering"
   special_instructions: "Special Instructions"
-  spree: ~
   spree/order: 
     coupon_code: "Coupon Code"
+  spree:
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Check for Spree security and release alerts"
   spree_alert_not_checking: "Not checking for Spree security and release alerts"

config/locales/es-MX.yml

@@ -1074,12 +1074,13 @@ es-MX:
   sold: Vendido
   sort_ordering: "Ordenación"
   special_instructions: "Instrucciones especiales"
-  spree: 
   spree/order: 
     coupon_code: Coupon Code
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Check for Spree security and release alerts"
   spree_alert_not_checking: "Not checking for Spree security and release alerts"

config/locales/es.yml

@@ -1074,12 +1074,13 @@ es:
   sold: Vendido
   sort_ordering: "Ordenación"
   special_instructions: "Instrucciones especiales"
-  spree: 
   spree/order: 
     coupon_code: Coupon Code
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Check for Spree security and release alerts"
   spree_alert_not_checking: "Not checking for Spree security and release alerts"

config/locales/et.yml

@@ -1074,12 +1074,13 @@ et:
   sold: Müüdud
   sort_ordering: Sorteerimise järjestus
   special_instructions: Tarne lisajuhised
-  spree: 
   spree/order: 
     coupon_code: Coupon Code
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Check for Spree security and release alerts"
   spree_alert_not_checking: "Not checking for Spree security and release alerts"

config/locales/fa.yml

@@ -1077,12 +1077,13 @@ fa:
   sold: فروخته شد
   sort_ordering: "Sort ordering"
   special_instructions: "Special Instructions"
-  spree: 
   spree/order: 
     coupon_code: Coupon Code
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Check for Spree security and release alerts"
   spree_alert_not_checking: "Not checking for Spree security and release alerts"

config/locales/fi.yml

@@ -1074,12 +1074,13 @@ fi:
   sold: Myyty
   sort_ordering: Lajittelujärjestys
   special_instructions: "Erityisohjeet"
-  spree: 
   spree/order: 
     coupon_code: Coupon Code
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Check for Spree security and release alerts"
   spree_alert_not_checking: "Not checking for Spree security and release alerts"

config/locales/fr.yml

@@ -1074,12 +1074,13 @@ fr:
   sold: Vendu
   sort_ordering: "Ordre de tri"
   special_instructions: "Instructions spéciales"
-  spree: 
   spree/order: 
     coupon_code: Coupon Code
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Check for Spree security and release alerts"
   spree_alert_not_checking: "Not checking for Spree security and release alerts"

config/locales/id.yml

@@ -1109,13 +1109,12 @@ id:
         site_id: "Site ID"
         token: "Token"
     date: "Tanggal"
+    date_picker:
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: "Waktu"
   spree/order:
     coupon_code: "Kode Kupon"
-    date: "Tanggal"
-    date_picker:
-      format: 'yy/mm/dd'
-    time: "Waktu"
   spree_alert_checking: "Cek keamanan Spree dan peringatan release"
   spree_alert_not_checking: "Tidak melakukan Cek keamanan Spree dan peringatan release"
   spree_gateway_error_flash_for_checkout: "Terdapat suatu masalah dengan informasi pembayaran anda. Cek informasi anda lagi dan coba lagi."

config/locales/il.yml

@@ -1074,12 +1074,13 @@ il:
   sold: Sold
   sort_ordering: "Sort ordering"
   special_instructions: "Special Instructions"
-  spree: 
   spree/order: 
     coupon_code: Coupon Code
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Check for Spree security and release alerts"
   spree_alert_not_checking: "Not checking for Spree security and release alerts"

config/locales/it.yml

@@ -1074,12 +1074,13 @@ it:
   sold: "Venduto"
   sort_ordering: "Ordinamento"
   special_instructions: "Istruzioni speciali"
-  spree: 
   spree/order: 
     coupon_code: Coupon Code
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Controlla gli annunci di Spree su sicurezza e aggiornamenti"
   spree_alert_not_checking: "Non controllare gli annunci di Spree su sicurezza e aggiornamenti"

config/locales/ja.yml

@@ -1101,11 +1101,12 @@ ja:
   sold: "販売済み"
   sort_ordering: "ソート順"
   special_instructions: "特別な指示"
+  spree/order:
+    coupon_code: "クーポンコード"
   spree:
-    time: Time
     date: "日付"
     date_picker:
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
       js_format: 'yy/mm/dd'
     time: "時間"
   spree_alert_checking: "Spreeのセキュリティ・リリースアラートをチェックする"

config/locales/ko.yml

@@ -1074,12 +1074,13 @@ ko:
   sold: #Sold
   sort_ordering: "순서 정렬"
   special_instructions: #"Special Instructions"
-  spree: 
   spree/order: 
     coupon_code: Coupon Code
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Check for Spree security and release alerts"
   spree_alert_not_checking: "Not checking for Spree security and release alerts"

config/locales/lt.yml

@@ -1074,12 +1074,13 @@ lt:
   sold: Sold
   sort_ordering: "Sort ordering"
   special_instructions: "Special Instructions"
-  spree: 
   spree/order: 
     coupon_code: Coupon Code
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Check for Spree security and release alerts"
   spree_alert_not_checking: "Not checking for Spree security and release alerts"

config/locales/lv.yml

@@ -1074,12 +1074,13 @@ lv:
   sold: "Pārdots"
   sort_ordering: "Grupēt pasūtījumus"
   special_instructions: "Special Instructions"
-  spree: 
   spree/order: 
     coupon_code: Coupon Code
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Check for Spree security and release alerts"
   spree_alert_not_checking: "Not checking for Spree security and release alerts"

config/locales/nb-NO.yml

@@ -1074,12 +1074,13 @@ nb-NO:
   sold: Sold
   sort_ordering: "Sort ordering"
   special_instructions: "Special Instructions"
-  spree: 
   spree/order: 
     coupon_code: Coupon Code
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Check for Spree security and release alerts"
   spree_alert_not_checking: "Not checking for Spree security and release alerts"

config/locales/nl-BE.yml

@@ -1074,12 +1074,13 @@ nl-BE:
   sold: Verkocht
   sort_ordering: "Sorteervolgorde"
   special_instructions: "Speciale Instructies"
-  spree: 
   spree/order: 
     coupon_code: Coupon Code
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Check for Spree security and release alerts"
   spree_alert_not_checking: "Not checking for Spree security and release alerts"

config/locales/nl.yml

@@ -2207,12 +2207,13 @@ nl:
   sold: Sold
   sort_ordering: "Sort ordering"
   special_instructions: "Special Instructions"
-  spree: 
   spree/order: 
     coupon_code: Coupon Code
+  spree: 
     date: Date
     date_picker: 
-      format: 'yy/mm/dd'
+      format: ! '%Y/%m/%d'
+      js_format: 'yy/mm/dd'
     time: Time
   spree_alert_checking: "Check for Spree security and release alerts"
   spree_alert_not_checking: "Not checking for Spree security and release alerts"