github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-14 17:23:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
56,054 Commits 214 Branches 500 Tags 960 MiB
59c3f2e5a2
Commit Graph

452 Commits

Author SHA1 Message Date
Arpit Jalan
25d70ec900 Update Translations 2017-07-05 11:35:35 +05:30
Guo Xiang Tan
a23ce56682 Update translations. 2017-06-19 12:39:30 +09:00
Arpit Jalan
4112c2b883 Update translations 2017-06-12 21:24:40 +05:30
Arpit Jalan
d326784ecf Update translations 2017-06-07 20:13:54 +05:30
Arpit Jalan
304090f759 Update translations 2017-05-31 22:36:20 +05:30
Arpit Jalan
f57914ccd8 Update translations 2017-05-22 10:24:44 +05:30
Neil Lalonde
8651fc57a5 Update translations 2017-05-15 11:11:18 -04:00
Arpit Jalan
1f6ffd5fb0 Update Translations 2017-05-02 16:08:55 +05:30
Arpit Jalan
df77a827e1 Update Translations 2017-04-24 18:12:40 +05:30
Arpit Jalan
ae96631692 Update Translations 2017-04-17 23:46:18 +05:30
Arpit Jalan
ff530d6fb3 Update Translations 2017-04-07 22:23:39 +05:30
Neil Lalonde
8b1bfeb4c6 Update translations 2017-03-20 11:04:34 -04:00
Neil Lalonde
4271aa0b48 Update translations 2017-03-08 11:54:01 -05:00
Arpit Jalan
ddcd060552 Update Translations 2017-03-01 11:03:44 +05:30
Neil Lalonde
56233e9ec6 Update translations 2017-02-13 16:42:15 -05:00
Neil Lalonde
8ab327665f Update translations 2017-01-26 12:22:14 -05:00
Arpit Jalan
bcbcfa2078 Update Translations 2017-01-18 22:13:12 +05:30
Arpit Jalan
1570c4e4a7 Update Translations 2017-01-12 13:26:45 +05:30
Neil Lalonde
5a2e989e0d Update translations 2017-01-06 15:53:03 -05:00
Arpit Jalan
be303ecef9 Update Translations 2017-01-04 23:43:08 +05:30
Arpit Jalan
4e63880b5d Update Translations 2016-12-29 00:15:25 +05:30
Arpit Jalan
0d826ea933 Update Translations 2016-12-21 23:09:02 +05:30
Arpit Jalan
5cc64103c6 Update Translations 2016-12-08 20:35:03 +05:30
Arpit Jalan
ece5442c54 Update Translations 2016-11-16 23:42:01 +05:30
Arpit Jalan
541c29ff4d Update Translations 2016-11-09 20:16:29 +05:30
Arpit Jalan
6eccf9da03 Update Translations 2016-10-20 18:49:09 +05:30
Neil Lalonde
4be3b9f36d Update translations 2016-08-25 11:04:46 -04:00
Neil Lalonde
f1bfc74e79 Update translations 2016-08-05 14:39:55 -04:00
Neil Lalonde
6a8f57d602 Update translations 2016-07-27 17:55:28 -04:00
Neil Lalonde
a3f39866ab Update translations using temporary workaround for Transifex bugs 2016-07-27 13:29:13 -04:00
Sam Saffron
46b34e3c62 FEATURE: remove user option for edit history public 
Users can no longer opt-in for "public" edit history
if site owner disables it.

This feature adds cost and complexity to post rendering since
user options need to be premeptively loaded for every user in the
stream. It is also confusing to explain to communities with private edit
history.
 2016-07-16 21:30:00 +10:00
Arpit Jalan
024c2e90c1 Update Translations 2016-06-09 22:07:41 +05:30
Arpit Jalan
4ff03b3451 Update Translations 2016-05-17 23:51:39 +05:30
Neil Lalonde
b1f798f119 Update translations 2016-05-04 14:22:15 -04:00
Neil Lalonde
e63e296761 Update translations 2016-04-20 19:18:07 -04:00
Arpit Jalan
b6a0b891b8 Update Translations 2016-03-28 23:34:04 +05:30
Arpit Jalan
6b01287e98 Update Translations 2016-03-28 14:00:18 +05:30
Arpit Jalan
ddebd76c44 Update Translations 2016-03-23 22:25:29 +05:30
Arpit Jalan
9dc533a26c fix broken locale 2016-03-01 22:52:55 +05:30
Arpit Jalan
915afa703d Update Translations 2016-01-26 23:41:00 +05:30
Arpit Jalan
593c22eda1 Update Translations 2016-01-04 21:01:49 +05:30
Neil Lalonde
fe10f3e0a3 Update translations 2015-12-18 10:48:02 -05:00
Arpit Jalan
04593b8fef Update Translations 2015-12-01 01:09:45 +05:30
Arpit Jalan
bde05fd334 Update Translations 2015-11-23 19:25:06 +05:30
Arpit Jalan
236f8bb0f7 Update Translations 2015-11-12 22:06:59 +05:30
Arpit Jalan
a44c2f6ea3 Update Translations 2015-11-02 17:49:57 +05:30
Arpit Jalan
c3cadbb4d8 Update Translations 2015-10-26 22:38:34 +05:30
Arpit Jalan
717be06f17 Update Translations 2015-10-20 23:11:42 +05:30
Arpit Jalan
06f616792d Update Translations 2015-10-15 18:19:04 +05:30
Neil Lalonde
1e5ad6f219 Update translations 2015-10-02 10:40:28 -04:00
Arpit Jalan
a2e8e5f90b Update Translations 2015-09-29 12:30:01 +05:30
Arpit Jalan
f031558aa5 Update Translations 2015-09-24 18:08:25 +05:30
Arpit Jalan
7a9404750e Update Translations 2015-09-21 17:51:42 +05:30
Arpit Jalan
3ba6d54843 Update Translations 2015-09-16 19:50:29 +05:30
Arpit Jalan
21f81979cb Update Translations 2015-09-07 19:48:43 +05:30
Arpit Jalan
4e2c932895 Update Translations 2015-09-04 18:59:15 +05:30
Arpit Jalan
b8c3187a94 Update Translations 2015-08-31 22:19:30 +05:30
Robin Ward
c5460b7d3f FEATURE: Full height hamburger menu 
- Rename `site-map` to `hamburger-menu`
- Includes acceptance tests
 2015-08-25 16:48:43 -04:00
Arpit Jalan
e1575746f2 Update Translations 2015-08-20 17:33:13 +05:30
Arpit Jalan
73f547b019 Update Translations 2015-08-10 23:41:05 +05:30
Arpit Jalan
e53bf294ef Update Translations 2015-08-04 13:17:39 +05:30
Arpit Jalan
62a59ef7c0 Update Translations 2015-07-30 22:41:12 +05:30
Arpit Jalan
fc977771a3 Update Translations 2015-07-16 19:18:02 +05:30
Gerhard Schlager
d08693edce FEATURE: Make abbreviated numbers (k, M) localizable 
- Make the decimal separator and thousands delimiter localizable
- Add translations for all languages, otherwise this will look very ugly
 2015-06-26 00:51:12 +02:00
Arpit Jalan
436e84c6c1 Update Translations 2015-06-15 20:25:53 +05:30
Arpit Jalan
7bc3a6fff0 Update Translations 2015-06-10 18:10:46 +05:30
Arpit Jalan
1ac4e60c90 Update Translations 2015-06-01 23:33:27 +05:30
Arpit Jalan
56544f2048 Update Translations 2015-05-21 00:24:12 +05:30
Arpit Jalan
ee960899df Update Translations 2015-05-06 21:32:11 +05:30
Arpit Jalan
574052b786 Update Translations 2015-04-22 19:05:15 +05:30
Arpit Jalan
77baae13bc Update Translations 2015-04-13 23:58:48 +05:30
Arpit Jalan
8623f179ff Update Translations 2015-04-09 20:58:06 +05:30
Arpit Jalan
47525c6af4 Update Translations 2015-04-01 22:16:57 +05:30
Arpit Jalan
7acae703d9 Update Translations 2015-03-24 20:57:12 +05:30
Arpit Jalan
27a793073a Update Translations 2015-03-18 18:27:27 +05:30
Robin Ward
354b9ccf3b Allow users to choose "Every 3 days" as a digest frequency 2015-03-10 16:04:48 -04:00
Arpit Jalan
ade082c072 Update Translations 2015-03-02 21:59:07 +05:30
Arpit Jalan
253ba977ef Update Translations 2015-02-25 22:47:17 +05:30
Arpit Jalan
439f13b040 Update Translations 2015-02-13 19:37:41 +05:30
Arpit Jalan
ba0cb45f4b Update Translations 2015-02-04 00:20:05 +05:30
Arpit Jalan
a144e61440 Update Translations 2015-01-21 22:58:30 +05:30
Arpit Jalan
2aff46532c Update Translations 2015-01-14 21:22:13 +05:30
Arpit Jalan
8f06e8f708 Update Translations 2015-01-12 19:53:52 +05:30
Arpit Jalan
fa8ba67523 Update Translations 2014-12-29 19:06:33 +05:30
Arpit Jalan
44e694819d Update Translations 2014-12-04 19:48:21 +05:30
Arpit Jalan
cd8ab37507 Update Translations 2014-11-27 20:28:52 +05:30
Arpit Jalan
e04cc1c9f5 Update Translations 2014-11-21 18:09:29 +05:30
Arpit Jalan
dbd5823881 Update Translations 2014-11-17 21:35:06 +05:30
Neil Lalonde
1565bd5e67 Update translations 2014-11-06 15:16:58 -05:00
Neil Lalonde
718854f055 Update translations 2014-10-30 17:30:05 -04:00
Arpit Jalan
d0cf73f105 Update Translations 2014-10-23 20:15:56 +05:30
Arpit Jalan
92efee088e Add missing transation files and update translations 2014-10-16 23:25:34 +05:30
Robin Ward
285c66b899 FIX: Say the file uploaded is too large, not "image" as you can upload 
other kinds of files.
 2014-10-09 16:03:04 -04:00
Arpit Jalan
648e7b90f4 Update Translations 2014-10-09 01:37:59 +05:30
Arpit Jalan
6989557a26 Update Translations 2014-09-30 19:53:17 +05:30
Robin Ward
6c275cd64d Update i18n keys for site_content rename 2014-09-24 16:13:48 -04:00
Arpit Jalan
b8b20cb9af Update Translations 2014-09-23 21:17:42 +05:30
Arpit Jalan
6455dc7580 Add pl_PL translations for Poll plugin and update translations 2014-09-14 23:52:24 +05:30
Arpit Jalan
93d9fe0497 Update Translations 2014-09-04 21:48:58 +05:30
Arpit Jalan
be8249f113 Update Translations 2014-08-28 08:52:11 +05:30
Arpit Jalan
02d05ca2ab Update Translations 2014-08-26 23:07:10 +05:30
Arpit Jalan
2e89ee953e Update Translations 2014-08-21 23:44:58 +05:30
Robin Ward
db4abe76db CLEANUP: Remove dead resetRead code path 2014-08-18 14:35:33 -04:00
Arpit Jalan
8c2476100b Update Translations 2014-08-18 20:47:59 +05:30
Arpit Jalan
e98a6cf993 Update Translation 2014-08-15 23:32:14 +05:30
Arpit Jalan
38d6e74c0b Update translation to fix missing strings 2014-08-12 11:35:33 +05:30
Arpit Jalan
3339b30001 Update Translations 2014-08-09 02:04:01 +05:30
Arpit Jalan
2820bd34da Update Translations 2014-08-01 20:02:56 +05:30
Arpit Jalan
2413da4157 Update translations 2014-07-25 19:05:28 +05:30
Arpit Jalan
37981fb258 Update translations 2014-07-17 10:33:49 +05:30
Arpit Jalan
842f317d62 Update translations 2014-07-11 01:37:19 +05:30
Neil Lalonde
337630a216 Update translations 2014-07-02 16:42:59 -04:00
Arpit Jalan
923fa4646b Update Translations 2014-06-30 16:21:43 +05:30
Arpit Jalan
7dd7c5eb11 Update Translations 2014-06-19 17:49:05 +05:30
Neil Lalonde
a8c1babbfe Update translations 2014-06-10 10:48:27 -04:00
Arpit Jalan
96b72c7615 Update translations 2014-06-10 03:07:50 +05:30
Arpit Jalan
0571d500c9 Update translations 2014-05-30 07:08:40 +05:30
Neil Lalonde
56bd657d76 Update translations 2014-05-23 19:20:16 -04:00
Arpit Jalan
f8255f4443 Update translations 2014-05-22 22:28:47 +05:30
Neil Lalonde
f111e4ba56 Update translations 2014-05-14 12:37:00 -04:00
Jeff Atwood
5a22385b76 unread_message_count is just a string now 2014-05-13 22:15:06 -07:00
Neil Lalonde
11c0eb8db3 Update translations 2014-05-07 10:33:41 -04:00
Neil Lalonde
cb2bcb89ff Update translations 2014-05-02 14:01:27 -04:00
Neil Lalonde
0f4014eef1 Update translations 2014-04-24 10:53:04 -04:00
Régis Hanol
de53385ed2 display the copy & paste images hint to FF users too 2014-04-23 18:49:54 +02:00
Neil Lalonde
31043275d3 Update translations from Transifex 2014-04-14 11:53:25 -04:00
Neil Lalonde
b7203c125e Merge pull request #2226 from CirnoKaster/patch-2 
client.zh_TW.yml: adding lines under filters.new
 2014-04-11 13:50:54 -04:00
Neil Lalonde
cb11967715 Add transifex config. Reconcile client.yml and server.yml translations in github and transifex. Transifex is now the source of all client.yml and server.yml files. 2014-04-10 15:42:38 -04:00
CirnoKaster
6e8d4625c0 adding lines under filters.new 
adding filters.new.lower_title_with_count and lower_title
 2014-04-04 17:23:22 +08:00
riking
c29c15a7a3 Switch from MMM D to D MMM to separate from year 
Additionally, in German, the format is 'D. MMM'.
 2014-03-11 03:28:13 -07:00
staryume
21d561bc3a Update client.zh_TW.yml 
Minor fixes for the chinese translations
 2014-03-06 20:17:57 +09:00
CirnoKaster
334ae44fb7 fix translate mistake 
Line 626
minor change : favourite > starred
 2014-03-06 15:02:55 +08:00
Sam
b4688fc4c5 Merge pull request #2046 from staryume/patch-4 
Update client.zh_TW.yml for better Tradtional Chinese translations
 2014-03-05 11:30:56 +11:00
Jeff Atwood
d5ec409434 add Transifex link to header of translation files 2014-03-04 14:35:23 -08:00
staryume
19b1d5890e Update client.zh_TW.yml 
Change for better Traditional Chinese terms 

Admin > 管理員
Moderator > 版主
Posts > 帖子 (sometimes 發表 as a verb )
Topics > 討論話題 (主題 makes user confused with "Themes" ) 
Catogeries > 分類
Mute > 消音 (阻決 is weird )
 2014-03-03 15:23:52 +09:00
Sam
7004b3f3b9 Merge pull request #2037 from infogulch/abandon-button-text 
Explicit button text in abandon dialog in all lang
 2014-03-03 10:37:32 +11:00
staryume
ae344e6cd8 Update client.zh_TW.yml 
Major update of client.zh_TW.yml (eg. favourite > starred)
 2014-03-03 01:38:19 +09:00
staryume
700ccf2ca9 Update client.zh_TW.yml 
Major update for filling a lot of new Traditional Chinese translations and fixes eg. favorite > starred
 2014-03-03 01:20:06 +09:00
infogulch
bf21a55571 Explicit button text in abandon dialog in all lang 
The current post abandon dialog displays typical yes/no buttons and should
instead show more informative button text.

This commit updates all `config/locales/client.*.yml` files and *alters the
structure* of the `post.abandon` node, and *adds three new nodes* under it:
`confirm`, `yes_value`, and `no_value`. The current value of the
`post.abandon` node is moved into `post.abandon.confirm` for all languages.
For English language text, the nodes `post.abandon.yes_value` and
`.no_value` are changed to `"Yes, abandon"` and `"No, keep"`, respectively.
For other languages, the standard yes/no values are copied, allowing simple
copyedits to make them more explicit in the future.

I also make the necessary changes to the `composer_controller.js` file so
the new values are used correctly.
 2014-02-28 23:42:14 -06:00
Sam
7ad00f426c FEATURE REMOVAL: persona login 
see: https://meta.discourse.org/t/pulling-persona-out-of-discourse-core/12613
 2014-02-11 16:56:48 +11:00
Neil Lalonde
b5d0031105 Topic list dates formatting changes: use Dec '12 and Jan 21 2014-01-29 15:45:06 -05:00
Robin Ward
2892153712 REMOVE: Get rid of the hotness control for good. 2014-01-29 11:54:34 -05:00
sbaer
644c17d260 Trying again to merge changes to Chinese localizations done by Kelvin 2014-01-28 15:11:23 -08:00
Robin Ward
4981525047 REFACTOR: Fixes poor class hierarchy for listing topics 
- Upgrades Ember to latest
- Fixes a bunch of bugs with page titles and missing "active" states
 2014-01-18 19:26:24 +01:00
Sam
e20f5f89e6 Merge pull request #1795 from ok-harry/master 
internationalize Discourse.Formatter.tinyDateYear
 2014-01-12 14:34:10 -08:00
Neil Lalonde
52580f09af Rename favorite to starred everywhere 2014-01-10 14:54:19 -05:00
Harry Seo
bb54de1e96 internationalize Discourse.Formatter.tinyDateYear 
missed client.??_??.yml
 2014-01-08 14:46:50 +09:00
Régis Hanol
0525cbdb11 Corrected the mention string in the user stream. (props to @sunyatasattva) 
Previously the string would show *You mentioned {{Your Name}}*. Now it
correctly shows *You mentioned {{Other user name}}*
 2013-12-12 11:46:36 +01:00
Neil Lalonde
ed3d3ae1e1 Upgrade font-awesome to version 4 2013-12-11 10:31:09 -05:00
Robin Ward
b646495798 Remove unused translations 2013-12-06 13:16:04 -05:00
Robin Ward
f5fc0b6b55 Only show external link icons, use the wikipedia-style icon. 2013-11-19 12:42:19 -05:00
Robin Ward
a2466d182f Added Participants, Likes to Topic Map 2013-11-18 13:49:53 -05:00
Robin Ward
4ce81e1b01 Rename "Best Of" to "Summary" 2013-11-18 12:48:26 -05:00
Robin Ward
ad3e276b4b Rename TopicSummary -> TopicMap 2013-11-18 12:08:21 -05:00
Neil Lalonde
0c6f794eb0 Used the term suspended instead of banned. 2013-11-07 13:53:49 -05:00
Robin Ward
52c3457133 Site setting to support showing real names in posts. Also put back in type to search on site settings 2013-11-01 16:32:12 -04:00
Robin Ward
7ef76fd4c3 Change "Create XXX Topic" to "Create Topic" 2013-10-31 16:29:41 -04:00
Robin Ward
bb135fafb4 Replace slow auto-filter in site settings with a filter button 2013-10-29 17:03:50 -04:00
Sam
666264879c change it so all topics MUST include a category, we store a special uncategorized category to compensate 
this cleans up a bunch of internals and removes some settings
 2013-10-24 12:08:02 +11:00
Régis Hanol
2e5e6b8c15 better file upload dialog 2013-10-08 18:58:24 +02:00
John Paul Ashenfelter
cc2b0f1a5f took a stab at other translations with help from google 2013-08-21 16:29:05 -04:00
Régis Hanol
dcfe4f2061 remove useless text beneath avatar 2013-08-20 21:53:17 +02:00
Régis Hanol
e397c14702 updated locales 2013-08-13 22:09:36 +02:00
charlieshum
199d6a3fcc Update client.zh_TW.yml 
update the translation by comparing with client.en.yml
 2013-08-10 19:43:47 +08:00
charlieshum
7b4a236c3f Update client.zh_TW.yml 2013-08-02 19:41:33 +08:00
Régis Hanol
be9217d4c8 add server-side filesize check on uploads 2013-07-24 00:54:41 +02:00
Sam
7c5e15966f Merge pull request #1225 from ZogStriP/upload-selector-handles-attachments 
uploads selector texts is now different when attachments are enabled
 2013-07-23 00:44:17 -07:00
Régis Hanol
6474e7df97 uploads selector texts is now different when attachments are enabled 2013-07-22 23:15:23 +02:00
Michael Campagnaro
9616767bff Add confirmation modal to admin group deletion 2013-07-22 02:48:23 -04:00
Régis Hanol
46ff98f2d3 fix composer toolbar upload title 2013-07-17 01:21:27 +02:00
Régis Hanol
36e6345eee change the icon in the composer toolbar with a more generic upload icon 
also changed all references to "images uploads" to a "uploads"
 2013-07-14 23:44:50 +02:00
Régis Hanol
3397c2235f display the size of the attachment in the preview 
instead of adding it during post processing
 2013-07-14 12:28:24 +02:00
Neil Lalonde
ad096ac2b7 More nav links on admin users list page 2013-07-08 12:44:14 -04:00
Régis Hanol
6723ba6014 Add a list of for file uploads 2013-07-01 02:19:03 +02:00
Neil Lalonde
c9556b4bb8 Remove bookmark from top right of post; move its functionality to the post menu button 2013-06-18 17:35:37 -04:00
Robin Ward
0b97ea6345 Better HTML emails, smarter email digests, new email section in admin with digest preview 2013-06-05 17:47:25 -04:00
tangramor
9df4ad794e update the locale of zh_CN & zh_TW 2013-05-23 10:56:49 +08:00
Tower He
795de0c2d0 Updated zh locales 2013-05-22 13:45:32 +08:00
Jeff Atwood
7cf3f16d62 add YAML lint hint to the top of lang YAML files 2013-05-17 16:54:07 -07:00
Tower He
fec26c1d29 Updated the zh locales 2013-05-03 20:21:50 +08:00
Yingpeng Xu
b2b9320706 update locales on client for zh_CN and zh_TW 2013-04-20 08:39:55 -07:00
Jeff Atwood
024791a80e simplify admin user view a tad 2013-04-19 22:34:11 -07:00
Jeff Atwood
8c8784abb6 simplify user profile layout, bold labels 2013-04-19 15:06:35 -07:00
Yingpeng Xu
c48aa487e3 localize composer toggler help text for zh_CN and zh_TW 2013-04-18 02:44:59 -04:00
Jeff Atwood
e671cf906c make one text for latest changes widget + taller 2013-04-16 16:35:28 -07:00
tangramor
344a744f3a Updated zh_CN & zh_TW translations to the latest en.yml 2013-04-13 10:51:54 +08:00
Robin Ward
2e4d73efc7 Merge pull request #578 from tonytonyjan/patch 
Patch
 2013-03-28 08:23:48 -07:00
Neil Lalonde
b0fd89b4a7 Fix spelling of Github to GitHub 2013-03-28 11:07:55 -04:00
Tony Jian
833d8a2557 correct zh_TW 2013-03-28 15:00:46 +08:00
Tony Jian
d783769a67 correct zh_TW 2013-03-28 14:58:02 +08:00
Tony Jian
f0728b16f6 add whitespace 2013-03-28 14:54:43 +08:00
Tony Jian
8cfa5d8e15 correct zh_TW 2013-03-28 14:37:09 +08:00
Tony Jian
e93c8e0dce correct zh_TW locale 2013-03-28 13:42:30 +08:00
Robin Ward
36269cfbaa Rename 'popular' to 'latest'. First stab at 'Hot' tab. 2013-03-27 16:21:23 -04:00
Neil Lalonde
4711cb4716 Cleanup layout of login buttons 2013-03-27 12:23:11 -04:00
tangramor
a168ee25c7 Update zh_CN and zh_TW to current en.yml 2013-03-25 20:43:56 +08:00
Sam
bceb124da6 correct line endings 2013-03-23 03:19:26 -07:00
Jeff Atwood
38285b6219 for PMs, switch to envelope glyph instead of lock 2013-03-23 02:46:50 -07:00
Neil Lalonde
40962c84ca Add 'all' column to admin dashboard counts 2013-03-21 16:51:50 -04:00
tangramor
dc7b690921 Add I18n support for "The topic has been deleted" message 2013-03-21 00:10:41 +08:00
tangramor
841bf3f064 Update the translations according to the latest en.yml 2013-03-20 23:48:28 +08:00
tangramor
30f6561623 Fix #435 increased the lenghth of category.topic_prefix string; also added zh_TW translations by converting the Simplified Chinese to Traditional Chinese 
New I18n entries added, added in both zh_CN and zh_TW
Start to translate FAQ, TOS and Privacy docs
Add missed zh_TW.js.erb
Make translation more precise
 2013-03-14 18:18:59 +08:00