Merge pull request #4553 from tobiasd/20160305-enzh

updates to the ZH CN, EN GB and EN US translations

view/lang/zh-cn/messages.po

@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-02 12:02+0100\n"
-"PO-Revision-Date: 2018-03-03 08:28+0000\n"
+"PO-Revision-Date: 2018-03-04 04:03+0000\n"
 "Last-Translator: 朱陈锬 <tangenters@outlook.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/Friendica/friendica/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -1144,12 +1144,12 @@ msgstr "%s 不参加。"
 #: include/conversation.php:1249
 #, php-format
 msgid "<span  %1$s>%2$d people</span> attend maybe"
-msgstr ""
+msgstr "<span  %1$s>%2$d人</span>可能参加"
 
 #: include/conversation.php:1250
 #, php-format
 msgid "%s anttend maybe."
-msgstr ""
+msgstr "%s 可能参加。"
 
 #: include/conversation.php:1280 include/conversation.php:1296
 msgid "Visible to <strong>everybody</strong>"
@@ -1409,7 +1409,7 @@ msgstr "联系人设置已应用。"
 
 #: mod/crepair.php:89
 msgid "Contact update failed."
-msgstr "熟人更新失败。"
+msgstr "联系人更新失败。"
 
 #: mod/crepair.php:110 mod/dfrn_confirm.php:131 mod/fsuggest.php:29
 #: mod/fsuggest.php:97
@@ -1571,7 +1571,7 @@ msgstr "照片"
 #: mod/photos.php:1659 mod/photos.php:1673 src/Model/Photo.php:244
 #: src/Model/Photo.php:253
 msgid "Contact Photos"
-msgstr "熟人照片"
+msgstr "联系人照片"
 
 #: mod/fbrowser.php:105 mod/fbrowser.php:136 mod/profile_photo.php:265
 msgid "Upload"
@@ -1644,7 +1644,7 @@ msgstr "成员"
 
 #: mod/group.php:216 mod/contacts.php:710
 msgid "All Contacts"
-msgstr "所有的熟人"
+msgstr "所有联系人"
 
 #: mod/group.php:217 mod/network.php:639
 msgid "Group is empty"
@@ -1660,7 +1660,7 @@ msgstr "添加联系人"
 
 #: mod/group.php:266 mod/profperm.php:115
 msgid "Click on a contact to add or remove."
-msgstr "点击熟人为添加或删除。"
+msgstr "单击联系人以添加或删除。"
 
 #: mod/hcard.php:18
 msgid "No profile"
@@ -2237,7 +2237,7 @@ msgstr "显示全部"
 #: mod/notifications.php:322
 #, php-format
 msgid "No more %s notifications."
-msgstr ""
+msgstr "没有更多的 %s 通知。"
 
 #: mod/oexchange.php:30
 msgid "Post successful."
@@ -2363,7 +2363,7 @@ msgstr "远程站点报告："
 
 #: mod/dfrn_confirm.php:396
 msgid "Unable to set contact photo."
-msgstr "不会指定熟人照片。"
+msgstr "无法设置联系人照片。"
 
 #: mod/dfrn_confirm.php:498
 #, php-format
@@ -2530,7 +2530,7 @@ msgstr "您一注册，请页跟我连接，用我的简介在："
 msgid ""
 "For more information about the Friendica project and why we feel it is "
 "important, please visit http://friendi.ca"
-msgstr ""
+msgstr "欲了解更多关于 Friendica 项目的信息以及为什么我们认为这很重要，请访问 http://friendi.ca"
 
 #: mod/manage.php:180
 msgid "Manage Identities and/or Pages"
@@ -3055,7 +3055,7 @@ msgstr ""
 
 #: mod/contacts.php:462 mod/contacts.php:814
 msgid "Do you really want to delete this contact?"
-msgstr "您真的想删除这个熟人吗？"
+msgstr "您真的想删除这个联系人吗？"
 
 #: mod/contacts.php:480
 msgid "Contact has been removed."
@@ -3519,7 +3519,7 @@ msgstr "您的介绍发布了。"
 msgid ""
 "Remote subscription can't be done for your network. Please subscribe "
 "directly on your system."
-msgstr ""
+msgstr "无法为您的网络完成远程订阅。请直接在您的系统上订阅。"
 
 #: mod/dfrn_request.php:493
 msgid "Please login to confirm introduction."
@@ -8783,7 +8783,7 @@ msgid ""
 "\t\t\tDear %1$s,\n"
 "\t\t\t\tThank you for registering at %2$s. Your account has been created.\n"
 "\t\t"
-msgstr ""
+msgstr "\n\t\t\t亲爱的 %1$s，\n\t\t\t\t感谢您在 %2$s 注册。您的账户已被创建。\n\t\t"
 
 #: src/Model/User.php:602
 #, php-format

view/lang/zh-cn/strings.php

@@ -252,8 +252,8 @@ $a->strings["<span  %1\$s>%2\$d people</span> attend"] = "<span  %1\$s>%2\$d 人
 $a->strings["%s attend."] = "%s 参加。";
 $a->strings["<span  %1\$s>%2\$d people</span> don't attend"] = "<span  %1\$s>%2\$d 人</span>不参加";
 $a->strings["%s don't attend."] = "%s 不参加。";
-$a->strings["<span  %1\$s>%2\$d people</span> attend maybe"] = "";
-$a->strings["%s anttend maybe."] = "";
+$a->strings["<span  %1\$s>%2\$d people</span> attend maybe"] = "<span  %1\$s>%2\$d人</span>可能参加";
+$a->strings["%s anttend maybe."] = "%s 可能参加。";
 $a->strings["Visible to <strong>everybody</strong>"] = "<strong>大家</strong>可见的";
 $a->strings["Please enter a link URL:"] = "请输入一个链接 URL：";
 $a->strings["Please enter a video link/URL:"] = "请输入视频连接／URL：";
@@ -320,7 +320,7 @@ $a->strings["Common Friends"] = "普通朋友们";
 $a->strings["Credits"] = "";
 $a->strings["Friendica is a community project, that would not be possible without the help of many people. Here is a list of those who have contributed to the code or the translation of Friendica. Thank you all!"] = "Friendica 是一个社区项目，如果没有许多人的努力她将无法实现。这里列出了那些为代码作出贡献或者参与本地化翻译的人们。感谢大家的努力！";
 $a->strings["Contact settings applied."] = "联系人设置已应用。";
-$a->strings["Contact update failed."] = "熟人更新失败。";
+$a->strings["Contact update failed."] = "联系人更新失败。";
 $a->strings["Contact not found."] = "没有找到联系人。";
 $a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>警告：此为进阶</strong>，如果您输入不正确的信息，您也许无法与这位联系人的正常通讯。";
 $a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "请<strong>立即</strong>用后退按钮如果您不确定怎么用这页";
@@ -354,7 +354,7 @@ $a->strings["Site Directory"] = "网站目录";
 $a->strings["Find"] = "搜索";
 $a->strings["No entries (some entries may be hidden)."] = "没有文章(有的文章会被隐藏)。";
 $a->strings["Photos"] = "照片";
-$a->strings["Contact Photos"] = "熟人照片";
+$a->strings["Contact Photos"] = "联系人照片";
 $a->strings["Upload"] = "上传";
 $a->strings["Files"] = "文件";
 $a->strings["Not Found"] = "未发现";
@@ -372,11 +372,11 @@ $a->strings["Delete Group"] = "删除群组";
 $a->strings["Group Editor"] = "组编辑器";
 $a->strings["Edit Group Name"] = "编辑群组名称";
 $a->strings["Members"] = "成员";
-$a->strings["All Contacts"] = "所有的熟人";
+$a->strings["All Contacts"] = "所有联系人";
 $a->strings["Group is empty"] = "组没有成员";
 $a->strings["Remove Contact"] = "删除联系人";
 $a->strings["Add Contact"] = "添加联系人";
-$a->strings["Click on a contact to add or remove."] = "点击熟人为添加或删除。";
+$a->strings["Click on a contact to add or remove."] = "单击联系人以添加或删除。";
 $a->strings["No profile"] = "无简介";
 $a->strings["Help:"] = "帮助：";
 $a->strings["Help"] = "帮助";
@@ -498,7 +498,7 @@ $a->strings["Network:"] = "网络";
 $a->strings["No introductions."] = "没有介绍。";
 $a->strings["Show unread"] = "显示未读";
 $a->strings["Show all"] = "显示全部";
-$a->strings["No more %s notifications."] = "";
+$a->strings["No more %s notifications."] = "没有更多的 %s 通知。";
 $a->strings["Post successful."] = "评论发表了。";
 $a->strings["OpenID protocol error. No ID returned."] = "OpenID协议错误。没ID还。 ";
 $a->strings["Account not found and OpenID registration is not permitted on this site."] = "找不到账户和OpenID注册不允许。";
@@ -528,7 +528,7 @@ $a->strings["Confirmation completed successfully."] = "确认成功完成。";
 $a->strings["Temporary failure. Please wait and try again."] = "临时失败。请等一会，再试。";
 $a->strings["Introduction failed or was revoked."] = "介绍失败或被吊销。";
 $a->strings["Remote site reported: "] = "远程站点报告：";
-$a->strings["Unable to set contact photo."] = "不会指定熟人照片。";
+$a->strings["Unable to set contact photo."] = "无法设置联系人照片。";
 $a->strings["No user record found for '%s' "] = "找不到「%s」的用户记录";
 $a->strings["Our site encryption key is apparently messed up."] = "看起来我们的加密钥匙失灵了。";
 $a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "空的URL供应，或URL解不了码。";
@@ -563,7 +563,7 @@ $a->strings["Your message:"] = "你的消息：";
 $a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "在 Friendica，你被诚挚地邀请来加入我和其他亲密的朋友－并帮助我们创建更好的社会网络。";
 $a->strings["You will need to supply this invitation code: \$invite_code"] = "您要输入这个邀请密码：\$invite_code";
 $a->strings["Once you have registered, please connect with me via my profile page at:"] = "您一注册，请页跟我连接，用我的简介在：";
-$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca"] = "";
+$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca"] = "欲了解更多关于 Friendica 项目的信息以及为什么我们认为这很重要，请访问 http://friendi.ca";
 $a->strings["Manage Identities and/or Pages"] = "管理身份或页";
 $a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "交替不同同一人或社会／组页合用您的账户或给您「管理」批准";
 $a->strings["Select an identity to manage: "] = "选择同一个人管理：";
@@ -692,7 +692,7 @@ $a->strings["Contact has been unignored"] = "联系人已被解除忽视";
 $a->strings["Contact has been archived"] = "联系人已存档";
 $a->strings["Contact has been unarchived"] = "联系人已被解除存档";
 $a->strings["Drop contact"] = "";
-$a->strings["Do you really want to delete this contact?"] = "您真的想删除这个熟人吗？";
+$a->strings["Do you really want to delete this contact?"] = "您真的想删除这个联系人吗？";
 $a->strings["Contact has been removed."] = "联系人被删除了。";
 $a->strings["You are mutual friends with %s"] = "您和 %s 互为朋友";
 $a->strings["You are sharing with %s"] = "你正在和 %s 分享";
@@ -802,7 +802,7 @@ $a->strings["Apparently you are already friends with %s."] = "看上去您已经
 $a->strings["Invalid profile URL."] = "无效的简介URL。";
 $a->strings["Disallowed profile URL."] = "不允许的简介地址.";
 $a->strings["Your introduction has been sent."] = "您的介绍发布了。";
-$a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "";
+$a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "无法为您的网络完成远程订阅。请直接在您的系统上订阅。";
 $a->strings["Please login to confirm introduction."] = "请登录以确认介绍。";
 $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "当前登录的身份不正确。请登录到<strong>这个</strong>用户。";
 $a->strings["Confirm"] = "确认";
@@ -2000,7 +2000,7 @@ $a->strings["An error occurred creating your self contact. Please try again."] =
 $a->strings["An error occurred creating your default contact group. Please try again."] = "";
 $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account is pending for approval by the administrator.\n\t\t"] = "";
 $a->strings["Registration at %s"] = "在 %s 的注册";
-$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "";
+$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "\n\t\t\t亲爱的 %1\$s，\n\t\t\t\t感谢您在 %2\$s 注册。您的账户已被创建。\n\t\t";
 $a->strings["\n\t\t\tThe login details are as follows:\n\t\t\t\tSite Location:\t%3\$s\n\t\t\t\tLogin Name:\t%1\$s\n\t\t\t\tPassword:\t%5\$s\n\n\t\t\tYou may change your password from your account Settings page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile keywords (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\n\t\t\tThank you and welcome to %2\$s."] = "";
 $a->strings["Drop Contact"] = "删除联系人";
 $a->strings["Organisation"] = "组织";