Merge pull request #2 from fabiode/patch-3

Updating master
spree-contrib · Feb 26, 2016 · 6fcec9e · 6fcec9e
2 parents c5a5c07 + 3b8f046
commit 6fcec9e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 22 deletions.
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
@@ -48,6 +48,7 @@ ja:
         email: "メールアドレス"
         ip_address: IPアドレス
         item_total: "合計個数"
+        name: "注文"
         number: "注文番号"
         payment_state: "支払い状態"
         shipment_state: "配送状態"
@@ -378,17 +379,17 @@ ja:
       tab:
         configuration:
         option_types:
-        orders:
+        orders: "注文"
         overview:
-        products:
+        products: "商品"
         promotions:
         promotion_categories:
         properties:
         prototypes:
-        reports:
+        reports: "リポート"
         taxonomies:
         taxons:
-        users:
+        users: "ユーザー"
       user:
         account:
         addresses:
@@ -644,6 +645,7 @@ ja:
     failed_payment_attempts:
     filename: "ファイル名"
     fill_in_customer_info:
+    filter: "フィルタ"
     filter_results: "検索結果"
     finalize: "確定"
     finalized:
@@ -766,7 +768,7 @@ ja:
     my_account: "アカウント情報"
     my_orders: "注文情報"
     name: "名称"
-    name_on_card:
+    name_on_card: "カード名義"
     name_or_sku: "品名もしくは品番"
     new: "新規"
     new_adjustment: "新規の値引き・追加請求"
@@ -868,7 +870,7 @@ ja:
         thanks:
         total:
     order_not_found:
-    order_number:
+    order_number: "注文 %{number}"
     order_processed_successfully: "注文が完了しました。"
     order_resumed:
     order_state:
@@ -984,8 +986,8 @@ ja:
         description: "最初の注文である"
         name: "最初の注文"
       item_total:
-        description: "合計個数"
-        name: "合計個数"
+        description: "商品金額合計"
+        name: "商品金額合計"
       landing_page:
         description: "お客様が特定のページを訪問済みである"
         name: "ランディングページ"

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
@@ -539,10 +539,10 @@ pt-BR:
     country_based: País de Origem
     country_name: Nome
     country_names:
-      CA:
-      FRA:
-      ITA:
-      US:
+      CA: Canadá
+      FRA: França
+      ITA: Itália
+      US: Estados Unidos
     coupon: Cupom
     coupon_code: Código do Cupom
     coupon_code_already_applied: O cupom já foi adicionado ao pedido
@@ -570,7 +570,7 @@ pt-BR:
     currency_symbol_position: Colocar o símbolo da moeda antes ou depois da quantia?
     currency_thousands_separator: Separador de milhares da moeda
     current: Atual
-    current_promotion_usage: Uso da promoção atual
+    current_promotion_usage: "Uso da promoção atual: %{count}"
     customer: Cliente
     customer_details: Detalhes do Cliente
     customer_details_updated: Os Detalhes do Cliente Foram Atualizados
@@ -1066,19 +1066,19 @@ pt-BR:
     refunds:
     register: Registrar-se
     registration: Registro
-    reimburse:
-    reimbursed:
-    reimbursement:
+    reimburse: Restituir
+    reimbursed: Restituído
+    reimbursement: Restituição
     reimbursement_mailer:
       reimbursement_email:
         days_to_send:
-        dear_customer:
+        dear_customer: Caro cliente
         exchange_summary:
-        for:
-        instructions:
-        refund_summary:
-        subject:
-        total_refunded:
+        for: Para
+        instructions: Instruções
+        refund_summary: Resumo da Restituição
+        subject: Assunto
+        total_refunded: Total Restituído
     reimbursement_perform_failed: Processo de Restituição falhou
     reimbursement_status: Status de Restituição
     reimbursement_type: Tipo de Restituição