Manual update from transifex

config/locales/en_GB.yml

@@ -351,8 +351,6 @@ en_GB:
         contact:
           name: Name
           name_placeholder: eg. Amanda Plum
-          email_address: Email Address
-          email_address_placeholder: eg. amanda@truffles.co.uk
           phone: Phone
           phone_placeholder: eg. 98 7654 3210
           website: Website
@@ -470,6 +468,7 @@ en_GB:
           email_confirmation_notice_html: "Email confirmation is pending. We've sent a confirmation email to %{email}."
           resend: Resend
           owner: 'Owner'
+          contact: "Contact"
           owner_tip: The primary user responsible for this enterprise.
           notifications: Notifications
           notifications_tip: Notifications about orders will be send to this email address.
@@ -931,7 +930,6 @@ en_GB:
   email_confirmation_click_link: "Please click the link below to confirm your email and to continue setting up your profile."
   email_confirmation_link_label: "Confirm this email address »"
   email_confirmation_help_html: "After confirming your email you can access your administration account for this enterprise. See the %{link} to find out more about %{sitename}'s features and to start using your profile or online store."
-  email_confirmation_userguide: "User Guide"
   email_social: "Connect with Us:"
   email_contact: "Email us:"
   email_signoff: "Cheers,"
@@ -963,9 +961,6 @@ en_GB:
   email_special_instructions: "Your notes:"
   email_signup_greeting: Hello!
   email_signup_welcome: "Welcome to %{sitename}!"
-  email_signup_login: Your login
-  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}"
   producer_mail_greeting: "Dear"
@@ -987,6 +982,8 @@ en_GB:
   enterprises_next_closing: "Next order closing"
   enterprises_ready_for: "Ready for"
   enterprises_choose: "Choose when you want your order:"
+  maps_open: "Open"
+  maps_closed: "Closed"
   hubs_buy: "Shop for:"
   hubs_shopping_here: "Shopping here"
   hubs_orders_closed: "Orders closed"
@@ -1310,7 +1307,6 @@ en_GB:
   enterprise_about_headline: "Nice one!"
   enterprise_about_message: "Now let's flesh out the details about"
   enterprise_success: "Success! %{enterprise} added to the Open Food Network "
-  enterprise_registration_exit_message: "If you exit this wizard at any stage, you need to click the confirmation link in the email you have received. This will take you to your admin interface where you can continue setting up your profile."
   enterprise_description: "Short Description"
   enterprise_description_placeholder: "A short sentence describing your enterprise"
   enterprise_long_desc: "Long Description"
@@ -1351,8 +1347,6 @@ en_GB:
   registration_finished_headline: "Finished!"
   registration_finished_thanks: "Thanks for filling out the details for %{enterprise}."
   registration_finished_login: "You can change or update your enterprise at any stage by logging into Open Food Network and going to Admin."
-  registration_finished_activate: "Activate %{enterprise}."
-  registration_finished_activate_instruction_html: "We've sent a confirmation email to <strong>%{email}</strong> if it hasn't been activated before.<br/> Please follow the instructions there to make your enterprise visible on the Open Food Network."
   registration_finished_action: "Open Food Network home"
   registration_contact_name: 'Contact Name'
   registration_type_headline: "Last step to add %{enterprise}!"
@@ -1802,7 +1796,6 @@ en_GB:
   order_cycles_email_to_producers_notice: 'Emails to be sent to producers have been queued for sending.'
   order_cycles_no_permission_to_coordinate_error: "None of your enterprises have permission to coordinate an order cycle"
   order_cycles_no_permission_to_create_error: "You don't have permission to create an order cycle coordinated by that enterprise"
-  order_cycles_no_permission_to_delete_error: "That order cycle has been selected by a customer and cannot be deleted. To prevent customers from accessing it, please close it instead."
   js:
     saving: 'Saving...'
     changes_saved: 'Changes saved.'
@@ -2099,7 +2092,6 @@ en_GB:
       address: address
       adjustments: adjustments
       awaiting_return: awaiting return
-      canceled: canceled
       cart: cart
       complete: complete
       confirm: confirm

config/locales/en_US.yml

@@ -36,7 +36,7 @@ en_US:
   title: US Food Coop - Open Food Network US
   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 or city...
   producers_join: US producers are now welcome to join US Food Coop - Open Food Network US.
   charges_sales_tax: Charges Sales Tax?
   print_invoice: "Invoice"
@@ -57,7 +57,7 @@ en_US:
   per_month: "per month"
   free: "free"
   free_trial: "free trial"
-  plus_tax: "plus VAT"
+  plus_tax: "plus tax"
   min_bill_turnover_desc: "once turnover exceeds %{mbt_amount}"
   say_no: "No"
   say_yes: "Yes"
@@ -315,6 +315,7 @@ en_US:
         weight_volume: "Weight/Volume"
         ask: "Ask?"
         page_title: "Bulk Order Management"
+        actions_delete: "Delete Selected"
         loading: "Loading orders"
         no_results: "No orders found."
         group_buy_unit_size: "Group Buy Unit Size"
@@ -350,8 +351,6 @@ en_US:
         contact:
           name: Name
           name_placeholder: eg. Justin Jones
-          email_address: Email Address
-          email_address_placeholder: eg. justin@truffles.com
           phone: Phone
           phone_placeholder: eg. (123)456-7891
           website: Website
@@ -469,6 +468,7 @@ en_US:
           email_confirmation_notice_html: "Email confirmation is pending. We've sent a confirmation email to %{email}."
           resend: Resend
           owner: 'Owner'
+          contact: "Contact"
           owner_tip: The primary user responsible for this enterprise.
           notifications: Notifications
           notifications_tip: Notifications about orders will be send to this email address.
@@ -760,10 +760,10 @@ en_US:
   address_placeholder: eg. 123 High Street
   address2: Address (contd.)
   city: City
-  city_placeholder: eg. New York
+  city_placeholder: City or Town
   postcode: Zip Code
   postcode_placeholder: eg. 24091
-  state: County
+  state: State
   country: Country
   unauthorized: Unauthorized
   terms_of_service: "Terms of service"
@@ -856,7 +856,7 @@ en_US:
   connect_cta: "Go Exploring"
   system_headline: "Shopping - here's how it works."
   system_step1: "1. Search"
-  system_step1_text: "Search our diverse, independent shops for seasonal local food. Search by neighbourhood and food category, or whether you prefer delivery or pickup."
+  system_step1_text: "Search our diverse, independent shops for seasonal local food. Search by neighborhood and food category, or whether you prefer delivery or pickup."
   system_step2: "2. Shop"
   system_step2_text: "Transform your transactions with affordable local food from diverse producers and hubs. Know the stories behind your food and the people who make it!"
   system_step3: "3. Pick-up / Delivery"
@@ -930,7 +930,6 @@ en_US:
   email_confirmation_click_link: "Please click the link below to confirm your email and to continue setting up your profile."
   email_confirmation_link_label: "Confirm this email address »"
   email_confirmation_help_html: "After confirming your email you can access your administration account for this enterprise. See the %{link} to find out more about %{sitename}'s features and to start using your profile or online store."
-  email_confirmation_userguide: "User Guide"
   email_social: "Connect with Us:"
   email_contact: "Email us:"
   email_signoff: "Cheers,"
@@ -962,9 +961,6 @@ en_US:
   email_special_instructions: "Your notes:"
   email_signup_greeting: Hello!
   email_signup_welcome: "Welcome to %{sitename}!"
-  email_signup_login: Your login
-  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}"
   producer_mail_greeting: "Dear"
@@ -986,6 +982,8 @@ en_US:
   enterprises_next_closing: "Next order closing"
   enterprises_ready_for: "Ready for"
   enterprises_choose: "Choose when you want your order:"
+  maps_open: "Open"
+  maps_closed: "Closed"
   hubs_buy: "Shop for:"
   hubs_shopping_here: "Shopping here"
   hubs_orders_closed: "Orders closed"
@@ -1060,8 +1058,8 @@ en_US:
   modal_hubs_content1: You can search for a convenient hub by location or name. Some hubs have multiple points where you can pick-up your purchases, and some will also provide delivery options. Each food hub is a sales point with independent business operations and logistics - so variations between hubs are to be expected.
   modal_hubs_content2: You can only shop at one food hub at a time.
   modal_groups: "Groups / Regions"
-  modal_groups_content1: These are the organisations and relationships between hubs which make up the Open Food Network.
-  modal_groups_content2: Some groups are clustered by location or council, others by non-geographic similarities.
+  modal_groups_content1: These are the organizations and relationships between hubs which make up the Open Food Network.
+  modal_groups_content2: Some groups are clustered by location, others by non-geographic similarities.
   modal_how: "How it works"
   modal_how_shop: Shop the Open Food Network
   modal_how_shop_explained: Search for a food hub near you to start shopping! You can expand each food hub to see what kinds of goodies are available, and click through to start shopping. (You can only shop one food hub at a time.)
@@ -1188,7 +1186,7 @@ en_US:
   confirm_oc_change: "Are you sure? This will change your selected order cycle and remove any items in your shopping cart."
   location_placeholder: "Type in a location..."
   error_required: "can't be blank"
-  error_number: "must be number"
+  error_number: "must be a number"
   error_email: "must be email address"
   error_not_found_in_database: "%{name} not found in database"
   error_no_permission_for_enterprise: "\"%{name}\": you do not have permission to manage products for this enterprise"
@@ -1238,8 +1236,8 @@ en_US:
             address1_field_error: "Please enter an address"
             address2_field: "Address line 2:"
             suburb_field: "City:"
-            suburb_field_placeholder: "eg. Minneapolis"
-            suburb_field_error: "Please enter a suburb"
+            suburb_field_placeholder: "City or Town"
+            suburb_field_error: "Please enter a city"
             postcode_field: "Zip code:"
             postcode_field_placeholder: "eg. 24301"
             postcode_field_error: "Zip code required"
@@ -1298,27 +1296,26 @@ en_US:
   logo_label: "Choose a logo image"
   logo_drag: "Drag and drop your logo here"
   review_logo: "Step 2. Review your logo"
-  review_logo_tip: "Tip: for best results, your logo should fill the available space"
+  review_logo_tip: "Tip: for the best look, your logo should fill the available space"
   logo_placeholder: "Your logo will appear here for review once uploaded"
   enterprise_about_headline: "Nice one!"
   enterprise_about_message: "Now let's flesh out the details about"
   enterprise_success: "Success! %{enterprise} added to the Open Food Network "
-  enterprise_registration_exit_message: "If you exit this wizard at any stage, you need to click the confirmation link in the email you have received. This will take you to your admin interface where you can continue setting up your profile."
   enterprise_description: "Short Description"
   enterprise_description_placeholder: "A short sentence describing your enterprise"
   enterprise_long_desc: "Long Description"
   enterprise_long_desc_placeholder: "This is your opportunity to tell the story of your enterprise - what makes you different and wonderful? We'd suggest keeping your description to under 600 characters or 150 words."
   enterprise_long_desc_length: "%{num} characters / up to 600 recommended"
   enterprise_limit: Enterprise Limit
-  enterprise_abn: "ABN"
-  enterprise_abn_placeholder: "eg. 99 123 456 789"
-  enterprise_acn: "ACN"
-  enterprise_acn_placeholder: "eg. 123 456 789"
+  enterprise_abn: "Tax ID No."
+  enterprise_abn_placeholder: "eg. 123456789"
+  enterprise_acn: "Legal Business Name"
+  enterprise_acn_placeholder: "eg. Justins Produce LLC"
   enterprise_tax_required: "You need to make a selection."
   enterprise_final_step: "Final step!"
   enterprise_social_text: "How can people find %{enterprise} online?"
   website: "Website"
-  website_placeholder: "eg. openfoodnetwork.org.au"
+  website_placeholder: "eg. openfoodnetwork.net"
   facebook: "Facebook"
   facebook_placeholder: "eg. www.facebook.com/PageNameHere"
   linkedin: "LinkedIn"
@@ -1332,7 +1329,7 @@ en_US:
   registration_action: "Let's get started!"
   registration_checklist: "You'll need"
   registration_time: "5-10 minutes"
-  registration_enterprise_address: "Enterprise address"
+  registration_enterprise_address: "Address"
   registration_contact_details: "Primary contact details"
   registration_logo: "Your logo image"
   registration_promo_image: "Landscape image for your profile"
@@ -1344,8 +1341,6 @@ en_US:
   registration_finished_headline: "Finished!"
   registration_finished_thanks: "Thanks for filling out the details for %{enterprise}."
   registration_finished_login: "You can change or update your enterprise at any stage by logging into Open Food Network and going to Admin."
-  registration_finished_activate: "Activate %{enterprise}."
-  registration_finished_activate_instruction_html: "We've sent a confirmation email to <strong>%{email}</strong> if it hasn't been activated before.<br/> Please follow the instructions there to make your enterprise visible on the Open Food Network."
   registration_finished_action: "Open Food Network home"
   registration_contact_name: 'Contact Name'
   registration_type_headline: "Last step to add %{enterprise}!"
@@ -1359,8 +1354,8 @@ en_US:
   registration_images_headline: "Thanks!"
   registration_images_description: "Let's upload some pretty 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: "Hooray! First we need to know a little bit about your enterprise:"
+  registration_detail_producer: "Oh Yeah! 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"
@@ -1369,11 +1364,11 @@ en_US:
   registration_detail_address1_placeholder: "e.g. 123 Cranberry 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: "City:"
+  registration_detail_suburb_placeholder: "City or Town"
+  registration_detail_suburb_error: "Please enter a city"
   registration_detail_postcode: "Zip Code:"
-  registration_detail_postcode_placeholder: "e.g. 3070"
+  registration_detail_postcode_placeholder: "e.g. 24908"
   registration_detail_postcode_error: "Zip Code required"
   registration_detail_state: "State:"
   registration_detail_state_error: "State required"
@@ -1428,17 +1423,17 @@ en_US:
   admin_entreprise_groups_data_powertip_logo: "This is the logo for the group"
   admin_entreprise_groups_data_powertip_promo_image: "This image is displayed at the top of the Group profile"
   admin_entreprise_groups_contact: "Contact"
-  admin_entreprise_groups_contact_phone_placeholder: "eg. 98 7654 3210"
+  admin_entreprise_groups_contact_phone_placeholder: "eg. (123)435-7891"
   admin_entreprise_groups_contact_address1_placeholder: "eg. 123 High Street"
-  admin_entreprise_groups_contact_city: "Suburb"
-  admin_entreprise_groups_contact_city_placeholder: "eg. Camden"
+  admin_entreprise_groups_contact_city: "City"
+  admin_entreprise_groups_contact_city_placeholder: "City or Town"
   admin_entreprise_groups_contact_zipcode: "Zip Code"
-  admin_entreprise_groups_contact_zipcode_placeholder: "eg. NW1 0AA"
-  admin_entreprise_groups_contact_state_id: "County"
+  admin_entreprise_groups_contact_zipcode_placeholder: "eg. 24098"
+  admin_entreprise_groups_contact_state_id: "State"
   admin_entreprise_groups_contact_country_id: "Country"
   admin_entreprise_groups_web: "Web Resources"
   admin_entreprise_groups_web_twitter: "eg. @openfoodnetuk"
-  admin_entreprise_groups_web_website_placeholder: "eg. www.truffles.co.uk"
+  admin_entreprise_groups_web_website_placeholder: "eg. www.truffles.com"
   admin_order_cycles: "Admin Order Cycles"
   open: "Open"
   close: "Close"
@@ -1555,7 +1550,7 @@ en_US:
   admin_share_city: "City"
   admin_share_zipcode: "Zip Code"
   admin_share_country: "Country"
-  admin_share_state: "County"
+  admin_share_state: "State"
   hub_sidebar_hubs: "Hubs"
   hub_sidebar_none_available: "None Available"
   hub_sidebar_manage: "Manage"
@@ -1669,6 +1664,8 @@ en_US:
   report_header_sum_total: Sum Total
   report_header_date_of_order: Date of Order
   report_header_amount_owing: Amount Owing
+  report_header_amount_paid: Amount Paid
+  report_header_units_required: Units Required
   report_header_remainder: Remainder
   report_header_order_date: Order date
   report_header_order_id: Order Id
@@ -1679,6 +1676,7 @@ en_US:
   report_header_customer_phone: Customer Phone
   report_header_customer_city: Customer City
   report_header_payment_state: Payment State
+  report_header_payment_type: Payment Type
   report_header_item_price: "Item (%{currency})"
   report_header_item_fees_price: "Item + Fees (%{currency})"
   report_header_admin_handling_fees: "Admin & Handling (%{currency})"
@@ -1763,6 +1761,7 @@ en_US:
   enterprise_role_uniqueness_error: "^That role is already present."
   inventory_item_visibility_error: must be true or false
   product_importer_file_error: "error: no file uploaded"
+  product_importer_spreadsheet_error: "could not process file: invalid filetype"
   product_importer_products_save_error: did not save any products successfully
   product_import_file_not_found_notice: 'File not found or could not be opened'
   product_import_no_data_in_spreadsheet_notice: 'No data found in spreadsheet'
@@ -1791,7 +1790,6 @@ en_US:
   order_cycles_email_to_producers_notice: 'Emails to be sent to producers have been queued for sending.'
   order_cycles_no_permission_to_coordinate_error: "None of your enterprises have permission to coordinate an order cycle"
   order_cycles_no_permission_to_create_error: "You don't have permission to create an order cycle coordinated by that enterprise"
-  order_cycles_no_permission_to_delete_error: "That order cycle has been selected by a customer and cannot be deleted. To prevent customers from accessing it, please close it instead."
   js:
     saving: 'Saving...'
     changes_saved: 'Changes saved.'
@@ -2055,6 +2053,7 @@ en_US:
           display_as: Display As
       reports:
         bulk_coop:
+          bulk_coop_supplier_report: 'Bulk Co-op - Totals by Supplier'
           bulk_coop_allocation: 'Bulk Co-op - Allocation'
           bulk_coop_packing_sheets: 'Bulk Co-op - Packing Sheets'
           bulk_coop_customer_payments: 'Bulk Co-op - Customer Payments'
@@ -2087,7 +2086,6 @@ en_US:
       address: address
       adjustments: adjustments
       awaiting_return: awaiting return
-      canceled: canceled
       cart: cart
       complete: complete
       confirm: confirm