update translations

7 files changed, 953 insertions, 434 deletions

diff --git a/l10n/zh_CN/calendar.po b/l10n/zh_CN/calendar.po
index a80e877b379..c7757d95e12 100644
--- a/l10n/zh_CN/calendar.po
+++ b/l10n/zh_CN/calendar.po
@@ -8,269 +8,282 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-24 00:24+0100\n"
-"PO-Revision-Date: 2012-01-22 07:42+0000\n"
-"Last-Translator: csslayer <wengxt@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
+"POT-Creation-Date: 2012-05-09 12:29+0200\n"
+"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/guesstimezone.php:42
+#: ajax/categories/rescan.php:28
+msgid "No calendars found."
+msgstr ""
+
+#: ajax/categories/rescan.php:36
+msgid "No events found."
+msgstr ""
+
+#: ajax/event/edit.form.php:20
+msgid "Wrong calendar"
+msgstr "错误的日历"
+
+#: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "新时区："
 
-#: ajax/settimezone.php:22
+#: ajax/settings/settimezone.php:22
 msgid "Timezone changed"
 msgstr "时区已修改"
 
-#: ajax/settimezone.php:24
+#: ajax/settings/settimezone.php:24
 msgid "Invalid request"
 msgstr "非法请求"
 
-#: appinfo/app.php:20 templates/calendar.php:14
-#: templates/part.eventform.php:20
+#: appinfo/app.php:23 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:31
+#: templates/settings.php:12
 msgid "Calendar"
 msgstr "日历"
 
-#: lib/app.php:19
-msgid "Wrong calendar"
-msgstr "错误的日历"
+#: js/calendar.js:788
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr ""
 
-#: lib/app.php:60 lib/object.php:332
+#: lib/app.php:122
 msgid "Birthday"
 msgstr "生日"
 
-#: lib/app.php:61 lib/object.php:333
+#: lib/app.php:123
 msgid "Business"
 msgstr "商务"
 
-#: lib/app.php:62 lib/object.php:334
+#: lib/app.php:124
 msgid "Call"
 msgstr "呼叫"
 
-#: lib/app.php:63 lib/object.php:335
+#: lib/app.php:125
 msgid "Clients"
 msgstr "客户"
 
-#: lib/app.php:64 lib/object.php:336
+#: lib/app.php:126
 msgid "Deliverer"
 msgstr "派送"
 
-#: lib/app.php:65 lib/object.php:337
+#: lib/app.php:127
 msgid "Holidays"
 msgstr "节日"
 
-#: lib/app.php:66 lib/object.php:338
+#: lib/app.php:128
 msgid "Ideas"
 msgstr "想法"
 
-#: lib/app.php:67 lib/object.php:339
+#: lib/app.php:129
 msgid "Journey"
 msgstr "旅行"
 
-#: lib/app.php:68 lib/object.php:340
+#: lib/app.php:130
 msgid "Jubilee"
 msgstr "周年纪念"
 
-#: lib/app.php:69 lib/object.php:341
+#: lib/app.php:131
 msgid "Meeting"
 msgstr "会议"
 
-#: lib/app.php:70 lib/object.php:342
+#: lib/app.php:132
 msgid "Other"
 msgstr "其他"
 
-#: lib/app.php:71 lib/object.php:343
+#: lib/app.php:133
 msgid "Personal"
 msgstr "个人"
 
-#: lib/app.php:72 lib/object.php:344
+#: lib/app.php:134
 msgid "Projects"
 msgstr "项目"
 
-#: lib/app.php:73 lib/object.php:345
+#: lib/app.php:135
 msgid "Questions"
 msgstr "问题"
 
-#: lib/app.php:74 lib/object.php:346
+#: lib/app.php:136
 msgid "Work"
 msgstr "工作"
 
-#: lib/object.php:353
+#: lib/app.php:377
+msgid "unnamed"
+msgstr ""
+
+#: lib/object.php:330
 msgid "Does not repeat"
 msgstr "不重复"
 
-#: lib/object.php:354
+#: lib/object.php:331
 msgid "Daily"
 msgstr "每天"
 
-#: lib/object.php:355
+#: lib/object.php:332
 msgid "Weekly"
 msgstr "每周"
 
-#: lib/object.php:356
+#: lib/object.php:333
 msgid "Every Weekday"
 msgstr "每个工作日"
 
-#: lib/object.php:357
+#: lib/object.php:334
 msgid "Bi-Weekly"
 msgstr "每两周"
 
-#: lib/object.php:358
+#: lib/object.php:335
 msgid "Monthly"
 msgstr "每月"
 
-#: lib/object.php:359
+#: lib/object.php:336
 msgid "Yearly"
 msgstr "每年"
 
-#: lib/object.php:366
+#: lib/object.php:343
 msgid "never"
 msgstr "从不"
 
-#: lib/object.php:367
+#: lib/object.php:344
 msgid "by occurrences"
 msgstr "按发生次数"
 
-#: lib/object.php:368
+#: lib/object.php:345
 msgid "by date"
 msgstr "按日期"
 
-#: lib/object.php:375
+#: lib/object.php:352
 msgid "by monthday"
 msgstr "按月的某天"
 
-#: lib/object.php:376
+#: lib/object.php:353
 msgid "by weekday"
 msgstr "按星期的某天"
 
-#: lib/object.php:383 templates/lAfix.php:3
+#: lib/object.php:360 templates/settings.php:42
 msgid "Monday"
 msgstr "星期一"
 
-#: lib/object.php:384 templates/lAfix.php:4
+#: lib/object.php:361
 msgid "Tuesday"
 msgstr "星期二"
 
-#: lib/object.php:385 templates/lAfix.php:5
+#: lib/object.php:362
 msgid "Wednesday"
 msgstr "星期三"
 
-#: lib/object.php:386 templates/lAfix.php:6
+#: lib/object.php:363
 msgid "Thursday"
 msgstr "星期四"
 
-#: lib/object.php:387 templates/lAfix.php:7
+#: lib/object.php:364
 msgid "Friday"
 msgstr "星期五"
 
-#: lib/object.php:388 templates/lAfix.php:8
+#: lib/object.php:365
 msgid "Saturday"
 msgstr "星期六"
 
-#: lib/object.php:389 templates/lAfix.php:2
+#: lib/object.php:366 templates/settings.php:43
 msgid "Sunday"
 msgstr "星期日"
 
-#: lib/object.php:396
+#: lib/object.php:373
 msgid "events week of month"
 msgstr "事件在每月的第几个星期"
 
-#: lib/object.php:397
+#: lib/object.php:374
 msgid "first"
 msgstr "第一"
 
-#: lib/object.php:398
+#: lib/object.php:375
 msgid "second"
 msgstr "第二"
 
-#: lib/object.php:399
+#: lib/object.php:376
 msgid "third"
 msgstr "第三"
 
-#: lib/object.php:400
+#: lib/object.php:377
 msgid "fourth"
 msgstr "第四"
 
-#: lib/object.php:401
+#: lib/object.php:378
 msgid "fifth"
 msgstr "第五"
 
-#: lib/object.php:402
+#: lib/object.php:379
 msgid "last"
 msgstr "最后"
 
-#: lib/object.php:424 templates/lAfix.php:16
+#: lib/object.php:401
 msgid "January"
 msgstr "一月"
 
-#: lib/object.php:425 templates/lAfix.php:17
+#: lib/object.php:402
 msgid "February"
 msgstr "二月"
 
-#: lib/object.php:426 templates/lAfix.php:18
+#: lib/object.php:403
 msgid "March"
 msgstr "三月"
 
-#: lib/object.php:427 templates/lAfix.php:19
+#: lib/object.php:404
 msgid "April"
 msgstr "四月"
 
-#: lib/object.php:428 templates/lAfix.php:20
+#: lib/object.php:405
 msgid "May"
 msgstr "五月"
 
-#: lib/object.php:429 templates/lAfix.php:21
+#: lib/object.php:406
 msgid "June"
 msgstr "六月"
 
-#: lib/object.php:430 templates/lAfix.php:22
+#: lib/object.php:407
 msgid "July"
 msgstr "七月"
 
-#: lib/object.php:431 templates/lAfix.php:23
+#: lib/object.php:408
 msgid "August"
 msgstr "八月"
 
-#: lib/object.php:432 templates/lAfix.php:24
+#: lib/object.php:409
 msgid "September"
 msgstr "九月"
 
-#: lib/object.php:433 templates/lAfix.php:25
+#: lib/object.php:410
 msgid "October"
 msgstr "十月"
 
-#: lib/object.php:434 templates/lAfix.php:26
+#: lib/object.php:411
 msgid "November"
 msgstr "十一月"
 
-#: lib/object.php:435 templates/lAfix.php:27
+#: lib/object.php:412
 msgid "December"
 msgstr "十二月"
 
-#: lib/object.php:441
+#: lib/object.php:418
 msgid "by events date"
 msgstr "按事件日期"
 
-#: lib/object.php:442
+#: lib/object.php:419
 msgid "by yearday(s)"
 msgstr "按每年的某天"
 
-#: lib/object.php:443
+#: lib/object.php:420
 msgid "by weeknumber(s)"
 msgstr "按星期数"
 
-#: lib/object.php:444
+#: lib/object.php:421
 msgid "by day and month"
 msgstr "按天和月份"
 
-#: lib/object.php:467
-msgid "Not an array"
-msgstr "不是一个数组"
-
 #: lib/search.php:32 lib/search.php:34 lib/search.php:37
 msgid "Date"
 msgstr "日期"
@@ -279,168 +292,113 @@ msgstr "日期"
 msgid "Cal."
 msgstr "日历"
 
-#: templates/calendar.php:10
+#: templates/calendar.php:11
 msgid "All day"
 msgstr "全天"
 
-#: templates/calendar.php:11 templates/part.choosecalendar.php:15
+#: templates/calendar.php:12 templates/part.choosecalendar.php:22
 msgid "New Calendar"
 msgstr "新日历"
 
-#: templates/calendar.php:12
+#: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "缺少字段"
 
-#: templates/calendar.php:13 templates/part.eventform.php:3
+#: templates/calendar.php:14 templates/part.eventform.php:19
+#: templates/part.showevent.php:11
 msgid "Title"
 msgstr "标题"
 
-#: templates/calendar.php:15
+#: templates/calendar.php:16
 msgid "From Date"
 msgstr "从"
 
-#: templates/calendar.php:16
+#: templates/calendar.php:17
 msgid "From Time"
 msgstr "从"
 
-#: templates/calendar.php:17
+#: templates/calendar.php:18
 msgid "To Date"
 msgstr "至"
 
-#: templates/calendar.php:18
+#: templates/calendar.php:19
 msgid "To Time"
 msgstr "至"
 
-#: templates/calendar.php:19
+#: templates/calendar.php:20
 msgid "The event ends before it starts"
 msgstr "事件在开始前已结束"
 
-#: templates/calendar.php:20
+#: templates/calendar.php:21
 msgid "There was a database fail"
 msgstr "数据库访问失败"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:40
 msgid "Week"
 msgstr "星期"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:41
 msgid "Month"
 msgstr "月"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:42
 msgid "List"
 msgstr "列表"
 
-#: templates/calendar.php:46
+#: templates/calendar.php:48
 msgid "Today"
 msgstr "今天"
 
-#: templates/calendar.php:47
+#: templates/calendar.php:49
 msgid "Calendars"
 msgstr "日历"
 
-#: templates/calendar.php:65
+#: templates/calendar.php:67
 msgid "There was a fail, while parsing the file."
 msgstr "解析文件失败"
 
-#: templates/lAfix.php:9
-msgid "Sun."
-msgstr "周日"
-
-#: templates/lAfix.php:10
-msgid "Mon."
-msgstr "周一"
-
-#: templates/lAfix.php:11
-msgid "Tue."
-msgstr "周二"
-
-#: templates/lAfix.php:12
-msgid "Wed."
-msgstr "周三"
-
-#: templates/lAfix.php:13
-msgid "Thu."
-msgstr "周四"
-
-#: templates/lAfix.php:14
-msgid "Fri."
-msgstr "周五"
-
-#: templates/lAfix.php:15
-msgid "Sat."
-msgstr "周六"
-
-#: templates/lAfix.php:28
-msgid "Jan."
-msgstr "1月"
-
-#: templates/lAfix.php:29
-msgid "Feb."
-msgstr "2月"
-
-#: templates/lAfix.php:30
-msgid "Mar."
-msgstr "3月"
-
-#: templates/lAfix.php:31
-msgid "Apr."
-msgstr "4月"
-
-#: templates/lAfix.php:32
-msgid "May."
-msgstr "5月"
-
-#: templates/lAfix.php:33
-msgid "Jun."
-msgstr "6月"
-
-#: templates/lAfix.php:34
-msgid "Jul."
-msgstr "7月"
-
-#: templates/lAfix.php:35
-msgid "Aug."
-msgstr "8月"
-
-#: templates/lAfix.php:36
-msgid "Sep."
-msgstr "9月"
-
-#: templates/lAfix.php:37
-msgid "Oct."
-msgstr "10月"
-
-#: templates/lAfix.php:38
-msgid "Nov."
-msgstr "11月"
-
-#: templates/lAfix.php:39
-msgid "Dec."
-msgstr "12月"
-
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "选择活动日历"
 
-#: templates/part.choosecalendar.php:20
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.php:2
+msgid "Your calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:27
+#: templates/part.choosecalendar.rowfields.php:5
 msgid "CalDav Link"
 msgstr "CalDav 链接"
 
+#: templates/part.choosecalendar.php:31
+msgid "Shared calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:48
+msgid "No shared calendars"
+msgstr ""
+
 #: templates/part.choosecalendar.rowfields.php:4
+msgid "Share Calendar"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
 msgstr "下载"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:7
 msgid "Edit"
 msgstr "编辑"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "删除"
 
+#: templates/part.choosecalendar.rowfields.shared.php:4
+msgid "shared with you by"
+msgstr ""
+
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
 msgstr "新日历"
@@ -482,98 +440,123 @@ msgstr "编辑事件"
 msgid "Export"
 msgstr "导出"
 
-#: templates/part.eventform.php:5
+#: templates/part.eventform.php:8 templates/part.showevent.php:3
+msgid "Eventinfo"
+msgstr ""
+
+#: templates/part.eventform.php:9 templates/part.showevent.php:4
+msgid "Repeating"
+msgstr ""
+
+#: templates/part.eventform.php:10 templates/part.showevent.php:5
+msgid "Alarm"
+msgstr ""
+
+#: templates/part.eventform.php:11 templates/part.showevent.php:6
+msgid "Attendees"
+msgstr ""
+
+#: templates/part.eventform.php:13
+msgid "Share"
+msgstr ""
+
+#: templates/part.eventform.php:21
 msgid "Title of the Event"
 msgstr "事件标题"
 
-#: templates/part.eventform.php:11
+#: templates/part.eventform.php:27 templates/part.showevent.php:19
 msgid "Category"
 msgstr "分类"
 
-#: templates/part.eventform.php:13
-msgid "Select category"
-msgstr "选择分类"
+#: templates/part.eventform.php:29
+msgid "Separate categories with commas"
+msgstr ""
+
+#: templates/part.eventform.php:30
+msgid "Edit categories"
+msgstr ""
 
-#: templates/part.eventform.php:37
+#: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
 msgstr "全天事件"
 
-#: templates/part.eventform.php:41
+#: templates/part.eventform.php:60 templates/part.showevent.php:59
 msgid "From"
 msgstr "自"
 
-#: templates/part.eventform.php:49
+#: templates/part.eventform.php:68 templates/part.showevent.php:67
 msgid "To"
 msgstr "至"
 
-#: templates/part.eventform.php:57
+#: templates/part.eventform.php:76 templates/part.showevent.php:75
 msgid "Advanced options"
 msgstr "高级选项"
 
-#: templates/part.eventform.php:61
+#: templates/part.eventform.php:81 templates/part.showevent.php:80
+msgid "Location"
+msgstr "地点"
+
+#: templates/part.eventform.php:83
+msgid "Location of the Event"
+msgstr "事件地点"
+
+#: templates/part.eventform.php:89 templates/part.showevent.php:88
+msgid "Description"
+msgstr "描述"
+
+#: templates/part.eventform.php:91
+msgid "Description of the Event"
+msgstr "事件描述"
+
+#: templates/part.eventform.php:100 templates/part.showevent.php:98
 msgid "Repeat"
 msgstr "重复"
 
-#: templates/part.eventform.php:68
+#: templates/part.eventform.php:107 templates/part.showevent.php:105
 msgid "Advanced"
 msgstr "高级"
 
-#: templates/part.eventform.php:112
+#: templates/part.eventform.php:151 templates/part.showevent.php:149
 msgid "Select weekdays"
 msgstr "选择星期中的某天"
 
-#: templates/part.eventform.php:125 templates/part.eventform.php:138
+#: templates/part.eventform.php:164 templates/part.eventform.php:177
+#: templates/part.showevent.php:162 templates/part.showevent.php:175
 msgid "Select days"
 msgstr "选择某天"
 
-#: templates/part.eventform.php:130
+#: templates/part.eventform.php:169 templates/part.showevent.php:167
 msgid "and the events day of year."
 msgstr "选择每年事件发生的日子"
 
-#: templates/part.eventform.php:143
+#: templates/part.eventform.php:182 templates/part.showevent.php:180
 msgid "and the events day of month."
 msgstr "选择每月事件发生的日子"
 
-#: templates/part.eventform.php:151
+#: templates/part.eventform.php:190 templates/part.showevent.php:188
 msgid "Select months"
 msgstr "选择月份"
 
-#: templates/part.eventform.php:164
+#: templates/part.eventform.php:203 templates/part.showevent.php:201
 msgid "Select weeks"
 msgstr "选择星期"
 
-#: templates/part.eventform.php:169
+#: templates/part.eventform.php:208 templates/part.showevent.php:206
 msgid "and the events week of year."
 msgstr "选择每年的事件发生的星期"
 
-#: templates/part.eventform.php:175
+#: templates/part.eventform.php:214 templates/part.showevent.php:212
 msgid "Interval"
 msgstr "间隔"
 
-#: templates/part.eventform.php:181
+#: templates/part.eventform.php:220 templates/part.showevent.php:218
 msgid "End"
 msgstr "结束"
 
-#: templates/part.eventform.php:193
+#: templates/part.eventform.php:233 templates/part.showevent.php:231
 msgid "occurrences"
 msgstr "次"
 
-#: templates/part.eventform.php:208
-msgid "Location"
-msgstr "地点"
-
-#: templates/part.eventform.php:210
-msgid "Location of the Event"
-msgstr "事件地点"
-
-#: templates/part.eventform.php:216
-msgid "Description"
-msgstr "描述"
-
-#: templates/part.eventform.php:218
-msgid "Description of the Event"
-msgstr "事件描述"
-
 #: templates/part.import.php:1
 msgid "Import a calendar file"
 msgstr "导入日历文件"
@@ -610,28 +593,74 @@ msgstr "关闭对话框"
 msgid "Create a new event"
 msgstr "创建新事件"
 
-#: templates/settings.php:13
+#: templates/part.showevent.php:1
+msgid "View an event"
+msgstr ""
+
+#: templates/part.showevent.php:23
+msgid "No categories selected"
+msgstr ""
+
+#: templates/part.showevent.php:25
+msgid "Select category"
+msgstr "选择分类"
+
+#: templates/part.showevent.php:37
+msgid "of"
+msgstr ""
+
+#: templates/part.showevent.php:62 templates/part.showevent.php:70
+msgid "at"
+msgstr ""
+
+#: templates/settings.php:14
 msgid "Timezone"
 msgstr "时区"
 
-#: templates/settings.php:30
+#: templates/settings.php:31
 msgid "Check always for changes of the timezone"
 msgstr "选中则总是按照时区变化"
 
-#: templates/settings.php:32
+#: templates/settings.php:33
 msgid "Timeformat"
 msgstr "时间格式"
 
-#: templates/settings.php:34
+#: templates/settings.php:35
 msgid "24h"
 msgstr "24小时"
 
-#: templates/settings.php:35
+#: templates/settings.php:36
 msgid "12h"
 msgstr "12小时"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "First day of the week"
+msgstr ""
+
+#: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
 msgstr "日历CalDAV 同步地址："
 
+#: templates/share.dropdown.php:20
+msgid "Users"
+msgstr ""
+
+#: templates/share.dropdown.php:21
+msgid "select users"
+msgstr ""
+
+#: templates/share.dropdown.php:36 templates/share.dropdown.php:62
+msgid "Editable"
+msgstr ""
+
+#: templates/share.dropdown.php:48
+msgid "Groups"
+msgstr ""
+
+#: templates/share.dropdown.php:49
+msgid "select groups"
+msgstr ""
 
+#: templates/share.dropdown.php:75
+msgid "make public"
+msgstr ""
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index e2f1c8d81b8..9ea76ae978d 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.po
@@ -8,228 +8,560 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-24 00:24+0100\n"
-"PO-Revision-Date: 2012-01-23 23:25+0000\n"
+"POT-Creation-Date: 2012-05-09 12:29+0200\n"
+"PO-Revision-Date: 2012-05-09 10:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+#: ajax/activation.php:19 ajax/updateaddressbook.php:32
 msgid "Error (de)activating addressbook."
 msgstr "(取消)激活地址簿错误。"
 
-#: ajax/addcard.php:79
+#: ajax/addcontact.php:58
 msgid "There was an error adding the contact."
 msgstr "添加联系人时出错。"
 
-#: ajax/addproperty.php:39
+#: ajax/addproperty.php:40
 msgid "Cannot add empty property."
 msgstr "无法添加空属性。"
 
-#: ajax/addproperty.php:51
+#: ajax/addproperty.php:52
 msgid "At least one of the address fields has to be filled out."
 msgstr "至少需要填写一项地址。"
 
-#: ajax/addproperty.php:78
+#: ajax/addproperty.php:62
+msgid "Trying to add duplicate property: "
+msgstr ""
+
+#: ajax/addproperty.php:120
 msgid "Error adding contact property."
 msgstr "添加联系人属性错误。"
 
-#: ajax/createaddressbook.php:20
+#: ajax/categories/categoriesfor.php:15
+msgid "No ID provided"
+msgstr ""
+
+#: ajax/categories/categoriesfor.php:27
+msgid "Error setting checksum."
+msgstr ""
+
+#: ajax/categories/delete.php:29
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+msgid "No address books found."
+msgstr ""
+
+#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+msgid "No contacts found."
+msgstr ""
+
+#: ajax/contactdetails.php:37
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contactdetails.php:41
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contactdetails.php:53
+msgid "Unknown"
+msgstr ""
+
+#: ajax/createaddressbook.php:18
+msgid "Cannot add addressbook with an empty name."
+msgstr ""
+
+#: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
 msgstr "添加地址簿错误。"
 
-#: ajax/createaddressbook.php:26
+#: ajax/createaddressbook.php:30
 msgid "Error activating addressbook."
 msgstr "激活地址簿错误。"
 
-#: ajax/deleteproperty.php:40
+#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:61
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:64
+msgid "The loading photo is not valid."
+msgstr ""
+
+#: ajax/deletecard.php:37 ajax/saveproperty.php:58
+msgid "id is not set."
+msgstr ""
+
+#: ajax/deleteproperty.php:36
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr "vCard 的信息不正确。请重新加载页面。"
+
+#: ajax/deleteproperty.php:43
 msgid "Error deleting contact property."
 msgstr "删除联系人属性错误。"
 
-#: ajax/setproperty.php:79
+#: ajax/editname.php:37
+msgid "Contact ID is missing."
+msgstr ""
+
+#: ajax/loadphoto.php:44
+msgid "Missing contact id."
+msgstr ""
+
+#: ajax/oc_photo.php:44
+msgid "No photo path was submitted."
+msgstr ""
+
+#: ajax/oc_photo.php:51
+msgid "File doesn't exist:"
+msgstr ""
+
+#: ajax/saveproperty.php:55
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/saveproperty.php:61
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/saveproperty.php:78
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/saveproperty.php:83
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/saveproperty.php:153
 msgid "Error updating contact property."
 msgstr "更新联系人属性错误。"
 
 #: ajax/updateaddressbook.php:20
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/updateaddressbook.php:26
 msgid "Error updating addressbook."
 msgstr "更新地址簿错误"
 
-#: appinfo/app.php:21 templates/settings.php:3
+#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+msgid "Error uploading contacts to storage."
+msgstr ""
+
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: appinfo/app.php:22 templates/settings.php:3
 msgid "Contacts"
 msgstr "联系人"
 
-#: lib/app.php:52
+#: lib/app.php:23
+msgid "Addressbook not found."
+msgstr ""
+
+#: lib/app.php:27
 msgid "This is not your addressbook."
 msgstr "这不是您的地址簿。"
 
-#: lib/app.php:61 photo.php:36
+#: lib/app.php:38
 msgid "Contact could not be found."
 msgstr "无法找到联系人。"
 
-#: lib/app.php:89
-msgid "Information about vCard is incorrect. Please reload the page."
-msgstr "vCard 的信息不正确。请重新加载页面。"
-
-#: lib/app.php:101 templates/part.addcardform.php:54
-#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+#: lib/app.php:94 templates/part.contact.php:109
 msgid "Address"
 msgstr "地址"
 
-#: lib/app.php:102 templates/part.addcardform.php:43
+#: lib/app.php:95
 msgid "Telephone"
 msgstr "电话"
 
-#: lib/app.php:103 templates/part.addcardform.php:37
-#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+#: lib/app.php:96 templates/part.contact.php:108
 msgid "Email"
 msgstr "电子邮件"
 
-#: lib/app.php:104 templates/part.addcardform.php:27
-#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: templates/part.contact.php:104
 msgid "Organization"
 msgstr "组织"
 
-#: lib/app.php:116 lib/app.php:123
+#: lib/app.php:109 lib/app.php:116 lib/app.php:126
 msgid "Work"
 msgstr "工作"
 
-#: lib/app.php:117 lib/app.php:121
+#: lib/app.php:110 lib/app.php:114 lib/app.php:127
 msgid "Home"
 msgstr "家庭"
 
-#: lib/app.php:122
+#: lib/app.php:115
 msgid "Mobile"
 msgstr "移动电话"
 
-#: lib/app.php:124
+#: lib/app.php:117
 msgid "Text"
 msgstr "文本"
 
-#: lib/app.php:125
+#: lib/app.php:118
 msgid "Voice"
 msgstr "语音"
 
-#: lib/app.php:126
+#: lib/app.php:119
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:120
 msgid "Fax"
 msgstr "传真"
 
-#: lib/app.php:127
+#: lib/app.php:121
 msgid "Video"
 msgstr "视频"
 
-#: lib/app.php:128
+#: lib/app.php:122
 msgid "Pager"
 msgstr "传呼机"
 
+#: lib/app.php:128
+msgid "Internet"
+msgstr ""
+
+#: lib/hooks.php:79
+msgid "{name}'s Birthday"
+msgstr ""
+
 #: lib/search.php:22
 msgid "Contact"
 msgstr "联系人"
 
-#: photo.php:42
-msgid "This is not your contact."
-msgstr "这不是您的联系人。"
-
-#: templates/index.php:6
+#: templates/index.php:13
 msgid "Add Contact"
 msgstr "添加联系人"
 
-#: templates/index.php:7
+#: templates/index.php:14
 msgid "Addressbooks"
 msgstr "地址簿"
 
-#: templates/part.addcardform.php:8
-msgid "Addressbook"
-msgstr "地址簿"
+#: templates/part.chooseaddressbook.php:1
+msgid "Configure Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+msgid "New Address Book"
+msgstr "新建地址簿"
+
+#: templates/part.chooseaddressbook.php:17
+msgid "Import from VCF"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.rowfields.php:8
+msgid "CardDav Link"
+msgstr "CardDav 链接"
+
+#: templates/part.chooseaddressbook.rowfields.php:11
+msgid "Download"
+msgstr "下载"
+
+#: templates/part.chooseaddressbook.rowfields.php:14
+msgid "Edit"
+msgstr "编辑"
+
+#: templates/part.chooseaddressbook.rowfields.php:17
+#: templates/part.contact.php:34 templates/part.contact.php:36
+#: templates/part.contact.php:38 templates/part.contact.php:42
+msgid "Delete"
+msgstr "删除"
+
+#: templates/part.contact.php:12
+msgid "Download contact"
+msgstr "下载联系人"
+
+#: templates/part.contact.php:13
+msgid "Delete contact"
+msgstr "删除联系人"
+
+#: templates/part.contact.php:19
+msgid "Drop photo to upload"
+msgstr ""
+
+#: templates/part.contact.php:29
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:30
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:35 templates/part.contact.php:105
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:36
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:37 templates/part.contact.php:106
+msgid "Birthday"
+msgstr "生日"
+
+#: templates/part.contact.php:38
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:39 templates/part.contact.php:111
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:41
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:42
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:55 templates/part.contact.php:69
+msgid "Preferred"
+msgstr "偏好"
+
+#: templates/part.contact.php:56
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:56
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:60
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:61
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:70
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:74
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:84
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:84
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:95
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:101
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:103
+msgid "Profile picture"
+msgstr ""
+
+#: templates/part.contact.php:107
+msgid "Phone"
+msgstr "电话"
+
+#: templates/part.contact.php:110
+msgid "Note"
+msgstr ""
+
+#: templates/part.contactphoto.php:8
+msgid "Delete current photo"
+msgstr ""
 
-#: templates/part.addcardform.php:21
-msgid "Name"
-msgstr "名称"
+#: templates/part.contactphoto.php:9
+msgid "Edit current photo"
+msgstr ""
+
+#: templates/part.contactphoto.php:10
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contactphoto.php:11
+msgid "Select photo from ownCloud"
+msgstr ""
 
-#: templates/part.addcardform.php:57 templates/part.details.php:43
-#: templates/part.details.php:79 templates/part.setpropertyform.php:10
-#: templates/part.setpropertyform.php:47
+#: templates/part.edit_address_dialog.php:9
+msgid "Edit address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:14
 msgid "Type"
 msgstr "类型"
 
-#: templates/part.addcardform.php:65 templates/part.details.php:49
-#: templates/part.setpropertyform.php:16
+#: templates/part.edit_address_dialog.php:22
+#: templates/part.edit_address_dialog.php:25
 msgid "PO Box"
 msgstr "邮箱"
 
-#: templates/part.addcardform.php:72 templates/part.details.php:53
-#: templates/part.setpropertyform.php:20
+#: templates/part.edit_address_dialog.php:29
+#: templates/part.edit_address_dialog.php:32
 msgid "Extended"
 msgstr "扩展"
 
-#: templates/part.addcardform.php:78 templates/part.details.php:57
-#: templates/part.setpropertyform.php:24
+#: templates/part.edit_address_dialog.php:35
+#: templates/part.edit_address_dialog.php:38
 msgid "Street"
 msgstr "街道"
 
-#: templates/part.addcardform.php:84 templates/part.details.php:61
-#: templates/part.setpropertyform.php:28
+#: templates/part.edit_address_dialog.php:41
+#: templates/part.edit_address_dialog.php:44
 msgid "City"
 msgstr "城市"
 
-#: templates/part.addcardform.php:90 templates/part.details.php:65
-#: templates/part.setpropertyform.php:32
+#: templates/part.edit_address_dialog.php:47
+#: templates/part.edit_address_dialog.php:50
 msgid "Region"
 msgstr "地区"
 
-#: templates/part.addcardform.php:96 templates/part.details.php:69
-#: templates/part.setpropertyform.php:36
+#: templates/part.edit_address_dialog.php:53
+#: templates/part.edit_address_dialog.php:56
 msgid "Zipcode"
 msgstr "邮编"
 
-#: templates/part.addcardform.php:102 templates/part.details.php:73
-#: templates/part.setpropertyform.php:40
+#: templates/part.edit_address_dialog.php:59
+#: templates/part.edit_address_dialog.php:62
 msgid "Country"
 msgstr "国家"
 
-#: templates/part.addcardform.php:109
-msgid "Create Contact"
-msgstr "创建联系人"
+#: templates/part.edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Choose active Address Books"
-msgstr "选择激活地址簿"
+#: templates/part.edit_categories_dialog.php:14
+msgid "Add"
+msgstr "添加"
 
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "新建地址簿"
+#: templates/part.edit_name_dialog.php:16
+msgid "Addressbook"
+msgstr "地址簿"
 
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:5
-msgid "CardDav Link"
-msgstr "CardDav 链接"
+#: templates/part.edit_name_dialog.php:23
+msgid "Hon. prefixes"
+msgstr ""
 
-#: templates/part.chooseaddressbook.rowfields.php:5
-msgid "Download"
-msgstr "下载"
+#: templates/part.edit_name_dialog.php:27
+msgid "Miss"
+msgstr ""
 
-#: templates/part.chooseaddressbook.rowfields.php:5
-msgid "Edit"
-msgstr "编辑"
+#: templates/part.edit_name_dialog.php:28
+msgid "Ms"
+msgstr ""
 
-#: templates/part.chooseaddressbook.rowfields.php:5
-msgid "Delete"
-msgstr "删除"
+#: templates/part.edit_name_dialog.php:29
+msgid "Mr"
+msgstr ""
 
-#: templates/part.details.php:3
-msgid "Download contact"
-msgstr "下载联系人"
+#: templates/part.edit_name_dialog.php:30
+msgid "Sir"
+msgstr ""
 
-#: templates/part.details.php:4
-msgid "Delete contact"
-msgstr "删除联系人"
+#: templates/part.edit_name_dialog.php:31
+msgid "Mrs"
+msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add"
-msgstr "添加"
+#: templates/part.edit_name_dialog.php:32
+msgid "Dr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:35
+msgid "Given name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:37
+msgid "Additional names"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:39
+msgid "Family name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:41
+msgid "Hon. suffixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:45
+msgid "J.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:46
+msgid "M.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:47
+msgid "D.O."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:48
+msgid "D.C."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:49
+msgid "Ph.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:50
+msgid "Esq."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:51
+msgid "Jr."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:52
+msgid "Sn."
+msgstr ""
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -256,27 +588,82 @@ msgid "Submit"
 msgstr "提交"
 
 #: templates/part.editaddressbook.php:30
+#: templates/part.importaddressbook.php:28
 msgid "Cancel"
 msgstr "取消"
 
-#: templates/part.property.php:3
-msgid "Birthday"
-msgstr "生日"
+#: templates/part.import.php:1
+msgid "Import a contacts file"
+msgstr ""
 
-#: templates/part.property.php:23
-msgid "Preferred"
-msgstr "偏好"
+#: templates/part.import.php:6
+msgid "Please choose the addressbook"
+msgstr ""
 
-#: templates/part.property.php:23 templates/part.setpropertyform.php:45
-msgid "Phone"
-msgstr "电话"
+#: templates/part.import.php:10
+msgid "create a new addressbook"
+msgstr ""
 
-#: templates/part.setpropertyform.php:57
-msgid "Update"
-msgstr "更新"
+#: templates/part.import.php:15
+msgid "Name of new addressbook"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing contacts"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Contacts imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
+
+#: templates/part.importaddressbook.php:9
+msgid "Import Addressbook"
+msgstr ""
+
+#: templates/part.importaddressbook.php:12
+msgid "Select address book to import to:"
+msgstr ""
+
+#: templates/part.importaddressbook.php:20
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: templates/part.importaddressbook.php:21
+msgid "Select from HD"
+msgstr ""
+
+#: templates/part.no_contacts.php:2
+msgid "You have no contacts in your addressbook."
+msgstr ""
+
+#: templates/part.no_contacts.php:4
+msgid "Add contact"
+msgstr ""
+
+#: templates/part.no_contacts.php:5
+msgid "Configure addressbooks"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "CardDAV syncing addresses"
+msgstr ""
 
 #: templates/settings.php:4
-msgid "CardDAV syncing address:"
-msgstr "CardDAV 同步地址："
+msgid "more info"
+msgstr ""
 
+#: templates/settings.php:6
+msgid "Primary address (Kontact et al)"
+msgstr ""
 
+#: templates/settings.php:8
+msgid "iOS/OS X"
+msgstr ""
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index afe32762564..cd097413638 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -8,20 +8,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-24 00:25+0100\n"
-"PO-Revision-Date: 2012-01-22 07:23+0000\n"
-"Last-Translator: csslayer <wengxt@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
+"POT-Creation-Date: 2012-05-09 12:29+0200\n"
+"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: lostpassword/index.php:24
+#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
+msgid "Application name not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:29
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:36
+msgid "This category already exists: "
+msgstr ""
+
+#: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "重置 Owncloud 密码"
 
+#: lostpassword/index.php:27
+msgid "ownCloud password reset"
+msgstr ""
+
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
 msgstr "使用以下链接重置您的密码：{link}"
@@ -38,12 +54,12 @@ msgstr "已请求"
 msgid "Login failed!"
 msgstr "登录失败！"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
-#: templates/login.php:8
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: templates/login.php:9
 msgid "Username"
 msgstr "用户名"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:15
 msgid "Request reset"
 msgstr "请求重置"
 
@@ -83,76 +99,88 @@ msgstr "管理员"
 msgid "Help"
 msgstr "帮助"
 
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
 #: templates/404.php:12
 msgid "Cloud not found"
 msgstr "未找到云"
 
-#: templates/installation.php:20
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:14
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
 msgstr "创建<strong>管理员账号</strong>"
 
-#: templates/installation.php:26 templates/login.php:12
+#: templates/installation.php:29 templates/login.php:13
 msgid "Password"
 msgstr "密码"
 
-#: templates/installation.php:32
+#: templates/installation.php:35
 msgid "Advanced"
 msgstr "高级"
 
-#: templates/installation.php:34
+#: templates/installation.php:37
 msgid "Data folder"
 msgstr "数据目录"
 
-#: templates/installation.php:41
+#: templates/installation.php:44
 msgid "Configure the database"
 msgstr "配置数据库"
 
-#: templates/installation.php:46 templates/installation.php:57
-#: templates/installation.php:67
+#: templates/installation.php:49 templates/installation.php:60
+#: templates/installation.php:70
 msgid "will be used"
 msgstr "将被使用"
 
-#: templates/installation.php:79
+#: templates/installation.php:82
 msgid "Database user"
 msgstr "数据库用户"
 
-#: templates/installation.php:83
+#: templates/installation.php:86
 msgid "Database password"
 msgstr "数据库密码"
 
-#: templates/installation.php:87
+#: templates/installation.php:90
 msgid "Database name"
 msgstr "数据库名"
 
-#: templates/installation.php:93
+#: templates/installation.php:96
 msgid "Database host"
 msgstr "数据库主机"
 
-#: templates/installation.php:98
+#: templates/installation.php:101
 msgid "Finish setup"
 msgstr "安装完成"
 
-#: templates/layout.guest.php:35
+#: templates/layout.guest.php:37
 msgid "web services under your control"
 msgstr "由您掌控的网络服务"
 
-#: templates/layout.user.php:34
+#: templates/layout.user.php:35
 msgid "Log out"
 msgstr "注销"
 
-#: templates/layout.user.php:46 templates/layout.user.php:47
+#: templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "设置"
 
-#: templates/login.php:5
+#: templates/login.php:6
 msgid "Lost your password?"
 msgstr "忘记密码？"
 
-#: templates/login.php:15
+#: templates/login.php:17
 msgid "remember"
 msgstr "记住"
 
-#: templates/login.php:16
+#: templates/login.php:18
 msgid "Log in"
 msgstr "登录"
 
@@ -167,5 +195,3 @@ msgstr "上一页"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "下一页"
-
-
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index cd794d7514e..28452ae2cdb 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-24 00:25+0100\n"
-"PO-Revision-Date: 2012-01-22 07:23+0000\n"
-"Last-Translator: csslayer <wengxt@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
+"POT-Creation-Date: 2012-05-09 12:29+0200\n"
+"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,66 +44,112 @@ msgstr "文件没有上传"
 msgid "Missing a temporary folder"
 msgstr "缺少临时目录"
 
-#: appinfo/app.php:8
+#: ajax/upload.php:25
+msgid "Failed to write to disk"
+msgstr ""
+
+#: appinfo/app.php:7
 msgid "Files"
 msgstr "文件"
 
 #: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
 msgid "Maximum upload size"
 msgstr "最大上传大小"
 
+#: templates/admin.php:7
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "新建"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "文本文件"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "文件夹"
 
-#: templates/index.php:12
-msgid "From the web"
-msgstr "来自网络"
+#: templates/index.php:11
+msgid "From url"
+msgstr ""
 
-#: templates/index.php:22
+#: templates/index.php:21
 msgid "Upload"
 msgstr "上传"
 
-#: templates/index.php:35
+#: templates/index.php:27
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:39
 msgid "Nothing in here. Upload something!"
 msgstr "这里还什么都没有。上传些东西吧！"
 
-#: templates/index.php:43
+#: templates/index.php:47
 msgid "Name"
 msgstr "名称"
 
-#: templates/index.php:45
+#: templates/index.php:49
+msgid "Share"
+msgstr ""
+
+#: templates/index.php:51
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:49
+#: templates/index.php:55
 msgid "Size"
 msgstr "大小"
 
-#: templates/index.php:50
+#: templates/index.php:56
 msgid "Modified"
 msgstr "修改日期"
 
-#: templates/index.php:50
+#: templates/index.php:56
+msgid "Delete all"
+msgstr ""
+
+#: templates/index.php:56
 msgid "Delete"
 msgstr "删除"
 
-#: templates/index.php:58
+#: templates/index.php:64
 msgid "Upload too large"
 msgstr "上传文件过大"
 
-#: templates/index.php:60
+#: templates/index.php:66
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您正尝试上传的文件超过了此服务器可以上传的最大大小"
 
+#: templates/index.php:71
+msgid "Files are being scanned, please wait."
+msgstr ""
 
+#: templates/index.php:74
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/zh_CN/gallery.po b/l10n/zh_CN/gallery.po
index 5ba9a6462fb..e07ea9859f4 100644
--- a/l10n/zh_CN/gallery.po
+++ b/l10n/zh_CN/gallery.po
@@ -9,46 +9,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-24 00:24+0100\n"
-"PO-Revision-Date: 2012-01-23 23:25+0000\n"
+"POT-Creation-Date: 2012-05-09 12:29+0200\n"
+"PO-Revision-Date: 2012-05-09 10:33+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:41
-msgid "Gallery"
-msgstr "图库"
-
-#: js/album_cover.js:40
-msgid "Scanning directories"
-msgstr "扫描目录"
-
-#: js/album_cover.js:48
-msgid "No photos found"
+#: appinfo/app.php:42
+msgid "Pictures"
 msgstr ""
 
-#: js/album_cover.js:51 js/album_cover.js:60
-msgid "Creating thumbnails"
-msgstr "创建缩略图"
+#: templates/index.php:16
+msgid "Rescan"
+msgstr "重新扫描"
 
-#: js/album_cover.js:81
-msgid "Do you wan't to remove album"
-msgstr "您是否想要移除相册"
+#: templates/index.php:17
+msgid "Stop"
+msgstr ""
 
-#: js/album_cover.js:94
-msgid "Input new gallery name"
-msgstr "输入新图库名称"
+#: templates/index.php:18
+msgid "Share"
+msgstr ""
 
-#: templates/index.php:10
-msgid "Rescan"
-msgstr "重新扫描"
+#: templates/index.php:19
+msgid "Settings"
+msgstr ""
 
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "返回"
 
+#: templates/view_album.php:36
+msgid "Remove confirmation"
+msgstr ""
+
+#: templates/view_album.php:37
+msgid "Do you want to remove album"
+msgstr ""
 
+#: templates/view_album.php:40
+msgid "Change album name"
+msgstr ""
+
+#: templates/view_album.php:43
+msgid "New album name"
+msgstr ""
diff --git a/l10n/zh_CN/media.po b/l10n/zh_CN/media.po
index 868e222190d..f59cf4210d2 100644
--- a/l10n/zh_CN/media.po
+++ b/l10n/zh_CN/media.po
@@ -8,17 +8,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-05-09 12:29+0200\n"
+"PO-Revision-Date: 2012-02-14 09:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:32
+#: appinfo/app.php:32 templates/player.php:9
 msgid "Music"
 msgstr "音乐"
 
@@ -61,5 +61,3 @@ msgstr "专辑"
 #: templates/music.php:39
 msgid "Title"
 msgstr "标题"
-
-
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 25c0fccc72c..a9cd39e03e5 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-24 00:25+0100\n"
-"PO-Revision-Date: 2012-01-22 07:26+0000\n"
-"Last-Translator: csslayer <wengxt@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
+"POT-Creation-Date: 2012-05-09 12:29+0200\n"
+"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +22,8 @@ msgstr ""
 msgid "email Changed"
 msgstr "电子邮件已修改"
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
+#: ajax/setlanguage.php:22
 msgid "Invalid request"
 msgstr "非法请求"
 
@@ -30,47 +31,59 @@ msgstr "非法请求"
 msgid "OpenID Changed"
 msgstr "OpenID 已修改"
 
-#: ajax/setlanguage.php:14
+#: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "语言已修改"
 
-#: personal.php:36 personal.php:37
+#: personal.php:39 personal.php:40
 msgid "__language_name__"
 msgstr "简体中文"
 
 #: templates/admin.php:13
-msgid "Log level"
-msgstr "日志级别"
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:40
+msgid "More"
+msgstr ""
 
 #: templates/apps.php:8
-msgid "Add your application"
-msgstr "加入您的应用程序"
+msgid "Add your App"
+msgstr ""
 
-#: templates/apps.php:21
+#: templates/apps.php:22
 msgid "Select an App"
 msgstr "选择一个应用"
 
-#: templates/apps.php:23
+#: templates/apps.php:25
 msgid "-licensed"
 msgstr "-许可证"
 
-#: templates/apps.php:23
+#: templates/apps.php:25
 msgid "by"
 msgstr "由"
 
 #: templates/help.php:8
+msgid "Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Managing Big Files"
+msgstr ""
+
+#: templates/help.php:10
 msgid "Ask a question"
 msgstr "提问"
 
-#: templates/help.php:20
+#: templates/help.php:22
 msgid "Problems connecting to help database."
 msgstr "连接帮助数据库错误 "
 
-#: templates/help.php:21
+#: templates/help.php:23
 msgid "Go there manually."
 msgstr "手动访问"
 
-#: templates/help.php:29
+#: templates/help.php:31
 msgid "Answer"
 msgstr "回答"
 
@@ -82,76 +95,90 @@ msgstr "您使用了"
 msgid "of the available"
 msgstr "的空间，总容量为"
 
+#: templates/personal.php:12
+msgid "Desktop and Mobile Syncing Clients"
+msgstr ""
+
 #: templates/personal.php:13
+msgid "Download"
+msgstr ""
+
+#: templates/personal.php:19
 msgid "Your password got changed"
 msgstr "密码已修改"
 
-#: templates/personal.php:14
+#: templates/personal.php:20
 msgid "Unable to change your password"
 msgstr "无法修改密码"
 
-#: templates/personal.php:15
+#: templates/personal.php:21
 msgid "Current password"
 msgstr "当前密码"
 
-#: templates/personal.php:16
+#: templates/personal.php:22
 msgid "New password"
 msgstr "新密码"
 
-#: templates/personal.php:17
+#: templates/personal.php:23
 msgid "show"
 msgstr "显示"
 
-#: templates/personal.php:18
+#: templates/personal.php:24
 msgid "Change password"
 msgstr "修改密码"
 
-#: templates/personal.php:24
+#: templates/personal.php:30
 msgid "Email"
 msgstr "电子邮件"
 
-#: templates/personal.php:25
+#: templates/personal.php:31
 msgid "Your email address"
 msgstr "您的电子邮件"
 
-#: templates/personal.php:26
+#: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
 msgstr "填写电子邮件地址以启用密码恢复"
 
-#: templates/personal.php:32 templates/personal.php:33
+#: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
 msgstr "语言"
 
-#: templates/personal.php:38
+#: templates/personal.php:44
 msgid "Help translate"
 msgstr "帮助翻译"
 
-#: templates/personal.php:45
+#: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "在文件管理器中使用这个地址来连接到您的 ownCloud"
 
-#: templates/users.php:15 templates/users.php:30
+#: templates/users.php:15 templates/users.php:44
 msgid "Name"
 msgstr "名称"
 
-#: templates/users.php:16 templates/users.php:31
+#: templates/users.php:16 templates/users.php:45
 msgid "Password"
 msgstr "密码"
 
-#: templates/users.php:17 templates/users.php:32 templates/users.php:46
+#: templates/users.php:17 templates/users.php:46 templates/users.php:60
 msgid "Groups"
 msgstr "组"
 
-#: templates/users.php:23
+#: templates/users.php:22
 msgid "Create"
 msgstr "创建"
 
-#: templates/users.php:33
+#: templates/users.php:25
+msgid "Default Quota"
+msgstr ""
+
+#: templates/users.php:35 templates/users.php:74
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:47
 msgid "Quota"
 msgstr "配额"
 
-#: templates/users.php:58
+#: templates/users.php:80
 msgid "Delete"
 msgstr "删除"
-
-