Merge https://github.com/friendica/friendica into pull

view/de/strings.php

@@ -445,7 +445,6 @@ $a->strings["Find"] = "Finde";
 $a->strings["No valid account found."] = "Kein gültiges Konto gefunden.";
 $a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Bitte überprüfe deine E-Mail.";
 $a->strings["Password reset requested at %s"] = "Anfrage zum Zurücksetzen des Passworts auf %s erhalten";
-$a->strings["Administrator"] = "Administrator";
 $a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert.";
 $a->strings["Password Reset"] = "Passwort zurücksetzen";
 $a->strings["Your password has been reset as requested."] = "Dein Passwort wurde wie gewünscht zurückgesetzt.";
@@ -453,6 +452,7 @@ $a->strings["Your new password is"] = "Dein neues Passwort lautet";
 $a->strings["Save or copy your new password - and then"] = "Speichere oder kopiere dein neues Passwort - und dann";
 $a->strings["click here to login"] = "hier klicken, um dich anzumelden";
 $a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Du kannst das Passwort in den <em>Einstellungen</em> ändern, sobald du dich erfolgreich angemeldet hast.";
+$a->strings["Your password has been changed at %s"] = "Auf %s wurde dein Passwort geändert";
 $a->strings["Forgot your Password?"] = "Hast du dein Passwort vergessen?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet.";
 $a->strings["Nickname or Email: "] = "Spitzname oder E-Mail:";
@@ -959,6 +959,10 @@ $a->strings["Applications"] = "Anwendungen";
 $a->strings["No installed applications."] = "Keine Applikationen installiert.";
 $a->strings["Search"] = "Suche";
 $a->strings["Profile not found."] = "Profil nicht gefunden.";
+$a->strings["Profile deleted."] = "Profil gelöscht.";
+$a->strings["Profile-"] = "Profil-";
+$a->strings["New profile created."] = "Neues Profil angelegt.";
+$a->strings["Profile unavailable to clone."] = "Profil nicht zum Duplizieren verfügbar.";
 $a->strings["Profile Name is required."] = "Profilname ist erforderlich.";
 $a->strings["Marital Status"] = "Familienstand";
 $a->strings["Romantic Partner"] = "Romanze";
@@ -979,10 +983,6 @@ $a->strings["public profile"] = "öffentliches Profil";
 $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s hat %2\$s geändert auf &ldquo;%3\$s&rdquo;";
 $a->strings[" - Visit %1\$s's %2\$s"] = " – %1\$ss %2\$s besuchen";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s.";
-$a->strings["Profile deleted."] = "Profil gelöscht.";
-$a->strings["Profile-"] = "Profil-";
-$a->strings["New profile created."] = "Neues Profil angelegt.";
-$a->strings["Profile unavailable to clone."] = "Profil nicht zum Duplizieren verfügbar.";
 $a->strings["Hide your contact/friend list from viewers of this profile?"] = "Liste der Kontakte vor Betrachtern dieses Profils verbergen?";
 $a->strings["Edit Profile Details"] = "Profil bearbeiten";
 $a->strings["Change Profile Photo"] = "Profilbild ändern";
@@ -1128,6 +1128,7 @@ $a->strings["Do not import your Facebook profile wall conversations"] = "Faceboo
 $a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "Wenn du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann.";
 $a->strings["Comma separated applications to ignore"] = "Kommaseparierte Anwendungen, die ignoriert werden sollen";
 $a->strings["Problems with Facebook Real-Time Updates"] = "Probleme mit Facebook Echtzeit-Updates";
+$a->strings["Administrator"] = "Administrator";
 $a->strings["Facebook Connector Settings"] = "Facebook-Verbindungseinstellungen";
 $a->strings["Facebook API Key"] = "Facebook API Schlüssel";
 $a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>"] = "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.<br><br>";
@@ -1164,6 +1165,7 @@ $a->strings["Facebook Post"] = "Facebook Relai";
 $a->strings["Install Facebook Post connector for this account."] = "Facebook-Connector für dieses Konto installieren.";
 $a->strings["Remove Facebook Post connector"] = "Facebook-Connector entfernen";
 $a->strings["Suppress \"View on friendica\""] = "Unterdrücke \"Auf Friendica Ansehen\"";
+$a->strings["Mirror wall posts from facebook to friendica."] = "Spiegle Pinnwandeinträge von Facebook auf friendica";
 $a->strings["Post to page/group:"] = "Auf FB Seite/Gruppe veröffentlichen";
 $a->strings["Facebook Post Settings"] = "Facebook-Beitragseinstellungen";
 $a->strings["%s:"] = "%s:";
@@ -1554,6 +1556,8 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted
 $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>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an deinen StatusNet-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde.";
 $a->strings["Allow posting to StatusNet"] = "Veröffentlichung bei StatusNet erlauben";
 $a->strings["Send public postings to StatusNet by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei StatusNet";
+$a->strings["Mirror all posts from statusnet that are no replies or repeated messages"] = "Spiegle alle Beiträge von StatusNet die keine Antworten oder wiederholten Nachrichten sind";
+$a->strings["Shortening method that optimizes the post"] = "Kürzungsverfahren, das den Beitrag optimiert";
 $a->strings["Send linked #-tags and @-names to StatusNet"] = "Sende verlinkte #-Tags und @-Namen nach StatusNet";
 $a->strings["Clear OAuth configuration"] = "OAuth-Konfiguration löschen";
 $a->strings["API URL"] = "API-URL";
@@ -1607,6 +1611,8 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted
 $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 Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an an deinen Twitter-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde.";
 $a->strings["Allow posting to Twitter"] = "Veröffentlichung bei Twitter erlauben";
 $a->strings["Send public postings to Twitter by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter";
+$a->strings["Mirror all posts from twitter that are no replies or retweets"] = "Spiegle alle Beiträge von Twitter die keine Antworten oder wiederholten Nachrichten sind";
+$a->strings["Shortening method that optimizes the tweet"] = "Kürzungsverfahren, das den Tweet optimiert";
 $a->strings["Send linked #-tags and @-names to Twitter"] = "Sende verlinkte #-Tags und @-Namen nach Twitter";
 $a->strings["Consumer key"] = "Consumer Key";
 $a->strings["Consumer secret"] = "Consumer Secret";

view/zh-cn/strings.php

@@ -13,7 +13,7 @@ $a->strings["Contact not found."] = "没找到熟人。";
 $a->strings["Repair Contact Settings"] = "维修熟人设置";
 $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>用后退按钮如果您不确定怎么用这页";
-$a->strings["Return to contact editor"] = "";
+$a->strings["Return to contact editor"] = "回归熟人处理器";
 $a->strings["Name"] = "名字";
 $a->strings["Account Nickname"] = "帐户昵称";
 $a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname越过名／昵称";
@@ -84,7 +84,6 @@ $a->strings["Public access denied."] = "公众看拒绝";
 $a->strings["No photos selected"] = "没有照片挑选了";
 $a->strings["Access to this item is restricted."] = "这个项目使用权限的。";
 $a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "";
-$a->strings["You have used %1$.2f Mbytes of photo storage."] = "";
 $a->strings["Upload Photos"] = "上传照片";
 $a->strings["New album name: "] = "新册名：";
 $a->strings["or existing album name: "] = "或现有册名";
@@ -257,6 +256,11 @@ $a->strings["This is most often a permission setting, as the web server may not
 $a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "";
 $a->strings[".htconfig.php is writable"] = ".htconfig.php是可写的";
+$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "";
+$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "";
+$a->strings["view/smarty3 is writable"] = "";
 $a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "";
 $a->strings["Url rewrite is working"] = "";
 $a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "数据库设置文件「.htconfig.php」不能被写。请把包括的正文造成设置文件在网服务器子目录。";
@@ -333,8 +337,8 @@ $a->strings["Notification type: "] = "通知种类：";
 $a->strings["Friend Suggestion"] = "朋友建议";
 $a->strings["suggested by %s"] = "由%s建议的";
 $a->strings["Hide this contact from others"] = "隐藏这个熟人给别人";
-$a->strings["Post a new friend activity"] = "";
+$a->strings["Post a new friend activity"] = "表新朋友活动";
-$a->strings["if applicable"] = "";
+$a->strings["if applicable"] = "或适用";
 $a->strings["Approve"] = "批准";
 $a->strings["Claims to be known to you: "] = "声称被您认识：";
 $a->strings["yes"] = "是";
@@ -385,7 +389,7 @@ $a->strings["%d contact in common"] = array(
 $a->strings["View all contacts"] = "看所有的熟人";
 $a->strings["Unblock"] = "不拦";
 $a->strings["Block"] = "拦";
-$a->strings["Toggle Blocked status"] = "";
+$a->strings["Toggle Blocked status"] = "交替拦配置";
 $a->strings["Unignore"] = "停不理";
 $a->strings["Toggle Ignored status"] = "";
 $a->strings["Unarchive"] = "";
@@ -437,7 +441,6 @@ $a->strings["Find"] = "搜索";
 $a->strings["No valid account found."] = "找不到效的账户。";
 $a->strings["Password reset request issued. Check your email."] = "重设密码要求发布了。核对您的收件箱。";
 $a->strings["Password reset requested at %s"] = "重设密码要求被发布%s";
-$a->strings["Administrator"] = "管理员";
 $a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "要求确认不了。(您可能已经提交它。)重设密码失败了。";
 $a->strings["Password Reset"] = "复位密码";
 $a->strings["Your password has been reset as requested."] = "您的密码被重设如要求的。";
@@ -445,14 +448,17 @@ $a->strings["Your new password is"] = "你的新的密码是";
 $a->strings["Save or copy your new password - and then"] = "保存或复制新密码－之后";
 $a->strings["click here to login"] = "在这儿点击";
 $a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "您的密码能被变化从<em>设置</em>页成功登记后。";
+$a->strings["Your password has been changed at %s"] = "";
 $a->strings["Forgot your Password?"] = "忘记你的密码吗？";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "输入您的邮件地址和提交为重置密码。然后核对收件箱看别的说明。";
 $a->strings["Nickname or Email: "] = "昵称或邮件地址：";
 $a->strings["Reset"] = "复位";
+$a->strings["Additional features"] = "";
 $a->strings["Missing some important data!"] = "有的重要信息失踪的！";
 $a->strings["Update"] = "更新";
 $a->strings["Failed to connect with email account using the settings provided."] = "不能连接电子邮件账户用输入的设置。";
 $a->strings["Email settings updated."] = "电子邮件设置更新了";
+$a->strings["Features updated"] = "";
 $a->strings["Passwords do not match. Password unchanged."] = "密码们不相配。密码没未改变的。";
 $a->strings["Empty passwords are not allowed. Password unchanged."] = "空的密码禁止。密码没未改变的。";
 $a->strings["Password changed."] = "密码变化了。";
@@ -476,6 +482,9 @@ $a->strings["No name"] = "无名";
 $a->strings["Remove authorization"] = "撤消权能";
 $a->strings["No Plugin settings configured"] = "没插件设置配置了";
 $a->strings["Plugin Settings"] = "插件设置";
+$a->strings["Off"] = "";
+$a->strings["On"] = "";
+$a->strings["Additional Features"] = "";
 $a->strings["Built-in support for %s connectivity is %s"] = "包括的支持为%s连通性是%s";
 $a->strings["enabled"] = "能够做的";
 $a->strings["disabled"] = "使不能用";
@@ -529,7 +538,7 @@ $a->strings["Permit unknown people to send you private mail?"] = "";
 $a->strings["Profile is <strong>not published</strong>."] = "简介是<strong>没出版</strong>";
 $a->strings["or"] = "或者";
 $a->strings["Your Identity Address is"] = "您的同一个人地址是";
-$a->strings["Automatically expire posts after this many days:"] = "";
+$a->strings["Automatically expire posts after this many days:"] = "自动地过期文章这数天：";
 $a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "如果空的，文章不会过期。过期的文章被删除";
 $a->strings["Advanced expiration settings"] = "先进的过期设置";
 $a->strings["Advanced Expiration"] = "先进的过期";
@@ -572,7 +581,7 @@ $a->strings["You are poked/prodded/etc. in a post"] = "";
 $a->strings["Advanced Account/Page Type Settings"] = "";
 $a->strings["Change the behaviour of this account for special situations"] = "";
 $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["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: "] = "选择同一个人管理：";
 $a->strings["Search Results For:"] = "搜索结果为：";
 $a->strings["Remove term"] = "删除关键字";
@@ -585,10 +594,10 @@ $a->strings["Sort by Post Date"] = "";
 $a->strings["Posts that mention or involve you"] = "";
 $a->strings["New"] = "新";
 $a->strings["Activity Stream - by date"] = "";
-$a->strings["Starred"] = "被星";
-$a->strings["Favourite Posts"] = "";
 $a->strings["Shared Links"] = "";
 $a->strings["Interesting Links"] = "";
+$a->strings["Starred"] = "被星";
+$a->strings["Favourite Posts"] = "";
 $a->strings["Warning: This group contains %s member from an insecure network."] = array(
 	0 => "警告：这个组包括%s成员从不安全网络。",
 );
@@ -601,7 +610,9 @@ $a->strings["Save"] = "保存";
 $a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "这个网站超过一天最多账户注册。请明天再试。";
 $a->strings["Import"] = "";
 $a->strings["Move account"] = "";
-$a->strings["You can import an account from another Friendica server. <br>\r\n                            You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.<br>\r\n                            <b>This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"] = "";
+$a->strings["You can import an account from another Friendica server."] = "";
+$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "";
 $a->strings["Account file"] = "";
 $a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "";
 $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "";
@@ -784,6 +795,7 @@ $a->strings["Self-signed certificate, use SSL for local links only (discouraged)
 $a->strings["File upload"] = "文件上传";
 $a->strings["Policies"] = "政策";
 $a->strings["Advanced"] = "高等";
+$a->strings["Performance"] = "";
 $a->strings["Site name"] = "网页名字";
 $a->strings["Banner/Logo"] = "标题/标志";
 $a->strings["System language"] = "系统语言";
@@ -793,6 +805,8 @@ $a->strings["Mobile system theme"] = "";
 $a->strings["Theme for mobile devices"] = "";
 $a->strings["SSL link policy"] = "";
 $a->strings["Determines whether generated links should be forced to use SSL"] = "";
+$a->strings["'Share' element"] = "";
+$a->strings["Activates the bbcode element 'share' for repeating items."] = "";
 $a->strings["Maximum image size"] = "图片最大尺寸";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "";
 $a->strings["Maximum image length"] = "";
@@ -800,6 +814,8 @@ $a->strings["Maximum length in pixels of the longest side of uploaded images. De
 $a->strings["JPEG image quality"] = "";
 $a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "";
 $a->strings["Register policy"] = "注册政策";
+$a->strings["Maximum Daily Registrations"] = "";
+$a->strings["If registration is permitted above, this sets the maximum number of new user registrations to accept per day.  If register is set to closed, this setting has no effect."] = "";
 $a->strings["Register text"] = "注册正文";
 $a->strings["Will be displayed prominently on the registration page."] = "";
 $a->strings["Accounts abandoned after x days"] = "账户丢弃X天后";
@@ -846,6 +862,14 @@ $a->strings["Poll interval"] = "";
 $a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "";
 $a->strings["Maximum Load Average"] = "";
 $a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "";
+$a->strings["Use MySQL full text engine"] = "";
+$a->strings["Activates the full text engine. Speeds up search - but can only search for four and more characters."] = "";
+$a->strings["Path to item cache"] = "";
+$a->strings["Cache duration in seconds"] = "";
+$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day)."] = "";
+$a->strings["Path for lock file"] = "";
+$a->strings["Temp path"] = "";
+$a->strings["Base path to installation"] = "";
 $a->strings["Update has been marked successful"] = "";
 $a->strings["Executing %s failed. Check system logs."] = "";
 $a->strings["Update %s was successfully applied."] = "";
@@ -927,6 +951,10 @@ $a->strings["Applications"] = "应用";
 $a->strings["No installed applications."] = "没有安装的应用";
 $a->strings["Search"] = "搜索";
 $a->strings["Profile not found."] = "找不到简介。";
+$a->strings["Profile deleted."] = "简介删除了。";
+$a->strings["Profile-"] = "简介-";
+$a->strings["New profile created."] = "创造新的简介";
+$a->strings["Profile unavailable to clone."] = "简介不可用为复制。";
 $a->strings["Profile Name is required."] = "必要简介名";
 $a->strings["Marital Status"] = "";
 $a->strings["Romantic Partner"] = "";
@@ -947,12 +975,9 @@ $a->strings["public profile"] = "";
 $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "";
 $a->strings[" - Visit %1\$s's %2\$s"] = "";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "";
-$a->strings["Profile deleted."] = "简介删除了。";
-$a->strings["Profile-"] = "简介-";
-$a->strings["New profile created."] = "创造新的简介";
-$a->strings["Profile unavailable to clone."] = "简介不可用为复制。";
 $a->strings["Hide your contact/friend list from viewers of this profile?"] = "藏起来发现您的熟人／朋友单不让这个简介看着看？";
 $a->strings["Edit Profile Details"] = "剪辑简介消息";
+$a->strings["Change Profile Photo"] = "";
 $a->strings["View this profile"] = "看这个简介";
 $a->strings["Create a new profile using these settings"] = "造成新的简介用这些设置";
 $a->strings["Clone this profile"] = "复制这个简介";
@@ -1004,12 +1029,12 @@ $a->strings["Edit visibility"] = "修改能见度";
 $a->strings["Save to Folder:"] = "";
 $a->strings["- select -"] = "";
 $a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s把%4\$s标签%2\$s的%3\$s";
-$a->strings["No potential page delegates located."] = "";
+$a->strings["No potential page delegates located."] = "找不到可能代表页人。";
-$a->strings["Delegate Page Management"] = "";
+$a->strings["Delegate Page Management"] = "页代表管理";
-$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "";
+$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "代表会管理所有的方面这个账户／页除了基础账户配置以外。请别代表您私人账户给您没完全信的人。";
-$a->strings["Existing Page Managers"] = "";
+$a->strings["Existing Page Managers"] = "目前页管理员";
-$a->strings["Existing Page Delegates"] = "";
+$a->strings["Existing Page Delegates"] = "目前页代表";
-$a->strings["Potential Delegates"] = "";
+$a->strings["Potential Delegates"] = "潜力的代表";
 $a->strings["Add"] = "加";
 $a->strings["No entries."] = "没有项目。";
 $a->strings["Source (bbcode) text:"] = "";
@@ -1094,6 +1119,7 @@ $a->strings["Do not import your Facebook profile wall conversations"] = "别进
 $a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "如果您选择连接交流和留这两个复选框空则，您Facebook简介墙被在您这网站的简介墙融合和您的这网站隐私设置决定谁能看那些交流。";
 $a->strings["Comma separated applications to ignore"] = "逗号分开的应用要不理";
 $a->strings["Problems with Facebook Real-Time Updates"] = "";
+$a->strings["Administrator"] = "管理员";
 $a->strings["Facebook Connector Settings"] = "Facebook连接器设置";
 $a->strings["Facebook API Key"] = "";
 $a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>"] = "";
@@ -1129,7 +1155,11 @@ $a->strings["Facebook Post disabled"] = "";
 $a->strings["Facebook Post"] = "";
 $a->strings["Install Facebook Post connector for this account."] = "";
 $a->strings["Remove Facebook Post connector"] = "";
+$a->strings["Suppress \"View on friendica\""] = "";
+$a->strings["Mirror wall posts from facebook to friendica."] = "";
+$a->strings["Post to page/group:"] = "";
 $a->strings["Facebook Post Settings"] = "";
+$a->strings["%s:"] = "";
 $a->strings["%d person likes this"] = array(
 	0 => "%d人喜欢这个",
 );
@@ -1177,12 +1207,12 @@ $a->strings["doubt"] = "";
 $a->strings["doubted"] = "";
 $a->strings["glare"] = "";
 $a->strings["glared at"] = "";
-$a->strings["YourLS Settings"] = "";
+$a->strings["YourLS Settings"] = "YourLS配置";
-$a->strings["URL: http://"] = "";
+$a->strings["URL: http://"] = "URL: http://";
-$a->strings["Username:"] = "";
+$a->strings["Username:"] = "用户名：";
-$a->strings["Password:"] = "";
+$a->strings["Password:"] = "密码：";
-$a->strings["Use SSL "] = "";
+$a->strings["Use SSL "] = "用SSL";
-$a->strings["yourls Settings saved."] = "";
+$a->strings["yourls Settings saved."] = "yourls配置保存了。";
 $a->strings["Post to LiveJournal"] = "";
 $a->strings["LiveJournal Post Settings"] = "";
 $a->strings["Enable LiveJournal Post Plugin"] = "";
@@ -1193,7 +1223,7 @@ $a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "";
 $a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "";
 $a->strings["Enable Content filter"] = "";
 $a->strings["Comma separated list of keywords to hide"] = "";
-$a->strings["Use /expression/ to provide regular expressions"] = "";
+$a->strings["Use /expression/ to provide regular expressions"] = "用/<i>表达式</i>/为输入正则表达式";
 $a->strings["NSFW Settings saved."] = "NSFW设置保持了。";
 $a->strings["%s - Click to open/close"] = "%s - 点击为打开／关闭";
 $a->strings["Forums"] = "";
@@ -1205,6 +1235,7 @@ $a->strings["Randomise Page/Forum list"] = "";
 $a->strings["Show pages/forums on profile page"] = "";
 $a->strings["Planets Settings"] = "";
 $a->strings["Enable Planets Plugin"] = "";
+$a->strings["Forum Directory"] = "";
 $a->strings["Login"] = "登录";
 $a->strings["OpenID"] = "OpenID";
 $a->strings["Latest users"] = "";
@@ -1410,10 +1441,10 @@ $a->strings["Report Bug"] = "报案程序错误";
 $a->strings["No Timeline settings updated."] = "";
 $a->strings["No Timeline Settings"] = "";
 $a->strings["Disable Archive selector on profile wall"] = "";
-$a->strings["\"Blockem\" Settings"] = "";
+$a->strings["\"Blockem\" Settings"] = "「Blockem」配置";
-$a->strings["Comma separated profile URLS to block"] = "";
+$a->strings["Comma separated profile URLS to block"] = "逗号分简介URL为栏";
-$a->strings["BLOCKEM Settings saved."] = "";
+$a->strings["BLOCKEM Settings saved."] = "「Blockem」配置保存了。";
-$a->strings["Blocked %s - Click to open/close"] = "";
+$a->strings["Blocked %s - Click to open/close"] = "%s拦了－点击为开关";
 $a->strings["Unblock Author"] = "";
 $a->strings["Block Author"] = "";
 $a->strings["blockem settings updated"] = "";
@@ -1428,7 +1459,7 @@ $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["Editplain settings updated."] = "";
+$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"] = "";
 $a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "";
@@ -1453,10 +1484,13 @@ $a->strings["Post to Libertree by default"] = "";
 $a->strings["Altpager settings updated."] = "";
 $a->strings["Alternate Pagination Setting"] = "";
 $a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "";
+$a->strings["Force global use of the alternate pager"] = "";
+$a->strings["Each user chooses whether to use the alternate pager"] = "";
 $a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "";
 $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["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."] = "";
@@ -1467,7 +1501,7 @@ $a->strings["Gravatar settings updated."] = "";
 $a->strings["Your Friendica test account is about to expire."] = "";
 $a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "";
 $a->strings["\"pageheader\" Settings"] = "\"pageheader";
-$a->strings["pageheader Settings saved."] = "";
+$a->strings["pageheader Settings saved."] = "pageHeader配置保存了。";
 $a->strings["Post to Insanejournal"] = "";
 $a->strings["InsaneJournal Post Settings"] = "";
 $a->strings["Enable InsaneJournal Post Plugin"] = "";
@@ -1511,16 +1545,21 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted
 $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["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"] = "";
+$a->strings["Shortening method that optimizes the post"] = "";
 $a->strings["Send linked #-tags and @-names to StatusNet"] = "";
 $a->strings["Clear OAuth configuration"] = "清理出OAuth设置";
 $a->strings["API URL"] = "API URL";
 $a->strings["Infinite Improbability Drive"] = "";
+$a->strings["You are now authenticated to tumblr."] = "";
+$a->strings["return to the connector page"] = "";
 $a->strings["Post to Tumblr"] = "发送到Tumblr";
 $a->strings["Tumblr Post Settings"] = "Tumblr发送设置";
+$a->strings["(Re-)Authenticate your tumblr page"] = "";
 $a->strings["Enable Tumblr Post Plugin"] = "使Tumblr发送插件能够";
-$a->strings["Tumblr login"] = "Tumblr登记名";
-$a->strings["Tumblr password"] = "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"] = "";
@@ -1561,6 +1600,8 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted
 $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 Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
 $a->strings["Allow posting to Twitter"] = "允许发送到Twitter";
 $a->strings["Send public postings to Twitter by default"] = "默认地发送公开文章到Twitter";
+$a->strings["Mirror all posts from twitter that are no replies or retweets"] = "";
+$a->strings["Shortening method that optimizes the tweet"] = "";
 $a->strings["Send linked #-tags and @-names to Twitter"] = "";
 $a->strings["Consumer key"] = "钥匙(Consumer key)";
 $a->strings["Consumer secret"] = "密码(Consumer secret)";
@@ -1663,6 +1704,7 @@ $a->strings["Zot!"] = "Zot!";
 $a->strings["LinkedIn"] = "LinkedIn";
 $a->strings["XMPP/IM"] = "XMPP/IM";
 $a->strings["MySpace"] = "MySpace";
+$a->strings["Google+"] = "";
 $a->strings["Male"] = "男的";
 $a->strings["Female"] = "女的";
 $a->strings["Currently Male"] = "现在男的";
@@ -1823,6 +1865,8 @@ $a->strings["Conversations on this site"] = "这个网站的交谈";
 $a->strings["Directory"] = "名录";
 $a->strings["People directory"] = "人物名录";
 $a->strings["Conversations from your friends"] = "从你朋友们的交谈";
+$a->strings["Network Reset"] = "";
+$a->strings["Load Network page with no filters"] = "";
 $a->strings["Friend Requests"] = "友谊邀请";
 $a->strings["See all notifications"] = "看所有的通知";
 $a->strings["Mark all system notifications seen"] = "记号各系统通知看过的";
@@ -1831,8 +1875,9 @@ $a->strings["Inbox"] = "收件箱";
 $a->strings["Outbox"] = "发件箱";
 $a->strings["Manage"] = "管理";
 $a->strings["Manage other pages"] = "管理别的页";
+$a->strings["Delegations"] = "";
 $a->strings["Profiles"] = "简介";
-$a->strings["Manage/edit profiles"] = "管理/修改简介";
+$a->strings["Manage/Edit Profiles"] = "";
 $a->strings["Manage/edit friends and contacts"] = "管理/编朋友们和熟人们";
 $a->strings["Site setup and configuration"] = "网站开办和配置";
 $a->strings["Nothing new here"] = "这里没有什么新的";
@@ -1871,10 +1916,47 @@ $a->strings["seconds"] = "秒";
 $a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s以前";
 $a->strings["%s's birthday"] = "";
 $a->strings["Happy Birthday %s"] = "";
-$a->strings["From: "] = "从：";
 $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>:</span>"] = "";
 $a->strings["$1 wrote:"] = "$1写：";
 $a->strings["Encrypted content"] = "";
+$a->strings["General Features"] = "";
+$a->strings["Multiple Profiles"] = "";
+$a->strings["Ability to create multiple profiles"] = "";
+$a->strings["Post Composition Features"] = "";
+$a->strings["Richtext Editor"] = "";
+$a->strings["Enable richtext editor"] = "";
+$a->strings["Post Preview"] = "";
+$a->strings["Allow previewing posts and comments before publishing them"] = "";
+$a->strings["Network Sidebar Widgets"] = "";
+$a->strings["Search by Date"] = "";
+$a->strings["Ability to select posts by date ranges"] = "";
+$a->strings["Group Filter"] = "";
+$a->strings["Enable widget to display Network posts only from selected group"] = "";
+$a->strings["Network Filter"] = "";
+$a->strings["Enable widget to display Network posts only from selected network"] = "";
+$a->strings["Save search terms for re-use"] = "";
+$a->strings["Network Tabs"] = "";
+$a->strings["Network Personal Tab"] = "";
+$a->strings["Enable tab to display only Network posts that you've interacted on"] = "";
+$a->strings["Network New Tab"] = "";
+$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "";
+$a->strings["Network Shared Links Tab"] = "";
+$a->strings["Enable tab to display only Network posts with links in them"] = "";
+$a->strings["Post/Comment Tools"] = "";
+$a->strings["Multiple Deletion"] = "";
+$a->strings["Select and delete multiple posts/comments at once"] = "";
+$a->strings["Edit Sent Posts"] = "";
+$a->strings["Edit and correct posts and comments after sending"] = "";
+$a->strings["Tagging"] = "";
+$a->strings["Ability to tag existing posts"] = "";
+$a->strings["Post Categories"] = "";
+$a->strings["Add categories to your posts"] = "";
+$a->strings["Ability to file posts under folders"] = "";
+$a->strings["Dislike Posts"] = "";
+$a->strings["Ability to dislike posts/comments"] = "";
+$a->strings["Star Posts"] = "";
+$a->strings["Ability to mark special posts with a star indicator"] = "";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "找不到DNS信息为数据库服务器「%s」";
 $a->strings["[no subject]"] = "[无题目]";
 $a->strings["Visible to everybody"] = "任何人可见的";
@@ -1969,8 +2051,9 @@ $a->strings["Delete Selected Items"] = "删除选的项目";
 $a->strings["Follow Thread"] = "";
 $a->strings["%s likes this."] = "%s喜欢这个.";
 $a->strings["%s doesn't like this."] = "%s没有喜欢这个.";
-$a->strings["<span  %1\$s>%2\$d people</span> like this."] = "<span  %1\$s>%2\$d人</span>喜欢这个。";
+$a->strings["like this"] = "";
-$a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = "<span  %1\$s>%2\$d人</span>不喜欢这个。";
+$a->strings["don't like this"] = "";
+$a->strings["people"] = "";
 $a->strings["and"] = "和";
 $a->strings[", and %d other people"] = "，和%d别人";
 $a->strings["%s like this."] = "%s喜欢这个";
@@ -1993,11 +2076,16 @@ $a->strings["Create a New Account"] = "创造新的账户";
 $a->strings["Nickname or Email address: "] = "绰号或电子邮件地址: ";
 $a->strings["Password: "] = "密码: ";
 $a->strings["Remember me"] = "";
-$a->strings["Or login using OpenID: "] = "";
+$a->strings["Or login using OpenID: "] = "或者用OpenID登记：";
 $a->strings["Forgot your password?"] = "忘记你的密码吗？";
+$a->strings["Website Terms of Service"] = "";
+$a->strings["terms of service"] = "";
+$a->strings["Website Privacy Policy"] = "";
+$a->strings["privacy policy"] = "";
 $a->strings["Requested account is not available."] = "";
 $a->strings["Edit profile"] = "修改简介";
 $a->strings["Message"] = "";
+$a->strings["Manage/edit profiles"] = "管理/修改简介";
 $a->strings["g A l F d"] = "g A l d F";
 $a->strings["F d"] = "F d";
 $a->strings["[today]"] = "[今天]";
@@ -2026,3 +2114,5 @@ $a->strings["Post to Drupal by default"] = "";
 $a->strings["OEmbed settings updated"] = "OEmbed设置更新了";
 $a->strings["Use OEmbed for YouTube videos"] = "用OEmbed为YouTube视频";
 $a->strings["URL to embed:"] = "URL要嵌入：";
+$a->strings["Tumblr login"] = "Tumblr登记名";
+$a->strings["Tumblr password"] = "Tumblr密码";