From e4c2f43d9ed6786918c721f8f835b2c3e5721e28 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Wed, 16 Jan 2013 15:40:50 -0500
Subject: [PATCH 1/2] CC-4855: System->Preferences->Fade in/out settings:
 Number's format is incorrect.

-fixed
---
 airtime_mvc/application/models/Preference.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index 30c6e80d9..08bd14137 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -220,7 +220,7 @@ class Application_Model_Preference
             $fade = $out;
         }
 
-        $fade = number_format($fade, 1);
+        $fade = number_format($fade, 1, '.', '');
         //fades need 2 leading zeros for DateTime conversion
         $fade = str_pad($fade, 4, "0", STR_PAD_LEFT);
 

From e05d99e16f6c16b17b8b825db9cf6aaa9983612d Mon Sep 17 00:00:00 2001
From: "cliff.wang" <cliff.wang@sourcefabric.org>
Date: Wed, 16 Jan 2013 16:33:16 -0500
Subject: [PATCH 2/2] Update Chinese translation

---
 .../locale/zh_CN/LC_MESSAGES/airtime.mo       | Bin 58411 -> 58411 bytes
 .../locale/zh_CN/LC_MESSAGES/airtime.po       |   8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.mo
index a8a431476ac3d0defb0371e3883071838641d1d2..d6df8642487ceb225b207ef951723eac209ee32c 100644
GIT binary patch
delta 65
zcmZ2|f_e1`<_$uV*v%9S&8&=#HcL*rugLatao@8Adp7^u+{Y#PeE0kp>lQxiTKaTi
U7sJyDYo6?x4iVbCbYGh)02Ux4mjD0&

delta 65
zcmV-H0KWgL$OEg$1F#a32Q?ruG&(akvl)`#AqMBMyXBsXv;MP=3K`~<w&jql=9jkV
Xm$U%okgVjqm*}pc=9RFsrM`wG8B!y&

diff --git a/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po b/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
index 4752e8d48..40ed989fd 100644
--- a/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Airtime 2.3\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-01-15 10:36-0500\n"
-"PO-Revision-Date: 2013-01-15 14:37-0500\n"
+"PO-Revision-Date: 2013-01-16 16:32-0500\n"
 "Last-Translator: Cliff Wang <cliff.wang@sourcefabric.org>\n"
 "Language-Team: Chinese Localization <contact@sourcefabric.org>\n"
 "Language: \n"
@@ -434,7 +434,7 @@ msgstr "编曲"
 #: airtime_mvc/application/controllers/LocaleController.php:77
 #: airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml:10
 msgid "Genre"
-msgstr "类型"
+msgstr "风格"
 
 #: airtime_mvc/application/models/Block.php:1219
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:51
@@ -1951,7 +1951,7 @@ msgstr "文件的状态不可知。这可能是由于文件位于远程存储位
 #: airtime_mvc/application/controllers/LocaleController.php:125
 #, php-format
 msgid "Listener Count on %s: %s"
-msgstr "听众计数%s：%s"
+msgstr "听众统计%s：%s"
 
 #: airtime_mvc/application/controllers/LocaleController.php:127
 msgid "Remind me in 1 week"
@@ -2845,7 +2845,7 @@ msgstr "无效的表格内容。"
 
 #: airtime_mvc/application/views/scripts/listenerstat/index.phtml:2
 msgid "Listener Count Over Time"
-msgstr "听众收听时间"
+msgstr "听众统计报告"
 
 #: airtime_mvc/application/views/scripts/partialviews/header.phtml:3
 msgid "Previous:"