From e5a96064496423b9a648a85670ff571b58bb5fd5 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Wed, 14 Aug 2019 03:25:02 +1000 Subject: [PATCH 01/12] Updating translations for config/locales/en_GB.yml --- config/locales/en_GB.yml | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index 26ef3d3767..482a5b2240 100644 --- a/config/locales/en_GB.yml +++ b/config/locales/en_GB.yml @@ -1001,6 +1001,10 @@ en_GB: The displayed prices are only an estimate and calculated at the time the subscription is changed. If you change prices or fees, orders will be updated, but the subscription will still display the old values. not_in_open_and_upcoming_order_cycles_warning: "There are no open or upcoming order cycles for this product." + autocomplete: + name_or_sku: "NAME OR SKU" + quantity: "Quantity" + add: "Add" details: details: Details invalid_error: Oops! Please fill in all of the required fields... @@ -1023,15 +1027,18 @@ en_GB: saving: "SAVING" saved: "SAVED" product_already_in_order: This product has already been added to the order. Please edit the quantity directly. + stock: + insufficient_stock: "Insufficient stock available" + out_of_stock: "Out of Stock" orders: number: Number confirm_edit: Are you sure you want to edit this order? Doing so may make it more difficult to automatically sync changes to the subscription in the future. - confirm_cancel_msg: Are you sure you want to cancel this subscription? This action cannot be undone. - cancel_failure_msg: 'Sorry, cancellation failed!' - confirm_pause_msg: Are you sure you want to pause this subscription? - pause_failure_msg: 'Sorry, pausing failed!' - confirm_unpause_msg: Are you sure you want to unpause this subscription? - unpause_failure_msg: 'Sorry, unpausing failed!' + confirm_cancel_msg: "Are you sure you want to cancel this subscription? This action cannot be undone." + cancel_failure_msg: "Sorry, cancellation failed!" + confirm_pause_msg: "Are you sure you want to pause this subscription?" + pause_failure_msg: "Sorry, pausing failed!" + confirm_unpause_msg: "If you have an open Order Cycle in this subscription's schedule, an order will be created for this customer. Are you sure you want to unpause this subscription?" + unpause_failure_msg: "Sorry, unpausing failed!" confirm_cancel_open_orders_msg: "Some orders for this subscription are currently open. The customer has already been notified that the order will be placed. Would you like to cancel these order(s) or keep them?" resume_canceled_orders_msg: "Some orders for this subscription can be resumed right now. You can resume them from the orders dropdown." yes_cancel_them: Cancel them @@ -1393,6 +1400,7 @@ en_GB: email_confirm_shop_number_html: "Order confirmation #%{number}" email_order_summary_item: "Item" email_order_summary_quantity: "Qty" + email_order_summary_sku: "Product Code" email_order_summary_price: "Price" email_order_summary_subtotal: "Subtotal:" email_order_summary_total: "Total:" @@ -2989,7 +2997,8 @@ en_GB: confirmation_pending: "Email confirmation is pending. We've sent a confirmation email to %{address}." variants: autocomplete: - producer_name: Producer + producer_name: "Producer" + unit: "Unit" general_settings: edit: legal_settings: "Legal Settings" From e9e73ef0e4803338bb1e3f5dad8674a9d30067f6 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Wed, 14 Aug 2019 04:43:50 +1000 Subject: [PATCH 03/12] Updating translations for config/locales/en_ZA.yml --- config/locales/en_ZA.yml | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/config/locales/en_ZA.yml b/config/locales/en_ZA.yml index d7e2f28ac4..d28e591140 100644 --- a/config/locales/en_ZA.yml +++ b/config/locales/en_ZA.yml @@ -94,6 +94,7 @@ en_ZA: user_passwords: spree_user: updated_not_active: "Your password has been reset, but your email has not been confirmed yet." + updated: "Your password was changed successfully. You are now signed in." send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes." models: order_cycle: @@ -1000,6 +1001,10 @@ en_ZA: The displayed prices are only an estimate and calculated at the time the subscription is changed. If you change prices or fees, orders will be updated, but the subscription will still display the old values. not_in_open_and_upcoming_order_cycles_warning: "There are no open or upcoming order cycles for this product." + autocomplete: + name_or_sku: "NAME OR SKU" + quantity: "Quantity" + add: "Add" details: details: Details invalid_error: Oops! Please fill in all of the required fields... @@ -1022,15 +1027,18 @@ en_ZA: saving: "SAVING" saved: "SAVED" product_already_in_order: This product has already been added to the order. Please edit the quantity directly. + stock: + insufficient_stock: "Insufficient stock available" + out_of_stock: "Out of Stock" orders: number: Number confirm_edit: Are you sure you want to edit this order? Doing so may make it more difficult to automatically sync changes to the subscription in the future. - confirm_cancel_msg: Are you sure you want to cancel this subscription? This action cannot be undone. - cancel_failure_msg: 'Sorry, cancellation failed!' - confirm_pause_msg: Are you sure you want to pause this subscription? - pause_failure_msg: 'Sorry, pausing failed!' - confirm_unpause_msg: Are you sure you want to unpause this subscription? - unpause_failure_msg: 'Sorry, unpausing failed!' + confirm_cancel_msg: "Are you sure you want to cancel this subscription? This action cannot be undone." + cancel_failure_msg: "Sorry, cancellation failed!" + confirm_pause_msg: "Are you sure you want to pause this subscription?" + pause_failure_msg: "Sorry, pausing failed!" + confirm_unpause_msg: "If you have an open Order Cycle in this subscription's schedule, an order will be created for this customer. Are you sure you want to unpause this subscription?" + unpause_failure_msg: "Sorry, unpausing failed!" confirm_cancel_open_orders_msg: "Some orders for this subscription are currently open. The customer has already been notified that the order will be placed. Would you like to cancel these order(s) or keep them?" resume_canceled_orders_msg: "Some orders for this subscription can be resumed right now. You can resume them from the orders dropdown." yes_cancel_them: Cancel them @@ -1392,6 +1400,7 @@ en_ZA: email_confirm_shop_number_html: "Order confirmation #%{number}" email_order_summary_item: "Item" email_order_summary_quantity: "Qty" + email_order_summary_sku: "SKU" email_order_summary_price: "Price" email_order_summary_subtotal: "Subtotal:" email_order_summary_total: "Total:" @@ -2780,6 +2789,7 @@ en_ZA: inventory: Inventory zipcode: Postcode weight: Weight (per kg) + error_user_destroy_with_orders: "Users with completed orders may not be deleted" actions: update: "Update" errors: @@ -2988,7 +2998,8 @@ en_ZA: confirmation_pending: "Email confirmation is pending. We've sent a confirmation email to %{address}." variants: autocomplete: - producer_name: Producer + producer_name: "Producer" + unit: "Unit" general_settings: edit: legal_settings: "Legal Settings" From 5a1ef04c676e380218cfb897afe8521c8b36dcb5 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Wed, 14 Aug 2019 04:57:27 +1000 Subject: [PATCH 04/12] Updating translations for config/locales/en_ZA.yml --- config/locales/en_ZA.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/locales/en_ZA.yml b/config/locales/en_ZA.yml index d28e591140..75270fce9e 100644 --- a/config/locales/en_ZA.yml +++ b/config/locales/en_ZA.yml @@ -2683,9 +2683,9 @@ en_ZA: check_for_spree_alerts: "Check for Spree alerts" currency_decimal_mark: "Currency decimal mark" currency_settings: "Currency Settings" - currency_symbol_position: Put "currency symbol before or after pound amount?" + currency_symbol_position: Put "currency symbol before or after Rand amount?" currency_thousands_separator: "Currency thousands separator" - hide_cents: "Hide pence" + hide_cents: "Hide cents" display_currency: "Display currency" choose_currency: "Choose Currency" mail_method_settings: "Mail Method Settings" @@ -2731,7 +2731,7 @@ en_ZA: default_tax: "Default Tax" default_tax_zone: "Default Tax Zone" country_based: "Country Based" - state_based: "County Based" + state_based: "Province Based" countries: "Countries" listing_countries: "Listing Countries" iso_name: "ISO Name" From c1248857b8651043032145d02dadb7737a09b836 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Wed, 14 Aug 2019 09:15:20 +1000 Subject: [PATCH 05/12] Updating translations for config/locales/en_CA.yml --- config/locales/en_CA.yml | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/config/locales/en_CA.yml b/config/locales/en_CA.yml index ad192f1850..138b931178 100644 --- a/config/locales/en_CA.yml +++ b/config/locales/en_CA.yml @@ -94,6 +94,7 @@ en_CA: user_passwords: spree_user: updated_not_active: "Your password has been reset, but your email has not been confirmed yet." + updated: "Your password was changed successfully. You are now signed in." send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes." models: order_cycle: @@ -1000,6 +1001,10 @@ en_CA: The displayed prices are only an estimate and calculated at the time the subscription is changed. If you change prices or fees, orders will be updated, but the subscription will still display the old values. not_in_open_and_upcoming_order_cycles_warning: "There are no open or upcoming order cycles for this product." + autocomplete: + name_or_sku: "NAME OR SKU" + quantity: "Quantity" + add: "Add" details: details: Details invalid_error: Oops! Please fill in all of the required fields... @@ -1022,15 +1027,18 @@ en_CA: saving: "SAVING" saved: "SAVED" product_already_in_order: This product has already been added to the order. Please edit the quantity directly. + stock: + insufficient_stock: "Insufficient stock available" + out_of_stock: "Out of Stock" orders: number: Number confirm_edit: Are you sure you want to edit this order? Doing so may make it more difficult to automatically sync changes to the subscription in the future. - confirm_cancel_msg: Are you sure you want to cancel this subscription? This action cannot be undone. - cancel_failure_msg: 'Sorry, cancellation failed!' - confirm_pause_msg: Are you sure you want to pause this subscription? - pause_failure_msg: 'Sorry, pausing failed!' - confirm_unpause_msg: Are you sure you want to unpause this subscription? - unpause_failure_msg: 'Sorry, unpausing failed!' + confirm_cancel_msg: "Are you sure you want to cancel this subscription? This action cannot be undone." + cancel_failure_msg: "Sorry, cancellation failed!" + confirm_pause_msg: "Are you sure you want to pause this subscription?" + pause_failure_msg: "Sorry, pausing failed!" + confirm_unpause_msg: "If you have an open Order Cycle in this subscription's schedule, an order will be created for this customer. Are you sure you want to unpause this subscription?" + unpause_failure_msg: "Sorry, unpausing failed!" confirm_cancel_open_orders_msg: "Some orders for this subscription are currently open. The customer has already been notified that the order will be placed. Would you like to cancel these order(s) or keep them?" resume_canceled_orders_msg: "Some orders for this subscription can be resumed right now. You can resume them from the orders dropdown." yes_cancel_them: Cancel them @@ -1392,6 +1400,7 @@ en_CA: email_confirm_shop_number_html: "Order confirmation #%{number}" email_order_summary_item: "Item" email_order_summary_quantity: "Qty" + email_order_summary_sku: "SKU" email_order_summary_price: "Price" email_order_summary_subtotal: "Subtotal:" email_order_summary_total: "Total:" @@ -2773,6 +2782,7 @@ en_CA: inventory: Inventory zipcode: Postal Code weight: Weight (per kg) + error_user_destroy_with_orders: "Users with completed orders may not be deleted" actions: update: "Update" errors: @@ -2876,9 +2886,11 @@ en_CA: new_shipping_method: "New Shipping Method" back_to_shipping_methods_list: "Back to Shipping Methods List" edit: + editing_shipping_method: "Editing Shipping Method" new: "New" back_to_shipping_methods_list: "Back to Shipping Methods List" form: + categories: "Categories" zones: "Zones" both: "Both" front_end: "Front End" @@ -2909,6 +2921,7 @@ en_CA: error_saving_payment: Error saving payment submitting_payment: Submitting payment... products: + image_upload_error: "The product image was not recognised. Please upload an image in PNG or JPG format." new: title: 'New Product' unit_name_placeholder: 'eg. bunches' @@ -2978,7 +2991,8 @@ en_CA: confirmation_pending: "Email confirmation is pending. We've sent a confirmation email to %{address}." variants: autocomplete: - producer_name: Producer + producer_name: "Producer" + unit: "Unit" general_settings: edit: legal_settings: "Legal Settings" @@ -3008,6 +3022,7 @@ en_CA: line_item: insufficient_stock: "Insufficient stock available, only %{on_hand} remaining" out_of_stock: "Out of Stock" + unavailable_item: "Currently unavailable" shipment_states: backorder: backorder partial: partial @@ -3027,6 +3042,8 @@ en_CA: invalid: invalid order_mailer: cancel_email: + customer_greeting: "Hi %{name}!" + instructions: "Your order has been CANCELED. Please retain this cancellation information for your records." order_summary_canceled: "Order Summary [CANCELED]" subject: "Cancellation of Order" confirm_email: From 20783db373663d47f7fd820b1e88f53324d341e8 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Thu, 15 Aug 2019 19:14:53 +1000 Subject: [PATCH 06/12] Updating translations for config/locales/en_GB.yml --- config/locales/en_GB.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index 482a5b2240..fbb3f437ec 100644 --- a/config/locales/en_GB.yml +++ b/config/locales/en_GB.yml @@ -244,6 +244,7 @@ en_GB: reset_password_token: Reset password expired: has expired, please request a new one back_to_payments_list: "Back to Payments List" + maestro_or_solo_cards: "Maestro/Solo cards" actions: create_and_add_another: "Create and Add Another" create: "Create" From 3d074b530f46346ee0649fbf19c216de5ce5ebc9 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Thu, 15 Aug 2019 19:16:43 +1000 Subject: [PATCH 07/12] Updating translations for config/locales/nb.yml --- config/locales/nb.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/nb.yml b/config/locales/nb.yml index 09bb286514..d8e20098c8 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -244,6 +244,7 @@ nb: reset_password_token: Tilbakestill passordtoken expired: er utløpt, vennligst be om en ny back_to_payments_list: "Tilbake til betalingsliste" + maestro_or_solo_cards: "Maestro/Solo kort" actions: create_and_add_another: "Opprett og legg til en annen" create: "Opprett" From 1e9820f291c3e59b380fbd828fe1f9efdf263824 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Tue, 20 Aug 2019 17:35:05 +1000 Subject: [PATCH 08/12] Updating translations for config/locales/fr.yml --- config/locales/fr.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 2e9cbd78a9..64d4801d29 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -244,6 +244,7 @@ fr: reset_password_token: La demande de réinitialisation du mot de passe expired: a expiré, veuillez faire une nouvelle demande. back_to_payments_list: "Retour à la liste des paiements" + maestro_or_solo_cards: "Cartes Maestro/Solo" actions: create_and_add_another: "Créer et ajouter nouveau" create: "Créer" @@ -452,6 +453,8 @@ fr: encoding_error: "Veuillez vérifier le paramètre de langue de votre code source et vous assurer qu'il est encodé en UTF-8" unexpected_error: "L'import de fichier produits à rencontré une erreur inconnue à l'ouverture du fichier : %{error_message}" index: + notice: "Notice" + beta_notice: "Cette fonctionnalité est en mode bêta : il est possible que vous rencontriez des erreurs en l'utilisant. N'hésitez pas à contacter le support utilisateurs." select_file: Sélectionner le fichier (tableur sous format csv) à importer spreadsheet: Tableur csv choose_import_type: Choisir le type d'import From 574781e901ce9cf25821f58a24a06c3e95103183 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Tue, 20 Aug 2019 17:39:01 +1000 Subject: [PATCH 10/12] Updating translations for config/locales/nb.yml --- config/locales/nb.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/locales/nb.yml b/config/locales/nb.yml index d8e20098c8..dc2d2d8c70 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -453,6 +453,8 @@ nb: encoding_error: "Vennligst sjekk språkinnstillingen til kildefilen din og kontroller at den er lagret med UTF-8-koding" unexpected_error: "Produktimport støtte på en uventet feil ved åpning av filen: %{error_message}" index: + notice: "Beskjed" + beta_notice: "Denne funksjonen er fremdeles i beta: du kan oppleve noen feil mens du bruker den. Ikke nøl med å kontakte support." select_file: Velg et regneark for å laste opp spreadsheet: Regneark choose_import_type: Velg importtype