Merge pull request #11353 from abdellani/remove-duplicated-keys-in-en-yml

Remove duplicated keys in en yml

config/locales/en.yml

@@ -138,7 +138,27 @@ en:
       aspect_ratio_is_not: "must have an aspect ratio of %{aspect_ratio}"
       aspect_ratio_unknown: "has an unknown aspect ratio"
       image_not_processable: "is not a valid image"
-
+    not_found:
+      title: "The page you were looking for doesn't exist (404)"
+      message_html: "<b>Please try again</b>
+      <p>This might be a temporary problem. Please click the back button to return to the previous screen or go back to <a href='/'>Home</a> and try again.</p>
+      <b>Contact support</b>
+      <p>If the problem persists or is urgent, please tell us about it. Find our contact details from the global <a href='https://openfoodnetwork.org/ofn-local/' target='blank'>Open Food Network Local page</a>.</p>
+      <p>It really helps us if you can give as much detail as possible about what the missing page is about.</p>"
+    internal_server_error:
+      title: "We're sorry, but something went wrong (500)"
+      message_html: "<b>Please try again</b>
+      <p>This might be a temporary problem. Please click the back button to return to the previous screen or go back to <a href='/''>Home</a> and try again.</p>
+      <b>We're on it</b>
+      <p>If you have seen this problem before, we probably already know about it and are working on a fix. We record all the errors that come up.</p>
+      <b>Contact support</b>
+      <p>If the problem persists or is urgent, please tell us about it. Find our contact details from the global <a href='https://openfoodnetwork.org/ofn-local/' target='blank'>Open Food Network Local page</a>.</p>
+      <p>It really helps us if you can give as much detail as possible about what you were doing when this error occurred.</p>"
+    unprocessable_entity:
+      title: "The change you wanted was rejected (422)"
+      message_html: "<p>The change you wanted was rejected. Maybe you tried to change something you don't have access to.
+      <br><h3><a href='/' >Return home</a></h3>
+      </p>"
   stripe:
     error_code:
       incorrect_number: "The card number is incorrect."
@@ -463,7 +483,7 @@ en:
   clear_filters: Clear filters
   quantity: Quantity
   pick_up: Pick up
-  ok: Ok
+  ok: OK
   copy: Copy
   change_my_password: "Change my password"
   update_password: "Update password"
@@ -605,7 +625,6 @@ en:
     has_n_rules: "has %{num} rules"
 
     unsaved_confirm_leave: "There are unsaved changed on this page. Continue without saving?"
-    unsaved_changes: "You have unsaved changes"
 
     available_units: "Available Units"
 
@@ -1380,7 +1399,6 @@ en:
         fees: Fees
         outgoing: Outgoing
         distributor: Distributor
-        products: Products
         tags: Tags
         add_a_tag: Add a tag
         delivery_details: Pickup / Delivery details
@@ -1891,12 +1909,10 @@ en:
   postcode: Postcode
   postcode_placeholder: eg. 3070
   suburb: Suburb
-  state: State
   country: Country
   unauthorized: Unauthorized
   terms_of_service: "Terms of service"
   on_demand: On demand
-  none: None
   not_allowed: Not allowed
   no_shipping: no shipping methods
   no_payment: no payment methods
@@ -2709,7 +2725,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
   credit: "Credit"
   Paid: "Paid"
   Ready: "Ready"
-  ok: OK
   not_visible: not visible
   you_have_no_orders_yet: "You have no orders yet"
   show_only_complete_orders: "Only show complete orders"
@@ -2761,7 +2776,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
   delivery_method: Delivery Method
   fee_type: "Fee Type"
   tax_category: "Tax Category"
-  description: "Description"
   display: "Display"
   tags: "Tags"
   calculator: "Calculator"
@@ -2794,10 +2808,8 @@ See the %{link} to find out more about %{sitename}'s features and to start using
   no_customers_found: "No customers found"
   go: "Go"
   hub: "Hub"
-  producer: "Producer"
   product: "Product"
   price: "Price"
-  on_hand: "On hand"
   review: "Review"
   save_changes: "Save Changes"
   order_saved: "Order Saved"
@@ -2849,9 +2861,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
   edit_profile_details: "Edit profile details"
   edit_profile_details_etc: "Change your profile description, images, etc."
   order_cycle: "Order Cycle"
-  order_cycles: "Order Cycles"
   enterprise_relationships: "Enterprise permissions"
-  remove_tax: "Remove tax"
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Last name begins with"
   shipping_method: "Shipping method"
@@ -2912,7 +2922,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
   report_header_last_name: Last Name
   report_header_suburb: Suburb
   report_header_phone: Phone
-  report_header_suburb: Suburb
   report_header_address: Address
   report_header_billing_address: Billing Address
   report_header_relationship: Relationship
@@ -3094,10 +3103,8 @@ See the %{link} to find out more about %{sitename}'s features and to start using
   users:  "Users"
   about: "About"
   images: "Images"
-  contact: "Contact"
   web: "Web"
   primary_details: "Primary Details"
-  contact: "Contact"
   social: "Social"
   shipping: "Shipping"
   shipping_methods: "Shipping Methods"
@@ -3662,12 +3669,10 @@ See the %{link} to find out more about %{sitename}'s features and to start using
         "none": "None"
 
   order: "Order"
-  distribution: "Distribution"
   order_details: "Order Details"
   customer_details: "Customer Details"
   adjustments: "Adjustments"
   payments: "Payments"
-  invoices: "Invoices"
   return_authorizations: "Return Authorizations"
   credit_owed: "Credit Owed"
   new_adjustment: "New Adjustment"
@@ -3782,7 +3787,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
     tracking: "Tracking"
     tracking_number: "Tracking Number"
     order_total: "Order Total"
-    order_updated: "Order updated"
     customer_details: "Customer Details"
     customer_details_updated: "Customer Details updated"
     customer_search: "Customer Search"
@@ -4638,28 +4642,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
       x_years:
         one: 1 year
         other: "%{count} years"
-  errors:
-    not_found:
-      title: "The page you were looking for doesn't exist (404)"
-      message_html: "<b>Please try again</b>
-      <p>This might be a temporary problem. Please click the back button to return to the previous screen or go back to <a href='/'>Home</a> and try again.</p>
-      <b>Contact support</b>
-      <p>If the problem persists or is urgent, please tell us about it. Find our contact details from the global <a href='https://openfoodnetwork.org/ofn-local/' target='blank'>Open Food Network Local page</a>.</p>
-      <p>It really helps us if you can give as much detail as possible about what the missing page is about.</p>"
-    internal_server_error:
-      title: "We're sorry, but something went wrong (500)"
-      message_html: "<b>Please try again</b>
-      <p>This might be a temporary problem. Please click the back button to return to the previous screen or go back to <a href='/''>Home</a> and try again.</p>
-      <b>We're on it</b>
-      <p>If you have seen this problem before, we probably already know about it and are working on a fix. We record all the errors that come up.</p>
-      <b>Contact support</b>
-      <p>If the problem persists or is urgent, please tell us about it. Find our contact details from the global <a href='https://openfoodnetwork.org/ofn-local/' target='blank'>Open Food Network Local page</a>.</p>
-      <p>It really helps us if you can give as much detail as possible about what you were doing when this error occurred.</p>"
-    unprocessable_entity:
-      title: "The change you wanted was rejected (422)"
-      message_html: "<p>The change you wanted was rejected. Maybe you tried to change something you don't have access to.
-      <br><h3><a href='/' >Return home</a></h3>
-      </p>"
   components:
     multiple_checked_select:
       filter_placeholder: "Filter options"