From d26c4cc6f7a00df0f170fc75b2a77b9c2a7f3f24 Mon Sep 17 00:00:00 2001
From: Vissakha <arpsara@ctc.fr>
Date: Fri, 16 Dec 2016 14:59:10 +0100
Subject: [PATCH] Update en.yml

---
 backend/spec/features/admin/orders/new_order_spec.rb | 2 +-
 backend/spec/features/admin/stock_transfer_spec.rb   | 4 ++--
 core/config/locales/en.yml                           | 9 ++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/backend/spec/features/admin/orders/new_order_spec.rb b/backend/spec/features/admin/orders/new_order_spec.rb
index ac3dd7b573b..f2c6a3806b8 100644
--- a/backend/spec/features/admin/orders/new_order_spec.rb
+++ b/backend/spec/features/admin/orders/new_order_spec.rb
@@ -53,7 +53,7 @@
     click_icon "capture"
 
     click_on "Shipments"
-    click_on "ship"
+    click_on "Ship"
 
     within '.carton-state' do
       expect(page).to have_content('shipped')
diff --git a/backend/spec/features/admin/stock_transfer_spec.rb b/backend/spec/features/admin/stock_transfer_spec.rb
index 9fa8604ee06..57f9f9eaaf4 100644
--- a/backend/spec/features/admin/stock_transfer_spec.rb
+++ b/backend/spec/features/admin/stock_transfer_spec.rb
@@ -85,7 +85,7 @@
     describe 'with enough stock' do
       it 'ships stock transfer' do
         visit spree.tracking_info_admin_stock_transfer_path(stock_transfer)
-        click_on 'ship'
+        click_on 'Ship'
 
         expect(page).to have_current_path(spree.admin_stock_transfers_path)
         expect(stock_transfer.reload.shipped_at).to_not be_nil
@@ -102,7 +102,7 @@
       it 'does not ship stock transfer' do
         visit spree.tracking_info_admin_stock_transfer_path(stock_transfer)
 
-        click_on 'ship'
+        click_on 'Ship'
 
         expect(page).to have_current_path(spree.tracking_info_admin_stock_transfer_path(stock_transfer))
         expect(stock_transfer.reload.shipped_at).to be_nil
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index e0ae0fc3b17..8f737410815 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -642,7 +642,7 @@ en:
       unlock_instructions:
         subject: Unlock Instructions
     oauth_callbacks:
-      failure: Could not authorize you from %{kind} because "%{reason}".
+      failure: "Could not authorize you from %{kind} because %{reason}."
       success: Successfully authorized from %{kind} account.
     unlocks:
       send_instructions: You will receive an email with instructions about how to unlock your account in a few minutes.
@@ -688,14 +688,13 @@ en:
       list: List
       listing: Listing
       new: New
-      refund: Refund
       receive: Receive
+      refund: Refund
       remove: Remove
       save: Save
-      ship: ship
-      update: Update
+      ship: Ship
       split: Split
-      ship: ship
+      update: Update
     activate: Activate
     active: Active
     add: Add