Updated: merge from r1937

2 files changed, 361 insertions, 305 deletions

diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index cf054b81..55d0ccf8 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.mo
+++ b/locale/ja_JP/LC_MESSAGES/messages.mo
diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po
index acc7f411..fd122b78 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/locale/ja_JP/LC_MESSAGES/messages.po
@@ -1,6 +1,6 @@
 # Japanese translations for Ampache package
 # Ampache.
-# Copyright (C) 2008 Ampache.org
+# Copyright (C) 2009 Ampache.org
 # This file is distributed under the same license as the Ampache package.
 # momo-i <webmaster at momo-i.org>, 2008.
 #
@@ -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: 2009-02-24 14:20+0900\n"
+"POT-Creation-Date: 2009-03-09 08:54+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"
@@ -31,10 +31,10 @@ msgstr "エラー: キーワードが何も入力されていません"
 #: ../../templates/show_live_streams.inc.php:57
 #: ../../templates/show_playlists.inc.php:34
 #: ../../templates/show_playlists.inc.php:57
-#: ../../templates/show_videos.inc.php:34
-#: ../../templates/show_videos.inc.php:56
+#: ../../templates/show_videos.inc.php:35
+#: ../../templates/show_videos.inc.php:58
 #: ../../templates/show_add_live_stream.inc.php:68
-#: ../../templates/show_catalog_row.inc.php:28
+#: ../../templates/show_catalog_row.inc.php:29
 #: ../../templates/show_video_row.inc.php:23
 #: ../../templates/show_artist_row.inc.php:23
 #: ../../templates/show_genres.inc.php:36
@@ -61,7 +61,6 @@ msgstr "追加"
 #: ../../templates/show_artist.inc.php:41
 #: ../../templates/show_album.inc.php:55
 #: ../../templates/show_playlist_row.inc.php:24
-#: ../../lib/class/stream.class.php:400
 #: ../../modules/localplay/mpd.controller.php:495
 #: ../../modules/localplay/httpq.controller.php:492
 msgid "Random"
@@ -76,7 +75,7 @@ msgstr "シャウトの投稿"
 #: ../../templates/show_playlist.inc.php:36
 #: ../../templates/rightbar.inc.php:49
 #: ../../templates/show_artist_row.inc.php:35
-#: ../../templates/show_search_options.inc.php:28
+#: ../../templates/show_search_options.inc.php:33
 #: ../../templates/show_playlist_row.inc.php:33
 msgid "Batch Download"
 msgstr "バッチダウンロード"
@@ -109,8 +108,8 @@ msgstr "設定"
 #: ../../templates/show_user_preferences.inc.php:37
 #: ../../templates/show_preference_box.inc.php:41
 #: ../../templates/show_preference_box.inc.php:71
-#: ../../templates/show_random_rules.inc.php:33
-#: ../../templates/show_random.inc.php:32
+#: ../../templates/show_random_rules.inc.php:34
+#: ../../templates/show_random.inc.php:33
 #: ../../templates/show_debug.inc.php:45 ../../templates/show_debug.inc.php:94
 msgid "Value"
 msgstr "値"
@@ -181,11 +180,12 @@ msgid "DESCRIPTION"
 msgstr "説明"
 
 #: ../../templates/show_test.inc.php:45
-#: ../../templates/show_install_lang.inc.php:54
+#: ../../templates/show_install_check.inc.php:24
+#: ../../templates/show_install_check.inc.php:29
 msgid "PHP Version"
 msgstr "PHPバージョン"
 
-#: ../../templates/show_test.inc.php:60
+#: ../../templates/show_test.inc.php:58
 msgid ""
 "This tests to make sure that you are running a version of PHP that is known "
 "to work with Ampache."
@@ -193,12 +193,13 @@ msgstr ""
 "これはAmpacheで働くと知られているPHPのバージョンを実行していることを確かめる"
 "ためにテストします。"
 
-#: ../../templates/show_test.inc.php:64
-#: ../../templates/show_install_lang.inc.php:64
+#: ../../templates/show_test.inc.php:62
+#: ../../templates/show_install_check.inc.php:36
+#: ../../templates/show_install_check.inc.php:40
 msgid "Mysql for PHP"
 msgstr "PHPのMysql"
 
-#: ../../templates/show_test.inc.php:79
+#: ../../templates/show_test.inc.php:75
 msgid ""
 "This test checks to see if you have the mysql extensions loaded for PHP. "
 "These are required for Ampache to work."
@@ -206,12 +207,13 @@ msgstr ""
 "このテストは、PHPのためにあなたがmysql拡張をロードするかチェックします。これ"
 "らはAmpacheが働くために要求されます。"
 
-#: ../../templates/show_test.inc.php:83
-#: ../../templates/show_install_lang.inc.php:79
+#: ../../templates/show_test.inc.php:79
+#: ../../templates/show_install_check.inc.php:47
+#: ../../templates/show_install_check.inc.php:51
 msgid "PHP Session Support"
 msgstr "PHPセッションサポート"
 
-#: ../../templates/show_test.inc.php:98
+#: ../../templates/show_test.inc.php:92
 msgid ""
 "This test checks to make sure that you have PHP session support enabled. "
 "Sessions are required for Ampache to work."
@@ -219,12 +221,13 @@ msgstr ""
 "このテストはPHPセッションのサポートを可能にすることを確かめるためにチェックし"
 "ます。セッションは、Ampacheが働くことを必要とされます。"
 
-#: ../../templates/show_test.inc.php:102
-#: ../../templates/show_install_lang.inc.php:89
+#: ../../templates/show_test.inc.php:96
+#: ../../templates/show_install_check.inc.php:58
+#: ../../templates/show_install_check.inc.php:62
 msgid "PHP ICONV Support"
 msgstr "PHP ICONVサポート"
 
-#: ../../templates/show_test.inc.php:116
+#: ../../templates/show_test.inc.php:108
 msgid ""
 "This test checks to make sure you have Iconv support installed. Iconv "
 "support is required for Ampache"
@@ -232,12 +235,13 @@ msgstr ""
 "このテストはIconvのサポートをインストールすることを確かめるためにチェックしま"
 "す。IconvのサポートはAmpacheのために必要になります。"
 
-#: ../../templates/show_test.inc.php:120
-#: ../../templates/show_install_lang.inc.php:99
+#: ../../templates/show_test.inc.php:112
+#: ../../templates/show_install_check.inc.php:69
+#: ../../templates/show_install_check.inc.php:73
 msgid "PHP PCRE Support"
 msgstr "PHP PCREサポート"
 
-#: ../../templates/show_test.inc.php:133
+#: ../../templates/show_test.inc.php:124
 msgid ""
 "This test makes sure you have PCRE support compiled into your version of "
 "PHP, this is required for Ampache."
@@ -245,12 +249,13 @@ msgstr ""
 "このテストは、あなたがPHPのバージョンへPCREのサポートをコンパイルすることを確"
 "かめます。これはAmpacheに必要です。"
 
-#: ../../templates/show_test.inc.php:137
-#: ../../templates/show_install_lang.inc.php:109
+#: ../../templates/show_test.inc.php:128
+#: ../../templates/show_install_check.inc.php:80
+#: ../../templates/show_install_check.inc.php:84
 msgid "PHP PutENV Support"
 msgstr "PHP PutENVサポート"
 
-#: ../../templates/show_test.inc.php:150
+#: ../../templates/show_test.inc.php:140
 msgid ""
 "This test makes sure that PHP isn't running in SafeMode and that we are able "
 "to modify the memory limits. While not required, without these abilities "
@@ -260,12 +265,12 @@ msgstr ""
 "とができることを確かめます。ampacheのいくつかの機能が正確に動かさないかもしれ"
 "ない一方で、機能なしでは要求されないかもしれません"
 
-#: ../../templates/show_test.inc.php:154
+#: ../../templates/show_test.inc.php:144
 #: ../../templates/show_install_config.inc.php:91
 msgid "Ampache.cfg.php Exists"
 msgstr "Ampache.cfg.phpは存在します"
 
-#: ../../templates/show_test.inc.php:167
+#: ../../templates/show_test.inc.php:157
 msgid ""
 "This attempts to read /config/ampache.cfg.php If this fails either the "
 "ampache.cfg.php is not in the correct locations or\n"
@@ -275,12 +280,12 @@ msgstr ""
 "むことを試みます、正確な位置あるいはそれにない、あなたのウェブサーバによって"
 "現在判読可能でありません。"
 
-#: ../../templates/show_test.inc.php:173
-#: ../../templates/show_install_config.inc.php:108
+#: ../../templates/show_test.inc.php:163
+#: ../../templates/show_install_config.inc.php:106
 msgid "Ampache.cfg.php Configured?"
 msgstr "Ampache.cfg.phpは設定されていますか？"
 
-#: ../../templates/show_test.inc.php:190
+#: ../../templates/show_test.inc.php:179
 msgid ""
 "This test makes sure that you have set all of the required configuration "
 "variables and that we are able to completely parse your config file"
@@ -288,11 +293,11 @@ msgstr ""
 "このテストは、あなたが要求された配置変数をすべてセットしており、私たちが"
 "configファイルを完全に解析することができることを確かめます。"
 
-#: ../../templates/show_test.inc.php:194
+#: ../../templates/show_test.inc.php:183
 msgid "DB Connection"
 msgstr "DB接続"
 
-#: ../../templates/show_test.inc.php:210
+#: ../../templates/show_test.inc.php:197
 msgid ""
 "This attempts to connect to your database using the values from your ampache."
 "cfg.php"
@@ -300,15 +305,28 @@ msgstr ""
 "これは、あなたのampache.cfg.phpからの値を使用して、あなたのデータベースに接続"
 "することを試みます。"
 
-#: ../../templates/show_test.inc.php:214
+#: ../../templates/show_test.inc.php:201
 msgid "DB Inserted"
 msgstr "DB挿入済"
 
-#: ../../templates/show_test.inc.php:236
+#: ../../templates/show_test.inc.php:215
+msgid ""
+"This checks a few key tables to make sure that you have successfully "
+"inserted the ampache database and that the user has access to the database"
+msgstr "これはAmpacheのデータベース挿入が成功することとユーザがデータベースへアクセスできることを確実にするためにいくつかのキーテーブルをチェックします"
+
+#: ../../templates/show_test.inc.php:220
 #: ../../templates/show_install_config.inc.php:63
 msgid "Web Path"
 msgstr "Webパス"
 
+#: ../../templates/show_test.inc.php:244
+msgid ""
+"This test makes sure that your web_path variable is set correctly and that "
+"we are able to get to the index page. If you do not see a check mark here "
+"then your web_path is not set correctly."
+msgstr "このテストはweb_path変数が正しく設定されていてインデックスページを取得することが出来ることを確実にします。ここでチェックマークが見れない場合、web_pathが正しく設定されていないかもしれません。"
+
 #: ../../templates/show_albums.inc.php:42
 #: ../../templates/show_albums.inc.php:73
 msgid "Cover"
@@ -341,7 +359,7 @@ msgstr "アルバム"
 #: ../../templates/show_artists.inc.php:37
 #: ../../templates/show_artists.inc.php:65
 #: ../../templates/sidebar_home.inc.php:34
-#: ../../templates/sidebar_home.inc.php:81
+#: ../../templates/sidebar_home.inc.php:80
 #: ../../templates/sidebar_home.inc.php:107
 #: ../../templates/show_similar_artists.inc.php:33
 #: ../../templates/show_similar_artists.inc.php:86
@@ -369,17 +387,17 @@ msgstr "アーティスト"
 #: ../../templates/show_artists.inc.php:38
 #: ../../templates/show_artists.inc.php:66
 #: ../../templates/show_manage_democratic.inc.php:39
-#: ../../templates/show_local_catalog_info.inc.php:31
-#: ../../templates/show_genre.inc.php:38
+#: ../../templates/show_popular.inc.php:23
+#: ../../templates/show_genre.inc.php:38 ../../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:1097
+#: ../../templates/show_genres.inc.php:74 ../../lib/class/browse.class.php:303
 msgid "Songs"
 msgstr "曲"
 
 #: ../../templates/show_albums.inc.php:47
 #: ../../templates/show_albums.inc.php:78
-#: ../../templates/show_edit_song.inc.php:67
+#: ../../templates/show_edit_song.inc.php:59
 #: ../../templates/show_play_selected.inc.php:61
 #: ../../templates/show_edit_album.inc.php:33
 #: ../../templates/show_search.inc.php:60
@@ -390,9 +408,10 @@ msgstr "年"
 #: ../../templates/show_albums.inc.php:79
 #: ../../templates/show_artists.inc.php:41
 #: ../../templates/show_artists.inc.php:69
-#: ../../templates/show_videos.inc.php:38
-#: ../../templates/show_videos.inc.php:60
-#: ../../templates/show_songs.inc.php:43 ../../templates/show_songs.inc.php:72
+#: ../../templates/show_videos.inc.php:40
+#: ../../templates/show_videos.inc.php:62
+#: ../../templates/show_stats.inc.php:34 ../../templates/show_songs.inc.php:43
+#: ../../templates/show_songs.inc.php:72
 msgid "Tags"
 msgstr "タグ"
 
@@ -408,8 +427,8 @@ msgstr "評価"
 
 #: ../../templates/show_albums.inc.php:50
 #: ../../templates/show_albums.inc.php:81
-#: ../../templates/show_catalogs.inc.php:36
-#: ../../templates/show_catalogs.inc.php:52
+#: ../../templates/show_catalogs.inc.php:38
+#: ../../templates/show_catalogs.inc.php:55
 #: ../../templates/show_playlists.inc.php:39
 #: ../../templates/show_playlists.inc.php:62
 #: ../../templates/show_album.inc.php:48
@@ -421,9 +440,9 @@ msgstr "操作"
 #: ../../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:52
+#: ../../templates/show_videos.inc.php:54
 #: ../../templates/show_objects.inc.php:44
-#: ../../templates/rightbar.inc.php:108 ../../templates/show_genres.inc.php:68
+#: ../../templates/rightbar.inc.php:105 ../../templates/show_genres.inc.php:68
 #: ../../templates/show_user_recommendations.inc.php:32
 #: ../../templates/show_user_recommendations.inc.php:43
 #: ../../templates/show_user_recommendations.inc.php:54
@@ -447,7 +466,7 @@ msgstr "フルネーム"
 #: ../../templates/show_install_account.inc.php:61
 #: ../../templates/show_recently_played.inc.php:41
 #: ../../templates/show_recently_played.inc.php:100
-#: ../../templates/show_login_form.inc.php:58
+#: ../../templates/show_login_form.inc.php:57
 #: ../../templates/show_user_registration.inc.php:73
 #: ../../templates/show_now_playing_row.inc.php:29
 msgid "Username"
@@ -491,7 +510,7 @@ msgstr "最終IP"
 #: ../../templates/show_genres.inc.php:39
 #: ../../templates/show_genres.inc.php:75
 #: ../../templates/show_localplay_instances.inc.php:29
-#: ../../templates/show_random_rules.inc.php:34
+#: ../../templates/show_random_rules.inc.php:36
 #: ../../templates/show_localplay_playlist.inc.php:35
 #: ../../templates/show_localplay_playlist.inc.php:61
 #: ../../templates/show_songs.inc.php:51 ../../templates/show_songs.inc.php:78
@@ -512,16 +531,16 @@ msgid "On-line"
 msgstr "オンライン"
 
 #: ../../templates/show_users.inc.php:53 ../../templates/show_user.inc.php:22
-#: ../../lib/class/user.class.php:663 ../../lib/class/catalog.class.php:145
-#: ../../lib/class/catalog.class.php:146 ../../lib/preferences.php:261
+#: ../../lib/class/user.class.php:663 ../../lib/class/catalog.class.php:146
+#: ../../lib/class/catalog.class.php:147 ../../lib/class/catalog.class.php:148
+#: ../../lib/preferences.php:261
 msgid "Never"
 msgstr "Never"
 
 #: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
-#: ../../lib/class/flag.class.php:332 ../../lib/class/localplay.class.php:648
+#: ../../lib/class/flag.class.php:337 ../../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
+#: ../../modules/localplay/mpd.controller.php:525
 msgid "Unknown"
 msgstr "不明"
 
@@ -546,7 +565,7 @@ msgstr "メールアドレス"
 #: ../../templates/show_edit_user.inc.php:52
 #: ../../templates/show_add_user.inc.php:52
 #: ../../templates/show_install_account.inc.php:65
-#: ../../templates/show_login_form.inc.php:62
+#: ../../templates/show_login_form.inc.php:61
 #: ../../templates/show_user_registration.inc.php:101
 #: ../../modules/localplay/mpd.controller.php:235
 #: ../../modules/localplay/httpq.controller.php:219
@@ -628,8 +647,8 @@ msgstr "管理者"
 msgid "Update User"
 msgstr "ユーザの更新"
 
-#: ../../templates/show_catalogs.inc.php:32
-#: ../../templates/show_catalogs.inc.php:48
+#: ../../templates/show_catalogs.inc.php:33
+#: ../../templates/show_catalogs.inc.php:50
 #: ../../templates/show_localplay_controllers.inc.php:32
 #: ../../templates/show_localplay_controllers.inc.php:63
 #: ../../templates/show_edit_live_stream_row.inc.php:26
@@ -646,6 +665,7 @@ msgstr "ユーザの更新"
 #: ../../templates/show_plugins.inc.php:61
 #: ../../templates/show_create_democratic.inc.php:26
 #: ../../templates/show_account.inc.php:27
+#: ../../templates/show_stats.inc.php:63
 #: ../../templates/show_edit_album.inc.php:27
 #: ../../templates/show_add_access_current.inc.php:26
 #: ../../templates/show_localplay_playlist.inc.php:34
@@ -658,22 +678,31 @@ msgstr "ユーザの更新"
 msgid "Name"
 msgstr "名前"
 
-#: ../../templates/show_catalogs.inc.php:33
-#: ../../templates/show_catalogs.inc.php:49
+#: ../../templates/show_catalogs.inc.php:34
+#: ../../templates/show_catalogs.inc.php:51
+#: ../../templates/show_stats.inc.php:64
 #: ../../templates/show_add_catalog.inc.php:47
 msgid "Path"
 msgstr "パス"
 
-#: ../../templates/show_catalogs.inc.php:34
-#: ../../templates/show_catalogs.inc.php:50
+#: ../../templates/show_catalogs.inc.php:35
+#: ../../templates/show_catalogs.inc.php:52
+#: ../../templates/show_stats.inc.php:65
 msgid "Last Verify"
 msgstr "最終確認"
 
-#: ../../templates/show_catalogs.inc.php:35
-#: ../../templates/show_catalogs.inc.php:51
+#: ../../templates/show_catalogs.inc.php:36
+#: ../../templates/show_catalogs.inc.php:53
+#: ../../templates/show_stats.inc.php:66
 msgid "Last Add"
 msgstr "最終追加"
 
+#: ../../templates/show_catalogs.inc.php:37
+#: ../../templates/show_catalogs.inc.php:54
+#: ../../templates/show_stats.inc.php:67
+msgid "Last Clean"
+msgstr "最終クリーン"
+
 #: ../../templates/show_localplay_controllers.inc.php:33
 #: ../../templates/show_localplay_controllers.inc.php:64
 #: ../../templates/show_plugins.inc.php:33
@@ -740,10 +769,10 @@ msgstr "変更を保存"
 #: ../../templates/show_artists.inc.php:39
 #: ../../templates/show_artists.inc.php:67
 #: ../../templates/sidebar_home.inc.php:33
-#: ../../templates/sidebar_home.inc.php:78
-#: ../../templates/show_local_catalog_info.inc.php:29
-#: ../../templates/show_genre.inc.php:32 ../../lib/ui.lib.php:408
-#: ../../lib/class/browse.class.php:1103
+#: ../../templates/sidebar_home.inc.php:77
+#: ../../templates/show_popular.inc.php:26
+#: ../../templates/show_genre.inc.php:32 ../../templates/show_stats.inc.php:30
+#: ../../lib/ui.lib.php:362 ../../lib/class/browse.class.php:309
 msgid "Albums"
 msgstr "アルバム"
 
@@ -768,8 +797,8 @@ msgid "Search Type"
 msgstr "検索タイプ"
 
 #: ../../templates/show_duplicate.inc.php:33
-#: ../../templates/show_videos.inc.php:35
-#: ../../templates/show_videos.inc.php:57
+#: ../../templates/show_videos.inc.php:36
+#: ../../templates/show_videos.inc.php:59
 #: ../../templates/show_edit_song.inc.php:31
 #: ../../templates/show_democratic_playlist.inc.php:55
 #: ../../templates/show_democratic_playlist.inc.php:95
@@ -793,7 +822,7 @@ msgstr "無効な曲を検索"
 
 #: ../../templates/show_import_playlist.inc.php:23
 msgid "Importing a Playlist from a File"
-msgstr "ファイルからプレイリストをインポート中"
+msgstr "ファイルからプレイリストをインポート"
 
 #: ../../templates/show_import_playlist.inc.php:28
 #: ../../templates/show_search.inc.php:66
@@ -809,9 +838,8 @@ msgid "Playlist Type"
 msgstr "プレイリストタイプ"
 
 #: ../../templates/show_import_playlist.inc.php:46
-#: ../../templates/sidebar_home.inc.php:39
 msgid "Import Playlist"
-msgstr "プレイリストのインポート"
+msgstr "プレイリストをインポート"
 
 #: ../../templates/show_edit_live_stream_row.inc.php:27
 #: ../../templates/show_add_live_stream.inc.php:42
@@ -848,7 +876,7 @@ msgid "Browse"
 msgstr "閲覧"
 
 #: ../../templates/sidebar_home.inc.php:32
-#: ../../templates/sidebar_home.inc.php:75
+#: ../../templates/sidebar_home.inc.php:74
 #: ../../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
@@ -856,79 +884,104 @@ msgid "Song Title"
 msgstr "曲タイトル"
 
 #: ../../templates/sidebar_home.inc.php:35
-#: ../../lib/class/browse.class.php:1157
+#: ../../lib/class/browse.class.php:364
 msgid "Tag Cloud"
 msgstr "タグクラウド"
 
 #: ../../templates/sidebar_home.inc.php:36
-#: ../../templates/sidebar_home.inc.php:87
+#: ../../templates/sidebar_home.inc.php:86
 #: ../../templates/sidebar_home.inc.php:108
 #: ../../templates/show_manage_democratic.inc.php:34
-#: ../../templates/show_play_selected.inc.php:47 ../../lib/ui.lib.php:367
+#: ../../templates/show_play_selected.inc.php:47 ../../lib/ui.lib.php:321
 msgid "Playlist"
 msgstr "再生リスト"
 
 #: ../../templates/sidebar_home.inc.php:37
-#: ../../lib/class/browse.class.php:1120
+#: ../../lib/class/browse.class.php:327
 msgid "Radio Stations"
 msgstr "ラジオステーション"
 
 #: ../../templates/sidebar_home.inc.php:38
+#: ../../templates/show_stats.inc.php:33 ../../templates/show_stats.inc.php:69
 msgid "Video"
 msgstr "動画"
 
-#: ../../templates/sidebar_home.inc.php:43
+#: ../../templates/sidebar_home.inc.php:42
 msgid "Filters"
 msgstr "フィルタ"
 
-#: ../../templates/sidebar_home.inc.php:47
+#: ../../templates/sidebar_home.inc.php:46
 msgid "Starts With"
 msgstr "開始 :"
 
-#: ../../templates/sidebar_home.inc.php:53
+#: ../../templates/sidebar_home.inc.php:52
 msgid "Minimum Count"
 msgstr "最小カウント"
 
-#: ../../templates/sidebar_home.inc.php:57
+#: ../../templates/sidebar_home.inc.php:56
 msgid "Rated"
 msgstr "評価"
 
-#: ../../templates/sidebar_home.inc.php:61
+#: ../../templates/sidebar_home.inc.php:60
 msgid "Unplayed"
 msgstr "未再生"
 
-#: ../../templates/sidebar_home.inc.php:65
+#: ../../templates/sidebar_home.inc.php:64
 #: ../../templates/show_artist.inc.php:55
 msgid "Show Art"
-msgstr "アーティスト表示"
+msgstr "アート表示"
 
-#: ../../templates/sidebar_home.inc.php:70
+#: ../../templates/sidebar_home.inc.php:69
 msgid "All Playlists"
 msgstr "全プレイリスト"
 
-#: ../../templates/sidebar_home.inc.php:89
+#: ../../templates/sidebar_home.inc.php:88
 msgid "Currently Playing"
 msgstr "現在再生中のもの"
 
-#: ../../templates/sidebar_home.inc.php:91
+#: ../../templates/sidebar_home.inc.php:90
 #: ../../templates/show_playtype_switch.inc.php:36
-#: ../../templates/sidebar_modules.inc.php:46 ../../lib/preferences.php:179
+#: ../../templates/sidebar_modules.inc.php:40 ../../lib/preferences.php:179
 #: ../../modules/localplay/mpd.controller.php:491
 #: ../../modules/localplay/httpq.controller.php:488
 msgid "Democratic"
 msgstr "デモクラティック"
 
-#: ../../templates/sidebar_home.inc.php:100
+#: ../../templates/sidebar_home.inc.php:99
 #: ../../templates/sidebar_localplay.inc.php:32
 #: ../../templates/show_playtype_switch.inc.php:34
 #: ../../templates/sidebar.inc.php:28 ../../lib/preferences.php:182
 msgid "Localplay"
 msgstr "ローカル再生"
 
+#: ../../templates/sidebar_home.inc.php:101
+#: ../../templates/show_live_stream.inc.php:29
+msgid "Import"
+msgstr "インポート"
+
 #: ../../templates/sidebar_home.inc.php:109
 msgid "Advanced"
 msgstr "高度"
 
+#: ../../templates/sidebar_home.inc.php:112
+#: ../../templates/show_popular.inc.php:22
+#: ../../templates/show_newest.inc.php:22
+msgid "Information"
+msgstr "情報"
+
+#: ../../templates/sidebar_home.inc.php:114
+#: ../../templates/show_stats.inc.php:24 ../../lib/ui.lib.php:374
+msgid "Statistics"
+msgstr "統計"
+
+#: ../../templates/sidebar_home.inc.php:115
+msgid "Newest"
+msgstr "最新"
+
+#: ../../templates/sidebar_home.inc.php:116
+msgid "Popular"
+msgstr "ポピュラー"
+
 #: ../../templates/show_confirmation.inc.php:27
 #: ../../templates/show_update_items.inc.php:27
 msgid "Continue"
@@ -1120,8 +1173,7 @@ msgstr "読取/書込"
 #: ../../templates/show_export.inc.php:35
 #: ../../templates/show_add_access_current.inc.php:40
 #: ../../templates/show_mail_users.inc.php:30
-#: ../../templates/show_admin_tools.inc.php:51 ../../lib/ui.lib.php:141
-#: ../../lib/ui.lib.php:150 ../../lib/ui.lib.php:632
+#: ../../templates/show_admin_tools.inc.php:51 ../../lib/ui.lib.php:543
 #: ../../lib/class/access.class.php:407 ../../lib/class/access.class.php:427
 msgid "All"
 msgstr "全て"
@@ -1231,7 +1283,6 @@ msgid "Show instances"
 msgstr "インスタンス表示"
 
 #: ../../templates/sidebar_localplay.inc.php:38
-#: ../../templates/sidebar_modules.inc.php:48
 msgid "Show Playlist"
 msgstr "再生リストの表示"
 
@@ -1241,7 +1292,7 @@ msgstr "有効なインスタンス"
 
 #: ../../templates/sidebar_localplay.inc.php:44
 #: ../../templates/show_gather_art.inc.php:24
-#: ../../templates/show_adds_catalog.inc.php:25 ../../lib/ui.lib.php:660
+#: ../../templates/show_adds_catalog.inc.php:25 ../../lib/ui.lib.php:571
 #: ../../lib/preferences.php:174 ../../lib/preferences.php:216
 msgid "None"
 msgstr "無し"
@@ -1276,16 +1327,22 @@ msgstr "クエリ:"
 msgid "Cache Hits:"
 msgstr "キャッシュヒット:"
 
-#: ../../templates/show_videos.inc.php:36
-#: ../../templates/show_videos.inc.php:58
+#: ../../templates/show_videos.inc.php:37
+#: ../../templates/show_videos.inc.php:60
 msgid "Codec"
 msgstr "コーデック"
 
-#: ../../templates/show_videos.inc.php:37
-#: ../../templates/show_videos.inc.php:59
+#: ../../templates/show_videos.inc.php:38
+#: ../../templates/show_videos.inc.php:61
 msgid "Resolution"
 msgstr "分析"
 
+#: ../../templates/show_videos.inc.php:39
+#: ../../templates/show_duplicates.inc.php:40
+#: ../../templates/show_duplicates.inc.php:79
+msgid "Length"
+msgstr "長さ"
+
 #: ../../templates/show_add_access_rpc.inc.php:22
 #: ../../templates/show_access_list.inc.php:36
 #: ../../templates/show_access_list.inc.php:37
@@ -1301,7 +1358,7 @@ msgid "RPC"
 msgstr "RPC"
 
 #: ../../templates/show_add_live_stream.inc.php:24
-#: ../../templates/sidebar_modules.inc.php:42
+#: ../../templates/show_live_stream.inc.php:26
 msgid "Add Radio Station"
 msgstr "ラジオステーションの追加"
 
@@ -1324,7 +1381,7 @@ msgid "Edit Artist"
 msgstr "アーティスト編集"
 
 #: ../../templates/show_edit_artist.inc.php:35
-#: ../../templates/show_edit_song.inc.php:81
+#: ../../templates/show_edit_song.inc.php:73
 #: ../../templates/show_edit_album.inc.php:41
 msgid "Flag for Retagging"
 msgstr "再タグ付けのフラグ"
@@ -1344,7 +1401,7 @@ msgstr "ACLタイプ"
 
 #: ../../templates/show_edit_access.inc.php:84
 #: ../../templates/show_preference_admin.inc.php:55
-#: ../../templates/show_catalog_row.inc.php:31
+#: ../../templates/show_catalog_row.inc.php:32
 #: ../../templates/show_play_selected.inc.php:64
 #: ../../templates/show_edit_shout.inc.php:41
 #: ../../templates/show_manage_catalogs.inc.php:42
@@ -1352,6 +1409,13 @@ msgstr "ACLタイプ"
 msgid "Update"
 msgstr "更新"
 
+#: ../../templates/show_popular.inc.php:29
+#: ../../templates/show_genre.inc.php:35 ../../templates/show_stats.inc.php:31
+#: ../../lib/ui.lib.php:366 ../../lib/class/browse.class.php:320
+#: ../../lib/class/album.class.php:256
+msgid "Artists"
+msgstr "アーティスト"
+
 #: ../../templates/show_similar_artists.inc.php:23
 msgid "Similar Artists"
 msgstr "同様のアーティスト"
@@ -1393,12 +1457,12 @@ msgstr "チェック中"
 #: ../../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:26
+#: ../../templates/show_verify_catalog.inc.php:28
 msgid "Reading"
 msgstr "読み込み中"
 
 #: ../../templates/sidebar_preferences.inc.php:9
-#: ../../templates/sidebar.inc.php:29 ../../lib/ui.lib.php:373
+#: ../../templates/sidebar.inc.php:29 ../../lib/ui.lib.php:327
 msgid "Preferences"
 msgstr "設定"
 
@@ -1427,8 +1491,8 @@ msgstr "アイテム"
 msgid "Reason to flag"
 msgstr "フラグする理由"
 
-#: ../../templates/show_flag.inc.php:56 ../../templates/rightbar.inc.php:105
-#: ../../templates/show_catalog_row.inc.php:33
+#: ../../templates/show_flag.inc.php:56 ../../templates/rightbar.inc.php:102
+#: ../../templates/show_catalog_row.inc.php:34
 #: ../../templates/show_democratic_playlist.inc.php:85
 #: ../../templates/show_live_stream_row.inc.php:34
 #: ../../templates/show_localplay_instances.inc.php:40
@@ -1436,7 +1500,7 @@ msgstr "フラグする理由"
 #: ../../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:320
+#: ../../lib/class/flag.class.php:325
 msgid "Delete"
 msgstr "削除"
 
@@ -1444,16 +1508,16 @@ msgstr "削除"
 msgid "Incorrect Tags"
 msgstr "不正なタグ"
 
-#: ../../templates/show_flag.inc.php:58 ../../lib/class/flag.class.php:326
+#: ../../templates/show_flag.inc.php:58 ../../lib/class/flag.class.php:331
 msgid "Re-encode"
 msgstr "再エンコード"
 
-#: ../../templates/show_flag.inc.php:59 ../../lib/class/flag.class.php:329
+#: ../../templates/show_flag.inc.php:59 ../../lib/class/flag.class.php:334
 msgid "Other"
 msgstr "その他"
 
 #: ../../templates/show_flag.inc.php:64
-#: ../../templates/show_edit_song.inc.php:73
+#: ../../templates/show_edit_song.inc.php:65
 #: ../../templates/show_flagged.inc.php:37
 #: ../../templates/show_flagged.inc.php:56
 #: ../../templates/show_search.inc.php:34
@@ -1586,11 +1650,11 @@ msgstr "MySQLのパスワード"
 msgid "Write Config"
 msgstr "コンフィグの書込み"
 
-#: ../../templates/show_install_config.inc.php:129
+#: ../../templates/show_install_config.inc.php:125
 msgid "Check for Config"
 msgstr "コンフィグのチェック"
 
-#: ../../templates/show_install_config.inc.php:135
+#: ../../templates/show_install_config.inc.php:131
 msgid "Continue to Step 3"
 msgstr "ステップ3へ続ける"
 
@@ -1623,8 +1687,9 @@ msgid "Advanced Add"
 msgstr "高度を追加"
 
 #: ../../templates/sidebar_admin.inc.php:24
+#: ../../templates/show_stats.inc.php:25
 #: ../../templates/show_admin_tools.inc.php:26
-#: ../../lib/class/browse.class.php:1141
+#: ../../lib/class/browse.class.php:348
 msgid "Catalogs"
 msgstr "カタログ"
 
@@ -1685,7 +1750,40 @@ msgstr "カタログのエクスポート"
 msgid "Manage Shoutbox"
 msgstr "シャウトボックスの管理"
 
-#: ../../templates/sidebar.inc.php:27 ../../lib/ui.lib.php:355
+#: ../../templates/show_install_check.inc.php:23
+msgid "Required"
+msgstr "必要条件"
+
+#: ../../templates/show_install_check.inc.php:27
+msgid "Hash Function Exists"
+msgstr "ハッシュ関数は存在します"
+
+#: ../../templates/show_install_check.inc.php:27
+msgid "SHA256 Support"
+msgstr "SHA256 サポート"
+
+#: ../../templates/show_install_check.inc.php:92
+msgid "Optional"
+msgstr "オプション"
+
+#: ../../templates/show_install_check.inc.php:93
+#: ../../templates/show_debug.inc.php:80
+msgid "Gettext Support"
+msgstr "Gettextサポート"
+
+#: ../../templates/show_install_check.inc.php:96
+msgid "Gettext Emulator will be used"
+msgstr "Gettextエミュレータが使用されるでしょう"
+
+#: ../../templates/show_install_check.inc.php:103
+msgid "Mbstring Support"
+msgstr "mbstringサポート"
+
+#: ../../templates/show_install_check.inc.php:106
+msgid "Multibyte Chracter may not detect correct"
+msgstr "マルチバイト文字列を正しく検出できないかもしれません"
+
+#: ../../templates/sidebar.inc.php:27 ../../lib/ui.lib.php:309
 msgid "Home"
 msgstr "ホーム"
 
@@ -1698,80 +1796,23 @@ msgstr "モジュール"
 msgid "Logout"
 msgstr "ログアウト"
 
-#: ../../templates/show_local_catalog_info.inc.php:24
-#: ../../templates/show_mail_users.inc.php:42
-msgid "Catalog Statistics"
-msgstr "カタログ統計"
-
-#: ../../templates/show_local_catalog_info.inc.php:27
-msgid "Connected Users"
-msgstr "接続したユーザ"
-
-#: ../../templates/show_local_catalog_info.inc.php:28
-msgid "Total Users"
-msgstr "合計ユーザ数"
-
-#: ../../templates/show_local_catalog_info.inc.php:30
-#: ../../templates/show_genre.inc.php:35 ../../lib/ui.lib.php:412
-#: ../../lib/class/browse.class.php:1114 ../../lib/class/album.class.php:256
-msgid "Artists"
-msgstr "アーティスト"
-
-#: ../../templates/show_local_catalog_info.inc.php:32
-msgid "Genres"
-msgstr "ジャンル"
-
-#: ../../templates/show_local_catalog_info.inc.php:33
-msgid "Catalog Size"
-msgstr "カタログサイズ"
-
-#: ../../templates/show_local_catalog_info.inc.php:34
-msgid "Catalog Time"
-msgstr "カタログ時間"
-
 #: ../../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:52
-msgid "System Checks"
-msgstr "システムチェック"
-
-#: ../../templates/show_install_lang.inc.php:120
-msgid "Optional"
-msgstr "オプション"
-
-#: ../../templates/show_install_lang.inc.php:121
-#: ../../templates/show_debug.inc.php:80
-msgid "Gettext Support"
-msgstr "Gettextサポート"
-
-#: ../../templates/show_install_lang.inc.php:124
-msgid "WARNING: This server will use gettext emulator."
-msgstr "警告: このサーバはgettextエミュレータを使用します。"
-
-#: ../../templates/show_install_lang.inc.php:130
-msgid "Mbstring Support"
-msgstr "mbstringサポート"
+#: ../../templates/show_install_lang.inc.php:54
+msgid "Minimum Requirements not met. Unable to Install Ampache."
+msgstr "必要最低限の構成を満たしていません。Ampacheをインストールできません。"
 
-#: ../../templates/show_install_lang.inc.php:142
+#: ../../templates/show_install_lang.inc.php:59
 msgid "Choose installation language."
 msgstr "インストールする言語を選択してください。"
 
-#: ../../templates/show_install_lang.inc.php:163
+#: ../../templates/show_install_lang.inc.php:80
 msgid "Start configuration"
 msgstr "設定の開始"
 
-#: ../../templates/show_install_lang.inc.php:169
-msgid "Ampache does not <strong>run</strong> correctly by this server."
-msgstr "Ampacheはこのサーバでは正しく<strong>動作</strong>しません。"
-
-#: ../../templates/show_install_lang.inc.php:170
-msgid "Please contact your server administrator, and fix them."
-msgstr "サーバの管理者へ連絡をして、これらを修正してください。"
-
 #: ../../templates/rightbar.inc.php:28
 msgid "Add to Playlist"
 msgstr "プレイリストへ追加"
@@ -1807,7 +1848,7 @@ msgstr "関連するアルバム"
 msgid "Related Tag"
 msgstr "関連するタグ"
 
-#: ../../templates/rightbar.inc.php:112
+#: ../../templates/rightbar.inc.php:109
 msgid "More"
 msgstr "More"
 
@@ -1889,20 +1930,20 @@ msgstr "更新"
 msgid "Play Album"
 msgstr "アルバム再生"
 
-#: ../../templates/show_catalog_row.inc.php:29
+#: ../../templates/show_catalog_row.inc.php:30
 #: ../../templates/show_admin_tools.inc.php:47
 msgid "Verify"
 msgstr "確認"
 
-#: ../../templates/show_catalog_row.inc.php:30
+#: ../../templates/show_catalog_row.inc.php:31
 #: ../../templates/show_admin_tools.inc.php:49
 msgid "Clean"
 msgstr "クリーン"
 
-#: ../../templates/show_catalog_row.inc.php:32
+#: ../../templates/show_catalog_row.inc.php:33
 #: ../../templates/show_admin_tools.inc.php:60
 msgid "Gather Art"
-msgstr "アーティスト収集"
+msgstr "アート収集"
 
 #: ../../templates/show_create_democratic.inc.php:22
 msgid "Create Democratic Playlist"
@@ -1913,7 +1954,7 @@ msgid "Cooldown Time"
 msgstr "クールダウン時間"
 
 #: ../../templates/show_create_democratic.inc.php:35
-#: ../../lib/class/democratic.class.php:98
+#: ../../lib/class/democratic.class.php:98 ../../lib/class/video.class.php:66
 msgid "minutes"
 msgstr "分"
 
@@ -1946,22 +1987,13 @@ msgstr "曲編集"
 
 #: ../../templates/show_edit_song.inc.php:40
 #: ../../templates/show_edit_song.inc.php:48
-#: ../../templates/show_edit_song.inc.php:56
 #: ../../templates/show_search.inc.php:106
+#: ../../templates/show_random.inc.php:64
 #: ../../templates/show_rename_artist.inc.php:33
 msgid "OR"
 msgstr "OR"
 
 #: ../../templates/show_edit_song.inc.php:53
-#: ../../templates/show_play_selected.inc.php:58
-#: ../../templates/show_genres.inc.php:37
-#: ../../templates/show_genres.inc.php:73
-#: ../../templates/show_playlist_songs.inc.php:45
-#: ../../templates/show_playlist_songs.inc.php:66 ../../lib/ui.lib.php:416
-msgid "Genre"
-msgstr "ジャンル"
-
-#: ../../templates/show_edit_song.inc.php:61
 #: ../../templates/show_localplay_playlist.inc.php:33
 #: ../../templates/show_localplay_playlist.inc.php:59
 #: ../../templates/show_songs.inc.php:44 ../../templates/show_songs.inc.php:73
@@ -1972,7 +2004,7 @@ msgstr "ジャンル"
 msgid "Track"
 msgstr "トラック"
 
-#: ../../templates/show_edit_song.inc.php:88
+#: ../../templates/show_edit_song.inc.php:80
 msgid "Update Song"
 msgstr "曲を更新"
 
@@ -2002,7 +2034,7 @@ msgid "Update Instance"
 msgstr "インスタンスの更新"
 
 #: ../../templates/show_search_bar.inc.php:29
-#: ../../templates/show_search.inc.php:131 ../../lib/ui.lib.php:370
+#: ../../templates/show_search.inc.php:131 ../../lib/ui.lib.php:324
 msgid "Search"
 msgstr "検索"
 
@@ -2010,10 +2042,21 @@ msgstr "検索"
 msgid "Advanced Search"
 msgstr "高度な検索"
 
-#: ../../templates/show_stats.inc.php:22
-#: ../../templates/sidebar_modules.inc.php:41 ../../lib/ui.lib.php:420
-msgid "Statistics"
-msgstr "統計"
+#: ../../templates/show_stats.inc.php:28
+msgid "Connected Users"
+msgstr "接続したユーザ"
+
+#: ../../templates/show_stats.inc.php:29
+msgid "Total Users"
+msgstr "合計ユーザ数"
+
+#: ../../templates/show_stats.inc.php:35 ../../templates/show_stats.inc.php:70
+msgid "Catalog Size"
+msgstr "カタログサイズ"
+
+#: ../../templates/show_stats.inc.php:36
+msgid "Catalog Time"
+msgstr "カタログ時間"
 
 #: ../../templates/show_ip_history.inc.php:23
 #, php-format
@@ -2063,6 +2106,14 @@ msgstr "選択されたトラックを削除"
 msgid "Add to"
 msgstr "追加: "
 
+#: ../../templates/show_play_selected.inc.php:58
+#: ../../templates/show_genres.inc.php:37
+#: ../../templates/show_genres.inc.php:73
+#: ../../templates/show_playlist_songs.inc.php:45
+#: ../../templates/show_playlist_songs.inc.php:66 ../../lib/ui.lib.php:370
+msgid "Genre"
+msgstr "ジャンル"
+
 #: ../../templates/show_flagged.inc.php:34
 #: ../../templates/show_flagged.inc.php:53
 #: ../../templates/show_manage_shoutbox.inc.php:34
@@ -2155,6 +2206,10 @@ msgid "Update Album"
 msgstr "アルバム更新"
 
 #: ../../templates/show_album_art.inc.php:47
+msgid "Invalid"
+msgstr "不正"
+
+#: ../../templates/show_album_art.inc.php:49
 #: ../../templates/show_disabled_songs.inc.php:33
 #: ../../templates/show_disabled_songs.inc.php:56
 msgid "Select"
@@ -2231,17 +2286,23 @@ msgstr "お気に入りの曲"
 msgid "Rules"
 msgstr "ルール"
 
-#: ../../templates/show_random_rules.inc.php:31
-#: ../../templates/show_random.inc.php:30
+#: ../../templates/show_random_rules.inc.php:32
+#: ../../templates/show_random.inc.php:31
 msgid "Field"
 msgstr "フィールド"
 
-#: ../../templates/show_random_rules.inc.php:32
+#: ../../templates/show_random_rules.inc.php:33
 #: ../../templates/show_search.inc.php:102
-#: ../../templates/show_random.inc.php:31
+#: ../../templates/show_random.inc.php:32
 msgid "Operator"
 msgstr "オペレータ"
 
+#: ../../templates/show_random_rules.inc.php:35
+#: ../../templates/show_search.inc.php:111
+#: ../../templates/show_random.inc.php:34
+msgid "Method"
+msgstr "方法"
+
 #: ../../templates/show_shoutbox.inc.php:22
 msgid "Shoutbox"
 msgstr "シャウトボックス"
@@ -2291,13 +2352,10 @@ msgid "Five Stars"
 msgstr "5点"
 
 #: ../../templates/show_search.inc.php:105
+#: ../../templates/show_random.inc.php:65
 msgid "AND"
 msgstr "AND"
 
-#: ../../templates/show_search.inc.php:111
-msgid "Method"
-msgstr "方法"
-
 #: ../../templates/show_search.inc.php:114
 msgid "Fuzzy"
 msgstr "曖昧"
@@ -2431,6 +2489,10 @@ msgstr "メール先:"
 msgid "Inactive Users"
 msgstr "不活発なユーザ"
 
+#: ../../templates/show_mail_users.inc.php:42
+msgid "Catalog Statistics"
+msgstr "カタログ統計"
+
 #: ../../templates/show_mail_users.inc.php:53
 msgid "Latest Artist Additions"
 msgstr "最後に追加したアーティスト"
@@ -2468,19 +2530,19 @@ msgstr "メール送信"
 msgid "Advanced Random Rules"
 msgstr "高度なランダムルール"
 
-#: ../../templates/show_random.inc.php:54
+#: ../../templates/show_random.inc.php:56
 msgid "Like"
 msgstr "Like"
 
-#: ../../templates/show_random.inc.php:63
+#: ../../templates/show_random.inc.php:71
 msgid "Add Rule"
 msgstr "ルールを追加"
 
-#: ../../templates/show_random.inc.php:66
+#: ../../templates/show_random.inc.php:74
 msgid "Save Rules As"
 msgstr "次のルールで保存"
 
-#: ../../templates/show_random.inc.php:69
+#: ../../templates/show_random.inc.php:77
 msgid "Load Saved Rules"
 msgstr "保存したルールを読み込む"
 
@@ -2488,7 +2550,8 @@ msgstr "保存したルールを読み込む"
 msgid "Options"
 msgstr "オプション"
 
-#: ../../templates/show_search_options.inc.php:26
+#: ../../templates/show_search_options.inc.php:27
+#: ../../templates/show_search_options.inc.php:28
 msgid "Add Search Results"
 msgstr "検索結果を追加"
 
@@ -2506,7 +2569,7 @@ msgstr "ローカル画像"
 
 #: ../../templates/show_get_albumart.inc.php:63
 msgid "Get Art"
-msgstr "アーティスト取得"
+msgstr "アート取得"
 
 #: ../../templates/show_adds_catalog.inc.php:23
 #, php-format
@@ -2601,11 +2664,13 @@ msgstr "%s プレイリスト"
 msgid "Updating the %s catalog"
 msgstr "%sカタログの更新中"
 
-#: ../../templates/show_verify_catalog.inc.php:24
-msgid "songs found checking tag information."
-msgstr "曲見つかりました。タグ情報をチェック中です。"
-
 #: ../../templates/show_verify_catalog.inc.php:25
+#, php-format
+msgid "%s item found checking tag information"
+msgid_plural "%s items found checking tag information"
+msgstr[0] "%sアイテム見つかりました。タグ情報をチェック中です。"
+
+#: ../../templates/show_verify_catalog.inc.php:27
 msgid "Verifed"
 msgstr "確認済み"
 
@@ -2645,8 +2710,8 @@ msgid "Disk"
 msgstr "ディスク"
 
 #: ../../templates/show_album.inc.php:34
-#: ../../lib/class/catalog.class.php:1909
-#: ../../lib/class/catalog.class.php:1980
+#: ../../lib/class/catalog.class.php:1928
+#: ../../lib/class/catalog.class.php:1999
 msgid "Unknown (Orphaned)"
 msgstr "不明(孤立)"
 
@@ -2671,7 +2736,7 @@ msgstr "アルバムアートを見つける"
 msgid "%s Lyrics"
 msgstr "%sの歌詞"
 
-#: ../../templates/show_lyrics.inc.php:40 ../../lib/class/artist.class.php:323
+#: ../../templates/show_lyrics.inc.php:39 ../../lib/class/artist.class.php:345
 msgid "Sorry Lyrics Not Found."
 msgstr "すみません歌詞は見つかりませんでした。"
 
@@ -2679,19 +2744,19 @@ msgstr "すみません歌詞は見つかりませんでした。"
 msgid "Add Localplay Instance"
 msgstr "ローカル再生インスタンス追加"
 
-#: ../../templates/show_login_form.inc.php:66
+#: ../../templates/show_login_form.inc.php:65
 msgid "Remember Me"
 msgstr "パスワードを記憶する"
 
-#: ../../templates/show_login_form.inc.php:73
+#: ../../templates/show_login_form.inc.php:72
 msgid "Login"
 msgstr "ログイン"
 
-#: ../../templates/show_login_form.inc.php:78
+#: ../../templates/show_login_form.inc.php:77
 msgid "Register"
 msgstr "登録"
 
-#: ../../templates/show_login_form.inc.php:90
+#: ../../templates/show_login_form.inc.php:89
 msgid "Message of the Day"
 msgstr "1日のメッセージ"
 
@@ -2733,11 +2798,6 @@ msgstr "前へ"
 msgid "Duplicate Songs"
 msgstr "重複している曲"
 
-#: ../../templates/show_duplicates.inc.php:40
-#: ../../templates/show_duplicates.inc.php:79
-msgid "Length"
-msgstr "長さ"
-
 #: ../../templates/show_duplicates.inc.php:41
 #: ../../templates/show_duplicates.inc.php:80
 msgid "Bitrate"
@@ -2748,9 +2808,13 @@ msgstr "ビットレート"
 msgid "Size"
 msgstr "サイズ"
 
+#: ../../templates/show_live_stream.inc.php:22
+msgid "Manage Radio Stations"
+msgstr "ラジオステーションの管理"
+
 #: ../../templates/show_manage_catalogs.inc.php:28
 msgid "Gather All Art"
-msgstr "全アーティストを収集"
+msgstr "全アートを収集"
 
 #: ../../templates/show_manage_catalogs.inc.php:29
 #: ../../templates/show_admin_tools.inc.php:80
@@ -3000,11 +3064,7 @@ msgstr "フラグ済みの管理"
 msgid "Show Disabled"
 msgstr "表示を無効にしました"
 
-#: ../../templates/sidebar_modules.inc.php:39
-msgid "Information"
-msgstr "情報"
-
-#: ../../templates/sidebar_modules.inc.php:49
+#: ../../templates/sidebar_modules.inc.php:42
 msgid "Manage Playlist"
 msgstr "再生リストの管理"
 
@@ -3114,79 +3174,79 @@ msgstr "すばらしい！"
 msgid "Off the Charts!"
 msgstr "とてつもなくすばらしい！"
 
-#: ../../lib/ui.lib.php:358
+#: ../../lib/ui.lib.php:312
 msgid "Upload"
 msgstr "アップロード"
 
-#: ../../lib/ui.lib.php:361
+#: ../../lib/ui.lib.php:315
 msgid "Local Play"
 msgstr "ローカル再生"
 
-#: ../../lib/ui.lib.php:364
+#: ../../lib/ui.lib.php:318
 msgid "Random Play"
 msgstr "ランダム再生"
 
-#: ../../lib/ui.lib.php:376 ../../lib/ui.lib.php:380
+#: ../../lib/ui.lib.php:330 ../../lib/ui.lib.php:334
 msgid "Admin-Catalog"
 msgstr "管理-カタログ"
 
-#: ../../lib/ui.lib.php:384
+#: ../../lib/ui.lib.php:338
 msgid "Admin-User Management"
 msgstr "管理-ユーザ管理"
 
-#: ../../lib/ui.lib.php:388
+#: ../../lib/ui.lib.php:342
 msgid "Admin-Mail Users"
 msgstr "管理-メール"
 
-#: ../../lib/ui.lib.php:392
+#: ../../lib/ui.lib.php:346
 msgid "Admin-Manage Access Lists"
 msgstr "管理-アクセスリスト管理"
 
-#: ../../lib/ui.lib.php:396
+#: ../../lib/ui.lib.php:350
 msgid "Admin-Site Preferences"
 msgstr "管理-サイト設定"
 
-#: ../../lib/ui.lib.php:400
+#: ../../lib/ui.lib.php:354
 msgid "Admin-Manage Modules"
 msgstr "管理-モジュール管理"
 
-#: ../../lib/ui.lib.php:404
+#: ../../lib/ui.lib.php:358
 msgid "Browse Music"
 msgstr "ミュージック閲覧"
 
-#: ../../lib/ui.lib.php:511
+#: ../../lib/ui.lib.php:465
 msgid "Add New"
 msgstr "新規追加"
 
-#: ../../lib/class/browse.class.php:1109
+#: ../../lib/class/browse.class.php:315
 msgid "Manage Users"
 msgstr "ユーザ管理"
 
-#: ../../lib/class/browse.class.php:1126
+#: ../../lib/class/browse.class.php:333
 msgid "Playlists"
 msgstr "プレイリスト"
 
-#: ../../lib/class/browse.class.php:1131
+#: ../../lib/class/browse.class.php:338
 msgid "Playlist Songs"
 msgstr "プレイリスト曲"
 
-#: ../../lib/class/browse.class.php:1136
+#: ../../lib/class/browse.class.php:343
 msgid "Current Playlist"
 msgstr "現在のプレイリスト"
 
-#: ../../lib/class/browse.class.php:1146
+#: ../../lib/class/browse.class.php:353
 msgid "Shoutbox Records"
 msgstr "シャウトボックスレコード"
 
-#: ../../lib/class/browse.class.php:1151
+#: ../../lib/class/browse.class.php:358
 msgid "Flagged Records"
 msgstr "フラグされたレコード"
 
-#: ../../lib/class/browse.class.php:1162
+#: ../../lib/class/browse.class.php:369
 msgid "Videos"
 msgstr "動画"
 
-#: ../../lib/class/browse.class.php:1167
+#: ../../lib/class/browse.class.php:374
 msgid "Democratic Playlist"
 msgstr "デモクラティックプレイリスト"
 
@@ -3204,15 +3264,15 @@ msgstr "IPアドレスバージョンが一致しません"
 msgid "API/RPC"
 msgstr "API/RPC"
 
-#: ../../lib/class/flag.class.php:307
+#: ../../lib/class/flag.class.php:312
 msgid "Approved"
 msgstr "承認"
 
-#: ../../lib/class/flag.class.php:308
+#: ../../lib/class/flag.class.php:313
 msgid "Pending"
 msgstr "保留"
 
-#: ../../lib/class/flag.class.php:323
+#: ../../lib/class/flag.class.php:328
 msgid "Re-Tag"
 msgstr "Re-Tag"
 
@@ -3228,11 +3288,11 @@ msgstr "一時停止"
 msgid "Primary"
 msgstr "プライマリ"
 
-#: ../../lib/class/artist.class.php:311
+#: ../../lib/class/artist.class.php:333
 msgid "Fault"
 msgstr "失敗"
 
-#: ../../lib/class/artist.class.php:318 ../../lib/class/catalog.class.php:1185
+#: ../../lib/class/artist.class.php:340 ../../lib/class/catalog.class.php:1234
 #: ../../admin/users.php:142
 msgid "Error"
 msgstr "エラー"
@@ -3247,7 +3307,7 @@ msgstr "エラー: ユーザ名は必須です"
 msgid "Error Passwords don't match"
 msgstr "エラー: パスワードが一致しません"
 
-#: ../../lib/class/album.class.php:479 ../../lib/class/catalog.class.php:426
+#: ../../lib/class/album.class.php:479 ../../lib/class/catalog.class.php:462
 msgid "Error: Unable to open"
 msgstr "エラー: 開けませんでした"
 
@@ -3255,143 +3315,143 @@ msgstr "エラー: 開けませんでした"
 msgid "RSS Feed"
 msgstr "RSSフィード"
 
-#: ../../lib/class/catalog.class.php:204
+#: ../../lib/class/catalog.class.php:208
 msgid "day"
 msgid_plural "days"
 msgstr[0] "日"
 
-#: ../../lib/class/catalog.class.php:206
+#: ../../lib/class/catalog.class.php:210
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "時間"
 
-#: ../../lib/class/catalog.class.php:306
+#: ../../lib/class/catalog.class.php:308
 msgid "Running Remote Sync"
 msgstr "リモート同期実行中"
 
-#: ../../lib/class/catalog.class.php:433 ../../lib/class/catalog.class.php:476
+#: ../../lib/class/catalog.class.php:469 ../../lib/class/catalog.class.php:512
 msgid "Error: Unable to change to directory"
 msgstr "エラー: ディレクトリを変更できませんでした"
 
-#: ../../lib/class/catalog.class.php:512
+#: ../../lib/class/catalog.class.php:548
 #, php-format
 msgid "Error: Unable to get filesize for %s"
 msgstr "エラー: %sのファイルサイズの取得に失敗しました"
 
-#: ../../lib/class/catalog.class.php:518
+#: ../../lib/class/catalog.class.php:554
 #, php-format
 msgid "%s is not readable by ampache"
 msgstr "%sはAmpacheで読み込めません"
 
-#: ../../lib/class/catalog.class.php:526
+#: ../../lib/class/catalog.class.php:562
 #, php-format
 msgid "%s does not match site charset"
 msgstr "%sはサイトのCharsetと一致しません"
 
-#: ../../lib/class/catalog.class.php:981
-#: ../../lib/class/catalog.class.php:1850 ../../preferences.php:111
+#: ../../lib/class/catalog.class.php:1029
+#: ../../lib/class/catalog.class.php:1869 ../../preferences.php:111
 #: ../../admin/access.php:109
 msgid "Updated"
 msgstr "更新しました"
 
-#: ../../lib/class/catalog.class.php:988
+#: ../../lib/class/catalog.class.php:1036
 msgid "No Update Needed"
 msgstr "必要な更新はありません"
 
-#: ../../lib/class/catalog.class.php:1114
+#: ../../lib/class/catalog.class.php:1163
 msgid "Running Remote Update"
 msgstr "リモート更新実行中"
 
-#: ../../lib/class/catalog.class.php:1141
+#: ../../lib/class/catalog.class.php:1190
 msgid "Added Playlist From"
 msgstr "次からプレイリストを追加:"
 
-#: ../../lib/class/catalog.class.php:1170
+#: ../../lib/class/catalog.class.php:1219
 msgid "Catalog Update Finished"
 msgstr "カタログ更新完了"
 
-#: ../../lib/class/catalog.class.php:1170
+#: ../../lib/class/catalog.class.php:1219
 msgid "Total Time"
 msgstr "合計時間"
 
-#: ../../lib/class/catalog.class.php:1171
+#: ../../lib/class/catalog.class.php:1220
 msgid "Total Songs"
 msgstr "合計曲"
 
-#: ../../lib/class/catalog.class.php:1171
+#: ../../lib/class/catalog.class.php:1220
 msgid "Songs Per Seconds"
 msgstr "1秒毎の曲"
 
-#: ../../lib/class/catalog.class.php:1185
+#: ../../lib/class/catalog.class.php:1234
 msgid "Unable to load pear XMLRPC library, make sure XML-RPC is enabled"
 msgstr ""
 "pear XMLRPCライブラリを読み込めませんでした。XML-RPCが有効になっているか確認"
 "してください。"
 
-#: ../../lib/class/catalog.class.php:1217
-#: ../../lib/class/catalog.class.php:1291
-#: ../../lib/class/catalog.class.php:1324
+#: ../../lib/class/catalog.class.php:1266
+#: ../../lib/class/catalog.class.php:1340
+#: ../../lib/class/catalog.class.php:1373
 #: ../../lib/class/xmlrpcclient.class.php:64
 #: ../../lib/class/xmlrpcclient.class.php:97
 msgid "Error connecting to"
 msgstr "接続中のエラー:"
 
-#: ../../lib/class/catalog.class.php:1217
-#: ../../lib/class/catalog.class.php:1291
-#: ../../lib/class/catalog.class.php:1324
+#: ../../lib/class/catalog.class.php:1266
+#: ../../lib/class/catalog.class.php:1340
+#: ../../lib/class/catalog.class.php:1373
 #: ../../lib/class/xmlrpcclient.class.php:64
 #: ../../lib/class/xmlrpcclient.class.php:97
 msgid "Code"
 msgstr "コード"
 
-#: ../../lib/class/catalog.class.php:1217
-#: ../../lib/class/catalog.class.php:1291
-#: ../../lib/class/catalog.class.php:1324
+#: ../../lib/class/catalog.class.php:1266
+#: ../../lib/class/catalog.class.php:1340
+#: ../../lib/class/catalog.class.php:1373
 #: ../../lib/class/xmlrpcclient.class.php:64
 msgid "Reason"
 msgstr "理由"
 
-#: ../../lib/class/catalog.class.php:1246
+#: ../../lib/class/catalog.class.php:1295
 msgid "Completed updating remote catalog(s)"
 msgstr "リモートカタログの更新完了"
 
-#: ../../lib/class/catalog.class.php:1250
+#: ../../lib/class/catalog.class.php:1299
 msgid "Starting synchronisation of album images"
 msgstr "アルバム画像の同期を開始しています"
 
-#: ../../lib/class/catalog.class.php:1252
+#: ../../lib/class/catalog.class.php:1301
 msgid "Completed synchronisation of album images"
 msgstr "アルバム画像の同期が完了しました"
 
-#: ../../lib/class/catalog.class.php:1287 ../../admin/access.php:93
+#: ../../lib/class/catalog.class.php:1336 ../../admin/access.php:93
 msgid "Added"
 msgstr "追加しました"
 
-#: ../../lib/class/catalog.class.php:1320
+#: ../../lib/class/catalog.class.php:1369
 msgid "images synchronized: "
 msgstr "同期した画像: "
 
-#: ../../lib/class/catalog.class.php:1449
+#: ../../lib/class/catalog.class.php:1498
 msgid "Catalog Root unreadable, stopping clean"
 msgstr "カタログルートに到達できません。クリーンを停止します"
 
-#: ../../lib/class/catalog.class.php:1510
+#: ../../lib/class/catalog.class.php:1559
 msgid "Catalog Clean Done"
 msgstr "カタログのクリーン完了"
 
-#: ../../lib/class/catalog.class.php:1510
+#: ../../lib/class/catalog.class.php:1559
 msgid "files removed"
 msgstr "ファイルを削除しました"
 
-#: ../../lib/class/catalog.class.php:1511
+#: ../../lib/class/catalog.class.php:1560
 msgid "Optimizing Tables"
 msgstr "テーブルを最適化中"
 
-#: ../../lib/class/catalog.class.php:1850
+#: ../../lib/class/catalog.class.php:1869
 msgid "Update Finished"
 msgstr "更新完了"
 
-#: ../../lib/class/catalog.class.php:1850
+#: ../../lib/class/catalog.class.php:1869
 msgid "Checked"
 msgstr "チェック済み"
 
@@ -3399,12 +3459,8 @@ msgstr "チェック済み"
 msgid "Related Genre"
 msgstr "関連するジャンル"
 
-#: ../../lib/class/stream.class.php:399
-msgid "Ampache"
-msgstr "Ampache"
-
-#: ../../lib/class/vauth.class.php:478 ../../lib/class/vauth.class.php:502
-#: ../../lib/class/vauth.class.php:541
+#: ../../lib/class/vauth.class.php:480 ../../lib/class/vauth.class.php:504
+#: ../../lib/class/vauth.class.php:543
 msgid "Error Username or Password incorrect, please try again"
 msgstr "エラー: ユーザ名かパスワードが間違っています。再試行して下さい"
 
@@ -3543,7 +3599,7 @@ msgstr ""
 msgid "Existing Database detected, unable to continue installation"
 msgstr "既存のデータベースを検出しました。インストールを続行できません。"
 
-#: ../../lib/install.php:135 ../../install.php:93
+#: ../../lib/install.php:135 ../../install.php:94
 msgid "Error: Unable to make Database Connection"
 msgstr "エラー: データベース接続を確立できませんでした。"
 
@@ -3559,11 +3615,11 @@ msgstr "パスワードが一致しません"
 msgid "Invalid Object Selected"
 msgstr "不正なオブジェクトが選択されました"
 
-#: ../../server/xml.server.php:85
+#: ../../server/xml.server.php:80
 msgid "Error Invalid Handshake - "
 msgstr "不正なハンドシェイクエラー - "
 
-#: ../../server/xml.server.php:315
+#: ../../server/xml.server.php:321 ../../server/xml.server.php:328
 msgid "Invalid Request"
 msgstr "不正なリクエスト"
 
@@ -3587,7 +3643,7 @@ msgstr "セッション期限切れ: 再ログインしてください"
 msgid "Radio Station Added"
 msgstr "ラジオステーションを追加しました"
 
-#: ../../install.php:176
+#: ../../install.php:177
 msgid "Error: Config file not found or Unreadable"
 msgstr "エラー: 設定ファイルは見つからないか読み込めません"