update languages

author: momo-i <webmaster@momo-i.org> 2011-10-11 14:18:43 +0900
committer: momo-i <webmaster@momo-i.org> 2011-10-11 14:18:43 +0900
commit: e3d8da45cad0a8f67e7eca278022e7267c01dd7b (patch)
tree: 3746b58b39ebda54cd58fcd2d3162e5ea48c4c48 /locale/ja_JP
parent: e19918277306c99b910aaf20a8a180d0fbda958f (diff)
download: ampache-e3d8da45cad0a8f67e7eca278022e7267c01dd7b.tar.gz
ampache-e3d8da45cad0a8f67e7eca278022e7267c01dd7b.tar.bz2
ampache-e3d8da45cad0a8f67e7eca278022e7267c01dd7b.zip
2 files changed, 2275 insertions, 1827 deletions
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index 70891d70..505f8a10 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 749e298b..c885ec32 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/locale/ja_JP/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ampache SVN $Rev$\n"
 "Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2011-02-05 10:48+0900\n"
+"POT-Creation-Date: 2011-10-11 14:17+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"
@@ -18,40 +18,40 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../flag.php:56
+#: ../../flag.php:51
 msgid "Item Flagged"
 msgstr "アイテムをフラグしました"
 
-#: ../../flag.php:56
+#: ../../flag.php:51
 msgid "The specified item has been flagged"
 msgstr "指定されたアイテムはフラグ済みです"
 
-#: ../../playlist.php:77
+#: ../../playlist.php:72
 msgid "Playlist Created"
 msgstr "プレイリストを作成しました"
 
-#: ../../playlist.php:77
-#, fuzzy, php-format
+#: ../../playlist.php:72
+#, php-format
 msgid "%1$s (%2$s) has been created"
-msgstr "を作成しました"
+msgstr "%1$s (%2$s) を作成しました"
 
-#: ../../playlist.php:113
+#: ../../playlist.php:108
 msgid "Playlist Not Imported"
 msgstr "プレイリストはインポートされませんでした"
 
-#: ../../playlist.php:117
+#: ../../playlist.php:112
 msgid "Playlist Imported"
 msgstr "プレイリストをインポートしました"
 
-#: ../../playlist.php:149
+#: ../../playlist.php:144
 msgid "Empty Playlists Deleted"
 msgstr "空のプレイリストを削除しました"
 
-#: ../../update.php:60 ../../update.php:64
+#: ../../update.php:55 ../../update.php:59
 msgid "Ampache Update"
 msgstr "Apmache更新"
 
-#: ../../update.php:69
+#: ../../update.php:64
 #, php-format
 msgid ""
 "This page handles all database updates to Ampache starting with "
@@ -62,625 +62,897 @@ msgstr ""
 "扱います。あなたのデータベースによると、あなたの最新版は以下の通りです: "
 "<strong>%s</strong>"
 
-#: ../../update.php:70
+#: ../../update.php:65
 msgid "the following updates need to be performed"
 msgstr "以下の必要な更新が実行されました"
 
-#: ../../update.php:77
+#: ../../update.php:72
 msgid "Update Now!"
 msgstr "今すぐ更新！"
 
-#: ../../update.php:81
+#: ../../update.php:76
 msgid "Ampache Installation."
 msgstr "Ampache インストール"
 
-#: ../../shout.php:60
+#: ../../shout.php:55
 msgid "Invalid Object Selected"
 msgstr "不正なオブジェクトが選択されました"
 
-#: ../../lib/general.lib.php:247 ../../lib/class/flag.class.php:359
-#: ../../lib/class/localplay.class.php:674 ../../lib/class/user.class.php:710
-#: ../../templates/show_user.inc.php:35 ../../templates/show_users.inc.php:66
-#: ../../modules/localplay/mpd.controller.php:513
+#: ../../lib/general.lib.php:241 ../../lib/class/flag.class.php:350
+#: ../../lib/class/localplay.class.php:665 ../../lib/class/user.class.php:701
+#: ../../templates/show_user.inc.php:30 ../../templates/show_users.inc.php:61
+#: ../../modules/localplay/mpd.controller.php:506
 msgid "Unknown"
 msgstr "不明"
 
-#: ../../lib/rating.lib.php:63
+#: ../../lib/rating.lib.php:58
 msgid "Don't Play"
 msgstr "再生しない"
 
-#: ../../lib/rating.lib.php:66
+#: ../../lib/rating.lib.php:61
 msgid "It's Pretty Bad"
 msgstr "非常に悪い"
 
-#: ../../lib/rating.lib.php:69
+#: ../../lib/rating.lib.php:64
 msgid "It's Ok"
 msgstr "良い"
 
-#: ../../lib/rating.lib.php:72
+#: ../../lib/rating.lib.php:67
 msgid "It's Pretty Good"
 msgstr "非常に良い"
 
-#: ../../lib/rating.lib.php:75
+#: ../../lib/rating.lib.php:70
 msgid "I Love It!"
 msgstr "最高！"
 
-#: ../../lib/rating.lib.php:78
+#: ../../lib/rating.lib.php:73
 msgid "It's Insane"
 msgstr "すばらしい！"
 
-#: ../../lib/rating.lib.php:82
+#: ../../lib/rating.lib.php:77
 msgid "Off the Charts!"
 msgstr "とてつもなくすばらしい！"
 
-#: ../../lib/install.php:83
+#: ../../lib/install.php:78
 msgid "Config file already exists, install is probably completed"
 msgstr "設定ファイルは既に存在し、インストールは恐らく完了しています。"
 
-#: ../../lib/install.php:94
+#: ../../lib/install.php:89
 msgid "Unable to connect to database, check your ampache config"
 msgstr ""
 "データベースへ接続できませんでした。Ampacheのコンフィグをチェックしてくださ"
 "い。"
 
-#: ../../lib/install.php:101
+#: ../../lib/install.php:96
 msgid "Unable to select database, check your ampache config"
 msgstr ""
 "データベースを選択できません。Ampache設定ファイルをチェックしてください。"
 
-#: ../../lib/install.php:111
+#: ../../lib/install.php:106
 msgid "Existing Database detected, unable to continue installation"
 msgstr "既存のデータベースを検出しました。インストールを続行できません。"
 
-#: ../../lib/install.php:148 ../../install.php:121
+#: ../../lib/install.php:143 ../../install.php:116
 msgid "Error: Unable to make Database Connection"
 msgstr "エラー: データベース接続を確立できませんでした。"
 
-#: ../../lib/install.php:307
+#: ../../lib/install.php:302
 msgid "No Username/Password specified"
 msgstr "指定されたユーザ名/パスワードはありません"
 
-#: ../../lib/install.php:312
+#: ../../lib/install.php:307
 msgid "Passwords do not match"
 msgstr "パスワードが一致しません"
 
-#: ../../lib/preferences.php:179 ../../lib/preferences.php:298
-#: ../../templates/show_flag_row.inc.php:45
-#: ../../templates/show_user_row.inc.php:56
+#: ../../lib/javascript/search-data.php:48
+#: ../../templates/show_disabled_songs.inc.php:74
+msgid "Remove"
+msgstr "削除"
+
+#: ../../lib/preferences.php:174 ../../lib/preferences.php:293
+#: ../../templates/show_flag_row.inc.php:40
+#: ../../templates/show_user_row.inc.php:51
 msgid "Enable"
 msgstr "有効"
 
-#: ../../lib/preferences.php:180 ../../lib/preferences.php:299
-#: ../../templates/show_localplay_controllers.inc.php:57
-#: ../../templates/show_duplicates.inc.php:49
-#: ../../templates/show_duplicates.inc.php:88
-#: ../../templates/show_user_row.inc.php:59
+#: ../../lib/preferences.php:175 ../../lib/preferences.php:294
+#: ../../templates/show_localplay_controllers.inc.php:52
+#: ../../templates/show_duplicates.inc.php:44
+#: ../../templates/show_duplicates.inc.php:83
+#: ../../templates/show_user_row.inc.php:54
 msgid "Disable"
 msgstr "無効"
 
-#: ../../lib/preferences.php:189 ../../lib/preferences.php:231
-#: ../../lib/ui.lib.php:455 ../../templates/sidebar_localplay.inc.php:57
-#: ../../templates/show_gather_art.inc.php:36
-#: ../../templates/show_adds_catalog.inc.php:38
+#: ../../lib/preferences.php:184 ../../lib/preferences.php:226
+#: ../../lib/ui.lib.php:450 ../../templates/sidebar_localplay.inc.php:52
+#: ../../templates/show_gather_art.inc.php:31
+#: ../../templates/show_adds_catalog.inc.php:33
 msgid "None"
 msgstr "無し"
 
-#: ../../lib/preferences.php:191 ../../templates/show_edit_user.inc.php:108
-#: ../../templates/show_playtype_switch.inc.php:45
+#: ../../lib/preferences.php:186 ../../templates/show_edit_user.inc.php:103
+#: ../../templates/show_playtype_switch.inc.php:40
 msgid "Stream"
 msgstr "ストリーム"
 
-#: ../../lib/preferences.php:194 ../../templates/sidebar_modules.inc.php:53
-#: ../../templates/sidebar_home.inc.php:61
-#: ../../templates/show_edit_user.inc.php:105
-#: ../../templates/show_playtype_switch.inc.php:49
-#: ../../modules/localplay/httpq.controller.php:510
-#: ../../modules/localplay/mpd.controller.php:479
-#: ../../modules/localplay/vlc.controller.php:542
+#: ../../lib/preferences.php:189 ../../templates/sidebar_modules.inc.php:48
+#: ../../templates/sidebar_home.inc.php:57
+#: ../../templates/show_edit_user.inc.php:100
+#: ../../templates/show_playtype_switch.inc.php:44
+#: ../../modules/localplay/httpq.controller.php:503
+#: ../../modules/localplay/mpd.controller.php:472
+#: ../../modules/localplay/vlc.controller.php:535
 msgid "Democratic"
 msgstr "デモクラティック"
 
-#: ../../lib/preferences.php:197 ../../templates/sidebar_localplay.inc.php:45
-#: ../../templates/sidebar_home.inc.php:70
-#: ../../templates/show_edit_user.inc.php:106
-#: ../../templates/sidebar.inc.php:40
-#: ../../templates/show_playtype_switch.inc.php:47
+#: ../../lib/preferences.php:192 ../../templates/sidebar_localplay.inc.php:40
+#: ../../templates/sidebar_home.inc.php:66
+#: ../../templates/show_edit_user.inc.php:101
+#: ../../templates/sidebar.inc.php:35
+#: ../../templates/show_playtype_switch.inc.php:42
 msgid "Localplay"
 msgstr "ローカル再生"
 
-#: ../../lib/preferences.php:199
-#: ../../templates/show_playtype_switch.inc.php:51
+#: ../../lib/preferences.php:194
+#: ../../templates/show_playtype_switch.inc.php:46
 msgid "Flash Player"
 msgstr "Flashプレーヤー"
 
-#: ../../lib/preferences.php:206
+#: ../../lib/preferences.php:201
 msgid "M3U"
 msgstr "M3U"
 
-#: ../../lib/preferences.php:207
+#: ../../lib/preferences.php:202
 msgid "Simple M3U"
 msgstr "簡易M3U"
 
-#: ../../lib/preferences.php:208
+#: ../../lib/preferences.php:203
 msgid "PLS"
 msgstr "PLS"
 
-#: ../../lib/preferences.php:209
+#: ../../lib/preferences.php:204
 msgid "Asx"
 msgstr "Asx"
 
-#: ../../lib/preferences.php:210
+#: ../../lib/preferences.php:205
 msgid "RAM"
 msgstr "RAM"
 
-#: ../../lib/preferences.php:211
+#: ../../lib/preferences.php:206
 msgid "XSPF"
 msgstr "XSPF"
 
-#: ../../lib/preferences.php:245
+#: ../../lib/preferences.php:240
 msgid "Disabled"
 msgstr "無効"
 
-#: ../../lib/preferences.php:246 ../../lib/class/democratic.class.php:170
-#: ../../templates/show_add_access_current.inc.php:58
-#: ../../templates/show_manage_shoutbox.inc.php:47
-#: ../../templates/show_manage_shoutbox.inc.php:71
-#: ../../templates/show_flagged.inc.php:47
-#: ../../templates/show_flagged.inc.php:66
-#: ../../templates/show_add_access.inc.php:55
-#: ../../templates/show_create_democratic.inc.php:54
-#: ../../templates/show_edit_user.inc.php:90
-#: ../../templates/show_access_list.inc.php:71
-#: ../../templates/show_edit_access.inc.php:73
-#: ../../templates/show_preference_box.inc.php:71
-#: ../../templates/show_add_access_rpc.inc.php:55
-#: ../../templates/show_add_access_local.inc.php:55
-#: ../../templates/show_preference_admin.inc.php:55
-#: ../../templates/show_mail_users.inc.php:44
-#: ../../templates/show_add_user.inc.php:87 ../../admin/users.php:138
+#: ../../lib/preferences.php:241 ../../lib/class/democratic.class.php:161
+#: ../../templates/show_add_access_current.inc.php:53
+#: ../../templates/show_manage_shoutbox.inc.php:42
+#: ../../templates/show_manage_shoutbox.inc.php:66
+#: ../../templates/show_flagged.inc.php:42
+#: ../../templates/show_flagged.inc.php:61
+#: ../../templates/show_add_access.inc.php:50
+#: ../../templates/show_create_democratic.inc.php:49
+#: ../../templates/show_edit_user.inc.php:85
+#: ../../templates/show_access_list.inc.php:66
+#: ../../templates/show_edit_access.inc.php:68
+#: ../../templates/show_preference_box.inc.php:66
+#: ../../templates/show_add_access_rpc.inc.php:50
+#: ../../templates/show_add_access_local.inc.php:50
+#: ../../templates/show_preference_admin.inc.php:50
+#: ../../templates/show_mail_users.inc.php:39
+#: ../../templates/show_add_user.inc.php:82 ../../admin/users.php:133
 msgid "User"
 msgstr "ユーザ"
 
-#: ../../lib/preferences.php:247
+#: ../../lib/preferences.php:242
 msgid "Manager"
 msgstr "マネージャ"
 
-#: ../../lib/preferences.php:248 ../../lib/class/democratic.class.php:179
-#: ../../templates/show_democratic_playlist.inc.php:74
-#: ../../templates/show_democratic_playlist.inc.php:114
-#: ../../templates/show_create_democratic.inc.php:57
-#: ../../templates/show_edit_user.inc.php:93
-#: ../../templates/sidebar.inc.php:43
-#: ../../templates/show_preference_box.inc.php:74
-#: ../../templates/show_preference_admin.inc.php:56
-#: ../../templates/show_mail_users.inc.php:45
-#: ../../templates/show_add_user.inc.php:90 ../../admin/users.php:139
+#: ../../lib/preferences.php:243 ../../lib/class/democratic.class.php:170
+#: ../../templates/show_democratic_playlist.inc.php:69
+#: ../../templates/show_democratic_playlist.inc.php:109
+#: ../../templates/show_create_democratic.inc.php:52
+#: ../../templates/show_edit_user.inc.php:88
+#: ../../templates/sidebar.inc.php:38
+#: ../../templates/show_preference_box.inc.php:69
+#: ../../templates/show_preference_admin.inc.php:51
+#: ../../templates/show_mail_users.inc.php:40
+#: ../../templates/show_add_user.inc.php:85 ../../admin/users.php:134
 msgid "Admin"
 msgstr "管理者"
 
-#: ../../lib/preferences.php:264
+#: ../../lib/preferences.php:259
 msgid "Send on Add"
 msgstr "追加を送信"
 
-#: ../../lib/preferences.php:265
+#: ../../lib/preferences.php:260
 msgid "Send and Clear on Add"
 msgstr "追加を送信とクリア"
 
-#: ../../lib/preferences.php:266
+#: ../../lib/preferences.php:261
 msgid "Clear on Send"
 msgstr "送信をクリア"
 
-#: ../../lib/preferences.php:267 ../../lib/preferences.php:290
-#: ../../templates/show_manage_democratic.inc.php:50
+#: ../../lib/preferences.php:262 ../../lib/preferences.php:285
+#: ../../templates/show_manage_democratic.inc.php:45
 msgid "Default"
 msgstr "デフォルト"
 
-#: ../../lib/preferences.php:273 ../../lib/preferences.php:281
+#: ../../lib/preferences.php:268 ../../lib/preferences.php:276
 msgid "Low"
 msgstr "低"
 
-#: ../../lib/preferences.php:274 ../../lib/preferences.php:282
+#: ../../lib/preferences.php:269 ../../lib/preferences.php:277
 msgid "Medium"
 msgstr "中"
 
-#: ../../lib/preferences.php:275 ../../lib/preferences.php:283
+#: ../../lib/preferences.php:270 ../../lib/preferences.php:278
 msgid "High"
 msgstr "高"
 
-#: ../../lib/preferences.php:289 ../../lib/class/user.class.php:706
-#: ../../lib/class/catalog.class.php:168 ../../lib/class/catalog.class.php:169
-#: ../../lib/class/catalog.class.php:170 ../../templates/show_user.inc.php:34
-#: ../../templates/show_users.inc.php:65
+#: ../../lib/preferences.php:284 ../../lib/class/user.class.php:697
+#: ../../lib/class/catalog.class.php:173 ../../lib/class/catalog.class.php:174
+#: ../../lib/class/catalog.class.php:175 ../../templates/show_user.inc.php:29
+#: ../../templates/show_users.inc.php:60
 msgid "Never"
 msgstr "Never"
 
-#: ../../lib/preferences.php:291
+#: ../../lib/preferences.php:286
 msgid "Always"
 msgstr "常に"
 
-#: ../../lib/ui.lib.php:233 ../../templates/sidebar.inc.php:39
+#: ../../lib/ui.lib.php:228 ../../templates/sidebar.inc.php:34
 msgid "Home"
 msgstr "ホーム"
 
-#: ../../lib/ui.lib.php:236
+#: ../../lib/ui.lib.php:231
 msgid "Upload"
 msgstr "アップロード"
 
-#: ../../lib/ui.lib.php:239
+#: ../../lib/ui.lib.php:234
 msgid "Local Play"
 msgstr "ローカル再生"
 
-#: ../../lib/ui.lib.php:242
+#: ../../lib/ui.lib.php:237
 msgid "Random Play"
 msgstr "ランダム再生"
 
-#: ../../lib/ui.lib.php:245 ../../templates/sidebar_home.inc.php:57
-#: ../../templates/sidebar_home.inc.php:79
-#: ../../templates/show_manage_democratic.inc.php:46
+#: ../../lib/ui.lib.php:240 ../../lib/class/search.class.php:342
+#: ../../templates/sidebar_home.inc.php:53
+#: ../../templates/sidebar_home.inc.php:75
+#: ../../templates/show_manage_democratic.inc.php:41
 msgid "Playlist"
 msgstr "プレイリスト"
 
-#: ../../lib/ui.lib.php:248 ../../templates/show_search.inc.php:162
-#: ../../templates/show_search_bar.inc.php:41
+#: ../../lib/ui.lib.php:243 ../../templates/show_search.inc.php:63
+#: ../../templates/sidebar_home.inc.php:86
+#: ../../templates/show_search_bar.inc.php:43
 msgid "Search"
 msgstr "検索"
 
-#: ../../lib/ui.lib.php:251 ../../templates/sidebar.inc.php:41
-#: ../../templates/show_user_row.inc.php:52
-#: ../../templates/sidebar_preferences.inc.php:41
+#: ../../lib/ui.lib.php:246 ../../templates/sidebar.inc.php:36
+#: ../../templates/show_user_row.inc.php:47
+#: ../../templates/sidebar_preferences.inc.php:36
 msgid "Preferences"
 msgstr "設定"
 
-#: ../../lib/ui.lib.php:254 ../../lib/ui.lib.php:258
+#: ../../lib/ui.lib.php:249 ../../lib/ui.lib.php:253
 msgid "Admin-Catalog"
 msgstr "管理-カタログ"
 
-#: ../../lib/ui.lib.php:262
+#: ../../lib/ui.lib.php:257
 msgid "Admin-User Management"
 msgstr "管理-ユーザ管理"
 
-#: ../../lib/ui.lib.php:266
+#: ../../lib/ui.lib.php:261
 msgid "Admin-Mail Users"
 msgstr "管理-メール"
 
-#: ../../lib/ui.lib.php:270
+#: ../../lib/ui.lib.php:265
 msgid "Admin-Manage Access Lists"
 msgstr "管理-アクセスリスト管理"
 
-#: ../../lib/ui.lib.php:274
+#: ../../lib/ui.lib.php:269
 msgid "Admin-Site Preferences"
 msgstr "管理-サイト設定"
 
-#: ../../lib/ui.lib.php:278
+#: ../../lib/ui.lib.php:273
 msgid "Admin-Manage Modules"
 msgstr "管理-モジュール管理"
 
-#: ../../lib/ui.lib.php:282
+#: ../../lib/ui.lib.php:277
 msgid "Browse Music"
 msgstr "ミュージック閲覧"
 
-#: ../../lib/ui.lib.php:286 ../../lib/class/browse.class.php:153
-#: ../../templates/show_recommended_artists.inc.php:50
-#: ../../templates/show_recommended_artists.inc.php:78
-#: ../../templates/browse_filters.inc.php:75
-#: ../../templates/show_stats.inc.php:43
-#: ../../templates/show_artists.inc.php:54
-#: ../../templates/show_artists.inc.php:82
-#: ../../templates/sidebar_home.inc.php:47
+#: ../../lib/ui.lib.php:281 ../../lib/class/browse.class.php:146
+#: ../../templates/show_recommended_artists.inc.php:45
+#: ../../templates/show_recommended_artists.inc.php:73
+#: ../../templates/browse_filters.inc.php:65
+#: ../../templates/show_search.inc.php:39
+#: ../../templates/show_stats.inc.php:38
+#: ../../templates/show_artists.inc.php:49
+#: ../../templates/show_artists.inc.php:77
+#: ../../templates/sidebar_home.inc.php:42
+#: ../../templates/sidebar_home.inc.php:89
+#: ../../templates/show_random.inc.php:35
 msgid "Albums"
 msgstr "アルバム"
 
-#: ../../lib/ui.lib.php:290 ../../lib/class/browse.class.php:164
-#: ../../lib/class/album.class.php:272 ../../templates/show_stats.inc.php:44
-#: ../../templates/sidebar_home.inc.php:48
+#: ../../lib/ui.lib.php:285 ../../lib/class/browse.class.php:157
+#: ../../lib/class/album.class.php:263 ../../templates/show_search.inc.php:40
+#: ../../templates/show_stats.inc.php:39
+#: ../../templates/sidebar_home.inc.php:43
+#: ../../templates/sidebar_home.inc.php:90
+#: ../../templates/show_random.inc.php:36
 msgid "Artists"
 msgstr "アーティスト"
 
-#: ../../lib/ui.lib.php:294 ../../templates/show_stats.inc.php:37
-#: ../../templates/sidebar_home.inc.php:85
+#: ../../lib/ui.lib.php:289 ../../templates/show_stats.inc.php:32
+#: ../../templates/sidebar_home.inc.php:81
 msgid "Statistics"
 msgstr "統計"
 
-#: ../../lib/ui.lib.php:348
+#: ../../lib/ui.lib.php:343
 msgid "Add New"
 msgstr "新規追加"
 
-#: ../../lib/ui.lib.php:428 ../../lib/class/access.class.php:501
-#: ../../lib/class/access.class.php:521
-#: ../../templates/show_add_access_current.inc.php:54
-#: ../../templates/show_admin_tools.inc.php:63
-#: ../../templates/show_add_access.inc.php:51
-#: ../../templates/show_edit_access.inc.php:91
-#: ../../templates/show_add_access_rpc.inc.php:51
-#: ../../templates/show_add_access_rpc.inc.php:66
-#: ../../templates/show_add_access_local.inc.php:51
-#: ../../templates/show_add_access_local.inc.php:66
-#: ../../templates/show_random.inc.php:52
-#: ../../templates/show_mail_users.inc.php:43
-#: ../../templates/show_export.inc.php:46
+#: ../../lib/ui.lib.php:423 ../../lib/class/access.class.php:485
+#: ../../lib/class/access.class.php:505
+#: ../../templates/show_add_access_current.inc.php:49
+#: ../../templates/show_admin_tools.inc.php:58
+#: ../../templates/show_add_access.inc.php:46
+#: ../../templates/show_edit_access.inc.php:86
+#: ../../templates/show_add_access_rpc.inc.php:46
+#: ../../templates/show_add_access_rpc.inc.php:61
+#: ../../templates/show_add_access_local.inc.php:46
+#: ../../templates/show_add_access_local.inc.php:61
+#: ../../templates/show_random.inc.php:62
+#: ../../templates/show_mail_users.inc.php:38
+#: ../../templates/show_export.inc.php:41
 msgid "All"
 msgstr "全て"
 
-#: ../../lib/ui.lib.php:772
+#: ../../lib/ui.lib.php:773
 msgid "On"
 msgstr "オン"
 
-#: ../../lib/ui.lib.php:775
+#: ../../lib/ui.lib.php:776
 msgid "Off"
 msgstr "オフ"
 
-#: ../../lib/class/art.class.php:992 ../../lib/class/catalog.class.php:480
+#: ../../lib/class/art.class.php:979 ../../lib/class/catalog.class.php:490
 msgid "Error: Unable to open"
 msgstr "エラー: 開けませんでした"
 
-#: ../../lib/class/access.class.php:172 ../../lib/class/access.class.php:176
-#: ../../lib/class/access.class.php:219 ../../lib/class/access.class.php:223
+#: ../../lib/class/access.class.php:163 ../../lib/class/access.class.php:167
+#: ../../lib/class/access.class.php:210 ../../lib/class/access.class.php:214
 msgid "Invalid IPv4 / IPv6 Address Entered"
 msgstr "無効なIPv4/IPv6アドレスが入力されました"
 
-#: ../../lib/class/access.class.php:181 ../../lib/class/access.class.php:182
-#: ../../lib/class/access.class.php:228 ../../lib/class/access.class.php:229
+#: ../../lib/class/access.class.php:172 ../../lib/class/access.class.php:173
+#: ../../lib/class/access.class.php:219 ../../lib/class/access.class.php:220
 msgid "IP Address Version Mismatch"
 msgstr "IPアドレスバージョンが一致しません"
 
-#: ../../lib/class/access.class.php:236
+#: ../../lib/class/access.class.php:227
 msgid "Duplicate ACL defined"
 msgstr "重複しているACL定義"
 
-#: ../../lib/class/access.class.php:504
-#: ../../templates/show_add_access_current.inc.php:51
-#: ../../templates/show_add_access.inc.php:48
-#: ../../templates/show_edit_access.inc.php:88
-#: ../../templates/show_add_access_rpc.inc.php:48
-#: ../../templates/show_add_access_local.inc.php:48
+#: ../../lib/class/access.class.php:488
+#: ../../templates/show_add_access_current.inc.php:46
+#: ../../templates/show_add_access.inc.php:43
+#: ../../templates/show_edit_access.inc.php:83
+#: ../../templates/show_add_access_rpc.inc.php:43
+#: ../../templates/show_add_access_local.inc.php:43
 msgid "View"
 msgstr "閲覧"
 
-#: ../../lib/class/access.class.php:507
-#: ../../templates/show_add_access_current.inc.php:52
-#: ../../templates/show_add_access.inc.php:49
-#: ../../templates/show_edit_access.inc.php:89
-#: ../../templates/show_add_access_rpc.inc.php:49
-#: ../../templates/show_add_access_local.inc.php:49
+#: ../../lib/class/access.class.php:491
+#: ../../templates/show_add_access_current.inc.php:47
+#: ../../templates/show_add_access.inc.php:44
+#: ../../templates/show_edit_access.inc.php:84
+#: ../../templates/show_add_access_rpc.inc.php:44
+#: ../../templates/show_add_access_local.inc.php:44
 msgid "Read"
 msgstr "読取"
 
-#: ../../lib/class/access.class.php:510
-#: ../../templates/show_add_access_current.inc.php:53
-#: ../../templates/show_add_access.inc.php:50
-#: ../../templates/show_edit_access.inc.php:90
-#: ../../templates/show_add_access_rpc.inc.php:50
-#: ../../templates/show_add_access_local.inc.php:50
+#: ../../lib/class/access.class.php:494
+#: ../../templates/show_add_access_current.inc.php:48
+#: ../../templates/show_add_access.inc.php:45
+#: ../../templates/show_edit_access.inc.php:85
+#: ../../templates/show_add_access_rpc.inc.php:45
+#: ../../templates/show_add_access_local.inc.php:45
 msgid "Read/Write"
 msgstr "読取/書込"
 
-#: ../../lib/class/access.class.php:537
+#: ../../lib/class/access.class.php:521
 msgid "API/RPC"
 msgstr "API/RPC"
 
-#: ../../lib/class/access.class.php:540
-#: ../../templates/show_add_access.inc.php:67
-#: ../../templates/show_edit_access.inc.php:49
-#: ../../templates/show_add_access_local.inc.php:64
-#: ../../templates/show_add_access_local.inc.php:65
-#: ../../templates/show_add_access_local.inc.php:66
+#: ../../lib/class/access.class.php:524
+#: ../../templates/show_add_access.inc.php:62
+#: ../../templates/show_edit_access.inc.php:44
+#: ../../templates/show_add_access_local.inc.php:59
+#: ../../templates/show_add_access_local.inc.php:60
+#: ../../templates/show_add_access_local.inc.php:61
 msgid "Local Network Definition"
 msgstr "ローカルネットワーク定義"
 
-#: ../../lib/class/access.class.php:543
-#: ../../templates/show_add_access.inc.php:66
-#: ../../templates/show_edit_access.inc.php:48
-#: ../../templates/show_add_access_local.inc.php:65
+#: ../../lib/class/access.class.php:527
+#: ../../templates/show_add_access.inc.php:61
+#: ../../templates/show_edit_access.inc.php:43
+#: ../../templates/show_add_access_local.inc.php:60
 msgid "Web Interface"
 msgstr "ウェブインタフェース"
 
-#: ../../lib/class/access.class.php:547
-#: ../../templates/show_add_access.inc.php:65
-#: ../../templates/show_edit_access.inc.php:47
-#: ../../templates/show_add_access_rpc.inc.php:65
-#: ../../templates/show_add_access_local.inc.php:65
+#: ../../lib/class/access.class.php:531
+#: ../../templates/show_add_access.inc.php:60
+#: ../../templates/show_edit_access.inc.php:42
+#: ../../templates/show_add_access_rpc.inc.php:60
+#: ../../templates/show_add_access_local.inc.php:60
 msgid "Stream Access"
 msgstr "ストリームアクセス"
 
-#: ../../lib/class/random.class.php:433 ../../templates/rightbar.inc.php:78
+#: ../../lib/class/random.class.php:371 ../../templates/rightbar.inc.php:73
 msgid "Related Album"
 msgstr "関連するアルバム"
 
-#: ../../lib/class/random.class.php:436
+#: ../../lib/class/random.class.php:374
 msgid "Related Genre"
 msgstr "関連するジャンル"
 
-#: ../../lib/class/random.class.php:439 ../../templates/rightbar.inc.php:75
+#: ../../lib/class/random.class.php:377 ../../templates/rightbar.inc.php:70
 msgid "Related Artist"
 msgstr "関連するアーティスト"
 
-#: ../../lib/class/random.class.php:442 ../../templates/rightbar.inc.php:72
+#: ../../lib/class/random.class.php:380 ../../templates/rightbar.inc.php:67
 msgid "Pure Random"
 msgstr "純粋なランダム"
 
-#: ../../lib/class/api.class.php:245
+#: ../../lib/class/api.class.php:229
 msgid "Error Invalid Handshake - "
 msgstr "不正なハンドシェイクエラー - "
 
-#: ../../lib/class/api.class.php:245
+#: ../../lib/class/api.class.php:229
 msgid "Invalid Username/Password"
 msgstr "不正なユーザ名/パスワードです"
 
-#: ../../lib/class/api.class.php:673 ../../lib/class/api.class.php:729
-#: ../../server/xml.server.php:107
+#: ../../lib/class/api.class.php:656 ../../lib/class/api.class.php:712
+#: ../../server/xml.server.php:102
 msgid "Invalid Request"
 msgstr "不正なリクエスト"
 
-#: ../../lib/class/api.class.php:694 ../../lib/class/api.class.php:707
+#: ../../lib/class/api.class.php:677 ../../lib/class/api.class.php:690
 msgid "Media Object Invalid or Not Specified"
 msgstr "メディアオブジェクトは不正か指定されていません"
 
-#: ../../lib/class/flag.class.php:334
+#: ../../lib/class/flag.class.php:325
 msgid "Approved"
 msgstr "承認"
 
-#: ../../lib/class/flag.class.php:335
+#: ../../lib/class/flag.class.php:326
 msgid "Pending"
 msgstr "保留"
 
-#: ../../lib/class/flag.class.php:347 ../../templates/rightbar.inc.php:117
-#: ../../templates/show_democratic_playlist.inc.php:99
-#: ../../templates/show_admin_tools.inc.php:65
-#: ../../templates/show_localplay_playlist.inc.php:63
-#: ../../templates/show_access_list.inc.php:90
-#: ../../templates/show_catalog_row.inc.php:47
-#: ../../templates/show_playlist_song_row.inc.php:54
-#: ../../templates/show_playlist_row.inc.php:51
-#: ../../templates/show_live_stream_row.inc.php:47
-#: ../../templates/show_localplay_instances.inc.php:52
-#: ../../templates/show_playlist.inc.php:77
-#: ../../templates/show_user_row.inc.php:62
-#: ../../templates/show_manage_democratic.inc.php:70
-#: ../../templates/show_shout_row.inc.php:48
+#: ../../lib/class/flag.class.php:338 ../../templates/rightbar.inc.php:112
+#: ../../templates/show_democratic_playlist.inc.php:94
+#: ../../templates/show_admin_tools.inc.php:60
+#: ../../templates/show_smartplaylist.inc.php:51
+#: ../../templates/show_localplay_playlist.inc.php:58
+#: ../../templates/show_access_list.inc.php:85
+#: ../../templates/show_catalog_row.inc.php:42
+#: ../../templates/show_playlist_song_row.inc.php:49
+#: ../../templates/show_playlist_row.inc.php:46
+#: ../../templates/show_live_stream_row.inc.php:42
+#: ../../templates/show_localplay_instances.inc.php:47
+#: ../../templates/show_smartplaylist_row.inc.php:37
+#: ../../templates/show_playlist.inc.php:72
+#: ../../templates/show_user_row.inc.php:57
+#: ../../templates/show_manage_democratic.inc.php:65
+#: ../../templates/show_shout_row.inc.php:43
 msgid "Delete"
 msgstr "削除"
 
-#: ../../lib/class/flag.class.php:350
+#: ../../lib/class/flag.class.php:341
 msgid "Re-Tag"
 msgstr "Re-Tag"
 
-#: ../../lib/class/flag.class.php:353
+#: ../../lib/class/flag.class.php:344
 msgid "Re-encode"
 msgstr "再エンコード"
 
-#: ../../lib/class/flag.class.php:356
+#: ../../lib/class/flag.class.php:347
 msgid "Other"
 msgstr "その他"
 
-#: ../../lib/class/browse.class.php:147
-#: ../../templates/show_recommended_artists.inc.php:49
-#: ../../templates/show_recommended_artists.inc.php:77
-#: ../../templates/show_albums.inc.php:59
-#: ../../templates/show_albums.inc.php:90
-#: ../../templates/show_stats.inc.php:45 ../../templates/show_stats.inc.php:81
-#: ../../templates/show_artists.inc.php:53
-#: ../../templates/show_artists.inc.php:81
-#: ../../templates/show_manage_democratic.inc.php:51
+#: ../../lib/class/browse.class.php:140
+#: ../../templates/show_recommended_artists.inc.php:44
+#: ../../templates/show_recommended_artists.inc.php:72
+#: ../../templates/show_albums.inc.php:54
+#: ../../templates/show_albums.inc.php:85
+#: ../../templates/show_search.inc.php:38
+#: ../../templates/show_stats.inc.php:40 ../../templates/show_stats.inc.php:76
+#: ../../templates/show_artists.inc.php:48
+#: ../../templates/show_artists.inc.php:76
+#: ../../templates/sidebar_home.inc.php:88
+#: ../../templates/show_random.inc.php:34
+#: ../../templates/show_manage_democratic.inc.php:46
 msgid "Songs"
 msgstr "曲"
 
-#: ../../lib/class/browse.class.php:159
+#: ../../lib/class/browse.class.php:152
 msgid "Manage Users"
 msgstr "ユーザ管理"
 
-#: ../../lib/class/browse.class.php:171
-#: ../../templates/sidebar_home.inc.php:51
+#: ../../lib/class/browse.class.php:164
+#: ../../templates/sidebar_home.inc.php:47
 msgid "Radio Stations"
 msgstr "ラジオステーション"
 
-#: ../../lib/class/browse.class.php:177
-#: ../../templates/sidebar_home.inc.php:50
+#: ../../lib/class/browse.class.php:170
+#: ../../templates/sidebar_home.inc.php:45
 msgid "Playlists"
 msgstr "プレイリスト"
 
-#: ../../lib/class/browse.class.php:182
+#: ../../lib/class/browse.class.php:175
 msgid "Playlist Songs"
 msgstr "プレイリスト曲"
 
-#: ../../lib/class/browse.class.php:187
+#: ../../lib/class/browse.class.php:180
 msgid "Current Playlist"
 msgstr "現在のプレイリスト"
 
-#: ../../lib/class/browse.class.php:192
-#: ../../templates/show_admin_tools.inc.php:38
-#: ../../templates/show_stats.inc.php:38
-#: ../../templates/sidebar_admin.inc.php:36
+#: ../../lib/class/browse.class.php:185
+#: ../../templates/sidebar_home.inc.php:46
+msgid "Smart Playlists"
+msgstr "スマートプレイリスト"
+
+#: ../../lib/class/browse.class.php:190
+#: ../../templates/show_admin_tools.inc.php:33
+#: ../../templates/show_stats.inc.php:33
+#: ../../templates/sidebar_admin.inc.php:31
 msgid "Catalogs"
 msgstr "カタログ"
 
-#: ../../lib/class/browse.class.php:197
+#: ../../lib/class/browse.class.php:195
 msgid "Shoutbox Records"
 msgstr "シャウトボックスレコード"
 
-#: ../../lib/class/browse.class.php:202
+#: ../../lib/class/browse.class.php:200
 msgid "Flagged Records"
 msgstr "フラグされたレコード"
 
-#: ../../lib/class/browse.class.php:208
-#: ../../templates/sidebar_home.inc.php:49 ../../browse.php:84
+#: ../../lib/class/browse.class.php:206
+#: ../../templates/sidebar_home.inc.php:44 ../../browse.php:79
 msgid "Tag Cloud"
 msgstr "タグクラウド"
 
-#: ../../lib/class/browse.class.php:214
-#: ../../templates/sidebar_home.inc.php:52
+#: ../../lib/class/browse.class.php:212 ../../templates/show_search.inc.php:41
+#: ../../templates/show_stats.inc.php:41 ../../templates/show_stats.inc.php:77
+#: ../../templates/sidebar_home.inc.php:48
+#: ../../templates/sidebar_home.inc.php:91
 msgid "Videos"
 msgstr "動画"
 
-#: ../../lib/class/browse.class.php:219
-#: ../../templates/show_democratic.inc.php:35
+#: ../../lib/class/browse.class.php:217
+#: ../../templates/show_democratic.inc.php:30
 msgid "Democratic Playlist"
 msgstr "デモクラティックプレイリスト"
 
-#: ../../lib/class/democratic.class.php:162
-#: ../../lib/class/video.class.php:103 ../../templates/show_search.inc.php:90
-#: ../../templates/show_create_democratic.inc.php:47
+#: ../../lib/class/search.class.php:56
+msgid "is greater than or equal to"
+msgstr ""
+
+#: ../../lib/class/search.class.php:62
+msgid "is less than or equal to"
+msgstr ""
+
+#: ../../lib/class/search.class.php:68 ../../lib/class/search.class.php:136
+#: ../../lib/class/search.class.php:155 ../../lib/class/search.class.php:168
+msgid "is"
+msgstr ""
+
+#: ../../lib/class/search.class.php:74 ../../lib/class/search.class.php:161
+#: ../../lib/class/search.class.php:174
+msgid "is not"
+msgstr ""
+
+#: ../../lib/class/search.class.php:80
+msgid "is greater than"
+msgstr ""
+
+#: ../../lib/class/search.class.php:86
+msgid "is less than"
+msgstr ""
+
+#: ../../lib/class/search.class.php:93
+msgid "is true"
+msgstr ""
+
+#: ../../lib/class/search.class.php:98
+msgid "is false"
+msgstr ""
+
+#: ../../lib/class/search.class.php:104
+msgid "contains"
+msgstr ""
+
+#: ../../lib/class/search.class.php:112
+msgid "does not contain"
+msgstr ""
+
+#: ../../lib/class/search.class.php:120
+#, fuzzy
+msgid "starts with"
+msgstr "開始 :"
+
+#: ../../lib/class/search.class.php:128
+msgid "ends with"
+msgstr ""
+
+#: ../../lib/class/search.class.php:142
+msgid "sounds like"
+msgstr ""
+
+#: ../../lib/class/search.class.php:148
+msgid "does not sound like"
+msgstr ""
+
+#: ../../lib/class/search.class.php:181
+msgid "before"
+msgstr ""
+
+#: ../../lib/class/search.class.php:187
+msgid "after"
+msgstr ""
+
+#: ../../lib/class/search.class.php:195
+msgid "Any searchable text"
+msgstr ""
+
+#: ../../lib/class/search.class.php:202 ../../lib/class/search.class.php:363
+#: ../../templates/show_disabled_songs.inc.php:43
+#: ../../templates/show_disabled_songs.inc.php:66
+#: ../../templates/show_democratic_playlist.inc.php:64
+#: ../../templates/show_democratic_playlist.inc.php:104
+#: ../../templates/show_edit_song.inc.php:39
+#: ../../templates/show_song.inc.php:52
+#: ../../templates/show_search_bar.inc.php:38
+#: ../../templates/show_videos.inc.php:45
+#: ../../templates/show_videos.inc.php:69
+#: ../../templates/show_duplicate.inc.php:40
+msgid "Title"
+msgstr "タイトル"
+
+#: ../../lib/class/search.class.php:209 ../../templates/show_albums.inc.php:52
+#: ../../templates/show_albums.inc.php:83
+#: ../../templates/show_disabled_songs.inc.php:44
+#: ../../templates/show_disabled_songs.inc.php:67
+#: ../../templates/show_democratic_playlist.inc.php:65
+#: ../../templates/show_democratic_playlist.inc.php:105
+#: ../../templates/show_edit_song.inc.php:45
+#: ../../templates/show_song.inc.php:54
+#: ../../templates/show_recently_played.inc.php:46
+#: ../../templates/show_recently_played.inc.php:109
+#: ../../templates/sidebar_home.inc.php:73
+#: ../../templates/show_songs.inc.php:49 ../../templates/show_songs.inc.php:78
+#: ../../templates/show_playlist_songs.inc.php:52
+#: ../../templates/show_playlist_songs.inc.php:78
+#: ../../templates/show_get_albumart.inc.php:43
+#: ../../templates/show_duplicates.inc.php:47
+#: ../../templates/show_duplicates.inc.php:86
+#: ../../templates/show_search_bar.inc.php:39
+#: ../../templates/show_now_playing_row.inc.php:68
+#: ../../templates/show_lyrics_song.inc.php:56
+msgid "Album"
+msgstr "アルバム"
+
+#: ../../lib/class/search.class.php:216
+#: ../../templates/show_recommended_artists.inc.php:43
+#: ../../templates/show_recommended_artists.inc.php:71
+#: ../../templates/show_albums.inc.php:53
+#: ../../templates/show_albums.inc.php:84
+#: ../../templates/show_disabled_songs.inc.php:45
+#: ../../templates/show_disabled_songs.inc.php:68
+#: ../../templates/show_democratic_playlist.inc.php:66
+#: ../../templates/show_democratic_playlist.inc.php:106
+#: ../../templates/show_edit_song.inc.php:53
+#: ../../templates/show_song.inc.php:53
+#: ../../templates/browse_filters.inc.php:68
+#: ../../templates/show_recently_played.inc.php:47
+#: ../../templates/show_recently_played.inc.php:110
+#: ../../templates/show_artists.inc.php:47
+#: ../../templates/show_artists.inc.php:75
+#: ../../templates/sidebar_home.inc.php:74
+#: ../../templates/show_songs.inc.php:48 ../../templates/show_songs.inc.php:77
+#: ../../templates/show_playlist_songs.inc.php:51
+#: ../../templates/show_playlist_songs.inc.php:77
+#: ../../templates/show_get_albumart.inc.php:35
+#: ../../templates/show_duplicates.inc.php:46
+#: ../../templates/show_duplicates.inc.php:85
+#: ../../templates/show_search_bar.inc.php:40
+#: ../../templates/show_now_playing_row.inc.php:75
+#: ../../templates/show_lyrics_song.inc.php:63
+msgid "Artist"
+msgstr "アーティスト"
+
+#: ../../lib/class/search.class.php:223
+#: ../../templates/show_edit_song.inc.php:73
+#: ../../templates/show_song.inc.php:57
+#: ../../templates/show_manage_shoutbox.inc.php:44
+#: ../../templates/show_manage_shoutbox.inc.php:68
+#: ../../templates/show_flagged.inc.php:44
+#: ../../templates/show_flagged.inc.php:63
+msgid "Comment"
+msgstr "コメント"
+
+#: ../../lib/class/search.class.php:231 ../../lib/class/search.class.php:409
+#: ../../lib/class/search.class.php:431
+#: ../../templates/show_live_streams.inc.php:47
+#: ../../templates/show_live_streams.inc.php:69
+#: ../../templates/show_search_bar.inc.php:41
+msgid "Tag"
+msgstr "タグ"
+
+#: ../../lib/class/search.class.php:238 ../../lib/class/search.class.php:417
+#: ../../templates/show_disabled_songs.inc.php:46
+#: ../../templates/show_disabled_songs.inc.php:69
+#: ../../templates/show_import_playlist.inc.php:35
+#: ../../templates/show_song.inc.php:63
+#: ../../templates/show_duplicates.inc.php:51
+#: ../../templates/show_duplicates.inc.php:90
+msgid "Filename"
+msgstr "フルネーム"
+
+#: ../../lib/class/search.class.php:245 ../../lib/class/search.class.php:370
+#: ../../templates/show_albums.inc.php:55
+#: ../../templates/show_albums.inc.php:86
+#: ../../templates/show_edit_song.inc.php:67
+#: ../../templates/show_edit_album.inc.php:41
+msgid "Year"
+msgstr "年"
+
+#: ../../lib/class/search.class.php:252
+msgid "Length (in minutes)"
+msgstr ""
+
+#: ../../lib/class/search.class.php:260 ../../lib/class/search.class.php:378
+#: ../../templates/show_recommended_artists.inc.php:48
+#: ../../templates/show_recommended_artists.inc.php:76
+#: ../../templates/show_albums.inc.php:57
+#: ../../templates/show_albums.inc.php:88 ../../templates/show_song.inc.php:35
+#: ../../templates/show_artists.inc.php:52
+#: ../../templates/show_artists.inc.php:80
+#: ../../templates/show_songs.inc.php:56 ../../templates/show_songs.inc.php:83
+#: ../../templates/show_playlist_songs.inc.php:59
+#: ../../templates/show_playlist_songs.inc.php:83
+#: ../../templates/show_now_playing_row.inc.php:43
+msgid "Rating"
+msgstr "評価"
+
+#: ../../lib/class/search.class.php:277 ../../templates/show_song.inc.php:61
+#: ../../templates/show_duplicates.inc.php:49
+#: ../../templates/show_duplicates.inc.php:88
+msgid "Bitrate"
+msgstr "ビットレート"
+
+#: ../../lib/class/search.class.php:302
+msgid "Played"
+msgstr "再生済"
+
+#: ../../lib/class/search.class.php:309 ../../lib/class/catalog.class.php:1392
+#: ../../templates/show_song.inc.php:68 ../../admin/access.php:110
+msgid "Added"
+msgstr "追加しました"
+
+#: ../../lib/class/search.class.php:316 ../../lib/class/catalog.class.php:1071
+#: ../../preferences.php:118 ../../admin/access.php:130
+msgid "Updated"
+msgstr "更新しました"
+
+#: ../../lib/class/search.class.php:329 ../../lib/class/search.class.php:401
+#: ../../templates/browse_filters.inc.php:74
+#: ../../templates/show_add_live_stream.inc.php:67
+#: ../../templates/show_export.inc.php:38
+msgid "Catalog"
+msgstr "カタログ"
+
+#: ../../lib/class/search.class.php:355
+#, fuzzy
+msgid "Smart Playlist"
+msgstr "プレイリストをインポート"
+
+#: ../../lib/class/search.class.php:425
+#: ../../templates/show_add_access_current.inc.php:35
+#: ../../templates/show_edit_catalog.inc.php:34
+#: ../../templates/show_admin_tools.inc.php:40
+#: ../../templates/show_admin_tools.inc.php:80
+#: ../../templates/show_edit_artist.inc.php:35
+#: ../../templates/show_localplay_controllers.inc.php:40
+#: ../../templates/show_localplay_controllers.inc.php:71
+#: ../../templates/show_stats.inc.php:71
+#: ../../templates/show_localplay_playlist.inc.php:42
+#: ../../templates/show_localplay_playlist.inc.php:68
+#: ../../templates/show_add_access.inc.php:35
+#: ../../templates/show_create_democratic.inc.php:33
+#: ../../templates/show_edit_album.inc.php:35
+#: ../../templates/show_live_streams.inc.php:44
+#: ../../templates/show_live_streams.inc.php:66
+#: ../../templates/show_account.inc.php:35
+#: ../../templates/show_add_live_stream.inc.php:34
+#: ../../templates/show_access_list.inc.php:62
+#: ../../templates/show_catalogs.inc.php:41
+#: ../../templates/show_catalogs.inc.php:65
+#: ../../templates/show_edit_access.inc.php:34
+#: ../../templates/show_add_playlist.inc.php:34
+#: ../../templates/show_edit_live_stream_row.inc.php:34
+#: ../../templates/show_plugins.inc.php:40
+#: ../../templates/show_plugins.inc.php:77
+#: ../../templates/show_add_access_rpc.inc.php:35
+#: ../../templates/show_add_access_local.inc.php:35
+msgid "Name"
+msgstr "名前"
+
+#: ../../lib/class/democratic.class.php:153 ../../lib/class/video.class.php:94
+#: ../../templates/show_create_democratic.inc.php:42
 msgid "minutes"
 msgstr "分"
 
-#: ../../lib/class/democratic.class.php:163
+#: ../../lib/class/democratic.class.php:154
 msgid "Primary"
 msgstr "プライマリ"
 
-#: ../../lib/class/democratic.class.php:167
-#: ../../templates/show_edit_user.inc.php:89
-#: ../../templates/show_preference_box.inc.php:70
-#: ../../templates/show_preference_admin.inc.php:54
-#: ../../templates/show_add_user.inc.php:86 ../../admin/users.php:137
+#: ../../lib/class/democratic.class.php:158
+#: ../../templates/show_edit_user.inc.php:84
+#: ../../templates/show_preference_box.inc.php:65
+#: ../../templates/show_preference_admin.inc.php:49
+#: ../../templates/show_add_user.inc.php:81 ../../admin/users.php:132
 msgid "Guest"
 msgstr "ゲスト"
 
-#: ../../lib/class/democratic.class.php:173
-#: ../../templates/show_create_democratic.inc.php:55
-#: ../../templates/show_edit_user.inc.php:91
-#: ../../templates/show_preference_box.inc.php:72
-#: ../../templates/show_add_user.inc.php:88
+#: ../../lib/class/democratic.class.php:164
+#: ../../templates/show_create_democratic.inc.php:50
+#: ../../templates/show_edit_user.inc.php:86
+#: ../../templates/show_preference_box.inc.php:67
+#: ../../templates/show_add_user.inc.php:83
 msgid "Content Manager"
 msgstr "コンテンツマネージャ"
 
-#: ../../lib/class/democratic.class.php:176
-#: ../../templates/show_create_democratic.inc.php:56
-#: ../../templates/show_edit_user.inc.php:92
-#: ../../templates/show_preference_box.inc.php:73
-#: ../../templates/show_add_user.inc.php:89
+#: ../../lib/class/democratic.class.php:167
+#: ../../templates/show_create_democratic.inc.php:51
+#: ../../templates/show_edit_user.inc.php:87
+#: ../../templates/show_preference_box.inc.php:68
+#: ../../templates/show_add_user.inc.php:84
 msgid "Catalog Manager"
 msgstr "カタログマネージャ"
 
-#: ../../lib/class/localplay.class.php:665
-#: ../../lib/class/ampacherss.class.php:92 ../../templates/header.inc.php:55
-#: ../../templates/show_now_playing.inc.php:44
-#: ../../templates/show_localplay_status.inc.php:39
+#: ../../lib/class/localplay.class.php:656
+#: ../../lib/class/ampacherss.class.php:83 ../../templates/header.inc.php:50
+#: ../../templates/show_now_playing.inc.php:39
+#: ../../templates/show_localplay_status.inc.php:34
 msgid "Now Playing"
 msgstr "現在の演奏曲"
 
-#: ../../lib/class/localplay.class.php:668
+#: ../../lib/class/localplay.class.php:659
 msgid "Stopped"
 msgstr "停止"
 
-#: ../../lib/class/localplay.class.php:671
+#: ../../lib/class/localplay.class.php:662
 msgid "Paused"
 msgstr "一時停止"
 
-#: ../../lib/class/query.class.php:91
+#: ../../lib/class/query.class.php:82
 msgid "Browse not found or expired, try reloading the page"
 msgstr "参照は見つかったか期限切れです。ページの再読込をしてください。"
 
-#: ../../lib/class/playlist.class.php:106
-#: ../../templates/show_edit_playlist_title.inc.php:45
-#: ../../templates/show_edit_playlist_row.inc.php:46
-msgid "Private"
-msgstr "プライベート"
-
-#: ../../lib/class/registration.class.php:71
+#: ../../lib/class/registration.class.php:62
 #, php-format
 msgid "New User Registration at %s"
 msgstr "%sの新規ユーザ登録"
 
-#: ../../lib/class/registration.class.php:73
+#: ../../lib/class/registration.class.php:64
 #, php-format
 msgid ""
 "Thank you for registering\n"
@@ -717,7 +989,7 @@ msgstr ""
 "\n"
 "登録ありがとうございました。\n"
 
-#: ../../lib/class/registration.class.php:94
+#: ../../lib/class/registration.class.php:85
 #, php-format
 msgid ""
 "A new user has registered\n"
@@ -735,1581 +1007,1428 @@ msgstr ""
 "メールアドレス: %s\n"
 "\n"
 
-#: ../../lib/class/album.class.php:258 ../../templates/show_album.inc.php:40
+#: ../../lib/class/playlist_object.abstract.php:42
+#: ../../templates/show_edit_playlist_title.inc.php:40
+#: ../../templates/show_edit_playlist_row.inc.php:41
+#: ../../templates/show_edit_smartplaylist_title.inc.php:33
+#: ../../templates/show_edit_smartplaylist_row.inc.php:34
+msgid "Private"
+msgstr "プライベート"
+
+#: ../../lib/class/album.class.php:249 ../../templates/show_album.inc.php:35
 msgid "Disk"
 msgstr "ディスク"
 
-#: ../../lib/class/album.class.php:272 ../../lib/class/album.class.php:273
-#: ../../templates/show_edit_album_row.inc.php:48
+#: ../../lib/class/album.class.php:263 ../../lib/class/album.class.php:264
+#: ../../templates/show_edit_album_row.inc.php:43
 msgid "Various"
 msgstr "いくつかの"
 
-#: ../../lib/class/user.class.php:422 ../../admin/users.php:67
-#: ../../admin/users.php:117
+#: ../../lib/class/user.class.php:413 ../../admin/users.php:62
+#: ../../admin/users.php:112
 msgid "Error Username Required"
 msgstr "エラー: ユーザ名は必須です"
 
-#: ../../lib/class/user.class.php:426 ../../admin/users.php:70
-#: ../../admin/users.php:113
+#: ../../lib/class/user.class.php:417 ../../admin/users.php:65
+#: ../../admin/users.php:108
 msgid "Error Passwords don't match"
 msgstr "エラー: パスワードが一致しません"
 
-#: ../../lib/class/user.class.php:732
-#: ../../templates/show_recommended_artists.inc.php:71
-#: ../../templates/show_albums.inc.php:80
-#: ../../templates/show_tagcloud.inc.php:45
-#: ../../templates/rightbar.inc.php:120
-#: ../../templates/show_user_recommendations.inc.php:45
-#: ../../templates/show_user_recommendations.inc.php:56
-#: ../../templates/show_user_recommendations.inc.php:67
-#: ../../templates/show_recently_played.inc.php:107
-#: ../../templates/show_artists.inc.php:75
-#: ../../templates/show_objects.inc.php:56
-#: ../../templates/show_songs.inc.php:76
-#: ../../templates/show_live_streams.inc.php:66
-#: ../../templates/show_playlists.inc.php:65
-#: ../../templates/show_user_stats.inc.php:47
-#: ../../templates/show_user_stats.inc.php:60
-#: ../../templates/show_user_stats.inc.php:73
-#: ../../templates/show_catalogs.inc.php:65
-#: ../../templates/show_videos.inc.php:69
-#: ../../templates/show_manage_democratic.inc.php:75
+#: ../../lib/class/user.class.php:723
+#: ../../templates/show_recommended_artists.inc.php:66
+#: ../../templates/show_albums.inc.php:75
+#: ../../templates/show_tagcloud.inc.php:40
+#: ../../templates/rightbar.inc.php:115
+#: ../../templates/show_user_recommendations.inc.php:40
+#: ../../templates/show_user_recommendations.inc.php:51
+#: ../../templates/show_user_recommendations.inc.php:62
+#: ../../templates/show_recently_played.inc.php:102
+#: ../../templates/show_artists.inc.php:70
+#: ../../templates/show_objects.inc.php:51
+#: ../../templates/show_songs.inc.php:71
+#: ../../templates/show_live_streams.inc.php:61
+#: ../../templates/show_playlists.inc.php:60
+#: ../../templates/show_smartplaylists.inc.php:52
+#: ../../templates/show_user_stats.inc.php:42
+#: ../../templates/show_user_stats.inc.php:55
+#: ../../templates/show_user_stats.inc.php:68
+#: ../../templates/show_catalogs.inc.php:60
+#: ../../templates/show_videos.inc.php:64
+#: ../../templates/show_manage_democratic.inc.php:70
 msgid "Not Enough Data"
 msgstr "データは全くありません"
 
-#: ../../lib/class/ampacherss.class.php:93 ../../templates/header.inc.php:56
-#: ../../templates/show_recently_played.inc.php:37
+#: ../../lib/class/ampacherss.class.php:84 ../../templates/header.inc.php:51
+#: ../../templates/show_recently_played.inc.php:32
 msgid "Recently Played"
 msgstr "最近再生したもの"
 
-#: ../../lib/class/ampacherss.class.php:94
+#: ../../lib/class/ampacherss.class.php:85
 msgid "Newest Albums"
 msgstr "新着アルバム"
 
-#: ../../lib/class/ampacherss.class.php:95
+#: ../../lib/class/ampacherss.class.php:86
 msgid "Newest Artists"
 msgstr "新着アーティスト"
 
-#: ../../lib/class/ampacherss.class.php:138
+#: ../../lib/class/ampacherss.class.php:129
 msgid "RSS Feed"
 msgstr "RSSフィード"
 
-#: ../../lib/class/ampacherss.class.php:197
-#: ../../templates/show_recently_played.inc.php:35
+#: ../../lib/class/ampacherss.class.php:188
+#: ../../templates/show_recently_played.inc.php:30
 msgid "seconds ago"
 msgstr "秒前"
 
-#: ../../lib/class/ampacherss.class.php:197
-#: ../../templates/show_recently_played.inc.php:35
+#: ../../lib/class/ampacherss.class.php:188
+#: ../../templates/show_recently_played.inc.php:30
 msgid "minutes ago"
 msgstr "分前"
 
-#: ../../lib/class/ampacherss.class.php:197
-#: ../../templates/show_recently_played.inc.php:35
+#: ../../lib/class/ampacherss.class.php:188
+#: ../../templates/show_recently_played.inc.php:30
 msgid "hours ago"
 msgstr "時間前"
 
-#: ../../lib/class/ampacherss.class.php:197
-#: ../../templates/show_recently_played.inc.php:35
+#: ../../lib/class/ampacherss.class.php:188
+#: ../../templates/show_recently_played.inc.php:30
 msgid "days ago"
 msgstr "日前"
 
-#: ../../lib/class/ampacherss.class.php:197
-#: ../../templates/show_recently_played.inc.php:35
+#: ../../lib/class/ampacherss.class.php:188
+#: ../../templates/show_recently_played.inc.php:30
 msgid "weeks ago"
 msgstr "週間前"
 
-#: ../../lib/class/ampacherss.class.php:197
-#: ../../templates/show_recently_played.inc.php:35
+#: ../../lib/class/ampacherss.class.php:188
+#: ../../templates/show_recently_played.inc.php:30
 msgid "months ago"
 msgstr "ヶ月前"
 
-#: ../../lib/class/ampacherss.class.php:197
-#: ../../templates/show_recently_played.inc.php:35
+#: ../../lib/class/ampacherss.class.php:188
+#: ../../templates/show_recently_played.inc.php:30
 msgid "years ago"
 msgstr "年前"
 
-#: ../../lib/class/catalog.class.php:232
+#: ../../lib/class/catalog.class.php:237
 msgid "day"
 msgid_plural "days"
 msgstr[0] "日"
 
-#: ../../lib/class/catalog.class.php:234
+#: ../../lib/class/catalog.class.php:239
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "時間"
 
-#: ../../lib/class/catalog.class.php:319
+#: ../../lib/class/catalog.class.php:324
 msgid "Running Remote Sync"
 msgstr "リモート同期実行中"
 
-#: ../../lib/class/catalog.class.php:487 ../../lib/class/catalog.class.php:536
+#: ../../lib/class/catalog.class.php:497 ../../lib/class/catalog.class.php:543
 msgid "Error: Unable to change to directory"
 msgstr "エラー: ディレクトリを変更できませんでした"
 
 #. HINT: FullFile
-#: ../../lib/class/catalog.class.php:573
+#: ../../lib/class/catalog.class.php:580
 #, php-format
 msgid "Error: Unable to get filesize for %s"
 msgstr "エラー: %sのファイルサイズの取得に失敗しました"
 
 #. HINT: FullFile
-#: ../../lib/class/catalog.class.php:580
+#: ../../lib/class/catalog.class.php:587
 #, php-format
 msgid "%s is not readable by ampache"
 msgstr "%sはAmpacheで読み込めません"
 
 #. HINT: FullFile
-#: ../../lib/class/catalog.class.php:589
+#: ../../lib/class/catalog.class.php:596
 #, php-format
 msgid "%s does not match site charset"
 msgstr "%sはサイトのCharsetと一致しません"
 
-#: ../../lib/class/catalog.class.php:1088
-#: ../../lib/class/catalog.class.php:1999 ../../preferences.php:123
-#: ../../admin/access.php:135
-msgid "Updated"
-msgstr "更新しました"
-
-#: ../../lib/class/catalog.class.php:1095
+#: ../../lib/class/catalog.class.php:1078
 msgid "No Update Needed"
 msgstr "必要な更新はありません"
 
-#: ../../lib/class/catalog.class.php:1230
+#: ../../lib/class/catalog.class.php:1213
 msgid "Running Remote Update"
 msgstr "リモート更新実行中"
 
-#: ../../lib/class/catalog.class.php:1257
+#: ../../lib/class/catalog.class.php:1240
 msgid "Added Playlist From"
 msgstr "次からプレイリストを追加:"
 
-#: ../../lib/class/catalog.class.php:1286
+#: ../../lib/class/catalog.class.php:1269
 msgid "Catalog Update Finished"
 msgstr "カタログ更新完了"
 
-#: ../../lib/class/catalog.class.php:1286
+#: ../../lib/class/catalog.class.php:1269
 msgid "Total Time"
 msgstr "合計時間"
 
-#: ../../lib/class/catalog.class.php:1287
+#: ../../lib/class/catalog.class.php:1270
 msgid "Total Songs"
 msgstr "合計曲"
 
-#: ../../lib/class/catalog.class.php:1287
+#: ../../lib/class/catalog.class.php:1270
 msgid "Songs Per Seconds"
 msgstr "1秒毎の曲"
 
-#: ../../lib/class/catalog.class.php:1301 ../../lib/class/artist.class.php:396
-#: ../../admin/users.php:155
+#: ../../lib/class/catalog.class.php:1284 ../../lib/class/artist.class.php:387
+#: ../../admin/users.php:150
 msgid "Error"
 msgstr "エラー"
 
-#: ../../lib/class/catalog.class.php:1301
+#: ../../lib/class/catalog.class.php:1284
 msgid "Unable to load pear XMLRPC library, make sure XML-RPC is enabled"
 msgstr ""
 "pear XMLRPCライブラリを読み込めませんでした。XML-RPCが有効になっているか確認"
 "してください。"
 
-#: ../../lib/class/catalog.class.php:1339
-#: ../../lib/class/catalog.class.php:1413
-#: ../../lib/class/catalog.class.php:1446
-#: ../../lib/class/catalog.class.php:2478
+#: ../../lib/class/catalog.class.php:1322
+#: ../../lib/class/catalog.class.php:1396
+#: ../../lib/class/catalog.class.php:1429
+#: ../../lib/class/catalog.class.php:2405
 msgid "Error connecting to"
 msgstr "接続中のエラー:"
 
-#: ../../lib/class/catalog.class.php:1339
-#: ../../lib/class/catalog.class.php:1413
-#: ../../lib/class/catalog.class.php:1446
-#: ../../lib/class/catalog.class.php:2478
+#: ../../lib/class/catalog.class.php:1322
+#: ../../lib/class/catalog.class.php:1396
+#: ../../lib/class/catalog.class.php:1429
+#: ../../lib/class/catalog.class.php:2405
 msgid "Code"
 msgstr "コード"
 
-#: ../../lib/class/catalog.class.php:1339
-#: ../../lib/class/catalog.class.php:1413
-#: ../../lib/class/catalog.class.php:1446
-#: ../../lib/class/catalog.class.php:2478
+#: ../../lib/class/catalog.class.php:1322
+#: ../../lib/class/catalog.class.php:1396
+#: ../../lib/class/catalog.class.php:1429
+#: ../../lib/class/catalog.class.php:2405
 msgid "Reason"
 msgstr "理由"
 
-#: ../../lib/class/catalog.class.php:1368
+#: ../../lib/class/catalog.class.php:1351
 msgid "Completed updating remote catalog(s)"
 msgstr "リモートカタログの更新完了"
 
-#: ../../lib/class/catalog.class.php:1372
+#: ../../lib/class/catalog.class.php:1355
 msgid "Starting synchronisation of album images"
 msgstr "アルバム画像の同期を開始しています"
 
-#: ../../lib/class/catalog.class.php:1374
+#: ../../lib/class/catalog.class.php:1357
 msgid "Completed synchronisation of album images"
 msgstr "アルバム画像の同期が完了しました"
 
-#: ../../lib/class/catalog.class.php:1409 ../../templates/show_song.inc.php:73
-#: ../../admin/access.php:115
-msgid "Added"
-msgstr "追加しました"
-
-#: ../../lib/class/catalog.class.php:1442
+#: ../../lib/class/catalog.class.php:1425
 msgid "images synchronized: "
 msgstr "同期した画像: "
 
-#: ../../lib/class/catalog.class.php:1577
+#: ../../lib/class/catalog.class.php:1555
 msgid "Catalog Root unreadable, stopping clean"
 msgstr "カタログルートに到達できません。クリーンを停止します"
 
-#: ../../lib/class/catalog.class.php:1614
-msgid "Error File Not Found or 0 Bytes:"
-msgstr "エラー: ファイルが見つからないか0バイトです:"
-
-#: ../../lib/class/catalog.class.php:1636
-msgid "Error Remote File Not Found or 0 Bytes:"
-msgstr "エラー: リモートファイルが見つからないか0バイトです:"
-
-#: ../../lib/class/catalog.class.php:1656
-msgid "Error All songs would be removed, doing nothing"
+#: ../../lib/class/catalog.class.php:1578
+#, fuzzy
+msgid "All files would be removed. Doing nothing"
 msgstr "エラー: 全曲削除しようとしましたが何もしていません。"
 
-#: ../../lib/class/catalog.class.php:1682
+#: ../../lib/class/catalog.class.php:1596
 #, php-format
 msgid "Catalog Clean Done. %d file removed."
 msgid_plural "Catalog Clean Done. %d files removed."
 msgstr[0] "カタログのクリーン完了。%dファイルを削除しました。"
 
-#: ../../lib/class/catalog.class.php:1684
-msgid "Optimizing Tables"
-msgstr "テーブルを最適化中"
+#: ../../lib/class/catalog.class.php:1626
+msgid "Error File Not Found or 0 Bytes:"
+msgstr "エラー: ファイルが見つからないか0バイトです:"
+
+#: ../../lib/class/catalog.class.php:1643
+msgid "Error Remote File Not Found or 0 Bytes:"
+msgstr "エラー: リモートファイルが見つからないか0バイトです:"
+
+#: ../../lib/class/catalog.class.php:1860
+#, fuzzy, php-format
+msgid "Catalog Verify Done. %d of %d files updated."
+msgstr "カタログのクリーン完了。%dファイルを削除しました。"
 
-#. HINT: Mediafile
-#: ../../lib/class/catalog.class.php:1979
+#: ../../lib/class/catalog.class.php:1896
 #, php-format
 msgid "%s does not exist or is not readable"
 msgstr "%sは存在しないか読み込めません。"
 
-#: ../../lib/class/catalog.class.php:1999
-msgid "Update Finished"
-msgstr "更新完了"
-
-#: ../../lib/class/catalog.class.php:1999
-msgid "Checked"
-msgstr "チェック済み"
-
-#: ../../lib/class/catalog.class.php:2076
-#: ../../lib/class/catalog.class.php:2178
-#: ../../templates/show_album.inc.php:47
+#: ../../lib/class/catalog.class.php:1997
+#: ../../lib/class/catalog.class.php:2105
+#: ../../templates/show_album.inc.php:42
 msgid "Unknown (Orphaned)"
 msgstr "不明(孤立)"
 
-#: ../../lib/class/catalog.class.php:2576
+#: ../../lib/class/catalog.class.php:2503
 msgid "Playlist creation error."
 msgstr "プレイリスト作成エラーです。"
 
-#: ../../lib/class/catalog.class.php:2583
+#: ../../lib/class/catalog.class.php:2510
 #, php-format
 msgid "Playlist Import and Recreate Successful. Total: %d Song"
 msgid_plural "Playlist Import and Recreate Successful. Total: %d Songs"
 msgstr[0] "プレイリストのインポートと再生成に成功しました。合計: %d曲"
 
 #. HINT: filename
-#: ../../lib/class/catalog.class.php:2589
+#: ../../lib/class/catalog.class.php:2516
 #, 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."
 msgstr[0] ""
 "%sを解析中 - 見つかりませんでした: %d曲。m3uファイルを確認してください。"
 
-#: ../../lib/class/artist.class.php:388
+#: ../../lib/class/artist.class.php:379
 msgid "Fault"
 msgstr "失敗"
 
-#: ../../lib/class/artist.class.php:401 ../../templates/show_lyrics.inc.php:53
+#: ../../lib/class/artist.class.php:392 ../../templates/show_lyrics.inc.php:47
 msgid "Sorry Lyrics Not Found."
 msgstr "すみません歌詞は見つかりませんでした。"
 
-#: ../../lib/security.lib.php:59
+#: ../../lib/security.lib.php:53
 #, fuzzy
 msgid "No problem found."
 msgstr "無効にした曲は見つかりませんでした"
 
-#: ../../lib/security.lib.php:62
+#: ../../lib/security.lib.php:56
 #, php-format
 msgid "You are running old ampache: %s"
 msgstr ""
 
-#: ../../lib/security.lib.php:90
+#: ../../lib/security.lib.php:84
 #, php-format
 msgid "Your PHP version may be too old: %s"
 msgstr ""
 
-#: ../../lib/security.lib.php:94
+#: ../../lib/security.lib.php:88
 #, fuzzy
 msgid "No probrem found."
 msgstr "レコードはありません"
 
-#: ../../lib/security.lib.php:97
+#: ../../lib/security.lib.php:91
 #, php-format
 msgid "You are running old php: %s"
 msgstr ""
 
-#: ../../register.php:85
+#: ../../lib/security.lib.php:180
+msgid "Provide useful information to attack the error information."
+msgstr ""
+
+#: ../../lib/security.lib.php:183
+msgid ""
+"Including the PHP version that is described in the HTTP header. It is "
+"\"INI_SYSTEM\" because it is set can be changed only in the server "
+"configuration."
+msgstr ""
+
+#: ../../lib/security.lib.php:186
+msgid ""
+"URL specified in session and the session ID is initialized using. "
+"(permissive session management. if you set 1 URL, POST in the session ID is "
+"ignored)"
+msgstr ""
+
+#: ../../lib/security.lib.php:190
+msgid "There is no probrem."
+msgstr ""
+
+#: ../../register.php:80
 msgid "Error Captcha Required"
 msgstr "エラー: Captchaは必須です"
 
-#: ../../register.php:92
+#: ../../register.php:87
 msgid "Error Captcha Failed"
 msgstr "エラー: Captcha失敗"
 
-#: ../../register.php:99
+#: ../../register.php:94
 msgid "You <U>must</U> accept the user agreement"
 msgstr "同意しなければなりません。"
 
-#: ../../register.php:104
+#: ../../register.php:99
 msgid "You did not enter a username"
 msgstr "ユーザ名が入力されていません"
 
-#: ../../register.php:108
+#: ../../register.php:103
 msgid "Please fill in your full name (Firstname Lastname)"
 msgstr "フルネームを記入してください"
 
-#: ../../register.php:129
+#: ../../register.php:124
 msgid "Error Email address not confirmed"
 msgstr "エラー: メールアドレスが確認されません"
 
-#: ../../register.php:135
+#: ../../register.php:130
 msgid "You must enter a password"
 msgstr "パスワードを入力してください"
 
-#: ../../register.php:139
+#: ../../register.php:134
 msgid "Your passwords do not match"
 msgstr "パスワードが一致しません"
 
-#: ../../register.php:143 ../../admin/users.php:122
+#: ../../register.php:138 ../../admin/users.php:117
 msgid "Error Username already exists"
 msgstr "エラー: ユーザ名はすでに存在します"
 
-#: ../../register.php:171 ../../admin/users.php:129
+#: ../../register.php:166 ../../admin/users.php:124
 msgid "Error: Insert Failed"
 msgstr "エラー: 挿入失敗"
 
-#: ../../install.php:206
+#: ../../install.php:204
 msgid "Error: Config file not found or Unreadable"
 msgstr "エラー: 設定ファイルは見つからないか読み込めません"
 
-#: ../../preferences.php:52 ../../preferences.php:87
+#: ../../preferences.php:47 ../../preferences.php:82
 msgid "Server"
 msgstr "サーバ"
 
-#: ../../preferences.php:119
+#: ../../preferences.php:114
 msgid "Error Update Failed"
 msgstr "エラー: 更新失敗"
 
-#: ../../preferences.php:124
+#: ../../preferences.php:119
 msgid "Your Account has been updated"
 msgstr "アカウントを更新しました"
 
-#: ../../lostpassword.php:50
+#: ../../lostpassword.php:45
 msgid "Password has been sent"
 msgstr "パスワードを送信しました"
 
-#: ../../lostpassword.php:52
+#: ../../lostpassword.php:47
 msgid "Password has not been sent"
 msgstr "パスワードは送信されませんでした"
 
-#: ../../lostpassword.php:70
+#: ../../lostpassword.php:65
 msgid "Lost Password"
 msgstr "パスワードをなくしました"
 
-#: ../../lostpassword.php:74
+#: ../../lostpassword.php:69
 #, php-format
 msgid "A user from %s has requested a password reset for '%s'."
 msgstr "%sからユーザは「%s：のパスワードリセットのリクエストをしました。"
 
-#: ../../lostpassword.php:76
+#: ../../lostpassword.php:71
 #, php-format
 msgid "The password has been set to: %s"
 msgstr "パスワードを%sへ設定しました"
 
 #. HINT: Artist Fullname
-#: ../../templates/show_song_row.inc.php:36
-#: ../../templates/show_recommended_artists.inc.php:47
-#: ../../templates/show_recommended_artists.inc.php:75
-#: ../../templates/show_albums.inc.php:53
-#: ../../templates/show_albums.inc.php:84
-#: ../../templates/show_admin_tools.inc.php:57
-#: ../../templates/show_song.inc.php:45
-#: ../../templates/show_artist_row.inc.php:36
-#: ../../templates/show_album_row.inc.php:36
-#: ../../templates/show_recently_played.inc.php:49
-#: ../../templates/show_recently_played.inc.php:92
-#: ../../templates/show_recently_played.inc.php:111
-#: ../../templates/show_artists.inc.php:51
-#: ../../templates/show_artists.inc.php:79
-#: ../../templates/show_artist.inc.php:62
-#: ../../templates/show_songs.inc.php:51 ../../templates/show_songs.inc.php:80
-#: ../../templates/show_live_stream.inc.php:39
-#: ../../templates/show_album.inc.php:64
-#: ../../templates/show_live_streams.inc.php:48
-#: ../../templates/show_live_streams.inc.php:70
-#: ../../templates/show_add_live_stream.inc.php:80
-#: ../../templates/show_playlists.inc.php:46
-#: ../../templates/show_playlists.inc.php:69
-#: ../../templates/show_catalog_row.inc.php:42
-#: ../../templates/show_playlist_song_row.inc.php:35
-#: ../../templates/show_videos.inc.php:49
-#: ../../templates/show_videos.inc.php:73
-#: ../../templates/show_playlist_row.inc.php:36
-#: ../../templates/show_live_stream_row.inc.php:36
-#: ../../templates/show_shoutbox.inc.php:47
-#: ../../templates/show_video_row.inc.php:36
+#: ../../templates/show_song_row.inc.php:31
+#: ../../templates/show_recommended_artists.inc.php:42
+#: ../../templates/show_recommended_artists.inc.php:70
+#: ../../templates/show_albums.inc.php:48
+#: ../../templates/show_albums.inc.php:79
+#: ../../templates/show_admin_tools.inc.php:52
+#: ../../templates/show_song.inc.php:40
+#: ../../templates/show_artist_row.inc.php:31
+#: ../../templates/show_album_row.inc.php:31
+#: ../../templates/show_recently_played.inc.php:44
+#: ../../templates/show_recently_played.inc.php:87
+#: ../../templates/show_recently_played.inc.php:106
+#: ../../templates/show_artists.inc.php:46
+#: ../../templates/show_artists.inc.php:74
+#: ../../templates/show_artist.inc.php:57
+#: ../../templates/show_songs.inc.php:46 ../../templates/show_songs.inc.php:75
+#: ../../templates/show_live_stream.inc.php:34
+#: ../../templates/show_album.inc.php:59
+#: ../../templates/show_live_streams.inc.php:43
+#: ../../templates/show_live_streams.inc.php:65
+#: ../../templates/show_add_live_stream.inc.php:75
+#: ../../templates/show_playlists.inc.php:41
+#: ../../templates/show_playlists.inc.php:64
+#: ../../templates/show_smartplaylists.inc.php:35
+#: ../../templates/show_smartplaylists.inc.php:56
+#: ../../templates/show_catalog_row.inc.php:37
+#: ../../templates/show_playlist_song_row.inc.php:30
+#: ../../templates/show_videos.inc.php:44
+#: ../../templates/show_videos.inc.php:68
+#: ../../templates/show_playlist_row.inc.php:31
+#: ../../templates/show_live_stream_row.inc.php:31
+#: ../../templates/show_shoutbox.inc.php:42
+#: ../../templates/show_smartplaylist_row.inc.php:24
+#: ../../templates/show_video_row.inc.php:31
 msgid "Add"
 msgstr "追加"
 
-#: ../../templates/show_song_row.inc.php:48
+#: ../../templates/show_song_row.inc.php:43
 msgid "Song Information"
 msgstr "曲情報"
 
-#: ../../templates/show_song_row.inc.php:51
-#: ../../templates/show_album_row.inc.php:58
+#: ../../templates/show_song_row.inc.php:46
+#: ../../templates/show_album_row.inc.php:53
 msgid "Post Shout"
 msgstr "シャウトの投稿"
 
-#: ../../templates/show_song_row.inc.php:56
-#: ../../templates/show_song.inc.php:48 ../../templates/show_artist.inc.php:78
-#: ../../templates/show_artist.inc.php:79
-#: ../../templates/show_album.inc.php:89 ../../templates/show_album.inc.php:90
-#: ../../templates/show_playlist_song_row.inc.php:49
-#: ../../templates/show_video_row.inc.php:45
+#: ../../templates/show_song_row.inc.php:51
+#: ../../templates/show_song.inc.php:43
+#: ../../templates/show_install_config.inc.php:69
+#: ../../templates/show_artist.inc.php:73
+#: ../../templates/show_artist.inc.php:74
+#: ../../templates/show_album.inc.php:84 ../../templates/show_album.inc.php:85
+#: ../../templates/show_playlist_song_row.inc.php:44
+#: ../../templates/show_video_row.inc.php:40
 msgid "Download"
 msgstr "ダウンロード"
 
-#: ../../templates/show_song_row.inc.php:60
-#: ../../templates/show_artist_row.inc.php:52
-#: ../../templates/show_album_row.inc.php:67
-#: ../../templates/show_access_list.inc.php:89
-#: ../../templates/show_playlist_song_row.inc.php:53
-#: ../../templates/show_playlist_row.inc.php:50
-#: ../../templates/show_live_stream_row.inc.php:44
-#: ../../templates/show_playlist.inc.php:70
-#: ../../templates/show_playlist.inc.php:71
-#: ../../templates/show_user_row.inc.php:51
-#: ../../templates/show_shout_row.inc.php:44
+#: ../../templates/show_song_row.inc.php:55
+#: ../../templates/show_smartplaylist.inc.php:44
+#: ../../templates/show_smartplaylist.inc.php:45
+#: ../../templates/show_artist_row.inc.php:47
+#: ../../templates/show_album_row.inc.php:62
+#: ../../templates/show_access_list.inc.php:84
+#: ../../templates/show_playlist_song_row.inc.php:48
+#: ../../templates/show_playlist_row.inc.php:45
+#: ../../templates/show_live_stream_row.inc.php:39
+#: ../../templates/show_smartplaylist_row.inc.php:36
+#: ../../templates/show_playlist.inc.php:65
+#: ../../templates/show_playlist.inc.php:66
+#: ../../templates/show_user_row.inc.php:46
+#: ../../templates/show_shout_row.inc.php:39
 msgid "Edit"
 msgstr "編集"
 
-#: ../../templates/show_add_access_current.inc.php:35
-#: ../../templates/show_access_list.inc.php:44
-#: ../../templates/show_access_list.inc.php:45
+#: ../../templates/show_add_access_current.inc.php:30
+#: ../../templates/show_access_list.inc.php:39
+#: ../../templates/show_access_list.inc.php:40
 msgid "Add Current Host"
 msgstr "現在ホストの追加"
 
-#: ../../templates/show_add_access_current.inc.php:40
-#: ../../templates/show_edit_catalog.inc.php:39
-#: ../../templates/show_admin_tools.inc.php:45
-#: ../../templates/show_admin_tools.inc.php:85
-#: ../../templates/show_edit_artist.inc.php:40
-#: ../../templates/show_localplay_controllers.inc.php:45
-#: ../../templates/show_localplay_controllers.inc.php:76
-#: ../../templates/show_stats.inc.php:76
-#: ../../templates/show_localplay_playlist.inc.php:47
-#: ../../templates/show_localplay_playlist.inc.php:73
-#: ../../templates/show_add_access.inc.php:40
-#: ../../templates/show_create_democratic.inc.php:38
-#: ../../templates/show_edit_album.inc.php:40
-#: ../../templates/show_live_streams.inc.php:49
-#: ../../templates/show_live_streams.inc.php:71
-#: ../../templates/show_account.inc.php:40
-#: ../../templates/show_add_live_stream.inc.php:39
-#: ../../templates/show_access_list.inc.php:67
-#: ../../templates/show_catalogs.inc.php:46
-#: ../../templates/show_catalogs.inc.php:70
-#: ../../templates/show_edit_access.inc.php:39
-#: ../../templates/show_add_playlist.inc.php:39
-#: ../../templates/show_edit_live_stream_row.inc.php:39
-#: ../../templates/show_plugins.inc.php:45
-#: ../../templates/show_plugins.inc.php:82
-#: ../../templates/show_add_access_rpc.inc.php:40
-#: ../../templates/show_add_access_local.inc.php:40
-msgid "Name"
-msgstr "名前"
-
-#: ../../templates/show_add_access_current.inc.php:46
-#: ../../templates/show_add_access.inc.php:83
-#: ../../templates/show_edit_access.inc.php:56
-#: ../../templates/show_add_access_rpc.inc.php:80
-#: ../../templates/show_add_access_local.inc.php:80
+#: ../../templates/show_add_access_current.inc.php:41
+#: ../../templates/show_add_access.inc.php:78
+#: ../../templates/show_edit_access.inc.php:51
+#: ../../templates/show_add_access_rpc.inc.php:75
+#: ../../templates/show_add_access_local.inc.php:75
 msgid "IPv4 or IPv6 Addresses"
 msgstr "IPv4又はIPv6アドレス"
 
-#: ../../templates/show_add_access_current.inc.php:49
-#: ../../templates/show_add_access.inc.php:46
-#: ../../templates/show_create_democratic.inc.php:51
-#: ../../templates/show_access_list.inc.php:70
-#: ../../templates/show_edit_access.inc.php:85
-#: ../../templates/show_add_access_rpc.inc.php:46
-#: ../../templates/show_add_access_local.inc.php:46
-#: ../../templates/show_preference_admin.inc.php:44
-#: ../../templates/show_preference_admin.inc.php:63
-#: ../../templates/show_manage_democratic.inc.php:49
+#: ../../templates/show_add_access_current.inc.php:44
+#: ../../templates/show_add_access.inc.php:41
+#: ../../templates/show_create_democratic.inc.php:46
+#: ../../templates/show_access_list.inc.php:65
+#: ../../templates/show_edit_access.inc.php:80
+#: ../../templates/show_add_access_rpc.inc.php:41
+#: ../../templates/show_add_access_local.inc.php:41
+#: ../../templates/show_preference_admin.inc.php:39
+#: ../../templates/show_preference_admin.inc.php:58
+#: ../../templates/show_manage_democratic.inc.php:44
 msgid "Level"
 msgstr "レベル"
 
-#: ../../templates/show_add_access_current.inc.php:64
-#: ../../templates/show_add_access.inc.php:73
-#: ../../templates/show_add_access_rpc.inc.php:70
-#: ../../templates/show_add_access_local.inc.php:70
+#: ../../templates/show_add_access_current.inc.php:59
+#: ../../templates/show_add_access.inc.php:68
+#: ../../templates/show_add_access_rpc.inc.php:65
+#: ../../templates/show_add_access_local.inc.php:65
 msgid "RPC Options"
 msgstr "RPCオプション"
 
-#: ../../templates/show_add_access_current.inc.php:67
-#: ../../templates/show_add_access.inc.php:76
-#: ../../templates/show_edit_access.inc.php:79
-#: ../../templates/show_add_access_rpc.inc.php:73
-#: ../../templates/show_add_access_local.inc.php:73
+#: ../../templates/show_add_access_current.inc.php:62
+#: ../../templates/show_add_access.inc.php:71
+#: ../../templates/show_edit_access.inc.php:74
+#: ../../templates/show_add_access_rpc.inc.php:68
+#: ../../templates/show_add_access_local.inc.php:68
 msgid "Remote Key"
 msgstr "リモートキー"
 
-#: ../../templates/show_add_access_current.inc.php:75
-#: ../../templates/show_add_access.inc.php:102
-#: ../../templates/show_add_access_rpc.inc.php:99
-#: ../../templates/show_add_access_local.inc.php:99
+#: ../../templates/show_add_access_current.inc.php:70
+#: ../../templates/show_add_access.inc.php:97
+#: ../../templates/show_add_access_rpc.inc.php:94
+#: ../../templates/show_add_access_local.inc.php:94
 msgid "Create ACL"
 msgstr "ACL作成"
 
-#: ../../templates/show_recommended_artists.inc.php:35
-#: ../../templates/show_now_playing_row.inc.php:101
+#: ../../templates/show_recommended_artists.inc.php:30
+#: ../../templates/show_now_playing_row.inc.php:96
 msgid "Similar Artists"
 msgstr "同様のアーティスト"
 
-#: ../../templates/show_recommended_artists.inc.php:48
-#: ../../templates/show_recommended_artists.inc.php:76
-#: ../../templates/show_albums.inc.php:58
-#: ../../templates/show_albums.inc.php:89
-#: ../../templates/show_disabled_songs.inc.php:50
-#: ../../templates/show_disabled_songs.inc.php:73
-#: ../../templates/show_democratic_playlist.inc.php:71
-#: ../../templates/show_democratic_playlist.inc.php:111
-#: ../../templates/show_edit_song.inc.php:58
-#: ../../templates/show_song.inc.php:58
-#: ../../templates/browse_filters.inc.php:78
-#: ../../templates/show_search.inc.php:57
-#: ../../templates/show_recently_played.inc.php:52
-#: ../../templates/show_recently_played.inc.php:115
-#: ../../templates/show_artists.inc.php:52
-#: ../../templates/show_artists.inc.php:80
-#: ../../templates/sidebar_home.inc.php:78
-#: ../../templates/show_songs.inc.php:53 ../../templates/show_songs.inc.php:82
-#: ../../templates/show_playlist_songs.inc.php:56
-#: ../../templates/show_playlist_songs.inc.php:82
-#: ../../templates/show_get_albumart.inc.php:40
-#: ../../templates/show_duplicates.inc.php:51
-#: ../../templates/show_duplicates.inc.php:90
-#: ../../templates/show_now_playing_row.inc.php:80
-#: ../../templates/show_lyrics_song.inc.php:68
-msgid "Artist"
-msgstr "アーティスト"
-
-#: ../../templates/show_recommended_artists.inc.php:51
-#: ../../templates/show_recommended_artists.inc.php:79
-#: ../../templates/show_democratic_playlist.inc.php:72
-#: ../../templates/show_democratic_playlist.inc.php:112
-#: ../../templates/show_search.inc.php:85
-#: ../../templates/show_artists.inc.php:55
-#: ../../templates/show_artists.inc.php:83
-#: ../../templates/show_songs.inc.php:57 ../../templates/show_songs.inc.php:86
-#: ../../templates/show_playlist_songs.inc.php:60
-#: ../../templates/show_playlist_songs.inc.php:86
-#: ../../templates/show_videos.inc.php:53
-#: ../../templates/show_videos.inc.php:77
+#: ../../templates/show_recommended_artists.inc.php:46
+#: ../../templates/show_recommended_artists.inc.php:74
+#: ../../templates/show_democratic_playlist.inc.php:67
+#: ../../templates/show_democratic_playlist.inc.php:107
+#: ../../templates/show_artists.inc.php:50
+#: ../../templates/show_artists.inc.php:78
+#: ../../templates/show_songs.inc.php:52 ../../templates/show_songs.inc.php:81
+#: ../../templates/show_playlist_songs.inc.php:55
+#: ../../templates/show_playlist_songs.inc.php:81
+#: ../../templates/show_videos.inc.php:48
+#: ../../templates/show_videos.inc.php:72
 msgid "Time"
 msgstr "時間"
 
-#: ../../templates/show_recommended_artists.inc.php:52
-#: ../../templates/show_recommended_artists.inc.php:80
-#: ../../templates/show_albums.inc.php:61
-#: ../../templates/show_albums.inc.php:92
-#: ../../templates/show_stats.inc.php:47
-#: ../../templates/show_artists.inc.php:56
-#: ../../templates/show_artists.inc.php:84
-#: ../../templates/show_songs.inc.php:55 ../../templates/show_songs.inc.php:84
-#: ../../templates/show_videos.inc.php:54
-#: ../../templates/show_videos.inc.php:78
+#: ../../templates/show_recommended_artists.inc.php:47
+#: ../../templates/show_recommended_artists.inc.php:75
+#: ../../templates/show_albums.inc.php:56
+#: ../../templates/show_albums.inc.php:87
+#: ../../templates/show_stats.inc.php:42
+#: ../../templates/show_artists.inc.php:51
+#: ../../templates/show_artists.inc.php:79
+#: ../../templates/show_songs.inc.php:50 ../../templates/show_songs.inc.php:79
+#: ../../templates/show_videos.inc.php:49
+#: ../../templates/show_videos.inc.php:73
 msgid "Tags"
 msgstr "タグ"
 
-#: ../../templates/show_recommended_artists.inc.php:53
-#: ../../templates/show_recommended_artists.inc.php:81
-#: ../../templates/show_albums.inc.php:62
-#: ../../templates/show_albums.inc.php:93 ../../templates/show_song.inc.php:40
-#: ../../templates/show_search.inc.php:117
-#: ../../templates/show_artists.inc.php:57
-#: ../../templates/show_artists.inc.php:85
-#: ../../templates/show_songs.inc.php:61 ../../templates/show_songs.inc.php:88
-#: ../../templates/show_playlist_songs.inc.php:64
-#: ../../templates/show_playlist_songs.inc.php:88
-#: ../../templates/show_now_playing_row.inc.php:48
-msgid "Rating"
-msgstr "評価"
-
-#: ../../templates/show_recommended_artists.inc.php:54
-#: ../../templates/show_recommended_artists.inc.php:82
-#: ../../templates/show_democratic_playlist.inc.php:67
-#: ../../templates/show_democratic_playlist.inc.php:107
-#: ../../templates/show_admin_tools.inc.php:46
-#: ../../templates/show_admin_tools.inc.php:86
-#: ../../templates/show_song.inc.php:43
-#: ../../templates/show_manage_shoutbox.inc.php:51
-#: ../../templates/show_manage_shoutbox.inc.php:75
-#: ../../templates/show_flagged.inc.php:51
-#: ../../templates/show_flagged.inc.php:70
-#: ../../templates/show_localplay_controllers.inc.php:48
-#: ../../templates/show_localplay_controllers.inc.php:79
-#: ../../templates/show_random_rules.inc.php:49
-#: ../../templates/show_localplay_playlist.inc.php:48
-#: ../../templates/show_localplay_playlist.inc.php:74
-#: ../../templates/show_artists.inc.php:58
-#: ../../templates/show_artists.inc.php:86
-#: ../../templates/show_songs.inc.php:63 ../../templates/show_songs.inc.php:90
-#: ../../templates/show_playlist_songs.inc.php:66
-#: ../../templates/show_playlist_songs.inc.php:90
-#: ../../templates/show_live_streams.inc.php:53
-#: ../../templates/show_live_streams.inc.php:75
-#: ../../templates/show_users.inc.php:58 ../../templates/show_users.inc.php:80
-#: ../../templates/show_access_list.inc.php:73
-#: ../../templates/show_plugins.inc.php:49
-#: ../../templates/show_plugins.inc.php:85
-#: ../../templates/show_videos.inc.php:55
-#: ../../templates/show_videos.inc.php:79
-#: ../../templates/show_localplay_instances.inc.php:41
-#: ../../templates/show_manage_democratic.inc.php:52
+#: ../../templates/show_recommended_artists.inc.php:49
+#: ../../templates/show_recommended_artists.inc.php:77
+#: ../../templates/show_democratic_playlist.inc.php:62
+#: ../../templates/show_democratic_playlist.inc.php:102
+#: ../../templates/show_admin_tools.inc.php:41
+#: ../../templates/show_admin_tools.inc.php:81
+#: ../../templates/show_song.inc.php:38
+#: ../../templates/show_manage_shoutbox.inc.php:46
+#: ../../templates/show_manage_shoutbox.inc.php:70
+#: ../../templates/show_flagged.inc.php:46
+#: ../../templates/show_flagged.inc.php:65
+#: ../../templates/show_localplay_controllers.inc.php:43
+#: ../../templates/show_localplay_controllers.inc.php:74
+#: ../../templates/show_localplay_playlist.inc.php:43
+#: ../../templates/show_localplay_playlist.inc.php:69
+#: ../../templates/show_artists.inc.php:53
+#: ../../templates/show_artists.inc.php:81
+#: ../../templates/show_songs.inc.php:58 ../../templates/show_songs.inc.php:85
+#: ../../templates/show_playlist_songs.inc.php:61
+#: ../../templates/show_playlist_songs.inc.php:85
+#: ../../templates/show_live_streams.inc.php:48
+#: ../../templates/show_live_streams.inc.php:70
+#: ../../templates/show_users.inc.php:53 ../../templates/show_users.inc.php:75
+#: ../../templates/show_access_list.inc.php:68
+#: ../../templates/show_plugins.inc.php:44
+#: ../../templates/show_plugins.inc.php:80
+#: ../../templates/show_videos.inc.php:50
+#: ../../templates/show_videos.inc.php:74
+#: ../../templates/show_localplay_instances.inc.php:36
+#: ../../templates/show_manage_democratic.inc.php:47
 msgid "Action"
 msgstr "操作"
 
-#: ../../templates/show_albums.inc.php:55
-#: ../../templates/show_albums.inc.php:86
+#: ../../templates/show_albums.inc.php:50
+#: ../../templates/show_albums.inc.php:81
 msgid "Cover"
 msgstr "カバー"
 
-#: ../../templates/show_albums.inc.php:57
-#: ../../templates/show_albums.inc.php:88
-#: ../../templates/show_disabled_songs.inc.php:49
-#: ../../templates/show_disabled_songs.inc.php:72
-#: ../../templates/show_democratic_playlist.inc.php:70
-#: ../../templates/show_democratic_playlist.inc.php:110
-#: ../../templates/show_edit_song.inc.php:50
-#: ../../templates/show_song.inc.php:59 ../../templates/show_search.inc.php:63
-#: ../../templates/show_recently_played.inc.php:51
-#: ../../templates/show_recently_played.inc.php:114
-#: ../../templates/sidebar_home.inc.php:77
-#: ../../templates/show_songs.inc.php:54 ../../templates/show_songs.inc.php:83
-#: ../../templates/show_playlist_songs.inc.php:57
-#: ../../templates/show_playlist_songs.inc.php:83
-#: ../../templates/show_get_albumart.inc.php:48
-#: ../../templates/show_duplicates.inc.php:52
-#: ../../templates/show_duplicates.inc.php:91
-#: ../../templates/show_now_playing_row.inc.php:73
-#: ../../templates/show_lyrics_song.inc.php:61
-msgid "Album"
-msgstr "アルバム"
-
-#: ../../templates/show_albums.inc.php:60
-#: ../../templates/show_albums.inc.php:91
-#: ../../templates/show_edit_song.inc.php:72
-#: ../../templates/show_search.inc.php:73
-#: ../../templates/show_edit_album.inc.php:46
-msgid "Year"
-msgstr "年"
-
-#: ../../templates/show_albums.inc.php:63
-#: ../../templates/show_albums.inc.php:94
-#: ../../templates/show_artist.inc.php:47
-#: ../../templates/show_album.inc.php:61
-#: ../../templates/show_playlists.inc.php:51
-#: ../../templates/show_playlists.inc.php:74
-#: ../../templates/show_catalogs.inc.php:51
-#: ../../templates/show_catalogs.inc.php:75
+#: ../../templates/show_albums.inc.php:58
+#: ../../templates/show_albums.inc.php:89
+#: ../../templates/show_artist.inc.php:42
+#: ../../templates/show_album.inc.php:56
+#: ../../templates/show_playlists.inc.php:46
+#: ../../templates/show_playlists.inc.php:69
+#: ../../templates/show_smartplaylists.inc.php:39
+#: ../../templates/show_smartplaylists.inc.php:60
+#: ../../templates/show_catalogs.inc.php:46
+#: ../../templates/show_catalogs.inc.php:70
 msgid "Actions"
 msgstr "操作"
 
-#: ../../templates/show_disabled_songs.inc.php:47
-#: ../../templates/show_disabled_songs.inc.php:70
-#: ../../templates/show_album_art.inc.php:61
+#: ../../templates/show_disabled_songs.inc.php:42
+#: ../../templates/show_disabled_songs.inc.php:65
+#: ../../templates/show_album_art.inc.php:56
 msgid "Select"
 msgstr "選択"
 
-#: ../../templates/show_disabled_songs.inc.php:48
-#: ../../templates/show_disabled_songs.inc.php:71
-#: ../../templates/show_democratic_playlist.inc.php:69
-#: ../../templates/show_democratic_playlist.inc.php:109
-#: ../../templates/show_edit_song.inc.php:44
-#: ../../templates/show_song.inc.php:57 ../../templates/show_search.inc.php:53
-#: ../../templates/show_videos.inc.php:50
-#: ../../templates/show_videos.inc.php:74
-#: ../../templates/show_duplicate.inc.php:45
-msgid "Title"
-msgstr "タイトル"
-
-#: ../../templates/show_disabled_songs.inc.php:51
-#: ../../templates/show_disabled_songs.inc.php:74
-#: ../../templates/show_import_playlist.inc.php:40
-#: ../../templates/show_song.inc.php:68 ../../templates/show_search.inc.php:79
-#: ../../templates/show_duplicates.inc.php:56
-#: ../../templates/show_duplicates.inc.php:95
-msgid "Filename"
-msgstr "フルネーム"
-
-#: ../../templates/show_disabled_songs.inc.php:52
-#: ../../templates/show_disabled_songs.inc.php:75
+#: ../../templates/show_disabled_songs.inc.php:47
+#: ../../templates/show_disabled_songs.inc.php:70
 msgid "Addition Time"
 msgstr "追加時間"
 
-#: ../../templates/show_disabled_songs.inc.php:66
-#: ../../templates/show_manage_shoutbox.inc.php:66
-#: ../../templates/show_flagged.inc.php:61
-#: ../../templates/show_localplay_controllers.inc.php:72
-#: ../../templates/show_localplay_playlist.inc.php:68
-#: ../../templates/show_plugins.inc.php:78
+#: ../../templates/show_disabled_songs.inc.php:61
+#: ../../templates/show_manage_shoutbox.inc.php:61
+#: ../../templates/show_flagged.inc.php:56
+#: ../../templates/show_localplay_controllers.inc.php:67
+#: ../../templates/show_localplay_playlist.inc.php:63
+#: ../../templates/show_plugins.inc.php:73
 msgid "No Records Found"
 msgstr "レコードはありません"
 
-#: ../../templates/show_disabled_songs.inc.php:79
-msgid "Remove"
-msgstr "削除"
-
-#: ../../templates/show_search_options.inc.php:34
+#: ../../templates/show_search_options.inc.php:29
 msgid "Options"
 msgstr "オプション"
 
-#: ../../templates/show_search_options.inc.php:38
-#: ../../templates/show_search_options.inc.php:39
+#: ../../templates/show_search_options.inc.php:33
+#: ../../templates/show_search_options.inc.php:34
 msgid "Add Search Results"
 msgstr "検索結果を追加"
 
-#: ../../templates/show_search_options.inc.php:43
-#: ../../templates/show_search_options.inc.php:44
-#: ../../templates/rightbar.inc.php:61
-#: ../../templates/show_artist_row.inc.php:48
-#: ../../templates/show_album_row.inc.php:63
-#: ../../templates/show_playlist_row.inc.php:46
-#: ../../templates/show_playlist.inc.php:56
-#: ../../templates/show_playlist.inc.php:57
+#: ../../templates/show_search_options.inc.php:38
+#: ../../templates/show_search_options.inc.php:39
+#: ../../templates/rightbar.inc.php:56
+#: ../../templates/show_smartplaylist.inc.php:34
+#: ../../templates/show_smartplaylist.inc.php:35
+#: ../../templates/show_artist_row.inc.php:43
+#: ../../templates/show_album_row.inc.php:58
+#: ../../templates/show_playlist_row.inc.php:41
+#: ../../templates/show_smartplaylist_row.inc.php:32
+#: ../../templates/show_playlist.inc.php:51
+#: ../../templates/show_playlist.inc.php:52
 msgid "Batch Download"
 msgstr "バッチダウンロード"
 
-#: ../../templates/rightbar.inc.php:37
-#: ../../templates/show_democratic.inc.php:52
-#: ../../templates/show_localplay_control.inc.php:39
-#: ../../templates/show_manage_democratic.inc.php:69
+#: ../../templates/rightbar.inc.php:32
+#: ../../templates/show_democratic.inc.php:47
+#: ../../templates/show_localplay_control.inc.php:34
+#: ../../templates/show_manage_democratic.inc.php:64
 msgid "Play"
 msgstr "再生"
 
-#: ../../templates/rightbar.inc.php:40
+#: ../../templates/rightbar.inc.php:35
 msgid "Add to Playlist"
 msgstr "プレイリストへ追加"
 
-#: ../../templates/rightbar.inc.php:43
+#: ../../templates/rightbar.inc.php:38
 msgid "Add to New Playlist"
 msgstr "新規プレイリストへ追加"
 
-#: ../../templates/rightbar.inc.php:66
-#: ../../templates/show_democratic.inc.php:56
-#: ../../templates/show_democratic.inc.php:57
-#: ../../templates/show_localplay_status.inc.php:59
+#: ../../templates/rightbar.inc.php:61
+#: ../../templates/show_democratic.inc.php:51
+#: ../../templates/show_democratic.inc.php:52
+#: ../../templates/show_localplay_status.inc.php:54
 msgid "Clear Playlist"
 msgstr "プレイリストをクリア"
 
-#: ../../templates/rightbar.inc.php:69
+#: ../../templates/rightbar.inc.php:64
 msgid "Add Dynamic Items"
 msgstr "動的アイテムを追加"
 
-#: ../../templates/rightbar.inc.php:81
+#: ../../templates/rightbar.inc.php:76
 msgid "Related Tag"
 msgstr "関連するタグ"
 
-#: ../../templates/rightbar.inc.php:124
+#: ../../templates/rightbar.inc.php:119
 msgid "More"
 msgstr "More"
 
-#: ../../templates/show_democratic_playlist.inc.php:55
+#: ../../templates/show_democratic_playlist.inc.php:50
 msgid "Playing from base Playlist"
 msgstr "ベースのプレイリストから再生"
 
-#: ../../templates/show_democratic_playlist.inc.php:68
-#: ../../templates/show_democratic_playlist.inc.php:108
+#: ../../templates/show_democratic_playlist.inc.php:63
+#: ../../templates/show_democratic_playlist.inc.php:103
 msgid "Votes"
 msgstr "投票"
 
-#: ../../templates/show_democratic_playlist.inc.php:87
+#: ../../templates/show_democratic_playlist.inc.php:82
 msgid "Remove Vote"
 msgstr "投票削除"
 
-#: ../../templates/show_democratic_playlist.inc.php:89
+#: ../../templates/show_democratic_playlist.inc.php:84
 msgid "Add Vote"
 msgstr "投票追加"
 
-#: ../../templates/show_edit_playlist_song_row.inc.php:51
-#: ../../templates/show_edit_playlist_title.inc.php:50
-#: ../../templates/show_edit_song_row.inc.php:58
-#: ../../templates/show_edit_album_row.inc.php:61
-#: ../../templates/show_edit_playlist_row.inc.php:51
-#: ../../templates/show_edit_artist_row.inc.php:45
-#: ../../templates/show_edit_live_stream_row.inc.php:65
+#: ../../templates/show_edit_playlist_song_row.inc.php:46
+#: ../../templates/show_edit_playlist_title.inc.php:45
+#: ../../templates/show_smartplaylist.inc.php:62
+#: ../../templates/show_edit_song_row.inc.php:53
+#: ../../templates/show_edit_album_row.inc.php:56
+#: ../../templates/show_edit_playlist_row.inc.php:46
+#: ../../templates/show_edit_artist_row.inc.php:40
+#: ../../templates/show_edit_live_stream_row.inc.php:60
+#: ../../templates/show_edit_smartplaylist_title.inc.php:38
+#: ../../templates/show_edit_smartplaylist_row.inc.php:39
 msgid "Save Changes"
 msgstr "変更を保存"
 
-#: ../../templates/show_big_art.inc.php:41
-#: ../../templates/show_album_art.inc.php:53
+#: ../../templates/show_big_art.inc.php:36
+#: ../../templates/show_album_art.inc.php:48
 msgid "Album Art"
 msgstr "アルバムアート"
 
-#: ../../templates/show_big_art.inc.php:45
+#: ../../templates/show_big_art.inc.php:40
 msgid "Click to close window"
 msgstr "ウィンドウを閉じる"
 
-#: ../../templates/show_edit_playlist_title.inc.php:44
-#: ../../templates/show_edit_playlist_row.inc.php:45
+#: ../../templates/show_edit_playlist_title.inc.php:39
+#: ../../templates/show_edit_playlist_row.inc.php:40
+#: ../../templates/show_edit_smartplaylist_title.inc.php:32
+#: ../../templates/show_edit_smartplaylist_row.inc.php:33
 msgid "Public"
 msgstr "公開"
 
-#: ../../templates/show_import_playlist.inc.php:35
+#: ../../templates/show_import_playlist.inc.php:30
 msgid "Importing a Playlist from a File"
 msgstr "ファイルからプレイリストをインポート"
 
-#: ../../templates/show_import_playlist.inc.php:46
+#: ../../templates/show_import_playlist.inc.php:41
 msgid "Playlist Type"
 msgstr "プレイリストタイプ"
 
-#: ../../templates/show_import_playlist.inc.php:58
+#: ../../templates/show_import_playlist.inc.php:53
 msgid "Import Playlist"
 msgstr "プレイリストをインポート"
 
-#: ../../templates/footer.inc.php:36
+#: ../../templates/footer.inc.php:31
 msgid "Using Old Password Encryption, Please Reset your Password"
 msgstr ""
 "古いパスワードの暗号を使用しています。パスワードをリセットしてください。"
 
-#: ../../templates/footer.inc.php:43
-#: ../../templates/show_login_form.inc.php:113
-#: ../../templates/show_lostpassword_form.inc.php:86
-#: ../../templates/show_user_registration.inc.php:128
+#: ../../templates/footer.inc.php:38
+#: ../../templates/show_login_form.inc.php:108
+#: ../../templates/show_lostpassword_form.inc.php:81
+#: ../../templates/show_user_registration.inc.php:123
 msgid "Queries:"
 msgstr "クエリ:"
 
-#: ../../templates/footer.inc.php:43
-#: ../../templates/show_login_form.inc.php:113
-#: ../../templates/show_lostpassword_form.inc.php:87
-#: ../../templates/show_user_registration.inc.php:128
+#: ../../templates/footer.inc.php:38
+#: ../../templates/show_login_form.inc.php:108
+#: ../../templates/show_lostpassword_form.inc.php:82
+#: ../../templates/show_user_registration.inc.php:123
 msgid "Cache Hits:"
 msgstr "キャッシュヒット:"
 
-#: ../../templates/show_stats_popular.inc.php:38
-#: ../../templates/show_all_popular.inc.php:41
-#: ../../templates/show_mail_users.inc.php:59
+#: ../../templates/show_stats_popular.inc.php:33
+#: ../../templates/show_all_popular.inc.php:36
+#: ../../templates/show_mail_users.inc.php:54
 msgid "Most Popular Albums"
 msgstr "1番人気のアルバム"
 
-#: ../../templates/show_stats_popular.inc.php:44
-#: ../../templates/show_all_popular.inc.php:38
-#: ../../templates/show_mail_users.inc.php:70
+#: ../../templates/show_stats_popular.inc.php:39
+#: ../../templates/show_all_popular.inc.php:33
+#: ../../templates/show_mail_users.inc.php:65
 msgid "Most Popular Artists"
 msgstr "1番人気のアーティスト"
 
-#: ../../templates/show_edit_song.inc.php:36
+#: ../../templates/show_edit_song.inc.php:31
 msgid "Edit Song"
 msgstr "曲編集"
 
-#: ../../templates/show_edit_song.inc.php:40
+#: ../../templates/show_edit_song.inc.php:35
 msgid "File"
 msgstr "ファイル"
 
-#: ../../templates/show_edit_song.inc.php:53
-#: ../../templates/show_edit_song.inc.php:61
-#: ../../templates/show_search.inc.php:137
-#: ../../templates/show_rename_artist.inc.php:45
-#: ../../templates/show_dynamic.inc.php:77
+#: ../../templates/show_edit_song.inc.php:48
+#: ../../templates/show_edit_song.inc.php:56
+#: ../../templates/show_rename_artist.inc.php:40
+#: ../../templates/show_dynamic.inc.php:72
 msgid "OR"
 msgstr "OR"
 
-#: ../../templates/show_edit_song.inc.php:66
-#: ../../templates/show_localplay_playlist.inc.php:46
-#: ../../templates/show_localplay_playlist.inc.php:72
-#: ../../templates/show_songs.inc.php:56 ../../templates/show_songs.inc.php:85
+#: ../../templates/show_edit_song.inc.php:61
+#: ../../templates/show_localplay_playlist.inc.php:41
+#: ../../templates/show_localplay_playlist.inc.php:67
+#: ../../templates/show_songs.inc.php:51 ../../templates/show_songs.inc.php:80
+#: ../../templates/show_playlist_songs.inc.php:49
 #: ../../templates/show_playlist_songs.inc.php:54
-#: ../../templates/show_playlist_songs.inc.php:59
+#: ../../templates/show_playlist_songs.inc.php:75
 #: ../../templates/show_playlist_songs.inc.php:80
-#: ../../templates/show_playlist_songs.inc.php:85
 msgid "Track"
 msgstr "トラック"
 
-#: ../../templates/show_edit_song.inc.php:78
-#: ../../templates/show_song.inc.php:62
-#: ../../templates/show_manage_shoutbox.inc.php:49
-#: ../../templates/show_manage_shoutbox.inc.php:73
-#: ../../templates/show_search.inc.php:47
-#: ../../templates/show_flagged.inc.php:49
-#: ../../templates/show_flagged.inc.php:68
-msgid "Comment"
-msgstr "コメント"
-
-#: ../../templates/show_edit_song.inc.php:86
-#: ../../templates/show_edit_artist.inc.php:48
-#: ../../templates/show_edit_album.inc.php:54
+#: ../../templates/show_edit_song.inc.php:81
+#: ../../templates/show_edit_artist.inc.php:43
+#: ../../templates/show_edit_album.inc.php:49
 msgid "Flag for Retagging"
 msgstr "再タグ付けのフラグ"
 
-#: ../../templates/show_edit_song.inc.php:93
+#: ../../templates/show_edit_song.inc.php:88
 msgid "Update Song"
 msgstr "曲を更新"
 
 #. HINT: Catalog Name
-#: ../../templates/show_edit_catalog.inc.php:35
+#: ../../templates/show_edit_catalog.inc.php:30
 #, php-format
 msgid "Settings for %s"
 msgstr "%sの設定"
 
-#: ../../templates/show_edit_catalog.inc.php:42
-#: ../../templates/show_add_catalog.inc.php:46
+#: ../../templates/show_edit_catalog.inc.php:37
+#: ../../templates/show_add_catalog.inc.php:41
 msgid "Auto-inserted Fields"
 msgstr "自動挿入フィールド"
 
-#: ../../templates/show_edit_catalog.inc.php:43
-#: ../../templates/show_add_catalog.inc.php:47
+#: ../../templates/show_edit_catalog.inc.php:38
+#: ../../templates/show_add_catalog.inc.php:42
 msgid "album name"
 msgstr "アルバム名"
 
-#: ../../templates/show_edit_catalog.inc.php:44
-#: ../../templates/show_add_catalog.inc.php:48
+#: ../../templates/show_edit_catalog.inc.php:39
+#: ../../templates/show_add_catalog.inc.php:43
 msgid "artist name"
 msgstr "アーティスト名"
 
-#: ../../templates/show_edit_catalog.inc.php:45
-#: ../../templates/show_add_catalog.inc.php:49
+#: ../../templates/show_edit_catalog.inc.php:40
+#: ../../templates/show_add_catalog.inc.php:44
 msgid "id3 comment"
 msgstr "ID3のコメント"
 
-#: ../../templates/show_edit_catalog.inc.php:46
-#: ../../templates/show_add_catalog.inc.php:50
+#: ../../templates/show_edit_catalog.inc.php:41
+#: ../../templates/show_add_catalog.inc.php:45
 msgid "track number (padded with leading 0)"
 msgstr "トラック番号"
 
-#: ../../templates/show_edit_catalog.inc.php:47
-#: ../../templates/show_add_catalog.inc.php:51
+#: ../../templates/show_edit_catalog.inc.php:42
+#: ../../templates/show_add_catalog.inc.php:46
 msgid "song title"
 msgstr "曲名"
 
-#: ../../templates/show_edit_catalog.inc.php:48
-#: ../../templates/show_add_catalog.inc.php:52
+#: ../../templates/show_edit_catalog.inc.php:43
+#: ../../templates/show_add_catalog.inc.php:47
 msgid "year"
 msgstr "年"
 
-#: ../../templates/show_edit_catalog.inc.php:49
-#: ../../templates/show_add_catalog.inc.php:53
+#: ../../templates/show_edit_catalog.inc.php:44
+#: ../../templates/show_add_catalog.inc.php:48
 msgid "other"
 msgstr "その他"
 
-#: ../../templates/show_edit_catalog.inc.php:53
-#: ../../templates/show_add_catalog.inc.php:62
+#: ../../templates/show_edit_catalog.inc.php:48
+#: ../../templates/show_add_catalog.inc.php:57
 msgid "Catalog Type"
 msgstr "カタログタイプ"
 
-#: ../../templates/show_edit_catalog.inc.php:57
+#: ../../templates/show_edit_catalog.inc.php:52
 msgid "XML-RPC Key"
 msgstr "XML-RPCキー"
 
-#: ../../templates/show_edit_catalog.inc.php:59
-#: ../../templates/show_add_catalog.inc.php:72
-#: ../../templates/show_add_catalog.inc.php:76
+#: ../../templates/show_edit_catalog.inc.php:54
+#: ../../templates/show_add_catalog.inc.php:67
+#: ../../templates/show_add_catalog.inc.php:71
 msgid "Required for Remote Catalogs"
 msgstr "リモートカタログの必須項目"
 
-#: ../../templates/show_edit_catalog.inc.php:63
+#: ../../templates/show_edit_catalog.inc.php:58
 msgid "Filename pattern"
 msgstr "ファイル名パターン"
 
-#: ../../templates/show_edit_catalog.inc.php:70
-#: ../../templates/show_add_catalog.inc.php:84
+#: ../../templates/show_edit_catalog.inc.php:65
+#: ../../templates/show_add_catalog.inc.php:79
 msgid "Folder Pattern"
 msgstr "フォルダパターン"
 
-#: ../../templates/show_edit_catalog.inc.php:70
-#: ../../templates/show_add_catalog.inc.php:84
+#: ../../templates/show_edit_catalog.inc.php:65
+#: ../../templates/show_add_catalog.inc.php:79
 msgid "(no leading or ending '/')"
 msgstr "(先頭がない又は「/」で終わっている)"
 
-#: ../../templates/show_edit_catalog.inc.php:80
+#: ../../templates/show_edit_catalog.inc.php:75
 msgid "Save Catalog Settings"
 msgstr "カタログ設定の保存"
 
-#: ../../templates/show_install_check.inc.php:36
+#: ../../templates/show_install_check.inc.php:31
 msgid "Required"
 msgstr "必要条件"
 
+#: ../../templates/show_install_check.inc.php:34
 #: ../../templates/show_install_check.inc.php:39
-#: ../../templates/show_install_check.inc.php:44
+#: ../../templates/show_install_check.inc.php:48
 #: ../../templates/show_install_check.inc.php:53
-#: ../../templates/show_install_check.inc.php:58
-#: ../../templates/show_test.inc.php:159
+#: ../../templates/show_test.inc.php:172
 #, php-format
 msgid "%s is readable"
 msgstr "%sは読み込み可"
 
-#: ../../templates/show_install_check.inc.php:67
-#: ../../templates/show_install_check.inc.php:80
-#: ../../templates/show_test.inc.php:57 ../../templates/show_info.inc.php:64
+#: ../../templates/show_install_check.inc.php:62
+#: ../../templates/show_install_check.inc.php:75
+#: ../../templates/show_test.inc.php:52 ../../templates/show_info.inc.php:60
 msgid "PHP Version"
 msgstr "PHPバージョン"
 
-#: ../../templates/show_install_check.inc.php:78
-#: ../../templates/show_test.inc.php:63
+#: ../../templates/show_install_check.inc.php:73
+#: ../../templates/show_test.inc.php:58
 msgid "Hash Function Exists"
 msgstr "ハッシュ関数は存在します"
 
-#: ../../templates/show_install_check.inc.php:78
-#: ../../templates/show_test.inc.php:63
+#: ../../templates/show_install_check.inc.php:73
+#: ../../templates/show_test.inc.php:58
 msgid "SHA256 Support"
 msgstr "SHA256 サポート"
 
+#: ../../templates/show_install_check.inc.php:83
 #: ../../templates/show_install_check.inc.php:88
-#: ../../templates/show_install_check.inc.php:93
 msgid "PHP MySQL Support"
 msgstr "PHP MySQL サポート"
 
+#: ../../templates/show_install_check.inc.php:96
 #: ../../templates/show_install_check.inc.php:101
-#: ../../templates/show_install_check.inc.php:106
-#: ../../templates/show_test.inc.php:94
+#: ../../templates/show_test.inc.php:89
 msgid "PHP Session Support"
 msgstr "PHPセッションサポート"
 
+#: ../../templates/show_install_check.inc.php:109
 #: ../../templates/show_install_check.inc.php:114
-#: ../../templates/show_install_check.inc.php:119
 msgid "PHP iconv Support"
 msgstr "PHP iconv サポート"
 
+#: ../../templates/show_install_check.inc.php:122
 #: ../../templates/show_install_check.inc.php:127
-#: ../../templates/show_install_check.inc.php:132
-#: ../../templates/show_test.inc.php:127
+#: ../../templates/show_test.inc.php:122
 msgid "PHP PCRE Support"
 msgstr "PHP PCREサポート"
 
-#: ../../templates/show_install_check.inc.php:140
-#: ../../templates/show_install_check.inc.php:145
-msgid "PHP putenv Support"
-msgstr "PHP pubenv サポート"
-
-#: ../../templates/show_install_check.inc.php:153
+#: ../../templates/show_install_check.inc.php:135
 msgid "Optional"
 msgstr "オプション"
 
-#: ../../templates/show_install_check.inc.php:155
+#: ../../templates/show_install_check.inc.php:137
 msgid "PHP gettext Support"
 msgstr "PHP gettextサポート"
 
-#: ../../templates/show_install_check.inc.php:159
+#: ../../templates/show_install_check.inc.php:141
 msgid "gettext emulation will be used"
 msgstr "gettextエミュレータが使用されるでしょう"
 
-#: ../../templates/show_install_check.inc.php:167
+#: ../../templates/show_install_check.inc.php:149
 msgid "PHP mbstring Support"
 msgstr "PHP mbstringサポート"
 
-#: ../../templates/show_install_check.inc.php:171
+#: ../../templates/show_install_check.inc.php:153
 msgid "Multibyte character encodings may not be autodetected correctly"
 msgstr "マルチバイト文字列を正しく検出できないかもしれません"
 
-#: ../../templates/show_install_check.inc.php:179
+#: ../../templates/show_install_check.inc.php:161
+#: ../../templates/show_test.inc.php:138
+#, fuzzy
+msgid "PHP Safe Mode"
+msgstr "セーフモード"
+
+#: ../../templates/show_install_check.inc.php:164
+#, fuzzy
+msgid "Safe mode enabled"
+msgstr "セーフモード"
+
+#: ../../templates/show_install_check.inc.php:167
+msgid "Safe mode not enabled"
+msgstr ""
+
+#: ../../templates/show_install_check.inc.php:172
 msgid "PHP Memory Limit"
 msgstr "PHP メモリ制限"
 
-#: ../../templates/show_install_check.inc.php:183
+#: ../../templates/show_install_check.inc.php:176
 msgid "Memory limit less than recommended size"
 msgstr "メモリ制限が推奨サイズより小さいです"
 
-#: ../../templates/show_install_check.inc.php:192
+#: ../../templates/show_install_check.inc.php:185
 msgid "PHP Execution Time Limit"
 msgstr "PHP 最大実行時間"
 
-#: ../../templates/show_install_check.inc.php:196
+#: ../../templates/show_install_check.inc.php:189
 msgid "Execution time limit less than recommended"
 msgstr "実行時間制限が推奨より小さいです"
 
-#: ../../templates/show_install_check.inc.php:199
+#: ../../templates/show_install_check.inc.php:192
 msgid "seconds"
 msgstr "秒"
 
-#: ../../templates/show_admin_tools.inc.php:59
-#: ../../templates/show_catalog_row.inc.php:43
+#: ../../templates/show_install_check.inc.php:197
+#, fuzzy
+msgid "ampache.cfg.php is writable"
+msgstr "Ampache.cfg.phpはありますか？"
+
+#: ../../templates/show_admin_tools.inc.php:54
+#: ../../templates/show_catalog_row.inc.php:38
 msgid "Verify"
 msgstr "確認"
 
-#: ../../templates/show_admin_tools.inc.php:61
-#: ../../templates/show_catalog_row.inc.php:44
+#: ../../templates/show_admin_tools.inc.php:56
+#: ../../templates/show_catalog_row.inc.php:39
 msgid "Clean"
 msgstr "クリーン"
 
-#: ../../templates/show_admin_tools.inc.php:71
+#: ../../templates/show_admin_tools.inc.php:66
 msgid "Fast"
 msgstr "Fast"
 
-#: ../../templates/show_admin_tools.inc.php:72
-#: ../../templates/show_catalog_row.inc.php:46
-#: ../../bin/catalog_update.inc:179
+#: ../../templates/show_admin_tools.inc.php:67
+#: ../../templates/show_catalog_row.inc.php:41
+#: ../../bin/catalog_update.inc:180
 msgid "Gather Art"
 msgstr "アート収集"
 
-#: ../../templates/show_admin_tools.inc.php:80
+#: ../../templates/show_admin_tools.inc.php:75
 msgid "No Catalogs Found"
 msgstr "カタログは見つかりませんでした"
 
-#: ../../templates/show_admin_tools.inc.php:90
-#: ../../templates/show_manage_catalogs.inc.php:44
+#: ../../templates/show_admin_tools.inc.php:85
+#: ../../templates/show_manage_catalogs.inc.php:39
 msgid "Clean All"
 msgstr "全て削除"
 
-#: ../../templates/show_admin_tools.inc.php:91
-#: ../../templates/show_manage_catalogs.inc.php:43
+#: ../../templates/show_admin_tools.inc.php:86
+#: ../../templates/show_manage_catalogs.inc.php:38
 msgid "Verify All"
 msgstr "全て確認"
 
-#: ../../templates/show_admin_tools.inc.php:92
-#: ../../templates/show_manage_catalogs.inc.php:42
+#: ../../templates/show_admin_tools.inc.php:87
+#: ../../templates/show_manage_catalogs.inc.php:37
 msgid "Add to All"
 msgstr "全てに追加"
 
-#: ../../templates/show_admin_tools.inc.php:93
-#: ../../templates/show_manage_catalogs.inc.php:45
+#: ../../templates/show_admin_tools.inc.php:88
+#: ../../templates/show_manage_catalogs.inc.php:40
 msgid "Update All"
 msgstr "全て更新"
 
-#: ../../templates/show_admin_tools.inc.php:94
-#: ../../templates/show_add_catalog.inc.php:37
-#: ../../templates/sidebar_admin.inc.php:38
+#: ../../templates/show_admin_tools.inc.php:89
+#: ../../templates/show_add_catalog.inc.php:32
+#: ../../templates/sidebar_admin.inc.php:33
 msgid "Add a Catalog"
 msgstr "カタログを追加"
 
-#: ../../templates/show_admin_tools.inc.php:95
+#: ../../templates/show_admin_tools.inc.php:90
 msgid "Clear Catalog Stats"
 msgstr "カタログステータスをクリア"
 
-#: ../../templates/show_admin_tools.inc.php:96
-#: ../../templates/show_add_catalog.inc.php:89
+#: ../../templates/show_admin_tools.inc.php:91
+#: ../../templates/show_add_catalog.inc.php:84
 msgid "Gather Album Art"
 msgstr "アルバムアートを収集"
 
-#: ../../templates/show_admin_tools.inc.php:100
-#: ../../templates/sidebar_modules.inc.php:43
-#: ../../templates/sidebar_admin.inc.php:55
+#: ../../templates/show_admin_tools.inc.php:95
+#: ../../templates/sidebar_modules.inc.php:38
+#: ../../templates/sidebar_admin.inc.php:50
 msgid "Other Tools"
 msgstr "その他ツール"
 
-#: ../../templates/show_admin_tools.inc.php:102
+#: ../../templates/show_admin_tools.inc.php:97
 msgid "Show Duplicate Songs"
 msgstr "重複している曲を表示"
 
-#: ../../templates/show_admin_tools.inc.php:103
-#: ../../templates/sidebar_admin.inc.php:58
+#: ../../templates/show_admin_tools.inc.php:98
+#: ../../templates/sidebar_admin.inc.php:54
 msgid "Clear Now Playing"
 msgstr "再生中の曲をクリア"
 
-#: ../../templates/show_admin_tools.inc.php:104
-#: ../../templates/header.inc.php:98
+#: ../../templates/show_admin_tools.inc.php:99
+#: ../../templates/header.inc.php:93
 msgid "Generate New Config"
 msgstr "新規設定を生成"
 
-#: ../../templates/show_admin_tools.inc.php:105
+#: ../../templates/show_admin_tools.inc.php:100
 msgid "Preferences Permissions"
 msgstr "設定パーミッション"
 
-#: ../../templates/show_admin_tools.inc.php:106
+#: ../../templates/show_admin_tools.inc.php:101
 msgid "Export To Itunes DB"
 msgstr "iTunesのDBへエクスポート"
 
-#: ../../templates/show_admin_tools.inc.php:107
+#: ../../templates/show_admin_tools.inc.php:102
 msgid "Show Inactive Users"
 msgstr "非活発ユーザを表示"
 
-#: ../../templates/show_admin_tools.inc.php:108
+#: ../../templates/show_admin_tools.inc.php:103
 msgid "Check for New Version"
 msgstr "新バージョンのチェック"
 
-#: ../../templates/sidebar_localplay.inc.php:48
-#: ../../templates/show_localplay_add_instance.inc.php:46
+#: ../../templates/show_smartplaylist.inc.php:39
+#: ../../templates/show_smartplaylist.inc.php:40
+#: ../../templates/show_playlist.inc.php:56
+#: ../../templates/show_playlist.inc.php:57
+msgid "Add All"
+msgstr "全て追加"
+
+#: ../../templates/sidebar_localplay.inc.php:43
+#: ../../templates/show_localplay_add_instance.inc.php:41
 msgid "Add Instance"
 msgstr "インスタンス追加"
 
-#: ../../templates/sidebar_localplay.inc.php:49
+#: ../../templates/sidebar_localplay.inc.php:44
 msgid "Show instances"
 msgstr "インスタンス表示"
 
-#: ../../templates/sidebar_localplay.inc.php:51
+#: ../../templates/sidebar_localplay.inc.php:46
 msgid "Show Playlist"
 msgstr "プレイリストの表示"
 
-#: ../../templates/sidebar_localplay.inc.php:55
+#: ../../templates/sidebar_localplay.inc.php:50
 msgid "Active Instance"
 msgstr "有効なインスタンス"
 
-#: ../../templates/sidebar_localplay.inc.php:73
+#: ../../templates/sidebar_localplay.inc.php:68
 msgid "Localplay Disabled"
 msgstr "ローカル再生は無効です"
 
-#: ../../templates/sidebar_localplay.inc.php:75
+#: ../../templates/sidebar_localplay.inc.php:70
 msgid "Allow Localplay set to False"
 msgstr "ローカル再生の許可をFalseにセットします"
 
-#: ../../templates/sidebar_localplay.inc.php:77
+#: ../../templates/sidebar_localplay.inc.php:72
 msgid "Localplay Controller Not Defined"
 msgstr "ローカル再生コントローラが定義されていません"
 
-#: ../../templates/sidebar_localplay.inc.php:79
-#: ../../templates/show_denied.inc.php:44
+#: ../../templates/sidebar_localplay.inc.php:74
+#: ../../templates/show_denied.inc.php:39
 msgid "Access Denied"
 msgstr "アクセス拒否"
 
-#: ../../templates/show_song.inc.php:37
+#: ../../templates/show_rules.inc.php:27
+msgid "Rules"
+msgstr "ルール"
+
+#: ../../templates/show_rules.inc.php:31
+msgid "Match"
+msgstr ""
+
+#: ../../templates/show_rules.inc.php:34
+#, fuzzy
+msgid "all rules"
+msgstr "ローカル再生モジュール"
+
+#: ../../templates/show_rules.inc.php:35
+msgid "any rule"
+msgstr ""
+
+#: ../../templates/show_rules.inc.php:43
+#, fuzzy
+msgid "Add Another Rule"
+msgstr "ルールを追加"
+
+#: ../../templates/show_song.inc.php:32
 msgid "Details"
 msgstr "詳細"
 
-#: ../../templates/show_song.inc.php:47
+#: ../../templates/show_song.inc.php:42
 msgid "Link"
 msgstr "リンク"
 
-#: ../../templates/show_song.inc.php:60
-#: ../../templates/show_playlist_songs.inc.php:58
-#: ../../templates/show_playlist_songs.inc.php:84
+#: ../../templates/show_song.inc.php:55
+#: ../../templates/show_playlist_songs.inc.php:53
+#: ../../templates/show_playlist_songs.inc.php:79
 msgid "Genre"
 msgstr "ジャンル"
 
-#: ../../templates/show_song.inc.php:61
-#: ../../templates/show_duplicates.inc.php:53
-#: ../../templates/show_duplicates.inc.php:92
-#: ../../templates/show_random.inc.php:57
+#: ../../templates/show_song.inc.php:56
+#: ../../templates/show_duplicates.inc.php:48
+#: ../../templates/show_duplicates.inc.php:87
+#: ../../templates/show_random.inc.php:67
 msgid "Length"
 msgstr "長さ"
 
-#: ../../templates/show_song.inc.php:63
+#: ../../templates/show_song.inc.php:58
 msgid "Label"
 msgstr "ラベル"
 
-#: ../../templates/show_song.inc.php:64
+#: ../../templates/show_song.inc.php:59
 msgid "Song Language"
 msgstr "曲言語"
 
-#: ../../templates/show_song.inc.php:65
+#: ../../templates/show_song.inc.php:60
 msgid "Catalog Number"
 msgstr "カタログ番号"
 
 #: ../../templates/show_song.inc.php:66
-#: ../../templates/show_duplicates.inc.php:54
-#: ../../templates/show_duplicates.inc.php:93
-msgid "Bitrate"
-msgstr "ビットレート"
-
-#: ../../templates/show_song.inc.php:71
 msgid "Last Updated"
 msgstr "最終更新"
 
-#: ../../templates/show_gather_art.inc.php:35 ../../bin/catalog_update.inc:137
+#: ../../templates/show_gather_art.inc.php:29
+#, fuzzy
+msgid "Album Art Search"
+msgstr "アルバムアートをクリアしました"
+
+#: ../../templates/show_gather_art.inc.php:30 ../../bin/catalog_update.inc:133
 msgid "Starting Album Art Search"
 msgstr "アルバムアート検索の開始"
 
-#: ../../templates/show_gather_art.inc.php:36
+#: ../../templates/show_gather_art.inc.php:31
 msgid "Searched"
 msgstr "検索済み"
 
-#: ../../templates/show_gather_art.inc.php:37
-#: ../../templates/show_clean_catalog.inc.php:39
-#: ../../templates/show_run_add_catalog.inc.php:37
-#: ../../templates/show_verify_catalog.inc.php:41
-#: ../../templates/show_adds_catalog.inc.php:39
+#: ../../templates/show_gather_art.inc.php:32
+#: ../../templates/show_clean_catalog.inc.php:34
+#: ../../templates/show_run_add_catalog.inc.php:32
+#: ../../templates/show_verify_catalog.inc.php:36
+#: ../../templates/show_adds_catalog.inc.php:34
 msgid "Reading"
 msgstr "読み込み中"
 
-#: ../../templates/show_confirmation.inc.php:40
-#: ../../templates/show_update_items.inc.php:39
+#: ../../templates/show_confirmation.inc.php:35
+#: ../../templates/show_update_items.inc.php:34
 msgid "Continue"
 msgstr "続ける"
 
-#: ../../templates/show_confirmation.inc.php:45
+#: ../../templates/show_confirmation.inc.php:40
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: ../../templates/show_edit_artist.inc.php:36
+#: ../../templates/show_edit_artist.inc.php:31
 msgid "Edit Artist"
 msgstr "アーティスト編集"
 
-#: ../../templates/show_edit_artist.inc.php:54
+#: ../../templates/show_edit_artist.inc.php:49
 msgid "Update Artist"
 msgstr "アーティスト更新"
 
 #. HINT: Artist Fullname
-#: ../../templates/show_artist_row.inc.php:37
-#: ../../templates/show_album_row.inc.php:37
-#: ../../templates/sidebar_home.inc.php:75
-#: ../../templates/show_artist.inc.php:67
-#: ../../templates/show_album.inc.php:68
-#: ../../templates/show_playlist_row.inc.php:37
-#: ../../templates/show_localplay_status.inc.php:56
-#: ../../modules/localplay/httpq.controller.php:514
-#: ../../modules/localplay/mpd.controller.php:483
-#: ../../modules/localplay/vlc.controller.php:546
+#: ../../templates/show_artist_row.inc.php:32
+#: ../../templates/show_album_row.inc.php:32
+#: ../../templates/sidebar_home.inc.php:71
+#: ../../templates/show_artist.inc.php:62
+#: ../../templates/show_album.inc.php:63
+#: ../../templates/show_playlist_row.inc.php:32
+#: ../../templates/show_localplay_status.inc.php:51
+#: ../../modules/localplay/httpq.controller.php:507
+#: ../../modules/localplay/mpd.controller.php:476
+#: ../../modules/localplay/vlc.controller.php:539
 msgid "Random"
 msgstr "ランダム"
 
-#: ../../templates/show_manage_shoutbox.inc.php:46
-#: ../../templates/show_manage_shoutbox.inc.php:70
-#: ../../templates/show_flagged.inc.php:46
-#: ../../templates/show_flagged.inc.php:65
+#: ../../templates/show_manage_shoutbox.inc.php:41
+#: ../../templates/show_manage_shoutbox.inc.php:65
+#: ../../templates/show_flagged.inc.php:41
+#: ../../templates/show_flagged.inc.php:60
 msgid "Object"
 msgstr "オブジェクト"
 
-#: ../../templates/show_manage_shoutbox.inc.php:48
-#: ../../templates/show_manage_shoutbox.inc.php:72
+#: ../../templates/show_manage_shoutbox.inc.php:43
+#: ../../templates/show_manage_shoutbox.inc.php:67
 msgid "Sticky"
 msgstr "Sticky"
 
-#: ../../templates/show_manage_shoutbox.inc.php:50
-#: ../../templates/show_manage_shoutbox.inc.php:74
+#: ../../templates/show_manage_shoutbox.inc.php:45
+#: ../../templates/show_manage_shoutbox.inc.php:69
 msgid "Date Added"
 msgstr "追加日"
 
-#: ../../templates/browse_filters.inc.php:37
+#: ../../templates/browse_filters.inc.php:32
 msgid "Filters"
 msgstr "フィルタ"
 
-#: ../../templates/browse_filters.inc.php:41
+#: ../../templates/browse_filters.inc.php:36
 msgid "Starts With"
 msgstr "開始 :"
 
-#: ../../templates/browse_filters.inc.php:47
+#: ../../templates/browse_filters.inc.php:42
 msgid "Minimum Count"
 msgstr "最小カウント"
 
-#: ../../templates/browse_filters.inc.php:52
+#: ../../templates/browse_filters.inc.php:47
 msgid "Rated"
 msgstr "評価"
 
-#: ../../templates/browse_filters.inc.php:57
+#: ../../templates/browse_filters.inc.php:52
 msgid "Unplayed"
 msgstr "未再生"
 
-#: ../../templates/browse_filters.inc.php:61
-#: ../../templates/show_artist.inc.php:83
-msgid "Show Art"
-msgstr "アート表示"
-
-#: ../../templates/browse_filters.inc.php:66
+#: ../../templates/browse_filters.inc.php:56
 msgid "All Playlists"
 msgstr "全プレイリスト"
 
-#: ../../templates/browse_filters.inc.php:72
-#: ../../templates/show_songs.inc.php:52 ../../templates/show_songs.inc.php:81
-#: ../../templates/show_playlist_songs.inc.php:55
-#: ../../templates/show_playlist_songs.inc.php:81
+#: ../../templates/browse_filters.inc.php:62
+#: ../../templates/show_songs.inc.php:47 ../../templates/show_songs.inc.php:76
+#: ../../templates/show_playlist_songs.inc.php:50
+#: ../../templates/show_playlist_songs.inc.php:76
 msgid "Song Title"
 msgstr "曲タイトル"
 
-#: ../../templates/browse_filters.inc.php:84
-#: ../../templates/show_add_live_stream.inc.php:72
-#: ../../templates/show_export.inc.php:43
-msgid "Catalog"
-msgstr "カタログ"
+#: ../../templates/browse_filters.inc.php:98
+msgid "Toggle Artwork"
+msgstr ""
 
-#: ../../templates/header.inc.php:81
+#: ../../templates/header.inc.php:76
 msgid "Log out"
 msgstr "ログアウト"
 
-#: ../../templates/header.inc.php:97
+#: ../../templates/header.inc.php:92
 msgid "Error Config File Out of Date"
 msgstr "エラー: 設定ファイルは期限切れです"
 
-#: ../../templates/show_search.inc.php:39
+#: ../../templates/show_search.inc.php:34
 msgid "Search Ampache"
 msgstr "Ampache検索"
 
-#: ../../templates/show_search.inc.php:43
-msgid "Keywords"
-msgstr "キーワード"
-
-#: ../../templates/show_search.inc.php:67
-#: ../../templates/show_live_streams.inc.php:52
-#: ../../templates/show_live_streams.inc.php:74
-msgid "Tag"
-msgstr "タグ"
-
-#: ../../templates/show_search.inc.php:92
-#: ../../templates/show_videos.inc.php:51
-#: ../../templates/show_videos.inc.php:75
-msgid "Codec"
-msgstr "コーデック"
-
-#: ../../templates/show_search.inc.php:98
-msgid "Played"
-msgstr "再生済"
-
-#: ../../templates/show_search.inc.php:102
-msgid "Yes"
-msgstr "はい"
-
-#: ../../templates/show_search.inc.php:103
-msgid "No"
-msgstr "いいえ"
-
-#: ../../templates/show_search.inc.php:106
-msgid "Min Bitrate"
-msgstr "最小ビットレート"
-
-#: ../../templates/show_search.inc.php:120
-msgid ">="
-msgstr ">="
-
-#: ../../templates/show_search.inc.php:121
-msgid "<="
-msgstr "<="
-
-#: ../../templates/show_search.inc.php:122
-msgid "="
-msgstr "="
-
-#: ../../templates/show_search.inc.php:126
-msgid "One Star"
-msgstr "1点"
-
-#: ../../templates/show_search.inc.php:127
-msgid "Two Stars"
-msgstr "2点"
-
-#: ../../templates/show_search.inc.php:128
-msgid "Three Stars"
-msgstr "3点"
-
-#: ../../templates/show_search.inc.php:129
-msgid "Four Stars"
-msgstr "4点"
-
-#: ../../templates/show_search.inc.php:130
-msgid "Five Stars"
-msgstr "5点"
-
-#: ../../templates/show_search.inc.php:133
-#: ../../templates/show_random_rules.inc.php:46
-#: ../../templates/show_dynamic.inc.php:45
-msgid "Operator"
-msgstr "オペレータ"
-
-#: ../../templates/show_search.inc.php:136
-#: ../../templates/show_dynamic.inc.php:78
-msgid "AND"
-msgstr "AND"
-
-#: ../../templates/show_search.inc.php:142
-#: ../../templates/show_random_rules.inc.php:48
-#: ../../templates/show_dynamic.inc.php:47
-msgid "Method"
-msgstr "方法"
-
-#: ../../templates/show_search.inc.php:145
-msgid "Fuzzy"
-msgstr "曖昧"
-
-#: ../../templates/show_search.inc.php:146
-msgid "Exact"
-msgstr "正確"
-
-#: ../../templates/show_search.inc.php:149
+#: ../../templates/show_search.inc.php:47
 msgid "Maximum Results"
 msgstr "最大結果"
 
-#: ../../templates/show_search.inc.php:152
-#: ../../templates/show_random.inc.php:61
-#: ../../templates/show_random.inc.php:98
+#: ../../templates/show_search.inc.php:50
+#: ../../templates/show_random.inc.php:71
+#: ../../templates/show_random.inc.php:87
 msgid "Unlimited"
 msgstr "無制限"
 
-#: ../../templates/show_user_recommendations.inc.php:42
+#: ../../templates/show_search.inc.php:65
+#, fuzzy
+msgid "Save as Smart Playlist"
+msgstr "プレイリストをクリア"
+
+#: ../../templates/show_user_recommendations.inc.php:37
 msgid "Recommended Artists"
 msgstr "お勧めアーティスト"
 
-#: ../../templates/show_user_recommendations.inc.php:53
+#: ../../templates/show_user_recommendations.inc.php:48
 msgid "Recommended Albums"
 msgstr "お勧めアルバム"
 
-#: ../../templates/show_user_recommendations.inc.php:64
+#: ../../templates/show_user_recommendations.inc.php:59
 msgid "Recommended Songs"
 msgstr "お勧めの曲"
 
-#: ../../templates/show_flagged.inc.php:48
-#: ../../templates/show_flagged.inc.php:67
+#: ../../templates/show_flagged.inc.php:43
+#: ../../templates/show_flagged.inc.php:62
 msgid "Flag"
 msgstr "フラグ"
 
-#: ../../templates/show_flagged.inc.php:50
-#: ../../templates/show_flagged.inc.php:69
+#: ../../templates/show_flagged.inc.php:45
+#: ../../templates/show_flagged.inc.php:64
 msgid "Status"
 msgstr "ステータス"
 
-#: ../../templates/show_random_albums.inc.php:35
+#: ../../templates/show_random_albums.inc.php:30
 msgid "Refresh"
 msgstr "更新"
 
-#: ../../templates/show_random_albums.inc.php:37
-#: ../../templates/show_index.inc.php:44
+#: ../../templates/show_random_albums.inc.php:32
+#: ../../templates/show_index.inc.php:39
 msgid "Albums of the Moment"
 msgstr "現在のアルバム"
 
-#: ../../templates/show_random_albums.inc.php:61
+#: ../../templates/show_random_albums.inc.php:56
 msgid "Play Album"
 msgstr "アルバム再生"
 
 #. HINT: Song Title
-#: ../../templates/show_lyrics.inc.php:46
+#: ../../templates/show_lyrics.inc.php:40
 #, php-format
 msgid "%s Lyrics"
 msgstr "%sの歌詞"
 
 #. HINT: Editing Username preferences
 #. HINT: Username
-#: ../../templates/show_user_preferences.inc.php:40
-#: ../../templates/show_preferences.inc.php:40
+#: ../../templates/show_user_preferences.inc.php:35
+#: ../../templates/show_preferences.inc.php:35
 #, php-format
 msgid "Editing %s preferences"
 msgstr "%s設定の編集"
 
-#: ../../templates/show_user_preferences.inc.php:48
-#: ../../templates/show_debug.inc.php:105
-#: ../../templates/show_preference_box.inc.php:52
-#: ../../templates/show_preference_box.inc.php:82
-#: ../../templates/show_preference_admin.inc.php:43
-#: ../../templates/show_preference_admin.inc.php:62
+#: ../../templates/show_user_preferences.inc.php:43
+#: ../../templates/show_debug.inc.php:100
+#: ../../templates/show_preference_box.inc.php:47
+#: ../../templates/show_preference_box.inc.php:77
+#: ../../templates/show_preference_admin.inc.php:38
+#: ../../templates/show_preference_admin.inc.php:57
 msgid "Preference"
 msgstr "設定"
 
-#: ../../templates/show_user_preferences.inc.php:49
-#: ../../templates/show_random_rules.inc.php:47
-#: ../../templates/show_debug.inc.php:57
-#: ../../templates/show_debug.inc.php:106
-#: ../../templates/show_preference_box.inc.php:53
-#: ../../templates/show_preference_box.inc.php:83
-#: ../../templates/show_dynamic.inc.php:46
+#: ../../templates/show_user_preferences.inc.php:44
+#: ../../templates/show_debug.inc.php:52
+#: ../../templates/show_debug.inc.php:101
+#: ../../templates/show_preference_box.inc.php:48
+#: ../../templates/show_preference_box.inc.php:78
+#: ../../templates/show_dynamic.inc.php:41
 msgid "Value"
 msgstr "値"
 
-#: ../../templates/show_user_preferences.inc.php:62
-#: ../../templates/show_preferences.inc.php:46
+#: ../../templates/show_user_preferences.inc.php:57
+#: ../../templates/show_preferences.inc.php:41
 msgid "Update Preferences"
 msgstr "設定の更新"
 
-#: ../../templates/error_page.inc.php:42
+#: ../../templates/show_smartplaylist_title.inc.php:24
+#, fuzzy, php-format
+msgid "%s %s (Smart Playlist)"
+msgstr "%s %s (プレイリスト)"
+
+#: ../../templates/error_page.inc.php:37
 msgid "Ampache error page"
 msgstr "Apmacheエラーページ"
 
-#: ../../templates/error_page.inc.php:59
+#: ../../templates/error_page.inc.php:54
 msgid ""
 "The folowing error has occured, you will automaticly be redirected after 10 "
 "seconds."
 msgstr "次のエラーが発生しました。10秒後に自動的にリダイレクトされます。"
 
-#: ../../templates/error_page.inc.php:61
+#: ../../templates/error_page.inc.php:56
 msgid "Error messages"
 msgstr "エラーメッセージ"
 
-#: ../../templates/show_add_catalog.inc.php:38
+#: ../../templates/show_add_catalog.inc.php:33
 msgid ""
 "In the form below enter either a local path (i.e. /data/music) or the URL to "
 "a remote Ampache installation (i.e http://theotherampache.com)"
@@ -2317,172 +2436,159 @@ msgstr ""
 "以下のフォームではローカルパス(例 /data/music)かURLのどちらかをリモートの"
 "Ampatcheに入れます(例 http://theoherampache.com)"
 
-#: ../../templates/show_add_catalog.inc.php:43
+#: ../../templates/show_add_catalog.inc.php:38
 msgid "Catalog Name"
 msgstr "カタログ名"
 
-#: ../../templates/show_add_catalog.inc.php:58
-#: ../../templates/show_stats.inc.php:77
-#: ../../templates/show_catalogs.inc.php:47
-#: ../../templates/show_catalogs.inc.php:71
+#: ../../templates/show_add_catalog.inc.php:53
+#: ../../templates/show_stats.inc.php:72
+#: ../../templates/show_catalogs.inc.php:42
+#: ../../templates/show_catalogs.inc.php:66
 msgid "Path"
 msgstr "パス"
 
-#: ../../templates/show_add_catalog.inc.php:65
+#: ../../templates/show_add_catalog.inc.php:60
 msgid "Local"
 msgstr "ローカル"
 
-#: ../../templates/show_add_catalog.inc.php:66
+#: ../../templates/show_add_catalog.inc.php:61
 msgid "Remote"
 msgstr "リモート"
 
-#: ../../templates/show_add_catalog.inc.php:71
+#: ../../templates/show_add_catalog.inc.php:66
 msgid "Remote Catalog Username"
 msgstr "リモートカタログのユーザ名"
 
-#: ../../templates/show_add_catalog.inc.php:75
+#: ../../templates/show_add_catalog.inc.php:70
 msgid "Remote Catalog Password"
 msgstr "リモートカタログのパスワード"
 
-#: ../../templates/show_add_catalog.inc.php:79
+#: ../../templates/show_add_catalog.inc.php:74
 msgid "Filename Pattern"
 msgstr "ファイル名のパターン"
 
-#: ../../templates/show_add_catalog.inc.php:93
+#: ../../templates/show_add_catalog.inc.php:88
 msgid "Build Playlists from m3u Files"
 msgstr "m3uファイルからプレイリストを構築"
 
-#: ../../templates/show_add_catalog.inc.php:100
+#: ../../templates/show_add_catalog.inc.php:95
 msgid "Add Catalog"
 msgstr "カタログを追加"
 
-#: ../../templates/show_add_shout.inc.php:35
+#: ../../templates/show_add_shout.inc.php:30
 msgid "Post to Shoutbox"
 msgstr "シャウトボックスへ投稿"
 
-#: ../../templates/show_add_shout.inc.php:39
-#: ../../templates/show_edit_shout.inc.php:43
+#: ../../templates/show_add_shout.inc.php:34
+#: ../../templates/show_edit_shout.inc.php:38
 msgid "Comment:"
 msgstr "コメント:"
 
-#: ../../templates/show_add_shout.inc.php:46
-#: ../../templates/show_edit_shout.inc.php:49
+#: ../../templates/show_add_shout.inc.php:41
+#: ../../templates/show_edit_shout.inc.php:44
 msgid "Make Sticky"
 msgstr "スティッキーにする"
 
-#: ../../templates/show_add_shout.inc.php:54
-#: ../../templates/show_add_playlist.inc.php:53
+#: ../../templates/show_add_shout.inc.php:49
+#: ../../templates/show_add_playlist.inc.php:48
 msgid "Create"
 msgstr "作成"
 
-#: ../../templates/show_localplay_add_instance.inc.php:35
+#: ../../templates/show_localplay_add_instance.inc.php:30
 msgid "Add Localplay Instance"
 msgstr "ローカル再生インスタンス追加"
 
-#: ../../templates/show_recently_played.inc.php:50
-#: ../../templates/show_recently_played.inc.php:113
-#: ../../templates/show_duplicates.inc.php:50
-#: ../../templates/show_duplicates.inc.php:89
-#: ../../templates/show_now_playing_row.inc.php:66
-#: ../../templates/show_lyrics_song.inc.php:54
+#: ../../templates/show_recently_played.inc.php:45
+#: ../../templates/show_recently_played.inc.php:108
+#: ../../templates/show_duplicates.inc.php:45
+#: ../../templates/show_duplicates.inc.php:84
+#: ../../templates/show_now_playing_row.inc.php:61
+#: ../../templates/show_lyrics_song.inc.php:49
 msgid "Song"
 msgstr "曲"
 
-#: ../../templates/show_recently_played.inc.php:53
-#: ../../templates/show_recently_played.inc.php:112
-#: ../../templates/show_users.inc.php:51 ../../templates/show_users.inc.php:73
-#: ../../templates/show_edit_user.inc.php:44
-#: ../../templates/show_login_form.inc.php:71
-#: ../../templates/show_now_playing_row.inc.php:41
-#: ../../templates/show_install_account.inc.php:50
-#: ../../templates/show_user_registration.inc.php:81
-#: ../../templates/show_add_user.inc.php:41
+#: ../../templates/show_recently_played.inc.php:48
+#: ../../templates/show_recently_played.inc.php:107
+#: ../../templates/show_users.inc.php:46 ../../templates/show_users.inc.php:68
+#: ../../templates/show_edit_user.inc.php:39
+#: ../../templates/show_login_form.inc.php:66
+#: ../../templates/show_now_playing_row.inc.php:36
+#: ../../templates/show_install_account.inc.php:45
+#: ../../templates/show_user_registration.inc.php:76
+#: ../../templates/show_add_user.inc.php:36
 msgid "Username"
 msgstr "ユーザ名"
 
-#: ../../templates/show_recently_played.inc.php:54
-#: ../../templates/show_recently_played.inc.php:116
+#: ../../templates/show_recently_played.inc.php:49
+#: ../../templates/show_recently_played.inc.php:111
 msgid "Last Played"
 msgstr "最後に再生した"
 
-#: ../../templates/show_localplay_controllers.inc.php:46
-#: ../../templates/show_localplay_controllers.inc.php:77
-#: ../../templates/show_plugins.inc.php:46
-#: ../../templates/show_plugins.inc.php:83
+#: ../../templates/show_localplay_controllers.inc.php:41
+#: ../../templates/show_localplay_controllers.inc.php:72
+#: ../../templates/show_plugins.inc.php:41
+#: ../../templates/show_plugins.inc.php:78
 msgid "Description"
 msgstr "説明"
 
-#: ../../templates/show_localplay_controllers.inc.php:47
-#: ../../templates/show_localplay_controllers.inc.php:78
-#: ../../templates/show_plugins.inc.php:47
-#: ../../templates/show_plugins.inc.php:84
+#: ../../templates/show_localplay_controllers.inc.php:42
+#: ../../templates/show_localplay_controllers.inc.php:73
+#: ../../templates/show_plugins.inc.php:42
+#: ../../templates/show_plugins.inc.php:79
 msgid "Version"
 msgstr "バージョン"
 
-#: ../../templates/show_localplay_controllers.inc.php:61
-#: ../../templates/show_plugins.inc.php:57
+#: ../../templates/show_localplay_controllers.inc.php:56
+#: ../../templates/show_plugins.inc.php:52
 msgid "Activate"
 msgstr "アクティベート"
 
-#: ../../templates/show_playlist_title.inc.php:36
+#: ../../templates/show_playlist_title.inc.php:31
 #, php-format
 msgid "%s %s (Playlist)"
 msgstr "%s %s (プレイリスト)"
 
-#: ../../templates/show_random_rules.inc.php:35
-msgid "Rules"
-msgstr "ルール"
-
-#: ../../templates/show_random_rules.inc.php:45
-#: ../../templates/show_dynamic.inc.php:44
-msgid "Field"
-msgstr "フィールド"
-
-#: ../../templates/show_stats.inc.php:41
+#: ../../templates/show_stats.inc.php:36
 msgid "Connected Users"
 msgstr "接続したユーザ"
 
-#: ../../templates/show_stats.inc.php:42
+#: ../../templates/show_stats.inc.php:37
 msgid "Total Users"
 msgstr "合計ユーザ数"
 
-#: ../../templates/show_stats.inc.php:46 ../../templates/show_stats.inc.php:82
-msgid "Video"
-msgstr "動画"
-
-#: ../../templates/show_stats.inc.php:48 ../../templates/show_stats.inc.php:83
+#: ../../templates/show_stats.inc.php:43 ../../templates/show_stats.inc.php:78
 msgid "Catalog Size"
 msgstr "カタログサイズ"
 
-#: ../../templates/show_stats.inc.php:49
+#: ../../templates/show_stats.inc.php:44
 msgid "Catalog Time"
 msgstr "カタログ時間"
 
-#: ../../templates/show_stats.inc.php:78
-#: ../../templates/show_catalogs.inc.php:48
-#: ../../templates/show_catalogs.inc.php:72
+#: ../../templates/show_stats.inc.php:73
+#: ../../templates/show_catalogs.inc.php:43
+#: ../../templates/show_catalogs.inc.php:67
 msgid "Last Verify"
 msgstr "最終確認"
 
-#: ../../templates/show_stats.inc.php:79
-#: ../../templates/show_catalogs.inc.php:49
-#: ../../templates/show_catalogs.inc.php:73
+#: ../../templates/show_stats.inc.php:74
+#: ../../templates/show_catalogs.inc.php:44
+#: ../../templates/show_catalogs.inc.php:68
 msgid "Last Add"
 msgstr "最終追加"
 
-#: ../../templates/show_stats.inc.php:80
-#: ../../templates/show_catalogs.inc.php:50
-#: ../../templates/show_catalogs.inc.php:74
+#: ../../templates/show_stats.inc.php:75
+#: ../../templates/show_catalogs.inc.php:45
+#: ../../templates/show_catalogs.inc.php:69
 msgid "Last Clean"
 msgstr "最終クリーン"
 
-#: ../../templates/show_install.inc.php:38
-#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_account.inc.php:38
+#: ../../templates/show_install.inc.php:33
+#: ../../templates/show_install_config.inc.php:33
+#: ../../templates/show_install_account.inc.php:33
 msgid "Step 1 - Create the Ampache database"
 msgstr "ステップ1 - Ampacheデータベースの作成"
 
-#: ../../templates/show_install.inc.php:40
+#: ../../templates/show_install.inc.php:35
 msgid ""
 "This step creates and inserts the Ampache database, so please provide a "
 "MySQL account with database creation rights. This step may take some time on "
@@ -2492,105 +2598,105 @@ msgstr ""
 "にAmpacheデータベースを作成します。マシンの速度によってこのステップはしばらく"
 "時間がかかるかもしれません。"
 
-#: ../../templates/show_install.inc.php:42
-#: ../../templates/show_install_config.inc.php:39
-#: ../../templates/show_install_account.inc.php:39
+#: ../../templates/show_install.inc.php:37
+#: ../../templates/show_install_config.inc.php:34
+#: ../../templates/show_install_account.inc.php:34
 msgid "Step 2 - Create ampache.cfg.php"
 msgstr "ステップ2 - ampache.cfg.phpの作成"
 
-#: ../../templates/show_install.inc.php:43
-#: ../../templates/show_install_config.inc.php:43
-#: ../../templates/show_install_account.inc.php:40
+#: ../../templates/show_install.inc.php:38
+#: ../../templates/show_install_config.inc.php:38
+#: ../../templates/show_install_account.inc.php:35
 msgid "Step 3 - Set up the initial account"
 msgstr "ステップ3 - 初期アカウントのセットアップ"
 
-#: ../../templates/show_install.inc.php:47
+#: ../../templates/show_install.inc.php:42
 msgid "Insert Ampache Database"
 msgstr "Ampacheデータベースの挿入"
 
-#: ../../templates/show_install.inc.php:51
+#: ../../templates/show_install.inc.php:46
 msgid "Desired Database Name"
 msgstr "希望するデータベース名"
 
-#: ../../templates/show_install.inc.php:55
-#: ../../templates/show_install_config.inc.php:60
+#: ../../templates/show_install.inc.php:50
+#: ../../templates/show_install_config.inc.php:55
 msgid "MySQL Hostname"
 msgstr "MySQLのホスト名"
 
-#: ../../templates/show_install.inc.php:59
+#: ../../templates/show_install.inc.php:54
 msgid "MySQL Administrative Username"
 msgstr "MySQL管理ユーザ名"
 
-#: ../../templates/show_install.inc.php:63
+#: ../../templates/show_install.inc.php:58
 msgid "MySQL Administrative Password"
 msgstr "MySQL管理パスワード"
 
-#: ../../templates/show_install.inc.php:67
+#: ../../templates/show_install.inc.php:62
 msgid "Create Database User for New Database"
 msgstr "新規データベースのユーザ作成"
 
-#: ../../templates/show_install.inc.php:71
+#: ../../templates/show_install.inc.php:66
 msgid "Ampache Database Username"
 msgstr "Ampacheデータベースユーザ名"
 
-#: ../../templates/show_install.inc.php:75
+#: ../../templates/show_install.inc.php:70
 msgid "Ampache Database User Password"
 msgstr "Ampacheデータベースユーザパスワード"
 
-#: ../../templates/show_install.inc.php:79
+#: ../../templates/show_install.inc.php:74
 msgid "Overwrite Existing"
 msgstr "既存を上書き"
 
-#: ../../templates/show_install.inc.php:83
+#: ../../templates/show_install.inc.php:78
 msgid "Use Existing Database"
 msgstr "既存のデータベースを使用する"
 
-#: ../../templates/show_install.inc.php:88
+#: ../../templates/show_install.inc.php:83
 msgid "Insert Database"
 msgstr "データベース挿入"
 
-#: ../../templates/show_newest.inc.php:35
-#: ../../templates/sidebar_home.inc.php:83
-#: ../../templates/show_popular.inc.php:35
+#: ../../templates/show_newest.inc.php:30
+#: ../../templates/sidebar_home.inc.php:79
+#: ../../templates/show_popular.inc.php:30
 msgid "Information"
 msgstr "情報"
 
-#: ../../templates/sidebar_modules.inc.php:37
-#: ../../templates/sidebar.inc.php:42
+#: ../../templates/sidebar_modules.inc.php:32
+#: ../../templates/sidebar.inc.php:37
 msgid "Modules"
 msgstr "モジュール"
 
-#: ../../templates/sidebar_modules.inc.php:39
+#: ../../templates/sidebar_modules.inc.php:34
 msgid "Localplay Modules"
 msgstr "ローカル再生モジュール"
 
-#: ../../templates/sidebar_modules.inc.php:40
+#: ../../templates/sidebar_modules.inc.php:35
 msgid "Available Plugins"
 msgstr "有効なプラグイン"
 
-#: ../../templates/sidebar_modules.inc.php:45
-#: ../../templates/show_duplicate.inc.php:35
-#: ../../templates/show_duplicate.inc.php:54
+#: ../../templates/sidebar_modules.inc.php:40
+#: ../../templates/show_duplicate.inc.php:30
+#: ../../templates/show_duplicate.inc.php:49
 msgid "Find Duplicates"
 msgstr "重複を見つける"
 
-#: ../../templates/sidebar_modules.inc.php:46
+#: ../../templates/sidebar_modules.inc.php:41
 msgid "Mail Users"
 msgstr "ユーザへメール"
 
-#: ../../templates/sidebar_modules.inc.php:47
+#: ../../templates/sidebar_modules.inc.php:42
 msgid "Manage Flagged"
 msgstr "フラグ済みの管理"
 
-#: ../../templates/sidebar_modules.inc.php:48
+#: ../../templates/sidebar_modules.inc.php:43
 msgid "Show Disabled"
 msgstr "表示の無効"
 
-#: ../../templates/sidebar_modules.inc.php:55
+#: ../../templates/sidebar_modules.inc.php:50
 msgid "Manage Playlist"
 msgstr "プレイリストの管理"
 
-#: ../../templates/show_install_config.inc.php:41
+#: ../../templates/show_install_config.inc.php:36
 #, php-format
 msgid ""
 "This step takes the basic config values and generates the config file. It "
@@ -2601,215 +2707,216 @@ msgstr ""
 "す。それはコンフィグファイルをダウンロードするように促されます。ダウンロード"
 "したコンフィグファイルを%sへ置いてください。"
 
-#: ../../templates/show_install_config.inc.php:47
+#: ../../templates/show_install_config.inc.php:42
 msgid "Generate Config File"
 msgstr "設定ファイルの生成"
 
-#: ../../templates/show_install_config.inc.php:52
-#: ../../templates/show_test.inc.php:235
+#: ../../templates/show_install_config.inc.php:47
+#: ../../templates/show_test.inc.php:248
 msgid "Web Path"
 msgstr "Webパス"
 
-#: ../../templates/show_install_config.inc.php:56
+#: ../../templates/show_install_config.inc.php:51
 msgid "Database Name"
 msgstr "データベース名"
 
-#: ../../templates/show_install_config.inc.php:64
+#: ../../templates/show_install_config.inc.php:59
 msgid "MySQL Username"
 msgstr "MySQLのユーザ名"
 
-#: ../../templates/show_install_config.inc.php:68
+#: ../../templates/show_install_config.inc.php:63
 msgid "MySQL Password"
 msgstr "MySQLのパスワード"
 
-#: ../../templates/show_install_config.inc.php:74
-msgid "Write Config"
-msgstr "コンフィグの書込み"
+#: ../../templates/show_install_config.inc.php:70
+#, fuzzy
+msgid "Write"
+msgstr "読取/書込"
 
-#: ../../templates/show_install_config.inc.php:84
+#: ../../templates/show_install_config.inc.php:80
 msgid "ampache.cfg.php exists?"
 msgstr "Ampache.cfg.phpはありますか？"
 
-#: ../../templates/show_install_config.inc.php:99
+#: ../../templates/show_install_config.inc.php:95
 msgid "ampache.cfg.php configured?"
 msgstr "Ampache.cfg.phpは設定されていますか？"
 
-#: ../../templates/show_install_config.inc.php:118
+#: ../../templates/show_install_config.inc.php:114
 msgid "Recheck Config"
 msgstr "コンフィグの再チェック"
 
-#: ../../templates/show_install_config.inc.php:124
+#: ../../templates/show_install_config.inc.php:120
 msgid "Continue to Step 3"
 msgstr "ステップ3へ続ける"
 
-#: ../../templates/show_debug.inc.php:35
+#: ../../templates/show_debug.inc.php:30
 msgid "Debug Tools"
 msgstr "デバッグツール"
 
-#: ../../templates/show_debug.inc.php:39 ../../templates/show_debug.inc.php:40
+#: ../../templates/show_debug.inc.php:34 ../../templates/show_debug.inc.php:35
 msgid "Generate Configuration"
 msgstr "設定を生成"
 
-#: ../../templates/show_debug.inc.php:43 ../../templates/show_debug.inc.php:44
+#: ../../templates/show_debug.inc.php:38 ../../templates/show_debug.inc.php:39
 msgid "Set Database Charset"
 msgstr "データベースCharsetをセット"
 
-#: ../../templates/show_debug.inc.php:49
+#: ../../templates/show_debug.inc.php:44
 msgid "PHP Settings"
 msgstr "PHP設定"
 
-#: ../../templates/show_debug.inc.php:56
+#: ../../templates/show_debug.inc.php:51
 msgid "Setting"
 msgstr "設定"
 
-#: ../../templates/show_debug.inc.php:60
+#: ../../templates/show_debug.inc.php:55
 msgid "Memory Limit"
 msgstr "メモリ制限"
 
-#: ../../templates/show_debug.inc.php:64
+#: ../../templates/show_debug.inc.php:59
 msgid "Maximum Execution Time"
 msgstr "最大実行時間"
 
-#: ../../templates/show_debug.inc.php:68
+#: ../../templates/show_debug.inc.php:63
 msgid "Override Execution Time"
 msgstr "オーバーライド実行時間"
 
-#: ../../templates/show_debug.inc.php:69
+#: ../../templates/show_debug.inc.php:64
 msgid "Failed"
 msgstr "失敗"
 
-#: ../../templates/show_debug.inc.php:69
+#: ../../templates/show_debug.inc.php:64
 msgid "Succeeded"
 msgstr "成功"
 
-#: ../../templates/show_debug.inc.php:72
+#: ../../templates/show_debug.inc.php:67
 msgid "Safe Mode"
 msgstr "セーフモード"
 
-#: ../../templates/show_debug.inc.php:80
+#: ../../templates/show_debug.inc.php:75
 msgid "Zlib Support"
 msgstr "Zlibサポート"
 
-#: ../../templates/show_debug.inc.php:84
+#: ../../templates/show_debug.inc.php:79
 msgid "GD Support"
 msgstr "GDサポート"
 
-#: ../../templates/show_debug.inc.php:88
+#: ../../templates/show_debug.inc.php:83
 msgid "Iconv Support"
 msgstr "Iconvサポート"
 
-#: ../../templates/show_debug.inc.php:92
+#: ../../templates/show_debug.inc.php:87
 msgid "Gettext Support"
 msgstr "Gettextサポート"
 
-#: ../../templates/show_debug.inc.php:98
+#: ../../templates/show_debug.inc.php:93
 msgid "Current Configuration"
 msgstr "現在の設定"
 
-#: ../../templates/show_add_access.inc.php:35
-#: ../../templates/show_access_list.inc.php:55
-#: ../../templates/show_access_list.inc.php:56
+#: ../../templates/show_add_access.inc.php:30
+#: ../../templates/show_access_list.inc.php:50
+#: ../../templates/show_access_list.inc.php:51
 msgid "Advanced Add"
 msgstr "高度を追加"
 
-#: ../../templates/show_add_access.inc.php:62
-#: ../../templates/show_edit_access.inc.php:43
+#: ../../templates/show_add_access.inc.php:57
+#: ../../templates/show_edit_access.inc.php:38
 msgid "ACL Type"
 msgstr "ACLタイプ"
 
-#: ../../templates/show_add_access.inc.php:68
-#: ../../templates/show_edit_access.inc.php:50
-#: ../../templates/show_add_access_rpc.inc.php:64
-#: ../../templates/show_add_access_rpc.inc.php:65
-#: ../../templates/show_add_access_rpc.inc.php:66
+#: ../../templates/show_add_access.inc.php:63
+#: ../../templates/show_edit_access.inc.php:45
+#: ../../templates/show_add_access_rpc.inc.php:59
+#: ../../templates/show_add_access_rpc.inc.php:60
+#: ../../templates/show_add_access_rpc.inc.php:61
 msgid "RPC"
 msgstr "RPC"
 
+#: ../../templates/show_add_access.inc.php:83
+#: ../../templates/show_edit_access.inc.php:56
+#: ../../templates/show_add_access_rpc.inc.php:80
+#: ../../templates/show_add_access_local.inc.php:80
+msgid "Start"
+msgstr "開始"
+
 #: ../../templates/show_add_access.inc.php:88
 #: ../../templates/show_edit_access.inc.php:61
 #: ../../templates/show_add_access_rpc.inc.php:85
 #: ../../templates/show_add_access_local.inc.php:85
-msgid "Start"
-msgstr "開始"
-
-#: ../../templates/show_add_access.inc.php:93
-#: ../../templates/show_edit_access.inc.php:66
-#: ../../templates/show_add_access_rpc.inc.php:90
-#: ../../templates/show_add_access_local.inc.php:90
 msgid "End"
 msgstr "終了"
 
-#: ../../templates/show_flag_row.inc.php:43
+#: ../../templates/show_flag_row.inc.php:38
 msgid "Reject"
 msgstr "拒否"
 
-#: ../../templates/show_edit_shout.inc.php:35
+#: ../../templates/show_edit_shout.inc.php:30
 msgid "Edit existing Shoutbox Post"
 msgstr "既存のシャウトボックス投稿を編集"
 
 #. HINT: Client link, Object link
-#: ../../templates/show_edit_shout.inc.php:40
+#: ../../templates/show_edit_shout.inc.php:35
 #, php-format
 msgid "Created by: %s for %s"
 msgstr "作成: %sの%s"
 
-#: ../../templates/show_edit_shout.inc.php:53
-#: ../../templates/show_create_democratic.inc.php:72
-#: ../../templates/show_catalog_row.inc.php:45
-#: ../../templates/show_edit_access.inc.php:97
-#: ../../templates/show_manage_catalogs.inc.php:55
-#: ../../templates/show_preference_admin.inc.php:68
+#: ../../templates/show_edit_shout.inc.php:48
+#: ../../templates/show_create_democratic.inc.php:67
+#: ../../templates/show_catalog_row.inc.php:40
+#: ../../templates/show_edit_access.inc.php:92
+#: ../../templates/show_manage_catalogs.inc.php:50
+#: ../../templates/show_preference_admin.inc.php:63
 msgid "Update"
 msgstr "更新"
 
-#: ../../templates/show_create_democratic.inc.php:34
-#: ../../templates/show_democratic.inc.php:47
-#: ../../templates/show_democratic.inc.php:48
+#: ../../templates/show_create_democratic.inc.php:29
+#: ../../templates/show_democratic.inc.php:42
+#: ../../templates/show_democratic.inc.php:43
 msgid "Configure Democratic Playlist"
 msgstr "デモクラティックプレイリスト設定"
 
-#: ../../templates/show_create_democratic.inc.php:42
-#: ../../templates/show_manage_democratic.inc.php:47
+#: ../../templates/show_create_democratic.inc.php:37
+#: ../../templates/show_manage_democratic.inc.php:42
 msgid "Base Playlist"
 msgstr "基となるプレイリスト"
 
-#: ../../templates/show_create_democratic.inc.php:46
+#: ../../templates/show_create_democratic.inc.php:41
 msgid "Cooldown Time"
 msgstr "クールダウン時間"
 
-#: ../../templates/show_create_democratic.inc.php:61
+#: ../../templates/show_create_democratic.inc.php:56
 msgid "Make Default"
 msgstr "デフォルトにする"
 
-#: ../../templates/show_create_democratic.inc.php:66
+#: ../../templates/show_create_democratic.inc.php:61
 msgid "Force Democratic Play"
 msgstr "強制デモクラティック再生"
 
-#: ../../templates/show_test.inc.php:44
-#: ../../templates/show_test_config.inc.php:52
-#: ../../templates/sidebar_admin.inc.php:57
+#: ../../templates/show_test.inc.php:39
+#: ../../templates/show_test_config.inc.php:47
+#: ../../templates/sidebar_admin.inc.php:52
 msgid "Ampache Debug"
 msgstr "Ampacheデバッグ"
 
-#: ../../templates/show_test.inc.php:45
+#: ../../templates/show_test.inc.php:40
 msgid ""
 "You've reached this page because a configuration error has occured. Debug "
 "Information below"
 msgstr "設定エラーが発生したためこのページを表示します。以下はデバッグ情報です"
 
-#: ../../templates/show_test.inc.php:50 ../../templates/show_info.inc.php:50
+#: ../../templates/show_test.inc.php:45 ../../templates/show_info.inc.php:46
 msgid "CHECK"
 msgstr "チェック"
 
-#: ../../templates/show_test.inc.php:52 ../../templates/show_info.inc.php:52
+#: ../../templates/show_test.inc.php:47 ../../templates/show_info.inc.php:48
 msgid "STATUS"
 msgstr "ステータス"
 
-#: ../../templates/show_test.inc.php:54 ../../templates/show_info.inc.php:54
+#: ../../templates/show_test.inc.php:49 ../../templates/show_info.inc.php:50
 msgid "DESCRIPTION"
 msgstr "説明"
 
-#: ../../templates/show_test.inc.php:72
+#: ../../templates/show_test.inc.php:67
 msgid ""
 "This tests to make sure that you are running a version of PHP that is known "
 "to work with Ampache."
@@ -2817,11 +2924,11 @@ msgstr ""
 "これはAmpacheで働くと知られているPHPのバージョンを実行していることを確かめる"
 "ためにテストします。"
 
-#: ../../templates/show_test.inc.php:77
+#: ../../templates/show_test.inc.php:72
 msgid "Mysql for PHP"
 msgstr "PHPのMysql"
 
-#: ../../templates/show_test.inc.php:90
+#: ../../templates/show_test.inc.php:85
 msgid ""
 "This test checks to see if you have the mysql extensions loaded for PHP. "
 "These are required for Ampache to work."
@@ -2829,7 +2936,7 @@ msgstr ""
 "このテストは、PHPのためにあなたがmysql拡張をロードするかチェックします。これ"
 "らはAmpacheが働くために要求されます。"
 
-#: ../../templates/show_test.inc.php:107
+#: ../../templates/show_test.inc.php:102
 msgid ""
 "This test checks to make sure that you have PHP session support enabled. "
 "Sessions are required for Ampache to work."
@@ -2837,11 +2944,11 @@ msgstr ""
 "このテストはPHPセッションのサポートを可能にすることを確かめるためにチェックし"
 "ます。セッションは、Ampacheが働くことを必要とされます。"
 
-#: ../../templates/show_test.inc.php:111
+#: ../../templates/show_test.inc.php:106
 msgid "PHP ICONV Support"
 msgstr "PHP ICONVサポート"
 
-#: ../../templates/show_test.inc.php:123
+#: ../../templates/show_test.inc.php:118
 msgid ""
 "This test checks to make sure you have Iconv support installed. Iconv "
 "support is required for Ampache"
@@ -2849,7 +2956,7 @@ msgstr ""
 "このテストはIconvのサポートをインストールすることを確かめるためにチェックしま"
 "す。IconvのサポートはAmpacheのために必要になります。"
 
-#: ../../templates/show_test.inc.php:139
+#: ../../templates/show_test.inc.php:134
 msgid ""
 "This test makes sure you have PCRE support compiled into your version of "
 "PHP, this is required for Ampache."
@@ -2857,21 +2964,39 @@ msgstr ""
 "このテストは、あなたがPHPのバージョンへPCREのサポートをコンパイルすることを確"
 "かめます。これはAmpacheに必要です。"
 
-#: ../../templates/show_test.inc.php:143
-msgid "PHP PutENV Support"
-msgstr "PHP PutENVサポート"
-
-#: ../../templates/show_test.inc.php:155
+#: ../../templates/show_test.inc.php:150
+#, fuzzy
 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 "
-"some features of ampache may not work correctly"
+"This test makes sure that PHP isn't running in safe mode.  Some features of "
+"Ampache may not work correctly in safe mode."
 msgstr ""
 "このテストは、PHPがSafeModeの中で走っておらず、私たちがメモリ範囲を修正するこ"
 "とができることを確かめます。ampacheのいくつかの機能が正確に動かさないかもしれ"
 "ない一方で、機能なしでは要求されないかもしれません"
 
-#: ../../templates/show_test.inc.php:172
+#: ../../templates/show_test.inc.php:154
+#, fuzzy
+msgid "Override Memory Limit"
+msgstr "メモリ制限"
+
+#: ../../templates/show_test.inc.php:159
+msgid ""
+"This tests whether Ampache can override the memory limit.  This is not "
+"strictly necessary, but may result in a better experience."
+msgstr ""
+
+#: ../../templates/show_test.inc.php:163
+#, fuzzy
+msgid "Override Execution Limit"
+msgstr "オーバーライド実行時間"
+
+#: ../../templates/show_test.inc.php:168
+msgid ""
+"This tests whether Ampache can override the limit on maximum execution "
+"time.  This is not strictly necessary, but may result in a better experience."
+msgstr ""
+
+#: ../../templates/show_test.inc.php:185
 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"
@@ -2881,11 +3006,11 @@ msgstr ""
 "むことを試みます、正確な位置あるいはそれにない、あなたのウェブサーバによって"
 "現在判読可能でありません。"
 
-#: ../../templates/show_test.inc.php:178
+#: ../../templates/show_test.inc.php:191
 msgid "Ampache.cfg.php Configured?"
 msgstr "Ampache.cfg.phpは設定されていますか？"
 
-#: ../../templates/show_test.inc.php:194
+#: ../../templates/show_test.inc.php:207
 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"
@@ -2893,11 +3018,11 @@ msgstr ""
 "このテストは、あなたが要求された配置変数をすべてセットしており、私たちが"
 "configファイルを完全に解析することができることを確かめます。"
 
-#: ../../templates/show_test.inc.php:198
+#: ../../templates/show_test.inc.php:211
 msgid "DB Connection"
 msgstr "DB接続"
 
-#: ../../templates/show_test.inc.php:212
+#: ../../templates/show_test.inc.php:225
 msgid ""
 "This attempts to connect to your database using the values from your ampache."
 "cfg.php"
@@ -2905,11 +3030,11 @@ msgstr ""
 "これは、あなたのampache.cfg.phpからの値を使用して、あなたのデータベースに接続"
 "することを試みます。"
 
-#: ../../templates/show_test.inc.php:216
+#: ../../templates/show_test.inc.php:229
 msgid "DB Inserted"
 msgstr "DB挿入済"
 
-#: ../../templates/show_test.inc.php:230
+#: ../../templates/show_test.inc.php:243
 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"
@@ -2917,7 +3042,7 @@ msgstr ""
 "これはAmpacheのデータベース挿入が成功することとユーザがデータベースへアクセス"
 "できることを確実にするためにいくつかのキーテーブルをチェックします"
 
-#: ../../templates/show_test.inc.php:259
+#: ../../templates/show_test.inc.php:272
 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 "
@@ -2927,502 +3052,514 @@ msgstr ""
 "とが出来ることを確実にします。ここでチェックマークが見れない場合、web_pathが"
 "正しく設定されていないかもしれません。"
 
-#: ../../templates/show_object_rating.inc.php:47
-#: ../../templates/show_object_rating_static.inc.php:47
+#: ../../templates/show_object_rating.inc.php:42
+#: ../../templates/show_object_rating_static.inc.php:42
 msgid "Current rating: "
 msgstr "現在の評価:"
 
-#: ../../templates/show_object_rating.inc.php:49
-#: ../../templates/show_object_rating_static.inc.php:49
+#: ../../templates/show_object_rating.inc.php:44
+#: ../../templates/show_object_rating_static.inc.php:44
 msgid "not rated yet"
 msgstr "まだ評価されていません"
 
-#: ../../templates/show_object_rating.inc.php:51
-#: ../../templates/show_object_rating_static.inc.php:51
+#: ../../templates/show_object_rating.inc.php:46
+#: ../../templates/show_object_rating_static.inc.php:46
 #, php-format
 msgid "%s of 5"
 msgstr "5点中%s点"
 
 #. HINT: Artist Name
-#: ../../templates/show_rename_artist.inc.php:41
+#: ../../templates/show_rename_artist.inc.php:36
 #, php-format
 msgid "Rename %s"
 msgstr "%sをリネーム"
 
-#: ../../templates/show_rename_artist.inc.php:47
+#: ../../templates/show_rename_artist.inc.php:42
 msgid "Insert current"
 msgstr "現在に挿入"
 
-#: ../../templates/show_rename_artist.inc.php:49
+#: ../../templates/show_rename_artist.inc.php:44
 msgid "Update id3 tags"
 msgstr "ID3タグの更新"
 
-#: ../../templates/show_rename_artist.inc.php:50
+#: ../../templates/show_rename_artist.inc.php:45
 msgid "Rename"
 msgstr "リネーム"
 
-#: ../../templates/sidebar_home.inc.php:37
+#: ../../templates/sidebar_home.inc.php:32
 msgid "Browse"
 msgstr "閲覧"
 
-#: ../../templates/sidebar_home.inc.php:46
+#: ../../templates/sidebar_home.inc.php:41
 msgid "Song Titles"
 msgstr "曲タイトル"
 
-#: ../../templates/sidebar_home.inc.php:59
+#: ../../templates/sidebar_home.inc.php:55
 msgid "Currently Playing"
 msgstr "現在再生中のもの"
 
-#: ../../templates/sidebar_home.inc.php:72
+#: ../../templates/sidebar_home.inc.php:68
 msgid "Import"
 msgstr "インポート"
 
-#: ../../templates/sidebar_home.inc.php:80
+#: ../../templates/sidebar_home.inc.php:76
 msgid "Advanced"
 msgstr "高度"
 
-#: ../../templates/sidebar_home.inc.php:86
+#: ../../templates/sidebar_home.inc.php:82
 msgid "Newest"
 msgstr "最新"
 
-#: ../../templates/sidebar_home.inc.php:87
+#: ../../templates/sidebar_home.inc.php:83
 msgid "Popular"
 msgstr "ポピュラー"
 
-#: ../../templates/show_user_activate.inc.php:41
-#: ../../templates/show_user_activate.inc.php:48
-#: ../../templates/show_registration_confirmation.inc.php:41
-#: ../../templates/show_user_registration.inc.php:41
-#: ../../templates/show_user_registration.inc.php:53
+#: ../../templates/show_user_activate.inc.php:36
+#: ../../templates/show_user_activate.inc.php:43
+#: ../../templates/show_registration_confirmation.inc.php:36
+#: ../../templates/show_user_registration.inc.php:36
+#: ../../templates/show_user_registration.inc.php:48
 msgid "Registration"
 msgstr "登録"
 
-#: ../../templates/show_user_activate.inc.php:60
+#: ../../templates/show_user_activate.inc.php:55
 msgid "User Activated"
 msgstr "ユーザアクティベート"
 
 #. HINT: Start A tag, End A tag
-#: ../../templates/show_user_activate.inc.php:64
+#: ../../templates/show_user_activate.inc.php:59
 #, php-format
 msgid "This User ID is activated and can be used %sLogin%s"
 msgstr "このユーザIDはアクティベート済みで%sログイン%sを使用できます"
 
-#: ../../templates/show_user_activate.inc.php:67
+#: ../../templates/show_user_activate.inc.php:62
 msgid "Validation Failed"
 msgstr "確認に失敗しました"
 
-#: ../../templates/show_user_activate.inc.php:68
+#: ../../templates/show_user_activate.inc.php:63
 msgid "The validation key used isn't correct"
 msgstr "使用した確認キーは正しくありません"
 
 #. HINT: Catalog Name
-#: ../../templates/show_clean_catalog.inc.php:36
+#: ../../templates/show_clean_catalog.inc.php:31
 #, php-format
 msgid "Cleaning the %s Catalog"
 msgstr "%sカタログの掃除中"
 
-#: ../../templates/show_clean_catalog.inc.php:38
+#: ../../templates/show_clean_catalog.inc.php:33
 msgid "Checking"
 msgstr "チェック中"
 
-#: ../../templates/show_user.inc.php:42
-#: ../../templates/show_edit_user.inc.php:52
-#: ../../templates/show_user_registration.inc.php:87
-#: ../../templates/show_add_user.inc.php:49
+#: ../../templates/show_user.inc.php:37
+#: ../../templates/show_edit_user.inc.php:47
+#: ../../templates/show_user_registration.inc.php:82
+#: ../../templates/show_add_user.inc.php:44
 msgid "Full Name"
 msgstr "フルネーム"
 
-#: ../../templates/show_user.inc.php:43
+#: ../../templates/show_user.inc.php:38
 msgid "Create Date"
 msgstr "作成日"
 
-#: ../../templates/show_user.inc.php:44 ../../templates/show_users.inc.php:52
-#: ../../templates/show_users.inc.php:74
+#: ../../templates/show_user.inc.php:39 ../../templates/show_users.inc.php:47
+#: ../../templates/show_users.inc.php:69
 msgid "Last Seen"
 msgstr "最終ログイン"
 
-#: ../../templates/show_user.inc.php:45 ../../templates/show_users.inc.php:54
-#: ../../templates/show_users.inc.php:76
+#: ../../templates/show_user.inc.php:40 ../../templates/show_users.inc.php:49
+#: ../../templates/show_users.inc.php:71
 msgid "Activity"
 msgstr "活動"
 
-#: ../../templates/show_user.inc.php:47
+#: ../../templates/show_user.inc.php:42
 msgid "User is Online Now"
 msgstr "ユーザは現在オンラインです"
 
-#: ../../templates/show_user.inc.php:49
+#: ../../templates/show_user.inc.php:44
 msgid "User is Offline Now"
 msgstr "ユーザは現在オフラインです"
 
-#: ../../templates/show_user.inc.php:54
+#: ../../templates/show_user.inc.php:49
 msgid "Active Playlist"
 msgstr "アクティブなプレイリスト"
 
-#: ../../templates/show_artist.inc.php:52
-#: ../../templates/show_artist.inc.php:53
+#: ../../templates/show_artist.inc.php:47
+#: ../../templates/show_artist.inc.php:48
 #, php-format
 msgid "Show All Songs By %s"
 msgstr "%sで全曲を表示"
 
-#: ../../templates/show_artist.inc.php:56
-#: ../../templates/show_artist.inc.php:57
+#: ../../templates/show_artist.inc.php:51
+#: ../../templates/show_artist.inc.php:52
 #, php-format
 msgid "Show Albums By %s"
 msgstr "%sによるアルバムを表示"
 
-#: ../../templates/show_artist.inc.php:63
+#: ../../templates/show_artist.inc.php:58
 #, php-format
 msgid "Add All Songs By %s"
 msgstr "%sで全曲を追加"
 
-#: ../../templates/show_artist.inc.php:68
+#: ../../templates/show_artist.inc.php:63
 #, php-format
 msgid "Add Random Songs By %s"
 msgstr "%sでランダム曲を追加"
 
-#: ../../templates/show_artist.inc.php:72
-#: ../../templates/show_artist.inc.php:73
-#: ../../templates/show_album.inc.php:83 ../../templates/show_album.inc.php:84
+#: ../../templates/show_artist.inc.php:67
+#: ../../templates/show_artist.inc.php:68
+#: ../../templates/show_album.inc.php:78 ../../templates/show_album.inc.php:79
 msgid "Update from tags"
 msgstr "タグから更新"
 
-#: ../../templates/show_live_stream.inc.php:35
+#: ../../templates/show_artist.inc.php:78
+msgid "Show Art"
+msgstr "アート表示"
+
+#: ../../templates/show_live_stream.inc.php:30
 msgid "Manage Radio Stations"
 msgstr "ラジオステーションの管理"
 
-#: ../../templates/show_live_stream.inc.php:39
-#: ../../templates/show_add_live_stream.inc.php:35
+#: ../../templates/show_live_stream.inc.php:34
+#: ../../templates/show_add_live_stream.inc.php:30
 msgid "Add Radio Station"
 msgstr "ラジオステーションの追加"
 
-#: ../../templates/show_get_albumart.inc.php:35
+#: ../../templates/show_get_albumart.inc.php:30
 msgid "Customize Search"
 msgstr "カスタマイズ検索"
 
-#: ../../templates/show_get_albumart.inc.php:56
+#: ../../templates/show_get_albumart.inc.php:51
 msgid "Direct URL to Image"
 msgstr "画像への直接URL"
 
-#: ../../templates/show_get_albumart.inc.php:64
+#: ../../templates/show_get_albumart.inc.php:59
 msgid "Local Image"
 msgstr "ローカル画像"
 
-#: ../../templates/show_get_albumart.inc.php:75
+#: ../../templates/show_get_albumart.inc.php:70
 msgid "Get Art"
 msgstr "アート取得"
 
-#: ../../templates/show_edit_album.inc.php:36
+#: ../../templates/show_edit_album.inc.php:31
 msgid "Edit Album"
 msgstr "アルバム編集"
 
-#: ../../templates/show_edit_album.inc.php:60
+#: ../../templates/show_edit_album.inc.php:55
 msgid "Update Album"
 msgstr "アルバム更新"
 
-#: ../../templates/show_album.inc.php:65
+#: ../../templates/show_album.inc.php:60
 msgid "Add Album"
 msgstr "アルバム追加"
 
-#: ../../templates/show_album.inc.php:69
+#: ../../templates/show_album.inc.php:64
 msgid "Add Random from Album"
 msgstr "アルバムからランダムに追加"
 
-#: ../../templates/show_album.inc.php:73 ../../templates/show_album.inc.php:74
+#: ../../templates/show_album.inc.php:68 ../../templates/show_album.inc.php:69
 msgid "Reset Album Art"
 msgstr "アルバムアートのリセット"
 
-#: ../../templates/show_album.inc.php:78 ../../templates/show_album.inc.php:79
+#: ../../templates/show_album.inc.php:73 ../../templates/show_album.inc.php:74
 msgid "Find Album Art"
 msgstr "アルバムアートを見つける"
 
-#: ../../templates/show_duplicates.inc.php:35
+#: ../../templates/show_duplicates.inc.php:30
 msgid "Duplicate Songs"
 msgstr "重複している曲"
 
-#: ../../templates/show_duplicates.inc.php:55
-#: ../../templates/show_duplicates.inc.php:94
+#: ../../templates/show_duplicates.inc.php:50
+#: ../../templates/show_duplicates.inc.php:89
 msgid "Size"
 msgstr "サイズ"
 
-#: ../../templates/show_live_streams.inc.php:50
-#: ../../templates/show_live_streams.inc.php:72
-#: ../../templates/show_add_live_stream.inc.php:66
-#: ../../templates/show_edit_live_stream_row.inc.php:42
+#: ../../templates/show_live_streams.inc.php:45
+#: ../../templates/show_live_streams.inc.php:67
+#: ../../templates/show_add_live_stream.inc.php:61
+#: ../../templates/show_edit_live_stream_row.inc.php:37
 msgid "Callsign"
 msgstr "コールサイン"
 
-#: ../../templates/show_live_streams.inc.php:51
-#: ../../templates/show_live_streams.inc.php:73
-#: ../../templates/show_add_live_stream.inc.php:60
-#: ../../templates/show_edit_live_stream_row.inc.php:43
+#: ../../templates/show_live_streams.inc.php:46
+#: ../../templates/show_live_streams.inc.php:68
+#: ../../templates/show_add_live_stream.inc.php:55
+#: ../../templates/show_edit_live_stream_row.inc.php:38
 msgid "Frequency"
 msgstr "周波数"
 
-#: ../../templates/show_users.inc.php:51 ../../templates/show_users.inc.php:73
+#: ../../templates/show_users.inc.php:46 ../../templates/show_users.inc.php:68
 msgid "Fullname"
 msgstr "フルネーム"
 
-#: ../../templates/show_users.inc.php:53 ../../templates/show_users.inc.php:75
+#: ../../templates/show_users.inc.php:48 ../../templates/show_users.inc.php:70
 msgid "Registration Date"
 msgstr "登録日"
 
-#: ../../templates/show_users.inc.php:56 ../../templates/show_users.inc.php:78
+#: ../../templates/show_users.inc.php:51 ../../templates/show_users.inc.php:73
 msgid "Last Ip"
 msgstr "最終IP"
 
-#: ../../templates/show_users.inc.php:59 ../../templates/show_users.inc.php:81
+#: ../../templates/show_users.inc.php:54 ../../templates/show_users.inc.php:76
 msgid "On-line"
 msgstr "オンライン"
 
-#: ../../templates/show_run_add_catalog.inc.php:36
-#: ../../templates/show_adds_catalog.inc.php:38
+#: ../../templates/show_run_add_catalog.inc.php:31
+#: ../../templates/show_adds_catalog.inc.php:33
 msgid "Found"
 msgstr "見つかりました"
 
-#: ../../templates/show_edit_user.inc.php:35
+#: ../../templates/show_edit_user.inc.php:30
 msgid "Editing existing User"
 msgstr "既存のユーザを編集"
 
-#: ../../templates/show_edit_user.inc.php:40
+#: ../../templates/show_edit_user.inc.php:35
 msgid "User Properties"
 msgstr "ユーザプロパティ"
 
-#: ../../templates/show_edit_user.inc.php:59
-#: ../../templates/show_account.inc.php:46
-#: ../../templates/show_user_registration.inc.php:93
-#: ../../templates/show_add_user.inc.php:56
+#: ../../templates/show_edit_user.inc.php:54
+#: ../../templates/show_account.inc.php:41
+#: ../../templates/show_user_registration.inc.php:88
+#: ../../templates/show_add_user.inc.php:51
 msgid "E-mail"
 msgstr "メールアドレス"
 
-#: ../../templates/show_edit_user.inc.php:67
-#: ../../templates/show_login_form.inc.php:75
-#: ../../templates/show_install_account.inc.php:54
-#: ../../templates/show_user_registration.inc.php:99
-#: ../../templates/show_add_user.inc.php:64
-#: ../../modules/localplay/httpq.controller.php:241
-#: ../../modules/localplay/mpd.controller.php:259
-#: ../../modules/localplay/vlc.controller.php:241
+#: ../../templates/show_edit_user.inc.php:62
+#: ../../templates/show_login_form.inc.php:70
+#: ../../templates/show_install_account.inc.php:49
+#: ../../templates/show_user_registration.inc.php:94
+#: ../../templates/show_add_user.inc.php:59
+#: ../../modules/localplay/httpq.controller.php:234
+#: ../../modules/localplay/mpd.controller.php:252
+#: ../../modules/localplay/vlc.controller.php:234
 msgid "Password"
 msgstr "パスワード"
 
-#: ../../templates/show_edit_user.inc.php:76
-#: ../../templates/show_account.inc.php:59
-#: ../../templates/show_install_account.inc.php:58
-#: ../../templates/show_user_registration.inc.php:105
-#: ../../templates/show_add_user.inc.php:73
+#: ../../templates/show_edit_user.inc.php:71
+#: ../../templates/show_account.inc.php:54
+#: ../../templates/show_install_account.inc.php:53
+#: ../../templates/show_user_registration.inc.php:100
+#: ../../templates/show_add_user.inc.php:68
 msgid "Confirm Password"
 msgstr "パスワード確認"
 
-#: ../../templates/show_edit_user.inc.php:84
-#: ../../templates/show_add_user.inc.php:81
+#: ../../templates/show_edit_user.inc.php:79
+#: ../../templates/show_add_user.inc.php:76
 msgid "User Access Level"
 msgstr "ユーザアクセスレベル"
 
-#: ../../templates/show_edit_user.inc.php:98
+#: ../../templates/show_edit_user.inc.php:93
 msgid "Other Options"
 msgstr "その他 オプション"
 
-#: ../../templates/show_edit_user.inc.php:101
+#: ../../templates/show_edit_user.inc.php:96
 msgid "Config Preset"
 msgstr "コンフィグプリセット"
 
-#: ../../templates/show_edit_user.inc.php:107
+#: ../../templates/show_edit_user.inc.php:102
 msgid "Flash"
 msgstr "Flash"
 
-#: ../../templates/show_edit_user.inc.php:113
+#: ../../templates/show_edit_user.inc.php:108
 msgid "Prevent Preset Override"
 msgstr "プリセットの上書きを防止します"
 
-#: ../../templates/show_edit_user.inc.php:115
+#: ../../templates/show_edit_user.inc.php:110
 msgid "This Affects all non-Admin accounts"
 msgstr "これは全ての非管理アカウントに影響します"
 
-#: ../../templates/show_edit_user.inc.php:119
-#: ../../templates/show_account.inc.php:65
-#: ../../templates/show_manage_catalogs.inc.php:46
+#: ../../templates/show_edit_user.inc.php:114
+#: ../../templates/show_account.inc.php:60
+#: ../../templates/show_manage_catalogs.inc.php:41
 msgid "Clear Stats"
 msgstr "ステータスをクリア"
 
-#: ../../templates/show_edit_user.inc.php:127
+#: ../../templates/show_edit_user.inc.php:122
 msgid "Update User"
 msgstr "ユーザの更新"
 
-#: ../../templates/show_account.inc.php:52
+#: ../../templates/show_account.inc.php:47
 msgid "New Password"
 msgstr "新規パスワード"
 
-#: ../../templates/show_account.inc.php:75
+#: ../../templates/show_account.inc.php:70
 msgid "Update Account"
 msgstr "アカウント更新"
 
-#: ../../templates/show_add_live_stream.inc.php:46
-#: ../../templates/show_edit_live_stream_row.inc.php:41
+#: ../../templates/show_add_live_stream.inc.php:41
+#: ../../templates/show_edit_live_stream_row.inc.php:36
 msgid "Homepage"
 msgstr "ホームページ"
 
-#: ../../templates/show_add_live_stream.inc.php:53
-#: ../../templates/show_edit_live_stream_row.inc.php:40
+#: ../../templates/show_add_live_stream.inc.php:48
+#: ../../templates/show_edit_live_stream_row.inc.php:35
 msgid "Stream URL"
 msgstr "ストリームURL"
 
-#: ../../templates/show_index.inc.php:44
+#: ../../templates/show_index.inc.php:39
 msgid "Loading..."
 msgstr "読み込み中..."
 
-#: ../../templates/show_playlists.inc.php:47
-#: ../../templates/show_playlists.inc.php:70
+#: ../../templates/show_playlists.inc.php:42
+#: ../../templates/show_playlists.inc.php:65
+#: ../../templates/show_smartplaylists.inc.php:36
+#: ../../templates/show_smartplaylists.inc.php:57
 msgid "Playlist Name"
 msgstr "プレイリスト名"
 
-#: ../../templates/show_playlists.inc.php:49
-#: ../../templates/show_playlists.inc.php:72
+#: ../../templates/show_playlists.inc.php:44
+#: ../../templates/show_playlists.inc.php:67
 msgid "# Songs"
 msgstr "# 曲数"
 
-#: ../../templates/show_playlists.inc.php:50
-#: ../../templates/show_playlists.inc.php:73
+#: ../../templates/show_playlists.inc.php:45
+#: ../../templates/show_playlists.inc.php:68
+#: ../../templates/show_smartplaylists.inc.php:38
+#: ../../templates/show_smartplaylists.inc.php:59
 msgid "Owner"
 msgstr "所有者"
 
-#: ../../templates/show_login_form.inc.php:79
+#: ../../templates/show_login_form.inc.php:74
 msgid "Remember Me"
 msgstr "パスワードを記憶する"
 
-#: ../../templates/show_login_form.inc.php:86
+#: ../../templates/show_login_form.inc.php:81
 msgid "Lost password"
 msgstr "パスワードをなくしました"
 
-#: ../../templates/show_login_form.inc.php:87
+#: ../../templates/show_login_form.inc.php:82
 msgid "Login"
 msgstr "ログイン"
 
-#: ../../templates/show_login_form.inc.php:92
+#: ../../templates/show_login_form.inc.php:87
 msgid "Register"
 msgstr "登録"
 
-#: ../../templates/show_login_form.inc.php:104
+#: ../../templates/show_login_form.inc.php:99
 msgid "Message of the Day"
 msgstr "1日のメッセージ"
 
-#: ../../templates/list_header.inc.php:114
+#: ../../templates/list_header.inc.php:109
 msgid "Prev"
 msgstr "前へ"
 
-#: ../../templates/list_header.inc.php:115
-#: ../../templates/show_localplay_control.inc.php:40
+#: ../../templates/list_header.inc.php:110
+#: ../../templates/show_localplay_control.inc.php:35
 msgid "Next"
 msgstr "次へ"
 
-#: ../../templates/show_install_lang.inc.php:40
+#: ../../templates/show_install_lang.inc.php:35
 msgid "Minimum requirements not met. Unable to install Ampache."
 msgstr "必要最低限の構成を満たしていません。Ampacheをインストールできません。"
 
-#: ../../templates/show_install_lang.inc.php:45
+#: ../../templates/show_install_lang.inc.php:40
 msgid "Choose Installation Language"
 msgstr "インストールする言語を選択してください。"
 
-#: ../../templates/show_install_lang.inc.php:66
+#: ../../templates/show_install_lang.inc.php:61
 msgid "Start configuration"
 msgstr "設定の開始"
 
-#: ../../templates/show_user_stats.inc.php:43
+#: ../../templates/show_user_stats.inc.php:38
 msgid "Favorite Artists"
 msgstr "お気に入りアーティスト"
 
-#: ../../templates/show_user_stats.inc.php:56
+#: ../../templates/show_user_stats.inc.php:51
 msgid "Favorite Albums"
 msgstr "お気に入りアルバム"
 
-#: ../../templates/show_user_stats.inc.php:69
+#: ../../templates/show_user_stats.inc.php:64
 msgid "Favorite Songs"
 msgstr "お気に入りの曲"
 
-#: ../../templates/show_access_list.inc.php:40
-#: ../../templates/sidebar_admin.inc.php:49
+#: ../../templates/show_access_list.inc.php:35
+#: ../../templates/sidebar_admin.inc.php:44
 msgid "Access Control"
 msgstr "アクセスコントロール"
 
-#: ../../templates/show_access_list.inc.php:48
-#: ../../templates/show_access_list.inc.php:49
-#: ../../templates/show_add_access_rpc.inc.php:35
+#: ../../templates/show_access_list.inc.php:43
+#: ../../templates/show_access_list.inc.php:44
+#: ../../templates/show_add_access_rpc.inc.php:30
 msgid "Add API / RPC Host"
 msgstr "API/RPCホストの追加"
 
-#: ../../templates/show_access_list.inc.php:52
-#: ../../templates/show_access_list.inc.php:53
-#: ../../templates/show_add_access_local.inc.php:35
+#: ../../templates/show_access_list.inc.php:47
+#: ../../templates/show_access_list.inc.php:48
+#: ../../templates/show_add_access_local.inc.php:30
 msgid "Add Local Network Definition"
 msgstr "ローカルネットワーク定義の追加"
 
-#: ../../templates/show_access_list.inc.php:62
+#: ../../templates/show_access_list.inc.php:57
 msgid "Access Control Entries"
 msgstr "アクセスコントロールエントリ"
 
-#: ../../templates/show_access_list.inc.php:68
+#: ../../templates/show_access_list.inc.php:63
 msgid "Start Address"
 msgstr "開始アドレス"
 
-#: ../../templates/show_access_list.inc.php:69
+#: ../../templates/show_access_list.inc.php:64
 msgid "End Address"
 msgstr "終了アドレス"
 
-#: ../../templates/show_access_list.inc.php:72
-#: ../../templates/show_add_playlist.inc.php:43
-#: ../../templates/show_add_access_rpc.inc.php:62
-#: ../../templates/show_add_access_local.inc.php:62
-#: ../../templates/show_random.inc.php:73
+#: ../../templates/show_access_list.inc.php:67
+#: ../../templates/show_add_playlist.inc.php:38
+#: ../../templates/show_add_access_rpc.inc.php:57
+#: ../../templates/show_add_access_local.inc.php:57
 msgid "Type"
 msgstr "タイプ"
 
-#: ../../templates/sidebar.inc.php:73
+#: ../../templates/sidebar.inc.php:68
 msgid "Logout"
 msgstr "ログアウト"
 
-#: ../../templates/show_edit_access.inc.php:35
+#: ../../templates/show_edit_access.inc.php:30
 msgid "Edit Access Control List"
 msgstr "アクセスコントロールリストの編集"
 
-#: ../../templates/show_manage_catalogs.inc.php:35
-#: ../../templates/sidebar_admin.inc.php:39
+#: ../../templates/show_manage_catalogs.inc.php:30
+#: ../../templates/sidebar_admin.inc.php:34
 msgid "Show Catalogs"
 msgstr "カタログを表示"
 
-#: ../../templates/show_manage_catalogs.inc.php:41
+#: ../../templates/show_manage_catalogs.inc.php:36
 msgid "Gather All Art"
 msgstr "全アートを収集"
 
 #. HINT: /data/myNewMusic
-#: ../../templates/show_manage_catalogs.inc.php:51
+#: ../../templates/show_manage_catalogs.inc.php:46
 #, php-format
 msgid "Add From %s"
 msgstr "%sから追加"
 
 #. HINT: /data/myUpdatedMusic
-#: ../../templates/show_manage_catalogs.inc.php:53
+#: ../../templates/show_manage_catalogs.inc.php:48
 #, php-format
 msgid "Update From %s"
 msgstr "%sから更新"
 
-#: ../../templates/show_add_playlist.inc.php:35
+#: ../../templates/show_add_playlist.inc.php:30
 msgid "Create a new playlist"
 msgstr "新規プレイリスト作成"
 
-#: ../../templates/show_info.inc.php:44
+#: ../../templates/show_info.inc.php:39
 #, fuzzy
 msgid "Ampache Security Information"
 msgstr "ユーザ情報"
 
-#: ../../templates/show_info.inc.php:45
+#: ../../templates/show_info.inc.php:40
 msgid "This page shows security information and ampache update information."
 msgstr ""
 
-#: ../../templates/show_info.inc.php:57
+#: ../../templates/show_info.inc.php:43 ../../templates/show_info.inc.php:91
+#, fuzzy
+msgid "Close this window"
+msgstr "ウィンドウを閉じる"
+
+#: ../../templates/show_info.inc.php:53
 #, fuzzy
 msgid "Ampache Version"
 msgstr "Ampache インストール"
 
-#: ../../templates/show_info.inc.php:60
+#: ../../templates/show_info.inc.php:56
 #, fuzzy
 msgid ""
 "Compare that you are running a version of Ampache and currently a version of "
@@ -3431,31 +3568,48 @@ msgstr ""
 "これはAmpacheで働くと知られているPHPのバージョンを実行していることを確かめる"
 "ためにテストします。"
 
-#: ../../templates/show_info.inc.php:67
+#: ../../templates/show_info.inc.php:63
 msgid "This test checks for vulnerable PHP whether to use version."
 msgstr ""
 
-#: ../../templates/show_info.inc.php:71
-msgid "PHP Info"
+#: ../../templates/show_info.inc.php:67
+msgid "PHP recommendation settings"
 msgstr ""
 
 #: ../../templates/show_info.inc.php:74
+msgid "This test checks whether the recommended security settings."
+msgstr ""
+
+#: ../../templates/show_info.inc.php:77
+msgid "PHP Info"
+msgstr ""
+
+#: ../../templates/show_info.inc.php:80
 msgid "This is the phpinfo() to display information."
 msgstr ""
 
-#: ../../templates/show_search_bar.inc.php:42
+#: ../../templates/show_search_bar.inc.php:37
+msgid "Anywhere"
+msgstr ""
+
+#: ../../templates/show_search_bar.inc.php:44
 msgid "Advanced Search"
 msgstr "高度な検索"
 
-#: ../../templates/show_album_art.inc.php:59
+#: ../../templates/show_album_art.inc.php:34
+#, fuzzy
+msgid "Select New Album Art"
+msgstr "アルバムアートのリセット"
+
+#: ../../templates/show_album_art.inc.php:54
 msgid "Invalid"
 msgstr "不正"
 
-#: ../../templates/show_registration_confirmation.inc.php:48
+#: ../../templates/show_registration_confirmation.inc.php:43
 msgid "Registration Complete"
 msgstr "登録完了"
 
-#: ../../templates/show_registration_confirmation.inc.php:54
+#: ../../templates/show_registration_confirmation.inc.php:49
 msgid ""
 "Your account has been created. An activation key has been sent to the e-mail "
 "address you provided. Please check your e-mail for further information"
@@ -3463,54 +3617,54 @@ msgstr ""
 "アカウントを作成しました。アクティベーションキーを入力したメールアドレスへ送"
 "信しました。メールをチェックしてください。"
 
-#: ../../templates/show_registration_confirmation.inc.php:56
+#: ../../templates/show_registration_confirmation.inc.php:51
 msgid "Return to Login Page"
 msgstr "ログインページへ戻る"
 
-#: ../../templates/show_update_items.inc.php:34
+#: ../../templates/show_update_items.inc.php:29
 msgid "Starting Update from Tags"
 msgstr "タグから更新を開始"
 
-#: ../../templates/show_update_items.inc.php:38
+#: ../../templates/show_update_items.inc.php:33
 msgid "Update from Tags Complete"
 msgstr "タグから更新完了"
 
-#: ../../templates/show_plugins.inc.php:48
+#: ../../templates/show_plugins.inc.php:43
 msgid "Installed Version"
 msgstr "インストール済みバージョン"
 
-#: ../../templates/show_plugins.inc.php:61
+#: ../../templates/show_plugins.inc.php:56
 msgid "Deactivate"
 msgstr "無効化"
 
-#: ../../templates/show_plugins.inc.php:65
+#: ../../templates/show_plugins.inc.php:60
 msgid "Upgrade"
 msgstr "アップグレード"
 
-#: ../../templates/show_lostpassword_form.inc.php:78
+#: ../../templates/show_lostpassword_form.inc.php:73
 msgid "Email"
 msgstr "メール"
 
-#: ../../templates/show_lostpassword_form.inc.php:82
+#: ../../templates/show_lostpassword_form.inc.php:77
 msgid "Submit"
 msgstr "送信"
 
-#: ../../templates/show_denied.inc.php:50
+#: ../../templates/show_denied.inc.php:45
 msgid ""
 "You've been redirected to this page because you do not have access to this "
 "function."
 msgstr "この機能へアクセスできないため、このページを表示しています。"
 
-#: ../../templates/show_denied.inc.php:51
+#: ../../templates/show_denied.inc.php:46
 msgid ""
 "If you believe this is an error please contact an Ampache administrator."
 msgstr "これがエラーだと思われる場合、Ampache管理者へお問合せください。"
 
-#: ../../templates/show_denied.inc.php:52
+#: ../../templates/show_denied.inc.php:47
 msgid "This event has been logged"
 msgstr "このイベントは記録済みです"
 
-#: ../../templates/show_denied.inc.php:56
+#: ../../templates/show_denied.inc.php:51
 msgid ""
 "You've been redirected to this page because you've attempted to access a "
 "function that is disabled in the demo."
@@ -3518,7 +3672,7 @@ msgstr ""
 "デモで無効になっている機能にアクセスを試みたため、このページにリダイレクトさ"
 "れました。"
 
-#: ../../templates/show_denied.inc.php:57
+#: ../../templates/show_denied.inc.php:52
 msgid ""
 "Functions are disabled in the demo because previous users of the demo have "
 "used the functionality to post inappropriate materials"
@@ -3526,125 +3680,136 @@ msgstr ""
 "デモの前のユーザが不適切な素材を投稿する機能を使用したので、機能はデモでは無"
 "効にされます。"
 
-#: ../../templates/show_all_popular.inc.php:44
+#: ../../templates/show_all_popular.inc.php:39
 msgid "Most Popular Genres"
 msgstr "1番人気のジャンル"
 
-#: ../../templates/show_all_popular.inc.php:50
-#: ../../templates/show_mail_users.inc.php:81
+#: ../../templates/show_all_popular.inc.php:45
+#: ../../templates/show_mail_users.inc.php:76
 msgid "Most Popular Songs"
 msgstr "1番人気の曲"
 
-#: ../../templates/show_all_popular.inc.php:53
+#: ../../templates/show_all_popular.inc.php:48
 msgid "Most Popular Live Streams"
 msgstr "1番人気のライブストリーム"
 
-#: ../../templates/show_all_popular.inc.php:56
+#: ../../templates/show_all_popular.inc.php:51
 msgid "Most Popular Tags"
 msgstr "一番人気のタグ"
 
-#: ../../templates/show_localplay_edit_instance.inc.php:35
+#: ../../templates/show_localplay_edit_instance.inc.php:30
 msgid "Edit Localplay Instance"
 msgstr "ローカルプレイインスタンスの編集"
 
-#: ../../templates/show_localplay_edit_instance.inc.php:46
+#: ../../templates/show_localplay_edit_instance.inc.php:41
 msgid "Update Instance"
 msgstr "インスタンスの更新"
 
-#: ../../templates/show_videos.inc.php:52
-#: ../../templates/show_videos.inc.php:76
+#: ../../templates/show_videos.inc.php:46
+#: ../../templates/show_videos.inc.php:70
+msgid "Codec"
+msgstr "コーデック"
+
+#: ../../templates/show_videos.inc.php:47
+#: ../../templates/show_videos.inc.php:71
 msgid "Resolution"
 msgstr "分析"
 
+#: ../../templates/show_verify_catalog.inc.php:29
+#, fuzzy
+msgid "Verify Catalog"
+msgstr "カタログの検証"
+
 #. HINT: Catalog Name
-#: ../../templates/show_verify_catalog.inc.php:36
+#: ../../templates/show_verify_catalog.inc.php:31
 #, php-format
 msgid "Updating the %s catalog"
 msgstr "%sカタログの更新中"
 
-#: ../../templates/show_verify_catalog.inc.php:38
+#: ../../templates/show_verify_catalog.inc.php:33
 #, php-format
 msgid "%d item found checking tag information"
 msgid_plural "%d items found checking tag information"
 msgstr[0] "%dアイテム見つかりました。タグ情報をチェック中です。"
 
-#: ../../templates/show_verify_catalog.inc.php:40
-msgid "Verifed"
+#: ../../templates/show_verify_catalog.inc.php:35
+#, fuzzy
+msgid "Verified"
 msgstr "確認済み"
 
 #. HINT: Democratic Name
-#: ../../templates/show_democratic.inc.php:35
+#: ../../templates/show_democratic.inc.php:30
 #, php-format
 msgid "%s Playlist"
 msgstr "%s プレイリスト"
 
-#: ../../templates/show_democratic.inc.php:42
-#: ../../templates/show_manage_democratic.inc.php:48
+#: ../../templates/show_democratic.inc.php:37
+#: ../../templates/show_manage_democratic.inc.php:43
 msgid "Cooldown"
 msgstr "クールダウン"
 
-#: ../../templates/show_democratic.inc.php:53
+#: ../../templates/show_democratic.inc.php:48
 msgid "Play Democratic Playlist"
 msgstr "デモクラティックプレイリストを再生"
 
-#: ../../templates/show_localplay_control.inc.php:36
+#: ../../templates/show_localplay_control.inc.php:31
 msgid "Previous"
 msgstr "前へ"
 
-#: ../../templates/show_localplay_control.inc.php:37
+#: ../../templates/show_localplay_control.inc.php:32
 msgid "Stop"
 msgstr "停止"
 
-#: ../../templates/show_localplay_control.inc.php:38
+#: ../../templates/show_localplay_control.inc.php:33
 msgid "Pause"
 msgstr "一時停止"
 
-#: ../../templates/show_now_playing_row.inc.php:58
+#: ../../templates/show_now_playing_row.inc.php:53
 msgid "Show Lyrics"
 msgstr "歌詞の表示"
 
-#: ../../templates/show_now_playing_row.inc.php:120
+#: ../../templates/show_now_playing_row.inc.php:115
 msgid "Similar Songs"
 msgstr "同様の曲"
 
-#: ../../templates/show_shoutbox.inc.php:35
+#: ../../templates/show_shoutbox.inc.php:30
 msgid "Shoutbox"
 msgstr "シャウトボックス"
 
-#: ../../templates/show_localplay_instances.inc.php:35
+#: ../../templates/show_localplay_instances.inc.php:30
 msgid "Show Localplay Instances"
 msgstr "ローカル再生インスタンスの表示"
 
-#: ../../templates/show_localplay_instances.inc.php:51
+#: ../../templates/show_localplay_instances.inc.php:46
 msgid "Edit Instance"
 msgstr "インスタンス編集"
 
 #. HINT: Username
-#: ../../templates/show_ip_history.inc.php:35
+#: ../../templates/show_ip_history.inc.php:30
 #, php-format
 msgid "%s IP History"
 msgstr "%s IP履歴"
 
-#: ../../templates/show_ip_history.inc.php:41
+#: ../../templates/show_ip_history.inc.php:36
 msgid "Show Unique"
 msgstr "ユニークを表示"
 
-#: ../../templates/show_ip_history.inc.php:44
-#: ../../templates/show_admin_info.inc.php:51
+#: ../../templates/show_ip_history.inc.php:39
+#: ../../templates/show_admin_info.inc.php:46
 msgid "Show All"
 msgstr "全て表示"
 
-#: ../../templates/show_ip_history.inc.php:57
-#: ../../templates/show_ip_history.inc.php:71
+#: ../../templates/show_ip_history.inc.php:52
+#: ../../templates/show_ip_history.inc.php:66
 msgid "Date"
 msgstr "日付"
 
-#: ../../templates/show_ip_history.inc.php:58
-#: ../../templates/show_ip_history.inc.php:72
+#: ../../templates/show_ip_history.inc.php:53
+#: ../../templates/show_ip_history.inc.php:67
 msgid "IP Address"
 msgstr "IPアドレス"
 
-#: ../../templates/show_install_account.inc.php:42
+#: ../../templates/show_install_account.inc.php:37
 msgid ""
 "This step creates your initial Ampache admin account. Once your admin "
 "account has been created you will be redirected to the login page."
@@ -3652,52 +3817,47 @@ msgstr ""
 "このステップはAmpacheの管理者アカウントを初期化します。一旦管理者アカウントが"
 "作成されるとログインページに飛びます。"
 
-#: ../../templates/show_install_account.inc.php:46
+#: ../../templates/show_install_account.inc.php:41
 msgid "Create Admin Account"
 msgstr "管理者アカウントの作成"
 
-#: ../../templates/show_install_account.inc.php:63
+#: ../../templates/show_install_account.inc.php:58
 msgid "Create Account"
 msgstr "アカウント作成"
 
-#: ../../templates/show_preference_box.inc.php:55
-#: ../../templates/show_preference_box.inc.php:85
+#: ../../templates/show_preference_box.inc.php:50
+#: ../../templates/show_preference_box.inc.php:80
 msgid "Apply to All"
 msgstr "全てに適用"
 
-#: ../../templates/show_preference_box.inc.php:56
-#: ../../templates/show_preference_box.inc.php:86
+#: ../../templates/show_preference_box.inc.php:51
+#: ../../templates/show_preference_box.inc.php:81
 msgid "Access Level"
 msgstr "アクセスレベル"
 
-#: ../../templates/show_playlist.inc.php:51
-#: ../../templates/show_playlist.inc.php:52
+#: ../../templates/show_playlist.inc.php:46
+#: ../../templates/show_playlist.inc.php:47
 msgid "Normalize Tracks"
 msgstr "トラックのノーマライズ"
 
+#: ../../templates/show_playlist.inc.php:60
 #: ../../templates/show_playlist.inc.php:61
-#: ../../templates/show_playlist.inc.php:62
-msgid "Add All"
-msgstr "全て追加"
-
-#: ../../templates/show_playlist.inc.php:65
-#: ../../templates/show_playlist.inc.php:66
 msgid "Add Random"
 msgstr "ランダムを追加"
 
-#: ../../templates/sidebar_preferences.inc.php:50
+#: ../../templates/sidebar_preferences.inc.php:45
 msgid "Account"
 msgstr "アカウント"
 
-#: ../../templates/install_header.inc.php:49
+#: ../../templates/install_header.inc.php:44
 msgid "Ampache Installation"
 msgstr "Ampache インストール"
 
-#: ../../templates/install_header.inc.php:54
+#: ../../templates/install_header.inc.php:49
 msgid "Requirements"
 msgstr "必要条件"
 
-#: ../../templates/install_header.inc.php:56
+#: ../../templates/install_header.inc.php:51
 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 "
@@ -3706,17 +3866,17 @@ msgstr ""
 "このページはAmpacheデータベースとampache.cfg.phpファイルの生成のインストール"
 "を扱います。続ける前に以下の事前準備をお願いします。"
 
-#: ../../templates/install_header.inc.php:59
+#: ../../templates/install_header.inc.php:54
 msgid ""
 "A MySQL server with a username and password that can create/modify databases"
 msgstr "データベースを作成/修正できるユーザ名とパスワードをもったMySQLサーバ"
 
-#: ../../templates/install_header.inc.php:60
+#: ../../templates/install_header.inc.php:55
 #, php-format
 msgid "Your webserver has read access to the files %s and %s"
 msgstr "ウェブサーバは%sファイルと%sファイルへのアクセスを読み込みます"
 
-#: ../../templates/install_header.inc.php:63
+#: ../../templates/install_header.inc.php:58
 #, php-format
 msgid ""
 "Once you have ensured that the above requirements are met please fill out "
@@ -3727,291 +3887,577 @@ msgstr ""
 "上記の要件を確認したら以下の情報を記入してください。必要なコンフィグの値を求"
 "めるだけです。後々Ampacheへの変更を加えたい場合、単に%sを編集するだけです。"
 
-#: ../../templates/sidebar_admin.inc.php:43
+#: ../../templates/sidebar_admin.inc.php:38
 msgid "User Tools"
 msgstr "ユーザツール"
 
-#: ../../templates/sidebar_admin.inc.php:45
-#: ../../templates/show_add_user.inc.php:97
+#: ../../templates/sidebar_admin.inc.php:40
+#: ../../templates/show_add_user.inc.php:92
 msgid "Add User"
 msgstr "ユーザ追加"
 
-#: ../../templates/sidebar_admin.inc.php:46
+#: ../../templates/sidebar_admin.inc.php:41
 msgid "Browse Users"
 msgstr "ユーザ閲覧"
 
-#: ../../templates/sidebar_admin.inc.php:51
+#: ../../templates/sidebar_admin.inc.php:46
 msgid "Add ACL"
 msgstr "ACL追加"
 
-#: ../../templates/sidebar_admin.inc.php:52
+#: ../../templates/sidebar_admin.inc.php:47
 msgid "Show ACL(s)"
 msgstr "ACL表示"
 
-#: ../../templates/sidebar_admin.inc.php:59
-#: ../../templates/show_export.inc.php:39
+#: ../../templates/sidebar_admin.inc.php:53
+msgid "Security Check"
+msgstr ""
+
+#: ../../templates/sidebar_admin.inc.php:55
+#: ../../templates/show_export.inc.php:34
 msgid "Export Catalog"
 msgstr "カタログのエクスポート"
 
-#: ../../templates/sidebar_admin.inc.php:61
+#: ../../templates/sidebar_admin.inc.php:57
 msgid "Manage Shoutbox"
 msgstr "シャウトボックスの管理"
 
-#: ../../templates/sidebar_admin.inc.php:66
+#: ../../templates/sidebar_admin.inc.php:62
 msgid "Server Config"
 msgstr "サーバ設定"
 
-#: ../../templates/show_admin_info.inc.php:43
+#: ../../templates/show_admin_info.inc.php:38
 msgid "Last Ten Flagged Records"
 msgstr "過去10のフラグされたレコード"
 
-#: ../../templates/show_admin_info.inc.php:47
-#: ../../templates/show_mail_users.inc.php:91
+#: ../../templates/show_admin_info.inc.php:42
+#: ../../templates/show_mail_users.inc.php:86
 msgid "Disabled Songs"
 msgstr "無効な曲"
 
-#: ../../templates/show_duplicate.inc.php:39
+#: ../../templates/show_duplicate.inc.php:34
 msgid "Search Type"
 msgstr "検索タイプ"
 
-#: ../../templates/show_duplicate.inc.php:46
+#: ../../templates/show_duplicate.inc.php:41
 msgid "Artist and Title"
 msgstr "アーティストとタイトル"
 
-#: ../../templates/show_duplicate.inc.php:47
+#: ../../templates/show_duplicate.inc.php:42
 msgid "Artist, Album and Title"
 msgstr "アーティストとアルバムとタイトル"
 
-#: ../../templates/show_duplicate.inc.php:49
+#: ../../templates/show_duplicate.inc.php:44
 msgid "Search Disabled Songs"
 msgstr "無効な曲を検索"
 
-#: ../../templates/show_localplay_status.inc.php:38
+#: ../../templates/show_localplay_status.inc.php:33
 msgid "Localplay Control"
 msgstr "ローカル再生のコントロール"
 
-#: ../../templates/show_localplay_status.inc.php:43
+#: ../../templates/show_localplay_status.inc.php:38
 msgid "Mute"
 msgstr "消音"
 
-#: ../../templates/show_localplay_status.inc.php:44
+#: ../../templates/show_localplay_status.inc.php:39
 msgid "Decrease Volume"
 msgstr "音量を下げる"
 
-#: ../../templates/show_localplay_status.inc.php:45
+#: ../../templates/show_localplay_status.inc.php:40
 msgid "Increase Volume"
 msgstr "音量を上げる"
 
-#: ../../templates/show_localplay_status.inc.php:46
+#: ../../templates/show_localplay_status.inc.php:41
 msgid "Volume"
 msgstr "音量"
 
-#: ../../templates/show_localplay_status.inc.php:51
+#: ../../templates/show_localplay_status.inc.php:46
 msgid "Repeat"
 msgstr "リピート"
 
-#: ../../templates/show_random.inc.php:35
+#: ../../templates/show_random.inc.php:30
 msgid "Play Random Selection"
 msgstr "ランダムな選択を再生"
 
-#: ../../templates/show_random.inc.php:39
+#: ../../templates/show_random.inc.php:42
 msgid "Item count"
 msgstr "アイテムカウント"
 
-#: ../../templates/show_random.inc.php:62
-#: ../../templates/show_random.inc.php:63
+#: ../../templates/show_random.inc.php:72
+#: ../../templates/show_random.inc.php:73
 #, php-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d分"
 
-#: ../../templates/show_random.inc.php:64
-#: ../../templates/show_random.inc.php:65
-#: ../../templates/show_random.inc.php:66
-#: ../../templates/show_random.inc.php:67
-#: ../../templates/show_random.inc.php:68
+#: ../../templates/show_random.inc.php:74
+#: ../../templates/show_random.inc.php:75
+#: ../../templates/show_random.inc.php:76
+#: ../../templates/show_random.inc.php:77
+#: ../../templates/show_random.inc.php:78
 #, php-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d時間"
 
-#: ../../templates/show_random.inc.php:77
-msgid "Standard"
-msgstr "基本"
-
-#: ../../templates/show_random.inc.php:78
-msgid "Less Played"
-msgstr "未再生"
-
-#: ../../templates/show_random.inc.php:79
-msgid "Full Albums"
-msgstr "フルアルバム"
-
-#: ../../templates/show_random.inc.php:80
-msgid "Full Artist"
-msgstr "フルアーティスト"
-
-#: ../../templates/show_random.inc.php:82
-msgid "Highest Rated"
-msgstr "高評価"
-
-#: ../../templates/show_random.inc.php:88
-msgid "From catalog"
-msgstr "カタログから"
-
-#: ../../templates/show_random.inc.php:94
+#: ../../templates/show_random.inc.php:83
 msgid "Size Limit"
 msgstr "サイズ制限"
 
-#: ../../templates/show_random.inc.php:109
+#: ../../templates/show_random.inc.php:101
 msgid "Enqueue"
 msgstr "エンキュー"
 
-#: ../../templates/show_object_rating_static.inc.php:57
+#: ../../templates/show_object_rating_static.inc.php:52
 msgid "out of"
 msgstr "out of"
 
-#: ../../templates/show_preference_admin.inc.php:35
+#: ../../templates/show_preference_admin.inc.php:30
 msgid "Preference Administration"
 msgstr "設定管理"
 
-#: ../../templates/show_user_registration.inc.php:67
+#: ../../templates/show_user_registration.inc.php:62
 msgid "User Agreement"
 msgstr "同意"
 
-#: ../../templates/show_user_registration.inc.php:74
+#: ../../templates/show_user_registration.inc.php:69
 msgid "I Accept"
 msgstr "同意する"
 
-#: ../../templates/show_user_registration.inc.php:79
+#: ../../templates/show_user_registration.inc.php:74
 msgid "User Information"
 msgstr "ユーザ情報"
 
-#: ../../templates/show_user_registration.inc.php:110
+#: ../../templates/show_user_registration.inc.php:105
 msgid "* Required fields"
 msgstr "* 必須フィールド"
 
-#: ../../templates/show_user_registration.inc.php:120
+#: ../../templates/show_user_registration.inc.php:115
 msgid "Register User"
 msgstr "ユーザ登録"
 
-#: ../../templates/show_mail_users.inc.php:36
+#: ../../templates/show_mail_users.inc.php:31
 msgid "Send E-mail to Users"
 msgstr "ユーザへメール送信"
 
-#: ../../templates/show_mail_users.inc.php:40
+#: ../../templates/show_mail_users.inc.php:35
 msgid "Mail to"
 msgstr "メール先:"
 
-#: ../../templates/show_mail_users.inc.php:46
+#: ../../templates/show_mail_users.inc.php:41
 msgid "Inactive Users"
 msgstr "不活発なユーザ"
 
-#: ../../templates/show_mail_users.inc.php:55
+#: ../../templates/show_mail_users.inc.php:50
 msgid "Catalog Statistics"
 msgstr "カタログ統計"
 
-#: ../../templates/show_mail_users.inc.php:66
+#: ../../templates/show_mail_users.inc.php:61
 msgid "Latest Artist Additions"
 msgstr "最後に追加したアーティスト"
 
-#: ../../templates/show_mail_users.inc.php:77
+#: ../../templates/show_mail_users.inc.php:72
 msgid "Latest Album Additions"
 msgstr "最後に追加したアルバム"
 
-#: ../../templates/show_mail_users.inc.php:87
+#: ../../templates/show_mail_users.inc.php:82
 msgid "Flagged Songs"
 msgstr "フラグされた曲"
 
-#: ../../templates/show_mail_users.inc.php:99
+#: ../../templates/show_mail_users.inc.php:94
 msgid "Most Popular Threshold in days"
 msgstr "1番人気にする日数の閾値"
 
-#: ../../templates/show_mail_users.inc.php:110
+#: ../../templates/show_mail_users.inc.php:105
 msgid "From"
 msgstr "From"
 
-#: ../../templates/show_mail_users.inc.php:113
+#: ../../templates/show_mail_users.inc.php:108
 msgid "Yourself"
 msgstr "自分自身"
 
-#: ../../templates/show_mail_users.inc.php:114
+#: ../../templates/show_mail_users.inc.php:109
 msgid "Ampache"
 msgstr "Ampache"
 
-#: ../../templates/show_mail_users.inc.php:119
+#: ../../templates/show_mail_users.inc.php:114
 msgid "Subject"
 msgstr "件名"
 
-#: ../../templates/show_mail_users.inc.php:126
+#: ../../templates/show_mail_users.inc.php:121
 msgid "Message"
 msgstr "本文"
 
-#: ../../templates/show_mail_users.inc.php:134
+#: ../../templates/show_mail_users.inc.php:129
 msgid "Send Mail"
 msgstr "メール送信"
 
-#: ../../templates/show_export.inc.php:62
+#: ../../templates/show_export.inc.php:57
 msgid "Format"
 msgstr "形式"
 
-#: ../../templates/show_export.inc.php:72
+#: ../../templates/show_export.inc.php:67
 msgid "Export"
 msgstr "エクスポート"
 
+#: ../../templates/show_adds_catalog.inc.php:29
+#, fuzzy
+msgid "Starting New Song Search"
+msgstr "%sカタログ上の新規曲検索を開始"
+
 #. HINT: Catalog Name
-#: ../../templates/show_adds_catalog.inc.php:36
+#: ../../templates/show_adds_catalog.inc.php:31
 #, php-format
 msgid "Starting New Song Search on %s catalog"
 msgstr "%sカタログ上の新規曲検索を開始"
 
-#: ../../templates/show_add_user.inc.php:35
+#: ../../templates/show_add_user.inc.php:30
 msgid "Adding a New User"
 msgstr "新規ユーザを追加"
 
-#: ../../templates/show_manage_democratic.inc.php:34
+#: ../../templates/show_manage_democratic.inc.php:29
 msgid "Manage Democratic Playlists"
 msgstr "デモクラティックプレイリスト管理"
 
-#: ../../templates/show_manage_democratic.inc.php:81
+#: ../../templates/show_manage_democratic.inc.php:76
 msgid "Create New Playlist"
 msgstr "新規プレイリスト作成"
 
-#: ../../templates/show_dynamic.inc.php:35
+#: ../../templates/show_dynamic.inc.php:30
 msgid "Advanced Random Rules"
 msgstr "高度なランダムルール"
 
-#: ../../templates/show_dynamic.inc.php:69
+#: ../../templates/show_dynamic.inc.php:39
+msgid "Field"
+msgstr "フィールド"
+
+#: ../../templates/show_dynamic.inc.php:40
+msgid "Operator"
+msgstr "オペレータ"
+
+#: ../../templates/show_dynamic.inc.php:42
+msgid "Method"
+msgstr "方法"
+
+#: ../../templates/show_dynamic.inc.php:64
 msgid "Like"
 msgstr "Like"
 
-#: ../../templates/show_dynamic.inc.php:84
+#: ../../templates/show_dynamic.inc.php:73
+msgid "AND"
+msgstr "AND"
+
+#: ../../templates/show_dynamic.inc.php:79
 msgid "Add Rule"
 msgstr "ルールを追加"
 
-#: ../../templates/show_dynamic.inc.php:87
+#: ../../templates/show_dynamic.inc.php:82
 msgid "Save Rules As"
 msgstr "次のルールで保存"
 
-#: ../../templates/show_dynamic.inc.php:90
+#: ../../templates/show_dynamic.inc.php:85
 msgid "Load Saved Rules"
 msgstr "保存したルールを読み込む"
 
-#: ../../search.php:50
-msgid "Error: No Keyword Entered"
-msgstr "エラー: キーワードが何も入力されていません"
+#: ../../sarg/trunk/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/v2.3/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/start/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-block-it.php:35
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-block-it.php:35
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-block-it.php:35
+#: ../../sarg/branches/v2.3/sarg-php/sarg-block-it.php:35
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-block-it.php:35
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-block-it.php:35
+#: ../../sarg/branches/serassio/sarg-php/sarg-block-it.php:35
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-block-it.php:35
+#, fuzzy
+msgid "Could not open the filename"
+msgstr "ユーザ名が入力されていません"
 
-#: ../../search.php:66
+#: ../../sarg/trunk/sarg-php/sarg-block-it.php:43
+#: ../../sarg/trunk/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/v2.3/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/v2.3/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/start/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/start/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-block-it.php:43
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-block-it.php:43
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/branches/v2.3/sarg-php/sarg-block-it.php:43
+#: ../../sarg/branches/v2.3/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-block-it.php:43
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-block-it.php:43
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/branches/serassio/sarg-php/sarg-block-it.php:43
+#: ../../sarg/branches/serassio/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-block-it.php:43
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-squidguard-block2.php:49
+#, fuzzy
+msgid "Write error"
+msgstr "コンフィグの書込み"
+
+#: ../../sarg/trunk/sarg-php/sarg-block-it.php:46
+#: ../../sarg/trunk/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/v2.3/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/v2.3/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/start/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/start/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-block-it.php:46
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-block-it.php:46
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/branches/v2.3/sarg-php/sarg-block-it.php:46
+#: ../../sarg/branches/v2.3/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-block-it.php:46
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-block-it.php:46
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/branches/serassio/sarg-php/sarg-block-it.php:46
+#: ../../sarg/branches/serassio/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-block-it.php:46
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-squidguard-block2.php:52
+msgid "Done!"
+msgstr ""
+
+#: ../../sarg/trunk/sarg-php/sarg-block-it.php:49
+#: ../../sarg/trunk/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/v2.3/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/v2.3/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/start/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/start/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-block-it.php:49
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-block-it.php:49
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/branches/v2.3/sarg-php/sarg-block-it.php:49
+#: ../../sarg/branches/v2.3/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-block-it.php:49
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-block-it.php:49
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/branches/serassio/sarg-php/sarg-block-it.php:49
+#: ../../sarg/branches/serassio/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-block-it.php:49
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-squidguard-block2.php:55
+msgid "Return"
+msgstr ""
+
+#: ../../sarg/trunk/sarg-php/sarg-block-it.php:51
+#: ../../sarg/trunk/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/v2.3/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/v2.3/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/start/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/start/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-block-it.php:51
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-block-it.php:51
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/branches/v2.3/sarg-php/sarg-block-it.php:51
+#: ../../sarg/branches/v2.3/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-block-it.php:51
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-block-it.php:51
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/branches/serassio/sarg-php/sarg-block-it.php:51
+#: ../../sarg/branches/serassio/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-block-it.php:51
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-squidguard-block2.php:57
+msgid " to Sarg."
+msgstr ""
+
+#: ../../sarg/trunk/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/v2.3/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/start/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/branches/v2.3/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/branches/serassio/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-squidguard-block2.php:41
+msgid "Could not open the file"
+msgstr ""
+
+#: ../../sarg/trunk/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/v2.3/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/start/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/branches/v2.3/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/branches/serassio/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-squidguard-block.php:54
+msgid "Sarg-SquidGuard - URL Blocking"
+msgstr ""
+
+#: ../../sarg/trunk/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/v2.3/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/start/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/branches/v2.3/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/branches/serassio/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-squidguard-block.php:57
+msgid "Choose the rule set where"
+msgstr ""
+
+#: ../../sarg/trunk/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/v2.3/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/start/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/branches/v2.3/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/branches/serassio/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-squidguard-block.php:59
+msgid "will by added"
+msgstr ""
+
+#: ../../search.php:49
 #, fuzzy
 msgid "Search Saved"
 msgstr "検索済み"
 
-#: ../../search.php:66
+#: ../../search.php:49
 #, php-format
 msgid "Your Search has been saved as a track in %s"
 msgstr ""
 
-#: ../../radio.php:67
+#: ../../radio.php:62
 msgid "Radio Station Added"
 msgstr "ラジオステーションを追加しました"
 
@@ -4049,50 +4495,50 @@ msgid ""
 msgstr ""
 "ファイルアップロードで問題があります: %sは部分的にアップロードされました。"
 
-#: ../../modules/localplay/httpq.controller.php:238
-#: ../../modules/localplay/shoutcast.controller.php:259
-#: ../../modules/localplay/mpd.controller.php:256
-#: ../../modules/localplay/vlc.controller.php:238
+#: ../../modules/localplay/httpq.controller.php:231
+#: ../../modules/localplay/shoutcast.controller.php:252
+#: ../../modules/localplay/mpd.controller.php:249
+#: ../../modules/localplay/vlc.controller.php:231
 msgid "Instance Name"
 msgstr "インスタンス名"
 
-#: ../../modules/localplay/httpq.controller.php:239
-#: ../../modules/localplay/mpd.controller.php:257
-#: ../../modules/localplay/vlc.controller.php:239
+#: ../../modules/localplay/httpq.controller.php:232
+#: ../../modules/localplay/mpd.controller.php:250
+#: ../../modules/localplay/vlc.controller.php:232
 msgid "Hostname"
 msgstr "ホスト名"
 
-#: ../../modules/localplay/httpq.controller.php:240
-#: ../../modules/localplay/mpd.controller.php:258
-#: ../../modules/localplay/vlc.controller.php:240
+#: ../../modules/localplay/httpq.controller.php:233
+#: ../../modules/localplay/mpd.controller.php:251
+#: ../../modules/localplay/vlc.controller.php:233
 msgid "Port"
 msgstr "ポート"
 
-#: ../../modules/localplay/shoutcast.controller.php:260
+#: ../../modules/localplay/shoutcast.controller.php:253
 msgid "PID File"
 msgstr "PIDファイル"
 
-#: ../../modules/localplay/shoutcast.controller.php:261
+#: ../../modules/localplay/shoutcast.controller.php:254
 msgid "Playlist File"
 msgstr "プレイリストファイル"
 
-#: ../../modules/localplay/shoutcast.controller.php:262
+#: ../../modules/localplay/shoutcast.controller.php:255
 msgid "Local Path to Files"
 msgstr "ファイルへのローカルパス"
 
-#: ../../albums.php:44
+#: ../../albums.php:39
 msgid "Album Art Cleared"
 msgstr "アルバムアートをクリアしました"
 
-#: ../../albums.php:44
+#: ../../albums.php:39
 msgid "Album Art information has been removed from the database"
 msgstr "アルバムアート情報はデータベースから削除されました"
 
-#: ../../albums.php:51 ../../albums.php:70 ../../albums.php:143
+#: ../../albums.php:46 ../../albums.php:65 ../../albums.php:138
 msgid "Album Art Not Located"
 msgstr "アルバムアートは配置されていません"
 
-#: ../../albums.php:51 ../../albums.php:70 ../../albums.php:143
+#: ../../albums.php:46 ../../albums.php:65 ../../albums.php:138
 msgid ""
 "Album Art could not be located at this time. This may be due to write access "
 "error, or the file is not received correctly."
@@ -4100,320 +4546,316 @@ msgstr ""
 "アルバムアートは今回配置できませんでした。これは書込みエラー又はファイルが正"
 "しく受信できなかったためです。"
 
-#: ../../albums.php:66 ../../albums.php:94
+#: ../../albums.php:61 ../../albums.php:89
 msgid "Album Art Inserted"
 msgstr "アルバムアートを挿入しました"
 
-#: ../../play/index.php:97
-msgid "Session Expired: please log in again at"
-msgstr "セッション期限切れ: 再ログインしてください"
-
 #. HINT: Artist, Song Title
-#: ../../song.php:54 ../../song.php:72
+#: ../../song.php:49 ../../song.php:67
 #, php-format
 msgid "%1$s - %2$s Lyrics Detail"
 msgstr "%1$s - %2$s 歌詞詳細"
 
-#: ../../democratic.php:68
+#: ../../democratic.php:63
 msgid "The Requested Playlist has been deleted."
 msgstr "要求されたプレイリストは削除されています。"
 
-#: ../../artists.php:95
+#: ../../artists.php:90
 #, fuzzy
 msgid "Renamed artist(s)"
 msgstr "関連するアーティスト"
 
-#: ../../artists.php:96
+#: ../../artists.php:91
 #, php-format
 msgid "%1$s artists have been merged with %2$s"
 msgstr ""
 
-#: ../../artists.php:175
+#: ../../artists.php:170
 #, fuzzy
 msgid "Renamed artist"
 msgstr "関連するアーティスト"
 
-#: ../../artists.php:176
+#: ../../artists.php:171
 #, php-format
 msgid "%1$s is now known as %2$s"
 msgstr ""
 
-#: ../../artists.php:200
+#: ../../artists.php:195
 msgid "Show Artists starting with"
 msgstr "次で開始されるアーティストを表示:"
 
-#: ../../login.php:98
+#: ../../login.php:93
 msgid "Error Username or Password incorrect, please try again"
 msgstr "エラー: ユーザ名かパスワードが間違っています。再試行して下さい"
 
-#: ../../login.php:105
+#: ../../login.php:100
 msgid "User Disabled please contact Admin"
 msgstr "ユーザは無効なので管理者にお問合せください"
 
-#: ../../login.php:113
+#: ../../login.php:108
 msgid "User Already Logged in"
 msgstr "ユーザはすでにログインしています"
 
-#: ../../login.php:134
+#: ../../login.php:129
 msgid "Unable to create local account"
 msgstr "ローカルアカウントを作成できませんでした"
 
-#: ../../admin/flag.php:92
+#: ../../admin/flag.php:87
 msgid "Song Updated"
 msgstr "曲を更新しました"
 
-#: ../../admin/flag.php:92
+#: ../../admin/flag.php:87
 msgid "The requested song has been updated"
 msgstr "要求された曲を更新しました"
 
-#: ../../admin/flag.php:134
+#: ../../admin/flag.php:129
 msgid "Album Updated"
 msgstr "アルバムを更新しました"
 
-#: ../../admin/flag.php:176
+#: ../../admin/flag.php:171
 msgid "Artist Updated"
 msgstr "アーティストを更新しました"
 
-#: ../../admin/flag.php:237
+#: ../../admin/flag.php:232
 msgid "Songs Updated"
 msgstr "曲を更新しました"
 
-#: ../../admin/flag.php:245
+#: ../../admin/flag.php:240
 msgid "Flag Removed"
 msgstr "フラグを削除しました"
 
-#: ../../admin/flag.php:246
+#: ../../admin/flag.php:241
 msgid "Flag Removed from"
 msgstr "次からフラグを削除しました:"
 
-#: ../../admin/flag.php:261
+#: ../../admin/flag.php:256
 msgid "Flags Updated"
 msgstr "フラグを更新しました"
 
-#: ../../admin/flag.php:280
+#: ../../admin/flag.php:275
 msgid "Songs Disabled"
 msgstr "曲を無効にしました"
 
-#: ../../admin/flag.php:280
+#: ../../admin/flag.php:275
 msgid "The requested song(s) have been disabled"
 msgstr "要求された曲は無効化されました"
 
-#: ../../admin/flag.php:291
+#: ../../admin/flag.php:286
 msgid "Songs Enabled"
 msgstr "曲を有効にしました"
 
-#: ../../admin/flag.php:291
+#: ../../admin/flag.php:286
 msgid "The requested song(s) have been enabled"
 msgstr "要求された曲は有効化されました"
 
-#: ../../admin/users.php:95
+#: ../../admin/users.php:90
 msgid "User Updated"
 msgstr "ユーザを更新しました"
 
-#: ../../admin/users.php:95
+#: ../../admin/users.php:90
 msgid "updated"
 msgstr "更新しました"
 
 #. HINT: %1 Username, %2 Access num
-#: ../../admin/users.php:142
+#: ../../admin/users.php:137
 msgid "New User Added"
 msgstr "新規ユーザを追加しました"
 
-#: ../../admin/users.php:142
+#: ../../admin/users.php:137
 #, php-format
 msgid "%1$s has been created with an access level of %2$s"
 msgstr "%1$sは%2$sのアクセスレベルで作成されました"
 
-#: ../../admin/users.php:147
+#: ../../admin/users.php:142
 msgid "User Enabled"
 msgstr "ユーザを有効化しました"
 
-#: ../../admin/users.php:152
+#: ../../admin/users.php:147
 msgid "User Disabled"
 msgstr "ユーザを無効化しました"
 
-#: ../../admin/users.php:155
+#: ../../admin/users.php:150
 msgid "Unable to Disabled last Administrator"
 msgstr "最後の管理者は無効に出来ません"
 
-#: ../../admin/users.php:171
+#: ../../admin/users.php:166
 msgid "User Deleted"
 msgstr "ユーザを削除しました"
 
-#: ../../admin/users.php:171
+#: ../../admin/users.php:166
 #, php-format
 msgid "%s has been Deleted"
 msgstr "%sを削除しました"
 
-#: ../../admin/users.php:174
+#: ../../admin/users.php:169
 msgid "Delete Error"
 msgstr "削除エラー"
 
-#: ../../admin/users.php:174
+#: ../../admin/users.php:169
 msgid "Unable to delete last Admin User"
 msgstr "最後の管理者は削除できません"
 
-#: ../../admin/users.php:180 ../../admin/access.php:56
+#: ../../admin/users.php:175 ../../admin/access.php:51
 msgid "Deletion Request"
 msgstr "削除要求"
 
-#: ../../admin/users.php:181
+#: ../../admin/users.php:176
 #, php-format
 msgid "Are you sure you want to permanently delete %s?"
 msgstr "%sを完全に削除してもよろしいですか？"
 
-#: ../../admin/shout.php:48
+#: ../../admin/shout.php:43
 msgid "Shoutbox Post Updated"
 msgstr "シャウトボックスの投稿を更新しました"
 
-#: ../../admin/shout.php:60
+#: ../../admin/shout.php:55
 msgid "Shoutbox Post Deleted"
 msgstr "シャウトボックスの投稿を削除しました"
 
-#: ../../admin/catalog.php:65 ../../admin/catalog.php:85
-#: ../../admin/catalog.php:110 ../../admin/catalog.php:182
+#: ../../admin/catalog.php:60 ../../admin/catalog.php:80
+#: ../../admin/catalog.php:106 ../../admin/catalog.php:179
 msgid "Catalog Updated"
 msgstr "カタログを更新しました"
 
-#: ../../admin/catalog.php:127
+#: ../../admin/catalog.php:123
 msgid "Catalog Deleted"
 msgstr "カタログを削除しました"
 
-#: ../../admin/catalog.php:127
+#: ../../admin/catalog.php:123
 msgid "The Catalog and all associated records have been deleted"
 msgstr "カタログと全ての割り当てられたレコードを削除しました"
 
-#: ../../admin/catalog.php:133
+#: ../../admin/catalog.php:129
 msgid "Catalog Delete"
 msgstr "カタログの削除"
 
-#: ../../admin/catalog.php:133
+#: ../../admin/catalog.php:129
 msgid "Confirm Deletion Request"
 msgstr "削除要求の確認"
 
-#: ../../admin/catalog.php:142
+#: ../../admin/catalog.php:138
 msgid "Song Removed"
 msgid_plural "Songs Removed"
 msgstr[0] "曲を削除しました"
 
-#: ../../admin/catalog.php:145
+#: ../../admin/catalog.php:141
 msgid "No Songs Removed"
 msgstr "曲は削除されませんでした"
 
-#: ../../admin/catalog.php:148
+#: ../../admin/catalog.php:144
 msgid "Disabled Song Processed"
 msgid_plural "Disabled Songs Processed"
 msgstr[0] "曲の無効化を実行しました"
 
-#: ../../admin/catalog.php:169
+#: ../../admin/catalog.php:166
 msgid "Catalog Cleaned"
 msgstr "カタログをクリーンにしました"
 
-#: ../../admin/catalog.php:213
+#: ../../admin/catalog.php:210
 msgid "Error: Name and path not specified"
 msgstr "エラー: 名前とパスが指定されていません"
 
-#: ../../admin/catalog.php:217
+#: ../../admin/catalog.php:214
 msgid "Error: Remote selected, but path is not a URL"
 msgstr "エラー: リモートを選択しましたが、パスがURLではありません"
 
-#: ../../admin/catalog.php:221
+#: ../../admin/catalog.php:218
 msgid "Error: Remote Catalog specified, but no key provided"
 msgstr "エラー: リモートカタログを指定しましたが、キーが提供されていません"
 
-#: ../../admin/catalog.php:231
+#: ../../admin/catalog.php:228
 msgid "Error: Defined Path is inside an existing catalog"
 msgstr "エラー: 定義されたパスは既存のカタログ内です"
 
-#: ../../admin/catalog.php:250
+#: ../../admin/catalog.php:246 ../../admin/catalog.php:247
 msgid "Catalog Created"
 msgstr "カタログを作成しました"
 
-#: ../../admin/catalog.php:267
+#: ../../admin/catalog.php:264
 msgid "Catalog statistics cleared"
 msgstr "カタログ統計を削除しました"
 
-#: ../../admin/catalog.php:281
+#: ../../admin/catalog.php:278
 msgid "Now Playing Cleared"
 msgstr "現在再生中のものをクリアしました"
 
-#: ../../admin/catalog.php:281
+#: ../../admin/catalog.php:278
 msgid "All now playing data has been cleared"
 msgstr "現在再生中のデータは全てクリアされました"
 
-#: ../../admin/catalog.php:292
+#: ../../admin/catalog.php:289
 msgid "No Disabled songs found"
 msgstr "無効にした曲は見つかりませんでした"
 
-#: ../../admin/catalog.php:301
+#: ../../admin/catalog.php:298
 msgid "Delete Catalog"
 msgstr "カタログの削除"
 
-#: ../../admin/catalog.php:301
+#: ../../admin/catalog.php:298
 msgid "Do you really want to delete this catalog?"
 msgstr "このカタログを削除してもよろしいですか？"
 
-#: ../../admin/catalog.php:321
+#: ../../admin/catalog.php:318
 msgid "Album Art Search Finished"
 msgstr "アルバムアート検索が完了しました"
 
-#: ../../admin/access.php:51
+#: ../../admin/access.php:46
 msgid "Deleted"
 msgstr "削除しました"
 
-#: ../../admin/access.php:51
+#: ../../admin/access.php:46
 msgid "Your Access List Entry has been removed"
 msgstr "アクセスリストエントリを削除しました"
 
-#: ../../admin/access.php:56
+#: ../../admin/access.php:51
 msgid "Are you sure you want to permanently delete"
 msgstr "完全に削除してもよろしいですか？"
 
-#: ../../admin/access.php:115
+#: ../../admin/access.php:110
 msgid "Your new Access Control List(s) have been created"
 msgstr "新しいアクセスコントロールリストを作成しました"
 
-#: ../../admin/access.php:135
+#: ../../admin/access.php:130
 msgid "Access List Entry updated"
 msgstr "アクセスリストエントリを更新しました"
 
-#: ../../admin/modules.php:49
+#: ../../admin/modules.php:44
 msgid "Install Failed, Controller Error"
 msgstr "コントロールエラーのためインストール失敗"
 
-#: ../../admin/modules.php:67 ../../admin/modules.php:112
+#: ../../admin/modules.php:62 ../../admin/modules.php:107
 msgid "Are you sure you want to remove this plugin?"
 msgstr "このプラグインを削除してもよろしいですか？"
 
-#: ../../admin/modules.php:79 ../../admin/modules.php:131
+#: ../../admin/modules.php:74 ../../admin/modules.php:126
 msgid "Plugin Deactivated"
 msgstr "プラグインを無効化しました"
 
-#: ../../admin/modules.php:94
+#: ../../admin/modules.php:89
 msgid "Unable to Install Plugin"
 msgstr "プラグインをインストールできませんでした"
 
-#: ../../admin/modules.php:105
+#: ../../admin/modules.php:100
 msgid "Plugin Activated"
 msgstr "プラグインを有効化しました"
 
-#: ../../admin/modules.php:146
+#: ../../admin/modules.php:141
 msgid "Plugin Upgraded"
 msgstr "プラグインをアップグレードしました"
 
-#: ../../admin/modules.php:152
+#: ../../admin/modules.php:147
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: ../../admin/modules.php:158
+#: ../../admin/modules.php:153
 msgid "Localplay Controllers"
 msgstr "ローカル再生コントローラ"
 
-#: ../../admin/system.php:61
+#: ../../admin/system.php:56
 msgid "Database Charset Updated"
 msgstr "データベースCharsetを更新しました"
 
-#: ../../admin/system.php:61
+#: ../../admin/system.php:56
 msgid ""
 "Your Database and associated tables have been updated to match your "
 "currently configured charset"
@@ -4421,74 +4863,74 @@ msgstr ""
 "データベースと割り当てられたテーブルは現在設定されたCharsetに一致する更新をし"
 "ました。"
 
-#: ../../admin/mail.php:72
+#: ../../admin/mail.php:67
 msgid "E-mail Sent"
 msgstr "メール送信"
 
-#: ../../admin/mail.php:73
+#: ../../admin/mail.php:68
 msgid "Your E-mail was successfully sent."
 msgstr "メールは送信されました。"
 
-#: ../../admin/mail.php:76
+#: ../../admin/mail.php:71
 msgid "E-mail Not Sent"
 msgstr "メールは送信されませんでした"
 
-#: ../../admin/mail.php:77
+#: ../../admin/mail.php:72
 msgid "Your E-mail was not sent."
 msgstr "メールは送信されませんでした。"
 
-#: ../../server/xml.server.php:54
+#: ../../server/xml.server.php:49
 msgid "Access Control not Enabled"
 msgstr "アクセスコントロールは有効ではありません"
 
-#: ../../server/xml.server.php:65
+#: ../../server/xml.server.php:60
 msgid "Session Expired"
 msgstr "セッションの期限切れ"
 
-#: ../../server/xml.server.php:76
+#: ../../server/xml.server.php:71
 msgid "Unauthorized access attempt to API - ACL Error"
 msgstr "APIへ不正アクセスが試みられました - ACLエラー"
 
-#: ../../bin/delete_disabled.inc:48
+#: ../../bin/delete_disabled.inc:43
 msgid "DEBUG ENABLED WILL NOT DELETE FILES!"
 msgstr "デバッグが有効の場合はファイルを削除しません！"
 
-#: ../../bin/delete_disabled.inc:56
+#: ../../bin/delete_disabled.inc:51
 #, php-format
 msgid "Would Delete: %s"
 msgstr "削除されます: %s"
 
-#: ../../bin/delete_disabled.inc:60
+#: ../../bin/delete_disabled.inc:55
 #, php-format
 msgid "Deleting: %s"
 msgstr "削除中: %s"
 
-#: ../../bin/write_playlists.inc:53
+#: ../../bin/write_playlists.inc:48
 #, php-format
 msgid "Error: Directory %s not writeable"
 msgstr "エラー: ディレクトリ%sは書込み不可です"
 
-#: ../../bin/write_playlists.inc:74
+#: ../../bin/write_playlists.inc:69
 msgid "This will dump a collection of m3u playlists based on type"
 msgstr "これはタイプに基づいたm3uプレイリストの収集をダンプします"
 
-#: ../../bin/write_playlists.inc:75
+#: ../../bin/write_playlists.inc:70
 msgid "Types:"
 msgstr "タイプ:"
 
-#: ../../bin/write_playlists.inc:76
+#: ../../bin/write_playlists.inc:71
 msgid "Dumps all Albums as individual playlists"
 msgstr "個々のプレイリストとして全てのアルバムをダンプします"
 
-#: ../../bin/write_playlists.inc:77
+#: ../../bin/write_playlists.inc:72
 msgid "Dumps all of your Playlists as m3u's"
 msgstr "m3uとして全てのプレイリストをダンプします"
 
-#: ../../bin/write_playlists.inc:78
+#: ../../bin/write_playlists.inc:73
 msgid "Dumps all Artists as individual playlists"
 msgstr "個々のプレイリストとして全てのアーティストをダンプします"
 
-#: ../../bin/write_tags.inc:47
+#: ../../bin/write_tags.inc:42
 msgid ""
 "Writting of Tags to files is not currently supported by Getid3() use at your "
 "own risk."
@@ -4496,288 +4938,288 @@ msgstr ""
 "ファイルへのタグの書き込みはGetid3()で現在サポートされていません。自己責任で"
 "利用してください。"
 
-#: ../../bin/write_tags.inc:59
+#: ../../bin/write_tags.inc:54
 msgid "No Flagged Songs Found, exiting..."
 msgstr "フラグされた曲はありません。終了します。。。"
 
-#: ../../bin/write_tags.inc:87
+#: ../../bin/write_tags.inc:82
 msgid "No Tag"
 msgstr "タグ無し"
 
 #. HINT: %1$s: title, %2$s: artist_name
-#: ../../bin/write_tags.inc:96
+#: ../../bin/write_tags.inc:91
 #, php-format
 msgid "Updated song %1$s by %2$s"
 msgstr "%2$sで曲%1$sを更新しました"
 
-#: ../../bin/migrate_config.inc:61
+#: ../../bin/migrate_config.inc:56
 msgid "Parsing old config file..."
 msgstr "古いコンフィグファイルを解析中。。。"
 
-#: ../../bin/migrate_config.inc:91
+#: ../../bin/migrate_config.inc:86
 msgid "Parse complete, writing"
 msgstr "解析完了。書込み中"
 
-#: ../../bin/migrate_config.inc:99
+#: ../../bin/migrate_config.inc:94
 msgid "Write success, config migrated"
 msgstr "書込み成功。コンフィグを統合しました"
 
-#: ../../bin/migrate_config.inc:103
+#: ../../bin/migrate_config.inc:98
 msgid "Access Denied, config migration failed"
 msgstr "アクセス拒否。コンフィグの統合に失敗しました"
 
-#: ../../bin/fix_filenames.inc:53
+#: ../../bin/fix_filenames.inc:48
 msgid "ERROR: Iconv required for this functionality, quiting"
 msgstr "エラー: Iconvはこの機能で必須です。終了します"
 
-#: ../../bin/fix_filenames.inc:62
+#: ../../bin/fix_filenames.inc:57
 #, php-format
 msgid "%s For the Love of Music"
 msgstr "%s 音楽の愛の為に"
 
-#: ../../bin/fix_filenames.inc:63
+#: ../../bin/fix_filenames.inc:58
 msgid "Testing Basic Translation, the two strings below should look the same"
 msgstr ""
 "基本的な翻訳をテストしています。以下の2つの文字が同じか確認してください"
 
-#: ../../bin/fix_filenames.inc:65
+#: ../../bin/fix_filenames.inc:60
 msgid "Original: For the Love of Music"
 msgstr "オリジナル: 音楽の愛の為に"
 
-#: ../../bin/fix_filenames.inc:67
+#: ../../bin/fix_filenames.inc:62
 #, php-format
 msgid "Translated: %s"
 msgstr "翻訳: %s"
 
-#: ../../bin/fix_filenames.inc:70
+#: ../../bin/fix_filenames.inc:65
 #, php-format
 msgid "Input Charset (%s):"
 msgstr "入力文字セット (%s):"
 
-#: ../../bin/fix_filenames.inc:74
+#: ../../bin/fix_filenames.inc:69
 #, php-format
 msgid "Using %s as source character set"
 msgstr "元の文字セットとして%sを使用しています"
 
-#: ../../bin/fix_filenames.inc:82
+#: ../../bin/fix_filenames.inc:77
 #, php-format
 msgid "Checking %s (%s)"
 msgstr "%sをチェックしています(%s)"
 
-#: ../../bin/fix_filenames.inc:88
+#: ../../bin/fix_filenames.inc:83
 msgid "Finished checking filenames for valid chacters"
 msgstr "有効な文字のファイル名チェックを完了しました"
 
-#: ../../bin/fix_filenames.inc:114
+#: ../../bin/fix_filenames.inc:109
 #, php-format
 msgid "ERROR: Unable to open %s"
 msgstr "エラー: %sを開けませんでした"
 
-#: ../../bin/fix_filenames.inc:120
+#: ../../bin/fix_filenames.inc:115
 #, php-format
 msgid "ERROR: Unable to chdir to %s"
 msgstr "エラー: %sへディレクトリを変更できませんでした"
 
-#: ../../bin/fix_filenames.inc:143
+#: ../../bin/fix_filenames.inc:138
 msgid "Translation failure, stripping non-valid characters"
 msgstr "翻訳に失敗しました。不正な文字列を削除しています"
 
-#: ../../bin/fix_filenames.inc:148
+#: ../../bin/fix_filenames.inc:143
 #, php-format
 msgid "Attempting to Transcode to %s"
 msgstr "%sへのトランスコードを試みています"
 
-#: ../../bin/fix_filenames.inc:151
+#: ../../bin/fix_filenames.inc:146
 #, php-format
 msgid "OLD: %s has invalid chars"
 msgstr "旧: %sは不正な文字です"
 
-#: ../../bin/fix_filenames.inc:153
+#: ../../bin/fix_filenames.inc:148
 #, php-format
 msgid "NEW: %s"
 msgstr "新: %s"
 
-#: ../../bin/fix_filenames.inc:157
+#: ../../bin/fix_filenames.inc:152
 msgid "Rename File (Y/N):"
 msgstr "ファイルをリネームしますか？ (Y/N):"
 
-#: ../../bin/fix_filenames.inc:160
+#: ../../bin/fix_filenames.inc:155
 msgid "Not Renaming..."
 msgstr "リネームしません..."
 
-#: ../../bin/fix_filenames.inc:192
+#: ../../bin/fix_filenames.inc:187
 #, php-format
 msgid "Error: Unable to create %s move failed, stopping"
 msgstr "エラー: %sを作成できず移動に失敗しました。停止します"
 
-#: ../../bin/fix_filenames.inc:204
+#: ../../bin/fix_filenames.inc:199
 msgid "Error: Copy Failed, not deleteing old file"
 msgstr "エラー: コピーに失敗しました。古いファイルを削除しません"
 
-#: ../../bin/fix_filenames.inc:213 ../../bin/sort_files.inc:300
+#: ../../bin/fix_filenames.inc:208 ../../bin/sort_files.inc:295
 #, php-format
 msgid "Error: Size Inconsistency, not deleting %s"
 msgstr "エラー: サイズの不整合です。%sを削除しません"
 
-#: ../../bin/fix_filenames.inc:220 ../../bin/sort_files.inc:307
+#: ../../bin/fix_filenames.inc:215 ../../bin/sort_files.inc:302
 #, php-format
 msgid "Error: Unable to delete %s"
 msgstr "エラー: %sを削除できません"
 
-#: ../../bin/fix_filenames.inc:222
+#: ../../bin/fix_filenames.inc:217
 msgid "File Moved..."
 msgstr "ファイルを移動しました。。。"
 
-#: ../../bin/sort_files.inc:72
+#: ../../bin/sort_files.inc:67
 #, php-format
 msgid "Starting Catalog: %s"
 msgstr "カタログの開始: %s"
 
-#: ../../bin/sort_files.inc:87
+#: ../../bin/sort_files.inc:82
 msgid "Moving File..."
 msgstr "ファイルを移動中。。。"
 
-#: ../../bin/sort_files.inc:89
+#: ../../bin/sort_files.inc:84
 #, php-format
 msgid "Source: %s"
 msgstr "元: %s"
 
-#: ../../bin/sort_files.inc:91
+#: ../../bin/sort_files.inc:86
 #, php-format
 msgid "Dest: %s"
 msgstr "先: %s"
 
-#: ../../bin/sort_files.inc:241
+#: ../../bin/sort_files.inc:236
 #, php-format
 msgid "Making %s Directory"
 msgstr "%sディレクトリを作成中"
 
-#: ../../bin/sort_files.inc:248
+#: ../../bin/sort_files.inc:243
 #, php-format
 msgid "Error: Unable to create %s move failed"
 msgstr "エラー: %sを作成できず移動に失敗しました"
 
 #. HINT: %1$s: file, %2$s: directory
-#: ../../bin/sort_files.inc:261
+#: ../../bin/sort_files.inc:256
 #, php-format
 msgid "Copying %1$s to %2$s"
 msgstr "%2$sへ%1$sをコピーしています"
 
-#: ../../bin/sort_files.inc:272
+#: ../../bin/sort_files.inc:267
 #, php-format
 msgid "Error: %s already exists"
 msgstr "エラー: %sはすでに存在します"
 
-#: ../../bin/sort_files.inc:293
+#: ../../bin/sort_files.inc:288
 #, php-format
 msgid "Error: Unable to copy file to %s"
 msgstr "エラー: %sへファイルをコピーできません"
 
-#: ../../bin/catalog_update.inc:49
+#: ../../bin/catalog_update.inc:45
 msgid "- All Catalog Operations"
 msgstr "- 全カタログの操作"
 
-#: ../../bin/catalog_update.inc:56
+#: ../../bin/catalog_update.inc:52
 msgid "- Catalog Clean"
 msgstr "- カタログクリーン"
 
-#: ../../bin/catalog_update.inc:60
+#: ../../bin/catalog_update.inc:56
 msgid "- Catalog Verify"
 msgstr "- カタログ検証"
 
-#: ../../bin/catalog_update.inc:64
+#: ../../bin/catalog_update.inc:60
 msgid "- Catalog Add"
 msgstr "- カタログ追加"
 
-#: ../../bin/catalog_update.inc:68
+#: ../../bin/catalog_update.inc:64
 msgid "- Catalog Art Gather"
 msgstr "- カタログアート収集"
 
-#: ../../bin/catalog_update.inc:72
+#: ../../bin/catalog_update.inc:68
 msgid "- Generate Thumbnails"
 msgstr "- サムネイルの生成"
 
-#: ../../bin/catalog_update.inc:95
+#: ../../bin/catalog_update.inc:91
 msgid "Starting Catalog Operations..."
 msgstr "カタログ操作の開始..."
 
-#: ../../bin/catalog_update.inc:108 ../../bin/print_tags.inc:55
+#: ../../bin/catalog_update.inc:104 ../../bin/print_tags.inc:50
 #, php-format
 msgid "Reading: %s"
 msgstr "%sを読み込んでいます"
 
-#: ../../bin/catalog_update.inc:113
+#: ../../bin/catalog_update.inc:109
 msgid "- Starting Clean - "
 msgstr "- 掃除開始 -"
 
-#: ../../bin/catalog_update.inc:121
+#: ../../bin/catalog_update.inc:117
 msgid "- Starting Verify - "
 msgstr "- 検証開始 -"
 
-#: ../../bin/catalog_update.inc:129
+#: ../../bin/catalog_update.inc:125
 msgid "- Starting Add - "
 msgstr "- 追加開始 -"
 
-#: ../../bin/catalog_update.inc:145
+#: ../../bin/catalog_update.inc:141
 msgid "Generating Thumbnails"
 msgstr "サムネイルの生成中"
 
-#: ../../bin/catalog_update.inc:167
+#: ../../bin/catalog_update.inc:168
 msgid "- Catalog Update -"
 msgstr "- 更新開始 -"
 
-#: ../../bin/catalog_update.inc:169
+#: ../../bin/catalog_update.inc:170
 msgid "Usage: catalog_update.inc [CATALOG NAME] [-c|-v|-a|-g|-t]"
 msgstr "使用方法: catalog_update.inc [カタログ名] [-c|-v|-a|-g|-t]"
 
-#: ../../bin/catalog_update.inc:171
+#: ../../bin/catalog_update.inc:172
 msgid "Default behavior is to do all"
 msgstr "デフォルトの動作は全てを実行します"
 
-#: ../../bin/catalog_update.inc:173
+#: ../../bin/catalog_update.inc:174
 msgid "Clean Catalogs"
 msgstr "カタログの掃除"
 
-#: ../../bin/catalog_update.inc:175
+#: ../../bin/catalog_update.inc:176
 msgid "Verify Catalogs"
 msgstr "カタログの検証"
 
-#: ../../bin/catalog_update.inc:177
+#: ../../bin/catalog_update.inc:178
 msgid "Add to Catalogs"
 msgstr "カタログへ追加"
 
-#: ../../bin/catalog_update.inc:181
+#: ../../bin/catalog_update.inc:182
 msgid "Generate Thumbnails"
 msgstr "サムネイルの生成"
 
-#: ../../bin/print_tags.inc:49
+#: ../../bin/print_tags.inc:44
 msgid "File not found."
 msgstr "ファイルが見つかりませんでした。"
 
-#: ../../bin/print_tags.inc:67
+#: ../../bin/print_tags.inc:62
 #, php-format
 msgid "Using: %s AND %s for file pattern matching"
 msgstr "ファイルパターンのマッチに%sと%sを使用しています"
 
-#: ../../bin/print_tags.inc:84
+#: ../../bin/print_tags.inc:79
 msgid "Results Seen by GetID3()"
 msgstr "GetID3()での結果を表示"
 
-#: ../../bin/print_tags.inc:88
+#: ../../bin/print_tags.inc:83
 #, php-format
 msgid "Results Seen by Ampache using %s"
 msgstr "Ampacheが%sを使用しての結果を表示"
 
-#: ../../bin/print_tags.inc:95
+#: ../../bin/print_tags.inc:90
 #, php-format
 msgid "%s Version %s"
 msgstr "%sバージョン%s"
 
-#: ../../bin/print_tags.inc:97
+#: ../../bin/print_tags.inc:92
 msgid "Usage:"
 msgstr "使用方法:"
 
-#: ../../bin/print_tags.inc:99
+#: ../../bin/print_tags.inc:94
 msgid "php print_tags.inc <Filename>"
 msgstr "php print_tags.inc <ファイル名>"
 
@@ -4888,3 +5330,9 @@ msgstr "インタフェース"
 #: Database words
 msgid "System"
 msgstr "システム"
+
+#~ msgid "PHP putenv Support"
+#~ msgstr "PHP pubenv サポート"
+
+#~ msgid "PHP PutENV Support"
+#~ msgstr "PHP PutENVサポート"
author	momo-i <webmaster@momo-i.org>	2011-10-11 14:18:43 +0900
committer	momo-i <webmaster@momo-i.org>	2011-10-11 14:18:43 +0900
commit	e3d8da45cad0a8f67e7eca278022e7267c01dd7b (patch)
tree	3746b58b39ebda54cd58fcd2d3162e5ea48c4c48 /locale/ja_JP
parent	e19918277306c99b910aaf20a8a180d0fbda958f (diff)
download	ampache-e3d8da45cad0a8f67e7eca278022e7267c01dd7b.tar.gz ampache-e3d8da45cad0a8f67e7eca278022e7267c01dd7b.tar.bz2 ampache-e3d8da45cad0a8f67e7eca278022e7267c01dd7b.zip