summaryrefslogtreecommitdiffstats
path: root/locale/en_GB
diff options
context:
space:
mode:
authormomo-i <momo-i@ampache>2009-06-24 02:08:30 +0000
committermomo-i <momo-i@ampache>2009-06-24 02:08:30 +0000
commitc2ada6f8be09032a28fed5ce169f86e6ea951156 (patch)
tree4f4d813499525ae54c4955a9b2559632eea78a18 /locale/en_GB
parent90d61c3deb6540581133914bf90fa6b209268b19 (diff)
downloadampache-c2ada6f8be09032a28fed5ce169f86e6ea951156.tar.gz
ampache-c2ada6f8be09032a28fed5ce169f86e6ea951156.tar.bz2
ampache-c2ada6f8be09032a28fed5ce169f86e6ea951156.zip
Add Polish language
Update sync messages
Diffstat (limited to 'locale/en_GB')
-rw-r--r--locale/en_GB/LC_MESSAGES/messages.mobin54250 -> 53574 bytes
-rw-r--r--locale/en_GB/LC_MESSAGES/messages.po670
2 files changed, 366 insertions, 304 deletions
diff --git a/locale/en_GB/LC_MESSAGES/messages.mo b/locale/en_GB/LC_MESSAGES/messages.mo
index 3cf72979..b3cd4430 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 f96a9cec..7da42025 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 SVN $Rev$\n"
"Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2009-05-06 21:58+0900\n"
+"POT-Creation-Date: 2009-06-24 10:57+0900\n"
"PO-Revision-Date: 2009-05-06 22:00+0900\n"
"Last-Translator: momo-i <webmaster@momo-i.org>\n"
"Language-Team: English (British)\n"
@@ -20,11 +20,13 @@ msgstr ""
msgid "Error: No Keyword Entered"
msgstr "Error: No Keyword Entered"
-#: ../../song.php:40
+#. HINT: Artist, Song Title
+#: ../../song.php:42 ../../song.php:60
#, php-format
msgid "%1$s - %2$s Lyrics Detail"
msgstr "%1$s - %2$s Lyrics Detail"
+#. HINT: Artist Fullname
#: ../../templates/show_album_row.inc.php:23
#: ../../templates/show_song_row.inc.php:23
#: ../../templates/show_albums.inc.php:40
@@ -35,8 +37,8 @@ msgstr "%1$s - %2$s Lyrics Detail"
#: ../../templates/show_live_streams.inc.php:57
#: ../../templates/show_playlists.inc.php:34
#: ../../templates/show_playlists.inc.php:57
-#: ../../templates/show_videos.inc.php:35
-#: ../../templates/show_videos.inc.php:58
+#: ../../templates/show_videos.inc.php:36
+#: ../../templates/show_videos.inc.php:60
#: ../../templates/show_add_live_stream.inc.php:68
#: ../../templates/show_catalog_row.inc.php:29
#: ../../templates/show_video_row.inc.php:23
@@ -50,7 +52,7 @@ msgstr "%1$s - %2$s Lyrics Detail"
#: ../../templates/show_recently_played.inc.php:37
#: ../../templates/show_recently_played.inc.php:80
#: ../../templates/show_recently_played.inc.php:99
-#: ../../templates/show_artist.inc.php:38
+#: ../../templates/show_artist.inc.php:43
#: ../../templates/show_album.inc.php:51
#: ../../templates/show_playlist_song_row.inc.php:22
#: ../../templates/show_song.inc.php:29
@@ -60,12 +62,13 @@ msgstr "%1$s - %2$s Lyrics Detail"
msgid "Add"
msgstr "Add"
+#. HINT: Artist Fullname
#: ../../templates/show_album_row.inc.php:24
-#: ../../templates/sidebar_home.inc.php:104
+#: ../../templates/sidebar_home.inc.php:105
#: ../../templates/show_artist_row.inc.php:24
#: ../../templates/show_genres.inc.php:52
#: ../../templates/show_localplay_status.inc.php:44
-#: ../../templates/show_artist.inc.php:41
+#: ../../templates/show_artist.inc.php:48
#: ../../templates/show_album.inc.php:55
#: ../../templates/show_playlist_row.inc.php:24
#: ../../modules/localplay/mpd.controller.php:495
@@ -103,6 +106,8 @@ msgstr "Batch Download"
msgid "Edit"
msgstr "Edit"
+#. HINT: Editing Username preferences
+#. HINT: Username
#: ../../templates/show_user_preferences.inc.php:28
#: ../../templates/show_preferences.inc.php:28
#, php-format
@@ -137,8 +142,9 @@ msgid "Song Information"
msgstr "Song Information"
#: ../../templates/show_song_row.inc.php:43
-#: ../../templates/show_artist.inc.php:50
-#: ../../templates/show_artist.inc.php:51
+#: ../../templates/show_video_row.inc.php:32
+#: ../../templates/show_artist.inc.php:59
+#: ../../templates/show_artist.inc.php:60
#: ../../templates/show_album.inc.php:76 ../../templates/show_album.inc.php:77
#: ../../templates/show_playlist_song_row.inc.php:33
#: ../../templates/show_song.inc.php:32
@@ -160,7 +166,7 @@ msgstr "Pause"
#: ../../templates/show_localplay_control.inc.php:28
#: ../../templates/show_manage_democratic.inc.php:57
#: ../../templates/rightbar.inc.php:25
-#: ../../templates/show_democratic.inc.php:38
+#: ../../templates/show_democratic.inc.php:39
msgid "Play"
msgstr "Play"
@@ -197,17 +203,17 @@ msgstr "DESCRIPTION"
#: ../../templates/show_test.inc.php:45
#: ../../templates/show_install_check.inc.php:26
-#: ../../templates/show_install_check.inc.php:33
+#: ../../templates/show_install_check.inc.php:39
msgid "PHP Version"
msgstr "PHP Version"
#: ../../templates/show_test.inc.php:51
-#: ../../templates/show_install_check.inc.php:31
+#: ../../templates/show_install_check.inc.php:37
msgid "Hash Function Exists"
msgstr "Hash Function Exists"
#: ../../templates/show_test.inc.php:51
-#: ../../templates/show_install_check.inc.php:31
+#: ../../templates/show_install_check.inc.php:37
msgid "SHA256 Support"
msgstr "SHA256 Support"
@@ -220,8 +226,8 @@ msgstr ""
"to work with Ampache."
#: ../../templates/show_test.inc.php:65
-#: ../../templates/show_install_check.inc.php:41
-#: ../../templates/show_install_check.inc.php:46
+#: ../../templates/show_install_check.inc.php:47
+#: ../../templates/show_install_check.inc.php:52
msgid "Mysql for PHP"
msgstr "Mysql for PHP"
@@ -234,8 +240,8 @@ msgstr ""
"These are required for Ampache to work."
#: ../../templates/show_test.inc.php:82
-#: ../../templates/show_install_check.inc.php:54
-#: ../../templates/show_install_check.inc.php:59
+#: ../../templates/show_install_check.inc.php:60
+#: ../../templates/show_install_check.inc.php:65
msgid "PHP Session Support"
msgstr "PHP Session Support"
@@ -248,8 +254,8 @@ msgstr ""
"Sessions are required for Ampache to work."
#: ../../templates/show_test.inc.php:99
-#: ../../templates/show_install_check.inc.php:67
-#: ../../templates/show_install_check.inc.php:72
+#: ../../templates/show_install_check.inc.php:73
+#: ../../templates/show_install_check.inc.php:78
msgid "PHP ICONV Support"
msgstr "PHP ICONV Support"
@@ -262,8 +268,8 @@ msgstr ""
"support is required for Ampache"
#: ../../templates/show_test.inc.php:115
-#: ../../templates/show_install_check.inc.php:80
-#: ../../templates/show_install_check.inc.php:85
+#: ../../templates/show_install_check.inc.php:86
+#: ../../templates/show_install_check.inc.php:91
msgid "PHP PCRE Support"
msgstr "PHP PCRE Support"
@@ -276,8 +282,8 @@ msgstr ""
"PHP, this is required for Ampache."
#: ../../templates/show_test.inc.php:131
-#: ../../templates/show_install_check.inc.php:93
-#: ../../templates/show_install_check.inc.php:98
+#: ../../templates/show_install_check.inc.php:99
+#: ../../templates/show_install_check.inc.php:104
msgid "PHP PutENV Support"
msgstr "PHP PutENV Support"
@@ -292,7 +298,7 @@ msgstr ""
"some features of ampache may not work correctly"
#: ../../templates/show_test.inc.php:147
-#: ../../templates/show_install_config.inc.php:91
+#: ../../templates/show_install_config.inc.php:93
msgid "Ampache.cfg.php Exists"
msgstr "Ampache.cfg.php Exists"
@@ -307,7 +313,7 @@ msgstr ""
"\tit is not currently readable by your webserver."
#: ../../templates/show_test.inc.php:166
-#: ../../templates/show_install_config.inc.php:106
+#: ../../templates/show_install_config.inc.php:108
msgid "Ampache.cfg.php Configured?"
msgstr "Ampache.cfg.php Configured?"
@@ -344,7 +350,7 @@ msgstr ""
"inserted the ampache database and that the user has access to the database"
#: ../../templates/show_test.inc.php:223
-#: ../../templates/show_install_config.inc.php:63
+#: ../../templates/show_install_config.inc.php:65
msgid "Web Path"
msgstr "Web Path"
@@ -365,7 +371,7 @@ msgstr "Cover"
#: ../../templates/show_albums.inc.php:44
#: ../../templates/show_albums.inc.php:75
-#: ../../templates/sidebar_home.inc.php:106
+#: ../../templates/sidebar_home.inc.php:107
#: ../../templates/show_edit_song.inc.php:37
#: ../../templates/show_democratic_playlist.inc.php:57
#: ../../templates/show_democratic_playlist.inc.php:97
@@ -380,9 +386,10 @@ msgstr "Cover"
#: ../../templates/show_disabled_songs.inc.php:58
#: ../../templates/show_duplicates.inc.php:39
#: ../../templates/show_duplicates.inc.php:78
+#: ../../templates/show_lyrics_song.inc.php:49
#: ../../templates/show_playlist_songs.inc.php:44
#: ../../templates/show_playlist_songs.inc.php:65
-#: ../../templates/show_now_playing_row.inc.php:52
+#: ../../templates/show_now_playing_row.inc.php:61
msgid "Album"
msgstr "Album"
@@ -390,8 +397,8 @@ msgstr "Album"
#: ../../templates/show_albums.inc.php:76
#: ../../templates/show_artists.inc.php:37
#: ../../templates/show_artists.inc.php:65
-#: ../../templates/sidebar_home.inc.php:80
-#: ../../templates/sidebar_home.inc.php:107
+#: ../../templates/sidebar_home.inc.php:81
+#: ../../templates/sidebar_home.inc.php:108
#: ../../templates/show_similar_artists.inc.php:33
#: ../../templates/show_similar_artists.inc.php:86
#: ../../templates/show_edit_song.inc.php:45
@@ -408,9 +415,10 @@ msgstr "Album"
#: ../../templates/show_disabled_songs.inc.php:59
#: ../../templates/show_duplicates.inc.php:38
#: ../../templates/show_duplicates.inc.php:77
+#: ../../templates/show_lyrics_song.inc.php:56
#: ../../templates/show_playlist_songs.inc.php:43
#: ../../templates/show_playlist_songs.inc.php:64
-#: ../../templates/show_now_playing_row.inc.php:59
+#: ../../templates/show_now_playing_row.inc.php:68
msgid "Artist"
msgstr "Artist"
@@ -420,7 +428,7 @@ msgstr "Artist"
#: ../../templates/show_artists.inc.php:66
#: ../../templates/show_manage_democratic.inc.php:39
#: ../../templates/show_popular.inc.php:23
-#: ../../templates/show_genre.inc.php:38 ../../templates/show_stats.inc.php:32
+#: ../../templates/show_genre.inc.php:39 ../../templates/show_stats.inc.php:32
#: ../../templates/show_stats.inc.php:68
#: ../../templates/show_genres.inc.php:38
#: ../../templates/show_genres.inc.php:74 ../../lib/class/browse.class.php:142
@@ -440,8 +448,8 @@ msgstr "Year"
#: ../../templates/show_albums.inc.php:79
#: ../../templates/show_artists.inc.php:41
#: ../../templates/show_artists.inc.php:69
-#: ../../templates/show_videos.inc.php:40
-#: ../../templates/show_videos.inc.php:63
+#: ../../templates/show_videos.inc.php:41
+#: ../../templates/show_videos.inc.php:65
#: ../../templates/show_stats.inc.php:34 ../../templates/show_songs.inc.php:43
#: ../../templates/show_songs.inc.php:72
msgid "Tags"
@@ -472,7 +480,7 @@ msgstr "Actions"
#: ../../templates/show_live_streams.inc.php:53
#: ../../templates/show_playlists.inc.php:53
#: ../../templates/show_manage_democratic.inc.php:63
-#: ../../templates/show_videos.inc.php:54
+#: ../../templates/show_videos.inc.php:56
#: ../../templates/show_objects.inc.php:44
#: ../../templates/rightbar.inc.php:108 ../../templates/show_genres.inc.php:68
#: ../../templates/show_user_recommendations.inc.php:32
@@ -493,10 +501,10 @@ msgstr "Fullname"
#: ../../templates/show_users.inc.php:39 ../../templates/show_users.inc.php:61
#: ../../templates/show_edit_user.inc.php:32
#: ../../templates/show_add_user.inc.php:29
-#: ../../templates/show_install_account.inc.php:61
+#: ../../templates/show_install_account.inc.php:62
#: ../../templates/show_recently_played.inc.php:41
#: ../../templates/show_recently_played.inc.php:100
-#: ../../templates/show_login_form.inc.php:57
+#: ../../templates/show_login_form.inc.php:58
#: ../../templates/show_user_registration.inc.php:73
#: ../../templates/show_now_playing_row.inc.php:29
msgid "Username"
@@ -528,6 +536,8 @@ msgstr "Last Ip"
#: ../../templates/show_live_streams.inc.php:40
#: ../../templates/show_live_streams.inc.php:62
#: ../../templates/show_manage_democratic.inc.php:40
+#: ../../templates/show_videos.inc.php:42
+#: ../../templates/show_videos.inc.php:66
#: ../../templates/show_plugins.inc.php:35
#: ../../templates/show_plugins.inc.php:64
#: ../../templates/show_democratic_playlist.inc.php:54
@@ -557,15 +567,15 @@ msgid "On-line"
msgstr "On-line"
#: ../../templates/show_users.inc.php:53 ../../templates/show_user.inc.php:22
-#: ../../lib/class/user.class.php:663 ../../lib/class/catalog.class.php:146
+#: ../../lib/class/user.class.php:671 ../../lib/class/catalog.class.php:146
#: ../../lib/class/catalog.class.php:147 ../../lib/class/catalog.class.php:148
-#: ../../lib/preferences.php:261
+#: ../../lib/preferences.php:263
msgid "Never"
msgstr "Never"
#: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
#: ../../lib/class/flag.class.php:337 ../../lib/class/localplay.class.php:648
-#: ../../lib/class/user.class.php:667 ../../lib/general.lib.php:338
+#: ../../lib/class/user.class.php:675 ../../lib/general.lib.php:339
#: ../../modules/localplay/mpd.controller.php:525
msgid "Unknown"
msgstr "Unknown"
@@ -594,8 +604,8 @@ msgstr "E-mail"
#: ../../templates/show_edit_user.inc.php:55
#: ../../templates/show_add_user.inc.php:52
-#: ../../templates/show_install_account.inc.php:65
-#: ../../templates/show_login_form.inc.php:61
+#: ../../templates/show_install_account.inc.php:66
+#: ../../templates/show_login_form.inc.php:62
#: ../../templates/show_user_registration.inc.php:101
#: ../../modules/localplay/mpd.controller.php:235
#: ../../modules/localplay/httpq.controller.php:219
@@ -605,7 +615,7 @@ msgstr "Password"
#: ../../templates/show_edit_user.inc.php:64
#: ../../templates/show_add_user.inc.php:61
#: ../../templates/show_account.inc.php:46
-#: ../../templates/show_install_account.inc.php:69
+#: ../../templates/show_install_account.inc.php:70
#: ../../templates/show_user_registration.inc.php:110
msgid "Confirm Password"
msgstr "Confirm Password"
@@ -639,7 +649,7 @@ msgstr "Guest"
#: ../../templates/show_access_list.inc.php:59
#: ../../templates/show_manage_shoutbox.inc.php:35
#: ../../templates/show_manage_shoutbox.inc.php:59
-#: ../../lib/class/democratic.class.php:148 ../../lib/preferences.php:231
+#: ../../lib/class/democratic.class.php:148 ../../lib/preferences.php:232
#: ../../admin/users.php:126
msgid "User"
msgstr "User"
@@ -668,7 +678,7 @@ msgstr "Catalog Manager"
#: ../../templates/show_democratic_playlist.inc.php:61
#: ../../templates/show_democratic_playlist.inc.php:101
#: ../../templates/show_mail_users.inc.php:32
-#: ../../lib/class/democratic.class.php:157 ../../lib/preferences.php:233
+#: ../../lib/class/democratic.class.php:157 ../../lib/preferences.php:234
#: ../../admin/users.php:127
msgid "Admin"
msgstr "Admin"
@@ -682,19 +692,19 @@ msgid "Config Preset"
msgstr "Config Preset"
#: ../../templates/show_edit_user.inc.php:93
-#: ../../templates/sidebar_home.inc.php:90
+#: ../../templates/sidebar_home.inc.php:91
#: ../../templates/show_playtype_switch.inc.php:36
-#: ../../templates/sidebar_modules.inc.php:41 ../../lib/preferences.php:179
+#: ../../templates/sidebar_modules.inc.php:41 ../../lib/preferences.php:180
#: ../../modules/localplay/mpd.controller.php:491
#: ../../modules/localplay/httpq.controller.php:488
msgid "Democratic"
msgstr "Democratic"
#: ../../templates/show_edit_user.inc.php:94
-#: ../../templates/sidebar_home.inc.php:99
+#: ../../templates/sidebar_home.inc.php:100
#: ../../templates/sidebar_localplay.inc.php:32
#: ../../templates/show_playtype_switch.inc.php:34
-#: ../../templates/sidebar.inc.php:28 ../../lib/preferences.php:182
+#: ../../templates/sidebar.inc.php:28 ../../lib/preferences.php:183
msgid "Localplay"
msgstr "Localplay"
@@ -704,7 +714,7 @@ msgstr "Flash"
#: ../../templates/show_edit_user.inc.php:96
#: ../../templates/show_playtype_switch.inc.php:32
-#: ../../lib/preferences.php:176
+#: ../../lib/preferences.php:177
msgid "Stream"
msgstr "Stream"
@@ -799,8 +809,8 @@ msgstr "Version"
#: ../../templates/show_localplay_controllers.inc.php:44
#: ../../templates/show_user_row.inc.php:46
#: ../../templates/show_duplicates.inc.php:36
-#: ../../templates/show_duplicates.inc.php:75 ../../lib/preferences.php:165
-#: ../../lib/preferences.php:271
+#: ../../templates/show_duplicates.inc.php:75 ../../lib/preferences.php:166
+#: ../../lib/preferences.php:273
msgid "Disable"
msgstr "Disable"
@@ -849,17 +859,17 @@ msgstr "Save Changes"
#: ../../templates/show_artists.inc.php:39
#: ../../templates/show_artists.inc.php:67
#: ../../templates/sidebar_home.inc.php:33
-#: ../../templates/sidebar_home.inc.php:77
+#: ../../templates/sidebar_home.inc.php:78
#: ../../templates/show_popular.inc.php:26
-#: ../../templates/show_genre.inc.php:32 ../../templates/show_stats.inc.php:30
+#: ../../templates/show_genre.inc.php:33 ../../templates/show_stats.inc.php:30
#: ../../lib/ui.lib.php:362 ../../lib/class/browse.class.php:148
msgid "Albums"
msgstr "Albums"
#: ../../templates/show_artists.inc.php:40
#: ../../templates/show_artists.inc.php:68
-#: ../../templates/show_videos.inc.php:39
-#: ../../templates/show_videos.inc.php:62
+#: ../../templates/show_videos.inc.php:40
+#: ../../templates/show_videos.inc.php:64
#: ../../templates/show_democratic_playlist.inc.php:59
#: ../../templates/show_democratic_playlist.inc.php:99
#: ../../templates/show_search.inc.php:72
@@ -880,8 +890,8 @@ msgid "Search Type"
msgstr "Search Type"
#: ../../templates/show_duplicate.inc.php:33
-#: ../../templates/show_videos.inc.php:36
-#: ../../templates/show_videos.inc.php:59
+#: ../../templates/show_videos.inc.php:37
+#: ../../templates/show_videos.inc.php:61
#: ../../templates/show_edit_song.inc.php:31
#: ../../templates/show_democratic_playlist.inc.php:56
#: ../../templates/show_democratic_playlist.inc.php:96
@@ -964,14 +974,14 @@ msgstr "Song Titles"
#: ../../templates/sidebar_home.inc.php:34
#: ../../templates/show_popular.inc.php:29
-#: ../../templates/show_genre.inc.php:35 ../../templates/show_stats.inc.php:31
+#: ../../templates/show_genre.inc.php:36 ../../templates/show_stats.inc.php:31
#: ../../lib/ui.lib.php:366 ../../lib/class/browse.class.php:159
-#: ../../lib/class/album.class.php:256
+#: ../../lib/class/album.class.php:257
msgid "Artists"
msgstr "Artists"
#: ../../templates/sidebar_home.inc.php:35
-#: ../../lib/class/browse.class.php:203
+#: ../../lib/class/browse.class.php:203 ../../browse.php:68
msgid "Tag Cloud"
msgstr "Tag Cloud"
@@ -1011,7 +1021,7 @@ msgid "Unplayed"
msgstr "Unplayed"
#: ../../templates/sidebar_home.inc.php:64
-#: ../../templates/show_artist.inc.php:55
+#: ../../templates/show_artist.inc.php:64
msgid "Show Art"
msgstr "Show Art"
@@ -1019,49 +1029,49 @@ msgstr "Show Art"
msgid "All Playlists"
msgstr "All Playlists"
-#: ../../templates/sidebar_home.inc.php:74
+#: ../../templates/sidebar_home.inc.php:75
#: ../../templates/show_songs.inc.php:40 ../../templates/show_songs.inc.php:69
#: ../../templates/show_playlist_songs.inc.php:42
#: ../../templates/show_playlist_songs.inc.php:63
msgid "Song Title"
msgstr "Song Title"
-#: ../../templates/sidebar_home.inc.php:86
-#: ../../templates/sidebar_home.inc.php:108
+#: ../../templates/sidebar_home.inc.php:87
+#: ../../templates/sidebar_home.inc.php:109
#: ../../templates/show_manage_democratic.inc.php:34
#: ../../templates/show_play_selected.inc.php:47 ../../lib/ui.lib.php:321
msgid "Playlist"
msgstr "Playlist"
-#: ../../templates/sidebar_home.inc.php:88
+#: ../../templates/sidebar_home.inc.php:89
msgid "Currently Playing"
msgstr "Currently Playing"
-#: ../../templates/sidebar_home.inc.php:101
+#: ../../templates/sidebar_home.inc.php:102
#: ../../templates/show_live_stream.inc.php:29
msgid "Import"
msgstr "Import"
-#: ../../templates/sidebar_home.inc.php:109
+#: ../../templates/sidebar_home.inc.php:110
msgid "Advanced"
msgstr "Advanced"
-#: ../../templates/sidebar_home.inc.php:112
+#: ../../templates/sidebar_home.inc.php:113
#: ../../templates/show_popular.inc.php:22
#: ../../templates/show_newest.inc.php:22
msgid "Information"
msgstr "Information"
-#: ../../templates/sidebar_home.inc.php:114
+#: ../../templates/sidebar_home.inc.php:115
#: ../../templates/show_stats.inc.php:24 ../../lib/ui.lib.php:374
msgid "Statistics"
msgstr "Statistics"
-#: ../../templates/sidebar_home.inc.php:115
+#: ../../templates/sidebar_home.inc.php:116
msgid "Newest"
msgstr "Newest"
-#: ../../templates/sidebar_home.inc.php:116
+#: ../../templates/sidebar_home.inc.php:117
msgid "Popular"
msgstr "Popular"
@@ -1080,8 +1090,8 @@ msgid "Reject"
msgstr "Reject"
#: ../../templates/show_flag_row.inc.php:33
-#: ../../templates/show_user_row.inc.php:43 ../../lib/preferences.php:164
-#: ../../lib/preferences.php:270
+#: ../../templates/show_user_row.inc.php:43 ../../lib/preferences.php:165
+#: ../../lib/preferences.php:272
msgid "Enable"
msgstr "Enable"
@@ -1100,6 +1110,7 @@ msgstr "# Songs"
msgid "Owner"
msgstr "Owner"
+#. HINT: Catalog Name
#: ../../templates/show_edit_catalog.inc.php:22
#, php-format
msgid "Settings for %s"
@@ -1188,7 +1199,7 @@ msgid "Base Playlist"
msgstr "Base Playlist"
#: ../../templates/show_manage_democratic.inc.php:36
-#: ../../templates/show_democratic.inc.php:28
+#: ../../templates/show_democratic.inc.php:29
msgid "Cooldown"
msgstr "Cooldown"
@@ -1206,7 +1217,7 @@ msgid "Level"
msgstr "Level"
#: ../../templates/show_manage_democratic.inc.php:38
-#: ../../lib/preferences.php:255 ../../lib/preferences.php:262
+#: ../../lib/preferences.php:257 ../../lib/preferences.php:264
msgid "Default"
msgstr "Default"
@@ -1358,6 +1369,7 @@ msgstr "End"
msgid "Create ACL"
msgstr "Create ACL"
+#. HINT: Playlist Type, Playlist Name
#: ../../templates/show_playlist.inc.php:26
#, php-format
msgid "%s %s Playlist"
@@ -1397,8 +1409,8 @@ msgstr "Active Instance"
#: ../../templates/sidebar_localplay.inc.php:44
#: ../../templates/show_gather_art.inc.php:24
-#: ../../templates/show_adds_catalog.inc.php:25 ../../lib/ui.lib.php:571
-#: ../../lib/preferences.php:174 ../../lib/preferences.php:216
+#: ../../templates/show_adds_catalog.inc.php:26 ../../lib/ui.lib.php:571
+#: ../../lib/preferences.php:175 ../../lib/preferences.php:217
msgid "None"
msgstr "None"
@@ -1424,21 +1436,23 @@ msgid "Using Old Password Encryption, Please Reset your Password"
msgstr "Using Old Password Encryption, Please Reset your Password"
#: ../../templates/footer.inc.php:32
+#: ../../templates/show_login_form.inc.php:99
msgid "Queries:"
msgstr "Queries:"
#: ../../templates/footer.inc.php:32
+#: ../../templates/show_login_form.inc.php:99
msgid "Cache Hits:"
msgstr "Cache Hits:"
-#: ../../templates/show_videos.inc.php:37
-#: ../../templates/show_videos.inc.php:60
+#: ../../templates/show_videos.inc.php:38
+#: ../../templates/show_videos.inc.php:62
#: ../../templates/show_search.inc.php:79
msgid "Codec"
msgstr "Codec"
-#: ../../templates/show_videos.inc.php:38
-#: ../../templates/show_videos.inc.php:61
+#: ../../templates/show_videos.inc.php:39
+#: ../../templates/show_videos.inc.php:63
msgid "Resolution"
msgstr "Resolution"
@@ -1537,20 +1551,21 @@ msgstr "Advanced Options"
msgid "Search Again"
msgstr "Search Again"
-#: ../../templates/show_clean_catalog.inc.php:23
+#. HINT: Catalog Name
+#: ../../templates/show_clean_catalog.inc.php:24
#, php-format
msgid "Cleaning the %s Catalog"
msgstr "Cleaning the %s Catalog"
-#: ../../templates/show_clean_catalog.inc.php:25
+#: ../../templates/show_clean_catalog.inc.php:26
msgid "Checking"
msgstr "Checking"
-#: ../../templates/show_clean_catalog.inc.php:26
+#: ../../templates/show_clean_catalog.inc.php:27
#: ../../templates/show_run_add_catalog.inc.php:25
#: ../../templates/show_gather_art.inc.php:25
-#: ../../templates/show_adds_catalog.inc.php:26
-#: ../../templates/show_verify_catalog.inc.php:28
+#: ../../templates/show_adds_catalog.inc.php:27
+#: ../../templates/show_verify_catalog.inc.php:29
msgid "Reading"
msgstr "Reading"
@@ -1610,7 +1625,7 @@ msgid "Flag"
msgstr "Flag"
#: ../../templates/show_playtype_switch.inc.php:38
-#: ../../lib/preferences.php:184
+#: ../../lib/preferences.php:185
msgid "Flash Player"
msgstr "Flash Player"
@@ -1618,17 +1633,17 @@ msgstr "Flash Player"
msgid "Preference Administration"
msgstr "Preference Administration"
-#: ../../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
+#: ../../templates/show_install_config.inc.php:34
+#: ../../templates/show_install_lang.inc.php:35
+#: ../../templates/show_install.inc.php:35
+#: ../../templates/show_install_account.inc.php:34
msgid "Ampache Installation"
msgstr "Ampache Installation"
-#: ../../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
+#: ../../templates/show_install_config.inc.php:40
+#: ../../templates/show_install_lang.inc.php:42
+#: ../../templates/show_install.inc.php:43
+#: ../../templates/show_install_account.inc.php:41
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 "
@@ -1638,29 +1653,29 @@ 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:42
-#: ../../templates/show_install_lang.inc.php:44
-#: ../../templates/show_install.inc.php:44
-#: ../../templates/show_install_account.inc.php:43
+#: ../../templates/show_install_config.inc.php:43
+#: ../../templates/show_install_lang.inc.php:45
+#: ../../templates/show_install.inc.php:46
+#: ../../templates/show_install_account.inc.php:44
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: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"
+#: ../../templates/show_install_config.inc.php:44
+#: ../../templates/show_install_lang.inc.php:46
+#: ../../templates/show_install.inc.php:47
+#: ../../templates/show_install_account.inc.php:45
+#, fuzzy, php-format
+msgid "Your webserver has read access to the %s file and the %s file"
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:45
-#: ../../templates/show_install_lang.inc.php:48
-#: ../../templates/show_install.inc.php:48
-#: ../../templates/show_install_account.inc.php:46
+#: ../../templates/show_install_config.inc.php:47
+#: ../../templates/show_install_lang.inc.php:49
+#: ../../templates/show_install.inc.php:50
+#: ../../templates/show_install_account.inc.php:47
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 "
@@ -1672,18 +1687,18 @@ 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:49
-#: ../../templates/show_install.inc.php:53
-#: ../../templates/show_install_account.inc.php:49
+#: ../../templates/show_install_config.inc.php:51
+#: ../../templates/show_install.inc.php:55
+#: ../../templates/show_install_account.inc.php:50
msgid "Step 1 - Creating and Inserting the Ampache Database"
msgstr "Step 1 - Creating and Inserting the Ampache Database"
-#: ../../templates/show_install_config.inc.php:50
-#: ../../templates/show_install.inc.php:57
+#: ../../templates/show_install_config.inc.php:52
+#: ../../templates/show_install.inc.php:59
msgid "Step 2 - Creating the Ampache.cfg.php file"
msgstr "Step 2 - Creating the Ampache.cfg.php file"
-#: ../../templates/show_install_config.inc.php:52
+#: ../../templates/show_install_config.inc.php:54
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 "
@@ -1693,43 +1708,43 @@ msgstr ""
"will prompt you to download the config file. Please put the downloaded "
"config file in /config"
-#: ../../templates/show_install_config.inc.php:54
-#: ../../templates/show_install.inc.php:58
-#: ../../templates/show_install_account.inc.php:51
+#: ../../templates/show_install_config.inc.php:56
+#: ../../templates/show_install.inc.php:60
+#: ../../templates/show_install_account.inc.php:52
msgid "Step 3 - Setup Initial Account"
msgstr "Step 3 - Setup Initial Account"
-#: ../../templates/show_install_config.inc.php:58
+#: ../../templates/show_install_config.inc.php:60
msgid "Generate Config File"
msgstr "Generate Config File"
-#: ../../templates/show_install_config.inc.php:67
-#: ../../templates/show_install.inc.php:66
+#: ../../templates/show_install_config.inc.php:69
+#: ../../templates/show_install.inc.php:68
msgid "Desired Database Name"
msgstr "Desired Database Name"
-#: ../../templates/show_install_config.inc.php:71
-#: ../../templates/show_install.inc.php:70
+#: ../../templates/show_install_config.inc.php:73
+#: ../../templates/show_install.inc.php:72
msgid "MySQL Hostname"
msgstr "MySQL Hostname"
-#: ../../templates/show_install_config.inc.php:75
+#: ../../templates/show_install_config.inc.php:77
msgid "MySQL Username"
msgstr "MySQL Username"
-#: ../../templates/show_install_config.inc.php:79
+#: ../../templates/show_install_config.inc.php:81
msgid "MySQL Password"
msgstr "MySQL Password"
-#: ../../templates/show_install_config.inc.php:84
+#: ../../templates/show_install_config.inc.php:86
msgid "Write Config"
msgstr "Write Config"
-#: ../../templates/show_install_config.inc.php:125
+#: ../../templates/show_install_config.inc.php:127
msgid "Check for Config"
msgstr "Check for Config"
-#: ../../templates/show_install_config.inc.php:131
+#: ../../templates/show_install_config.inc.php:133
msgid "Continue to Step 3"
msgstr "Continue to Step 3"
@@ -1749,7 +1764,7 @@ msgstr "User is Offline Now"
msgid "Active Playlist"
msgstr "Active Playlist"
-#: ../../templates/show_user.inc.php:68 ../../templates/header.inc.php:36
+#: ../../templates/show_user.inc.php:68 ../../templates/header.inc.php:37
#: ../../templates/show_recently_played.inc.php:25
#: ../../lib/class/ampacherss.class.php:71
msgid "Recently Played"
@@ -1833,25 +1848,26 @@ msgstr "Server Config"
msgid "Required"
msgstr "Required"
-#: ../../templates/show_install_check.inc.php:106
+#: ../../templates/show_install_check.inc.php:112
msgid "Optional"
msgstr "Optional"
-#: ../../templates/show_install_check.inc.php:108
+#: ../../templates/show_install_check.inc.php:114
#: ../../templates/show_debug.inc.php:80
msgid "Gettext Support"
msgstr "Gettext Support"
-#: ../../templates/show_install_check.inc.php:112
+#: ../../templates/show_install_check.inc.php:118
msgid "Gettext Emulator will be used"
msgstr "Gettext Emulator will be used"
-#: ../../templates/show_install_check.inc.php:120
+#: ../../templates/show_install_check.inc.php:126
msgid "Mbstring Support"
msgstr "Mbstring Support"
-#: ../../templates/show_install_check.inc.php:124
-msgid "Multibyte Chracter may not detect correct"
+#: ../../templates/show_install_check.inc.php:130
+#, fuzzy
+msgid "Multibyte Character may not detect correct"
msgstr "Multibyte Chracter may not detect correct"
#: ../../templates/sidebar.inc.php:27 ../../lib/ui.lib.php:309
@@ -1867,20 +1883,20 @@ msgstr "Modules"
msgid "Logout"
msgstr "Logout"
-#: ../../templates/show_install_lang.inc.php:39
-#: ../../templates/show_install.inc.php:39
+#: ../../templates/show_install_lang.inc.php:40
+#: ../../templates/show_install.inc.php:41
msgid "Requirements"
msgstr "Requirements"
-#: ../../templates/show_install_lang.inc.php:54
+#: ../../templates/show_install_lang.inc.php:55
msgid "Minimum Requirements not met. Unable to Install Ampache."
msgstr "Minimum Requirements not met. Unable to Install Ampache."
-#: ../../templates/show_install_lang.inc.php:59
+#: ../../templates/show_install_lang.inc.php:60
msgid "Choose installation language."
msgstr "Choose installation language."
-#: ../../templates/show_install_lang.inc.php:80
+#: ../../templates/show_install_lang.inc.php:81
msgid "Start configuration"
msgstr "Start configuration"
@@ -1894,8 +1910,8 @@ msgstr "Add to New Playlist"
#: ../../templates/rightbar.inc.php:54
#: ../../templates/show_localplay_status.inc.php:47
-#: ../../templates/show_democratic.inc.php:42
#: ../../templates/show_democratic.inc.php:43
+#: ../../templates/show_democratic.inc.php:44
msgid "Clear Playlist"
msgstr "Clear Playlist"
@@ -1923,7 +1939,7 @@ msgstr "Related Tag"
msgid "More"
msgstr "More"
-#: ../../templates/header.inc.php:35
+#: ../../templates/header.inc.php:36
#: ../../templates/show_localplay_status.inc.php:27
#: ../../templates/show_now_playing.inc.php:33
#: ../../lib/class/localplay.class.php:639
@@ -1931,15 +1947,15 @@ msgstr "More"
msgid "Now Playing"
msgstr "Now Playing"
-#: ../../templates/header.inc.php:61
+#: ../../templates/header.inc.php:62
msgid "Log out"
msgstr "Log out"
-#: ../../templates/header.inc.php:77
+#: ../../templates/header.inc.php:78
msgid "Error Config File Out of Date"
msgstr "Error Config File Out of Date"
-#: ../../templates/header.inc.php:78
+#: ../../templates/header.inc.php:79
#: ../../templates/show_admin_tools.inc.php:92
msgid "Generate New Config"
msgstr "Generate New Config"
@@ -1959,7 +1975,8 @@ msgstr "Private"
msgid "Adding a New User"
msgstr "Adding a New User"
-#: ../../templates/show_genre.inc.php:29
+#. HINT: Genre Name
+#: ../../templates/show_genre.inc.php:30
#, php-format
msgid "Viewing %s Genre"
msgstr "Viewing %s Genre"
@@ -1976,16 +1993,17 @@ msgstr "Registration"
msgid "User Activated"
msgstr "User Activated"
-#: ../../templates/show_user_activate.inc.php:51
+#. HINT: Start A tag, End A tag
+#: ../../templates/show_user_activate.inc.php:52
#, php-format
msgid "This User ID is activated and can be used %sLogin%s"
msgstr "This User ID is activated and can be used %sLogin%s"
-#: ../../templates/show_user_activate.inc.php:54
+#: ../../templates/show_user_activate.inc.php:55
msgid "Validation Failed"
msgstr "Validation Failed"
-#: ../../templates/show_user_activate.inc.php:55
+#: ../../templates/show_user_activate.inc.php:56
msgid "The validation key used isn't correct"
msgstr "The validation key used isn't correct"
@@ -2017,8 +2035,8 @@ msgid "Gather Art"
msgstr "Gather Art"
#: ../../templates/show_create_democratic.inc.php:22
-#: ../../templates/show_democratic.inc.php:33
#: ../../templates/show_democratic.inc.php:34
+#: ../../templates/show_democratic.inc.php:35
msgid "Configure Democratic Playlist"
msgstr "Configure Democratic Playlist"
@@ -2129,6 +2147,7 @@ msgstr "Catalog Size"
msgid "Catalog Time"
msgstr "Catalog Time"
+#. HINT: Username
#: ../../templates/show_ip_history.inc.php:23
#, php-format
msgid "%s IP History"
@@ -2225,6 +2244,7 @@ msgstr "Recommended Songs"
msgid "Edit existing Shoutbox Post"
msgstr "Edit existing Shoutbox Post"
+#. HINT: Client link, Object link
#: ../../templates/show_edit_shout.inc.php:28
#, php-format
msgid "Created by: %s for %s"
@@ -2455,11 +2475,11 @@ msgid "Create"
msgstr "Create"
#: ../../templates/show_run_add_catalog.inc.php:24
-#: ../../templates/show_adds_catalog.inc.php:25
+#: ../../templates/show_adds_catalog.inc.php:26
msgid "Found"
msgstr "Found"
-#: ../../templates/show_install.inc.php:55
+#: ../../templates/show_install.inc.php:57
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 "
@@ -2469,55 +2489,47 @@ 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:62
+#: ../../templates/show_install.inc.php:64
msgid "Insert Ampache Database"
msgstr "Insert Ampache Database"
-#: ../../templates/show_install.inc.php:74
+#: ../../templates/show_install.inc.php:76
msgid "MySQL Administrative Username"
msgstr "MySQL Administrative Username"
-#: ../../templates/show_install.inc.php:78
+#: ../../templates/show_install.inc.php:80
msgid "MySQL Administrative Password"
msgstr "MySQL Administrative Password"
-#: ../../templates/show_install.inc.php:82
+#: ../../templates/show_install.inc.php:84
msgid "Create Database User for New Database"
msgstr "Create Database User for New Database"
-#: ../../templates/show_install.inc.php:86
+#: ../../templates/show_install.inc.php:88
msgid "Ampache Database Username"
msgstr "Ampache Database Username"
-#: ../../templates/show_install.inc.php:90
+#: ../../templates/show_install.inc.php:92
msgid "Ampache Database User Password"
msgstr "Ampache Database User Password"
-#: ../../templates/show_install.inc.php:94
+#: ../../templates/show_install.inc.php:96
msgid "Overwrite Existing"
msgstr "Overwrite Existing"
-#: ../../templates/show_install.inc.php:98
+#: ../../templates/show_install.inc.php:100
msgid "Use Existing Database"
msgstr "Use Existing Database"
-#: ../../templates/show_install.inc.php:103
+#: ../../templates/show_install.inc.php:105
msgid "Insert Database"
msgstr "Insert Database"
-#: ../../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 ""
-"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:50
+#: ../../templates/show_install_account.inc.php:51
msgid "Step 2 - Creating the ampache.cfg.php file"
msgstr "Step 2 - Creating the ampache.cfg.php file"
-#: ../../templates/show_install_account.inc.php:53
+#: ../../templates/show_install_account.inc.php:54
msgid ""
"This step creates your initial Ampache admin account. Once your admin "
"account has been created you will be directed to the login page"
@@ -2525,11 +2537,11 @@ 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:57
+#: ../../templates/show_install_account.inc.php:58
msgid "Create Admin Account"
msgstr "Create Admin Account"
-#: ../../templates/show_install_account.inc.php:74
+#: ../../templates/show_install_account.inc.php:75
msgid "Create Account"
msgstr "Create Account"
@@ -2714,7 +2726,8 @@ msgstr "Local Image"
msgid "Get Art"
msgstr "Get Art"
-#: ../../templates/show_adds_catalog.inc.php:23
+#. HINT: Catalog Name
+#: ../../templates/show_adds_catalog.inc.php:24
#, php-format
msgid "Starting New Song Search on %s catalog"
msgstr "Starting New Song Search on %s catalog"
@@ -2758,7 +2771,8 @@ msgstr "years ago"
#: ../../templates/show_recently_played.inc.php:101
#: ../../templates/show_duplicates.inc.php:37
#: ../../templates/show_duplicates.inc.php:76
-#: ../../templates/show_now_playing_row.inc.php:45
+#: ../../templates/show_lyrics_song.inc.php:42
+#: ../../templates/show_now_playing_row.inc.php:54
msgid "Song"
msgstr "Song"
@@ -2767,63 +2781,70 @@ msgstr "Song"
msgid "Last Played"
msgstr "Last Played"
-#: ../../templates/show_artist.inc.php:22
+#. HINT: Artist Fullname
+#: ../../templates/show_artist.inc.php:23
#, php-format
msgid "Albums by %s"
msgstr "Albums by %s"
-#: ../../templates/show_artist.inc.php:25
+#. HINT: Object type, Artist Fullname
+#: ../../templates/show_artist.inc.php:27
#, php-format
msgid "%s by %s"
msgstr "%s by %s"
-#: ../../templates/show_artist.inc.php:35
+#. HINT: Artist Fullname
+#: ../../templates/show_artist.inc.php:38
+#: ../../templates/show_artist.inc.php:39
#, php-format
msgid "Show All Songs By %s"
msgstr "Show All Songs By %s"
-#: ../../templates/show_artist.inc.php:38
+#: ../../templates/show_artist.inc.php:44
#, php-format
msgid "Add All Songs By %s"
msgstr "Add All Songs By %s"
-#: ../../templates/show_artist.inc.php:41
+#: ../../templates/show_artist.inc.php:49
#, php-format
msgid "Add Random Songs By %s"
msgstr "Add Random Songs By %s"
-#: ../../templates/show_artist.inc.php:45
+#: ../../templates/show_artist.inc.php:53
+#: ../../templates/show_artist.inc.php:54
#: ../../templates/show_album.inc.php:70 ../../templates/show_album.inc.php:71
msgid "Update from tags"
msgstr "Update from tags"
-#: ../../templates/show_democratic.inc.php:21
+#. HINT: Democratic Name
+#: ../../templates/show_democratic.inc.php:22
#, php-format
msgid "%s Playlist"
msgstr "%s Playlist"
-#: ../../templates/show_democratic.inc.php:21
+#: ../../templates/show_democratic.inc.php:22
#: ../../lib/class/browse.class.php:214
msgid "Democratic Playlist"
msgstr "Democratic Playlist"
-#: ../../templates/show_democratic.inc.php:39
+#: ../../templates/show_democratic.inc.php:40
msgid "Play Democratic Playlist"
msgstr "Play Democratic Playlist"
-#: ../../templates/show_verify_catalog.inc.php:23
+#. HINT: Catalog Name
+#: ../../templates/show_verify_catalog.inc.php:24
#, php-format
msgid "Updating the %s catalog"
msgstr "Updating the %s catalog"
-#: ../../templates/show_verify_catalog.inc.php:25
+#: ../../templates/show_verify_catalog.inc.php:26
#, php-format
msgid "%d item found checking tag information"
msgid_plural "%d items found checking tag information"
msgstr[0] "%d item found checking tag information"
msgstr[1] "%d items found checking tag information"
-#: ../../templates/show_verify_catalog.inc.php:27
+#: ../../templates/show_verify_catalog.inc.php:28
msgid "Verifed"
msgstr "Verifed"
@@ -2861,13 +2882,13 @@ msgstr ""
"Functions are disabled in the demo because previous users of the demo have "
"used the functionality to post inappropriate materials"
-#: ../../templates/show_album.inc.php:27 ../../lib/class/album.class.php:244
+#: ../../templates/show_album.inc.php:27 ../../lib/class/album.class.php:245
msgid "Disk"
msgstr "Disk"
#: ../../templates/show_album.inc.php:34
-#: ../../lib/class/catalog.class.php:1981
-#: ../../lib/class/catalog.class.php:2052
+#: ../../lib/class/catalog.class.php:1994
+#: ../../lib/class/catalog.class.php:2097
msgid "Unknown (Orphaned)"
msgstr "Unknown (Orphaned)"
@@ -2887,12 +2908,13 @@ msgstr "Reset Album Art"
msgid "Find Album Art"
msgstr "Find Album Art"
+#. HINT: Song Title
#: ../../templates/show_lyrics.inc.php:33
#, php-format
msgid "%s Lyrics"
msgstr "%s Lyrics"
-#: ../../templates/show_lyrics.inc.php:39 ../../lib/class/artist.class.php:358
+#: ../../templates/show_lyrics.inc.php:40 ../../lib/class/artist.class.php:359
msgid "Sorry Lyrics Not Found."
msgstr "Sorry Lyrics Not Found."
@@ -2900,19 +2922,19 @@ msgstr "Sorry Lyrics Not Found."
msgid "Add Localplay Instance"
msgstr "Add Localplay Instance"
-#: ../../templates/show_login_form.inc.php:65
+#: ../../templates/show_login_form.inc.php:66
msgid "Remember Me"
msgstr "Remember Me"
-#: ../../templates/show_login_form.inc.php:72
+#: ../../templates/show_login_form.inc.php:73
msgid "Login"
msgstr "Login"
-#: ../../templates/show_login_form.inc.php:77
+#: ../../templates/show_login_form.inc.php:78
msgid "Register"
msgstr "Register"
-#: ../../templates/show_login_form.inc.php:89
+#: ../../templates/show_login_form.inc.php:90
msgid "Message of the Day"
msgstr "Message of the Day"
@@ -2958,7 +2980,7 @@ msgstr "Bitrate"
msgid "Last Updated"
msgstr "Last Updated"
-#: ../../templates/show_song.inc.php:57 ../../lib/class/catalog.class.php:1342
+#: ../../templates/show_song.inc.php:57 ../../lib/class/catalog.class.php:1348
#: ../../admin/access.php:93
msgid "Added"
msgstr "Added"
@@ -2973,7 +2995,7 @@ msgid "Remove"
msgstr "Remove"
#: ../../templates/show_edit_album_row.inc.php:35
-#: ../../lib/class/album.class.php:256 ../../lib/class/album.class.php:257
+#: ../../lib/class/album.class.php:257 ../../lib/class/album.class.php:258
msgid "Various"
msgstr "Various"
@@ -3018,11 +3040,13 @@ msgstr "Clean All"
msgid "Update All"
msgstr "Update All"
+#. HINT: /data/myNewMusic
#: ../../templates/show_manage_catalogs.inc.php:38
#, php-format
msgid "Add From %s"
msgstr "Add From %s"
+#. HINT: /data/myUpdatedMusic
#: ../../templates/show_manage_catalogs.inc.php:40
#, php-format
msgid "Update From %s"
@@ -3081,6 +3105,7 @@ msgstr "End Address"
msgid "Key"
msgstr "Key"
+#. HINT: Artist Name
#: ../../templates/show_rename_artist.inc.php:29
#, php-format
msgid "Rename %s"
@@ -3230,6 +3255,10 @@ msgstr "Iconv Support"
msgid "Current Configuration"
msgstr "Current Configuration"
+#: ../../templates/show_now_playing_row.inc.php:46
+msgid "Show Lyrics"
+msgstr "Show Lyrics"
+
#: ../../templates/sidebar_modules.inc.php:27
msgid "Localplay Modules"
msgstr "Localplay Modules"
@@ -3312,7 +3341,7 @@ msgstr "Your passwords do not match"
msgid "Error Username already exists"
msgstr "Error Username already exists"
-#: ../../register.php:159
+#: ../../register.php:159 ../../admin/users.php:117
msgid "Error: Insert Failed"
msgstr "Error: Insert Failed"
@@ -3320,15 +3349,15 @@ msgstr "Error: Insert Failed"
msgid "User Disabled please contact Admin"
msgstr "User Disabled please contact Admin"
-#: ../../login.php:87
+#: ../../login.php:89
msgid "Unable to create new account"
msgstr "Unable to create new account"
-#: ../../login.php:95
+#: ../../login.php:98
msgid "No local account found"
msgstr "No local account found"
-#: ../../login.php:112
+#: ../../login.php:115
msgid "User Already Logged in"
msgstr "User Already Logged in"
@@ -3466,12 +3495,12 @@ msgstr "Paused"
msgid "Primary"
msgstr "Primary"
-#: ../../lib/class/artist.class.php:345
+#: ../../lib/class/artist.class.php:346
msgid "Fault"
msgstr "Fault"
-#: ../../lib/class/artist.class.php:353 ../../lib/class/catalog.class.php:1234
-#: ../../admin/users.php:142
+#: ../../lib/class/artist.class.php:354 ../../lib/class/catalog.class.php:1240
+#: ../../admin/users.php:143
msgid "Error"
msgstr "Error"
@@ -3485,7 +3514,7 @@ msgstr "Error Username Required"
msgid "Error Passwords don't match"
msgstr "Error Passwords don't match"
-#: ../../lib/class/album.class.php:489 ../../lib/class/catalog.class.php:462
+#: ../../lib/class/album.class.php:490 ../../lib/class/catalog.class.php:462
msgid "Error: Unable to open"
msgstr "Error: Unable to open"
@@ -3513,153 +3542,158 @@ msgstr "Running Remote Sync"
msgid "Error: Unable to change to directory"
msgstr "Error: Unable to change to directory"
-#: ../../lib/class/catalog.class.php:548
+#. HINT: FullFile
+#: ../../lib/class/catalog.class.php:549
#, php-format
msgid "Error: Unable to get filesize for %s"
msgstr "Error: Unable to get filesize for %s"
-#: ../../lib/class/catalog.class.php:554
+#. HINT: FullFile
+#: ../../lib/class/catalog.class.php:556
#, php-format
msgid "%s is not readable by ampache"
msgstr "%s is not readable by ampache"
-#: ../../lib/class/catalog.class.php:562
+#. HINT: FullFile
+#: ../../lib/class/catalog.class.php:565
#, php-format
msgid "%s does not match site charset"
msgstr "%s does not match site charset"
-#: ../../lib/class/catalog.class.php:1029
-#: ../../lib/class/catalog.class.php:1922 ../../preferences.php:111
+#: ../../lib/class/catalog.class.php:1032
+#: ../../lib/class/catalog.class.php:1936 ../../preferences.php:111
#: ../../admin/access.php:109
msgid "Updated"
msgstr "Updated"
-#: ../../lib/class/catalog.class.php:1036
+#: ../../lib/class/catalog.class.php:1039
msgid "No Update Needed"
msgstr "No Update Needed"
-#: ../../lib/class/catalog.class.php:1163
+#: ../../lib/class/catalog.class.php:1169
msgid "Running Remote Update"
msgstr "Running Remote Update"
-#: ../../lib/class/catalog.class.php:1190
+#: ../../lib/class/catalog.class.php:1196
msgid "Added Playlist From"
msgstr "Added Playlist From"
-#: ../../lib/class/catalog.class.php:1219
+#: ../../lib/class/catalog.class.php:1225
msgid "Catalog Update Finished"
msgstr "Catalog Update Finished"
-#: ../../lib/class/catalog.class.php:1219
+#: ../../lib/class/catalog.class.php:1225
msgid "Total Time"
msgstr "Total Time"
-#: ../../lib/class/catalog.class.php:1220
+#: ../../lib/class/catalog.class.php:1226
msgid "Total Songs"
msgstr "Total Songs"
-#: ../../lib/class/catalog.class.php:1220
+#: ../../lib/class/catalog.class.php:1226
msgid "Songs Per Seconds"
msgstr "Songs Per Seconds"
-#: ../../lib/class/catalog.class.php:1234
+#: ../../lib/class/catalog.class.php:1240
msgid "Unable to load pear XMLRPC library, make sure XML-RPC is enabled"
msgstr "Unable to load pear XMLRPC library, make sure XML-RPC is enabled"
-#: ../../lib/class/catalog.class.php:1272
-#: ../../lib/class/catalog.class.php:1346
-#: ../../lib/class/catalog.class.php:1379
-#: ../../lib/class/catalog.class.php:2343
+#: ../../lib/class/catalog.class.php:1278
+#: ../../lib/class/catalog.class.php:1352
+#: ../../lib/class/catalog.class.php:1385
+#: ../../lib/class/catalog.class.php:2395
#: ../../lib/class/xmlrpcclient.class.php:64
#: ../../lib/class/xmlrpcclient.class.php:97
msgid "Error connecting to"
msgstr "Error connecting to"
-#: ../../lib/class/catalog.class.php:1272
-#: ../../lib/class/catalog.class.php:1346
-#: ../../lib/class/catalog.class.php:1379
-#: ../../lib/class/catalog.class.php:2343
+#: ../../lib/class/catalog.class.php:1278
+#: ../../lib/class/catalog.class.php:1352
+#: ../../lib/class/catalog.class.php:1385
+#: ../../lib/class/catalog.class.php:2395
#: ../../lib/class/xmlrpcclient.class.php:64
#: ../../lib/class/xmlrpcclient.class.php:97
msgid "Code"
msgstr "Code"
-#: ../../lib/class/catalog.class.php:1272
-#: ../../lib/class/catalog.class.php:1346
-#: ../../lib/class/catalog.class.php:1379
-#: ../../lib/class/catalog.class.php:2343
+#: ../../lib/class/catalog.class.php:1278
+#: ../../lib/class/catalog.class.php:1352
+#: ../../lib/class/catalog.class.php:1385
+#: ../../lib/class/catalog.class.php:2395
#: ../../lib/class/xmlrpcclient.class.php:64
msgid "Reason"
msgstr "Reason"
-#: ../../lib/class/catalog.class.php:1301
+#: ../../lib/class/catalog.class.php:1307
msgid "Completed updating remote catalog(s)"
msgstr "Completed updating remote catalog(s)"
-#: ../../lib/class/catalog.class.php:1305
+#: ../../lib/class/catalog.class.php:1311
msgid "Starting synchronisation of album images"
msgstr "Starting synchronisation of album images"
-#: ../../lib/class/catalog.class.php:1307
+#: ../../lib/class/catalog.class.php:1313
msgid "Completed synchronisation of album images"
msgstr "Completed synchronisation of album images"
-#: ../../lib/class/catalog.class.php:1375
+#: ../../lib/class/catalog.class.php:1381
msgid "images synchronized: "
msgstr "images synchronized: "
-#: ../../lib/class/catalog.class.php:1506
+#: ../../lib/class/catalog.class.php:1515
msgid "Catalog Root unreadable, stopping clean"
msgstr "Catalog Root unreadable, stopping clean"
-#: ../../lib/class/catalog.class.php:1542
+#: ../../lib/class/catalog.class.php:1551
msgid "Error File Not Found or 0 Bytes:"
msgstr "Error File Not Found or 0 Bytes:"
-#: ../../lib/class/catalog.class.php:1564
+#: ../../lib/class/catalog.class.php:1573
msgid "Error Remote File Not Found or 0 Bytes:"
msgstr "Error Remote File Not Found or 0 Bytes:"
-#: ../../lib/class/catalog.class.php:1583
+#: ../../lib/class/catalog.class.php:1592
msgid "Error All songs would be removed, doing nothing"
msgstr "Error All songs would be removed, doing nothing"
-#: ../../lib/class/catalog.class.php:1611
+#: ../../lib/class/catalog.class.php:1620
#, php-format
msgid "Catalog Clean Done. %d file removed."
msgid_plural "Catalog Clean Done. %d files removed."
msgstr[0] "Catalog Clean Done. %d file removed."
msgstr[1] "Catalog Clean Done. %d files removed."
-#: ../../lib/class/catalog.class.php:1613
+#: ../../lib/class/catalog.class.php:1622
msgid "Optimizing Tables"
msgstr "Optimizing Tables"
-#: ../../lib/class/catalog.class.php:1900
+#. HINT: Mediafile
+#: ../../lib/class/catalog.class.php:1914
#, php-format
msgid "%s does not exist or is not readable"
msgstr "%s does not exist or is not readable"
-#: ../../lib/class/catalog.class.php:1922
+#: ../../lib/class/catalog.class.php:1936
msgid "Update Finished"
msgstr "Update Finished"
-#: ../../lib/class/catalog.class.php:1922
+#: ../../lib/class/catalog.class.php:1936
msgid "Checked"
msgstr "Checked"
-#: ../../lib/class/catalog.class.php:2441
+#: ../../lib/class/catalog.class.php:2493
msgid "Playlist creation error."
msgstr "Playlist creation error."
-#: ../../lib/class/catalog.class.php:2448
+#: ../../lib/class/catalog.class.php:2500
#, php-format
msgid "Playlist Import and Recreate Successful. Total: %d Song"
msgid_plural "Playlist Import and Recreate Successful. Total: %d Songs"
msgstr[0] "Playlist Import and Recreate Successful. Total: %d Song"
msgstr[1] "Playlist Import and Recreate Successful. Total: %d Songs"
-#: ../../lib/class/catalog.class.php:2454
+#. HINT: filename
+#: ../../lib/class/catalog.class.php:2506
#, php-format
msgid "Parsing %s - Not Found: %d Song. Please check your m3u file."
msgid_plural "Parsing %s - Not Found: %d Songs. Please check your m3u file."
@@ -3680,12 +3714,13 @@ msgstr "Error Username or Password incorrect, please try again"
msgid "From: Ampache "
msgstr "From: Ampache "
-#: ../../lib/class/registration.class.php:55
+#. HINT: Site Title
+#: ../../lib/class/registration.class.php:56
#, php-format
msgid "New User Registration at %s"
msgstr "New User Registration at %s"
-#: ../../lib/class/registration.class.php:68
+#: ../../lib/class/registration.class.php:69
#, php-format
msgid ""
"Thank you for registering\n"
@@ -3722,7 +3757,7 @@ msgstr ""
"\n"
"Thank you for registering\n"
-#: ../../lib/class/registration.class.php:98
+#: ../../lib/class/registration.class.php:99
#, php-format
msgid ""
"A new user has registered\n"
@@ -3741,59 +3776,59 @@ msgstr ""
"E-mail: %s\n"
"\n"
-#: ../../lib/general.lib.php:405
+#: ../../lib/general.lib.php:406
msgid "On"
msgstr "On"
-#: ../../lib/general.lib.php:408
+#: ../../lib/general.lib.php:409
msgid "Off"
msgstr "Off"
-#: ../../lib/preferences.php:191
+#: ../../lib/preferences.php:192
msgid "M3U"
msgstr "M3U"
-#: ../../lib/preferences.php:192
+#: ../../lib/preferences.php:193
msgid "Simple M3U"
msgstr "Simple M3U"
-#: ../../lib/preferences.php:193
+#: ../../lib/preferences.php:194
msgid "PLS"
msgstr "PLS"
-#: ../../lib/preferences.php:194
+#: ../../lib/preferences.php:195
msgid "Asx"
msgstr "Asx"
-#: ../../lib/preferences.php:195
+#: ../../lib/preferences.php:196
msgid "RAM"
msgstr "RAM"
-#: ../../lib/preferences.php:196
+#: ../../lib/preferences.php:197
msgid "XSPF"
msgstr "XSPF"
-#: ../../lib/preferences.php:230
+#: ../../lib/preferences.php:231
msgid "Disabled"
msgstr "Disabled"
-#: ../../lib/preferences.php:232
+#: ../../lib/preferences.php:233
msgid "Manager"
msgstr "Manager"
-#: ../../lib/preferences.php:252
+#: ../../lib/preferences.php:254
msgid "Send on Add"
msgstr "Send on Add"
-#: ../../lib/preferences.php:253
+#: ../../lib/preferences.php:255
msgid "Send and Clear on Add"
msgstr "Send and Clear on Add"
-#: ../../lib/preferences.php:254
+#: ../../lib/preferences.php:256
msgid "Clear on Send"
msgstr "Clear on Send"
-#: ../../lib/preferences.php:263
+#: ../../lib/preferences.php:265
msgid "Always"
msgstr "Always"
@@ -3829,12 +3864,12 @@ msgstr "Invalid Object Selected"
msgid "Error Invalid Handshake - "
msgstr "Error Invalid Handshake - "
-#: ../../server/xml.server.php:346 ../../server/xml.server.php:395
-#: ../../server/xml.server.php:403
+#: ../../server/xml.server.php:345 ../../server/xml.server.php:394
+#: ../../server/xml.server.php:402
msgid "Invalid Request"
msgstr "Invalid Request"
-#: ../../server/xml.server.php:361 ../../server/xml.server.php:374
+#: ../../server/xml.server.php:360 ../../server/xml.server.php:373
msgid "Media Object Invalid or Not Specified"
msgstr "Media Object Invalid or Not Specified"
@@ -3858,7 +3893,7 @@ msgstr "Session Expired: please log in again at"
msgid "Radio Station Added"
msgstr "Radio Station Added"
-#: ../../install.php:182
+#: ../../install.php:184
msgid "Error: Config file not found or Unreadable"
msgstr "Error: Config file not found or Unreadable"
@@ -3994,11 +4029,11 @@ msgstr "Playlist File"
msgid "Local Path to Files"
msgstr "Local Path to Files"
-#: ../../admin/mail.php:90
+#: ../../admin/mail.php:79
msgid "E-mail Sent"
msgstr "E-mail Sent"
-#: ../../admin/mail.php:91
+#: ../../admin/mail.php:80
msgid "Your E-mail was successfully sent."
msgstr "Your E-mail was successfully sent."
@@ -4110,40 +4145,52 @@ msgstr "User Updated"
msgid "updated"
msgstr "updated"
-#: ../../admin/users.php:129
+#. HINT: %1 Username, %2 Access num
+#: ../../admin/users.php:130
msgid "New User Added"
msgstr "New User Added"
-#: ../../admin/users.php:134
+#: ../../admin/users.php:130
+#, php-format
+msgid "%1$s has been created with an access level of %2$s"
+msgstr ""
+
+#: ../../admin/users.php:135
msgid "User Enabled"
msgstr "User Enabled"
-#: ../../admin/users.php:139
+#: ../../admin/users.php:140
msgid "User Disabled"
msgstr "User Disabled"
-#: ../../admin/users.php:142
+#: ../../admin/users.php:143
msgid "Unable to Disabled last Administrator"
msgstr "Unable to Disabled last Administrator"
-#: ../../admin/users.php:154
+#: ../../admin/users.php:155
msgid "User Deleted"
msgstr "User Deleted"
-#: ../../admin/users.php:157
+#: ../../admin/users.php:155
+#, fuzzy, php-format
+msgid "%s has been Deleted"
+msgstr " has been created"
+
+#: ../../admin/users.php:158
msgid "Delete Error"
msgstr "Delete Error"
-#: ../../admin/users.php:157
+#: ../../admin/users.php:158
msgid "Unable to delete last Admin User"
msgstr "Unable to delete last Admin User"
-#: ../../admin/users.php:163
+#: ../../admin/users.php:164
msgid "Deletion Request"
msgstr "Deletion Request"
-#: ../../admin/users.php:164
-msgid "Are you sure you want to permanently delete"
+#: ../../admin/users.php:165
+#, fuzzy, php-format
+msgid "Are you sure you want to permanently delete %s?"
msgstr "Are you sure you want to permanently delete"
#: ../../admin/system.php:49
@@ -4158,84 +4205,96 @@ msgstr ""
"Your Database and associated tables have been updated to match your "
"currently configured charset"
-#: ../../admin/catalog.php:53 ../../admin/catalog.php:73
-#: ../../admin/catalog.php:98 ../../admin/catalog.php:170
+#: ../../admin/catalog.php:54 ../../admin/catalog.php:74
+#: ../../admin/catalog.php:99 ../../admin/catalog.php:171
msgid "Catalog Updated"
msgstr "Catalog Updated"
-#: ../../admin/catalog.php:115
+#: ../../admin/catalog.php:116
msgid "Catalog Deleted"
msgstr "Catalog Deleted"
-#: ../../admin/catalog.php:115
+#: ../../admin/catalog.php:116
msgid "The Catalog and all associated records have been deleted"
msgstr "The Catalog and all associated records have been deleted"
-#: ../../admin/catalog.php:121
+#: ../../admin/catalog.php:122
msgid "Catalog Delete"
msgstr "Catalog Delete"
-#: ../../admin/catalog.php:121
+#: ../../admin/catalog.php:122
msgid "Confirm Deletion Request"
msgstr "Confirm Deletion Request"
-#: ../../admin/catalog.php:130
+#: ../../admin/catalog.php:131
msgid "Song Removed"
msgid_plural "Songs Removed"
msgstr[0] "Song Removed"
msgstr[1] "Songs Removed"
-#: ../../admin/catalog.php:133
+#: ../../admin/catalog.php:134
msgid "No Songs Removed"
msgstr "No Songs Removed"
-#: ../../admin/catalog.php:136
+#: ../../admin/catalog.php:137
msgid "Disabled Song Processed"
msgid_plural "Disabled Songs Processed"
msgstr[0] "Disabled Song Processed"
msgstr[1] "Disabled Songs Processed"
-#: ../../admin/catalog.php:157
+#: ../../admin/catalog.php:158
msgid "Catalog Cleaned"
msgstr "Catalog Cleaned"
-#: ../../admin/catalog.php:214
+#: ../../admin/catalog.php:202
+msgid "Error: Name and path not specified"
+msgstr ""
+
+#: ../../admin/catalog.php:206
+msgid "Error: Remote selected, but path is not a URL"
+msgstr ""
+
+#: ../../admin/catalog.php:210
+msgid "Error: Remote Catalog specified, but no key provided"
+msgstr ""
+
+#: ../../admin/catalog.php:215
msgid "Error: Defined Path is inside an existing catalog"
msgstr "Error: Defined Path is inside an existing catalog"
-#: ../../admin/catalog.php:233
+#: ../../admin/catalog.php:234
msgid "Catalog Created"
msgstr "Catalog Created"
-#: ../../admin/catalog.php:250
+#: ../../admin/catalog.php:251
msgid "Catalog statistics cleared"
msgstr "Catalog statistics cleared"
-#: ../../admin/catalog.php:263
+#: ../../admin/catalog.php:264
msgid "Now Playing Cleared"
msgstr "Now Playing Cleared"
-#: ../../admin/catalog.php:263
+#: ../../admin/catalog.php:264
msgid "All now playing data has been cleared"
msgstr "All now playing data has been cleared"
-#: ../../admin/catalog.php:273
+#: ../../admin/catalog.php:275
msgid "No Disabled songs found"
msgstr "No Disabled songs found"
-#: ../../admin/catalog.php:282
+#: ../../admin/catalog.php:284
msgid "Delete Catalog"
msgstr "Delete Catalog"
-#: ../../admin/catalog.php:282
+#: ../../admin/catalog.php:284
msgid "Do you really want to delete this catalog?"
msgstr "Do you really want to delete this catalog?"
-#: ../../admin/catalog.php:302
+#: ../../admin/catalog.php:304
msgid "Album Art Search Finished"
msgstr "Album Art Search Finished"
-#: ../../bin/print_tags.inc:66
+#: ../../bin/print_tags.inc:68
msgid ""
"[print_tags.php.inc]\n"
"This commandline script will display the tag information for the specified "
@@ -4249,7 +4308,7 @@ msgstr ""
"appear to Ampache. \n"
" \n"
-#: ../../bin/print_tags.inc:72
+#: ../../bin/print_tags.inc:74
msgid "Filename:"
msgstr "Filename:"
@@ -4361,6 +4420,9 @@ msgstr "Interface"
msgid "System"
msgstr "System"
-#: Database words
-msgid "Show Lyrics"
-msgstr "Show Lyrics"
+#~ msgid ""
+#~ "Your webserver has read access to the /sql/ampache.sql file and the /"
+#~ "config/ampache.cfg.dist.php file"
+#~ msgstr ""
+#~ "Your webserver has read access to the /sql/ampache.sql file and the /"
+#~ "config/ampache.cfg.dist.php file"