Merge branch '2.5.x' into saas

2014-09-12 16:31:58 -04:00 · 2014-09-12 16:31:58 -04:00 · ac60a927d4
parent cc3ddb40ea 2729202dc4
commit ac60a927d4
5 changed files with 152 additions and 150 deletions
--- a/airtime_mvc/application/models/Locale.php
+++ b/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)",
--- a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
@ -2216,6 +2216,8 @@ msgstr ""
 msgid ""
 "Warning: You cannot change this field while the show is currently playing"
 msgstr ""
+"Attention: Vous ne pouvez pas modifier ce champ alors que l'émission est en "
+"cours de lecture"

 #: airtime_mvc/application/controllers/LocaleController.php:181
 msgid "No result found"
--- a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po