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

boot.php

@@ -635,7 +635,11 @@ if(! class_exists('App')) {
 		function set_pager_itemspage($n) {
 			$this->pager['itemspage'] = ((intval($n) > 0) ? intval($n) : 0);
 			$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
+		}
 		
+		function set_pager_page($n) {
+			$this->pager['page'] = $n;
+			$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
 		}
 
 		function init_pagehead() {

include/api.php

@@ -741,8 +741,9 @@
 		if ($page<0) $page=0;
 		$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
 		$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
-		$exclude_replies = (x($_REQUEST,'exclude_replies')?1:0);
 		//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+		$exclude_replies = (x($_REQUEST,'exclude_replies')?1:0);
+		$conversation_id = (x($_REQUEST,'conversation_id')?$_REQUEST['conversation_id']:0);
 
 		$start = $page*$count;
 
@@ -753,6 +754,8 @@
 			$sql_extra .= ' AND `item`.`id` <= '.intval($max_id);
 		if ($exclude_replies > 0)
 			$sql_extra .= ' AND `item`.`parent` = `item`.`id`';
+		if ($conversation_id > 0)
+			$sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id);
 
 		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
 			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
@@ -816,6 +819,8 @@
 		$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
 		$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
 		//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+		$exclude_replies = (x($_REQUEST,'exclude_replies')?1:0);
+		$conversation_id = (x($_REQUEST,'conversation_id')?$_REQUEST['conversation_id']:0);
 
 		$start = $page*$count;
 
@@ -823,6 +828,10 @@
 
 		if ($max_id > 0)
 			$sql_extra = 'AND `item`.`id` <= '.intval($max_id);
+		if ($exclude_replies > 0)
+			$sql_extra .= ' AND `item`.`parent` = `item`.`id`';
+		if ($conversation_id > 0)
+			$sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id);
 
 		/*$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
 			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
@@ -1124,14 +1133,19 @@
 		$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
 		if ($page<0) $page=0;
 		$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
-		$exclude_replies = (x($_REQUEST,'exclude_replies')?1:0);
 		//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+		$exclude_replies = (x($_REQUEST,'exclude_replies')?1:0);
+		$conversation_id = (x($_REQUEST,'conversation_id')?$_REQUEST['conversation_id']:0);
 
 		$start = $page*$count;
 
 		$sql_extra = '';
 		if ($user_info['self']==1) $sql_extra .= " AND `item`.`wall` = 1 ";
-		if ($exclude_replies > 0)  $sql_extra .= ' AND `item`.`parent` = `item`.`id`';
+
+		if ($exclude_replies > 0)
+			$sql_extra .= ' AND `item`.`parent` = `item`.`id`';
+		if ($conversation_id > 0)
+			$sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id);
 
 		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,

include/ostatus_conversation.php

@@ -100,6 +100,10 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
 	$items = array_reverse($items);
 
 	foreach ($items as $single_conv) {
+		// identi.ca just changed the format of the activity streams. This is a quick fix.
+		if (@is_string($single_conv->object->id))
+			$single_conv->id = $single_conv->object->id;
+
 		if (@!$single_conv->id AND $single_conv->provider->url AND $single_conv->statusnet_notice_info->local_id)
 			$single_conv->id = $single_conv->provider->url."notice/".$single_conv->statusnet_notice_info->local_id;
 

include/text.php

@@ -27,7 +27,11 @@ function replace_macros($s,$r) {
 	$a = get_app();
 
 	$t = $a->template_engine();
+	try {
 		$output = $t->replace_macros($s,$r);
+	} catch (Exception $e) {
+		echo "<pre><b>".__function__."</b>: ".$e->getMessage()."</pre>"; killme();
+	}
 
 	$a->save_timestamp($stamp1, "rendering");
 
@@ -260,6 +264,84 @@ function hex2bin($s) {
 }}
 
 
+if(! function_exists('paginate_data')) {
+/**
+ * Automatica pagination data.
+ *
+ * @param App $a App instance
+ * @param int $count [optional] item count (used with alt pager)
+ * @return Array data for pagination template
+ */
+function paginate_data(&$a, $count=null) {
+	$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
+
+	$stripped = str_replace('q=','',$stripped);
+	$stripped = trim($stripped,'/');
+	$pagenum = $a->pager['page'];
+	$url = $a->get_baseurl() . '/' . $stripped;
+
+
+	$data = array();
+	function _l(&$d, $name, $url, $text, $class="") { 
+		
+		$d[$name] = array('url'=>$url, 'text'=>$text, 'class'=>$class); 
+	}
+
+	if (!is_null($count)){
+		// alt pager
+		if($a->pager['page']>1)
+			_l($data,  "prev", $url.'&page='.($a->pager['page'] - 1), t('newer'));
+		if($count>0)
+			_l($data,  "next", $url.'&page='.($a->pager['page'] + 1), t('older'));
+	} else {
+		// full pager
+		if($a->pager['total'] > $a->pager['itemspage']) {
+			if($a->pager['page'] != 1)
+				_l($data,  "prev", $url.'&page='.($a->pager['page'] - 1), t('prev'));
+
+			_l($data, "first", $url."&page=1",  t('first'));
+
+			
+			$numpages = $a->pager['total'] / $a->pager['itemspage'];
+
+			$numstart = 1;
+			$numstop = $numpages;
+
+			if($numpages > 14) {
+				$numstart = (($pagenum > 7) ? ($pagenum - 7) : 1);
+				$numstop = (($pagenum > ($numpages - 7)) ? $numpages : ($numstart + 14));
+			}
+
+			$pages = array();
+
+			for($i = $numstart; $i <= $numstop; $i++){
+				if($i == $a->pager['page'])
+					_l($pages, $i, "#",  $i, "current");
+				else
+					_l($pages, $i, $url."&page=$i", $i, "n");
+			}
+
+			if(($a->pager['total'] % $a->pager['itemspage']) != 0) {
+				if($i == $a->pager['page'])
+					_l($pages, $i, "#",  $i, "current");
+				else
+					_l($pages, $i, $url."&page=$i", $i, "n");
+			}
+
+			$data['pages'] = $pages;
+
+			$lastpage = (($numpages > intval($numpages)) ? intval($numpages)+1 : $numpages);
+			_l($data, "last", $url."&page=$lastpage", t('last'));
+			
+			if(($a->pager['total'] - ($a->pager['itemspage'] * $a->pager['page'])) > 0)
+				_l($data, "next", $url."&page=".($a->pager['page'] + 1), t('next'));
+
+		}	
+	}
+	return $data;
+
+}}
+
 if(! function_exists('paginate')) {
 /**
  * Automatic pagination.
@@ -277,58 +359,11 @@ if(! function_exists('paginate')) {
  * @return string html for pagination #FIXME remove html
  */
 function paginate(&$a) {
-	$o = '';
-	$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
 	
-//	$stripped = preg_replace('/&zrl=(.*?)([\?&]|$)/ism','',$stripped);
+	$data = paginate_data($a);
+	$tpl = get_markup_template("paginate.tpl");
+	return replace_macros($tpl, array("pager" => $data));
 
-	$stripped = str_replace('q=','',$stripped);
-	$stripped = trim($stripped,'/');
-	$pagenum = $a->pager['page'];
-	$url = $a->get_baseurl() . '/' . $stripped;
-
-
-	  if($a->pager['total'] > $a->pager['itemspage']) {
-		$o .= '<div class="pager">';
-    		if($a->pager['page'] != 1)
-			$o .= '<span class="pager_prev">'."<a href=\"$url".'&page='.($a->pager['page'] - 1).'">' . t('prev') . '</a></span> ';
-
-		$o .=  "<span class=\"pager_first\"><a href=\"$url"."&page=1\">" . t('first') . "</a></span> ";
-
-    		$numpages = $a->pager['total'] / $a->pager['itemspage'];
-
-			$numstart = 1;
-    		$numstop = $numpages;
-
-    		if($numpages > 14) {
-      			$numstart = (($pagenum > 7) ? ($pagenum - 7) : 1);
-      			$numstop = (($pagenum > ($numpages - 7)) ? $numpages : ($numstart + 14));
-    		}
-   
-		for($i = $numstart; $i <= $numstop; $i++){
-      			if($i == $a->pager['page'])
-				$o .= '<span class="pager_current">'.(($i < 10) ? '&nbsp;'.$i : $i);
-			else
-				$o .= "<span class=\"pager_n\"><a href=\"$url"."&page=$i\">".(($i < 10) ? '&nbsp;'.$i : $i)."</a>";
-			$o .= '</span> ';
-		}
-
-		if(($a->pager['total'] % $a->pager['itemspage']) != 0) {
-			if($i == $a->pager['page'])
-				$o .= '<span class="pager_current">'.(($i < 10) ? '&nbsp;'.$i : $i);
-			else
-				$o .= "<span class=\"pager_n\"><a href=\"$url"."&page=$i\">".(($i < 10) ? '&nbsp;'.$i : $i)."</a>";
-			$o .= '</span> ';
-		}
-
-		$lastpage = (($numpages > intval($numpages)) ? intval($numpages)+1 : $numpages);
-		$o .= "<span class=\"pager_last\"><a href=\"$url"."&page=$lastpage\">" . t('last') . "</a></span> ";
-
-    		if(($a->pager['total'] - ($a->pager['itemspage'] * $a->pager['page'])) > 0)
-			$o .= '<span class="pager_next">'."<a href=\"$url"."&page=".($a->pager['page'] + 1).'">' . t('next') . '</a></span>';
-		$o .= '</div>'."\r\n";
-	}
-	return $o;
 }}
 
 if(! function_exists('alt_pager')) {
@@ -339,27 +374,11 @@ if(! function_exists('alt_pager')) {
  * @return string html for pagination #FIXME remove html
  */
 function alt_pager(&$a, $i) {
-        $o = '';
-	$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
-	$stripped = str_replace('q=','',$stripped);
-	$stripped = trim($stripped,'/');
-	$pagenum = $a->pager['page'];
-        $url = $a->get_baseurl() . '/' . $stripped;
 
-        $o .= '<div class="pager">';
+	$data = paginate_data($a, $i);
+	$tpl = get_markup_template("paginate.tpl");
+	return replace_macros($tpl, array('pager' => $data));
 	
-	if($a->pager['page']>1)
-	  $o .= "<a href=\"$url"."&page=".($a->pager['page'] - 1).'" class="pager_newer">' . t('newer') . '</a>';
-        if($i>0) {
-          if($a->pager['page']>1)
-	          $o .= "&nbsp;-&nbsp;";
-	  $o .= "<a href=\"$url"."&page=".($a->pager['page'] + 1).'" class="pager_older">' . t('older') . '</a>';
-	}
-
-
-        $o .= '</div>'."\r\n";
-
-	return $o;
 }}
 
 
@@ -564,8 +583,11 @@ function get_markup_template($s, $root = '') {
 
 	$a = get_app();
 	$t = $a->template_engine();
-	
+	try {
 		$template = $t->get_template_file($s, $root);
+	} catch (Exception $e) {
+		echo "<pre><b>".__function__."</b>: ".$e->getMessage()."</pre>"; killme();
+	}
 	
 	$a->save_timestamp($stamp1, "file");
 	

view/cs/messages.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2013-05-22 00:01-0700\n"
+"POT-Creation-Date: 2013-06-12 00:01-0700\n"
-"PO-Revision-Date: 2013-05-24 17:03+0000\n"
+"PO-Revision-Date: 2013-06-12 18:39+0000\n"
 "Last-Translator: Michal Šupler <msupler@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
@@ -401,7 +401,8 @@ msgstr "Editovat Kontakty"
 msgid "Send PM"
 msgstr "Poslat soukromou zprávu"
 
-#: ../../include/bbcode.php:210 ../../include/bbcode.php:549
+#: ../../include/bbcode.php:210 ../../include/bbcode.php:550
+#: ../../include/bbcode.php:551
 msgid "Image/photo"
 msgstr "Obrázek/fotografie"
 
@@ -416,7 +417,7 @@ msgstr "<span><a href=\"%s\" target=\"external-link\">%s</a> napsal následujíc
 msgid "$1 wrote:"
 msgstr "$1 napsal:"
 
-#: ../../include/bbcode.php:557 ../../include/bbcode.php:558
+#: ../../include/bbcode.php:559 ../../include/bbcode.php:560
 msgid "Encrypted content"
 msgstr "Šifrovaný obsah"
 
@@ -594,7 +595,7 @@ msgstr "Závažná chyba: Generování bezpečnostních klíčů se nezdařilo."
 msgid "An error occurred during registration. Please try again."
 msgstr "Došlo k chybě při registraci. Zkuste to prosím znovu."
 
-#: ../../include/user.php:237 ../../include/text.php:1594
+#: ../../include/user.php:237 ../../include/text.php:1596
 msgid "default"
 msgstr "standardní"
 
@@ -926,7 +927,7 @@ msgstr "%1$s je nyní přítel s %2$s"
 msgid "Sharing notification from Diaspora network"
 msgstr "Sdílení oznámení ze sítě Diaspora"
 
-#: ../../include/diaspora.php:1874 ../../include/text.php:1860
+#: ../../include/diaspora.php:1874 ../../include/text.php:1862
 #: ../../include/conversation.php:126 ../../include/conversation.php:254
 #: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:151
 #: ../../view/theme/diabook/theme.php:464
@@ -1361,112 +1362,112 @@ msgstr "uvolněný"
 msgid "surprised"
 msgstr "překvapený"
 
-#: ../../include/text.php:1161
+#: ../../include/text.php:1163
 msgid "Monday"
 msgstr "Pondělí"
 
-#: ../../include/text.php:1161
+#: ../../include/text.php:1163
 msgid "Tuesday"
 msgstr "Úterý"
 
-#: ../../include/text.php:1161
+#: ../../include/text.php:1163
 msgid "Wednesday"
 msgstr "Středa"
 
-#: ../../include/text.php:1161
+#: ../../include/text.php:1163
 msgid "Thursday"
 msgstr "Čtvrtek"
 
-#: ../../include/text.php:1161
+#: ../../include/text.php:1163
 msgid "Friday"
 msgstr "Pátek"
 
-#: ../../include/text.php:1161
+#: ../../include/text.php:1163
 msgid "Saturday"
 msgstr "Sobota"
 
-#: ../../include/text.php:1161
+#: ../../include/text.php:1163
 msgid "Sunday"
 msgstr "Neděle"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "January"
 msgstr "Ledna"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "February"
 msgstr "Února"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "March"
 msgstr "Března"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "April"
 msgstr "Dubna"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "May"
 msgstr "Května"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "June"
 msgstr "Června"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "July"
 msgstr "Července"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "August"
 msgstr "Srpna"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "September"
 msgstr "Září"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "October"
 msgstr "Října"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "November"
 msgstr "Listopadu"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "December"
 msgstr "Prosinec"
 
-#: ../../include/text.php:1321 ../../mod/videos.php:301
+#: ../../include/text.php:1323 ../../mod/videos.php:301
 msgid "View Video"
 msgstr "Zobrazit video"
 
-#: ../../include/text.php:1353
+#: ../../include/text.php:1355
 msgid "bytes"
 msgstr "bytů"
 
-#: ../../include/text.php:1377 ../../include/text.php:1389
+#: ../../include/text.php:1379 ../../include/text.php:1391
 msgid "Click to open/close"
 msgstr "Klikněte pro otevření/zavření"
 
-#: ../../include/text.php:1551 ../../mod/events.php:335
+#: ../../include/text.php:1553 ../../mod/events.php:335
 msgid "link to source"
 msgstr "odkaz na zdroj"
 
-#: ../../include/text.php:1606
+#: ../../include/text.php:1608
 msgid "Select an alternate language"
 msgstr "Vyběr alternativního jazyka"
 
-#: ../../include/text.php:1858 ../../include/conversation.php:118
+#: ../../include/text.php:1860 ../../include/conversation.php:118
 #: ../../include/conversation.php:246 ../../view/theme/diabook/theme.php:456
 msgid "event"
 msgstr "událost"
 
-#: ../../include/text.php:1862
+#: ../../include/text.php:1864
 msgid "activity"
 msgstr "aktivita"
 
-#: ../../include/text.php:1864 ../../mod/content.php:628
+#: ../../include/text.php:1866 ../../mod/content.php:628
 #: ../../object/Item.php:364 ../../object/Item.php:377
 msgid "comment"
 msgid_plural "comments"
@@ -1474,11 +1475,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] "komentář"
 
-#: ../../include/text.php:1865
+#: ../../include/text.php:1867
 msgid "post"
 msgstr "příspěvek"
 
-#: ../../include/text.php:2020
+#: ../../include/text.php:2022
 msgid "Item filed"
 msgstr "Položka vyplněna"
 
@@ -6367,8 +6368,8 @@ msgid "Tips for New Members"
 msgstr "Tipy pro nové členy"
 
 #: ../../mod/install.php:117
-msgid "Friendica Social Communications Server - Setup"
+msgid "Friendica Communications Server - Setup"
-msgstr "Friendica Sociální komunkační server - Nastavení"
+msgstr "Friendica Komunikační server - Nastavení"
 
 #: ../../mod/install.php:123
 msgid "Could not connect to database."

view/cs/strings.php

@@ -1489,7 +1489,7 @@ $a->strings["Go to the Help Section"] = "Navštivte sekci nápovědy";
 $a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Na stránkách <strong>Nápověda</strong> naleznete nejen další podrobnosti o všech funkcích Friendika ale také další zdroje informací.";
 $a->strings["Requested profile is not available."] = "Požadovaný profil není k dispozici.";
 $a->strings["Tips for New Members"] = "Tipy pro nové členy";
-$a->strings["Friendica Social Communications Server - Setup"] = "Friendica Sociální komunkační server - Nastavení";
+$a->strings["Friendica Communications Server - Setup"] = "Friendica Komunikační server - Nastavení";
 $a->strings["Could not connect to database."] = "Nelze se připojit k databázi.";
 $a->strings["Could not create table."] = "Nelze vytvořit tabulku.";
 $a->strings["Your Friendica site database has been installed."] = "Vaše databáze Friendica  byla nainstalována.";

view/nb-no/update_fail_eml.tpl

@@ -1,5 +1,5 @@
 Hei,  
-jeg er $sitename.   
+Jeg er $sitename;   
 Friendica-utviklerne slapp nylig oppdateringen $update, 
 men da jeg prøvde å installere den, gikk noe forferdelig galt.  
 Dette trenger å bli fikset raskt og jeg kan ikke gjøre det alene. Vennligst kontakt en 

view/templates/paginate.tpl

@@ -0,0 +1,13 @@
+<div class="pager">
+	{{if $pager}}
+	{{if $pager.prev}}<span class="pager_prev {{$pager.prev.class}}"><a href="{{$pager.prev.url}}">{{$pager.prev.text}}</a></span>{{/if}}
+
+	{{if $pager.first}}<span class="pager_first $pager.first.class"><a href="{{$pager.first.url}}">{{$pager.first.text}}</a></span>{{/if}}
+
+	{{foreach $pager.pages as $p}}<span class="pager_{{$p.class}}"><a href="{{$p.url}}">{{$p.text}}</a></span>{{/foreach}}
+
+	{{if $pager.last}}&nbsp;<span class="pager_last {{$pager.last.class}}"><a href="{{$pager.last.url}}">{{$pager.last.text}}</a></span>{{/if}}
+
+	{{if $pager.next}}<span class="pager_next {{$pager.next.class}}"><a href="{{$pager.next.url}}">{{$pager.next.text}}</a></span>{{/if}}
+	{{/if}}
+</div>

view/zh-cn/strings.php

@@ -98,6 +98,181 @@ $a->strings["View Photos"] = "看照片";
 $a->strings["Network Posts"] = "网络文章";
 $a->strings["Edit Contact"] = "编辑熟人";
 $a->strings["Send PM"] = "法私人的新闻";
+$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 href=\"%s\" target=\"external-link\">%s</a>写了下面的<a href=\"%s\" target=\"external-link\">文章</a>";
+$a->strings["$1 wrote:"] = "$1写：";
+$a->strings["Encrypted content"] = "加密的内容";
+$a->strings["Visible to everybody"] = "任何人可见的";
+$a->strings["show"] = "著";
+$a->strings["don't show"] = "别著";
+$a->strings["Logged out."] = "注销了";
+$a->strings["Login failed."] = "登记失败了。";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "我们用您输入的OpenID登录的时候碰到问题。请核实拼法是对的。";
+$a->strings["The error message was:"] = "错误通知是：";
+$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
+$a->strings["Starts:"] = "开始：";
+$a->strings["Finishes:"] = "结束：";
+$a->strings["Location:"] = "位置:";
+$a->strings["Disallowed profile URL."] = "不允许的简介地址.";
+$a->strings["Connect URL missing."] = "连接URL失踪的。";
+$a->strings["This site is not configured to allow communications with other networks."] = "这网站没配置允许跟别的网络交流.";
+$a->strings["No compatible communication protocols or feeds were discovered."] = "没有兼容协议或者摘要找到了.";
+$a->strings["The profile address specified does not provide adequate information."] = "输入的简介地址没有够消息。";
+$a->strings["An author or name was not found."] = "找不到作者或名。";
+$a->strings["No browser URL could be matched to this address."] = "这个地址没有符合什么游览器URL。";
+$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "使不了知道的相配或邮件熟人相配 ";
+$a->strings["Use mailto: in front of address to force email check."] = "输入mailto:地址前为要求电子邮件检查。";
+$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "输入的简介地址属在这个网站使不可用的网络。";
+$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "有限的简介。这人不会接受直达／私人通信从您。";
+$a->strings["Unable to retrieve contact information."] = "不能取回熟人消息。";
+$a->strings["following"] = "关注";
+$a->strings["An invitation is required."] = "邀请必要的。";
+$a->strings["Invitation could not be verified."] = "不能证实邀请。";
+$a->strings["Invalid OpenID url"] = "无效的OpenID url";
+$a->strings["Please enter the required information."] = "请输入必要的信息。";
+$a->strings["Please use a shorter name."] = "请用短一点名。";
+$a->strings["Name too short."] = "名字太短。";
+$a->strings["That doesn't appear to be your full (First Last) name."] = "这看上去不是您的全姓名。";
+$a->strings["Your email domain is not among those allowed on this site."] = "这网站允许的域名中没有您的";
+$a->strings["Not a valid email address."] = "无效的邮件地址。";
+$a->strings["Cannot use that email."] = "不能用这个邮件地址。";
+$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "您的昵称只能包含\"a-z\",\"0-9\",\"-\"和\"_\",还有头一字必须是拉丁字。";
+$a->strings["Nickname is already registered. Please choose another."] = "昵称已经报到。请选择新的。";
+$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "昵称曾经这里注册于是不能再用。请选择别的。";
+$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "要紧错误：产生安全钥匙失败了。";
+$a->strings["An error occurred during registration. Please try again."] = "报到出了问题。请再试。";
+$a->strings["default"] = "默认";
+$a->strings["An error occurred creating your default profile. Please try again."] = "造成默认简介出了问题。请再试。";
+$a->strings["Profile Photos"] = "简介照片";
+$a->strings["Unknown | Not categorised"] = "未知的 ｜无分类";
+$a->strings["Block immediately"] = "立即拦";
+$a->strings["Shady, spammer, self-marketer"] = "可疑，发垃圾者，自市场开发者";
+$a->strings["Known to me, but no opinion"] = "我认识，但没有意见";
+$a->strings["OK, probably harmless"] = "行，大概无恶意的";
+$a->strings["Reputable, has my trust"] = "可信的，有我的信任";
+$a->strings["Frequently"] = "时常";
+$a->strings["Hourly"] = "每小时";
+$a->strings["Twice daily"] = "每日两次";
+$a->strings["Daily"] = "每日";
+$a->strings["Weekly"] = "每周";
+$a->strings["Monthly"] = "每月";
+$a->strings["Friendica"] = "Friendica";
+$a->strings["OStatus"] = "OStatus";
+$a->strings["RSS/Atom"] = "RSS/Atom";
+$a->strings["Email"] = "电子邮件";
+$a->strings["Diaspora"] = "Diaspora";
+$a->strings["Facebook"] = "Facebook";
+$a->strings["Zot!"] = "Zot!";
+$a->strings["LinkedIn"] = "LinkedIn";
+$a->strings["XMPP/IM"] = "XMPP/IM";
+$a->strings["MySpace"] = "MySpace";
+$a->strings["Google+"] = "Google+";
+$a->strings["Add New Contact"] = "增添新的熟人";
+$a->strings["Enter address or web location"] = "输入地址或网位置";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "比如：li@example.com, http://example.com/li";
+$a->strings["Connect"] = "连接";
+$a->strings["%d invitation available"] = array(
+	0 => "%d邀请可用的",
+);
+$a->strings["Find People"] = "找人物";
+$a->strings["Enter name or interest"] = "输入名字或兴趣";
+$a->strings["Connect/Follow"] = "连接/关注";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "比如：李某，打鱼";
+$a->strings["Find"] = "搜索";
+$a->strings["Friend Suggestions"] = "友谊建议";
+$a->strings["Similar Interests"] = "相似兴趣";
+$a->strings["Random Profile"] = "随机简介";
+$a->strings["Invite Friends"] = "邀请朋友们";
+$a->strings["Networks"] = "网络";
+$a->strings["All Networks"] = "所有网络";
+$a->strings["Saved Folders"] = "保存的文件夹";
+$a->strings["Everything"] = "一切";
+$a->strings["Categories"] = "种类";
+$a->strings["%d contact in common"] = array(
+	0 => "%d共同熟人",
+);
+$a->strings["show more"] = "看多";
+$a->strings[" on Last.fm"] = "在Last.fm";
+$a->strings["view full size"] = "看全尺寸";
+$a->strings["Miscellaneous"] = "形形色色";
+$a->strings["year"] = "年";
+$a->strings["month"] = "月";
+$a->strings["day"] = "日";
+$a->strings["never"] = "从未";
+$a->strings["less than a second ago"] = "一秒以内";
+$a->strings["years"] = "年";
+$a->strings["months"] = "月";
+$a->strings["week"] = "星期";
+$a->strings["weeks"] = "星期";
+$a->strings["days"] = "天";
+$a->strings["hour"] = "小时";
+$a->strings["hours"] = "小时";
+$a->strings["minute"] = "分钟";
+$a->strings["minutes"] = "分钟";
+$a->strings["second"] = "秒";
+$a->strings["seconds"] = "秒";
+$a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s以前";
+$a->strings["%s's birthday"] = "%s的生日";
+$a->strings["Happy Birthday %s"] = "生日快乐%s";
+$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."] = "这个行动在您的订阅不可用的。";
+$a->strings["(no subject)"] = "沒有题目";
+$a->strings["noreply"] = "noreply";
+$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s是成为%2\$s的朋友";
+$a->strings["Sharing notification from Diaspora network"] = "分享通知从Diaspora网络";
+$a->strings["photo"] = "照片";
+$a->strings["status"] = "现状";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s喜欢%2\$s的%3\$s";
+$a->strings["Attachments:"] = "附件：";
+$a->strings["[Name Withheld]"] = "[名字拒给]";
+$a->strings["A new person is sharing with you at "] = "一位新人给你分享在";
+$a->strings["You have a new follower at "] = "你有新的关注者在";
+$a->strings["Item not found."] = "项目找不到。";
+$a->strings["Do you really want to delete this item?"] = "您真的想删除这个项目吗？";
+$a->strings["Yes"] = "是";
+$a->strings["Cancel"] = "退消";
+$a->strings["Permission denied."] = "权限不够。";
+$a->strings["Archives"] = "档案";
+$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["Saved Searches"] = "保存的搜索";
+$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)"] = "使表示光网络文章在12小时内分页可用";
+$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["prev"] = "上个";
 $a->strings["first"] = "首先";
 $a->strings["last"] = "最后";
@@ -162,192 +337,18 @@ $a->strings["September"] = "九月";
 $a->strings["October"] = "十月";
 $a->strings["November"] = "十一月";
 $a->strings["December"] = "十二月";
+$a->strings["View Video"] = "看视频";
 $a->strings["bytes"] = "字节";
 $a->strings["Click to open/close"] = "点击为开关";
 $a->strings["link to source"] = "链接到来源";
-$a->strings["default"] = "默认";
 $a->strings["Select an alternate language"] = "选择别的语言";
 $a->strings["event"] = "项目";
-$a->strings["photo"] = "照片";
 $a->strings["activity"] = "活动";
 $a->strings["comment"] = array(
 	0 => "评论",
 );
 $a->strings["post"] = "文章";
 $a->strings["Item filed"] = "把项目归档了";
-$a->strings["Visible to everybody"] = "任何人可见的";
-$a->strings["show"] = "著";
-$a->strings["don't show"] = "别著";
-$a->strings["Logged out."] = "注销了";
-$a->strings["Login failed."] = "登记失败了。";
-$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "我们用您输入的OpenID登录的时候碰到问题。请核实拼法是对的。";
-$a->strings["The error message was:"] = "错误通知是：";
-$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
-$a->strings["Starts:"] = "开始：";
-$a->strings["Finishes:"] = "结束：";
-$a->strings["Location:"] = "位置:";
-$a->strings["Disallowed profile URL."] = "不允许的简介地址.";
-$a->strings["Connect URL missing."] = "连接URL失踪的。";
-$a->strings["This site is not configured to allow communications with other networks."] = "这网站没配置允许跟别的网络交流.";
-$a->strings["No compatible communication protocols or feeds were discovered."] = "没有兼容协议或者摘要找到了.";
-$a->strings["The profile address specified does not provide adequate information."] = "输入的简介地址没有够消息。";
-$a->strings["An author or name was not found."] = "找不到作者或名。";
-$a->strings["No browser URL could be matched to this address."] = "这个地址没有符合什么游览器URL。";
-$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "使不了知道的相配或邮件熟人相配 ";
-$a->strings["Use mailto: in front of address to force email check."] = "输入mailto:地址前为要求电子邮件检查。";
-$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "输入的简介地址属在这个网站使不可用的网络。";
-$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "有限的简介。这人不会接受直达／私人通信从您。";
-$a->strings["Unable to retrieve contact information."] = "不能取回熟人消息。";
-$a->strings["following"] = "关注";
-$a->strings["An invitation is required."] = "邀请必要的。";
-$a->strings["Invitation could not be verified."] = "不能证实邀请。";
-$a->strings["Invalid OpenID url"] = "无效的OpenID url";
-$a->strings["Please enter the required information."] = "请输入必要的信息。";
-$a->strings["Please use a shorter name."] = "请用短一点名。";
-$a->strings["Name too short."] = "名字太短。";
-$a->strings["That doesn't appear to be your full (First Last) name."] = "这看上去不是您的全姓名。";
-$a->strings["Your email domain is not among those allowed on this site."] = "这网站允许的域名中没有您的";
-$a->strings["Not a valid email address."] = "无效的邮件地址。";
-$a->strings["Cannot use that email."] = "不能用这个邮件地址。";
-$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "您的昵称只能包含\"a-z\",\"0-9\",\"-\"和\"_\",还有头一字必须是拉丁字。";
-$a->strings["Nickname is already registered. Please choose another."] = "昵称已经报到。请选择新的。";
-$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "昵称曾经这里注册于是不能再用。请选择别的。";
-$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "要紧错误：产生安全钥匙失败了。";
-$a->strings["An error occurred during registration. Please try again."] = "报到出了问题。请再试。";
-$a->strings["An error occurred creating your default profile. Please try again."] = "造成默认简介出了问题。请再试。";
-$a->strings["Profile Photos"] = "简介照片";
-$a->strings["Unknown | Not categorised"] = "未知的 ｜无分类";
-$a->strings["Block immediately"] = "立即拦";
-$a->strings["Shady, spammer, self-marketer"] = "可疑，发垃圾者，自市场开发者";
-$a->strings["Known to me, but no opinion"] = "我认识，但没有意见";
-$a->strings["OK, probably harmless"] = "行，大概无恶意的";
-$a->strings["Reputable, has my trust"] = "可信的，有我的信任";
-$a->strings["Frequently"] = "时常";
-$a->strings["Hourly"] = "每小时";
-$a->strings["Twice daily"] = "每日两次";
-$a->strings["Daily"] = "每日";
-$a->strings["Weekly"] = "每周";
-$a->strings["Monthly"] = "每月";
-$a->strings["Friendica"] = "Friendica";
-$a->strings["OStatus"] = "OStatus";
-$a->strings["RSS/Atom"] = "RSS/Atom";
-$a->strings["Email"] = "电子邮件";
-$a->strings["Diaspora"] = "Diaspora";
-$a->strings["Facebook"] = "Facebook";
-$a->strings["Zot!"] = "Zot!";
-$a->strings["LinkedIn"] = "LinkedIn";
-$a->strings["XMPP/IM"] = "XMPP/IM";
-$a->strings["MySpace"] = "MySpace";
-$a->strings["Google+"] = "Google+";
-$a->strings["Add New Contact"] = "增添新的熟人";
-$a->strings["Enter address or web location"] = "输入地址或网位置";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "比如：li@example.com, http://example.com/li";
-$a->strings["Connect"] = "连接";
-$a->strings["%d invitation available"] = array(
-	0 => "%d邀请可用的",
-);
-$a->strings["Find People"] = "找人物";
-$a->strings["Enter name or interest"] = "输入名字或兴趣";
-$a->strings["Connect/Follow"] = "连接/关注";
-$a->strings["Examples: Robert Morgenstein, Fishing"] = "比如：李某，打鱼";
-$a->strings["Find"] = "搜索";
-$a->strings["Friend Suggestions"] = "友谊建议";
-$a->strings["Similar Interests"] = "相似兴趣";
-$a->strings["Random Profile"] = "随机简介";
-$a->strings["Invite Friends"] = "邀请朋友们";
-$a->strings["Networks"] = "网络";
-$a->strings["All Networks"] = "所有网络";
-$a->strings["Saved Folders"] = "保存的文件夹";
-$a->strings["Everything"] = "一切";
-$a->strings["Categories"] = "种类";
-$a->strings["%d contact in common"] = array(
-	0 => "%d共同熟人",
-);
-$a->strings["show more"] = "看多";
-$a->strings[" on Last.fm"] = "在Last.fm";
-$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 href=\"%s\" target=\"external-link\">%s</a>写了下面的<a href=\"%s\" target=\"external-link\">文章</a>";
-$a->strings["$1 wrote:"] = "$1写：";
-$a->strings["Encrypted content"] = "加密的内容";
-$a->strings["view full size"] = "看全尺寸";
-$a->strings["Miscellaneous"] = "形形色色";
-$a->strings["year"] = "年";
-$a->strings["month"] = "月";
-$a->strings["day"] = "日";
-$a->strings["never"] = "从未";
-$a->strings["less than a second ago"] = "一秒以内";
-$a->strings["years"] = "年";
-$a->strings["months"] = "月";
-$a->strings["week"] = "星期";
-$a->strings["weeks"] = "星期";
-$a->strings["days"] = "天";
-$a->strings["hour"] = "小时";
-$a->strings["hours"] = "小时";
-$a->strings["minute"] = "分钟";
-$a->strings["minutes"] = "分钟";
-$a->strings["second"] = "秒";
-$a->strings["seconds"] = "秒";
-$a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s以前";
-$a->strings["%s's birthday"] = "%s的生日";
-$a->strings["Happy Birthday %s"] = "生日快乐%s";
-$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."] = "这个行动在您的订阅不可用的。";
-$a->strings["(no subject)"] = "沒有题目";
-$a->strings["noreply"] = "noreply";
-$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s是成为%2\$s的朋友";
-$a->strings["Sharing notification from Diaspora network"] = "分享通知从Diaspora网络";
-$a->strings["status"] = "现状";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s喜欢%2\$s的%3\$s";
-$a->strings["Attachments:"] = "附件：";
-$a->strings["[Name Withheld]"] = "[名字拒给]";
-$a->strings["A new person is sharing with you at "] = "一位新人给你分享在";
-$a->strings["You have a new follower at "] = "你有新的关注者在";
-$a->strings["Item not found."] = "项目找不到。";
-$a->strings["Do you really want to delete this item?"] = "您真的想删除这个项目吗？";
-$a->strings["Yes"] = "是";
-$a->strings["Cancel"] = "退消";
-$a->strings["Permission denied."] = "权限不够。";
-$a->strings["Archives"] = "档案";
-$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["Saved Searches"] = "保存的搜索";
-$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)"] = "使表示光网络文章在12小时内分页可用";
-$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["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "一个删除的组用这名被复兴。现有的项目权利<strong>可能</strong>还效为这个组和未来的成员。如果这不是您想的，请造成新组给起别的名。";
 $a->strings["Default privacy group for new contacts"] = "默认隐私组为新熟人";
 $a->strings["Everybody"] = "每人";
@@ -1173,6 +1174,11 @@ $a->strings["No suggestions available. If this is a new site, please try again i
 $a->strings["Ignore/Hide"] = "不理／隐藏";
 $a->strings["People Search"] = "搜索人物";
 $a->strings["No matches"] = "没有结果";
+$a->strings["No videos selected"] = "没选择的视频";
+$a->strings["Access to this item is restricted."] = "这个项目使用权限的。";
+$a->strings["View Album"] = "看照片册";
+$a->strings["Recent Videos"] = "最近视频";
+$a->strings["Upload New Videos"] = "上传新视频";
 $a->strings["Tag removed"] = "标签去除了";
 $a->strings["Remove Item Tag"] = "去除项目标签";
 $a->strings["Select a tag to remove: "] = "选择标签去除";
@@ -1392,7 +1398,6 @@ $a->strings["a photo"] = "一张照片";
 $a->strings["Image exceeds size limit of "] = "图片超出最大尺寸";
 $a->strings["Image file is empty."] = "图片文件空的。";
 $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."] = "您用%2$.2f兆字节的%1$.2f兆字节照片存储。";
 $a->strings["Upload Photos"] = "上传照片";
 $a->strings["New album name: "] = "新册名：";
@@ -1426,7 +1431,6 @@ $a->strings["I like this (toggle)"] = "我喜欢这(交替)";
 $a->strings["I don't like this (toggle)"] = "我不喜欢这(交替)";
 $a->strings["This is you"] = "这是你";
 $a->strings["Comment"] = "评论";
-$a->strings["View Album"] = "看照片册";
 $a->strings["Recent Photos"] = "最近的照片";
 $a->strings["Welcome to Friendica"] = "Friendica欢迎你";
 $a->strings["New Member Checklist"] = "新的成员一览表";
@@ -1463,7 +1467,7 @@ $a->strings["Go to the Help Section"] = "看帮助部分";
 $a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "我们<strong>帮助</strong>页可查阅到详情关于别的编程特点和资源。";
 $a->strings["Requested profile is not available."] = "要求的简介联系不上的。";
 $a->strings["Tips for New Members"] = "提示对新成员";
-$a->strings["Friendica Social Communications Server - Setup"] = "Friendica社会交通服务器－安装";
+$a->strings["Friendica Communications Server - Setup"] = "Friendica沟通服务器－安装";
 $a->strings["Could not connect to database."] = "解不了数据库。";
 $a->strings["Could not create table."] = "造成不了表格。";
 $a->strings["Your Friendica site database has been installed."] = "您Friendica网站数据库被安装了。";
@@ -1630,5 +1634,6 @@ $a->strings["Event Reminders"] = "事件提醒";
 $a->strings["Events this week:"] = "这周的事件:";
 $a->strings["Status Messages and Posts"] = "现状通知和文章";
 $a->strings["Profile Details"] = "简介内容";
+$a->strings["Videos"] = "视频";
 $a->strings["Events and Calendar"] = "项目和日历";
 $a->strings["Only You Can See This"] = "只您许看这个";

view/zh-cn/update_fail_eml.tpl

@@ -1,11 +1,11 @@
-Hey, 
+你好， 
-I'm $sitename.   
+我是$sitename；   
-The friendica developers released update $update recently, 
+Friendica开发者最近出版更新$update， 
-but when I tried to install it, something went terribly wrong.  
+可我安装的时候，遇到什么灾害，  
-This needs to be fixed soon and I can't do it alone. Please contact a 
+这要紧急地维修，可我不会自己做。请联系 
-friendica developer if you can not help me on your own. My database might be invalid. 
+一个Friendica开发者如果你不会自己帮我。我的数据库会不效。 
 
-The error message is '$error'.   
+错误通信是「$error」   
 
-I'm sorry, 
+不好意思， 
-your friendica server at $siteurl
+你Friendica服务器在$siteurl