Bug 1041 fixed : manual user adding in admin's user management panel

- Double password type fields
- Add controls of the filling fields
- Alert text added in language pack - EN, FR, DE and ES are OK. IT have to be fixed.

- Subsidiary fix : Small grammatical error in FR/common.lang.php

git-svn-id: http://piwigo.org/svn/trunk@3751 68402e56-0260-453c-a942-63ccdbb3a9ee

10 files changed, 271 insertions, 217 deletions

diff --git a/admin/template/goto/user_list.tpl b/admin/template/goto/user_list.tpl
index 49e1828ec..daf193ed9 100644
--- a/admin/template/goto/user_list.tpl
+++ b/admin/template/goto/user_list.tpl
@@ -1,3 +1,4 @@
+{* $Id: user_list.tpl 2578 2008-09-24 00:51:40Z rvelices $ *}
 <div class="titrePage">
   <h2>{'title_liste_users'|@translate}</h2>
 </div>
@@ -5,19 +6,20 @@
 <form class="filter" method="post" name="add_user" action="{$F_ADD_ACTION}">
   <fieldset>
     <legend>{'Add a user'|@translate}</legend>
-    <label>{'Username'|@translate} <input type="text" name="login" maxlength="50" size="20"></label>
-    <label>{'Password'|@translate} <input type="text" name="password"></label>
-    <label>{'Email address'|@translate} <input type="text" name="email"></label>
-    <label>&nbsp; <input class="submit" type="submit" name="submit_add" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}></label>
+    <label>{'Username'|@translate} <input type="text" name="login" maxlength="50" size="20" /></label>
+    <label>{'Password'|@translate} <input type="password" name="password" /></label>
+    <label>{'Confirm Password'|@translate} <input type="password" name="password_conf" id="password_conf" /></label>
+    <label>{'Email address'|@translate} <input type="text" name="email" /></label>
+    <label>&nbsp; <input class="submit" type="submit" name="submit_add" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED} /></label>
   </fieldset>
 </form>
 
 <form class="filter" method="get" name="filter" action="{$F_FILTER_ACTION}">
 <fieldset>
   <legend>{'Filter'|@translate}</legend>
-  <input type="hidden" name="page" value="user_list">
+  <input type="hidden" name="page" value="user_list" />
 
-  <label>{'Username'|@translate} <input type="text" name="username" value="{$F_USERNAME}"></label>
+  <label>{'Username'|@translate} <input type="text" name="username" value="{$F_USERNAME}" /></label>
 
   <label>
   {'status'|@translate}
@@ -41,7 +43,7 @@
 
   <label>
   &nbsp;
-  <input class="submit" type="submit" value="{'Submit'|@translate}">
+  <input class="submit" type="submit" value="{'Submit'|@translate}" />
   </label>
 
 </fieldset>
@@ -70,7 +72,7 @@
 
   {foreach from=$users item=user name=users_loop}
   <tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}">
-    <td><input type="checkbox" name="selection[]" value="{$user.ID}" {$user.CHECKED} id="selection-{$user.ID}"></td>
+    <td><input type="checkbox" name="selection[]" value="{$user.ID}" {$user.CHECKED} id="selection-{$user.ID}" /></td>
     <td><label for="selection-{$user.ID}">{$user.USERNAME}</label></td>
     <td>{$user.STATUS}</td>
     <td>{$user.EMAIL}</td>
@@ -80,8 +82,8 @@
     <td>{$data}</td>
     {/foreach}
     <td style="text-align:center;">
-      <a href="{$user.U_PERM}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/permissions.png" class="button" style="border:none" alt="{'permissions'|@translate}" title="{'permissions'|@translate}"></a>
-      <a href="{$user.U_PROFILE}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/edit_s.png" class="button" style="border:none" alt="{'Profile'|@translate}" title="{'Profile'|@translate}"></a>
+      <a href="{$user.U_PERM}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/permissions.png" class="button" style="border:none" alt="{'permissions'|@translate}" title="{'permissions'|@translate}" /></a>
+      <a href="{$user.U_PROFILE}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/edit_s.png" class="button" style="border:none" alt="{'Profile'|@translate}" title="{'Profile'|@translate}" /></a>
       {foreach from=$user.plugin_actions item=data}
       {$data}
       {/foreach}
@@ -90,13 +92,13 @@
   {/foreach}
 </table>
 
-{if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
+<div class="navigationBar">{$NAVBAR}</div>
 
 {* delete the selected users ? *}
 <fieldset>
   <legend>{'Deletions'|@translate}</legend>
-  <label><input type="checkbox" name="confirm_deletion" value="1"> {'confirm'|@translate}</label>
-  <input class="submit" type="submit" value="{'Delete selected users'|@translate}" name="delete" {$TAG_INPUT_ENABLED}>
+  <label><input type="checkbox" name="confirm_deletion" value="1" /> {'confirm'|@translate}</label>
+  <input class="submit" type="submit" value="{'Delete selected users'|@translate}" name="delete" {$TAG_INPUT_ENABLED}/>
 </fieldset>
 
 <fieldset>
@@ -106,8 +108,8 @@
     <tr>
       <td>{'Status'|@translate}</td>
       <td>
-        <label><input type="radio" name="status_action" value="leave" checked="checked"> {'leave'|@translate}</label>
-        <label><input type="radio" name="status_action" value="set" id="status_action_set"> {'set to'|@translate}</label>
+        <label><input type="radio" name="status_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
+        <label><input type="radio" name="status_action" value="set" id="status_action_set" /> {'set to'|@translate}</label>
         <select onchange="document.getElementById('status_action_set').checked = true;" name="status" size="1">
           {html_options options=$pref_status_options selected=$pref_status_selected}
         </select>
@@ -118,10 +120,10 @@
     <tr>
       <td>{'adviser'|@translate}</td>
       <td>
-        <label><input type="radio" name="adviser" value="leave" checked="checked"> {'leave'|@translate}</label>
+        <label><input type="radio" name="adviser" value="leave" checked="checked" /> {'leave'|@translate}</label>
         / {'set to'|@translate}
-        <label><input type="radio" name="adviser" value="true">{'Yes'|@translate}</label>
-        <label><input type="radio" name="adviser" value="false">{'No'|@translate}</label>
+        <label><input type="radio" name="adviser" value="true"  />{'Yes'|@translate}</label>
+        <label><input type="radio" name="adviser" value="false" />{'No'|@translate}</label>
       </td>
     </tr>
     {/if}
@@ -162,18 +164,18 @@
     <tr>
       <td>{'enabled_high'|@translate}</td>
       <td>
-        <label><input type="radio" name="enabled_high" value="leave" checked="checked"> {'leave'|@translate}</label>
+        <label><input type="radio" name="enabled_high" value="leave" checked="checked" /> {'leave'|@translate}</label>
         / {'set to'|@translate}
-        <label><input type="radio" name="enabled_high" value="true">{'Yes'|@translate}</label>
-        <label><input type="radio" name="enabled_high" value="false">{'No'|@translate}</label>
+        <label><input type="radio" name="enabled_high" value="true"  />{'Yes'|@translate}</label>
+        <label><input type="radio" name="enabled_high" value="false" />{'No'|@translate}</label>
       </td>
     </tr>
 
 	<tr>
 		<td>{'Privacy level'|@translate}</td>
 		<td>
-			<label><input type="radio" name="level_action" value="leave" checked="checked">{'leave'|@translate}</label>
-			<label><input type="radio" name="level_action" value="set" id="level_action_set">{'set to'|@translate}</label>
+			<label><input type="radio" name="level_action" value="leave" checked="checked" />{'leave'|@translate}</label>
+			<label><input type="radio" name="level_action" value="set" id="level_action_set" />{'set to'|@translate}</label>
 			<select onchange="document.getElementById('level_action_set').checked = true;" name="level" size="1">
 			  {html_options options=$level_options selected=$level_selected}
 			</select>
@@ -193,28 +195,28 @@
   <tr>
     <td>{'nb_image_per_row'|@translate}</td>
     <td>
-      <label><input type="radio" name="nb_image_line_action" value="leave" checked="checked"> {'leave'|@translate}</label>
-      <label><input type="radio" name="nb_image_line_action" value="set" id="nb_image_line_action_set"> {'set to'|@translate}</label>
+      <label><input type="radio" name="nb_image_line_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
+      <label><input type="radio" name="nb_image_line_action" value="set" id="nb_image_line_action_set"  /> {'set to'|@translate}</label>
       <input onmousedown="document.getElementById('nb_image_line_action_set').checked = true;"
-             size="3" maxlength="2" type="text" name="nb_image_line" value="{$NB_IMAGE_LINE}">
+             size="3" maxlength="2" type="text" name="nb_image_line" value="{$NB_IMAGE_LINE}" />
     </td>
   </tr>
 
   <tr>
     <td>{'nb_row_per_page'|@translate}</td>
     <td>
-      <label><input type="radio" name="nb_line_page_action" value="leave" checked="checked"> {'leave'|@translate}</label>
-      <label><input type="radio" name="nb_line_page_action" value="set" id="nb_line_page_action_set"> {'set to'|@translate}</label>
+      <label><input type="radio" name="nb_line_page_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
+      <label><input type="radio" name="nb_line_page_action" value="set" id="nb_line_page_action_set" /> {'set to'|@translate}</label>
       <input onmousedown="document.getElementById('nb_line_page_action_set').checked = true;"
-             size="3" maxlength="2" type="text" name="nb_line_page" value="{$NB_LINE_PAGE}">
+             size="3" maxlength="2" type="text" name="nb_line_page" value="{$NB_LINE_PAGE}" />
     <td>
   </tr>
 
   <tr>
     <td>{'theme'|@translate}</td>
     <td>
-      <label><input type="radio" name="template_action" value="leave" checked="checked"> {'leave'|@translate}</label>
-      <label><input type="radio" name="template_action" value="set" id="template_action_set"> {'set to'|@translate}</label>
+      <label><input type="radio" name="template_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
+      <label><input type="radio" name="template_action" value="set" id="template_action_set" /> {'set to'|@translate}</label>
       <select onchange="document.getElementById('template_action_set').checked = true;" name="template" size="1">
         {html_options values=$template_options output=$template_options selected=$template_selected}
       </select>
@@ -224,8 +226,8 @@
   <tr>
     <td>{'language'|@translate}</td>
     <td>
-      <label><input type="radio" name="language_action" value="leave" checked="checked"> {'leave'|@translate}</label>
-      <label><input type="radio" name="language_action" value="set" id="language_action_set"> {'set to'|@translate}</label>
+      <label><input type="radio" name="language_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
+      <label><input type="radio" name="language_action" value="set" id="language_action_set" /> {'set to'|@translate}</label>
       <select onchange="document.getElementById('language_action_set').checked = true;" name="language" size="1">
         {html_options options=$language_options selected=$language_selected}
       </select>
@@ -235,51 +237,51 @@
   <tr>
     <td>{'recent_period'|@translate}</td>
     <td>
-      <label><input type="radio" name="recent_period_action" value="leave" checked="checked"> {'leave'|@translate}</label>
-      <label><input type="radio" name="recent_period_action" value="set" id="recent_period_action_set"> {'set to'|@translate}</label>
+      <label><input type="radio" name="recent_period_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
+      <label><input type="radio" name="recent_period_action" value="set" id="recent_period_action_set"  /> {'set to'|@translate}</label>
       <input onmousedown="document.getElementById('recent_period_action_set').checked = true;"
-             type="text" size="3" maxlength="2" name="recent_period" value="{$RECENT_PERIOD}">
+             type="text" size="3" maxlength="2" name="recent_period" value="{$RECENT_PERIOD}" />
     </td>
   </tr>
 
   <tr>
     <td>{'auto_expand'|@translate}</td>
     <td>
-      <label><input type="radio" name="expand" value="leave" checked="checked"> {'leave'|@translate}</label>
+      <label><input type="radio" name="expand" value="leave" checked="checked" /> {'leave'|@translate}</label>
       / {'set to'|@translate}
-      <label><input type="radio" name="expand" value="true">{'Yes'|@translate}</label>
-      <label><input type="radio" name="expand" value="false">{'No'|@translate}</label>
+      <label><input type="radio" name="expand" value="true"  />{'Yes'|@translate}</label>
+      <label><input type="radio" name="expand" value="false" />{'No'|@translate}</label>
     </td>
   </tr>
 
   <tr>
     <td>{'show_nb_comments'|@translate}</td>
     <td>
-      <label><input type="radio" name="show_nb_comments" value="leave" checked="checked"> {'leave'|@translate}</label>
+      <label><input type="radio" name="show_nb_comments" value="leave" checked="checked" /> {'leave'|@translate}</label>
       / {'set to'|@translate}
-      <label><input type="radio" name="show_nb_comments" value="true">{'Yes'|@translate}</label>
-      <label><input type="radio" name="show_nb_comments" value="false">{'No'|@translate}</label>
+      <label><input type="radio" name="show_nb_comments" value="true" />{'Yes'|@translate}</label>
+      <label><input type="radio" name="show_nb_comments" value="false" />{'No'|@translate}</label>
     </td>
   </tr>
 
   <tr>
     <td>{'show_nb_hits'|@translate}</td>
     <td>
-      <label><input type="radio" name="show_nb_hits" value="leave" checked="checked"> {'leave'|@translate}</label>
+      <label><input type="radio" name="show_nb_hits" value="leave" checked="checked" /> {'leave'|@translate}</label>
       / {'set to'|@translate}
-      <label><input type="radio" name="show_nb_hits" value="true">{'Yes'|@translate}</label>
-      <label><input type="radio" name="show_nb_hits" value="false">{'No'|@translate}</label>
+      <label><input type="radio" name="show_nb_hits" value="true" />{'Yes'|@translate}</label>
+      <label><input type="radio" name="show_nb_hits" value="false" />{'No'|@translate}</label>
     </td>
   </tr>
 
   <tr>
     <td>{'maxwidth'|@translate}</td>
     <td>
-      <label><input type="radio" name="maxwidth_action" value="leave" checked="checked"> {'leave'|@translate}</label>
-      <label><input type="radio" name="maxwidth_action" value="unset"> {'unset'|@translate}</label>
-      <label><input type="radio" name="maxwidth_action" value="set" id="maxwidth_action_set"> {'set to'|@translate}</label>
+      <label><input type="radio" name="maxwidth_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
+      <label><input type="radio" name="maxwidth_action" value="unset" /> {'unset'|@translate}</label>
+      <label><input type="radio" name="maxwidth_action" value="set" id="maxwidth_action_set" /> {'set to'|@translate}</label>
       <input onmousedown="document.getElementById('maxwidth_action_set').checked = true;"
-             type="text" size="4" maxlength="4" name="maxwidth" value="{$MAXWIDTH}">
+             type="text" size="4" maxlength="4" name="maxwidth" value="{$MAXWIDTH}" />
     </td>
   </tr>
 
@@ -287,11 +289,11 @@
   <tr>
     <td>{'maxheight'|@translate}</td>
     <td>
-      <label><input type="radio" name="maxheight_action" value="leave" checked="checked"> {'leave'|@translate}</label>
-      <label><input type="radio" name="maxheight_action" value="unset"> {'unset'|@translate}</label>
-      <label><input type="radio" name="maxheight_action" value="set" id="maxheight_action_set"> {'set to'|@translate}</label>
+      <label><input type="radio" name="maxheight_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
+      <label><input type="radio" name="maxheight_action" value="unset" /> {'unset'|@translate}</label>
+      <label><input type="radio" name="maxheight_action" value="set" id="maxheight_action_set" /> {'set to'|@translate}</label>
       <input onmousedown="document.getElementById('maxheight_action_set').checked = true;"
-             type="text" size="4" maxlength="4" name="maxheight" value="{$MAXHEIGHT}">
+             type="text" size="4" maxlength="4" name="maxheight" value="{$MAXHEIGHT}" />
     </td>
   </tr>
 
@@ -302,13 +304,13 @@
 
 <p>
   {'target'|@translate}
-  <label><input type="radio" name="target" value="all"> {'all'|@translate}</label>
-  <label><input type="radio" name="target" value="selection" checked="checked"> {'selection'|@translate}</label>
+  <label><input type="radio" name="target" value="all" /> {'all'|@translate}</label>
+  <label><input type="radio" name="target" value="selection" checked="checked" /> {'selection'|@translate}</label>
 </p>
 
 <p>
-  <input class="submit" type="submit" value="{'Submit'|@translate}" name="pref_submit" {$TAG_INPUT_ENABLED}>
-  <input class="submit" type="reset" value="{'Reset'|@translate}" name="pref_reset">
+  <input class="submit" type="submit" value="{'Submit'|@translate}" name="pref_submit" {$TAG_INPUT_ENABLED} />
+  <input class="submit" type="reset" value="{'Reset'|@translate}" name="pref_reset" />
 </p>
 
 </form>
diff --git a/admin/user_list.php b/admin/user_list.php
index 0461c83ba..454c96d29 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -185,19 +185,38 @@ $page['direction_items'] = array(
 
 if (isset($_POST['submit_add']))
 {
-  $page['errors'] = register_user(
-    $_POST['login'], $_POST['password'], $_POST['email'], false);
-
-  if (count($page['errors']) == 0)
-  {
-    array_push(
-      $page['infos'],
-      sprintf(
-        l10n('user "%s" added'),
-        $_POST['login']
-        )
-      );
-  }
+	if(empty($_POST['password']))
+	{
+		array_push($page['errors'], l10n('Password is missing'));
+	}
+	else if(empty($_POST['password_conf']))
+	{
+		array_push($page['errors'], l10n('Password confirmation is missing'));
+	}
+	else if(empty($_POST['email']))
+	{
+		array_push($page['errors'], l10n('Email address is missing'));
+	}
+	else if ($_POST['password'] != $_POST['password_conf'])
+	{
+		array_push($page['errors'], l10n('Password confirmation error'));
+	}
+	else
+	{
+  		$page['errors'] = register_user(
+    		$_POST['login'], $_POST['password'], $_POST['email'], false);
+
+		if (count($page['errors']) == 0)
+  		{
+    		array_push(
+    			$page['infos'],
+    			sprintf(
+    				l10n('user "%s" added'),
+    				$_POST['login']
+    			)
+    		);
+  		}
+	}
 }
 
 // +-----------------------------------------------------------------------+
@@ -589,7 +608,7 @@ $navbar = create_navigation_bar(
   $conf['users_page']
   );
 
-$template->assign('navbar', $navbar);
+$template->assign('NAVBAR', $navbar);
 
 // +-----------------------------------------------------------------------+
 // |                               user list                               |
@@ -658,12 +677,12 @@ foreach ($visible_user_list as $local_user)
       'U_PERM' => $perm_url.$local_user['id'],
       'USERNAME' => $local_user['username']
         .($local_user['id'] == $conf['guest_id']
-          ? '<br>['.l10n('is_the_guest').']' : '')
+          ? '<BR />['.l10n('is_the_guest').']' : '')
         .($local_user['id'] == $conf['default_user_id']
-          ? '<br>['.l10n('is_the_default').']' : ''),
+          ? '<BR />['.l10n('is_the_default').']' : ''),
       'STATUS' => l10n('user_status_'.
         $local_user['status']).(($local_user['adviser'] == 'true')
-        ? '<br>['.l10n('adviser').']' : ''),
+        ? '<BR />['.l10n('adviser').']' : ''),
       'EMAIL' => get_email_address_as_display_text($local_user['email']),
       'GROUPS' => $groups_string,
       'PROPERTIES' => implode( ', ', $properties),
diff --git a/language/de_DE/admin.lang.php b/language/de_DE/admin.lang.php
index 49752dd08..83c7b495e 100644
--- a/language/de_DE/admin.lang.php
+++ b/language/de_DE/admin.lang.php
@@ -76,7 +76,7 @@ $lang['Current name'] = 'Derzeitiger Name';
 $lang['Database'] = 'Datenbank';
 $lang['Deactivate'] = 'Deaktiviere';
 $lang['Delete Representant'] = 'Lösche Vorschaubild';
-$lang['Delete selected tags'] = 'Lösche markierte Tags';
+$lang['Delete selected tags'] = 'Lösche markierte tags';
 $lang['Delete selected users'] = 'Lösche markierte Benutzer';
 $lang['Deletions'] = 'Löschungen';
 $lang['Deny selected groups'] = 'Ausgewählte Gruppen ablehnen';
@@ -86,8 +86,8 @@ $lang['Display options'] = 'Anzeigeeinstellungen';
 $lang['Dissociated'] = 'ist nicht verlinkt';
 $lang['Does not represent'] = 'Ist nicht Vorschaubild für diese Kategirien';
 $lang['Edit all picture informations'] = 'Bearbeite alle Bildinformationen';
-$lang['Edit selected tags'] = 'Bearbeite markierte Tags';
-$lang['Edit tags'] = 'Bearbeite Tags';
+$lang['Edit selected tags'] = 'Bearbeite markierte tags';
+$lang['Edit tags'] = 'Bearbeite tags';
 $lang['Elements'] = 'Elemente';
 $lang['Email administrators when a new user registers'] = 'sende eine E-Mail an den(die) Adminstrator(en) wenn sich ein neuer Benutzer registriert hat';
 $lang['Email administrators when a valid comment is entered'] = 'sende eine E-Mail an den(die) Adminstrator(en) wenn ein Kommentar hinterlassen wurde';
@@ -110,7 +110,7 @@ $lang['Install'] = 'Installiere';
 $lang['Link all category elements to a new category'] = 'Verlinkte alle Kategorieelemente zu einer neuen Kategorie';
 $lang['Link all category elements to some existing categories'] = 'Verlinkte alle Kategorieelemente zu einer bestehenden Kategorie';
 $lang['Linked categories'] = 'Verlinkte Kategorie';
-$lang['Lock gallery'] = 'Schliesse die Bildergalerie für Wartungsarbeiten';
+$lang['Lock gallery'] = 'SCHLIESSE DIE BILDERGALERIE     VORSICHT, Aussperrgefahr!!!';
 $lang['Maintenance'] = 'Wartung';
 $lang['Manage permissions for a category'] = 'Befugnisse für Kategorien verwalten';
 $lang['Manage permissions for group "%s"'] = 'Befugnisse verwalten für die Gruppe "%s"';
@@ -123,12 +123,12 @@ $lang['Move'] = 'Bewege';
 $lang['Name'] = 'Name';
 $lang['New name'] = 'Neuer Name';
 $lang['New parent category'] = 'Neue Oberkategorie';
-$lang['New tag'] = 'Neuer Tag';
-$lang['No tag defined. Use Administration>Pictures>Tags'] = 'Kein Tag definiert. Benutze Verwaltung > Elemente > Tags';
+$lang['New tag'] = 'Neuer tag';
+$lang['No tag defined. Use Administration>Pictures>Tags'] = 'Kein tag definiert. Benutze Verwaltung > Elemente > Tags';
 $lang['Number of comments per page'] = 'Anzahl von Kommentaren pro Seite';
 $lang['Number of rates'] = 'Anzahl von Bewertungen';
 $lang['Number of thumbnails to create'] = 'Anzahl von zu erstellenden Vorschaubildern';
-$lang['Only private categories are listed'] = 'Nur private Kategorien aufgeführt';
+$lang['Only private categories are listed'] = 'Nur provate Kategorien aufgeführt';
 $lang['Operating system'] = 'Betriebssystem';
 $lang['Options'] = 'Optionen';
 $lang['Order alphanumerically'] = 'Ordne Alphanumerisch';
@@ -138,12 +138,12 @@ $lang['Parent category'] = 'übergeordnete Kategorie';
 $lang['Path'] = 'Pfad';
 $lang['Permalink'] = 'Permalink';
 $lang['Permalink_%s_histo_used_by_%s'] = 'Permalink %s wurde vorher Kategorie %s zugewiesen. Lösche ihn zuerst aus der History';
-$lang['Permalink_name_rule'] = 'Ein Permalink darf nur aus folgenden Zeichen bestehen: a-z, A-Z, 0-9, "-" or "_". Er darf nicht nur aus Zahlen bestehen oder mit einer Zahl beginnen mit einem darauffolgenden "-"';
+$lang['Permalink_name_rule'] = 'Ein Permalink darf nur aus folgenden Zeichen bestehen: a-z, A-Z, 0-9, "-" or "_". Er darf nicht nur aus Zahlen bstehen oder mit einer Zal beginnen mit einem darauffolgenden "-"';
 $lang['Permalink %s is already used by category %s'] = 'Permalink %s wird zur Zeit von Kategorie %s benutzt';
-$lang['Permalink history'] = 'Permalink-Historie';
+$lang['Permalink history'] = 'Permalink history';
 $lang['Permalinks'] = 'Permalinks';
 $lang['Permission denied'] = 'Zugriff verweigern';
-$lang['Permission granted thanks to a group'] = 'Benutzern durch Zugehörigkeit in einer Gruppe Zugriff erlaubt';
+$lang['Permission granted thanks to a group'] = 'Durch Zugehörigkeit einer Gruppe gewährte Erlaubnis';
 $lang['Permission granted'] = 'Zugriff erlaubt';
 $lang['Picture informations updated'] = 'Elementinformationen aktualisiert';
 $lang['Plugins'] = 'Plugins';
@@ -161,7 +161,7 @@ $lang['Representation of categories'] = 'Galerievorschaubild';
 $lang['Representative'] = 'Vorschaubild';
 $lang['Represents'] = 'Ist Vorschaubild für diese Kategorien';
 $lang['Save order'] = 'Reihenfolge speichern';
-$lang['Save to permalink history'] = 'Speichere in der Permalink-Historie';
+$lang['Save to permalink history'] = 'Speichere in der permalink history';
 $lang['Select at least one category'] = 'Mindestens eine Kategorie auswählen';
 $lang['Select at least one picture'] = 'Mindestens ein Element auswählen';
 $lang['Select at least one user'] = 'Mindestens einen Benutzer auswählen';
@@ -206,7 +206,7 @@ $lang['cat_lock_title'] = 'Kategorie schließen';
 $lang['cat_private'] = 'Private Kategorie';
 $lang['cat_public'] = 'öffentliche Kategorie';
 $lang['cat_representant'] = 'Bestimme ein neues zufälliges Vorschaubild';
-$lang['cat_security'] = 'Öffentlich / Privat';
+$lang['cat_security'] = 'öffentlich / Privat';
 $lang['cat_status_title'] = 'Berechtigungen für ausgewählte Kategorien verwalten';
 $lang['cat_upload_title'] = 'Wähle Uploadkategorie aus';
 $lang['cat_virtual_added'] = 'Virtuelle Kategorie hinzugefügt';
@@ -214,7 +214,7 @@ $lang['cat_virtual_deleted'] = 'Virtuelle Kategorie gelöscht';
 $lang['category'] = 'Kategorie';
 $lang['conf_access'] = 'Zugangsart';
 $lang['conf_comments_title'] = 'Benutzerkommentare';
-$lang['conf_confirmation'] = 'Änderungen wurden gespeichert';
+$lang['conf_confirmation'] = 'änderungen wurden gespeichert';
 $lang['conf_display'] = 'Standartanzeige';
 $lang['conf_history_title'] = 'Statistik';
 $lang['conf_gallery_url_error'] = 'Die URL der Galerie ist falsch.';
@@ -352,7 +352,7 @@ $lang['remote_site_local_found'] = 'Listing.xml lokalen Datei gefunden wurde fü
 $lang['remote_site_local_update'] = 'lesen listing.xml lokalen und zu aktualisieren';
 $lang['remote_site_test'] = 'Test';
 $lang['remote_site_test_hint'] = 'testen Remote-Site';
-$lang['remote_site_uncorrect_url'] = 'Die URL einer Remote-Site muss mit "http://" oder "https://" beginnen und darf nur diese Zeichen enthalten "/", "a-zA-Z0-9", "-" oder "_"';
+$lang['remote_site_uncorrect_url'] = 'Die URL einer Remote-Site muss mit "http://" oder "https" und darf als Zeichen, dass "/", "a-zA-Z0-9", "-" oder "_"';
 $lang['remove tags'] = 'Tags entfernen';
 $lang['repair and optimize database'] = 'Reparieren und Optimierung der Datenbank';
 $lang['selection'] = 'Auswahl';
@@ -365,7 +365,7 @@ $lang['site_delete'] = 'löschen';
 $lang['site_delete_hint'] = 'Entfernen dieser Seite und alle damit zusammenhängenden Daten';
 $lang['site_deleted'] = 'gelöscht';
 $lang['site_err'] = 'ein Fehler ist aufgetreten';
-$lang['site_err_remote_file_not_found'] = 'Die Datei create_listing_file.php wurde nicht gefunden auf der Remote-Seite';
+$lang['site_err_remote_file_not_found'] = 'Die Datei create_listing_file.php wurde nicht gefunden auf dem Remote-Standort';
 $lang['site_local'] = 'Lokal';
 $lang['site_remote'] = 'Remote -';
 $lang['site_synchronize'] = 'synchronisieren';
@@ -395,7 +395,7 @@ $lang['tn_err_width'] = 'die Breite muss größer sein als';
 $lang['tn_format'] = 'für das Format der Datei';
 $lang['tn_no_missing'] = 'Keine Miniaturansicht fehlt';
 $lang['tn_no_support'] = 'Bild nicht verfügbar oder wird nicht unterstützt';
-$lang['tn_params_GD'] = 'Version von GD Library';
+$lang['tn_params_GD'] = 'Version von GD';
 $lang['tn_params_title'] = 'Einstellung der Miniaturisierung';
 $lang['tn_results_gen_time'] = 'generiert in';
 $lang['tn_results_title'] = 'Ergebnis der Verkleinerung';
@@ -479,7 +479,7 @@ $lang['user'] = 'Benutzer';
 $lang['IP'] = 'IP';
 $lang['image'] = 'Bilder';
 $lang['section'] = 'Abschnitt';
-$lang['tags'] = 'Tags';
+$lang['tags'] = 'tags';
 $lang['conf_history_guest'] = 'Speichere Seitenaufrufe von Gästen';
 $lang['conf_history_user'] = 'Speichere Seitenaufrufe pro Benutzer';
 $lang['conf_history_admin'] = 'Speichere auch Seitenaufrufe des Administrators';
@@ -587,15 +587,15 @@ $lang['plugins_archive_error'] = 'Kann das Archiv nicht lesen oder entpacken.';
 $lang['plugins_extract_error'] = 'Fehler beim entpacken des Archives(%s).';
 $lang['plugins_check_chmod'] = 'überprüfen Sie die Berechtigungen des Ordners "Plugins" und dessen Unterordner (CHMOD).';
 $lang['plugins_server_error'] = 'Es konnte keine Verbindung zum Server hergestellt werden.';
-$lang['Purge compiled templates'] = 'Löschen der kompilierten Templates';
+$lang['Purge compiled templates'] = 'Löschen kompilierten Templates';
 $lang['Caddie is currently empty'] = 'Der Sammelkorb ist derzeit leer.';
 $lang['DEMO'] = 'Demo';
 $lang['HOME'] = 'Home Piwigo';
 $lang['FORUM'] = 'Support';
 $lang['BUGS'] = 'Bugs';
 $lang['EXTENSIONS'] = 'Erweiterungen';
-$lang['WIKI / DOC'] = 'WIKI / Dokumentation';
-$lang['conf_upload_title'] = 'Upload';
+$lang['WIKI / DOC'] = 'Dokumentation';
+$lang['conf_upload_title'] = 'Download';
 $lang['Show upload link every time'] = 'Den Uploadlink immer anzeigen';
 $lang['User access level to upload'] = 'Benutzer dürfen Bilder hochladen';
 $lang['ACCESS_0'] = 'Frei';
@@ -613,11 +613,11 @@ $lang['c13y_version_correction'] = 'Sie müssen Ihr System zu aktualisieren, um
 $lang['Deleted on'] = 'Gelöscht am';
 $lang['Last hit'] =  'Letzter Zugriff';
 $lang['Hits'] = 'Verwendungen';
-$lang['GD library is missing'] = 'die GD-Library ist nicht auf dem Server installiert, bitte frage den Administrator oder Provider.';
+$lang['GD library is missing'] = 'die GD-Library ist nicht vorhanden';
 $lang['conf_extents'] = 'Templates (Modelle)';
-$lang['extend_for_templates'] = 'Erweitere für Templates';
-$lang['Replacement of original templates'] = 'Ersetzte originale Templates';
-$lang['Replacers'] = 'Veränderte (Templates geändert)';
+$lang['extend_for_templates'] = 'Extend für Vorlagen';
+$lang['Replacement of original templates'] = 'Anstelle der ursprünglichen Templates von Template-Ordner an des Template-Erweiterung';
+$lang['Replacers'] = 'Stellvertreter (Templates geändert)';
 $lang['Original templates'] = 'Originales Templates';
 $lang['Optional URL keyword'] = 'Optionale Parameter in der URL';
 $lang['Templates recorded.'] = 'Die Konfiguration der Templates gespeichert wurde.';
@@ -643,14 +643,18 @@ $lang['Delete selected photos'] = 'Fotos löschen';
 $lang['%d photo was deleted'] = '%d Foto wurde gelöscht';
 $lang['%d photos were deleted'] = '%d Fotos wurden gelöscht';
 $lang['Bound template'] = 'Verbundenes Template';
-$lang['Downloads'] = 'Downloads';
-$lang['Released on'] = 'Veröffentlicht am';
-$lang['Number of downloads'] = 'Anzahl der Downloads';
+/* TODO */ $lang['Downloads'] = 'Downloads';
+/* TODO */ $lang['Released on'] = 'Released on';
+/* TODO */ $lang['Number of downloads'] = 'Number of downloads';
 // --------- Starting below: New or revised $lang ---- from Colibri
-$lang['Piwigo Announcements Newsletter'] = 'Piwigo Newsletter';
-$lang['Subscribe to Piwigo Announcements Newsletter'] = 'Bleibe in Verbindung mit dem, abonniere den Piwigo Newsletter. Du bekommst eine E-Mail wenn eine neue Version verfügbar ist (manchmal wird ein Bug gefixt, der die Sicherheit der Piwigo erhöht, es ist dann wichtig, das Upgrade zu installieren) und wenn es wichtige Ereignisse rund um das Projekt gibt. Es sind nur ein paar E-Mails im Jahr.';
-$lang['Subscribe %s'] = 'Abonnieren %s';
-$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Abonniere %s zum englischen Piwigo Newsletter';
-$lang['Purge search history'] = 'Lösche die Such-Historie';
-$lang['Hide'] = 'Verstecken';
+/*TODO*/$lang['Piwigo Announcements Newsletter'] = 'Piwigo Announcements Newsletter';
+/*TODO*/$lang['Subscribe to Piwigo Announcements Newsletter'] = 'Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.';
+/*TODO*/$lang['Subscribe %s'] = 'Subscribe %s';
+/*TODO*/$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Subscribe %s to Piwigo English Announcements Newsletter';
+/*TODO*/$lang['Purge search history'] = 'Purge search history';
+/*TODO*/$lang['Hide'] = 'Hide';
+$lang['Password is missing'] = 'Passwort fehlt. Bitte geben Sie das Passwort ein.';
+$lang['Password confirmation is missing'] = 'Passwort-Bestätigung fehlt. Bitte bestätigen Sie die gewählte Passwort ein.';
+$lang['Email address is missing'] = 'E-Mail-Adresse fehlt. Bitte geben Sie eine E-Mail-Adresse.';
+$lang['Password confirmation error'] = 'Passwortbestätigung Fehler.';
 ?>
\ No newline at end of file
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 9357321c0..e3f856001 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -647,11 +647,15 @@ $lang['Bound template'] = 'Bound template';
 $lang['Downloads'] = 'Downloads';
 $lang['Released on'] = 'Released on';
 $lang['Number of downloads'] = 'Number of downloads';
-// --------- Starting below: New or revised $lang ---- from Colibri (2.1)
+// --------- Starting below: New or revised $lang ---- from Colibri
 $lang['Piwigo Announcements Newsletter'] = 'Piwigo Announcements Newsletter';
 $lang['Subscribe to Piwigo Announcements Newsletter'] = 'Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.';
 $lang['Subscribe %s'] = 'Subscribe %s';
 $lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Subscribe %s to Piwigo Announcements Newsletter';
 $lang['Purge search history'] = 'Purge search history';
 $lang['Hide'] = 'Hide';
+$lang['Password is missing'] = 'Password is missing. Please enter the password.';
+$lang['Password confirmation is missing'] = 'Password confirmation is missing. Please confirm the chosen password.';
+$lang['Email address is missing'] = 'Email address is missing. Please specify an email address.';
+$lang['Password confirmation error'] = 'Password confirmation error.';
 ?>
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index 5d3389671..8eb33e851 100644
--- a/language/es_ES/admin.lang.php
+++ b/language/es_ES/admin.lang.php
@@ -651,4 +651,8 @@ $lang['Subscribe %s'] = 'Abonar a la newsletter inglesa %s';
 $lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Abonar %s a la newsletter Piwigo';
 $lang['Purge search history'] = 'Purgar la reseña histórica de las búsquedas';
 $lang['Hide'] = 'Enmascarar';
+$lang['Password is missing'] = 'Contraseña falta. Por favor, introduzca la contraseña.';
+$lang['Password confirmation is missing'] = 'Falta la confirmación de la contraseña. Por favor, confirme la contraseña que elija.';
+$lang['Email address is missing'] = 'Dirección de correo electrónico está desaparecido. Por favor, especifica una dirección de correo electrónico.';
+$lang['Password confirmation error'] = 'Error de Confirmación de la contraseña.';
 ?>
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 91eb380fb..26d5104e0 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -71,10 +71,6 @@ $lang['Category elements associated to the following categories: %s'] = 'Les él
 $lang['Check for upgrade failed for unknown reasons.'] = 'La vérification de la dernière version sur le serveur a échouée pour une raison inconnue.';
 $lang['Check for upgrade'] = 'Dernière version ?';
 $lang['Comments for all'] = 'Commentaires pour tous';
-$lang['Allow users to edit theirs owns comments'] = 'Autoriser les utilisateurs à modifier leurs propres commentaires';
-$lang['Allow users to delete theirs owns comments'] = 'Autoriser les utilisateurs à supprimer leurs propres commentaires';
-$lang['Email administrators when a comment is modified'] = 'Notifier les administrateurs quand un commentaire est modifié';
-$lang['Email administrators when a comment is deleted'] = 'Notifier les administrateurs quand un commentaire est supprimé';
 $lang['Controversy'] = 'Controverse';
 $lang['Current name'] = 'Nom courant';
 $lang['Database'] = 'Base de données';
@@ -650,11 +646,15 @@ $lang['Bound template'] = 'Template rattaché';
 $lang['Downloads'] = 'Téléchargements';
 $lang['Released on'] = 'Ajouté le';
 $lang['Number of downloads'] = 'Nombre de téléchargements';
-// --------- Starting below: New or revised $lang ---- from Colibri (2.1)
+// --------- Starting below: New or revised $lang ---- from Colibri
 $lang['Piwigo Announcements Newsletter'] = 'Newsletter Piwigo';
 $lang['Subscribe to Piwigo Announcements Newsletter'] = 'Restez en contact avec le projet Piwigo, abonnez-vous à la newsletter. Vous recevrez un email lorsqu\'une nouvelle version sera disponible (parfois un bug de sécurité est corrigé, il est important d\'être au courant et de mettre à jour) ou qu\'un événement majeur surviendra sur le projet. Seulement quelques messages par an.';
 $lang['Subscribe %s'] = 'Abonner %s';
 $lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Abonner %s à la newsletter Piwigo';
 $lang['Purge search history'] = 'Purger l\'historique des recherches';
 $lang['Hide'] = 'Masquer';
+$lang['Password is missing'] = 'Le mot de passe manque. Veuillez saisir le mot de passe.';
+$lang['Password confirmation is missing'] = 'La confirmation du mot de passe manque. Veuillez confirmer le mot de passe choisi.';
+$lang['Email address is missing'] = 'L\'adresse email manque. Veuillez spécifier une adresse email.';
+$lang['Password confirmation error'] = 'Erreur de confirmation du mot de passe.';
 ?>
diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php
index 8273c733a..791a90e88 100644
--- a/language/fr_FR/common.lang.php
+++ b/language/fr_FR/common.lang.php
@@ -160,7 +160,6 @@ $lang['comment_to_validate'] = 'Un administrateur doit valider votre commentaire
 $lang['comment_user_exists'] = 'Ce nom d\'utilisateur est déjà pris';
 $lang['comments'] = 'Commentaires';
 $lang['comments_add'] = 'Ajouter un commentaire';
-$lang['Edit a comment'] = 'Editer un commentaire';
 $lang['created after %s (%s)'] = 'créée après le %s (%s)';
 $lang['created before %s (%s)'] = 'créée avant le %s (%s)';
 $lang['created between %s (%s) and %s (%s)'] = 'créée entre le %s (%s) et le %s (%s)';
@@ -259,7 +258,7 @@ $lang['recent_period'] = 'Période récente';
 $lang['recent_pics_cat'] = 'Images récentes';
 $lang['recent_pics_cat_hint'] = 'afficher les images les plus récentes';
 $lang['redirect_msg'] = 'Redirection...';
-$lang['reg_err_login1'] = 'S\'il vous plaît, entrer un nom utilisateur';
+$lang['reg_err_login1'] = 'S\'il vous plaît, entrez un nom utilisateur';
 $lang['reg_err_login2'] = 'le nom utilisateur ne doit pas se terminer par un espace';
 $lang['reg_err_login3'] = 'le nom utilisateur ne doit pas commencer par un espace';
 $lang['reg_err_login5'] = 'ce nom utilisateur est déjà pris';
@@ -366,7 +365,4 @@ $lang['group by letters'] = 'regrouper par lettres';
 $lang['letters'] = 'lettres';
 $lang['show tag cloud'] = 'montrer le nuage de tags';
 $lang['cloud'] = 'nuage';
-// --------- Starting below: New or revised $lang ---- from Colibri (2.1)
-$lang['del_all_favorites_hint'] = 'supprimer toutes les images de vos favoris';
-$lang['Sent by'] = 'Envoyé par';
 ?>
diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php
index b1818ee0e..ee9d20f54 100644
--- a/language/it_IT/admin.lang.php
+++ b/language/it_IT/admin.lang.php
@@ -193,7 +193,7 @@ $lang['Webmaster cannot be deleted'] = 'Il webmaster non può essere cancellato'
 $lang['You are running on development sources, no check possible.'] = 'State lavorando con una versione di sviluppo, impossibile verificare l\'ultima versione.';
 $lang['You cannot delete your account'] = 'Non potete cancellare il vostro conto utente';
 $lang['You cannot move a category in its own sub category'] = 'Non potete spostare una categoria in una sua sottocategoria.';
-$lang['You need to confirm deletion'] = 'Dovete confermare la soppressione';
+$lang['You need to confirm deletion'] = 'Dovete confermare la cancellazione';
 $lang['add tags'] = 'aggiungere i tags';
 $lang['adviser'] = 'Consigliere';
 $lang['associate to category'] = 'associare la categoria';
@@ -312,7 +312,7 @@ $lang['nbm_send_mode'] = 'Invio';
 $lang['nbm_send_options'] = 'Opzioni';
 $lang['nbm_send_submit'] = 'Inviare';
 $lang['nbm_subscribe_col'] = 'Iscritti';
-$lang['nbm_subscribe_mode'] = 'Iscrizione';
+$lang['nbm_subscribe_mode'] = 'Iscriviti';
 $lang['nbm_title_param'] = 'Parametri';
 $lang['nbm_title_send'] = 'Selezionare gli invii';
 $lang['nbm_title_subscribe'] = 'Iscrivere/Cancellare utenti';
@@ -328,7 +328,7 @@ $lang['nbm_users_change_enabled_updated_data_count'] = '%d utenti aggiornati.';
 $lang['nbm_user_not_change_enabled_false'] = 'L\'utente %s [%s] non è stato cancellato dalla lista degli iscritti.';
 $lang['nbm_user_not_change_enabled_true'] = 'L\'utente %s [%s] non è stato aggiunto alla lista degli iscritti.';
 $lang['nbm_user_x_added'] = 'Utente %s [%s] aggiunto.';
-$lang['nbm_warning_subscribe_unsubscribe'] = 'Attenzione: la sottoscrizione o la soppressione invierà un\'email agli utenti in questione';
+$lang['nbm_warning_subscribe_unsubscribe'] = 'Attenzione: la sottoscrizione o la cancellazione invierà un\'email agli utenti in questione';
 $lang['nbm_send_html_mail'] = 'Invio dell\'email in formato HTML';
 $lang['nbm_send_recent_post_dates'] = 'Includere le ultime immagini per data';
 $lang['nbm_info_send_recent_post_dates'] = 'Disponibile unicamente con il formato HTML';
@@ -364,7 +364,7 @@ $lang['site_created'] = 'creato';
 $lang['site_delete'] = 'cancellare';
 $lang['site_delete_hint'] = 'cancellare questo sito e tutti gli elementi ad esso connessi';
 $lang['site_deleted'] = 'cancellato';
-$lang['site_err'] = 'Si è verificato un\'errore';
+$lang['site_err'] = 'Si è verificato un errore';
 $lang['site_err_remote_file_not_found'] = 'file "create_listing_file.php" introvabile sul sito remoto';
 $lang['site_local'] = 'Locale';
 $lang['site_remote'] = 'Remoto';
@@ -431,7 +431,7 @@ $lang['update_nb_del_categories'] = 'categorie eliminate dalla base dati';
 $lang['update_nb_del_elements'] = 'elementi eliminati dalla base dati';
 $lang['update_nb_elements_metadata_available'] = 'immagini in coda per la sincronizzazione dei metadati';
 $lang['update_nb_elements_metadata_sync'] = 'informazioni sugli elementi sincronizzate con i metadati';
-$lang['update_nb_errors'] = 'Si sono verificati errori durante la sincronizzazione';
+$lang['update_nb_errors'] = 'errori durante la sincronizzazione';
 $lang['update_nb_new_categories'] = 'categorie aggiunte nella base dati';
 $lang['update_nb_new_elements'] = 'elementi aggiunti nella base dati';
 $lang['update_nb_upd_elements'] = 'elementi aggiornati nella base dati';
@@ -517,7 +517,7 @@ $lang['c13y_Anomaly'] = 'Anomalia';
 $lang['c13y_Correction'] = 'Correzione';
 $lang['c13y_Automatic_correction'] = 'Correzione automatica';
 $lang['c13y_Impossible_automatic_correction'] = 'Correzione automatica impossibile';
-$lang['c13y_Correction_applied_success'] = 'Correzione applicata con successo';
+$lang['c13y_Correction_applied_success'] = 'Correzione applicata con sucesso';
 $lang['c13y_Correction_applied_error'] = 'Correzione applicata con errori';
 $lang['c13y_anomaly_count'] = 'individuata %d anomalia.';
 $lang['c13y_anomalies_count'] = 'individuate %d anomalie.';
@@ -578,16 +578,16 @@ $lang['plugins_delete'] = 'Cancellare';
 $lang['plugins_confirm_install'] = 'Siete sicuri di volere installare questo plugin?';
 $lang['plugins_confirm_delete'] = 'Siete sicuri di volere cancellare questo plugin?';
 $lang['plugins_confirm_upgrade'] = 'Siete sicuri di volere installare questo aggiornamento? Dovete verificare che questo aggiornamento non necessiti una disinstallazione.';
-$lang['plugins_upgrade_ok'] = '%s è stato aggiornato con successo.';
-$lang['plugins_install_ok'] = 'Il plugin è stato copiato con successo.';
-$lang['plugins_install_need_activate'] = 'Recatevi nella lista dei plugins per installarlo ed attivarlo.';
+$lang['plugins_upgrade_ok'] = '%s é stato aggiornato con successo.';
+$lang['plugins_install_ok'] = 'Il plugin é stato copiato con sucesso.';
+$lang['plugins_install_need_activate'] = 'Recatevi nella lista dei plugins per installarlo e attivarlo.';
 $lang['plugins_temp_path_error'] = 'È impossibile creare un file temporaneo.';
 $lang['plugins_dl_archive_error'] = 'È impossibile recuperare l\'archivio.';
 $lang['plugins_archive_error'] = 'È impossibile leggere o di eseguire l\'archivio.';
-$lang['plugins_extract_error'] = 'Si è verificato un\'errore durante l\'esecuzione del file (%s).';
+$lang['plugins_extract_error'] = 'Un errore è avvenuto durante l\'esecuzione del file (%s).';
 $lang['plugins_check_chmod'] = 'Verificate i permessi della cartella "plugins" et delle sue sotto cartelle (CHMOD).';
-$lang['plugins_server_error'] = 'Non è possibile connettersi al server.';
-$lang['Purge compiled templates'] = '"Ripulire" i templates compilati';
+$lang['plugins_server_error'] = 'Non é possibile connettersi al server.';
+$lang['Purge compiled templates'] = 'Spurgare i templates compilati';
 $lang['Caddie is currently empty'] = 'Il cestino è attualente vuoto.';
 $lang['DEMO'] = 'Demo';
 $lang['HOME'] = 'Home Piwigo';
@@ -637,9 +637,9 @@ $lang['ranks'] = 'rangs';
 $lang['Drag to re-order'] = 'Clicca e trascina per riorganizzare';
 $lang['Unable to retrieve server informations since allow_url_fopen is disabled.'] = 'È impossibile connettersi al server perche la funzione allow_url_fopen è disattivata.';
 $lang['Quick Local Synchronization'] = 'Sincronizzazione rapida';
-$lang['No photo can be deleted'] = 'Nessuna foto può essere eliminata';
+$lang['No photo can be deleted'] = 'Nessuna foto può essere soppressa';
 $lang['Note: Only deletes photos added with pLoader'] = 'Nota: solo le foto agiunte con pLoader possono essere rimosse';
-$lang['Delete selected photos'] = 'Sopprimere le foto';
+$lang['Delete selected photos'] = 'Cancellare le foto';
 $lang['%d photo was deleted'] = '%d foto cancellata';
 $lang['%d photos were deleted'] = '%d foto cancellate';
 $lang['Bound template'] = 'Template legato';
@@ -648,9 +648,13 @@ $lang['Released on'] = 'Aggiunto il';
 $lang['Number of downloads'] = 'Totale dei downloads';
 // --------- Starting below: New or revised $lang ---- from Colibri
 $lang['Piwigo Announcements Newsletter'] = 'Newsletter Piwigo';
-$lang['Subscribe to Piwigo Announcements Newsletter'] = 'Rimanete in contatto con il progetto abbonandovi alla newsletter. Riceverete un mail ogni volta che una nuova versione sarà disponibile (avvolte un bug di sicurezza è corretto, è importante esserne al corrente ed aggiornare il prodotto) o che soppravvenga un evento importante sul progetto. Solo qualche mail all\'anno';
+$lang['Subscribe to Piwigo Announcements Newsletter'] = 'Rimanete in contatto con il progetto con il progetto Piwigo, abbonatevi alla newsletter. Riceverete un mail ad ogni volta che una nuova versione sarà disponibile (avvolte un bug di sicurezza è corretto, è importante esserne al corrente e d\'aggiornare il prodotto) o che un evento importante sorga sul progetto. Solo qualche mail all\'anno';
 $lang['Subscribe %s'] = 'Abbonare %s';
 $lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Abbonare %s alla newsletter Piwigo';
-$lang['Purge search history'] = '"Ripulire" la cronologia delle ricerche';
-$lang['Hide'] = 'Nascondere';
+/*TODO*/$lang['Purge search history'] = 'Purge search history';
+/*TODO*/$lang['Hide'] = 'Hide';
+$lang['Password is missing'] = 'Password è mancante. Si prega di inserire la password.';
+$lang['Password confirmation is missing'] = 'Password di conferma è mancante. Si prega di confermare la password prescelta.';
+$lang['Email address is missing'] = 'Indirizzo e-mail è mancante. Si prega di specificare un indirizzo email.';
+/*TODO*/$lang['Password confirmation error'] = 'Password confirmation error.';
 ?>
diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index c3aee9f15..6b38fe1c1 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -507,7 +507,6 @@ $lang['Hour'] = 'Uur';
 $lang['is_the_guest'] = 'gast';
 $lang['is_the_default'] = 'Standaard waarden';
 $lang['High filesize'] = 'Grote bestandsformaat';
-
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
 $lang['Guest cannot be deleted'] = 'Gast kan niet verwijderd worden';
 $lang['Default user cannot be deleted'] = 'Standaart gebruiker kan niet verwijderd worden';
@@ -552,97 +551,111 @@ $lang['Level 1'] = 'Contacten';
 $lang['Level 2'] = 'Vrienden';
 $lang['Level 4'] = 'Familie';
 $lang['Level 8'] = 'Admins';
-/* TODO */ $lang['c13y_maintenance'] = 'Reinitialize check integrity';
+$lang['c13y_maintenance'] = 'Herinitalizeer de integrieteitscontrole';
 $lang['Check all'] = 'Selecteer alles';
 $lang['Uncheck all'] = 'Deselecteer alles';
-/* TODO */ $lang['c13y_check_auto'] = 'Check automatic corrections';
+$lang['c13y_check_auto'] = 'Controleer de aoutomatische correcties';
 $lang['c13y_submit_correction'] = 'Pas geselecteerde correcties toe';
-/* TODO */ $lang['c13y_submit_ignore'] = 'Ignore selected anomalies';
-/* TODO */ $lang['c13y_submit_refresh'] = 'Refresh';
-/* TODO */ $lang['c13y_ignore_msg1'] = 'The anomaly will be ignored until next application version';
+$lang['c13y_submit_ignore'] = 'Negeer geselecteerde anomalieën';
+$lang['c13y_submit_refresh'] = 'Ververs';
+$lang['c13y_ignore_msg1'] = 'De anomalie worden genegeerd totdat de volgende versie';
 /* TODO */ $lang['c13y_ignore_msg2'] = 'Correction the anomaly will cancel the fact that it\'s ignored';
-/* TODO */ $lang['c13y_anomaly_ignored_count'] = '%d anomaly has been ignored.';
-/* TODO */ $lang['c13y_anomalies_ignored_count'] = '%d anomalies has been ignored.';
-/* TODO */ $lang['plugins_need_update'] = 'Plugins which need upgrade';
-/* TODO */ $lang['plugins_dontneed_update'] = 'Plugins up to date';
-/* TODO */ $lang['plugins_cant_check'] = 'Plugin versions can\'t be checked';
-/* TODO */ $lang['plugins_actual_version'] = 'Current<br>version';
-/* TODO */ $lang['plugins_new_version'] = 'Available<br>version';
-/* TODO */ $lang['plugins_auto_update'] = 'Automatic upgrade';
-/* TODO */ $lang['plugins_auto_install'] = 'Automatic installation';
-/* TODO */ $lang['plugins_download'] = 'Download file';
-/* TODO */ $lang['plugins_tab_list'] = 'Plugin list';
-/* TODO */ $lang['plugins_tab_update'] = 'Check for updates';
-/* TODO */ $lang['plugins_tab_new'] = 'Other plugins';
-/* TODO */ $lang['plugins_revisions'] = 'Last revisions';
-/* TODO */ $lang['plugins_delete'] = 'Delete';
-/* TODO */ $lang['plugins_confirm_delete'] = 'Are you sure you want to delete this plugin?';
-/* TODO */ $lang['plugins_confirm_install'] = 'Are you sure you want to install this plugin?';
-/* TODO */ $lang['plugins_confirm_upgrade'] = 'Are you sur to install this upgrade? You must verify if this version does not need uninstallation.';
-/* TODO */ $lang['plugins_upgrade_ok'] = '%s has been successfully upgraded.';
-/* TODO */ $lang['plugins_install_ok'] = 'Plugin has been successfully copied';
-/* TODO */ $lang['plugins_install_need_activate'] = 'You might go to plugin list to install and activate it.';
-/* TODO */ $lang['plugins_temp_path_error'] = 'Can\'t create temporary file.';
-/* TODO */ $lang['plugins_dl_archive_error'] = 'Can\'t download archive.';
-/* TODO */ $lang['plugins_archive_error'] = 'Can\'t read or extract archive.';
-/* TODO */ $lang['plugins_extract_error'] = 'An error occured during extraction (%s).';
-/* TODO */ $lang['plugins_check_chmod'] = 'Please check "plugins" folder and sub-folders permissions (CHMOD).';
-/* TODO */ $lang['plugins_server_error'] = 'Can\'t connect to server.';
-/* TODO */ $lang['Purge compiled templates'] = 'Purge compiled templates';
-/* TODO */ $lang['Caddie is currently empty'] = 'Caddie is currently empty';
-/* TODO */ $lang['DEMO'] = 'Demo';
-/* TODO */ $lang['HOME'] = 'Piwigo Home';
-/* TODO */ $lang['FORUM'] = 'Bijstand';
-/* TODO */ $lang['BUGS'] = 'Fouten';
-/* TODO */ $lang['EXTENSIONS'] = 'Extensies';
-/* TODO */ $lang['WIKI / DOC'] = 'Documentatie';
-/* TODO */ $lang['conf_upload_title'] = 'Upload';
-/* TODO */ $lang['Show upload link every time'] = 'Show upload link every time';
-/* TODO */ $lang['User access level to upload'] = 'User access level to upload';
-/* TODO */ $lang['ACCESS_0'] = 'Free access';
-/* TODO */ $lang['ACCESS_1'] = 'Access to all';
-/* TODO */ $lang['ACCESS_2'] = 'Access to subscribed';
-/* TODO */ $lang['ACCESS_3'] = 'Access to administrators';
-/* TODO */ $lang['ACCESS_4'] = 'Access to webmasters';
-/* TODO */ $lang['ACCESS_5'] = 'No access';
+$lang['c13y_anomaly_ignored_count'] = '%d anomalie is genegeerd.';
+$lang['c13y_anomalies_ignored_count'] = '%d anomalieen zijn genegeerd.';
+$lang['plugins_need_update'] = 'Plugins welke bijgewerkt moeten worden';
+$lang['plugins_dontneed_update'] = 'Plugins zijn recent';
+$lang['plugins_cant_check'] = 'Plugin versies kunnen niet gecontroleerd worden';
+$lang['plugins_actual_version'] = 'Huidige <br>versie';
+$lang['plugins_new_version'] = 'Beschikbare<br>versie';
+$lang['plugins_auto_update'] = 'Automatische upgrade';
+$lang['plugins_auto_install'] = 'Automatische installatie';
+$lang['plugins_download'] = 'Download bestand';
+$lang['plugins_tab_list'] = 'Plugin lijst';
+$lang['plugins_tab_update'] = 'Controleer op updates';
+$lang['plugins_tab_new'] = 'Andere plugins';
+$lang['plugins_revisions'] = 'Lastste revisie';
+$lang['plugins_delete'] = 'Verwijder';
+$lang['plugins_confirm_delete'] = 'Weet U het zeker dat u deze plugin wilt verwijderen?';
+$lang['plugins_confirm_install'] = 'Weet U het zeker dat u deze plugin wilt installeren?';
+$lang['plugins_confirm_upgrade'] = 'Weet U het zeker dat u deze plugin wilt bijwerken? Je moet controleren of deze versie niet gedeinstaleerd moet worden.';
+$lang['plugins_upgrade_ok'] = '%s zijn succesvol bijgewerkt.';
+$lang['plugins_install_ok'] = 'Plugin is succesvol gekopieerd';
+$lang['plugins_install_need_activate'] = 'Je zou kan gaan naar de lijst om de plugin te installeren en activeren.';
+$lang['plugins_temp_path_error'] = 'Kan geen tijdelijk bestand maken.';
+$lang['plugins_dl_archive_error'] = 'Kan geen archief downloaden.';
+$lang['plugins_archive_error'] = 'Kan het archief niet lezen of uitpakken.';
+$lang['plugins_extract_error'] = 'Een fout is opgetreden tijdens het uitpakken (%s).';
+$lang['plugins_check_chmod'] = 'Controleer de "plugins" folder en de sub-folders permissies (CHMOD).';
+$lang['plugins_server_error'] = 'Kan niet met de server verbinden.';
+$lang['Purge compiled templates'] = 'Purge samengestelde sjablonen';
+$lang['Caddie is currently empty'] = 'Caddie is momenteel leeg';
+$lang['DEMO'] = 'Demo';
+$lang['HOME'] = 'Piwigo Home';
+$lang['FORUM'] = 'Bijstand';
+$lang['BUGS'] = 'Fouten';
+$lang['EXTENSIONS'] = 'Extensies';
+$lang['WIKI / DOC'] = 'Documentatie';
+$lang['conf_upload_title'] = 'Upload';
+$lang['Show upload link every time'] = 'Show upload link altijd';
+$lang['User access level to upload'] = 'Gebruiker toegangsniveau om te uploaden';
+$lang['ACCESS_0'] = 'Gratis toegang';
+$lang['ACCESS_1'] = 'Toegang tot alles';
+$lang['ACCESS_2'] = 'Toegang tot geabbonnneerde';
+$lang['ACCESS_3'] = 'Toegang voor beheerders';
+$lang['ACCESS_4'] = 'Toegang voor webmasters';
+$lang['ACCESS_5'] = 'Geen toegang';
 $lang['A new version of Piwigo is available.'] = 'Een nieuwere versie van Piwigo is beschikbaar.';
 $lang['Piwigo Administration'] = 'Piwigo Beheer';
 $lang['Piwigo version'] = 'Piwigo versie';
 $lang['You are running the latest version of Piwigo.'] = 'Je hebt de laatste versie van Piwigo.';
-/* TODO */ $lang['c13y_version_anomaly'] = 'The version of %s [%s] installed is not compatible with the version required [%s]';
-/* TODO */ $lang['c13y_version_correction'] = 'You need to upgrade your system to take full advantage of the application else the application will not work correctly, or not at all';
-/* TODO */ $lang['Deleted on'] = 'Deleted on';
-/* TODO */ $lang['Last hit'] =  'Last hit';
-/* TODO */ $lang['Hits'] = 'Hits';
-/* TODO */ $lang['GD library is missing'] = 'GD library is missing';
-/* TODO */ $lang['conf_extents'] = 'Templates';
-/* TODO */ $lang['extend_for_templates'] = 'Extend for templates';
-/* TODO */ $lang['Replacement of original templates'] =
- 'Replacement of original templates by customized templates from template-extension subfolder';
-/* TODO */ $lang['Replacers'] = 'Replacers (customized templates)';
-/* TODO */ $lang['Original templates'] = 'Original templates';
-/* TODO */ $lang['Optional URL keyword'] = 'Optional URL keyword';
-/* TODO */ $lang['Templates recorded.'] = 'Templates configuration has been recorded.';
-/* TODO */ $lang['Optimizations completed'] = 'All optimizations have been successfully completed.';
-/* TODO */ $lang['Optimizations errors'] = 'Optimizations have been completed with some errors.';
+$lang['c13y_version_anomaly'] = 'De versie van %s [%s] welke geinstalleerd is is niet compatibel met de vereiste versie [%s]';
+$lang['c13y_version_correction'] = 'Je moet je systeem bijwerken om volledig gebruik te kunnen maken de software, anders kan de software mogelijk niet goed werken, of helemaal niet';
+$lang['Deleted on'] = 'Verwijderd op';
+$lang['Last hit'] =  'Laaste hit';
+$lang['Hits'] = 'Hits';
+$lang['GD library is missing'] = 'GD library is  er niet';
+$lang['conf_extents'] = 'Sjablonen';
+$lang['extend_for_templates'] = 'Uitbreiding voor sjablonen';
+$lang['Replacement of original templates'] = 
+ 'Vervanging van de originele sjablonen door aangepaste sjablonen van sjabloon-extensie submap';
+$lang['Replacers'] = 'Vervangers (eigenbouw sjabloon)';
+$lang['Original templates'] = 'Origineel sjabloontemplates';
+$lang['Optional URL keyword'] = 'Optionele URL sleutelwoord';
+$lang['Templates recorded.'] = 'Sjabloon configuratie is vastgelegd.';
+$lang['Optimizations completed'] = 'Alle verbeteringen zijn succesvol afgerond.';
+$lang['Optimizations errors'] = 'Verbeteringen zijn afgerond met enkele fouten.';
 $lang['delete this comment'] = 'verwijder dit commentaar';
 $lang['link_info_image'] = 'Aanpassen informatie';
 $lang['edit category informations'] = 'bewerk categorie informatie';
-/* TODO */ $lang['nothing'] = 'nothing';
-/* TODO */ $lang['overrides existing values with empty ones'] = 'overrides existing values with empty ones';
-/* TODO */ $lang['Drag to re-order'] = 'Drag to re-order';
-/* TODO */ $lang['Unable to retrieve server informations since allow_url_fopen is disabled.'] = 'Unable to retrieve server informations since allow_url_fopen is disabled.';
-/* TODO */ $lang['Quick Local Synchronization'] = 'Quick Local Synchronization';
-/* TODO */ $lang['No photo can be deleted'] = 'No photo can be deleted';
-/* TODO */ $lang['Note: Only deletes photos added with pLoader'] = 'Note: Only deletes photos added with pLoader';
-/* TODO */ $lang['Delete selected photos'] = 'Delete selected photos';
-/* TODO */ $lang['%d photo was deleted'] = '%d photo was deleted';
-/* TODO */ $lang['%d photos were deleted'] = '%d photos were deleted';
-/* TODO */ $lang['Bound template'] = 'Bound template';
-/* TODO */ $lang['Downloads'] = 'Downloads';
-/* TODO */ $lang['Released on'] = 'Released on';
-/* TODO */ $lang['Number of downloads'] = 'Number of downloads';
-// --------- Starting below: New or revised $lang ---- from Colibri (2.1)
+$lang['nothing'] = 'niets';
+$lang['overrides existing values with empty ones'] = 'overschrijft de bestaande waarden met lege waardes';
+/*TODO*/$lang['manage image ranks'] = 'manage image ranks';
+/*TODO*/$lang['Manage image ranks'] = 'Manage image ranks';
+/*TODO*/$lang['Edit ranks'] = 'Edit ranks';
+/*TODO*/$lang['No element in this category'] = 'No element in this category';
+/*TODO*/$lang['Images manual order was saved'] = 'Images manual order was saved';
+/*TODO*/$lang['ranks'] = 'ranks';
+$lang['Drag to re-order'] = 'sleep om te herschikken';
+$lang['Unable to retrieve server informations since allow_url_fopen is disabled.'] = 'Kan geen server verkrijgen omdat allow_url_fopen is uitgeschakeld.';
+$lang['Quick Local Synchronization'] = 'Snelle lokale Synchronizatie';
+$lang['No photo can be deleted'] = 'Geen enkele foto kan verwijderd worden';
+$lang['Note: Only deletes photos added with pLoader'] = 'Noot: Kan alleen foto\'s verwijderen welke met ploarde geplaatst zijn';
+$lang['Delete selected photos'] = 'Verwijder geselecteerde foto\'s';
+$lang['%d photo was deleted'] = '%d foto is verwijderd';
+$lang['%d photos were deleted'] = '%d foto\'s zijn verwijderd';
+$lang['Bound template'] = 'Gebonden sjabloon';
+$lang['Downloads'] = 'Downloads';
+$lang['Released on'] = 'Uitgegeven op';
+$lang['Number of downloads'] = 'Aantal downloads';
+// --------- Starting below: New or revised $lang ---- from Colibri
+/*TODO*/$lang['Piwigo Announcements Newsletter'] = 'Piwigo Announcements Newsletter';
+/*TODO*/$lang['Subscribe to Piwigo Announcements Newsletter'] = 'Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.';
+/*TODO*/$lang['Subscribe %s'] = 'Subscribe %s';
+/*TODO*/$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Subscribe %s to Piwigo English Announcements Newsletter';
 /*TODO*/$lang['Purge search history'] = 'Purge search history';
 /*TODO*/$lang['Hide'] = 'Hide';
+/*TODO*/$lang['Password is missing'] = 'Password is missing. Please enter the password.';
+/*TODO*/$lang['Password confirmation is missing'] = 'Password confirmation is missing. Please confirm the chosen password.';
+/*TODO*/$lang['Email address is missing'] = 'Email address is missing. Please specify an email address.';
+/*TODO*/$lang['Password confirmation error'] = 'Password confirmation error.';
 ?>
diff --git a/language/pl_PL/admin.lang.php b/language/pl_PL/admin.lang.php
index 4fe20436c..364f82ca1 100644
--- a/language/pl_PL/admin.lang.php
+++ b/language/pl_PL/admin.lang.php
@@ -647,7 +647,15 @@ $lang['Bound template'] = 'Przypisz Szablon';
 /* TODO */ $lang['Downloads'] = 'Downloads';
 /* TODO */ $lang['Released on'] = 'Released on';
 /* TODO */ $lang['Number of downloads'] = 'Number of downloads';
-// --------- Starting below: New or revised $lang ---- from Colibri (2.1)
+// --------- Starting below: New or revised $lang ---- from Colibri
+/*TODO*/$lang['Piwigo Announcements Newsletter'] = 'Piwigo Announcements Newsletter';
+/*TODO*/$lang['Subscribe to Piwigo Announcements Newsletter'] = 'Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.';
+/*TODO*/$lang['Subscribe %s'] = 'Subscribe %s';
+/*TODO*/$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Subscribe %s to Piwigo English Announcements Newsletter';
 /*TODO*/$lang['Purge search history'] = 'Purge search history';
 /*TODO*/$lang['Hide'] = 'Hide';
+/*TODO*/$lang['Password is missing'] = 'Password is missing. Please enter the password.';
+/*TODO*/$lang['Password confirmation is missing'] = 'Password confirmation is missing. Please confirm the chosen password.';
+/*TODO*/$lang['Email address is missing'] = 'Email address is missing. Please specify an email address.';
+/*TODO*/$lang['Password confirmation error'] = 'Password confirmation error.';
 ?>