Updated: message sync from r1893

2 files changed, 31 insertions, 30 deletions

diff --git a/locale/en_GB/LC_MESSAGES/messages.mo b/locale/en_GB/LC_MESSAGES/messages.mo
index 3084f68b..bfc761d3 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 897be6b9..5b9dee0f 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 3.5.0\n"
 "Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2009-02-19 11:31+0900\n"
+"POT-Creation-Date: 2009-02-23 07:53+0900\n"
 "PO-Revision-Date: 2009-02-02 07:46+0900\n"
 "Last-Translator: momo-i <webmaster at momo-i.org>\n"
 "Language-Team: English (British)\n"
@@ -145,8 +145,8 @@ 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:30
 #: ../../templates/show_democratic.inc.php:31
+#: ../../templates/show_democratic.inc.php:32
 msgid "Play"
 msgstr "Play"
 
@@ -519,8 +519,8 @@ msgid "Never"
 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:667 ../../lib/general.lib.php:337
+#: ../../lib/class/flag.class.php:332 ../../lib/class/localplay.class.php:648
+#: ../../lib/class/user.class.php:667 ../../lib/general.lib.php:338
 #: ../../modules/localplay/mpd.controller.php:511
 #: ../../modules/localplay/httpq.controller.php:507
 msgid "Unknown"
@@ -571,7 +571,7 @@ msgstr "User Access Level"
 #: ../../templates/show_preference_box.inc.php:58
 #: ../../templates/show_preference_admin.inc.php:41
 #: ../../templates/show_add_user.inc.php:74
-#: ../../lib/class/democratic.class.php:102 ../../admin/users.php:125
+#: ../../lib/class/democratic.class.php:103 ../../admin/users.php:125
 msgid "Guest"
 msgstr "Guest"
 
@@ -591,7 +591,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:105 ../../lib/preferences.php:231
+#: ../../lib/class/democratic.class.php:106 ../../lib/preferences.php:231
 #: ../../admin/users.php:126
 msgid "User"
 msgstr "User"
@@ -600,7 +600,7 @@ msgstr "User"
 #: ../../templates/show_preference_box.inc.php:60
 #: ../../templates/show_add_user.inc.php:76
 #: ../../templates/show_create_democratic.inc.php:42
-#: ../../lib/class/democratic.class.php:108
+#: ../../lib/class/democratic.class.php:109
 msgid "Content Manager"
 msgstr "Content Manager"
 
@@ -608,7 +608,7 @@ msgstr "Content Manager"
 #: ../../templates/show_preference_box.inc.php:61
 #: ../../templates/show_add_user.inc.php:77
 #: ../../templates/show_create_democratic.inc.php:43
-#: ../../lib/class/democratic.class.php:111
+#: ../../lib/class/democratic.class.php:112
 msgid "Catalog Manager"
 msgstr "Catalog Manager"
 
@@ -620,7 +620,7 @@ msgstr "Catalog Manager"
 #: ../../templates/show_democratic_playlist.inc.php:60
 #: ../../templates/show_democratic_playlist.inc.php:100
 #: ../../templates/show_mail_users.inc.php:32
-#: ../../lib/class/democratic.class.php:114 ../../lib/preferences.php:233
+#: ../../lib/class/democratic.class.php:115 ../../lib/preferences.php:233
 #: ../../admin/users.php:127
 msgid "Admin"
 msgstr "Admin"
@@ -1433,7 +1433,7 @@ msgstr "Reason to flag"
 #: ../../templates/show_playlist_song_row.inc.php:38
 #: ../../templates/show_playlist_row.inc.php:38
 #: ../../templates/show_admin_tools.inc.php:53
-#: ../../lib/class/flag.class.php:270
+#: ../../lib/class/flag.class.php:320
 msgid "Delete"
 msgstr "Delete"
 
@@ -1441,11 +1441,11 @@ msgstr "Delete"
 msgid "Incorrect Tags"
 msgstr "Incorrect Tags"
 
-#: ../../templates/show_flag.inc.php:58 ../../lib/class/flag.class.php:276
+#: ../../templates/show_flag.inc.php:58 ../../lib/class/flag.class.php:326
 msgid "Re-encode"
 msgstr "Re-encode"
 
-#: ../../templates/show_flag.inc.php:59 ../../lib/class/flag.class.php:279
+#: ../../templates/show_flag.inc.php:59 ../../lib/class/flag.class.php:329
 msgid "Other"
 msgstr "Other"
 
@@ -1782,8 +1782,8 @@ msgstr "Add to New Playlist"
 
 #: ../../templates/rightbar.inc.php:54
 #: ../../templates/show_localplay_status.inc.php:47
-#: ../../templates/show_democratic.inc.php:34
 #: ../../templates/show_democratic.inc.php:35
+#: ../../templates/show_democratic.inc.php:36
 msgid "Clear Playlist"
 msgstr "Clear Playlist"
 
@@ -1913,7 +1913,7 @@ msgid "Cooldown Time"
 msgstr "Cooldown Time"
 
 #: ../../templates/show_create_democratic.inc.php:35
-#: ../../lib/class/democratic.class.php:97
+#: ../../lib/class/democratic.class.php:98
 msgid "minutes"
 msgstr "minutes"
 
@@ -2652,8 +2652,8 @@ msgid "Disk"
 msgstr "Disk"
 
 #: ../../templates/show_album.inc.php:34
-#: ../../lib/class/catalog.class.php:1887
-#: ../../lib/class/catalog.class.php:1958
+#: ../../lib/class/catalog.class.php:1909
+#: ../../lib/class/catalog.class.php:1980
 msgid "Unknown (Orphaned)"
 msgstr "Unknown (Orphaned)"
 
@@ -3203,15 +3203,15 @@ msgstr "IP Address Version Mismatch"
 msgid "API/RPC"
 msgstr "API/RPC"
 
-#: ../../lib/class/flag.class.php:257
+#: ../../lib/class/flag.class.php:307
 msgid "Approved"
 msgstr "Approved"
 
-#: ../../lib/class/flag.class.php:258
+#: ../../lib/class/flag.class.php:308
 msgid "Pending"
 msgstr "Pending"
 
-#: ../../lib/class/flag.class.php:273
+#: ../../lib/class/flag.class.php:323
 msgid "Re-Tag"
 msgstr "Re-Tag"
 
@@ -3223,7 +3223,7 @@ msgstr "Stopped"
 msgid "Paused"
 msgstr "Paused"
 
-#: ../../lib/class/democratic.class.php:98
+#: ../../lib/class/democratic.class.php:99
 msgid "Primary"
 msgstr "Primary"
 
@@ -3280,7 +3280,8 @@ msgstr "%s is not readable by ampache"
 msgid "%s does not match site charset"
 msgstr "%s does not match site charset"
 
-#: ../../lib/class/catalog.class.php:981 ../../preferences.php:111
+#: ../../lib/class/catalog.class.php:981
+#: ../../lib/class/catalog.class.php:1850 ../../preferences.php:111
 #: ../../admin/access.php:109
 msgid "Updated"
 msgstr "Updated"
@@ -3380,18 +3381,15 @@ msgstr "files removed"
 msgid "Optimizing Tables"
 msgstr "Optimizing Tables"
 
-#: ../../lib/class/catalog.class.php:1828
-msgid "Update Finished."
+#: ../../lib/class/catalog.class.php:1850
+#, fuzzy
+msgid "Update Finished"
 msgstr "Update Finished."
 
-#: ../../lib/class/catalog.class.php:1828
+#: ../../lib/class/catalog.class.php:1850
 msgid "Checked"
 msgstr "Checked"
 
-#: ../../lib/class/catalog.class.php:1828
-msgid "songs updated."
-msgstr "songs updated."
-
 #: ../../lib/class/random.class.php:410
 msgid "Related Genre"
 msgstr "Related Genre"
@@ -3471,11 +3469,11 @@ msgstr ""
 "E-mail: %s\n"
 "\n"
 
-#: ../../lib/general.lib.php:396
+#: ../../lib/general.lib.php:397
 msgid "On"
 msgstr "On"
 
-#: ../../lib/general.lib.php:399
+#: ../../lib/general.lib.php:400
 msgid "Off"
 msgstr "Off"
 
@@ -4059,6 +4057,9 @@ msgstr "Interface"
 msgid "System"
 msgstr "System"
 
+#~ msgid "songs updated."
+#~ msgstr "songs updated."
+
 #~ msgid "Play Random Selection"
 #~ msgstr "Play Random Selection"