From e31d17f4fb0e1ee89bcf751bb0035e4641ae0945 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Tue, 26 Oct 2021 15:59:56 +1100 Subject: [PATCH] Update translations --- config/locales/en_FR.yml | 1 + config/locales/en_GB.yml | 67 ++++++++++++++++++++++++++++++++++++++++ config/locales/en_IE.yml | 15 +++++++++ config/locales/en_US.yml | 1 + config/locales/fr.yml | 1 + config/locales/it.yml | 32 ++++++++++++++++++- config/locales/ru.yml | 15 +++++++++ 7 files changed, 131 insertions(+), 1 deletion(-) diff --git a/config/locales/en_FR.yml b/config/locales/en_FR.yml index cd94efde29..88237770f2 100644 --- a/config/locales/en_FR.yml +++ b/config/locales/en_FR.yml @@ -3561,6 +3561,7 @@ en_FR: no_payment_via_admin_backend: Paypal payments cannot be captured in the Backoffice products: image_upload_error: "The product image was not recognised. Please upload an image in PNG or JPG format." + paperclip_image_error: "Paperclip returned errors for file '%{attachment_file_name}' - check ImageMagick installation or image source file." new: title: "New Product" new_product: "New Product" diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index 7bff58a492..dc03dd1c68 100644 --- a/config/locales/en_GB.yml +++ b/config/locales/en_GB.yml @@ -41,6 +41,8 @@ en_GB: attributes: email: taken: "There's already an account for this email. Please login or reset your password." + reset_password_token: + invalid: is invalid spree/order: no_card: There are no authorised credit cards available to charge spree/credit_card: @@ -95,6 +97,9 @@ en_GB: community_forum_url: "Community forum URL" customer_instructions: "Customer instructions" devise: + passwords: + spree_user: + cannot_be_blank: "User password cannot be blank. Please enter a password." confirmations: send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes." failed_to_send: "An error occurred whilst sending your confirmation email." @@ -233,6 +238,7 @@ en_GB: search_by_name: Search by name, town, county or postcode... producers_join: UK producers are now welcome to join Open Food Network UK. charges_sales_tax: Charges VAT? + business_address: "Business Address" print_invoice: "Print Invoice" print_ticket: "Print Ticket" select_ticket_printer: "Select printer for tickets" @@ -712,6 +718,15 @@ en_GB: terms_and_conditions: "Terms and Conditions" remove_terms_and_conditions: "Remove File" uploaded_on: "uploaded on" + reset_form: "Reset Form" + business_address: + company_legal_name: Company Legal Name + company_placeholder: Example. + address1: Legal address + address1_placeholder: 123 High Street + address2: Address (contd.) + legal_phone_number: Legal phone number + phone_placeholder: "01632 123 456" contact: name: Name name_placeholder: eg. Amanda Plum @@ -1025,6 +1040,7 @@ en_GB: schedule: Schedule schedules: Schedules new_schedule: New Schedule + new_schedule_tooltip: The frequency with which a subscription order is placed name_and_timing_form: name: Name orders_open: Orders open at @@ -1530,40 +1546,81 @@ en_GB: cost_currency: "Cost Currency" split_checkout: your_details_without_number: Your details + payment_method_without_number: Payment method + order_summary_without_number: Order summary step1: your_details: title: Your details first_name: label: First Name + placeholder: e.g. Jane last_name: label: Last Name + placeholder: e.g. Doe email: label: Email + placeholder: e.g. Janedoe@email.com phone: label: Phone number + placeholder: e.g. 07987654321 billing_address: title: Billing address address: + address1: + label: Address (House Number + Street) + placeholder: e.g. Flat 1 Elm Apartments + address2: + label: Additional address info (optional) + placeholder: Flat Number 3 city: label: City + placeholder: e.g. London state_id: label: County zipcode: label: Postcode + placeholder: e.g. SW11 3QN country_id: label: Country delivery_address: title: Delivery address + submit: Next - Payment method + cancel: Back to Edit basket + step2: + payment_method: + title: Payment method + explaination: You can review and confirm your order in the next step which includes the final costs. + submit: Next - Order summary + cancel: Back to Your details step3: your_details: title: Your details + edit: Edit your details billing_address: title: Billing address + shipping_address: + title: Shipping address + delivery_info: + title: Delivery info + payment_method: + title: Payment method + edit: Edit payment method + order: + title: Order total terms_and_conditions: message_html: "I agree to the seller's %{terms_and_conditions_link}." link_text: "Terms and Conditions" + agree: By clicking 'Complete order' you agree to your order being processed. + submit: Complete order + cancel: Back to Payment method errors: + global: "Saving failed, please update the highlighted fields." + terms_not_accepted: Please accept Terms and Conditions + required: Field cannot be blank + invalid_number: "Please enter a valid phone number" invalid_email: "Please enter a valid email address" + select_a_shipping_method: Select a shipping method + select_a_payment_method: Select a payment method order_paid: PAID order_not_paid: NOT PAID order_total: Total order @@ -1663,6 +1720,7 @@ en_GB: producer_mail_order_text: "Here is a summary of the orders for your products:" producer_mail_delivery_instructions: "Stock pickup/delivery instructions:" producer_mail_signoff: "Thanks and best wishes" + producer_mail_order_customer_text: "Here is a summary of the orders grouped by customers" shopping_oc_closed: Orders are closed shopping_oc_closed_description: "Please wait until the next cycle opens (or contact us directly to see if we can accept any late orders)" shopping_oc_last_closed: "The last cycle closed %{distance_of_time} ago" @@ -2071,6 +2129,8 @@ en_GB: fundraising_fee: "Fundraising fee" price_graph: "Price graph" included_tax: "Included tax" + tax: "Tax" + tax_amount_included: "%{amount} (included)" balance: "Balance" transaction: "Transaction" transaction_date: "Date" @@ -2142,6 +2202,7 @@ en_GB: calculator_values: "Calculator values" calculator_settings_warning: "If you are changing the calculator type, you must save first before you can edit the calculator settings" calculator_preferred_unit_error: "must be kg or lb" + calculator_preferred_value_error: "Invalid input. Please use only numbers. For example: 10, 5.5, -20" flat_percent_per_item: "Flat Percent (per item)" flat_rate_per_item: "Flat Rate (per item)" flat_rate_per_order: "Flat Rate (per order)" @@ -2149,6 +2210,7 @@ en_GB: price_sack: "Price Sack" new_order_cycles: "New Order Cycles" new_order_cycle: "New Order Cycle" + new_order_cycle_tooltip: "Open shop for a certain time period" select_a_coordinator_for_your_order_cycle: "Select a coordinator for your order cycle" notify_producers: 'Notify producers' edit_order_cycle: "Edit Order Cycle" @@ -2515,6 +2577,7 @@ en_GB: resolve_errors: Please resolve the following errors more_items: "+ %{count} More" default_card_updated: Default Card Updated + default_card_voids_auth: Changing your default card will remove the shop's existing authorisations to charge it. You can re-authorise shops after updating the default card. Do you wish to change the default card? cart: add_to_cart_failed: > There was a problem adding this product to your basket. Perhaps it has become @@ -2553,6 +2616,8 @@ en_GB: title: "Uploading Terms and Conditions" message_1: "All your buyers will have to agree to them once at checkout. If you update the file, all your buyers will have to agree to them again at checkout." message_2: "For buyers with subscriptions, you need to email them the Terms and Conditions (or the changes to them) for now, nothing will notify them about these new Terms and Conditions." + business_address_info: + message: "Company Legal Name, Legal Address and Legal Phone Number are used for businesses that invoice from a legal entity registered with different details to their public trading information. These details will ONLY be used on invoices. If these details are blank your Public Name, Address and Phone Number will be used on invoices." panels: save: SAVE saved: SAVED @@ -2716,6 +2781,7 @@ en_GB: invalid: "invalid" quantity_adjusted: "Insufficient stock available. Line item updated to maximum available quantity." quantity_unchanged: "Quantity unchanged from previous amount." + cannot_remove_last_item: "Cannot remove last item from order. Please cancel order instead." resend_user_email_confirmation: resend: "Resend" sending: "Resend..." @@ -3732,6 +3798,7 @@ en_GB: awaiting_return: awaiting return canceled: cancelled cart: cart + confirmation: "confirmation" complete: complete confirm: confirm delivery: delivery diff --git a/config/locales/en_IE.yml b/config/locales/en_IE.yml index 88dcb49f1f..7922bbd7ea 100644 --- a/config/locales/en_IE.yml +++ b/config/locales/en_IE.yml @@ -238,6 +238,7 @@ en_IE: search_by_name: Search by name, town, county or eircode... producers_join: Producers are now welcome to join Open Food Network Ireland. charges_sales_tax: Charges VAT? + business_address: "Business Address" print_invoice: "Print Invoice" print_ticket: "Print Ticket" select_ticket_printer: "Select printer for tickets" @@ -717,6 +718,15 @@ en_IE: terms_and_conditions: "Terms and Conditions" remove_terms_and_conditions: "Remove File" uploaded_on: "uploaded on" + reset_form: "Reset Form" + business_address: + company_legal_name: Company Legal Name + company_placeholder: Example Inc. + address1: Legal address + address1_placeholder: 123 Main Street + address2: Address(contd.) + legal_phone_number: Legal phone number + phone_placeholder: "08x 123 4567" contact: name: Name name_placeholder: eg. Amanda Plum @@ -1537,6 +1547,7 @@ en_IE: split_checkout: your_details_without_number: Your details payment_method_without_number: Payment method + order_summary_without_number: Order summary step1: your_details: title: Your details @@ -2566,6 +2577,7 @@ en_IE: resolve_errors: Please resolve the following errors more_items: "+ %{count} More" default_card_updated: Default Card Updated + default_card_voids_auth: Changing your default card will remove shops' existing authorisations to charge it. You can re-authorise shops after updating the default card. Do you wish to change the default card? cart: add_to_cart_failed: > There was a problem adding this product to the cart. Perhaps it has become @@ -2604,6 +2616,8 @@ en_IE: title: "Uploading Terms and Conditions" message_1: "All your buyers will have to agree to them once at checkout. If you update the file, all your buyers will have to agree to them again at checkout." message_2: "For buyers with subscriptions, you need to email them the Terms and Conditions (or the changes to them) for now, nothing will notify them about these new Terms and Conditions." + business_address_info: + message: "Company Legal Name, Legal Address and Legal Phone number are used for businesses that invoice from a legal entity registered with different details to their public trading information. These details will ONLY be used on invoices. If these details are blank your public Name, Address and Phone Number will be used on invoices." panels: save: SAVE saved: SAVED @@ -3553,6 +3567,7 @@ en_IE: no_payment_via_admin_backend: Paypal payments cannot be captured in the Backoffice products: image_upload_error: "The product image was not recognised. Please upload an image in PNG or JPG format." + paperclip_image_error: "Paperclip returned errors for file '%{attachment_file_name}' - check ImageMagick installation or image source file." new: title: "New Product" new_product: "New Product" diff --git a/config/locales/en_US.yml b/config/locales/en_US.yml index 96e17b886a..f56a13a498 100644 --- a/config/locales/en_US.yml +++ b/config/locales/en_US.yml @@ -1547,6 +1547,7 @@ en_US: split_checkout: your_details_without_number: Your details payment_method_without_number: Payment method + order_summary_without_number: Order summary step1: your_details: title: Your details diff --git a/config/locales/fr.yml b/config/locales/fr.yml index dc645bbcd9..048fce311e 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -3590,6 +3590,7 @@ fr: no_payment_via_admin_backend: 'Il n''est pas encore possible de payer avec Paypal via l''administration. ' products: image_upload_error: "L'image du produit n'a pas été reconnue. Veuillez importer une image au format PNG ou JPG." + paperclip_image_error: "Erreur pour le ficher '%{attachment_file_name}' - veuillez vérifier la source du fichier." new: title: "Nouveau Produit" new_product: "Nouveau Produit" diff --git a/config/locales/it.yml b/config/locales/it.yml index 1befca8cb7..b822ee7dd3 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -41,6 +41,8 @@ it: attributes: email: taken: "Esiste già un account con questa email. Ti preghiamo di accedere o impostare una nuova password." + reset_password_token: + invalid: non è valido spree/order: no_card: Non ci sono carte di credito autorizzate disponibili per l'addebito spree/credit_card: @@ -95,6 +97,9 @@ it: community_forum_url: "URL Forum Community" customer_instructions: "Istruzioni per i consumatori" devise: + passwords: + spree_user: + cannot_be_blank: "La password non può essere vuota. Per favore digita una password" confirmations: send_instructions: "A breve riceverai una email con le istruzioni per la conferma del tuo account." failed_to_send: "C'è stato un errore nell'invio dell'email di conferma." @@ -233,6 +238,7 @@ it: search_by_name: Cerca per nome o zona... producers_join: I Produttori sono ora invitati ad unirsi ad Open Food Network charges_sales_tax: Addebiti l'IVA? + business_address: "Indirizzo azienda" print_invoice: "Stampa fattura" print_ticket: "Stampa Biglietto" select_ticket_printer: "Seleziona la stampante per i biglietti" @@ -712,6 +718,15 @@ it: terms_and_conditions: "Termini e Condizioni" remove_terms_and_conditions: "Rimuovi File" uploaded_on: "caricato il" + reset_form: "Cancella" + business_address: + company_legal_name: Ragione Sociale + company_placeholder: Esempio + address1: Indirizzo sede legale + address1_placeholder: via Roma 123 + address2: Indirizzo + legal_phone_number: Numero di telefono del rappresentante legale + phone_placeholder: "333 123123" contact: name: Nome name_placeholder: es. Gustav Plum @@ -1533,6 +1548,7 @@ it: split_checkout: your_details_without_number: I tuoi dettagli payment_method_without_number: Metodo di pagamento + order_summary_without_number: Riepilogo ordine step1: your_details: title: I tuoi dettagli @@ -1583,6 +1599,8 @@ it: edit: Modifica i tuoi dati billing_address: title: Indirizzo di fatturazione + shipping_address: + title: Indirizzo consegna delivery_info: title: Informazioni sulla consegna payment_method: @@ -1593,12 +1611,17 @@ it: terms_and_conditions: message_html: "Accetto i %{terms_and_conditions_link} del venditore." link_text: "Termini e Condizioni" + agree: Cliccando su "Conferma" accetti che la tua gentile richiesta sia processata. submit: Completa ordine cancel: Torna al metodo di pagamento errors: + global: "Salvataggio non riuscito. Per favore compila i campi evidenziati." + terms_not_accepted: Per favore accetta i Termini e Condizioni required: Il campo non può essere lasciato vuoto invalid_number: "Per favore inserisci un numero di telefono valido" invalid_email: "Per favore inserisci un indirizzo email valido" + select_a_shipping_method: Seleziona un metodo di consegna + select_a_payment_method: Seleziona un metodo di pagamento order_paid: PAGATO order_not_paid: NON PAGATO order_total: Totale dell'ordine @@ -1694,10 +1717,11 @@ it: set_a_password: "Ti sarà richiesto di impostare una password prima di poter gestire la pagina dell'azienda." mistakenly_sent: "Non sai perché hai ricevuto questa mail? Per favore contatta %{owner_email} per maggiori informazioni." producer_mail_greeting: "Cara/o" - producer_mail_text_before: "Per favore cerca qui sotto l'aggiornamento riguardo il ciclo d'ordine pronto per:" + producer_mail_text_before: "Qui sotto trovi il resoconto delle gentili richieste per il ciclo: " producer_mail_order_text: "Ecco il sommario degli ordini per i tuoi prodotti:" producer_mail_delivery_instructions: "Istruzioni per la consegna o il ritiro in magazzino:" producer_mail_signoff: "Grazie e sinceri saluti" + producer_mail_order_customer_text: "Qui trovi un resoconto delle gentili richieste raggruppate per consumatore." shopping_oc_closed: Gli ordini sono chiusi shopping_oc_closed_description: "Per favore aspetta l'apertura del prossimo ciclo (o contattaci direttamente per sapere se possiamo accettare ordini fuori tempo)" shopping_oc_last_closed: "L'ultimo ciclo è chiuso %{distance_of_time} fa" @@ -2179,6 +2203,7 @@ it: calculator_values: "Valori del calcolatore" calculator_settings_warning: "Se stai modificando il tipo di calcolatore, devi prima salvare prima di editare i setting del calcolatore" calculator_preferred_unit_error: "deve essere kg" + calculator_preferred_value_error: "Input non valido. Per favore usa solo numeri. Per esempio, 10; 5,5; -20" flat_percent_per_item: "Percentuale (per prodotto)" flat_rate_per_item: "Tariffa fissa (per pezzo)" flat_rate_per_order: "Tariffa fissa (per gentile richiesta)" @@ -2553,6 +2578,7 @@ it: resolve_errors: 'Per favore risolvi i seguenti errori:' more_items: "+ %{count} ancora" default_card_updated: Carta predefinita aggiornata + default_card_voids_auth: Cambiare la tua carta predefinita rimuove le autorizzazioni esistenti al negozio di caricarla. Potrai ri-autorizzare i negozi dopo aver aggiornato la carta predefinita. Desideri cambiare la tua carta predefinita? cart: add_to_cart_failed: > C'è stato un problema nell'aggiungere questo prodotto al carrello. Forse @@ -2591,6 +2617,8 @@ it: title: "Caricamento dei Termini e Condizioni" message_1: "Tutti i tuoi clienti dovranno accettarli alla conferma delle loro gentili richieste. Se aggiorni il documento, tutti i tuoi clienti dovranno accettarli nuovamente alla prossima conferma di richiesta." message_2: "Per i clienti in abbonamento, per ora è necessario mandare loro una mail con i Termini e le Condizioni (o con le modifiche ad essi). Non è al momento prevista alcuna notifica automatica." + business_address_info: + message: "La ragione sociale, l'indirizzo ed il telefono della sede legale sono usati per aziende che fatturano da un'entità legale registrata con dettagli diversi rispetto alle informazioni commerciali pubbliche. Questi dettagli saranno utilizzati SOLO per le fatture. Se non inserisci queste informazioni, nelle fatture saranno utilizzati Nome, Indirizzo e Numero di telefono pubblicati." panels: save: SALVA saved: SALVATO @@ -2751,6 +2779,7 @@ it: invalid: "invalido" quantity_adjusted: "Disponibilità insufficiente. Quantità aggiornata alla massima quantità disponibile." quantity_unchanged: "Quantità non modificata rispetto a quantità precedente." + cannot_remove_last_item: "Non è possibile rimuovere l'ultimo articolo dalla gentile richiesta. Per favore cancella l'ordine piuttosto." resend_user_email_confirmation: resend: "Invia nuovamente" sending: "Invia di nuovo..." @@ -3536,6 +3565,7 @@ it: no_payment_via_admin_backend: I pagamenti con Paypal non possono comparire nel Pannello di Controllo products: image_upload_error: "L'immagine del prodotto non è stata riconosciuta. Carica un'immagine in formato PNG o JPG." + paperclip_image_error: "Paperclip riporta errori per il file '%{attachment_file_name}' - controlla l'istallazione di ImageMagick o la fonte del file immagine." new: title: "Nuovo prodotto" new_product: "Nuovo prodotto" diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 31982bb61e..f3c4e27778 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -239,6 +239,7 @@ ru: search_by_name: Поиск по имени или городу... producers_join: Производители теперь могут присоединиться к Открытой Сети Продуктов. charges_sales_tax: Сбор налога с продаж? + business_address: "Юридический Адрес" print_invoice: "Счёт" print_ticket: "Печать счета" select_ticket_printer: "Выбрать принтер для счетов" @@ -718,6 +719,15 @@ ru: terms_and_conditions: "Условия и Положения" remove_terms_and_conditions: "Удалить Файл" uploaded_on: "загружено на" + reset_form: "Отчистить Форму" + business_address: + company_legal_name: Юридическое Название Компании + company_placeholder: Пример Inc. + address1: Юридический адрес + address1_placeholder: ул. Мира 17. + address2: Адрес (продолжение) + legal_phone_number: Официальный номер телефона + phone_placeholder: "+7 123 456 7890" contact: name: Имя name_placeholder: напр. Иван Иванов @@ -1540,6 +1550,7 @@ ru: split_checkout: your_details_without_number: Информация о Вас payment_method_without_number: Способ оплаты + order_summary_without_number: Итог заказа step1: your_details: title: Информация о Вас @@ -2569,6 +2580,7 @@ ru: resolve_errors: Пожалуйста исправьте следующие ошибки more_items: "+ %{count} Больше" default_card_updated: Карта По Умолчанию Обновлена + default_card_voids_auth: Смена карты по умолчанию приведет к удалению существующих разрешений магазинов на операции по ней. Вы можете повторно авторизовать магазины после обновления карты по умолчанию. Вы хотите изменить карту по умолчанию? cart: add_to_cart_failed: > При добавлении этого товара в корзину возникла проблема. Возможно, он стал @@ -2607,6 +2619,8 @@ ru: title: "Загрузка Условий и Положений" message_1: "Все ваши покупатели должны будут согласиться с ними один раз при оформлении заказа. Если вы обновите файл, всем вашим покупателям придется снова согласиться с ними при оформлении заказа." message_2: "Покупателям с подписками необходимо отправить Условия и Положения (или их изменения) по электронной почте, иначе они не будут знать о них." + business_address_info: + message: "Юридическое Название компании, Юридический Адрес и Официальный номер телефона используются в компаниях, которые выставляют счета от юридического лица, зарегистрированного с другими реквизитами, отличными от их общедоступной торговой информации. Эти данные будут использоваться ТОЛЬКО в счетах. Если эти данные не заполнены, в счетах будут использоваться ваше Публичное название, Адрес и номер телефона." panels: save: СОХРАНИТЬ saved: СОХРАНЕН @@ -3603,6 +3617,7 @@ ru: no_payment_via_admin_backend: Платежи Paypal не могут быть зарегистрированы в Бэк-офисе products: image_upload_error: "Изображение товара не было распознано. Пожалуйста, загрузите изображение в формате PNG или JPG." + paperclip_image_error: "Скрепка вернула ошибки для файла '%{attachment_file_name}' - проверьте установку ImageMagick или исходный файл изображения." new: title: "Новый Товар" new_product: "Новый Товар"