i18n simple_form move of remaining labels

config/locales/de.yml

@@ -38,17 +38,27 @@ de:
       article:
         article_category: Kategorie
         availability: Artikel ist verfügbar?
+        availability_short: verf.
         deposit: Pfand
         fc_price: Endpreis
-        fc_share: FC-Aufschlag
+        fc_price_short:
+        fc_share: FoodCoop-Aufschlag
+        fc_share_short: FC-Aufschlag
         gross_price: Bruttopreis
+        manufacturer: Produzent
         name: Name
         note: Notiz
+        order_number: Bestellnummer
+        origin: Herkunft
         price: Nettopreis
         supplier: Lieferantin
         tax: MwSt
         unit: Einheit
         unit_quantity: Gebindegröße
+        unit_quantity_short: GebGr
+      article_category:
+        description: Beschreibung
+        name: Name
       delivery:
         delivered_on: Lieferdatum
         note: Notiz
@@ -56,6 +66,9 @@ de:
       financial_transaction:
         amount: Betrag
         note: Notiz
+      group_order_article:
+        ordergroup_id: Bestellgruppe
+        result: Menge
       invoice:
         amount: Betrag
         date: Rechnungsdatum
@@ -67,10 +80,41 @@ de:
         order: Bestellung
         paid_on: Bezahlt am
         supplier: Lieferant
+      message:
+        body: Inhalt
+        group_id: Gruppe
+        private: Privat
+        recipient_tokens: Empfänger_innen
+        sent_to_all: An alle Mitglieder schicken
+        subject: Betreff
+      order:
+        ends: Endet am
+        note: Notiz
+        starts: Läuft vom
+      order_article:
+        units_to_order: Menge
+        update_current_price: Globalen Preis aktualisieren
+      order_comment:
+        text: Kommentiere diese Bestellung ...
+      ordergroup:
+        contact_address: Adresse
+        contact_person: Kontaktperson
+        contact_phone: Telefon
+        description: Beschreibung
+        ignore_apple_restriction: Bestellstop bei zu wenig Äpfeln ignorieren
+        name: Name
+        user_tokens: Mitglieder
+      page:
+        body: Inhalt
+        parent_id: Oberseite
+        title: Titel
       stock_article:
         price: Nettopreis
         quantity: Lagerbestand
         quantity_available: Verfügbarer Bestand
+      stock_taking:
+        date: Datum
+        note: Notiz
       supplier:
         address: Adresse
         contact_person: Ansprechparter_in
@@ -87,6 +131,17 @@ de:
         phone: Telefon
         phone2: Telefon 2
         url: Homepage
+      stock_article:
+        supplier: Lieferant
+      task:
+        description: Beschreibung
+        done: Erledigt?
+        due_date: Wann erledigen?
+        duration: Dauer
+        name: Name
+        required_users: Anzahl
+        user_list: Verantwortliche
+        workgroup: Arbeitsgruppe
       user:
         email: Email
         first_name: Vorname
@@ -95,10 +150,21 @@ de:
         nick: Benutzername
         ordergroup: Bestellgruppe
         password: Passwort
+        password_confirmation: Passwort wiederholen
         phone: Telefon
         workgroup:
           one: Arbeitsgruppe
           other: Arbeitsgruppen
+      workgroup:
+        name: Name
+        description: Beschreibung
+        next_weekly_tasks_number: Für wieviel Wochen im Voraus sollen Aufgaben erstellt werden?
+        role_admin: Administration
+        role_article_meta: Artikeldatenbank
+        role_finance: Finanzen
+        role_orders: Bestellverwaltung
+        role_suppliers: Lieferanten
+        user_tokens: Mitglieder
     errors:
       format: ! '%{attribute} %{message}'
       general: Ein Problem ist aufgetreten.
@@ -1607,60 +1673,6 @@ de:
         required_users: Wieviel Benutzerinnen werden insgesamt benötigt?
       tax: In Prozent, Standard sind 7,0
     labels:
-      article:
-        article_category: Kategorie
-        manufacturer: Produzent
-        name: Name
-        note: Notiz
-        origin: Herkunft
-        unit: Einheit
-      article_category:
-        description: Beschreibung
-        name: Name
-      defaults:
-        amount: Betrag
-        date: Datum
-        deposit: Pfand
-        description: Beschreibung
-        email: E-Mail
-        note: Notiz
-        order_number: Bestellnummer
-        ordergroup: Bestellgruppe
-        password: Passwort
-        password_confirmation: Passwort wiederholen
-        phone: Telefon
-        price: Preis (netto)
-        tax: MwSt
-        title: Titel
-        unit_quantity: Gebindegröße
-        user_tokens: Mitglieder
-      group_order_article:
-        ordergroup_id: Bestellgruppe
-        result: Menge
-      message:
-        body: Inhalt
-        group_id: Gruppe
-        private: Privat
-        recipient_tokens: Empfänger_innen
-        sent_to_all: An alle Mitglieder schicken
-        subject: Betreff
-      order:
-        ends: Endet am
-        starts: Läuft vom
-      order_article:
-        units_to_order: Menge
-        update_current_price: Globalen Preis aktualisieren
-      order_comment:
-        text: Kommentiere diese Bestellung ...
-      ordergroup:
-        contact_address: Adresse
-        contact_person: Kontaktperson
-        contact_phone: Telefon
-        ignore_apple_restriction: Bestellstop bei zu wenig Äpfeln ignorieren
-        name: Name
-      page:
-        body: Inhalt
-        parent_id: Oberseite
       settings:
         messages:
           send_as_email: Bekomme Nachrichten als Emails.
@@ -1676,23 +1688,6 @@ de:
         settings_group:
           messages: Nachrichten
           privacy: Privatsphäre
-      stock_article:
-        supplier: Lieferant
-      task:
-        done: Erledigt?
-        due_date: Wann erledigen?
-        duration: Dauer
-        name: Name
-        required_users: Anzahl
-        user_list: Verantwortliche
-        workgroup: Arbeitsgruppe
-      workgroup:
-        next_weekly_tasks_number: Für wieviel Wochen im Voraus sollen Aufgaben erstellt werden?
-        role_admin: Administration
-        role_article_meta: Artikeldatenbank
-        role_finance: Finanzen
-        role_orders: Bestellverwaltung
-        role_suppliers: Lieferanten
     'no': Nein
     options:
       settings:

config/locales/en.yml

@@ -48,8 +48,9 @@ en:
         manufacturer: Manufacturer
         name: Name
         note: Note
+        order_number: Order number
         origin: Origin
-        price: Price
+        price: Price (net)
         supplier: Supplier
         tax: VAT
         unit: Unit
@@ -60,10 +61,14 @@ en:
         name: Name
       delivery:
         delivered_on: Delivery date
+        note: Note
         supplier: Supplier
       financial_transaction:
         amount: amount
         note: note
+      group_order_article:
+        ordergroup_id: Ordergroup
+        result: Amount
       invoice:
         amount: Amount
         date: Billing date
@@ -75,14 +80,45 @@ en:
         order: Order
         paid_on: Paid on
         supplier: Supplier
+      message:
+        body: Body
+        group_id: Group
+        private: Private
+        recipient_tokens: Recipients
+        sent_to_all: Send to all members
+        subject: Subject
+      order:
+        ends: Ends at
+        note: Note
+        starts: Starts at
+      order_article:
+        units_to_order: Amount of units
+        update_current_price: Globally update current price
+      order_comment:
+        text: Add comment to this order ...
+      ordergroup:
+        contact_address: Address
+        contact_person: Contact person
+        contact_phone: Phone
+        description: Description
+        ignore_apple_restriction: Ignore order stop by apple points restriction
+        name: Name
+        user_tokens: Members
+      page:
+        body: Body
+        parent_id: Parent page
       stock_article:
         price: Price
         quantity: Quantity
         quantity_available: Available quantity
+      stock_taking:
+        date: Date
+        note: Note
       supplier:
         address: Address
         contact_person: Contact person
         customer_number: Customer number
+        customer_number_short: Cust.nr.
         delivery_days: Delivery days
         email: Email
         fax: Fax
@@ -94,7 +130,10 @@ en:
         phone: Phone
         phone2: Phone 2
         url: Homepage
+      stock_article:
+        supplier: Supplier
       task:
+        description: Description
         done: Done?
         due_date: Due date
         duration: Duration
@@ -110,10 +149,21 @@ en:
         nick: Username
         ordergroup: Ordergroup
         password: Password
+        password_confirmation: Repeat password
         phone: Telephone
         workgroup:
           one: Workgroup
           other: Workgroups
+      workgroup:
+        name: Name
+        description: Description
+        next_weekly_tasks_number: For how many weeks in advance would you like to define tasks?
+        role_admin: Administration
+        role_article_meta: Article database
+        role_finance: Finances
+        role_orders: Order management
+        role_suppliers: Suppliers
+        user_tokens: Members
     errors:
       format: ! '%{attribute} %{message}'
       general: A problem has occured.
@@ -1624,50 +1674,6 @@ en:
         required_users: How many users will be needed in total?
       tax: In percentage, standard is 7,0
     labels:
-      defaults:
-        amount: Amount
-        date: Date
-        deposit: Deposit
-        description: Description
-        email: Email
-        note: Note
-        order_number: Order number
-        ordergroup: Ordergroup
-        password: Password
-        password_confirmation: Repeat password
-        phone: Phone
-        price: Price (net)
-        tax: VAT
-        title: Title
-        unit_quantity: Unit quantity
-        user_tokens: Members
-      group_order_article:
-        ordergroup_id: Ordergroup
-        result: Amount
-      message:
-        body: Body
-        group_id: Group
-        private: Private
-        recipient_tokens: Recipients
-        sent_to_all: Send to all members
-        subject: Subject
-      order:
-        ends: Ends at
-        starts: Starts at
-      order_article:
-        units_to_order: Amount of units
-        update_current_price: Globally update current price
-      order_comment:
-        text: Add comment to this order ...
-      ordergroup:
-        contact_address: Address
-        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
       settings:
         messages:
           send_as_email: Receive messages as emails.
@@ -1683,15 +1689,6 @@ en:
         settings_group:
           messages: Messages
           privacy: Privacy
-      stock_article:
-        supplier: Supplier
-      workgroup:
-        next_weekly_tasks_number: For how many weeks in advance would you like to define tasks?
-        role_admin: Administration
-        role_article_meta: Article database
-        role_finance: Finances
-        role_orders: Order management
-        role_suppliers: Suppliers
     'no': 'No'
     options:
       settings: