Updated: message merged r1849

2 files changed, 245 insertions, 187 deletions

diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index 8cfdfd0e..1a5bc3e7 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 165781a4..ed6fc88c 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 3.5.0\n"
 "Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2009-01-06 07:40+0900\n"
+"POT-Creation-Date: 2009-02-02 07:39+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"
@@ -484,7 +484,7 @@ msgstr "最終IP"
 #: ../../templates/show_song.inc.php:27
 #: ../../templates/show_admin_tools.inc.php:34
 #: ../../templates/show_admin_tools.inc.php:74
-#: ../../templates/show_access_list.inc.php:52
+#: ../../templates/show_access_list.inc.php:62
 #: ../../templates/show_playlist_songs.inc.php:48
 #: ../../templates/show_playlist_songs.inc.php:69
 #: ../../templates/show_manage_shoutbox.inc.php:39
@@ -498,14 +498,14 @@ msgid "On-line"
 msgstr "オンライン"
 
 #: ../../templates/show_users.inc.php:53 ../../templates/show_user.inc.php:22
-#: ../../lib/class/user.class.php:662 ../../lib/class/catalog.class.php:152
+#: ../../lib/class/user.class.php:663 ../../lib/class/catalog.class.php:152
 #: ../../lib/class/catalog.class.php:153 ../../lib/preferences.php:261
 msgid "Never"
 msgstr "Never"
 
 #: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
 #: ../../lib/class/flag.class.php:282 ../../lib/class/localplay.class.php:648
-#: ../../lib/class/user.class.php:666 ../../lib/general.lib.php:439
+#: ../../lib/class/user.class.php:667 ../../lib/general.lib.php:337
 #: ../../modules/localplay/mpd.controller.php:511
 #: ../../modules/localplay/httpq.controller.php:510
 msgid "Unknown"
@@ -562,15 +562,18 @@ msgstr "ゲスト"
 
 #: ../../templates/show_edit_user.inc.php:75
 #: ../../templates/show_preference_box.inc.php:59
-#: ../../templates/show_edit_access.inc.php:57
+#: ../../templates/show_add_access_local.inc.php:41
+#: ../../templates/show_add_access_rpc.inc.php:41
+#: ../../templates/show_edit_access.inc.php:60
 #: ../../templates/show_preference_admin.inc.php:42
-#: ../../templates/show_add_access.inc.php:46
+#: ../../templates/show_add_access.inc.php:41
 #: ../../templates/show_add_user.inc.php:75
 #: ../../templates/show_create_democratic.inc.php:41
 #: ../../templates/show_flagged.inc.php:35
 #: ../../templates/show_flagged.inc.php:54
+#: ../../templates/show_add_access_current.inc.php:44
 #: ../../templates/show_mail_users.inc.php:31
-#: ../../templates/show_access_list.inc.php:49
+#: ../../templates/show_access_list.inc.php:59
 #: ../../templates/show_manage_shoutbox.inc.php:35
 #: ../../templates/show_manage_shoutbox.inc.php:59
 #: ../../lib/class/democratic.class.php:105 ../../lib/preferences.php:231
@@ -619,6 +622,8 @@ msgstr "ユーザの更新"
 #: ../../templates/show_live_streams.inc.php:36
 #: ../../templates/show_live_streams.inc.php:58
 #: ../../templates/show_edit_catalog.inc.php:26
+#: ../../templates/show_add_access_local.inc.php:26
+#: ../../templates/show_add_access_rpc.inc.php:26
 #: ../../templates/show_add_live_stream.inc.php:28
 #: ../../templates/show_edit_artist.inc.php:27
 #: ../../templates/show_edit_access.inc.php:26
@@ -628,12 +633,13 @@ msgstr "ユーザの更新"
 #: ../../templates/show_create_democratic.inc.php:26
 #: ../../templates/show_account.inc.php:27
 #: ../../templates/show_edit_album.inc.php:27
+#: ../../templates/show_add_access_current.inc.php:26
 #: ../../templates/show_localplay_playlist.inc.php:32
 #: ../../templates/show_localplay_playlist.inc.php:58
 #: ../../templates/show_add_playlist.inc.php:28
 #: ../../templates/show_admin_tools.inc.php:33
 #: ../../templates/show_admin_tools.inc.php:73
-#: ../../templates/show_access_list.inc.php:45
+#: ../../templates/show_access_list.inc.php:55
 #: ../../templates/show_playlist_edit.inc.php:30
 msgid "Name"
 msgstr "名前"
@@ -1024,12 +1030,15 @@ msgid "Cooldown"
 msgstr "クールダウン"
 
 #: ../../templates/show_manage_democratic.inc.php:37
-#: ../../templates/show_edit_access.inc.php:69
+#: ../../templates/show_add_access_local.inc.php:32
+#: ../../templates/show_add_access_rpc.inc.php:32
+#: ../../templates/show_edit_access.inc.php:72
 #: ../../templates/show_preference_admin.inc.php:31
 #: ../../templates/show_preference_admin.inc.php:50
-#: ../../templates/show_add_access.inc.php:52
+#: ../../templates/show_add_access.inc.php:32
 #: ../../templates/show_create_democratic.inc.php:38
-#: ../../templates/show_access_list.inc.php:48
+#: ../../templates/show_add_access_current.inc.php:35
+#: ../../templates/show_access_list.inc.php:58
 msgid "Level"
 msgstr "レベル"
 
@@ -1042,6 +1051,133 @@ msgstr "デフォルト"
 msgid "Create New Playlist"
 msgstr "新規プレイリスト作成"
 
+#: ../../templates/show_add_access_local.inc.php:22
+#: ../../templates/show_access_list.inc.php:40
+#: ../../templates/show_access_list.inc.php:41
+msgid "Add Local Network Definition"
+msgstr "ローカルネットワーク定義の追加"
+
+#: ../../templates/show_add_access_local.inc.php:34
+#: ../../templates/show_add_access_rpc.inc.php:34
+#: ../../templates/show_edit_access.inc.php:75
+#: ../../templates/show_add_access.inc.php:34
+#: ../../templates/show_play_selected.inc.php:49
+#: ../../templates/show_add_access_current.inc.php:37
+#: ../../lib/class/access.class.php:410
+msgid "View"
+msgstr "閲覧"
+
+#: ../../templates/show_add_access_local.inc.php:35
+#: ../../templates/show_add_access_rpc.inc.php:35
+#: ../../templates/show_edit_access.inc.php:76
+#: ../../templates/show_add_access.inc.php:35
+#: ../../templates/show_add_access_current.inc.php:38
+#: ../../lib/class/access.class.php:413
+msgid "Read"
+msgstr "読取"
+
+#: ../../templates/show_add_access_local.inc.php:36
+#: ../../templates/show_add_access_rpc.inc.php:36
+#: ../../templates/show_edit_access.inc.php:77
+#: ../../templates/show_add_access.inc.php:36
+#: ../../templates/show_add_access_current.inc.php:39
+#: ../../lib/class/access.class.php:416
+msgid "Read/Write"
+msgstr "読取/書込"
+
+#: ../../templates/show_add_access_local.inc.php:37
+#: ../../templates/show_add_access_local.inc.php:52
+#: ../../templates/show_add_access_rpc.inc.php:37
+#: ../../templates/show_add_access_rpc.inc.php:52
+#: ../../templates/show_edit_access.inc.php:78
+#: ../../templates/show_add_access.inc.php:37
+#: ../../templates/show_export.inc.php:35
+#: ../../templates/show_add_access_current.inc.php:40
+#: ../../templates/show_mail_users.inc.php:30
+#: ../../templates/show_random.inc.php:38
+#: ../../templates/show_admin_tools.inc.php:51 ../../lib/ui.lib.php:141
+#: ../../lib/ui.lib.php:150 ../../lib/ui.lib.php:632
+#: ../../lib/class/access.class.php:407 ../../lib/class/access.class.php:427
+msgid "All"
+msgstr "全て"
+
+#: ../../templates/show_add_access_local.inc.php:48
+#: ../../templates/show_add_access_rpc.inc.php:48
+#: ../../templates/show_add_playlist.inc.php:32
+#: ../../templates/show_random.inc.php:61
+#: ../../templates/show_access_list.inc.php:61
+#: ../../templates/show_playlist_edit.inc.php:36
+msgid "Type"
+msgstr "タイプ"
+
+#: ../../templates/show_add_access_local.inc.php:50
+#: ../../templates/show_add_access_local.inc.php:51
+#: ../../templates/show_add_access_local.inc.php:52
+#: ../../templates/show_edit_access.inc.php:36
+#: ../../templates/show_add_access.inc.php:53
+#: ../../lib/class/access.class.php:446
+msgid "Local Network Definition"
+msgstr "ローカルネットワーク定義"
+
+#: ../../templates/show_add_access_local.inc.php:51
+#: ../../templates/show_add_access_rpc.inc.php:51
+#: ../../templates/show_edit_access.inc.php:34
+#: ../../templates/show_add_access.inc.php:51
+#: ../../lib/class/access.class.php:453
+msgid "Stream Access"
+msgstr "ストリームアクセス"
+
+#: ../../templates/show_add_access_local.inc.php:51
+#: ../../templates/show_edit_access.inc.php:35
+#: ../../templates/show_add_access.inc.php:52
+#: ../../lib/class/access.class.php:449
+msgid "Web Interface"
+msgstr "ウェブインタフェース"
+
+#: ../../templates/show_add_access_local.inc.php:56
+#: ../../templates/show_add_access_rpc.inc.php:56
+#: ../../templates/show_add_access.inc.php:59
+#: ../../templates/show_add_access_current.inc.php:50
+msgid "RPC Options"
+msgstr "RPCオプション"
+
+#: ../../templates/show_add_access_local.inc.php:59
+#: ../../templates/show_add_access_rpc.inc.php:59
+#: ../../templates/show_edit_access.inc.php:66
+#: ../../templates/show_add_access.inc.php:62
+#: ../../templates/show_add_access_current.inc.php:53
+msgid "Remote Key"
+msgstr "リモートキー"
+
+#: ../../templates/show_add_access_local.inc.php:66
+#: ../../templates/show_add_access_rpc.inc.php:66
+#: ../../templates/show_edit_access.inc.php:43
+#: ../../templates/show_add_access.inc.php:69
+#: ../../templates/show_add_access_current.inc.php:32
+msgid "IPv4 or IPv6 Addresses"
+msgstr "IPv4又はIPv6アドレス"
+
+#: ../../templates/show_add_access_local.inc.php:71
+#: ../../templates/show_add_access_rpc.inc.php:71
+#: ../../templates/show_edit_access.inc.php:48
+#: ../../templates/show_add_access.inc.php:74
+msgid "Start"
+msgstr "開始"
+
+#: ../../templates/show_add_access_local.inc.php:76
+#: ../../templates/show_add_access_rpc.inc.php:76
+#: ../../templates/show_edit_access.inc.php:53
+#: ../../templates/show_add_access.inc.php:79
+msgid "End"
+msgstr "終了"
+
+#: ../../templates/show_add_access_local.inc.php:85
+#: ../../templates/show_add_access_rpc.inc.php:85
+#: ../../templates/show_add_access.inc.php:88
+#: ../../templates/show_add_access_current.inc.php:61
+msgid "Create ACL"
+msgstr "ACL作成"
+
 #: ../../templates/show_playlist.inc.php:26
 #, php-format
 msgid "%s %s Playlist"
@@ -1116,6 +1252,20 @@ msgstr "クエリ:"
 msgid "Cache Hits:"
 msgstr "キャッシュヒット:"
 
+#: ../../templates/show_add_access_rpc.inc.php:22
+#: ../../templates/show_access_list.inc.php:36
+#: ../../templates/show_access_list.inc.php:37
+msgid "Add API / RPC Host"
+msgstr "API/RPCホストの追加"
+
+#: ../../templates/show_add_access_rpc.inc.php:50
+#: ../../templates/show_add_access_rpc.inc.php:51
+#: ../../templates/show_add_access_rpc.inc.php:52
+#: ../../templates/show_edit_access.inc.php:37
+#: ../../templates/show_add_access.inc.php:54
+msgid "RPC"
+msgstr "RPC"
+
 #: ../../templates/show_add_live_stream.inc.php:24
 #: ../../templates/sidebar_modules.inc.php:42
 msgid "Add Radio Station"
@@ -1150,80 +1300,15 @@ msgid "Update Artist"
 msgstr "アーティスト更新"
 
 #: ../../templates/show_edit_access.inc.php:22
-msgid "Edit ACL"
-msgstr "ACL編集"
+msgid "Edit Access Control List"
+msgstr "アクセスコントロールリストの編集"
 
 #: ../../templates/show_edit_access.inc.php:30
-#: ../../templates/show_add_access.inc.php:63
+#: ../../templates/show_add_access.inc.php:48
 msgid "ACL Type"
 msgstr "ACLタイプ"
 
-#: ../../templates/show_edit_access.inc.php:34
-#: ../../templates/show_add_access.inc.php:66
-msgid "Stream Access"
-msgstr "ストリームアクセス"
-
-#: ../../templates/show_edit_access.inc.php:35
-#: ../../templates/show_add_access.inc.php:67
-msgid "Web Interface"
-msgstr "ウェブインタフェース"
-
-#: ../../templates/show_edit_access.inc.php:36
-#: ../../templates/show_add_access.inc.php:68
-msgid "Local Network Definition"
-msgstr "ローカルネットワーク定義"
-
-#: ../../templates/show_edit_access.inc.php:37
-#: ../../templates/show_add_access.inc.php:69
-msgid "RPC"
-msgstr "RPC"
-
-#: ../../templates/show_edit_access.inc.php:43
-#: ../../templates/show_add_access.inc.php:32
-msgid "Start IP Address"
-msgstr "開始IPアドレス"
-
-#: ../../templates/show_edit_access.inc.php:50
-#: ../../templates/show_add_access.inc.php:39
-msgid "End IP Address"
-msgstr "終了IPアドレス"
-
-#: ../../templates/show_edit_access.inc.php:63
-#: ../../templates/show_add_access.inc.php:77
-msgid "Remote Key"
-msgstr "リモートキー"
-
-#: ../../templates/show_edit_access.inc.php:73
-#: ../../templates/show_add_access.inc.php:55
-#: ../../templates/show_play_selected.inc.php:49
-#: ../../lib/class/access.class.php:328
-msgid "View"
-msgstr "閲覧"
-
-#: ../../templates/show_edit_access.inc.php:74
-#: ../../templates/show_add_access.inc.php:56
-#: ../../lib/class/access.class.php:331
-msgid "Read"
-msgstr "読取"
-
-#: ../../templates/show_edit_access.inc.php:75
-#: ../../templates/show_add_access.inc.php:57
-#: ../../lib/class/access.class.php:334
-msgid "Read/Write"
-msgstr "読取/書込"
-
-#: ../../templates/show_edit_access.inc.php:76
-#: ../../templates/show_add_access.inc.php:58
-#: ../../templates/show_export.inc.php:35
-#: ../../templates/show_mail_users.inc.php:30
-#: ../../templates/show_random.inc.php:38
-#: ../../templates/show_admin_tools.inc.php:51 ../../lib/ui.lib.php:141
-#: ../../lib/ui.lib.php:150 ../../lib/ui.lib.php:632
-#: ../../lib/class/access.class.php:325 ../../lib/class/access.class.php:350
-msgid "All"
-msgstr "全て"
-
-#: ../../templates/show_edit_access.inc.php:82
+#: ../../templates/show_edit_access.inc.php:84
 #: ../../templates/show_preference_admin.inc.php:55
 #: ../../templates/show_catalog_row.inc.php:31
 #: ../../templates/show_play_selected.inc.php:64
@@ -1498,16 +1583,10 @@ msgid "Recently Played"
 msgstr "最近再生したもの"
 
 #: ../../templates/show_add_access.inc.php:22
-msgid "Add Access for a Host"
-msgstr "ホストのアクセスを追加"
-
-#: ../../templates/show_add_access.inc.php:74
-msgid "RPC Options"
-msgstr "RPCオプション"
-
-#: ../../templates/show_add_access.inc.php:84
-msgid "Create ACL"
-msgstr "ACL作成"
+#: ../../templates/show_access_list.inc.php:43
+#: ../../templates/show_access_list.inc.php:44
+msgid "Advanced Add"
+msgstr "高度を追加"
 
 #: ../../templates/sidebar_admin.inc.php:24
 #: ../../templates/show_admin_tools.inc.php:26
@@ -1540,6 +1619,7 @@ msgid "Browse Users"
 msgstr "ユーザ閲覧"
 
 #: ../../templates/sidebar_admin.inc.php:37
+#: ../../templates/show_access_list.inc.php:28
 msgid "Access Control"
 msgstr "アクセスコントロール"
 
@@ -1722,7 +1802,7 @@ msgstr "公開"
 
 #: ../../templates/show_edit_playlist_row.inc.php:33
 #: ../../templates/show_playlist_edit.inc.php:40
-#: ../../lib/class/playlist.class.php:81
+#: ../../lib/class/playlist.class.php:83
 msgid "Private"
 msgstr "プライベート"
 
@@ -2086,6 +2166,12 @@ msgstr "過去10のフラグされたレコード"
 msgid "Disabled Songs"
 msgstr "無効な曲"
 
+#: ../../templates/show_add_access_current.inc.php:22
+#: ../../templates/show_access_list.inc.php:32
+#: ../../templates/show_access_list.inc.php:33
+msgid "Add Current Host"
+msgstr "現在ホストの追加"
+
 #: ../../templates/show_localplay_instances.inc.php:23
 msgid "Show Localplay Instances"
 msgstr "ローカル再生インスタンスの表示"
@@ -2196,13 +2282,6 @@ msgstr "無制限"
 msgid "Create a new playlist"
 msgstr "新規プレイリスト作成"
 
-#: ../../templates/show_add_playlist.inc.php:32
-#: ../../templates/show_random.inc.php:61
-#: ../../templates/show_access_list.inc.php:51
-#: ../../templates/show_playlist_edit.inc.php:36
-msgid "Type"
-msgstr "タイプ"
-
 #: ../../templates/show_run_add_catalog.inc.php:24
 #: ../../templates/show_adds_catalog.inc.php:25
 msgid "Found"
@@ -2565,8 +2644,8 @@ msgid "Disk"
 msgstr "ディスク"
 
 #: ../../templates/show_album.inc.php:34
-#: ../../lib/class/catalog.class.php:1922
-#: ../../lib/class/catalog.class.php:1993
+#: ../../lib/class/catalog.class.php:1931
+#: ../../lib/class/catalog.class.php:2002
 msgid "Unknown (Orphaned)"
 msgstr "不明(孤立)"
 
@@ -2725,53 +2804,19 @@ msgstr "非活発ユーザを表示"
 msgid "Check for New Version"
 msgstr "新バージョンのチェック"
 
-#: ../../templates/show_access_list.inc.php:29
-msgid "Ampache Access Control"
-msgstr "Ampacheアクセスコントロール"
-
-#: ../../templates/show_access_list.inc.php:32
-msgid ""
-"Since your catalog can be accessed remotely you may want to limit the access "
-"from remote sources so you are not in violation of copyright laws."
-msgstr ""
-"カタログにリモートでアクセスできますが、リモートのソースからアクセスを制限し"
-"ているかもしれないので、あなたは著作権法を違反していません。"
-
-#: ../../templates/show_access_list.inc.php:33
-msgid ""
-"By default your server will allow anyone with an account to stream music."
-msgstr ""
-"デフォルトであなたのサーバはストリーム音楽へのアカウントで誰も許可しません。"
-
-#: ../../templates/show_access_list.inc.php:34
-msgid ""
-"It will not allow any other Ampache servers to connect to it to share "
-"catalog information."
-msgstr ""
-"それはカタログ情報をそれへ接続するためにどのほかのAmpacheサーバも許可しませ"
-"ん。"
-
-#: ../../templates/show_access_list.inc.php:35
-msgid ""
-"Use tool below to add any server's IP address that you want to access your "
-"Ampache catalog or be able to stream from this server."
-msgstr ""
-"このサーバからストリームすることの出来る又はAmpacheカタログへアクセスしたい全"
-"てのサーバのIPアドレスを追加するために以下のツールを使用します。"
-
-#: ../../templates/show_access_list.inc.php:40
-msgid "Add Entry"
-msgstr "エントリの追加 "
+#: ../../templates/show_access_list.inc.php:50
+msgid "Access Control Entries"
+msgstr "アクセスコントロールエントリ"
 
-#: ../../templates/show_access_list.inc.php:46
+#: ../../templates/show_access_list.inc.php:56
 msgid "Start Address"
 msgstr "開始アドレス"
 
-#: ../../templates/show_access_list.inc.php:47
+#: ../../templates/show_access_list.inc.php:57
 msgid "End Address"
 msgstr "終了アドレス"
 
-#: ../../templates/show_access_list.inc.php:50
+#: ../../templates/show_access_list.inc.php:60
 msgid "Key"
 msgstr "キー"
 
@@ -3122,6 +3167,20 @@ msgstr "シャウトボックスレコード"
 msgid "Flagged Records"
 msgstr "フラグされたレコード"
 
+#: ../../lib/class/access.class.php:102 ../../lib/class/access.class.php:106
+#: ../../lib/class/access.class.php:146 ../../lib/class/access.class.php:150
+msgid "Invalid IPv4 / IPv6 Address Entered"
+msgstr "無効なIPv4/IPv6アドレスが入力されました"
+
+#: ../../lib/class/access.class.php:111 ../../lib/class/access.class.php:112
+#: ../../lib/class/access.class.php:155 ../../lib/class/access.class.php:156
+msgid "IP Address Version Mismatch"
+msgstr "IPアドレスバージョンが一致しません"
+
+#: ../../lib/class/access.class.php:443
+msgid "API/RPC"
+msgstr "API/RPC"
+
 #: ../../lib/class/flag.class.php:257
 msgid "Approved"
 msgstr "承認"
@@ -3157,7 +3216,7 @@ msgid "Error Passwords don't match"
 msgstr "エラー: パスワードが一致しません"
 
 #: ../../lib/class/album.class.php:479 ../../lib/class/catalog.class.php:433
-#: ../../lib/class/catalog.class.php:774
+#: ../../lib/class/catalog.class.php:783
 msgid "Error: Unable to open"
 msgstr "エラー: 開けませんでした"
 
@@ -3183,132 +3242,132 @@ msgstr "リモート同期実行中"
 msgid "Error: Unable to change to directory"
 msgstr "エラー: ディレクトリを変更できませんでした"
 
-#: ../../lib/class/catalog.class.php:511
+#: ../../lib/class/catalog.class.php:519
 #, php-format
 msgid "Error: Unable to get filesize for %s"
 msgstr "エラー: %sのファイルサイズの取得に失敗しました"
 
-#: ../../lib/class/catalog.class.php:517
+#: ../../lib/class/catalog.class.php:525
 #, php-format
 msgid "%s is not readable by ampache"
 msgstr "%sはAmpacheで読み込めません"
 
-#: ../../lib/class/catalog.class.php:525
+#: ../../lib/class/catalog.class.php:533
 #, php-format
 msgid "%s does not match site charset"
 msgstr "%sはサイトのCharsetと一致しません"
 
-#: ../../lib/class/catalog.class.php:1063 ../../preferences.php:111
-#: ../../admin/access.php:45
+#: ../../lib/class/catalog.class.php:1072 ../../preferences.php:111
+#: ../../admin/access.php:109
 msgid "Updated"
 msgstr "更新しました"
 
-#: ../../lib/class/catalog.class.php:1070
+#: ../../lib/class/catalog.class.php:1079
 msgid "No Update Needed"
 msgstr "必要な更新はありません"
 
-#: ../../lib/class/catalog.class.php:1170
+#: ../../lib/class/catalog.class.php:1179
 msgid "Running Remote Update"
 msgstr "リモート更新実行中"
 
-#: ../../lib/class/catalog.class.php:1197
+#: ../../lib/class/catalog.class.php:1206
 msgid "Added Playlist From"
 msgstr "次からプレイリストを追加:"
 
-#: ../../lib/class/catalog.class.php:1226
+#: ../../lib/class/catalog.class.php:1235
 msgid "Catalog Update Finished"
 msgstr "カタログ更新完了"
 
-#: ../../lib/class/catalog.class.php:1226
+#: ../../lib/class/catalog.class.php:1235
 msgid "Total Time"
 msgstr "合計時間"
 
-#: ../../lib/class/catalog.class.php:1227
+#: ../../lib/class/catalog.class.php:1236
 msgid "Total Songs"
 msgstr "合計曲"
 
-#: ../../lib/class/catalog.class.php:1227
+#: ../../lib/class/catalog.class.php:1236
 msgid "Songs Per Seconds"
 msgstr "1秒毎の曲"
 
-#: ../../lib/class/catalog.class.php:1241 ../../admin/users.php:142
+#: ../../lib/class/catalog.class.php:1250 ../../admin/users.php:142
 msgid "Error"
 msgstr "エラー"
 
-#: ../../lib/class/catalog.class.php:1241
+#: ../../lib/class/catalog.class.php:1250
 msgid "Unable to load pear XMLRPC library, make sure XML-RPC is enabled"
 msgstr ""
-"pear XMLRPCライブラリを読み込めませんでした。XML-RPCが有効になっているか確認してく"
-"ださい。"
+"pear XMLRPCライブラリを読み込めませんでした。XML-RPCが有効になっているか確認"
+"してください。"
 
-#: ../../lib/class/catalog.class.php:1273
-#: ../../lib/class/catalog.class.php:1347
-#: ../../lib/class/catalog.class.php:1380
+#: ../../lib/class/catalog.class.php:1282
+#: ../../lib/class/catalog.class.php:1356
+#: ../../lib/class/catalog.class.php:1389
 #: ../../lib/class/xmlrpcclient.class.php:64
 #: ../../lib/class/xmlrpcclient.class.php:97
 msgid "Error connecting to"
 msgstr "接続中のエラー:"
 
-#: ../../lib/class/catalog.class.php:1273
-#: ../../lib/class/catalog.class.php:1347
-#: ../../lib/class/catalog.class.php:1380
+#: ../../lib/class/catalog.class.php:1282
+#: ../../lib/class/catalog.class.php:1356
+#: ../../lib/class/catalog.class.php:1389
 #: ../../lib/class/xmlrpcclient.class.php:64
 #: ../../lib/class/xmlrpcclient.class.php:97
 msgid "Code"
 msgstr "コード"
 
-#: ../../lib/class/catalog.class.php:1273
-#: ../../lib/class/catalog.class.php:1347
-#: ../../lib/class/catalog.class.php:1380
+#: ../../lib/class/catalog.class.php:1282
+#: ../../lib/class/catalog.class.php:1356
+#: ../../lib/class/catalog.class.php:1389
 #: ../../lib/class/xmlrpcclient.class.php:64
 msgid "Reason"
 msgstr "理由"
 
-#: ../../lib/class/catalog.class.php:1302
+#: ../../lib/class/catalog.class.php:1311
 msgid "Completed updating remote catalog(s)"
 msgstr "リモートカタログの更新完了"
 
-#: ../../lib/class/catalog.class.php:1306
+#: ../../lib/class/catalog.class.php:1315
 msgid "Starting synchronisation of album images"
 msgstr "アルバム画像の同期を開始しています"
 
-#: ../../lib/class/catalog.class.php:1308
+#: ../../lib/class/catalog.class.php:1317
 msgid "Completed synchronisation of album images"
 msgstr "アルバム画像の同期が完了しました"
 
-#: ../../lib/class/catalog.class.php:1343 ../../admin/access.php:40
+#: ../../lib/class/catalog.class.php:1352 ../../admin/access.php:93
 msgid "Added"
 msgstr "追加しました"
 
-#: ../../lib/class/catalog.class.php:1376
+#: ../../lib/class/catalog.class.php:1385
 msgid "images synchronized: "
 msgstr "同期した画像: "
 
-#: ../../lib/class/catalog.class.php:1505
+#: ../../lib/class/catalog.class.php:1514
 msgid "Catalog Root unreadable, stopping clean"
 msgstr "カタログルートに到達できません。クリーンを停止します"
 
-#: ../../lib/class/catalog.class.php:1562
+#: ../../lib/class/catalog.class.php:1571
 msgid "Catalog Clean Done"
 msgstr "カタログのクリーン完了"
 
-#: ../../lib/class/catalog.class.php:1562
+#: ../../lib/class/catalog.class.php:1571
 msgid "files removed"
 msgstr "ファイルを削除しました"
 
-#: ../../lib/class/catalog.class.php:1563
+#: ../../lib/class/catalog.class.php:1572
 msgid "Optimizing Tables"
 msgstr "テーブルを最適化中"
 
-#: ../../lib/class/catalog.class.php:1863
+#: ../../lib/class/catalog.class.php:1872
 msgid "Update Finished."
 msgstr "更新完了"
 
-#: ../../lib/class/catalog.class.php:1863
+#: ../../lib/class/catalog.class.php:1872
 msgid "Checked"
 msgstr "チェック済み"
 
-#: ../../lib/class/catalog.class.php:1863
+#: ../../lib/class/catalog.class.php:1872
 msgid "songs updated."
 msgstr "曲更新しました"
 
@@ -3389,11 +3448,11 @@ msgstr ""
 "メールアドレス: %s\n"
 "\n"
 
-#: ../../lib/general.lib.php:498
+#: ../../lib/general.lib.php:396
 msgid "On"
 msgstr "オン"
 
-#: ../../lib/general.lib.php:501
+#: ../../lib/general.lib.php:399
 msgid "Off"
 msgstr "オフ"
 
@@ -3464,11 +3523,11 @@ msgstr "既存のデータベースを検出しました。インストールを
 msgid "Error: Unable to make Database Connection"
 msgstr "エラー: データベース接続を確立できませんでした。"
 
-#: ../../lib/install.php:270
+#: ../../lib/install.php:276
 msgid "No Username/Password specified"
 msgstr "指定されたユーザ名/パスワードはありません"
 
-#: ../../lib/install.php:275
+#: ../../lib/install.php:281
 msgid "Passwords do not match"
 msgstr "パスワードが一致しません"
 
@@ -3718,11 +3777,11 @@ msgstr "削除しました"
 msgid "Your Access List Entry has been removed"
 msgstr "アクセスリストエントリを削除しました"
 
-#: ../../admin/access.php:40
-msgid "Your new Access List Entry has been created"
-msgstr "新しいアクセスリストエントリを作成しました"
+#: ../../admin/access.php:93
+msgid "Your new Access Control List(s) have been created"
+msgstr "新しいアクセスコントロールリストを作成しました"
 
-#: ../../admin/access.php:45
+#: ../../admin/access.php:109
 msgid "Access List Entry updated"
 msgstr "アクセスリストエントリを更新しました"
 
@@ -3978,4 +4037,3 @@ msgstr "インタフェース"
 #: Database words
 msgid "System"
 msgstr "システム"
-