simplify i18n and fix some small ui issues

config/locales/en.yml

@@ -20,6 +20,7 @@ en:
         supplier: Supplier
         tax: VAT
         unit: Unit
+        units: Units
         unit_quantity: Unit quantity
         unit_quantity_short: U.Q.
       article_category:
@@ -35,9 +36,15 @@ en:
         note: Note
         ordergroup: Ordergroup
         user: Entered by
+      group_order:
+        updated_by: Last ordered by
+        price: Order sum
       group_order_article:
         ordergroup_id: Ordergroup
         result: Amount
+        quantity: Amount
+        tolerance: Tolerance
+        total_price: Sum
       invoice:
         amount: Amount
         date: Billing date
@@ -57,6 +64,7 @@ en:
         sent_to_all: Send to all members
         subject: Subject
       order:
+        closed_by: Settled by
         created_by: Created by
         ends: Ends at
         name: Supplier
@@ -64,11 +72,15 @@ en:
         starts: Starts at
         status: Status
       order_article:
+        missing_units: Missing units
+        missing_units_short: Missing
         units_to_order: Amount of units
         update_current_price: Globally update current price
       order_comment:
         text: Add comment to this order ...
       ordergroup:
+        available_funds: Available credit
+        account_balance: Account balance
         contact_address: Address
         contact_person: Contact person
         contact_phone: Phone
@@ -82,9 +94,9 @@ en:
         title: Title
       stock_article:
         price: Price
-        quantity: Quantity
+        available: Available
         quantity_available: Available quantity
-        supplier: Supplier
+        quantity_available_short: Avail.
       stock_taking:
         date: Date
         note: Note
@@ -98,6 +110,7 @@ en:
         fax: Fax
         is_subscribed: subscribed?
         min_order_quantity: Minimum order quantity
+        min_order_quantity_short: Min. quantity
         name: Name
         note: Note
         order_howto: How to order
@@ -707,30 +720,14 @@ en:
       notfound: Incorrect URL, this is not your order.
     form:
       action_save: Save order
-      amount: Amount
-      available: Available
-      available_funds: Available credits
-      created_by: Created by
-      ending: End
-      funds: Credit
-      last_update: Last ordered
-      manufacturer: Manufacturer
-      min_quantity: Minimum quantity
-      name: Name
       new_funds: New account balance
-      note: Note
       price: Price
       reset_article_search: Reset search
       search_article: Search for article...
-      sum: Sum
       sum_amount: Current amount
-      supplier: Supplier
       title: Orders
-      tolerance: Tolerance
       total_sum_amount: Total amount
       total_tolerance: Total tolerance
-      unit: Unit
-      unit_missing: Missing units
       units: Units
       units_full: Filled units
       units_total: Total units
@@ -742,9 +739,7 @@ en:
         title: Unsettled orders
         total_sum: Total sum
       funds:
-        account_balance: Account balance
-        available_funds: Available credit
-        finished_orders: unsettled orders
+        finished_orders: Unsettled orders
         open_orders: Current orders
         title: Credit
       title: Orders overview
@@ -752,14 +747,9 @@ en:
       not_enough_apples: You need at least %{stop_ordering_under} apples to order. Currently your order group has only %{apples} apples.
     order:
       title: Articles
-    orders:
-      ending: End
-      sum: Sum
-      supplier: Suppliers
     show:
       articles:
         edit_order: Edit order
-        name: Name
         not_ordered_msg: You didn’t place an order yet
         order_closed_msg: Sorry, this order is closed.
         order_nopen_title: Considering current orders of all groups
@@ -769,21 +759,14 @@ en:
         ordered: Ordered
         ordered_title: Amount + tolerance
         show_hide: Show/hide articles not ordered
-        sum: Sum
+        show_note: Show note
         title: Article overview
-        total_price: Total price
         unit_price: Unit price
-        units: Units
-      closed_by: Settled by %{user}
       comment: Comment
       comments:
         title: Comments
-      ending: End
       not_ordered: You didn’t order.
-      note: Note
-      order_sum: Order sum
       sum: Sum
-      supplier: Suppliers
       title: Your order result for %{order}
     switch_order:
       remaining: ! '%{remaining} remaining'
@@ -1345,12 +1328,9 @@ en:
       title: Weekly jobs
       user_not_found: No user found
     open_orders:
-      ending: Ending
       no_open_orders: There are no current orders
       not_enough_apples: Attention your order group has too few apple points to place an order!
-      supplier: Supplier
       title: Current orders
-      total: Sum
       total_sum: Total sum
       who_ordered: Who ordered?
     workgroup_members: