Merge remote branch 'upstream/master'

view/zh-cn/messages.po

@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
 "POT-Creation-Date: 2013-01-27 10:00-0800\n"
-"PO-Revision-Date: 2013-01-30 13:05+0000\n"
+"PO-Revision-Date: 2013-01-31 13:15+0000\n"
 "Last-Translator: matthew_exon <transifex.mexon@spamgourmet.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/friendica/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -2937,7 +2937,7 @@ msgid ""
 "On your <em>Quick Start</em> page - find a brief introduction to your "
 "profile and network tabs, make some new connections, and find some groups to"
 " join."
-msgstr ""
+msgstr "在您的<em>快开始</em>页－看段介绍您的简介和网络分页，结新联系，而找新组为加入。"
 
 #: ../../mod/newmember.php:26
 msgid "Go to Your Settings"
@@ -3388,15 +3388,15 @@ msgstr "%s贴上一个新闻。"
 #: ../../mod/mood.php:62 ../../include/conversation.php:226
 #, php-format
 msgid "%1$s is currently %2$s"
-msgstr ""
+msgstr "%1$s现在是%2$s"
 
 #: ../../mod/mood.php:133
 msgid "Mood"
-msgstr ""
+msgstr "心情"
 
 #: ../../mod/mood.php:134
 msgid "Set your current mood and tell your friends"
-msgstr ""
+msgstr "选择现在的心情而告诉朋友们"
 
 #: ../../mod/profile_photo.php:44
 msgid "Image uploaded but image cropping failed."
@@ -3718,11 +3718,11 @@ msgstr "默认系统主题－会被用户简介超驰－<a href='#' id='cnftheme
 
 #: ../../mod/admin.php:474
 msgid "Mobile system theme"
-msgstr ""
+msgstr "手机系统主题"
 
 #: ../../mod/admin.php:474
 msgid "Theme for mobile devices"
-msgstr ""
+msgstr "主题适合手机"
 
 #: ../../mod/admin.php:475
 msgid "SSL link policy"
@@ -3855,11 +3855,11 @@ msgstr "URL为更新综合目录。如果没有，这个应用用不了综合目
 
 #: ../../mod/admin.php:490
 msgid "Allow threaded items"
-msgstr ""
+msgstr "允许线绳项目"
 
 #: ../../mod/admin.php:490
 msgid "Allow infinite level threading for items on this site."
-msgstr ""
+msgstr "允许无限水平线绳为这网站的项目。"
 
 #: ../../mod/admin.php:491
 msgid "Private posts by default for new users"
@@ -6133,22 +6133,22 @@ msgstr "项目结束"
 #: ../../addon/dav/common/wdcal_edit.inc.php:492
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:492
 msgid "Add a notification"
-msgstr ""
+msgstr "加一个通知"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:687
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:687
 msgid "The event #name# will start at #date"
-msgstr ""
+msgstr "项目#name#开始在#date"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:696
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:696
 msgid "#name# is about to begin."
-msgstr ""
+msgstr "#name#快开始。"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:769
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:769
 msgid "Saved"
-msgstr ""
+msgstr "保存了"
 
 #: ../../addon/dav/common/wdcal_configuration.php:148
 #: ../../addon.old/dav/common/wdcal_configuration.php:148
@@ -6163,17 +6163,17 @@ msgstr "德国时间形式（日／月／年）"
 #: ../../addon/dav/common/dav_caldav_backend_private.inc.php:39
 #: ../../addon.old/dav/common/dav_caldav_backend_private.inc.php:39
 msgid "Private Events"
-msgstr ""
+msgstr "私人项目"
 
 #: ../../addon/dav/common/dav_carddav_backend_private.inc.php:46
 #: ../../addon.old/dav/common/dav_carddav_backend_private.inc.php:46
 msgid "Private Addressbooks"
-msgstr ""
+msgstr "私人通讯录"
 
 #: ../../addon/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php:36
 #: ../../addon.old/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php:36
 msgid "Friendica-Native events"
-msgstr ""
+msgstr "本Friendica项目"
 
 #: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:36
 #: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:59
@@ -6194,37 +6194,37 @@ msgstr "您的Friendica熟人"
 msgid ""
 "Something went wrong when trying to import the file. Sorry. Maybe some "
 "events were imported anyway."
-msgstr ""
+msgstr "进口文件出了问题。不好意思。可能一些项目却是成功地进口了。"
 
 #: ../../addon/dav/friendica/layout.fnk.php:131
 #: ../../addon.old/dav/friendica/layout.fnk.php:131
 msgid "Something went wrong when trying to import the file. Sorry."
-msgstr ""
+msgstr "进口文件出了问题。不好意思。"
 
 #: ../../addon/dav/friendica/layout.fnk.php:134
 #: ../../addon.old/dav/friendica/layout.fnk.php:134
 msgid "The ICS-File has been imported."
-msgstr ""
+msgstr "把ICS文件进口了。"
 
 #: ../../addon/dav/friendica/layout.fnk.php:138
 #: ../../addon.old/dav/friendica/layout.fnk.php:138
 msgid "No file was uploaded."
-msgstr ""
+msgstr "没有上传的文件。"
 
 #: ../../addon/dav/friendica/layout.fnk.php:147
 #: ../../addon.old/dav/friendica/layout.fnk.php:147
 msgid "Import a ICS-file"
-msgstr ""
+msgstr "进口ICS文件"
 
 #: ../../addon/dav/friendica/layout.fnk.php:150
 #: ../../addon.old/dav/friendica/layout.fnk.php:150
 msgid "ICS-File"
-msgstr ""
+msgstr "ICS文件"
 
 #: ../../addon/dav/friendica/layout.fnk.php:151
 #: ../../addon.old/dav/friendica/layout.fnk.php:151
 msgid "Overwrite all #num# existing events"
-msgstr ""
+msgstr "替换所有#num#现有的项目"
 
 #: ../../addon/dav/friendica/layout.fnk.php:228
 #: ../../addon.old/dav/friendica/layout.fnk.php:228
@@ -6264,17 +6264,17 @@ msgstr "错误"
 #: ../../addon/dav/friendica/layout.fnk.php:380
 #: ../../addon.old/dav/friendica/layout.fnk.php:380
 msgid "The calendar has been updated."
-msgstr ""
+msgstr "日历更新了。"
 
 #: ../../addon/dav/friendica/layout.fnk.php:393
 #: ../../addon.old/dav/friendica/layout.fnk.php:393
 msgid "The new calendar has been created."
-msgstr ""
+msgstr "新日历创造了。"
 
 #: ../../addon/dav/friendica/layout.fnk.php:417
 #: ../../addon.old/dav/friendica/layout.fnk.php:417
 msgid "The calendar has been deleted."
-msgstr ""
+msgstr "日历删除了。"
 
 #: ../../addon/dav/friendica/layout.fnk.php:424
 #: ../../addon.old/dav/friendica/layout.fnk.php:424
@@ -6294,12 +6294,12 @@ msgstr "时区"
 #: ../../addon/dav/friendica/layout.fnk.php:445
 #: ../../addon.old/dav/friendica/layout.fnk.php:445
 msgid "Calendars"
-msgstr ""
+msgstr "日历"
 
 #: ../../addon/dav/friendica/layout.fnk.php:487
 #: ../../addon.old/dav/friendica/layout.fnk.php:487
 msgid "Create a new calendar"
-msgstr ""
+msgstr "创造新日历"
 
 #: ../../addon/dav/friendica/layout.fnk.php:496
 #: ../../addon.old/dav/friendica/layout.fnk.php:496
@@ -6334,7 +6334,7 @@ msgid ""
 "The current version of this plugin has not been set up correctly. Please "
 "contact the system administrator of your installation of friendica to fix "
 "this."
-msgstr ""
+msgstr "现有的插件没安装好。请跟系统管理您的friendica安装联系为维修。"
 
 #: ../../addon/dav/friendica/main.php:242
 #: ../../addon.old/dav/friendica/main.php:242
@@ -6352,7 +6352,7 @@ msgstr "noreply"
 #: ../../addon/dav/friendica/main.php:282
 #: ../../addon.old/dav/friendica/main.php:282
 msgid "Notification: "
-msgstr ""
+msgstr "通知："
 
 #: ../../addon/dav/friendica/main.php:309
 #: ../../addon.old/dav/friendica/main.php:309
@@ -6367,12 +6367,12 @@ msgstr "安装出错误。"
 #: ../../addon/dav/friendica/main.php:316
 #: ../../addon.old/dav/friendica/main.php:316
 msgid "The database tables have been updated."
-msgstr ""
+msgstr "数据库表格更新了。"
 
 #: ../../addon/dav/friendica/main.php:317
 #: ../../addon.old/dav/friendica/main.php:317
 msgid "An error occurred during the update."
-msgstr ""
+msgstr "更新出了问题。"
 
 #: ../../addon/dav/friendica/main.php:333
 #: ../../addon.old/dav/friendica/main.php:333
@@ -6402,7 +6402,7 @@ msgid ""
 "database structure, it's always safe to have a backup. Below, you can have a"
 " look at the database-queries that will be made when pressing the "
 "'update'-button."
-msgstr ""
+msgstr "请备份所有的日历数据（表格有前缀「dav_」）继续之前。虽然所有的日历项目<i>应该</i>被转化成新数据库体系，备份总是最好。下边您会看数据库命令进行按「更新」按钮的时候。"
 
 #: ../../addon/dav/friendica/main.php:343
 #: ../../addon.old/dav/friendica/main.php:343
@@ -6422,7 +6422,7 @@ msgstr "安装"
 #: ../../addon/dav/friendica/main.php:350
 #: ../../addon.old/dav/friendica/main.php:350
 msgid "Unknown"
-msgstr ""
+msgstr "不知道的"
 
 #: ../../addon/dav/friendica/main.php:350
 #: ../../addon.old/dav/friendica/main.php:350
@@ -6431,7 +6431,7 @@ msgid ""
 " sorry. Please go to the database backend, back up the data, and delete all "
 "tables beginning with 'dav_' manually. Afterwards, this installation routine"
 " should be able to reinitialize the tables automatically."
-msgstr ""
+msgstr "出什么真糟糕的问题。我不能自动地恢复，不好意思。请看数据库系统，备份数据，而手动地把所有前缀着「dav_」表格删除。之后，这个安装程序应该能把表格自动地初始化。"
 
 #: ../../addon/dav/friendica/main.php:355
 #: ../../addon.old/dav/friendica/main.php:355
@@ -6466,12 +6466,12 @@ msgstr "Friendica项目：熟人"
 #: ../../addon/dav/friendica/calendar.friendica.fnk.php:248
 #: ../../addon.old/dav/friendica/calendar.friendica.fnk.php:248
 msgid "Private Addresses"
-msgstr ""
+msgstr "私人地址"
 
 #: ../../addon/dav/friendica/calendar.friendica.fnk.php:249
 #: ../../addon.old/dav/friendica/calendar.friendica.fnk.php:249
 msgid "Friendica Contacts"
-msgstr ""
+msgstr "Friendica熟人"
 
 #: ../../addon/uhremotestorage/uhremotestorage.php:84
 #: ../../addon.old/uhremotestorage/uhremotestorage.php:84
@@ -8471,71 +8471,71 @@ msgstr "窝脖儿了"
 
 #: ../../include/text.php:796
 msgid "happy"
-msgstr ""
+msgstr "开心"
 
 #: ../../include/text.php:797
 msgid "sad"
-msgstr ""
+msgstr "伤心"
 
 #: ../../include/text.php:798
 msgid "mellow"
-msgstr ""
+msgstr "轻松"
 
 #: ../../include/text.php:799
 msgid "tired"
-msgstr ""
+msgstr "累"
 
 #: ../../include/text.php:800
 msgid "perky"
-msgstr ""
+msgstr "机敏"
 
 #: ../../include/text.php:801
 msgid "angry"
-msgstr ""
+msgstr "生气"
 
 #: ../../include/text.php:802
 msgid "stupified"
-msgstr ""
+msgstr "麻醉"
 
 #: ../../include/text.php:803
 msgid "puzzled"
-msgstr ""
+msgstr "纳闷"
 
 #: ../../include/text.php:804
 msgid "interested"
-msgstr ""
+msgstr "有兴趣"
 
 #: ../../include/text.php:805
 msgid "bitter"
-msgstr ""
+msgstr "苦"
 
 #: ../../include/text.php:806
 msgid "cheerful"
-msgstr ""
+msgstr "快乐"
 
 #: ../../include/text.php:807
 msgid "alive"
-msgstr ""
+msgstr "活着"
 
 #: ../../include/text.php:808
 msgid "annoyed"
-msgstr ""
+msgstr "被烦恼"
 
 #: ../../include/text.php:809
 msgid "anxious"
-msgstr ""
+msgstr "心焦"
 
 #: ../../include/text.php:810
 msgid "cranky"
-msgstr ""
+msgstr "不稳"
 
 #: ../../include/text.php:811
 msgid "disturbed"
-msgstr ""
+msgstr "不安"
 
 #: ../../include/text.php:812
 msgid "frustrated"
-msgstr ""
+msgstr "被作梗"
 
 #: ../../include/text.php:813
 msgid "motivated"
@@ -8991,7 +8991,7 @@ msgstr "$1写："
 
 #: ../../include/bbcode.php:520 ../../include/bbcode.php:521
 msgid "Encrypted content"
-msgstr ""
+msgstr "加密的内容"
 
 #: ../../include/features.php:23
 msgid "General Features"

view/zh-cn/strings.php

@@ -634,7 +634,7 @@ $a->strings["New Member Checklist"] = "新的成员一览表";
 $a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "我们想提高几个建议和超链接为让你的经历愉快。点击一个项目为了访问相应的网页。你最初登记两周以上一个环节到这儿来在你的首页，然后悄声地消失。";
 $a->strings["Getting Started"] = "";
 $a->strings["Friendica Walk-Through"] = "";
-$a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join."] = "";
+$a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join."] = "在您的<em>快开始</em>页－看段介绍您的简介和网络分页，结新联系，而找新组为加入。";
 $a->strings["Go to Your Settings"] = "";
 $a->strings["On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "在你的<em>设置</em>页 - 改变你的最初的密码。也记住你的客户地址。这好像一个电子邮件地址，是用于在自由社会化网络交朋友们有用的。";
 $a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "校对别的设置，特别隐私设置。一个未出版的目录项目是跟未出版的电话号码一样。平时，你可能应该出版你的目录项目-除非都你的朋友们和可交的朋友们已经知道确切地怎么找你。";
@@ -723,9 +723,9 @@ $a->strings["This message was sent to you by %s, a member of the Friendica socia
 $a->strings["You may visit them online at %s"] = "你可以网上拜访他在%s";
 $a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "你不想受到这些新闻的话，请回答这个新闻给发者联系。";
 $a->strings["%s posted an update."] = "%s贴上一个新闻。";
-$a->strings["%1\$s is currently %2\$s"] = "";
+$a->strings["%1\$s is currently %2\$s"] = "%1\$s现在是%2\$s";
-$a->strings["Mood"] = "";
+$a->strings["Mood"] = "心情";
-$a->strings["Set your current mood and tell your friends"] = "";
+$a->strings["Set your current mood and tell your friends"] = "选择现在的心情而告诉朋友们";
 $a->strings["Image uploaded but image cropping failed."] = "照片上传去了，但修剪失灵。";
 $a->strings["Image size reduction [%s] failed."] = "照片减少[%s]失灵。";
 $a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "万一新照片一会出现，换档重新加载或者成为空浏览器高速缓存。";
@@ -802,8 +802,8 @@ $a->strings["Banner/Logo"] = "标题/标志";
 $a->strings["System language"] = "系统语言";
 $a->strings["System theme"] = "系统主题";
 $a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "默认系统主题－会被用户简介超驰－<a href='#' id='cnftheme'>把主题设置变化</a>";
-$a->strings["Mobile system theme"] = "";
+$a->strings["Mobile system theme"] = "手机系统主题";
-$a->strings["Theme for mobile devices"] = "";
+$a->strings["Theme for mobile devices"] = "主题适合手机";
 $a->strings["SSL link policy"] = "SSL环节方针";
 $a->strings["Determines whether generated links should be forced to use SSL"] = "决定产生的环节否则被强迫用SSL";
 $a->strings["'Share' element"] = "";
@@ -831,8 +831,8 @@ $a->strings["Force publish"] = "需要出版";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "让所有这网站的的简介表明在网站目录。";
 $a->strings["Global directory update URL"] = "综合目录更新URL";
 $a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL为更新综合目录。如果没有，这个应用用不了综合目录。";
-$a->strings["Allow threaded items"] = "";
+$a->strings["Allow threaded items"] = "允许线绳项目";
-$a->strings["Allow infinite level threading for items on this site."] = "";
+$a->strings["Allow infinite level threading for items on this site."] = "允许无限水平线绳为这网站的项目。";
 $a->strings["Private posts by default for new users"] = "";
 $a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "";
 $a->strings["Block multiple registrations"] = "拦一人多注册";
@@ -1306,24 +1306,24 @@ $a->strings["Weeks"] = "周";
 $a->strings["before the"] = "前";
 $a->strings["start of the event"] = "项目开始";
 $a->strings["end of the event"] = "项目结束";
-$a->strings["Add a notification"] = "";
+$a->strings["Add a notification"] = "加一个通知";
-$a->strings["The event #name# will start at #date"] = "";
+$a->strings["The event #name# will start at #date"] = "项目#name#开始在#date";
-$a->strings["#name# is about to begin."] = "";
+$a->strings["#name# is about to begin."] = "#name#快开始。";
-$a->strings["Saved"] = "";
+$a->strings["Saved"] = "保存了";
 $a->strings["U.S. Time Format (mm/dd/YYYY)"] = "美国时间形式（月／日／年）";
 $a->strings["German Time Format (dd.mm.YYYY)"] = "德国时间形式（日／月／年）";
-$a->strings["Private Events"] = "";
+$a->strings["Private Events"] = "私人项目";
-$a->strings["Private Addressbooks"] = "";
+$a->strings["Private Addressbooks"] = "私人通讯录";
-$a->strings["Friendica-Native events"] = "";
+$a->strings["Friendica-Native events"] = "本Friendica项目";
 $a->strings["Friendica-Contacts"] = "Friendica熟人";
 $a->strings["Your Friendica-Contacts"] = "您的Friendica熟人";
-$a->strings["Something went wrong when trying to import the file. Sorry. Maybe some events were imported anyway."] = "";
+$a->strings["Something went wrong when trying to import the file. Sorry. Maybe some events were imported anyway."] = "进口文件出了问题。不好意思。可能一些项目却是成功地进口了。";
-$a->strings["Something went wrong when trying to import the file. Sorry."] = "";
+$a->strings["Something went wrong when trying to import the file. Sorry."] = "进口文件出了问题。不好意思。";
-$a->strings["The ICS-File has been imported."] = "";
+$a->strings["The ICS-File has been imported."] = "把ICS文件进口了。";
-$a->strings["No file was uploaded."] = "";
+$a->strings["No file was uploaded."] = "没有上传的文件。";
-$a->strings["Import a ICS-file"] = "";
+$a->strings["Import a ICS-file"] = "进口ICS文件";
-$a->strings["ICS-File"] = "";
+$a->strings["ICS-File"] = "ICS文件";
-$a->strings["Overwrite all #num# existing events"] = "";
+$a->strings["Overwrite all #num# existing events"] = "替换所有#num#现有的项目";
 $a->strings["New event"] = "新项目";
 $a->strings["Today"] = "今天";
 $a->strings["Day"] = "天";
@@ -1331,45 +1331,45 @@ $a->strings["Week"] = "周";
 $a->strings["Reload"] = "再装入";
 $a->strings["Date"] = "日期";
 $a->strings["Error"] = "错误";
-$a->strings["The calendar has been updated."] = "";
+$a->strings["The calendar has been updated."] = "日历更新了。";
-$a->strings["The new calendar has been created."] = "";
+$a->strings["The new calendar has been created."] = "新日历创造了。";
-$a->strings["The calendar has been deleted."] = "";
+$a->strings["The calendar has been deleted."] = "日历删除了。";
 $a->strings["Calendar Settings"] = "日历设置";
 $a->strings["Date format"] = "日期形式";
 $a->strings["Time zone"] = "时区";
-$a->strings["Calendars"] = "";
+$a->strings["Calendars"] = "日历";
-$a->strings["Create a new calendar"] = "";
+$a->strings["Create a new calendar"] = "创造新日历";
 $a->strings["Limitations"] = "限制";
 $a->strings["Warning"] = "警告";
 $a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "同步（iPhone，Thunderbird Lightning, 案桌，等）";
 $a->strings["Synchronizing this calendar with the iPhone"] = "正在把这个日历跟iPhone同步";
 $a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "正在把您的Friendica熟人跟iPhone同步";
-$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "";
+$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "现有的插件没安装好。请跟系统管理您的friendica安装联系为维修。";
 $a->strings["Extended calendar with CalDAV-support"] = "增能日历跟CalDAV支持";
 $a->strings["noreply"] = "noreply";
-$a->strings["Notification: "] = "";
+$a->strings["Notification: "] = "通知：";
 $a->strings["The database tables have been installed."] = "数据库表格被安装了。";
 $a->strings["An error occurred during the installation."] = "安装出错误。";
-$a->strings["The database tables have been updated."] = "";
+$a->strings["The database tables have been updated."] = "数据库表格更新了。";
-$a->strings["An error occurred during the update."] = "";
+$a->strings["An error occurred during the update."] = "更新出了问题。";
 $a->strings["No system-wide settings yet."] = "还没有系统设置。";
 $a->strings["Database status"] = "数据库现状";
 $a->strings["Installed"] = "安装了";
 $a->strings["Upgrade needed"] = "必须更新";
-$a->strings["Please back up all calendar data (the tables beginning with dav_*) before proceeding. While all calendar events <i>should</i> be converted to the new database structure, it's always safe to have a backup. Below, you can have a look at the database-queries that will be made when pressing the 'update'-button."] = "";
+$a->strings["Please back up all calendar data (the tables beginning with dav_*) before proceeding. While all calendar events <i>should</i> be converted to the new database structure, it's always safe to have a backup. Below, you can have a look at the database-queries that will be made when pressing the 'update'-button."] = "请备份所有的日历数据（表格有前缀「dav_」）继续之前。虽然所有的日历项目<i>应该</i>被转化成新数据库体系，备份总是最好。下边您会看数据库命令进行按「更新」按钮的时候。";
 $a->strings["Upgrade"] = "更新";
 $a->strings["Not installed"] = "没安装";
 $a->strings["Install"] = "安装";
-$a->strings["Unknown"] = "";
+$a->strings["Unknown"] = "不知道的";
-$a->strings["Something really went wrong. I cannot recover from this state automatically, sorry. Please go to the database backend, back up the data, and delete all tables beginning with 'dav_' manually. Afterwards, this installation routine should be able to reinitialize the tables automatically."] = "";
+$a->strings["Something really went wrong. I cannot recover from this state automatically, sorry. Please go to the database backend, back up the data, and delete all tables beginning with 'dav_' manually. Afterwards, this installation routine should be able to reinitialize the tables automatically."] = "出什么真糟糕的问题。我不能自动地恢复，不好意思。请看数据库系统，备份数据，而手动地把所有前缀着「dav_」表格删除。之后，这个安装程序应该能把表格自动地初始化。";
 $a->strings["Troubleshooting"] = "调试";
 $a->strings["Manual creation of the database tables:"] = "手动造成数据库表格：";
 $a->strings["Show SQL-statements"] = "表示SQL陈述";
 $a->strings["Private Calendar"] = "私人日历";
 $a->strings["Friendica Events: Mine"] = "Friendica项目：我的";
 $a->strings["Friendica Events: Contacts"] = "Friendica项目：熟人";
-$a->strings["Private Addresses"] = "";
+$a->strings["Private Addresses"] = "私人地址";
-$a->strings["Friendica Contacts"] = "";
+$a->strings["Friendica Contacts"] = "Friendica熟人";
 $a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "许用您的friendica用户名（%s）根对外没主办的贮藏（比如ownCloud）。看<a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>";
 $a->strings["Template URL (with {category})"] = "模板URL（根{category}）";
 $a->strings["OAuth end-point"] = "OAuth 端点";
@@ -1793,23 +1793,23 @@ $a->strings["finger"] = "指";
 $a->strings["fingered"] = "指了";
 $a->strings["rebuff"] = "窝脖儿";
 $a->strings["rebuffed"] = "窝脖儿了";
-$a->strings["happy"] = "";
+$a->strings["happy"] = "开心";
-$a->strings["sad"] = "";
+$a->strings["sad"] = "伤心";
-$a->strings["mellow"] = "";
+$a->strings["mellow"] = "轻松";
-$a->strings["tired"] = "";
+$a->strings["tired"] = "累";
-$a->strings["perky"] = "";
+$a->strings["perky"] = "机敏";
-$a->strings["angry"] = "";
+$a->strings["angry"] = "生气";
-$a->strings["stupified"] = "";
+$a->strings["stupified"] = "麻醉";
-$a->strings["puzzled"] = "";
+$a->strings["puzzled"] = "纳闷";
-$a->strings["interested"] = "";
+$a->strings["interested"] = "有兴趣";
-$a->strings["bitter"] = "";
+$a->strings["bitter"] = "苦";
-$a->strings["cheerful"] = "";
+$a->strings["cheerful"] = "快乐";
-$a->strings["alive"] = "";
+$a->strings["alive"] = "活着";
-$a->strings["annoyed"] = "";
+$a->strings["annoyed"] = "被烦恼";
-$a->strings["anxious"] = "";
+$a->strings["anxious"] = "心焦";
-$a->strings["cranky"] = "";
+$a->strings["cranky"] = "不稳";
-$a->strings["disturbed"] = "";
+$a->strings["disturbed"] = "不安";
-$a->strings["frustrated"] = "";
+$a->strings["frustrated"] = "被作梗";
 $a->strings["motivated"] = "";
 $a->strings["relaxed"] = "";
 $a->strings["surprised"] = "";
@@ -1923,7 +1923,7 @@ $a->strings["Happy Birthday %s"] = "生日快乐%s";
 $a->strings["Image/photo"] = "图像／照片";
 $a->strings["<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a href=\"%s\" target=\"external-link\">post</a>"] = "";
 $a->strings["$1 wrote:"] = "$1写：";
-$a->strings["Encrypted content"] = "";
+$a->strings["Encrypted content"] = "加密的内容";
 $a->strings["General Features"] = "";
 $a->strings["Multiple Profiles"] = "";
 $a->strings["Ability to create multiple profiles"] = "";