diff options
| -rw-r--r-- | admin/include/functions_install.inc.php | 1 | ||||
| -rw-r--r-- | admin/themes/default/template/install.tpl | 9 | ||||
| -rw-r--r-- | install.php | 7 | ||||
| -rw-r--r-- | language/en_UK/admin.lang.php | 2 | ||||
| -rw-r--r-- | language/en_UK/install.lang.php | 8 | ||||
| -rw-r--r-- | language/fr_FR/admin.lang.php | 6 |
6 files changed, 17 insertions, 16 deletions
diff --git a/admin/include/functions_install.inc.php b/admin/include/functions_install.inc.php index 9aab979c6..fdfeb08d7 100644 --- a/admin/include/functions_install.inc.php +++ b/admin/include/functions_install.inc.php @@ -146,7 +146,6 @@ function install_db_connect(&$infos, &$errors) $pwg_db_link = pwg_db_connect($_POST['dbhost'], $_POST['dbuser'], $_POST['dbpasswd'], $_POST['dbname']); - array_push( $infos, l10n('Parameters are correct') ); return true; } catch (Exception $e) diff --git a/admin/themes/default/template/install.tpl b/admin/themes/default/template/install.tpl index 3a6d1e5c5..31e89ec42 100644 --- a/admin/themes/default/template/install.tpl +++ b/admin/themes/default/template/install.tpl @@ -82,6 +82,12 @@ TD { height: 2.5em; } +.infos { + background-color:transparent; + border:none; + color:#999; +} + .sql_content, .infos a { color: #ff3363; } @@ -221,8 +227,7 @@ TD { </form> {else} <p> - <input type="button" name="Home" value="{'Home'|@translate}" onClick="window.open('index.php');"> - <input type="button" name="Administration" value="{'Administration'|@translate}" onClick="window.open('admin.php');"> + <input type="button" name="Home" value="{'Visit Gallery'|@translate}" onClick="window.open('index.php');"> </p> {if !isset($migration)} diff --git a/install.php b/install.php index 2742a16ce..289a32bf0 100644 --- a/install.php +++ b/install.php @@ -506,9 +506,10 @@ elseif ($step == 3) } else { - array_push($infos, l10n('The configuration of Piwigo is finished, here is the next step<br><br> -* go to the identification page and use the login/password given for webmaster<br> -* this login will enable you to access to the administration panel and to the instructions in order to place pictures in your directories')); + array_push( + $infos, + l10n('Congratulations, Piwigo installation is completed') + ); if (isset($error_copy)) { diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index 044feefa6..f1c8356ce 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -645,7 +645,7 @@ $lang['Downloads'] = "Downloads"; $lang['Released on'] = "Released on"; $lang['Number of downloads'] = "Number of downloads"; $lang['Piwigo Announcements Newsletter'] = "Piwigo Announcement Newsletter"; -$lang['Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'] = "Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will be sent emails when a new release is available (sometimes including a security bug fix it is important to know and upgrade) and when major events happen to the project. Only a few emails a year."; +$lang['Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'] = "Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will be sent emails when a new release is available (sometimes including a security bug fix, it is important to know and upgrade) and when major events happen to the project. Only a few emails a year."; $lang['Subscribe %s'] = "Subscribe %s"; $lang['Subscribe %s to Piwigo Announcements Newsletter'] = "Subscribe %s to Piwigo Announcements Newsletter"; $lang['Purge search history'] = "Purge search history"; diff --git a/language/en_UK/install.lang.php b/language/en_UK/install.lang.php index d9ade559e..d9134d8a5 100644 --- a/language/en_UK/install.lang.php +++ b/language/en_UK/install.lang.php @@ -59,11 +59,6 @@ $lang['Keep it confidential, it enables you to access administration panel'] = " $lang['Password [confirm]'] = "Password [confirm]"; $lang['verification'] = "verification"; $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = "Need help? Ask your question on <a href=\"%s\">Piwigo message board</a>."; -$lang['The configuration of Piwigo is finished, here is the next step<br><br> -* go to the identification page and use the login/password given for webmaster<br> -* this login will enable you to access to the administration panel and to the instructions in order to place pictures in your directories'] = "Piwigo configuration is finished, here is the next step:<br><br> -* go to the identification page and use the login/password given for webmaster<br> -* this will give you access to the administration panel, with the instructions to load pictures in your directories"; $lang['Webmaster mail address'] = "Webmaster mail address"; $lang['Visitors will be able to contact site administrator with this mail'] = "Visitors will be able to use this mail to contact the site administrator"; $lang['PHP 5 is required'] = "PHP 5 is required"; @@ -75,4 +70,5 @@ $lang['Sorry!'] = "Sorry!"; $lang['Piwigo was not able to configure PHP 5.'] = "Piwigo was not able to configure PHP 5."; $lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = "You should refer to your hosting provider's support and see how you can switch to PHP 5 by yourself."; $lang['Hope to see you back soon.'] = "Hope to see you back soon."; -?>
\ No newline at end of file +$lang['Congratulations, Piwigo installation is completed'] = 'Congratulations, Piwigo installation is completed'; +?> diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index 31e52ed0e..dc8f4c72b 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -645,9 +645,9 @@ $lang['Downloads'] = "Téléchargements"; $lang['Released on'] = "Publié le"; $lang['Number of downloads'] = "Nombre de téléchargements"; $lang['Piwigo Announcements Newsletter'] = "Newsletter Piwigo"; -$lang['Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'] = "Gardez le contact avec le projet Piwigo, abonnez-vous à la newsletter. Vous recevrez un email lorsqu'une nouvelle version est disponible (parfois un bug de sécurité est corrigé qu'il est important de connaître et de mettre à jour) ou qu'un événement majeur survient sur le projet. Quelques messages par an seulement."; -$lang['Subscribe %s'] = "S'abonner %s"; -$lang['Subscribe %s to Piwigo Announcements Newsletter'] = "S'abonner %s à la newsletter Piwigo"; +$lang['Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'] = "Gardez le contact avec le projet Piwigo, abonnez-vous à la newsletter. Vous recevrez un email lorsqu'une nouvelle version est disponible (parfois un bug de sécurité est corrigé, il est important de le savoir et de mettre à jour) ou qu'un événement majeur survient sur le projet. Quelques messages par an seulement."; +$lang['Subscribe %s'] = "Abonner %s"; +$lang['Subscribe %s to Piwigo Announcements Newsletter'] = "Abonner %s à la newsletter Piwigo"; $lang['Purge search history'] = "Purger l'historique des recherches"; $lang['Hide'] = "Masquer"; $lang['Password is missing. Please enter the password.'] = "Le mot de passe manque. Veuillez saisir le mot de passe."; |