Resolve merge conflicts

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