Merge branch 'master' into warn-uncheck-ordered-article

config/locales/de.yml

@@ -505,6 +505,7 @@ de:
       - Gebinde
       - Einheit
       - Preis/Einheit
+      total: Gesamtpreis
     order_matrix:
       filename: Bestellung %{name}-%{date} - Sortiermatrix
       heading: Artikelübersicht
@@ -719,6 +720,7 @@ de:
       ordergroups:
         account_balance: Kontostand
         account_statement: Kontoauszug
+        contact: Kontakt
         name: Name
         new_transaction: Neue Transaktion
     update:
@@ -1604,6 +1606,7 @@ de:
         contact_person: Kontaktperson
         contact_phone: Telefon
         ignore_apple_restriction: Bestellstop bei zu wenig Äpfeln ignorieren
+        name: Name
       page:
         body: Inhalt
         parent_id: Oberseite
@@ -1671,6 +1674,7 @@ de:
           language:
             de: Deutsch
             en: English
+            fr: Französisch
             nl: Niederländisch
     required:
       mark: ! '*'
@@ -1744,6 +1748,7 @@ de:
       show_stock_takings: Inventurübersicht
       stock_count: ! 'Artikelanzahl:'
       stock_worth: ! 'Aktueller Lagerwert:'
+      title: Lager (%{article_count})
       toggle_unavailable: Nicht verfügbare Artikel zeigen/verstecken
       view_options: Ansichtsoptionen
     new:
@@ -1774,6 +1779,7 @@ de:
     shared_suppliers:
       body: <p>Hier werden die Lieferantinnen der externen Datenbank angezeigt.</p> <p>Ihr könnt externe Lieferantinnen importieren, indem ihr sie einfach abonniert. (siehe unten)</p> <p>Damit wird eine neue Lieferantin angelegt und mit der externen Datenbank verknüpft.</p>
       subscribe: abonnieren
+      subscribe_again: erneut abonnieren
       supplier: Lieferantin
       title: Externe Listen
     show:
@@ -1834,6 +1840,7 @@ de:
       group_tasks: Gruppenaufgaben
       my_tasks: Meine Aufgaben
       new_task: Neue Aufgabe erstellen
+      pages: Seiten
     new:
       title: Neue Aufgabe erstellen
     repeated: Aufgabe wird wöchentlich wiederholt

config/locales/en.yml

@@ -236,7 +236,7 @@ en:
       option_available: Make articles available
       option_delete: Delete article
       option_not_available: Make articles unavailable
-      option_select: Choose special offer ...
+      option_select: Select action ...
       price_netto: Price
       unit_quantity_desc: Unit quantity
       unit_quantity_short: Quantity
@@ -440,7 +440,7 @@ en:
       article: Article
       category: Category
       create_from_blank: Create new article
-      create_stock_article: Create stock articles
+      create_stock_article: Create stock article
       price: Netprice
       quantity: Quantity
       title_fill_quantities: 2. Set delivery quantities
@@ -493,7 +493,7 @@ en:
       - Article
       - Amount
       - Price
-      - Unit Quantity
+      - Unit quantity
       - Unit
       - Sum
       sum: Sum
@@ -504,20 +504,24 @@ en:
       - Order Number
       - Amount
       - Name
-      - Barrel
+      - Unit quantity
       - Unit
       - Price/Unit
+      - Subtotal
+      total: Total
     order_matrix:
       filename: Order %{name}-%{date} - sorting matrix
       heading: Article overview
       rows:
       - Article
       - Unit
-      - Barrel
+      - Unit quantity
       - FC-Price
       - Amount
       title: ! 'Order sorting matrix: %{name}, closed at %{date}'
-      total: ! '%{count} articles in total'
+      total:
+        one: One article in total
+        other: ! '%{count} articles in total'
   errors:
     format: ! '%{attribute} %{message}'
     general: A problem has occured.
@@ -721,6 +725,7 @@ en:
       ordergroups:
         account_balance: Account balance
         account_statement: Account statement
+        contact: Contact
         name: Name
         new_transaction: New transaction
     update:
@@ -1606,6 +1611,7 @@ en:
         contact_person: Contact person
         contact_phone: Phone
         ignore_apple_restriction: Ignore order stop by apple points restriction
+        name: Name
       page:
         body: Body
         parent_id: Parent page
@@ -1673,6 +1679,7 @@ en:
           language:
             de: German
             en: English
+            fr: French
             nl: Dutch
     required:
       mark: ! '*'
@@ -1746,6 +1753,7 @@ en:
       show_stock_takings: Inventory overview
       stock_count: ! 'Number of articles:'
       stock_worth: ! 'Current stock value:'
+      title: Stock (%{article_count})
       toggle_unavailable: Show/hide unavailable articles
       view_options: View options
     new:
@@ -1776,6 +1784,7 @@ en:
     shared_suppliers:
       body: <p>Suppliers of the external database are displayed here.</p> <p>You can import external suppliers by subscribing (see below).</p> <p>A new supplier will be created and connected to the external database.</p>
       subscribe: Subscribe
+      subscribe_again: Subscribe again
       supplier: Supplier
       title: External lists
     show:
@@ -1836,6 +1845,7 @@ en:
       group_tasks: Group tasks
       my_tasks: My tasks
       new_task: Create new task
+      pages: Pages
     new:
       title: Create new tasks
     repeated: Task is repeated weekly

config/locales/nl.yml

@@ -479,48 +479,60 @@ nl:
       notice: 
   documents:
     order_by_articles:
-      filename: 
-      rows: 
-      title: 
+      filename: Bestelling %{name}-%{date} - Artikellijst
+      rows:
+      - Huishouden
+      - Hoeveelheid
+      - Prijs
+      title: ! 'Artikellijst van bestelling: %{name}, gesloten op %{date}'
     order_by_groups:
-      filename: 
-      rows: 
-      sum: 
-      title: 
+      filename: Bestelling %{name}-%{date} - Huishoudenslijst
+      rows:
+      - Artikel
+      - Hoeveelheid
+      - Prijs
+      - Gr.Eenh.
+      - Eenheid
+      - Som
+      sum: Som
+      title: ! 'Huishoudenslijst van bestelling: %{name}, gesloten op %{date}'
     order_fax:
-      filename: 
-      rows: 
+      filename: Bestelling %{name}-%{date} - Fax
+      rows: ! '[]'
+      total: Totaal
     order_matrix:
-      filename: 
-      heading: 
+      filename: Bestelling %{name}-%{date} - Sorteermatrix
+      heading: Artikeloverzicht
       rows: 
-      title: 
-      total: 
+      title: ! 'Sorteermatrix van bestelling: %{name}, gesloten op %{date}'
+      total:
+        one: In totaal éen artikel
+        other: In totaal %{count} artikelen
   errors:
     format: 
-    general: 
+    general: Er is een probleem opgetreden.
     general_again: 
-    general_msg: 
+    general_msg: ! 'Er is een probleem opgetreden: %{msg}'
     messages:
-      accepted: 
-      blank: 
+      accepted: moet geaccepteerd worden
+      blank: moet ingevuld worden
       confirmation: 
-      empty: 
-      equal_to: 
+      empty: moet ingevuld worden
+      equal_to: moet precies %{count} zijn
       even: 
-      exclusion: 
-      greater_than: 
+      exclusion: moet even zijn
+      greater_than: moet groter dan %{count} zijn
       greater_than_or_equal_to: 
       inclusion: 
       invalid: 
-      less_than: 
-      less_than_or_equal_to: 
-      not_a_number: 
-      not_an_integer: 
-      odd: 
+      less_than: moet kleiner dan %{count} zijn
+      less_than_or_equal_to: moet groter of gelijk aan %{count} zijn
+      not_a_number: is geen getal
+      not_an_integer: moet een geheel getal zijn
+      odd: moet oneven zijn
       record_invalid: 
-      taken: 
-      taken_with_deleted: 
+      taken: is al in gebruik
+      taken_with_deleted: is al in gebruik (verwijderde groep)
       too_long: 
       too_short: 
       wrong_length: 
@@ -697,6 +709,7 @@ nl:
       ordergroups:
         account_balance: Tegoed
         account_statement: 
+        contact: 
         name: Naam
         new_transaction: Nieuwe transactie
     update:
@@ -1493,6 +1506,7 @@ nl:
         contact_person: Contactpersoon
         contact_phone: Telefoon
         ignore_apple_restriction: 
+        name: 
       page:
         body: 
         parent_id: 
@@ -1560,6 +1574,7 @@ nl:
           language:
             de: Duits
             en: Engels
+            fr: Frans
             nl: Nederlands
     required:
       mark: ! '*'
@@ -1633,6 +1648,7 @@ nl:
       show_stock_takings: 
       stock_count: 
       stock_worth: 
+      title: 
       toggle_unavailable: 
       view_options: 
     new:
@@ -1663,6 +1679,7 @@ nl:
     shared_suppliers:
       body: 
       subscribe: 
+      subscribe_again: 
       supplier: 
       title: 
     show:
@@ -1723,6 +1740,7 @@ nl:
       group_tasks: 
       my_tasks: 
       new_task: 
+      pages: 
     new:
       title: 
     repeated: 
@@ -1763,9 +1781,9 @@ nl:
     history: 
     marks:
       close: ! '×'
-      success: 
+      success: <i class="icon icon-ok"></i>
     or_cancel: of annuleren
-    please_wait: 
+    please_wait: Een moment alstublieft...
     save: Opslaan
     show: Tonen
   views: