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

view/theme/diabook/wall_thread.tpl

@@ -41,7 +41,7 @@
 				$item.item_photo_menu
 				</ul>
 				
-			</div>	
+			
 			{{ if $item.owner_url }}
 			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
 				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
@@ -49,7 +49,9 @@
 				</a>
 			</div>
 			{{ endif }}			
-			<div class="wall-item-location">$item.location</div>	
+			</div>
+			
+<div class="wall-item-location">$item.location</div>	
 		</div>
 
 <div class="wall-item-actions-author">

view/zh-cn/messages.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-11-14 10:00-0800\n"
+"POT-Creation-Date: 2012-11-18 10:00-0800\n"
-"PO-Revision-Date: 2012-11-18 17:14+0000\n"
+"PO-Revision-Date: 2012-11-18 20:12+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"
@@ -800,7 +800,7 @@ msgstr "设定您的位置"
 
 #: ../../mod/editpost.php:115 ../../include/conversation.php:978
 msgid "set location"
-msgstr ""
+msgstr "指定位置"
 
 #: ../../mod/editpost.php:116 ../../include/conversation.php:979
 msgid "Clear browser location"
@@ -808,7 +808,7 @@ msgstr "清空浏览器位置"
 
 #: ../../mod/editpost.php:117 ../../include/conversation.php:980
 msgid "clear location"
-msgstr ""
+msgstr "清理出位置"
 
 #: ../../mod/editpost.php:119 ../../include/conversation.php:986
 msgid "Permission settings"
@@ -2657,7 +2657,7 @@ msgstr "选择同一个人管理："
 
 #: ../../mod/network.php:181
 msgid "Search Results For:"
-msgstr ""
+msgstr "搜索结果为："
 
 #: ../../mod/network.php:221 ../../mod/search.php:18
 msgid "Remove term"
@@ -4140,7 +4140,7 @@ msgstr "FTP密码"
 
 #: ../../mod/profile.php:21 ../../boot.php:1123
 msgid "Requested profile is not available."
-msgstr ""
+msgstr "要求的简介联系不上的。"
 
 #: ../../mod/profile.php:155 ../../mod/display.php:87
 msgid "Access to this profile has been restricted."
@@ -4661,7 +4661,7 @@ msgstr "友谊建议"
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
-msgstr ""
+msgstr "没有建议。如果这是新网站，请24小时后再试。"
 
 #: ../../mod/suggest.php:61
 msgid "Ignore/Hide"
@@ -5125,7 +5125,7 @@ msgstr "发送到Facebook取消由于多网络准许矛盾。"
 #: ../../addon.old/facebook/facebook.php:1149
 #: ../../addon.old/fbpost/fbpost.php:610
 msgid "View on Friendica"
-msgstr ""
+msgstr "看在Friendica"
 
 #: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:643
 #: ../../addon.old/facebook/facebook.php:1182
@@ -5249,7 +5249,7 @@ msgstr "可用的小窗口"
 #: ../../addon/widgets/widget_friends.php:40
 #: ../../addon.old/widgets/widget_friends.php:40
 msgid "Connect on Friendica!"
-msgstr ""
+msgstr "连接在Friendica！"
 
 #: ../../addon/morepokes/morepokes.php:19
 #: ../../addon.old/morepokes/morepokes.php:19
@@ -7144,7 +7144,7 @@ msgid ""
 "here and enter the API base root.<br />Before you register your own OAuth "
 "key pair ask the administrator if there is already a key pair for this "
 "Friendica installation at your favorited StatusNet installation."
-msgstr ""
+msgstr "找不到「consumer key」双为StatusNet。注册您Friendica账户当「desktop client」在您的StatusNet账户，粘贴「consumer key」双这儿和输入API基础根。<br />您登记您的OAuth钥匙双前问行政人员已经有没有钥匙双为这个Friendica安装在您最喜欢的StatusNet安装。"
 
 #: ../../addon/statusnet/statusnet.php:283
 #: ../../addon.old/statusnet/statusnet.php:283
@@ -7436,7 +7436,7 @@ msgid ""
 "button below to get a PIN from Twitter which you have to copy into the input"
 " box below and submit the form. Only your <strong>public</strong> posts will"
 " be posted to Twitter."
-msgstr ""
+msgstr "在这个Friendica网站使Twitter插件可用的可您还没有把您的账户和您Twitter账户连通。为这做点击下边的按钮得到密码从Twitter您要粘贴在下边的输入框和提交。只您的<strong>公开</strong>文章被发送到Twitter。"
 
 #: ../../addon/twitter/twitter.php:173 ../../addon.old/twitter/twitter.php:173
 msgid "Log in with Twitter"
@@ -8762,7 +8762,7 @@ msgstr ""
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "找不到DNS信息为数据库服务器「%s」"
 
-#: ../../include/message.php:15 ../../include/message.php:171
+#: ../../include/message.php:15 ../../include/message.php:172
 msgid "[no subject]"
 msgstr "[无题目]"
 
@@ -9243,7 +9243,7 @@ msgstr ""
 
 #: ../../include/conversation.php:987
 msgid "permissions"
-msgstr ""
+msgstr "权利"
 
 #: ../../include/plugin.php:389 ../../include/plugin.php:391
 msgid "Click here to upgrade."

view/zh-cn/strings.php

@@ -144,9 +144,9 @@ $a->strings["video link"] = "视频环节";
 $a->strings["Insert audio link"] = "插入录音环节";
 $a->strings["audio link"] = "录音环节";
 $a->strings["Set your location"] = "设定您的位置";
-$a->strings["set location"] = "";
+$a->strings["set location"] = "指定位置";
 $a->strings["Clear browser location"] = "清空浏览器位置";
-$a->strings["clear location"] = "";
+$a->strings["clear location"] = "清理出位置";
 $a->strings["Permission settings"] = "权设置";
 $a->strings["CC: email addresses"] = "抄送: 电子邮件地址";
 $a->strings["Public post"] = "公开的消息";
@@ -574,7 +574,7 @@ $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["Select an identity to manage: "] = "选择同一个人管理：";
-$a->strings["Search Results For:"] = "";
+$a->strings["Search Results For:"] = "搜索结果为：";
 $a->strings["Remove term"] = "删除关键字";
 $a->strings["Saved Searches"] = "保存的搜索";
 $a->strings["add"] = "添加";
@@ -900,7 +900,7 @@ $a->strings["FTP Host"] = "FTP主机";
 $a->strings["FTP Path"] = "FTP目录";
 $a->strings["FTP User"] = "FTP用户";
 $a->strings["FTP Password"] = "FTP密码";
-$a->strings["Requested profile is not available."] = "";
+$a->strings["Requested profile is not available."] = "要求的简介联系不上的。";
 $a->strings["Access to this profile has been restricted."] = "使用权这个简介被限制了.";
 $a->strings["Tips for New Members"] = "提示对新成员";
 $a->strings["{0} wants to be your friend"] = "{0}想成为您的朋友";
@@ -1024,7 +1024,7 @@ $a->strings["bb2md2html2bb: "] = "";
 $a->strings["Source input (Diaspora format): "] = "";
 $a->strings["diaspora2bb: "] = "";
 $a->strings["Friend Suggestions"] = "友谊建议";
-$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "没有建议。如果这是新网站，请24小时后再试。";
 $a->strings["Ignore/Hide"] = "不理／隐藏";
 $a->strings["Global Directory"] = "综合目录";
 $a->strings["Find on this site"] = "找在这网站";
@@ -1112,7 +1112,7 @@ $a->strings["Activate Real-Time Updates"] = "";
 $a->strings["The new values have been saved."] = "";
 $a->strings["Post to Facebook"] = "放在Facebook";
 $a->strings["Post to Facebook cancelled because of multi-network access permission conflict."] = "发送到Facebook取消由于多网络准许矛盾。";
-$a->strings["View on Friendica"] = "";
+$a->strings["View on Friendica"] = "看在Friendica";
 $a->strings["Facebook post failed. Queued for retry."] = "Facebook发送失败了。排队着待再试。";
 $a->strings["Your Facebook connection became invalid. Please Re-authenticate."] = "";
 $a->strings["Facebook connection became invalid"] = "";
@@ -1140,7 +1140,7 @@ $a->strings["Get added to this list!"] = "";
 $a->strings["Generate new key"] = "造成新钥匙";
 $a->strings["Widgets key"] = "小窗口钥匙";
 $a->strings["Widgets available"] = "可用的小窗口";
-$a->strings["Connect on Friendica!"] = "";
+$a->strings["Connect on Friendica!"] = "连接在Friendica！";
 $a->strings["bitchslap"] = "";
 $a->strings["bitchslapped"] = "";
 $a->strings["shag"] = "";
@@ -1496,7 +1496,7 @@ $a->strings["StatusNet Posting Settings"] = "StatusNet发送设置";
 $a->strings["Globally Available StatusNet OAuthKeys"] = "综合可用的StatusNet OAuthKeys";
 $a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "有已经装配的OAuth钥匙双于有的StatusNet服务器可用。如果您用那些之一，请用那个。否则随便连接任何别的StatusNet（看下）。";
 $a->strings["Provide your own OAuth Credentials"] = "提供您自己的OAuth证件";
-$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "";
+$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "找不到「consumer key」双为StatusNet。注册您Friendica账户当「desktop client」在您的StatusNet账户，粘贴「consumer key」双这儿和输入API基础根。<br />您登记您的OAuth钥匙双前问行政人员已经有没有钥匙双为这个Friendica安装在您最喜欢的StatusNet安装。";
 $a->strings["OAuth Consumer Key"] = "Oauth消费者钥匙";
 $a->strings["OAuth Consumer Secret"] = "Oauth消费者密码";
 $a->strings["Base API Path (remember the trailing /)"] = "基础API地址(注意最后的／)";
@@ -1554,7 +1554,7 @@ $a->strings["Post to Twitter"] = "发送到在Twitter";
 $a->strings["Twitter settings updated."] = "Twitter设置更新了。";
 $a->strings["Twitter Posting Settings"] = "Twitter发送设置";
 $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "找不到Twitter的消费钥匙双。请联系您的网页行政人员。";
-$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "";
+$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "在这个Friendica网站使Twitter插件可用的可您还没有把您的账户和您Twitter账户连通。为这做点击下边的按钮得到密码从Twitter您要粘贴在下边的输入框和提交。只您的<strong>公开</strong>文章被发送到Twitter。";
 $a->strings["Log in with Twitter"] = "用Twitter登记";
 $a->strings["Copy the PIN from Twitter here"] = "复制Twitter密码这儿";
 $a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter 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>文章会被发送到有关的Twitter账户。您会选择默认地这样做（这儿）或个文章分开地写字时候选择在文章设置。";
@@ -1981,7 +1981,7 @@ $a->strings["Please enter an audio link/URL:"] = "请输入音响连接／URL：
 $a->strings["Tag term:"] = "标签:";
 $a->strings["Where are you right now?"] = "你在哪里?";
 $a->strings["Delete item(s)?"] = "";
-$a->strings["permissions"] = "";
+$a->strings["permissions"] = "权利";
 $a->strings["Click here to upgrade."] = "";
 $a->strings["This action exceeds the limits set by your subscription plan."] = "";
 $a->strings["This action is not available under your subscription plan."] = "";