From 0b442ceaee940877c4c0f821f54d78903392aa2d Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Thu, 17 Apr 2014 07:51:58 -0400
Subject: [PATCH] [PASSED QA] Bug 9448 [QA Followup]

Rephrases permission description a bit to make it clearer and easier to
translate.

Adds German descriptions as requested by katrin.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes QA script and all tests.
Tested with various permission combinations:
- superlibrarian
- updatecharges (full permission)
- only 'remaining permissions for updating charges'
It works as expected.

Note: I think we need a follow up to include the
'Forgive overdue charges' checkbox on the check in page
in the new permission.
---
 installer/data/mysql/de-DE/mandatory/userpermissions.sql            | 4 ++--
 installer/data/mysql/en/mandatory/userpermissions.sql               | 2 +-
 installer/data/mysql/es-ES/mandatory/userpermissions.sql            | 2 +-
 installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql        | 2 +-
 installer/data/mysql/it-IT/necessari/userpermissions.sql            | 2 +-
 installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql       | 2 +-
 installer/data/mysql/pl-PL/mandatory/userpermissions.sql            | 2 +-
 installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql | 2 +-
 installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql | 2 +-
 installer/data/mysql/updatedatabase.pl                              | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/installer/data/mysql/de-DE/mandatory/userpermissions.sql b/installer/data/mysql/de-DE/mandatory/userpermissions.sql
index 1f1e6ad..d80c4d4 100644
--- a/installer/data/mysql/de-DE/mandatory/userpermissions.sql
+++ b/installer/data/mysql/de-DE/mandatory/userpermissions.sql
@@ -11,8 +11,8 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    ( 9, 'edit_catalogue', 'Katalogdaten bearbeiten (Titel- und Exemplardaten ändern)'),
    ( 9, 'fast_cataloging', 'Schnellaufnahmen anlegen'),
    ( 9, 'edit_items', 'Exemplare bearbeiten'),
-   (10, 'writeoff', 'Write off charges'),
-   (10, 'remaining_permissions', 'Remaining updatecharges permissions'),
+   (10, 'writeoff', 'Gebühren erlassen'),
+   (10, 'remaining_permissions', 'Verbleibende Berechtigungen für die Verwaltung von Gebühren'),
    (11, 'vendors_manage', 'Lieferanten verwalten'),
    (11, 'contracts_manage', 'Vereinbarungen verwalten'),
    (11, 'period_manage', 'Etats verwalten'),
diff --git a/installer/data/mysql/en/mandatory/userpermissions.sql b/installer/data/mysql/en/mandatory/userpermissions.sql
index 642f3be..af2ea6c 100644
--- a/installer/data/mysql/en/mandatory/userpermissions.sql
+++ b/installer/data/mysql/en/mandatory/userpermissions.sql
@@ -12,7 +12,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    ( 9, 'fast_cataloging', 'Fast cataloging'),
    ( 9, 'edit_items', 'Edit Items'),
    (10, 'writeoff', 'Write off charges'),
-   (10, 'remaining_permissions', 'Remaining updatecharges permissions'),
+   (10, 'remaining_permissions', 'Remaining permissions for managing charges'),
    (11, 'vendors_manage', 'Manage vendors'),
    (11, 'contracts_manage', 'Manage contracts'),
    (11, 'period_manage', 'Manage periods'),
diff --git a/installer/data/mysql/es-ES/mandatory/userpermissions.sql b/installer/data/mysql/es-ES/mandatory/userpermissions.sql
index fa22c18..321bde0 100644
--- a/installer/data/mysql/es-ES/mandatory/userpermissions.sql
+++ b/installer/data/mysql/es-ES/mandatory/userpermissions.sql
@@ -12,7 +12,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    ( 9, 'fast_cataloging', 'Fast cataloging'),
    ( 9, 'edit_items', 'Edit Items'),
    (10, 'writeoff', 'Write off charges'),
-   (10, 'remaining_permissions', 'Remaining updatecharges permissions'),
+   (10, 'remaining_permissions', 'Remaining permissions for managing charges'),
    (11, 'vendors_manage', 'Manage vendors'),
    (11, 'contracts_manage', 'Manage contracts'),
    (11, 'period_manage', 'Manage periods'),
diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
index 8966895..c30b09b 100644
--- a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
@@ -12,7 +12,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    ( 9, 'fast_cataloging', 'Catalogage rapide'),
    ( 9, 'edit_items', 'Modifier des exemplaires'),
    (10, 'writeoff', 'Write off charges'),
-   (10, 'remaining_permissions', 'Remaining updatecharges permissions'),
+   (10, 'remaining_permissions', 'Remaining permissions for managing charges'),
    (13, 'edit_news', 'Ecrire des nouvelles pour l''OPAC et l''interface professionnelle'),
    (13, 'label_creator', 'Créer des étiquettes à partir des données du catalogues et des adhérents'),
    (13, 'edit_calendar', 'Définir les jours de fermeture de la bibliothèque'),
diff --git a/installer/data/mysql/it-IT/necessari/userpermissions.sql b/installer/data/mysql/it-IT/necessari/userpermissions.sql
index ec121e0..751c451 100644
--- a/installer/data/mysql/it-IT/necessari/userpermissions.sql
+++ b/installer/data/mysql/it-IT/necessari/userpermissions.sql
@@ -14,7 +14,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    ( 9, 'fast_cataloging', 'Catalogazione veloce'),
    ( 9, 'edit_items', 'Crea/modifica copie'),
    (10, 'writeoff', 'Write off charges'),
-   (10, 'remaining_permissions', 'Remaining updatecharges permissions'),
+   (10, 'remaining_permissions', 'Remaining permissions for managing charges'),
    (11, 'vendors_manage', 'Crea/modifica fornitori'),
    (11, 'contracts_manage', 'Crea/modifica contratti'),
    (11, 'period_manage', 'Gestisci scadenze budgets'),
diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
index 88f91c7..f72bfbd 100644
--- a/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
@@ -32,7 +32,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    ( 9, 'fast_cataloging', 'Hurtigkatalogisering'),
    ( 9, 'edit_items', 'Endre eksmeplarer'),
    (10, 'writeoff', 'Write off charges'),
-   (10, 'remaining_permissions', 'Remaining updatecharges permissions'),
+   (10, 'remaining_permissions', 'Remaining permissions for managing charges'),
    (11, 'vendors_manage', 'Administrere leverandører'),
    (11, 'contracts_manage', 'Administrere kontrakter'),
    (11, 'period_manage', 'Administrere perioder'),
diff --git a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql b/installer/data/mysql/pl-PL/mandatory/userpermissions.sql
index 4ae6b6f..f75452f 100644
--- a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql
+++ b/installer/data/mysql/pl-PL/mandatory/userpermissions.sql
@@ -12,7 +12,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    ( 9, 'fast_cataloging', 'Szybkie katalogowanie'),
    ( 9, 'edit_items', 'Edit Items'),
    (10, 'writeoff', 'Write off charges'),
-   (10, 'remaining_permissions', 'Remaining updatecharges permissions'),
+   (10, 'remaining_permissions', 'Remaining permissions for managing charges'),
    (11, 'vendors_manage', 'Zarządzanei dostawcami'),
    (11, 'contracts_manage', 'Zarządzanie kontraktami'),
    (11, 'period_manage', 'Manage periods'),
diff --git a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql b/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql
index 0c18a35..68e9dcf 100644
--- a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql
+++ b/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql
@@ -38,7 +38,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    ( 9, 'fast_cataloging', 'Fast cataloging'),
    ( 9, 'edit_items', 'Edit Items'),
    (10, 'writeoff', 'Write off charges'),
-   (10, 'remaining_permissions', 'Remaining updatecharges permissions'),
+   (10, 'remaining_permissions', 'Remaining permissions for managing charges'),
    (11, 'vendors_manage', 'Manage vendors'),
    (11, 'contracts_manage', 'Manage contracts'),
    (11, 'period_manage', 'Manage periods'),
diff --git a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql b/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql
index de7b934..0696a0a 100644
--- a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql
+++ b/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql
@@ -38,7 +38,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    ( 9, 'fast_cataloging', 'Fast cataloging'),
    ( 9, 'edit_items', 'Edit Items'),
    (10, 'writeoff', 'Write off charges'),
-   (10, 'remaining_permissions', 'Remaining updatecharges permissions'),
+   (10, 'remaining_permissions', 'Remaining permissions for managing charges'),
    (11, 'vendors_manage', 'Manage vendors'),
    (11, 'contracts_manage', 'Manage contracts'),
    (11, 'period_manage', 'Manage periods'),
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index e67e60a..3508dfc 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -8132,7 +8132,7 @@ if(CheckVersion($DBversion)) {
 $DBversion = "3.15.00.XXX";
 if ( CheckVersion($DBversion) ) {
    $dbh->do("INSERT INTO permissions (module_bit, code, description) VALUES ('10', 'writeoff', 'Write off charges')");
-   $dbh->do("INSERT INTO permissions (module_bit, code, description) VALUES ('10', 'remaining_permissions', 'Remaining updatecharges permissions')");
+   $dbh->do("INSERT INTO permissions (module_bit, code, description) VALUES ('10', 'remaining_permissions', 'Remaining permissions for managing charges')");
    print "Upgrade to $DBversion done (Bug 9448 - Add separate permission for writing off fees)\n";
    SetVersion ($DBversion);
 }
-- 
1.8.3.2