Resolve merge conflicts

config/app_config.yml.SAMPLE

@@ -37,6 +37,9 @@ default: &defaults
   # price markup in percent
   price_markup: 2.0
 
+  # default vat percentage for new articles
+  tax_default: 7.0
+
   # tolerance order option: If set to false, article tolerance values do not count
   # for total article price as long as the order is not finished.
   tolerance_is_costly: false

config/locales/de.yml

@@ -615,7 +615,7 @@ de:
         ended: beendet
         last_edited_by: Zuletzt bearbeitet von
         name: Lieferantin
-        no_closed_orders: derzeit gibt es keine beendeten Bestellungen
+        no_closed_orders: Derzeit gibt es keine beendeten Bestellungen.
         state: Status
       summary:
         changed: Daten wurden verändert!
@@ -672,9 +672,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
@@ -1082,11 +1082,10 @@ de:
 
         die Bestelling für "%{order}" wurde am %{when} von %{user} beendet.
 
-
         Für Euch wurden die folgenden Artikel bestellt:
 
 '
-      text1: ! 'Gesamtpreis: %{sum}
+      text1: ! 'o Gesamtpreis: %{sum}
 
 
         Bestelling unline einsehen: %{order_url}

config/locales/en.yml

@@ -614,7 +614,7 @@ en:
         close: close directly
         confirm: Do you really want to fully close the order?
         end: End
-        ended: ended
+        ended: closed
         last_edited_by: Last edited by
         name: Supplier
         no_closed_orders: At the moment there are no closed orders.
@@ -674,11 +674,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:
@@ -1080,25 +1080,23 @@ 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 were ordered by your ordergroup:
+        The following articles have been ordered for your ordergroup:
 
 '
-      text1: ! 'Total sum: %{sum}
+      text1: ! 'o Total sum: %{sum}
 
 
-        See order online: %{order_url}
+        You can view the order online: %{order_url}
 
 
-        Kind regards from %{foodcoop}.
 
-'
+        Kind regards from %{foodcoop}.'
     reset_password:
       subject: New password for %{username}
       text: ! 'Hi %{user},
@@ -1298,7 +1296,7 @@ en:
       number: Number
       to_address: Shipping address
     finish:
-      notice: The order has been ended.
+      notice: The order has been closed.
     form:
       name: Name
       note: Note

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
@@ -576,7 +576,7 @@ nl:
         close: direct afsluiten
         confirm: Weet je zeker dat de je bestelling wilt afsluiten?
         end: Einde
-        ended: beëindigd
+        ended: gesloten
         last_edited_by: Laatst aangepast door
         name: Leverancier
         no_closed_orders: Momenteel zijn er geen gesloten bestellingen.
@@ -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:
@@ -934,7 +934,7 @@ nl:
       feedback:
         desc: Foutje gevonden? Suggesties? Ideeën? Commentaar?
         title: Feedback
-      footer: Foodsoft, open source software voor een non-profit voedselcoop.
+      footer: Foodsoft, open source software voor non-profit voedselcoops.
       help: Help
       logout: Uitloggen
       ordergroup: Mijn huishouden
@@ -983,9 +983,23 @@ 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: 
@@ -1157,7 +1171,7 @@ nl:
       number: 
       to_address: 
     finish:
-      notice: 
+      notice: De bestelling is gesloten.
     form:
       name: 
       note: