Updated tempalate, po files, and Install process.

2 files changed, 84 insertions, 23 deletions

diff --git a/locale/en_GB/LC_MESSAGES/messages.mo b/locale/en_GB/LC_MESSAGES/messages.mo
index 3978e057..e4303488 100644
--- a/locale/en_GB/LC_MESSAGES/messages.mo
+++ b/locale/en_GB/LC_MESSAGES/messages.mo
diff --git a/locale/en_GB/LC_MESSAGES/messages.po b/locale/en_GB/LC_MESSAGES/messages.po
index c485b7a6..5a333847 100644
--- a/locale/en_GB/LC_MESSAGES/messages.po
+++ b/locale/en_GB/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ampache 2.5.0\n"
 "Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2008-08-25 10:44+0900\n"
+"POT-Creation-Date: 2008-08-27 09:09+0900\n"
 "PO-Revision-Date: 2005-07-17 21:58-0000\n"
 "Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: British English <en@li.org>\n"
@@ -1374,14 +1374,14 @@ msgid "Preference Administration"
 msgstr "Preferences"
 
 #: ../../templates/show_install_config.inc.php:32
-#: ../../templates/show_install_lang.inc.php:32
+#: ../../templates/show_install_lang.inc.php:33
 #: ../../templates/show_install.inc.php:32
 #: ../../templates/show_install_account.inc.php:32
 msgid "Ampache Installation"
 msgstr "Ampache Installation"
 
 #: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:40
 #: ../../templates/show_install.inc.php:40
 #: ../../templates/show_install_account.inc.php:39
 #, fuzzy
@@ -1395,7 +1395,7 @@ msgstr ""
 "have the following pre-requisites"
 
 #: ../../templates/show_install_config.inc.php:41
-#: ../../templates/show_install_lang.inc.php:42
+#: ../../templates/show_install_lang.inc.php:43
 #: ../../templates/show_install.inc.php:43
 #: ../../templates/show_install_account.inc.php:42
 msgid ""
@@ -1404,7 +1404,7 @@ msgstr ""
 "A MySQL Server with a username and password that can create/modify databases"
 
 #: ../../templates/show_install_config.inc.php:42
-#: ../../templates/show_install_lang.inc.php:43
+#: ../../templates/show_install_lang.inc.php:44
 #: ../../templates/show_install.inc.php:44
 msgid ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
@@ -1414,7 +1414,7 @@ msgstr ""
 "ampache.cfg.php.dist file"
 
 #: ../../templates/show_install_config.inc.php:44
-#: ../../templates/show_install_lang.inc.php:46
+#: ../../templates/show_install_lang.inc.php:47
 #: ../../templates/show_install.inc.php:47
 #: ../../templates/show_install_account.inc.php:45
 msgid ""
@@ -1623,15 +1623,82 @@ msgstr "Catalogue Size"
 msgid "Catalog Time"
 msgstr "Catalogue Time"
 
-#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install_lang.inc.php:38
+#: ../../templates/show_install_lang.inc.php:52
 #: ../../templates/show_install.inc.php:38
 msgid "Requirements"
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:72
+#: ../../templates/show_install_lang.inc.php:51
+#, fuzzy
+msgid "System Checks"
+msgstr "Stream"
+
+#: ../../templates/show_install_lang.inc.php:53
+#, fuzzy
+msgid "PHP Version:"
+msgstr "PHP Version"
+
+#: ../../templates/show_install_lang.inc.php:63
+#, fuzzy
+msgid "Mysql for PHP:"
+msgstr "Mysql for PHP"
+
+#: ../../templates/show_install_lang.inc.php:77
+#, fuzzy
+msgid "PHP Session Support:"
+msgstr "PHP Session Support"
+
+#: ../../templates/show_install_lang.inc.php:87
+#, fuzzy
+msgid "PHP ICONV Support:"
+msgstr "PHP ICONV Support"
+
+#: ../../templates/show_install_lang.inc.php:97
+#, fuzzy
+msgid "PHP PCRE Support:"
+msgstr "PHP ICONV Support"
+
+#: ../../templates/show_install_lang.inc.php:107
+#, fuzzy
+msgid "PHP PutENV Support:"
+msgstr "PHP ICONV Support"
+
+#: ../../templates/show_install_lang.inc.php:120
+msgid "PHP Safe Mode:"
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:130
+#, fuzzy
+msgid "Optional"
+msgstr "Action"
+
+#: ../../templates/show_install_lang.inc.php:131
+#, fuzzy
+msgid "PHP GetText Support:"
+msgstr "PHP ICONV Support"
+
+#: ../../templates/show_install_lang.inc.php:140
+#, fuzzy
+msgid "PHP Mbstring Support:"
+msgstr "PHP Session Support"
+
+#: ../../templates/show_install_lang.inc.php:152
+msgid "Choose installation language."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:173
 msgid "Start configuration"
 msgstr ""
 
+#: ../../templates/show_install_lang.inc.php:179
+msgid "Ampache does not <strong>run</strong> correctly by this server."
+msgstr ""
+
+#: ../../templates/show_install_lang.inc.php:180
+msgid "Please contact your server administrator, and fix them."
+msgstr ""
+
 #: ../../templates/rightbar.inc.php:28
 msgid "Add to Playlist"
 msgstr ""
@@ -2415,8 +2482,8 @@ msgstr ""
 #: ../../templates/show_random.inc.php:51
 #: ../../templates/show_random.inc.php:52
 #, php-format
-msgid "%s minute"
-msgid_plural "%s minutes"
+msgid "%d minute"
+msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -2426,8 +2493,8 @@ msgstr[1] ""
 #: ../../templates/show_random.inc.php:56
 #: ../../templates/show_random.inc.php:57
 #, fuzzy, php-format
-msgid "%s hour"
-msgid_plural "%s hours"
+msgid "%d hour"
+msgid_plural "%d hours"
 msgstr[0] "hour"
 msgstr[1] "hour"
 
@@ -2540,9 +2607,7 @@ msgstr "Albums by"
 #: ../../templates/show_artist.inc.php:25
 #, php-format
 msgid "%s by %s"
-msgid_plural "%ss by %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: ../../templates/show_artist.inc.php:35
 #, fuzzy, php-format
@@ -3588,12 +3653,12 @@ msgstr "Playlist Type"
 msgid "Local Path to Files"
 msgstr "Local Play Control"
 
-#: ../../admin/mail.php:84
+#: ../../admin/mail.php:90
 #, fuzzy
 msgid "E-mail Sent"
 msgstr "E-mail"
 
-#: ../../admin/mail.php:85
+#: ../../admin/mail.php:91
 msgid "Your E-mail was successfully sent."
 msgstr ""
 
@@ -3840,7 +3905,7 @@ msgstr "Do you really want to delete this catalogue?"
 msgid "Album Art Search Finished"
 msgstr "Album Art Search Finished"
 
-#: ../../bin/print_tags.inc:67
+#: ../../bin/print_tags.inc:66
 msgid ""
 "[print_tags.php.inc]\n"
 "This commandline script will display the tag information for the specified "
@@ -3849,7 +3914,7 @@ msgid ""
 "        \n"
 msgstr ""
 
-#: ../../bin/print_tags.inc:73
+#: ../../bin/print_tags.inc:72
 #, fuzzy
 msgid "Filename:"
 msgstr "Filename"
@@ -4147,10 +4212,6 @@ msgstr "Filename"
 #~ msgid "Streaming"
 #~ msgstr "Stream"
 
-#, fuzzy
-#~ msgid "System"
-#~ msgstr "Stream"
-
 #~ msgid "Host Access to Your Catalog"
 #~ msgstr "Host Access to Your Catalogue"