Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

This commit is contained in:
yanxd 2014-02-17 15:37:53 +08:00
commit 0fe5c5c5b5
1 changed files with 5 additions and 0 deletions

View File

@ -1590,5 +1590,10 @@ en:
label_memo_locked: 'Topic is locked' label_memo_locked: 'Topic is locked'
label_downloads_list: enter file list. label_downloads_list: enter file list.
label_sumbit_empty: search bar need container. label_sumbit_empty: search bar need container.
label_setup_time: Start date
label_endup_time: Over date
label_class_period: Class hour
label_class_hour: period
label_activity_time: publish date