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

This commit is contained in:
Albert Santoni 2014-08-27 16:47:26 -04:00
commit c1843f9d6b
2 changed files with 3 additions and 3 deletions

View file

@ -10,8 +10,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-08-25 02:34+0000\n"
"Last-Translator: Kazuhiro Shimbo <kazuhiro.shimbo@mail.rakuten.com>\n"
"PO-Revision-Date: 2014-08-27 01:20+0000\n"
"Last-Translator: Akemi Makino <akemi.makino@mail.rakuten.com>\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"
@ -38,7 +38,7 @@ msgstr ""
#: airtime_mvc/application/layouts/scripts/layout.phtml:27
msgid "Logout"
msgstr ""
msgstr "ログアウト"
#: airtime_mvc/application/layouts/scripts/layout.phtml:42
#: airtime_mvc/application/layouts/scripts/layout.phtml:68