Merge pull request #1243 from openfoodfoundation/uk/translations

Translation updates

config/locales/en-GB.yml

@@ -6,7 +6,7 @@ en-GB:
         shipment_state: Shipment State
   devise:
     failure:
-      invalid:
+      invalid: |
         Invalid email or password.
         Were you a guest last time?  Perhaps you need to create an account or reset your password.
     enterprise_confirmations:
@@ -23,7 +23,7 @@ en-GB:
   title: Open Food Network
   welcome_to: 'Welcome to '
   site_meta_description: "We begin from the ground up. With farmers and growers ready to tell their stories proudly and truly. With distributors ready to connect people with products fairly and honestly. With buyers who believe that better weekly shopping decisions can seriously change the world."
-  search_by_name: Search by name...
+  search_by_name: Search by name, town, county or postcode...
   producers: 'UK Producers'
   producers_join: UK producers are now welcome to join Open Food Network UK.
   charges_sales_tax: Charges VAT?
@@ -43,7 +43,7 @@ en-GB:
   monthly_cap_excl_tax: "monthly cap (excl. VAT)"
   capped_at_cap: "capped at %{cap}"
   per_month: "per month"
-  free: "free"
+  free: "pay what you can"
   free_trial: "free trial"
   plus_tax: "plus VAT"
   total_monthly_bill_incl_tax: "Total Monthly Bill (Incl. VAT)"
@@ -90,6 +90,18 @@ en-GB:
         add_a_new_customer_for: Add a new customer for %{shop_name}
         code: Code
         duplicate_code: "This code is used already."
+        bill_address: "Billing Address"
+        ship_address: "Shipping Address"
+        update_address_success: 'Address updated successfully.'
+        update_address_error: 'Sorry! Please input all of the required fields!'
+        edit_bill_address: 'Edit Billing Address'
+        edit_ship_address: 'Edit Shipping Address'
+        required_fileds: 'Required fields are denoted with an asterisk'
+        select_country: 'Select Country'
+        select_state: 'Select County'
+        edit: 'Edit'
+        update_address: 'Update Address'
+        confirm_delete: 'Sure to delete?'
     products:
       bulk_edit:
         unit: Unit
@@ -152,11 +164,15 @@ en-GB:
         status: Status
         manage: Manage
       form:
-        primary_details:
-          shopfront_requires_login: "Shopfront requires login?"
-          shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront."
+        shop_preferences:
+          shopfront_requires_login: "Publicly visible shopfront?"
+          shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront or if it's visible to everybody."
           shopfront_requires_login_false: "Public"
-          shopfront_requires_login_true: "Require customers to login"
+          shopfront_requires_login_true: "Visible to registered customers only"
+          allow_guest_orders: "Guest orders"
+          allow_guest_orders_tip: "Allow checkout as guest or require a registered user."
+          allow_guest_orders_false: "Require login to order"
+          allow_guest_orders_true: "Allow guest checkout"
   home:
     hubs:
       show_closed_shops: "Show closed shops"
@@ -308,7 +324,9 @@ en-GB:
   checkout_as_guest: "Checkout as guest"
   checkout_details: "Your details"
   checkout_billing: "Billing info"
+  checkout_default_bill_address: "Save as default billing address"
   checkout_shipping: Shipping info
+  checkout_default_ship_address: "Save as default shipping address"
   checkout_method_free: Free
   checkout_address_same: Shipping address same as billing address?
   checkout_ready_for: "Ready for:"
@@ -347,6 +365,7 @@ en-GB:
   email_userguide_html: "The User Guide with detailed support for setting up your Producer or Hub is here: %{link}"
   email_admin_html: "You can manage your account by logging into the %{link} or by clicking on the cog in the top right hand side of the homepage, and selecting Administration."
   email_community_html: "We also have an online forum for community discussion related to OFN software and the unique challenges of running a food enterprise. You are encouraged to join in. We are constantly evolving and your input into this forum will shape what happens next. %{link}"
+  join_community: "Join the community"
   email_help: "If you have any difficulties, check out our FAQs, browse the forum or post a 'Support' topic and someone will help you out!"
   email_confirmation_greeting: "Hi, %{contact}!"
   email_confirmation_profile_created: "A profile for %{name} has been successfully created! To activate your Profile we need to confirm this email address."
@@ -388,7 +407,7 @@ en-GB:
   email_signup_email: Your login email is
   email_signup_shop_html: "You can start shopping online now at %{link}."
   email_signup_text: "Thanks for joining the network. If you are a customer, we look forward to introducing you to many fantastic farmers, wonderful food hubs and delicious food! If you are a producer or food enterprise, we are excited to have you as a part of the network."
-  email_signup_help_html: "We welcome all your questions and feedback; you can use the <em>Send Feedback</em> button on the site or email us at"
+  email_signup_help_html: "We welcome all your questions and feedback; you can use the <em>Send Feedback</em> button on the site or email us at %{email}"
   producer_mail_greeting: "Dear"
   producer_mail_text_before: "We now have all the consumer orders for the next food delivery."
   producer_mail_order_text: "Here is a summary of the orders for your products:"
@@ -529,8 +548,8 @@ en-GB:
   sell_hubs_detail: "Set up a profile for your food enterprise or organisation on the OFN. At any time you can upgrade your profile to a multi-producer shop."
   sell_groups_detail: "Set up a tailored directory of enterprises (producers and other food enterprises) for your region or for your organisation."
   sell_user_guide: "Find out more in our user guide."
-  sell_listing_price: "Listing on OFN is free. Opening and running a shop on OFN is free for six months and always free for small enterprises. We charge just 2% of sales for enterprises turning over more than £5000/year."
-  sell_embed: "We can also embed an OFN shop in your own customised website or build a customised local food network website for your region."
+  sell_listing_price: "Selling through OFN UK is free!\n\nOFN UK is a Platform Cooperative - part of the Solidarity or Sharing Economy. Our goal is to support the distribution of as much local food as possible. As such OFN UK asks users to 'Pay What You Feel' toward the running costs and maintenance. We think 2% of sales is fair for all the services that OFN UK provide. But more importantly, we think that getting good local food to people at a fair price is more important than paying for software. So pay what you feel our services are worth to your enterprise."
+  sell_embed: "We collectively budget for new feature development from the international OFN community. This way the huge cost of good software development can be shared. If you want a new feature, chances are someone in France, South Africa, Australia, India or Brazil might want it too! Use the Community Forum to suggest features you'd like to see."
   sell_ask_services: "Ask us about OFN services."
   shops_title: Shops
   shops_headline: Shopping, transformed.
@@ -706,30 +725,30 @@ en-GB:
   registration_type_producer: "Yes, I'm a producer"
   registration_type_no_producer: "No, I'm not a producer"
   registration_type_error: "Please choose one. Are you are producer?"
-  registration_type_producer_help: "Producers make yummy things to eat and/or drink. You're a producer if you grow it, raise it, brew it, bake it, ferment it, milk it or mould it."
+  registration_type_producer_help: "Producers make things to eat and/or drink. You're a producer if you might grow it, raise it, brew it, bake it or ferment it."
   registration_type_no_producer_help: "If you’re not a producer, you’re probably someone who sells and distributes food. You might be a hub, coop, buying group, retailer, wholesaler or other."
   create_profile: "Create profile"
   registration_images_headline: "Thanks!"
-  registration_images_description: "Let's upload some pretty pictures so your profile looks great! :)"
+  registration_images_description: "Let's upload some pictures so your profile looks great! :)"
   registration_detail_headline: "Let's get started"
-  registration_detail_enterprise: "Woot! First we need to know a little bit about your enterprise:"
-  registration_detail_producer: "Woot! First we need to know a little bit about your farm:"
+  registration_detail_enterprise: "First we need to know a little bit about your enterprise:"
+  registration_detail_producer: "First we need to know a little bit about your farm:"
   registration_detail_name_enterprise: "Enterprise name:"
   registration_detail_name_producer: "Farm name:"
-  registration_detail_name_placeholder: "e.g. Charlie's Awesome Farm"
+  registration_detail_name_placeholder: "e.g. Charlie's Farm"
   registration_detail_name_error: "Please choose a unique name for your enterprise"
   registration_detail_address1: "Address line 1:"
-  registration_detail_address1_placeholder: "e.g. 123 Cranberry Drive"
+  registration_detail_address1_placeholder: "e.g. 123 Apple Drive"
   registration_detail_address1_error: "Please enter an address"
   registration_detail_address2: "Address line 2:"
-  registration_detail_suburb: "Suburb:"
-  registration_detail_suburb_placeholder: "e.g. Northcote"
-  registration_detail_suburb_error: "Please enter a suburb"
+  registration_detail_suburb: "Town:"
+  registration_detail_suburb_placeholder: "e.g. Taunton"
+  registration_detail_suburb_error: "Please enter a town"
   registration_detail_postcode: "Postcode:"
-  registration_detail_postcode_placeholder: "e.g. 3070"
+  registration_detail_postcode_placeholder: "e.g. TA1 1AA"
   registration_detail_postcode_error: "Postcode required"
-  registration_detail_state: "State:"
-  registration_detail_state_error: "State required"
+  registration_detail_state: "County:"
+  registration_detail_state_error: "County required"
   registration_detail_country: "Country:"
   registration_detail_country_error: "Please select a country"
   fees: "Fees"
@@ -797,6 +816,7 @@ en-GB:
   tax_category: "Tax Category"
   calculator: "Calculator"
   calculator_values: "Calculator values"
+  flat_percent_per_item: "Flat Percent (per item)"
   new_order_cycles: "New Order Cycles"
   select_a_coordinator_for_your_order_cycle: "Select a coordinator for your order cycle"
   edit_order_cycle: "Edit Order Cycle"
@@ -947,6 +967,7 @@ en-GB:
   validation_msg_tax_category_cant_be_blank: "^Tax Category can't be blank"
   validation_msg_is_associated_with_an_exising_customer: "is associated with an existing customer"
   spree:
+    zipcode: Postcode
     shipment_states:
       backorder: backorder
       partial: partial