From 1d12e093428d7affa9b27b737309b172c4b17ab5 Mon Sep 17 00:00:00 2001 From: wvengen Date: Thu, 18 Jul 2013 16:22:38 +0200 Subject: [PATCH] update translations and localeapp roundtrip --- config/locales/de.yml | 14 +++++++------- config/locales/en.yml | 20 +++++++++++--------- config/locales/nl.yml | 42 ++++++++++++++++++++++++++++++++++-------- 3 files changed, 52 insertions(+), 24 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index 200cd086..fe40c899 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -465,11 +465,11 @@ de: title_articles: Artikel unit: Einheit stock_article_for_adding: - action_add_to_delivery: 'Liefern' - action_edit: 'Bearbeiten' - action_other_price: 'Kopieren' + action_add_to_delivery: Liefern + action_edit: Bearbeiten + action_other_price: Kopieren stock_article_form: - copy_stock_article: 'Lagerartikel kopieren' + copy_stock_article: Lagerartikel kopieren stock_change_fields: remove_article: Artikel aus Lieferung entfernen suppliers_overview: Lieferantenübersicht @@ -1534,11 +1534,11 @@ de: units_to_order: Anzahl gelieferter Gebinde update_current_price: Ändert auch den Preis für aktuelle Bestellungen stock_article: - supplier: copy_stock_article: name: Bitte ändern edit_stock_article: - price: ! '' + price: + supplier: supplier: min_order_quantity: Die Mindestbestellmenge wird während der Bestellung angezeigt und soll motivieren task: @@ -1858,7 +1858,7 @@ de: history: Verlauf anzeigen marks: close: ! '×' - success: ! '' + success: or_cancel: oder abbrechen please_wait: Bitte warten... save: Speichern diff --git a/config/locales/en.yml b/config/locales/en.yml index 1d68511a..dd49da68 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -426,7 +426,7 @@ en: year: years deliveries: add_stock_change: - how_many_units: 'How many units (%{unit}) to deliver? Stock article name: %{name}.' + how_many_units: ! 'How many units (%{unit}) to deliver? Stock article name: %{name}.' create: notice: Delivery was created. Please don’t forget to create invoice! create_stock_article: @@ -439,8 +439,8 @@ en: actions: Tasks article: Article category: Category - copy_order_article: Copy order article - new_stock_article: Create new stock article + create_from_blank: Create new article + create_stock_article: Create stock articles price: Netprice quantity: Quantity title_fill_quantities: 2. Set delivery quantities @@ -467,11 +467,11 @@ en: title_articles: Article unit: Unit stock_article_for_adding: - action_add_to_delivery: 'Add to delivery' - action_edit: 'Edit' - action_other_price: 'Copy' + action_add_to_delivery: Add to delivery + action_edit: Edit + action_other_price: Copy stock_article_form: - copy_stock_article: 'Lagerartikel kopieren' + copy_stock_article: Copy stock article stock_change_fields: remove_article: Remove article from delivery suppliers_overview: Supplier overview @@ -1536,11 +1536,11 @@ en: units_to_order: Amount of delivered units update_current_price: Also update the price of the current order stock_article: - supplier: copy_stock_article: name: Please modify edit_stock_article: - price: ! '' + price: + supplier: supplier: min_order_quantity: The minimum amount which has to be orderd will be shown during the order process and should motivate ordering task: @@ -1860,7 +1860,9 @@ en: history: Show history marks: close: ! '×' + success: or_cancel: or cancel + please_wait: Please wait... save: Save show: Show views: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 64e54f15..de0f5d84 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -39,6 +39,8 @@ nl: article_category: categorie availability: Artikel leverbaar? deposit: statiegeld + fc_price: + fc_share: gross_price: bruto prijs price: netto prijs tax: BTW @@ -421,20 +423,28 @@ nl: second: seconden year: jaren deliveries: + add_stock_change: + how_many_units: create: notice: + create_stock_article: + notice: destroy: notice: edit: title: form: - add_article: - new_article: - search: - title: - note_new_article: - note_new_article_link: - remove_article: + actions: + article: + category: + create_from_blank: + create_stock_article: + price: + quantity: + title_fill_quantities: + title_finish_delivery: + title_select_stock_articles: + unit: index: confirm_delete: new_delivery: @@ -454,11 +464,19 @@ nl: title: title_articles: unit: - stock_change: + stock_article_for_adding: + action_add_to_delivery: + action_edit: + action_other_price: + stock_article_form: + copy_stock_article: + stock_change_fields: remove_article: suppliers_overview: update: notice: + update_stock_article: + notice: documents: order_by_articles: filename: @@ -1044,6 +1062,8 @@ nl: subject: title: model: + delivery: + each_stock_article_must_be_unique: membership: no_admin_delete: order_article: @@ -1405,6 +1425,10 @@ nl: units_to_order: update_current_price: stock_article: + copy_stock_article: + name: + edit_stock_article: + price: supplier: supplier: min_order_quantity: @@ -1725,7 +1749,9 @@ nl: history: marks: close: ! '×' + success: or_cancel: of annuleren + please_wait: save: Opslaan show: Tonen views: