Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x

This commit is contained in:
Duncan Sommerville 2014-11-05 10:08:09 -05:00
commit e843d96e3f
2 changed files with 4 additions and 4 deletions

View File

@ -11,8 +11,8 @@ 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-11-04 16:43+0000\n"
"Last-Translator: Duncan Sommerville <duncan.sommerville@gmail.com>\n"
"PO-Revision-Date: 2014-11-05 10:53+0000\n"
"Last-Translator: Andrey Podshivalov\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/airtime/language/ja/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -2063,14 +2063,14 @@ msgid ""
"A static smart block will save the criteria and generate the block content "
"immediately. This allows you to edit and view it in the Library before "
"adding it to a show."
msgstr ""
msgstr "スマート・ブロックは基準を満たし、即時にブロック・コンテンツを生成します。これにより、コンテンツをショーに追加する前にライブラリーにおいてコンテンツを編集および閲覧できます。"
#: airtime_mvc/application/controllers/LocaleController.php:134
msgid ""
"A dynamic smart block will only save the criteria. The block content will "
"get generated upon adding it to a show. You will not be able to view and "
"edit the content in the Library."
msgstr ""
msgstr "自動生成スマートブロックは基準の設定のみ操作できます。ブロックコンテンツは番組に追加するとすぐに生成されます。生成したコンテンツをライブラリ内で編集することはできません。"
#: airtime_mvc/application/controllers/LocaleController.php:136
msgid ""