From 46def147aa5418beb5c13b181cc759254b153dbd Mon Sep 17 00:00:00 2001
From: "Max F. Albrecht" <1@178.is>
Date: Wed, 18 Feb 2015 12:05:43 +0100
Subject: [PATCH] ui: permissions: adjust naming 2

[#87606962]
---
 app/assets/javascripts/i18n/locale/de-CH.js              | 6 +++++-
 app/assets/javascripts/i18n/locale/en-GB.js              | 2 +-
 app/assets/javascripts/views/permissions/index.tmpl.haml | 2 +-
 app/assets/javascripts/views/permissions/line.tmpl.haml  | 2 +-
 app/views/permissions/edit.html.haml                     | 2 +-
 locale/de_CH/madek.po                                    | 5 ++++-
 locale/en_GB/madek.po                                    | 3 +++
 7 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/i18n/locale/de-CH.js b/app/assets/javascripts/i18n/locale/de-CH.js
index 54cbe9cd66..060fe880d0 100644
--- a/app/assets/javascripts/i18n/locale/de-CH.js
+++ b/app/assets/javascripts/i18n/locale/de-CH.js
@@ -381,6 +381,10 @@ window.i18n.locale_data = {
          null,
          "Metadaten editieren"
       ],
+      "Edit metadata and add to Set": [
+         null,
+         "Metadaten editieren & Inhalte zu Set hinzufügen"
+      ],
       "Edit metadata of these media entries": [
          null,
          "Metadaten von Medieneinträgen editieren"
@@ -431,7 +435,7 @@ window.i18n.locale_data = {
       ],
       "Get full size": [
          null,
-         "Original exportieren und in PDF blättern"
+         "Original exportieren & in PDF blättern"
       ],
       "External users": [
          null,
diff --git a/app/assets/javascripts/i18n/locale/en-GB.js b/app/assets/javascripts/i18n/locale/en-GB.js
index 8b27314781..3c8c4eb58b 100644
--- a/app/assets/javascripts/i18n/locale/en-GB.js
+++ b/app/assets/javascripts/i18n/locale/en-GB.js
@@ -374,7 +374,7 @@ window.i18n.locale_data = {
       ],
       "Edit metadata": [
          null,
-         "Edit metadata"
+         "Edit metadata and add to Set"
       ],
       "Edit metadata of these media entries": [
          null,
diff --git a/app/assets/javascripts/views/permissions/index.tmpl.haml b/app/assets/javascripts/views/permissions/index.tmpl.haml
index 1c7bad52dc..e538e35b00 100644
--- a/app/assets/javascripts/views/permissions/index.tmpl.haml
+++ b/app/assets/javascripts/views/permissions/index.tmpl.haml
@@ -15,7 +15,7 @@
             %td.ui-rights-role-title  ${_jed('Permission')}
             %td.ui-rights-check-title ${_jed('Get metadata and previews')}
             %td.ui-rights-check-title ${_jed('Get full size')}
-            %td.ui-rights-check-title ${_jed('Edit metadata')}
+            %td.ui-rights-check-title ${_jed('Edit metadata and add to Set')}
             %td.ui-rights-check-title ${_jed('Edit permissions')}
 
         %tbody
diff --git a/app/assets/javascripts/views/permissions/line.tmpl.haml b/app/assets/javascripts/views/permissions/line.tmpl.haml
index d000ebb0d0..4d0d140f1d 100644
--- a/app/assets/javascripts/views/permissions/line.tmpl.haml
+++ b/app/assets/javascripts/views/permissions/line.tmpl.haml
@@ -41,6 +41,6 @@
 
   {{tmpl({permission: download, label: "Get full size", name: "download"}, {manageable: $item.manageable}) App.renderPath("permissions/line/right-check")}}
 
-  {{tmpl({permission: edit, label: "Edit metadata", name: "edit"}, {manageable: $item.manageable}) App.renderPath("permissions/line/right-check")}}
+  {{tmpl({permission: edit, label: "Edit metadata and add to Set", name: "edit"}, {manageable: $item.manageable}) App.renderPath("permissions/line/right-check")}}
 
   {{tmpl({permission: manage, label: "Edit permissions", name: "manage"}, {manageable: $item.manageable}) App.renderPath("permissions/line/right-check")}}
diff --git a/app/views/permissions/edit.html.haml b/app/views/permissions/edit.html.haml
index 03ddf1671c..ef483f2f5b 100644
--- a/app/views/permissions/edit.html.haml
+++ b/app/views/permissions/edit.html.haml
@@ -89,7 +89,7 @@
               %h2.title-l.ui-info-box-title Ihre Berechtigungen
               %p.ui-info-box-intro Sie, #{current_user}, haben gegenwärtig als Person oder als Mitglied einer Gruppe folgende Berechtigungen
               %ul.inline
-                - action_map= {view: "Get metadata and previews", download: "Get full size", edit: "Edit metadata" , manage: "Edit permissions"}
+                - action_map= {view: "Get metadata and previews", download: "Get full size", edit: "Edit metadata and add to Set", manage: "Edit permissions"}
                 - [:view, :download, :edit, :manage].each do |action|
                   - if @media_resources.accessible_by_user(current_user,action).count == @media_resources.count
                     %li<>
diff --git a/locale/de_CH/madek.po b/locale/de_CH/madek.po
index 0fa0928ddd..f1184eb461 100644
--- a/locale/de_CH/madek.po
+++ b/locale/de_CH/madek.po
@@ -253,6 +253,9 @@ msgstr "Filterset editieren"
 msgid "Edit metadata"
 msgstr "Metadaten editieren"
 
+msgid "Edit metadata and add to Set"
+msgstr "Metadaten editieren & Inhalte zu Set hinzufügen"
+
 msgid "Edit metadata of these media entries"
 msgstr "Metadaten von Medieneinträgen editieren"
 
@@ -290,7 +293,7 @@ msgid "Export"
 msgstr "Exportieren"
 
 msgid "Get full size"
-msgstr "Original exportieren und in PDF blättern"
+msgstr "Original exportieren & in PDF blättern"
 
 msgid "External users"
 msgstr "Externe"
diff --git a/locale/en_GB/madek.po b/locale/en_GB/madek.po
index dad48cb33a..26a4c0c512 100644
--- a/locale/en_GB/madek.po
+++ b/locale/en_GB/madek.po
@@ -246,6 +246,9 @@ msgstr "Edit filter set"
 msgid "Edit metadata"
 msgstr "Edit metadata"
 
+msgid "Edit metadata"
+msgstr "Edit metadata and add to Set"
+
 msgid "Edit metadata of these media entries"
 msgstr "Edit metadata of these media entries"