Merge https://github.com/friendica/friendica into pull
This commit is contained in:
friendica
commit
917acd6eb7
|
|
@ -66,6 +66,7 @@ class Item extends BaseObject {
|
|||
if(! visible_activity($item)) {
|
||||
continue;
|
||||
}
|
||||
$item['pagedrop'] = $data['pagedrop'];
|
||||
$child = new Item($item);
|
||||
$this->add_child($child);
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -357,13 +357,13 @@ $a->strings["%s is now friends with %s"] = "%s成为%s的朋友";
|
|||
$a->strings["%s created a new post"] = "%s造成新文章";
|
||||
$a->strings["%s commented on %s's post"] = "%s便条%s的文章";
|
||||
$a->strings["No more network notifications."] = "没有别的网络通信。";
|
||||
$a->strings["Network Notifications"] = "";
|
||||
$a->strings["No more system notifications."] = "";
|
||||
$a->strings["System Notifications"] = "";
|
||||
$a->strings["Network Notifications"] = "网络通知";
|
||||
$a->strings["No more system notifications."] = "没别系统通知。";
|
||||
$a->strings["System Notifications"] = "系统通知";
|
||||
$a->strings["No more personal notifications."] = "没有别的私人通信。";
|
||||
$a->strings["Personal Notifications"] = "";
|
||||
$a->strings["Personal Notifications"] = "私人通知";
|
||||
$a->strings["No more home notifications."] = "没有别的家通信。";
|
||||
$a->strings["Home Notifications"] = "";
|
||||
$a->strings["Home Notifications"] = "主页通知";
|
||||
$a->strings["Could not access contact record."] = "用不了熟人记录。";
|
||||
$a->strings["Could not locate selected profile."] = "找不到选择的简介。";
|
||||
$a->strings["Contact updated."] = "熟人更新了。";
|
||||
|
|
@ -655,7 +655,7 @@ $a->strings["Your Contacts page is your gateway to managing friendships and conn
|
|||
$a->strings["Go to Your Site's Directory"] = "";
|
||||
$a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested."] = "目录页让您找别人在这个网络或别的同盟的网站。找一个<em>连接</em>或<em>关注</em>按钮在他们的简介页。您被要求的话，提供您自己的同一个人地址。";
|
||||
$a->strings["Finding New People"] = "";
|
||||
$a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "";
|
||||
$a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "在熟人页的工具栏有一些工具为找新朋友们。我们会使人们相配按名或兴趣，和以网络关系作为提醒建议的根据。在新网站，朋友建议平常开始24小时后。";
|
||||
$a->strings["Groups"] = "组";
|
||||
$a->strings["Group Your Contacts"] = "";
|
||||
$a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "您交朋友们后，组织他们分私人交流组在您熟人页的边栏，您会私下地跟组交流在您的网络页。";
|
||||
|
|
@ -766,7 +766,7 @@ $a->strings["Theme settings updated."] = "";
|
|||
$a->strings["Site"] = "网站";
|
||||
$a->strings["Users"] = "用户";
|
||||
$a->strings["Plugins"] = "插件";
|
||||
$a->strings["Themes"] = "";
|
||||
$a->strings["Themes"] = "主题";
|
||||
$a->strings["DB updates"] = "";
|
||||
$a->strings["Logs"] = "记录";
|
||||
$a->strings["Admin"] = "管理";
|
||||
|
|
@ -909,7 +909,7 @@ $a->strings["Enable"] = "使能用";
|
|||
$a->strings["Toggle"] = "肘节";
|
||||
$a->strings["Author: "] = "";
|
||||
$a->strings["Maintainer: "] = "";
|
||||
$a->strings["No themes found."] = "";
|
||||
$a->strings["No themes found."] = "找不到主题。";
|
||||
$a->strings["Screenshot"] = "";
|
||||
$a->strings["[Experimental]"] = "";
|
||||
$a->strings["[Unsupported]"] = "";
|
||||
|
|
@ -1366,11 +1366,11 @@ $a->strings["Friendica Events: Mine"] = "";
|
|||
$a->strings["Friendica Events: Contacts"] = "";
|
||||
$a->strings["Private Addresses"] = "";
|
||||
$a->strings["Friendica Contacts"] = "";
|
||||
$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>"] = "";
|
||||
$a->strings["Template URL (with {category})"] = "";
|
||||
$a->strings["OAuth end-point"] = "";
|
||||
$a->strings["Api"] = "";
|
||||
$a->strings["Member since:"] = "";
|
||||
$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 端点";
|
||||
$a->strings["Api"] = "API";
|
||||
$a->strings["Member since:"] = "客人从：";
|
||||
$a->strings["Three Dimensional Tic-Tac-Toe"] = "三维井字棋";
|
||||
$a->strings["3D Tic-Tac-Toe"] = "三维井字棋";
|
||||
$a->strings["New game"] = "新游戏";
|
||||
|
|
@ -1403,9 +1403,9 @@ $a->strings["Each user chooses whether his/her posts show the post recipients"]
|
|||
$a->strings["Startpage Settings"] = "";
|
||||
$a->strings["Home page to load after login - leave blank for profile wall"] = "";
|
||||
$a->strings["Examples: "network" or "notifications/system""] = "";
|
||||
$a->strings["Geonames settings updated."] = "";
|
||||
$a->strings["Geonames Settings"] = "";
|
||||
$a->strings["Enable Geonames Plugin"] = "";
|
||||
$a->strings["Geonames settings updated."] = "Geonames设置更新了。";
|
||||
$a->strings["Geonames Settings"] = "Geonames设置";
|
||||
$a->strings["Enable Geonames Plugin"] = "使Geonames插件能用";
|
||||
$a->strings["Your account on %s will expire in a few days."] = "";
|
||||
$a->strings["Your Friendica account is about to expire."] = "";
|
||||
$a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "";
|
||||
|
|
@ -1445,20 +1445,20 @@ $a->strings["\"Blockem\" Settings"] = "「Blockem」配置";
|
|||
$a->strings["Comma separated profile URLS to block"] = "逗号分简介URL为栏";
|
||||
$a->strings["BLOCKEM Settings saved."] = "「Blockem」配置保存了。";
|
||||
$a->strings["Blocked %s - Click to open/close"] = "%s拦了－点击为开关";
|
||||
$a->strings["Unblock Author"] = "";
|
||||
$a->strings["Block Author"] = "";
|
||||
$a->strings["blockem settings updated"] = "";
|
||||
$a->strings[":-)"] = "";
|
||||
$a->strings[":-("] = "";
|
||||
$a->strings["lol"] = "";
|
||||
$a->strings["Quick Comment Settings"] = "";
|
||||
$a->strings["Unblock Author"] = "不拦作家";
|
||||
$a->strings["Block Author"] = "拦作家";
|
||||
$a->strings["blockem settings updated"] = "blockem设置更新了";
|
||||
$a->strings[":-)"] = ":-)";
|
||||
$a->strings[":-("] = ":-(";
|
||||
$a->strings["lol"] = "lol";
|
||||
$a->strings["Quick Comment Settings"] = "快捷评论设置";
|
||||
$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "";
|
||||
$a->strings["Enter quick comments, one per line"] = "";
|
||||
$a->strings["Quick Comment settings saved."] = "";
|
||||
$a->strings["Tile Server URL"] = "";
|
||||
$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "";
|
||||
$a->strings["Default zoom"] = "";
|
||||
$a->strings["The default zoom level. (1:world, 18:highest)"] = "";
|
||||
$a->strings["Enter quick comments, one per line"] = "输入快捷评论，一行一个";
|
||||
$a->strings["Quick Comment settings saved."] = "快捷评论设置保存了。";
|
||||
$a->strings["Tile Server URL"] = "砖服务器URL";
|
||||
$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "一单<a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">公共砖服务器</a>";
|
||||
$a->strings["Default zoom"] = "默认变焦距";
|
||||
$a->strings["The default zoom level. (1:world, 18:highest)"] = "默认变焦距。(1:世界, 18:最高)";
|
||||
$a->strings["Group Text settings updated."] = "";
|
||||
$a->strings["Group Text"] = "";
|
||||
$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
|
||||
|
|
@ -1490,9 +1490,9 @@ $a->strings["The MathJax addon renders mathematical formulae written using the L
|
|||
$a->strings["Use the MathJax renderer"] = "";
|
||||
$a->strings["MathJax Base URL"] = "";
|
||||
$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "";
|
||||
$a->strings["Editplain settings updated."] = "";
|
||||
$a->strings["Editplain Settings"] = "";
|
||||
$a->strings["Disable richtext status editor"] = "";
|
||||
$a->strings["Editplain settings updated."] = "Editplain设置更新了";
|
||||
$a->strings["Editplain Settings"] = "Editplain设置";
|
||||
$a->strings["Disable richtext status editor"] = "使richtext现状编辑 不能用";
|
||||
$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
|
||||
$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "";
|
||||
$a->strings["Rating of images"] = "";
|
||||
|
|
@ -1521,7 +1521,7 @@ $a->strings["Approve subscription requests from Friendica contacts automatically
|
|||
$a->strings["Subscribe to Friendica contacts automatically"] = "";
|
||||
$a->strings["Purge internal list of jabber addresses of contacts"] = "";
|
||||
$a->strings["Add contact"] = "";
|
||||
$a->strings["View Source"] = "";
|
||||
$a->strings["View Source"] = "看源代码";
|
||||
$a->strings["Post to StatusNet"] = "发送到StatusNet";
|
||||
$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "请联系您的网站行政人员。<br />提供的API URL无效。";
|
||||
$a->strings["We could not contact the StatusNet API with the Path you entered."] = "我们不能联系StatusNet API在您输入的路径。";
|
||||
|
|
@ -1542,7 +1542,7 @@ $a->strings["Current StatusNet API is"] = "现在StatusNet API是";
|
|||
$a->strings["Cancel StatusNet Connection"] = "注销StatusNet连接";
|
||||
$a->strings["Currently connected to: "] = "现在连接到：";
|
||||
$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "如果使可用的都您<strong>公开的</strong>文章会被发送到有关的StatusNet账户。您会选择默认地这样做（这儿）或个文章分开地写字时候选择在文章设置。";
|
||||
$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
|
||||
$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>注意</strong>: 由于您的隐私设置(<em>隐藏您的简介内容为生看者？</em>)超链接可能包括在公文章转播到StatusNets会带领来客到空白页讲他看您的简介被限制。";
|
||||
$a->strings["Allow posting to StatusNet"] = "许放在StatusNet";
|
||||
$a->strings["Send public postings to StatusNet by default"] = "默认发送公开文章在StatusNet";
|
||||
$a->strings["Mirror all posts from statusnet that are no replies or repeated messages"] = "";
|
||||
|
|
@ -1560,9 +1560,9 @@ $a->strings["Enable Tumblr Post Plugin"] = "使Tumblr发送插件能够";
|
|||
$a->strings["Post to Tumblr by default"] = "默认地给Tumblr发送";
|
||||
$a->strings["Post to page:"] = "";
|
||||
$a->strings["You are not authenticated to tumblr"] = "";
|
||||
$a->strings["Numfriends settings updated."] = "";
|
||||
$a->strings["Numfriends Settings"] = "";
|
||||
$a->strings["How many contacts to display on profile sidebar"] = "";
|
||||
$a->strings["Numfriends settings updated."] = "Numfriends设置更新了";
|
||||
$a->strings["Numfriends Settings"] = "Numfriends设置";
|
||||
$a->strings["How many contacts to display on profile sidebar"] = "多少熟人表示在简介工具栏";
|
||||
$a->strings["Gnot settings updated."] = "";
|
||||
$a->strings["Gnot Settings"] = "";
|
||||
$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "";
|
||||
|
|
@ -1578,17 +1578,17 @@ $a->strings["Post to WordPress by default"] = "默认地发送到Wordpress";
|
|||
$a->strings["Provide a backlink to the Friendica post"] = "";
|
||||
$a->strings["Post from Friendica"] = "文章从Friendica";
|
||||
$a->strings["Read the original post and comment stream on Friendica"] = "";
|
||||
$a->strings["\"Show more\" Settings"] = "";
|
||||
$a->strings["Enable Show More"] = "";
|
||||
$a->strings["Cutting posts after how much characters"] = "";
|
||||
$a->strings["Show More Settings saved."] = "";
|
||||
$a->strings["\"Show more\" Settings"] = "「看更多」设置";
|
||||
$a->strings["Enable Show More"] = "使看更多能用";
|
||||
$a->strings["Cutting posts after how much characters"] = "剪掉文章多少字后";
|
||||
$a->strings["Show More Settings saved."] = "看更多设置保存了。";
|
||||
$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "这个网站用<a href='http://www.piwik.org'>Piwik</a>分析工具追踪 。";
|
||||
$a->strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "如果您不想您访问这样记录您<a href='%s'>可以用一个cookie防Piwik追踪未来的访问</a>(选择性退出)。";
|
||||
$a->strings["Piwik Base URL"] = "Piwik基础URL";
|
||||
$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "";
|
||||
$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "绝对道路到Piwik安装。（没有协议（http/s）跟斜线后缀）";
|
||||
$a->strings["Site ID"] = "网站ID";
|
||||
$a->strings["Show opt-out cookie link?"] = " 显示选择性退出cookie按钮？";
|
||||
$a->strings["Asynchronous tracking"] = "";
|
||||
$a->strings["Asynchronous tracking"] = "异步追踪";
|
||||
$a->strings["Post to Twitter"] = "发送到在Twitter";
|
||||
$a->strings["Twitter settings updated."] = "Twitter设置更新了。";
|
||||
$a->strings["Twitter Posting Settings"] = "Twitter发送设置";
|
||||
|
|
@ -2042,8 +2042,8 @@ $a->strings["Network Posts"] = "";
|
|||
$a->strings["Edit Contact"] = "";
|
||||
$a->strings["Send PM"] = "法私人的新闻";
|
||||
$a->strings["%1\$s poked %2\$s"] = "";
|
||||
$a->strings["post/item"] = "";
|
||||
$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "";
|
||||
$a->strings["post/item"] = "文章／项目";
|
||||
$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s标注%2\$s的%3\$s为偏爱";
|
||||
$a->strings["Categories:"] = "";
|
||||
$a->strings["Filed under:"] = "";
|
||||
$a->strings["remove"] = "";
|
||||
|
|
@ -2102,15 +2102,15 @@ $a->strings["via"] = "";
|
|||
$a->strings["toggle mobile"] = "";
|
||||
$a->strings["Bg settings updated."] = "";
|
||||
$a->strings["Bg Settings"] = "";
|
||||
$a->strings["Post to Drupal"] = "";
|
||||
$a->strings["Drupal Post Settings"] = "";
|
||||
$a->strings["Enable Drupal Post Plugin"] = "";
|
||||
$a->strings["Drupal username"] = "";
|
||||
$a->strings["Drupal password"] = "";
|
||||
$a->strings["Post Type - article,page,or blog"] = "";
|
||||
$a->strings["Drupal site URL"] = "";
|
||||
$a->strings["Drupal site uses clean URLS"] = "";
|
||||
$a->strings["Post to Drupal by default"] = "";
|
||||
$a->strings["Post to Drupal"] = "发到Drupal";
|
||||
$a->strings["Drupal Post Settings"] = "Drupal设置";
|
||||
$a->strings["Enable Drupal Post Plugin"] = "使Drupal插件能够";
|
||||
$a->strings["Drupal username"] = "Drupal用户名";
|
||||
$a->strings["Drupal password"] = "Drupal密码";
|
||||
$a->strings["Post Type - article,page,or blog"] = "文章种类－文章，页，博客";
|
||||
$a->strings["Drupal site URL"] = "Drupal网站URL";
|
||||
$a->strings["Drupal site uses clean URLS"] = "Drupal网站用整洁URL";
|
||||
$a->strings["Post to Drupal by default"] = "默认地发到Drupal";
|
||||
$a->strings["OEmbed settings updated"] = "OEmbed设置更新了";
|
||||
$a->strings["Use OEmbed for YouTube videos"] = "用OEmbed为YouTube视频";
|
||||
$a->strings["URL to embed:"] = "URL要嵌入：";
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user