summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xlocale/base/gather-messages.sh4
-rw-r--r--locale/base/messages.pot291
-rw-r--r--locale/base/translation-words.txt112
-rw-r--r--locale/ca_ES/LC_MESSAGES/messages.mobin32764 -> 32636 bytes
-rw-r--r--locale/ca_ES/LC_MESSAGES/messages.po322
-rw-r--r--locale/de_DE/LC_MESSAGES/messages.mobin43307 -> 43111 bytes
-rw-r--r--locale/de_DE/LC_MESSAGES/messages.po321
-rw-r--r--locale/el_GR/LC_MESSAGES/messages.mobin52614 -> 52477 bytes
-rw-r--r--locale/el_GR/LC_MESSAGES/messages.po319
-rw-r--r--locale/en_GB/LC_MESSAGES/messages.mobin16620 -> 16548 bytes
-rw-r--r--locale/en_GB/LC_MESSAGES/messages.po320
-rw-r--r--locale/es_ES/LC_MESSAGES/messages.mobin10840 -> 10745 bytes
-rw-r--r--locale/es_ES/LC_MESSAGES/messages.po318
-rw-r--r--locale/fr_FR/LC_MESSAGES/messages.mobin47896 -> 47743 bytes
-rw-r--r--locale/fr_FR/LC_MESSAGES/messages.po329
-rw-r--r--locale/it_IT/LC_MESSAGES/messages.mobin17862 -> 17733 bytes
-rw-r--r--locale/it_IT/LC_MESSAGES/messages.po321
-rw-r--r--locale/ja_JP/LC_MESSAGES/messages.mobin51659 -> 51542 bytes
-rw-r--r--locale/ja_JP/LC_MESSAGES/messages.po312
-rw-r--r--locale/nl_NL/LC_MESSAGES/messages.mobin23659 -> 23597 bytes
-rw-r--r--locale/nl_NL/LC_MESSAGES/messages.po318
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.mobin40211 -> 40161 bytes
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.po323
-rw-r--r--locale/tr_TR/LC_MESSAGES/messages.mobin590 -> 670 bytes
-rw-r--r--locale/tr_TR/LC_MESSAGES/messages.po300
-rw-r--r--locale/zh_CN/LC_MESSAGES/messages.mobin475 -> 555 bytes
-rw-r--r--locale/zh_CN/LC_MESSAGES/messages.po291
-rw-r--r--templates/show_install.inc.php1
-rw-r--r--templates/show_install_account.inc.php1
-rw-r--r--templates/show_install_config.inc.php1
-rw-r--r--templates/show_install_lang.inc.php27
-rw-r--r--templates/show_preference_admin.inc.php2
-rw-r--r--templates/show_preference_box.inc.php2
-rw-r--r--templates/show_preferences.inc.php2
34 files changed, 2918 insertions, 1319 deletions
diff --git a/locale/base/gather-messages.sh b/locale/base/gather-messages.sh
index 964024c7..9ea71cb4 100755
--- a/locale/base/gather-messages.sh
+++ b/locale/base/gather-messages.sh
@@ -49,6 +49,8 @@ case $1 in
"--all"|"-a"|"all")
xgettext --from-code=UTF-8 --msgid-bugs-address="$MAILADDR" -L php -o $POTNAME `find ../../ -name \*.php -type f` `find ../../ -name \*.inc -type f`
OLANG=`ls ../ | grep -v base`
+ echo "add database words add to pot file..."
+ cat translation-words.txt >> messages.pot
for i in $OLANG
do
echo "$i PO file merging..."
@@ -65,6 +67,8 @@ case $1 in
else
echo "pot file creation wasn't done.";
fi
+ echo "add database words to pot file..."
+ cat translation-words.txt >> messages.pot
;;
"--init"|"-i"|"init")
msginit -l $LANG -i $POTNAME -o $PODIR/$PONAME;
diff --git a/locale/base/messages.pot b/locale/base/messages.pot
index 590f963d..64bbf280 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-27 09:56+0900\n"
+"POT-Creation-Date: 2008-08-29 16:03+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"
@@ -90,6 +90,7 @@ msgid "Edit"
msgstr ""
#: ../../templates/show_user_preferences.inc.php:28
+#: ../../templates/show_preferences.inc.php:28
#, php-format
msgid "Editing %s preferences"
msgstr ""
@@ -231,7 +232,7 @@ msgid ""
msgstr ""
#: ../../templates/show_test.inc.php:153
-#: ../../templates/show_install_config.inc.php:88
+#: ../../templates/show_install_config.inc.php:89
msgid "Ampache.cfg.php Exists"
msgstr ""
@@ -243,7 +244,7 @@ msgid ""
msgstr ""
#: ../../templates/show_test.inc.php:172
-#: ../../templates/show_install_config.inc.php:105
+#: ../../templates/show_install_config.inc.php:106
msgid "Ampache.cfg.php Configured?"
msgstr ""
@@ -268,7 +269,7 @@ msgid "DB Inserted"
msgstr ""
#: ../../templates/show_test.inc.php:235
-#: ../../templates/show_install_config.inc.php:60
+#: ../../templates/show_install_config.inc.php:61
msgid "Web Path"
msgstr ""
@@ -390,7 +391,7 @@ msgstr ""
#: ../../templates/show_users.inc.php:104
#: ../../templates/show_edit_user.inc.php:29
#: ../../templates/show_add_user.inc.php:29
-#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_install_account.inc.php:61
#: ../../templates/show_recently_played.inc.php:39
#: ../../templates/show_recently_played.inc.php:98
#: ../../templates/show_user_registration.inc.php:75
@@ -463,7 +464,7 @@ msgstr ""
#: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
#: ../../lib/class/flag.class.php:282 ../../lib/class/localplay.class.php:648
-#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:409
+#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:439
#: ../../modules/localplay/mpd.controller.php:508
#: ../../modules/localplay/httpq.controller.php:505
msgid "Unknown"
@@ -489,7 +490,7 @@ msgstr ""
#: ../../templates/show_edit_user.inc.php:52
#: ../../templates/show_add_user.inc.php:52
-#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_install_account.inc.php:65
#: ../../templates/show_login_form.inc.php:62
#: ../../templates/show_user_registration.inc.php:103
#: ../../modules/localplay/mpd.controller.php:235
@@ -500,7 +501,7 @@ msgstr ""
#: ../../templates/show_edit_user.inc.php:61
#: ../../templates/show_add_user.inc.php:61
#: ../../templates/show_account.inc.php:46
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:69
#: ../../templates/show_user_registration.inc.php:112
msgid "Confirm Password"
msgstr ""
@@ -1325,43 +1326,43 @@ msgstr ""
msgid "Preference Administration"
msgstr ""
-#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:33
-#: ../../templates/show_install.inc.php:32
-#: ../../templates/show_install_account.inc.php:32
+#: ../../templates/show_install_config.inc.php:33
+#: ../../templates/show_install_lang.inc.php:34
+#: ../../templates/show_install.inc.php:33
+#: ../../templates/show_install_account.inc.php:33
msgid "Ampache Installation"
msgstr ""
-#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:40
-#: ../../templates/show_install.inc.php:40
-#: ../../templates/show_install_account.inc.php:39
+#: ../../templates/show_install_config.inc.php:39
+#: ../../templates/show_install_lang.inc.php:41
+#: ../../templates/show_install.inc.php:41
+#: ../../templates/show_install_account.inc.php:40
msgid ""
"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"
msgstr ""
-#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:43
-#: ../../templates/show_install.inc.php:43
-#: ../../templates/show_install_account.inc.php:42
+#: ../../templates/show_install_config.inc.php:42
+#: ../../templates/show_install_lang.inc.php:44
+#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_account.inc.php:43
msgid ""
"A MySQL Server with a username and password that can create/modify databases"
msgstr ""
-#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:44
-#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_config.inc.php:43
+#: ../../templates/show_install_lang.inc.php:45
+#: ../../templates/show_install.inc.php:45
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.php.dist file"
msgstr ""
-#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:47
-#: ../../templates/show_install.inc.php:47
-#: ../../templates/show_install_account.inc.php:45
+#: ../../templates/show_install_config.inc.php:45
+#: ../../templates/show_install_lang.inc.php:48
+#: ../../templates/show_install.inc.php:48
+#: ../../templates/show_install_account.inc.php:46
msgid ""
"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 "
@@ -1369,61 +1370,61 @@ msgid ""
"date simply edit /config/ampache.cfg.php"
msgstr ""
-#: ../../templates/show_install_config.inc.php:48
-#: ../../templates/show_install.inc.php:52
-#: ../../templates/show_install_account.inc.php:48
+#: ../../templates/show_install_config.inc.php:49
+#: ../../templates/show_install.inc.php:53
+#: ../../templates/show_install_account.inc.php:49
msgid "Step 1 - Creating and Inserting the Ampache Database"
msgstr ""
-#: ../../templates/show_install_config.inc.php:49
-#: ../../templates/show_install.inc.php:56
+#: ../../templates/show_install_config.inc.php:50
+#: ../../templates/show_install.inc.php:57
msgid "Step 2 - Creating the Ampache.cfg.php file"
msgstr ""
-#: ../../templates/show_install_config.inc.php:51
+#: ../../templates/show_install_config.inc.php:52
msgid ""
"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"
msgstr ""
-#: ../../templates/show_install_config.inc.php:53
-#: ../../templates/show_install.inc.php:57
-#: ../../templates/show_install_account.inc.php:50
+#: ../../templates/show_install_config.inc.php:54
+#: ../../templates/show_install.inc.php:58
+#: ../../templates/show_install_account.inc.php:51
msgid "Step 3 - Setup Initial Account"
msgstr ""
-#: ../../templates/show_install_config.inc.php:56
+#: ../../templates/show_install_config.inc.php:57
msgid "Generate Config File"
msgstr ""
-#: ../../templates/show_install_config.inc.php:64
-#: ../../templates/show_install.inc.php:65
+#: ../../templates/show_install_config.inc.php:65
+#: ../../templates/show_install.inc.php:66
msgid "Desired Database Name"
msgstr ""
-#: ../../templates/show_install_config.inc.php:68
-#: ../../templates/show_install.inc.php:69
+#: ../../templates/show_install_config.inc.php:69
+#: ../../templates/show_install.inc.php:70
msgid "MySQL Hostname"
msgstr ""
-#: ../../templates/show_install_config.inc.php:72
+#: ../../templates/show_install_config.inc.php:73
msgid "MySQL Username"
msgstr ""
-#: ../../templates/show_install_config.inc.php:76
+#: ../../templates/show_install_config.inc.php:77
msgid "MySQL Password"
msgstr ""
-#: ../../templates/show_install_config.inc.php:81
+#: ../../templates/show_install_config.inc.php:82
msgid "Write Config"
msgstr ""
-#: ../../templates/show_install_config.inc.php:126
+#: ../../templates/show_install_config.inc.php:127
msgid "Check for Config"
msgstr ""
-#: ../../templates/show_install_config.inc.php:132
+#: ../../templates/show_install_config.inc.php:133
msgid "Continue to Step 3"
msgstr ""
@@ -1561,69 +1562,69 @@ msgstr ""
msgid "Catalog Time"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:38
-#: ../../templates/show_install_lang.inc.php:52
-#: ../../templates/show_install.inc.php:38
+#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install.inc.php:39
msgid "Requirements"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:51
+#: ../../templates/show_install_lang.inc.php:52
msgid "System Checks"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install_lang.inc.php:54
msgid "PHP Version:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:63
+#: ../../templates/show_install_lang.inc.php:64
msgid "Mysql for PHP:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:77
+#: ../../templates/show_install_lang.inc.php:78
msgid "PHP Session Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:87
+#: ../../templates/show_install_lang.inc.php:88
msgid "PHP ICONV Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:97
+#: ../../templates/show_install_lang.inc.php:98
msgid "PHP PCRE Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:107
+#: ../../templates/show_install_lang.inc.php:108
msgid "PHP PutENV Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:120
-msgid "PHP Safe Mode:"
-msgstr ""
-
-#: ../../templates/show_install_lang.inc.php:130
+#: ../../templates/show_install_lang.inc.php:119
msgid "Optional"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:131
+#: ../../templates/show_install_lang.inc.php:120
msgid "PHP GetText Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:140
+#: ../../templates/show_install_lang.inc.php:123
+msgid "WARNING: This server will use gettext emulator."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:129
msgid "PHP Mbstring Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:152
+#: ../../templates/show_install_lang.inc.php:141
msgid "Choose installation language."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:173
+#: ../../templates/show_install_lang.inc.php:162
msgid "Start configuration"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:179
+#: ../../templates/show_install_lang.inc.php:168
msgid "Ampache does not <strong>run</strong> correctly by this server."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:180
+#: ../../templates/show_install_lang.inc.php:169
msgid "Please contact your server administrator, and fix them."
msgstr ""
@@ -2072,14 +2073,6 @@ msgstr ""
msgid "Disabled Songs"
msgstr ""
-#: ../../templates/show_preferences.inc.php:28
-msgid "Editing"
-msgstr ""
-
-#: ../../templates/show_preferences.inc.php:28
-msgid "preferences"
-msgstr ""
-
#: ../../templates/show_localplay_instances.inc.php:23
msgid "Show Localplay Instances"
msgstr ""
@@ -2202,66 +2195,66 @@ msgstr ""
msgid "Found"
msgstr ""
-#: ../../templates/show_install.inc.php:54
+#: ../../templates/show_install.inc.php:55
msgid ""
"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"
msgstr ""
-#: ../../templates/show_install.inc.php:61
+#: ../../templates/show_install.inc.php:62
msgid "Insert Ampache Database"
msgstr ""
-#: ../../templates/show_install.inc.php:73
+#: ../../templates/show_install.inc.php:74
msgid "MySQL Administrative Username"
msgstr ""
-#: ../../templates/show_install.inc.php:77
+#: ../../templates/show_install.inc.php:78
msgid "MySQL Administrative Password"
msgstr ""
-#: ../../templates/show_install.inc.php:81
+#: ../../templates/show_install.inc.php:82
msgid "Create Database User for New Database"
msgstr ""
-#: ../../templates/show_install.inc.php:85
+#: ../../templates/show_install.inc.php:86
msgid "Ampache Database Username"
msgstr ""
-#: ../../templates/show_install.inc.php:89
+#: ../../templates/show_install.inc.php:90
msgid "Ampache Database User Password"
msgstr ""
-#: ../../templates/show_install.inc.php:93
+#: ../../templates/show_install.inc.php:94
msgid "Overwrite Existing"
msgstr ""
-#: ../../templates/show_install.inc.php:98
+#: ../../templates/show_install.inc.php:99
msgid "Insert Database"
msgstr ""
-#: ../../templates/show_install_account.inc.php:43
+#: ../../templates/show_install_account.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.dist.php file"
msgstr ""
-#: ../../templates/show_install_account.inc.php:49
+#: ../../templates/show_install_account.inc.php:50
msgid "Step 2 - Creating the ampache.cfg.php file"
msgstr ""
-#: ../../templates/show_install_account.inc.php:52
+#: ../../templates/show_install_account.inc.php:53
msgid ""
"This step creates your initial Ampache admin account. Once your admin "
"account has been created you will be directed to the login page"
msgstr ""
-#: ../../templates/show_install_account.inc.php:56
+#: ../../templates/show_install_account.inc.php:57
msgid "Create Admin Account"
msgstr ""
-#: ../../templates/show_install_account.inc.php:73
+#: ../../templates/show_install_account.inc.php:74
msgid "Create Account"
msgstr ""
@@ -3259,15 +3252,11 @@ msgstr ""
msgid "Error Username or Password incorrect, please try again"
msgstr ""
-#: ../../lib/general.lib.php:406
-msgid "Simplified Chinese"
-msgstr ""
-
-#: ../../lib/general.lib.php:468
+#: ../../lib/general.lib.php:498
msgid "On"
msgstr ""
-#: ../../lib/general.lib.php:471
+#: ../../lib/general.lib.php:501
msgid "Off"
msgstr ""
@@ -3702,3 +3691,115 @@ msgstr ""
#: ../../bin/print_tags.inc:72
msgid "Filename:"
msgstr ""
+#: Database words
+msgid "Allow Downloads"
+msgstr ""
+
+#: Database words
+msgid "Popular Threshold"
+msgstr ""
+
+#: Database words
+msgid "Transcode Bitrate"
+msgstr ""
+
+#: Database words
+msgid "Ampache :: Pour l'Amour de la Musique"
+msgstr ""
+
+#: Database words
+msgid "Lock Songs"
+msgstr ""
+
+#: Database words
+msgid "Forces Http play regardless of port"
+msgstr ""
+
+#: Database words
+msgid "Non-Standard Http Port"
+msgstr ""
+
+#: Database words
+msgid "Localplay Type"
+msgstr ""
+
+#: Database words
+msgid "Type of Playback"
+msgstr ""
+
+#: Database words
+msgid "Language"
+msgstr ""
+
+#: Database words
+msgid "Theme"
+msgstr ""
+
+#: Database words
+msgid "Album Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Artist Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Title Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Offset Limit"
+msgstr ""
+
+#: Database words
+msgid "Localplay Access"
+msgstr ""
+
+#: Database words
+msgid "Allow Streaming"
+msgstr ""
+
+#: Database words
+msgid "Allow Democratic Play"
+msgstr ""
+
+#: Database words
+msgid "Allow Localplay Play"
+msgstr ""
+
+#: Database words
+msgid "Statistics Day Threshold"
+msgstr ""
+
+#: Database words
+msgid "Min Element Count"
+msgstr ""
+
+#: Database words
+msgid "Rate Limit"
+msgstr ""
+
+#: Database words
+msgid "Playlist Method"
+msgstr ""
+
+#: Database words
+msgid "Transcoding"
+msgstr ""
+
+#: Database words
+msgid "User to track"
+msgstr ""
+
+#: Database words
+msgid "Streaming"
+msgstr ""
+
+#: Database words
+msgid "Interface"
+msgstr ""
+
+#: Database words
+msgid "System"
+msgstr ""
+
diff --git a/locale/base/translation-words.txt b/locale/base/translation-words.txt
new file mode 100644
index 00000000..623ae184
--- /dev/null
+++ b/locale/base/translation-words.txt
@@ -0,0 +1,112 @@
+#: Database words
+msgid "Allow Downloads"
+msgstr ""
+
+#: Database words
+msgid "Popular Threshold"
+msgstr ""
+
+#: Database words
+msgid "Transcode Bitrate"
+msgstr ""
+
+#: Database words
+msgid "Ampache :: Pour l'Amour de la Musique"
+msgstr ""
+
+#: Database words
+msgid "Lock Songs"
+msgstr ""
+
+#: Database words
+msgid "Forces Http play regardless of port"
+msgstr ""
+
+#: Database words
+msgid "Non-Standard Http Port"
+msgstr ""
+
+#: Database words
+msgid "Localplay Type"
+msgstr ""
+
+#: Database words
+msgid "Type of Playback"
+msgstr ""
+
+#: Database words
+msgid "Language"
+msgstr ""
+
+#: Database words
+msgid "Theme"
+msgstr ""
+
+#: Database words
+msgid "Album Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Artist Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Title Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Offset Limit"
+msgstr ""
+
+#: Database words
+msgid "Localplay Access"
+msgstr ""
+
+#: Database words
+msgid "Allow Streaming"
+msgstr ""
+
+#: Database words
+msgid "Allow Democratic Play"
+msgstr ""
+
+#: Database words
+msgid "Allow Localplay Play"
+msgstr ""
+
+#: Database words
+msgid "Statistics Day Threshold"
+msgstr ""
+
+#: Database words
+msgid "Min Element Count"
+msgstr ""
+
+#: Database words
+msgid "Rate Limit"
+msgstr ""
+
+#: Database words
+msgid "Playlist Method"
+msgstr ""
+
+#: Database words
+msgid "Transcoding"
+msgstr ""
+
+#: Database words
+msgid "User to track"
+msgstr ""
+
+#: Database words
+msgid "Streaming"
+msgstr ""
+
+#: Database words
+msgid "Interface"
+msgstr ""
+
+#: Database words
+msgid "System"
+msgstr ""
+
diff --git a/locale/ca_ES/LC_MESSAGES/messages.mo b/locale/ca_ES/LC_MESSAGES/messages.mo
index 4e2144e6..e6303e55 100644
--- a/locale/ca_ES/LC_MESSAGES/messages.mo
+++ b/locale/ca_ES/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/ca_ES/LC_MESSAGES/messages.po b/locale/ca_ES/LC_MESSAGES/messages.po
index 1115777a..1669b577 100644
--- a/locale/ca_ES/LC_MESSAGES/messages.po
+++ b/locale/ca_ES/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-27 09:09+0900\n"
+"POT-Creation-Date: 2008-08-29 16:03+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"
@@ -100,6 +100,7 @@ msgid "Edit"
msgstr "Editar"
#: ../../templates/show_user_preferences.inc.php:28
+#: ../../templates/show_preferences.inc.php:28
#, fuzzy, php-format
msgid "Editing %s preferences"
msgstr "preferències"
@@ -255,7 +256,7 @@ msgstr ""
"bé"
#: ../../templates/show_test.inc.php:153
-#: ../../templates/show_install_config.inc.php:88
+#: ../../templates/show_install_config.inc.php:89
msgid "Ampache.cfg.php Exists"
msgstr "Ja existeix Ampache.cfg.php"
@@ -270,7 +271,7 @@ msgstr ""
"\tit no és pot llegir pel teu servidor web"
#: ../../templates/show_test.inc.php:172
-#: ../../templates/show_install_config.inc.php:105
+#: ../../templates/show_install_config.inc.php:106
msgid "Ampache.cfg.php Configured?"
msgstr "Està configurat AMpache.cfg.php?"
@@ -297,7 +298,7 @@ msgid "DB Inserted"
msgstr ""
#: ../../templates/show_test.inc.php:235
-#: ../../templates/show_install_config.inc.php:60
+#: ../../templates/show_install_config.inc.php:61
msgid "Web Path"
msgstr "Patrh del web"
@@ -419,7 +420,7 @@ msgstr "Nom sencer"
#: ../../templates/show_users.inc.php:104
#: ../../templates/show_edit_user.inc.php:29
#: ../../templates/show_add_user.inc.php:29
-#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_install_account.inc.php:61
#: ../../templates/show_recently_played.inc.php:39
#: ../../templates/show_recently_played.inc.php:98
#: ../../templates/show_user_registration.inc.php:75
@@ -492,7 +493,7 @@ msgstr ""
#: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
#: ../../lib/class/flag.class.php:282 ../../lib/class/localplay.class.php:648
-#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:409
+#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:439
#: ../../modules/localplay/mpd.controller.php:508
#: ../../modules/localplay/httpq.controller.php:505
msgid "Unknown"
@@ -518,7 +519,7 @@ msgstr "E-mail"
#: ../../templates/show_edit_user.inc.php:52
#: ../../templates/show_add_user.inc.php:52
-#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_install_account.inc.php:65
#: ../../templates/show_login_form.inc.php:62
#: ../../templates/show_user_registration.inc.php:103
#: ../../modules/localplay/mpd.controller.php:235
@@ -529,7 +530,7 @@ msgstr "Contrasenya"
#: ../../templates/show_edit_user.inc.php:61
#: ../../templates/show_add_user.inc.php:61
#: ../../templates/show_account.inc.php:46
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:69
#: ../../templates/show_user_registration.inc.php:112
msgid "Confirm Password"
msgstr "Confirma la contrasenya"
@@ -1356,17 +1357,17 @@ msgstr ""
msgid "Preference Administration"
msgstr "Preferències administratives"
-#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:33
-#: ../../templates/show_install.inc.php:32
-#: ../../templates/show_install_account.inc.php:32
+#: ../../templates/show_install_config.inc.php:33
+#: ../../templates/show_install_lang.inc.php:34
+#: ../../templates/show_install.inc.php:33
+#: ../../templates/show_install_account.inc.php:33
msgid "Ampache Installation"
msgstr "Instalació de l'Ampache"
-#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:40
-#: ../../templates/show_install.inc.php:40
-#: ../../templates/show_install_account.inc.php:39
+#: ../../templates/show_install_config.inc.php:39
+#: ../../templates/show_install_lang.inc.php:41
+#: ../../templates/show_install.inc.php:41
+#: ../../templates/show_install_account.inc.php:40
msgid ""
"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 "
@@ -1376,19 +1377,19 @@ msgstr ""
"la creació De l'arxiu ampache.cfg.php. Abans de continuar, per favor "
"asseguri's que té els següents requisits previs "
-#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:43
-#: ../../templates/show_install.inc.php:43
-#: ../../templates/show_install_account.inc.php:42
+#: ../../templates/show_install_config.inc.php:42
+#: ../../templates/show_install_lang.inc.php:44
+#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_account.inc.php:43
msgid ""
"A MySQL Server with a username and password that can create/modify databases"
msgstr ""
"Un servidor MySQL amb un nom d'usuari i contrasenya que poden crear i "
"modificar les bases de dades"
-#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:44
-#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_config.inc.php:43
+#: ../../templates/show_install_lang.inc.php:45
+#: ../../templates/show_install.inc.php:45
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.php.dist file"
@@ -1396,10 +1397,10 @@ msgstr ""
"La teva web té accés de lectura a /sql/ampache.sql i a l'arxiu /config/"
"ampache.cfg.php.dist "
-#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:47
-#: ../../templates/show_install.inc.php:47
-#: ../../templates/show_install_account.inc.php:45
+#: ../../templates/show_install_config.inc.php:45
+#: ../../templates/show_install_lang.inc.php:48
+#: ../../templates/show_install.inc.php:48
+#: ../../templates/show_install_account.inc.php:46
msgid ""
"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 "
@@ -1411,61 +1412,61 @@ msgstr ""
"els requisits de configuració. Si desitges realitzar canvis posteriors en la "
"teva instal·lació de l'ampache només has d'editar /config/ampache.cfg.php"
-#: ../../templates/show_install_config.inc.php:48
-#: ../../templates/show_install.inc.php:52
-#: ../../templates/show_install_account.inc.php:48
+#: ../../templates/show_install_config.inc.php:49
+#: ../../templates/show_install.inc.php:53
+#: ../../templates/show_install_account.inc.php:49
msgid "Step 1 - Creating and Inserting the Ampache Database"
msgstr "Pas 1 - Crear i inserir la base de dades de l'ampache"
-#: ../../templates/show_install_config.inc.php:49
-#: ../../templates/show_install.inc.php:56
+#: ../../templates/show_install_config.inc.php:50
+#: ../../templates/show_install.inc.php:57
msgid "Step 2 - Creating the Ampache.cfg.php file"
msgstr "Pas 2 - Creant l'arxiu Ampache.cfg.php"
-#: ../../templates/show_install_config.inc.php:51
+#: ../../templates/show_install_config.inc.php:52
msgid ""
"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"
msgstr ""
-#: ../../templates/show_install_config.inc.php:53
-#: ../../templates/show_install.inc.php:57
-#: ../../templates/show_install_account.inc.php:50
+#: ../../templates/show_install_config.inc.php:54
+#: ../../templates/show_install.inc.php:58
+#: ../../templates/show_install_account.inc.php:51
msgid "Step 3 - Setup Initial Account"
msgstr "Pas 3 - Compte inicial"
-#: ../../templates/show_install_config.inc.php:56
+#: ../../templates/show_install_config.inc.php:57
msgid "Generate Config File"
msgstr ""
-#: ../../templates/show_install_config.inc.php:64
-#: ../../templates/show_install.inc.php:65
+#: ../../templates/show_install_config.inc.php:65
+#: ../../templates/show_install.inc.php:66
msgid "Desired Database Name"
msgstr "Nom desitjat per la base de dades"
-#: ../../templates/show_install_config.inc.php:68
-#: ../../templates/show_install.inc.php:69
+#: ../../templates/show_install_config.inc.php:69
+#: ../../templates/show_install.inc.php:70
msgid "MySQL Hostname"
msgstr "MySQL hostname"
-#: ../../templates/show_install_config.inc.php:72
+#: ../../templates/show_install_config.inc.php:73
msgid "MySQL Username"
msgstr "Usuari de MySQL"
-#: ../../templates/show_install_config.inc.php:76
+#: ../../templates/show_install_config.inc.php:77
msgid "MySQL Password"
msgstr "Contresenya de MySQL"
-#: ../../templates/show_install_config.inc.php:81
+#: ../../templates/show_install_config.inc.php:82
msgid "Write Config"
msgstr "Escriure configuració"
-#: ../../templates/show_install_config.inc.php:126
+#: ../../templates/show_install_config.inc.php:127
msgid "Check for Config"
msgstr "Comprovant per la configuració"
-#: ../../templates/show_install_config.inc.php:132
+#: ../../templates/show_install_config.inc.php:133
msgid "Continue to Step 3"
msgstr ""
@@ -1603,79 +1604,79 @@ msgstr "Mida del catàleg"
msgid "Catalog Time"
msgstr "Temps del catàleg"
-#: ../../templates/show_install_lang.inc.php:38
-#: ../../templates/show_install_lang.inc.php:52
-#: ../../templates/show_install.inc.php:38
+#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install.inc.php:39
msgid "Requirements"
msgstr "Requisits"
-#: ../../templates/show_install_lang.inc.php:51
+#: ../../templates/show_install_lang.inc.php:52
#, fuzzy
msgid "System Checks"
msgstr "Sistema"
-#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install_lang.inc.php:54
#, fuzzy
msgid "PHP Version:"
msgstr "Versió PHP"
-#: ../../templates/show_install_lang.inc.php:63
+#: ../../templates/show_install_lang.inc.php:64
#, fuzzy
msgid "Mysql for PHP:"
msgstr "Mysql per PHP"
-#: ../../templates/show_install_lang.inc.php:77
+#: ../../templates/show_install_lang.inc.php:78
#, fuzzy
msgid "PHP Session Support:"
msgstr "Sessió de PHP suportada"
-#: ../../templates/show_install_lang.inc.php:87
+#: ../../templates/show_install_lang.inc.php:88
#, fuzzy
msgid "PHP ICONV Support:"
msgstr "PHP ICONV suportat"
-#: ../../templates/show_install_lang.inc.php:97
+#: ../../templates/show_install_lang.inc.php:98
#, fuzzy
msgid "PHP PCRE Support:"
msgstr "Suport PHP PCRE"
-#: ../../templates/show_install_lang.inc.php:107
+#: ../../templates/show_install_lang.inc.php:108
#, 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
+#: ../../templates/show_install_lang.inc.php:119
#, fuzzy
msgid "Optional"
msgstr "Opcions"
-#: ../../templates/show_install_lang.inc.php:131
+#: ../../templates/show_install_lang.inc.php:120
#, fuzzy
msgid "PHP GetText Support:"
msgstr "Suport PHP PutENV"
-#: ../../templates/show_install_lang.inc.php:140
+#: ../../templates/show_install_lang.inc.php:123
+msgid "WARNING: This server will use gettext emulator."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:129
#, fuzzy
msgid "PHP Mbstring Support:"
msgstr "Sessió de PHP suportada"
-#: ../../templates/show_install_lang.inc.php:152
+#: ../../templates/show_install_lang.inc.php:141
msgid "Choose installation language."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:173
+#: ../../templates/show_install_lang.inc.php:162
msgid "Start configuration"
msgstr "Configuració inicial"
-#: ../../templates/show_install_lang.inc.php:179
+#: ../../templates/show_install_lang.inc.php:168
msgid "Ampache does not <strong>run</strong> correctly by this server."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:180
+#: ../../templates/show_install_lang.inc.php:169
msgid "Please contact your server administrator, and fix them."
msgstr ""
@@ -2132,14 +2133,6 @@ msgstr "Els deu últims registres assenyalats"
msgid "Disabled Songs"
msgstr "Cançons no disponibles"
-#: ../../templates/show_preferences.inc.php:28
-msgid "Editing"
-msgstr "Editant"
-
-#: ../../templates/show_preferences.inc.php:28
-msgid "preferences"
-msgstr "preferències"
-
#: ../../templates/show_localplay_instances.inc.php:23
msgid "Show Localplay Instances"
msgstr ""
@@ -2263,7 +2256,7 @@ msgstr "Tipus"
msgid "Found"
msgstr "Trobat"
-#: ../../templates/show_install.inc.php:54
+#: ../../templates/show_install.inc.php:55
msgid ""
"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 "
@@ -2273,39 +2266,39 @@ msgstr ""
"la base de dades Mysql amb els drets de creació. Aquest pas pot dur un temps "
"depenent de la velocitat de la seva computadora"
-#: ../../templates/show_install.inc.php:61
+#: ../../templates/show_install.inc.php:62
msgid "Insert Ampache Database"
msgstr ""
-#: ../../templates/show_install.inc.php:73
+#: ../../templates/show_install.inc.php:74
msgid "MySQL Administrative Username"
msgstr "Nom d'usuari de l'administrador de Mysql"
-#: ../../templates/show_install.inc.php:77
+#: ../../templates/show_install.inc.php:78
msgid "MySQL Administrative Password"
msgstr "Contresenya de l'administrador de Mysql"
-#: ../../templates/show_install.inc.php:81
+#: ../../templates/show_install.inc.php:82
msgid "Create Database User for New Database"
msgstr "Crea un usuari de la nova base de dades"
-#: ../../templates/show_install.inc.php:85
+#: ../../templates/show_install.inc.php:86
msgid "Ampache Database Username"
msgstr "Nom d'usuari de la base de dades de l'Ampache "
-#: ../../templates/show_install.inc.php:89
+#: ../../templates/show_install.inc.php:90
msgid "Ampache Database User Password"
msgstr "Contrasenya de l'usuari de la base de dades de l'Ampache"
-#: ../../templates/show_install.inc.php:93
+#: ../../templates/show_install.inc.php:94
msgid "Overwrite Existing"
msgstr ""
-#: ../../templates/show_install.inc.php:98
+#: ../../templates/show_install.inc.php:99
msgid "Insert Database"
msgstr "Inserar base de dades"
-#: ../../templates/show_install_account.inc.php:43
+#: ../../templates/show_install_account.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.dist.php file"
@@ -2313,11 +2306,11 @@ msgstr ""
"El teu servidor web pot llegir l'arxiu /sql/ampache.sql i /config/ampache."
"cfg.php"
-#: ../../templates/show_install_account.inc.php:49
+#: ../../templates/show_install_account.inc.php:50
msgid "Step 2 - Creating the ampache.cfg.php file"
msgstr "Pas 2 - Crear l'arxiu ampache.cfg.php"
-#: ../../templates/show_install_account.inc.php:52
+#: ../../templates/show_install_account.inc.php:53
msgid ""
"This step creates your initial Ampache admin account. Once your admin "
"account has been created you will be directed to the login page"
@@ -2325,11 +2318,11 @@ msgstr ""
"Aquests passos generen la teva compte administrativa inicial de l'ampache. "
"Despré de crear-la seràs dirigit a la pagina d'entrada"
-#: ../../templates/show_install_account.inc.php:56
+#: ../../templates/show_install_account.inc.php:57
msgid "Create Admin Account"
msgstr "Compte d'administració creada"
-#: ../../templates/show_install_account.inc.php:73
+#: ../../templates/show_install_account.inc.php:74
msgid "Create Account"
msgstr "Crear un compte"
@@ -3339,15 +3332,11 @@ msgstr "cançons actualitzades"
msgid "Error Username or Password incorrect, please try again"
msgstr ""
-#: ../../lib/general.lib.php:406
-msgid "Simplified Chinese"
-msgstr "Xinés simplificat"
-
-#: ../../lib/general.lib.php:468
+#: ../../lib/general.lib.php:498
msgid "On"
msgstr "Engegat"
-#: ../../lib/general.lib.php:471
+#: ../../lib/general.lib.php:501
msgid "Off"
msgstr "Parat"
@@ -3798,6 +3787,143 @@ msgstr ""
msgid "Filename:"
msgstr "Nom de l'arxiu:"
+#: Database words
+#, fuzzy
+msgid "Allow Downloads"
+msgstr "Baixar"
+
+#: Database words
+#, fuzzy
+msgid "Popular Threshold"
+msgstr "El més popular Threshold en díes"
+
+#: Database words
+#, fuzzy
+msgid "Transcode Bitrate"
+msgstr "Bitrate mínim"
+
+#: Database words
+msgid "Ampache :: Pour l'Amour de la Musique"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Lock Songs"
+msgstr "# Cançons"
+
+#: Database words
+msgid "Forces Http play regardless of port"
+msgstr ""
+
+#: Database words
+msgid "Non-Standard Http Port"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Localplay Type"
+msgstr "Sona localment"
+
+#: Database words
+msgid "Type of Playback"
+msgstr ""
+
+#: Database words
+msgid "Language"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Theme"
+msgstr "Temps"
+
+#: Database words
+msgid "Album Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Artist Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Title Ellipse Threshold"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Offset Limit"
+msgstr "Mida límit"
+
+#: Database words
+#, fuzzy
+msgid "Localplay Access"
+msgstr "Mòduls de reproducció local"
+
+#: Database words
+#, fuzzy
+msgid "Allow Streaming"
+msgstr "Streaming"
+
+#: Database words
+#, fuzzy
+msgid "Allow Democratic Play"
+msgstr "Democràtic"
+
+#: Database words
+#, fuzzy
+msgid "Allow Localplay Play"
+msgstr "Reproduir localment"
+
+#: Database words
+msgid "Statistics Day Threshold"
+msgstr ""
+
+#: Database words
+msgid "Min Element Count"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Rate Limit"
+msgstr "Mida límit"
+
+#: Database words
+#, fuzzy
+msgid "Playlist Method"
+msgstr "LLista creada"
+
+#: Database words
+msgid "Transcoding"
+msgstr ""
+
+#: Database words
+msgid "User to track"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Streaming"
+msgstr "Streaming"
+
+#: Database words
+#, fuzzy
+msgid "Interface"
+msgstr "Interfície"
+
+#: Database words
+#, fuzzy
+msgid "System"
+msgstr "Ítem"
+
+#~ msgid "Editing"
+#~ msgstr "Editant"
+
+#~ msgid "preferences"
+#~ msgstr "preferències"
+
+#~ msgid "Simplified Chinese"
+#~ msgstr "Xinés simplificat"
+
#, fuzzy
#~ msgid "Playlist %s"
#~ msgstr "LListes de reproducció"
@@ -4189,12 +4315,6 @@ msgstr "Nom de l'arxiu:"
#~ msgid "Rebuild Preferences"
#~ msgstr "Reconstruint les preferències"
-#~ msgid "Interface"
-#~ msgstr "Interfície"
-
-#~ msgid "Streaming"
-#~ msgstr "Streaming"
-
#~ 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 118f59bc..ede90a72 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 84b81155..dce737f6 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-27 09:09+0900\n"
+"POT-Creation-Date: 2008-08-29 16:03+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"
@@ -94,6 +94,7 @@ msgid "Edit"
msgstr "Editieren"
#: ../../templates/show_user_preferences.inc.php:28
+#: ../../templates/show_preferences.inc.php:28
#, fuzzy, php-format
msgid "Editing %s preferences"
msgstr "Einstellungen"
@@ -250,7 +251,7 @@ msgstr ""
"Dinge von Ampache nicht korrekt arbeiten"
#: ../../templates/show_test.inc.php:153
-#: ../../templates/show_install_config.inc.php:88
+#: ../../templates/show_install_config.inc.php:89
msgid "Ampache.cfg.php Exists"
msgstr "Ampache.cfg vorhanden"
@@ -265,7 +266,7 @@ msgstr ""
"\toder sie ist nicht korrekt lesbar"
#: ../../templates/show_test.inc.php:172
-#: ../../templates/show_install_config.inc.php:105
+#: ../../templates/show_install_config.inc.php:106
msgid "Ampache.cfg.php Configured?"
msgstr "Ampache.cfg.php konfiguriert?"
@@ -294,7 +295,7 @@ msgid "DB Inserted"
msgstr "Datenbank eingefügt"
#: ../../templates/show_test.inc.php:235
-#: ../../templates/show_install_config.inc.php:60
+#: ../../templates/show_install_config.inc.php:61
msgid "Web Path"
msgstr "Web Pfad"
@@ -416,7 +417,7 @@ msgstr "Kompletter Name"
#: ../../templates/show_users.inc.php:104
#: ../../templates/show_edit_user.inc.php:29
#: ../../templates/show_add_user.inc.php:29
-#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_install_account.inc.php:61
#: ../../templates/show_recently_played.inc.php:39
#: ../../templates/show_recently_played.inc.php:98
#: ../../templates/show_user_registration.inc.php:75
@@ -489,7 +490,7 @@ msgstr "Nie"
#: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
#: ../../lib/class/flag.class.php:282 ../../lib/class/localplay.class.php:648
-#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:409
+#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:439
#: ../../modules/localplay/mpd.controller.php:508
#: ../../modules/localplay/httpq.controller.php:505
msgid "Unknown"
@@ -515,7 +516,7 @@ msgstr ""
#: ../../templates/show_edit_user.inc.php:52
#: ../../templates/show_add_user.inc.php:52
-#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_install_account.inc.php:65
#: ../../templates/show_login_form.inc.php:62
#: ../../templates/show_user_registration.inc.php:103
#: ../../modules/localplay/mpd.controller.php:235
@@ -526,7 +527,7 @@ msgstr "Passwort"
#: ../../templates/show_edit_user.inc.php:61
#: ../../templates/show_add_user.inc.php:61
#: ../../templates/show_account.inc.php:46
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:69
#: ../../templates/show_user_registration.inc.php:112
msgid "Confirm Password"
msgstr "Passwort wiederholen"
@@ -1354,17 +1355,17 @@ msgstr ""
msgid "Preference Administration"
msgstr "Administrations-Einstellungen"
-#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:33
-#: ../../templates/show_install.inc.php:32
-#: ../../templates/show_install_account.inc.php:32
+#: ../../templates/show_install_config.inc.php:33
+#: ../../templates/show_install_lang.inc.php:34
+#: ../../templates/show_install.inc.php:33
+#: ../../templates/show_install_account.inc.php:33
msgid "Ampache Installation"
msgstr "Ampache Installation"
-#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:40
-#: ../../templates/show_install.inc.php:40
-#: ../../templates/show_install_account.inc.php:39
+#: ../../templates/show_install_config.inc.php:39
+#: ../../templates/show_install_lang.inc.php:41
+#: ../../templates/show_install.inc.php:41
+#: ../../templates/show_install_account.inc.php:40
msgid ""
"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 "
@@ -1375,19 +1376,19 @@ msgstr ""
"Installation fortfahren stellen Sie bitte sicher, dass folgende "
"Voraussetzungen erfüllt sind."
-#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:43
-#: ../../templates/show_install.inc.php:43
-#: ../../templates/show_install_account.inc.php:42
+#: ../../templates/show_install_config.inc.php:42
+#: ../../templates/show_install_lang.inc.php:44
+#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_account.inc.php:43
msgid ""
"A MySQL Server with a username and password that can create/modify databases"
msgstr ""
"Ein MySQL Server mit bekanntem Benutzername und Passwort auf dem Datenbanken "
"erstellt/modifiziert werden können"
-#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:44
-#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_config.inc.php:43
+#: ../../templates/show_install_lang.inc.php:45
+#: ../../templates/show_install.inc.php:45
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.php.dist file"
@@ -1395,10 +1396,10 @@ msgstr ""
"Ihr Websever hat Leserechte an der Datei /sql/ampache.sql und /config/"
"ampache.cfg.php.dist"
-#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:47
-#: ../../templates/show_install.inc.php:47
-#: ../../templates/show_install_account.inc.php:45
+#: ../../templates/show_install_config.inc.php:45
+#: ../../templates/show_install_lang.inc.php:48
+#: ../../templates/show_install.inc.php:48
+#: ../../templates/show_install_account.inc.php:46
msgid ""
"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 "
@@ -1411,18 +1412,18 @@ msgstr ""
"an Ihrer Ampache Installation durchführen möchten, editieren Sie einfach die "
"Datei/config/ampache.cfg.php im Ampache Verzeichnis"
-#: ../../templates/show_install_config.inc.php:48
-#: ../../templates/show_install.inc.php:52
-#: ../../templates/show_install_account.inc.php:48
+#: ../../templates/show_install_config.inc.php:49
+#: ../../templates/show_install.inc.php:53
+#: ../../templates/show_install_account.inc.php:49
msgid "Step 1 - Creating and Inserting the Ampache Database"
msgstr "Schritt 1 - Erstellen der Ampache Datenbank"
-#: ../../templates/show_install_config.inc.php:49
-#: ../../templates/show_install.inc.php:56
+#: ../../templates/show_install_config.inc.php:50
+#: ../../templates/show_install.inc.php:57
msgid "Step 2 - Creating the Ampache.cfg.php file"
msgstr "Schritt 2 - Erstellen der Ampache.cfg.php Datei"
-#: ../../templates/show_install_config.inc.php:51
+#: ../../templates/show_install_config.inc.php:52
msgid ""
"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 "
@@ -1432,43 +1433,43 @@ msgstr ""
"Konfigurationsdatei. Sie werden aufgefordert die Konfigurationsdatei "
"herunterzuladen. Bitte kopieren sie die Datei in /config"
-#: ../../templates/show_install_config.inc.php:53
-#: ../../templates/show_install.inc.php:57
-#: ../../templates/show_install_account.inc.php:50
+#: ../../templates/show_install_config.inc.php:54
+#: ../../templates/show_install.inc.php:58
+#: ../../templates/show_install_account.inc.php:51
msgid "Step 3 - Setup Initial Account"
msgstr "Schritt 3 - Administrations Benutzer erstellen"
-#: ../../templates/show_install_config.inc.php:56
+#: ../../templates/show_install_config.inc.php:57
msgid "Generate Config File"
msgstr "Konfigurationsdatei Erstellen"
-#: ../../templates/show_install_config.inc.php:64
-#: ../../templates/show_install.inc.php:65
+#: ../../templates/show_install_config.inc.php:65
+#: ../../templates/show_install.inc.php:66
msgid "Desired Database Name"
msgstr "Gewünschter Datenbankname"
-#: ../../templates/show_install_config.inc.php:68
-#: ../../templates/show_install.inc.php:69
+#: ../../templates/show_install_config.inc.php:69
+#: ../../templates/show_install.inc.php:70
msgid "MySQL Hostname"
msgstr ""
-#: ../../templates/show_install_config.inc.php:72
+#: ../../templates/show_install_config.inc.php:73
msgid "MySQL Username"
msgstr "MySQL Benutzername"
-#: ../../templates/show_install_config.inc.php:76
+#: ../../templates/show_install_config.inc.php:77
msgid "MySQL Password"
msgstr "MySQL Passwort"
-#: ../../templates/show_install_config.inc.php:81
+#: ../../templates/show_install_config.inc.php:82
msgid "Write Config"
msgstr "Schreibe Konfiguration"
-#: ../../templates/show_install_config.inc.php:126
+#: ../../templates/show_install_config.inc.php:127
msgid "Check for Config"
msgstr "Prüfe die Konfiguration"
-#: ../../templates/show_install_config.inc.php:132
+#: ../../templates/show_install_config.inc.php:133
msgid "Continue to Step 3"
msgstr "Weiter zu Schritt 3"
@@ -1609,79 +1610,78 @@ msgstr "Kataloggröße"
msgid "Catalog Time"
msgstr "Katalog Spielzeit"
-#: ../../templates/show_install_lang.inc.php:38
-#: ../../templates/show_install_lang.inc.php:52
-#: ../../templates/show_install.inc.php:38
+#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install.inc.php:39
msgid "Requirements"
msgstr "Anforderungen"
-#: ../../templates/show_install_lang.inc.php:51
+#: ../../templates/show_install_lang.inc.php:52
msgid "System Checks"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install_lang.inc.php:54
#, fuzzy
msgid "PHP Version:"
msgstr "PHP Version"
-#: ../../templates/show_install_lang.inc.php:63
+#: ../../templates/show_install_lang.inc.php:64
#, fuzzy
msgid "Mysql for PHP:"
msgstr "MySQL für PHP"
-#: ../../templates/show_install_lang.inc.php:77
+#: ../../templates/show_install_lang.inc.php:78
#, fuzzy
msgid "PHP Session Support:"
msgstr "PHP Session Unterstützung"
-#: ../../templates/show_install_lang.inc.php:87
+#: ../../templates/show_install_lang.inc.php:88
#, fuzzy
msgid "PHP ICONV Support:"
msgstr "PHP ICONV Unterstützung"
-#: ../../templates/show_install_lang.inc.php:97
+#: ../../templates/show_install_lang.inc.php:98
#, fuzzy
msgid "PHP PCRE Support:"
msgstr "PHP PCRE Unterstützung"
-#: ../../templates/show_install_lang.inc.php:107
+#: ../../templates/show_install_lang.inc.php:108
#, 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
+#: ../../templates/show_install_lang.inc.php:119
#, fuzzy
msgid "Optional"
msgstr "Optionen"
-#: ../../templates/show_install_lang.inc.php:131
+#: ../../templates/show_install_lang.inc.php:120
#, fuzzy
msgid "PHP GetText Support:"
msgstr "Gettext Unterstützung"
-#: ../../templates/show_install_lang.inc.php:140
+#: ../../templates/show_install_lang.inc.php:123
+msgid "WARNING: This server will use gettext emulator."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:129
#, fuzzy
msgid "PHP Mbstring Support:"
msgstr "PHP Session Unterstützung"
-#: ../../templates/show_install_lang.inc.php:152
+#: ../../templates/show_install_lang.inc.php:141
msgid "Choose installation language."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:173
+#: ../../templates/show_install_lang.inc.php:162
msgid "Start configuration"
msgstr "Starte Konfiguration"
-#: ../../templates/show_install_lang.inc.php:179
+#: ../../templates/show_install_lang.inc.php:168
msgid "Ampache does not <strong>run</strong> correctly by this server."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:180
+#: ../../templates/show_install_lang.inc.php:169
msgid "Please contact your server administrator, and fix them."
msgstr ""
@@ -2138,14 +2138,6 @@ msgstr "Die letzten 10 markierten Lieder"
msgid "Disabled Songs"
msgstr "Gesperrte Lieder"
-#: ../../templates/show_preferences.inc.php:28
-msgid "Editing"
-msgstr "Editieren der"
-
-#: ../../templates/show_preferences.inc.php:28
-msgid "preferences"
-msgstr "Einstellungen"
-
#: ../../templates/show_localplay_instances.inc.php:23
msgid "Show Localplay Instances"
msgstr "Lokal-Abspiel-Instanzen anzeigen"
@@ -2269,7 +2261,7 @@ msgstr "Typ"
msgid "Found"
msgstr "gefunden"
-#: ../../templates/show_install.inc.php:54
+#: ../../templates/show_install.inc.php:55
msgid ""
"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 "
@@ -2280,39 +2272,39 @@ msgstr ""
"Schritt kann einige Zeit dauern, abhängig von der Geschwindigkeit Ihres "
"Computers"
-#: ../../templates/show_install.inc.php:61
+#: ../../templates/show_install.inc.php:62
msgid "Insert Ampache Database"
msgstr "Ampache Datenbank Einspielen"
-#: ../../templates/show_install.inc.php:73
+#: ../../templates/show_install.inc.php:74
msgid "MySQL Administrative Username"
msgstr "Administrativer MySQL Benutzer"
-#: ../../templates/show_install.inc.php:77
+#: ../../templates/show_install.inc.php:78
msgid "MySQL Administrative Password"
msgstr "MySQL Administrationspasswort"
-#: ../../templates/show_install.inc.php:81
+#: ../../templates/show_install.inc.php:82
msgid "Create Database User for New Database"
msgstr "Erstelle Datenbank Benutzer für die neue Datenbank"
-#: ../../templates/show_install.inc.php:85
+#: ../../templates/show_install.inc.php:86
msgid "Ampache Database Username"
msgstr "Ampache Datenbank Benutzername"
-#: ../../templates/show_install.inc.php:89
+#: ../../templates/show_install.inc.php:90
msgid "Ampache Database User Password"
msgstr "Ampache Datenbank Passwort"
-#: ../../templates/show_install.inc.php:93
+#: ../../templates/show_install.inc.php:94
msgid "Overwrite Existing"
msgstr "Überschreibe bestehende"
-#: ../../templates/show_install.inc.php:98
+#: ../../templates/show_install.inc.php:99
msgid "Insert Database"
msgstr "Datenbank einfügen"
-#: ../../templates/show_install_account.inc.php:43
+#: ../../templates/show_install_account.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.dist.php file"
@@ -2320,11 +2312,11 @@ msgstr ""
"Ihr Webserver benötigt Leseberechtigung an den Dateien/sql/ampache.sql und /"
"config/ampache.cfg.dist.php"
-#: ../../templates/show_install_account.inc.php:49
+#: ../../templates/show_install_account.inc.php:50
msgid "Step 2 - Creating the ampache.cfg.php file"
msgstr "Schritt 2 - Erstellen der ampache.cfg.php Konfigurationsdatei"
-#: ../../templates/show_install_account.inc.php:52
+#: ../../templates/show_install_account.inc.php:53
msgid ""
"This step creates your initial Ampache admin account. Once your admin "
"account has been created you will be directed to the login page"
@@ -2332,11 +2324,11 @@ msgstr ""
"Dieser Schritt erstellt das Ampache Admin-Konto. Sobald Ihr Admin-Konto "
"erstellt wurde, werden Sie zur Login-Seite weitergeleitet"
-#: ../../templates/show_install_account.inc.php:56
+#: ../../templates/show_install_account.inc.php:57
msgid "Create Admin Account"
msgstr "Admin Konto erstellen"
-#: ../../templates/show_install_account.inc.php:73
+#: ../../templates/show_install_account.inc.php:74
msgid "Create Account"
msgstr "Konto erstellen"
@@ -3348,15 +3340,11 @@ msgstr "Lieder aktualisiert."
msgid "Error Username or Password incorrect, please try again"
msgstr ""
-#: ../../lib/general.lib.php:406
-msgid "Simplified Chinese"
-msgstr "Vereinfachtes Chinesisch"
-
-#: ../../lib/general.lib.php:468
+#: ../../lib/general.lib.php:498
msgid "On"
msgstr "Ein"
-#: ../../lib/general.lib.php:471
+#: ../../lib/general.lib.php:501
msgid "Off"
msgstr "Aus"
@@ -3814,6 +3802,147 @@ msgstr ""
msgid "Filename:"
msgstr "Dateiname:"
+#: Database words
+#, fuzzy
+msgid "Allow Downloads"
+msgstr "Download"
+
+#: Database words
+#, fuzzy
+msgid "Popular Threshold"
+msgstr "Meistgespielte Lieder in Tagen"
+
+#: Database words
+#, fuzzy
+msgid "Transcode Bitrate"
+msgstr "Min Bitrate"
+
+#: Database words
+msgid "Ampache :: Pour l'Amour de la Musique"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Lock Songs"
+msgstr "# Lieder"
+
+#: Database words
+msgid "Forces Http play regardless of port"
+msgstr ""
+
+#: Database words
+msgid "Non-Standard Http Port"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Localplay Type"
+msgstr "Lokal abspielen"
+
+#: Database words
+msgid "Type of Playback"
+msgstr ""
+
+#: Database words
+msgid "Language"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Theme"
+msgstr "Dauer"
+
+#: Database words
+msgid "Album Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Artist Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Title Ellipse Threshold"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Offset Limit"
+msgstr "Größenbegrenzung"
+
+#: Database words
+#, fuzzy
+msgid "Localplay Access"
+msgstr "Lokal-Abspiel-Module"
+
+#: Database words
+msgid "Allow Streaming"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Allow Democratic Play"
+msgstr "Erstelle Demokratische Wiedergabeliste"
+
+#: Database words
+#, fuzzy
+msgid "Allow Localplay Play"
+msgstr "Lokales Abspielen nicht erlaubt"
+
+#: Database words
+msgid "Statistics Day Threshold"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Min Element Count"
+msgstr "Mindesanzahl"
+
+#: Database words
+#, fuzzy
+msgid "Rate Limit"
+msgstr "Größenbegrenzung"
+
+#: Database words
+#, fuzzy
+msgid "Playlist Method"
+msgstr "Wiedergabeliste erstellt"
+
+#: Database words
+msgid "Transcoding"
+msgstr ""
+
+#: Database words
+msgid "User to track"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Streaming"
+msgstr "Stream"
+
+#: Database words
+#, fuzzy
+msgid "Interface"
+msgstr "Bitrate"
+
+#: Database words
+#, fuzzy
+msgid "System"
+msgstr "Lied"
+
+#~ msgid "Editing"
+#~ msgstr "Editieren der"
+
+#~ msgid "preferences"
+#~ msgstr "Einstellungen"
+
+#, fuzzy
+#~ msgid "PHP Safe Mode:"
+#~ msgstr "Sicherheitsmodus"
+
+#~ msgid "Simplified Chinese"
+#~ msgstr "Vereinfachtes Chinesisch"
+
#~ msgid "Browse By"
#~ msgstr "Anzeige nach"
diff --git a/locale/el_GR/LC_MESSAGES/messages.mo b/locale/el_GR/LC_MESSAGES/messages.mo
index 9931549b..3cc70f33 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 5d4c1421..448dca10 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-27 09:09+0900\n"
+"POT-Creation-Date: 2008-08-29 16:03+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"
@@ -90,6 +90,7 @@ msgid "Edit"
msgstr "Επεξεργασία"
#: ../../templates/show_user_preferences.inc.php:28
+#: ../../templates/show_preferences.inc.php:28
#, fuzzy, php-format
msgid "Editing %s preferences"
msgstr "προτιμήσεις"
@@ -236,7 +237,7 @@ msgstr ""
"ορισμένα χαρακτηριστικά του ampache ίσως δε λειτουργούν σωστά"
#: ../../templates/show_test.inc.php:153
-#: ../../templates/show_install_config.inc.php:88
+#: ../../templates/show_install_config.inc.php:89
msgid "Ampache.cfg.php Exists"
msgstr "Υπάρχει ήδη το αρχείο ρυθμίσεων ampache.cfg.php"
@@ -251,7 +252,7 @@ msgstr ""
"δικαιώματα"
#: ../../templates/show_test.inc.php:172
-#: ../../templates/show_install_config.inc.php:105
+#: ../../templates/show_install_config.inc.php:106
msgid "Ampache.cfg.php Configured?"
msgstr "Διαμορφώθηκε το αρχείο ampache.cfg.php;"
@@ -280,7 +281,7 @@ msgid "DB Inserted"
msgstr ""
#: ../../templates/show_test.inc.php:235
-#: ../../templates/show_install_config.inc.php:60
+#: ../../templates/show_install_config.inc.php:61
msgid "Web Path"
msgstr "Διαδρομή web"
@@ -402,7 +403,7 @@ msgstr "Ονοματεπώνυμο"
#: ../../templates/show_users.inc.php:104
#: ../../templates/show_edit_user.inc.php:29
#: ../../templates/show_add_user.inc.php:29
-#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_install_account.inc.php:61
#: ../../templates/show_recently_played.inc.php:39
#: ../../templates/show_recently_played.inc.php:98
#: ../../templates/show_user_registration.inc.php:75
@@ -475,7 +476,7 @@ msgstr "Ποτέ"
#: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
#: ../../lib/class/flag.class.php:282 ../../lib/class/localplay.class.php:648
-#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:409
+#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:439
#: ../../modules/localplay/mpd.controller.php:508
#: ../../modules/localplay/httpq.controller.php:505
msgid "Unknown"
@@ -501,7 +502,7 @@ msgstr "E-mail"
#: ../../templates/show_edit_user.inc.php:52
#: ../../templates/show_add_user.inc.php:52
-#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_install_account.inc.php:65
#: ../../templates/show_login_form.inc.php:62
#: ../../templates/show_user_registration.inc.php:103
#: ../../modules/localplay/mpd.controller.php:235
@@ -512,7 +513,7 @@ msgstr "Κωδικός"
#: ../../templates/show_edit_user.inc.php:61
#: ../../templates/show_add_user.inc.php:61
#: ../../templates/show_account.inc.php:46
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:69
#: ../../templates/show_user_registration.inc.php:112
msgid "Confirm Password"
msgstr "Επιβεβαίωση Κωδικού"
@@ -1339,17 +1340,17 @@ msgstr "Αναπαραγωγή Flash"
msgid "Preference Administration"
msgstr "Προτιμήσεις Διαχείρισης"
-#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:33
-#: ../../templates/show_install.inc.php:32
-#: ../../templates/show_install_account.inc.php:32
+#: ../../templates/show_install_config.inc.php:33
+#: ../../templates/show_install_lang.inc.php:34
+#: ../../templates/show_install.inc.php:33
+#: ../../templates/show_install_account.inc.php:33
msgid "Ampache Installation"
msgstr "Εγκατάσταση"
-#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:40
-#: ../../templates/show_install.inc.php:40
-#: ../../templates/show_install_account.inc.php:39
+#: ../../templates/show_install_config.inc.php:39
+#: ../../templates/show_install_lang.inc.php:41
+#: ../../templates/show_install.inc.php:41
+#: ../../templates/show_install_account.inc.php:40
msgid ""
"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 "
@@ -1359,19 +1360,19 @@ msgstr ""
"δημιουργία του αρχείου ρυθμίσεων. Πριν συνεχίσετε, βεβαιωθείτε ότι "
"ικανοποιείτε τις ακόλουθες προϋποθέσεις"
-#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:43
-#: ../../templates/show_install.inc.php:43
-#: ../../templates/show_install_account.inc.php:42
+#: ../../templates/show_install_config.inc.php:42
+#: ../../templates/show_install_lang.inc.php:44
+#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_account.inc.php:43
msgid ""
"A MySQL Server with a username and password that can create/modify databases"
msgstr ""
"Ένας MySQL Server με όνομα χρήστη και κωδικό που μπορεί να δημιουργεί/"
"τροποποιεί βάσεις"
-#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:44
-#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_config.inc.php:43
+#: ../../templates/show_install_lang.inc.php:45
+#: ../../templates/show_install.inc.php:45
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.php.dist file"
@@ -1379,10 +1380,10 @@ msgstr ""
"Ο webserver έχει δικαιώματα ανάγνωσης στο /sql/ampache.sql αρχείο και στο "
"αρχείο /config/ampache.cfg.php.dist"
-#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:47
-#: ../../templates/show_install.inc.php:47
-#: ../../templates/show_install_account.inc.php:45
+#: ../../templates/show_install_config.inc.php:45
+#: ../../templates/show_install_lang.inc.php:48
+#: ../../templates/show_install.inc.php:48
+#: ../../templates/show_install_account.inc.php:46
msgid ""
"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 "
@@ -1394,61 +1395,61 @@ msgstr ""
"για τις επιθυμητές ρυθμίσεις. Αν θελήσετε να κάνετε αργότερα αλλαγές απλώς "
"επεξεργαστείτε το /config/ampache.cfg.php"
-#: ../../templates/show_install_config.inc.php:48
-#: ../../templates/show_install.inc.php:52
-#: ../../templates/show_install_account.inc.php:48
+#: ../../templates/show_install_config.inc.php:49
+#: ../../templates/show_install.inc.php:53
+#: ../../templates/show_install_account.inc.php:49
msgid "Step 1 - Creating and Inserting the Ampache Database"
msgstr "Βήμα 1 - Δημιουργία Βάσης Δεδομένων"
-#: ../../templates/show_install_config.inc.php:49
-#: ../../templates/show_install.inc.php:56
+#: ../../templates/show_install_config.inc.php:50
+#: ../../templates/show_install.inc.php:57
msgid "Step 2 - Creating the Ampache.cfg.php file"
msgstr "Βήμα 2 - Δημιουργία του ampache.cfg.php αρχείου"
-#: ../../templates/show_install_config.inc.php:51
+#: ../../templates/show_install_config.inc.php:52
msgid ""
"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"
msgstr ""
-#: ../../templates/show_install_config.inc.php:53
-#: ../../templates/show_install.inc.php:57
-#: ../../templates/show_install_account.inc.php:50
+#: ../../templates/show_install_config.inc.php:54
+#: ../../templates/show_install.inc.php:58
+#: ../../templates/show_install_account.inc.php:51
msgid "Step 3 - Setup Initial Account"
msgstr "Βήμα 3 - Δημιουργία αρχικού λογαριασμού"
-#: ../../templates/show_install_config.inc.php:56
+#: ../../templates/show_install_config.inc.php:57
msgid "Generate Config File"
msgstr "Δημιουργία Αρχείο Ρυθμίσεων"
-#: ../../templates/show_install_config.inc.php:64
-#: ../../templates/show_install.inc.php:65
+#: ../../templates/show_install_config.inc.php:65
+#: ../../templates/show_install.inc.php:66
msgid "Desired Database Name"
msgstr "Επιθυμητό όνομα βάσης"
-#: ../../templates/show_install_config.inc.php:68
-#: ../../templates/show_install.inc.php:69
+#: ../../templates/show_install_config.inc.php:69
+#: ../../templates/show_install.inc.php:70
msgid "MySQL Hostname"
msgstr "Όνομα Εξυπηρετητή MySQL"
-#: ../../templates/show_install_config.inc.php:72
+#: ../../templates/show_install_config.inc.php:73
msgid "MySQL Username"
msgstr "Όνομα χρήστη MySQL"
-#: ../../templates/show_install_config.inc.php:76
+#: ../../templates/show_install_config.inc.php:77
msgid "MySQL Password"
msgstr "Κωδικός MySQL"
-#: ../../templates/show_install_config.inc.php:81
+#: ../../templates/show_install_config.inc.php:82
msgid "Write Config"
msgstr "Εγγραφή ρυθμίσεων"
-#: ../../templates/show_install_config.inc.php:126
+#: ../../templates/show_install_config.inc.php:127
msgid "Check for Config"
msgstr "Έλεγχος για αρχείο ρυθμίσεων"
-#: ../../templates/show_install_config.inc.php:132
+#: ../../templates/show_install_config.inc.php:133
msgid "Continue to Step 3"
msgstr "Συνεχίστε στο Βήμα 3"
@@ -1586,78 +1587,78 @@ msgstr "Μέγεθος Καταλόγου"
msgid "Catalog Time"
msgstr "Χρόνος Καταλόγου"
-#: ../../templates/show_install_lang.inc.php:38
-#: ../../templates/show_install_lang.inc.php:52
-#: ../../templates/show_install.inc.php:38
+#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install.inc.php:39
msgid "Requirements"
msgstr "Απαιτήσεις"
-#: ../../templates/show_install_lang.inc.php:51
+#: ../../templates/show_install_lang.inc.php:52
msgid "System Checks"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install_lang.inc.php:54
#, fuzzy
msgid "PHP Version:"
msgstr "Έκδοση PHP"
-#: ../../templates/show_install_lang.inc.php:63
+#: ../../templates/show_install_lang.inc.php:64
#, fuzzy
msgid "Mysql for PHP:"
msgstr "MySQL για PHP"
-#: ../../templates/show_install_lang.inc.php:77
+#: ../../templates/show_install_lang.inc.php:78
#, fuzzy
msgid "PHP Session Support:"
msgstr "Υποστήριξη PHP Session"
-#: ../../templates/show_install_lang.inc.php:87
+#: ../../templates/show_install_lang.inc.php:88
#, fuzzy
msgid "PHP ICONV Support:"
msgstr "PHP ICONV Support"
-#: ../../templates/show_install_lang.inc.php:97
+#: ../../templates/show_install_lang.inc.php:98
#, fuzzy
msgid "PHP PCRE Support:"
msgstr "PHP PCRE Support"
-#: ../../templates/show_install_lang.inc.php:107
+#: ../../templates/show_install_lang.inc.php:108
#, 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
+#: ../../templates/show_install_lang.inc.php:119
#, fuzzy
msgid "Optional"
msgstr "Επιλογές RPC"
-#: ../../templates/show_install_lang.inc.php:131
+#: ../../templates/show_install_lang.inc.php:120
#, fuzzy
msgid "PHP GetText Support:"
msgstr "PHP PutENV Support"
-#: ../../templates/show_install_lang.inc.php:140
+#: ../../templates/show_install_lang.inc.php:123
+msgid "WARNING: This server will use gettext emulator."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:129
#, fuzzy
msgid "PHP Mbstring Support:"
msgstr "Υποστήριξη PHP Session"
-#: ../../templates/show_install_lang.inc.php:152
+#: ../../templates/show_install_lang.inc.php:141
msgid "Choose installation language."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:173
+#: ../../templates/show_install_lang.inc.php:162
msgid "Start configuration"
msgstr "Έναρξη ρύθμισης"
-#: ../../templates/show_install_lang.inc.php:179
+#: ../../templates/show_install_lang.inc.php:168
msgid "Ampache does not <strong>run</strong> correctly by this server."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:180
+#: ../../templates/show_install_lang.inc.php:169
msgid "Please contact your server administrator, and fix them."
msgstr ""
@@ -2114,14 +2115,6 @@ msgstr "Τελευταίες Δέκα μαρκαρισμένες εγγραφέ
msgid "Disabled Songs"
msgstr "Απενεργοποιημένα Τραγούδια"
-#: ../../templates/show_preferences.inc.php:28
-msgid "Editing"
-msgstr "Επεξεργασία"
-
-#: ../../templates/show_preferences.inc.php:28
-msgid "preferences"
-msgstr "προτιμήσεις"
-
#: ../../templates/show_localplay_instances.inc.php:23
msgid "Show Localplay Instances"
msgstr "Δείξε Στιγμιότυπα Τοπικής Αναπαραγωγής"
@@ -2245,7 +2238,7 @@ msgstr "Τύπος"
msgid "Found"
msgstr "Βρέθηκαν"
-#: ../../templates/show_install.inc.php:54
+#: ../../templates/show_install.inc.php:55
msgid ""
"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 "
@@ -2255,39 +2248,39 @@ msgstr ""
"λογαριασμό mysql με δικαιώματα δημιουργίας βάσης. Αυτό μπορεί να διαρκέσει "
"λίγο ανάλογα με την ταχύτητα του υπολογιστή σας"
-#: ../../templates/show_install.inc.php:61
+#: ../../templates/show_install.inc.php:62
msgid "Insert Ampache Database"
msgstr "Εισαγωγή στοιχείων στη βάση"
-#: ../../templates/show_install.inc.php:73
+#: ../../templates/show_install.inc.php:74
msgid "MySQL Administrative Username"
msgstr "Όνομα Διαχειριστή MySQL"
-#: ../../templates/show_install.inc.php:77
+#: ../../templates/show_install.inc.php:78
msgid "MySQL Administrative Password"
msgstr "Κωδικός Διαχειριστή MySQL"
-#: ../../templates/show_install.inc.php:81
+#: ../../templates/show_install.inc.php:82
msgid "Create Database User for New Database"
msgstr "Δημιουργία Χρήστη της νέας βάσης"
-#: ../../templates/show_install.inc.php:85
+#: ../../templates/show_install.inc.php:86
msgid "Ampache Database Username"
msgstr "Όνομα Χρήστη νέας βάσης"
-#: ../../templates/show_install.inc.php:89
+#: ../../templates/show_install.inc.php:90
msgid "Ampache Database User Password"
msgstr "Κωδικός Χρήστη νέας βάσης"
-#: ../../templates/show_install.inc.php:93
+#: ../../templates/show_install.inc.php:94
msgid "Overwrite Existing"
msgstr "Εγγραφή πάνω σε ήδη υπάρχουσα βάση"
-#: ../../templates/show_install.inc.php:98
+#: ../../templates/show_install.inc.php:99
msgid "Insert Database"
msgstr "Εισαγωγή βάσης"
-#: ../../templates/show_install_account.inc.php:43
+#: ../../templates/show_install_account.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.dist.php file"
@@ -2295,11 +2288,11 @@ msgstr ""
"Ο webserver έχει δικαίωμα ανάγνωση των /sql/ampache.sql, /config/ampache.cfg."
"dist.php αρχείων"
-#: ../../templates/show_install_account.inc.php:49
+#: ../../templates/show_install_account.inc.php:50
msgid "Step 2 - Creating the ampache.cfg.php file"
msgstr "Βήμα 2- Δημιουργία του ampache.cfg.php αρχείου"
-#: ../../templates/show_install_account.inc.php:52
+#: ../../templates/show_install_account.inc.php:53
msgid ""
"This step creates your initial Ampache admin account. Once your admin "
"account has been created you will be directed to the login page"
@@ -2307,11 +2300,11 @@ msgstr ""
"Αυτό το βήμα δημιουργεί τον αρχικό λογαριασμό Διαχειριστή του Ampache. Μόλις "
"ο λογαριασμός δημιουργηθεί θα ανακατευθυνθείτε στη σελίδα ειδόδου"
-#: ../../templates/show_install_account.inc.php:56
+#: ../../templates/show_install_account.inc.php:57
msgid "Create Admin Account"
msgstr "Δημιουργία Λογαριασμού Διαχειριστή"
-#: ../../templates/show_install_account.inc.php:73
+#: ../../templates/show_install_account.inc.php:74
msgid "Create Account"
msgstr "Δημιουργία Λογαριασμού"
@@ -3320,15 +3313,11 @@ msgstr "τραγούδια ενημερώθηκαν"
msgid "Error Username or Password incorrect, please try again"
msgstr ""
-#: ../../lib/general.lib.php:406
-msgid "Simplified Chinese"
-msgstr "Απλοποιημένα κινέζικα"
-
-#: ../../lib/general.lib.php:468
+#: ../../lib/general.lib.php:498
msgid "On"
msgstr "Ενεργό"
-#: ../../lib/general.lib.php:471
+#: ../../lib/general.lib.php:501
msgid "Off"
msgstr "Ανενεργό"
@@ -3776,6 +3765,143 @@ msgstr ""
msgid "Filename:"
msgstr "Όνομα Αρχείου"
+#: Database words
+#, fuzzy
+msgid "Allow Downloads"
+msgstr "Κατέβασμα"
+
+#: Database words
+#, fuzzy
+msgid "Popular Threshold"
+msgstr "Δημοφιλέστερο Όριο εδώ και μέρες"
+
+#: Database words
+#, fuzzy
+msgid "Transcode Bitrate"
+msgstr "Ελάχιστο Bitrate"
+
+#: Database words
+msgid "Ampache :: Pour l'Amour de la Musique"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Lock Songs"
+msgstr "Τραγούδια"
+
+#: Database words
+msgid "Forces Http play regardless of port"
+msgstr ""
+
+#: Database words
+msgid "Non-Standard Http Port"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Localplay Type"
+msgstr "Τοπική Αναπαραγωγή"
+
+#: Database words
+msgid "Type of Playback"
+msgstr ""
+
+#: Database words
+msgid "Language"
+msgstr "Γλώσσα"
+
+#: Database words
+#, fuzzy
+msgid "Theme"
+msgstr "Χρόνος"
+
+#: Database words
+msgid "Album Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Artist Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Title Ellipse Threshold"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Offset Limit"
+msgstr "Όριο μεγέθους"
+
+#: Database words
+#, fuzzy
+msgid "Localplay Access"
+msgstr "Λειτουργικές Μονάδες Τοπικής Αναπαραγωγής"
+
+#: Database words
+msgid "Allow Streaming"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Allow Democratic Play"
+msgstr "Δημιουργία Δημοκρατικής playlist"
+
+#: Database words
+#, fuzzy
+msgid "Allow Localplay Play"
+msgstr "Τοπική Αναπαραγωγή"
+
+#: Database words
+msgid "Statistics Day Threshold"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Min Element Count"
+msgstr "Ελάχιστο Πλήθος"
+
+#: Database words
+#, fuzzy
+msgid "Rate Limit"
+msgstr "Όριο μεγέθους"
+
+#: Database words
+#, fuzzy
+msgid "Playlist Method"
+msgstr "Η playlist δημιουργήθηκε"
+
+#: Database words
+msgid "Transcoding"
+msgstr ""
+
+#: Database words
+msgid "User to track"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Streaming"
+msgstr "Ροή"
+
+#: Database words
+#, fuzzy
+msgid "Interface"
+msgstr "Περιβάλλον Web"
+
+#: Database words
+#, fuzzy
+msgid "System"
+msgstr "Στοιχείο"
+
+#~ msgid "Editing"
+#~ msgstr "Επεξεργασία"
+
+#~ msgid "preferences"
+#~ msgstr "προτιμήσεις"
+
+#~ msgid "Simplified Chinese"
+#~ msgstr "Απλοποιημένα κινέζικα"
+
#, fuzzy
#~ msgid "Playlist %s"
#~ msgstr "Playlists"
@@ -3834,9 +3960,6 @@ msgstr "Όνομα Αρχείου"
#~ msgid "Label"
#~ msgstr "Ετικέτα"
-#~ msgid "Language"
-#~ msgstr "Γλώσσα"
-
#~ msgid "Catalog Number"
#~ msgstr "Αριθμός καταλόγους"
diff --git a/locale/en_GB/LC_MESSAGES/messages.mo b/locale/en_GB/LC_MESSAGES/messages.mo
index e4303488..ee725a08 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 5a333847..87848fab 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-27 09:09+0900\n"
+"POT-Creation-Date: 2008-08-29 16:03+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"
@@ -90,6 +90,7 @@ msgid "Edit"
msgstr "Edit"
#: ../../templates/show_user_preferences.inc.php:28
+#: ../../templates/show_preferences.inc.php:28
#, fuzzy, php-format
msgid "Editing %s preferences"
msgstr "preferences"
@@ -244,7 +245,7 @@ msgid ""
msgstr ""
#: ../../templates/show_test.inc.php:153
-#: ../../templates/show_install_config.inc.php:88
+#: ../../templates/show_install_config.inc.php:89
msgid "Ampache.cfg.php Exists"
msgstr "Ampache.cfg.php Exists"
@@ -259,7 +260,7 @@ msgstr ""
"\tit is not currently readable by your webserver."
#: ../../templates/show_test.inc.php:172
-#: ../../templates/show_install_config.inc.php:105
+#: ../../templates/show_install_config.inc.php:106
msgid "Ampache.cfg.php Configured?"
msgstr "Ampache.cfg.php Configured?"
@@ -286,7 +287,7 @@ msgid "DB Inserted"
msgstr ""
#: ../../templates/show_test.inc.php:235
-#: ../../templates/show_install_config.inc.php:60
+#: ../../templates/show_install_config.inc.php:61
msgid "Web Path"
msgstr "Web Path"
@@ -410,7 +411,7 @@ msgstr "Fullname"
#: ../../templates/show_users.inc.php:104
#: ../../templates/show_edit_user.inc.php:29
#: ../../templates/show_add_user.inc.php:29
-#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_install_account.inc.php:61
#: ../../templates/show_recently_played.inc.php:39
#: ../../templates/show_recently_played.inc.php:98
#: ../../templates/show_user_registration.inc.php:75
@@ -485,7 +486,7 @@ msgstr ""
#: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
#: ../../lib/class/flag.class.php:282 ../../lib/class/localplay.class.php:648
-#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:409
+#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:439
#: ../../modules/localplay/mpd.controller.php:508
#: ../../modules/localplay/httpq.controller.php:505
msgid "Unknown"
@@ -511,7 +512,7 @@ msgstr "E-mail"
#: ../../templates/show_edit_user.inc.php:52
#: ../../templates/show_add_user.inc.php:52
-#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_install_account.inc.php:65
#: ../../templates/show_login_form.inc.php:62
#: ../../templates/show_user_registration.inc.php:103
#: ../../modules/localplay/mpd.controller.php:235
@@ -522,7 +523,7 @@ msgstr "Password"
#: ../../templates/show_edit_user.inc.php:61
#: ../../templates/show_add_user.inc.php:61
#: ../../templates/show_account.inc.php:46
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:69
#: ../../templates/show_user_registration.inc.php:112
msgid "Confirm Password"
msgstr "Confirm Password"
@@ -1373,17 +1374,17 @@ msgstr ""
msgid "Preference Administration"
msgstr "Preferences"
-#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:33
-#: ../../templates/show_install.inc.php:32
-#: ../../templates/show_install_account.inc.php:32
+#: ../../templates/show_install_config.inc.php:33
+#: ../../templates/show_install_lang.inc.php:34
+#: ../../templates/show_install.inc.php:33
+#: ../../templates/show_install_account.inc.php:33
msgid "Ampache Installation"
msgstr "Ampache Installation"
-#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:40
-#: ../../templates/show_install.inc.php:40
-#: ../../templates/show_install_account.inc.php:39
+#: ../../templates/show_install_config.inc.php:39
+#: ../../templates/show_install_lang.inc.php:41
+#: ../../templates/show_install.inc.php:41
+#: ../../templates/show_install_account.inc.php:40
#, fuzzy
msgid ""
"This Page handles the installation of the Ampache database and the creation "
@@ -1394,18 +1395,18 @@ msgstr ""
"of the ampache.cfg.php file. Before you continue please make sure that you "
"have the following pre-requisites"
-#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:43
-#: ../../templates/show_install.inc.php:43
-#: ../../templates/show_install_account.inc.php:42
+#: ../../templates/show_install_config.inc.php:42
+#: ../../templates/show_install_lang.inc.php:44
+#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_account.inc.php:43
msgid ""
"A MySQL Server with a username and password that can create/modify databases"
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:44
-#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_config.inc.php:43
+#: ../../templates/show_install_lang.inc.php:45
+#: ../../templates/show_install.inc.php:45
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.php.dist file"
@@ -1413,10 +1414,10 @@ msgstr ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.php.dist file"
-#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:47
-#: ../../templates/show_install.inc.php:47
-#: ../../templates/show_install_account.inc.php:45
+#: ../../templates/show_install_config.inc.php:45
+#: ../../templates/show_install_lang.inc.php:48
+#: ../../templates/show_install.inc.php:48
+#: ../../templates/show_install_account.inc.php:46
msgid ""
"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 "
@@ -1428,61 +1429,61 @@ msgstr ""
"values. If you would like to make changes to your ampache install at a later "
"date simply edit /config/ampache.cfg.php"
-#: ../../templates/show_install_config.inc.php:48
-#: ../../templates/show_install.inc.php:52
-#: ../../templates/show_install_account.inc.php:48
+#: ../../templates/show_install_config.inc.php:49
+#: ../../templates/show_install.inc.php:53
+#: ../../templates/show_install_account.inc.php:49
msgid "Step 1 - Creating and Inserting the Ampache Database"
msgstr "Step 1 - Creating and Inserting the Ampache Database"
-#: ../../templates/show_install_config.inc.php:49
-#: ../../templates/show_install.inc.php:56
+#: ../../templates/show_install_config.inc.php:50
+#: ../../templates/show_install.inc.php:57
msgid "Step 2 - Creating the Ampache.cfg.php file"
msgstr "Step 2 - Creating the Ampache.cfg.php file"
-#: ../../templates/show_install_config.inc.php:51
+#: ../../templates/show_install_config.inc.php:52
msgid ""
"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"
msgstr ""
-#: ../../templates/show_install_config.inc.php:53
-#: ../../templates/show_install.inc.php:57
-#: ../../templates/show_install_account.inc.php:50
+#: ../../templates/show_install_config.inc.php:54
+#: ../../templates/show_install.inc.php:58
+#: ../../templates/show_install_account.inc.php:51
msgid "Step 3 - Setup Initial Account"
msgstr "Step 3 - Setup Initial Account"
-#: ../../templates/show_install_config.inc.php:56
+#: ../../templates/show_install_config.inc.php:57
msgid "Generate Config File"
msgstr ""
-#: ../../templates/show_install_config.inc.php:64
-#: ../../templates/show_install.inc.php:65
+#: ../../templates/show_install_config.inc.php:65
+#: ../../templates/show_install.inc.php:66
msgid "Desired Database Name"
msgstr "Desired Database Name"
-#: ../../templates/show_install_config.inc.php:68
-#: ../../templates/show_install.inc.php:69
+#: ../../templates/show_install_config.inc.php:69
+#: ../../templates/show_install.inc.php:70
msgid "MySQL Hostname"
msgstr "MySQL Hostname"
-#: ../../templates/show_install_config.inc.php:72
+#: ../../templates/show_install_config.inc.php:73
msgid "MySQL Username"
msgstr "MySQL Username"
-#: ../../templates/show_install_config.inc.php:76
+#: ../../templates/show_install_config.inc.php:77
msgid "MySQL Password"
msgstr "MySQL Password"
-#: ../../templates/show_install_config.inc.php:81
+#: ../../templates/show_install_config.inc.php:82
msgid "Write Config"
msgstr "Write Configuration"
-#: ../../templates/show_install_config.inc.php:126
+#: ../../templates/show_install_config.inc.php:127
msgid "Check for Config"
msgstr "Check for Configuration"
-#: ../../templates/show_install_config.inc.php:132
+#: ../../templates/show_install_config.inc.php:133
msgid "Continue to Step 3"
msgstr ""
@@ -1623,79 +1624,79 @@ msgstr "Catalogue Size"
msgid "Catalog Time"
msgstr "Catalogue Time"
-#: ../../templates/show_install_lang.inc.php:38
-#: ../../templates/show_install_lang.inc.php:52
-#: ../../templates/show_install.inc.php:38
+#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install.inc.php:39
msgid "Requirements"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:51
+#: ../../templates/show_install_lang.inc.php:52
#, fuzzy
msgid "System Checks"
msgstr "Stream"
-#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install_lang.inc.php:54
#, fuzzy
msgid "PHP Version:"
msgstr "PHP Version"
-#: ../../templates/show_install_lang.inc.php:63
+#: ../../templates/show_install_lang.inc.php:64
#, fuzzy
msgid "Mysql for PHP:"
msgstr "Mysql for PHP"
-#: ../../templates/show_install_lang.inc.php:77
+#: ../../templates/show_install_lang.inc.php:78
#, fuzzy
msgid "PHP Session Support:"
msgstr "PHP Session Support"
-#: ../../templates/show_install_lang.inc.php:87
+#: ../../templates/show_install_lang.inc.php:88
#, fuzzy
msgid "PHP ICONV Support:"
msgstr "PHP ICONV Support"
-#: ../../templates/show_install_lang.inc.php:97
+#: ../../templates/show_install_lang.inc.php:98
#, fuzzy
msgid "PHP PCRE Support:"
msgstr "PHP ICONV Support"
-#: ../../templates/show_install_lang.inc.php:107
+#: ../../templates/show_install_lang.inc.php:108
#, 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
+#: ../../templates/show_install_lang.inc.php:119
#, fuzzy
msgid "Optional"
msgstr "Action"
-#: ../../templates/show_install_lang.inc.php:131
+#: ../../templates/show_install_lang.inc.php:120
#, fuzzy
msgid "PHP GetText Support:"
msgstr "PHP ICONV Support"
-#: ../../templates/show_install_lang.inc.php:140
+#: ../../templates/show_install_lang.inc.php:123
+msgid "WARNING: This server will use gettext emulator."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:129
#, fuzzy
msgid "PHP Mbstring Support:"
msgstr "PHP Session Support"
-#: ../../templates/show_install_lang.inc.php:152
+#: ../../templates/show_install_lang.inc.php:141
msgid "Choose installation language."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:173
+#: ../../templates/show_install_lang.inc.php:162
msgid "Start configuration"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:179
+#: ../../templates/show_install_lang.inc.php:168
msgid "Ampache does not <strong>run</strong> correctly by this server."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:180
+#: ../../templates/show_install_lang.inc.php:169
msgid "Please contact your server administrator, and fix them."
msgstr ""
@@ -2173,14 +2174,6 @@ msgstr ""
msgid "Disabled Songs"
msgstr "Show Disabled Songs"
-#: ../../templates/show_preferences.inc.php:28
-msgid "Editing"
-msgstr "Editing"
-
-#: ../../templates/show_preferences.inc.php:28
-msgid "preferences"
-msgstr "preferences"
-
#: ../../templates/show_localplay_instances.inc.php:23
msgid "Show Localplay Instances"
msgstr ""
@@ -2311,7 +2304,7 @@ msgstr "Type"
msgid "Found"
msgstr "Found"
-#: ../../templates/show_install.inc.php:54
+#: ../../templates/show_install.inc.php:55
msgid ""
"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 "
@@ -2321,40 +2314,40 @@ msgstr ""
"mysql account with database creation rights. This step may take a while "
"depending upon the speed of your computer"
-#: ../../templates/show_install.inc.php:61
+#: ../../templates/show_install.inc.php:62
msgid "Insert Ampache Database"
msgstr ""
-#: ../../templates/show_install.inc.php:73
+#: ../../templates/show_install.inc.php:74
msgid "MySQL Administrative Username"
msgstr "MySQL Administrative Username"
-#: ../../templates/show_install.inc.php:77
+#: ../../templates/show_install.inc.php:78
msgid "MySQL Administrative Password"
msgstr "MySQL Administrative Password"
-#: ../../templates/show_install.inc.php:81
+#: ../../templates/show_install.inc.php:82
msgid "Create Database User for New Database"
msgstr ""
-#: ../../templates/show_install.inc.php:85
+#: ../../templates/show_install.inc.php:86
#, fuzzy
msgid "Ampache Database Username"
msgstr "Desired Database Name"
-#: ../../templates/show_install.inc.php:89
+#: ../../templates/show_install.inc.php:90
msgid "Ampache Database User Password"
msgstr ""
-#: ../../templates/show_install.inc.php:93
+#: ../../templates/show_install.inc.php:94
msgid "Overwrite Existing"
msgstr ""
-#: ../../templates/show_install.inc.php:98
+#: ../../templates/show_install.inc.php:99
msgid "Insert Database"
msgstr "Insert Database"
-#: ../../templates/show_install_account.inc.php:43
+#: ../../templates/show_install_account.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.dist.php file"
@@ -2362,11 +2355,11 @@ msgstr ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.dist.php file"
-#: ../../templates/show_install_account.inc.php:49
+#: ../../templates/show_install_account.inc.php:50
msgid "Step 2 - Creating the ampache.cfg.php file"
msgstr "Step 2 - Creating the ampache.cfg.php file"
-#: ../../templates/show_install_account.inc.php:52
+#: ../../templates/show_install_account.inc.php:53
msgid ""
"This step creates your initial Ampache admin account. Once your admin "
"account has been created you will be directed to the login page"
@@ -2374,12 +2367,12 @@ msgstr ""
"This step creates your initial Ampache admin account. Once your admin "
"account has been created you will be directed to the login page"
-#: ../../templates/show_install_account.inc.php:56
+#: ../../templates/show_install_account.inc.php:57
#, fuzzy
msgid "Create Admin Account"
msgstr "Create Account"
-#: ../../templates/show_install_account.inc.php:73
+#: ../../templates/show_install_account.inc.php:74
msgid "Create Account"
msgstr "Create Account"
@@ -3435,15 +3428,11 @@ msgstr "Playlist updated."
msgid "Error Username or Password incorrect, please try again"
msgstr ""
-#: ../../lib/general.lib.php:406
-msgid "Simplified Chinese"
-msgstr ""
-
-#: ../../lib/general.lib.php:468
+#: ../../lib/general.lib.php:498
msgid "On"
msgstr "On"
-#: ../../lib/general.lib.php:471
+#: ../../lib/general.lib.php:501
msgid "Off"
msgstr "Off"
@@ -3919,6 +3908,140 @@ msgstr ""
msgid "Filename:"
msgstr "Filename"
+#: Database words
+#, fuzzy
+msgid "Allow Downloads"
+msgstr "Download"
+
+#: Database words
+#, fuzzy
+msgid "Popular Threshold"
+msgstr "Most Popular Songs"
+
+#: Database words
+#, fuzzy
+msgid "Transcode Bitrate"
+msgstr "Bitrate"
+
+#: Database words
+msgid "Ampache :: Pour l'Amour de la Musique"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Lock Songs"
+msgstr "Songs"
+
+#: Database words
+msgid "Forces Http play regardless of port"
+msgstr ""
+
+#: Database words
+msgid "Non-Standard Http Port"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Localplay Type"
+msgstr "Local Play"
+
+#: Database words
+#, fuzzy
+msgid "Type of Playback"
+msgstr "Playback"
+
+#: Database words
+msgid "Language"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Theme"
+msgstr "Time"
+
+#: Database words
+msgid "Album Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Artist Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Title Ellipse Threshold"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Offset Limit"
+msgstr "View Limit"
+
+#: Database words
+#, fuzzy
+msgid "Localplay Access"
+msgstr "Local Play Control"
+
+#: Database words
+#, fuzzy
+msgid "Allow Streaming"
+msgstr "Stream"
+
+#: Database words
+msgid "Allow Democratic Play"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Allow Localplay Play"
+msgstr "Local Play"
+
+#: Database words
+msgid "Statistics Day Threshold"
+msgstr ""
+
+#: Database words
+msgid "Min Element Count"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Rate Limit"
+msgstr "View Limit"
+
+#: Database words
+#, fuzzy
+msgid "Playlist Method"
+msgstr "Playlist updated."
+
+#: Database words
+msgid "Transcoding"
+msgstr ""
+
+#: Database words
+msgid "User to track"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Streaming"
+msgstr "Stream"
+
+#: Database words
+#, fuzzy
+msgid "Interface"
+msgstr "Bitrate"
+
+#: Database words
+#, fuzzy
+msgid "System"
+msgstr "Stream"
+
+#~ msgid "Editing"
+#~ msgstr "Editing"
+
+#~ msgid "preferences"
+#~ msgstr "preferences"
+
#, fuzzy
#~ msgid "Playlist %s"
#~ msgstr "Playlists"
@@ -4208,10 +4331,6 @@ msgstr "Filename"
#~ msgid "Rebuild Preferences"
#~ msgstr "Rebuild Preferences"
-#, fuzzy
-#~ msgid "Streaming"
-#~ msgstr "Stream"
-
#~ msgid "Host Access to Your Catalog"
#~ msgstr "Host Access to Your Catalogue"
@@ -4453,9 +4572,6 @@ msgstr "Filename"
#~ msgid "Under LIBGLUE"
#~ msgstr "Under LIBGLUE"
-#~ msgid "Playback"
-#~ msgstr "Playback"
-
#~ msgid "Clear queue"
#~ msgstr "Clear queue"
diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo
index fe639df1..5b09f1c5 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 b4dacc0d..fadc34a6 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-27 09:09+0900\n"
+"POT-Creation-Date: 2008-08-29 16:03+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"
@@ -90,6 +90,7 @@ msgid "Edit"
msgstr ""
#: ../../templates/show_user_preferences.inc.php:28
+#: ../../templates/show_preferences.inc.php:28
#, fuzzy, php-format
msgid "Editing %s preferences"
msgstr "Preferecias del sitio"
@@ -231,7 +232,7 @@ msgid ""
msgstr ""
#: ../../templates/show_test.inc.php:153
-#: ../../templates/show_install_config.inc.php:88
+#: ../../templates/show_install_config.inc.php:89
msgid "Ampache.cfg.php Exists"
msgstr ""
@@ -243,7 +244,7 @@ msgid ""
msgstr ""
#: ../../templates/show_test.inc.php:172
-#: ../../templates/show_install_config.inc.php:105
+#: ../../templates/show_install_config.inc.php:106
msgid "Ampache.cfg.php Configured?"
msgstr ""
@@ -268,7 +269,7 @@ msgid "DB Inserted"
msgstr ""
#: ../../templates/show_test.inc.php:235
-#: ../../templates/show_install_config.inc.php:60
+#: ../../templates/show_install_config.inc.php:61
msgid "Web Path"
msgstr ""
@@ -390,7 +391,7 @@ msgstr "Nombre entero"
#: ../../templates/show_users.inc.php:104
#: ../../templates/show_edit_user.inc.php:29
#: ../../templates/show_add_user.inc.php:29
-#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_install_account.inc.php:61
#: ../../templates/show_recently_played.inc.php:39
#: ../../templates/show_recently_played.inc.php:98
#: ../../templates/show_user_registration.inc.php:75
@@ -464,7 +465,7 @@ msgstr ""
#: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
#: ../../lib/class/flag.class.php:282 ../../lib/class/localplay.class.php:648
-#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:409
+#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:439
#: ../../modules/localplay/mpd.controller.php:508
#: ../../modules/localplay/httpq.controller.php:505
msgid "Unknown"
@@ -490,7 +491,7 @@ msgstr "Correo"
#: ../../templates/show_edit_user.inc.php:52
#: ../../templates/show_add_user.inc.php:52
-#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_install_account.inc.php:65
#: ../../templates/show_login_form.inc.php:62
#: ../../templates/show_user_registration.inc.php:103
#: ../../modules/localplay/mpd.controller.php:235
@@ -501,7 +502,7 @@ msgstr "Contraseña"
#: ../../templates/show_edit_user.inc.php:61
#: ../../templates/show_add_user.inc.php:61
#: ../../templates/show_account.inc.php:46
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:69
#: ../../templates/show_user_registration.inc.php:112
msgid "Confirm Password"
msgstr ""
@@ -1348,17 +1349,17 @@ msgstr ""
msgid "Preference Administration"
msgstr "Preferencias"
-#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:33
-#: ../../templates/show_install.inc.php:32
-#: ../../templates/show_install_account.inc.php:32
+#: ../../templates/show_install_config.inc.php:33
+#: ../../templates/show_install_lang.inc.php:34
+#: ../../templates/show_install.inc.php:33
+#: ../../templates/show_install_account.inc.php:33
msgid "Ampache Installation"
msgstr "Instalación de Ampache"
-#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:40
-#: ../../templates/show_install.inc.php:40
-#: ../../templates/show_install_account.inc.php:39
+#: ../../templates/show_install_config.inc.php:39
+#: ../../templates/show_install_lang.inc.php:41
+#: ../../templates/show_install.inc.php:41
+#: ../../templates/show_install_account.inc.php:40
msgid ""
"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 "
@@ -1368,26 +1369,26 @@ msgstr ""
"creación del archivo ampache.cfg.php. Antes de seguir, por favor asegurase "
"que tiene los requisitos siguientes."
-#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:43
-#: ../../templates/show_install.inc.php:43
-#: ../../templates/show_install_account.inc.php:42
+#: ../../templates/show_install_config.inc.php:42
+#: ../../templates/show_install_lang.inc.php:44
+#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_account.inc.php:43
msgid ""
"A MySQL Server with a username and password that can create/modify databases"
msgstr ""
-#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:44
-#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_config.inc.php:43
+#: ../../templates/show_install_lang.inc.php:45
+#: ../../templates/show_install.inc.php:45
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.php.dist file"
msgstr ""
-#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:47
-#: ../../templates/show_install.inc.php:47
-#: ../../templates/show_install_account.inc.php:45
+#: ../../templates/show_install_config.inc.php:45
+#: ../../templates/show_install_lang.inc.php:48
+#: ../../templates/show_install.inc.php:48
+#: ../../templates/show_install_account.inc.php:46
msgid ""
"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 "
@@ -1395,61 +1396,61 @@ msgid ""
"date simply edit /config/ampache.cfg.php"
msgstr ""
-#: ../../templates/show_install_config.inc.php:48
-#: ../../templates/show_install.inc.php:52
-#: ../../templates/show_install_account.inc.php:48
+#: ../../templates/show_install_config.inc.php:49
+#: ../../templates/show_install.inc.php:53
+#: ../../templates/show_install_account.inc.php:49
msgid "Step 1 - Creating and Inserting the Ampache Database"
msgstr ""
-#: ../../templates/show_install_config.inc.php:49
-#: ../../templates/show_install.inc.php:56
+#: ../../templates/show_install_config.inc.php:50
+#: ../../templates/show_install.inc.php:57
msgid "Step 2 - Creating the Ampache.cfg.php file"
msgstr ""
-#: ../../templates/show_install_config.inc.php:51
+#: ../../templates/show_install_config.inc.php:52
msgid ""
"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"
msgstr ""
-#: ../../templates/show_install_config.inc.php:53
-#: ../../templates/show_install.inc.php:57
-#: ../../templates/show_install_account.inc.php:50
+#: ../../templates/show_install_config.inc.php:54
+#: ../../templates/show_install.inc.php:58
+#: ../../templates/show_install_account.inc.php:51
msgid "Step 3 - Setup Initial Account"
msgstr ""
-#: ../../templates/show_install_config.inc.php:56
+#: ../../templates/show_install_config.inc.php:57
msgid "Generate Config File"
msgstr ""
-#: ../../templates/show_install_config.inc.php:64
-#: ../../templates/show_install.inc.php:65
+#: ../../templates/show_install_config.inc.php:65
+#: ../../templates/show_install.inc.php:66
msgid "Desired Database Name"
msgstr ""
-#: ../../templates/show_install_config.inc.php:68
-#: ../../templates/show_install.inc.php:69
+#: ../../templates/show_install_config.inc.php:69
+#: ../../templates/show_install.inc.php:70
msgid "MySQL Hostname"
msgstr "Nombre del servidor MySQL"
-#: ../../templates/show_install_config.inc.php:72
+#: ../../templates/show_install_config.inc.php:73
msgid "MySQL Username"
msgstr "Nombre del usuario de MySQL"
-#: ../../templates/show_install_config.inc.php:76
+#: ../../templates/show_install_config.inc.php:77
msgid "MySQL Password"
msgstr "Contraseña de MySQL"
-#: ../../templates/show_install_config.inc.php:81
+#: ../../templates/show_install_config.inc.php:82
msgid "Write Config"
msgstr ""
-#: ../../templates/show_install_config.inc.php:126
+#: ../../templates/show_install_config.inc.php:127
msgid "Check for Config"
msgstr ""
-#: ../../templates/show_install_config.inc.php:132
+#: ../../templates/show_install_config.inc.php:133
msgid "Continue to Step 3"
msgstr ""
@@ -1590,71 +1591,71 @@ msgstr "Tamaño del catálogo"
msgid "Catalog Time"
msgstr "Tiempo del catálogo"
-#: ../../templates/show_install_lang.inc.php:38
-#: ../../templates/show_install_lang.inc.php:52
-#: ../../templates/show_install.inc.php:38
+#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install.inc.php:39
msgid "Requirements"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:51
+#: ../../templates/show_install_lang.inc.php:52
msgid "System Checks"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install_lang.inc.php:54
#, fuzzy
msgid "PHP Version:"
msgstr "Versión de PHP"
-#: ../../templates/show_install_lang.inc.php:63
+#: ../../templates/show_install_lang.inc.php:64
msgid "Mysql for PHP:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:77
+#: ../../templates/show_install_lang.inc.php:78
msgid "PHP Session Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:87
+#: ../../templates/show_install_lang.inc.php:88
msgid "PHP ICONV Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:97
+#: ../../templates/show_install_lang.inc.php:98
msgid "PHP PCRE Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:107
+#: ../../templates/show_install_lang.inc.php:108
msgid "PHP PutENV Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:120
-msgid "PHP Safe Mode:"
-msgstr ""
-
-#: ../../templates/show_install_lang.inc.php:130
+#: ../../templates/show_install_lang.inc.php:119
#, fuzzy
msgid "Optional"
msgstr "Acciónes"
-#: ../../templates/show_install_lang.inc.php:131
+#: ../../templates/show_install_lang.inc.php:120
msgid "PHP GetText Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:140
+#: ../../templates/show_install_lang.inc.php:123
+msgid "WARNING: This server will use gettext emulator."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:129
msgid "PHP Mbstring Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:152
+#: ../../templates/show_install_lang.inc.php:141
msgid "Choose installation language."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:173
+#: ../../templates/show_install_lang.inc.php:162
msgid "Start configuration"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:179
+#: ../../templates/show_install_lang.inc.php:168
msgid "Ampache does not <strong>run</strong> correctly by this server."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:180
+#: ../../templates/show_install_lang.inc.php:169
msgid "Please contact your server administrator, and fix them."
msgstr ""
@@ -2126,14 +2127,6 @@ msgstr ""
msgid "Disabled Songs"
msgstr "Canciónes duplicadas"
-#: ../../templates/show_preferences.inc.php:28
-msgid "Editing"
-msgstr ""
-
-#: ../../templates/show_preferences.inc.php:28
-msgid "preferences"
-msgstr "preferencias"
-
#: ../../templates/show_localplay_instances.inc.php:23
msgid "Show Localplay Instances"
msgstr ""
@@ -2262,7 +2255,7 @@ msgstr "Tipo"
msgid "Found"
msgstr "Encontrado"
-#: ../../templates/show_install.inc.php:54
+#: ../../templates/show_install.inc.php:55
msgid ""
"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 "
@@ -2272,39 +2265,39 @@ msgstr ""
"una cuenta de MySQL con permisos de crear una base de datos. Es posibleque "
"tenga que esperar un ratito. Este dependa en cuán viejo es su computadora."
-#: ../../templates/show_install.inc.php:61
+#: ../../templates/show_install.inc.php:62
msgid "Insert Ampache Database"
msgstr ""
-#: ../../templates/show_install.inc.php:73
+#: ../../templates/show_install.inc.php:74
msgid "MySQL Administrative Username"
msgstr "Nombre administrativo de MySQL"
-#: ../../templates/show_install.inc.php:77
+#: ../../templates/show_install.inc.php:78
msgid "MySQL Administrative Password"
msgstr "Contraseña administrativa de MySQL"
-#: ../../templates/show_install.inc.php:81
+#: ../../templates/show_install.inc.php:82
msgid "Create Database User for New Database"
msgstr "Crear un usuario para nueva base de datos"
-#: ../../templates/show_install.inc.php:85
+#: ../../templates/show_install.inc.php:86
msgid "Ampache Database Username"
msgstr "Nombre del usuario de la base de datos Ampache"
-#: ../../templates/show_install.inc.php:89
+#: ../../templates/show_install.inc.php:90
msgid "Ampache Database User Password"
msgstr "Contraseña del usario de la base de datos Ampache"
-#: ../../templates/show_install.inc.php:93
+#: ../../templates/show_install.inc.php:94
msgid "Overwrite Existing"
msgstr ""
-#: ../../templates/show_install.inc.php:98
+#: ../../templates/show_install.inc.php:99
msgid "Insert Database"
msgstr "Insertar una base de datos"
-#: ../../templates/show_install_account.inc.php:43
+#: ../../templates/show_install_account.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.dist.php file"
@@ -2312,21 +2305,21 @@ msgstr ""
"Su servidor sí tiene aceso de leer el archivo /sql/ampache.sql y el archivo /"
"config/ampache.cfg.dist.php"
-#: ../../templates/show_install_account.inc.php:49
+#: ../../templates/show_install_account.inc.php:50
msgid "Step 2 - Creating the ampache.cfg.php file"
msgstr ""
-#: ../../templates/show_install_account.inc.php:52
+#: ../../templates/show_install_account.inc.php:53
msgid ""
"This step creates your initial Ampache admin account. Once your admin "
"account has been created you will be directed to the login page"
msgstr ""
-#: ../../templates/show_install_account.inc.php:56
+#: ../../templates/show_install_account.inc.php:57
msgid "Create Admin Account"
msgstr ""
-#: ../../templates/show_install_account.inc.php:73
+#: ../../templates/show_install_account.inc.php:74
msgid "Create Account"
msgstr "Crear una cuenta"
@@ -3367,15 +3360,11 @@ msgstr ""
msgid "Error Username or Password incorrect, please try again"
msgstr ""
-#: ../../lib/general.lib.php:406
-msgid "Simplified Chinese"
-msgstr "Chino simplificado"
-
-#: ../../lib/general.lib.php:468
+#: ../../lib/general.lib.php:498
msgid "On"
msgstr "Encender"
-#: ../../lib/general.lib.php:471
+#: ../../lib/general.lib.php:501
msgid "Off"
msgstr "Apagar"
@@ -3838,6 +3827,138 @@ msgstr ""
msgid "Filename:"
msgstr "Nombre del archivo:"
+#: Database words
+#, fuzzy
+msgid "Allow Downloads"
+msgstr "Bajar"
+
+#: Database words
+#, fuzzy
+msgid "Popular Threshold"
+msgstr "Las canciónes más populares"
+
+#: Database words
+#, fuzzy
+msgid "Transcode Bitrate"
+msgstr "Bitrate mínimo"
+
+#: Database words
+msgid "Ampache :: Pour l'Amour de la Musique"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Lock Songs"
+msgstr "Numero de canciónes"
+
+#: Database words
+msgid "Forces Http play regardless of port"
+msgstr ""
+
+#: Database words
+msgid "Non-Standard Http Port"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Localplay Type"
+msgstr "Local"
+
+#: Database words
+#, fuzzy
+msgid "Type of Playback"
+msgstr "Reproduccin"
+
+#: Database words
+msgid "Language"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Theme"
+msgstr "Tiempo"
+
+#: Database words
+msgid "Album Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Artist Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Title Ellipse Threshold"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Offset Limit"
+msgstr "Límite"
+
+#: Database words
+#, fuzzy
+msgid "Localplay Access"
+msgstr "Control local de reproducción"
+
+#: Database words
+msgid "Allow Streaming"
+msgstr ""
+
+#: Database words
+msgid "Allow Democratic Play"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Allow Localplay Play"
+msgstr "Local"
+
+#: Database words
+msgid "Statistics Day Threshold"
+msgstr ""
+
+#: Database words
+msgid "Min Element Count"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Rate Limit"
+msgstr "Límite"
+
+#: Database words
+#, fuzzy
+msgid "Playlist Method"
+msgstr "Lista creada"
+
+#: Database words
+msgid "Transcoding"
+msgstr ""
+
+#: Database words
+msgid "User to track"
+msgstr ""
+
+#: Database words
+msgid "Streaming"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Interface"
+msgstr "Bitrate mínimo"
+
+#: Database words
+#, fuzzy
+msgid "System"
+msgstr "Título"
+
+#~ msgid "preferences"
+#~ msgstr "preferencias"
+
+#~ msgid "Simplified Chinese"
+#~ msgstr "Chino simplificado"
+
#, fuzzy
#~ msgid "Playlist %s"
#~ msgstr "Listas de reproducción"
@@ -3913,10 +4034,6 @@ msgstr "Nombre del archivo:"
#~ msgid "Do you really want to clear the statistics for this catalog?"
#~ msgstr "¿Confirmas borrar las estadísticas de este catálogo?"
-#, fuzzy
-#~ msgid "Site"
-#~ msgstr "Título"
-
#~ msgid "Do you really want to delete this Access Record?"
#~ msgstr "¿Confirmas borrar este registro de aceso?"
@@ -4157,9 +4274,6 @@ msgstr "Nombre del archivo:"
#~ msgid "Under LIBGLUE"
#~ msgstr "Bajo LIBGLUE"
-#~ msgid "Playback"
-#~ msgstr "Reproduccin"
-
#~ msgid "Clear queue"
#~ msgstr "Limpiar queue"
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index f2e458f3..7c0c20dc 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 630f481c..cb43c449 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-27 09:09+0900\n"
+"POT-Creation-Date: 2008-08-29 16:03+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"
@@ -96,6 +96,7 @@ msgid "Edit"
msgstr "&Eacute;diter"
#: ../../templates/show_user_preferences.inc.php:28
+#: ../../templates/show_preferences.inc.php:28
#, fuzzy, php-format
msgid "Editing %s preferences"
msgstr "pr&eacute;f&eacute;rences"
@@ -248,7 +249,7 @@ msgstr ""
"fonctionnalit&eacute;s de ampache"
#: ../../templates/show_test.inc.php:153
-#: ../../templates/show_install_config.inc.php:88
+#: ../../templates/show_install_config.inc.php:89
msgid "Ampache.cfg.php Exists"
msgstr "Ampache.cfg.php existe"
@@ -263,7 +264,7 @@ msgstr ""
"\t n'est pas lisible par votre serveur web"
#: ../../templates/show_test.inc.php:172
-#: ../../templates/show_install_config.inc.php:105
+#: ../../templates/show_install_config.inc.php:106
msgid "Ampache.cfg.php Configured?"
msgstr "Ampache.cfg.php configur&eacute; ?"
@@ -293,7 +294,7 @@ msgid "DB Inserted"
msgstr "Base de donn&eacute;es ins&eacute;r&eacute;"
#: ../../templates/show_test.inc.php:235
-#: ../../templates/show_install_config.inc.php:60
+#: ../../templates/show_install_config.inc.php:61
msgid "Web Path"
msgstr "Chemin d'acc&egrave;s web"
@@ -415,7 +416,7 @@ msgstr "Nom complet"
#: ../../templates/show_users.inc.php:104
#: ../../templates/show_edit_user.inc.php:29
#: ../../templates/show_add_user.inc.php:29
-#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_install_account.inc.php:61
#: ../../templates/show_recently_played.inc.php:39
#: ../../templates/show_recently_played.inc.php:98
#: ../../templates/show_user_registration.inc.php:75
@@ -488,7 +489,7 @@ msgstr "Jamais"
#: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
#: ../../lib/class/flag.class.php:282 ../../lib/class/localplay.class.php:648
-#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:409
+#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:439
#: ../../modules/localplay/mpd.controller.php:508
#: ../../modules/localplay/httpq.controller.php:505
msgid "Unknown"
@@ -514,7 +515,7 @@ msgstr "E-mail"
#: ../../templates/show_edit_user.inc.php:52
#: ../../templates/show_add_user.inc.php:52
-#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_install_account.inc.php:65
#: ../../templates/show_login_form.inc.php:62
#: ../../templates/show_user_registration.inc.php:103
#: ../../modules/localplay/mpd.controller.php:235
@@ -525,7 +526,7 @@ msgstr "Mot de passe"
#: ../../templates/show_edit_user.inc.php:61
#: ../../templates/show_add_user.inc.php:61
#: ../../templates/show_account.inc.php:46
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:69
#: ../../templates/show_user_registration.inc.php:112
msgid "Confirm Password"
msgstr "Confirmation du mot de passe"
@@ -1353,17 +1354,17 @@ msgstr "Lecteur Flash "
msgid "Preference Administration"
msgstr "Pr&eacute;f&eacute;rences d'administration"
-#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:33
-#: ../../templates/show_install.inc.php:32
-#: ../../templates/show_install_account.inc.php:32
+#: ../../templates/show_install_config.inc.php:33
+#: ../../templates/show_install_lang.inc.php:34
+#: ../../templates/show_install.inc.php:33
+#: ../../templates/show_install_account.inc.php:33
msgid "Ampache Installation"
msgstr "Installation d'Ampache"
-#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:40
-#: ../../templates/show_install.inc.php:40
-#: ../../templates/show_install_account.inc.php:39
+#: ../../templates/show_install_config.inc.php:39
+#: ../../templates/show_install_lang.inc.php:41
+#: ../../templates/show_install.inc.php:41
+#: ../../templates/show_install_account.inc.php:40
msgid ""
"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 "
@@ -1373,19 +1374,19 @@ msgstr ""
"et la cr&eacute;ation du fichier ampache.cfg.php. Avant de continuer, "
"assurez-vous d'avoir tous les pr&eacute;-requis"
-#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:43
-#: ../../templates/show_install.inc.php:43
-#: ../../templates/show_install_account.inc.php:42
+#: ../../templates/show_install_config.inc.php:42
+#: ../../templates/show_install_lang.inc.php:44
+#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_account.inc.php:43
msgid ""
"A MySQL Server with a username and password that can create/modify databases"
msgstr ""
"Un serveur MySQL avec un utilisateur et mot de passe pouvant cr&eacute;er et "
"modifier les bases de donn&eacute;es"
-#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:44
-#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_config.inc.php:43
+#: ../../templates/show_install_lang.inc.php:45
+#: ../../templates/show_install.inc.php:45
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.php.dist file"
@@ -1393,10 +1394,10 @@ msgstr ""
"Votre serveur web a des droits en lecture sur les fichiers /sql/ampache.sql "
"et /config/ampache.cfg.php.dist"
-#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:47
-#: ../../templates/show_install.inc.php:47
-#: ../../templates/show_install_account.inc.php:45
+#: ../../templates/show_install_config.inc.php:45
+#: ../../templates/show_install_lang.inc.php:48
+#: ../../templates/show_install.inc.php:48
+#: ../../templates/show_install_account.inc.php:46
msgid ""
"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 "
@@ -1409,20 +1410,20 @@ msgstr ""
"indispensables. Si vous d&eacute;sirez modifier par la suite votre "
"configuration, &eacute;ditez le fichier /config/ampache.cfg.php"
-#: ../../templates/show_install_config.inc.php:48
-#: ../../templates/show_install.inc.php:52
-#: ../../templates/show_install_account.inc.php:48
+#: ../../templates/show_install_config.inc.php:49
+#: ../../templates/show_install.inc.php:53
+#: ../../templates/show_install_account.inc.php:49
msgid "Step 1 - Creating and Inserting the Ampache Database"
msgstr ""
"Etape 1 - Cr&eacute;ation et alimentation de la base de donn&eacute;es "
"d'Ampache"
-#: ../../templates/show_install_config.inc.php:49
-#: ../../templates/show_install.inc.php:56
+#: ../../templates/show_install_config.inc.php:50
+#: ../../templates/show_install.inc.php:57
msgid "Step 2 - Creating the Ampache.cfg.php file"
msgstr "&eacute;tape 2 - Cr&eacute;ation du fichier Ampache.cfg.php"
-#: ../../templates/show_install_config.inc.php:51
+#: ../../templates/show_install_config.inc.php:52
msgid ""
"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 "
@@ -1432,43 +1433,43 @@ msgstr ""
"le t&eacute;l&eacute;charger puis le copier dans le r&eacute;pertoire /"
"config."
-#: ../../templates/show_install_config.inc.php:53
-#: ../../templates/show_install.inc.php:57
-#: ../../templates/show_install_account.inc.php:50
+#: ../../templates/show_install_config.inc.php:54
+#: ../../templates/show_install.inc.php:58
+#: ../../templates/show_install_account.inc.php:51
msgid "Step 3 - Setup Initial Account"
msgstr "Etape 3 - Param&egrave;tres du compte initial"
-#: ../../templates/show_install_config.inc.php:56
+#: ../../templates/show_install_config.inc.php:57
msgid "Generate Config File"
msgstr "G&eacute;n&eacute;rer le fichier de configuration"
-#: ../../templates/show_install_config.inc.php:64
-#: ../../templates/show_install.inc.php:65
+#: ../../templates/show_install_config.inc.php:65
+#: ../../templates/show_install.inc.php:66
msgid "Desired Database Name"
msgstr "Nom de la base de donn&eacute;es"
-#: ../../templates/show_install_config.inc.php:68
-#: ../../templates/show_install.inc.php:69
+#: ../../templates/show_install_config.inc.php:69
+#: ../../templates/show_install.inc.php:70
msgid "MySQL Hostname"
msgstr "H&ocirc;te MySQL"
-#: ../../templates/show_install_config.inc.php:72
+#: ../../templates/show_install_config.inc.php:73
msgid "MySQL Username"
msgstr "Utilisateur MySQL"
-#: ../../templates/show_install_config.inc.php:76
+#: ../../templates/show_install_config.inc.php:77
msgid "MySQL Password"
msgstr "Mot de passe MySQL"
-#: ../../templates/show_install_config.inc.php:81
+#: ../../templates/show_install_config.inc.php:82
msgid "Write Config"
msgstr "&eacute;crire la configuration"
-#: ../../templates/show_install_config.inc.php:126
+#: ../../templates/show_install_config.inc.php:127
msgid "Check for Config"
msgstr "Test de la configuration"
-#: ../../templates/show_install_config.inc.php:132
+#: ../../templates/show_install_config.inc.php:133
msgid "Continue to Step 3"
msgstr "Continuer vers l'&eacute;tape 3"
@@ -1606,80 +1607,79 @@ msgstr "Taille du catalogue"
msgid "Catalog Time"
msgstr "Dur&eacute;e du catalogue"
-#: ../../templates/show_install_lang.inc.php:38
-#: ../../templates/show_install_lang.inc.php:52
-#: ../../templates/show_install.inc.php:38
+#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install.inc.php:39
msgid "Requirements"
msgstr "Pr&eacute;-requis"
-#: ../../templates/show_install_lang.inc.php:51
+#: ../../templates/show_install_lang.inc.php:52
#, fuzzy
msgid "System Checks"
msgstr "Système"
-#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install_lang.inc.php:54
#, fuzzy
msgid "PHP Version:"
msgstr "Version de PHP"
-#: ../../templates/show_install_lang.inc.php:63
+#: ../../templates/show_install_lang.inc.php:64
#, fuzzy
msgid "Mysql for PHP:"
msgstr "Mysql pour PHP"
-#: ../../templates/show_install_lang.inc.php:77
+#: ../../templates/show_install_lang.inc.php:78
#, fuzzy
msgid "PHP Session Support:"
msgstr "Support des sessions PHP"
-#: ../../templates/show_install_lang.inc.php:87
+#: ../../templates/show_install_lang.inc.php:88
#, fuzzy
msgid "PHP ICONV Support:"
msgstr "Support de PHP ICONV"
-#: ../../templates/show_install_lang.inc.php:97
+#: ../../templates/show_install_lang.inc.php:98
#, fuzzy
msgid "PHP PCRE Support:"
msgstr "Support de PHP PCRE"
-#: ../../templates/show_install_lang.inc.php:107
+#: ../../templates/show_install_lang.inc.php:108
#, 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
+#: ../../templates/show_install_lang.inc.php:119
#, fuzzy
msgid "Optional"
msgstr "Options"
-#: ../../templates/show_install_lang.inc.php:131
+#: ../../templates/show_install_lang.inc.php:120
#, fuzzy
msgid "PHP GetText Support:"
msgstr "Support Gettext"
-#: ../../templates/show_install_lang.inc.php:140
+#: ../../templates/show_install_lang.inc.php:123
+msgid "WARNING: This server will use gettext emulator."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:129
#, fuzzy
msgid "PHP Mbstring Support:"
msgstr "Support des sessions PHP"
-#: ../../templates/show_install_lang.inc.php:152
+#: ../../templates/show_install_lang.inc.php:141
msgid "Choose installation language."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:173
+#: ../../templates/show_install_lang.inc.php:162
msgid "Start configuration"
msgstr "Lancer la configuration"
-#: ../../templates/show_install_lang.inc.php:179
+#: ../../templates/show_install_lang.inc.php:168
msgid "Ampache does not <strong>run</strong> correctly by this server."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:180
+#: ../../templates/show_install_lang.inc.php:169
msgid "Please contact your server administrator, and fix them."
msgstr ""
@@ -2140,14 +2140,6 @@ msgstr "Les dix derni&eacute;s enregistrements marqu&eacute;s"
msgid "Disabled Songs"
msgstr "Morceaux d&eacute;sactiv&eacute;s"
-#: ../../templates/show_preferences.inc.php:28
-msgid "Editing"
-msgstr "&eacute;dition"
-
-#: ../../templates/show_preferences.inc.php:28
-msgid "preferences"
-msgstr "pr&eacute;f&eacute;rences"
-
#: ../../templates/show_localplay_instances.inc.php:23
msgid "Show Localplay Instances"
msgstr "Afficher les instances de lecture locale"
@@ -2271,7 +2263,7 @@ msgstr "Type"
msgid "Found"
msgstr "Trouv&eacute;"
-#: ../../templates/show_install.inc.php:54
+#: ../../templates/show_install.inc.php:55
msgid ""
"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 "
@@ -2282,40 +2274,40 @@ msgstr ""
"cr&eacute;ation. Cette &eacute;tape peut prendre un certain temps. Cela "
"d&eacute;pends de la vitesse de votre ordinateur"
-#: ../../templates/show_install.inc.php:61
+#: ../../templates/show_install.inc.php:62
msgid "Insert Ampache Database"
msgstr "Ins&eacute;rer la base de donn&eacute;es Ampache"
-#: ../../templates/show_install.inc.php:73
+#: ../../templates/show_install.inc.php:74
msgid "MySQL Administrative Username"
msgstr "Nom d'utilisateur administrateur MySQL"
-#: ../../templates/show_install.inc.php:77
+#: ../../templates/show_install.inc.php:78
msgid "MySQL Administrative Password"
msgstr "Mot de passe administrateur MySQL"
-#: ../../templates/show_install.inc.php:81
+#: ../../templates/show_install.inc.php:82
msgid "Create Database User for New Database"
msgstr ""
"Cr&eacute;er un utilisateur de base de donn&eacute;es pour la nouvelle base"
-#: ../../templates/show_install.inc.php:85
+#: ../../templates/show_install.inc.php:86
msgid "Ampache Database Username"
msgstr "Nom d'utilisateur de base de donn&eacute;es Ampache"
-#: ../../templates/show_install.inc.php:89
+#: ../../templates/show_install.inc.php:90
msgid "Ampache Database User Password"
msgstr "Mot de passe de l'utilisateur de base de donn&eacute;es Ampache"
-#: ../../templates/show_install.inc.php:93
+#: ../../templates/show_install.inc.php:94
msgid "Overwrite Existing"
msgstr "Ecraser la configuration existante"
-#: ../../templates/show_install.inc.php:98
+#: ../../templates/show_install.inc.php:99
msgid "Insert Database"
msgstr "Remplissage de la base de donn&eacute;es"
-#: ../../templates/show_install_account.inc.php:43
+#: ../../templates/show_install_account.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.dist.php file"
@@ -2323,11 +2315,11 @@ msgstr ""
"Votre serveur web a acc&egrave;s en lecture sur les fichiers /sql/ampache."
"sql et /config/ampache.cfg.dist.php"
-#: ../../templates/show_install_account.inc.php:49
+#: ../../templates/show_install_account.inc.php:50
msgid "Step 2 - Creating the ampache.cfg.php file"
msgstr "Etape 2 - Cr&eacute;ation du fichier ampache.cfg.php"
-#: ../../templates/show_install_account.inc.php:52
+#: ../../templates/show_install_account.inc.php:53
msgid ""
"This step creates your initial Ampache admin account. Once your admin "
"account has been created you will be directed to the login page"
@@ -2336,11 +2328,11 @@ msgstr ""
"ce compte cr&eacute;&eacute;, vous serez redirig&eacute; vers la page de "
"login"
-#: ../../templates/show_install_account.inc.php:56
+#: ../../templates/show_install_account.inc.php:57
msgid "Create Admin Account"
msgstr "Cr&eacute;er un compte administrateur"
-#: ../../templates/show_install_account.inc.php:73
+#: ../../templates/show_install_account.inc.php:74
msgid "Create Account"
msgstr "Cr&eacute;er un compte"
@@ -3354,15 +3346,11 @@ msgstr "morceaux mis &agrave; jour"
msgid "Error Username or Password incorrect, please try again"
msgstr ""
-#: ../../lib/general.lib.php:406
-msgid "Simplified Chinese"
-msgstr "Chinois simplifi&eacute;"
-
-#: ../../lib/general.lib.php:468
+#: ../../lib/general.lib.php:498
msgid "On"
msgstr "actif"
-#: ../../lib/general.lib.php:471
+#: ../../lib/general.lib.php:501
msgid "Off"
msgstr "inactif"
@@ -3833,6 +3821,149 @@ msgstr ""
msgid "Filename:"
msgstr "Nom de fichier :"
+#: Database words
+#, fuzzy
+msgid "Allow Downloads"
+msgstr "T&eacute;l&eacute;charger"
+
+#: Database words
+#, fuzzy
+msgid "Popular Threshold"
+msgstr "Morceaux les plus populaires"
+
+#: Database words
+#, fuzzy
+msgid "Transcode Bitrate"
+msgstr "D&eacute;bit minimum"
+
+#: Database words
+msgid "Ampache :: Pour l'Amour de la Musique"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Lock Songs"
+msgstr "Nb de morceaux"
+
+#: Database words
+msgid "Forces Http play regardless of port"
+msgstr ""
+
+#: Database words
+msgid "Non-Standard Http Port"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Localplay Type"
+msgstr "Lecture en local"
+
+#: Database words
+msgid "Type of Playback"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Language"
+msgstr "Gerant "
+
+#: Database words
+#, fuzzy
+msgid "Theme"
+msgstr "Dur&eacute;e"
+
+#: Database words
+msgid "Album Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Artist Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Title Ellipse Threshold"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Offset Limit"
+msgstr "Limite de Taille"
+
+#: Database words
+#, fuzzy
+msgid "Localplay Access"
+msgstr "Lecture en local"
+
+#: Database words
+#, fuzzy
+msgid "Allow Streaming"
+msgstr "Flux"
+
+#: Database words
+#, fuzzy
+msgid "Allow Democratic Play"
+msgstr "Cr&eacute;er une liste de lecture d&eacute;mocratique"
+
+#: Database words
+#, fuzzy
+msgid "Allow Localplay Play"
+msgstr "Authorisation du mode lecture locale d&eacute;sactiv&eacute;"
+
+#: Database words
+msgid "Statistics Day Threshold"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Min Element Count"
+msgstr "Comptage minimum"
+
+#: Database words
+#, fuzzy
+msgid "Rate Limit"
+msgstr "Limite de Taille"
+
+#: Database words
+#, fuzzy
+msgid "Playlist Method"
+msgstr "Liste de lecture cr&eacute;&eacute;e"
+
+#: Database words
+msgid "Transcoding"
+msgstr ""
+
+#: Database words
+msgid "User to track"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Streaming"
+msgstr "Flux"
+
+#: Database words
+#, fuzzy
+msgid "Interface"
+msgstr "l'Interface"
+
+#: Database words
+#, fuzzy
+msgid "System"
+msgstr "élément"
+
+#~ msgid "Editing"
+#~ msgstr "&eacute;dition"
+
+#~ msgid "preferences"
+#~ msgstr "pr&eacute;f&eacute;rences"
+
+#, fuzzy
+#~ msgid "PHP Safe Mode:"
+#~ msgstr "Mode sans &eacute;chec"
+
+#~ msgid "Simplified Chinese"
+#~ msgstr "Chinois simplifi&eacute;"
+
#, fuzzy
#~ msgid "Playlist %s"
#~ msgstr "Listes de lecture"
@@ -3840,12 +3971,6 @@ msgstr "Nom de fichier :"
#~ msgid "Buy Track from MyStrands"
#~ msgstr "Acheter la piste chez MyStrands"
-#~ msgid "Interface"
-#~ msgstr "l'Interface"
-
-#~ msgid "Streaming"
-#~ msgstr "Flux"
-
#~ msgid "Recommendations"
#~ msgstr "Recommandations"
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 808d0051..0386d99a 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 d8495577..cecf8c4c 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-27 09:09+0900\n"
+"POT-Creation-Date: 2008-08-29 16:03+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"
@@ -90,6 +90,7 @@ msgid "Edit"
msgstr "Modifica"
#: ../../templates/show_user_preferences.inc.php:28
+#: ../../templates/show_preferences.inc.php:28
#, fuzzy, php-format
msgid "Editing %s preferences"
msgstr "Impostazioni sito"
@@ -246,7 +247,7 @@ msgid ""
msgstr ""
#: ../../templates/show_test.inc.php:153
-#: ../../templates/show_install_config.inc.php:88
+#: ../../templates/show_install_config.inc.php:89
msgid "Ampache.cfg.php Exists"
msgstr "Ampache.cfg.php esiste"
@@ -258,7 +259,7 @@ msgid ""
msgstr ""
#: ../../templates/show_test.inc.php:172
-#: ../../templates/show_install_config.inc.php:105
+#: ../../templates/show_install_config.inc.php:106
msgid "Ampache.cfg.php Configured?"
msgstr "Ampache.cfg.php Configurato?"
@@ -283,7 +284,7 @@ msgid "DB Inserted"
msgstr ""
#: ../../templates/show_test.inc.php:235
-#: ../../templates/show_install_config.inc.php:60
+#: ../../templates/show_install_config.inc.php:61
msgid "Web Path"
msgstr "Percorso Web"
@@ -405,7 +406,7 @@ msgstr "Nome completo"
#: ../../templates/show_users.inc.php:104
#: ../../templates/show_edit_user.inc.php:29
#: ../../templates/show_add_user.inc.php:29
-#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_install_account.inc.php:61
#: ../../templates/show_recently_played.inc.php:39
#: ../../templates/show_recently_played.inc.php:98
#: ../../templates/show_user_registration.inc.php:75
@@ -479,7 +480,7 @@ msgstr ""
#: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
#: ../../lib/class/flag.class.php:282 ../../lib/class/localplay.class.php:648
-#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:409
+#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:439
#: ../../modules/localplay/mpd.controller.php:508
#: ../../modules/localplay/httpq.controller.php:505
msgid "Unknown"
@@ -505,7 +506,7 @@ msgstr "E-mail"
#: ../../templates/show_edit_user.inc.php:52
#: ../../templates/show_add_user.inc.php:52
-#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_install_account.inc.php:65
#: ../../templates/show_login_form.inc.php:62
#: ../../templates/show_user_registration.inc.php:103
#: ../../modules/localplay/mpd.controller.php:235
@@ -516,7 +517,7 @@ msgstr "Password"
#: ../../templates/show_edit_user.inc.php:61
#: ../../templates/show_add_user.inc.php:61
#: ../../templates/show_account.inc.php:46
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:69
#: ../../templates/show_user_registration.inc.php:112
msgid "Confirm Password"
msgstr "Conferma password"
@@ -1367,17 +1368,17 @@ msgstr ""
msgid "Preference Administration"
msgstr "Impostazioni"
-#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:33
-#: ../../templates/show_install.inc.php:32
-#: ../../templates/show_install_account.inc.php:32
+#: ../../templates/show_install_config.inc.php:33
+#: ../../templates/show_install_lang.inc.php:34
+#: ../../templates/show_install.inc.php:33
+#: ../../templates/show_install_account.inc.php:33
msgid "Ampache Installation"
msgstr "Installazione Ampache"
-#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:40
-#: ../../templates/show_install.inc.php:40
-#: ../../templates/show_install_account.inc.php:39
+#: ../../templates/show_install_config.inc.php:39
+#: ../../templates/show_install_lang.inc.php:41
+#: ../../templates/show_install.inc.php:41
+#: ../../templates/show_install_account.inc.php:40
msgid ""
"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 "
@@ -1387,28 +1388,28 @@ msgstr ""
"creazione del file ampache.cfg.php. Prima di continuare assicurati di avere "
"i seguenti pre-requisiti"
-#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:43
-#: ../../templates/show_install.inc.php:43
-#: ../../templates/show_install_account.inc.php:42
+#: ../../templates/show_install_config.inc.php:42
+#: ../../templates/show_install_lang.inc.php:44
+#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_account.inc.php:43
msgid ""
"A MySQL Server with a username and password that can create/modify databases"
msgstr ""
"Un server MySQL con nome utente e password che consentono di creare/"
"modificare database"
-#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:44
-#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_config.inc.php:43
+#: ../../templates/show_install_lang.inc.php:45
+#: ../../templates/show_install.inc.php:45
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.php.dist file"
msgstr ""
-#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:47
-#: ../../templates/show_install.inc.php:47
-#: ../../templates/show_install_account.inc.php:45
+#: ../../templates/show_install_config.inc.php:45
+#: ../../templates/show_install_lang.inc.php:48
+#: ../../templates/show_install.inc.php:48
+#: ../../templates/show_install_account.inc.php:46
msgid ""
"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 "
@@ -1416,61 +1417,61 @@ msgid ""
"date simply edit /config/ampache.cfg.php"
msgstr ""
-#: ../../templates/show_install_config.inc.php:48
-#: ../../templates/show_install.inc.php:52
-#: ../../templates/show_install_account.inc.php:48
+#: ../../templates/show_install_config.inc.php:49
+#: ../../templates/show_install.inc.php:53
+#: ../../templates/show_install_account.inc.php:49
msgid "Step 1 - Creating and Inserting the Ampache Database"
msgstr "Passo 1 - Creazione ed inserimento del database Ampache"
-#: ../../templates/show_install_config.inc.php:49
-#: ../../templates/show_install.inc.php:56
+#: ../../templates/show_install_config.inc.php:50
+#: ../../templates/show_install.inc.php:57
msgid "Step 2 - Creating the Ampache.cfg.php file"
msgstr "Passso 2 - Creazione del file Ampache.cfg.php"
-#: ../../templates/show_install_config.inc.php:51
+#: ../../templates/show_install_config.inc.php:52
msgid ""
"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"
msgstr ""
-#: ../../templates/show_install_config.inc.php:53
-#: ../../templates/show_install.inc.php:57
-#: ../../templates/show_install_account.inc.php:50
+#: ../../templates/show_install_config.inc.php:54
+#: ../../templates/show_install.inc.php:58
+#: ../../templates/show_install_account.inc.php:51
msgid "Step 3 - Setup Initial Account"
msgstr "Passo 3 -Impostazione account iniziale"
-#: ../../templates/show_install_config.inc.php:56
+#: ../../templates/show_install_config.inc.php:57
msgid "Generate Config File"
msgstr ""
-#: ../../templates/show_install_config.inc.php:64
-#: ../../templates/show_install.inc.php:65
+#: ../../templates/show_install_config.inc.php:65
+#: ../../templates/show_install.inc.php:66
msgid "Desired Database Name"
msgstr "Nome del database desiderato"
-#: ../../templates/show_install_config.inc.php:68
-#: ../../templates/show_install.inc.php:69
+#: ../../templates/show_install_config.inc.php:69
+#: ../../templates/show_install.inc.php:70
msgid "MySQL Hostname"
msgstr "Server MySQL"
-#: ../../templates/show_install_config.inc.php:72
+#: ../../templates/show_install_config.inc.php:73
msgid "MySQL Username"
msgstr "Nome utente MySQL"
-#: ../../templates/show_install_config.inc.php:76
+#: ../../templates/show_install_config.inc.php:77
msgid "MySQL Password"
msgstr "Password MySQL"
-#: ../../templates/show_install_config.inc.php:81
+#: ../../templates/show_install_config.inc.php:82
msgid "Write Config"
msgstr "Scrivi configurazione"
-#: ../../templates/show_install_config.inc.php:126
+#: ../../templates/show_install_config.inc.php:127
msgid "Check for Config"
msgstr "Controllo configurazione"
-#: ../../templates/show_install_config.inc.php:132
+#: ../../templates/show_install_config.inc.php:133
msgid "Continue to Step 3"
msgstr ""
@@ -1611,79 +1612,79 @@ msgstr "Dimensione catalogo"
msgid "Catalog Time"
msgstr "Durata catalogo"
-#: ../../templates/show_install_lang.inc.php:38
-#: ../../templates/show_install_lang.inc.php:52
-#: ../../templates/show_install.inc.php:38
+#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install.inc.php:39
msgid "Requirements"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:51
+#: ../../templates/show_install_lang.inc.php:52
#, fuzzy
msgid "System Checks"
msgstr "Stream"
-#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install_lang.inc.php:54
#, fuzzy
msgid "PHP Version:"
msgstr "Versione PHP"
-#: ../../templates/show_install_lang.inc.php:63
+#: ../../templates/show_install_lang.inc.php:64
#, fuzzy
msgid "Mysql for PHP:"
msgstr "Mysql per PHP"
-#: ../../templates/show_install_lang.inc.php:77
+#: ../../templates/show_install_lang.inc.php:78
#, fuzzy
msgid "PHP Session Support:"
msgstr "Supporto sessioni PHP"
-#: ../../templates/show_install_lang.inc.php:87
+#: ../../templates/show_install_lang.inc.php:88
#, fuzzy
msgid "PHP ICONV Support:"
msgstr "Supporto PHP ICONV"
-#: ../../templates/show_install_lang.inc.php:97
+#: ../../templates/show_install_lang.inc.php:98
#, fuzzy
msgid "PHP PCRE Support:"
msgstr "Supporto PHP ICONV"
-#: ../../templates/show_install_lang.inc.php:107
+#: ../../templates/show_install_lang.inc.php:108
#, 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
+#: ../../templates/show_install_lang.inc.php:119
#, fuzzy
msgid "Optional"
msgstr "Azioni"
-#: ../../templates/show_install_lang.inc.php:131
+#: ../../templates/show_install_lang.inc.php:120
#, fuzzy
msgid "PHP GetText Support:"
msgstr "Supporto PHP ICONV"
-#: ../../templates/show_install_lang.inc.php:140
+#: ../../templates/show_install_lang.inc.php:123
+msgid "WARNING: This server will use gettext emulator."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:129
#, fuzzy
msgid "PHP Mbstring Support:"
msgstr "Supporto sessioni PHP"
-#: ../../templates/show_install_lang.inc.php:152
+#: ../../templates/show_install_lang.inc.php:141
msgid "Choose installation language."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:173
+#: ../../templates/show_install_lang.inc.php:162
msgid "Start configuration"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:179
+#: ../../templates/show_install_lang.inc.php:168
msgid "Ampache does not <strong>run</strong> correctly by this server."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:180
+#: ../../templates/show_install_lang.inc.php:169
msgid "Please contact your server administrator, and fix them."
msgstr ""
@@ -2157,14 +2158,6 @@ msgstr ""
msgid "Disabled Songs"
msgstr "Mostra brani disabilitati"
-#: ../../templates/show_preferences.inc.php:28
-msgid "Editing"
-msgstr "Modifica"
-
-#: ../../templates/show_preferences.inc.php:28
-msgid "preferences"
-msgstr "impostazioni"
-
#: ../../templates/show_localplay_instances.inc.php:23
msgid "Show Localplay Instances"
msgstr ""
@@ -2294,46 +2287,46 @@ msgstr ""
msgid "Found"
msgstr "Trovato"
-#: ../../templates/show_install.inc.php:54
+#: ../../templates/show_install.inc.php:55
msgid ""
"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"
msgstr ""
-#: ../../templates/show_install.inc.php:61
+#: ../../templates/show_install.inc.php:62
msgid "Insert Ampache Database"
msgstr ""
-#: ../../templates/show_install.inc.php:73
+#: ../../templates/show_install.inc.php:74
msgid "MySQL Administrative Username"
msgstr "Utente amministratore MySQL"
-#: ../../templates/show_install.inc.php:77
+#: ../../templates/show_install.inc.php:78
msgid "MySQL Administrative Password"
msgstr "Password amministratore MySQL"
-#: ../../templates/show_install.inc.php:81
+#: ../../templates/show_install.inc.php:82
msgid "Create Database User for New Database"
msgstr ""
-#: ../../templates/show_install.inc.php:85
+#: ../../templates/show_install.inc.php:86
msgid "Ampache Database Username"
msgstr "Nome utente del database Ampache"
-#: ../../templates/show_install.inc.php:89
+#: ../../templates/show_install.inc.php:90
msgid "Ampache Database User Password"
msgstr "Password utente del database Ampache"
-#: ../../templates/show_install.inc.php:93
+#: ../../templates/show_install.inc.php:94
msgid "Overwrite Existing"
msgstr ""
-#: ../../templates/show_install.inc.php:98
+#: ../../templates/show_install.inc.php:99
msgid "Insert Database"
msgstr "Inserisci database"
-#: ../../templates/show_install_account.inc.php:43
+#: ../../templates/show_install_account.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.dist.php file"
@@ -2341,11 +2334,11 @@ msgstr ""
"Il tuo webserver ha accesso in lettura al file /sql/ampache.sql ed al file /"
"config/ampache.cfg.dist.php"
-#: ../../templates/show_install_account.inc.php:49
+#: ../../templates/show_install_account.inc.php:50
msgid "Step 2 - Creating the ampache.cfg.php file"
msgstr "Passo 2 - Creazione del file ampache.cfg.php"
-#: ../../templates/show_install_account.inc.php:52
+#: ../../templates/show_install_account.inc.php:53
msgid ""
"This step creates your initial Ampache admin account. Once your admin "
"account has been created you will be directed to the login page"
@@ -2353,11 +2346,11 @@ msgstr ""
"Questo passo crea il tuo accouunt iniziale di amministrazione. Una volta che "
"l' account sarà stato creato verrai ridiretto nella pagina di accesso."
-#: ../../templates/show_install_account.inc.php:56
+#: ../../templates/show_install_account.inc.php:57
msgid "Create Admin Account"
msgstr "Crea account Amministratore"
-#: ../../templates/show_install_account.inc.php:73
+#: ../../templates/show_install_account.inc.php:74
msgid "Create Account"
msgstr "Crea account"
@@ -3406,15 +3399,11 @@ msgstr "è stata aggiornata"
msgid "Error Username or Password incorrect, please try again"
msgstr ""
-#: ../../lib/general.lib.php:406
-msgid "Simplified Chinese"
-msgstr "Cinese semplificato"
-
-#: ../../lib/general.lib.php:468
+#: ../../lib/general.lib.php:498
msgid "On"
msgstr ""
-#: ../../lib/general.lib.php:471
+#: ../../lib/general.lib.php:501
msgid "Off"
msgstr ""
@@ -3886,6 +3875,141 @@ msgstr ""
msgid "Filename:"
msgstr "Nome file:"
+#: Database words
+#, fuzzy
+msgid "Allow Downloads"
+msgstr "Scarica"
+
+#: Database words
+#, fuzzy
+msgid "Popular Threshold"
+msgstr "Brani più popolari"
+
+#: Database words
+#, fuzzy
+msgid "Transcode Bitrate"
+msgstr "Bitrate min."
+
+#: Database words
+msgid "Ampache :: Pour l'Amour de la Musique"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Lock Songs"
+msgstr "N° Brani"
+
+#: Database words
+msgid "Forces Http play regardless of port"
+msgstr ""
+
+#: Database words
+msgid "Non-Standard Http Port"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Localplay Type"
+msgstr "Riproduzione locale"
+
+#: Database words
+#, fuzzy
+msgid "Type of Playback"
+msgstr "Riproduzione"
+
+#: Database words
+msgid "Language"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Theme"
+msgstr "Durata"
+
+#: Database words
+msgid "Album Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Artist Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Title Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Offset Limit"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Localplay Access"
+msgstr "Controllo riproduzione locale"
+
+#: Database words
+#, fuzzy
+msgid "Allow Streaming"
+msgstr "Stream"
+
+#: Database words
+msgid "Allow Democratic Play"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Allow Localplay Play"
+msgstr "Riproduzione locale"
+
+#: Database words
+msgid "Statistics Day Threshold"
+msgstr ""
+
+#: Database words
+msgid "Min Element Count"
+msgstr ""
+
+#: Database words
+msgid "Rate Limit"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Playlist Method"
+msgstr "Playlist creata."
+
+#: Database words
+msgid "Transcoding"
+msgstr ""
+
+#: Database words
+msgid "User to track"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Streaming"
+msgstr "Stream"
+
+#: Database words
+#, fuzzy
+msgid "Interface"
+msgstr "Bitrate"
+
+#: Database words
+#, fuzzy
+msgid "System"
+msgstr "Stream"
+
+#~ msgid "Editing"
+#~ msgstr "Modifica"
+
+#~ msgid "preferences"
+#~ msgstr "impostazioni"
+
+#~ msgid "Simplified Chinese"
+#~ msgstr "Cinese semplificato"
+
#, fuzzy
#~ msgid "Playlist %s"
#~ msgstr "Playlists"
@@ -4167,10 +4291,6 @@ msgstr "Nome file:"
#~ msgid "Rebuild Preferences"
#~ msgstr "Ricostruisci impostazioni"
-#, fuzzy
-#~ msgid "Streaming"
-#~ msgstr "Stream"
-
#~ msgid "Revoke"
#~ msgstr "Rovoca"
@@ -4342,9 +4462,6 @@ msgstr "Nome file:"
#~ msgid "Common Functions"
#~ msgstr "Funzioni comuni"
-#~ msgid "Playback"
-#~ msgstr "Riproduzione"
-
#~ msgid "Clear queue"
#~ msgstr "Cancella coda"
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index f578cead..c26b882d 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 a58be5d0..2db26f0e 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-27 09:09+0900\n"
+"POT-Creation-Date: 2008-08-29 16:03+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"
@@ -90,6 +90,7 @@ msgid "Edit"
msgstr "編集"
#: ../../templates/show_user_preferences.inc.php:28
+#: ../../templates/show_preferences.inc.php:28
#, php-format
msgid "Editing %s preferences"
msgstr "%s設定の編集"
@@ -244,7 +245,7 @@ msgstr ""
"ない一方で、機能なしでは要求されないかもしれません"
#: ../../templates/show_test.inc.php:153
-#: ../../templates/show_install_config.inc.php:88
+#: ../../templates/show_install_config.inc.php:89
msgid "Ampache.cfg.php Exists"
msgstr "Ampache.cfg.phpは存在します"
@@ -259,7 +260,7 @@ msgstr ""
"現在判読可能でありません。"
#: ../../templates/show_test.inc.php:172
-#: ../../templates/show_install_config.inc.php:105
+#: ../../templates/show_install_config.inc.php:106
msgid "Ampache.cfg.php Configured?"
msgstr "Ampache.cfg.phpは設定されていますか?"
@@ -288,7 +289,7 @@ msgid "DB Inserted"
msgstr "DB挿入済"
#: ../../templates/show_test.inc.php:235
-#: ../../templates/show_install_config.inc.php:60
+#: ../../templates/show_install_config.inc.php:61
msgid "Web Path"
msgstr "Webパス"
@@ -410,7 +411,7 @@ msgstr "フルネーム"
#: ../../templates/show_users.inc.php:104
#: ../../templates/show_edit_user.inc.php:29
#: ../../templates/show_add_user.inc.php:29
-#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_install_account.inc.php:61
#: ../../templates/show_recently_played.inc.php:39
#: ../../templates/show_recently_played.inc.php:98
#: ../../templates/show_user_registration.inc.php:75
@@ -483,7 +484,7 @@ msgstr "Never"
#: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
#: ../../lib/class/flag.class.php:282 ../../lib/class/localplay.class.php:648
-#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:409
+#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:439
#: ../../modules/localplay/mpd.controller.php:508
#: ../../modules/localplay/httpq.controller.php:505
msgid "Unknown"
@@ -509,7 +510,7 @@ msgstr "メールアドレス"
#: ../../templates/show_edit_user.inc.php:52
#: ../../templates/show_add_user.inc.php:52
-#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_install_account.inc.php:65
#: ../../templates/show_login_form.inc.php:62
#: ../../templates/show_user_registration.inc.php:103
#: ../../modules/localplay/mpd.controller.php:235
@@ -520,7 +521,7 @@ msgstr "パスワード"
#: ../../templates/show_edit_user.inc.php:61
#: ../../templates/show_add_user.inc.php:61
#: ../../templates/show_account.inc.php:46
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:69
#: ../../templates/show_user_registration.inc.php:112
msgid "Confirm Password"
msgstr "パスワード確認"
@@ -1346,17 +1347,17 @@ msgstr "Flashプレーヤー"
msgid "Preference Administration"
msgstr "設定管理"
-#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:33
-#: ../../templates/show_install.inc.php:32
-#: ../../templates/show_install_account.inc.php:32
+#: ../../templates/show_install_config.inc.php:33
+#: ../../templates/show_install_lang.inc.php:34
+#: ../../templates/show_install.inc.php:33
+#: ../../templates/show_install_account.inc.php:33
msgid "Ampache Installation"
msgstr "Ampache インストール"
-#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:40
-#: ../../templates/show_install.inc.php:40
-#: ../../templates/show_install_account.inc.php:39
+#: ../../templates/show_install_config.inc.php:39
+#: ../../templates/show_install_lang.inc.php:41
+#: ../../templates/show_install.inc.php:41
+#: ../../templates/show_install_account.inc.php:40
msgid ""
"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 "
@@ -1365,17 +1366,17 @@ msgstr ""
"このページはAmpacheデータベースとampache.cfg.phpファイルの生成のインストール"
"を扱います。続ける前に以下の事前準備をお願いします。"
-#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:43
-#: ../../templates/show_install.inc.php:43
-#: ../../templates/show_install_account.inc.php:42
+#: ../../templates/show_install_config.inc.php:42
+#: ../../templates/show_install_lang.inc.php:44
+#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_account.inc.php:43
msgid ""
"A MySQL Server with a username and password that can create/modify databases"
msgstr "データベースを作成/修正できるユーザ名とパスワードをもったMySQLサーバ"
-#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:44
-#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_config.inc.php:43
+#: ../../templates/show_install_lang.inc.php:45
+#: ../../templates/show_install.inc.php:45
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.php.dist file"
@@ -1383,10 +1384,10 @@ msgstr ""
"ウェブサーバが/sql/ampache.sqlファイルと/config/ampache.cfg.php.distファイル"
"への読み取り権限を持っている"
-#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:47
-#: ../../templates/show_install.inc.php:47
-#: ../../templates/show_install_account.inc.php:45
+#: ../../templates/show_install_config.inc.php:45
+#: ../../templates/show_install_lang.inc.php:48
+#: ../../templates/show_install.inc.php:48
+#: ../../templates/show_install_account.inc.php:46
msgid ""
"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 "
@@ -1397,18 +1398,18 @@ msgstr ""
"めるだけです。後々Ampacheへの変更を加えたい場合、単に/config/ampache.cfg.php"
"を編集するだけです。"
-#: ../../templates/show_install_config.inc.php:48
-#: ../../templates/show_install.inc.php:52
-#: ../../templates/show_install_account.inc.php:48
+#: ../../templates/show_install_config.inc.php:49
+#: ../../templates/show_install.inc.php:53
+#: ../../templates/show_install_account.inc.php:49
msgid "Step 1 - Creating and Inserting the Ampache Database"
msgstr "ステップ1 - Ampacheデータベースの作成と挿入"
-#: ../../templates/show_install_config.inc.php:49
-#: ../../templates/show_install.inc.php:56
+#: ../../templates/show_install_config.inc.php:50
+#: ../../templates/show_install.inc.php:57
msgid "Step 2 - Creating the Ampache.cfg.php file"
msgstr "ステップ2 - Ampache.cfg.phpファイルの作成"
-#: ../../templates/show_install_config.inc.php:51
+#: ../../templates/show_install_config.inc.php:52
msgid ""
"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 "
@@ -1418,43 +1419,43 @@ msgstr ""
"す。それはコンフィグファイルをダウンロードするように促されます。ダウンロード"
"したコンフィグファイルを/configディレクトリへ置いてください。"
-#: ../../templates/show_install_config.inc.php:53
-#: ../../templates/show_install.inc.php:57
-#: ../../templates/show_install_account.inc.php:50
+#: ../../templates/show_install_config.inc.php:54
+#: ../../templates/show_install.inc.php:58
+#: ../../templates/show_install_account.inc.php:51
msgid "Step 3 - Setup Initial Account"
msgstr "ステップ3 - 初期アカウントのセットアップ"
-#: ../../templates/show_install_config.inc.php:56
+#: ../../templates/show_install_config.inc.php:57
msgid "Generate Config File"
msgstr "設定ファイルの生成"
-#: ../../templates/show_install_config.inc.php:64
-#: ../../templates/show_install.inc.php:65
+#: ../../templates/show_install_config.inc.php:65
+#: ../../templates/show_install.inc.php:66
msgid "Desired Database Name"
msgstr "希望するデータベース名"
-#: ../../templates/show_install_config.inc.php:68
-#: ../../templates/show_install.inc.php:69
+#: ../../templates/show_install_config.inc.php:69
+#: ../../templates/show_install.inc.php:70
msgid "MySQL Hostname"
msgstr "MySQLのホスト名"
-#: ../../templates/show_install_config.inc.php:72
+#: ../../templates/show_install_config.inc.php:73
msgid "MySQL Username"
msgstr "MySQLのユーザ名"
-#: ../../templates/show_install_config.inc.php:76
+#: ../../templates/show_install_config.inc.php:77
msgid "MySQL Password"
msgstr "MySQLのパスワード"
-#: ../../templates/show_install_config.inc.php:81
+#: ../../templates/show_install_config.inc.php:82
msgid "Write Config"
msgstr "コンフィグの書込み"
-#: ../../templates/show_install_config.inc.php:126
+#: ../../templates/show_install_config.inc.php:127
msgid "Check for Config"
msgstr "コンフィグのチェック"
-#: ../../templates/show_install_config.inc.php:132
+#: ../../templates/show_install_config.inc.php:133
msgid "Continue to Step 3"
msgstr "ステップ3へ続ける"
@@ -1592,79 +1593,78 @@ msgstr "カタログサイズ"
msgid "Catalog Time"
msgstr "カタログ時間"
-#: ../../templates/show_install_lang.inc.php:38
-#: ../../templates/show_install_lang.inc.php:52
-#: ../../templates/show_install.inc.php:38
+#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install.inc.php:39
msgid "Requirements"
msgstr "必要条件"
-#: ../../templates/show_install_lang.inc.php:51
+#: ../../templates/show_install_lang.inc.php:52
msgid "System Checks"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install_lang.inc.php:54
#, fuzzy
msgid "PHP Version:"
msgstr "PHPバージョン"
-#: ../../templates/show_install_lang.inc.php:63
+#: ../../templates/show_install_lang.inc.php:64
#, fuzzy
msgid "Mysql for PHP:"
msgstr "PHPのMysql"
-#: ../../templates/show_install_lang.inc.php:77
+#: ../../templates/show_install_lang.inc.php:78
#, fuzzy
msgid "PHP Session Support:"
msgstr "PHPセッションサポート"
-#: ../../templates/show_install_lang.inc.php:87
+#: ../../templates/show_install_lang.inc.php:88
#, fuzzy
msgid "PHP ICONV Support:"
msgstr "PHP ICONVサポート"
-#: ../../templates/show_install_lang.inc.php:97
+#: ../../templates/show_install_lang.inc.php:98
#, fuzzy
msgid "PHP PCRE Support:"
msgstr "PHP PCREサポート"
-#: ../../templates/show_install_lang.inc.php:107
+#: ../../templates/show_install_lang.inc.php:108
#, 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
+#: ../../templates/show_install_lang.inc.php:119
#, fuzzy
msgid "Optional"
msgstr "オプション"
-#: ../../templates/show_install_lang.inc.php:131
+#: ../../templates/show_install_lang.inc.php:120
#, fuzzy
msgid "PHP GetText Support:"
msgstr "Gettextサポート"
-#: ../../templates/show_install_lang.inc.php:140
+#: ../../templates/show_install_lang.inc.php:123
+msgid "WARNING: This server will use gettext emulator."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:129
#, fuzzy
msgid "PHP Mbstring Support:"
msgstr "PHPセッションサポート"
-#: ../../templates/show_install_lang.inc.php:152
+#: ../../templates/show_install_lang.inc.php:141
msgid "Choose installation language."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:173
+#: ../../templates/show_install_lang.inc.php:162
msgid "Start configuration"
msgstr "設定の開始"
-#: ../../templates/show_install_lang.inc.php:179
+#: ../../templates/show_install_lang.inc.php:168
msgid "Ampache does not <strong>run</strong> correctly by this server."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:180
+#: ../../templates/show_install_lang.inc.php:169
msgid "Please contact your server administrator, and fix them."
msgstr ""
@@ -2113,14 +2113,6 @@ msgstr "過去10のフラグされたレコード"
msgid "Disabled Songs"
msgstr "無効な曲"
-#: ../../templates/show_preferences.inc.php:28
-msgid "Editing"
-msgstr "編集中"
-
-#: ../../templates/show_preferences.inc.php:28
-msgid "preferences"
-msgstr "設定"
-
#: ../../templates/show_localplay_instances.inc.php:23
msgid "Show Localplay Instances"
msgstr "ローカル再生インスタンスの表示"
@@ -2243,7 +2235,7 @@ msgstr "タイプ"
msgid "Found"
msgstr "見つかりました"
-#: ../../templates/show_install.inc.php:54
+#: ../../templates/show_install.inc.php:55
msgid ""
"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 "
@@ -2253,39 +2245,39 @@ msgstr ""
"にAmpacheデータベースを作成し、データを挿入します。マシンの速度によってこのス"
"テップはしばらく時間がかかるかもしれません。"
-#: ../../templates/show_install.inc.php:61
+#: ../../templates/show_install.inc.php:62
msgid "Insert Ampache Database"
msgstr "Ampacheデータベースの挿入"
-#: ../../templates/show_install.inc.php:73
+#: ../../templates/show_install.inc.php:74
msgid "MySQL Administrative Username"
msgstr "MySQL管理ユーザ名"
-#: ../../templates/show_install.inc.php:77
+#: ../../templates/show_install.inc.php:78
msgid "MySQL Administrative Password"
msgstr "MySQL管理パスワード"
-#: ../../templates/show_install.inc.php:81
+#: ../../templates/show_install.inc.php:82
msgid "Create Database User for New Database"
msgstr "新規データベースのユーザ作成"
-#: ../../templates/show_install.inc.php:85
+#: ../../templates/show_install.inc.php:86
msgid "Ampache Database Username"
msgstr "Ampacheデータベースユーザ名"
-#: ../../templates/show_install.inc.php:89
+#: ../../templates/show_install.inc.php:90
msgid "Ampache Database User Password"
msgstr "Ampacheデータベースユーザパスワード"
-#: ../../templates/show_install.inc.php:93
+#: ../../templates/show_install.inc.php:94
msgid "Overwrite Existing"
msgstr "既存を上書き"
-#: ../../templates/show_install.inc.php:98
+#: ../../templates/show_install.inc.php:99
msgid "Insert Database"
msgstr "データベース挿入"
-#: ../../templates/show_install_account.inc.php:43
+#: ../../templates/show_install_account.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.dist.php file"
@@ -2293,11 +2285,11 @@ msgstr ""
"ウェブサーバは/sql/ampache.sqlファイル及び/config/ampache.cfg.dist.phpファイ"
"ルの読込権限を持っている必要があります。"
-#: ../../templates/show_install_account.inc.php:49
+#: ../../templates/show_install_account.inc.php:50
msgid "Step 2 - Creating the ampache.cfg.php file"
msgstr "ステップ2 - ampache.cfg.phpファイルの作成"
-#: ../../templates/show_install_account.inc.php:52
+#: ../../templates/show_install_account.inc.php:53
msgid ""
"This step creates your initial Ampache admin account. Once your admin "
"account has been created you will be directed to the login page"
@@ -2305,11 +2297,11 @@ msgstr ""
"このステップはAmpacheの管理者アカウントを初期化します。一旦管理者アカウントが"
"作成されるとログインページに飛びます。"
-#: ../../templates/show_install_account.inc.php:56
+#: ../../templates/show_install_account.inc.php:57
msgid "Create Admin Account"
msgstr "管理者アカウントの作成"
-#: ../../templates/show_install_account.inc.php:73
+#: ../../templates/show_install_account.inc.php:74
msgid "Create Account"
msgstr "アカウント作成"
@@ -3312,15 +3304,11 @@ msgstr "曲更新しました"
msgid "Error Username or Password incorrect, please try again"
msgstr "エラー: ユーザ名かパスワードが間違っています。再試行して下さい"
-#: ../../lib/general.lib.php:406
-msgid "Simplified Chinese"
-msgstr "簡体中文"
-
-#: ../../lib/general.lib.php:468
+#: ../../lib/general.lib.php:498
msgid "On"
msgstr "オン"
-#: ../../lib/general.lib.php:471
+#: ../../lib/general.lib.php:501
msgid "Off"
msgstr "オフ"
@@ -3767,8 +3755,132 @@ msgstr ""
msgid "Filename:"
msgstr "ファイル名:"
-#~ msgid "Playlist %s"
-#~ msgstr "%sプレイリスト"
+#: Database words
+#, fuzzy
+msgid "Allow Downloads"
+msgstr "ダウンロード"
+
+#: Database words
+#, fuzzy
+msgid "Popular Threshold"
+msgstr "1番人気にする日数の閾値"
+
+#: Database words
+#, fuzzy
+msgid "Transcode Bitrate"
+msgstr "最小ビットレート"
+
+#: Database words
+msgid "Ampache :: Pour l'Amour de la Musique"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Lock Songs"
+msgstr "# 曲数"
+
+#: Database words
+msgid "Forces Http play regardless of port"
+msgstr ""
+
+#: Database words
+msgid "Non-Standard Http Port"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Localplay Type"
+msgstr "ローカル再生"
+
+#: Database words
+msgid "Type of Playback"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Language"
+msgstr "マネージャ"
+
+#: Database words
+#, fuzzy
+msgid "Theme"
+msgstr "時間"
+
+#: Database words
+msgid "Album Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Artist Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Title Ellipse Threshold"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Offset Limit"
+msgstr "サイズ制限"
+
+#: Database words
+#, fuzzy
+msgid "Localplay Access"
+msgstr "ローカル再生モジュール"
+
+#: Database words
+msgid "Allow Streaming"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Allow Democratic Play"
+msgstr "大衆的なプレイリスト作成"
+
+#: Database words
+#, fuzzy
+msgid "Allow Localplay Play"
+msgstr "ローカル再生の許可をFalseにセットします"
+
+#: Database words
+msgid "Statistics Day Threshold"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Min Element Count"
+msgstr "最小カウント"
+
+#: Database words
+#, fuzzy
+msgid "Rate Limit"
+msgstr "サイズ制限"
+
+#: Database words
+#, fuzzy
+msgid "Playlist Method"
+msgstr "プレイリストを作成しました"
+
+#: Database words
+msgid "Transcoding"
+msgstr ""
+
+#: Database words
+msgid "User to track"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Streaming"
+msgstr "ストリーム"
+
+#: Database words
+#, fuzzy
+msgid "Interface"
+msgstr "ウェブインタフェース"
+
+#: Database words
+#, fuzzy
+msgid "System"
+msgstr "アイテム"
-#~ msgid "Use tool below to add any server"
-#~ msgstr "全てのサーバを追加するために以下のツールを使用します"
diff --git a/locale/nl_NL/LC_MESSAGES/messages.mo b/locale/nl_NL/LC_MESSAGES/messages.mo
index 812d2acd..8b3378c9 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 84449e57..40293835 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-27 09:09+0900\n"
+"POT-Creation-Date: 2008-08-29 16:03+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"
@@ -90,6 +90,7 @@ msgid "Edit"
msgstr "Bewerk"
#: ../../templates/show_user_preferences.inc.php:28
+#: ../../templates/show_preferences.inc.php:28
#, fuzzy, php-format
msgid "Editing %s preferences"
msgstr "Site Instellingen"
@@ -247,7 +248,7 @@ msgstr ""
"van bepaalde onderdelen van Ampache"
#: ../../templates/show_test.inc.php:153
-#: ../../templates/show_install_config.inc.php:88
+#: ../../templates/show_install_config.inc.php:89
msgid "Ampache.cfg.php Exists"
msgstr "Ampache.cfg.php Bestaat"
@@ -262,7 +263,7 @@ msgstr ""
"\t niet leesbaar door de webserver."
#: ../../templates/show_test.inc.php:172
-#: ../../templates/show_install_config.inc.php:105
+#: ../../templates/show_install_config.inc.php:106
msgid "Ampache.cfg.php Configured?"
msgstr "Ampache.cfg.php Geconfigureerd?"
@@ -288,7 +289,7 @@ msgid "DB Inserted"
msgstr ""
#: ../../templates/show_test.inc.php:235
-#: ../../templates/show_install_config.inc.php:60
+#: ../../templates/show_install_config.inc.php:61
msgid "Web Path"
msgstr "Web Directory"
@@ -410,7 +411,7 @@ msgstr "Volledige Naam"
#: ../../templates/show_users.inc.php:104
#: ../../templates/show_edit_user.inc.php:29
#: ../../templates/show_add_user.inc.php:29
-#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_install_account.inc.php:61
#: ../../templates/show_recently_played.inc.php:39
#: ../../templates/show_recently_played.inc.php:98
#: ../../templates/show_user_registration.inc.php:75
@@ -484,7 +485,7 @@ msgstr ""
#: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
#: ../../lib/class/flag.class.php:282 ../../lib/class/localplay.class.php:648
-#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:409
+#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:439
#: ../../modules/localplay/mpd.controller.php:508
#: ../../modules/localplay/httpq.controller.php:505
msgid "Unknown"
@@ -510,7 +511,7 @@ msgstr ""
#: ../../templates/show_edit_user.inc.php:52
#: ../../templates/show_add_user.inc.php:52
-#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_install_account.inc.php:65
#: ../../templates/show_login_form.inc.php:62
#: ../../templates/show_user_registration.inc.php:103
#: ../../modules/localplay/mpd.controller.php:235
@@ -521,7 +522,7 @@ msgstr "Paswoord"
#: ../../templates/show_edit_user.inc.php:61
#: ../../templates/show_add_user.inc.php:61
#: ../../templates/show_account.inc.php:46
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:69
#: ../../templates/show_user_registration.inc.php:112
msgid "Confirm Password"
msgstr "Typ Nogmaals uw paswoord"
@@ -1372,17 +1373,17 @@ msgstr ""
msgid "Preference Administration"
msgstr "Beheer Instellingen"
-#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:33
-#: ../../templates/show_install.inc.php:32
-#: ../../templates/show_install_account.inc.php:32
+#: ../../templates/show_install_config.inc.php:33
+#: ../../templates/show_install_lang.inc.php:34
+#: ../../templates/show_install.inc.php:33
+#: ../../templates/show_install_account.inc.php:33
msgid "Ampache Installation"
msgstr "Ampache Installatie"
-#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:40
-#: ../../templates/show_install.inc.php:40
-#: ../../templates/show_install_account.inc.php:39
+#: ../../templates/show_install_config.inc.php:39
+#: ../../templates/show_install_lang.inc.php:41
+#: ../../templates/show_install.inc.php:41
+#: ../../templates/show_install_account.inc.php:40
msgid ""
"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 "
@@ -1392,19 +1393,19 @@ msgstr ""
"aanmakenvan het ampache.cfg.php configuratie bestand. Voordat u verder gaat "
"controleer of u voldoet aanonderstaande eisen"
-#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:43
-#: ../../templates/show_install.inc.php:43
-#: ../../templates/show_install_account.inc.php:42
+#: ../../templates/show_install_config.inc.php:42
+#: ../../templates/show_install_lang.inc.php:44
+#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_account.inc.php:43
msgid ""
"A MySQL Server with a username and password that can create/modify databases"
msgstr ""
"Een MySQL Server met gebruikersnaam en paswoord dat een database kan "
"aanmaken/wijzigen"
-#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:44
-#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_config.inc.php:43
+#: ../../templates/show_install_lang.inc.php:45
+#: ../../templates/show_install.inc.php:45
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.php.dist file"
@@ -1412,10 +1413,10 @@ msgstr ""
"Uw webserver leesrechten heeft op de files /sql/ampache.sql en de file /"
"config/ampache.cfg.php.dist"
-#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:47
-#: ../../templates/show_install.inc.php:47
-#: ../../templates/show_install_account.inc.php:45
+#: ../../templates/show_install_config.inc.php:45
+#: ../../templates/show_install_lang.inc.php:48
+#: ../../templates/show_install.inc.php:48
+#: ../../templates/show_install_account.inc.php:46
msgid ""
"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 "
@@ -1428,61 +1429,61 @@ msgstr ""
"ampache installatie kan ditdoor het bestand /config/amache.cfg.php te "
"bewerken"
-#: ../../templates/show_install_config.inc.php:48
-#: ../../templates/show_install.inc.php:52
-#: ../../templates/show_install_account.inc.php:48
+#: ../../templates/show_install_config.inc.php:49
+#: ../../templates/show_install.inc.php:53
+#: ../../templates/show_install_account.inc.php:49
msgid "Step 1 - Creating and Inserting the Ampache Database"
msgstr "Stap 1 - Aanmaken en vullen van de Ampache Database"
-#: ../../templates/show_install_config.inc.php:49
-#: ../../templates/show_install.inc.php:56
+#: ../../templates/show_install_config.inc.php:50
+#: ../../templates/show_install.inc.php:57
msgid "Step 2 - Creating the Ampache.cfg.php file"
msgstr " Stap 2 - Creeer het ampache.cfg.php bestand"
-#: ../../templates/show_install_config.inc.php:51
+#: ../../templates/show_install_config.inc.php:52
msgid ""
"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"
msgstr ""
-#: ../../templates/show_install_config.inc.php:53
-#: ../../templates/show_install.inc.php:57
-#: ../../templates/show_install_account.inc.php:50
+#: ../../templates/show_install_config.inc.php:54
+#: ../../templates/show_install.inc.php:58
+#: ../../templates/show_install_account.inc.php:51
msgid "Step 3 - Setup Initial Account"
msgstr "Stap 3 - Opzet Initeel Account"
-#: ../../templates/show_install_config.inc.php:56
+#: ../../templates/show_install_config.inc.php:57
msgid "Generate Config File"
msgstr ""
-#: ../../templates/show_install_config.inc.php:64
-#: ../../templates/show_install.inc.php:65
+#: ../../templates/show_install_config.inc.php:65
+#: ../../templates/show_install.inc.php:66
msgid "Desired Database Name"
msgstr "Gewenste Database Naam"
-#: ../../templates/show_install_config.inc.php:68
-#: ../../templates/show_install.inc.php:69
+#: ../../templates/show_install_config.inc.php:69
+#: ../../templates/show_install.inc.php:70
msgid "MySQL Hostname"
msgstr "MySQL Hostnaam"
-#: ../../templates/show_install_config.inc.php:72
+#: ../../templates/show_install_config.inc.php:73
msgid "MySQL Username"
msgstr "MySQl Gebruikersnaam"
-#: ../../templates/show_install_config.inc.php:76
+#: ../../templates/show_install_config.inc.php:77
msgid "MySQL Password"
msgstr "MySQL Paswoord"
-#: ../../templates/show_install_config.inc.php:81
+#: ../../templates/show_install_config.inc.php:82
msgid "Write Config"
msgstr "Schrijf Config"
-#: ../../templates/show_install_config.inc.php:126
+#: ../../templates/show_install_config.inc.php:127
msgid "Check for Config"
msgstr "Check voor Config"
-#: ../../templates/show_install_config.inc.php:132
+#: ../../templates/show_install_config.inc.php:133
msgid "Continue to Step 3"
msgstr ""
@@ -1622,78 +1623,78 @@ msgstr "Catalogus Grootte"
msgid "Catalog Time"
msgstr "Catalogus Tijd"
-#: ../../templates/show_install_lang.inc.php:38
-#: ../../templates/show_install_lang.inc.php:52
-#: ../../templates/show_install.inc.php:38
+#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install.inc.php:39
msgid "Requirements"
msgstr "Vereisten"
-#: ../../templates/show_install_lang.inc.php:51
+#: ../../templates/show_install_lang.inc.php:52
msgid "System Checks"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install_lang.inc.php:54
#, fuzzy
msgid "PHP Version:"
msgstr "PHP Versie"
-#: ../../templates/show_install_lang.inc.php:63
+#: ../../templates/show_install_lang.inc.php:64
#, fuzzy
msgid "Mysql for PHP:"
msgstr "MySQL voor PHP"
-#: ../../templates/show_install_lang.inc.php:77
+#: ../../templates/show_install_lang.inc.php:78
#, fuzzy
msgid "PHP Session Support:"
msgstr "PHP Sessie Ondersteuning"
-#: ../../templates/show_install_lang.inc.php:87
+#: ../../templates/show_install_lang.inc.php:88
#, fuzzy
msgid "PHP ICONV Support:"
msgstr "PHP ICONV Ondersteuning"
-#: ../../templates/show_install_lang.inc.php:97
+#: ../../templates/show_install_lang.inc.php:98
#, fuzzy
msgid "PHP PCRE Support:"
msgstr "PHP PCRE Ondersteuning"
-#: ../../templates/show_install_lang.inc.php:107
+#: ../../templates/show_install_lang.inc.php:108
#, 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
+#: ../../templates/show_install_lang.inc.php:119
#, fuzzy
msgid "Optional"
msgstr "Acties"
-#: ../../templates/show_install_lang.inc.php:131
+#: ../../templates/show_install_lang.inc.php:120
#, fuzzy
msgid "PHP GetText Support:"
msgstr "PHP PutENV Ondersteuning"
-#: ../../templates/show_install_lang.inc.php:140
+#: ../../templates/show_install_lang.inc.php:123
+msgid "WARNING: This server will use gettext emulator."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:129
#, fuzzy
msgid "PHP Mbstring Support:"
msgstr "PHP Sessie Ondersteuning"
-#: ../../templates/show_install_lang.inc.php:152
+#: ../../templates/show_install_lang.inc.php:141
msgid "Choose installation language."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:173
+#: ../../templates/show_install_lang.inc.php:162
msgid "Start configuration"
msgstr "Start Configuratie"
-#: ../../templates/show_install_lang.inc.php:179
+#: ../../templates/show_install_lang.inc.php:168
msgid "Ampache does not <strong>run</strong> correctly by this server."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:180
+#: ../../templates/show_install_lang.inc.php:169
msgid "Please contact your server administrator, and fix them."
msgstr ""
@@ -2167,14 +2168,6 @@ msgstr "Laatste tien gemarkeerde records"
msgid "Disabled Songs"
msgstr "Laat gedeactiveerde Liedjes Zien"
-#: ../../templates/show_preferences.inc.php:28
-msgid "Editing"
-msgstr "Bezig met Bewerken"
-
-#: ../../templates/show_preferences.inc.php:28
-msgid "preferences"
-msgstr "instellingen"
-
#: ../../templates/show_localplay_instances.inc.php:23
msgid "Show Localplay Instances"
msgstr ""
@@ -2303,7 +2296,7 @@ msgstr ""
msgid "Found"
msgstr "Gevonden"
-#: ../../templates/show_install.inc.php:54
+#: ../../templates/show_install.inc.php:55
msgid ""
"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 "
@@ -2313,39 +2306,39 @@ msgstr ""
"met rechten om een database aan te mogen maken. Dit kan even duren naar "
"gelang de snelheid van uw computer"
-#: ../../templates/show_install.inc.php:61
+#: ../../templates/show_install.inc.php:62
msgid "Insert Ampache Database"
msgstr ""
-#: ../../templates/show_install.inc.php:73
+#: ../../templates/show_install.inc.php:74
msgid "MySQL Administrative Username"
msgstr "MySQl Administratieve Gebruikersnaam"
-#: ../../templates/show_install.inc.php:77
+#: ../../templates/show_install.inc.php:78
msgid "MySQL Administrative Password"
msgstr "MySQl Administratieve Paswoord"
-#: ../../templates/show_install.inc.php:81
+#: ../../templates/show_install.inc.php:82
msgid "Create Database User for New Database"
msgstr "Maak Database Gebruiker aan voor nieuwe Database"
-#: ../../templates/show_install.inc.php:85
+#: ../../templates/show_install.inc.php:86
msgid "Ampache Database Username"
msgstr "Ampache Database Gebruikersnaam"
-#: ../../templates/show_install.inc.php:89
+#: ../../templates/show_install.inc.php:90
msgid "Ampache Database User Password"
msgstr "Ampache Database Gebruikers Paswoord"
-#: ../../templates/show_install.inc.php:93
+#: ../../templates/show_install.inc.php:94
msgid "Overwrite Existing"
msgstr ""
-#: ../../templates/show_install.inc.php:98
+#: ../../templates/show_install.inc.php:99
msgid "Insert Database"
msgstr "Maak Database"
-#: ../../templates/show_install_account.inc.php:43
+#: ../../templates/show_install_account.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.dist.php file"
@@ -2353,11 +2346,11 @@ msgstr ""
"Uw webserver heeft lees rechten heeft op het bestand /sql/ampache.sql en "
"hetampache.cfg.dist.php bestand"
-#: ../../templates/show_install_account.inc.php:49
+#: ../../templates/show_install_account.inc.php:50
msgid "Step 2 - Creating the ampache.cfg.php file"
msgstr "Stap 2 - Aanmaken vna het ampache.cfg.php bestand"
-#: ../../templates/show_install_account.inc.php:52
+#: ../../templates/show_install_account.inc.php:53
msgid ""
"This step creates your initial Ampache admin account. Once your admin "
"account has been created you will be directed to the login page"
@@ -2365,11 +2358,11 @@ msgstr ""
"Deze stap maakt uw initieele administratieve Ampache account aan. Alsuw "
"account gemaakt is wordt u naar de login pagina gestuurt"
-#: ../../templates/show_install_account.inc.php:56
+#: ../../templates/show_install_account.inc.php:57
msgid "Create Admin Account"
msgstr "Maak een Beheer Account aan"
-#: ../../templates/show_install_account.inc.php:73
+#: ../../templates/show_install_account.inc.php:74
msgid "Create Account"
msgstr "Maak Account aan"
@@ -3416,15 +3409,11 @@ msgstr "liedjes bijgewerkt."
msgid "Error Username or Password incorrect, please try again"
msgstr ""
-#: ../../lib/general.lib.php:406
-msgid "Simplified Chinese"
-msgstr "Simpel Chinees"
-
-#: ../../lib/general.lib.php:468
+#: ../../lib/general.lib.php:498
msgid "On"
msgstr "Aan"
-#: ../../lib/general.lib.php:471
+#: ../../lib/general.lib.php:501
msgid "Off"
msgstr "Uit"
@@ -3898,6 +3887,138 @@ msgstr ""
msgid "Filename:"
msgstr "Bestandsnaam"
+#: Database words
+msgid "Allow Downloads"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Popular Threshold"
+msgstr "Meest Populaire Nummers"
+
+#: Database words
+msgid "Transcode Bitrate"
+msgstr "Ampache :: Pour l'Amour de la Musique"
+
+#: Database words
+msgid "Ampache :: Pour l'Amour de la Musique"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Lock Songs"
+msgstr "# Liedjes"
+
+#: Database words
+msgid "Forces Http play regardless of port"
+msgstr ""
+
+#: Database words
+msgid "Non-Standard Http Port"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Localplay Type"
+msgstr "Lokaal Afspelen"
+
+#: Database words
+msgid "Type of Playback"
+msgstr ""
+
+#: Database words
+msgid "Language"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Theme"
+msgstr "Tijd"
+
+#: Database words
+msgid "Album Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Artist Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Title Ellipse Threshold"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Offset Limit"
+msgstr "Grootte Limiet"
+
+#: Database words
+#, fuzzy
+msgid "Localplay Access"
+msgstr "Lokaal Afspelen"
+
+#: Database words
+msgid "Allow Streaming"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Allow Democratic Play"
+msgstr "Democratisch Spelen Actief"
+
+#: Database words
+#, fuzzy
+msgid "Allow Localplay Play"
+msgstr "Lokaal Afspelen"
+
+#: Database words
+msgid "Statistics Day Threshold"
+msgstr ""
+
+#: Database words
+msgid "Min Element Count"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Rate Limit"
+msgstr "Grootte Limiet"
+
+#: Database words
+#, fuzzy
+msgid "Playlist Method"
+msgstr "Speellijst aangemaakt"
+
+#: Database words
+msgid "Transcoding"
+msgstr ""
+
+#: Database words
+msgid "User to track"
+msgstr ""
+
+#: Database words
+msgid "Streaming"
+msgstr ""
+
+#: Database words
+msgid "Interface"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "System"
+msgstr "Grootte"
+
+#~ msgid "Editing"
+#~ msgstr "Bezig met Bewerken"
+
+#~ msgid "preferences"
+#~ msgstr "instellingen"
+
+#~ msgid "Simplified Chinese"
+#~ msgstr "Simpel Chinees"
+
#, fuzzy
#~ msgid "Playlist %s"
#~ msgstr "Speellijsten"
@@ -4112,10 +4233,6 @@ msgstr "Bestandsnaam"
#~ "verwijderen?"
#, fuzzy
-#~ msgid "Site"
-#~ msgstr "Grootte"
-
-#, fuzzy
#~ msgid "Confirm Delete"
#~ msgstr "Bevestig verwijdering"
@@ -4429,9 +4546,6 @@ msgstr "Bestandsnaam"
#~ msgid "catalog path"
#~ msgstr "catalogus directory"
-#~ msgid "Democratic Play Active"
-#~ msgstr "Democratisch Spelen Actief"
-
#, fuzzy
#~ msgid "You don't have any duplicate songs."
#~ msgstr "U heeft geen enkele dubbele liedjes"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index f17eaa47..f9537fe2 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 ae934782..d9d2feff 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-27 09:09+0900\n"
+"POT-Creation-Date: 2008-08-29 16:03+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"
@@ -91,6 +91,7 @@ msgid "Edit"
msgstr ""
#: ../../templates/show_user_preferences.inc.php:28
+#: ../../templates/show_preferences.inc.php:28
#, fuzzy, php-format
msgid "Editing %s preferences"
msgstr ""
@@ -242,7 +243,7 @@ msgstr ""
" Ampache ."
#: ../../templates/show_test.inc.php:153
-#: ../../templates/show_install_config.inc.php:88
+#: ../../templates/show_install_config.inc.php:89
msgid "Ampache.cfg.php Exists"
msgstr "Ampache.cfg.php "
@@ -257,7 +258,7 @@ msgstr ""
"\t -."
#: ../../templates/show_test.inc.php:172
-#: ../../templates/show_install_config.inc.php:105
+#: ../../templates/show_install_config.inc.php:106
msgid "Ampache.cfg.php Configured?"
msgstr "Ampache.cfg.php ?"
@@ -285,7 +286,7 @@ msgid "DB Inserted"
msgstr ""
#: ../../templates/show_test.inc.php:235
-#: ../../templates/show_install_config.inc.php:60
+#: ../../templates/show_install_config.inc.php:61
msgid "Web Path"
msgstr " "
@@ -407,7 +408,7 @@ msgstr " "
#: ../../templates/show_users.inc.php:104
#: ../../templates/show_edit_user.inc.php:29
#: ../../templates/show_add_user.inc.php:29
-#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_install_account.inc.php:61
#: ../../templates/show_recently_played.inc.php:39
#: ../../templates/show_recently_played.inc.php:98
#: ../../templates/show_user_registration.inc.php:75
@@ -480,7 +481,7 @@ msgstr ""
#: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
#: ../../lib/class/flag.class.php:282 ../../lib/class/localplay.class.php:648
-#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:409
+#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:439
#: ../../modules/localplay/mpd.controller.php:508
#: ../../modules/localplay/httpq.controller.php:505
msgid "Unknown"
@@ -506,7 +507,7 @@ msgstr "-"
#: ../../templates/show_edit_user.inc.php:52
#: ../../templates/show_add_user.inc.php:52
-#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_install_account.inc.php:65
#: ../../templates/show_login_form.inc.php:62
#: ../../templates/show_user_registration.inc.php:103
#: ../../modules/localplay/mpd.controller.php:235
@@ -517,7 +518,7 @@ msgstr ""
#: ../../templates/show_edit_user.inc.php:61
#: ../../templates/show_add_user.inc.php:61
#: ../../templates/show_account.inc.php:46
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:69
#: ../../templates/show_user_registration.inc.php:112
msgid "Confirm Password"
msgstr " "
@@ -1345,17 +1346,17 @@ msgstr ""
msgid "Preference Administration"
msgstr " "
-#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:33
-#: ../../templates/show_install.inc.php:32
-#: ../../templates/show_install_account.inc.php:32
+#: ../../templates/show_install_config.inc.php:33
+#: ../../templates/show_install_lang.inc.php:34
+#: ../../templates/show_install.inc.php:33
+#: ../../templates/show_install_account.inc.php:33
msgid "Ampache Installation"
msgstr " Ampache"
-#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:40
-#: ../../templates/show_install.inc.php:40
-#: ../../templates/show_install_account.inc.php:39
+#: ../../templates/show_install_config.inc.php:39
+#: ../../templates/show_install_lang.inc.php:41
+#: ../../templates/show_install.inc.php:41
+#: ../../templates/show_install_account.inc.php:40
msgid ""
"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 "
@@ -1365,18 +1366,18 @@ msgstr ""
" ampache.cfg.php. , , , "
" :"
-#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:43
-#: ../../templates/show_install.inc.php:43
-#: ../../templates/show_install_account.inc.php:42
+#: ../../templates/show_install_config.inc.php:42
+#: ../../templates/show_install_lang.inc.php:44
+#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_account.inc.php:43
msgid ""
"A MySQL Server with a username and password that can create/modify databases"
msgstr ""
"MySQL / "
-#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:44
-#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_config.inc.php:43
+#: ../../templates/show_install_lang.inc.php:45
+#: ../../templates/show_install.inc.php:45
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.php.dist file"
@@ -1384,10 +1385,10 @@ msgstr ""
" /sql/ampache.sql /config/ampache."
"cfg.php.dist"
-#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:47
-#: ../../templates/show_install.inc.php:47
-#: ../../templates/show_install_account.inc.php:45
+#: ../../templates/show_install_config.inc.php:45
+#: ../../templates/show_install_lang.inc.php:48
+#: ../../templates/show_install.inc.php:48
+#: ../../templates/show_install_account.inc.php:46
msgid ""
"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 "
@@ -1399,61 +1400,61 @@ msgstr ""
" . "
"Ampache, /config/ampache.cfg.php"
-#: ../../templates/show_install_config.inc.php:48
-#: ../../templates/show_install.inc.php:52
-#: ../../templates/show_install_account.inc.php:48
+#: ../../templates/show_install_config.inc.php:49
+#: ../../templates/show_install.inc.php:53
+#: ../../templates/show_install_account.inc.php:49
msgid "Step 1 - Creating and Inserting the Ampache Database"
msgstr " 1 - Ampache"
-#: ../../templates/show_install_config.inc.php:49
-#: ../../templates/show_install.inc.php:56
+#: ../../templates/show_install_config.inc.php:50
+#: ../../templates/show_install.inc.php:57
msgid "Step 2 - Creating the Ampache.cfg.php file"
msgstr " 2 - Ampache.cfg.php"
-#: ../../templates/show_install_config.inc.php:51
+#: ../../templates/show_install_config.inc.php:52
msgid ""
"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"
msgstr ""
-#: ../../templates/show_install_config.inc.php:53
-#: ../../templates/show_install.inc.php:57
-#: ../../templates/show_install_account.inc.php:50
+#: ../../templates/show_install_config.inc.php:54
+#: ../../templates/show_install.inc.php:58
+#: ../../templates/show_install_account.inc.php:51
msgid "Step 3 - Setup Initial Account"
msgstr " 3 - "
-#: ../../templates/show_install_config.inc.php:56
+#: ../../templates/show_install_config.inc.php:57
msgid "Generate Config File"
msgstr " "
-#: ../../templates/show_install_config.inc.php:64
-#: ../../templates/show_install.inc.php:65
+#: ../../templates/show_install_config.inc.php:65
+#: ../../templates/show_install.inc.php:66
msgid "Desired Database Name"
msgstr " "
-#: ../../templates/show_install_config.inc.php:68
-#: ../../templates/show_install.inc.php:69
+#: ../../templates/show_install_config.inc.php:69
+#: ../../templates/show_install.inc.php:70
msgid "MySQL Hostname"
msgstr "MySQL "
-#: ../../templates/show_install_config.inc.php:72
+#: ../../templates/show_install_config.inc.php:73
msgid "MySQL Username"
msgstr "MySQL "
-#: ../../templates/show_install_config.inc.php:76
+#: ../../templates/show_install_config.inc.php:77
msgid "MySQL Password"
msgstr "MySQL "
-#: ../../templates/show_install_config.inc.php:81
+#: ../../templates/show_install_config.inc.php:82
msgid "Write Config"
msgstr " "
-#: ../../templates/show_install_config.inc.php:126
+#: ../../templates/show_install_config.inc.php:127
msgid "Check for Config"
msgstr " "
-#: ../../templates/show_install_config.inc.php:132
+#: ../../templates/show_install_config.inc.php:133
msgid "Continue to Step 3"
msgstr " 3"
@@ -1591,79 +1592,79 @@ msgstr " "
msgid "Catalog Time"
msgstr " "
-#: ../../templates/show_install_lang.inc.php:38
-#: ../../templates/show_install_lang.inc.php:52
-#: ../../templates/show_install.inc.php:38
+#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install.inc.php:39
msgid "Requirements"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:51
+#: ../../templates/show_install_lang.inc.php:52
#, fuzzy
msgid "System Checks"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install_lang.inc.php:54
#, fuzzy
msgid "PHP Version:"
msgstr " PHP"
-#: ../../templates/show_install_lang.inc.php:63
+#: ../../templates/show_install_lang.inc.php:64
#, fuzzy
msgid "Mysql for PHP:"
msgstr "Mysql PHP"
-#: ../../templates/show_install_lang.inc.php:77
+#: ../../templates/show_install_lang.inc.php:78
#, fuzzy
msgid "PHP Session Support:"
msgstr " PHP Session"
-#: ../../templates/show_install_lang.inc.php:87
+#: ../../templates/show_install_lang.inc.php:88
#, fuzzy
msgid "PHP ICONV Support:"
msgstr " PHP ICONV"
-#: ../../templates/show_install_lang.inc.php:97
+#: ../../templates/show_install_lang.inc.php:98
#, fuzzy
msgid "PHP PCRE Support:"
msgstr " PHP PCRE"
-#: ../../templates/show_install_lang.inc.php:107
+#: ../../templates/show_install_lang.inc.php:108
#, 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
+#: ../../templates/show_install_lang.inc.php:119
#, fuzzy
msgid "Optional"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:131
+#: ../../templates/show_install_lang.inc.php:120
#, fuzzy
msgid "PHP GetText Support:"
msgstr " PHP PutENV"
-#: ../../templates/show_install_lang.inc.php:140
+#: ../../templates/show_install_lang.inc.php:123
+msgid "WARNING: This server will use gettext emulator."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:129
#, fuzzy
msgid "PHP Mbstring Support:"
msgstr " PHP Session"
-#: ../../templates/show_install_lang.inc.php:152
+#: ../../templates/show_install_lang.inc.php:141
msgid "Choose installation language."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:173
+#: ../../templates/show_install_lang.inc.php:162
msgid "Start configuration"
msgstr " "
-#: ../../templates/show_install_lang.inc.php:179
+#: ../../templates/show_install_lang.inc.php:168
msgid "Ampache does not <strong>run</strong> correctly by this server."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:180
+#: ../../templates/show_install_lang.inc.php:169
msgid "Please contact your server administrator, and fix them."
msgstr ""
@@ -2120,14 +2121,6 @@ msgstr " "
msgid "Disabled Songs"
msgstr " "
-#: ../../templates/show_preferences.inc.php:28
-msgid "Editing"
-msgstr ""
-
-#: ../../templates/show_preferences.inc.php:28
-msgid "preferences"
-msgstr ""
-
#: ../../templates/show_localplay_instances.inc.php:23
msgid "Show Localplay Instances"
msgstr " "
@@ -2251,7 +2244,7 @@ msgstr ""
msgid "Found"
msgstr ""
-#: ../../templates/show_install.inc.php:54
+#: ../../templates/show_install.inc.php:55
msgid ""
"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 "
@@ -2261,39 +2254,39 @@ msgstr ""
" mysql . "
" ."
-#: ../../templates/show_install.inc.php:61
+#: ../../templates/show_install.inc.php:62
msgid "Insert Ampache Database"
msgstr " "
-#: ../../templates/show_install.inc.php:73
+#: ../../templates/show_install.inc.php:74
msgid "MySQL Administrative Username"
msgstr "MySQL -"
-#: ../../templates/show_install.inc.php:77
+#: ../../templates/show_install.inc.php:78
msgid "MySQL Administrative Password"
msgstr "MySQL "
-#: ../../templates/show_install.inc.php:81
+#: ../../templates/show_install.inc.php:82
msgid "Create Database User for New Database"
msgstr " "
-#: ../../templates/show_install.inc.php:85
+#: ../../templates/show_install.inc.php:86
msgid "Ampache Database Username"
msgstr "Ampache "
-#: ../../templates/show_install.inc.php:89
+#: ../../templates/show_install.inc.php:90
msgid "Ampache Database User Password"
msgstr "Ampache "
-#: ../../templates/show_install.inc.php:93
+#: ../../templates/show_install.inc.php:94
msgid "Overwrite Existing"
msgstr " "
-#: ../../templates/show_install.inc.php:98
+#: ../../templates/show_install.inc.php:99
msgid "Insert Database"
msgstr " "
-#: ../../templates/show_install_account.inc.php:43
+#: ../../templates/show_install_account.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.dist.php file"
@@ -2301,11 +2294,11 @@ msgstr ""
" /sql/ampache.sql /config/ampache."
"cfg.php.dist"
-#: ../../templates/show_install_account.inc.php:49
+#: ../../templates/show_install_account.inc.php:50
msgid "Step 2 - Creating the ampache.cfg.php file"
msgstr " 2 - Ampache.cfg.php"
-#: ../../templates/show_install_account.inc.php:52
+#: ../../templates/show_install_account.inc.php:53
msgid ""
"This step creates your initial Ampache admin account. Once your admin "
"account has been created you will be directed to the login page"
@@ -2314,11 +2307,11 @@ msgstr ""
" , "
"."
-#: ../../templates/show_install_account.inc.php:56
+#: ../../templates/show_install_account.inc.php:57
msgid "Create Admin Account"
msgstr " "
-#: ../../templates/show_install_account.inc.php:73
+#: ../../templates/show_install_account.inc.php:74
msgid "Create Account"
msgstr " "
@@ -3330,15 +3323,11 @@ msgstr " ."
msgid "Error Username or Password incorrect, please try again"
msgstr ""
-#: ../../lib/general.lib.php:406
-msgid "Simplified Chinese"
-msgstr ""
-
-#: ../../lib/general.lib.php:468
+#: ../../lib/general.lib.php:498
msgid "On"
msgstr ""
-#: ../../lib/general.lib.php:471
+#: ../../lib/general.lib.php:501
msgid "Off"
msgstr ""
@@ -3788,6 +3777,141 @@ msgstr ""
msgid "Filename:"
msgstr ":"
+#: Database words
+#, fuzzy
+msgid "Allow Downloads"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Popular Threshold"
+msgstr " "
+
+#: Database words
+#, fuzzy
+msgid "Transcode Bitrate"
+msgstr " "
+
+#: Database words
+msgid "Ampache :: Pour l'Amour de la Musique"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Lock Songs"
+msgstr "# "
+
+#: Database words
+msgid "Forces Http play regardless of port"
+msgstr ""
+
+#: Database words
+msgid "Non-Standard Http Port"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Localplay Type"
+msgstr " "
+
+#: Database words
+msgid "Type of Playback"
+msgstr ""
+
+#: Database words
+msgid "Language"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Theme"
+msgstr ""
+
+#: Database words
+msgid "Album Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Artist Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Title Ellipse Threshold"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Offset Limit"
+msgstr " "
+
+#: Database words
+#, fuzzy
+msgid "Localplay Access"
+msgstr " "
+
+#: Database words
+#, fuzzy
+msgid "Allow Streaming"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Allow Democratic Play"
+msgstr " "
+
+#: Database words
+#, fuzzy
+msgid "Allow Localplay Play"
+msgstr " "
+
+#: Database words
+msgid "Statistics Day Threshold"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Min Element Count"
+msgstr " "
+
+#: Database words
+#, fuzzy
+msgid "Rate Limit"
+msgstr " "
+
+#: Database words
+#, fuzzy
+msgid "Playlist Method"
+msgstr " "
+
+#: Database words
+msgid "Transcoding"
+msgstr ""
+
+#: Database words
+msgid "User to track"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Streaming"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Interface"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "System"
+msgstr ""
+
+#~ msgid "Editing"
+#~ msgstr ""
+
+#~ msgid "preferences"
+#~ msgstr ""
+
#, fuzzy
#~ msgid "Playlist %s"
#~ msgstr ""
@@ -3843,9 +3967,6 @@ msgstr ":"
#~ msgid "Label"
#~ msgstr ""
-#~ msgid "Language"
-#~ msgstr ""
-
#~ msgid "Catalog Number"
#~ msgstr " "
@@ -3972,12 +4093,6 @@ msgstr ":"
#~ msgid "Rebuild Preferences"
#~ msgstr " "
-#~ msgid "Interface"
-#~ msgstr ""
-
-#~ msgid "Streaming"
-#~ 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 687ef811..8aed5551 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 b2aed9c4..9f34cab4 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-27 09:09+0900\n"
+"POT-Creation-Date: 2008-08-29 16:03+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"
@@ -89,6 +89,7 @@ msgid "Edit"
msgstr ""
#: ../../templates/show_user_preferences.inc.php:28
+#: ../../templates/show_preferences.inc.php:28
#, fuzzy, php-format
msgid "Editing %s preferences"
msgstr "Site genelinde geerli olan tercihleri dzenle"
@@ -230,7 +231,7 @@ msgid ""
msgstr ""
#: ../../templates/show_test.inc.php:153
-#: ../../templates/show_install_config.inc.php:88
+#: ../../templates/show_install_config.inc.php:89
msgid "Ampache.cfg.php Exists"
msgstr ""
@@ -242,7 +243,7 @@ msgid ""
msgstr ""
#: ../../templates/show_test.inc.php:172
-#: ../../templates/show_install_config.inc.php:105
+#: ../../templates/show_install_config.inc.php:106
msgid "Ampache.cfg.php Configured?"
msgstr ""
@@ -267,7 +268,7 @@ msgid "DB Inserted"
msgstr ""
#: ../../templates/show_test.inc.php:235
-#: ../../templates/show_install_config.inc.php:60
+#: ../../templates/show_install_config.inc.php:61
msgid "Web Path"
msgstr ""
@@ -389,7 +390,7 @@ msgstr ""
#: ../../templates/show_users.inc.php:104
#: ../../templates/show_edit_user.inc.php:29
#: ../../templates/show_add_user.inc.php:29
-#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_install_account.inc.php:61
#: ../../templates/show_recently_played.inc.php:39
#: ../../templates/show_recently_played.inc.php:98
#: ../../templates/show_user_registration.inc.php:75
@@ -462,7 +463,7 @@ msgstr ""
#: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
#: ../../lib/class/flag.class.php:282 ../../lib/class/localplay.class.php:648
-#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:409
+#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:439
#: ../../modules/localplay/mpd.controller.php:508
#: ../../modules/localplay/httpq.controller.php:505
msgid "Unknown"
@@ -488,7 +489,7 @@ msgstr ""
#: ../../templates/show_edit_user.inc.php:52
#: ../../templates/show_add_user.inc.php:52
-#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_install_account.inc.php:65
#: ../../templates/show_login_form.inc.php:62
#: ../../templates/show_user_registration.inc.php:103
#: ../../modules/localplay/mpd.controller.php:235
@@ -499,7 +500,7 @@ msgstr ""
#: ../../templates/show_edit_user.inc.php:61
#: ../../templates/show_add_user.inc.php:61
#: ../../templates/show_account.inc.php:46
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:69
#: ../../templates/show_user_registration.inc.php:112
msgid "Confirm Password"
msgstr ""
@@ -1332,43 +1333,43 @@ msgstr ""
msgid "Preference Administration"
msgstr ""
-#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:33
-#: ../../templates/show_install.inc.php:32
-#: ../../templates/show_install_account.inc.php:32
+#: ../../templates/show_install_config.inc.php:33
+#: ../../templates/show_install_lang.inc.php:34
+#: ../../templates/show_install.inc.php:33
+#: ../../templates/show_install_account.inc.php:33
msgid "Ampache Installation"
msgstr ""
-#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:40
-#: ../../templates/show_install.inc.php:40
-#: ../../templates/show_install_account.inc.php:39
+#: ../../templates/show_install_config.inc.php:39
+#: ../../templates/show_install_lang.inc.php:41
+#: ../../templates/show_install.inc.php:41
+#: ../../templates/show_install_account.inc.php:40
msgid ""
"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"
msgstr ""
-#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:43
-#: ../../templates/show_install.inc.php:43
-#: ../../templates/show_install_account.inc.php:42
+#: ../../templates/show_install_config.inc.php:42
+#: ../../templates/show_install_lang.inc.php:44
+#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_account.inc.php:43
msgid ""
"A MySQL Server with a username and password that can create/modify databases"
msgstr ""
-#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:44
-#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_config.inc.php:43
+#: ../../templates/show_install_lang.inc.php:45
+#: ../../templates/show_install.inc.php:45
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.php.dist file"
msgstr ""
-#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:47
-#: ../../templates/show_install.inc.php:47
-#: ../../templates/show_install_account.inc.php:45
+#: ../../templates/show_install_config.inc.php:45
+#: ../../templates/show_install_lang.inc.php:48
+#: ../../templates/show_install.inc.php:48
+#: ../../templates/show_install_account.inc.php:46
msgid ""
"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 "
@@ -1376,61 +1377,61 @@ msgid ""
"date simply edit /config/ampache.cfg.php"
msgstr ""
-#: ../../templates/show_install_config.inc.php:48
-#: ../../templates/show_install.inc.php:52
-#: ../../templates/show_install_account.inc.php:48
+#: ../../templates/show_install_config.inc.php:49
+#: ../../templates/show_install.inc.php:53
+#: ../../templates/show_install_account.inc.php:49
msgid "Step 1 - Creating and Inserting the Ampache Database"
msgstr ""
-#: ../../templates/show_install_config.inc.php:49
-#: ../../templates/show_install.inc.php:56
+#: ../../templates/show_install_config.inc.php:50
+#: ../../templates/show_install.inc.php:57
msgid "Step 2 - Creating the Ampache.cfg.php file"
msgstr ""
-#: ../../templates/show_install_config.inc.php:51
+#: ../../templates/show_install_config.inc.php:52
msgid ""
"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"
msgstr ""
-#: ../../templates/show_install_config.inc.php:53
-#: ../../templates/show_install.inc.php:57
-#: ../../templates/show_install_account.inc.php:50
+#: ../../templates/show_install_config.inc.php:54
+#: ../../templates/show_install.inc.php:58
+#: ../../templates/show_install_account.inc.php:51
msgid "Step 3 - Setup Initial Account"
msgstr ""
-#: ../../templates/show_install_config.inc.php:56
+#: ../../templates/show_install_config.inc.php:57
msgid "Generate Config File"
msgstr ""
-#: ../../templates/show_install_config.inc.php:64
-#: ../../templates/show_install.inc.php:65
+#: ../../templates/show_install_config.inc.php:65
+#: ../../templates/show_install.inc.php:66
msgid "Desired Database Name"
msgstr ""
-#: ../../templates/show_install_config.inc.php:68
-#: ../../templates/show_install.inc.php:69
+#: ../../templates/show_install_config.inc.php:69
+#: ../../templates/show_install.inc.php:70
msgid "MySQL Hostname"
msgstr ""
-#: ../../templates/show_install_config.inc.php:72
+#: ../../templates/show_install_config.inc.php:73
msgid "MySQL Username"
msgstr ""
-#: ../../templates/show_install_config.inc.php:76
+#: ../../templates/show_install_config.inc.php:77
msgid "MySQL Password"
msgstr ""
-#: ../../templates/show_install_config.inc.php:81
+#: ../../templates/show_install_config.inc.php:82
msgid "Write Config"
msgstr ""
-#: ../../templates/show_install_config.inc.php:126
+#: ../../templates/show_install_config.inc.php:127
msgid "Check for Config"
msgstr ""
-#: ../../templates/show_install_config.inc.php:132
+#: ../../templates/show_install_config.inc.php:133
msgid "Continue to Step 3"
msgstr ""
@@ -1570,70 +1571,70 @@ msgstr ""
msgid "Catalog Time"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:38
-#: ../../templates/show_install_lang.inc.php:52
-#: ../../templates/show_install.inc.php:38
+#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install.inc.php:39
msgid "Requirements"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:51
+#: ../../templates/show_install_lang.inc.php:52
msgid "System Checks"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install_lang.inc.php:54
#, fuzzy
msgid "PHP Version:"
msgstr "Almanca"
-#: ../../templates/show_install_lang.inc.php:63
+#: ../../templates/show_install_lang.inc.php:64
msgid "Mysql for PHP:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:77
+#: ../../templates/show_install_lang.inc.php:78
msgid "PHP Session Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:87
+#: ../../templates/show_install_lang.inc.php:88
msgid "PHP ICONV Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:97
+#: ../../templates/show_install_lang.inc.php:98
msgid "PHP PCRE Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:107
+#: ../../templates/show_install_lang.inc.php:108
msgid "PHP PutENV Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:120
-msgid "PHP Safe Mode:"
-msgstr ""
-
-#: ../../templates/show_install_lang.inc.php:130
+#: ../../templates/show_install_lang.inc.php:119
msgid "Optional"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:131
+#: ../../templates/show_install_lang.inc.php:120
msgid "PHP GetText Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:140
+#: ../../templates/show_install_lang.inc.php:123
+msgid "WARNING: This server will use gettext emulator."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:129
msgid "PHP Mbstring Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:152
+#: ../../templates/show_install_lang.inc.php:141
msgid "Choose installation language."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:173
+#: ../../templates/show_install_lang.inc.php:162
msgid "Start configuration"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:179
+#: ../../templates/show_install_lang.inc.php:168
msgid "Ampache does not <strong>run</strong> correctly by this server."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:180
+#: ../../templates/show_install_lang.inc.php:169
msgid "Please contact your server administrator, and fix them."
msgstr ""
@@ -2091,14 +2092,6 @@ msgstr ""
msgid "Disabled Songs"
msgstr ""
-#: ../../templates/show_preferences.inc.php:28
-msgid "Editing"
-msgstr ""
-
-#: ../../templates/show_preferences.inc.php:28
-msgid "preferences"
-msgstr ""
-
#: ../../templates/show_localplay_instances.inc.php:23
msgid "Show Localplay Instances"
msgstr ""
@@ -2223,66 +2216,66 @@ msgstr ""
msgid "Found"
msgstr ""
-#: ../../templates/show_install.inc.php:54
+#: ../../templates/show_install.inc.php:55
msgid ""
"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"
msgstr ""
-#: ../../templates/show_install.inc.php:61
+#: ../../templates/show_install.inc.php:62
msgid "Insert Ampache Database"
msgstr ""
-#: ../../templates/show_install.inc.php:73
+#: ../../templates/show_install.inc.php:74
msgid "MySQL Administrative Username"
msgstr ""
-#: ../../templates/show_install.inc.php:77
+#: ../../templates/show_install.inc.php:78
msgid "MySQL Administrative Password"
msgstr ""
-#: ../../templates/show_install.inc.php:81
+#: ../../templates/show_install.inc.php:82
msgid "Create Database User for New Database"
msgstr ""
-#: ../../templates/show_install.inc.php:85
+#: ../../templates/show_install.inc.php:86
msgid "Ampache Database Username"
msgstr ""
-#: ../../templates/show_install.inc.php:89
+#: ../../templates/show_install.inc.php:90
msgid "Ampache Database User Password"
msgstr ""
-#: ../../templates/show_install.inc.php:93
+#: ../../templates/show_install.inc.php:94
msgid "Overwrite Existing"
msgstr ""
-#: ../../templates/show_install.inc.php:98
+#: ../../templates/show_install.inc.php:99
msgid "Insert Database"
msgstr ""
-#: ../../templates/show_install_account.inc.php:43
+#: ../../templates/show_install_account.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.dist.php file"
msgstr ""
-#: ../../templates/show_install_account.inc.php:49
+#: ../../templates/show_install_account.inc.php:50
msgid "Step 2 - Creating the ampache.cfg.php file"
msgstr ""
-#: ../../templates/show_install_account.inc.php:52
+#: ../../templates/show_install_account.inc.php:53
msgid ""
"This step creates your initial Ampache admin account. Once your admin "
"account has been created you will be directed to the login page"
msgstr ""
-#: ../../templates/show_install_account.inc.php:56
+#: ../../templates/show_install_account.inc.php:57
msgid "Create Admin Account"
msgstr ""
-#: ../../templates/show_install_account.inc.php:73
+#: ../../templates/show_install_account.inc.php:74
msgid "Create Account"
msgstr ""
@@ -3295,15 +3288,11 @@ msgstr ""
msgid "Error Username or Password incorrect, please try again"
msgstr ""
-#: ../../lib/general.lib.php:406
-msgid "Simplified Chinese"
-msgstr ""
-
-#: ../../lib/general.lib.php:468
+#: ../../lib/general.lib.php:498
msgid "On"
msgstr ""
-#: ../../lib/general.lib.php:471
+#: ../../lib/general.lib.php:501
msgid "Off"
msgstr ""
@@ -3755,6 +3744,124 @@ msgstr ""
msgid "Filename:"
msgstr ""
+#: Database words
+msgid "Allow Downloads"
+msgstr ""
+
+#: Database words
+msgid "Popular Threshold"
+msgstr ""
+
+#: Database words
+msgid "Transcode Bitrate"
+msgstr "Ampache :: Pour l'Amour de la Musique"
+
+#: Database words
+msgid "Ampache :: Pour l'Amour de la Musique"
+msgstr ""
+
+#: Database words
+msgid "Lock Songs"
+msgstr ""
+
+#: Database words
+msgid "Forces Http play regardless of port"
+msgstr ""
+
+#: Database words
+msgid "Non-Standard Http Port"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Localplay Type"
+msgstr "Yerel alma Dzeni"
+
+#: Database words
+#, fuzzy
+msgid "Type of Playback"
+msgstr "al"
+
+#: Database words
+msgid "Language"
+msgstr ""
+
+#: Database words
+msgid "Theme"
+msgstr ""
+
+#: Database words
+msgid "Album Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Artist Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Title Ellipse Threshold"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Offset Limit"
+msgstr "Snrlar grntle"
+
+#: Database words
+#, fuzzy
+msgid "Localplay Access"
+msgstr "Yerel alma Dzeni"
+
+#: Database words
+msgid "Allow Streaming"
+msgstr ""
+
+#: Database words
+msgid "Allow Democratic Play"
+msgstr ""
+
+#: Database words
+msgid "Allow Localplay Play"
+msgstr ""
+
+#: Database words
+msgid "Statistics Day Threshold"
+msgstr ""
+
+#: Database words
+msgid "Min Element Count"
+msgstr ""
+
+#: Database words
+#, fuzzy
+msgid "Rate Limit"
+msgstr "Snrlar grntle"
+
+#: Database words
+#, fuzzy
+msgid "Playlist Method"
+msgstr "Sonu bulunamad"
+
+#: Database words
+msgid "Transcoding"
+msgstr ""
+
+#: Database words
+msgid "User to track"
+msgstr ""
+
+#: Database words
+msgid "Streaming"
+msgstr ""
+
+#: Database words
+msgid "Interface"
+msgstr ""
+
+#: Database words
+msgid "System"
+msgstr ""
+
#, fuzzy
#~ msgid "Playlist %s"
#~ msgstr "Sonu bulunamad"
@@ -3821,9 +3928,6 @@ msgstr ""
#~ msgid "Flagging song completed."
#~ msgstr "ark iaretleme tamamland"
-#~ msgid "Playback"
-#~ msgstr "al"
-
#~ msgid "Clear queue"
#~ msgstr "Kuyruu sil"
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index e81a364e..3eb21c8e 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 1a9bf7f9..92db1b26 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-27 09:09+0900\n"
+"POT-Creation-Date: 2008-08-29 16:03+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"
@@ -89,6 +89,7 @@ msgid "Edit"
msgstr ""
#: ../../templates/show_user_preferences.inc.php:28
+#: ../../templates/show_preferences.inc.php:28
#, php-format
msgid "Editing %s preferences"
msgstr ""
@@ -230,7 +231,7 @@ msgid ""
msgstr ""
#: ../../templates/show_test.inc.php:153
-#: ../../templates/show_install_config.inc.php:88
+#: ../../templates/show_install_config.inc.php:89
msgid "Ampache.cfg.php Exists"
msgstr ""
@@ -242,7 +243,7 @@ msgid ""
msgstr ""
#: ../../templates/show_test.inc.php:172
-#: ../../templates/show_install_config.inc.php:105
+#: ../../templates/show_install_config.inc.php:106
msgid "Ampache.cfg.php Configured?"
msgstr ""
@@ -267,7 +268,7 @@ msgid "DB Inserted"
msgstr ""
#: ../../templates/show_test.inc.php:235
-#: ../../templates/show_install_config.inc.php:60
+#: ../../templates/show_install_config.inc.php:61
msgid "Web Path"
msgstr ""
@@ -389,7 +390,7 @@ msgstr ""
#: ../../templates/show_users.inc.php:104
#: ../../templates/show_edit_user.inc.php:29
#: ../../templates/show_add_user.inc.php:29
-#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_install_account.inc.php:61
#: ../../templates/show_recently_played.inc.php:39
#: ../../templates/show_recently_played.inc.php:98
#: ../../templates/show_user_registration.inc.php:75
@@ -462,7 +463,7 @@ msgstr ""
#: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
#: ../../lib/class/flag.class.php:282 ../../lib/class/localplay.class.php:648
-#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:409
+#: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:439
#: ../../modules/localplay/mpd.controller.php:508
#: ../../modules/localplay/httpq.controller.php:505
msgid "Unknown"
@@ -488,7 +489,7 @@ msgstr ""
#: ../../templates/show_edit_user.inc.php:52
#: ../../templates/show_add_user.inc.php:52
-#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_install_account.inc.php:65
#: ../../templates/show_login_form.inc.php:62
#: ../../templates/show_user_registration.inc.php:103
#: ../../modules/localplay/mpd.controller.php:235
@@ -499,7 +500,7 @@ msgstr ""
#: ../../templates/show_edit_user.inc.php:61
#: ../../templates/show_add_user.inc.php:61
#: ../../templates/show_account.inc.php:46
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:69
#: ../../templates/show_user_registration.inc.php:112
msgid "Confirm Password"
msgstr ""
@@ -1325,43 +1326,43 @@ msgstr ""
msgid "Preference Administration"
msgstr ""
-#: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:33
-#: ../../templates/show_install.inc.php:32
-#: ../../templates/show_install_account.inc.php:32
+#: ../../templates/show_install_config.inc.php:33
+#: ../../templates/show_install_lang.inc.php:34
+#: ../../templates/show_install.inc.php:33
+#: ../../templates/show_install_account.inc.php:33
msgid "Ampache Installation"
msgstr ""
-#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:40
-#: ../../templates/show_install.inc.php:40
-#: ../../templates/show_install_account.inc.php:39
+#: ../../templates/show_install_config.inc.php:39
+#: ../../templates/show_install_lang.inc.php:41
+#: ../../templates/show_install.inc.php:41
+#: ../../templates/show_install_account.inc.php:40
msgid ""
"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"
msgstr ""
-#: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:43
-#: ../../templates/show_install.inc.php:43
-#: ../../templates/show_install_account.inc.php:42
+#: ../../templates/show_install_config.inc.php:42
+#: ../../templates/show_install_lang.inc.php:44
+#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_account.inc.php:43
msgid ""
"A MySQL Server with a username and password that can create/modify databases"
msgstr ""
-#: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:44
-#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_config.inc.php:43
+#: ../../templates/show_install_lang.inc.php:45
+#: ../../templates/show_install.inc.php:45
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.php.dist file"
msgstr ""
-#: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:47
-#: ../../templates/show_install.inc.php:47
-#: ../../templates/show_install_account.inc.php:45
+#: ../../templates/show_install_config.inc.php:45
+#: ../../templates/show_install_lang.inc.php:48
+#: ../../templates/show_install.inc.php:48
+#: ../../templates/show_install_account.inc.php:46
msgid ""
"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 "
@@ -1369,61 +1370,61 @@ msgid ""
"date simply edit /config/ampache.cfg.php"
msgstr ""
-#: ../../templates/show_install_config.inc.php:48
-#: ../../templates/show_install.inc.php:52
-#: ../../templates/show_install_account.inc.php:48
+#: ../../templates/show_install_config.inc.php:49
+#: ../../templates/show_install.inc.php:53
+#: ../../templates/show_install_account.inc.php:49
msgid "Step 1 - Creating and Inserting the Ampache Database"
msgstr ""
-#: ../../templates/show_install_config.inc.php:49
-#: ../../templates/show_install.inc.php:56
+#: ../../templates/show_install_config.inc.php:50
+#: ../../templates/show_install.inc.php:57
msgid "Step 2 - Creating the Ampache.cfg.php file"
msgstr ""
-#: ../../templates/show_install_config.inc.php:51
+#: ../../templates/show_install_config.inc.php:52
msgid ""
"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"
msgstr ""
-#: ../../templates/show_install_config.inc.php:53
-#: ../../templates/show_install.inc.php:57
-#: ../../templates/show_install_account.inc.php:50
+#: ../../templates/show_install_config.inc.php:54
+#: ../../templates/show_install.inc.php:58
+#: ../../templates/show_install_account.inc.php:51
msgid "Step 3 - Setup Initial Account"
msgstr ""
-#: ../../templates/show_install_config.inc.php:56
+#: ../../templates/show_install_config.inc.php:57
msgid "Generate Config File"
msgstr ""
-#: ../../templates/show_install_config.inc.php:64
-#: ../../templates/show_install.inc.php:65
+#: ../../templates/show_install_config.inc.php:65
+#: ../../templates/show_install.inc.php:66
msgid "Desired Database Name"
msgstr ""
-#: ../../templates/show_install_config.inc.php:68
-#: ../../templates/show_install.inc.php:69
+#: ../../templates/show_install_config.inc.php:69
+#: ../../templates/show_install.inc.php:70
msgid "MySQL Hostname"
msgstr ""
-#: ../../templates/show_install_config.inc.php:72
+#: ../../templates/show_install_config.inc.php:73
msgid "MySQL Username"
msgstr ""
-#: ../../templates/show_install_config.inc.php:76
+#: ../../templates/show_install_config.inc.php:77
msgid "MySQL Password"
msgstr ""
-#: ../../templates/show_install_config.inc.php:81
+#: ../../templates/show_install_config.inc.php:82
msgid "Write Config"
msgstr ""
-#: ../../templates/show_install_config.inc.php:126
+#: ../../templates/show_install_config.inc.php:127
msgid "Check for Config"
msgstr ""
-#: ../../templates/show_install_config.inc.php:132
+#: ../../templates/show_install_config.inc.php:133
msgid "Continue to Step 3"
msgstr ""
@@ -1561,69 +1562,69 @@ msgstr ""
msgid "Catalog Time"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:38
-#: ../../templates/show_install_lang.inc.php:52
-#: ../../templates/show_install.inc.php:38
+#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install.inc.php:39
msgid "Requirements"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:51
+#: ../../templates/show_install_lang.inc.php:52
msgid "System Checks"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install_lang.inc.php:54
msgid "PHP Version:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:63
+#: ../../templates/show_install_lang.inc.php:64
msgid "Mysql for PHP:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:77
+#: ../../templates/show_install_lang.inc.php:78
msgid "PHP Session Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:87
+#: ../../templates/show_install_lang.inc.php:88
msgid "PHP ICONV Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:97
+#: ../../templates/show_install_lang.inc.php:98
msgid "PHP PCRE Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:107
+#: ../../templates/show_install_lang.inc.php:108
msgid "PHP PutENV Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:120
-msgid "PHP Safe Mode:"
-msgstr ""
-
-#: ../../templates/show_install_lang.inc.php:130
+#: ../../templates/show_install_lang.inc.php:119
msgid "Optional"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:131
+#: ../../templates/show_install_lang.inc.php:120
msgid "PHP GetText Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:140
+#: ../../templates/show_install_lang.inc.php:123
+msgid "WARNING: This server will use gettext emulator."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:129
msgid "PHP Mbstring Support:"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:152
+#: ../../templates/show_install_lang.inc.php:141
msgid "Choose installation language."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:173
+#: ../../templates/show_install_lang.inc.php:162
msgid "Start configuration"
msgstr ""
-#: ../../templates/show_install_lang.inc.php:179
+#: ../../templates/show_install_lang.inc.php:168
msgid "Ampache does not <strong>run</strong> correctly by this server."
msgstr ""
-#: ../../templates/show_install_lang.inc.php:180
+#: ../../templates/show_install_lang.inc.php:169
msgid "Please contact your server administrator, and fix them."
msgstr ""
@@ -2072,14 +2073,6 @@ msgstr ""
msgid "Disabled Songs"
msgstr ""
-#: ../../templates/show_preferences.inc.php:28
-msgid "Editing"
-msgstr ""
-
-#: ../../templates/show_preferences.inc.php:28
-msgid "preferences"
-msgstr ""
-
#: ../../templates/show_localplay_instances.inc.php:23
msgid "Show Localplay Instances"
msgstr ""
@@ -2202,66 +2195,66 @@ msgstr ""
msgid "Found"
msgstr ""
-#: ../../templates/show_install.inc.php:54
+#: ../../templates/show_install.inc.php:55
msgid ""
"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"
msgstr ""
-#: ../../templates/show_install.inc.php:61
+#: ../../templates/show_install.inc.php:62
msgid "Insert Ampache Database"
msgstr ""
-#: ../../templates/show_install.inc.php:73
+#: ../../templates/show_install.inc.php:74
msgid "MySQL Administrative Username"
msgstr ""
-#: ../../templates/show_install.inc.php:77
+#: ../../templates/show_install.inc.php:78
msgid "MySQL Administrative Password"
msgstr ""
-#: ../../templates/show_install.inc.php:81
+#: ../../templates/show_install.inc.php:82
msgid "Create Database User for New Database"
msgstr ""
-#: ../../templates/show_install.inc.php:85
+#: ../../templates/show_install.inc.php:86
msgid "Ampache Database Username"
msgstr ""
-#: ../../templates/show_install.inc.php:89
+#: ../../templates/show_install.inc.php:90
msgid "Ampache Database User Password"
msgstr ""
-#: ../../templates/show_install.inc.php:93
+#: ../../templates/show_install.inc.php:94
msgid "Overwrite Existing"
msgstr ""
-#: ../../templates/show_install.inc.php:98
+#: ../../templates/show_install.inc.php:99
msgid "Insert Database"
msgstr ""
-#: ../../templates/show_install_account.inc.php:43
+#: ../../templates/show_install_account.inc.php:44
msgid ""
"Your webserver has read access to the /sql/ampache.sql file and the /config/"
"ampache.cfg.dist.php file"
msgstr ""
-#: ../../templates/show_install_account.inc.php:49
+#: ../../templates/show_install_account.inc.php:50
msgid "Step 2 - Creating the ampache.cfg.php file"
msgstr ""
-#: ../../templates/show_install_account.inc.php:52
+#: ../../templates/show_install_account.inc.php:53
msgid ""
"This step creates your initial Ampache admin account. Once your admin "
"account has been created you will be directed to the login page"
msgstr ""
-#: ../../templates/show_install_account.inc.php:56
+#: ../../templates/show_install_account.inc.php:57
msgid "Create Admin Account"
msgstr ""
-#: ../../templates/show_install_account.inc.php:73
+#: ../../templates/show_install_account.inc.php:74
msgid "Create Account"
msgstr ""
@@ -3260,15 +3253,11 @@ msgstr ""
msgid "Error Username or Password incorrect, please try again"
msgstr ""
-#: ../../lib/general.lib.php:406
-msgid "Simplified Chinese"
-msgstr ""
-
-#: ../../lib/general.lib.php:468
+#: ../../lib/general.lib.php:498
msgid "On"
msgstr ""
-#: ../../lib/general.lib.php:471
+#: ../../lib/general.lib.php:501
msgid "Off"
msgstr ""
@@ -3707,6 +3696,118 @@ msgstr ""
msgid "Filename:"
msgstr ""
+#: Database words
+msgid "Allow Downloads"
+msgstr ""
+
+#: Database words
+msgid "Popular Threshold"
+msgstr ""
+
+#: Database words
+msgid "Transcode Bitrate"
+msgstr "Ampache :: Pour l'Amour de la Musique"
+
+#: Database words
+msgid "Ampache :: Pour l'Amour de la Musique"
+msgstr ""
+
+#: Database words
+msgid "Lock Songs"
+msgstr ""
+
+#: Database words
+msgid "Forces Http play regardless of port"
+msgstr ""
+
+#: Database words
+msgid "Non-Standard Http Port"
+msgstr ""
+
+#: Database words
+msgid "Localplay Type"
+msgstr ""
+
+#: Database words
+msgid "Type of Playback"
+msgstr ""
+
+#: Database words
+msgid "Language"
+msgstr ""
+
+#: Database words
+msgid "Theme"
+msgstr ""
+
+#: Database words
+msgid "Album Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Artist Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Title Ellipse Threshold"
+msgstr ""
+
+#: Database words
+msgid "Offset Limit"
+msgstr ""
+
+#: Database words
+msgid "Localplay Access"
+msgstr ""
+
+#: Database words
+msgid "Allow Streaming"
+msgstr ""
+
+#: Database words
+msgid "Allow Democratic Play"
+msgstr ""
+
+#: Database words
+msgid "Allow Localplay Play"
+msgstr ""
+
+#: Database words
+msgid "Statistics Day Threshold"
+msgstr ""
+
+#: Database words
+msgid "Min Element Count"
+msgstr ""
+
+#: Database words
+msgid "Rate Limit"
+msgstr ""
+
+#: Database words
+msgid "Playlist Method"
+msgstr ""
+
+#: Database words
+msgid "Transcoding"
+msgstr ""
+
+#: Database words
+msgid "User to track"
+msgstr ""
+
+#: Database words
+msgid "Streaming"
+msgstr ""
+
+#: Database words
+msgid "Interface"
+msgstr ""
+
+#: Database words
+msgid "System"
+msgstr ""
+
#, fuzzy
#~ msgid "Entry Updated"
#~ msgstr "ID3 "
diff --git a/templates/show_install.inc.php b/templates/show_install.inc.php
index 4738d263..5c0ebb90 100644
--- a/templates/show_install.inc.php
+++ b/templates/show_install.inc.php
@@ -25,6 +25,7 @@ if (INSTALL != '1') { exit; }
<head>
<title>Ampache :: For The Love Of Music - Install</title>
<link rel="stylesheet" href="templates/install.css" type="text/css" media="screen" />
+<meta http-equiv="Content-Type" Content="text/html; Charset=<?php echo $charset; ?>" />
</head>
<body>
<script src="lib/javascript-base.js" language="javascript" type="text/javascript"></script>
diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php
index 9eb5183a..e751a1bd 100644
--- a/templates/show_install_account.inc.php
+++ b/templates/show_install_account.inc.php
@@ -26,6 +26,7 @@ if (INSTALL != '1') { exit; }
<head>
<title>Ampache :: For The Love Of Music - Install</title>
<link rel="stylesheet" href="templates/install.css" type="text/css" media="screen" />
+<meta http-equiv="Content-Type" Content="text/html; Charset=<?php echo $charset; ?>" />
</head>
<body>
<div id="header">
diff --git a/templates/show_install_config.inc.php b/templates/show_install_config.inc.php
index 3cb13849..2c8f630c 100644
--- a/templates/show_install_config.inc.php
+++ b/templates/show_install_config.inc.php
@@ -26,6 +26,7 @@ if (INSTALL != '1') { exit; }
<head>
<title>Ampache :: For The Love Of Music - Install</title>
<link rel="stylesheet" href="templates/install.css" type="text/css" media="screen" />
+<meta http-equiv="Content-Type" Content="text/html; Charset=<?php echo $charset; ?>" />
</head>
<body>
<div id="header">
diff --git a/templates/show_install_lang.inc.php b/templates/show_install_lang.inc.php
index 7e790af2..630fc552 100644
--- a/templates/show_install_lang.inc.php
+++ b/templates/show_install_lang.inc.php
@@ -26,6 +26,7 @@
<head>
<title>Ampache :: Pour l'Amour de la Musique - Install</title>
<link rel="stylesheet" href="templates/install.css" type="text/css" media="screen" />
+<meta http-equiv="Content-Type" Content="text/html; Charset=<?php echo $charset; ?>" />
</head>
<body>
<script src="lib/javascript-base.js" language="javascript" type="text/javascript"></script>
@@ -52,7 +53,7 @@
<h4><?php echo _('Requirements'); ?></h4>
<p><?php echo _('PHP Version:'); ?>
<?php
- if(strcmp('5.1.0',phpversion()) > 0) {
+ if(!check_php_ver()) {
echo " <font color=\"red\">ERROR</font> " . phpversion();
$results = $results + 1;
} else {
@@ -62,7 +63,7 @@
</p>
<p><?php echo _('Mysql for PHP:'); ?>
<?php
- if (!function_exists('mysql_query')) {
+ if (!check_php_mysql()) {
echo " <font color=\"red\">ERROR</font> ";
$results = $results + 1;
} else {
@@ -76,7 +77,7 @@
</p>
<p><?php echo _('PHP Session Support:'); ?>
<?php
- if (!function_exists('session_set_save_handler')) {
+ if (!check_php_session()) {
echo " <font color=\"red\">ERROR</font> ";
$results = $results + 1;
} else {
@@ -86,7 +87,7 @@
</p>
<p><?php echo _('PHP ICONV Support:'); ?>
<?php
- if (!function_exists('iconv')) {
+ if (!check_php_iconv()) {
echo " <font color=\"red\">ERROR</font> ";
$results = $results + 1;
} else {
@@ -96,7 +97,7 @@
</p>
<p><?php echo _('PHP PCRE Support:'); ?>
<?php
- if (!function_exists('preg_match')) {
+ if (!check_php_pcre()) {
echo " <font color=\"red\">ERROR</font> ";
$results = $results + 1;
} else {
@@ -106,10 +107,7 @@
</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)) {
+ if (!check_putenv()) {
echo " <font color=\"red\">ERROR</font> ";
$results = $results + 1;
} else {
@@ -117,21 +115,12 @@
}
?>
</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> ";
+ 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> ";
}
diff --git a/templates/show_preference_admin.inc.php b/templates/show_preference_admin.inc.php
index 737cadf4..311a8a41 100644
--- a/templates/show_preference_admin.inc.php
+++ b/templates/show_preference_admin.inc.php
@@ -34,7 +34,7 @@
unset($is_25,$is_5,$is_100);
?>
<tr class="<?php echo flip_class(); ?>">
- <td class="cel_preference"><?php echo scrub_out($preference['description']); ?></td>
+ <td class="cel_preference"><?php echo scrub_out(_($preference['description'])); ?></td>
<td class="cel_level">
<?php $level_name = "is_" . $preference['level']; ${$level_name} = 'selected="selected"'; ?>
<select name="prefs[<?php echo scrub_out($preference['name']); ?>]">
diff --git a/templates/show_preference_box.inc.php b/templates/show_preference_box.inc.php
index 8d4fcb15..1301df36 100644
--- a/templates/show_preference_box.inc.php
+++ b/templates/show_preference_box.inc.php
@@ -26,7 +26,7 @@ if ((Access::check('interface','100') OR !Config::get('use_auth')) AND $_REQUEST
$is_admin = true;
}
?>
-<h4><?php echo $preferences['title']; ?></h4>
+<h4><?php echo _($preferences['title']); ?></h4>
<table class="tabledata" cellpadding="0" cellspacing="0">
<colgroup>
<col id="col_preference" />
diff --git a/templates/show_preferences.inc.php b/templates/show_preferences.inc.php
index 1ee70ec3..1e2d7638 100644
--- a/templates/show_preferences.inc.php
+++ b/templates/show_preferences.inc.php
@@ -25,7 +25,7 @@
*/
?>
-<?php show_box_top(_('Editing') . ' ' . $fullname . ' ' . _('preferences'),'box box_preferences'); ?>
+<?php show_box_top(sprintf(_('Editing %s preferences'), $fullname),'box box_preferences'); ?>
<?php if ($_REQUEST['tab'] != 'account' && $_REQUEST['tab'] != 'modules') { ?>
<form method="post" name="preferences" action="<?php echo Config::get('web_path'); ?>/preferences.php?action=update_preferences" enctype="multipart/form-data">