From 8a299654501db00316a56efda76448a6bb3975e1 Mon Sep 17 00:00:00 2001 From: nikrou Date: Mon, 16 Nov 2009 19:17:01 +0000 Subject: Feature 928 resolved. Replace include/mysql.inc.php by include/config_database.inc.php to be independant of database engine Rename database configurations variables by ones in $conf array. git-svn-id: http://piwigo.org/svn/trunk@4280 68402e56-0260-453c-a942-63ccdbb3a9ee --- language/de_DE/install.lang.php | 2 +- language/de_DE/upgrade.lang.php | 2 +- language/en_UK/install.lang.php | 2 +- language/en_UK/upgrade.lang.php | 2 +- language/es_ES/install.lang.php | 2 +- language/es_ES/upgrade.lang.php | 2 +- language/fr_FR/install.lang.php | 2 +- language/fr_FR/upgrade.lang.php | 2 +- language/it_IT/install.lang.php | 2 +- language/it_IT/upgrade.lang.php | 2 +- language/nl_NL/install.lang.php | 2 +- language/nl_NL/upgrade.lang.php | 2 +- language/pl_PL/install.lang.php | 2 +- language/pl_PL/upgrade.lang.php | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) (limited to 'language') diff --git a/language/de_DE/install.lang.php b/language/de_DE/install.lang.php index 8ae41d833..d435d66a0 100644 --- a/language/de_DE/install.lang.php +++ b/language/de_DE/install.lang.php @@ -54,7 +54,7 @@ $lang['step2_pwd'] = 'Passwort'; $lang['step2_pwd_info'] = 'Administratorpasswort'; $lang['step2_pwd_conf'] = 'Passwort [Bestätigung]'; $lang['step2_pwd_conf_info'] = 'Wiederholen Sie das eingegebene Passwort'; -$lang['step1_err_copy'] = 'Kopieren Sie den rosa Text ohne die Bindestriche und fügen Sie ihn in die Datei "include / mysql.inc.php" auf dem Webserver ein (Warnung: die Datei "mysql.inc.php" darf nur die rosa Zeichen enthalten, nicht mehr und nicht weniger)'; +$lang['step1_err_copy'] = 'Kopieren Sie den rosa Text ohne die Bindestriche und fügen Sie ihn in die Datei "include / config_database.inc.php" auf dem Webserver ein (Warnung: die Datei "config_database.inc.php" darf nur die rosa Zeichen enthalten, nicht mehr und nicht weniger)'; $lang['install_help'] = 'Brauchen Sie Hilfe? Stellen Sie Ihre Frage auf der Forum Piwigo .'; $lang['install_end_message'] = 'Die Konfiguration der Piwigo abgeschlossen ist, hier ist der nächste Schritt

* Gehen Sie zum Anmelden auf die Startseite: [ Identifizierung ] und verwenden Sie die Login / Passwort für Webmaster
diff --git a/language/de_DE/upgrade.lang.php b/language/de_DE/upgrade.lang.php index 75b246eaf..117cb12ac 100644 --- a/language/de_DE/upgrade.lang.php +++ b/language/de_DE/upgrade.lang.php @@ -34,7 +34,7 @@ $lang['perform a maintenance check'] = 'Führen Sie einen Wartungs-Check am [Adm $lang['deactivated plugins'] = 'Als Vorsichtsmaßnahme folgenden Plugins wurden deaktiviert. Sie müssen prüfen, ob Plugins aktualisieren, bevor sie reactiving:'; $lang['upgrade login message'] = 'Nur Administrator können Upgrade ausführen : Bitte melden Sie sich an unter.'; $lang['You do not have access rights to run upgrade'] = 'Sie haben nicht das Recht auf Zugang zum Upgrade ausführen'; -$lang['in include/mysql.inc.php, before ?>, insert:'] = 'In include/mysql.inc.php, vor ?>, wird Folgendes eingefügt:'; +$lang['in include/config_database.inc.php, before ?>, insert:'] = 'In include/config_database.inc.php, vor ?>, wird Folgendes eingefügt:'; // Upgrade informations from upgrade_1.3.1.php $lang['all sub-categories of private categories become private'] = 'Alle Unter-Kategorien von privaten Gruppen wirden privaten'; diff --git a/language/en_UK/install.lang.php b/language/en_UK/install.lang.php index a921e0c76..716393b7d 100644 --- a/language/en_UK/install.lang.php +++ b/language/en_UK/install.lang.php @@ -37,7 +37,7 @@ $lang['step1_err_db'] = 'Connection to server succeed, but it was impossible to $lang['step1_err_server'] = 'Can\'t connect to server'; $lang['step1_err_copy_2'] = 'The next step of the installation is now possible'; $lang['step1_err_copy_next'] = 'next step'; -$lang['step1_err_copy'] = 'Copy the text in pink between hyphens and paste it into the file "include/mysql.inc.php"(Warning : mysql.inc.php must only contain what is in pink, no line return or space character)'; +$lang['step1_err_copy'] = 'Copy the text in pink between hyphens and paste it into the file "include/config_database.inc.php"(Warning : config_database.inc.php must only contain what is in pink, no line return or space character)'; $lang['step1_host'] = 'MySQL host'; $lang['step1_host_info'] = 'localhost, sql.multimania.com, toto.freesurf.fr'; diff --git a/language/en_UK/upgrade.lang.php b/language/en_UK/upgrade.lang.php index 275bc8e2e..01f64e50d 100644 --- a/language/en_UK/upgrade.lang.php +++ b/language/en_UK/upgrade.lang.php @@ -34,7 +34,7 @@ $lang['perform a maintenance check'] = 'Perform a maintenance check in [Administ $lang['deactivated plugins'] = 'As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'; $lang['upgrade login message'] = 'Only administrator can run upgrade: please sign in below.'; $lang['You do not have access rights to run upgrade'] = 'You do not have access rights to run upgrade'; -$lang['in include/mysql.inc.php, before ?>, insert:'] = 'In include/mysql.inc.php, before ?>, insert:'; +$lang['in include/config_database.inc.php, before ?>, insert:'] = 'In include/config_database.inc.php, before ?>, insert:'; // Upgrade informations from upgrade_1.3.1.php $lang['all sub-categories of private categories become private'] = 'All sub-categories of private categories become private'; diff --git a/language/es_ES/install.lang.php b/language/es_ES/install.lang.php index 8a9335716..e4d9d71e6 100644 --- a/language/es_ES/install.lang.php +++ b/language/es_ES/install.lang.php @@ -54,7 +54,7 @@ $lang['step2_pwd'] = 'Palabra de paso'; $lang['step2_pwd_info'] = 'Debe quedar confidencial, permite acceder al tabla de administración.'; $lang['step2_pwd_conf'] = 'Palabra de paso [Confirmar]'; $lang['step2_pwd_conf_info'] = 'Comprobación'; -$lang['step1_err_copy'] = 'Copie el texto en rosa entre las rayas y pegúelo en el fichero mysql.inc.php que se encuentra en el repertorio " include " a la base del lugar donde usted instaló a Piwigo (el fichero mysql.inc.php debe contener SÓLO lo que está en rosa entre las rayas, ninguna vuelta a la línea o espacio es autorizado)'; +$lang['step1_err_copy'] = 'Copie el texto en rosa entre las rayas y pegúelo en el fichero config_database.inc.php que se encuentra en el repertorio " include " a la base del lugar donde usted instaló a Piwigo (el fichero config_database.inc.php debe contener SÓLO lo que está en rosa entre las rayas, ninguna vuelta a la línea o espacio es autorizado)'; $lang['install_help'] = '¿ Necesidad de ayudante? Plantee su cuestión sobre él foro de Piwigo.'; $lang['install_end_message'] = 'La configuración de la aplicación correctamente se celebró, coloca en la etapa próxima

* Vaya sobre la página de identificación y conéctese con pseudo dado para el webmaster
diff --git a/language/es_ES/upgrade.lang.php b/language/es_ES/upgrade.lang.php index 1a9a24999..4177e4156 100644 --- a/language/es_ES/upgrade.lang.php +++ b/language/es_ES/upgrade.lang.php @@ -34,7 +34,7 @@ $lang['perform a maintenance check'] = 'Por favor, efectúes un mantenimiento en $lang['deactivated plugins'] = 'Por precaución, el plugins siguiente han sido desactivados. Verifique si existen unas posturas al día antes de reactivarlas:'; $lang['upgrade login message'] = 'Sólo un administrador puede lanzar la puesta al día: por favor, identifiqúese más abajo.'; $lang['You do not have access rights to run upgrade'] = 'Usted no tiene los derechos necessaires para lanzar la puesta al día.'; -/* TODO */$lang['in include/mysql.inc.php, before ?>, insert:'] = 'In include/mysql.inc.php, before ?>, insert:'; +/* TODO */$lang['in include/config_database.inc.php, before ?>, insert:'] = 'In include/config_database.inc.php, before ?>, insert:'; // Upgrade informations from upgrade_1.3.1.php $lang['all sub-categories of private categories become private'] = 'Todas las subcategorías de categorías privadas se vuelven privadas'; diff --git a/language/fr_FR/install.lang.php b/language/fr_FR/install.lang.php index 6a593ab32..860dd7b4a 100644 --- a/language/fr_FR/install.lang.php +++ b/language/fr_FR/install.lang.php @@ -54,7 +54,7 @@ $lang['step2_pwd'] = 'Mot de passe'; $lang['step2_pwd_info'] = 'Il doit rester confidentiel, il permet d\'accéder au panneau d\'administration.'; $lang['step2_pwd_conf'] = 'Mot de passe [ Confirmer ]'; $lang['step2_pwd_conf_info'] = 'Vérification'; -$lang['step1_err_copy'] = 'Copiez le texte en rose entre les tirets et collez-le dans le fichier mysql.inc.php qui se trouve dans le répertoire "include" à la base de l\'endroit où vous avez installé Piwigo (le fichier mysql.inc.php ne doit comporter QUE ce qui est en rose entre les tirets, aucun retour à la ligne ou espace n\'est autorisé)'; +$lang['step1_err_copy'] = 'Copiez le texte en rose entre les tirets et collez-le dans le fichier config_database.inc.php qui se trouve dans le répertoire "include" à la base de l\'endroit où vous avez installé Piwigo (le fichier config_database.inc.php ne doit comporter QUE ce qui est en rose entre les tirets, aucun retour à la ligne ou espace n\'est autorisé)'; $lang['install_help'] = 'Besoin d\'aide ? Posez votre question sur le forum de Piwigo.'; $lang['install_end_message'] = 'La configuration de l\'application s\'est correctement déroulée, place à la prochaine étape

* allez sur la page d\'identification et connectez-vous avec le pseudo donné pour le webmaster
diff --git a/language/fr_FR/upgrade.lang.php b/language/fr_FR/upgrade.lang.php index 565c8c606..83a7c90ca 100644 --- a/language/fr_FR/upgrade.lang.php +++ b/language/fr_FR/upgrade.lang.php @@ -34,7 +34,7 @@ $lang['perform a maintenance check'] = 'Veuillez effectuer une maintenance dans $lang['deactivated plugins'] = 'Par précaution, les plugins suivants ont été désactivés. Vérifiez s\'il existe des mises à jour avant de les réactiver:'; $lang['upgrade login message'] = 'Seul un administrateur peut lancer la mise à jour: veuillez vous identifier ci-dessous.'; $lang['You do not have access rights to run upgrade'] = 'Vous n\'avez pas les droits necessaires pour lancer la mise à jour.'; -$lang['in include/mysql.inc.php, before ?>, insert:'] = 'Dans le fichier include/mysql.inc.php, avant ?>, insérez:'; +$lang['in include/config_database.inc.php, before ?>, insert:'] = 'Dans le fichier include/config_database.inc.php, avant ?>, insérez:'; // Upgrade informations from upgrade_1.3.1.php $lang['all sub-categories of private categories become private'] = 'Toutes les sous-catégories de catégories privées deviennent privées'; diff --git a/language/it_IT/install.lang.php b/language/it_IT/install.lang.php index 7c524c3aa..1072bbe64 100644 --- a/language/it_IT/install.lang.php +++ b/language/it_IT/install.lang.php @@ -54,7 +54,7 @@ $lang['step2_pwd'] = 'Password'; $lang['step2_pwd_info'] = 'da conservare con cura. Permette l\'accesso al pannello di amministrazione'; $lang['step2_pwd_conf'] = 'Password [confermare]'; $lang['step2_pwd_conf_info'] = 'verifica'; -$lang['step1_err_copy'] = 'Copiate il testo in rosa trà i trattini e mettetelo nel file mysql.inc.php che si trova nella directory "include" alla base del vostro sito dove aveto installato Piwigo (il file mysql.inc.php non deve contenere altro che ciò che è in rosa tra i trattini, nessun ritorno a capo o spazio è autorizzato)'; +$lang['step1_err_copy'] = 'Copiate il testo in rosa trà i trattini e mettetelo nel file config_database.inc.php che si trova nella directory "include" alla base del vostro sito dove aveto installato Piwigo (il file config_database.inc.php non deve contenere altro che ciò che è in rosa tra i trattini, nessun ritorno a capo o spazio è autorizzato)'; $lang['install_help'] = 'Bisogno di un aiuto? Visitate il forum di Piwigo.'; $lang['install_end_message'] = 'La configurazione di Piwigo è conclusa. Procedete al prossimo step

* collegatevi alla pagina d\'accesso e usare come nome d\'utente e password quello del Webmaster
diff --git a/language/it_IT/upgrade.lang.php b/language/it_IT/upgrade.lang.php index e0f247c40..cebda9ca6 100644 --- a/language/it_IT/upgrade.lang.php +++ b/language/it_IT/upgrade.lang.php @@ -34,7 +34,7 @@ $lang['perform a maintenance check'] = 'Se riscontrate dei problemi, effettuare $lang['deactivated plugins'] = 'Per precauzione, i plugins sono stati disattivati. Verificate se non esistono degli aggiornamenti prima di riattivarli:'; $lang['upgrade login message'] = 'Solo un\'amministratore può eseguire l\'aggiornamento: identificatevi.'; $lang['You do not have access rights to run upgrade'] = 'Non avete le autorizzazioni necessarie per effettuare l\'aggiornamento'; -$lang['in include/mysql.inc.php, before ?>, insert:'] = 'Nel file include/mysql.inc.php, prima di ?>, inserire:'; +$lang['in include/config_database.inc.php, before ?>, insert:'] = 'Nel file include/config_database.inc.php, prima di ?>, inserire:'; // Upgrade informations from upgrade_1.3.1.php $lang['all sub-categories of private categories become private'] = 'Tutte le sottocategorie delle categorie private diventono private'; diff --git a/language/nl_NL/install.lang.php b/language/nl_NL/install.lang.php index e8399e473..e0f635207 100644 --- a/language/nl_NL/install.lang.php +++ b/language/nl_NL/install.lang.php @@ -37,7 +37,7 @@ $lang['step1_err_db'] = 'De verbinding met de server is geslaagd, maar het is ni $lang['step1_err_server'] = 'Geen verbinding met de server'; $lang['step1_err_copy_2'] = 'Het is nu mogelijk om verder te gaan met de volgende stap van de installatie'; $lang['step1_err_copy_next'] = 'volgende stap'; -$lang['step1_err_copy'] = 'Kopieer de tekst tussen de lijnen en plak deze in het bestand "include/mysql.inc.php"(Waarschuwing: mysql.inc.php mag alleen het roze gedeelte bevatten, geen return of extra spatie). Dit moet alleen wanneer dit bestand geen schrijfrechten'; +$lang['step1_err_copy'] = 'Kopieer de tekst tussen de lijnen en plak deze in het bestand "include/config_database.inc.php"(Waarschuwing: config_database.inc.php mag alleen het roze gedeelte bevatten, geen return of extra spatie). Dit moet alleen wanneer dit bestand geen schrijfrechten'; $lang['step1_host'] = 'MySQL host'; $lang['step1_host_info'] = 'localhost, sql.multimania.com, toto.freesurf.fr'; diff --git a/language/nl_NL/upgrade.lang.php b/language/nl_NL/upgrade.lang.php index 87a6ddb29..ba1d1c9d6 100644 --- a/language/nl_NL/upgrade.lang.php +++ b/language/nl_NL/upgrade.lang.php @@ -35,7 +35,7 @@ $lang['perform a maintenance check'] = 'Perform a maintenance check in [Administ $lang['deactivated plugins'] = 'As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'; $lang['upgrade login message'] = 'Only administrator can run upgrade: please sign in below.'; $lang['You do not have access rights to run upgrade'] = 'You do not have access rights to run upgrade'; -$lang['in include/mysql.inc.php, before ?>, insert:'] = 'In include/mysql.inc.php, before ?>, insert:'; +$lang['in include/config_database.inc.php, before ?>, insert:'] = 'In include/config_database.inc.php, before ?>, insert:'; // Upgrade informations from upgrade_1.3.1.php $lang['all sub-categories of private categories become private'] = 'All sub-categories of private categories become private'; diff --git a/language/pl_PL/install.lang.php b/language/pl_PL/install.lang.php index 37ada6308..266b70c09 100644 --- a/language/pl_PL/install.lang.php +++ b/language/pl_PL/install.lang.php @@ -37,7 +37,7 @@ $lang['step1_err_db'] = 'PoÅ‚Ä…czenie do serwera powiodÅ‚o siÄ™, ale nie byÅ‚o m $lang['step1_err_server'] = 'Nie można poÅ‚Ä…czyć sie do serwera'; $lang['step1_err_copy_2'] = 'Teraz mozliwy jest nastÄ™pny krok instalacji'; $lang['step1_err_copy_next'] = 'nastÄ™pny krok'; -$lang['step1_err_copy'] = 'Skopiuj tekst zaznaczony na różowo pomiÄ™dzy cudzysÅ‚owiami i wklej do pliku "include/mysql.inc.php"(Uwaga : mysql.inc.php musi zawierać tylko to co jest na różowo bez żadnych znaków koÅ„ca linii czy spacji)'; +$lang['step1_err_copy'] = 'Skopiuj tekst zaznaczony na różowo pomiÄ™dzy cudzysÅ‚owiami i wklej do pliku "include/config_database.inc.php"(Uwaga : config_database.inc.php musi zawierać tylko to co jest na różowo bez żadnych znaków koÅ„ca linii czy spacji)'; $lang['step1_host'] = 'MySQL host'; $lang['step1_host_info'] = 'localhost, sql.multimania.com, toto.freesurf.fr'; diff --git a/language/pl_PL/upgrade.lang.php b/language/pl_PL/upgrade.lang.php index 2dcdad47d..ec4d32887 100644 --- a/language/pl_PL/upgrade.lang.php +++ b/language/pl_PL/upgrade.lang.php @@ -34,7 +34,7 @@ $lang['perform a maintenance check'] = 'Jeżeli napotkasz jakiÅ› problem wykonaj $lang['deactivated plugins'] = 'W ramach zabezpieczenia zostÄ…Å‚y deaktywowane nastÄ™pujÄ…ce wtyczki. Przed ich ponownÄ… aktywacjÄ… musisz sprawdzić dostÄ™pność aktualizacji dla nich:'; $lang['upgrade login message'] = 'Tylko administrator może wykonać aktualizacjÄ™: zaloguj siÄ™ poniżej.'; $lang['You do not have access rights to run upgrade'] = 'Nie masz uprawnieÅ„ do wykonania aktualizacji'; -$lang['in include/mysql.inc.php, before ?>, insert:'] = 'W pliku include/mysql.inc.php, przed ?>, wstaw:'; +$lang['in include/config_database.inc.php, before ?>, insert:'] = 'W pliku include/config_database.inc.php, przed ?>, wstaw:'; // Upgrade informations from upgrade_1.3.1.php $lang['all sub-categories of private categories become private'] = 'Wszystkie podkategorie kategorii prywatnych stanÄ… siÄ™ prywatne'; -- cgit v1.2.3