Merging upstream pull

airtime_mvc/application/models/Locale.php

@@ -15,7 +15,7 @@ class Application_Model_Locale
             "hr_HR" => "Hrvatski",
             "hu_HU" => "Magyar",
             "it_IT" => "Italiano",
-            "ja"    => "日本語",
+            "ja_JP"    => "日本語",
             "ko_KR" => "한국어",
             "pl_PL" => "Polski",
             "pt_BR" => "Português (Brasil)",

airtime_mvc/locale/ja/LC_MESSAGES/airtime.po

@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-12-13 12:58-0500\n"
-"PO-Revision-Date: 2014-09-09 09:17+0000\n"
+"PO-Revision-Date: 2014-09-17 23:48+0000\n"
 "Last-Translator: Kazuhiro Shimbo <kazuhiro.shimbo@mail.rakuten.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/airtime/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -75,7 +75,7 @@ msgstr "キューアウトの設定"
 
 #: airtime_mvc/application/layouts/scripts/layout.phtml:73
 msgid "Cursor"
-msgstr ""
+msgstr "カーソル"
 
 #: airtime_mvc/application/layouts/scripts/layout.phtml:74
 #: airtime_mvc/application/controllers/LocaleController.php:274
@@ -145,7 +145,7 @@ msgstr "ムード"
 #: airtime_mvc/application/controllers/LocaleController.php:77
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:61
 msgid "Label"
-msgstr ""
+msgstr "レーベル"
 
 #: airtime_mvc/application/services/HistoryService.php:1112
 #: airtime_mvc/application/services/HistoryService.php:1166
@@ -394,7 +394,7 @@ msgstr "追加"
 msgid ""
 "Rescan watched directory (This is useful if it is network mount and may be "
 "out of sync with Airtime)"
-msgstr ""
+msgstr "同期済み一覧を再スキャンする (もしネットワーク実装であったりRakuten.FMと同期していないと思われる場合に便利です)"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:44
 msgid "Remove watched directory"
@@ -402,7 +402,7 @@ msgstr "同期ディレクトリを削除する"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
-msgstr ""
+msgstr "いかなるメディアフォルダも見ていません"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:1
 msgid "Register Airtime"
@@ -535,7 +535,7 @@ msgstr "マスターソース接続URL："
 #: airtime_mvc/application/views/scripts/form/preferences_livestream.phtml:115
 #: airtime_mvc/application/views/scripts/form/preferences_livestream.phtml:159
 msgid "Override"
-msgstr ""
+msgstr "オーバーライド"
 
 #: airtime_mvc/application/views/scripts/form/preferences_livestream.phtml:120
 #: airtime_mvc/application/views/scripts/form/preferences_livestream.phtml:164
@@ -779,7 +779,7 @@ msgstr "ON AIR"
 
 #: airtime_mvc/application/views/scripts/partialviews/header.phtml:55
 msgid "Listen"
-msgstr ""
+msgstr "試聴"
 
 #: airtime_mvc/application/views/scripts/partialviews/header.phtml:59
 msgid "Station time"
@@ -819,7 +819,7 @@ msgstr "録音と再配信"
 
 #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:29
 msgid "Who"
-msgstr ""
+msgstr "DJ"
 
 #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:33
 msgid "Style"
@@ -1023,7 +1023,7 @@ msgstr "プレイリストを空にする"
 
 #: airtime_mvc/application/views/scripts/error/error.phtml:6
 msgid "Zend Framework Default Application"
-msgstr ""
+msgstr "Zend Framework Default Application"
 
 #: airtime_mvc/application/views/scripts/error/error.phtml:10
 msgid "Page not found!"
@@ -1215,7 +1215,7 @@ msgstr "年："
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:19
 #: airtime_mvc/application/forms/EditAudioMD.php:67
 msgid "Label:"
-msgstr ""
+msgstr "ラベル："
 
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:20
 #: airtime_mvc/application/forms/EditAudioMD.php:96
@@ -1348,17 +1348,17 @@ msgstr "国の選択"
 #: airtime_mvc/application/models/MusicDir.php:160
 #, php-format
 msgid "%s is already watched."
-msgstr ""
+msgstr "%sは同期済みです。"
 
 #: airtime_mvc/application/models/MusicDir.php:164
 #, php-format
 msgid "%s contains nested watched directory: %s"
-msgstr ""
+msgstr "%sは同期している次のフォルダを含んでいます： %s "
 
 #: airtime_mvc/application/models/MusicDir.php:168
 #, php-format
 msgid "%s is nested within existing watched directory: %s"
-msgstr ""
+msgstr "%sは同期している次のフォルダに含まれています： %s "
 
 #: airtime_mvc/application/models/MusicDir.php:189
 #: airtime_mvc/application/models/MusicDir.php:368
@@ -1370,18 +1370,18 @@ msgstr "%sは有効なディレクトリではありません。"
 #, php-format
 msgid ""
 "%s is already set as the current storage dir or in the watched folders list"
-msgstr ""
+msgstr "%sはすでに保存ディレクトリまたは同期フォルダに設定されています。"
 
 #: airtime_mvc/application/models/MusicDir.php:386
 #, php-format
 msgid ""
 "%s is already set as the current storage dir or in the watched folders list."
-msgstr ""
+msgstr "%sはすでに保存ディレクトリまたは同期フォルダに設定されています。"
 
 #: airtime_mvc/application/models/MusicDir.php:429
 #, php-format
 msgid "%s doesn't exist in the watched list."
-msgstr ""
+msgstr "%sは同期リストの中に存在しません。"
 
 #: airtime_mvc/application/models/Block.php:333
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:120
@@ -1415,7 +1415,7 @@ msgstr "キューアウトをキューインより小さく設定することは
 #: airtime_mvc/application/models/Block.php:1340
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:48
 msgid "Select criteria"
-msgstr "選択してください"
+msgstr "基準を選択してください"
 
 #: airtime_mvc/application/models/Block.php:1342
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:50
@@ -1495,19 +1495,19 @@ msgstr "ウェブサイト"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:366
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:404
 msgid "Select modifier"
-msgstr "選択してください"
+msgstr "条件を選択してください"
 
 #: airtime_mvc/application/models/Block.php:1372
 #: airtime_mvc/application/controllers/LocaleController.php:142
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:88
 msgid "contains"
-msgstr "含む"
+msgstr "以下を含む"
 
 #: airtime_mvc/application/models/Block.php:1373
 #: airtime_mvc/application/controllers/LocaleController.php:143
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:89
 msgid "does not contain"
-msgstr "含まない"
+msgstr "以下を含まない"
 
 #: airtime_mvc/application/models/Block.php:1374
 #: airtime_mvc/application/models/Block.php:1378
@@ -1515,7 +1515,7 @@ msgstr "含まない"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:90
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:104
 msgid "is"
-msgstr "一致する"
+msgstr "以下と一致する"
 
 #: airtime_mvc/application/models/Block.php:1375
 #: airtime_mvc/application/models/Block.php:1379
@@ -1523,19 +1523,19 @@ msgstr "一致する"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:91
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:105
 msgid "is not"
-msgstr "一致しない"
+msgstr "以下と一致しない"
 
 #: airtime_mvc/application/models/Block.php:1376
 #: airtime_mvc/application/controllers/LocaleController.php:146
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:92
 msgid "starts with"
-msgstr "始まる"
+msgstr "以下で始まる"
 
 #: airtime_mvc/application/models/Block.php:1377
 #: airtime_mvc/application/controllers/LocaleController.php:147
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:93
 msgid "ends with"
-msgstr "終る"
+msgstr "以下で終わる"
 
 #: airtime_mvc/application/models/Block.php:1380
 #: airtime_mvc/application/controllers/LocaleController.php:148
@@ -1623,17 +1623,17 @@ msgstr "リンクした番組の外に項目を移動することはできませ
 
 #: airtime_mvc/application/models/Scheduler.php:119
 msgid "The schedule you're viewing is out of date! (sched mismatch)"
-msgstr ""
+msgstr "参照中のスケジュールはの有効ではありません。"
 
 #: airtime_mvc/application/models/Scheduler.php:124
 msgid "The schedule you're viewing is out of date! (instance mismatch)"
-msgstr ""
+msgstr "参照中のスケジュールは有効ではありません。"
 
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:444
 #: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
-msgstr ""
+msgstr "参照中のスケジュールは有効ではありません。"
 
 #: airtime_mvc/application/models/Scheduler.php:142
 #, php-format
@@ -1874,7 +1874,7 @@ msgstr "プレイリストに追加できるのはトラック・スマートブ
 
 #: airtime_mvc/application/controllers/LocaleController.php:53
 msgid "Please select a cursor position on timeline."
-msgstr ""
+msgstr "タイムライン上のカーソル位置を選択して下さい。"
 
 #: airtime_mvc/application/controllers/LocaleController.php:58
 msgid "Add to selected show"
@@ -2034,7 +2034,7 @@ msgid ""
 "Airtime is unsure about the status of this file. This can happen when the "
 "file is on a remote drive that is unaccessible or the file is in a directory"
 " that isn't 'watched' anymore."
-msgstr ""
+msgstr "このファイルのステータスが不明です。これは、ファイルがアクセス不能な外付けドライブに存在するか、またはファイルが同期されていないディレクトリに存在する場合に起こります。"
 
 #: airtime_mvc/application/controllers/LocaleController.php:124
 #, php-format
@@ -2111,7 +2111,7 @@ msgstr "保存先のフォルダを変更しますか？Rakuten.FMライブラ
 
 #: airtime_mvc/application/controllers/LocaleController.php:157
 msgid "Are you sure you want to remove the watched folder?"
-msgstr ""
+msgstr "同期されているフォルダを削除してもよろしいですか？"
 
 #: airtime_mvc/application/controllers/LocaleController.php:158
 msgid "This path is currently not accessible."
@@ -2233,20 +2233,20 @@ msgstr "この番組の配信回が存在しません。"
 
 #: airtime_mvc/application/controllers/LocaleController.php:186
 msgid "Warning: Shows cannot be re-linked"
-msgstr ""
+msgstr "注意：番組は再度リンクできません。"
 
 #: airtime_mvc/application/controllers/LocaleController.php:187
 msgid ""
 "By linking your repeating shows any media items scheduled in any repeat show"
 " will also get scheduled in the other repeat shows"
-msgstr ""
+msgstr "配信内容を同期すると、配信内容の変更が対応するすべての再配信にも反映されます。"
 
 #: airtime_mvc/application/controllers/LocaleController.php:188
 msgid ""
 "Timezone is set to the station timezone by default. Shows in the calendar "
 "will be displayed in your local time defined by the Interface Timezone in "
 "your user settings."
-msgstr ""
+msgstr "タイムゾーンは初期設定ではステーション所在地に合わせて設定されています。タイムゾーンを変更するには、ユーザー設定からインターフェイスのタイムゾーンを変更して下さい。"
 
 #: airtime_mvc/application/controllers/LocaleController.php:192
 msgid "Show"
@@ -2593,7 +2593,7 @@ msgstr "ディスク"
 
 #: airtime_mvc/application/controllers/LocaleController.php:308
 msgid "Look in"
-msgstr ""
+msgstr "閲覧"
 
 #: airtime_mvc/application/controllers/LocaleController.php:310
 msgid "Open"
@@ -2681,7 +2681,7 @@ msgstr "ユーザー管理"
 
 #: airtime_mvc/application/controllers/LocaleController.php:331
 msgid "Manage watched folders"
-msgstr ""
+msgstr "同期されているフォルダを管理"
 
 #: airtime_mvc/application/controllers/LocaleController.php:332
 #: airtime_mvc/application/forms/SupportSettings.php:112
@@ -2797,7 +2797,7 @@ msgstr "%d/%d ファイルをアップロードしました。"
 
 #: airtime_mvc/application/controllers/LocaleController.php:370
 msgid "N/A"
-msgstr ""
+msgstr "N/A"
 
 #: airtime_mvc/application/controllers/LocaleController.php:371
 msgid "Drag files here."
@@ -2926,11 +2926,11 @@ msgstr "Liquidsoapに問題があります。"
 
 #: airtime_mvc/application/controllers/ShowbuilderController.php:196
 msgid "Select cursor"
-msgstr ""
+msgstr "カーソルを選択"
 
 #: airtime_mvc/application/controllers/ShowbuilderController.php:197
 msgid "Remove cursor"
-msgstr ""
+msgstr "カーソルを削除"
 
 #: airtime_mvc/application/controllers/ShowbuilderController.php:216
 msgid "show does not exist"
@@ -3024,7 +3024,7 @@ msgstr "インポートフォルダ："
 
 #: airtime_mvc/application/forms/WatchedDirPreferences.php:25
 msgid "Watched Folders:"
-msgstr ""
+msgstr "同期フォルダ："
 
 #: airtime_mvc/application/forms/WatchedDirPreferences.php:40
 msgid "Not a valid Directory"
@@ -3216,7 +3216,7 @@ msgstr "24時間を越える長さに設定することはできません。"
 
 #: airtime_mvc/application/forms/AddShowRepeats.php:10
 msgid "Link:"
-msgstr "リンク："
+msgstr "配信内容を同期する："
 
 #: airtime_mvc/application/forms/AddShowRepeats.php:16
 msgid "Repeat Type:"
@@ -3289,15 +3289,15 @@ msgstr "パスワード"
 
 #: airtime_mvc/application/forms/PasswordChange.php:28
 msgid "Confirm new password"
-msgstr ""
+msgstr "新しいパスワードを確認してください。"
 
 #: airtime_mvc/application/forms/PasswordChange.php:36
 msgid "Password confirmation does not match your password."
-msgstr ""
+msgstr "パスワード確認がパスワードと一致しません。"
 
 #: airtime_mvc/application/forms/PasswordChange.php:43
 msgid "Get new password"
-msgstr ""
+msgstr "新しいパスワードを入手"
 
 #: airtime_mvc/application/forms/SupportSettings.php:21
 #: airtime_mvc/application/forms/GeneralPreferences.php:21
@@ -3439,7 +3439,7 @@ msgstr "Icecastサーバーを使用する際はマウント欄を入力して
 
 #: airtime_mvc/application/forms/StreamSetting.php:22
 msgid "Hardware Audio Output"
-msgstr ""
+msgstr "オーディオ出力"
 
 #: airtime_mvc/application/forms/StreamSetting.php:33
 msgid "Output Type"
@@ -3495,7 +3495,7 @@ msgstr "再配信"
 
 #: airtime_mvc/application/forms/EmailServerPreferences.php:17
 msgid "Enable System Emails (Password Reset)"
-msgstr ""
+msgstr "システムメールを有効化 (パスワードリセット)"
 
 #: airtime_mvc/application/forms/EmailServerPreferences.php:27
 msgid "Reset Password 'From' Email"
@@ -3588,7 +3588,7 @@ msgstr "デフォルトフェードアウト（初期値）："
 msgid ""
 "Allow Remote Websites To Access \"Schedule\" Info?%s (Enable this to make "
 "front-end widgets work.)"
-msgstr ""
+msgstr "外部サイトからの「スケジュール」情報へのアクセスを許可しますか?%s （フロントエンドのウィジェットを機能させる場合は、これを有効にしてください）"
 
 #: airtime_mvc/application/forms/GeneralPreferences.php:90
 msgid "Disabled"
@@ -3620,7 +3620,7 @@ msgstr "メール"
 
 #: airtime_mvc/application/forms/PasswordRestore.php:36
 msgid "Restore password"
-msgstr ""
+msgstr "パスワードをリセット"
 
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:118
 msgid "hours"
@@ -3681,7 +3681,7 @@ msgstr "設定できるアイテムの最大数は500です。"
 
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:529
 msgid "You must select Criteria and Modifier"
-msgstr ""
+msgstr "「基準」と「条件」を選択してください。"
 
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:536
 msgid "'Length' should be in '00:00:00' format"
@@ -3733,7 +3733,7 @@ msgstr "SoundCloudへのアップロードを有効化"
 
 #: airtime_mvc/application/forms/SoundcloudPreferences.php:36
 msgid "Automatically Mark Files \"Downloadable\" on SoundCloud"
-msgstr ""
+msgstr "自動的にSoundCloud上で「Downloadable」ファイルとしてアップロードする。"
 
 #: airtime_mvc/application/forms/SoundcloudPreferences.php:47
 msgid "SoundCloud Email"
@@ -3809,7 +3809,7 @@ msgstr "Other"
 
 #: airtime_mvc/application/forms/SoundcloudPreferences.php:133
 msgid "Default License:"
-msgstr "トライセンス（初期値）："
+msgstr "ライセンス（初期値）："
 
 #: airtime_mvc/application/forms/SoundcloudPreferences.php:137
 msgid "The work is in the public domain"
@@ -3881,7 +3881,7 @@ msgstr "メディアフォルダ"
 
 #: airtime_mvc/application/configs/navigation.php:64
 msgid "Streams"
-msgstr "配信"
+msgstr "配信設定"
 
 #: airtime_mvc/application/configs/navigation.php:83
 msgid "Listener Stats"
@@ -3913,4 +3913,4 @@ msgstr "選択してください。"
 
 #: airtime_mvc/library/propel/contrib/pear/HTML_QuickForm_Propel/Propel.php:531
 msgid "No Records"
-msgstr ""
+msgstr "録画なし"

airtime_mvc/public/js/plupload/i18n/ja_JP.js

@@ -0,0 +1,27 @@
+//Japanese
+plupload.addI18n({
+    'Select files' : $.i18n._('Select files'),
+    'Add files to the upload queue and click the start button.' : $.i18n._('Add files to the upload queue and click the start button.'),
+    'Filename' : $.i18n._('Filename'),
+    'Status' : $.i18n._('Status'),
+    'Size' : $.i18n._('Size'),
+    'Add files' : $.i18n._('Add files'),
+    'Stop current upload' : $.i18n._('Stop current upload'),
+    'Start uploading queue' : $.i18n._('Start uploading queue'),
+    'Uploaded %d/%d files': $.i18n._('Uploaded %d/%d files'),
+    'N/A' : $.i18n._('N/A'),
+    'Drag files here.' : $.i18n._('Drag files here.'),
+    'File extension error.': $.i18n._('File extension error.'),
+    'File size error.': $.i18n._('File size error.'),
+    'Init error.': $.i18n._('Init error.'),
+    'HTTP Error.': $.i18n._('HTTP Error.'),
+    'Security error.': $.i18n._('Security error.'),
+    'Generic error.': $.i18n._('Generic error.'),
+    'IO error.': $.i18n._('IO error.'),
+    'Stop Upload': $.i18n._('Stop Upload'),
+    'Add Files': $.i18n._('Add Files'),
+    'Start Upload': $.i18n._('Start Upload'),
+    'Start upload': $.i18n._('Start upload'),
+    '%d files queued': $.i18n._('%d files queued'),
+    "Error: Invalid file extension: " : $.i18n._("Error: Invalid file extension: ")
+});