Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
james 2013-01-16 16:38:44 -05:00
parent 3f2ab9bb4e d7e40710f4
commit 5283757cc6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/models/Preference.php
View File

@ -220,7 +220,7 @@ class Application_Model_Preference
$fade = $out; $fade = $out;
} }
$fade = number_format($fade, 1); $fade = number_format($fade, 1, '.', '');
//fades need 2 leading zeros for DateTime conversion //fades need 2 leading zeros for DateTime conversion
$fade = str_pad($fade, 4, "0", STR_PAD_LEFT); $fade = str_pad($fade, 4, "0", STR_PAD_LEFT);

BIN
airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.mo
View File

Binary file not shown.

8
airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
View File

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