diff --git a/config/locales/de.yml b/config/locales/de.yml index 6e3390b1..04049a71 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -658,9 +658,9 @@ de: end: Ende everything_cleared: Super, alles schon abgerechnet... group: Gruppe - last_transactions: letzte Überweisungen + last_transactions: Letzte Überweisungen note: Notiz - open_transactions: noch nicht abgerechnet + open_transactions: Noch nicht abgerechnet show_all: alle anzeigen supplier: Lieferantin title: Finanzbereich @@ -1068,11 +1068,8 @@ de: die Bestelling für "%{order}" wurde am %{when} von %{user} beendet. - - Für Euch wurden die folgenden Artikel bestellt: - -' - text1: ! 'Gesamtpreis: %{sum} + Für Euch wurden die folgenden Artikel bestellt:' + text1: ! 'o Gesamtpreis: %{sum} Bestelling unline einsehen: %{order_url} diff --git a/config/locales/en.yml b/config/locales/en.yml index 12a50fae..ec6cef0b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -660,11 +660,11 @@ en: end: End everything_cleared: Great, everything is accounted... group: Group - last_transactions: Last transactions + last_transactions: Recent transactions note: Note - open_transactions: not yet settled + open_transactions: Unsettled orders show_all: show all - supplier: supplier + supplier: Supplier title: Finances unpaid_invoices: Unpaid invoices invoices: @@ -1066,25 +1066,21 @@ en: ' order_result: - subject: ! 'Order was ended: %{name}' + subject: ! 'Order closed: %{name}' text0: ! 'Dear %{ordergroup}, - The order for "%{order}" was placed on %{when} by %{user}. + The order for "%{order}" has been closed by %{user} on %{when}. + + The following articles have been ordered for your ordergroup:' + text1: ! 'o Total sum: %{sum} - The following articles were ordered by your ordergroup: - -' - text1: ! 'Total sum: %{sum} + You can view the order online: %{order_url} - See order online: %{order_url} - - Kind regards from %{foodcoop}. - -' + Kind regards from %{foodcoop}.' reset_password: subject: New password for %{username} text: ! 'Hi %{user}, diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 8989d734..adc5abc8 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -528,7 +528,7 @@ nl: edit_results_by_articles: add_article: Artikel toevoegen amount: Aantal - amount_per_unit: Groothandelsverpakkingsgroote * Aantal + amount_per_unit: Gr.Eenh. article: Artikel gross: Bruto net: Netto @@ -636,11 +636,11 @@ nl: end: Einde everything_cleared: Mooi zo, alles is verrekend... group: Groep - last_transactions: Laatste transacties + last_transactions: Recente transacties note: Notitie - open_transactions: nog niet afgerekend + open_transactions: Nog niet afgerekend show_all: alle tonen - supplier: leverancier + supplier: Leverancier title: Financiën unpaid_invoices: Onbetaalde facturen invoices: @@ -983,9 +983,21 @@ nl: subject: text: order_result: - subject: - text0: - text1: + subject: ! 'Bestelling gesloten: %{name}' + text0: ! 'Beste %{ordergroup}. + + + De bestelling voor "%{order}" is om %{when} gesloten door %{user}. + + De volgende artikelen zijn voor jouw huishouden besteld:' + text1: ! 'o Totaal: %{sum} + + + Je kunt de bestelling online bekijken: %{order_url} + + + + Vriendelijke groet van %{foodcoop}.' reset_password: subject: text: