4 files changed, 33 insertions, 3 deletions
diff --git a/admin/themes/default/template/group_list.tpl b/admin/themes/default/template/group_list.tpl
index 0443f62eb..c11b6369a 100644
--- a/admin/themes/default/template/group_list.tpl
+++ b/admin/themes/default/template/group_list.tpl
@@ -96,7 +96,7 @@ $(document).ready(function() {
           <option value="merge">{'Merge selected groups'|@translate}</option>
           <option value="duplicate">{'Duplicate'|@translate}</option>
           <option value="manage_members">{'Manage the members'|@translate}</option>
-          <option value="manage_pemissions">{'Manage permissions'|@translate}</option>
+          <option value="manage_pemissions">{'Manage Permissions'|@translate}</option>
           <option value="toggle_default">{'Toggle \'default group\' property'|@translate}</option>
       {if !empty($element_set_groupe_plugins_actions)}
         {foreach from=$element_set_groupe_plugins_actions item=action}
@@ -158,7 +158,7 @@ $(document).ready(function() {
         {if not empty($groups)}
         {foreach from=$groups item=group}
         <p group_id="{$group.ID}" class="grp_action">
-          {$group.NAME} > <a href="{$group.U_PERM}" title="{'Permissions'|@translate}">{'Manage permissions'|@translate}</a>
+          {$group.NAME} > <a href="{$group.U_PERM}" title="{'Permissions'|@translate}">{'Manage Permissions'|@translate}</a>
         </p>
         {/foreach}
         {/if}
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 08cf63117..0ef743350 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -310,6 +310,7 @@ $lang['Drag to re-order'] = "Click-and-drag to re-order";
 $lang['Drop into album'] = 'Select an album';
 $lang['Dump Database'] = 'Dump Database';
 $lang['Duplicate selected tags'] = 'Duplicate selected tags';
+$lang['Duplicate'] = 'Duplicate';
 $lang['Duplicates'] = 'Duplicates';
 $lang['Edit album permissions'] = "Edit album permissions";
 $lang['Edit album'] = "Edit album";
@@ -481,6 +482,7 @@ $lang['Manage photo ranks'] = "Manage photo ranks";
 $lang['Manage photos'] = 'Manage photos';
 $lang['manage sub-albums'] = "manage sub-albums";
 $lang['Manage tags'] = "Manage tags";
+$lang['Manage the members'] = 'Manage the members';
 $lang['Manage this set of %d photos'] = 'Manage this set of %d photos';
 $lang['Manage'] = "Manage";
 $lang['manual order'] = 'manual order';
@@ -490,6 +492,7 @@ $lang['Maximum height'] = 'Maximum height';
 $lang['Maximum width'] = 'Maximum width';
 $lang['Members'] = "Members";
 $lang['Menu Management'] = 'Menus';
+$lang['Merge selected groups'] = 'Merge selected groups';
 $lang['Merge selected tags'] = 'Merge selected tags';
 $lang['Merge tags'] = 'Merge tags';
 $lang['Metadata synchronization results'] = "Metadata synchronization results";
@@ -521,7 +524,9 @@ $lang['No destination tag selected'] = 'No destination tag selected';
 $lang['No display'] = "No display";
 $lang['No file was uploaded'] = 'No file was uploaded';
 $lang['No group is permitted to see this private album'] = 'No group is permitted to see this private album';
+$lang['No group selected, no action possible.'] = 'No group selected, no action possible.';
 $lang['No mail to send.'] = "No mail to be sent.";
+$lang['No members to manage'] = "No members to manage";
 $lang['No order field selected'] = 'No order field selected';
 $lang['No photo can be deleted'] = "No photo can be deleted";
 $lang['No photo in the current set.'] = 'No photo in the current set.';
@@ -622,6 +627,7 @@ $lang['Piwigo Update'] = 'Piwigo Update';
 $lang['Piwigo Uploader'] = 'Piwigo Uploader';
 $lang['Piwigo version'] = "Piwigo version";
 $lang['pixels'] = 'pixels';
+$lang['Please select at least two groups'] = 'Please select at least two groups';
 $lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = "Please check \"plugins\" folder and sub-folders permissions (CHMOD).";
 $lang['Please wait...'] = 'Please wait...';
 $lang['pLoader stands for <em>Piwigo Uploader</em>. From your computer, pLoader prepares your photos and transfer them to your Piwigo photo gallery.'] = 'pLoader stands for <em>Piwigo Uploader</em>. From your computer, pLoader prepares your photos and transfer them to your Piwigo photo gallery.';
@@ -677,6 +683,7 @@ $lang['Remove from caddie'] = 'Remove from caddie';
 $lang['remove tags'] = "remove tags";
 $lang['remove this filter'] = 'remove this filter';
 $lang['remove title'] = 'remove title';
+$lang['Rename'] = 'Rename';
 $lang['Repair and optimize database'] = "Repair and optimize database";
 $lang['Replacement of original templates by customized templates from template-extension subfolder'] = "Replacement of original templates by customized templates from the template-extension subfolder";
 $lang['Replacers (customized templates)'] = "Substitutes (customized templates)";
@@ -816,6 +823,8 @@ $lang['This is a major update, with <a href="%s">new exciting features</a>.'] =
 $lang['This is a minor update, with only bug corrections.'] = 'This is a minor update, with only bug corrections.';
 $lang['This name is already used by another group.'] = "This name is already used by another group.";
 $lang['THIS PLUGIN IS NOW PART OF PIWIGO CORE! DELETE IT NOW.'] = 'THIS PLUGIN IS NOW PART OF PIWIGO CORE! UNINSTALL IT NOW!';
+$lang['This group will be set to default'] = "This group will be set to default";
+$lang['This group will be unset to default'] = "This group will be unset to default";
 $lang['This site already exists'] = "This site already exists";
 $lang['This theme was not designed to be directly activated'] = 'This theme was not designed to be directly activated';
 $lang['Thumbnail'] = "Thumbnail";
@@ -835,6 +844,7 @@ $lang['total time'] = "total time";
 $lang['Two updates are available'] = 'Two updates are available';
 $lang['Type here the author name'] = 'Type here the author name';
 $lang['Type here the title'] = 'Type here the title';
+$lang['Type here the name of the new group'] = 'Type here the name of the new group';
 $lang['Type in a search term'] = "Type in a search term";
 $lang['Unable to check for upgrade.'] = "Unable to check for upgrade.";
 $lang['Unable to dump database.'] = 'Unable to dump database.';
diff --git a/language/fr_CA/admin.lang.php b/language/fr_CA/admin.lang.php
index dcad87350..eb9410199 100644
--- a/language/fr_CA/admin.lang.php
+++ b/language/fr_CA/admin.lang.php
@@ -935,5 +935,14 @@ $lang['Duplicate selected tags'] = 'Dupliquer les mots clés sélectionnés';
 $lang['Name of the duplicate'] = 'Nom du duplicata';
 $lang['Source tag'] = 'Source du mot clé';
 $lang['Tag "%s" is now a duplicate of "%s"'] = 'Le mot clé "%s" est désormais une copie de "%s"';
-
+$lang['Manage the members'] = 'Gérer les membres';
+$lang['Type here the name of the new group'] = 'Inscrivez ici le nom du nouveau groupe';
+$lang['No group selected, no action possible.'] = 'Pas de groupes sélectionnés, pas d\'actions possibles.';
+$lang['Please select at least two groups'] = 'Merci de sélectionner au moins deux groupes';
+$lang['Duplicate'] = 'Dupliquer';
+$lang['Merge selected groups'] = 'Fusionner les groupes sélectionnés';
+$lang['This group will be set to default'] = "Ce groupe deviendra par défaut";
+$lang['This group will be unset to default'] = "Ce groupe ne sera plus par défaut";
+$lang['No members to manage'] = "Aucun membre à gérer";
+$lang['Rename'] = 'Renommer';
 ?>
 \ No newline at end of file
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index a05dd505e..1a3f529a1 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -939,4 +939,15 @@ $lang['Number of albums per page'] = 'Nombre d\'albums par page';
 $lang['Ratio'] = 'Ratio';
 $lang['between %d and %d pixels'] = 'entre %d et %d pixels';
 $lang['between %.2f and %.2f'] = 'entre %.2f et %.2f';
+$lang['Manage the members'] = 'Gérer les membres';
+$lang['Type here the name of the new group'] = 'Inscrivez ici le nom du nouveau groupe';
+$lang['No group selected, no action possible.'] = 'Pas de groupes sélectionnés, pas d\'actions possibles.';
+$lang['Please select at least two groups'] = 'Merci de sélectionner au moins deux groupes';
+$lang['Duplicate'] = 'Dupliquer';
+$lang['Merge selected groups'] = 'Fusionner les groupes sélectionnés';
+$lang['This group will be set to default'] = "Ce groupe deviendra par défaut";
+$lang['This group will be unset to default'] = "Ce groupe ne sera plus par défaut";
+$lang['No members to manage'] = "Aucun membre à gérer";
+$lang['Rename'] = 'Renommer';
+
 ?>
 \ No newline at end of file