From ff46db430bd2aa265c16bbd6ff17e0bae710d332 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Thu, 8 Sep 2011 10:46:35 +0000
Subject: feature 2431: only keep MySQL on installation form

git-svn-id: http://piwigo.org/svn/trunk@12103 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/themes/default/template/install.tpl       | 53 -------------------------
 install.php                                     | 15 +------
 language/ar_SA/install.lang.php                 |  3 --
 language/ca_ES/install.lang.php                 |  3 --
 language/cs_CZ/install.lang.php                 |  3 --
 language/da_DK/install.lang.php                 |  3 --
 language/de_DE/install.lang.php                 |  3 --
 language/en_UK/install.lang.php                 |  3 --
 language/es_ES/install.lang.php                 |  3 --
 language/fa_IR/install.lang.php                 |  4 --
 language/fr_CA/install.lang.php                 |  3 --
 language/fr_FR/install.lang.php                 |  3 --
 language/he_IL/install.lang.php                 |  3 --
 language/hr_HR/install.lang.php                 |  2 -
 language/hu_HU/install.lang.php                 |  3 --
 language/it_IT/install.lang.php                 |  3 --
 language/ja_JP/install.lang.php                 |  3 --
 language/ka_GE/install.lang.php                 |  3 --
 language/lv_LV/install.lang.php                 |  3 --
 language/nl_NL/install.lang.php                 |  3 --
 language/no_NO/install.lang.php                 |  3 --
 language/pl_PL/install.lang.php                 |  3 --
 language/pt_PT/install.lang.php                 |  3 --
 language/ru_RU/install.lang.php                 |  3 --
 language/sh_RS/install.lang.php                 |  2 -
 language/sk_SK/install.lang.php                 |  3 --
 language/sr_RS/install.lang.php                 |  3 --
 language/sv_SE/install.lang.php                 |  3 --
 language/tr_TR/install.lang.php                 |  3 --
 language/vi_VN/install.lang.php                 |  3 --
 language/zh_CN/install.lang.php                 |  3 --
 language/zh_TW/install.lang.php                 |  3 --
 plugins/language_switch/flags.tpl               |  2 +-
 plugins/language_switch/language_switch.inc.php | 16 +++++---
 34 files changed, 12 insertions(+), 163 deletions(-)

diff --git a/admin/themes/default/template/install.tpl b/admin/themes/default/template/install.tpl
index 2988cfd42..454a81904 100644
--- a/admin/themes/default/template/install.tpl
+++ b/admin/themes/default/template/install.tpl
@@ -26,31 +26,6 @@
 {literal}
 <script type="text/javascript">
 $(function() {
-    $option_selected = $('#dblayer option:selected').attr('value');
-    if ($option_selected=='sqlite' || $option_selected=='pdo-sqlite') {
-       $('input[name=dbhost],input[name=dbuser],input[name=dbpasswd]').parent().parent().hide();
-    }
-    if ($option_selected=='mysql') {
-        $('#experimentalDbEngines').hide();
-    }
-
-    $('#dblayer').change(function() {
-        $db = this;
-        if ($db.value=='sqlite' || $db.value=='pdo-sqlite') {
-           $('input[name=dbhost],input[name=dbuser],input[name=dbpasswd]').parent().parent().hide();
-        } else {
-           $('input[name=dbhost],input[name=dbuser],input[name=dbpasswd]').parent().parent().show();
-        }
-
-        if ($db.value=='mysql') {
-            $('#experimentalDbEngines').hide();
-        }
-        else {
-            $('#experimentalDbEngines').show();
-        }
-      });
-  });
-
 $(document).ready(function() {
   $("a.externalLink").click(function() {
     window.open($(this).attr("href"));
@@ -248,34 +223,6 @@ jQuery().ready(function(){ldelim}
   <legend>{'Database configuration'|@translate}</legend>
 
   <table class="table2">
-    {if count($F_DB_ENGINES)>1}
-    <tr>
-      <td style="width: 30%;" class="fieldname">{'Database type'|@translate}</td>
-      <td>
-	<select name="dblayer" id="dblayer">
-	  {foreach from=$F_DB_ENGINES key=k item=v}
-	  <option value="{$k}"
-		  {if $k==$F_DB_LAYER and $v.available} selected="selected"{/if}
-		  {if !$v.available} disabled="disabled"{/if}
-		  >{$v.label}</option>
-	  {/foreach}
-	</select>    
-      </td>
-      <td class="fielddesc">{'The type of database your piwigo data will be store in'|@translate}</td>
-    {else}
-    <td colspan="3">
-    <input type="hidden" name="dbengine" value="{$F_DB_LAYER}">
-    </td>
-    {/if}
-    </tr>
-    <tr id="experimentalDbEngines">
-      <td colspan="3">
-<div class="warnings">
-      {'SQLite and PostgreSQL are currently in experimental state.'|@translate}
-      <a href="http://piwigo.org/forum/viewtopic.php?id=15927" class="externalLink">{'Learn more'|@translate}</a>
-</div>
-      </td>
-    </tr>
     <tr>
       <td style="width: 30%;" class="fieldname">{'Host'|@translate}</td>
       <td><input type="text" name="dbhost" value="{$F_DB_HOST}"></td>
diff --git a/install.php b/install.php
index 695f2371a..9a877a25b 100644
--- a/install.php
+++ b/install.php
@@ -96,15 +96,6 @@ if( !@get_magic_quotes_gpc() )
 
 define('DEFAULT_PREFIX_TABLE', 'piwigo_');
 
-// default database engine proposed if severals are available
-// choices : sqlite, mysql, pgsql, pdo-sqlite
-// see include/dblayer/dblayers.inc.php
-define('DEFAULT_DB_ENGINE', 'mysql');
-
-// database engine default choice between sqlite (native or via pdo)
-// if the twice are available.
-define('DEFAULT_DB_SQLITE', 'native'); 
-
 if (isset($_POST['install']))
 {
   $prefixeTable = $_POST['prefix'];
@@ -150,7 +141,7 @@ $dbhost = (!empty($_POST['dbhost'])) ? $_POST['dbhost'] : 'localhost';
 $dbuser = (!empty($_POST['dbuser'])) ? $_POST['dbuser'] : '';
 $dbpasswd = (!empty($_POST['dbpasswd'])) ? $_POST['dbpasswd'] : '';
 $dbname = (!empty($_POST['dbname'])) ? $_POST['dbname'] : '';
-$dblayer = (!empty($_POST['dblayer'])) ? $_POST['dblayer'] : DEFAULT_DB_ENGINE;
+$dblayer = 'mysql';
 
 $admin_name = (!empty($_POST['admin_name'])) ? $_POST['admin_name'] : '';
 $admin_pass1 = (!empty($_POST['admin_pass1'])) ? $_POST['admin_pass1'] : '';
@@ -419,8 +410,6 @@ INSERT INTO '.$prefixeTable.'config (param,value,comment)
 }
 
 //------------------------------------------------------ start template output
-$dbengines = available_engines();
-
 foreach ($languages->fs_languages as $language_code => $fs_language)
 {
   if ($language == $language_code)
@@ -436,8 +425,6 @@ $template->assign(
     'T_CONTENT_ENCODING' => 'utf-8',
     'RELEASE' => PHPWG_VERSION,
     'F_ACTION' => 'install.php?language=' . $language,
-    'F_DB_ENGINES' => $dbengines,
-    'F_DB_LAYER' => $dblayer,
     'F_DB_HOST' => $dbhost,
     'F_DB_USER' => $dbuser,
     'F_DB_NAME' => $dbname,
diff --git a/language/ar_SA/install.lang.php b/language/ar_SA/install.lang.php
index c0c5b6582..6f0ce6993 100644
--- a/language/ar_SA/install.lang.php
+++ b/language/ar_SA/install.lang.php
@@ -32,8 +32,6 @@ $lang['Webmaster login'] = 'دخول المدير';
 $lang['It will be shown to the visitors. It is necessary for website administration'] = 'سوف تظهر للزوار ، ضرورية للادارة و لوحة التحكم';
 $lang['Connection to server succeed, but it was impossible to connect to database'] = 'تم الاتصال بالخادم الموقع ، لكن لم يتم يتم الاتصال بقاعدة البيانات';
 $lang['Can\'t connect to server'] = 'لا يمكن الاتصال بالخادم';
-$lang['Database type'] = 'نوع قاعدة البيانات';
-$lang['The type of database your piwigo data will be store in'] = 'قاعدة بيانات المعرض Piwigo سوف تخزن ';
 $lang['Host'] = 'المضيف';
 $lang['localhost, sql.multimania.com, toto.freesurf.fr'] = 'localhost, sql.multimania.com, toto.freesurf.fr';
 $lang['User'] = 'المستخدم';
@@ -68,7 +66,6 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'فشل في إنشاء ملف التكوين local/config/database.inc.php ';
 $lang['Download the config file'] = 'تحميل ملف التكوين';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'يمكنك تحميل ملف التكوين وتحميله إلى الدليل المحلي';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'تحت التجربية حاليا  SQLite و PostgreSQL ';
 $lang['Learn more'] = 'تعلم أكثر';
 
 ?>
\ No newline at end of file
diff --git a/language/ca_ES/install.lang.php b/language/ca_ES/install.lang.php
index 2024ac317..df5f58ed1 100644
--- a/language/ca_ES/install.lang.php
+++ b/language/ca_ES/install.lang.php
@@ -34,8 +34,6 @@ $lang['Webmaster login'] = "Nom de l'usuari administrador";
 $lang['It will be shown to the visitors. It is necessary for website administration'] = "Això es mostrarà als visitants. És necessari per el lloc web d'administració";
 $lang['Connection to server succeed, but it was impossible to connect to database'] = "La connexió amb el servidor ha estat exitosa, però la connexió amb la base de dades ha estat impossible";
 $lang['Can\'t connect to server'] = "No es pot connectar amb el servidor";
-$lang['Database type'] = "Tipus de base de dades";
-$lang['The type of database your piwigo data will be store in'] = "El tipus de base de dades on s'emmagatzemaran les dades de la teva galeria Piwigo";
 $lang['Host'] = "Amfitrió";
 $lang['localhost, sql.multimania.com, toto.freesurf.fr'] = "localhost, sql.multimania.com, toto.freesurf.fr";
 $lang['User'] = "Usuari";
@@ -70,6 +68,5 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'La creació del fitxer de configuració local/config/database.inc.php ha fallat.';
 $lang['Download the config file'] = 'Descarregueu el fitxer de configuració';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Podeu descarregar el fitxer de configuració i penjar-lo al directori local/config de la vostra instal·lació.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite i PostgreSQL s\'estant executant en mode experimental.';
 $lang['Learn more'] = 'Apreneu-ne més';
 ?>
diff --git a/language/cs_CZ/install.lang.php b/language/cs_CZ/install.lang.php
index be3ff4458..ab6306367 100644
--- a/language/cs_CZ/install.lang.php
+++ b/language/cs_CZ/install.lang.php
@@ -55,8 +55,6 @@ $lang['verification'] = 'kontrola';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Potřebujete pomoc ? Zeptejte se na <a href="%s">Piwigo fóru</a>.';
 $lang['Webmaster mail address'] = 'E-mail správce';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Návštěvníci mohou pomocí tohoto e-mailu správce kontaktovat';
-$lang['Database type'] = 'Typ databáze';
-$lang['The type of database your piwigo data will be store in'] = 'Typ databáze Vaší Piwigo databáze bude uložen';
 $lang['PHP 5 is required'] = 'Je nutný PHP 5';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Na Vašem webhostingu je PHP %s.';
 $lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo se může pokusit změnit Vaše nastavení na PHP 5 tím, že vytvoří nebo změní soubor .htaccess.';
@@ -71,7 +69,6 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'Vytvoření souboru local/config/database.inc.php se nepodařilo.';
 $lang['Download the config file'] = 'Stáhnout konfigurační soubor';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Můžete stáhnout konfigurační soubor a nahrát jej do adrešáře local/config Vaší instalace.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite a PostgreSQL se aktuálně teprve testují.';
 $lang['Learn more'] = 'Zjistit více';
 $lang['Just another Piwigo gallery'] = 'Jen další galerie Piwigo';
 $lang['Welcome to my photo gallery'] = 'Vítejte na mé fotogalerii';
diff --git a/language/da_DK/install.lang.php b/language/da_DK/install.lang.php
index c228f02a9..812b095ea 100644
--- a/language/da_DK/install.lang.php
+++ b/language/da_DK/install.lang.php
@@ -63,13 +63,10 @@ $lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo var ikke istand til a
 $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = "Du henvises til din webhost for at se hvordan du selv kan skifte til PHP 5.";
 $lang['Hope to see you back soon.'] = 'Håber snart at se dig igen.';
 
-$lang['Database type'] = 'Database type';
-$lang['The type of database your piwigo data will be store in'] = 'Din Piwigo database vil blive lagret i';
 $lang['Congratulations, Piwigo installation is completed'] = 'Tillykke, Piwigo installationen er slut';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'En alternativ måde er at kopiere teksten i boksen ovenover og sætte den ind i filen "local/config/database.inc.php" (Advarsel : database.inc.php må kun indeholde hvad der er i tekstfeltet, ingen linieskift eller andet.)';
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'Oprettelsen af local/config/database.inc.php gik galt.';
 $lang['Download the config file'] = 'Download config filen';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Du kan downloade config filen og uploade den til local/config i din installation.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite og PostgreSQL er i øjeblikket kun som eksperiment.';
 $lang['Learn more'] = 'Lær mere';
 ?>
\ No newline at end of file
diff --git a/language/de_DE/install.lang.php b/language/de_DE/install.lang.php
index b0e63d454..e01276284 100644
--- a/language/de_DE/install.lang.php
+++ b/language/de_DE/install.lang.php
@@ -66,14 +66,11 @@ $lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ist nicht in der Lage
 $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = "Sie können Kontakt zu ihrem Hosting-Provider aufnehmen und um Unterstützung bitten zur Umstellung auf PHP 5.";
 $lang['Hope to see you back soon.'] = 'Wir hoffen, Sie sind bald wieder zurück.';
 
-$lang['Database type'] = 'Datenbanktyp';
-$lang['The type of database your piwigo data will be store in'] = 'Der Typ der Datenbank, die Piwigo-Daten werden gespeichert in';
 $lang['Congratulations, Piwigo installation is completed'] = 'Glückwunsch, Sie haben Piwigo erfolgreich installiert';
 
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Eine andere Lösung ist, den Text im Kasten oben zu kopieren und ihn in die Datei "local/config/database.inc.php" einzufügen (Warnung: database.inc.php darf nur enthalten, was im Textbereich ist, keine Zeilenumbrüche (Enter) oder Leerzeichen)';
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'Die Erstellung der Datei local/config/database.inc.php ist fehlgeschlagen.';
 $lang['Download the config file'] = 'Lade die Konfigurationsdatei herunter';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'SIe können die Konfigurationsdatei herunterladen und in den Ordner local/config ihrer Installation hochladen.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'Die Unterstüztung von SQLite und PostgreSQL befindet sich noch in einem experimentellen Stadium.';
 $lang['Learn more'] = 'Mehr Informationen';
 ?>
diff --git a/language/en_UK/install.lang.php b/language/en_UK/install.lang.php
index d4922d4da..d1c750027 100644
--- a/language/en_UK/install.lang.php
+++ b/language/en_UK/install.lang.php
@@ -34,8 +34,6 @@ $lang['Webmaster login'] = "Webmaster login";
 $lang['It will be shown to the visitors. It is necessary for website administration'] = "It will be shown to the visitors. It is necessary for website administration";
 $lang['Connection to server succeed, but it was impossible to connect to database'] = "Connection to server successful, but the connection to the database is impossible";
 $lang['Can\'t connect to server'] = "Cannot connect to server";
-$lang['Database type'] = "Database type";
-$lang['The type of database your piwigo data will be store in'] = "The type of database your Piwigo data will be store in";
 $lang['Host'] = "Host";
 $lang['localhost, sql.multimania.com, toto.freesurf.fr'] = "localhost, sql.multimania.com, toto.freesurf.fr";
 $lang['User'] = "User";
@@ -70,7 +68,6 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'Creation of config file local/config/database.inc.php failed.';
 $lang['Download the config file'] = 'Download the config file';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'You can download the config file and upload it to local/config directory of your installation.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite and PostgreSQL are currently in experimental state.';
 $lang['Learn more'] = 'Learn more';
 $lang['Just another Piwigo gallery'] = 'Just another Piwigo gallery';
 $lang['Welcome to my photo gallery'] = 'Welcome to my photo gallery';
diff --git a/language/es_ES/install.lang.php b/language/es_ES/install.lang.php
index 2ea250d37..ca063a7aa 100644
--- a/language/es_ES/install.lang.php
+++ b/language/es_ES/install.lang.php
@@ -67,14 +67,11 @@ $lang["You may referer to your hosting provider's support and see how you could
 $lang['Hope to see you back soon.'] = 'Esperando verle  muy pronto...';
 
 
-$lang['Database type'] = 'Tipo de base de datos';
-$lang['The type of database your piwigo data will be store in'] = 'La base de datos en la cual será almacenado su dato Piwigo';
 $lang['Congratulations, Piwigo installation is completed'] = 'Félicitation, Piwigo está completamente instalado';
 
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Una solución alternativa es copiar el texto en la zona más abajo and de pegarlo en el fichero  "local/config/database.inc.php" (Atención: database.inc.php debe contener sólo lo que se encuentra en la zona, no de regreso a la línea, ningún espacio';
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'La creación del fichero de configuración local/config/database.inc.php fue suspendido.';
 $lang['Download the config file'] = 'Descargar el fichero de configuración';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Usted puede descargar el fichero de configuración y carga en el repertorio local/config de su instalación Piwigo.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite y PostgreSQL están actualmente en estado experimental.';
 $lang['Learn more'] = 'Más información';
 ?>
\ No newline at end of file
diff --git a/language/fa_IR/install.lang.php b/language/fa_IR/install.lang.php
index f5704c966..6fb2523d6 100644
--- a/language/fa_IR/install.lang.php
+++ b/language/fa_IR/install.lang.php
@@ -34,8 +34,6 @@ $lang['Webmaster login'] = "ورود وب‌مستر";
 $lang['It will be shown to the visitors. It is necessary for website administration'] = "این برای بازدیدکنندگان نمایش‌داده و برای مدیریت وب‌سایت ضروری است";
 $lang['Connection to server succeed, but it was impossible to connect to database'] = "ارتباط با سرور با موفقيت انجام شد اما ارتباط با سرور پايگاه داده با مشکل مواجه شد.";
 $lang['Can\'t connect to server'] = "ارتباط با سرور ممکن نيست";
-$lang['Database type'] = "نوع پايگاه داده";
-$lang['The type of database your piwigo data will be store in'] = "نوع پايگاه داده گالري شما در اينجا قرار مي‌گيرد";
 $lang['Host'] = "ميزبان";
 $lang['localhost, sql.multimania.com, toto.freesurf.fr'] = "localhost, sql.multimania.com, toto.freesurf.fr";
 $lang['User'] = "نام‌کاربري";
@@ -70,7 +68,5 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'اشکال در ایجاد فایل local/config/database.inc.php.';
 $lang['Download the config file'] = 'دريافت فايل پيکربندي';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'شما مي‌توانيد فايل پيکربندي را دانلود کنيد و آن را در دايرکتوري local/config در محلي که گالري را نصب کرديد آپلود کنيد.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite and PostgreSQL are currently in experimental state.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite و PostgreSQL در حال آزمایش هستند.(استفاده از آن‌ها یک ریسک است!)';
 $lang['Learn more'] = 'اطلاعات بيشتر در اين‌باره';
 ?>
\ No newline at end of file
diff --git a/language/fr_CA/install.lang.php b/language/fr_CA/install.lang.php
index aaabd1ef0..5b4f40613 100644
--- a/language/fr_CA/install.lang.php
+++ b/language/fr_CA/install.lang.php
@@ -34,8 +34,6 @@ $lang['Webmaster login'] = "Identifiant de l'administrateur";
 $lang['It will be shown to the visitors. It is necessary for website administration'] = "Cet identifiant apparaîtra à tous vos visiteurs. Il vous sert pour administrer le site";
 $lang['Connection to server succeed, but it was impossible to connect to database'] = "La connexion au serveur est OK, mais la connection à cette base de données est impossible";
 $lang['Can\'t connect to server'] = "Impossible de se connecter au serveur";
-$lang['Database type'] = "Type de base de données";
-$lang['The type of database your piwigo data will be store in'] = "La base de données dans laquelle seront stockées vos données Piwigo";
 $lang['Host'] = "Hôte";
 $lang['localhost, sql.multimania.com, toto.freesurf.fr'] = "localhost, sql.multimania.com, toto.freesurf.fr";
 $lang['User'] = "Utilisateur";
@@ -71,6 +69,5 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'La création du fichier de configuration local/config/database.inc.php a échoué.';
 $lang['Download the config file'] = 'Télécharger le fichier de configuration';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Vous pouvez télécharger le fichier de configuration et le transférer dans le répertoire local/config de votre installation Piwigo.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'Les types SQLite et PostgreSQL sont actuellement en phase expérimentale.';
 $lang['Learn more'] = 'En savoir plus';
 ?>
diff --git a/language/fr_FR/install.lang.php b/language/fr_FR/install.lang.php
index f03752344..06ea386e7 100644
--- a/language/fr_FR/install.lang.php
+++ b/language/fr_FR/install.lang.php
@@ -34,8 +34,6 @@ $lang['Webmaster login'] = "Identifiant de l'administrateur";
 $lang['It will be shown to the visitors. It is necessary for website administration'] = "Cet identifiant apparaîtra à tous vos visiteurs. Il vous sert pour administrer le site";
 $lang['Connection to server succeed, but it was impossible to connect to database'] = "La connexion au serveur est OK, mais la connection à cette base de données est impossible";
 $lang['Can\'t connect to server'] = "Impossible de se connecter au serveur";
-$lang['Database type'] = "Type de base de données";
-$lang['The type of database your piwigo data will be store in'] = "La base de données dans laquelle seront stockées vos données Piwigo";
 $lang['Host'] = "Hôte";
 $lang['localhost, sql.multimania.com, toto.freesurf.fr'] = "localhost, sql.multimania.com, toto.freesurf.fr";
 $lang['User'] = "Utilisateur";
@@ -71,7 +69,6 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'La création du fichier de configuration local/config/database.inc.php a échoué.';
 $lang['Download the config file'] = 'Télécharger le fichier de configuration';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Vous pouvez télécharger le fichier de configuration et le transférer dans le répertoire local/config de votre installation Piwigo.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'Les types SQLite et PostgreSQL sont actuellement en phase expérimentale.';
 $lang['Learn more'] = 'En savoir plus';
 $lang['Just another Piwigo gallery'] = 'Une galerie Piwigo de plus';
 $lang['Welcome to my photo gallery'] = 'Bienvenue sur ma galerie photo';
diff --git a/language/he_IL/install.lang.php b/language/he_IL/install.lang.php
index 41ea44a92..ba6f45191 100644
--- a/language/he_IL/install.lang.php
+++ b/language/he_IL/install.lang.php
@@ -34,8 +34,6 @@ $lang['Webmaster login'] = "התחברות מנהל האתר";
 $lang['It will be shown to the visitors. It is necessary for website administration'] = "יוצג בפני המבקרים. נחוץ בשביל מנהל האתר";
 $lang['Connection to server succeed, but it was impossible to connect to database'] = "התחבר לשרת בהצלחה, אך לא הצליח להתחבר לבסיס נתונים";
 $lang['Can\'t connect to server'] = "לא מצליח להתחבר לשרת";
-$lang['Database type'] = "סוג בסיס הנתונים";
-$lang['The type of database your piwigo data will be store in'] = "סוג בסיס הנתונים שהגלריה שלך תהיה מאוחסנת בו";
 $lang['Host'] = "שרת מארח";
 $lang['localhost, sql.multimania.com, toto.freesurf.fr'] = "localhost, sql.multimania.com, toto.freesurf.fr";
 $lang['User'] = "משתמש";
@@ -70,6 +68,5 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'יצירת קובץ config local/config/database.inc.php ניכשל.';
 $lang['Download the config file'] = 'הורד את קובץ config';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'אתה יכול להוריד את קובץ config ולהעלות אותו אל local/config בתיקיית ההתקנה שלך.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite ו PostgreSQL כרגע במצב ניסיוני.';
 $lang['Learn more'] = 'למד עוד';
 ?>
\ No newline at end of file
diff --git a/language/hr_HR/install.lang.php b/language/hr_HR/install.lang.php
index 13a172335..1de7b8073 100644
--- a/language/hr_HR/install.lang.php
+++ b/language/hr_HR/install.lang.php
@@ -57,8 +57,6 @@ $lang['Webmaster mail address'] = 'Webmaster-ova e-mail adresa';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Posjetitelji će moći pisati upravitelju galerije preko ove adrese';
 
 // piwigo 2.1
-$lang['Database type'] = 'Vrsta baze podataka';
-$lang['The type of database your piwigo data will be store in'] = 'Vrsta baze podataka u kojoj će se pohraniti vaši Piwigo podatci';
 $lang['PHP 5 is required'] = 'PHP 5 je obvezan';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Čini se da vaše web mjesto trenutno koristi PHP inačicu %s.';
 $lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo će pokušati podesiti sustavne postavke na PHP 5 izradom ili prilagodbom .htaccess zapisa.';
diff --git a/language/hu_HU/install.lang.php b/language/hu_HU/install.lang.php
index c1bc1bfdb..0ff235887 100644
--- a/language/hu_HU/install.lang.php
+++ b/language/hu_HU/install.lang.php
@@ -34,8 +34,6 @@ $lang['Webmaster login'] = 'Webmester';
 $lang['It will be shown to the visitors. It is necessary for website administration'] = 'A látogatók látni fogják. Szükséges a weboldal adminisztrációjához';
 $lang['Connection to server succeed, but it was impossible to connect to database'] = 'A kapcsolat a kiszolgálóval rendben, de nem sikerült csatlakozni az adatbázishoz';
 $lang['Can\'t connect to server'] = 'Nem sikerült kapcsolódni a szerverhez';
-$lang['Database type'] = "Adatbázis típusa";
-$lang['The type of database your piwigo data will be store in'] = "Az adatbázis típusa a Piwigo adatok tárolására";
 $lang['Host'] = 'MySQL host';
 $lang['localhost, sql.multimania.com, toto.freesurf.fr'] = 'localhost, sql, stb.';
 $lang['User'] = 'Felhasználó név';
@@ -70,7 +68,6 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'A local/config/database.inc.php konfigurációs fájl létrehozása sikertelen.';
 $lang['Download the config file'] = 'Konfigurációs fájl letöltése';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Letöltheti a konfigurációs fájlt és töltse fel a telepítésének local/config könyvtárába.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite és PostgreSQL jelenleg kísérleti állapotban.';
 $lang['Learn more'] = 'Bővebben';
 $lang['Just another Piwigo gallery'] = 'Csak egy újabb Piwigo galéria';
 $lang['Welcome to my photo gallery'] = 'Üdvözöljük a képgalériában';
diff --git a/language/it_IT/install.lang.php b/language/it_IT/install.lang.php
index 47cfc2f0e..64b06f757 100644
--- a/language/it_IT/install.lang.php
+++ b/language/it_IT/install.lang.php
@@ -34,8 +34,6 @@ $lang['Webmaster login'] = 'Nome utente webmaster';
 $lang['It will be shown to the visitors. It is necessary for website administration'] = 'Esso verr�mostrato ai visitatori. � necessario per amministrare il vostro sito';
 $lang['Connection to server succeed, but it was impossible to connect to database'] = 'Connessione al server riuscita, ma non � stato possibile connettersi al database';
 $lang['Can\'t connect to server'] = 'Impossibile connettersi al server';
-$lang['Database type'] = 'Tipo database';
-$lang['The type of database your piwigo data will be store in'] = 'Il tipo di database dove verranno inseriti i dati di Piwigo';
 $lang['Host'] = 'Host';
 $lang['localhost, sql.multimania.com, toto.freesurf.fr'] = 'localhost, sql.multimania.com, pluto.libero.it';
 $lang['User'] = 'Utente';
@@ -71,7 +69,6 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'Creazione del file di configurazione local/config/database.inc.php fallita.';
 $lang['Download the config file'] = 'Scaricare il file di configurazione';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = '� possibile scaricare il file di configurazione e caricarlo in local/config della vostra installazione di Piwigo.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite e PostgreSQL sono attualmente in stato sperimentale.';
 $lang['Learn more'] = 'Per saperne di pi�';
 $lang['Just another Piwigo gallery'] = 'Una galleria Piwigo in pi� ';
 $lang['Welcome to my photo gallery'] = 'Benvenuti nella mia galleria fotografica';
diff --git a/language/ja_JP/install.lang.php b/language/ja_JP/install.lang.php
index 4618f9602..ca9f68951 100644
--- a/language/ja_JP/install.lang.php
+++ b/language/ja_JP/install.lang.php
@@ -55,8 +55,6 @@ $lang['verification'] = '確認';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'ヘルプが必要ですか? <a href="%s">Piwigoメッセージボード</a>にて、あなたの質問を投稿してください。';
 $lang['Webmaster mail address'] = 'ウェブマスタメールアドレス';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'ビジターは、このメールアドレスでサイト管理者に連絡することができます。';
-$lang['Database type'] = 'データベース種';
-$lang['The type of database your piwigo data will be store in'] = 'あなたのPiwigoデータが保存されているデータベース種';
 $lang['PHP 5 is required'] = 'PHP 5は必要';
 $lang['It appears your webhost is currently running PHP %s.'] = 'あなたのウェブホストは現在PHP %sを使っているらしいです。';
 $lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigoは.htaccess ファイルを作成するか、変更しようとしてPHP 5に設定してみます。';
@@ -71,6 +69,5 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'local/config/database.inc.php のconfig ファイル作成失敗しました。';
 $lang['Download the config file'] = 'config ファイルをダウンロードします。';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'config ファイルをダウンロードし、インストールされた local/config ディレクトリーにアップロードすることができます。';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite と PostgreSQL は現在試験中です。';
 $lang['Learn more'] = '詳細はこちら';
 ?>
\ No newline at end of file
diff --git a/language/ka_GE/install.lang.php b/language/ka_GE/install.lang.php
index 60efd4155..f2440aa5a 100644
--- a/language/ka_GE/install.lang.php
+++ b/language/ka_GE/install.lang.php
@@ -56,8 +56,6 @@ $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.']
 $lang['Webmaster mail address'] = 'ვებმასტერის ელ.ფოსტა';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'გამოყენებული იქნება მომხმარებლების მიერ ადმინისტრატორთან კავშირისათვის';
 
-$lang['Database type'] = 'მონაცემთა ბაზის ტიპი';
-$lang['The type of database your piwigo data will be store in'] = 'მონაცემთა ბაზის ტიპი შენახული იქნება';
 $lang['PHP 5 is required'] = 'საჭიროა PHP 5';
 $lang['It appears your webhost is currently running PHP %s.'] = 'სავარაუდოდ თქვენი ხოსტინგი ამჟამად იყენებს PHP %s.';
 $lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo–ს შეუძლია შეეცადოს გადართოს თქვენი კონფიგურაცია PHP 5, .htaccess ფაილს შექმნით ან შეცვლით.';
@@ -72,6 +70,5 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'კონფიგურაციის ფაილის local/config/database.inc.php შექმნა არ მოხერხდა.';
 $lang['Download the config file'] = 'ავტვირთოთ კონფიგურაციის ფაილი';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'თქვენ შეგიძლიათ ატვირთოთ კონფიგურაციის ფაილი და გადასცეთ იგი local/config directory ში.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite და PostgreSQL ამჟამად იმყოპება ექსპერიმენტის სტადიაში.';
 $lang['Learn more'] = 'გავიგოთ მეტი';
 ?>
\ No newline at end of file
diff --git a/language/lv_LV/install.lang.php b/language/lv_LV/install.lang.php
index 8bffdf137..30b744579 100644
--- a/language/lv_LV/install.lang.php
+++ b/language/lv_LV/install.lang.php
@@ -32,8 +32,6 @@ $lang['Webmaster login'] = "Webmastera logins";
 $lang['It will be shown to the visitors. It is necessary for website administration'] = "Tas tiks radits apmekletajiem. Tas nepieciešams web lapas administrešanai";
 $lang['Connection to server succeed, but it was impossible to connect to database'] = "Savienojums ar serveri sekmigs, bet savienojums ar datu bazi nav iespejams";
 $lang['Can\'t connect to server'] = "Nevar savienoties ar serveri";
-$lang['Database type'] = "Datubazes tips";
-$lang['The type of database your piwigo data will be store in'] = "Datu bazes tips, kur tiks galbati Jusu Ptwigo dati.";
 $lang['Host'] = "Hosts";
 $lang['localhost, sql.multimania.com, toto.freesurf.fr'] = "localhost, sql.multimania.com, toto.freesurf.fr";
 $lang['User'] = "Lietotajs";
@@ -68,6 +66,5 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'Konfigurācijas faila local/config/database.inc.php izveide ir nesekmīga.';
 $lang['Download the config file'] = 'Lejupladet config failu';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Jums jalejupielade configuracijas fails un jaielade tas Jusu instalacijas local/config mape.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite un PostgreSQL patlaban darbojas eksperimentala režima.';
 $lang['Learn more'] = 'Uzzini vairak';
 ?>
\ No newline at end of file
diff --git a/language/nl_NL/install.lang.php b/language/nl_NL/install.lang.php
index 277554ec2..434863260 100644
--- a/language/nl_NL/install.lang.php
+++ b/language/nl_NL/install.lang.php
@@ -55,8 +55,6 @@ $lang['verification'] = 'verificatie';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Hulp nodig ? Stel uw vraag op het <a href="%s" target="_blank">Piwigo forum</a>.';
 $lang['Webmaster mail address'] = 'Email-adres van de webbeheerder';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Met dit email-adres kunnen bezoekers contact opnemen met de beheerder';
-$lang['Database type'] = 'Database type';
-$lang['The type of database your piwigo data will be store in'] = 'Het type database waarin uw Piwigo-gegevens worden opgeslagen';
 $lang['PHP 5 is required'] = 'PHP 5 is vereist';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Het lijkt er op dat uw webhost momenteel gebruik maakt van PHP %s.';
 $lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan proberen uw configuratie om te zetten naar PHP 5 door het aanmaken of wijzigen van een .htaccess bestand.';
@@ -71,7 +69,6 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'Het aanmaken van config-bestand local/config/database.inc.php is mislukt.';
 $lang['Download the config file'] = 'Download het config-bestand';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'U kunt het config-bestand downloaden en het uploaden naar de local/config directory van uw Piwigo-installatie.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] =
 'SQLite en PostgreSQL zijn momenteel nog in een experimenteel stadium.';
 $lang['Learn more'] = 'Leer meer';
 ?>
\ No newline at end of file
diff --git a/language/no_NO/install.lang.php b/language/no_NO/install.lang.php
index 324ac6016..ac63a543b 100644
--- a/language/no_NO/install.lang.php
+++ b/language/no_NO/install.lang.php
@@ -32,8 +32,6 @@ $lang['Webmaster login'] = 'Webmaster innlogging';
 $lang['It will be shown to the visitors. It is necessary for website administration'] = 'Det vil vises for besøkende. Det er nødvendig med side administrasjon';
 $lang['Connection to server succeed, but it was impossible to connect to database'] = 'Tilkobling til server er ok, men tilkobling til databasen er ikke mulig';
 $lang['Can\'t connect to server'] = 'Kan ikke koble til server';
-$lang['Database type'] = 'Database type';
-$lang['The type of database your piwigo data will be store in'] = 'Type database dine Piwigo data vil bli lagret i';
 $lang['Host'] = 'Host';
 $lang['localhost, sql.multimania.com, toto.freesurf.fr'] = 'localhost, sql.multimania.com, toto.freesurf.fr';
 $lang['User'] = 'bruker (user)';
@@ -68,7 +66,6 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'Opprettelse av konfig fil local/config/database.inc.php feilet.';
 $lang['Download the config file'] = 'Last ned konfig fil';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Du kan laste ned konfig filen og laste den opp til local/config mappen i din installasjon.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite og PostgreSQL er foreløpig i en eksperimentell fase.';
 $lang['Learn more'] = 'Lær mer';
 
 ?>
\ No newline at end of file
diff --git a/language/pl_PL/install.lang.php b/language/pl_PL/install.lang.php
index 17f28f9c7..89fdb44ac 100644
--- a/language/pl_PL/install.lang.php
+++ b/language/pl_PL/install.lang.php
@@ -66,13 +66,10 @@ $lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nie mógł skonfiguro
 $lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Możesz skontaktować się z działem wsparcia Twojego providera aby dowiedzieć się jak włączyć PHP 5.';
 $lang['Hope to see you back soon.'] = 'Do zobaczenia wkrótce.';
 //For 2.1.0
-$lang['Database type'] = 'Typ bazy danych';
-$lang['The type of database your piwigo data will be store in'] = 'Typ bazy danych Twojego Piwigo zostanie zapisany w';
 $lang['Congratulations, Piwigo installation is completed'] = 'Gratulacje, instalacja Piwigo zakończona sukcesem';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Alternatywnym rozwiązaniem jest skopiować tekst z powyższego textbox i wkleić do pliku "local/config/database.inc.php" (Uwaga : database.inc.php musi zawierać to co jest w textbox i nie może zawierać znaków spacji oraz enter)';
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'Nie powiodło się stworzenie pliku konfiguracyjnego local/config/database.inc.php.';
 $lang['Download the config file'] = 'Pobierz plik konfiguracyjny';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Możesz pobrać plik konfiguracyjny i wgrać go do katalogu lokalnego/z konfiguracją.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'Wsparcie dla SQLite oraz PostgreSQL jest eksperymentalne.';
 $lang['Learn more'] = 'Dowiedz się więcej';
 ?>
\ No newline at end of file
diff --git a/language/pt_PT/install.lang.php b/language/pt_PT/install.lang.php
index 72f013701..1271f31ca 100644
--- a/language/pt_PT/install.lang.php
+++ b/language/pt_PT/install.lang.php
@@ -66,13 +66,10 @@ $lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo não pôde configurar
 $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = "Você deve entrar em contacto com o suporte do seu provedor e saber como pode mudar para PHP 5.";
 $lang['Hope to see you back soon.'] = 'Espero que volte em breve.';
 
-$lang['Database type'] = 'Tipo de Base de Dados';
-$lang['The type of database your piwigo data will be store in'] = 'O tipo de base de dados em que a sua informação Piwigo será guardada';
 $lang['Congratulations, Piwigo installation is completed'] = 'Parabéns, a sua instalação Piwigo está completa';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Uma solução alternativa será copiar o texto na caixa abaixo e colá-lo no ficheiro "local/config/database.inc.php" (Atenção : database.inc.php apenas deverá conter o que está na área de texto, não insira nenhuma linha nova ou espaço em branco)';
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'A criação do ficheiro de configuração local/config/database.inc.php falhou.';
 $lang['Download the config file'] = 'Guardar ficheiro de configuração';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Pode guardar o ficheiro de configuração no seu computador e de seguida enviá-lo para a pasta /local/config da sua instalação.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite e PostgreSQL ainda estão em fase experimental.';
 $lang['Learn more'] = 'Saber mais';
 ?>
\ No newline at end of file
diff --git a/language/ru_RU/install.lang.php b/language/ru_RU/install.lang.php
index 352a79c93..97160e5e3 100644
--- a/language/ru_RU/install.lang.php
+++ b/language/ru_RU/install.lang.php
@@ -52,8 +52,6 @@ $lang['verification'] = 'еще раз для исключения опечат
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Нужна помощь? Задайте свои вопросы на <a href="%s">Форуме Piwigo</a>.';
 $lang['Webmaster mail address'] = 'Электронная почта вебмастера';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Будет использоваться для контакта посетителей с администратором';
-$lang['Database type'] = 'Тип базы данных';
-$lang['The type of database your piwigo data will be store in'] = 'Тип базы данных будет храниться в';
 $lang['PHP 5 is required'] = 'Требуется PHP 5';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Кажется, что Ваш хостинг в настоящее время под управлением  PHP %s.';
 $lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo может попытаться переключить Вашу конфигурацию на PHP 5, создавая или изменяя .htaccess файл.';
@@ -68,6 +66,5 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'Создать файл конфигурации local/config/database.inc.php не удалось.';
 $lang['Download the config file'] = 'Загрузить файл конфигурации';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Вы можете загрузить файл конфигурации и передать его в local/config directory.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite и PostgreSQL в настоящее время находятся в стадии эксперимента.';
 $lang['Learn more'] = 'Узнать больше';
 ?>
\ No newline at end of file
diff --git a/language/sh_RS/install.lang.php b/language/sh_RS/install.lang.php
index 7f3cbb988..35e514d77 100644
--- a/language/sh_RS/install.lang.php
+++ b/language/sh_RS/install.lang.php
@@ -33,8 +33,6 @@ $lang['Webmaster login'] = 'Webmaster pristup';
 $lang['It will be shown to the visitors. It is necessary for website administration'] = 'Bice prikazano posetiocima. Neophodno je za administraciju stranice';
 $lang['Connection to server succeed, but it was impossible to connect to database'] = 'Konekcija na server uspešna, ali konecija na bazu je nemoguca';
 $lang['Can\'t connect to server'] = 'Nemoguce povezivanje na server';
-$lang['Database type'] = 'Tip baze';
-$lang['The type of database your piwigo data will be store in'] = 'Tip baze gde ce Vaši Piwigo podaci biti smešteni';
 $lang['Host'] = 'Host';
 $lang['localhost, sql.multimania.com, toto.freesurf.fr'] = 'localhost, sql.multimania.com, toto.freesurf.fr';
 $lang['User'] = 'Korisnik';
diff --git a/language/sk_SK/install.lang.php b/language/sk_SK/install.lang.php
index 2803a143e..b8f127cbe 100644
--- a/language/sk_SK/install.lang.php
+++ b/language/sk_SK/install.lang.php
@@ -60,8 +60,6 @@ $lang['Webmaster mail address'] = 'E-mail webmastra';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Návštevníci môžu pomocou tohto e-mailu kontaktovať správcu';
 
 // missing translations 2.1.0
-$lang['Database type'] = 'Typ databázy';
-$lang['The type of database your piwigo data will be store in'] = 'Typ databázy Vašej Piwigo databázy bude uložený';
 $lang['PHP 5 is required'] = 'Je nutné PHP 5';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Na Vašom webhostingu je PHP %s.';
 $lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo sa môže pokúsiť zmeniť Vaše nastavenie na PHP 5 tým, že vytvorí alebo zmení súbor .htaccess.';
@@ -76,6 +74,5 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'Vytvorenie súboru local/config/database.inc.php sa nepodarilo.';
 $lang['Download the config file'] = 'Stiahnuť konfiguračný súbor';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Môžete stiahnuť konfiguračný súbor a nahrať ho do adresára local/config Vašej inštalácie.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite a PostgreSQL sa aktuálne zatiaľ testujú.';
 $lang['Learn more'] = 'Zistiť viac';
 ?>
\ No newline at end of file
diff --git a/language/sr_RS/install.lang.php b/language/sr_RS/install.lang.php
index 51b7058ed..82fc71ffe 100644
--- a/language/sr_RS/install.lang.php
+++ b/language/sr_RS/install.lang.php
@@ -33,8 +33,6 @@ $lang['Webmaster login'] = 'Приступ уредника интернет с
 $lang['It will be shown to the visitors. It is necessary for website administration'] = 'Биће приказано посетиоцима. Неопходно је за администрацију интернет страница';
 $lang['Connection to server succeed, but it was impossible to connect to database'] = 'Повезивање на сервер успешно, али повезивање на базу је немогућа';
 $lang['Can\'t connect to server'] = 'Немогуће повезивање на сервер';
-$lang['Database type'] = 'Тип базе';
-$lang['The type of database your piwigo data will be store in'] = 'Тип базе где ће Ваши Piwigo подаци бити смештени';
 $lang['Host'] = 'Хост';
 $lang['localhost, sql.multimania.com, toto.freesurf.fr'] = 'localhost, sql.multimania.com, toto.freesurf.fr';
 $lang['User'] = 'Korisnik';
@@ -69,6 +67,5 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'Формирање конфигурационе датотеке local/config/database.inc.php неуспешно.';
 $lang['Download the config file'] = 'Сними на рачунар конфигурациону датотеку';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Можете снимити на рацунар конфигурациону датотеку и послати је на local/config директоријум Ваше инсталације.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite и PostgreSQL су тренутно у фази испитивања.';
 $lang['Learn more'] = 'Научите више';
 ?>
\ No newline at end of file
diff --git a/language/sv_SE/install.lang.php b/language/sv_SE/install.lang.php
index de80bc56f..9351c01ae 100644
--- a/language/sv_SE/install.lang.php
+++ b/language/sv_SE/install.lang.php
@@ -34,8 +34,6 @@ $lang['Webmaster login'] = 'Webbansvarig login';
 $lang['It will be shown to the visitors. It is necessary for website administration'] = 'Det kommer att visas för besökare. Det är nödvändigt för administrering av hemsidan.';
 $lang['Connection to server succeed, but it was impossible to connect to database'] = 'Ansluten till server, men kunde inte ansluta till databasen.';
 $lang['Can\'t connect to server'] = 'Kan inte ansluta till servern';
-$lang['Database type'] = 'Databas typ';
-$lang['The type of database your piwigo data will be store in'] = 'Ange vilken typ av databas din Piwigo data ska lagras i.';
 $lang['Host'] = 'Värd';
 $lang['localhost, sql.multimania.com, toto.freesurf.fr'] = 'localhost, sql.multimania.com, toto.freesurf.fr';
 $lang['User'] = 'Användare';
@@ -70,6 +68,5 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'Kunde inte skapa filen local/config/database.inc.php .';
 $lang['Download the config file'] = 'Ladda ner konfigurations filen';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Du kan ladda ner konfigurationsfilen och ladda upp den till local/config .';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite och PostgreSQL är för tillfället i försöksstadie.';
 $lang['Learn more'] = 'Läs mer';
 ?>
\ No newline at end of file
diff --git a/language/tr_TR/install.lang.php b/language/tr_TR/install.lang.php
index b4403f961..fbb8c4b90 100644
--- a/language/tr_TR/install.lang.php
+++ b/language/tr_TR/install.lang.php
@@ -34,8 +34,6 @@ $lang['Webmaster login'] = 'Site yöneticisi giriş';
 $lang['It will be shown to the visitors. It is necessary for website administration'] = 'Bu ziyaretçilere gösterilecek. Bu web sitesi yönetimi için gereklidir';
 $lang['Connection to server succeed, but it was impossible to connect to database'] = 'Sunucuya bağlantı başarılı, ama veritabanına bağlantı kurulamadı';
 $lang['Can\'t connect to server'] = 'Sunucuya bağlanamadı';
-$lang['Database type'] = 'Veritabanı türü';
-$lang['The type of database your piwigo data will be store in'] = 'Piwigo verilerinizi depolama türü';
 $lang['Host'] = 'Host';
 $lang['localhost, sql.multimania.com, toto.freesurf.fr'] = 'localhost, sql.multimania.com, toto.freesurf.fr';
 $lang['User'] = 'Kullanıcı';
@@ -70,6 +68,5 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'Yapılandırmada dosyası local/config/database.inc.php oluşturma başarısız oldu.';
 $lang['Download the config file'] = 'Yapılandırma dosyasını indir';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Yapılandırma dosyasını indirip düzenleyebilir ve kurulum dizininde local/config bölümüne yükleyebilirsiniz.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite ve PostgreSQL deneysel durumda.';
 $lang['Learn more'] = 'Daha fazla bilgi edinin';
 ?>
\ No newline at end of file
diff --git a/language/vi_VN/install.lang.php b/language/vi_VN/install.lang.php
index 54c121ed0..18799fe32 100644
--- a/language/vi_VN/install.lang.php
+++ b/language/vi_VN/install.lang.php
@@ -63,14 +63,11 @@ $lang['Sorry!'] = 'Rất tiếc!';
 $lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo không thể cấu hình cho PHP 5.';
 $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = "Bạn nên yêu cầu hỗ trợ từ nhà cung cấp máy chủ và tìm hiểu xem nếu có thể tự chuyển được sang phiên bản PHP 5.";
 $lang['Hope to see you back soon.'] = 'Hi vọng nhận được phản hồi của bạn sớm.';
-$lang['Database type'] = 'Dạng cơ sở dữ liệu';
-$lang['The type of database your piwigo data will be store in'] = 'Dạng cơ sở dữ liệu Piwigo của bạn sẽ được lưu vào';
 $lang['Congratulations, Piwigo installation is completed'] = 'Xin chúc mừng, việc cài đặt Piwigo đã hoàn tất';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Một giải pháp khác là chép những dòng text trên và dán chúng vào tệp tin nằm vị trí "local/config/database.inc.php" (Cảnh báo: tệp tin database.inc.php chỉ có những nội dung trong phạm vi nhập text, không được thêm hàng hoặc ký tự nào khác)';
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'Việc tạo ra tệp tin cấu hình local/config/database.inc.php đã bị lỗi.';
 $lang['Download the config file'] = 'Tải tệp tin cấu hình xuống';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Bạn có thể tải tệp tin cấu hình và upload nó vào thư mục local/config của thư mục cài đặt Piwigo.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite và PostgreSQL hiện đang được thử nghiệm.';
 $lang['Learn more'] = 'Tìm hiểu thêm';
 $lang['Just another Piwigo gallery'] = 'Lại thêm một thư viện Piwigo nữa';
 $lang['Welcome to my photo gallery'] = 'Chào mừng bạn đến với thư viện hình của tôi';
diff --git a/language/zh_CN/install.lang.php b/language/zh_CN/install.lang.php
index df61f58c9..656a2d191 100644
--- a/language/zh_CN/install.lang.php
+++ b/language/zh_CN/install.lang.php
@@ -65,13 +65,10 @@ $lang['Sorry!'] = '对不起!';
 $lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo不能设置PHP 5.';
 $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = '你应该联系你的主机管理员并向其请教如何设置PHP 5.';
 $lang['Hope to see you back soon.'] = '希望下次再见到你...';
-$lang['Database type'] = '数据库类型';
-$lang['The type of database your piwigo data will be store in'] = '用来存放您的 Piwigo 数据的数据库的类型';
 $lang['Congratulations, Piwigo installation is completed'] = '恭喜，Piwigo 已安装完成。';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = '另一个解决办法是，将以上文本框里的文本拷贝到 "local/config/database.inc.php" 文件里（注意：database.inc.php 必须只能包含此文本框里的内容，没有换行或者空格字符）';
 $lang['Creation of config file local/config/database.inc.php failed.'] = '创建 local/config/database.inc.php 文件失败.';
 $lang['Download the config file'] = '下载配置文件';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = '您可以下载配置文件，然后上传到 local/config 目录以完成您的安装.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite 和 PostgreSQL 现在还处在实验阶段.';
 $lang['Learn more'] = '了解更多';
 ?>
\ No newline at end of file
diff --git a/language/zh_TW/install.lang.php b/language/zh_TW/install.lang.php
index 2e4d4315a..d3f7fabbb 100644
--- a/language/zh_TW/install.lang.php
+++ b/language/zh_TW/install.lang.php
@@ -65,13 +65,10 @@ $lang['Sorry!'] = '對不起!';
 $lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo不能設置PHP 5.';
 $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = '你應該聯繫你的主機管理員並向其請教如何設置PHP 5.';
 $lang['Hope to see you back soon.'] = '希望下次再見到你...';
-$lang['Database type'] = '數據庫類型';
-$lang['The type of database your piwigo data will be store in'] = '用來存放您的 Piwigo 數據的數據庫的類型';
 $lang['Congratulations, Piwigo installation is completed'] = '恭喜，Piwigo 已安裝完成。';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = '另一個解決辦法是，將以上文本框裡的文本拷貝到 "local/config/database.inc.php" 文件裡（注意：database.inc.php 必須只能包含此文本框裡的內容，沒有換行或者空格字符）';
 $lang['Creation of config file local/config/database.inc.php failed.'] = '創建 local/config/database.inc.php 文件失敗.';
 $lang['Download the config file'] = '下載配置文件';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = '您可以下載配置文件，然後上傳到 local/config 目錄以完成您的安裝.';
-$lang['SQLite and PostgreSQL are currently in experimental state.'] = 'SQLite 和 PostgreSQL 現在還處在實驗階段.';
 $lang['Learn more'] = '瞭解更多';
 ?>
\ No newline at end of file
diff --git a/plugins/language_switch/flags.tpl b/plugins/language_switch/flags.tpl
index 9bf88dba6..3add5c1a2 100644
--- a/plugins/language_switch/flags.tpl
+++ b/plugins/language_switch/flags.tpl
@@ -19,7 +19,7 @@
 
 {foreach from=$lang_switch.flags key=code item=flag name=f}
           <li>
-            <a rel="nofollow" href="{$SCRIPT_NAME}{$flag.url}">
+            <a rel="nofollow" href="{$flag.url}">
               <img class="flags" src="{$flag.img}" alt="{$flag.alt}" title="{$flag.alt}"/> {$flag.title}
             </a>
           </li>
diff --git a/plugins/language_switch/language_switch.inc.php b/plugins/language_switch/language_switch.inc.php
index a1d85a4ca..3f782e1f7 100644
--- a/plugins/language_switch/language_switch.inc.php
+++ b/plugins/language_switch/language_switch.inc.php
@@ -100,15 +100,19 @@ UPDATE '.USER_INFOS_TABLE.'
     }
     
     $url_starting = get_query_string_diff(array('lang'));
+
+    echo htmlspecialchars($url_starting).'<br>';
     
     foreach ($available_lang as $code => $displayname)
     {
-      $qlc = array ( 
-        'url' => str_replace(
-          array('=&amp;','?&amp;'),
-          array('&amp;','?'),
-          add_url_params($url_starting, array('lang'=> $code))
-          ),
+      $qlc = array (
+        // 'url' => duplicate_index_url().'&amp;lang='.$code,
+        'url' => add_url_params(duplicate_index_url(), array('lang'=> $code)),
+        // 'url' => str_replace(
+        //   array('=&amp;','?&amp;'),
+        //   array('&amp;','?'),
+        //   add_url_params($url_starting, array('lang'=> $code))
+        //   ),
         'alt' => ucwords($displayname),
         'title' => substr($displayname, 0, -4), // remove [FR] or [RU]
         'img' => get_root_url().'language/'.$code.'/'.$code.'.jpg',
-- 
cgit v1.2.3