diff --git a/admin/themes/default/template/profile_content.tpl b/admin/themes/default/template/profile_content.tpl
index 29338c3e4..e7c209222 100644
--- a/admin/themes/default/template/profile_content.tpl
+++ b/admin/themes/default/template/profile_content.tpl
@@ -45,15 +45,9 @@
     <ul>
       <li>
         <span class="property">
-          <label for="nb_image_line">{'Number of photos per row'|@translate}</label>
+          <label for="nb_image_page">{'Number of photos per page'|@translate}</label>
         </span>
-        <input type="text" size="3" maxlength="2" name="nb_image_line" id="nb_image_line" value="{$NB_IMAGE_LINE}">
-      </li>
-      <li>
-        <span class="property">
-          <label for="nb_line_page">{'Number of rows per page'|@translate}</label>
-        </span>
-        <input type="text" size="3" maxlength="2" name="nb_line_page" id="nb_line_page" value="{$NB_ROW_PAGE}" >
+        <input type="text" size="3" maxlength="2" name="nb_image_page" id="nb_image_page" value="{$NB_IMAGE_PAGE}">
       </li>
 {if not $SPECIAL_USER}
       <li>
diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl
index 9e5884b08..95214815b 100644
--- a/admin/themes/default/template/user_list.tpl
+++ b/admin/themes/default/template/user_list.tpl
@@ -183,25 +183,15 @@
 
 <table>
   <tr>
-    <td>{'Number of photos per row'|@translate}</td>
+    <td>{'Number of photos per page'|@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>
-      <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}">
+      <label><input type="radio" name="nb_image_page_action" value="leave" checked="checked"> {'leave'|@translate}</label>
+      <label><input type="radio" name="nb_image_page_action" value="set" id="nb_image_page_action_set"> {'set to'|@translate}</label>
+      <input onmousedown="document.getElementById('nb_image_page_action_set').checked = true;"
+             size="3" maxlength="2" type="text" name="nb_image_page" value="{$NB_IMAGE_PAGE}">
     </td>
   </tr>
 
-  <tr>
-    <td>{'Number of rows 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>
-      <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}">
-    <td>
-  </tr>
-
   <tr>
     <td>{'Interface theme'|@translate}</td>
     <td>
diff --git a/admin/user_list.php b/admin/user_list.php
index 18e9ce2b4..eb17f1137 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -384,7 +384,7 @@ DELETE FROM '.USER_GROUP_TABLE.'
   $dbfields = array('primary' => array('user_id'), 'update' => array());
 
   $formfields =
-    array('nb_image_line', 'nb_line_page', 'theme', 'language',
+    array('nb_image_page', 'theme', 'language',
           'recent_period', 'maxwidth', 'expand', 'show_nb_comments',
           'show_nb_hits', 'maxheight', 'status', 'enabled_high',
           'level');
@@ -559,8 +559,7 @@ if (isset($_POST['pref_submit']))
 {
   $template->assign(
     array(
-      'NB_IMAGE_LINE' => $_POST['nb_image_line'],
-      'NB_LINE_PAGE' => $_POST['nb_line_page'],
+      'NB_IMAGE_PAGE' => $_POST['nb_image_page'],
       'MAXWIDTH' => $_POST['maxwidth'],
       'MAXHEIGHT' => $_POST['maxheight'],
       'RECENT_PERIOD' => $_POST['recent_period'],
@@ -571,8 +570,7 @@ else
   $default_user = get_default_user_info(true);
   $template->assign(
     array(
-      'NB_IMAGE_LINE' => $default_user['nb_image_line'],
-      'NB_LINE_PAGE' => $default_user['nb_line_page'],
+      'NB_IMAGE_PAGE' => $default_user['nb_image_page'],
       'MAXWIDTH' => $default_user['maxwidth'],
       'MAXHEIGHT' => $default_user['maxheight'],
       'RECENT_PERIOD' => $default_user['recent_period'],
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index 549daf7cb..95cd23261 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -244,9 +244,6 @@ function build_user( $user_id, $use_cache )
     $user['internal_status']['guest_must_be_guest'] = true;
   }
 
-  // calculation of the number of picture to display per page
-  $user['nb_image_page'] = $user['nb_image_line'] * $user['nb_line_page'];
-
   // Check user theme
   if (!isset($user['theme_name']))
   {
diff --git a/install/db/101-database.php b/install/db/101-database.php
new file mode 100644
index 000000000..8348a0f86
--- /dev/null
+++ b/install/db/101-database.php
@@ -0,0 +1,65 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2011 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+$upgrade_description = 'merge nb_line_page and nb_image_line into nb_image_page';
+
+// add column
+if ('mysql' == $conf['dblayer'])
+{
+  pwg_query('
+    ALTER TABLE '.USER_INFOS_TABLE.' 
+      ADD COLUMN `nb_image_page` tinyint(3) unsigned NOT NULL default \'15\'
+  ;');
+}
+else if (in_array($conf['dblayer'], array('pgsql', 'sqlite', 'pdo-sqlite')))
+{
+  pwg_query('
+    ALTER TABLE '.IMAGES_TABLE.' 
+      ADD COLUMN "nb_image_page" INTEGER default 15 NOT NULL
+  ;');
+}
+
+// merge datas
+pwg_query('
+  UPDATE '.USER_INFOS_TABLE.' 
+  SET nb_image_page = nb_line_page*nb_image_line
+;');
+
+// delete old columns
+pwg_query('
+  ALTER TABLE '.USER_INFOS_TABLE.' 
+    DROP `nb_line_page`,
+    DROP `nb_image_line`
+;');
+
+echo
+"\n"
+. $upgrade_description
+."\n"
+;
+?>
\ No newline at end of file
diff --git a/install/piwigo_structure-mysql.sql b/install/piwigo_structure-mysql.sql
index 31b5183ce..42e94d367 100644
--- a/install/piwigo_structure-mysql.sql
+++ b/install/piwigo_structure-mysql.sql
@@ -404,8 +404,7 @@ CREATE TABLE `piwigo_user_group` (
 DROP TABLE IF EXISTS `piwigo_user_infos`;
 CREATE TABLE `piwigo_user_infos` (
   `user_id` smallint(5) NOT NULL default '0',
-  `nb_image_line` tinyint(1) unsigned NOT NULL default '5',
-  `nb_line_page` tinyint(3) unsigned NOT NULL default '3',
+  `nb_image_page` tinyint(3) unsigned NOT NULL default '15',
   `status` enum('webmaster','admin','normal','generic','guest') NOT NULL default 'guest',
   `language` varchar(50) NOT NULL default 'en_UK',
   `maxwidth` smallint(6) default NULL,
diff --git a/install/piwigo_structure-pdo-sqlite.sql b/install/piwigo_structure-pdo-sqlite.sql
index f89fd160f..a0b502fc8 100644
--- a/install/piwigo_structure-pdo-sqlite.sql
+++ b/install/piwigo_structure-pdo-sqlite.sql
@@ -467,8 +467,7 @@ DROP TABLE IF EXISTS piwigo_user_infos;
 CREATE TABLE piwigo_user_infos
 (
   "user_id" INTEGER default 0 NOT NULL,
-  "nb_image_line" INTEGER default 5 NOT NULL,
-  "nb_line_page" INTEGER default 3 NOT NULL,
+  "nb_image_page" INTEGER default 15 NOT NULL,
   "status" VARCHAR(50) default 'guest',
   "language" VARCHAR(50) default 'en_UK' NOT NULL,
   "maxwidth" INTEGER,
diff --git a/install/piwigo_structure-pgsql.sql b/install/piwigo_structure-pgsql.sql
index 940768e85..cf55dea0c 100644
--- a/install/piwigo_structure-pgsql.sql
+++ b/install/piwigo_structure-pgsql.sql
@@ -568,8 +568,7 @@ DROP TABLE IF EXISTS "piwigo_user_infos" CASCADE;
 CREATE TABLE "piwigo_user_infos"
 (
   "user_id" INTEGER default 0 NOT NULL,
-  "nb_image_line" INTEGER default 5 NOT NULL,
-  "nb_line_page" INTEGER default 3 NOT NULL,
+  "nb_image_page" INTEGER default 15 NOT NULL,
   "status" USER_INFOS_STATUS default 'guest'::USER_INFOS_STATUS,
   "language" VARCHAR(50) default 'en_UK' NOT NULL,
   "maxwidth" INTEGER,
diff --git a/install/piwigo_structure-sqlite.sql b/install/piwigo_structure-sqlite.sql
index f89fd160f..a0b502fc8 100644
--- a/install/piwigo_structure-sqlite.sql
+++ b/install/piwigo_structure-sqlite.sql
@@ -467,8 +467,7 @@ DROP TABLE IF EXISTS piwigo_user_infos;
 CREATE TABLE piwigo_user_infos
 (
   "user_id" INTEGER default 0 NOT NULL,
-  "nb_image_line" INTEGER default 5 NOT NULL,
-  "nb_line_page" INTEGER default 3 NOT NULL,
+  "nb_image_page" INTEGER default 15 NOT NULL,
   "status" VARCHAR(50) default 'guest',
   "language" VARCHAR(50) default 'en_UK' NOT NULL,
   "maxwidth" INTEGER,
diff --git a/language/ar_SA/common.lang.php b/language/ar_SA/common.lang.php
index b6c0a45de..6bb815861 100644
--- a/language/ar_SA/common.lang.php
+++ b/language/ar_SA/common.lang.php
@@ -234,10 +234,10 @@ $lang['month'][8] = 'أغسطس';
 $lang['month'][9] = 'سبتمبر';
 $lang['Most visited'] = 'الصور الأكثر مشاهدة';
 $lang['display most visited photos'] = 'أعرض الصور الاكثر مشاهدة';
-$lang['The number of photos per row must be a not null scalar'] = 'عدد الصور لكل صف لا يجب ان يكون فارغ';
-$lang['Number of photos per row'] = 'عدد الصورلكل صف';
-$lang['The number of rows per page must be a not null scalar'] = 'عدد الصورلكل صف لا يجب ان يكون فارغ';
-$lang['Number of rows per page'] = 'عدد الصفوف في الصفحة';
+// $lang['The number of photos per row must be a not null scalar'] = 'عدد الصور لكل صف لا يجب ان يكون فارغ';
+// $lang['Number of photos per row'] = 'عدد الصورلكل صف';
+// $lang['The number of rows per page must be a not null scalar'] = 'عدد الصورلكل صف لا يجب ان يكون فارغ';
+// $lang['Number of rows per page'] = 'عدد الصفوف في الصفحة';
 $lang['Unknown identifier'] = 'معرف مجهول';
 $lang['New password'] = 'كلمة مرور جديدة';
 $lang['Rate this photo'] = 'قيم هذه الصورة';
diff --git a/language/ca_ES/common.lang.php b/language/ca_ES/common.lang.php
index bbfc87bb9..eaaf083f2 100644
--- a/language/ca_ES/common.lang.php
+++ b/language/ca_ES/common.lang.php
@@ -227,10 +227,8 @@ $lang['month'][8] = 'Agost';
 $lang['month'][9] = 'Setembre';
 $lang['Most visited'] = 'Més visitades';
 $lang['display most visited photos'] = 'visualitza les imatges més visitades';
-$lang['The number of photos per row must be a not null scalar'] = 'El nombre d\'imatges per fila ha de ser un escalar no nul';
-$lang['Number of photos per row'] = 'Nombre d\'imatges per fila';
-$lang['The number of rows per page must be a not null scalar'] = 'El nombre de files per pàgina ha de ser un escalar no nul';
-$lang['Number of rows per page'] = 'Nombre de files per pàgina';
+$lang['The number of photos per page must be a not null scalar'] = 'El nombre d\'imatges per pàgina ha de ser un escalar no nul';
+$lang['Number of photos per page'] = 'Nombre d\'imatges per pàgina';
 $lang['Unknown identifier'] = 'identificador desconegut';
 $lang['New password'] = 'Nova contrasenya';
 $lang['Rate this photo'] = 'Valoreu aquesta imatge';
diff --git a/language/cs_CZ/common.lang.php b/language/cs_CZ/common.lang.php
index 7c6ebd4ca..34aaa69d0 100644
--- a/language/cs_CZ/common.lang.php
+++ b/language/cs_CZ/common.lang.php
@@ -235,10 +235,8 @@ $lang['month'][8] = 'Srpen';
 $lang['month'][9] = 'Září';
 $lang['Most visited'] = 'Nejčastěji zobrazované';
 $lang['display most visited photos'] = 'Nejčastěji zobrazované fotografie';
-$lang['The number of photos per row must be a not null scalar'] = 'Počet fotografií v řádku musí být číslo větší než 0.';
-$lang['Number of photos per row'] = 'Počet fotografií v řádku';
-$lang['The number of rows per page must be a not null scalar'] = 'Počet řádků na stránce musí být číslo větší než 0.';
-$lang['Number of rows per page'] = 'Počet řádků na stránce';
+$lang['The number of photos per page must be a not null scalar'] = 'Počet fotografií v stránce musí být číslo větší než 0.';
+$lang['Number of photos per page'] = 'Počet fotografií v stránce';
 $lang['Unknown identifier'] = 'Neznámý identifikátor';
 $lang['New password'] = 'Nové heslo';
 $lang['Rate this photo'] = 'Ohodnotit tuto fotografii';
diff --git a/language/da_DK/common.lang.php b/language/da_DK/common.lang.php
index 7b905ca0a..a6b7435c5 100644
--- a/language/da_DK/common.lang.php
+++ b/language/da_DK/common.lang.php
@@ -231,10 +231,8 @@ $lang['month'][8] = 'August';
 $lang['month'][9] = 'September';
 $lang['Most visited'] = 'Mest sete';
 $lang['display most visited photos'] = 'vis mest sete fotos';
-$lang['The number of photos per row must be a not null scalar'] = 'Antallet af fotos pr. række må ikke være nul';
-$lang['Number of photos per row'] = 'antallet af fotos pr. række';
-$lang['The number of rows per page must be a not null scalar'] = 'Antallet af rækker pr. side må ikke være nul';
-$lang['Number of rows per page'] = 'Antallet af rækker pr. side';
+$lang['The number of photos per page must be a not null scalar'] = 'Antallet af fotos pr. side må ikke være nul';
+$lang['Number of photos per page'] = 'antallet af fotos pr. side';
 $lang['Unknown identifier'] = 'Ukendt identifier';
 $lang['New password'] = 'Nyt password';
 $lang['Rate this photo'] = 'Bedøm dette foto';
diff --git a/language/de_DE/common.lang.php b/language/de_DE/common.lang.php
index 4a0c24602..5c8cca1cb 100644
--- a/language/de_DE/common.lang.php
+++ b/language/de_DE/common.lang.php
@@ -231,10 +231,8 @@ $lang['month'][8] = 'August';
 $lang['month'][9] = 'September';
 $lang['Most visited'] = 'Am häufigsten gesehen';
 $lang['display most visited photos'] = 'zeige die meistbesuchten Fotos';
-$lang['The number of photos per row must be a not null scalar'] = 'Die Anzahl Fotos per Reihe darf nicht Null sein';
-$lang['Number of photos per row'] = 'Anzahl Fotos per Reihe';
-$lang['The number of rows per page must be a not null scalar'] = 'Die Anzahl der Zeilen pro Seite muss mindestens 1 sein';
-$lang['Number of rows per page'] = 'Anzahl der Zeilen pro Seite';
+$lang['The number of photos per page must be a not null scalar'] = 'Die Anzahl Fotos pro Seite darf nicht Null sein';
+$lang['Number of photos per page'] = 'Anzahl Fotos pro Seite';
 $lang['Unknown identifier'] = 'Identifikatoren unbekannt';
 $lang['New password'] = 'Neues Passwort';
 $lang['Rate this photo'] = 'Bewerte dieses Foto';
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index 97f528c61..8d8b2a970 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -229,10 +229,8 @@ $lang['month'][8] = "August";
 $lang['month'][9] = "September";
 $lang['Most visited'] = "Most visited";
 $lang['display most visited photos'] = "display most visited photos";
-$lang['The number of photos per row must be a not null scalar'] = "The number of photos per row must be a nonzero integer";
-$lang['Number of photos per row'] = "Number of photos per row";
-$lang['The number of rows per page must be a not null scalar'] = "The number of rows per page must be a nonzero integer";
-$lang['Number of rows per page'] = "Number of rows per page";
+$lang['The number of photos per page must be a not null scalar'] = "The number of photos per page must be a nonzero integer";
+$lang['Number of photos per page'] = "Number of photos per page";
 $lang['Unknown identifier'] = "Unknown identifier";
 $lang['New password'] = "New password";
 $lang['Rate this photo'] = "Rate this photo";
diff --git a/language/es_AR/common.lang.php b/language/es_AR/common.lang.php
index b9f5365c1..d790ddff4 100644
--- a/language/es_AR/common.lang.php
+++ b/language/es_AR/common.lang.php
@@ -230,10 +230,8 @@ $lang['month'][8] = 'Agosto';
 $lang['month'][9] = 'Septiembre';
 $lang['Most visited'] = 'Las más vistas';
 $lang['display most visited photos'] = 'mostrar las imágenes más vistas';
-$lang['The number of photos per row must be a not null scalar'] = 'La cantidad de imágenes por línea debe ser un número entero superior a cero';
-$lang['Number of photos per row'] = 'Cantidad de diapositivas por línea';
-$lang['The number of rows per page must be a not null scalar'] = 'La cantidad de líneas por página debe ser un número entero superior a cero';
-$lang['Number of rows per page'] = 'Cantidad de  líneas por página';
+$lang['The number of photos per page must be a not null scalar'] = 'La cantidad de imágenes por página debe ser un número entero superior a cero';
+$lang['Number of photos per page'] = 'Cantidad de diapositivas por página';
 $lang['Unknown identifier'] = 'Identificador desconocido';
 $lang['New password'] = 'Nueva contraseña';
 $lang['Rate this photo'] = 'Votar esta imagen';
diff --git a/language/es_ES/common.lang.php b/language/es_ES/common.lang.php
index be344bb06..a22a68b84 100644
--- a/language/es_ES/common.lang.php
+++ b/language/es_ES/common.lang.php
@@ -230,10 +230,8 @@ $lang['month'][8] = 'Agosto';
 $lang['month'][9] = 'Septiembre';
 $lang['Most visited'] = 'Imágenes más vistas';
 $lang['display most visited photos'] = 'mostrar las fotos más vistas';
-$lang['The number of photos per row must be a not null scalar'] = 'La cantidad de fotos por línea debe ser un número entero superior a cero';
-$lang['Number of photos per row'] = 'Número de miniaturas por línea';
-$lang['The number of rows per page must be a not null scalar'] = 'El número de líneas por página debe ser un numero entero no nulo';
-$lang['Number of rows per page'] = 'Número de líneas por pagina';
+$lang['The number of photos per page must be a not null scalar'] = 'La cantidad de fotos por pagina debe ser un número entero superior a cero';
+$lang['Number of photos per page'] = 'Número de miniaturas por pagina';
 $lang['Unknown identifier'] = 'Identificador desconocido';
 $lang['New password'] = 'Nueva contraseña';
 $lang['Rate this photo'] = 'Votar esta foto';
diff --git a/language/fa_IR/common.lang.php b/language/fa_IR/common.lang.php
index 783bc0720..d4a09c220 100644
--- a/language/fa_IR/common.lang.php
+++ b/language/fa_IR/common.lang.php
@@ -229,10 +229,10 @@ $lang['month'][8] = "آگوست";
 $lang['month'][9] = "سپتامبر";
 $lang['Most visited'] = "بیشترین بازدید";
 $lang['display most visited photos'] = "نمایش عکس‌هایی که بیشترین بازدید را داشته‌اند.";
-$lang['The number of photos per row must be a not null scalar'] = "تعداد عکس‌هایی که در هر سطر نمایش داده می‌شود که باید یک عدد غیر صفر باشد.";
-$lang['Number of photos per row'] = "تعداد عکس‌هایی که در هر سطر نمایش داده می‌شود";
-$lang['The number of rows per page must be a not null scalar'] = "تعداد عکس‌هایی که در هر صفحه نمایش داده می‌شود که باید یک عدد غیر صفر باشد.";
-$lang['Number of rows per page'] = "تعداد عکس‌هایی که در هر صفحه نمایش داده می‌شود";
+// $lang['The number of photos per row must be a not null scalar'] = "تعداد عکس‌هایی که در هر سطر نمایش داده می‌شود که باید یک عدد غیر صفر باشد.";
+// $lang['Number of photos per row'] = "تعداد عکس‌هایی که در هر سطر نمایش داده می‌شود";
+// $lang['The number of rows per page must be a not null scalar'] = "تعداد عکس‌هایی که در هر صفحه نمایش داده می‌شود که باید یک عدد غیر صفر باشد.";
+// $lang['Number of rows per page'] = "تعداد عکس‌هایی که در هر صفحه نمایش داده می‌شود";
 $lang['Unknown identifier'] = "ناشناخته!";
 $lang['New password'] = "گذرواژه جدید";
 $lang['Rate this photo'] = "امتیاز دادن به این تصویر";
diff --git a/language/fr_CA/common.lang.php b/language/fr_CA/common.lang.php
index 6cdc6994b..ebdaf7e12 100644
--- a/language/fr_CA/common.lang.php
+++ b/language/fr_CA/common.lang.php
@@ -229,10 +229,8 @@ $lang['month'][8] = 'Août';
 $lang['month'][9] = 'Septembre';
 $lang['Most visited'] = 'Plus vues';
 $lang['display most visited photos'] = 'afficher les images les plus vues';
-$lang['The number of photos per row must be a not null scalar'] = 'Le nombre d\'images par ligne doit être un entier non nul';
-$lang['Number of photos per row'] = 'Nombre de miniatures par ligne';
-$lang['The number of rows per page must be a not null scalar'] = 'Le nombre de lignes par page doit être un entier non nul';
-$lang['Number of rows per page'] = 'Nombre de lignes par page';
+$lang['The number of photos per page must be a not null scalar'] = 'Le nombre d\'images par page doit être un entier non nul';
+$lang['Number of photos per page'] = 'Nombre de miniatures par page';
 $lang['Unknown identifier'] = 'Identifiants inconnus';
 $lang['New password'] = 'Nouveau mot de passe';
 $lang['Rate this photo'] = 'Votez pour cette image';
diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php
index 10b393f8f..038807785 100644
--- a/language/fr_FR/common.lang.php
+++ b/language/fr_FR/common.lang.php
@@ -229,10 +229,8 @@ $lang['month'][8] = 'Août';
 $lang['month'][9] = 'Septembre';
 $lang['Most visited'] = 'Plus vues';
 $lang['display most visited photos'] = 'afficher les photos les plus vues';
-$lang['The number of photos per row must be a not null scalar'] = 'Le nombre de photos par ligne doit être un entier non nul';
-$lang['Number of photos per row'] = 'Nombre de miniatures par ligne';
-$lang['The number of rows per page must be a not null scalar'] = 'Le nombre de lignes par page doit être un entier non nul';
-$lang['Number of rows per page'] = 'Nombre de lignes par page';
+$lang['The number of photos per page must be a not null scalar'] = 'Le nombre de photos par page doit être un entier non nul';
+$lang['Number of photos per page'] = 'Nombre de miniatures par page';
 $lang['Unknown identifier'] = 'Identifiants inconnus';
 $lang['New password'] = 'Nouveau mot de passe';
 $lang['Rate this photo'] = 'Votez pour cette photo';
diff --git a/language/he_IL/common.lang.php b/language/he_IL/common.lang.php
index c476276db..09444883d 100644
--- a/language/he_IL/common.lang.php
+++ b/language/he_IL/common.lang.php
@@ -229,10 +229,10 @@ $lang['month'][8] = "אוגוסט";
 $lang['month'][9] = "ספטמבר";
 $lang['Most visited'] = "הכי נצפה";
 $lang['display most visited photos'] = "הצג את התמונות הנצפות ביותר";
-$lang['The number of photos per row must be a not null scalar'] = 'מספר התמונות בכל שורה חייב להיות מספר שלם שונה מאפס';
-$lang['Number of photos per row'] = 'מספר התמונות בכל שורה';
-$lang['The number of rows per page must be a not null scalar'] = 'מספר שורות בכל דף חייב להיות מספר שלם שונה מאפס';
-$lang['Number of rows per page'] = "מספר שורות לעמוד";
+// $lang['The number of photos per row must be a not null scalar'] = 'מספר התמונות בכל שורה חייב להיות מספר שלם שונה מאפס';
+// $lang['Number of photos per row'] = 'מספר התמונות בכל שורה';
+// $lang['The number of rows per page must be a not null scalar'] = 'מספר שורות בכל דף חייב להיות מספר שלם שונה מאפס';
+// $lang['Number of rows per page'] = "מספר שורות לעמוד";
 $lang['Unknown identifier'] = 'מזהה לא ידוע';
 $lang['New password'] = "סיסמה חדשה";
 $lang['Rate this photo'] = "דרג תמונה זאת";
diff --git a/language/hr_HR/common.lang.php b/language/hr_HR/common.lang.php
index 9a840d10a..f5646352f 100644
--- a/language/hr_HR/common.lang.php
+++ b/language/hr_HR/common.lang.php
@@ -230,10 +230,8 @@ $lang['month'][8] = 'Kolovoz';
 $lang['month'][9] = 'Rujan';
 $lang['Most visited'] = 'Najposjećenije';
 $lang['display most visited photos'] = 'prikaz najposjećenijih slika';
-$lang['The number of photos per row must be a not null scalar'] = 'broj slika po redu mora biti cjelobrojna vrijednost';
-$lang['Number of photos per row'] = 'Broj slika po redu';
-$lang['The number of rows per page must be a not null scalar'] = 'Broj redova po stranici mora biti cjelobrojna vrijednost';
-$lang['Number of rows per page'] = 'Broj redova po stranici';
+$lang['The number of photos per page must be a not null scalar'] = 'broj slika po stranici mora biti cjelobrojna vrijednost';
+$lang['Number of photos per page'] = 'Broj slika po stranici';
 $lang['Unknown identifier'] = 'Nepoznata oznaka';
 $lang['New password'] = 'Nova zaporka';
 $lang['Rate this photo'] = 'Ocjeni ovu sliku';
diff --git a/language/hu_HU/common.lang.php b/language/hu_HU/common.lang.php
index 25d278ffc..f5df6a213 100644
--- a/language/hu_HU/common.lang.php
+++ b/language/hu_HU/common.lang.php
@@ -231,10 +231,10 @@ $lang['month'][8] = 'Augusztus';
 $lang['month'][9] = 'Szeptember';
 $lang['Most visited'] = 'Legtöbbször nézett';
 $lang['display most visited photos'] = 'A leglátogatottabb képek megjelenítése';
-$lang['The number of photos per row must be a not null scalar'] = 'A soronkénti képek száma nem lehet 0!';
-$lang['Number of photos per row'] = 'Képek száma soronként';
-$lang['The number of rows per page must be a not null scalar'] = 'Az oldalankénti sorok száma nem lehet 0!';
-$lang['Number of rows per page'] = 'Sorok száma oldalanként';
+// $lang['The number of photos per row must be a not null scalar'] = 'A soronkénti képek száma nem lehet 0!';
+// $lang['Number of photos per row'] = 'Képek száma soronként';
+// $lang['The number of rows per page must be a not null scalar'] = 'Az oldalankénti sorok száma nem lehet 0!';
+// $lang['Number of rows per page'] = 'Sorok száma oldalanként';
 $lang['Unknown identifier'] = 'Ismeretlen azonosító';
 $lang['New password'] = 'Új jelszó';
 $lang['Rate this photo'] = 'Értékeld a képet';
diff --git a/language/is_IS/common.lang.php b/language/is_IS/common.lang.php
index aff7cb383..b0f1e56a4 100644
--- a/language/is_IS/common.lang.php
+++ b/language/is_IS/common.lang.php
@@ -229,10 +229,10 @@ $lang['return to normal view mode'] = 'aftur í venjulegan skjá';
 $lang['display a calendar by posted date'] = 'sýna dagatal hjá dagsetningu sem birt var á';
 $lang['Most visited'] = 'Oftast heimsótt';
 $lang['display most visited photos'] = 'sýna mest heimsóttar myndir';
-$lang['The number of photos per row must be a not null scalar'] = 'Fjöldi mynda í röð verða að vera nonzero heiltala';
-$lang['Number of photos per row'] = 'Fjöldi mynda í hverri röð';
-$lang['The number of rows per page must be a not null scalar'] = 'Fjöldi raða á síðu verða að vera nonzero heiltala';
-$lang['Number of rows per page'] = 'Fjöldi raða á síðu';
+// $lang['The number of photos per row must be a not null scalar'] = 'Fjöldi mynda í röð verða að vera nonzero heiltala';
+// $lang['Number of photos per row'] = 'Fjöldi mynda í hverri röð';
+// $lang['The number of rows per page must be a not null scalar'] = 'Fjöldi raða á síðu verða að vera nonzero heiltala';
+// $lang['Number of rows per page'] = 'Fjöldi raða á síðu';
 $lang['Unknown identifier'] = 'Óþekkt auðkenni';
 $lang['New password'] = 'Nýtt lykilorð';
 $lang['Rate this photo'] = 'Gefa þessari mynd einkunn';
diff --git a/language/it_IT/common.lang.php b/language/it_IT/common.lang.php
index 214887605..4de23c579 100644
--- a/language/it_IT/common.lang.php
+++ b/language/it_IT/common.lang.php
@@ -229,10 +229,8 @@ $lang['month'][8] = 'Agosto';
 $lang['month'][9] = 'Settembre';
 $lang['Most visited'] = 'Le più viste';
 $lang['display most visited photos'] = 'Mostra le foto le più viste';
-$lang['The number of photos per row must be a not null scalar'] = 'Il numero di foto per riga deve essere un intero non nullo';
-$lang['Number of photos per row'] = 'Numero di miniature per riga';
-$lang['The number of rows per page must be a not null scalar'] = 'Il numero di righe per pagina deve essere un intero non nullo';
-$lang['Number of rows per page'] = 'Numero di righe per pagina';
+$lang['The number of photos per page must be a not null scalar'] = 'Il numero di foto per pagina deve essere un intero non nullo';
+$lang['Number of photos per page'] = 'Numero di miniature per pagina';
 $lang['Unknown identifier'] = 'Identificante sconosciuto';
 $lang['New password'] = 'Nuova password';
 $lang['Rate this photo'] = 'Vota questa foto';
diff --git a/language/ja_JP/common.lang.php b/language/ja_JP/common.lang.php
index 4fb5bec7b..4f2b4cb4b 100644
--- a/language/ja_JP/common.lang.php
+++ b/language/ja_JP/common.lang.php
@@ -230,10 +230,10 @@ $lang['month'][8] = '8月';
 $lang['month'][9] = '9月';
 $lang['Most visited'] = '最多アクセス';
 $lang['display most visited photos'] = '最もアクセスされた写真を表示します。';
-$lang['The number of photos per row must be a not null scalar'] = '1行あたりのイメージ数には、空白以外の値を設定してください。';
-$lang['Number of photos per row'] = '1行あたりのイメージ数';
-$lang['The number of rows per page must be a not null scalar'] = '1ページあたりの行数には、空白以外の値を設定してください。';
-$lang['Number of rows per page'] = '1ページあたりの行数';
+// $lang['The number of photos per row must be a not null scalar'] = '1行あたりのイメージ数には、空白以外の値を設定してください。';
+// $lang['Number of photos per row'] = '1行あたりのイメージ数';
+// $lang['The number of rows per page must be a not null scalar'] = '1ページあたりの行数には、空白以外の値を設定してください。';
+// $lang['Number of rows per page'] = '1ページあたりの行数';
 $lang['Unknown identifier'] = '不明なID';
 $lang['New password'] = '新しいパスワード';
 $lang['Rate this photo'] = 'この写真を評する';
diff --git a/language/ka_GE/common.lang.php b/language/ka_GE/common.lang.php
index a6bc26de4..f0167a67c 100644
--- a/language/ka_GE/common.lang.php
+++ b/language/ka_GE/common.lang.php
@@ -231,10 +231,10 @@ $lang['month'][8] = 'აგვისტო';
 $lang['month'][9] = 'სექტემბერი';
 $lang['Most visited'] = 'პოპულარურობის მიხედვით';
 $lang['display most visited photos'] = 'ვნახოთ ყველაზე პოპულარული ფოტოები';
-$lang['The number of photos per row must be a not null scalar'] = 'ფოტოების რიცხვი არ უნდა იყოს ნულის ტოლი';
-$lang['Number of photos per row'] = 'ფოტოების რაოდენობა სტრიქონში';
-$lang['The number of rows per page must be a not null scalar'] = 'სტრიქონთა რაოდენობა არ უნდა იყოს ნულის ტოლი';
-$lang['Number of rows per page'] = 'სტრიქონთა რიცხვი გვერდზე';
+// $lang['The number of photos per row must be a not null scalar'] = 'ფოტოების რიცხვი არ უნდა იყოს ნულის ტოლი';
+// $lang['Number of photos per row'] = 'ფოტოების რაოდენობა სტრიქონში';
+// $lang['The number of rows per page must be a not null scalar'] = 'სტრიქონთა რაოდენობა არ უნდა იყოს ნულის ტოლი';
+// $lang['Number of rows per page'] = 'სტრიქონთა რიცხვი გვერდზე';
 $lang['Unknown identifier'] = 'უცნობი იდენტიფიკატორი';
 $lang['New password'] = 'ახალი პაროლი';
 $lang['Rate this photo'] = 'შეაფასეთ ეს ფოტო';
diff --git a/language/lv_LV/common.lang.php b/language/lv_LV/common.lang.php
index d09312432..d978049e1 100644
--- a/language/lv_LV/common.lang.php
+++ b/language/lv_LV/common.lang.php
@@ -229,10 +229,8 @@ $lang['month'][8] = "Augusts";
 $lang['month'][9] = "Septembris";
 $lang['Most visited'] = "Visapmeklētākie";
 $lang['display most visited photos'] = 'parādīt visapmeklētākos fotoattēlus';
-$lang['The number of photos per row must be a not null scalar'] = 'Foto skaits rindā nedrīkst būt nulle skalārs lielums';
-$lang['Number of photos per row'] = 'Foto skaits rindā';
-$lang['The number of rows per page must be a not null scalar'] = "Rindu skaitam lapā jābut lielākam par 0 un veselam skaitlim";
-$lang['Number of rows per page'] = "Rindu skaits lapā";
+$lang['The number of photos per page must be a not null scalar'] = 'Foto skaits lapā nedrīkst būt nulle skalārs lielums';
+$lang['Number of photos per page'] = 'Foto skaits lapā';
 $lang['Unknown identifier'] = "Nezināms identifikators";
 $lang['New password'] = "Jauna parole";
 $lang['Rate this photo'] = 'Vērtēt šo foto';
diff --git a/language/mk_MK/common.lang.php b/language/mk_MK/common.lang.php
index 1a90f85d8..8bc9ef427 100644
--- a/language/mk_MK/common.lang.php
+++ b/language/mk_MK/common.lang.php
@@ -240,10 +240,10 @@ $lang['month'][8] = 'август';
 $lang['month'][9] = 'септември';
 $lang['Most visited'] = 'Најпосетени';
 $lang['display most visited photos'] = 'Ги покажува најпосетените фотографии';
-$lang['The number of photos per row must be a not null scalar'] = 'Бројот на фотографии во низа не може да биде непостоечки број.';
-$lang['Number of photos per row'] = 'Број на фотографии во низа';
-$lang['The number of rows per page must be a not null scalar'] = 'Бројот на низи по страна не може да биде непостоечки број.';
-$lang['Number of rows per page'] = 'Број на низи по страна';
+// $lang['The number of photos per row must be a not null scalar'] = 'Бројот на фотографии во низа не може да биде непостоечки број.';
+// $lang['Number of photos per row'] = 'Број на фотографии во низа';
+// $lang['The number of rows per page must be a not null scalar'] = 'Бројот на низи по страна не може да биде непостоечки број.';
+// $lang['Number of rows per page'] = 'Број на низи по страна';
 $lang['Unknown identifier'] = 'Unknown identifier';
 $lang['New password'] = 'Нова лозинка';
 $lang['Rate this photo'] = 'Оцени ја фотографијата';
diff --git a/language/nl_NL/common.lang.php b/language/nl_NL/common.lang.php
index 63f8b250c..aa4e8cc9a 100644
--- a/language/nl_NL/common.lang.php
+++ b/language/nl_NL/common.lang.php
@@ -231,10 +231,8 @@ $lang['month'][8] = 'Augustus';
 $lang['month'][9] = 'September';
 $lang['Most visited'] = 'Meest bekeken';
 $lang['display most visited photos'] = 'Toon de meest bekeken afbeelding';
-$lang['The number of photos per row must be a not null scalar'] = 'Het aantal afbeeldingen per rij mag geen ongeldige deling zijn';
-$lang['Number of photos per row'] = 'Aantal afbeeldingen per rij';
-$lang['The number of rows per page must be a not null scalar'] = 'Het aantal rijen per pagina mag geen ongeldige deling zijn';
-$lang['Number of rows per page'] = 'Aantal rijen per pagina';
+$lang['The number of photos per page must be a not null scalar'] = 'Het aantal afbeeldingen per pagina mag geen ongeldige deling zijn';
+$lang['Number of photos per page'] = 'Aantal afbeeldingen per pagina';
 $lang['Unknown identifier'] = 'Onbekend herkenningsteken';
 $lang['New password'] = 'Nieuw wachtwoord';
 $lang['Rate this photo'] = 'Waardeer deze afbeelding';
diff --git a/language/no_NO/common.lang.php b/language/no_NO/common.lang.php
index 18290a914..a7e8398e4 100644
--- a/language/no_NO/common.lang.php
+++ b/language/no_NO/common.lang.php
@@ -267,10 +267,8 @@ $lang['return to normal view mode'] = 'tilbake til normalvisning';
 $lang['display a calendar by posted date'] = 'vis en kalender etter dato postet';
 $lang['Most visited'] = 'Mest besøkte';
 $lang['display most visited photos'] = 'vis mest besøkte bilder';
-$lang['The number of photos per row must be a not null scalar'] = 'Antall bilder per rad må være større en null';
-$lang['Number of photos per row'] = 'Antall bilder per rad';
-$lang['The number of rows per page must be a not null scalar'] = 'Antall rader per side må være større en null';
-$lang['Number of rows per page'] = 'Antall rader per side';
+$lang['The number of photos per page must be a not null scalar'] = 'Antall bilder per side må være større en null';
+$lang['Number of photos per page'] = 'Antall bilder per side';
 $lang['Unknown identifier'] = 'Ukjent identifier';
 $lang['New password'] = 'Nytt passord';
 $lang['Rate this photo'] = 'Gi karakter på dette bildet';
diff --git a/language/pl_PL/common.lang.php b/language/pl_PL/common.lang.php
index e57ade2af..131910aca 100644
--- a/language/pl_PL/common.lang.php
+++ b/language/pl_PL/common.lang.php
@@ -231,10 +231,10 @@ $lang['month'][8] = 'Sierpień';
 $lang['month'][9] = 'Wrzesień';
 $lang['Most visited'] = 'Najczęściej odwiedzane';
 $lang['display most visited photos'] = 'pokaż najczęściej odwiedzane zdjęcia';
-$lang['The number of photos per row must be a not null scalar'] = 'Liczba zdjęć w wierszu musi być większa od zera';
-$lang['Number of photos per row'] = 'Liczba zdjęć w wierszu';
-$lang['The number of rows per page must be a not null scalar'] = 'Liczba wierszy na stronie musi być większa od zera';
-$lang['Number of rows per page'] = 'Liczba wierszy na stronie';
+// $lang['The number of photos per row must be a not null scalar'] = 'Liczba zdjęć w wierszu musi być większa od zera';
+// $lang['Number of photos per row'] = 'Liczba zdjęć w wierszu';
+// $lang['The number of rows per page must be a not null scalar'] = 'Liczba wierszy na stronie musi być większa od zera';
+// $lang['Number of rows per page'] = 'Liczba wierszy na stronie';
 $lang['Unknown identifier'] = 'Nieznany identyfikator';
 $lang['New password'] = 'Nowe hasło';
 $lang['Rate this photo'] = 'Oceń to zdjęcie';
diff --git a/language/pt_BR/common.lang.php b/language/pt_BR/common.lang.php
index 6311e147a..76c298efd 100644
--- a/language/pt_BR/common.lang.php
+++ b/language/pt_BR/common.lang.php
@@ -230,10 +230,8 @@ $lang['month'][8] = 'agosto';
 $lang['month'][9] = 'setembro';
 $lang['Most visited'] = 'Mais visitadas';
 $lang['display most visited photos'] = 'Mostra as imagens mais visitadas';
-$lang['The number of photos per row must be a not null scalar'] = 'O número de imagens por linha deve ser inteiro e não nulo';
-$lang['Number of photos per row'] = 'Número de imagens por linha';
-$lang['The number of rows per page must be a not null scalar'] = 'O número de linhas por página deve ser inteiro e não nulo';
-$lang['Number of rows per page'] = 'Número de linhas por página';
+$lang['The number of photos per page must be a not null scalar'] = 'O número de imagens por página deve ser inteiro e não nulo';
+$lang['Number of photos per page'] = 'Número de imagens por página';
 $lang['Unknown identifier'] = 'Origem desconhecida';
 $lang['New password'] = 'Senha nova';
 $lang['Rate this photo'] = 'Dê uma nota a esta imagem';
diff --git a/language/pt_PT/common.lang.php b/language/pt_PT/common.lang.php
index 03faeac03..8a7c3c7da 100644
--- a/language/pt_PT/common.lang.php
+++ b/language/pt_PT/common.lang.php
@@ -230,10 +230,8 @@ $lang['month'][8] = 'Agosto';
 $lang['month'][9] = 'Setembro';
 $lang['Most visited'] = 'Mais vistas';
 $lang['display most visited photos'] = 'Mostra as fotos mais vistas';
-$lang['The number of photos per row must be a not null scalar'] = 'O número de fotos por linha deve ser inteiro e não nulo';
-$lang['Number of photos per row'] = 'Número de imagens por linha';
-$lang['The number of rows per page must be a not null scalar'] = 'O número de linhas por página deve ser inteiro e não nulo';
-$lang['Number of rows per page'] = 'Número de linhas por página';
+$lang['The number of photos per page must be a not null scalar'] = 'O número de fotos por página deve ser inteiro e não nulo';
+$lang['Number of photos per page'] = 'Número de imagens por página';
 $lang['Unknown identifier'] = 'Identificador desconhecido';
 $lang['New password'] = 'Nova palavra-passe';
 $lang['Rate this photo'] = 'Classifique a esta foto';
diff --git a/language/ro_RO/common.lang.php b/language/ro_RO/common.lang.php
index 52174445f..f9439f151 100644
--- a/language/ro_RO/common.lang.php
+++ b/language/ro_RO/common.lang.php
@@ -221,10 +221,8 @@ $lang['return to normal view mode'] = 'Înapoi la vizualizarea normală';
 $lang['display a calendar by posted date'] = 'afişează un calendar în funcţie de data adăugării';
 $lang['Most visited'] = 'Cele mai vizionate';
 $lang['display most visited photos'] = 'afişează imaginile cele mai vizionate';
-$lang['The number of photos per row must be a not null scalar'] = 'Numărul de imagini pe linie trebuie să fie un număr întreg nenul';
-$lang['Number of photos per row'] = 'Numărul de miniaturi pe linie';
-$lang['The number of rows per page must be a not null scalar'] = 'Numărul de linii pe pagină trebuie să fie un număr întreg nenul';
-$lang['Number of rows per page'] = 'Numărul de linii pe pagină';
+$lang['The number of photos per page must be a not null scalar'] = 'Numărul de imagini pe pagină trebuie să fie un număr întreg nenul';
+$lang['Number of photos per page'] = 'Numărul de miniaturi pe pagină';
 $lang['Unknown identifier'] = 'Identificator necunoscut ';
 $lang['New password'] = 'Parolă nouă';
 $lang['Rate this photo'] = 'Evaluează aceasta imagine';
diff --git a/language/ru_RU/common.lang.php b/language/ru_RU/common.lang.php
index d806b84e5..00a778d63 100644
--- a/language/ru_RU/common.lang.php
+++ b/language/ru_RU/common.lang.php
@@ -231,10 +231,10 @@ $lang['month'][8] = 'Август';
 $lang['month'][9] = 'Сентябрь';
 $lang['Most visited'] = 'По популярности';
 $lang['display most visited photos'] = 'показать наиболее популярные фотографии';
-$lang['The number of photos per row must be a not null scalar'] = 'Число фотографий в ряду недолжно быть нулевым';
-$lang['Number of photos per row'] = 'Число фотографий в ряду';
-$lang['The number of rows per page must be a not null scalar'] = 'Число строк на странице должно быть не нулевым целым положительным';
-$lang['Number of rows per page'] = 'Число строк на странице';
+// $lang['The number of photos per row must be a not null scalar'] = 'Число фотографий в ряду недолжно быть нулевым';
+// $lang['Number of photos per row'] = 'Число фотографий в ряду';
+// $lang['The number of rows per page must be a not null scalar'] = 'Число строк на странице должно быть не нулевым целым положительным';
+// $lang['Number of rows per page'] = 'Число строк на странице';
 $lang['Unknown identifier'] = 'Неизвестный идентификатор';
 $lang['New password'] = 'Новый пароль';
 $lang['Rate this photo'] = 'Оценить эту фотографию';
diff --git a/language/sh_RS/common.lang.php b/language/sh_RS/common.lang.php
index 240622c57..f55207edb 100644
--- a/language/sh_RS/common.lang.php
+++ b/language/sh_RS/common.lang.php
@@ -230,10 +230,8 @@ $lang['month'][8] = 'Avgust';
 $lang['month'][9] = 'Septembar';
 $lang['Most visited'] = 'Najposjećenije';
 $lang['display most visited photos'] = 'prikaz najposjećenijih slika';
-$lang['The number of photos per row must be a not null scalar'] = 'broj slika po redu mora biti celobrojna vrednost';
-$lang['Number of photos per row'] = 'Broj slika po redu';
-$lang['The number of rows per page must be a not null scalar'] = 'Broj redova po stranici mora biti celobrojna vrednost';
-$lang['Number of rows per page'] = 'Broj redova po stranici';
+$lang['The number of photos per page must be a not null scalar'] = 'broj slika po stranici mora biti celobrojna vrednost';
+$lang['Number of photos per page'] = 'Broj slika po stranici';
 $lang['Unknown identifier'] = 'Nepoznata oznaka';
 $lang['New password'] = 'Nova lozinka';
 $lang['Rate this photo'] = 'Oceni ovu sliku';
diff --git a/language/sk_SK/common.lang.php b/language/sk_SK/common.lang.php
index fefad7328..8dc671ff6 100644
--- a/language/sk_SK/common.lang.php
+++ b/language/sk_SK/common.lang.php
@@ -235,10 +235,10 @@ $lang['month'][8] = 'August';
 $lang['month'][9] = 'September';
 $lang['Most visited'] = 'Najčastejšie zobrazované';
 $lang['display most visited photos'] = 'najčastejšie zobrazované fotografie';
-$lang['The number of photos per row must be a not null scalar'] = 'Počet fotografií v riadku musí byť číslo väčšie ako 0.';
-$lang['Number of photos per row'] = 'Počet fotografií v riadku';
-$lang['The number of rows per page must be a not null scalar'] = 'Počet riadkov na stránke musí byť číslo väčšie ako 0.';
-$lang['Number of rows per page'] = 'Počet riadkov na stránke';
+// $lang['The number of photos per row must be a not null scalar'] = 'Počet fotografií v riadku musí byť číslo väčšie ako 0.';
+// $lang['Number of photos per row'] = 'Počet fotografií v riadku';
+// $lang['The number of rows per page must be a not null scalar'] = 'Počet riadkov na stránke musí byť číslo väčšie ako 0.';
+// $lang['Number of rows per page'] = 'Počet riadkov na stránke';
 $lang['Unknown identifier'] = 'Neznámy identifikátor';
 $lang['New password'] = 'Nové heslo';
 $lang['Rate this photo'] = 'Ohodnotiť túto fotografiu';
diff --git a/language/sl_SL/common.lang.php b/language/sl_SL/common.lang.php
index cd2cc4e9d..75f9b4f16 100644
--- a/language/sl_SL/common.lang.php
+++ b/language/sl_SL/common.lang.php
@@ -204,10 +204,10 @@ $lang['Maximum height must be a number superior to 50'] = 'Maksimalna velikost m
 $lang['Maximum photo width'] = 'Maksimalna dolžina slik';
 $lang['Most visited'] = 'Najbolj obiskana';
 $lang['display most visited photos'] = 'prikaži najbolj obiskane slike';
-$lang['The number of photos per row must be a not null scalar'] = 'Število slik v vrstici, mora biti ne prazno celo število.';
-$lang['Number of photos per row'] = 'Število slik v vrstici';
-$lang['The number of rows per page must be a not null scalar'] = 'Število vrstic na strani, mora biti ne prazno celo število.';
-$lang['Number of rows per page'] = 'Število vrstic na stran';
+// $lang['The number of photos per row must be a not null scalar'] = 'Število slik v vrstici, mora biti ne prazno celo število.';
+// $lang['Number of photos per row'] = 'Število slik v vrstici';
+// $lang['The number of rows per page must be a not null scalar'] = 'Število vrstic na strani, mora biti ne prazno celo število.';
+// $lang['Number of rows per page'] = 'Število vrstic na stran';
 $lang['Unknown identifier'] = 'Neznan';
 $lang['New password'] = 'Novo geslo';
 $lang['Rate this photo'] = 'Glasuj';
diff --git a/language/sr_RS/common.lang.php b/language/sr_RS/common.lang.php
index b7c198172..09a9385c7 100644
--- a/language/sr_RS/common.lang.php
+++ b/language/sr_RS/common.lang.php
@@ -230,10 +230,10 @@ $lang['month'][8] = 'Август';
 $lang['month'][9] = 'Септембар';
 $lang['Most visited'] = 'Најпосјећеније';
 $lang['display most visited photos'] = 'приказ најпосјећенијих слика';
-$lang['The number of photos per row must be a not null scalar'] = 'број слика по реду мора бити целобројна вредност';
-$lang['Number of photos per row'] = 'Број слика по реду';
-$lang['The number of rows per page must be a not null scalar'] = 'Број редова по страници мора бити целобројна вредност';
-$lang['Number of rows per page'] = 'Број редова по страници';
+// $lang['The number of photos per row must be a not null scalar'] = 'број слика по реду мора бити целобројна вредност';
+// $lang['Number of photos per row'] = 'Број слика по реду';
+// $lang['The number of rows per page must be a not null scalar'] = 'Број редова по страници мора бити целобројна вредност';
+// $lang['Number of rows per page'] = 'Број редова по страници';
 $lang['Unknown identifier'] = 'Непозната ознака';
 $lang['New password'] = 'Нова лозинка';
 $lang['Rate this photo'] = 'Оцени ову слику';
diff --git a/language/sv_SE/common.lang.php b/language/sv_SE/common.lang.php
index bd47384aa..b020e6a70 100644
--- a/language/sv_SE/common.lang.php
+++ b/language/sv_SE/common.lang.php
@@ -265,10 +265,8 @@ $lang['return to normal view mode'] = 'återgå till normalt visnings läge';
 $lang['display a calendar by posted date'] = 'visa en kalender sorterad på publicerd datum';
 $lang['Most visited'] = 'Mest besökta';
 $lang['display most visited photos'] = 'Visa mest besökta bilder';
-$lang['The number of photos per row must be a not null scalar'] = 'Antalet bilder per rad måste vara ett heltal';
-$lang['Number of photos per row'] = 'Antal bilder per rad';
-$lang['The number of rows per page must be a not null scalar'] = 'Antalet rader per sida måste vara ett heltal';
-$lang['Number of rows per page'] = 'Antal rader per sida';
+$lang['The number of photos per page must be a not null scalar'] = 'Antalet bilder per sida måste vara ett heltal';
+$lang['Number of photos per page'] = 'Antal bilder per sida';
 $lang['Unknown identifier'] = 'Okänt användarnamn';
 $lang['New password'] = 'Nytt lösenord';
 $lang['Rate this photo'] = 'Betyg sätt den här bilden';
diff --git a/language/tr_TR/common.lang.php b/language/tr_TR/common.lang.php
index 3c12f76ef..f25819f62 100644
--- a/language/tr_TR/common.lang.php
+++ b/language/tr_TR/common.lang.php
@@ -233,10 +233,10 @@ $lang['month'][8] = "Ağustos";
 $lang['month'][9] = "Eylül";
 $lang['Most visited'] = 'En çok görüntülenenler';
 $lang['display most visited photos'] = 'en çok görüntülenen resimlerı göster';
-$lang['The number of photos per row must be a not null scalar'] = 'Her sıra için gösterilen resim sayısı 0 dan farklı bir tam sayı olmalıdır';
-$lang['Number of photos per row'] = 'Her sıra için gösterilen resim sayısı';
-$lang['The number of rows per page must be a not null scalar'] = 'Her sayfa için gösterilen resim sayısı 0 dan farklı bir tamsayı olmalıdır';
-$lang['Number of rows per page'] = 'Her sayfada gösterilen sıra sayısı';
+// $lang['The number of photos per row must be a not null scalar'] = 'Her sıra için gösterilen resim sayısı 0 dan farklı bir tam sayı olmalıdır';
+// $lang['Number of photos per row'] = 'Her sıra için gösterilen resim sayısı';
+// $lang['The number of rows per page must be a not null scalar'] = 'Her sayfa için gösterilen resim sayısı 0 dan farklı bir tamsayı olmalıdır';
+// $lang['Number of rows per page'] = 'Her sayfada gösterilen sıra sayısı';
 $lang['Unknown identifier'] = 'bilinmeyen kimlik';
 $lang['New password'] = 'yeni şifre';
 $lang['Rate this photo'] = 'resime puan ver';
diff --git a/language/uk_UA/common.lang.php b/language/uk_UA/common.lang.php
index d1f21f04a..28d5d6994 100644
--- a/language/uk_UA/common.lang.php
+++ b/language/uk_UA/common.lang.php
@@ -257,10 +257,10 @@ $lang['return to normal view mode'] = 'повернутися до звичай
 $lang['display a calendar by posted date'] = 'показувати календар за датою відправлення';
 $lang['Most visited'] = 'Найбільш відвідувані';
 $lang['display most visited photos'] = 'показувати найбільш відвідувані фотографії';
-$lang['The number of photos per row must be a not null scalar'] = 'Кількість фотографій у рядку повинно бути цілим ненульовим числом';
-$lang['Number of photos per row'] = 'Кількість фотографій в рядку';
-$lang['The number of rows per page must be a not null scalar'] = 'Кількість рядків на сторінці повинно бути цілим ненульовим числом';
-$lang['Number of rows per page'] = 'Кількість рядків на сторінці';
+// $lang['The number of photos per row must be a not null scalar'] = 'Кількість фотографій у рядку повинно бути цілим ненульовим числом';
+// $lang['Number of photos per row'] = 'Кількість фотографій в рядку';
+// $lang['The number of rows per page must be a not null scalar'] = 'Кількість рядків на сторінці повинно бути цілим ненульовим числом';
+// $lang['Number of rows per page'] = 'Кількість рядків на сторінці';
 $lang['Unknown identifier'] = 'Невідомий ідентифікатор';
 $lang['New password'] = 'Новий пароль';
 $lang['Rate this photo'] = 'Оцінити це фото';
diff --git a/language/vi_VN/common.lang.php b/language/vi_VN/common.lang.php
index 8d1c3c1b1..d40fb89c1 100644
--- a/language/vi_VN/common.lang.php
+++ b/language/vi_VN/common.lang.php
@@ -229,10 +229,10 @@ $lang['month'][8] = 'Tháng Tám';
 $lang['month'][9] = 'Tháng Chín';
 $lang['Most visited'] = 'Hình được xem nhiều nhất';
 $lang['display most visited photos'] = 'hiển thị những hình được xem nhiều nhất';
-$lang['The number of photos per row must be a not null scalar'] = 'Số hình mỗi hàng phải là đại lượng vô hướng không rỗng';
-$lang['Number of photos per row'] = 'Số hình trên mỗi hàng';
-$lang['The number of rows per page must be a not null scalar'] = 'Số hàng mỗi trang phải là đại lượng vô hướng không rỗng';
-$lang['Number of rows per page'] = 'Số hàng trên mỗi trang';
+// $lang['The number of photos per row must be a not null scalar'] = 'Số hình mỗi hàng phải là đại lượng vô hướng không rỗng';
+// $lang['Number of photos per row'] = 'Số hình trên mỗi hàng';
+// $lang['The number of rows per page must be a not null scalar'] = 'Số hàng mỗi trang phải là đại lượng vô hướng không rỗng';
+// $lang['Number of rows per page'] = 'Số hàng trên mỗi trang';
 $lang['Unknown identifier'] = 'Định danh không xác định';
 $lang['New password'] = 'Mật khẩu mới';
 $lang['Rate this photo'] = 'Đánh giá hình này';
diff --git a/language/zh_CN/common.lang.php b/language/zh_CN/common.lang.php
index 6714d8a08..6a7582796 100644
--- a/language/zh_CN/common.lang.php
+++ b/language/zh_CN/common.lang.php
@@ -230,10 +230,10 @@ $lang['month'][8] = "8月";
 $lang['month'][9] = "9月";
 $lang['Most visited'] = "最多观看";
 $lang['display most visited photos'] = "显示最多观看的图片";
-$lang['The number of photos per row must be a not null scalar'] = "每行图片的数量必须为非零整数";
-$lang['Number of photos per row'] = "每行图片的数量";
-$lang['The number of rows per page must be a not null scalar'] = "行数必须为非零整数";
-$lang['Number of rows per page'] = "每页行数";
+// $lang['The number of photos per row must be a not null scalar'] = "每行图片的数量必须为非零整数";
+// $lang['Number of photos per row'] = "每行图片的数量";
+// $lang['The number of rows per page must be a not null scalar'] = "行数必须为非零整数";
+// $lang['Number of rows per page'] = "每页行数";
 $lang['Unknown identifier'] = "未知标识符";
 $lang['New password'] = "新密码";
 $lang['Rate this photo'] = "给这张图片评分";
diff --git a/language/zh_TW/common.lang.php b/language/zh_TW/common.lang.php
index c7f64a12e..3d415555f 100644
--- a/language/zh_TW/common.lang.php
+++ b/language/zh_TW/common.lang.php
@@ -230,10 +230,10 @@ $lang['month'][8] = '八月';
 $lang['month'][9] = '九月';
 $lang['Most visited'] = '最受喜歡';
 $lang['display most visited photos'] = '顯示查看次數最多的圖片';
-$lang['The number of photos per row must be a not null scalar'] = '每行圖片數必須是非零整數';
-$lang['Number of photos per row'] = '每行圖片數';
-$lang['The number of rows per page must be a not null scalar'] = '每頁總行數必須是非零整數';
-$lang['Number of rows per page'] = '每頁行數';
+// $lang['The number of photos per row must be a not null scalar'] = '每行圖片數必須是非零整數';
+// $lang['Number of photos per row'] = '每行圖片數';
+// $lang['The number of rows per page must be a not null scalar'] = '每頁總行數必須是非零整數';
+// $lang['Number of rows per page'] = '每頁行數';
 $lang['Unknown identifier'] = '帳戶不存在';
 $lang['New password'] = '新密碼';
 $lang['Rate this photo'] = '對圖片投票';
diff --git a/profile.php b/profile.php
index e0bb598e8..498c5546e 100644
--- a/profile.php
+++ b/profile.php
@@ -49,7 +49,7 @@ if (!defined('PHPWG_ROOT_PATH'))
   if (isset($_POST['reset_to_default']))
   {
     $fields = array(
-      'nb_image_line', 'nb_line_page', 'maxwidth', 'maxheight', 'expand',
+      'nb_image_page', 'maxwidth', 'maxheight', 'expand',
       'show_nb_comments', 'show_nb_hits', 'recent_period', 'show_nb_hits'
       );
 
@@ -117,16 +117,10 @@ function save_profile_from_post($userdata, &$errors)
   if ($conf['allow_user_customization'] or defined('IN_ADMIN'))
   {
     $int_pattern = '/^\d+$/';
-    if (empty($_POST['nb_image_line'])
-        or (!preg_match($int_pattern, $_POST['nb_image_line'])))
+    if (empty($_POST['nb_image_page'])
+        or (!preg_match($int_pattern, $_POST['nb_image_page'])))
     {
-      $errors[] = l10n('The number of photos per row must be a not null scalar');
-    }
-
-    if (empty($_POST['nb_line_page'])
-        or (!preg_match($int_pattern, $_POST['nb_line_page'])))
-    {
-      $errors[] = l10n('The number of rows per page must be a not null scalar');
+      $errors[] = l10n('The number of photos per page must be a not null scalar');
     }
 
     if ($_POST['maxwidth'] != ''
@@ -216,7 +210,7 @@ function save_profile_from_post($userdata, &$errors)
     {
       // update user "additional" informations (specific to Piwigo)
       $fields = array(
-        'nb_image_line', 'nb_line_page', 'language', 'maxwidth', 'maxheight',
+        'nb_image_page', 'language', 'maxwidth', 'maxheight',
         'expand', 'show_nb_comments', 'show_nb_hits', 'recent_period', 'theme'
         );
 
@@ -261,8 +255,7 @@ function load_profile_in_template($url_action, $url_redirect, $userdata)
       'USERNAME'=>stripslashes($userdata['username']),
       'EMAIL'=>get_email_address_as_display_text(@$userdata['email']),
       'ALLOW_USER_CUSTOMIZATION'=>$conf['allow_user_customization'],
-      'NB_IMAGE_LINE'=>$userdata['nb_image_line'],
-      'NB_ROW_PAGE'=>$userdata['nb_line_page'],
+      'NB_IMAGE_PAGE'=>$userdata['nb_image_page'],
       'RECENT_PERIOD'=>$userdata['recent_period'],
       'MAXWIDTH'=>@$userdata['maxwidth'],
       'MAXHEIGHT'=>@$userdata['maxheight'],
diff --git a/themes/default/template/profile_content.tpl b/themes/default/template/profile_content.tpl
index f2e9e3b18..e43dcde8a 100644
--- a/themes/default/template/profile_content.tpl
+++ b/themes/default/template/profile_content.tpl
@@ -46,15 +46,9 @@
     <ul>
       <li>
         <span class="property">
-          <label for="nb_image_line">{'Number of photos per row'|@translate}</label>
+          <label for="nb_image_page">{'Number of photos per page'|@translate}</label>
         </span>
-        <input type="text" size="3" maxlength="2" name="nb_image_line" id="nb_image_line" value="{$NB_IMAGE_LINE}">
-      </li>
-      <li>
-        <span class="property">
-          <label for="nb_line_page">{'Number of rows per page'|@translate}</label>
-        </span>
-        <input type="text" size="3" maxlength="2" name="nb_line_page" id="nb_line_page" value="{$NB_ROW_PAGE}" >
+        <input type="text" size="3" maxlength="2" name="nb_image_page" id="nb_image_page" value="{$NB_IMAGE_PAGE}">
       </li>
       <li>
         <span class="property">