Merge pull request #409 from foodcoop1040/confirm

Rename translation "admin.confirm" to "ui.confirm_delete"

app/views/admin/ordergroups/_ordergroups.html.haml

@@ -19,5 +19,5 @@
         %td= format_date ordergroup.last_user_activity
         %td
           = link_to t('ui.edit'), edit_admin_ordergroup_path(ordergroup), class: 'btn btn-mini'
-          = link_to t('ui.delete'), [:admin, ordergroup], :data => {:confirm => t('admin.confirm', name: ordergroup.name)},
+          = link_to t('ui.delete'), [:admin, ordergroup], :data => {:confirm => t('ui.confirm_delete', name: ordergroup.name)},
             :method => :delete, class: 'btn btn-mini btn-danger'

app/views/admin/users/_users.html.haml

@@ -26,5 +26,5 @@
             = link_to t('ui.restore'), restore_admin_user_path(user), :data => {:confirm => t('ui.confirm_restore', name: user.name)},
                 :method => :post, class: 'btn btn-success btn-mini'
           - else
-            = link_to t('ui.delete'), [:admin, user], :data => {:confirm => t('admin.confirm', name: user.name)},
+            = link_to t('ui.delete'), [:admin, user], :data => {:confirm => t('ui.confirm_delete', name: user.name)},
                 :method => :delete, class: 'btn btn-danger btn-mini'

app/views/admin/workgroups/_workgroups.html.haml

@@ -16,5 +16,5 @@
         %td= format_roles(workgroup)
         %td
           = link_to t('ui.edit'), edit_admin_workgroup_path(workgroup), class: 'btn btn-mini'
-          = link_to t('ui.delete'), [:admin, workgroup], :data => {:confirm => t('admin.confirm', name: workgroup.name)},
+          = link_to t('ui.delete'), [:admin, workgroup], :data => {:confirm => t('ui.confirm_delete', name: workgroup.name)},
             :method => :delete, class: 'btn btn-mini btn-danger'

config/locales/de.yml

@@ -245,7 +245,6 @@ de:
         title: Einstellungen
       update:
         notice: Einstellungen gespeichert.
-    confirm: Willst du %{name} wirklich löschen?
     ordergroups:
       destroy:
         error: 'Bestellgruppe konnte nicht als gelöscht markiert werden: %{error}'
@@ -1697,6 +1696,7 @@ de:
     back: Züruck
     cancel: Abbrechen
     close: Schließen
+    confirm_delete: Willst du %{name} wirklich löschen?
     confirm_restore: Willst du %{name} wirklich wiederherstellen?
     copy: kopieren
     delete: Löschen

config/locales/en.yml

@@ -250,7 +250,6 @@ en:
         title: Configuration
       update:
         notice: Configuration saved.
-    confirm: Do you really want to delete %{name}?
     ordergroups:
       destroy:
         error: 'Ordergroup could not be marked as deleted: %{error}'
@@ -1719,6 +1718,7 @@ en:
     back: Back
     cancel: Cancel
     close: Close
+    confirm_delete: Do you really want to delete %{name}?
     confirm_restore: Do you really want to restore %{name}?
     copy: Copy
     delete: Delete

config/locales/fr.yml

@@ -244,7 +244,6 @@ fr:
         title: 
       update:
         notice: 
-    confirm: Veux-tu vraiment supprimer %{name}?
     ordergroups:
       destroy:
         error: 'La cellule n''a pas pu être dissoute: %{error}'
@@ -1709,6 +1708,7 @@ fr:
     back: Retour
     cancel: Annuler
     close: Fermer
+    confirm_delete: Veux-tu vraiment supprimer %{name}?
     copy: 
     delete: Supprimer
     edit: Modifier

config/locales/nl.yml

@@ -244,7 +244,6 @@ nl:
         title: Configuratie
       update:
         notice: Configuratie opgeslagen.
-    confirm: Wil je %{name} daadwerkelijk wissen?
     ordergroups:
       destroy:
         error: 'Huishouden kon niet als verwijderd gemarkeerd worden: %{error}'
@@ -1696,6 +1695,7 @@ nl:
     back: Terug
     cancel: Annuleren
     close: Sluiten
+    confirm_delete: Wil je %{name} daadwerkelijk wissen?
     copy: Kopiëren
     delete: Verwijder
     edit: Bewerk