move commonly used verbs to common i18n identifier

2013-04-04 02:49:52 +02:00 · 2013-04-04 02:49:52 +02:00 · f1d6df9ecc
commit f1d6df9ecc
parent 4aa40b387a
60 changed files with 50 additions and 111 deletions
--- a/app/views/admin/ordergroups/_form.html.haml
+++ b/app/views/admin/ordergroups/_form.html.haml
@ -8,4 +8,4 @@
    = f.input :ignore_apple_restriction
  .form-actions
    = f.button :submit
-    = link_to t('admin.or_cancel'), :back
+    = link_to t('ui.or_cancel'), :back
--- a/app/views/admin/ordergroups/_ordergroups.html.haml
+++ b/app/views/admin/ordergroups/_ordergroups.html.haml
@ -17,6 +17,6 @@
        %td= link_to_gmaps ordergroup.contact_address
        %td= ordergroup.users.size
        %td
-          = link_to t('admin.edit'), edit_admin_ordergroup_path(ordergroup), class: 'btn btn-mini'
-          = link_to t('admin.delete'), [:admin, ordergroup], :confirm => t('admin.confirm', name: ordergroup.name),
-            :method => :delete, class: 'btn btn-mini btn-danger'
+          = link_to t('ui.edit'), edit_admin_ordergroup_path(ordergroup), class: 'btn btn-mini'
+          = link_to t('ui.delete'), [:admin, ordergroup], :confirm => t('admin.confirm', name: ordergroup.name),
+            :method => :delete, class: 'btn btn-mini btn-danger'
--- a/app/views/admin/ordergroups/show.html.haml
+++ b/app/views/admin/ordergroups/show.html.haml
@ -1,6 +1,6 @@
 - title t '.title', name: @ordergroup.name

 %section= render 'shared/group', group: @ordergroup
-= link_to t('.edit'), edit_admin_ordergroup_path(@ordergroup), class: 'btn'
-= link_to t('.delete'), [:admin, @ordergroup], :confirm => t('.confirm'), :method => :delete, class: 'btn btn-danger'
+= link_to t('ui.edit'), edit_admin_ordergroup_path(@ordergroup), class: 'btn'
+= link_to t('ui.delete'), [:admin, @ordergroup], :confirm => t('.confirm'), :method => :delete, class: 'btn btn-danger'
 = link_to t('.send_message'), new_message_path(:message => {:group_id => @ordergroup.id}), class: 'btn'
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@ -2,4 +2,4 @@
  = render 'shared/user_form_fields', f: f
  .form-actions
    = f.submit
-    = link_to t('admin.or_cancel'), :back
+    = link_to t('ui.or_cancel'), :back
--- a/app/views/admin/users/_users.html.haml
+++ b/app/views/admin/users/_users.html.haml
@ -18,6 +18,6 @@
        %td= user.email
        %td= format_roles(user)
        %td= format_time(user.last_login)
-        %td= link_to t('admin.edit'), edit_admin_user_path(user), class: 'btn btn-mini'
-        %td= link_to t('admin.delete'), [:admin, user], :confirm => t('admin.confirm', name: user.name),
+        %td= link_to t('ui.edit'), edit_admin_user_path(user), class: 'btn btn-mini'
+        %td= link_to t('ui.delete'), [:admin, user], :confirm => t('admin.confirm', name: user.name),
            :method => :delete, class: 'btn btn-danger btn-mini'
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@ -33,7 +33,7 @@

 %hr/
 %p
-  = link_to t('admin.edit'), edit_admin_user_path(@user), class: 'btn'
-  = link_to t('admin.delete'), [:admin, @user], :confirm => t('.confirm', user: @user.first_name),
+  = link_to t('ui.edit'), edit_admin_user_path(@user), class: 'btn'
+  = link_to t('ui.delete'), [:admin, @user], :confirm => t('.confirm', user: @user.first_name),
    :method => :delete, class: 'btn btn-danger'
  = link_to t('.send_message'), new_message_path(:message => {:mail_to => @user.id}), class: 'btn'
--- a/app/views/admin/workgroups/_form.html.haml
+++ b/app/views/admin/workgroups/_form.html.haml
@ -9,4 +9,4 @@
    = f.input :role_orders
  .form-actions
    = f.button :submit
-    = link_to t('admin.or_cancel'), :back
+    = link_to t('ui.or_cancel'), :back
--- a/app/views/admin/workgroups/_workgroups.html.haml
+++ b/app/views/admin/workgroups/_workgroups.html.haml
@ -15,6 +15,6 @@
        %td= workgroup.users.size
        %td= format_roles(workgroup)
        %td
-          = link_to t('admin.edit'), edit_admin_workgroup_path(workgroup), class: 'btn btn-mini'
-          = link_to t('admin.delete'), [:admin, workgroup], :confirm => t('admin.confirm', name: workgroup.name),
+          = link_to t('ui.edit'), edit_admin_workgroup_path(workgroup), class: 'btn btn-mini'
+          = link_to t('ui.delete'), [:admin, workgroup], :confirm => t('admin.confirm', name: workgroup.name),
            :method => :delete, class: 'btn btn-mini btn-danger'
--- a/app/views/admin/workgroups/show.html.haml
+++ b/app/views/admin/workgroups/show.html.haml
@ -1,6 +1,6 @@
 - title t '.title', name: @workgroup.name

 %section= render 'shared/group', group: @workgroup
-= link_to t('.edit'), edit_admin_workgroup_path(@workgroup), class: 'btn'
-= link_to t('.delete'), [:admin, @workgroup], :confirm => t('.confirm'), :method => :delete, class: 'btn btn-danger'
-= link_to_new_message(message_params: {group_id: @workgroup.id})
+= link_to t('ui.edit'), edit_admin_workgroup_path(@workgroup), class: 'btn'
+= link_to t('ui.delete'), [:admin, @workgroup], :confirm => t('.confirm'), :method => :delete, class: 'btn btn-danger'
+= link_to_new_message(message_params: {group_id: @workgroup.id})
--- a/app/views/article_categories/_form.html.haml
+++ b/app/views/article_categories/_form.html.haml
@ -3,4 +3,4 @@
  = f.input :description
  .form-actions
    = f.submit class: 'btn'
-    = link_to t('.or_cancel'), article_categories_path
+    = link_to t('ui.or_cancel'), article_categories_path
--- a/app/views/articles/edit_all.html.haml
+++ b/app/views/articles/edit_all.html.haml
@ -7,4 +7,4 @@
  %i= t '.warning'
  .form-actions
    = submit_tag t('.submit'), class: 'btn btn-primary'
-    = link_to t('.or_cancel'), supplier_articles_path(@supplier)
+    = link_to t('ui.or_cancel'), supplier_articles_path(@supplier)
--- a/app/views/articles/parse_upload.html.haml
+++ b/app/views/articles/parse_upload.html.haml
@ -5,5 +5,5 @@
  = render 'edit_all_table'
  .form-actions
    = submit_tag t('.submit', supplier: @supplier.name), class: 'btn btn-primary'
-    = link_to t('.or_cancel'), upload_supplier_articles_path(@supplier)
+    = link_to t('ui.or_cancel'), upload_supplier_articles_path(@supplier)
      
--- a/app/views/articles/sync.html.haml
+++ b/app/views/articles/sync.html.haml
@ -64,4 +64,4 @@
  %hr/
  = hidden_field 'supplier', 'id'
  = submit_tag t('.submit'), class: 'btn btn-primary'
-  = link_to t('.or_cancel'), supplier_articles_path(@supplier)
+  = link_to t('ui.or_cancel'), supplier_articles_path(@supplier)
--- a/app/views/finance/balancing/_edit_note.html.haml
+++ b/app/views/finance/balancing/_edit_note.html.haml
@ -1,9 +1,9 @@
 = simple_form_for @order, url: update_note_finance_order_path(@order), remote: true, method: :put do |f|
  .modal-header
-    = button_tag "x", class: 'close', data: {dismiss: 'modal'}
+    = button_tag t('ui.marks.close'), class: 'close', data: {dismiss: 'modal'}
    %h3 Notiz bearbeiten
  .modal-body
    = f.input :note, input_html: {class: 'input-xlarge'}
  .modal-footer
-    = button_tag t('.close'), class: 'btn', data: {dismiss: 'modal'}
-    = f.submit , class: 'btn btn-primary'
+    = button_tag t('ui.close'), class: 'btn', data: {dismiss: 'modal'}
+    = f.submit , class: 'btn btn-primary'
--- a/app/views/finance/balancing/_order_article.html.haml
+++ b/app/views/finance/balancing/_order_article.html.haml
@ -19,8 +19,8 @@
 %td= order_article.price.tax
 %td= order_article.price.deposit
 %td
-  = link_to t('.edit'), edit_finance_order_order_article_path(order_article.order, order_article), remote: true,
+  = link_to t('ui.edit'), edit_finance_order_order_article_path(order_article.order, order_article), remote: true,
    class: 'btn btn-mini'
 %td
-  = link_to t('.delete'), finance_order_order_article_path(order_article.order, order_article), method: :delete,
-    remote: true, confirm: t('.confirm'), class: 'btn btn-danger btn-mini'
+  = link_to t('ui.delete'), finance_order_order_article_path(order_article.order, order_article), method: :delete,
+    remote: true, confirm: t('.confirm'), class: 'btn btn-danger btn-mini'
--- a/app/views/finance/financial_transactions/new.html.haml
+++ b/app/views/finance/financial_transactions/new.html.haml
@ -9,4 +9,4 @@
  = f.input :note, :as => :text
  .form-actions
    = f.submit class: 'btn btn-primary'
-    = link_to t('.or_cancel'), finance_ordergroup_transactions_path(@ordergroup)
+    = link_to t('ui.or_cancel'), finance_ordergroup_transactions_path(@ordergroup)
--- a/app/views/finance/financial_transactions/new_collection.html.haml
+++ b/app/views/finance/financial_transactions/new_collection.html.haml
@ -33,4 +33,4 @@
    = link_to t('.new_ordergroup'), '#', 'data-add-transaction' => true, class: 'btn'
  .form-actions
    = submit_tag t('.save'), class: 'btn btn-primary'
-    = link_to t('.or_cancel'), finance_ordergroups_path
+    = link_to t('ui.or_cancel'), finance_ordergroups_path
--- a/app/views/finance/group_order_articles/_form.html.haml
+++ b/app/views/finance/group_order_articles/_form.html.haml
@ -7,5 +7,5 @@
    = form.input :ordergroup_id, as: :select, collection: Ordergroup.all.map { |g| [g.name, g.id] }
    = form.input :result, hint: "Einheit: #{@order_article.article.unit}"
  .modal-footer
-    = button_tag t('.close'), class: 'btn', data: {dismiss: 'modal'}
-    = form.submit t('.save'), class: 'btn btn-primary'
+    = button_tag t('ui.close'), class: 'btn', data: {dismiss: 'modal'}
+    = form.submit t('ui.save'), class: 'btn btn-primary'
--- a/app/views/finance/index.html.haml
+++ b/app/views/finance/index.html.haml
@ -18,7 +18,7 @@
            %td= format_date(invoice.date)
            %td.numeric= number_to_currency(invoice.amount)
            %td= invoice.supplier.name
-            %td= link_to t('.edit'), edit_finance_invoice_path(invoice), class: 'btn btn-mini'
+            %td= link_to t('ui.edit'), edit_finance_invoice_path(invoice), class: 'btn btn-mini'

    %h2
      = t('.last_transactions')
@ -57,4 +57,4 @@
              %td.numeric= number_to_currency(order.sum(:fc))
              %td= link_to t('.clear'), new_finance_order_path(order_id: order.id), class: 'btn btn-mini'
    - else
-      = t('.everything_cleared')
+      = t('.everything_cleared')
--- a/app/views/finance/invoices/_form.html.haml
+++ b/app/views/finance/invoices/_form.html.haml
@ -17,4 +17,4 @@
  = f.input :note
  .form-actions
    = f.submit class: 'btn'
-    = link_to t('.or_cancel'), :back
+    = link_to t('ui.or_cancel'), :back
--- a/app/views/foodcoop/workgroups/edit.html.haml
+++ b/app/views/foodcoop/workgroups/edit.html.haml
@ -5,4 +5,4 @@
  = render :partial => 'shared/group_form_fields', :locals => {:f => f}
  .form-actions
    = f.submit
-    = link_to t('.or_cancel'), foodcoop_workgroups_path
+    = link_to t('ui.or_cancel'), foodcoop_workgroups_path
--- a/app/views/group_orders/_form.html.haml
+++ b/app/views/group_orders/_form.html.haml
@ -138,6 +138,6 @@
              €
      #order-button
        = submit_tag( t('.action_save'), id: 'submit_button', class: 'btn btn-primary' )
-        #{link_to t('.cancel'), group_orders_path}
+        #{link_to t('ui.or_cancel'), group_orders_path}
  %input#total_balance{name: "total_balance", type: "hidden", value: @ordergroup.account_balance - @group_order.price}/
  %input{name: "version", type: "hidden", value: @version}/
--- a/app/views/home/profile.html.haml
+++ b/app/views/home/profile.html.haml
@ -8,7 +8,7 @@
    = simple_form_for(@current_user, :url => { :action => 'update_profile'}) do |f|
      = render :partial => 'shared/user_form_fields', :locals => {:f => f}
      .form-actions
-        = submit_tag t('.user.save'), class: 'btn'
+        = submit_tag t('ui.save'), class: 'btn'
  .span5
    %h2= t '.groups.title'
    %table.table.table-striped
--- a/app/views/login/forgot_password.html.haml
+++ b/app/views/login/forgot_password.html.haml
@ -4,4 +4,4 @@
  = form.input :email
  .form-actions
    = form.submit t('.submit'), class: 'btn'
-    = link_to t('.cancel'), :back
+    = link_to t('ui.or_cancel'), :back
--- a/app/views/messages/new.haml
+++ b/app/views/messages/new.haml
@ -43,4 +43,4 @@
  = f.input :body, input_html: {class: 'input-xxlarge'}
  .form-actions
    = f.submit class: 'btn btn-primary'
-    = link_to t('.cancel'), :back
+    = link_to t('ui.or_cancel'), :back
--- a/app/views/ordergroups/edit.html.haml
+++ b/app/views/ordergroups/edit.html.haml
@ -81,4 +81,4 @@
    = f.label :contact_address
    %br/
    = f.text_field :contact_address
-  %p= f.submit t('.submit')
+  %p= f.submit t('ui.edit')
--- a/app/views/orders/_form.html.haml
+++ b/app/views/orders/_form.html.haml
@ -51,4 +51,4 @@

  .form-actions
    = f.submit class: 'btn'
-    = link_to t('.cancel'), orders_path
+    = link_to t('ui.or_cancel'), orders_path
--- a/app/views/stock_takings/edit.html.haml
+++ b/app/views/stock_takings/edit.html.haml
@ -4,4 +4,4 @@
  = f.input :date
  = f.input :note
  = f.submit
-  = link_to t('.cancel'), stock_takings_path
+  = link_to t('ui.cancel'), stock_takings_path
--- a/app/views/stock_takings/new.html.haml
+++ b/app/views/stock_takings/new.html.haml
@ -14,4 +14,4 @@
    = render :partial => 'stock_change', :collection => @stock_taking.stock_changes
  .form-actions
    = f.submit class: 'btn'
-    = link_to t('.cancel'), stock_takings_path
+    = link_to t('ui.cancel'), stock_takings_path
--- a/app/views/stockit/_form.html.haml
+++ b/app/views/stockit/_form.html.haml
@ -13,4 +13,4 @@
  = f.association :article_category
  .form-actions
    = f.submit class: 'btn'
-    = link_to t('.cancel'), stock_articles_path
+    = link_to t('ui.or_cancel'), stock_articles_path
--- a/app/views/suppliers/_form.haml
+++ b/app/views/suppliers/_form.haml
@ -18,4 +18,4 @@
  = f.input :min_order_quantity
  .form-actions
    = f.submit class: 'btn'
-    = link_to t('.cancel'), suppliers_path
+    = link_to t('ui.or_cancel'), suppliers_path
--- a/config/locales/de/de.admin.yml
+++ b/config/locales/de/de.admin.yml
@ -1,11 +1,8 @@
 de:
  admin:
-    edit: 'Bearbeiten'
-    delete: 'Löschen'
    confirm: 'Willst du %{name} wirklich löschen?'
    actions: 'Aktionen'
    access_to: 'Zugriff auf'
-    or_cancel: 'oder abbrechen'
    search_placeholder: 'Name ...'
    base:
      index:
@ -43,7 +40,6 @@ de:
      show:
        title: 'Bestellgruppe %{name}'
        edit: 'Gruppe/Mitglieder bearbeiten'
-        delete: 'Löschen'
        confirm: 'Bist Du sicher?'
        send_message: 'Nachricht senden'
      ordergroups:
@ -98,11 +94,10 @@ de:
      show:
        title: 'Arbeitsgruppe %{name}'
        edit: 'Gruppe/Mitglieder bearbeiten'
-        delete: 'Löschen'
        confirm: 'Bist Du sicher?'
      workgroups:
        name: 'Name'
        members: 'Mitglieder'
      destroy:
        notice: 'Arbeitsgruppe wurde gelöscht'
-        error: 'Arbeitsgruppe konnte nicht gelöscht werden: #{error}'
+        error: 'Arbeitsgruppe konnte nicht gelöscht werden: #{error}'
--- a/config/locales/de/de.article_categories.yml
+++ b/config/locales/de/de.article_categories.yml
@ -2,8 +2,6 @@ de:
  article_categories:
    edit:
      title: 'Kategorie ändern'
-    form:
-      or_cancel: 'oder abbrechen'
    index:
      title: 'Artikelkategorien'
      new: 'Neue Kategorie anlegen'
--- a/config/locales/de/de.articles.yml
+++ b/config/locales/de/de.articles.yml
@ -22,7 +22,6 @@ de:
      note: 'Pflichtfelder sind: Name, Einheit, (netto) Preis und Bestellnummer.'
      warning: 'Achtung, alle Artikel werden aktualisiert!'
      submit: 'Alle Artikel aktualisieren'
-      or_cancel: 'oder abbrechen'
    edit_all_table:
      available_short: 'verf.'
      available_desc: 'verfügbar'
@ -70,7 +69,6 @@ de:
      unit_quantity_short: 'GebGr'
      price_short: 'Price'
      submit: 'Alle löschen/aktualisieren'
-      or_cancel: 'oder abbrechen'
    upload:
      title: '%{supplier} / Artikel hochladen'
      body:
@ -91,7 +89,6 @@ de:
        <p><i>Bitte überprufe die engelesenen Artikel.</i></p>
        <p><i>Achtung, momentan gibt es keine Überprüfung auf doppelte Artikel.</i></p>
      submit: 'Speichere neue Artikel für %{supplier}'
-      or_cancel: 'oder abbrechen'

    # used by controller
    update_all:
--- a/config/locales/de/de.defaults.yml
+++ b/config/locales/de/de.defaults.yml
@ -289,6 +289,8 @@ de:
    edit: 'Bearbeiten'
    delete: 'Löschen'
    show: 'Anzeigen'
+    save: 'Speichern'
+    or_cancel: 'oder abbrechen'
    marks:
      close: 'x'

--- a/config/locales/de/de.finance.yml
+++ b/config/locales/de/de.finance.yml
@ -7,7 +7,6 @@ de:
      date: 'Datum'
      amount: 'Betrag'
      supplier: 'Lieferantin'
-      edit: 'Bearbeiten'
      last_transactions: 'letzte Überweisungen'
      group: 'Gruppe'
      note: 'Notiz'
@ -67,8 +66,6 @@ de:
        confirm: 'Wirklich die Bestellung schließen setzen?'
        no_closed_orders: 'derzeit gibt es keine beendeten Bestellungen'
      order_article:
-        edit: 'Bearbeiten'
-        delete: 'Löschen'
        confirm: 'Bist du sicher?'
      invoice:
        invoice_number: 'Rechnungsnummer:'
@ -85,9 +82,6 @@ de:
        total: 'Gesamtpreis'
        add_group: 'Gruppe hinzufügen'
        total_fc: 'Summe (FC-Preis)'
-      edit_note:
-        close: 'Schließen'
-        save: 'Speichern'
      edit_results_by_articles:
        article: 'Artikel'
        number: 'Nr.'
@ -126,16 +120,12 @@ de:
        note: 'Notiz'
        amount: 'Betrag'
        save: "Transaktionen speichern"
-        or_cancel: 'oder abbrechen'
      new:
        title: "Neue Transaktion"
        paragraph: 'Hier kannst du der Bestellgruppe <b>%{name}</b> Geld gutschreiben/abziehen.'
-        or_cancel: "oder abbrechen"
    group_order_articles:
      form:
        amount_change_for: 'Mengenänderung für %{article}'
-        close: 'Schließen'
-        save: "Speichern"
    ordergroups:
      ordergroups:
        name: "Name"
@ -153,7 +143,6 @@ de:
        linked: "Diese Rechnung ist mit einer %{what_link} verknüpft."
        delivery: "Lieferung"
        order: "Bestellung"
-        or_cancel: "oder abbrechen"
      index:
        title: "Rechnungen"
        action_new: "Neue Rechnung anlegen"
--- a/config/locales/de/de.foodcoop.yml
+++ b/config/locales/de/de.foodcoop.yml
@ -29,7 +29,6 @@ de:
        title: 'Gruppe bearbeiten'
        invite_new: 'Neue Mitglieder kannst du %{invite_link} einladen.'
        invite_link: 'hier'
-        or_cancel: 'oder abbrechen'
      workgroup:
        show_tasks: 'Alle Aufgaben zeigen'
        edit: 'Gruppe bearbeiten'
--- a/config/locales/de/de.group_orders.yml
+++ b/config/locales/de/de.group_orders.yml
@ -33,7 +33,6 @@ de:
      available_funds: 'Verfügbares Guthaben'
      new_funds: 'Neuer Kontostand'
      action_save: 'Bestellung speichern'
-      cancel: 'oder abbrechen'
    index:
      title: 'Bestellüberblick'
      funds:
--- a/config/locales/de/de.home.yml
+++ b/config/locales/de/de.home.yml
@ -72,7 +72,6 @@ de:
      user:
        title: '%{user}'
        since: '(Mitglied seit: %{when})'
-        save: 'Speichern'
      groups:
        title: 'Du bist Mitglied in folgenden Gruppen'
        invite: 'Neue Mitglieder einladen'
--- a/config/locales/de/de.login.yml
+++ b/config/locales/de/de.login.yml
@ -18,7 +18,6 @@ de:
        <p>Dazu musst hier die E-Mail-Adresse eingeben, mit der Du in der Foodsoft angemeldet bist.
        Du erhälst dann eine E-Mail mit weiteren Instruktionen.</p>
      submit: 'Neues Passwort anfordern'
-      cancel: 'oder abbrechen'
    new_password:
      title: 'Neues Passwort'
      body:
--- a/config/locales/de/de.messages.yml
+++ b/config/locales/de/de.messages.yml
@ -16,7 +16,6 @@ de:
        subscribe: 'Erklärungen zum Verteiler findest Du im %{link}.'
        wiki: 'Wiki (Abschnitt Mailing-Liste)'
        mail: 'z.b. mit einer Mail an %{email}.'
-      cancel: 'oder abbrechen'
    show:
      title: 'Nachricht anzeigen'
      from: 'Von:'
--- a/config/locales/de/de.ordergroups.yml
+++ b/config/locales/de/de.ordergroups.yml
@ -4,7 +4,6 @@ de:
      title: 'Bestellgruppen'
    edit:
      title: 'Bestellgruppe bearbeiten'
-      submit: 'Bearbeiten'

    # used by model
    model:
--- a/config/locales/de/de.orders.yml
+++ b/config/locales/de/de.orders.yml
@ -22,7 +22,6 @@ de:
      unit_quantity: 'Gebinde'
      prices: 'Price (netto/FC)'
      select_all: 'Alle auswählen'
-      cancel: 'oder abbrechen'
    index:
      title: 'Bestellungen verwalten'
      new_order: 'Neue Bestellung anlegen'
--- a/config/locales/de/de.stock_takings.yml
+++ b/config/locales/de/de.stock_takings.yml
@ -2,7 +2,6 @@ de:
  stock_takings:
    edit:
      title: 'Inventur bearbeiten'
-      cancel: 'or cancel'
    index:
      title: 'Inventurübersicht'
      new_inventory: 'Neue Inventur anlegen'
@ -13,7 +12,6 @@ de:
      text_need_articles: 'Einen neuen Lagerartikel musst Du vorher %{create_link} bevor Du Ihn hier verwenden kannst.'
      create: 'anlegen'
      stock_articles: 'Lagerartikel'
-      cancel: 'oder abbrechen'
    show:
      title: 'Inventur anzeigen'
      date: 'Datum'
--- a/config/locales/de/de.stockit.yml
+++ b/config/locales/de/de.stockit.yml
@ -4,7 +4,6 @@ de:
      title: 'Lagerartikel bearbeiten'
    form:
      price_hint: 'Um Chaos zu vermeiden können bis auf weiteres die Preise von angelegten Lagerartikeln nicht mehr verändert werden.'
-      cancel: 'or cancel'
    index:
      view_options: 'Ansichtsoptionen'
      toggle_unavailable: 'Nicht verfügbare Artikel zeigen/verstecken'
--- a/config/locales/de/de.suppliers.yml
+++ b/config/locales/de/de.suppliers.yml
@ -11,8 +11,6 @@ de:
      confirm_del: 'Achtung, willst Du wirklich den Lieferanten %{name} löschen?'
    edit:
      title: 'Lieferantin bearbeiten'
-    form:
-      cancel: 'oder abbrechen'
    new:
      title: 'Neue Lieferantin'
    show:
--- a/config/locales/en/en.admin.yml
+++ b/config/locales/en/en.admin.yml
@ -1,11 +1,8 @@
 en:
  admin:
-    edit: 'Edit'
-    delete: 'Delete'
    confirm: 'Do you really want to delete %{name}?'
    actions: 'Actions'
    access_to: 'access to'
-    or_cancel: 'or cancel'
    search_placeholder: 'name ..'
    base:
      index:
@ -43,7 +40,6 @@ en:
      show:
        title: 'Ordergroup %{name}'
        edit: 'Edit group/member'
-        delete: 'Delete'
        confirm: 'Are you sure?'
        send_message: 'Send message'
      ordergroups:
@ -95,7 +91,6 @@ en:
      show:
        title: 'Workgroup %{name}'
        edit: 'Edit group/members'
-        delete: 'Delete'
        confirm: 'Are you sure?'
      workgroups:
        name: 'name'
--- a/config/locales/en/en.article_categories.yml
+++ b/config/locales/en/en.article_categories.yml
@ -2,8 +2,6 @@ en:
  article_categories:
    edit:
      title: 'Edit category'
-    form:
-      or_cancel: 'or cancel'
    index:
      title: 'Article categories'
      new: 'Add new category'
--- a/config/locales/en/en.articles.yml
+++ b/config/locales/en/en.articles.yml
@ -22,7 +22,6 @@ en:
      note: 'Mandatory fields are: name, unit, (net) price and order number.'
      warning: 'Warning: all articles will be updated!'
      submit: 'Updating all articles'
-      or_cancel: 'or cancel'
    edit_all_table:
      available_short: 'avail'
      available_desc: 'available'
@ -69,7 +68,6 @@ en:
      unit_quantity_short: 'Unity Quan.'
      price_short: 'Price'
      submit: 'Delete/update all'
-      or_cancel: 'or cancel'
    upload:
      title: '%{supplier} / upload article'
      body:
@ -88,7 +86,6 @@ en:
        <p><i>Please check the imported articles.</i></p>
        <p><i>Attention, at the moment there is no revision on dubble articles.</i></p>
      submit: 'Save new articles for %{supplier}'
-      or_cancel: 'or cancel'

    # used by controller
    update_all:
--- a/config/locales/en/en.defaults.yml
+++ b/config/locales/en/en.defaults.yml
@ -270,6 +270,8 @@ en:
    edit: 'Edit'
    delete: 'Delete'
    show: 'Show'
+    save: 'Save'
+    or_cancel: 'or cancel'
    marks:
      close: 'x'

--- a/config/locales/en/en.finance.yml
+++ b/config/locales/en/en.finance.yml
@ -7,7 +7,6 @@ en:
      date: 'Date'
      amount: 'Amount'
      supplier: 'supplier'
-      edit: 'Edit'
      last_transactions: 'Last Transactions'
      group: 'Group'
      note: 'Note'
@ -67,8 +66,6 @@ en:
        confirm: 'Really want to put the order on closed?'
        no_closed_orders: 'At the moment there are not closed orders'
      order_article:
-        edit: 'Edit'
-        delete: 'Delete'
        confirm: 'Are you sure?'
      invoice:
        invoice_number: 'Invoice number:'
@ -85,9 +82,6 @@ en:
        total: 'Total costs'
        add_group: 'Add group'
        total_fc: 'Sum (FC-Price)'
-      edit_note:
-        close: 'Close'
-        save: 'Save'
      edit_results_by_articles:
        article: 'Article'
        number: 'Number'
@ -126,16 +120,12 @@ en:
        note: 'Note'
        amount: 'Amount'
        save: "Save transaction"
-        or_cancel: 'or cancel'
      new:
        title: "New transaction"
        paragraph: 'Here you can credit/distract the order group <b>%{name}</b> money.'
-        or_cancel: "or cancel"
    group_order_articles:
      form:
        amount_change_for: 'Change amount for %{article}'
-        close: 'Close'
-        save: "Save"
    ordergroups:
      ordergroups:
        name: "Name"
@ -153,7 +143,6 @@ en:
        linked: "This invoice is linked to a %{what_link}."
        delivery: "delivery"
        order: "order"
-        or_cancel: "or cancel"
      index:
        title: "Invoices"
        action_new: "Create new invoice"
--- a/config/locales/en/en.foodcoop.yml
+++ b/config/locales/en/en.foodcoop.yml
@ -29,7 +29,6 @@ en:
        title: 'Edit group'
        invite_new: 'You can invite new members %{invite_link}.'
        invite_link: 'here'
-        or_cancel: 'or cancel'
      workgroup:
        show_tasks: 'Show all tasks'
        edit: 'Edit group'
--- a/config/locales/en/en.group_orders.yml
+++ b/config/locales/en/en.group_orders.yml
@ -32,7 +32,6 @@ en:
      available_funds: 'Available credits'
      new_funds: 'New account balance'
      action_save: 'Save order'
-      cancel: 'or cancel'
    index:
      title: 'Orders overview'
      funds:
--- a/config/locales/en/en.home.yml
+++ b/config/locales/en/en.home.yml
@ -72,7 +72,6 @@ en:
      user:
        title: '%{user}'
        since: '(member since: %{when})'
-        save: 'Save'
      groups:
        title: 'You are member of the following groups'
        invite: 'Invite new members'
--- a/config/locales/en/en.login.yml
+++ b/config/locales/en/en.login.yml
@ -18,7 +18,6 @@ en:
        <p>Please fill in the email address with which you are registered here.
        Then you will receive an email with further instructions.</p>
      submit: 'Request new password'
-      cancel: 'or abort'
    new_password:
      title: 'New password'
      body:
--- a/config/locales/en/en.ordergroups.yml
+++ b/config/locales/en/en.ordergroups.yml
@ -4,7 +4,6 @@ en:
      title: 'Ordergroups'
    edit:
      title: 'Edit ordergroups'
-      submit: 'Edit'

    # used by model
    model:
--- a/config/locales/en/en.orders.yml
+++ b/config/locales/en/en.orders.yml
@ -22,7 +22,6 @@ en:
      unit_quantity: 'Unit quantity'
      prices: 'Prices (net/FC)'
      select_all: 'Select all'
-      cancel: 'or cancel'
    index:
      title: 'Manage orders'
      new_order: 'Create new order'
--- a/config/locales/en/en.stock_takings.yml
+++ b/config/locales/en/en.stock_takings.yml
@ -2,7 +2,6 @@ en:
  stock_takings:
    edit:
      title: 'Edit inventory'
-      cancel: 'or cancel'
    index:
      title: 'Inventory overview'
      new_inventory: 'Create new inventory'
@ -13,7 +12,6 @@ en:
      text_need_articles: 'You have to %{create_link} a new stock article before you can use it here.'
      create: 'create'
      stock_articles: 'Stock articles'
-      cancel: 'or cancel'
    show:
      title: 'Show inventory'
      date: 'Date'
--- a/config/locales/en/en.stockit.yml
+++ b/config/locales/en/en.stockit.yml
@ -4,7 +4,6 @@ en:
      title: 'Edit stock articles'
    form:
      price_hint: 'To avoid choas, it is not possible to edit the prices of already added stock articles until further notice.'
-      cancel: 'or cancel'
    index:
      view_options: 'View options'
      toggle_unavailable: 'Show/hide unavailable articles'
--- a/config/locales/en/en.suppliers.yml
+++ b/config/locales/en/en.suppliers.yml
@ -11,8 +11,6 @@ en:
      confirm_del: 'Do you really want to delete the supplier %{name}?'
    edit:
      title: 'Edit supplier'
-    form:
-      cancel: 'or cancel'
    new:
      title: 'New supplier'
    show: