Updated: message sync from r1893

2 files changed, 38 insertions, 84 deletions

diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index 990389b4..eaedaf9f 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 97051824..e9c52978 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-02-19 11:31+0900\n"
+"POT-Creation-Date: 2009-02-23 07:53+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"
@@ -146,8 +146,8 @@ msgstr "一時停止"
 #: ../../templates/show_localplay_control.inc.php:28
 #: ../../templates/show_manage_democratic.inc.php:57
 #: ../../templates/rightbar.inc.php:25
-#: ../../templates/show_democratic.inc.php:30
 #: ../../templates/show_democratic.inc.php:31
+#: ../../templates/show_democratic.inc.php:32
 msgid "Play"
 msgstr "再生"
 
@@ -518,8 +518,8 @@ msgid "Never"
 msgstr "Never"
 
 #: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
-#: ../../lib/class/flag.class.php:282 ../../lib/class/localplay.class.php:648
-#: ../../lib/class/user.class.php:667 ../../lib/general.lib.php:337
+#: ../../lib/class/flag.class.php:332 ../../lib/class/localplay.class.php:648
+#: ../../lib/class/user.class.php:667 ../../lib/general.lib.php:338
 #: ../../modules/localplay/mpd.controller.php:511
 #: ../../modules/localplay/httpq.controller.php:507
 msgid "Unknown"
@@ -570,7 +570,7 @@ msgstr "ユーザアクセスレベル"
 #: ../../templates/show_preference_box.inc.php:58
 #: ../../templates/show_preference_admin.inc.php:41
 #: ../../templates/show_add_user.inc.php:74
-#: ../../lib/class/democratic.class.php:102 ../../admin/users.php:125
+#: ../../lib/class/democratic.class.php:103 ../../admin/users.php:125
 msgid "Guest"
 msgstr "ゲスト"
 
@@ -590,7 +590,7 @@ msgstr "ゲスト"
 #: ../../templates/show_access_list.inc.php:59
 #: ../../templates/show_manage_shoutbox.inc.php:35
 #: ../../templates/show_manage_shoutbox.inc.php:59
-#: ../../lib/class/democratic.class.php:105 ../../lib/preferences.php:231
+#: ../../lib/class/democratic.class.php:106 ../../lib/preferences.php:231
 #: ../../admin/users.php:126
 msgid "User"
 msgstr "ユーザ"
@@ -599,7 +599,7 @@ msgstr "ユーザ"
 #: ../../templates/show_preference_box.inc.php:60
 #: ../../templates/show_add_user.inc.php:76
 #: ../../templates/show_create_democratic.inc.php:42
-#: ../../lib/class/democratic.class.php:108
+#: ../../lib/class/democratic.class.php:109
 msgid "Content Manager"
 msgstr "コンテンツマネージャ"
 
@@ -607,7 +607,7 @@ msgstr "コンテンツマネージャ"
 #: ../../templates/show_preference_box.inc.php:61
 #: ../../templates/show_add_user.inc.php:77
 #: ../../templates/show_create_democratic.inc.php:43
-#: ../../lib/class/democratic.class.php:111
+#: ../../lib/class/democratic.class.php:112
 msgid "Catalog Manager"
 msgstr "カタログマネージャ"
 
@@ -619,7 +619,7 @@ msgstr "カタログマネージャ"
 #: ../../templates/show_democratic_playlist.inc.php:60
 #: ../../templates/show_democratic_playlist.inc.php:100
 #: ../../templates/show_mail_users.inc.php:32
-#: ../../lib/class/democratic.class.php:114 ../../lib/preferences.php:233
+#: ../../lib/class/democratic.class.php:115 ../../lib/preferences.php:233
 #: ../../admin/users.php:127
 msgid "Admin"
 msgstr "管理者"
@@ -914,7 +914,7 @@ msgstr "現在再生中のもの"
 #: ../../modules/localplay/mpd.controller.php:491
 #: ../../modules/localplay/httpq.controller.php:488
 msgid "Democratic"
-msgstr "大衆向け"
+msgstr "デモクラティック"
 
 #: ../../templates/sidebar_home.inc.php:99
 #: ../../templates/sidebar_localplay.inc.php:32
@@ -1040,7 +1040,7 @@ msgstr "カタログ設定の保存"
 
 #: ../../templates/show_manage_democratic.inc.php:22
 msgid "Manage Democratic Playlists"
-msgstr "大衆向けのプレイリスト管理"
+msgstr "デモクラティックプレイリスト管理"
 
 #: ../../templates/show_manage_democratic.inc.php:35
 #: ../../templates/show_create_democratic.inc.php:30
@@ -1433,7 +1433,7 @@ msgstr "フラグする理由"
 #: ../../templates/show_playlist_song_row.inc.php:38
 #: ../../templates/show_playlist_row.inc.php:38
 #: ../../templates/show_admin_tools.inc.php:53
-#: ../../lib/class/flag.class.php:270
+#: ../../lib/class/flag.class.php:320
 msgid "Delete"
 msgstr "削除"
 
@@ -1441,11 +1441,11 @@ msgstr "削除"
 msgid "Incorrect Tags"
 msgstr "不正なタグ"
 
-#: ../../templates/show_flag.inc.php:58 ../../lib/class/flag.class.php:276
+#: ../../templates/show_flag.inc.php:58 ../../lib/class/flag.class.php:326
 msgid "Re-encode"
 msgstr "再エンコード"
 
-#: ../../templates/show_flag.inc.php:59 ../../lib/class/flag.class.php:279
+#: ../../templates/show_flag.inc.php:59 ../../lib/class/flag.class.php:329
 msgid "Other"
 msgstr "その他"
 
@@ -1779,8 +1779,8 @@ msgstr "新規プレイリストへ追加"
 
 #: ../../templates/rightbar.inc.php:54
 #: ../../templates/show_localplay_status.inc.php:47
-#: ../../templates/show_democratic.inc.php:34
 #: ../../templates/show_democratic.inc.php:35
+#: ../../templates/show_democratic.inc.php:36
 msgid "Clear Playlist"
 msgstr "プレイリストをクリア"
 
@@ -1903,14 +1903,14 @@ msgstr "アーティスト収集"
 
 #: ../../templates/show_create_democratic.inc.php:22
 msgid "Create Democratic Playlist"
-msgstr "大衆的なプレイリスト作成"
+msgstr "デモクラティックプレイリスト作成"
 
 #: ../../templates/show_create_democratic.inc.php:34
 msgid "Cooldown Time"
 msgstr "クールダウン時間"
 
 #: ../../templates/show_create_democratic.inc.php:35
-#: ../../lib/class/democratic.class.php:97
+#: ../../lib/class/democratic.class.php:98
 msgid "minutes"
 msgstr "分"
 
@@ -2225,15 +2225,13 @@ msgid "Favorite Songs"
 msgstr "お気に入りの曲"
 
 #: ../../templates/show_random_rules.inc.php:22
-#, fuzzy
 msgid "Rules"
-msgstr "モジュール"
+msgstr "ルール"
 
 #: ../../templates/show_random_rules.inc.php:31
 #: ../../templates/show_random.inc.php:30
-#, fuzzy
 msgid "Field"
-msgstr "失敗"
+msgstr "フィールド"
 
 #: ../../templates/show_random_rules.inc.php:32
 #: ../../templates/show_search.inc.php:102
@@ -2464,26 +2462,24 @@ msgid "Send Mail"
 msgstr "メール送信"
 
 #: ../../templates/show_random.inc.php:22
-#, fuzzy
 msgid "Advanced Random Rules"
-msgstr "ランダムを追加"
+msgstr "高度なランダムルール"
 
 #: ../../templates/show_random.inc.php:54
 msgid "Like"
-msgstr ""
+msgstr "Like"
 
 #: ../../templates/show_random.inc.php:63
-#, fuzzy
 msgid "Add Rule"
-msgstr "全て追加"
+msgstr "ルールを追加"
 
 #: ../../templates/show_random.inc.php:66
 msgid "Save Rules As"
-msgstr ""
+msgstr "次のルールで保存"
 
 #: ../../templates/show_random.inc.php:69
 msgid "Load Saved Rules"
-msgstr ""
+msgstr "保存したルールを読み込む"
 
 #: ../../templates/show_search_options.inc.php:23
 msgid "Options"
@@ -2646,8 +2642,8 @@ msgid "Disk"
 msgstr "ディスク"
 
 #: ../../templates/show_album.inc.php:34
-#: ../../lib/class/catalog.class.php:1887
-#: ../../lib/class/catalog.class.php:1958
+#: ../../lib/class/catalog.class.php:1909
+#: ../../lib/class/catalog.class.php:1980
 msgid "Unknown (Orphaned)"
 msgstr "不明(孤立)"
 
@@ -3179,9 +3175,8 @@ msgid "Videos"
 msgstr "動画"
 
 #: ../../lib/class/browse.class.php:1167
-#, fuzzy
 msgid "Democratic Playlist"
-msgstr "大衆的なプレイリスト作成"
+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
@@ -3197,15 +3192,15 @@ msgstr "IPアドレスバージョンが一致しません"
 msgid "API/RPC"
 msgstr "API/RPC"
 
-#: ../../lib/class/flag.class.php:257
+#: ../../lib/class/flag.class.php:307
 msgid "Approved"
 msgstr "承認"
 
-#: ../../lib/class/flag.class.php:258
+#: ../../lib/class/flag.class.php:308
 msgid "Pending"
 msgstr "保留"
 
-#: ../../lib/class/flag.class.php:273
+#: ../../lib/class/flag.class.php:323
 msgid "Re-Tag"
 msgstr "Re-Tag"
 
@@ -3217,7 +3212,7 @@ msgstr "停止"
 msgid "Paused"
 msgstr "一時停止"
 
-#: ../../lib/class/democratic.class.php:98
+#: ../../lib/class/democratic.class.php:99
 msgid "Primary"
 msgstr "プライマリ"
 
@@ -3272,7 +3267,8 @@ msgstr "%sはAmpacheで読み込めません"
 msgid "%s does not match site charset"
 msgstr "%sはサイトのCharsetと一致しません"
 
-#: ../../lib/class/catalog.class.php:981 ../../preferences.php:111
+#: ../../lib/class/catalog.class.php:981
+#: ../../lib/class/catalog.class.php:1850 ../../preferences.php:111
 #: ../../admin/access.php:109
 msgid "Updated"
 msgstr "更新しました"
@@ -3374,18 +3370,14 @@ msgstr "ファイルを削除しました"
 msgid "Optimizing Tables"
 msgstr "テーブルを最適化中"
 
-#: ../../lib/class/catalog.class.php:1828
-msgid "Update Finished."
+#: ../../lib/class/catalog.class.php:1850
+msgid "Update Finished"
 msgstr "更新完了"
 
-#: ../../lib/class/catalog.class.php:1828
+#: ../../lib/class/catalog.class.php:1850
 msgid "Checked"
 msgstr "チェック済み"
 
-#: ../../lib/class/catalog.class.php:1828
-msgid "songs updated."
-msgstr "曲更新しました"
-
 #: ../../lib/class/random.class.php:410
 msgid "Related Genre"
 msgstr "関連するジャンル"
@@ -3463,11 +3455,11 @@ msgstr ""
 "メールアドレス: %s\n"
 "\n"
 
-#: ../../lib/general.lib.php:396
+#: ../../lib/general.lib.php:397
 msgid "On"
 msgstr "オン"
 
-#: ../../lib/general.lib.php:399
+#: ../../lib/general.lib.php:400
 msgid "Off"
 msgstr "オフ"
 
@@ -4052,41 +4044,3 @@ msgstr "インタフェース"
 #: Database words
 msgid "System"
 msgstr "システム"
-
-#~ msgid "Play Random Selection"
-#~ msgstr "ランダム選択を再生"
-
-#~ msgid "Item count"
-#~ msgstr "アイテムカウント"
-
-#~ msgid "%d minute"
-#~ msgid_plural "%d minutes"
-#~ msgstr[0] "%d分"
-
-#~ msgid "%d hour"
-#~ msgid_plural "%d hours"
-#~ msgstr[0] "%d時間"
-
-#~ msgid "Standard"
-#~ msgstr "基本"
-
-#~ msgid "Less Played"
-#~ msgstr "以下を再生"
-
-#~ msgid "Full Albums"
-#~ msgstr "完全なアルバム"
-
-#~ msgid "Full Artist"
-#~ msgstr "完全なアーティスト"
-
-#~ msgid "Highest Rated"
-#~ msgstr "高評価"
-
-#~ msgid "From catalog"
-#~ msgstr "カタログから"
-
-#~ msgid "Size Limit"
-#~ msgstr "サイズ制限"
-
-#~ msgid "Enqueue"
-#~ msgstr "エンキュー"