summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--install.php54
-rw-r--r--locale/base/LANGLIST25
-rw-r--r--locale/base/messages.pot93
-rw-r--r--locale/ca_CA/LC_MESSAGES/messages.mobin32764 -> 32764 bytes
-rw-r--r--locale/ca_CA/LC_MESSAGES/messages.po106
-rw-r--r--locale/de_DE/LC_MESSAGES/messages.mobin43307 -> 43307 bytes
-rw-r--r--locale/de_DE/LC_MESSAGES/messages.po103
-rw-r--r--locale/el_GR/LC_MESSAGES/messages.mobin52614 -> 52614 bytes
-rw-r--r--locale/el_GR/LC_MESSAGES/messages.po102
-rw-r--r--locale/en_GB/LC_MESSAGES/messages.mobin16620 -> 16620 bytes
-rw-r--r--locale/en_GB/LC_MESSAGES/messages.po107
-rw-r--r--locale/es_ES/LC_MESSAGES/messages.mobin10840 -> 10840 bytes
-rw-r--r--locale/es_ES/LC_MESSAGES/messages.po95
-rw-r--r--locale/fr_FR/LC_MESSAGES/messages.mobin47896 -> 47896 bytes
-rw-r--r--locale/fr_FR/LC_MESSAGES/messages.po107
-rw-r--r--locale/it_IT/LC_MESSAGES/messages.mobin17862 -> 17862 bytes
-rw-r--r--locale/it_IT/LC_MESSAGES/messages.po107
-rw-r--r--locale/ja_JP/LC_MESSAGES/messages.mobin51813 -> 51659 bytes
-rw-r--r--locale/ja_JP/LC_MESSAGES/messages.po108
-rw-r--r--locale/nl_NL/LC_MESSAGES/messages.mobin23659 -> 23659 bytes
-rw-r--r--locale/nl_NL/LC_MESSAGES/messages.po102
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.mobin40211 -> 40211 bytes
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.po107
-rw-r--r--locale/tr_TR/LC_MESSAGES/messages.mobin590 -> 590 bytes
-rw-r--r--locale/tr_TR/LC_MESSAGES/messages.po98
-rw-r--r--locale/zh_CN/LC_MESSAGES/messages.mobin475 -> 475 bytes
-rw-r--r--locale/zh_CN/LC_MESSAGES/messages.po93
-rw-r--r--templates/show_denied.inc.php2
-rw-r--r--templates/show_gather_art.inc.php2
-rw-r--r--templates/show_install.inc.php6
-rw-r--r--templates/show_install_account.inc.php6
-rw-r--r--templates/show_install_config.inc.php4
-rw-r--r--templates/show_install_lang.inc.php115
-rw-r--r--templates/show_registration_confirmation.inc.php2
-rw-r--r--templates/show_test.inc.php2
-rw-r--r--templates/show_test_config.inc.php2
-rw-r--r--templates/show_user_activate.inc.php2
-rw-r--r--templates/show_user_registration.inc.php2
38 files changed, 1240 insertions, 312 deletions
diff --git a/install.php b/install.php
index 7aed5b3a..0c6873ef 100644
--- a/install.php
+++ b/install.php
@@ -67,14 +67,19 @@ $php_self = $http_type . $_SERVER['HTTP_HOST'] . "/" . preg_replace("/^\/(.+\.ph
/* Catch the Current Action */
switch ($_REQUEST['action']) {
case 'create_db':
- if (!install_insert_db($username,$password,$hostname,$database)) {
- require_once 'templates/show_install.inc.php';
- break;
- }
-
/* Get the variables for the language */
$htmllang = $_REQUEST['htmllang'];
$charset = $_REQUEST['charset'];
+
+ // Set the lang in the conf array
+ Config::set('lang', $htmllang,'1');
+ Config::set('site_charset', $charset, '1');
+ load_gettext();
+
+ if (!install_insert_db($username,$password,$hostname,$database)) {
+ require_once 'templates/show_install.inc.php';
+ break;
+ }
header ("Location: " . $php_self . "?action=show_create_config&local_db=$database&local_host=$hostname&htmllang=$htmllang&charset=$charset");
@@ -125,6 +130,15 @@ switch ($_REQUEST['action']) {
$results = parse_ini_file($configfile);
Config::set_by_array($results,'1');
+ /* Get the variables for the language */
+ $htmllang = $_REQUEST['htmllang'];
+ $charset = $_REQUEST['charset'];
+
+ // Set the lang in the conf array
+ Config::set('lang', $htmllang,'1');
+ Config::set('site_charset', $charset, '1');
+ load_gettext();
+
$password2 = scrub_in($_REQUEST['local_pass2']);
if (!install_create_account($username,$password,$password2)) {
@@ -143,6 +157,15 @@ switch ($_REQUEST['action']) {
$results = parse_ini_file($configfile);
+ /* Get the variables for the language */
+ $htmllang = $_REQUEST['htmllang'];
+ $charset = $_REQUEST['charset'];
+
+ // Set the lang in the conf array
+ Config::set('lang', $htmllang,'1');
+ Config::set('site_charset', $charset, '1');
+ load_gettext();
+
/* Make sure we've got a valid config file */
if (!check_config_values($results)) {
require_once Config::get('prefix') . '/templates/show_install_config.inc.php';
@@ -210,12 +233,23 @@ switch ($_REQUEST['action']) {
require_once 'templates/show_install.inc.php';
break;
default:
- /* Do some basic tests here... most common error, no mysql */
- if (!function_exists('mysql_query')) {
- header ("Location: test.php");
+ if ($_ENV['LANG']) {
+ $lang = $_ENV['LANG'];
+ } else {
+ $lang = "en_US";
}
- $htmllang = "en_US";
- header ("Content-Type: text/html; charset=UTF-8");
+ if(strpos($lang, ".")) {
+ $langtmp = split("\.", $lang);
+ $htmllang = $langtmp[0];
+ $charset = $langtmp[1];
+ } else {
+ $htmllang = $lang;
+ $charset = "UTF-8";
+ }
+ Config::set('lang',$htmllang,'1');
+ Config::set('site_charset', $charset, '1');
+ load_gettext();
+ //header ("Content-Type: text/html; charset=$charset");
/* Show the language options first */
require_once 'templates/show_install_lang.inc.php';
break;
diff --git a/locale/base/LANGLIST b/locale/base/LANGLIST
index 0a6d725f..940de20a 100644
--- a/locale/base/LANGLIST
+++ b/locale/base/LANGLIST
@@ -1,16 +1,17 @@
Localization Status Report for Ampache.
+Generated: 08/27/2008 00:55:43 GMT
LANG Trans Fuzzy Untrans Obsolete
-ca_CA 496 43 194 134
-de_DE 645 43 45 14
-el_GR 634 42 57 32
-en_GB 249 181 303 187
-es_ES 182 133 418 150
-fr_FR 671 43 19 141
-it_IT 288 161 284 180
-ja_JP 726 0 11 0
-nl_NL 341 158 234 187
-ru_RU 635 40 58 77
-tr_TR 3 59 671 49
-zh_CN 0 5 728 6
+ca_CA 500 53 198 129
+de_DE 649 53 49 10
+el_GR 638 51 62 29
+en_GB 252 192 307 183
+es_ES 184 137 430 148
+fr_FR 675 55 21 136
+it_IT 291 172 288 176
+ja_JP 723 13 15 2
+nl_NL 345 168 238 183
+ru_RU 639 51 61 72
+tr_TR 3 60 688 49
+zh_CN 0 5 746 6
diff --git a/locale/base/messages.pot b/locale/base/messages.pot
index 0574fe4a..590f963d 100644
--- a/locale/base/messages.pot
+++ b/locale/base/messages.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2008-08-25 13:02+0900\n"
+"POT-Creation-Date: 2008-08-27 09:56+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1326,14 +1326,14 @@ msgid "Preference Administration"
msgstr ""
#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:32
+#: ../../templates/show_install_lang.inc.php:33
#: ../../templates/show_install.inc.php:32
#: ../../templates/show_install_account.inc.php:32
msgid "Ampache Installation"
msgstr ""
#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:40
#: ../../templates/show_install.inc.php:40
#: ../../templates/show_install_account.inc.php:39
msgid ""
@@ -1343,7 +1343,7 @@ msgid ""
msgstr ""
#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:42
+#: ../../templates/show_install_lang.inc.php:43
#: ../../templates/show_install.inc.php:43
#: ../../templates/show_install_account.inc.php:42
msgid ""
@@ -1351,7 +1351,7 @@ msgid ""
msgstr ""
#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:43
+#: ../../templates/show_install_lang.inc.php:44
#: ../../templates/show_install.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
@@ -1359,7 +1359,7 @@ msgid ""
msgstr ""
#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:46
+#: ../../templates/show_install_lang.inc.php:47
#: ../../templates/show_install.inc.php:47
#: ../../templates/show_install_account.inc.php:45
msgid ""
@@ -1561,15 +1561,72 @@ msgstr ""
msgid "Catalog Time"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install_lang.inc.php:38
+#: ../../templates/show_install_lang.inc.php:52
#: ../../templates/show_install.inc.php:38
msgid "Requirements"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:72
+#: ../../templates/show_install_lang.inc.php:51
+msgid "System Checks"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:53
+msgid "PHP Version:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:63
+msgid "Mysql for PHP:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:77
+msgid "PHP Session Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:87
+msgid "PHP ICONV Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:97
+msgid "PHP PCRE Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:107
+msgid "PHP PutENV Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:120
+msgid "PHP Safe Mode:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:130
+msgid "Optional"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:131
+msgid "PHP GetText Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:140
+msgid "PHP Mbstring Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:152
+msgid "Choose installation language."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:173
msgid "Start configuration"
msgstr ""
+#: ../../templates/show_install_lang.inc.php:179
+msgid "Ampache does not <strong>run</strong> correctly by this server."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:180
+msgid "Please contact your server administrator, and fix them."
+msgstr ""
+
#: ../../templates/rightbar.inc.php:28
msgid "Add to Playlist"
msgstr ""
@@ -2302,8 +2359,8 @@ msgstr ""
#: ../../templates/show_random.inc.php:51
#: ../../templates/show_random.inc.php:52
#, php-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%d minute"
+msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
@@ -2313,8 +2370,8 @@ msgstr[1] ""
#: ../../templates/show_random.inc.php:56
#: ../../templates/show_random.inc.php:57
#, php-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%d hour"
+msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
@@ -2420,9 +2477,7 @@ msgstr ""
#: ../../templates/show_artist.inc.php:25
#, php-format
msgid "%s by %s"
-msgid_plural "%ss by %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
#: ../../templates/show_artist.inc.php:35
#, php-format
@@ -3404,11 +3459,11 @@ msgstr ""
msgid "Local Path to Files"
msgstr ""
-#: ../../admin/mail.php:84
+#: ../../admin/mail.php:90
msgid "E-mail Sent"
msgstr ""
-#: ../../admin/mail.php:85
+#: ../../admin/mail.php:91
msgid "Your E-mail was successfully sent."
msgstr ""
@@ -3635,7 +3690,7 @@ msgstr ""
msgid "Album Art Search Finished"
msgstr ""
-#: ../../bin/print_tags.inc:67
+#: ../../bin/print_tags.inc:66
msgid ""
"[print_tags.php.inc]\n"
"This commandline script will display the tag information for the specified "
@@ -3644,6 +3699,6 @@ msgid ""
" \n"
msgstr ""
-#: ../../bin/print_tags.inc:73
+#: ../../bin/print_tags.inc:72
msgid "Filename:"
msgstr ""
diff --git a/locale/ca_CA/LC_MESSAGES/messages.mo b/locale/ca_CA/LC_MESSAGES/messages.mo
index 7012ca40..4e2144e6 100644
--- a/locale/ca_CA/LC_MESSAGES/messages.mo
+++ b/locale/ca_CA/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/ca_CA/LC_MESSAGES/messages.po b/locale/ca_CA/LC_MESSAGES/messages.po
index 1594dfdb..1115777a 100644
--- a/locale/ca_CA/LC_MESSAGES/messages.po
+++ b/locale/ca_CA/LC_MESSAGES/messages.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Ampache 3.5.0\n"
"Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2008-08-25 10:44+0900\n"
+"POT-Creation-Date: 2008-08-27 09:09+0900\n"
"PO-Revision-Date: 2008-01-04 16:41+0100\n"
"Last-Translator: Guillem Lluch Moll <glluch@ya.com>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
@@ -1357,14 +1357,14 @@ msgid "Preference Administration"
msgstr "Preferències administratives"
#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:32
+#: ../../templates/show_install_lang.inc.php:33
#: ../../templates/show_install.inc.php:32
#: ../../templates/show_install_account.inc.php:32
msgid "Ampache Installation"
msgstr "Instalació de l'Ampache"
#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:40
#: ../../templates/show_install.inc.php:40
#: ../../templates/show_install_account.inc.php:39
msgid ""
@@ -1377,7 +1377,7 @@ msgstr ""
"asseguri's que té els següents requisits previs "
#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:42
+#: ../../templates/show_install_lang.inc.php:43
#: ../../templates/show_install.inc.php:43
#: ../../templates/show_install_account.inc.php:42
msgid ""
@@ -1387,7 +1387,7 @@ msgstr ""
"modificar les bases de dades"
#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:43
+#: ../../templates/show_install_lang.inc.php:44
#: ../../templates/show_install.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
@@ -1397,7 +1397,7 @@ msgstr ""
"ampache.cfg.php.dist "
#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:46
+#: ../../templates/show_install_lang.inc.php:47
#: ../../templates/show_install.inc.php:47
#: ../../templates/show_install_account.inc.php:45
msgid ""
@@ -1603,15 +1603,82 @@ msgstr "Mida del catàleg"
msgid "Catalog Time"
msgstr "Temps del catàleg"
-#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install_lang.inc.php:38
+#: ../../templates/show_install_lang.inc.php:52
#: ../../templates/show_install.inc.php:38
msgid "Requirements"
msgstr "Requisits"
-#: ../../templates/show_install_lang.inc.php:72
+#: ../../templates/show_install_lang.inc.php:51
+#, fuzzy
+msgid "System Checks"
+msgstr "Sistema"
+
+#: ../../templates/show_install_lang.inc.php:53
+#, fuzzy
+msgid "PHP Version:"
+msgstr "Versió PHP"
+
+#: ../../templates/show_install_lang.inc.php:63
+#, fuzzy
+msgid "Mysql for PHP:"
+msgstr "Mysql per PHP"
+
+#: ../../templates/show_install_lang.inc.php:77
+#, fuzzy
+msgid "PHP Session Support:"
+msgstr "Sessió de PHP suportada"
+
+#: ../../templates/show_install_lang.inc.php:87
+#, fuzzy
+msgid "PHP ICONV Support:"
+msgstr "PHP ICONV suportat"
+
+#: ../../templates/show_install_lang.inc.php:97
+#, fuzzy
+msgid "PHP PCRE Support:"
+msgstr "Suport PHP PCRE"
+
+#: ../../templates/show_install_lang.inc.php:107
+#, fuzzy
+msgid "PHP PutENV Support:"
+msgstr "Suport PHP PutENV"
+
+#: ../../templates/show_install_lang.inc.php:120
+msgid "PHP Safe Mode:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:130
+#, fuzzy
+msgid "Optional"
+msgstr "Opcions"
+
+#: ../../templates/show_install_lang.inc.php:131
+#, fuzzy
+msgid "PHP GetText Support:"
+msgstr "Suport PHP PutENV"
+
+#: ../../templates/show_install_lang.inc.php:140
+#, fuzzy
+msgid "PHP Mbstring Support:"
+msgstr "Sessió de PHP suportada"
+
+#: ../../templates/show_install_lang.inc.php:152
+msgid "Choose installation language."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:173
msgid "Start configuration"
msgstr "Configuració inicial"
+#: ../../templates/show_install_lang.inc.php:179
+msgid "Ampache does not <strong>run</strong> correctly by this server."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:180
+msgid "Please contact your server administrator, and fix them."
+msgstr ""
+
#: ../../templates/rightbar.inc.php:28
msgid "Add to Playlist"
msgstr ""
@@ -2361,8 +2428,8 @@ msgstr "Longitud"
#: ../../templates/show_random.inc.php:51
#: ../../templates/show_random.inc.php:52
#, fuzzy, php-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%d minute"
+msgid_plural "%d minutes"
msgstr[0] "Minuts"
msgstr[1] "Minuts"
@@ -2372,8 +2439,8 @@ msgstr[1] "Minuts"
#: ../../templates/show_random.inc.php:56
#: ../../templates/show_random.inc.php:57
#, fuzzy, php-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%d hour"
+msgid_plural "%d hours"
msgstr[0] "hora"
msgstr[1] "hora"
@@ -2479,9 +2546,7 @@ msgstr "Albums de"
#: ../../templates/show_artist.inc.php:25
#, php-format
msgid "%s by %s"
-msgid_plural "%ss by %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
#: ../../templates/show_artist.inc.php:35
#, fuzzy, php-format
@@ -3482,11 +3547,11 @@ msgstr "Tipus de llista"
msgid "Local Path to Files"
msgstr "Inici de Reproducció local fallada"
-#: ../../admin/mail.php:84
+#: ../../admin/mail.php:90
msgid "E-mail Sent"
msgstr "Enviar e-mail"
-#: ../../admin/mail.php:85
+#: ../../admin/mail.php:91
msgid "Your E-mail was successfully sent."
msgstr "El teu e-mail s'ha enviat correctament"
@@ -3715,7 +3780,7 @@ msgstr "Realment vols esborrar aquest catàleg"
msgid "Album Art Search Finished"
msgstr "Finalitzat la cerca de portades"
-#: ../../bin/print_tags.inc:67
+#: ../../bin/print_tags.inc:66
msgid ""
"[print_tags.php.inc]\n"
"This commandline script will display the tag information for the specified "
@@ -3729,7 +3794,7 @@ msgstr ""
" apareixerà a l'ampache. \n"
" \n"
-#: ../../bin/print_tags.inc:73
+#: ../../bin/print_tags.inc:72
msgid "Filename:"
msgstr "Nom de l'arxiu:"
@@ -4130,9 +4195,6 @@ msgstr "Nom de l'arxiu:"
#~ msgid "Streaming"
#~ msgstr "Streaming"
-#~ msgid "System"
-#~ msgstr "Sistema"
-
#~ msgid "XML-RPC"
#~ msgstr "XML-RPC"
diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index 336a6ce6..118f59bc 100644
--- a/locale/de_DE/LC_MESSAGES/messages.mo
+++ b/locale/de_DE/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po
index 8a3fc7f1..84b81155 100644
--- a/locale/de_DE/LC_MESSAGES/messages.po
+++ b/locale/de_DE/LC_MESSAGES/messages.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: messages\n"
"Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2008-08-25 12:59+0900\n"
+"POT-Creation-Date: 2008-08-27 09:09+0900\n"
"PO-Revision-Date: 2008-08-24 09:26+0200\n"
"Last-Translator: Nikolai Försterling <devel@fosternet.de>\n"
"Language-Team: <de@li.org>\n"
@@ -1355,14 +1355,14 @@ msgid "Preference Administration"
msgstr "Administrations-Einstellungen"
#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:32
+#: ../../templates/show_install_lang.inc.php:33
#: ../../templates/show_install.inc.php:32
#: ../../templates/show_install_account.inc.php:32
msgid "Ampache Installation"
msgstr "Ampache Installation"
#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:40
#: ../../templates/show_install.inc.php:40
#: ../../templates/show_install_account.inc.php:39
msgid ""
@@ -1376,7 +1376,7 @@ msgstr ""
"Voraussetzungen erfüllt sind."
#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:42
+#: ../../templates/show_install_lang.inc.php:43
#: ../../templates/show_install.inc.php:43
#: ../../templates/show_install_account.inc.php:42
msgid ""
@@ -1386,7 +1386,7 @@ msgstr ""
"erstellt/modifiziert werden können"
#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:43
+#: ../../templates/show_install_lang.inc.php:44
#: ../../templates/show_install.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
@@ -1396,7 +1396,7 @@ msgstr ""
"ampache.cfg.php.dist"
#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:46
+#: ../../templates/show_install_lang.inc.php:47
#: ../../templates/show_install.inc.php:47
#: ../../templates/show_install_account.inc.php:45
msgid ""
@@ -1609,15 +1609,82 @@ msgstr "Kataloggröße"
msgid "Catalog Time"
msgstr "Katalog Spielzeit"
-#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install_lang.inc.php:38
+#: ../../templates/show_install_lang.inc.php:52
#: ../../templates/show_install.inc.php:38
msgid "Requirements"
msgstr "Anforderungen"
-#: ../../templates/show_install_lang.inc.php:72
+#: ../../templates/show_install_lang.inc.php:51
+msgid "System Checks"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:53
+#, fuzzy
+msgid "PHP Version:"
+msgstr "PHP Version"
+
+#: ../../templates/show_install_lang.inc.php:63
+#, fuzzy
+msgid "Mysql for PHP:"
+msgstr "MySQL für PHP"
+
+#: ../../templates/show_install_lang.inc.php:77
+#, fuzzy
+msgid "PHP Session Support:"
+msgstr "PHP Session Unterstützung"
+
+#: ../../templates/show_install_lang.inc.php:87
+#, fuzzy
+msgid "PHP ICONV Support:"
+msgstr "PHP ICONV Unterstützung"
+
+#: ../../templates/show_install_lang.inc.php:97
+#, fuzzy
+msgid "PHP PCRE Support:"
+msgstr "PHP PCRE Unterstützung"
+
+#: ../../templates/show_install_lang.inc.php:107
+#, fuzzy
+msgid "PHP PutENV Support:"
+msgstr "PHP PutENV Unterstützung"
+
+#: ../../templates/show_install_lang.inc.php:120
+#, fuzzy
+msgid "PHP Safe Mode:"
+msgstr "Sicherheitsmodus"
+
+#: ../../templates/show_install_lang.inc.php:130
+#, fuzzy
+msgid "Optional"
+msgstr "Optionen"
+
+#: ../../templates/show_install_lang.inc.php:131
+#, fuzzy
+msgid "PHP GetText Support:"
+msgstr "Gettext Unterstützung"
+
+#: ../../templates/show_install_lang.inc.php:140
+#, fuzzy
+msgid "PHP Mbstring Support:"
+msgstr "PHP Session Unterstützung"
+
+#: ../../templates/show_install_lang.inc.php:152
+msgid "Choose installation language."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:173
msgid "Start configuration"
msgstr "Starte Konfiguration"
+#: ../../templates/show_install_lang.inc.php:179
+msgid "Ampache does not <strong>run</strong> correctly by this server."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:180
+msgid "Please contact your server administrator, and fix them."
+msgstr ""
+
#: ../../templates/rightbar.inc.php:28
msgid "Add to Playlist"
msgstr "Zur Wiedergabeliste hinzufügen "
@@ -2368,8 +2435,8 @@ msgstr "Länge"
#: ../../templates/show_random.inc.php:51
#: ../../templates/show_random.inc.php:52
#, fuzzy, php-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%d minute"
+msgid_plural "%d minutes"
msgstr[0] "Minute"
msgstr[1] "Minuten"
@@ -2379,8 +2446,8 @@ msgstr[1] "Minuten"
#: ../../templates/show_random.inc.php:56
#: ../../templates/show_random.inc.php:57
#, fuzzy, php-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%d hour"
+msgid_plural "%d hours"
msgstr[0] "Stunde"
msgstr[1] "Stunden"
@@ -2486,9 +2553,7 @@ msgstr "Alben von"
#: ../../templates/show_artist.inc.php:25
#, php-format
msgid "%s by %s"
-msgid_plural "%ss by %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
#: ../../templates/show_artist.inc.php:35
#, fuzzy, php-format
@@ -3495,11 +3560,11 @@ msgstr "Wiedergabelistentyp"
msgid "Local Path to Files"
msgstr "Lokal-Abspiel-Module"
-#: ../../admin/mail.php:84
+#: ../../admin/mail.php:90
msgid "E-mail Sent"
msgstr "E-mail gesendet"
-#: ../../admin/mail.php:85
+#: ../../admin/mail.php:91
msgid "Your E-mail was successfully sent."
msgstr "Ihre E-mail wurde gesendet"
@@ -3731,7 +3796,7 @@ msgstr "Wollen Sie diesen Katalog wirklich löschen?"
msgid "Album Art Search Finished"
msgstr "Album Cover-Suche beendet"
-#: ../../bin/print_tags.inc:67
+#: ../../bin/print_tags.inc:66
msgid ""
"[print_tags.php.inc]\n"
"This commandline script will display the tag information for the specified "
@@ -3745,7 +3810,7 @@ msgstr ""
"in Ampache erscheinen. \n"
" \n"
-#: ../../bin/print_tags.inc:73
+#: ../../bin/print_tags.inc:72
msgid "Filename:"
msgstr "Dateiname:"
diff --git a/locale/el_GR/LC_MESSAGES/messages.mo b/locale/el_GR/LC_MESSAGES/messages.mo
index 15d769c2..9931549b 100644
--- a/locale/el_GR/LC_MESSAGES/messages.mo
+++ b/locale/el_GR/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/el_GR/LC_MESSAGES/messages.po b/locale/el_GR/LC_MESSAGES/messages.po
index c1e1f7b9..5d4c1421 100644
--- a/locale/el_GR/LC_MESSAGES/messages.po
+++ b/locale/el_GR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Ampache 3.5.0\n"
"Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2008-08-25 10:44+0900\n"
+"POT-Creation-Date: 2008-08-27 09:09+0900\n"
"PO-Revision-Date: 2008-08-25 08:43+0900\n"
"Last-Translator: Ampache <translations at ampache.org>\n"
"Language-Team: Greek <LL@li.org>\n"
@@ -1340,14 +1340,14 @@ msgid "Preference Administration"
msgstr "Προτιμήσεις Διαχείρισης"
#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:32
+#: ../../templates/show_install_lang.inc.php:33
#: ../../templates/show_install.inc.php:32
#: ../../templates/show_install_account.inc.php:32
msgid "Ampache Installation"
msgstr "Εγκατάσταση"
#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:40
#: ../../templates/show_install.inc.php:40
#: ../../templates/show_install_account.inc.php:39
msgid ""
@@ -1360,7 +1360,7 @@ msgstr ""
"ικανοποιείτε τις ακόλουθες προϋποθέσεις"
#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:42
+#: ../../templates/show_install_lang.inc.php:43
#: ../../templates/show_install.inc.php:43
#: ../../templates/show_install_account.inc.php:42
msgid ""
@@ -1370,7 +1370,7 @@ msgstr ""
"τροποποιεί βάσεις"
#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:43
+#: ../../templates/show_install_lang.inc.php:44
#: ../../templates/show_install.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
@@ -1380,7 +1380,7 @@ msgstr ""
"αρχείο /config/ampache.cfg.php.dist"
#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:46
+#: ../../templates/show_install_lang.inc.php:47
#: ../../templates/show_install.inc.php:47
#: ../../templates/show_install_account.inc.php:45
msgid ""
@@ -1586,15 +1586,81 @@ msgstr "Μέγεθος Καταλόγου"
msgid "Catalog Time"
msgstr "Χρόνος Καταλόγου"
-#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install_lang.inc.php:38
+#: ../../templates/show_install_lang.inc.php:52
#: ../../templates/show_install.inc.php:38
msgid "Requirements"
msgstr "Απαιτήσεις"
-#: ../../templates/show_install_lang.inc.php:72
+#: ../../templates/show_install_lang.inc.php:51
+msgid "System Checks"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:53
+#, fuzzy
+msgid "PHP Version:"
+msgstr "Έκδοση PHP"
+
+#: ../../templates/show_install_lang.inc.php:63
+#, fuzzy
+msgid "Mysql for PHP:"
+msgstr "MySQL για PHP"
+
+#: ../../templates/show_install_lang.inc.php:77
+#, fuzzy
+msgid "PHP Session Support:"
+msgstr "Υποστήριξη PHP Session"
+
+#: ../../templates/show_install_lang.inc.php:87
+#, fuzzy
+msgid "PHP ICONV Support:"
+msgstr "PHP ICONV Support"
+
+#: ../../templates/show_install_lang.inc.php:97
+#, fuzzy
+msgid "PHP PCRE Support:"
+msgstr "PHP PCRE Support"
+
+#: ../../templates/show_install_lang.inc.php:107
+#, fuzzy
+msgid "PHP PutENV Support:"
+msgstr "PHP PutENV Support"
+
+#: ../../templates/show_install_lang.inc.php:120
+msgid "PHP Safe Mode:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:130
+#, fuzzy
+msgid "Optional"
+msgstr "Επιλογές RPC"
+
+#: ../../templates/show_install_lang.inc.php:131
+#, fuzzy
+msgid "PHP GetText Support:"
+msgstr "PHP PutENV Support"
+
+#: ../../templates/show_install_lang.inc.php:140
+#, fuzzy
+msgid "PHP Mbstring Support:"
+msgstr "Υποστήριξη PHP Session"
+
+#: ../../templates/show_install_lang.inc.php:152
+msgid "Choose installation language."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:173
msgid "Start configuration"
msgstr "Έναρξη ρύθμισης"
+#: ../../templates/show_install_lang.inc.php:179
+msgid "Ampache does not <strong>run</strong> correctly by this server."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:180
+msgid "Please contact your server administrator, and fix them."
+msgstr ""
+
#: ../../templates/rightbar.inc.php:28
msgid "Add to Playlist"
msgstr "Προσθήκη στην playlist"
@@ -2344,8 +2410,8 @@ msgstr "Διάρκεια"
#: ../../templates/show_random.inc.php:51
#: ../../templates/show_random.inc.php:52
#, fuzzy, php-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%d minute"
+msgid_plural "%d minutes"
msgstr[0] "λεπτά"
msgstr[1] "λεπτά"
@@ -2355,8 +2421,8 @@ msgstr[1] "λεπτά"
#: ../../templates/show_random.inc.php:56
#: ../../templates/show_random.inc.php:57
#, fuzzy, php-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%d hour"
+msgid_plural "%d hours"
msgstr[0] "ώρα"
msgstr[1] "ώρα"
@@ -2462,9 +2528,7 @@ msgstr "Άλμπουμς από"
#: ../../templates/show_artist.inc.php:25
#, php-format
msgid "%s by %s"
-msgid_plural "%ss by %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
#: ../../templates/show_artist.inc.php:35
#, fuzzy, php-format
@@ -3463,11 +3527,11 @@ msgstr "Τύπος playlist"
msgid "Local Path to Files"
msgstr "Λειτουργικές Μονάδες Τοπικής Αναπαραγωγής"
-#: ../../admin/mail.php:84
+#: ../../admin/mail.php:90
msgid "E-mail Sent"
msgstr "Στάλθηκε E-mail"
-#: ../../admin/mail.php:85
+#: ../../admin/mail.php:91
msgid "Your E-mail was successfully sent."
msgstr "To e-mail στάλθηκε επιτυχώς"
@@ -3696,7 +3760,7 @@ msgstr "Θέλετε σίγουρα να διαγράψετε αυτόν τον
msgid "Album Art Search Finished"
msgstr "Ολοκληρώθηκε η αναζήτηση εξωφύλλων"
-#: ../../bin/print_tags.inc:67
+#: ../../bin/print_tags.inc:66
msgid ""
"[print_tags.php.inc]\n"
"This commandline script will display the tag information for the specified "
@@ -3708,7 +3772,7 @@ msgstr ""
"συγκεκριμένου αρχείου όπως θα εμφανιστούν στον ampache. \n"
"\t\n"
-#: ../../bin/print_tags.inc:73
+#: ../../bin/print_tags.inc:72
msgid "Filename:"
msgstr "Όνομα Αρχείου"
diff --git a/locale/en_GB/LC_MESSAGES/messages.mo b/locale/en_GB/LC_MESSAGES/messages.mo
index 3978e057..e4303488 100644
--- a/locale/en_GB/LC_MESSAGES/messages.mo
+++ b/locale/en_GB/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/en_GB/LC_MESSAGES/messages.po b/locale/en_GB/LC_MESSAGES/messages.po
index c485b7a6..5a333847 100644
--- a/locale/en_GB/LC_MESSAGES/messages.po
+++ b/locale/en_GB/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ampache 2.5.0\n"
"Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2008-08-25 10:44+0900\n"
+"POT-Creation-Date: 2008-08-27 09:09+0900\n"
"PO-Revision-Date: 2005-07-17 21:58-0000\n"
"Last-Translator: David Lodge <dave@cirt.net>\n"
"Language-Team: British English <en@li.org>\n"
@@ -1374,14 +1374,14 @@ msgid "Preference Administration"
msgstr "Preferences"
#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:32
+#: ../../templates/show_install_lang.inc.php:33
#: ../../templates/show_install.inc.php:32
#: ../../templates/show_install_account.inc.php:32
msgid "Ampache Installation"
msgstr "Ampache Installation"
#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:40
#: ../../templates/show_install.inc.php:40
#: ../../templates/show_install_account.inc.php:39
#, fuzzy
@@ -1395,7 +1395,7 @@ msgstr ""
"have the following pre-requisites"
#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:42
+#: ../../templates/show_install_lang.inc.php:43
#: ../../templates/show_install.inc.php:43
#: ../../templates/show_install_account.inc.php:42
msgid ""
@@ -1404,7 +1404,7 @@ msgstr ""
"A MySQL Server with a username and password that can create/modify databases"
#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:43
+#: ../../templates/show_install_lang.inc.php:44
#: ../../templates/show_install.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
@@ -1414,7 +1414,7 @@ msgstr ""
"ampache.cfg.php.dist file"
#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:46
+#: ../../templates/show_install_lang.inc.php:47
#: ../../templates/show_install.inc.php:47
#: ../../templates/show_install_account.inc.php:45
msgid ""
@@ -1623,15 +1623,82 @@ msgstr "Catalogue Size"
msgid "Catalog Time"
msgstr "Catalogue Time"
-#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install_lang.inc.php:38
+#: ../../templates/show_install_lang.inc.php:52
#: ../../templates/show_install.inc.php:38
msgid "Requirements"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:72
+#: ../../templates/show_install_lang.inc.php:51
+#, fuzzy
+msgid "System Checks"
+msgstr "Stream"
+
+#: ../../templates/show_install_lang.inc.php:53
+#, fuzzy
+msgid "PHP Version:"
+msgstr "PHP Version"
+
+#: ../../templates/show_install_lang.inc.php:63
+#, fuzzy
+msgid "Mysql for PHP:"
+msgstr "Mysql for PHP"
+
+#: ../../templates/show_install_lang.inc.php:77
+#, fuzzy
+msgid "PHP Session Support:"
+msgstr "PHP Session Support"
+
+#: ../../templates/show_install_lang.inc.php:87
+#, fuzzy
+msgid "PHP ICONV Support:"
+msgstr "PHP ICONV Support"
+
+#: ../../templates/show_install_lang.inc.php:97
+#, fuzzy
+msgid "PHP PCRE Support:"
+msgstr "PHP ICONV Support"
+
+#: ../../templates/show_install_lang.inc.php:107
+#, fuzzy
+msgid "PHP PutENV Support:"
+msgstr "PHP ICONV Support"
+
+#: ../../templates/show_install_lang.inc.php:120
+msgid "PHP Safe Mode:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:130
+#, fuzzy
+msgid "Optional"
+msgstr "Action"
+
+#: ../../templates/show_install_lang.inc.php:131
+#, fuzzy
+msgid "PHP GetText Support:"
+msgstr "PHP ICONV Support"
+
+#: ../../templates/show_install_lang.inc.php:140
+#, fuzzy
+msgid "PHP Mbstring Support:"
+msgstr "PHP Session Support"
+
+#: ../../templates/show_install_lang.inc.php:152
+msgid "Choose installation language."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:173
msgid "Start configuration"
msgstr ""
+#: ../../templates/show_install_lang.inc.php:179
+msgid "Ampache does not <strong>run</strong> correctly by this server."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:180
+msgid "Please contact your server administrator, and fix them."
+msgstr ""
+
#: ../../templates/rightbar.inc.php:28
msgid "Add to Playlist"
msgstr ""
@@ -2415,8 +2482,8 @@ msgstr ""
#: ../../templates/show_random.inc.php:51
#: ../../templates/show_random.inc.php:52
#, php-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%d minute"
+msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
@@ -2426,8 +2493,8 @@ msgstr[1] ""
#: ../../templates/show_random.inc.php:56
#: ../../templates/show_random.inc.php:57
#, fuzzy, php-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%d hour"
+msgid_plural "%d hours"
msgstr[0] "hour"
msgstr[1] "hour"
@@ -2540,9 +2607,7 @@ msgstr "Albums by"
#: ../../templates/show_artist.inc.php:25
#, php-format
msgid "%s by %s"
-msgid_plural "%ss by %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
#: ../../templates/show_artist.inc.php:35
#, fuzzy, php-format
@@ -3588,12 +3653,12 @@ msgstr "Playlist Type"
msgid "Local Path to Files"
msgstr "Local Play Control"
-#: ../../admin/mail.php:84
+#: ../../admin/mail.php:90
#, fuzzy
msgid "E-mail Sent"
msgstr "E-mail"
-#: ../../admin/mail.php:85
+#: ../../admin/mail.php:91
msgid "Your E-mail was successfully sent."
msgstr ""
@@ -3840,7 +3905,7 @@ msgstr "Do you really want to delete this catalogue?"
msgid "Album Art Search Finished"
msgstr "Album Art Search Finished"
-#: ../../bin/print_tags.inc:67
+#: ../../bin/print_tags.inc:66
msgid ""
"[print_tags.php.inc]\n"
"This commandline script will display the tag information for the specified "
@@ -3849,7 +3914,7 @@ msgid ""
" \n"
msgstr ""
-#: ../../bin/print_tags.inc:73
+#: ../../bin/print_tags.inc:72
#, fuzzy
msgid "Filename:"
msgstr "Filename"
@@ -4147,10 +4212,6 @@ msgstr "Filename"
#~ msgid "Streaming"
#~ msgstr "Stream"
-#, fuzzy
-#~ msgid "System"
-#~ msgstr "Stream"
-
#~ msgid "Host Access to Your Catalog"
#~ msgstr "Host Access to Your Catalogue"
diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo
index f7e715ba..fe639df1 100644
--- a/locale/es_ES/LC_MESSAGES/messages.mo
+++ b/locale/es_ES/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/es_ES/LC_MESSAGES/messages.po b/locale/es_ES/LC_MESSAGES/messages.po
index f2f91cc3..b4dacc0d 100644
--- a/locale/es_ES/LC_MESSAGES/messages.po
+++ b/locale/es_ES/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Ampache 3.5.0\n"
"Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2008-08-25 10:44+0900\n"
+"POT-Creation-Date: 2008-08-27 09:09+0900\n"
"PO-Revision-Date: 2008-08-25 08:43+0900\n"
"Last-Translator: Ampache <translations at ampache.org>\n"
"Language-Team: Spanish <LL@li.org>\n"
@@ -1349,14 +1349,14 @@ msgid "Preference Administration"
msgstr "Preferencias"
#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:32
+#: ../../templates/show_install_lang.inc.php:33
#: ../../templates/show_install.inc.php:32
#: ../../templates/show_install_account.inc.php:32
msgid "Ampache Installation"
msgstr "Instalación de Ampache"
#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:40
#: ../../templates/show_install.inc.php:40
#: ../../templates/show_install_account.inc.php:39
msgid ""
@@ -1369,7 +1369,7 @@ msgstr ""
"que tiene los requisitos siguientes."
#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:42
+#: ../../templates/show_install_lang.inc.php:43
#: ../../templates/show_install.inc.php:43
#: ../../templates/show_install_account.inc.php:42
msgid ""
@@ -1377,7 +1377,7 @@ msgid ""
msgstr ""
#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:43
+#: ../../templates/show_install_lang.inc.php:44
#: ../../templates/show_install.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
@@ -1385,7 +1385,7 @@ msgid ""
msgstr ""
#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:46
+#: ../../templates/show_install_lang.inc.php:47
#: ../../templates/show_install.inc.php:47
#: ../../templates/show_install_account.inc.php:45
msgid ""
@@ -1590,15 +1590,74 @@ msgstr "Tamaño del catálogo"
msgid "Catalog Time"
msgstr "Tiempo del catálogo"
-#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install_lang.inc.php:38
+#: ../../templates/show_install_lang.inc.php:52
#: ../../templates/show_install.inc.php:38
msgid "Requirements"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:72
+#: ../../templates/show_install_lang.inc.php:51
+msgid "System Checks"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:53
+#, fuzzy
+msgid "PHP Version:"
+msgstr "Versión de PHP"
+
+#: ../../templates/show_install_lang.inc.php:63
+msgid "Mysql for PHP:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:77
+msgid "PHP Session Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:87
+msgid "PHP ICONV Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:97
+msgid "PHP PCRE Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:107
+msgid "PHP PutENV Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:120
+msgid "PHP Safe Mode:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:130
+#, fuzzy
+msgid "Optional"
+msgstr "Acciónes"
+
+#: ../../templates/show_install_lang.inc.php:131
+msgid "PHP GetText Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:140
+msgid "PHP Mbstring Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:152
+msgid "Choose installation language."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:173
msgid "Start configuration"
msgstr ""
+#: ../../templates/show_install_lang.inc.php:179
+msgid "Ampache does not <strong>run</strong> correctly by this server."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:180
+msgid "Please contact your server administrator, and fix them."
+msgstr ""
+
#: ../../templates/rightbar.inc.php:28
msgid "Add to Playlist"
msgstr ""
@@ -2370,8 +2429,8 @@ msgstr "Longitud"
#: ../../templates/show_random.inc.php:51
#: ../../templates/show_random.inc.php:52
#, fuzzy, php-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%d minute"
+msgid_plural "%d minutes"
msgstr[0] "Minutos"
msgstr[1] "Minutos"
@@ -2381,8 +2440,8 @@ msgstr[1] "Minutos"
#: ../../templates/show_random.inc.php:56
#: ../../templates/show_random.inc.php:57
#, fuzzy, php-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%d hour"
+msgid_plural "%d hours"
msgstr[0] "hora"
msgstr[1] "hora"
@@ -2496,9 +2555,7 @@ msgstr "Álbumes por"
#: ../../templates/show_artist.inc.php:25
#, php-format
msgid "%s by %s"
-msgid_plural "%ss by %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
#: ../../templates/show_artist.inc.php:35
#, fuzzy, php-format
@@ -3521,12 +3578,12 @@ msgstr "Tipo de lista"
msgid "Local Path to Files"
msgstr "Control local de reproducción"
-#: ../../admin/mail.php:84
+#: ../../admin/mail.php:90
#, fuzzy
msgid "E-mail Sent"
msgstr "Correo"
-#: ../../admin/mail.php:85
+#: ../../admin/mail.php:91
msgid "Your E-mail was successfully sent."
msgstr ""
@@ -3768,7 +3825,7 @@ msgstr "¿Confirmas que quiere borrar este catálogo?"
msgid "Album Art Search Finished"
msgstr "Búsqueda de arte de álbum acabado"
-#: ../../bin/print_tags.inc:67
+#: ../../bin/print_tags.inc:66
msgid ""
"[print_tags.php.inc]\n"
"This commandline script will display the tag information for the specified "
@@ -3777,7 +3834,7 @@ msgid ""
" \n"
msgstr ""
-#: ../../bin/print_tags.inc:73
+#: ../../bin/print_tags.inc:72
msgid "Filename:"
msgstr "Nombre del archivo:"
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index bb0f4a8a..f2e458f3 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.mo
+++ b/locale/fr_FR/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index f4c04977..630f481c 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Ampache 3.5.0\n"
"Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2008-08-25 10:44+0900\n"
+"POT-Creation-Date: 2008-08-27 09:09+0900\n"
"PO-Revision-Date: 2008-08-01 00:52+0200\n"
"Last-Translator: Erwan Velu <erwan.velu@free.fr>\n"
"Language-Team: French <kde-i18n-doc@lists.kde.org>\n"
@@ -1354,14 +1354,14 @@ msgid "Preference Administration"
msgstr "Pr&eacute;f&eacute;rences d'administration"
#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:32
+#: ../../templates/show_install_lang.inc.php:33
#: ../../templates/show_install.inc.php:32
#: ../../templates/show_install_account.inc.php:32
msgid "Ampache Installation"
msgstr "Installation d'Ampache"
#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:40
#: ../../templates/show_install.inc.php:40
#: ../../templates/show_install_account.inc.php:39
msgid ""
@@ -1374,7 +1374,7 @@ msgstr ""
"assurez-vous d'avoir tous les pr&eacute;-requis"
#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:42
+#: ../../templates/show_install_lang.inc.php:43
#: ../../templates/show_install.inc.php:43
#: ../../templates/show_install_account.inc.php:42
msgid ""
@@ -1384,7 +1384,7 @@ msgstr ""
"modifier les bases de donn&eacute;es"
#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:43
+#: ../../templates/show_install_lang.inc.php:44
#: ../../templates/show_install.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
@@ -1394,7 +1394,7 @@ msgstr ""
"et /config/ampache.cfg.php.dist"
#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:46
+#: ../../templates/show_install_lang.inc.php:47
#: ../../templates/show_install.inc.php:47
#: ../../templates/show_install_account.inc.php:45
msgid ""
@@ -1606,15 +1606,83 @@ msgstr "Taille du catalogue"
msgid "Catalog Time"
msgstr "Dur&eacute;e du catalogue"
-#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install_lang.inc.php:38
+#: ../../templates/show_install_lang.inc.php:52
#: ../../templates/show_install.inc.php:38
msgid "Requirements"
msgstr "Pr&eacute;-requis"
-#: ../../templates/show_install_lang.inc.php:72
+#: ../../templates/show_install_lang.inc.php:51
+#, fuzzy
+msgid "System Checks"
+msgstr "Système"
+
+#: ../../templates/show_install_lang.inc.php:53
+#, fuzzy
+msgid "PHP Version:"
+msgstr "Version de PHP"
+
+#: ../../templates/show_install_lang.inc.php:63
+#, fuzzy
+msgid "Mysql for PHP:"
+msgstr "Mysql pour PHP"
+
+#: ../../templates/show_install_lang.inc.php:77
+#, fuzzy
+msgid "PHP Session Support:"
+msgstr "Support des sessions PHP"
+
+#: ../../templates/show_install_lang.inc.php:87
+#, fuzzy
+msgid "PHP ICONV Support:"
+msgstr "Support de PHP ICONV"
+
+#: ../../templates/show_install_lang.inc.php:97
+#, fuzzy
+msgid "PHP PCRE Support:"
+msgstr "Support de PHP PCRE"
+
+#: ../../templates/show_install_lang.inc.php:107
+#, fuzzy
+msgid "PHP PutENV Support:"
+msgstr "Support de PHP ICONV"
+
+#: ../../templates/show_install_lang.inc.php:120
+#, fuzzy
+msgid "PHP Safe Mode:"
+msgstr "Mode sans &eacute;chec"
+
+#: ../../templates/show_install_lang.inc.php:130
+#, fuzzy
+msgid "Optional"
+msgstr "Options"
+
+#: ../../templates/show_install_lang.inc.php:131
+#, fuzzy
+msgid "PHP GetText Support:"
+msgstr "Support Gettext"
+
+#: ../../templates/show_install_lang.inc.php:140
+#, fuzzy
+msgid "PHP Mbstring Support:"
+msgstr "Support des sessions PHP"
+
+#: ../../templates/show_install_lang.inc.php:152
+msgid "Choose installation language."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:173
msgid "Start configuration"
msgstr "Lancer la configuration"
+#: ../../templates/show_install_lang.inc.php:179
+msgid "Ampache does not <strong>run</strong> correctly by this server."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:180
+msgid "Please contact your server administrator, and fix them."
+msgstr ""
+
#: ../../templates/rightbar.inc.php:28
msgid "Add to Playlist"
msgstr "Ajouter &agrave; la liste de lecture"
@@ -2373,8 +2441,8 @@ msgstr "Dur&eacute;e"
#: ../../templates/show_random.inc.php:51
#: ../../templates/show_random.inc.php:52
#, fuzzy, php-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%d minute"
+msgid_plural "%d minutes"
msgstr[0] "minute"
msgstr[1] ""
@@ -2384,8 +2452,8 @@ msgstr[1] ""
#: ../../templates/show_random.inc.php:56
#: ../../templates/show_random.inc.php:57
#, fuzzy, php-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%d hour"
+msgid_plural "%d hours"
msgstr[0] "heure"
msgstr[1] "heure"
@@ -2491,9 +2559,7 @@ msgstr "Albums par %s"
#: ../../templates/show_artist.inc.php:25
#, fuzzy, php-format
msgid "%s by %s"
-msgid_plural "%ss by %s"
-msgstr[0] "Albums par %s"
-msgstr[1] "Albums par %s"
+msgstr "Albums par %s"
#: ../../templates/show_artist.inc.php:35
#, php-format
@@ -3499,11 +3565,11 @@ msgstr "Fichier de liste de lecture"
msgid "Local Path to Files"
msgstr "Chemin d'accès aux fichiers"
-#: ../../admin/mail.php:84
+#: ../../admin/mail.php:90
msgid "E-mail Sent"
msgstr "E-Mail envoy&eacute;"
-#: ../../admin/mail.php:85
+#: ../../admin/mail.php:91
msgid "Your E-mail was successfully sent."
msgstr "Email envoy&eacute;"
@@ -3749,7 +3815,7 @@ msgstr "Voulez-vous vraiment supprimer ce catalogue ?"
msgid "Album Art Search Finished"
msgstr "Recherche de jaquettes d'albums termin&eacute;e"
-#: ../../bin/print_tags.inc:67
+#: ../../bin/print_tags.inc:66
msgid ""
"[print_tags.php.inc]\n"
"This commandline script will display the tag information for the specified "
@@ -3763,7 +3829,7 @@ msgstr ""
"sera pr&eacute;sent&eacute; dans Ampache. \n"
" \n"
-#: ../../bin/print_tags.inc:73
+#: ../../bin/print_tags.inc:72
msgid "Filename:"
msgstr "Nom de fichier :"
@@ -3780,9 +3846,6 @@ msgstr "Nom de fichier :"
#~ msgid "Streaming"
#~ msgstr "Flux"
-#~ msgid "System"
-#~ msgstr "Système"
-
#~ msgid "Recommendations"
#~ msgstr "Recommandations"
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index bd2fb912..808d0051 100644
--- a/locale/it_IT/LC_MESSAGES/messages.mo
+++ b/locale/it_IT/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po
index 73f23a6c..d8495577 100644
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Ampache 3.5.0\n"
"Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2008-08-25 10:44+0900\n"
+"POT-Creation-Date: 2008-08-27 09:09+0900\n"
"PO-Revision-Date: 2006-01-08 00:34+0100\n"
"Last-Translator: Mr-miky <translate@mr-miky.com>\n"
"Language-Team: Italian\n"
@@ -1368,14 +1368,14 @@ msgid "Preference Administration"
msgstr "Impostazioni"
#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:32
+#: ../../templates/show_install_lang.inc.php:33
#: ../../templates/show_install.inc.php:32
#: ../../templates/show_install_account.inc.php:32
msgid "Ampache Installation"
msgstr "Installazione Ampache"
#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:40
#: ../../templates/show_install.inc.php:40
#: ../../templates/show_install_account.inc.php:39
msgid ""
@@ -1388,7 +1388,7 @@ msgstr ""
"i seguenti pre-requisiti"
#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:42
+#: ../../templates/show_install_lang.inc.php:43
#: ../../templates/show_install.inc.php:43
#: ../../templates/show_install_account.inc.php:42
msgid ""
@@ -1398,7 +1398,7 @@ msgstr ""
"modificare database"
#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:43
+#: ../../templates/show_install_lang.inc.php:44
#: ../../templates/show_install.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
@@ -1406,7 +1406,7 @@ msgid ""
msgstr ""
#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:46
+#: ../../templates/show_install_lang.inc.php:47
#: ../../templates/show_install.inc.php:47
#: ../../templates/show_install_account.inc.php:45
msgid ""
@@ -1611,15 +1611,82 @@ msgstr "Dimensione catalogo"
msgid "Catalog Time"
msgstr "Durata catalogo"
-#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install_lang.inc.php:38
+#: ../../templates/show_install_lang.inc.php:52
#: ../../templates/show_install.inc.php:38
msgid "Requirements"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:72
+#: ../../templates/show_install_lang.inc.php:51
+#, fuzzy
+msgid "System Checks"
+msgstr "Stream"
+
+#: ../../templates/show_install_lang.inc.php:53
+#, fuzzy
+msgid "PHP Version:"
+msgstr "Versione PHP"
+
+#: ../../templates/show_install_lang.inc.php:63
+#, fuzzy
+msgid "Mysql for PHP:"
+msgstr "Mysql per PHP"
+
+#: ../../templates/show_install_lang.inc.php:77
+#, fuzzy
+msgid "PHP Session Support:"
+msgstr "Supporto sessioni PHP"
+
+#: ../../templates/show_install_lang.inc.php:87
+#, fuzzy
+msgid "PHP ICONV Support:"
+msgstr "Supporto PHP ICONV"
+
+#: ../../templates/show_install_lang.inc.php:97
+#, fuzzy
+msgid "PHP PCRE Support:"
+msgstr "Supporto PHP ICONV"
+
+#: ../../templates/show_install_lang.inc.php:107
+#, fuzzy
+msgid "PHP PutENV Support:"
+msgstr "Supporto PHP ICONV"
+
+#: ../../templates/show_install_lang.inc.php:120
+msgid "PHP Safe Mode:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:130
+#, fuzzy
+msgid "Optional"
+msgstr "Azioni"
+
+#: ../../templates/show_install_lang.inc.php:131
+#, fuzzy
+msgid "PHP GetText Support:"
+msgstr "Supporto PHP ICONV"
+
+#: ../../templates/show_install_lang.inc.php:140
+#, fuzzy
+msgid "PHP Mbstring Support:"
+msgstr "Supporto sessioni PHP"
+
+#: ../../templates/show_install_lang.inc.php:152
+msgid "Choose installation language."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:173
msgid "Start configuration"
msgstr ""
+#: ../../templates/show_install_lang.inc.php:179
+msgid "Ampache does not <strong>run</strong> correctly by this server."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:180
+msgid "Please contact your server administrator, and fix them."
+msgstr ""
+
#: ../../templates/rightbar.inc.php:28
msgid "Add to Playlist"
msgstr ""
@@ -2393,8 +2460,8 @@ msgstr "Durata"
#: ../../templates/show_random.inc.php:51
#: ../../templates/show_random.inc.php:52
#, fuzzy, php-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%d minute"
+msgid_plural "%d minutes"
msgstr[0] "Minuti"
msgstr[1] "Minuti"
@@ -2404,8 +2471,8 @@ msgstr[1] "Minuti"
#: ../../templates/show_random.inc.php:56
#: ../../templates/show_random.inc.php:57
#, fuzzy, php-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%d hour"
+msgid_plural "%d hours"
msgstr[0] "ora"
msgstr[1] "ora"
@@ -2518,9 +2585,7 @@ msgstr "Album per"
#: ../../templates/show_artist.inc.php:25
#, php-format
msgid "%s by %s"
-msgid_plural "%ss by %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
#: ../../templates/show_artist.inc.php:35
#, fuzzy, php-format
@@ -3555,12 +3620,12 @@ msgstr "Tipo playlist"
msgid "Local Path to Files"
msgstr "Controllo riproduzione locale"
-#: ../../admin/mail.php:84
+#: ../../admin/mail.php:90
#, fuzzy
msgid "E-mail Sent"
msgstr "Gestione E-mail"
-#: ../../admin/mail.php:85
+#: ../../admin/mail.php:91
msgid "Your E-mail was successfully sent."
msgstr ""
@@ -3808,7 +3873,7 @@ msgstr "Vuoi veramente cancellare questo catalogo?"
msgid "Album Art Search Finished"
msgstr "Ricerca copertine terminata"
-#: ../../bin/print_tags.inc:67
+#: ../../bin/print_tags.inc:66
msgid ""
"[print_tags.php.inc]\n"
"This commandline script will display the tag information for the specified "
@@ -3817,7 +3882,7 @@ msgid ""
" \n"
msgstr ""
-#: ../../bin/print_tags.inc:73
+#: ../../bin/print_tags.inc:72
msgid "Filename:"
msgstr "Nome file:"
@@ -4106,10 +4171,6 @@ msgstr "Nome file:"
#~ msgid "Streaming"
#~ msgstr "Stream"
-#, fuzzy
-#~ msgid "System"
-#~ msgstr "Stream"
-
#~ msgid "Revoke"
#~ msgstr "Rovoca"
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index d13eef84..f578cead 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.mo
+++ b/locale/ja_JP/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po
index c182b8d2..a58be5d0 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/locale/ja_JP/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Ampache 3.5.0\n"
"Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2008-08-25 10:44+0900\n"
+"POT-Creation-Date: 2008-08-27 09:09+0900\n"
"PO-Revision-Date: 2008-07-14 20:44+0900\n"
"Last-Translator: momo-i <webmaster at momo-i.org>\n"
"Language-Team: Japanese\n"
@@ -1347,14 +1347,14 @@ msgid "Preference Administration"
msgstr "設定管理"
#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:32
+#: ../../templates/show_install_lang.inc.php:33
#: ../../templates/show_install.inc.php:32
#: ../../templates/show_install_account.inc.php:32
msgid "Ampache Installation"
msgstr "Ampache インストール"
#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:40
#: ../../templates/show_install.inc.php:40
#: ../../templates/show_install_account.inc.php:39
msgid ""
@@ -1366,7 +1366,7 @@ msgstr ""
"を扱います。続ける前に以下の事前準備をお願いします。"
#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:42
+#: ../../templates/show_install_lang.inc.php:43
#: ../../templates/show_install.inc.php:43
#: ../../templates/show_install_account.inc.php:42
msgid ""
@@ -1374,7 +1374,7 @@ msgid ""
msgstr "データベースを作成/修正できるユーザ名とパスワードをもったMySQLサーバ"
#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:43
+#: ../../templates/show_install_lang.inc.php:44
#: ../../templates/show_install.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
@@ -1384,7 +1384,7 @@ msgstr ""
"への読み取り権限を持っている"
#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:46
+#: ../../templates/show_install_lang.inc.php:47
#: ../../templates/show_install.inc.php:47
#: ../../templates/show_install_account.inc.php:45
msgid ""
@@ -1592,15 +1592,82 @@ msgstr "カタログサイズ"
msgid "Catalog Time"
msgstr "カタログ時間"
-#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install_lang.inc.php:38
+#: ../../templates/show_install_lang.inc.php:52
#: ../../templates/show_install.inc.php:38
msgid "Requirements"
msgstr "必要条件"
-#: ../../templates/show_install_lang.inc.php:72
+#: ../../templates/show_install_lang.inc.php:51
+msgid "System Checks"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:53
+#, fuzzy
+msgid "PHP Version:"
+msgstr "PHPバージョン"
+
+#: ../../templates/show_install_lang.inc.php:63
+#, fuzzy
+msgid "Mysql for PHP:"
+msgstr "PHPのMysql"
+
+#: ../../templates/show_install_lang.inc.php:77
+#, fuzzy
+msgid "PHP Session Support:"
+msgstr "PHPセッションサポート"
+
+#: ../../templates/show_install_lang.inc.php:87
+#, fuzzy
+msgid "PHP ICONV Support:"
+msgstr "PHP ICONVサポート"
+
+#: ../../templates/show_install_lang.inc.php:97
+#, fuzzy
+msgid "PHP PCRE Support:"
+msgstr "PHP PCREサポート"
+
+#: ../../templates/show_install_lang.inc.php:107
+#, fuzzy
+msgid "PHP PutENV Support:"
+msgstr "PHP PutENVサポート"
+
+#: ../../templates/show_install_lang.inc.php:120
+#, fuzzy
+msgid "PHP Safe Mode:"
+msgstr "セーフモード"
+
+#: ../../templates/show_install_lang.inc.php:130
+#, fuzzy
+msgid "Optional"
+msgstr "オプション"
+
+#: ../../templates/show_install_lang.inc.php:131
+#, fuzzy
+msgid "PHP GetText Support:"
+msgstr "Gettextサポート"
+
+#: ../../templates/show_install_lang.inc.php:140
+#, fuzzy
+msgid "PHP Mbstring Support:"
+msgstr "PHPセッションサポート"
+
+#: ../../templates/show_install_lang.inc.php:152
+msgid "Choose installation language."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:173
msgid "Start configuration"
msgstr "設定の開始"
+#: ../../templates/show_install_lang.inc.php:179
+msgid "Ampache does not <strong>run</strong> correctly by this server."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:180
+msgid "Please contact your server administrator, and fix them."
+msgstr ""
+
#: ../../templates/rightbar.inc.php:28
msgid "Add to Playlist"
msgstr "プレイリストへ追加"
@@ -2339,9 +2406,9 @@ msgstr "長さ"
#: ../../templates/show_random.inc.php:51
#: ../../templates/show_random.inc.php:52
-#, php-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+#, fuzzy, php-format
+msgid "%d minute"
+msgid_plural "%d minutes"
msgstr[0] "%s分"
#: ../../templates/show_random.inc.php:53
@@ -2349,9 +2416,9 @@ msgstr[0] "%s分"
#: ../../templates/show_random.inc.php:55
#: ../../templates/show_random.inc.php:56
#: ../../templates/show_random.inc.php:57
-#, php-format
-msgid "%s hour"
-msgid_plural "%s hours"
+#, fuzzy, php-format
+msgid "%d hour"
+msgid_plural "%d hours"
msgstr[0] "%s時間"
#: ../../templates/show_random.inc.php:65
@@ -2454,10 +2521,9 @@ msgid "Albums by %s"
msgstr "%sによるアルバム"
#: ../../templates/show_artist.inc.php:25
-#, php-format
+#, fuzzy, php-format
msgid "%s by %s"
-msgid_plural "%ss by %s"
-msgstr[0] "%2$sによる%1$s"
+msgstr "%2$sによる%1$s"
#: ../../templates/show_artist.inc.php:35
#, php-format
@@ -3452,11 +3518,11 @@ msgstr "プレイリストファイル"
msgid "Local Path to Files"
msgstr "ファイルへのローカルパス"
-#: ../../admin/mail.php:84
+#: ../../admin/mail.php:90
msgid "E-mail Sent"
msgstr "メール送信"
-#: ../../admin/mail.php:85
+#: ../../admin/mail.php:91
msgid "Your E-mail was successfully sent."
msgstr "メールは送信されました。"
@@ -3685,7 +3751,7 @@ msgstr "このカタログを削除してもよろしいですか?"
msgid "Album Art Search Finished"
msgstr "アルバムアーティスト検索が完了しました"
-#: ../../bin/print_tags.inc:67
+#: ../../bin/print_tags.inc:66
msgid ""
"[print_tags.php.inc]\n"
"This commandline script will display the tag information for the specified "
@@ -3697,7 +3763,7 @@ msgstr ""
"このコマンドラインスクリプトはAmpacheへ表示されるものとして指定されたファイル"
"名のタグ情報を表示します。\n"
-#: ../../bin/print_tags.inc:73
+#: ../../bin/print_tags.inc:72
msgid "Filename:"
msgstr "ファイル名:"
diff --git a/locale/nl_NL/LC_MESSAGES/messages.mo b/locale/nl_NL/LC_MESSAGES/messages.mo
index 3a140ee7..812d2acd 100644
--- a/locale/nl_NL/LC_MESSAGES/messages.mo
+++ b/locale/nl_NL/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/nl_NL/LC_MESSAGES/messages.po b/locale/nl_NL/LC_MESSAGES/messages.po
index 77245fcf..84449e57 100644
--- a/locale/nl_NL/LC_MESSAGES/messages.po
+++ b/locale/nl_NL/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Ampache SVN 693\n"
"Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2008-08-25 10:44+0900\n"
+"POT-Creation-Date: 2008-08-27 09:09+0900\n"
"PO-Revision-Date: 2006-11-14 08:00+0100\n"
"Last-Translator: Terence Theijn <terence.theijn@gmail.com>\n"
"Language-Team: Dutch <terence.theijn@gmail.com>\n"
@@ -1373,14 +1373,14 @@ msgid "Preference Administration"
msgstr "Beheer Instellingen"
#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:32
+#: ../../templates/show_install_lang.inc.php:33
#: ../../templates/show_install.inc.php:32
#: ../../templates/show_install_account.inc.php:32
msgid "Ampache Installation"
msgstr "Ampache Installatie"
#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:40
#: ../../templates/show_install.inc.php:40
#: ../../templates/show_install_account.inc.php:39
msgid ""
@@ -1393,7 +1393,7 @@ msgstr ""
"controleer of u voldoet aanonderstaande eisen"
#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:42
+#: ../../templates/show_install_lang.inc.php:43
#: ../../templates/show_install.inc.php:43
#: ../../templates/show_install_account.inc.php:42
msgid ""
@@ -1403,7 +1403,7 @@ msgstr ""
"aanmaken/wijzigen"
#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:43
+#: ../../templates/show_install_lang.inc.php:44
#: ../../templates/show_install.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
@@ -1413,7 +1413,7 @@ msgstr ""
"config/ampache.cfg.php.dist"
#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:46
+#: ../../templates/show_install_lang.inc.php:47
#: ../../templates/show_install.inc.php:47
#: ../../templates/show_install_account.inc.php:45
msgid ""
@@ -1622,15 +1622,81 @@ msgstr "Catalogus Grootte"
msgid "Catalog Time"
msgstr "Catalogus Tijd"
-#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install_lang.inc.php:38
+#: ../../templates/show_install_lang.inc.php:52
#: ../../templates/show_install.inc.php:38
msgid "Requirements"
msgstr "Vereisten"
-#: ../../templates/show_install_lang.inc.php:72
+#: ../../templates/show_install_lang.inc.php:51
+msgid "System Checks"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:53
+#, fuzzy
+msgid "PHP Version:"
+msgstr "PHP Versie"
+
+#: ../../templates/show_install_lang.inc.php:63
+#, fuzzy
+msgid "Mysql for PHP:"
+msgstr "MySQL voor PHP"
+
+#: ../../templates/show_install_lang.inc.php:77
+#, fuzzy
+msgid "PHP Session Support:"
+msgstr "PHP Sessie Ondersteuning"
+
+#: ../../templates/show_install_lang.inc.php:87
+#, fuzzy
+msgid "PHP ICONV Support:"
+msgstr "PHP ICONV Ondersteuning"
+
+#: ../../templates/show_install_lang.inc.php:97
+#, fuzzy
+msgid "PHP PCRE Support:"
+msgstr "PHP PCRE Ondersteuning"
+
+#: ../../templates/show_install_lang.inc.php:107
+#, fuzzy
+msgid "PHP PutENV Support:"
+msgstr "PHP PutENV Ondersteuning"
+
+#: ../../templates/show_install_lang.inc.php:120
+msgid "PHP Safe Mode:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:130
+#, fuzzy
+msgid "Optional"
+msgstr "Acties"
+
+#: ../../templates/show_install_lang.inc.php:131
+#, fuzzy
+msgid "PHP GetText Support:"
+msgstr "PHP PutENV Ondersteuning"
+
+#: ../../templates/show_install_lang.inc.php:140
+#, fuzzy
+msgid "PHP Mbstring Support:"
+msgstr "PHP Sessie Ondersteuning"
+
+#: ../../templates/show_install_lang.inc.php:152
+msgid "Choose installation language."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:173
msgid "Start configuration"
msgstr "Start Configuratie"
+#: ../../templates/show_install_lang.inc.php:179
+msgid "Ampache does not <strong>run</strong> correctly by this server."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:180
+msgid "Please contact your server administrator, and fix them."
+msgstr ""
+
#: ../../templates/rightbar.inc.php:28
msgid "Add to Playlist"
msgstr ""
@@ -2406,8 +2472,8 @@ msgstr "Lengte"
#: ../../templates/show_random.inc.php:51
#: ../../templates/show_random.inc.php:52
#, fuzzy, php-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%d minute"
+msgid_plural "%d minutes"
msgstr[0] "Minuten"
msgstr[1] "Minuten"
@@ -2417,8 +2483,8 @@ msgstr[1] "Minuten"
#: ../../templates/show_random.inc.php:56
#: ../../templates/show_random.inc.php:57
#, fuzzy, php-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%d hour"
+msgid_plural "%d hours"
msgstr[0] "uur"
msgstr[1] "uur"
@@ -2531,9 +2597,7 @@ msgstr "Albums bij"
#: ../../templates/show_artist.inc.php:25
#, php-format
msgid "%s by %s"
-msgid_plural "%ss by %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
#: ../../templates/show_artist.inc.php:35
#, fuzzy, php-format
@@ -3569,11 +3633,11 @@ msgstr "Speellijst Type"
msgid "Local Path to Files"
msgstr "Lokale Afspeel Initialisatie Gefaalt"
-#: ../../admin/mail.php:84
+#: ../../admin/mail.php:90
msgid "E-mail Sent"
msgstr "E-mail Verzonden"
-#: ../../admin/mail.php:85
+#: ../../admin/mail.php:91
msgid "Your E-mail was successfully sent."
msgstr "Uw E-mail is succesvol verzonden."
@@ -3821,7 +3885,7 @@ msgstr "Weet je zeker dat je deze catalogus wilt verwijderen?"
msgid "Album Art Search Finished"
msgstr "Album Hoes Zoeken beeindigd"
-#: ../../bin/print_tags.inc:67
+#: ../../bin/print_tags.inc:66
msgid ""
"[print_tags.php.inc]\n"
"This commandline script will display the tag information for the specified "
@@ -3830,7 +3894,7 @@ msgid ""
" \n"
msgstr ""
-#: ../../bin/print_tags.inc:73
+#: ../../bin/print_tags.inc:72
msgid "Filename:"
msgstr "Bestandsnaam"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index e1b0e639..f17eaa47 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.mo
+++ b/locale/ru_RU/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index e04c3a5d..ae934782 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/locale/ru_RU/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ampache\n"
"Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2008-08-25 10:44+0900\n"
+"POT-Creation-Date: 2008-08-27 09:09+0900\n"
"PO-Revision-Date: 2007-02-05 21:58-0000\n"
"Last-Translator: Alexey Illarionov <littlesavage@orionet.ru>\n"
"Language-Team: British English <en@li.org>\n"
@@ -1346,14 +1346,14 @@ msgid "Preference Administration"
msgstr " "
#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:32
+#: ../../templates/show_install_lang.inc.php:33
#: ../../templates/show_install.inc.php:32
#: ../../templates/show_install_account.inc.php:32
msgid "Ampache Installation"
msgstr " Ampache"
#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:40
#: ../../templates/show_install.inc.php:40
#: ../../templates/show_install_account.inc.php:39
msgid ""
@@ -1366,7 +1366,7 @@ msgstr ""
" :"
#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:42
+#: ../../templates/show_install_lang.inc.php:43
#: ../../templates/show_install.inc.php:43
#: ../../templates/show_install_account.inc.php:42
msgid ""
@@ -1375,7 +1375,7 @@ msgstr ""
"MySQL / "
#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:43
+#: ../../templates/show_install_lang.inc.php:44
#: ../../templates/show_install.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
@@ -1385,7 +1385,7 @@ msgstr ""
"cfg.php.dist"
#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:46
+#: ../../templates/show_install_lang.inc.php:47
#: ../../templates/show_install.inc.php:47
#: ../../templates/show_install_account.inc.php:45
msgid ""
@@ -1591,15 +1591,82 @@ msgstr " "
msgid "Catalog Time"
msgstr " "
-#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install_lang.inc.php:38
+#: ../../templates/show_install_lang.inc.php:52
#: ../../templates/show_install.inc.php:38
msgid "Requirements"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:72
+#: ../../templates/show_install_lang.inc.php:51
+#, fuzzy
+msgid "System Checks"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:53
+#, fuzzy
+msgid "PHP Version:"
+msgstr " PHP"
+
+#: ../../templates/show_install_lang.inc.php:63
+#, fuzzy
+msgid "Mysql for PHP:"
+msgstr "Mysql PHP"
+
+#: ../../templates/show_install_lang.inc.php:77
+#, fuzzy
+msgid "PHP Session Support:"
+msgstr " PHP Session"
+
+#: ../../templates/show_install_lang.inc.php:87
+#, fuzzy
+msgid "PHP ICONV Support:"
+msgstr " PHP ICONV"
+
+#: ../../templates/show_install_lang.inc.php:97
+#, fuzzy
+msgid "PHP PCRE Support:"
+msgstr " PHP PCRE"
+
+#: ../../templates/show_install_lang.inc.php:107
+#, fuzzy
+msgid "PHP PutENV Support:"
+msgstr " PHP PutENV"
+
+#: ../../templates/show_install_lang.inc.php:120
+msgid "PHP Safe Mode:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:130
+#, fuzzy
+msgid "Optional"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:131
+#, fuzzy
+msgid "PHP GetText Support:"
+msgstr " PHP PutENV"
+
+#: ../../templates/show_install_lang.inc.php:140
+#, fuzzy
+msgid "PHP Mbstring Support:"
+msgstr " PHP Session"
+
+#: ../../templates/show_install_lang.inc.php:152
+msgid "Choose installation language."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:173
msgid "Start configuration"
msgstr " "
+#: ../../templates/show_install_lang.inc.php:179
+msgid "Ampache does not <strong>run</strong> correctly by this server."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:180
+msgid "Please contact your server administrator, and fix them."
+msgstr ""
+
#: ../../templates/rightbar.inc.php:28
msgid "Add to Playlist"
msgstr " "
@@ -2350,8 +2417,8 @@ msgstr ""
#: ../../templates/show_random.inc.php:51
#: ../../templates/show_random.inc.php:52
#, fuzzy, php-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%d minute"
+msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
@@ -2362,8 +2429,8 @@ msgstr[2] ""
#: ../../templates/show_random.inc.php:56
#: ../../templates/show_random.inc.php:57
#, fuzzy, php-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%d hour"
+msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
@@ -2470,10 +2537,7 @@ msgstr ""
#: ../../templates/show_artist.inc.php:25
#, php-format
msgid "%s by %s"
-msgid_plural "%ss by %s"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr ""
#: ../../templates/show_artist.inc.php:35
#, fuzzy, php-format
@@ -3474,11 +3538,11 @@ msgstr " "
msgid "Local Path to Files"
msgstr " "
-#: ../../admin/mail.php:84
+#: ../../admin/mail.php:90
msgid "E-mail Sent"
msgstr "- "
-#: ../../admin/mail.php:85
+#: ../../admin/mail.php:91
msgid "Your E-mail was successfully sent."
msgstr " - "
@@ -3707,7 +3771,7 @@ msgstr " ?"
msgid "Album Art Search Finished"
msgstr " "
-#: ../../bin/print_tags.inc:67
+#: ../../bin/print_tags.inc:66
msgid ""
"[print_tags.php.inc]\n"
"This commandline script will display the tag information for the specified "
@@ -3720,7 +3784,7 @@ msgstr ""
" Ampache\n"
" \n"
-#: ../../bin/print_tags.inc:73
+#: ../../bin/print_tags.inc:72
msgid "Filename:"
msgstr ":"
@@ -3914,9 +3978,6 @@ msgstr ":"
#~ msgid "Streaming"
#~ msgstr ""
-#~ msgid "System"
-#~ msgstr ""
-
#~ msgid "Play Random from Album"
#~ msgstr " "
diff --git a/locale/tr_TR/LC_MESSAGES/messages.mo b/locale/tr_TR/LC_MESSAGES/messages.mo
index 232ca9dd..687ef811 100644
--- a/locale/tr_TR/LC_MESSAGES/messages.mo
+++ b/locale/tr_TR/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/tr_TR/LC_MESSAGES/messages.po b/locale/tr_TR/LC_MESSAGES/messages.po
index a70b24c9..b2aed9c4 100644
--- a/locale/tr_TR/LC_MESSAGES/messages.po
+++ b/locale/tr_TR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Ampache 3.5.0\n"
"Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2008-08-25 10:44+0900\n"
+"POT-Creation-Date: 2008-08-27 09:09+0900\n"
"PO-Revision-Date: 2008-05-10 02:21-0700\n"
"Last-Translator: Ampache <translations at ampache.org>\n"
"Language-Team: Turkish <translations at ampache.org>\n"
@@ -1333,14 +1333,14 @@ msgid "Preference Administration"
msgstr ""
#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:32
+#: ../../templates/show_install_lang.inc.php:33
#: ../../templates/show_install.inc.php:32
#: ../../templates/show_install_account.inc.php:32
msgid "Ampache Installation"
msgstr ""
#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:40
#: ../../templates/show_install.inc.php:40
#: ../../templates/show_install_account.inc.php:39
msgid ""
@@ -1350,7 +1350,7 @@ msgid ""
msgstr ""
#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:42
+#: ../../templates/show_install_lang.inc.php:43
#: ../../templates/show_install.inc.php:43
#: ../../templates/show_install_account.inc.php:42
msgid ""
@@ -1358,7 +1358,7 @@ msgid ""
msgstr ""
#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:43
+#: ../../templates/show_install_lang.inc.php:44
#: ../../templates/show_install.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
@@ -1366,7 +1366,7 @@ msgid ""
msgstr ""
#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:46
+#: ../../templates/show_install_lang.inc.php:47
#: ../../templates/show_install.inc.php:47
#: ../../templates/show_install_account.inc.php:45
msgid ""
@@ -1570,15 +1570,73 @@ msgstr ""
msgid "Catalog Time"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install_lang.inc.php:38
+#: ../../templates/show_install_lang.inc.php:52
#: ../../templates/show_install.inc.php:38
msgid "Requirements"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:72
+#: ../../templates/show_install_lang.inc.php:51
+msgid "System Checks"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:53
+#, fuzzy
+msgid "PHP Version:"
+msgstr "Almanca"
+
+#: ../../templates/show_install_lang.inc.php:63
+msgid "Mysql for PHP:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:77
+msgid "PHP Session Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:87
+msgid "PHP ICONV Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:97
+msgid "PHP PCRE Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:107
+msgid "PHP PutENV Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:120
+msgid "PHP Safe Mode:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:130
+msgid "Optional"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:131
+msgid "PHP GetText Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:140
+msgid "PHP Mbstring Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:152
+msgid "Choose installation language."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:173
msgid "Start configuration"
msgstr ""
+#: ../../templates/show_install_lang.inc.php:179
+msgid "Ampache does not <strong>run</strong> correctly by this server."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:180
+msgid "Please contact your server administrator, and fix them."
+msgstr ""
+
#: ../../templates/rightbar.inc.php:28
msgid "Add to Playlist"
msgstr ""
@@ -2322,8 +2380,8 @@ msgstr ""
#: ../../templates/show_random.inc.php:51
#: ../../templates/show_random.inc.php:52
#, php-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%d minute"
+msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
@@ -2333,8 +2391,8 @@ msgstr[1] ""
#: ../../templates/show_random.inc.php:56
#: ../../templates/show_random.inc.php:57
#, php-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%d hour"
+msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
@@ -2442,9 +2500,7 @@ msgstr ""
#: ../../templates/show_artist.inc.php:25
#, php-format
msgid "%s by %s"
-msgid_plural "%ss by %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
#: ../../templates/show_artist.inc.php:35
#, fuzzy, php-format
@@ -3444,11 +3500,11 @@ msgstr "Sonu bulunamad"
msgid "Local Path to Files"
msgstr "Yerel alma Dzeni"
-#: ../../admin/mail.php:84
+#: ../../admin/mail.php:90
msgid "E-mail Sent"
msgstr ""
-#: ../../admin/mail.php:85
+#: ../../admin/mail.php:91
msgid "Your E-mail was successfully sent."
msgstr ""
@@ -3686,7 +3742,7 @@ msgstr ""
msgid "Album Art Search Finished"
msgstr ""
-#: ../../bin/print_tags.inc:67
+#: ../../bin/print_tags.inc:66
msgid ""
"[print_tags.php.inc]\n"
"This commandline script will display the tag information for the specified "
@@ -3695,7 +3751,7 @@ msgid ""
" \n"
msgstr ""
-#: ../../bin/print_tags.inc:73
+#: ../../bin/print_tags.inc:72
msgid "Filename:"
msgstr ""
@@ -3710,10 +3766,6 @@ msgstr ""
#~ msgid "German"
#~ msgstr "Almanca"
-#, fuzzy
-#~ msgid "Persian"
-#~ msgstr "Almanca"
-
#~ msgid "French"
#~ msgstr "Franszca"
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index dcfbdc23..e81a364e 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.mo
+++ b/locale/zh_CN/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 530009f0..1a9bf7f9 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Ampache 3.5.0\n"
"Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2008-08-25 10:44+0900\n"
+"POT-Creation-Date: 2008-08-27 09:09+0900\n"
"PO-Revision-Date: 2008-05-10 02:21-0700\n"
"Last-Translator: ampache <translations at ampache.org>\n"
"Language-Team: Chinese Simplified <translations at ampache.org>\n"
@@ -1326,14 +1326,14 @@ msgid "Preference Administration"
msgstr ""
#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:32
+#: ../../templates/show_install_lang.inc.php:33
#: ../../templates/show_install.inc.php:32
#: ../../templates/show_install_account.inc.php:32
msgid "Ampache Installation"
msgstr ""
#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:40
#: ../../templates/show_install.inc.php:40
#: ../../templates/show_install_account.inc.php:39
msgid ""
@@ -1343,7 +1343,7 @@ msgid ""
msgstr ""
#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:42
+#: ../../templates/show_install_lang.inc.php:43
#: ../../templates/show_install.inc.php:43
#: ../../templates/show_install_account.inc.php:42
msgid ""
@@ -1351,7 +1351,7 @@ msgid ""
msgstr ""
#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:43
+#: ../../templates/show_install_lang.inc.php:44
#: ../../templates/show_install.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
@@ -1359,7 +1359,7 @@ msgid ""
msgstr ""
#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:46
+#: ../../templates/show_install_lang.inc.php:47
#: ../../templates/show_install.inc.php:47
#: ../../templates/show_install_account.inc.php:45
msgid ""
@@ -1561,15 +1561,72 @@ msgstr ""
msgid "Catalog Time"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install_lang.inc.php:38
+#: ../../templates/show_install_lang.inc.php:52
#: ../../templates/show_install.inc.php:38
msgid "Requirements"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:72
+#: ../../templates/show_install_lang.inc.php:51
+msgid "System Checks"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:53
+msgid "PHP Version:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:63
+msgid "Mysql for PHP:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:77
+msgid "PHP Session Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:87
+msgid "PHP ICONV Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:97
+msgid "PHP PCRE Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:107
+msgid "PHP PutENV Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:120
+msgid "PHP Safe Mode:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:130
+msgid "Optional"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:131
+msgid "PHP GetText Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:140
+msgid "PHP Mbstring Support:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:152
+msgid "Choose installation language."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:173
msgid "Start configuration"
msgstr ""
+#: ../../templates/show_install_lang.inc.php:179
+msgid "Ampache does not <strong>run</strong> correctly by this server."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:180
+msgid "Please contact your server administrator, and fix them."
+msgstr ""
+
#: ../../templates/rightbar.inc.php:28
msgid "Add to Playlist"
msgstr ""
@@ -2302,8 +2359,8 @@ msgstr ""
#: ../../templates/show_random.inc.php:51
#: ../../templates/show_random.inc.php:52
#, php-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%d minute"
+msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
@@ -2313,8 +2370,8 @@ msgstr[1] ""
#: ../../templates/show_random.inc.php:56
#: ../../templates/show_random.inc.php:57
#, php-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%d hour"
+msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
@@ -2420,9 +2477,7 @@ msgstr ""
#: ../../templates/show_artist.inc.php:25
#, php-format
msgid "%s by %s"
-msgid_plural "%ss by %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
#: ../../templates/show_artist.inc.php:35
#, php-format
@@ -3405,11 +3460,11 @@ msgstr ""
msgid "Local Path to Files"
msgstr ""
-#: ../../admin/mail.php:84
+#: ../../admin/mail.php:90
msgid "E-mail Sent"
msgstr ""
-#: ../../admin/mail.php:85
+#: ../../admin/mail.php:91
msgid "Your E-mail was successfully sent."
msgstr ""
@@ -3639,7 +3694,7 @@ msgstr ""
msgid "Album Art Search Finished"
msgstr ""
-#: ../../bin/print_tags.inc:67
+#: ../../bin/print_tags.inc:66
msgid ""
"[print_tags.php.inc]\n"
"This commandline script will display the tag information for the specified "
@@ -3648,7 +3703,7 @@ msgid ""
" \n"
msgstr ""
-#: ../../bin/print_tags.inc:73
+#: ../../bin/print_tags.inc:72
msgid "Filename:"
msgstr ""
diff --git a/templates/show_denied.inc.php b/templates/show_denied.inc.php
index 19b1507d..1b59cf08 100644
--- a/templates/show_denied.inc.php
+++ b/templates/show_denied.inc.php
@@ -47,7 +47,7 @@ echo _("Functions are disabled in the demo because previous users of the demo ha
<?php } ?>
</p>
<div id="bottom">
-<p><b>Ampache</b><br />
+<p><strong>Ampache</strong><br />
Pour l'Amour de la Musique.</p>
</div>
</body>
diff --git a/templates/show_gather_art.inc.php b/templates/show_gather_art.inc.php
index 1cd126ed..9003748b 100644
--- a/templates/show_gather_art.inc.php
+++ b/templates/show_gather_art.inc.php
@@ -20,7 +20,7 @@
*/
show_box_top();
-echo "<b>" . _('Starting Album Art Search') . ". . .</b><br />\n";
+echo "<strong>" . _('Starting Album Art Search') . ". . .</strong><br />\n";
echo _('Searched') . ": <span id=\"count_art_" . $catalog_id . "\">" . _('None') . "</span><br />";
echo _('Reading') . ":<span id=\"read_art_$catalog_id\"></span><br />";
show_box_bottom();
diff --git a/templates/show_install.inc.php b/templates/show_install.inc.php
index 5d3a05eb..4738d263 100644
--- a/templates/show_install.inc.php
+++ b/templates/show_install.inc.php
@@ -35,7 +35,7 @@ if (INSTALL != '1') { exit; }
<div id="text-box">
<div class="notify">
- <b><?php echo _('Requirements'); ?></b>
+ <strong><?php echo _('Requirements'); ?></strong>
<p>
<?php echo _("This Page handles the installation of the Ampache database and the creation of the ampache.cfg.php file. Before you continue please make sure that you have the following pre-requisites"); ?>
</p>
@@ -49,7 +49,7 @@ if (INSTALL != '1') { exit; }
</div>
<div class="content">
- <b><?php echo _("Step 1 - Creating and Inserting the Ampache Database"); ?></b><br />
+ <strong><?php echo _("Step 1 - Creating and Inserting the Ampache Database"); ?></strong><br />
<dl>
<dd><?php echo _("This step creates and inserts the Ampache database, as such please provide a mysql account with database creation rights. This step may take a while depending upon the speed of your computer"); ?></dd>
</dl>
@@ -103,7 +103,7 @@ if (INSTALL != '1') { exit; }
</div>
<div id="bottom">
- <p><b>Ampache Installation.</b><br />
+ <p><strong>Ampache Installation.</strong><br />
Pour l'Amour de la Musique</p>
</div>
</div>
diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php
index 486a316e..9eb5183a 100644
--- a/templates/show_install_account.inc.php
+++ b/templates/show_install_account.inc.php
@@ -47,14 +47,14 @@ if (INSTALL != '1') { exit; }
<div class="content">
<?php echo _("Step 1 - Creating and Inserting the Ampache Database"); ?><br />
<?php echo _("Step 2 - Creating the ampache.cfg.php file"); ?><br />
- <b><?php echo _("Step 3 - Setup Initial Account"); ?></b><br />
+ <strong><?php echo _("Step 3 - Setup Initial Account"); ?></strong><br />
<dl>
<dd><?php echo _("This step creates your initial Ampache admin account. Once your admin account has been created you will be directed to the login page"); ?></dd>
</dl>
<?php Error::display('general'); ?>
<br />
<span class="header2"><?php echo _('Create Admin Account'); ?></span>
- <form method="post" action="<?php echo $GLOBALS['php_self'] . "?action=create_account"; ?>" enctype="multipart/form-data" >
+ <form method="post" action="<?php echo $GLOBALS['php_self'] . "?action=create_account&amp;htmllang=$htmllang&amp;charset=$charset"; ?>" enctype="multipart/form-data" >
<table>
<tr>
<td class="align"><?php echo _('Username'); ?></td>
@@ -76,7 +76,7 @@ if (INSTALL != '1') { exit; }
</form>
</div>
<div id="bottom">
- <p><b>Ampache Installation.</b><br />
+ <p><strong>Ampache Installation.</strong><br />
For the love of Music.</p>
</div>
diff --git a/templates/show_install_config.inc.php b/templates/show_install_config.inc.php
index ab266495..3cb13849 100644
--- a/templates/show_install_config.inc.php
+++ b/templates/show_install_config.inc.php
@@ -46,7 +46,7 @@ if (INSTALL != '1') { exit; }
<div class="content">
<?php echo _("Step 1 - Creating and Inserting the Ampache Database"); ?><br />
- <b><?php echo _("Step 2 - Creating the Ampache.cfg.php file"); ?></b><br />
+ <strong><?php echo _("Step 2 - Creating the Ampache.cfg.php file"); ?></strong><br />
<dl>
<dd><?php echo _("This steps takes the basic config values and generates the config file. It will prompt you to download the config file. Please put the downloaded config file in /config"); ?></dd>
</dl>
@@ -133,7 +133,7 @@ if (INSTALL != '1') { exit; }
</form>
</div>
<div id="bottom">
- <p><b>Ampache Installation.</b><br />
+ <p><strong>Ampache Installation.</strong><br />
For the love of Music.</p>
</div>
</div>
diff --git a/templates/show_install_lang.inc.php b/templates/show_install_lang.inc.php
index 4ec20405..7e790af2 100644
--- a/templates/show_install_lang.inc.php
+++ b/templates/show_install_lang.inc.php
@@ -20,6 +20,7 @@
*/
?>
<?php if (INSTALL != '1') { exit; } ?>
+<?php $results = 0; ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>">
<head>
@@ -34,7 +35,7 @@
</div>
<div id="text-box">
<div class="notify">
- <b><?php echo _('Requirements'); ?></b>
+ <strong><?php echo _('Requirements'); ?></strong>
<p>
<?php echo _('This Page handles the installation of the Ampache database and the creation of the ampache.cfg.php file. Before you continue please make sure that you have the following pre-requisites'); ?>
</p>
@@ -46,9 +47,109 @@
<?php echo _("Once you have ensured that you have the above requirements please fill out the information below. You will only be asked for the required config values. If you would like to make changes to your ampache install at a later date simply edit /config/ampache.cfg.php"); ?>
</p>
</div>
-
<div class="content">
- <b>Choose installation language.</b>
+ <h3><?php echo _('System Checks'); ?></h3>
+ <h4><?php echo _('Requirements'); ?></h4>
+ <p><?php echo _('PHP Version:'); ?>
+ <?php
+ if(strcmp('5.1.0',phpversion()) > 0) {
+ echo " <font color=\"red\">ERROR</font> " . phpversion();
+ $results = $results + 1;
+ } else {
+ echo " <font color=\"green\">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;</font> " . phpversion();
+ }
+ ?>
+ </p>
+ <p><?php echo _('Mysql for PHP:'); ?>
+ <?php
+ if (!function_exists('mysql_query')) {
+ echo " <font color=\"red\">ERROR</font> ";
+ $results = $results + 1;
+ } else {
+ if(strcmp('5.0.0',mysql_get_server_info()) > 0) {
+ echo " <font color=\"#FF6600\">&nbsp;&nbsp;&nbsp;WARNING&nbsp;&nbsp;&nbsp;&nbsp;</font> " . mysql_get_server_info() . "<strong>We recommend MySQL version more than 5.0.0</strong>";
+ } else {
+ echo " <font color=\"green\">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;</font> " . mysql_get_server_info();
+ }
+ }
+ ?>
+ </p>
+ <p><?php echo _('PHP Session Support:'); ?>
+ <?php
+ if (!function_exists('session_set_save_handler')) {
+ echo " <font color=\"red\">ERROR</font> ";
+ $results = $results + 1;
+ } else {
+ echo " <font color=\"green\">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;</font> ";
+ }
+ ?>
+ </p>
+ <p><?php echo _('PHP ICONV Support:'); ?>
+ <?php
+ if (!function_exists('iconv')) {
+ echo " <font color=\"red\">ERROR</font> ";
+ $results = $results + 1;
+ } else {
+ echo " <font color=\"green\">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;</font> ";
+ }
+ ?>
+ </p>
+ <p><?php echo _('PHP PCRE Support:'); ?>
+ <?php
+ if (!function_exists('preg_match')) {
+ echo " <font color=\"red\">ERROR</font> ";
+ $results = $results + 1;
+ } else {
+ echo " <font color=\"green\">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;</font> ";
+ }
+ ?>
+ </p>
+ <p><?php echo _('PHP PutENV Support:'); ?>
+ <?php
+ $current = ini_get('memory_limit');
+ $current = substr($current_memory,0,strlen($current_memory)-1);
+ $new_limit = ($current+1) . "M";
+ if (!ini_set(memory_limit,$new_limit)) {
+ echo " <font color=\"red\">ERROR</font> ";
+ $results = $results + 1;
+ } else {
+ echo " <font color=\"green\">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;</font> ";
+ }
+ ?>
+ </p>
+ <p><?php echo _('PHP Safe Mode:'); ?>
+ <?php
+ if (ini_get('safe_mode')) {
+ echo " <font color=\"red\">Using Safe Mode.</font> ";
+ } else {
+ echo " <font color=\"green\">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;</font> ";
+ }
+ ?>
+ </p>
+ <hr />
+ <h4><?php echo _('Optional'); ?></h4>
+ <p><?php echo _('PHP GetText Support:'); ?>
+ <?php
+ if (!function_exists('gettext')) {
+ echo " <font color=\"#FF6600\">WARNING: This server will use gettext emulator.</font> ";
+ } else {
+ echo " <font color=\"green\">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;</font> ";
+ }
+ ?>
+ </p>
+ <p><?php echo _('PHP Mbstring Support:'); ?>
+ <?php
+ if (!function_exists('mb_check_encoding')) {
+ echo " <font color=\"#FF6600\">WARNING</font> ";
+ } else {
+ echo " <font color=\"green\">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;</font> ";
+ }
+ ?>
+ </p>
+ </div>
+ <?php if($results == 0) { ?>
+ <div class="content">
+ <strong><?php echo _('Choose installation language.'); ?></strong>
<p>
<?php Error::display('general'); ?>
</p>
@@ -73,8 +174,14 @@ echo "</select>\n";
</form>
</div>
+ <?php } else { /* if results */ ?>
+ <div class="content">
+ <?php echo _('Ampache does not <strong>run</strong> correctly by this server.'); ?><br />
+ <?php echo _('Please contact your server administrator, and fix them.'); ?>
+ </div>
+ <?php } /* if results */ ?>
<div id="bottom">
- <p><b>Ampache Installation.</b><br />
+ <p><strong>Ampache Installation.</strong><br />
For the love of Music.</p>
</div>
</div>
diff --git a/templates/show_registration_confirmation.inc.php b/templates/show_registration_confirmation.inc.php
index 19d4e308..55cb78db 100644
--- a/templates/show_registration_confirmation.inc.php
+++ b/templates/show_registration_confirmation.inc.php
@@ -46,7 +46,7 @@ $web_path = Config::get('web_path');
<a href="<?php echo Config::get('web_path'); ?>/login.php"><?php echo _('Return to Login Page'); ?></a>
</div><!--end <div>id="maincontainer-->
<div id="bottom">
-<p><b>Ampache</b><br />
+<p><strong>Ampache</strong><br />
Pour l'Amour de la Musique.</p>
</div>
</body>
diff --git a/templates/show_test.inc.php b/templates/show_test.inc.php
index 4fa81cf3..43338288 100644
--- a/templates/show_test.inc.php
+++ b/templates/show_test.inc.php
@@ -264,7 +264,7 @@
</table>
</div>
<div id="bottom">
-<p><b>Ampache Debug.</b><br />
+<p><strong>Ampache Debug.</strong><br />
For the love of Music.</p>
</div>
</body>
diff --git a/templates/show_test_config.inc.php b/templates/show_test_config.inc.php
index ab9e1ee2..085fa17c 100644
--- a/templates/show_test_config.inc.php
+++ b/templates/show_test_config.inc.php
@@ -74,7 +74,7 @@ This variable no longer exists, all downsampling/transcoding is handled by the t
<br />
</div>
<div id="bottom">
-<p><b>Ampache Debug.</b><br />
+<p><strong>Ampache Debug.</strong><br />
For the love of Music.</p>
</div>
</body>
diff --git a/templates/show_user_activate.inc.php b/templates/show_user_activate.inc.php
index da9bae91..99e8796f 100644
--- a/templates/show_user_activate.inc.php
+++ b/templates/show_user_activate.inc.php
@@ -56,7 +56,7 @@ $web_path = Config::get('web_path');
<?php } ?>
</div><!--end <div>id="maincontainer-->
<div id="bottom">
-<p><b>Ampache</b><br />
+<p><strong>Ampache</strong><br />
Pour l'Amour de la Musique.</p>
</div>
</body>
diff --git a/templates/show_user_registration.inc.php b/templates/show_user_registration.inc.php
index f35e6bfe..c435293d 100644
--- a/templates/show_user_registration.inc.php
+++ b/templates/show_user_registration.inc.php
@@ -137,7 +137,7 @@ if (Config::get('user_agreement')) { ?>
</form>
</div><!--end <div>id="maincontainer-->
<div id="bottom">
-<p><b>Ampache</b><br />
+<p><strong>Ampache</strong><br />
Pour l'Amour de la Musique.</p>
</div>
</body>