Merge remote-tracking branch 'upstream/master'

boot.php

@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1729' );
+define ( 'FRIENDICA_VERSION',      '3.1.1743' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1163      );
 define ( 'EOL',                    "<br />\r\n"     );

include/api.php

@@ -649,7 +649,7 @@
 				'created_at' => api_date($lastwall['created']),
 				'in_reply_to_status_id' => $in_reply_to_status_id,
 				'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'),
-				'id' => $lastwall['contact-id'],
+				'id' => $lastwall['id'],
 				'in_reply_to_user_id' => $in_reply_to_user_id,
 				'in_reply_to_screen_name' => $in_reply_to_screen_name,
 				'geo' => '',

include/diaspora.php

@@ -2117,7 +2117,9 @@ function diaspora_profile($importer,$xml,$msg) {
 	if($name === '') {
 		$name = $handle_parts[0];
 	}
-	if(strpos($image_url, $handle_parts[1]) === false) {
+	
+	 
+	if( preg_match("|^https?://|", $image_url) === 0) {
 		$image_url = "http://" . $handle_parts[1] . $image_url;
 	}
 

include/network.php

@@ -93,7 +93,7 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_
 			$newurl = trim(array_pop($matches));
 		}
 		if(strpos($newurl,'/') === 0)
-			$newurl = $url . $newurl;
+			$newurl = $old_location_info["scheme"]."://".$old_location_info["host"].$newurl;
 		if (filter_var($newurl, FILTER_VALIDATE_URL)) {
 			$redirects++;
 			return fetch_url($newurl,$binary,$redirects,$timeout);
@@ -188,7 +188,7 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
         preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches);
         $newurl = trim(array_pop($matches));
 		if(strpos($newurl,'/') === 0)
-			$newurl = $url . $newurl;
+			$newurl = $old_location_info["scheme"] . "://" . $old_location_info["host"] . $newurl;
         if (filter_var($newurl, FILTER_VALIDATE_URL)) {
             $redirects++;
             return fetch_url($newurl,false,$redirects,$timeout);

include/onepoll.php

@@ -551,10 +551,10 @@ function onepoll_run(&$argv, &$argc){
 		if($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly'])
 			$hubmode = 'unsubscribe';
 
-		if($contact['network'] === NETWORK_OSTATUS && (! $contact['hub-verify']))
+		if(($contact['network'] === NETWORK_OSTATUS ||  $contact['network'] == NETWORK_FEED) && (! $contact['hub-verify']))
 			$hub_update = true;
 
-		if((strlen($hub)) && ($hub_update) && ($contact['rel'] != CONTACT_IS_FOLLOWER)) {
+		if((strlen($hub)) && ($hub_update) && (($contact['rel'] != CONTACT_IS_FOLLOWER) || $contact['network'] == NETWORK_FEED) ) {
 			logger('poller: hub ' . $hubmode . ' : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
 			$hubs = explode(',', $hub);
 			if(count($hubs)) {

include/pgettext.php

@@ -87,16 +87,19 @@ function pop_lang() {
 }
 
 
-// load string translation table for alternate language
+// l
 
 if(! function_exists('load_translation_table')) {
+/**
+ * load string translation table for alternate language
+ *
+ * first plugin strings are loaded, then globals
+ * 
+ * @param string $lang language code to load
+ */
 function load_translation_table($lang) {
 	global $a;
 
-	$a->strings = array();
-	if(file_exists("view/$lang/strings.php")) {
-		include("view/$lang/strings.php");
-	}
 	// load enabled plugins strings
 	$plugins = q("SELECT name FROM addon WHERE installed=1;");
 	if ($plugins!==false) {
@@ -107,6 +110,12 @@ function load_translation_table($lang) {
 			}
 		}
 	}
+	
+	$a->strings = array();
+	if(file_exists("view/$lang/strings.php")) {
+		include("view/$lang/strings.php");
+	}
+
 }}
 
 // translate string if translation exists

include/plugin.php

@@ -185,6 +185,21 @@ function call_hooks($name, &$data = null) {
 	}
 }}
 
+//check if an app_menu hook exist for plugin $name.
+//Return true if the plugin is an app
+if(! function_exists('plugin_is_app')) {
+function plugin_is_app($name) {
+	$a = get_app();
+
+	if(is_array($a->hooks) && (array_key_exists('app_menu',$a->hooks))) {
+		foreach($a->hooks['app_menu'] as $hook) {
+			if($hook[0] == 'addon/'.$name.'/'.$name.'.php')
+				return true;
+		}
+	}
+	
+	return false;
+}}
 
 /*
  * parse plugin comment in search of plugin infos.

include/tags.php

@@ -79,6 +79,12 @@ function create_tags_from_item($itemid) {
 	foreach ($tags as $tag=>$link) {
 
 		if (substr(trim($tag), 0, 1) == "#") {
+			// try to ignore #039 or #1 or anything like that
+			if(ctype_digit(substr(trim($tag),1)))
+				continue;
+			// try to ignore html hex escapes, e.g. #x2317
+			if((substr(trim($tag),1,1) == 'x' || substr(trim($tag),1,1) == 'X') && ctype_digit(substr(trim($tag),2)))
+				continue;
 			$type = TERM_HASHTAG;
 			$term = substr($tag, 1);
 		} elseif (substr(trim($tag), 0, 1) == "@") {

include/text.php

@@ -1269,11 +1269,42 @@ if(! function_exists('prepare_body')) {
  * @hook prepare_body ('item'=>item array, 'html'=>body string) after first bbcode to html
  * @hook prepare_body_final ('item'=>item array, 'html'=>body string) after attach icons and blockquote special case handling (spoiler, author)
  */
-function prepare_body($item,$attach = false) {
+function prepare_body(&$item,$attach = false) {
 
 	$a = get_app();
 	call_hooks('prepare_body_init', $item);
 
+	$searchpath = $a->get_baseurl()."/search?tag=";
+
+	$tags=array();
+	$hashtags = array();
+	$mentions = array();
+
+	if (!get_config('system','suppress_tags')) {
+		$taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`",
+				intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION));
+
+		foreach($taglist as $tag) {
+
+			if ($tag["url"] == "")
+				$tag["url"] = $searchpath.strtolower($tag["term"]);
+
+			if ($tag["type"] == TERM_HASHTAG) {
+				$hashtags[] = "#<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
+				$prefix = "#";
+			} elseif ($tag["type"] == TERM_MENTION) {
+				$mentions[] = "@<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
+				$prefix = "@";
+			}
+			$tags[] = $prefix."<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
+		}
+	}
+
+	$item['tags'] = $tags;
+	$item['hashtags'] = $hashtags;
+	$item['mentions'] = $mentions;
+
+
 	//$cachefile = get_cachefile($item["guid"]."-".strtotime($item["edited"])."-".hash("crc32", $item['body']));
 	$cachefile = get_cachefile($item["guid"]."-".hash("md5", $item['body']));
 

index.php

@@ -149,11 +149,16 @@ else {
 
 nav_set_selected('nothing');
 
-$arr = array('app_menu' => $a->apps);
+//Don't populate apps_menu if apps are private
+$privateapps = get_config('config','private_addons');
+if((local_user()) || (! $privateapps === "1"))
+{
+	$arr = array('app_menu' => $a->apps);
 
-call_hooks('app_menu', $arr);
+	call_hooks('app_menu', $arr);
 
-$a->apps = $arr['app_menu'];
+	$a->apps = $arr['app_menu'];
+}
 
 /**
  *
@@ -187,11 +192,19 @@ if(strlen($a->module)) {
 	if ($a->module == "stream")
 		$a->module = "network";
 	
+	$privateapps = get_config('config','private_addons');
+
 	if(is_array($a->plugins) && in_array($a->module,$a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) {
+		//Check if module is an app and if public access to apps is allowed or not
+		if((!local_user()) && plugin_is_app($a->module) && $privateapps === "1") {
+			info( t("You must be logged in to use addons. "));
+		}
+		else {
 			include_once("addon/{$a->module}/{$a->module}.php");
 			if(function_exists($a->module . '_module'))
 				$a->module_loaded = true;
 		}
+	}
 
 	/**
 	 * If not, next look for a 'standard' program module in the 'mod' directory

mod/admin.php

@@ -622,9 +622,40 @@ function admin_page_dbsync(&$a) {
 function admin_page_users_post(&$a){
 	$pending = ( x($_POST, 'pending') ? $_POST['pending'] : Array() );
 	$users = ( x($_POST, 'user') ? $_POST['user'] : Array() );
+	$nu_name = ( x($_POST, 'new_user_name') ? $_POST['new_user_name'] : ''); 
+  $nu_nickname = ( x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : ''); 
+  $nu_email = ( x($_POST, 'new_user_email') ? $_POST['new_user_email'] : '');
 
   check_form_security_token_redirectOnErr('/admin/users', 'admin_users');
     
+  if (!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) { 
+      require_once('include/user.php'); 
+      require_once('include/email.php'); 
+      $result = create_user( array('username'=>$nu_name, 'email'=>$nu_email, 'nickname'=>$nu_nickname, 'verified'=>1)  ); 
+      if(! $result['success']) { 
+		    notice($result['message']); 
+		    return; 
+      } 
+      $nu = $result['user']; 
+      $email_tpl = get_intltext_template("register_adminadd_eml.tpl"); 
+      $email_tpl = replace_macros($email_tpl, array( 
+		    '$sitename' => $a->config['sitename'], 
+		    '$siteurl' =>  $a->get_baseurl(), 
+		    '$username' => $nu['username'], 
+		    '$email' => $nu['email'], 
+		    '$password' => $result['password'], 
+		    '$uid' => $nu['uid'] )); 
+ 
+      $res = mail($nu['email'], email_header_encode( sprintf( t('Registration details for %s'), $a->config['sitename']),'UTF-8'), 
+		    $email_tpl,  
+		    'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" 
+		    . 'Content-type: text/plain; charset=UTF-8' . "\n" 
+		    . 'Content-transfer-encoding: 8bit' ); 
+      if ($res) { 
+		    info( t('Registration successful. Email send to user').EOL ); 
+      } 
+  }
+	
 	if (x($_POST,'page_users_block')){
 		foreach($users as $uid){
 			q("UPDATE `user` SET `blocked`=1-`blocked` WHERE `uid`=%s",
@@ -740,19 +771,35 @@ function admin_page_users(&$a){
 		$e['login_date'] = relative_date($e['login_date']);
 		$e['lastitem_date'] = relative_date($e['lastitem_date']);
         $e['is_admin'] = ($e['email'] === $a->config['admin_email']);
+        $e['deleted'] = ($e['account_removed']?relative_date($e['account_expires_on']):False);
 		return $e;
 	}
 	$users = array_map("_setup_users", $users);
 	
 	
 	// Get rid of dashes in key names, Smarty3 can't handle them
-	foreach($users as $key => $user) {
+	// and extracting deleted users
-		$new_user = array();
+	
-		foreach($user as $k => $v) {
+	$tmp_users = Array();
+	$deleted = Array();
+	
+	while(count($users)) {
+		$new_user = Array();
+		foreach( array_pop($users) as $k => $v) {
 			$k = str_replace('-','_',$k);
 			$new_user[$k] = $v;
 		}
-		$users[$key] = $new_user;
+		if($new_user['deleted']) {
+			array_push($deleted, $new_user);
+		}
+		else {
+			array_push($tmp_users, $new_user);
+		}
+	}
+	//Reversing the two array, and moving $tmp_users to $users
+	array_reverse($deleted);
+	while(count($tmp_users)) {
+		array_push($users, array_pop($tmp_users));
 	}
 
 	$t = get_markup_template("admin_users.tpl");
@@ -763,6 +810,7 @@ function admin_page_users(&$a){
 		'$submit' => t('Submit'),
 		'$select_all' => t('select all'),
 		'$h_pending' => t('User registrations waiting for confirm'),
+		'$h_deleted' => t('User waiting for permanent deletion'),
 		'$th_pending' => array( t('Request date'), t('Name'), t('Email') ),
 		'$no_pending' =>  t('No registrations.'),
 		'$approve' => t('Approve'),
@@ -774,6 +822,8 @@ function admin_page_users(&$a){
         '$accountexpired' => t('Account expired'),
 		
 		'$h_users' => t('Users'),
+		'$h_newuser' => t('New User'),
+		'$th_deleted' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Deleted since') ),
 		'$th_users' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'),  t('Account') ),
 
 		'$confirm_delete_multi' => t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'),
@@ -785,7 +835,11 @@ function admin_page_users(&$a){
 		'$baseurl' => $a->get_baseurl(true),
 
 		'$pending' => $pending,
+		'deleted' => $deleted,
 		'$users' => $users,
+		'$newusername'  => array('new_user_name', t("Name"), '', t("Name of the new user.")), 
+    '$newusernickname'  => array('new_user_nickname', t("Nickname"), '', t("Nickname of the new user.")), 
+    '$newuseremail'  => array('new_user_email', t("Email"), '', t("Email address of the new user.")),
 	));
 	$o .= paginate($a);
 	return $o;

mod/pubsub.php

@@ -121,11 +121,12 @@ function pubsub_post(&$a) {
 	$importer = $r[0];
 
 	$r = q("SELECT * FROM `contact` WHERE `subhub` = 1 AND `id` = %d AND `uid` = %d 
-		AND ( `rel` = %d OR `rel` = %d ) AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+		AND ( `rel` = %d OR `rel` = %d OR network = '%s' ) AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
 		intval($contact_id),
 		intval($importer['uid']),
 		intval(CONTACT_IS_SHARING),
-		intval(CONTACT_IS_FRIEND)	
+		intval(CONTACT_IS_FRIEND),
+		dbesc(NETWORK_FEED)
 	);
 
 	if(! count($r)) {

mod/tagger.php

@@ -151,10 +151,24 @@ EOT;
 		);
 	}			
 
-	if((! $blocktags) && (! stristr($item['tag'], ']' . $term . '[' ))) {
+	$term_objtype = (($item['resource-id']) ? TERM_OBJ_PHOTO : TERM_OBJ_POST );
-		q("update item set tag = '%s' where id = %d limit 1",
+        $t = q("SELECT count(tid) as tcount FROM term WHERE oid=%d AND term='%s'",
+                intval($item['id']),
+                dbesc($term)
+        );
+	if((! $blocktags) && $t[0]['tcount']==0 ) {
+		/*q("update item set tag = '%s' where id = %d limit 1",
 			dbesc($item['tag'] . (strlen($item['tag']) ? ',' : '') . '#[url=' . $a->get_baseurl() . '/search?tag=' . $term . ']'. $term . '[/url]'),
 			intval($item['id'])
+		);*/
+
+		q("INSERT INTO term (oid, otype, type, term, url, uid) VALUE (%d, %d, %d, '%s', '%s', %d)",
+		   intval($item['id']),
+		   $term_objtype,
+		   TERM_HASHTAG,
+		   dbesc($term),
+		   dbesc($a->get_baseurl() . '/search?tag=' . $term),
+		   intval($owner_uid)
 		);
 	}
 	
@@ -167,12 +181,27 @@ EOT;
 		$x = q("SELECT `blocktags` FROM `user` WHERE `uid` = %d limit 1",
 			intval($r[0]['uid'])
 		);
-		if(count($x) && !$x[0]['blocktags'] && (! stristr($r[0]['tag'], ']' . $term . '['))) {
+		$t = q("SELECT count(tid) as tcount FROM term WHERE oid=%d AND term='%s'",
+			intval($r[0]['id']),
+			dbesc($term)
+		);
+		if(count($x) && !$x[0]['blocktags'] && $t[0]['tcount']==0){
+			q("INSERT INTO term (oid, otype, type, term, url, uid) VALUE (%d, %d, %d, '%s', '%s', %d)",
+	                   intval($r[0]['id']),
+	                   $term_objtype,
+	                   TERM_HASHTAG,
+	                   dbesc($term),
+	                   dbesc($a->get_baseurl() . '/search?tag=' . $term),
+	                   intval($owner_uid)
+	                );
+		}
+
+		/*if(count($x) && !$x[0]['blocktags'] && (! stristr($r[0]['tag'], ']' . $term . '['))) {
 			q("update item set tag = '%s' where id = %d limit 1",
 				dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $a->get_baseurl() . '/search?tag=' . $term . ']'. $term . '[/url]'),
 				intval($r[0]['id'])
 			);
-		}
+		}*/
 
 	}
 		

mod/uexport.php

@@ -168,6 +168,7 @@ function uexport_account($a){
 function uexport_all(&$a) {
     
     uexport_account($a);
+	echo "\n";
 
 	$r = q("SELECT count(*) as `total` FROM `item` WHERE `uid` = %d ",
 		intval(local_user())
@@ -184,14 +185,14 @@ function uexport_all(&$a) {
 			intval($x),
 			intval(500)
 		);
-		if(count($r)) {
+		/*if(count($r)) {
 			foreach($r as $rr)
 				foreach($rr as $k => $v)
 					$item[][$k] = $v;
-		}
+		}*/
 
-		$output = array('item' => $item);
+		$output = array('item' => $r);
-		echo json_encode($output);
+		echo json_encode($output)."\n";
 	}
 
 }

object/Item.php

@@ -158,25 +158,6 @@ class Item extends BaseObject {
 		$hashtags = array();
 		$mentions = array();
 
-		if (!get_config('system','suppress_tags')) {
-			$taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`",
-					intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION));
-
-			foreach($taglist as $tag) {
-
-				if ($tag["url"] == "")
-					$tag["url"] = $searchpath.strtolower($tag["term"]);
-
-				if ($tag["type"] == TERM_HASHTAG) {
-					$hashtags[] = "#<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
-					$prefix = "#";
-				} elseif ($tag["type"] == TERM_MENTION) {
-					$mentions[] = "@<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
-					$prefix = "@";
-				}
-				$tags[] = $prefix."<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
-			}
-		}
 
 		/*foreach(explode(',',$item['tag']) as $tag){
 			$tag = trim($tag);
@@ -291,9 +272,9 @@ class Item extends BaseObject {
 			'template' => $this->get_template(),
 
 			'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
-			'tags' => $tags,
+			'tags' => $item['tags'],
-			'hashtags' => $hashtags,
+			'hashtags' => $item['hashtags'],
-			'mentions' => $mentions,
+			'mentions' => $item['mentions'],
 			'txt_cats' => t('Categories:'),
 			'txt_folders' => t('Filed under:'),
 			'has_cats' => ((count($categories)) ? 'true' : ''),

view/ca/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: 2013-05-13 00:03-0700\n"
+"POT-Creation-Date: 2013-06-12 00:01-0700\n"
-"PO-Revision-Date: 2013-05-15 21:23+0000\n"
+"PO-Revision-Date: 2013-06-26 10:11+0000\n"
 "Last-Translator: Rafael GARAU <transifex@macadamia.es>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/friendica/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
 #: ../../include/nav.php:77 ../../mod/profperm.php:103
 #: ../../mod/newmember.php:32 ../../view/theme/diabook/theme.php:88
-#: ../../boot.php:1946
+#: ../../boot.php:1947
 msgid "Profile"
 msgstr "Perfil"
 
@@ -31,7 +31,7 @@ msgid "Full Name:"
 msgstr "Nom Complet:"
 
 #: ../../include/profile_advanced.php:17 ../../mod/directory.php:136
-#: ../../boot.php:1486
+#: ../../boot.php:1487
 msgid "Gender:"
 msgstr "Gènere:"
 
@@ -52,7 +52,7 @@ msgid "Age:"
 msgstr "Edat:"
 
 #: ../../include/profile_advanced.php:37 ../../mod/directory.php:138
-#: ../../boot.php:1489
+#: ../../boot.php:1490
 msgid "Status:"
 msgstr "Estatus:"
 
@@ -66,7 +66,7 @@ msgid "Sexual Preference:"
 msgstr "Preferència Sexual:"
 
 #: ../../include/profile_advanced.php:48 ../../mod/directory.php:140
-#: ../../boot.php:1491
+#: ../../boot.php:1492
 msgid "Homepage:"
 msgstr "Pàgina web:"
 
@@ -402,6 +402,26 @@ msgstr "Editat Contacte"
 msgid "Send PM"
 msgstr "Enviar Missatge Privat"
 
+#: ../../include/bbcode.php:210 ../../include/bbcode.php:550
+#: ../../include/bbcode.php:551
+msgid "Image/photo"
+msgstr "Imatge/foto"
+
+#: ../../include/bbcode.php:272
+#, php-format
+msgid ""
+"<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a "
+"href=\"%s\" target=\"external-link\">post</a>"
+msgstr "<span><a href=\"%s\" target=\"external-link\">%s</a> va escriure el següent <a href=\"%s\" target=\"external-link\">post</a>"
+
+#: ../../include/bbcode.php:514 ../../include/bbcode.php:534
+msgid "$1 wrote:"
+msgstr "$1 va escriure:"
+
+#: ../../include/bbcode.php:559 ../../include/bbcode.php:560
+msgid "Encrypted content"
+msgstr "Encriptar contingut"
+
 #: ../../include/acl_selectors.php:325
 msgid "Visible to everybody"
 msgstr "Visible per tothom"
@@ -449,7 +469,7 @@ msgid "Finishes:"
 msgstr "Acaba:"
 
 #: ../../include/bb2diaspora.php:415 ../../include/event.php:40
-#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1484
+#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1485
 msgid "Location:"
 msgstr "Ubicació:"
 
@@ -576,7 +596,7 @@ msgstr "ERROR IMPORTANT: La generació de claus de seguretat ha fallat."
 msgid "An error occurred during registration. Please try again."
 msgstr "Un error ha succeït durant el registre. Intenta-ho de nou."
 
-#: ../../include/user.php:237 ../../include/text.php:1594
+#: ../../include/user.php:237 ../../include/text.php:1596
 msgid "default"
 msgstr "per defecte"
 
@@ -703,7 +723,7 @@ msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr "Exemple: bob@example.com, http://example.com/barbara"
 
 #: ../../include/contact_widgets.php:9 ../../mod/suggest.php:88
-#: ../../mod/match.php:58 ../../boot.php:1416
+#: ../../mod/match.php:58 ../../boot.php:1417
 msgid "Connect"
 msgstr "Connexió"
 
@@ -780,7 +800,7 @@ msgstr[0] "%d contacte en comú"
 msgstr[1] "%d contactes en comú"
 
 #: ../../include/contact_widgets.php:204 ../../mod/content.php:629
-#: ../../object/Item.php:365 ../../boot.php:670
+#: ../../object/Item.php:365 ../../boot.php:671
 msgid "show more"
 msgstr "Mostrar més"
 
@@ -788,25 +808,6 @@ msgstr "Mostrar més"
 msgid " on Last.fm"
 msgstr " a Last.fm"
 
-#: ../../include/bbcode.php:210 ../../include/bbcode.php:549
-msgid "Image/photo"
-msgstr "Imatge/foto"
-
-#: ../../include/bbcode.php:272
-#, php-format
-msgid ""
-"<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a "
-"href=\"%s\" target=\"external-link\">post</a>"
-msgstr "<span><a href=\"%s\" target=\"external-link\">%s</a> va escriure el següent <a href=\"%s\" target=\"external-link\">post</a>"
-
-#: ../../include/bbcode.php:514 ../../include/bbcode.php:534
-msgid "$1 wrote:"
-msgstr "$1 va escriure:"
-
-#: ../../include/bbcode.php:557 ../../include/bbcode.php:558
-msgid "Encrypted content"
-msgstr "Encriptar contingut"
-
 #: ../../include/network.php:877
 msgid "view full size"
 msgstr "Veure'l a mida completa"
@@ -925,7 +926,7 @@ msgstr "%1$s és ara amic amb %2$s"
 msgid "Sharing notification from Diaspora network"
 msgstr "Compartint la notificació de la xarxa Diàspora"
 
-#: ../../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
@@ -1359,123 +1360,123 @@ msgstr "tranquil"
 msgid "surprised"
 msgstr "sorprès"
 
-#: ../../include/text.php:1161
+#: ../../include/text.php:1163
 msgid "Monday"
 msgstr "Dilluns"
 
-#: ../../include/text.php:1161
+#: ../../include/text.php:1163
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: ../../include/text.php:1161
+#: ../../include/text.php:1163
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: ../../include/text.php:1161
+#: ../../include/text.php:1163
 msgid "Thursday"
 msgstr "Dijous"
 
-#: ../../include/text.php:1161
+#: ../../include/text.php:1163
 msgid "Friday"
 msgstr "Divendres"
 
-#: ../../include/text.php:1161
+#: ../../include/text.php:1163
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: ../../include/text.php:1161
+#: ../../include/text.php:1163
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "January"
 msgstr "Gener"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "February"
 msgstr "Febrer"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "March"
 msgstr "Març"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "April"
 msgstr "Abril"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "May"
 msgstr "Maig"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "June"
 msgstr "Juny"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "July"
 msgstr "Juliol"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "August"
 msgstr "Agost"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "September"
 msgstr "Setembre"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "October"
 msgstr "Octubre"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "November"
 msgstr "Novembre"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1167
 msgid "December"
 msgstr "Desembre"
 
-#: ../../include/text.php:1321 ../../mod/videos.php:301
+#: ../../include/text.php:1323 ../../mod/videos.php:301
 msgid "View Video"
 msgstr "Veure Video"
 
-#: ../../include/text.php:1353
+#: ../../include/text.php:1355
 msgid "bytes"
 msgstr "bytes"
 
-#: ../../include/text.php:1377 ../../include/text.php:1389
+#: ../../include/text.php:1379 ../../include/text.php:1391
 msgid "Click to open/close"
 msgstr "Clicar per a obrir/tancar"
 
-#: ../../include/text.php:1551 ../../mod/events.php:335
+#: ../../include/text.php:1553 ../../mod/events.php:335
 msgid "link to source"
 msgstr "Enllaç al origen"
 
-#: ../../include/text.php:1606
+#: ../../include/text.php:1608
 msgid "Select an alternate language"
 msgstr "Sel·lecciona un idioma alternatiu"
 
-#: ../../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 "esdeveniment"
 
-#: ../../include/text.php:1862
+#: ../../include/text.php:1864
 msgid "activity"
 msgstr "activitat"
 
-#: ../../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"
 msgstr[0] ""
 msgstr[1] "comentari"
 
-#: ../../include/text.php:1865
+#: ../../include/text.php:1867
 msgid "post"
 msgstr "missatge"
 
-#: ../../include/text.php:2020
+#: ../../include/text.php:2022
 msgid "Item filed"
 msgstr "Element arxivat"
 
@@ -1998,7 +1999,7 @@ msgstr "Res nou aquí"
 msgid "Clear notifications"
 msgstr "Neteja notificacions"
 
-#: ../../include/nav.php:73 ../../boot.php:1135
+#: ../../include/nav.php:73 ../../boot.php:1136
 msgid "Logout"
 msgstr "Sortir"
 
@@ -2006,7 +2007,7 @@ msgstr "Sortir"
 msgid "End this session"
 msgstr "Termina sessió"
 
-#: ../../include/nav.php:76 ../../boot.php:1939
+#: ../../include/nav.php:76 ../../boot.php:1940
 msgid "Status"
 msgstr "Estatus"
 
@@ -2020,7 +2021,7 @@ msgid "Your profile page"
 msgstr "La seva pàgina de perfil"
 
 #: ../../include/nav.php:78 ../../mod/fbrowser.php:25
-#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1953
+#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1954
 msgid "Photos"
 msgstr "Fotos"
 
@@ -2029,7 +2030,7 @@ msgid "Your photos"
 msgstr "Les seves fotos"
 
 #: ../../include/nav.php:79 ../../mod/events.php:370
-#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1970
+#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1971
 msgid "Events"
 msgstr "Esdeveniments"
 
@@ -2045,7 +2046,7 @@ msgstr "Notes personals"
 msgid "Your personal photos"
 msgstr "Les seves fotos personals"
 
-#: ../../include/nav.php:91 ../../boot.php:1136
+#: ../../include/nav.php:91 ../../boot.php:1137
 msgid "Login"
 msgstr "Identifica't"
 
@@ -2062,7 +2063,7 @@ msgstr "Inici"
 msgid "Home Page"
 msgstr "Pàgina d'Inici"
 
-#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1111
+#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1112
 msgid "Register"
 msgstr "Registrar"
 
@@ -2191,7 +2192,7 @@ msgstr "Ajustos"
 msgid "Account settings"
 msgstr "Configuració del compte"
 
-#: ../../include/nav.php:169 ../../boot.php:1438
+#: ../../include/nav.php:169 ../../boot.php:1439
 msgid "Profiles"
 msgstr "Perfils"
 
@@ -2590,23 +2591,23 @@ msgstr "Edat:"
 msgid "Edit/Manage Profiles"
 msgstr "Editar/Gestionar Perfils"
 
-#: ../../mod/profiles.php:726 ../../boot.php:1444 ../../boot.php:1470
+#: ../../mod/profiles.php:726 ../../boot.php:1445 ../../boot.php:1471
 msgid "Change profile photo"
 msgstr "Canviar la foto del perfil"
 
-#: ../../mod/profiles.php:727 ../../boot.php:1445
+#: ../../mod/profiles.php:727 ../../boot.php:1446
 msgid "Create New Profile"
 msgstr "Crear un Nou Perfil"
 
-#: ../../mod/profiles.php:738 ../../boot.php:1455
+#: ../../mod/profiles.php:738 ../../boot.php:1456
 msgid "Profile Image"
 msgstr "Imatge del Perfil"
 
-#: ../../mod/profiles.php:740 ../../boot.php:1458
+#: ../../mod/profiles.php:740 ../../boot.php:1459
 msgid "visible to everybody"
 msgstr "Visible per tothom"
 
-#: ../../mod/profiles.php:741 ../../boot.php:1459
+#: ../../mod/profiles.php:741 ../../boot.php:1460
 msgid "Edit visibility"
 msgstr "Editar visibilitat"
 
@@ -2634,7 +2635,7 @@ msgstr "Visible Per"
 msgid "All Contacts (with secure profile access)"
 msgstr "Tots els Contactes (amb accés segur al perfil)"
 
-#: ../../mod/notes.php:44 ../../boot.php:1977
+#: ../../mod/notes.php:44 ../../boot.php:1978
 msgid "Personal Notes"
 msgstr "Notes Personals"
 
@@ -5576,7 +5577,7 @@ msgid ""
 "Password reset failed."
 msgstr "La sol·licitut no pot ser verificada. (Hauries de presentar-la abans). Restabliment de contrasenya fracassat."
 
-#: ../../mod/lostpass.php:84 ../../boot.php:1150
+#: ../../mod/lostpass.php:84 ../../boot.php:1151
 msgid "Password Reset"
 msgstr "Restabliment de Contrasenya"
 
@@ -5962,7 +5963,7 @@ msgstr "No més notificacions d'inici."
 msgid "Home Notifications"
 msgstr "Notificacions d'Inici"
 
-#: ../../mod/photos.php:51 ../../boot.php:1956
+#: ../../mod/photos.php:51 ../../boot.php:1957
 msgid "Photo Albums"
 msgstr "Àlbum de Fotos"
 
@@ -6159,7 +6160,7 @@ msgstr "Aquest ets tu"
 
 #: ../../mod/photos.php:1551 ../../mod/photos.php:1595
 #: ../../mod/photos.php:1678 ../../mod/content.php:732
-#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:669
+#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:670
 msgid "Comment"
 msgstr "Comentari"
 
@@ -6348,7 +6349,7 @@ msgid ""
 " features and resources."
 msgstr "A les nostres pàgines <strong>d'ajuda</strong> es poden consultar detalls sobre les característiques d'altres programes i recursos."
 
-#: ../../mod/profile.php:21 ../../boot.php:1324
+#: ../../mod/profile.php:21 ../../boot.php:1325
 msgid "Requested profile is not available."
 msgstr "El perfil sol·licitat no està disponible."
 
@@ -6357,8 +6358,8 @@ msgid "Tips for New Members"
 msgstr "Consells per a nous membres"
 
 #: ../../mod/install.php:117
-msgid "Friendica Social Communications Server - Setup"
+msgid "Friendica Communications Server - Setup"
-msgstr "Friendica Social Communications Server - Ajustos"
+msgstr "Friendica Servidor de Comunicacions - Configuració"
 
 #: ../../mod/install.php:123
 msgid "Could not connect to database."
@@ -6988,128 +6989,128 @@ msgstr "mida del text en Areas de Text"
 msgid "toggle mobile"
 msgstr "canviar a mòbil"
 
-#: ../../boot.php:668
+#: ../../boot.php:669
 msgid "Delete this item?"
 msgstr "Esborrar aquest element?"
 
-#: ../../boot.php:671
+#: ../../boot.php:672
 msgid "show fewer"
 msgstr "Mostrar menys"
 
-#: ../../boot.php:998
+#: ../../boot.php:999
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Actualització de %s fracassà. Mira el registre d'errors."
 
-#: ../../boot.php:1000
+#: ../../boot.php:1001
 #, php-format
 msgid "Update Error at %s"
 msgstr "Error d'actualització en %s"
 
-#: ../../boot.php:1110
+#: ../../boot.php:1111
 msgid "Create a New Account"
 msgstr "Crear un Nou Compte"
 
-#: ../../boot.php:1138
+#: ../../boot.php:1139
 msgid "Nickname or Email address: "
 msgstr "Àlies o Adreça de correu:"
 
-#: ../../boot.php:1139
+#: ../../boot.php:1140
 msgid "Password: "
 msgstr "Contrasenya:"
 
-#: ../../boot.php:1140
+#: ../../boot.php:1141
 msgid "Remember me"
 msgstr "Recorda'm ho"
 
-#: ../../boot.php:1143
+#: ../../boot.php:1144
 msgid "Or login using OpenID: "
 msgstr "O accedixi emprant OpenID:"
 
-#: ../../boot.php:1149
+#: ../../boot.php:1150
 msgid "Forgot your password?"
 msgstr "Oblidà la contrasenya?"
 
-#: ../../boot.php:1152
+#: ../../boot.php:1153
 msgid "Website Terms of Service"
 msgstr "Termes del Servei al Llocweb"
 
-#: ../../boot.php:1153
+#: ../../boot.php:1154
 msgid "terms of service"
 msgstr "termes del servei"
 
-#: ../../boot.php:1155
+#: ../../boot.php:1156
 msgid "Website Privacy Policy"
 msgstr "Política de Privacitat al Llocweb"
 
-#: ../../boot.php:1156
+#: ../../boot.php:1157
 msgid "privacy policy"
 msgstr "política de privacitat"
 
-#: ../../boot.php:1285
+#: ../../boot.php:1286
 msgid "Requested account is not available."
 msgstr "El compte sol·licitat no esta disponible"
 
-#: ../../boot.php:1364 ../../boot.php:1468
+#: ../../boot.php:1365 ../../boot.php:1469
 msgid "Edit profile"
 msgstr "Editar perfil"
 
-#: ../../boot.php:1430
+#: ../../boot.php:1431
 msgid "Message"
 msgstr "Missatge"
 
-#: ../../boot.php:1438
+#: ../../boot.php:1439
 msgid "Manage/edit profiles"
 msgstr "Gestiona/edita perfils"
 
-#: ../../boot.php:1567 ../../boot.php:1653
+#: ../../boot.php:1568 ../../boot.php:1654
 msgid "g A l F d"
 msgstr "g A l F d"
 
-#: ../../boot.php:1568 ../../boot.php:1654
+#: ../../boot.php:1569 ../../boot.php:1655
 msgid "F d"
 msgstr "F d"
 
-#: ../../boot.php:1613 ../../boot.php:1694
+#: ../../boot.php:1614 ../../boot.php:1695
 msgid "[today]"
 msgstr "[avui]"
 
-#: ../../boot.php:1625
+#: ../../boot.php:1626
 msgid "Birthday Reminders"
 msgstr "Recordatori d'Aniversaris"
 
-#: ../../boot.php:1626
+#: ../../boot.php:1627
 msgid "Birthdays this week:"
 msgstr "Aniversari aquesta setmana"
 
-#: ../../boot.php:1687
+#: ../../boot.php:1688
 msgid "[No description]"
 msgstr "[sense descripció]"
 
-#: ../../boot.php:1705
+#: ../../boot.php:1706
 msgid "Event Reminders"
 msgstr "Recordatori d'Esdeveniments"
 
-#: ../../boot.php:1706
+#: ../../boot.php:1707
 msgid "Events this week:"
 msgstr "Esdeveniments aquesta setmana"
 
-#: ../../boot.php:1942
+#: ../../boot.php:1943
 msgid "Status Messages and Posts"
 msgstr "Missatges i Enviaments d'Estatus"
 
-#: ../../boot.php:1949
+#: ../../boot.php:1950
 msgid "Profile Details"
 msgstr "Detalls del Perfil"
 
-#: ../../boot.php:1960 ../../boot.php:1963
+#: ../../boot.php:1961 ../../boot.php:1964
 msgid "Videos"
 msgstr "Vídeos"
 
-#: ../../boot.php:1973
+#: ../../boot.php:1974
 msgid "Events and Calendar"
 msgstr "Esdeveniments i Calendari"
 
-#: ../../boot.php:1980
+#: ../../boot.php:1981
 msgid "Only You Can See This"
 msgstr "Només ho pots veure tu"

view/ca/strings.php

@@ -98,6 +98,10 @@ $a->strings["View Photos"] = "Veure Fotos";
 $a->strings["Network Posts"] = "Enviaments a la Xarxa";
 $a->strings["Edit Contact"] = "Editat Contacte";
 $a->strings["Send PM"] = "Enviar Missatge Privat";
+$a->strings["Image/photo"] = "Imatge/foto";
+$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> va escriure el següent <a href=\"%s\" target=\"external-link\">post</a>";
+$a->strings["$1 wrote:"] = "$1 va escriure:";
+$a->strings["Encrypted content"] = "Encriptar contingut";
 $a->strings["Visible to everybody"] = "Visible per tothom";
 $a->strings["show"] = "mostra";
 $a->strings["don't show"] = "no mostris";
@@ -191,10 +195,6 @@ $a->strings["%d contact in common"] = array(
 );
 $a->strings["show more"] = "Mostrar més";
 $a->strings[" on Last.fm"] = " a Last.fm";
-$a->strings["Image/photo"] = "Imatge/foto";
-$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> va escriure el següent <a href=\"%s\" target=\"external-link\">post</a>";
-$a->strings["$1 wrote:"] = "$1 va escriure:";
-$a->strings["Encrypted content"] = "Encriptar contingut";
 $a->strings["view full size"] = "Veure'l a mida completa";
 $a->strings["Miscellaneous"] = "Miscel·lania";
 $a->strings["year"] = "any";
@@ -1478,7 +1478,7 @@ $a->strings["Go to the Help Section"] = "Anar a la secció d'Ajuda";
 $a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "A les nostres pàgines <strong>d'ajuda</strong> es poden consultar detalls sobre les característiques d'altres programes i recursos.";
 $a->strings["Requested profile is not available."] = "El perfil sol·licitat no està disponible.";
 $a->strings["Tips for New Members"] = "Consells per a nous membres";
-$a->strings["Friendica Social Communications Server - Setup"] = "Friendica Social Communications Server - Ajustos";
+$a->strings["Friendica Communications Server - Setup"] = "Friendica Servidor de Comunicacions - Configuració";
 $a->strings["Could not connect to database."] = "No puc connectar a la base de dades.";
 $a->strings["Could not create table."] = "No puc creat taula.";
 $a->strings["Your Friendica site database has been installed."] = "La base de dades del teu lloc Friendica ha estat instal·lada.";

view/ca/update_fail_eml.tpl

@@ -0,0 +1,11 @@
+Cheic, 
+Jo soc a $sitename.   
+Els desenvolupadors de Friendica han alliberat una actualització $update recentment, 
+però quan vaig intentar actualitzar, quelcom terrible va anar malament.  
+Això necessita ser reparat aviat i no ho puc fer sol. Per favor, contacta amb 
+un desenvolupador de Friendica si no em pots ajudar per tu mateix. La meva base de dades es pot corrompre. 
+
+El missatge d'error va ser '$error'.   
+
+Ho lamento. 
+El teu servidor friendica a $siteurl

view/cs/strings.php

@@ -277,12 +277,12 @@ $a->strings["Ability to dislike posts/comments"] = "Možnost označit příspěv
 $a->strings["Star Posts"] = "Příspěvky s hvězdou";
 $a->strings["Ability to mark special posts with a star indicator"] = "Možnost označit příspěvky s indikátorem hvězdy";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Nelze nalézt záznam v DNS pro databázový server '%s'";
+$a->strings["newer"] = "novější";
+$a->strings["older"] = "starší";
 $a->strings["prev"] = "předchozí";
 $a->strings["first"] = "první";
 $a->strings["last"] = "poslední";
 $a->strings["next"] = "další";
-$a->strings["newer"] = "novější";
-$a->strings["older"] = "starší";
 $a->strings["No contacts"] = "Žádné kontakty";
 $a->strings["%d Contact"] = array(
 	0 => "%d kontakt",
@@ -879,73 +879,13 @@ $a->strings["No contacts in common."] = "Žádné společné kontakty.";
 $a->strings["You must be logged in to use addons. "] = "Musíte být přihlášení pro použití rozšíření.";
 $a->strings["Applications"] = "Aplikace";
 $a->strings["No installed applications."] = "Žádné nainstalované aplikace.";
-$a->strings["Could not access contact record."] = "Nelze získat přístup k záznamu kontaktu.";
+$a->strings["Import"] = "Import";
-$a->strings["Could not locate selected profile."] = "Nelze nalézt vybraný profil.";
+$a->strings["Move account"] = "Přesunout účet";
-$a->strings["Contact updated."] = "Kontakt aktualizován.";
+$a->strings["You can import an account from another Friendica server."] = "Můžete importovat účet z jiného Friendica serveru.";
-$a->strings["Failed to update contact record."] = "Nepodařilo se aktualizovat kontakt.";
+$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."] = "Musíte exportovat svůj účet na sterém serveru a nahrát ho zde. My následně vytvoříme Váš původní účet zde včetně všech kontaktů. Zároveň se pokusíme informovat všechny Vaše přátele, že jste se sem přestěhovali.";
-$a->strings["Contact has been blocked"] = "Kontakt byl zablokován";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "Tato funkčnost je experimentální. Nemůžeme importovat kontakty z OSStatus sítí (statusnet/identi.ca) nebo z Diaspory";
-$a->strings["Contact has been unblocked"] = "Kontakt byl odblokován";
+$a->strings["Account file"] = "Soubor s účtem";
-$a->strings["Contact has been ignored"] = "Kontakt bude ignorován";
+$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "K exportu Vašeho účtu, jděte do \"Nastavení->Export vašich osobních dat\" a zvolte \" Export účtu\"";
-$a->strings["Contact has been unignored"] = "Kontakt přestal být ignorován";
-$a->strings["Contact has been archived"] = "Kontakt byl archivován";
-$a->strings["Contact has been unarchived"] = "Kontakt byl vrácen z archívu.";
-$a->strings["Do you really want to delete this contact?"] = "Opravdu chcete smazat tento kontakt?";
-$a->strings["Contact has been removed."] = "Kontakt byl odstraněn.";
-$a->strings["You are mutual friends with %s"] = "Jste vzájemní přátelé s uživatelem %s";
-$a->strings["You are sharing with %s"] = "Sdílíte s uživatelem %s";
-$a->strings["%s is sharing with you"] = "uživatel %s sdílí s vámi";
-$a->strings["Private communications are not available for this contact."] = "Soukromá komunikace není dostupná pro tento kontakt.";
-$a->strings["(Update was successful)"] = "(Aktualizace byla úspěšná)";
-$a->strings["(Update was not successful)"] = "(Aktualizace nebyla úspěšná)";
-$a->strings["Suggest friends"] = "Navrhněte přátelé";
-$a->strings["Network type: %s"] = "Typ sítě: %s";
-$a->strings["View all contacts"] = "Zobrazit všechny kontakty";
-$a->strings["Toggle Blocked status"] = "Přepnout stav Blokováno";
-$a->strings["Unignore"] = "Přestat ignorovat";
-$a->strings["Ignore"] = "Ignorovat";
-$a->strings["Toggle Ignored status"] = "Přepnout stav Ignorováno";
-$a->strings["Unarchive"] = "Vrátit z archívu";
-$a->strings["Archive"] = "Archivovat";
-$a->strings["Toggle Archive status"] = "Přepnout stav Archivováno";
-$a->strings["Repair"] = "Opravit";
-$a->strings["Advanced Contact Settings"] = "Pokročilé nastavení kontaktu";
-$a->strings["Communications lost with this contact!"] = "Komunikace s tímto kontaktem byla ztracena!";
-$a->strings["Contact Editor"] = "Editor kontaktu";
-$a->strings["Profile Visibility"] = "Viditelnost profilu";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Vyberte prosím profil, který chcete zobrazit %s při zabezpečeném prohlížení vašeho profilu.";
-$a->strings["Contact Information / Notes"] = "Kontaktní informace / poznámky";
-$a->strings["Edit contact notes"] = "Editovat poznámky kontaktu";
-$a->strings["Block/Unblock contact"] = "Blokovat / Odblokovat kontakt";
-$a->strings["Ignore contact"] = "Ignorovat kontakt";
-$a->strings["Repair URL settings"] = "Opravit nastavení adresy URL ";
-$a->strings["View conversations"] = "Zobrazit konverzace";
-$a->strings["Delete contact"] = "Odstranit kontakt";
-$a->strings["Last update:"] = "Poslední aktualizace:";
-$a->strings["Update public posts"] = "Aktualizovat veřejné příspěvky";
-$a->strings["Currently blocked"] = "V současnosti zablokováno";
-$a->strings["Currently ignored"] = "V současnosti ignorováno";
-$a->strings["Currently archived"] = "Aktuálně archivován";
-$a->strings["Hide this contact from others"] = "Skrýt tento kontakt před ostatními";
-$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Odpovědi/Libí se na Vaše veřejné příspěvky <strong>mohou být</strong> stále viditelné";
-$a->strings["Suggestions"] = "Doporučení";
-$a->strings["Suggest potential friends"] = "Navrhnout potenciální přátele";
-$a->strings["All Contacts"] = "Všechny kontakty";
-$a->strings["Show all contacts"] = "Zobrazit všechny kontakty";
-$a->strings["Unblocked"] = "Odblokován";
-$a->strings["Only show unblocked contacts"] = "Zobrazit pouze neblokované kontakty";
-$a->strings["Blocked"] = "Blokován";
-$a->strings["Only show blocked contacts"] = "Zobrazit pouze blokované kontakty";
-$a->strings["Ignored"] = "Ignorován";
-$a->strings["Only show ignored contacts"] = "Zobrazit pouze ignorované kontakty";
-$a->strings["Archived"] = "Archivován";
-$a->strings["Only show archived contacts"] = "Zobrazit pouze archivované kontakty";
-$a->strings["Hidden"] = "Skrytý";
-$a->strings["Only show hidden contacts"] = "Zobrazit pouze skryté kontakty";
-$a->strings["Mutual Friendship"] = "Vzájemné přátelství";
-$a->strings["is a fan of yours"] = "je Váš fanoušek";
-$a->strings["you are a fan of"] = "jste fanouškem";
-$a->strings["Search your contacts"] = "Prohledat Vaše kontakty";
-$a->strings["Finding: "] = "Zjištění: ";
 $a->strings["everybody"] = "Žádost o připojení selhala nebo byla zrušena.";
 $a->strings["Additional features"] = "Další funkčnosti";
 $a->strings["Display settings"] = "Nastavení zobrazení";
@@ -1160,6 +1100,7 @@ $a->strings["Unable to resolve your name at the provided location."] = "Nepodař
 $a->strings["You have already introduced yourself here."] = "Již jste se zde zavedli.";
 $a->strings["Apparently you are already friends with %s."] = "Zřejmě jste již přátelé se %s.";
 $a->strings["Invalid profile URL."] = "Neplatné URL profilu.";
+$a->strings["Failed to update contact record."] = "Nepodařilo se aktualizovat kontakt.";
 $a->strings["Your introduction has been sent."] = "Vaše žádost o propojení byla odeslána.";
 $a->strings["Please login to confirm introduction."] = "Prosím přihlašte se k potvrzení žádosti o propojení.";
 $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Jste přihlášeni pod nesprávnou identitou  Prosím, přihlaste se do <strong>tohoto</strong> profilu.";
@@ -1182,6 +1123,7 @@ $a->strings["Submit Request"] = "Odeslat žádost";
 $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s následuje %3\$s uživatele %2\$s";
 $a->strings["Global Directory"] = "Globální adresář";
 $a->strings["Find on this site"] = "Nalézt na tomto webu";
+$a->strings["Finding: "] = "Zjištění: ";
 $a->strings["Site Directory"] = "Adresář serveru";
 $a->strings["Gender: "] = "Pohlaví: ";
 $a->strings["No entries (some entries may be hidden)."] = "Žádné záznamy (některé položky mohou být skryty).";
@@ -1223,13 +1165,6 @@ $a->strings["Export your account info and contacts. Use this to make a backup of
 $a->strings["Export all"] = "Exportovat vše";
 $a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Exportujte své informace k účtu, kontakty a vše své položky jako json. To může být velmi velký soubor a může to zabrat spoustu času. Tuto funkci použijte pro úplnou zálohu svého účtu(fotografie se neexportují)";
 $a->strings["- select -"] = "- vyber -";
-$a->strings["Import"] = "Import";
-$a->strings["Move account"] = "Přesunout účet";
-$a->strings["You can import an account from another Friendica server."] = "Můžete importovat účet z jiného Friendica serveru.";
-$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."] = "Musíte exportovat svůj účet na sterém serveru a nahrát ho zde. My následně vytvoříme Váš původní účet zde včetně všech kontaktů. Zároveň se pokusíme informovat všechny Vaše přátele, že jste se sem přestěhovali.";
-$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "Tato funkčnost je experimentální. Nemůžeme importovat kontakty z OSStatus sítí (statusnet/identi.ca) nebo z Diaspory";
-$a->strings["Account file"] = "Soubor s účtem";
-$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "K exportu Vašeho účtu, jděte do \"Nastavení->Export vašich osobních dat\" a zvolte \" Export účtu\"";
 $a->strings["[Embedded content - reload page to view]"] = "[Vložený obsah - obnovení stránky pro zobrazení]";
 $a->strings["Contact added"] = "Kontakt přidán";
 $a->strings["This is Friendica, version"] = "Toto je Friendica, verze";
@@ -1252,6 +1187,7 @@ $a->strings["Group removed."] = "Skupina odstraněna. ";
 $a->strings["Unable to remove group."] = "Nelze odstranit skupinu.";
 $a->strings["Group Editor"] = "Editor skupin";
 $a->strings["Members"] = "Členové";
+$a->strings["All Contacts"] = "Všechny kontakty";
 $a->strings["No profile"] = "Žádný profil";
 $a->strings["Help:"] = "Nápověda:";
 $a->strings["Not Found"] = "Nenalezen";
@@ -1375,12 +1311,14 @@ $a->strings["Private messages to this person are at risk of public disclosure."]
 $a->strings["Invalid contact."] = "Neplatný kontakt.";
 $a->strings["Invalid request identifier."] = "Neplatný identifikátor požadavku.";
 $a->strings["Discard"] = "Odstranit";
+$a->strings["Ignore"] = "Ignorovat";
 $a->strings["System"] = "Systém";
 $a->strings["Show Ignored Requests"] = "Zobrazit ignorované žádosti";
 $a->strings["Hide Ignored Requests"] = "Skrýt ignorované žádosti";
 $a->strings["Notification type: "] = "Typ oznámení: ";
 $a->strings["Friend Suggestion"] = "Návrh přátelství";
 $a->strings["suggested by %s"] = "navrhl %s";
+$a->strings["Hide this contact from others"] = "Skrýt tento kontakt před ostatními";
 $a->strings["Post a new friend activity"] = "Zveřejnit aktivitu nového přítele.";
 $a->strings["if applicable"] = "je-li použitelné";
 $a->strings["Claims to be known to you: "] = "Vaši údajní známí: ";
@@ -1551,6 +1489,68 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ
 $a->strings["Errors encountered creating database tables."] = "Při vytváření databázových tabulek došlo k chybám.";
 $a->strings["<h1>What next</h1>"] = "<h1>Co dál<h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "Webový instalátor musí být schopen vytvořit soubor s názvem \".htconfig.php\" v hlavním adresáři Vašeho webového serveru ale nyní mu to není umožněno.";
+$a->strings["Could not access contact record."] = "Nelze získat přístup k záznamu kontaktu.";
+$a->strings["Could not locate selected profile."] = "Nelze nalézt vybraný profil.";
+$a->strings["Contact updated."] = "Kontakt aktualizován.";
+$a->strings["Contact has been blocked"] = "Kontakt byl zablokován";
+$a->strings["Contact has been unblocked"] = "Kontakt byl odblokován";
+$a->strings["Contact has been ignored"] = "Kontakt bude ignorován";
+$a->strings["Contact has been unignored"] = "Kontakt přestal být ignorován";
+$a->strings["Contact has been archived"] = "Kontakt byl archivován";
+$a->strings["Contact has been unarchived"] = "Kontakt byl vrácen z archívu.";
+$a->strings["Do you really want to delete this contact?"] = "Opravdu chcete smazat tento kontakt?";
+$a->strings["Contact has been removed."] = "Kontakt byl odstraněn.";
+$a->strings["You are mutual friends with %s"] = "Jste vzájemní přátelé s uživatelem %s";
+$a->strings["You are sharing with %s"] = "Sdílíte s uživatelem %s";
+$a->strings["%s is sharing with you"] = "uživatel %s sdílí s vámi";
+$a->strings["Private communications are not available for this contact."] = "Soukromá komunikace není dostupná pro tento kontakt.";
+$a->strings["(Update was successful)"] = "(Aktualizace byla úspěšná)";
+$a->strings["(Update was not successful)"] = "(Aktualizace nebyla úspěšná)";
+$a->strings["Suggest friends"] = "Navrhněte přátelé";
+$a->strings["Network type: %s"] = "Typ sítě: %s";
+$a->strings["View all contacts"] = "Zobrazit všechny kontakty";
+$a->strings["Toggle Blocked status"] = "Přepnout stav Blokováno";
+$a->strings["Unignore"] = "Přestat ignorovat";
+$a->strings["Toggle Ignored status"] = "Přepnout stav Ignorováno";
+$a->strings["Unarchive"] = "Vrátit z archívu";
+$a->strings["Archive"] = "Archivovat";
+$a->strings["Toggle Archive status"] = "Přepnout stav Archivováno";
+$a->strings["Repair"] = "Opravit";
+$a->strings["Advanced Contact Settings"] = "Pokročilé nastavení kontaktu";
+$a->strings["Communications lost with this contact!"] = "Komunikace s tímto kontaktem byla ztracena!";
+$a->strings["Contact Editor"] = "Editor kontaktu";
+$a->strings["Profile Visibility"] = "Viditelnost profilu";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Vyberte prosím profil, který chcete zobrazit %s při zabezpečeném prohlížení vašeho profilu.";
+$a->strings["Contact Information / Notes"] = "Kontaktní informace / poznámky";
+$a->strings["Edit contact notes"] = "Editovat poznámky kontaktu";
+$a->strings["Block/Unblock contact"] = "Blokovat / Odblokovat kontakt";
+$a->strings["Ignore contact"] = "Ignorovat kontakt";
+$a->strings["Repair URL settings"] = "Opravit nastavení adresy URL ";
+$a->strings["View conversations"] = "Zobrazit konverzace";
+$a->strings["Delete contact"] = "Odstranit kontakt";
+$a->strings["Last update:"] = "Poslední aktualizace:";
+$a->strings["Update public posts"] = "Aktualizovat veřejné příspěvky";
+$a->strings["Currently blocked"] = "V současnosti zablokováno";
+$a->strings["Currently ignored"] = "V současnosti ignorováno";
+$a->strings["Currently archived"] = "Aktuálně archivován";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Odpovědi/Libí se na Vaše veřejné příspěvky <strong>mohou být</strong> stále viditelné";
+$a->strings["Suggestions"] = "Doporučení";
+$a->strings["Suggest potential friends"] = "Navrhnout potenciální přátele";
+$a->strings["Show all contacts"] = "Zobrazit všechny kontakty";
+$a->strings["Unblocked"] = "Odblokován";
+$a->strings["Only show unblocked contacts"] = "Zobrazit pouze neblokované kontakty";
+$a->strings["Blocked"] = "Blokován";
+$a->strings["Only show blocked contacts"] = "Zobrazit pouze blokované kontakty";
+$a->strings["Ignored"] = "Ignorován";
+$a->strings["Only show ignored contacts"] = "Zobrazit pouze ignorované kontakty";
+$a->strings["Archived"] = "Archivován";
+$a->strings["Only show archived contacts"] = "Zobrazit pouze archivované kontakty";
+$a->strings["Hidden"] = "Skrytý";
+$a->strings["Only show hidden contacts"] = "Zobrazit pouze skryté kontakty";
+$a->strings["Mutual Friendship"] = "Vzájemné přátelství";
+$a->strings["is a fan of yours"] = "je Váš fanoušek";
+$a->strings["you are a fan of"] = "jste fanouškem";
+$a->strings["Search your contacts"] = "Prohledat Vaše kontakty";
 $a->strings["Post successful."] = "Příspěvek úspěšně odeslán";
 $a->strings["OpenID protocol error. No ID returned."] = "Chyba OpenID protokolu. Navrátilo se žádné ID.";
 $a->strings["Account not found and OpenID registration is not permitted on this site."] = "Nenalezen účet a OpenID registrace na tomto serveru není dovolena.";

view/de/smarty3/register_adminadd_eml.tpl

@@ -0,0 +1,32 @@
+Hallo {{$username}},
+	der Administrator von {{$sitename}} hat einen Account für dich eingerichtet.
+
+Hier die Login Details:
+
+
+Adresse der Seite:	{{$siteurl}}
+Login Name:	{{$email}}
+Passwort:	{{$password}}
+
+Du kannst und solltest das Passwort in den "Einstellungen" zu deinem Account ändern, 
+nachdem du dich erstmalig eingeloggt hast.
+
+Bitte nimm dir einige Augenblicke Zeit, um die anderen Einstellungen auf der Seite kennenzulernen und zu überprüfen.
+
+Eventuell möchtest du außerdem einige grundlegende Informationen in deinem Standardprofil (auf der "Profile" Seite) eintragen, 
+damit andere Leute dich einfacher finden können.
+
+Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profilbild hochzuladen,
+sowie ein paar "Profil-Schlüsselwörter" einzutragen (um leichter Menschen mit gleichen Interessen zu finden) - und 
+vielleicht auch in welchen Land du lebst; falls du nicht konkreter
+werden möchtest.
+
+Wir respektieren dein Recht auf Privatsphäre und keine dieser Angaben ist notwendig. 
+Wenn du ganz neu bei Friendica bist und niemanden kennst, werden sie dir aber helfen
+ein paar neue und interessante Freunde zu finden.  
+
+
+Danke und willkommen auf {{$sitename}}.
+
+Beste Grüße,
+	{{$sitename}} Administrator

view/de/strings.php

@@ -275,12 +275,12 @@ $a->strings["Ability to dislike posts/comments"] = "Ermöglicht es Beiträge mit
 $a->strings["Star Posts"] = "Beiträge Markieren";
 $a->strings["Ability to mark special posts with a star indicator"] = "Erlaubt es Beiträge mit einem Stern-Indikator zu  markieren";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln.";
+$a->strings["newer"] = "neuer";
+$a->strings["older"] = "älter";
 $a->strings["prev"] = "vorige";
 $a->strings["first"] = "erste";
 $a->strings["last"] = "letzte";
 $a->strings["next"] = "nächste";
-$a->strings["newer"] = "neuer";
-$a->strings["older"] = "älter";
 $a->strings["No contacts"] = "Keine Kontakte";
 $a->strings["%d Contact"] = array(
 	0 => "%d Kontakt",
@@ -872,73 +872,13 @@ $a->strings["No contacts in common."] = "Keine gemeinsamen Kontakte.";
 $a->strings["You must be logged in to use addons. "] = "Sie müssen angemeldet sein um Addons benutzen zu können.";
 $a->strings["Applications"] = "Anwendungen";
 $a->strings["No installed applications."] = "Keine Applikationen installiert.";
-$a->strings["Could not access contact record."] = "Konnte nicht auf die Kontaktdaten zugreifen.";
+$a->strings["Import"] = "Import";
-$a->strings["Could not locate selected profile."] = "Konnte das ausgewählte Profil nicht finden.";
+$a->strings["Move account"] = "Account umziehen";
-$a->strings["Contact updated."] = "Kontakt aktualisiert.";
+$a->strings["You can import an account from another Friendica server."] = "Du kannst einen Account von einem anderen Friendica Server importieren.";
-$a->strings["Failed to update contact record."] = "Aktualisierung der Kontaktdaten fehlgeschlagen.";
+$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."] = "Du musst deinen Account vom alten Server exportieren und hier hochladen. Wir stellen deinen alten Account mit all deinen Kontakten wieder her. Wir werden auch versuchen all deine Freunde darüber zu informieren, dass du hierher umgezogen bist.";
-$a->strings["Contact has been blocked"] = "Kontakt wurde blockiert";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (statusnet/identi.ca) oder von Diaspora importieren";
-$a->strings["Contact has been unblocked"] = "Kontakt wurde wieder freigegeben";
+$a->strings["Account file"] = "Account Datei";
-$a->strings["Contact has been ignored"] = "Kontakt wurde ignoriert";
+$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Um deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\"";
-$a->strings["Contact has been unignored"] = "Kontakt wird nicht mehr ignoriert";
-$a->strings["Contact has been archived"] = "Kontakt wurde archiviert";
-$a->strings["Contact has been unarchived"] = "Kontakt wurde aus dem Archiv geholt";
-$a->strings["Do you really want to delete this contact?"] = "Möchtest du wirklich diesen Kontakt löschen?";
-$a->strings["Contact has been removed."] = "Kontakt wurde entfernt.";
-$a->strings["You are mutual friends with %s"] = "Du hast mit %s eine beidseitige Freundschaft";
-$a->strings["You are sharing with %s"] = "Du teilst mit %s";
-$a->strings["%s is sharing with you"] = "%s teilt mit Dir";
-$a->strings["Private communications are not available for this contact."] = "Private Kommunikation ist für diesen Kontakt nicht verfügbar.";
-$a->strings["(Update was successful)"] = "(Aktualisierung war erfolgreich)";
-$a->strings["(Update was not successful)"] = "(Aktualisierung war nicht erfolgreich)";
-$a->strings["Suggest friends"] = "Kontakte vorschlagen";
-$a->strings["Network type: %s"] = "Netzwerktyp: %s";
-$a->strings["View all contacts"] = "Alle Kontakte anzeigen";
-$a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten";
-$a->strings["Unignore"] = "Ignorieren aufheben";
-$a->strings["Ignore"] = "Ignorieren";
-$a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten";
-$a->strings["Unarchive"] = "Aus Archiv zurückholen";
-$a->strings["Archive"] = "Archivieren";
-$a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten";
-$a->strings["Repair"] = "Reparieren";
-$a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen";
-$a->strings["Communications lost with this contact!"] = "Verbindungen mit diesem Kontakt verloren!";
-$a->strings["Contact Editor"] = "Kontakt Editor";
-$a->strings["Profile Visibility"] = "Profil-Sichtbarkeit";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines deiner Profile das angezeigt werden soll, wenn %s dein Profil aufruft.";
-$a->strings["Contact Information / Notes"] = "Kontakt Informationen / Notizen";
-$a->strings["Edit contact notes"] = "Notizen zum Kontakt bearbeiten";
-$a->strings["Block/Unblock contact"] = "Kontakt blockieren/freischalten";
-$a->strings["Ignore contact"] = "Ignoriere den Kontakt";
-$a->strings["Repair URL settings"] = "URL Einstellungen reparieren";
-$a->strings["View conversations"] = "Unterhaltungen anzeigen";
-$a->strings["Delete contact"] = "Lösche den Kontakt";
-$a->strings["Last update:"] = "letzte Aktualisierung:";
-$a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren";
-$a->strings["Currently blocked"] = "Derzeit geblockt";
-$a->strings["Currently ignored"] = "Derzeit ignoriert";
-$a->strings["Currently archived"] = "Momentan archiviert";
-$a->strings["Hide this contact from others"] = "Verberge diesen Kontakt vor anderen";
-$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein";
-$a->strings["Suggestions"] = "Kontaktvorschläge";
-$a->strings["Suggest potential friends"] = "Freunde vorschlagen";
-$a->strings["All Contacts"] = "Alle Kontakte";
-$a->strings["Show all contacts"] = "Alle Kontakte anzeigen";
-$a->strings["Unblocked"] = "Ungeblockt";
-$a->strings["Only show unblocked contacts"] = "Nur nicht-blockierte Kontakte anzeigen";
-$a->strings["Blocked"] = "Geblockt";
-$a->strings["Only show blocked contacts"] = "Nur blockierte Kontakte anzeigen";
-$a->strings["Ignored"] = "Ignoriert";
-$a->strings["Only show ignored contacts"] = "Nur ignorierte Kontakte anzeigen";
-$a->strings["Archived"] = "Archiviert";
-$a->strings["Only show archived contacts"] = "Nur archivierte Kontakte anzeigen";
-$a->strings["Hidden"] = "Verborgen";
-$a->strings["Only show hidden contacts"] = "Nur verborgene Kontakte anzeigen";
-$a->strings["Mutual Friendship"] = "Beidseitige Freundschaft";
-$a->strings["is a fan of yours"] = "ist ein Fan von dir";
-$a->strings["you are a fan of"] = "du bist Fan von";
-$a->strings["Search your contacts"] = "Suche in deinen Kontakten";
-$a->strings["Finding: "] = "Funde: ";
 $a->strings["everybody"] = "jeder";
 $a->strings["Additional features"] = "Zusätzliche Features";
 $a->strings["Display settings"] = "Anzeige-Einstellungen";
@@ -1152,6 +1092,7 @@ $a->strings["Unable to resolve your name at the provided location."] = "Konnte d
 $a->strings["You have already introduced yourself here."] = "Du hast dich hier bereits vorgestellt.";
 $a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob du bereits mit %s befreundet bist.";
 $a->strings["Invalid profile URL."] = "Ungültige Profil-URL.";
+$a->strings["Failed to update contact record."] = "Aktualisierung der Kontaktdaten fehlgeschlagen.";
 $a->strings["Your introduction has been sent."] = "Deine Kontaktanfrage wurde gesendet.";
 $a->strings["Please login to confirm introduction."] = "Bitte melde dich an, um die Kontaktanfrage zu bestätigen.";
 $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an.";
@@ -1174,6 +1115,7 @@ $a->strings["Submit Request"] = "Anfrage abschicken";
 $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt %2\$s %3\$s";
 $a->strings["Global Directory"] = "Weltweites Verzeichnis";
 $a->strings["Find on this site"] = "Auf diesem Server suchen";
+$a->strings["Finding: "] = "Funde: ";
 $a->strings["Site Directory"] = "Verzeichnis";
 $a->strings["Gender: "] = "Geschlecht:";
 $a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein).";
@@ -1215,13 +1157,6 @@ $a->strings["Export your account info and contacts. Use this to make a backup of
 $a->strings["Export all"] = "Alles exportieren";
 $a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Exportiere deine Account Informationen, Kontakte und alle Einträge als JSON Datei. Dies könnte eine sehr große Datei werden und dementsprechend viel Zeit benötigen. Verwende dies um ein komplettes Backup deines Accounts anzulegen (Fotos werden nicht exportiert).";
 $a->strings["- select -"] = "- auswählen -";
-$a->strings["Import"] = "Import";
-$a->strings["Move account"] = "Account umziehen";
-$a->strings["You can import an account from another Friendica server."] = "Du kannst einen Account von einem anderen Friendica Server importieren.";
-$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."] = "Du musst deinen Account vom alten Server exportieren und hier hochladen. Wir stellen deinen alten Account mit all deinen Kontakten wieder her. Wir werden auch versuchen all deine Freunde darüber zu informieren, dass du hierher umgezogen bist.";
-$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (statusnet/identi.ca) oder von Diaspora importieren";
-$a->strings["Account file"] = "Account Datei";
-$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "Um deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\"";
 $a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]";
 $a->strings["Contact added"] = "Kontakt hinzugefügt";
 $a->strings["This is Friendica, version"] = "Dies ist Friendica, Version";
@@ -1244,6 +1179,7 @@ $a->strings["Group removed."] = "Gruppe entfernt.";
 $a->strings["Unable to remove group."] = "Konnte die Gruppe nicht entfernen.";
 $a->strings["Group Editor"] = "Gruppeneditor";
 $a->strings["Members"] = "Mitglieder";
+$a->strings["All Contacts"] = "Alle Kontakte";
 $a->strings["No profile"] = "Kein Profil";
 $a->strings["Help:"] = "Hilfe:";
 $a->strings["Not Found"] = "Nicht gefunden";
@@ -1364,12 +1300,14 @@ $a->strings["Private messages to this person are at risk of public disclosure."]
 $a->strings["Invalid contact."] = "Ungültiger Kontakt.";
 $a->strings["Invalid request identifier."] = "Invalid request identifier.";
 $a->strings["Discard"] = "Verwerfen";
+$a->strings["Ignore"] = "Ignorieren";
 $a->strings["System"] = "System";
 $a->strings["Show Ignored Requests"] = "Zeige ignorierte Anfragen";
 $a->strings["Hide Ignored Requests"] = "Verberge ignorierte Anfragen";
 $a->strings["Notification type: "] = "Benachrichtigungstyp: ";
 $a->strings["Friend Suggestion"] = "Kontaktvorschlag";
 $a->strings["suggested by %s"] = "vorgeschlagen von %s";
+$a->strings["Hide this contact from others"] = "Verberge diesen Kontakt vor anderen";
 $a->strings["Post a new friend activity"] = "Neue-Kontakt Nachricht senden";
 $a->strings["if applicable"] = "falls anwendbar";
 $a->strings["Claims to be known to you: "] = "Behauptet dich zu kennen: ";
@@ -1540,6 +1478,68 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ
 $a->strings["Errors encountered creating database tables."] = "Fehler aufgetreten während der Erzeugung der Datenbanktabellen.";
 $a->strings["<h1>What next</h1>"] = "<h1>Wie geht es weiter?</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten.";
+$a->strings["Could not access contact record."] = "Konnte nicht auf die Kontaktdaten zugreifen.";
+$a->strings["Could not locate selected profile."] = "Konnte das ausgewählte Profil nicht finden.";
+$a->strings["Contact updated."] = "Kontakt aktualisiert.";
+$a->strings["Contact has been blocked"] = "Kontakt wurde blockiert";
+$a->strings["Contact has been unblocked"] = "Kontakt wurde wieder freigegeben";
+$a->strings["Contact has been ignored"] = "Kontakt wurde ignoriert";
+$a->strings["Contact has been unignored"] = "Kontakt wird nicht mehr ignoriert";
+$a->strings["Contact has been archived"] = "Kontakt wurde archiviert";
+$a->strings["Contact has been unarchived"] = "Kontakt wurde aus dem Archiv geholt";
+$a->strings["Do you really want to delete this contact?"] = "Möchtest du wirklich diesen Kontakt löschen?";
+$a->strings["Contact has been removed."] = "Kontakt wurde entfernt.";
+$a->strings["You are mutual friends with %s"] = "Du hast mit %s eine beidseitige Freundschaft";
+$a->strings["You are sharing with %s"] = "Du teilst mit %s";
+$a->strings["%s is sharing with you"] = "%s teilt mit Dir";
+$a->strings["Private communications are not available for this contact."] = "Private Kommunikation ist für diesen Kontakt nicht verfügbar.";
+$a->strings["(Update was successful)"] = "(Aktualisierung war erfolgreich)";
+$a->strings["(Update was not successful)"] = "(Aktualisierung war nicht erfolgreich)";
+$a->strings["Suggest friends"] = "Kontakte vorschlagen";
+$a->strings["Network type: %s"] = "Netzwerktyp: %s";
+$a->strings["View all contacts"] = "Alle Kontakte anzeigen";
+$a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten";
+$a->strings["Unignore"] = "Ignorieren aufheben";
+$a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten";
+$a->strings["Unarchive"] = "Aus Archiv zurückholen";
+$a->strings["Archive"] = "Archivieren";
+$a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten";
+$a->strings["Repair"] = "Reparieren";
+$a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen";
+$a->strings["Communications lost with this contact!"] = "Verbindungen mit diesem Kontakt verloren!";
+$a->strings["Contact Editor"] = "Kontakt Editor";
+$a->strings["Profile Visibility"] = "Profil-Sichtbarkeit";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines deiner Profile das angezeigt werden soll, wenn %s dein Profil aufruft.";
+$a->strings["Contact Information / Notes"] = "Kontakt Informationen / Notizen";
+$a->strings["Edit contact notes"] = "Notizen zum Kontakt bearbeiten";
+$a->strings["Block/Unblock contact"] = "Kontakt blockieren/freischalten";
+$a->strings["Ignore contact"] = "Ignoriere den Kontakt";
+$a->strings["Repair URL settings"] = "URL Einstellungen reparieren";
+$a->strings["View conversations"] = "Unterhaltungen anzeigen";
+$a->strings["Delete contact"] = "Lösche den Kontakt";
+$a->strings["Last update:"] = "letzte Aktualisierung:";
+$a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren";
+$a->strings["Currently blocked"] = "Derzeit geblockt";
+$a->strings["Currently ignored"] = "Derzeit ignoriert";
+$a->strings["Currently archived"] = "Momentan archiviert";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein";
+$a->strings["Suggestions"] = "Kontaktvorschläge";
+$a->strings["Suggest potential friends"] = "Freunde vorschlagen";
+$a->strings["Show all contacts"] = "Alle Kontakte anzeigen";
+$a->strings["Unblocked"] = "Ungeblockt";
+$a->strings["Only show unblocked contacts"] = "Nur nicht-blockierte Kontakte anzeigen";
+$a->strings["Blocked"] = "Geblockt";
+$a->strings["Only show blocked contacts"] = "Nur blockierte Kontakte anzeigen";
+$a->strings["Ignored"] = "Ignoriert";
+$a->strings["Only show ignored contacts"] = "Nur ignorierte Kontakte anzeigen";
+$a->strings["Archived"] = "Archiviert";
+$a->strings["Only show archived contacts"] = "Nur archivierte Kontakte anzeigen";
+$a->strings["Hidden"] = "Verborgen";
+$a->strings["Only show hidden contacts"] = "Nur verborgene Kontakte anzeigen";
+$a->strings["Mutual Friendship"] = "Beidseitige Freundschaft";
+$a->strings["is a fan of yours"] = "ist ein Fan von dir";
+$a->strings["you are a fan of"] = "du bist Fan von";
+$a->strings["Search your contacts"] = "Suche in deinen Kontakten";
 $a->strings["Post successful."] = "Beitrag erfolgreich veröffentlicht.";
 $a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
 $a->strings["Account not found and OpenID registration is not permitted on this site."] = "Nutzerkonto wurde nicht gefunden und OpenID-Registrierung ist auf diesem Server nicht gestattet.";

view/de/update_fail_eml.tpl

@@ -2,7 +2,7 @@ Hi,
 $sitename   
 Die friendica Entwickler haben jüngst Update $update veröffentlicht, 
 aber als ich versucht habe es zu installieren ist etwas schrecklich schief gegangen.  
-Das sollte schnellst möglichst behoben werden und ich kann das nicht alleine machen. 
+Das sollte schnellst möglich behoben werden und ich kann das nicht alleine machen. 
 Bitte wende dich an einen friendica Entwickler, falls du mir nicht alleine helfen kannst. Meine Datenbank könnte unbrauchbar sein. 
 
 Die Fehlermeldung lautet '$error'.   

view/fr/strings.php

@@ -99,7 +99,7 @@ $a->strings["Network Posts"] = "Posts du Réseau";
 $a->strings["Edit Contact"] = "Éditer le contact";
 $a->strings["Send PM"] = "Message privé";
 $a->strings["Image/photo"] = "Image/photo";
-$a->strings["<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a href=\"%s\" target=\"external-link\">post</a>"] = "";
+$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 écris le <a href=\"%s\" target=\"external-link\">post</a> suivant";
 $a->strings["$1 wrote:"] = "$1 a écrit:";
 $a->strings["Encrypted content"] = "Contenu chiffré";
 $a->strings["Visible to everybody"] = "Visible par tout le monde";
@@ -166,7 +166,7 @@ $a->strings["Zot!"] = "Zot!";
 $a->strings["LinkedIn"] = "LinkedIn";
 $a->strings["XMPP/IM"] = "XMPP/IM";
 $a->strings["MySpace"] = "MySpace";
-$a->strings["Google+"] = "";
+$a->strings["Google+"] = "Google+";
 $a->strings["Add New Contact"] = "Ajouter un nouveau contact";
 $a->strings["Enter address or web location"] = "Entrez son adresse ou sa localisation web";
 $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Exemple: bob@example.com, http://example.com/barbara";
@@ -231,7 +231,7 @@ $a->strings["[Name Withheld]"] = "[Nom non-publié]";
 $a->strings["A new person is sharing with you at "] = "Une nouvelle personne partage avec vous à ";
 $a->strings["You have a new follower at "] = "Vous avez un nouvel abonné à ";
 $a->strings["Item not found."] = "Élément introuvable.";
-$a->strings["Do you really want to delete this item?"] = "";
+$a->strings["Do you really want to delete this item?"] = "Voulez-vous vraiment supprimer cet élément ?";
 $a->strings["Yes"] = "Oui";
 $a->strings["Cancel"] = "Annuler";
 $a->strings["Permission denied."] = "Permission refusée.";
@@ -245,7 +245,7 @@ $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["Search by Date"] = "Rechercher par 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"] = "";
@@ -275,12 +275,12 @@ $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'"] = "Impossible de localiser les informations DNS pour le serveur de base de données '%s'";
+$a->strings["newer"] = "Plus récent";
+$a->strings["older"] = "Plus ancien";
 $a->strings["prev"] = "précédent";
 $a->strings["first"] = "premier";
 $a->strings["last"] = "dernier";
 $a->strings["next"] = "suivant";
-$a->strings["newer"] = "Plus récent";
-$a->strings["older"] = "Plus ancien";
 $a->strings["No contacts"] = "Aucun contact";
 $a->strings["%d Contact"] = array(
 	0 => "%d contact",
@@ -394,7 +394,7 @@ $a->strings["Please enter an audio link/URL:"] = "Entrez un lien/URL audio :";
 $a->strings["Tag term:"] = "Tag : ";
 $a->strings["Save to Folder:"] = "Sauver dans le Dossier:";
 $a->strings["Where are you right now?"] = "Où êtes-vous présentemment?";
-$a->strings["Delete item(s)?"] = "";
+$a->strings["Delete item(s)?"] = "Supprimer les élément(s) ?";
 $a->strings["Post to Email"] = "Publier aussi par courriel";
 $a->strings["Share"] = "Partager";
 $a->strings["Upload photo"] = "Joindre photo";
@@ -421,7 +421,7 @@ $a->strings["Example: bob@example.com, mary@example.com"] = "Exemple: bob@exempl
 $a->strings["Preview"] = "Aperçu";
 $a->strings["Post to Groups"] = "";
 $a->strings["Post to Contacts"] = "";
-$a->strings["Private post"] = "";
+$a->strings["Private post"] = "Message privé";
 $a->strings["Friendica Notification"] = "Notification Friendica";
 $a->strings["Thank You,"] = "Merci, ";
 $a->strings["%s Administrator"] = "L'administrateur de %s";
@@ -463,7 +463,7 @@ $a->strings["Please visit %s to approve or reject the suggestion."] = "Merci de
 $a->strings["[no subject]"] = "[pas de sujet]";
 $a->strings["Wall Photos"] = "Photos du mur";
 $a->strings["Nothing new here"] = "Rien de neuf ici";
-$a->strings["Clear notifications"] = "";
+$a->strings["Clear notifications"] = "Effacer les notifications";
 $a->strings["Logout"] = "Se déconnecter";
 $a->strings["End this session"] = "Mettre fin à cette session";
 $a->strings["Status"] = "Statut";
@@ -506,29 +506,29 @@ $a->strings["Outbox"] = "Messages sortants";
 $a->strings["New Message"] = "Nouveau message";
 $a->strings["Manage"] = "Gérer";
 $a->strings["Manage other pages"] = "Gérer les autres pages";
-$a->strings["Delegations"] = "";
+$a->strings["Delegations"] = "Délégations";
 $a->strings["Delegate Page Management"] = "Déléguer la gestion de la page";
 $a->strings["Settings"] = "Réglages";
 $a->strings["Account settings"] = "Compte";
 $a->strings["Profiles"] = "Profils";
-$a->strings["Manage/Edit Profiles"] = "";
+$a->strings["Manage/Edit Profiles"] = "Gérer/Éditer les profiles";
 $a->strings["Contacts"] = "Contacts";
 $a->strings["Manage/edit friends and contacts"] = "Gérer/éditer les amitiés et contacts";
 $a->strings["Admin"] = "Admin";
 $a->strings["Site setup and configuration"] = "Démarrage et configuration du site";
-$a->strings["Navigation"] = "";
+$a->strings["Navigation"] = "Navigation";
-$a->strings["Site map"] = "";
+$a->strings["Site map"] = "Carte du site";
 $a->strings["Embedded content"] = "Contenu incorporé";
 $a->strings["Embedding disabled"] = "Incorporation désactivée";
 $a->strings["Error decoding account file"] = "";
 $a->strings["Error! No version data in file! This is not a Friendica account file?"] = "";
 $a->strings["Error! Cannot check nickname"] = "";
 $a->strings["User '%s' already exists on this server!"] = "";
-$a->strings["User creation error"] = "";
+$a->strings["User creation error"] = "Erreur de création d'utilisateur";
-$a->strings["User profile creation error"] = "";
+$a->strings["User profile creation error"] = "Erreur de création du profil utilisateur";
 $a->strings["%d contact not imported"] = array(
-	0 => "",
+	0 => "%d contacts non importés",
-	1 => "",
+	1 => "%d contacts non importés",
 );
 $a->strings["Done. You can now login with your username and password"] = "";
 $a->strings["Welcome "] = "Bienvenue ";
@@ -680,9 +680,9 @@ $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["Hide help entry from navigation menu"] = "Cacher l'aide du menu de navigation";
-$a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "";
+$a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Cacher l'entrée du menu pour les pages d'Aide dans le menu de navigation. Vous pouvez toujours y accéder en tapant /help directement.";
 $a->strings["Single user instance"] = "Instance mono-utilisateur";
-$a->strings["Make this instance multi-user or single-user for the named user"] = "";
+$a->strings["Make this instance multi-user or single-user for the named user"] = "Transformer cette en instance en multi-utilisateur ou mono-utilisateur pour cet l'utilisateur.";
 $a->strings["Maximum image size"] = "Taille maximale des images";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Taille maximale des images envoyées (en octets). 0 par défaut, c'est à dire \"aucune limite\".";
 $a->strings["Maximum image length"] = "Longueur maximale des images";
@@ -858,7 +858,7 @@ $a->strings["Please enter your password for verification:"] = "Merci de saisir v
 $a->strings["Source (bbcode) text:"] = "Texte source (bbcode) :";
 $a->strings["Source (Diaspora) text to convert to BBcode:"] = "Texte source (Diaspora) à convertir en BBcode :";
 $a->strings["Source input: "] = "Source input: ";
-$a->strings["bb2html (raw HTML): "] = "";
+$a->strings["bb2html (raw HTML): "] = "bb2html (HTML brut)";
 $a->strings["bb2html: "] = "bb2html: ";
 $a->strings["bb2html2bb: "] = "bb2html2bb: ";
 $a->strings["bb2md: "] = "bb2md: ";
@@ -869,76 +869,16 @@ $a->strings["Source input (Diaspora format): "] = "Texte source (format Diaspora
 $a->strings["diaspora2bb: "] = "diaspora2bb :";
 $a->strings["Common Friends"] = "Amis communs";
 $a->strings["No contacts in common."] = "Pas de contacts en commun.";
-$a->strings["You must be logged in to use addons. "] = "";
+$a->strings["You must be logged in to use addons. "] = "Vous devez être connecté pour utiliser les addons.";
 $a->strings["Applications"] = "Applications";
 $a->strings["No installed applications."] = "Pas d'application installée.";
-$a->strings["Could not access contact record."] = "Impossible d'accéder à l'enregistrement du contact.";
+$a->strings["Import"] = "Importer";
-$a->strings["Could not locate selected profile."] = "Impossible de localiser le profil séléctionné.";
+$a->strings["Move account"] = "Migrer le compte";
-$a->strings["Contact updated."] = "Contact mis-à-jour.";
+$a->strings["You can import an account from another Friendica server."] = "";
-$a->strings["Failed to update contact record."] = "Échec de mise-à-jour du contact.";
+$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["Contact has been blocked"] = "Le contact a été bloqué";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "";
-$a->strings["Contact has been unblocked"] = "Le contact n'est plus bloqué";
+$a->strings["Account file"] = "Fichier du compte";
-$a->strings["Contact has been ignored"] = "Le contact a été ignoré";
+$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "";
-$a->strings["Contact has been unignored"] = "Le contact n'est plus ignoré";
-$a->strings["Contact has been archived"] = "Contact archivé";
-$a->strings["Contact has been unarchived"] = "Contact désarchivé";
-$a->strings["Do you really want to delete this contact?"] = "";
-$a->strings["Contact has been removed."] = "Ce contact a été retiré.";
-$a->strings["You are mutual friends with %s"] = "Vous êtes ami (et réciproquement) avec %s";
-$a->strings["You are sharing with %s"] = "Vous partagez avec %s";
-$a->strings["%s is sharing with you"] = "%s partage avec vous";
-$a->strings["Private communications are not available for this contact."] = "Les communications privées ne sont pas disponibles pour ce contact.";
-$a->strings["(Update was successful)"] = "(Mise à jour effectuée avec succès)";
-$a->strings["(Update was not successful)"] = "(Mise à jour échouée)";
-$a->strings["Suggest friends"] = "Suggérer amitié/contact";
-$a->strings["Network type: %s"] = "Type de réseau %s";
-$a->strings["View all contacts"] = "Voir tous les contacts";
-$a->strings["Toggle Blocked status"] = "(dés)activer l'état \"bloqué\"";
-$a->strings["Unignore"] = "Ne plus ignorer";
-$a->strings["Ignore"] = "Ignorer";
-$a->strings["Toggle Ignored status"] = "(dés)activer l'état \"ignoré\"";
-$a->strings["Unarchive"] = "Désarchiver";
-$a->strings["Archive"] = "Archiver";
-$a->strings["Toggle Archive status"] = "(dés)activer l'état \"archivé\"";
-$a->strings["Repair"] = "Réparer";
-$a->strings["Advanced Contact Settings"] = "Réglages avancés du contact";
-$a->strings["Communications lost with this contact!"] = "Communications perdues avec ce contact !";
-$a->strings["Contact Editor"] = "Éditeur de contact";
-$a->strings["Profile Visibility"] = "Visibilité du profil";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Merci de choisir le profil que vous souhaitez montrer à %s lorsqu'il vous rend visite de manière sécurisée.";
-$a->strings["Contact Information / Notes"] = "Informations de contact / Notes";
-$a->strings["Edit contact notes"] = "Éditer les notes des contacts";
-$a->strings["Block/Unblock contact"] = "Bloquer/débloquer ce contact";
-$a->strings["Ignore contact"] = "Ignorer ce contact";
-$a->strings["Repair URL settings"] = "Réparer les réglages d'URL";
-$a->strings["View conversations"] = "Voir les conversations";
-$a->strings["Delete contact"] = "Effacer ce contact";
-$a->strings["Last update:"] = "Dernière mise-à-jour :";
-$a->strings["Update public posts"] = "Met ses entrées publiques à jour: ";
-$a->strings["Currently blocked"] = "Actuellement bloqué";
-$a->strings["Currently ignored"] = "Actuellement ignoré";
-$a->strings["Currently archived"] = "Actuellement archivé";
-$a->strings["Hide this contact from others"] = "Cacher ce contact aux autres";
-$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Les réponses et \"j'aime\" à vos contenus publics <strong>peuvent</strong> être toujours visibles";
-$a->strings["Suggestions"] = "Suggestions";
-$a->strings["Suggest potential friends"] = "Suggérer des amis potentiels";
-$a->strings["All Contacts"] = "Tous les contacts";
-$a->strings["Show all contacts"] = "Montrer tous les contacts";
-$a->strings["Unblocked"] = "Non-bloqués";
-$a->strings["Only show unblocked contacts"] = "Ne montrer que les contacts non-bloqués";
-$a->strings["Blocked"] = "Bloqués";
-$a->strings["Only show blocked contacts"] = "Ne montrer que les contacts bloqués";
-$a->strings["Ignored"] = "Ignorés";
-$a->strings["Only show ignored contacts"] = "Ne montrer que les contacts ignorés";
-$a->strings["Archived"] = "Archivés";
-$a->strings["Only show archived contacts"] = "Ne montrer que les contacts archivés";
-$a->strings["Hidden"] = "Cachés";
-$a->strings["Only show hidden contacts"] = "Ne montrer que les contacts masqués";
-$a->strings["Mutual Friendship"] = "Relation réciproque";
-$a->strings["is a fan of yours"] = "Vous suit";
-$a->strings["you are a fan of"] = "Vous le/la suivez";
-$a->strings["Search your contacts"] = "Rechercher dans vos contacts";
-$a->strings["Finding: "] = "Trouvé: ";
 $a->strings["everybody"] = "tout le monde";
 $a->strings["Additional features"] = "";
 $a->strings["Display settings"] = "Affichage";
@@ -1152,6 +1092,7 @@ $a->strings["Unable to resolve your name at the provided location."] = "Impossib
 $a->strings["You have already introduced yourself here."] = "Vous vous êtes déjà présenté ici.";
 $a->strings["Apparently you are already friends with %s."] = "Il semblerait que vous soyez déjà ami avec %s.";
 $a->strings["Invalid profile URL."] = "URL de profil invalide.";
+$a->strings["Failed to update contact record."] = "Échec de mise-à-jour du contact.";
 $a->strings["Your introduction has been sent."] = "Votre introduction a été envoyée.";
 $a->strings["Please login to confirm introduction."] = "Connectez-vous pour confirmer l'introduction.";
 $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Identité incorrecte actuellement connectée. Merci de vous connecter à <strong>ce</strong> profil.";
@@ -1174,10 +1115,11 @@ $a->strings["Submit Request"] = "Envoyer la requête";
 $a->strings["%1\$s is following %2\$s's %3\$s"] = "";
 $a->strings["Global Directory"] = "Annuaire global";
 $a->strings["Find on this site"] = "Trouver sur ce site";
+$a->strings["Finding: "] = "Trouvé: ";
 $a->strings["Site Directory"] = "Annuaire local";
 $a->strings["Gender: "] = "Genre: ";
 $a->strings["No entries (some entries may be hidden)."] = "Aucune entrée (certaines peuvent être cachées).";
-$a->strings["Do you really want to delete this suggestion?"] = "";
+$a->strings["Do you really want to delete this suggestion?"] = "Voulez-vous vraiment supprimer cette suggestion ?";
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Aucune suggestion. Si ce site est récent, merci de recommencer dans 24h.";
 $a->strings["Ignore/Hide"] = "Ignorer/cacher";
 $a->strings["People Search"] = "Recherche de personnes";
@@ -1215,13 +1157,6 @@ $a->strings["Export your account info and contacts. Use this to make a backup of
 $a->strings["Export all"] = "Tout exporter";
 $a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Exportez votre compte, vos infos, vos contacts et toutes vos publications (en JSON). Le fichier résultant peut être extrêmement volumineux, et sa production peut durer longtemps. Vous pourrez l'utiliser pour faire une sauvegarde complète (à part les photos).";
 $a->strings["- select -"] = "- choisir -";
-$a->strings["Import"] = "Importer";
-$a->strings["Move account"] = "Migrer le compte";
-$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"] = "Fichier du compte";
-$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "";
 $a->strings["[Embedded content - reload page to view]"] = "[contenu incorporé - rechargez la page pour le voir]";
 $a->strings["Contact added"] = "Contact ajouté";
 $a->strings["This is Friendica, version"] = "Motorisé par Friendica version";
@@ -1244,6 +1179,7 @@ $a->strings["Group removed."] = "Groupe enlevé.";
 $a->strings["Unable to remove group."] = "Impossible d'enlever le groupe.";
 $a->strings["Group Editor"] = "Éditeur de groupe";
 $a->strings["Members"] = "Membres";
+$a->strings["All Contacts"] = "Tous les contacts";
 $a->strings["No profile"] = "Aucun profil";
 $a->strings["Help:"] = "Aide:";
 $a->strings["Not Found"] = "Non trouvé";
@@ -1364,12 +1300,14 @@ $a->strings["Private messages to this person are at risk of public disclosure."]
 $a->strings["Invalid contact."] = "Contact invalide.";
 $a->strings["Invalid request identifier."] = "Identifiant de demande invalide.";
 $a->strings["Discard"] = "Rejeter";
+$a->strings["Ignore"] = "Ignorer";
 $a->strings["System"] = "Système";
 $a->strings["Show Ignored Requests"] = "Voir les demandes ignorées";
 $a->strings["Hide Ignored Requests"] = "Cacher les demandes ignorées";
 $a->strings["Notification type: "] = "Type de notification: ";
 $a->strings["Friend Suggestion"] = "Suggestion d'amitié/contact";
 $a->strings["suggested by %s"] = "suggéré(e) par %s";
+$a->strings["Hide this contact from others"] = "Cacher ce contact aux autres";
 $a->strings["Post a new friend activity"] = "Poster concernant les nouvelles amitiés";
 $a->strings["if applicable"] = "si possible";
 $a->strings["Claims to be known to you: "] = "Prétend que vous le connaissez: ";
@@ -1540,6 +1478,68 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ
 $a->strings["Errors encountered creating database tables."] = "Des erreurs ont été signalées lors de la création des tables.";
 $a->strings["<h1>What next</h1>"] = "<h1>Ensuite</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: Vous devez configurer [manuellement] une tâche programmée pour le 'poller'.";
+$a->strings["Could not access contact record."] = "Impossible d'accéder à l'enregistrement du contact.";
+$a->strings["Could not locate selected profile."] = "Impossible de localiser le profil séléctionné.";
+$a->strings["Contact updated."] = "Contact mis-à-jour.";
+$a->strings["Contact has been blocked"] = "Le contact a été bloqué";
+$a->strings["Contact has been unblocked"] = "Le contact n'est plus bloqué";
+$a->strings["Contact has been ignored"] = "Le contact a été ignoré";
+$a->strings["Contact has been unignored"] = "Le contact n'est plus ignoré";
+$a->strings["Contact has been archived"] = "Contact archivé";
+$a->strings["Contact has been unarchived"] = "Contact désarchivé";
+$a->strings["Do you really want to delete this contact?"] = "";
+$a->strings["Contact has been removed."] = "Ce contact a été retiré.";
+$a->strings["You are mutual friends with %s"] = "Vous êtes ami (et réciproquement) avec %s";
+$a->strings["You are sharing with %s"] = "Vous partagez avec %s";
+$a->strings["%s is sharing with you"] = "%s partage avec vous";
+$a->strings["Private communications are not available for this contact."] = "Les communications privées ne sont pas disponibles pour ce contact.";
+$a->strings["(Update was successful)"] = "(Mise à jour effectuée avec succès)";
+$a->strings["(Update was not successful)"] = "(Mise à jour échouée)";
+$a->strings["Suggest friends"] = "Suggérer amitié/contact";
+$a->strings["Network type: %s"] = "Type de réseau %s";
+$a->strings["View all contacts"] = "Voir tous les contacts";
+$a->strings["Toggle Blocked status"] = "(dés)activer l'état \"bloqué\"";
+$a->strings["Unignore"] = "Ne plus ignorer";
+$a->strings["Toggle Ignored status"] = "(dés)activer l'état \"ignoré\"";
+$a->strings["Unarchive"] = "Désarchiver";
+$a->strings["Archive"] = "Archiver";
+$a->strings["Toggle Archive status"] = "(dés)activer l'état \"archivé\"";
+$a->strings["Repair"] = "Réparer";
+$a->strings["Advanced Contact Settings"] = "Réglages avancés du contact";
+$a->strings["Communications lost with this contact!"] = "Communications perdues avec ce contact !";
+$a->strings["Contact Editor"] = "Éditeur de contact";
+$a->strings["Profile Visibility"] = "Visibilité du profil";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Merci de choisir le profil que vous souhaitez montrer à %s lorsqu'il vous rend visite de manière sécurisée.";
+$a->strings["Contact Information / Notes"] = "Informations de contact / Notes";
+$a->strings["Edit contact notes"] = "Éditer les notes des contacts";
+$a->strings["Block/Unblock contact"] = "Bloquer/débloquer ce contact";
+$a->strings["Ignore contact"] = "Ignorer ce contact";
+$a->strings["Repair URL settings"] = "Réparer les réglages d'URL";
+$a->strings["View conversations"] = "Voir les conversations";
+$a->strings["Delete contact"] = "Effacer ce contact";
+$a->strings["Last update:"] = "Dernière mise-à-jour :";
+$a->strings["Update public posts"] = "Met ses entrées publiques à jour: ";
+$a->strings["Currently blocked"] = "Actuellement bloqué";
+$a->strings["Currently ignored"] = "Actuellement ignoré";
+$a->strings["Currently archived"] = "Actuellement archivé";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Les réponses et \"j'aime\" à vos contenus publics <strong>peuvent</strong> être toujours visibles";
+$a->strings["Suggestions"] = "Suggestions";
+$a->strings["Suggest potential friends"] = "Suggérer des amis potentiels";
+$a->strings["Show all contacts"] = "Montrer tous les contacts";
+$a->strings["Unblocked"] = "Non-bloqués";
+$a->strings["Only show unblocked contacts"] = "Ne montrer que les contacts non-bloqués";
+$a->strings["Blocked"] = "Bloqués";
+$a->strings["Only show blocked contacts"] = "Ne montrer que les contacts bloqués";
+$a->strings["Ignored"] = "Ignorés";
+$a->strings["Only show ignored contacts"] = "Ne montrer que les contacts ignorés";
+$a->strings["Archived"] = "Archivés";
+$a->strings["Only show archived contacts"] = "Ne montrer que les contacts archivés";
+$a->strings["Hidden"] = "Cachés";
+$a->strings["Only show hidden contacts"] = "Ne montrer que les contacts masqués";
+$a->strings["Mutual Friendship"] = "Relation réciproque";
+$a->strings["is a fan of yours"] = "Vous suit";
+$a->strings["you are a fan of"] = "Vous le/la suivez";
+$a->strings["Search your contacts"] = "Rechercher dans vos contacts";
 $a->strings["Post successful."] = "Publication réussie.";
 $a->strings["OpenID protocol error. No ID returned."] = "Erreur de protocole OpenID. Pas d'ID en retour.";
 $a->strings["Account not found and OpenID registration is not permitted on this site."] = "Compte introuvable, et l'inscription OpenID n'est pas autorisée sur ce site.";
@@ -1583,7 +1583,7 @@ $a->strings["to"] = "à";
 $a->strings["Wall-to-Wall"] = "Inter-mur";
 $a->strings["via Wall-To-Wall:"] = "en Inter-mur:";
 $a->strings["This entry was edited"] = "";
-$a->strings["via"] = "";
+$a->strings["via"] = "via";
 $a->strings["Theme settings"] = "Réglages du thème graphique";
 $a->strings["Set resize level for images in posts and comments (width and height)"] = "Choisir une taille pour les images dans les publications et commentaires (largeur et hauteur)";
 $a->strings["Set font-size for posts and comments"] = "Réglez 'font-size' (taille de police) pour publications et commentaires";

view/it/strings.php

@@ -275,12 +275,12 @@ $a->strings["Ability to dislike posts/comments"] = "Permetti di inviare \"non mi
 $a->strings["Star Posts"] = "Post preferiti";
 $a->strings["Ability to mark special posts with a star indicator"] = "Permette di segnare i post preferiti con una stella";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Non trovo le informazioni DNS per il database server '%s'";
+$a->strings["newer"] = "nuovi";
+$a->strings["older"] = "vecchi";
 $a->strings["prev"] = "prec";
 $a->strings["first"] = "primo";
 $a->strings["last"] = "ultimo";
 $a->strings["next"] = "succ";
-$a->strings["newer"] = "nuovi";
-$a->strings["older"] = "vecchi";
 $a->strings["No contacts"] = "Nessun contatto";
 $a->strings["%d Contact"] = array(
 	0 => "%d contatto",
@@ -713,9 +713,9 @@ $a->strings["Set default post permissions for all new members to the default pri
 $a->strings["Don't include post content in email notifications"] = "Non includere il contenuto dei post nelle notifiche via email";
 $a->strings["Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure."] = "Non include il contenuti del post/commento/messaggio privato/etc. nelle notifiche email che sono inviate da questo sito, per privacy";
 $a->strings["Disallow public access to addons listed in the apps menu."] = "Disabilita l'accesso pubblico ai plugin raccolti nel menu apps.";
-$a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "";
+$a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "Selezionando questo box si limiterà ai soli membri l'accesso agli addon nel menu applicazioni";
 $a->strings["Don't embed private images in posts"] = "Non inglobare immagini private nei post";
-$a->strings["Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."] = "";
+$a->strings["Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."] = "Non sostituire le foto locali nei post con una copia incorporata dell'immagine. Questo significa che i contatti che riceveranno i post contenenti foto private dovranno autenticarsi e caricare ogni immagine, cosa che puo' richiedere un po' di tempo.";
 $a->strings["Block multiple registrations"] = "Blocca registrazioni multiple";
 $a->strings["Disallow users to register additional accounts for use as pages."] = "Non permette all'utente di registrare account extra da usare come pagine.";
 $a->strings["OpenID support"] = "Supporto OpenID";
@@ -728,8 +728,8 @@ $a->strings["Show Community Page"] = "Mostra pagina Comunità";
 $a->strings["Display a Community page showing all recent public postings on this site."] = "Mostra una pagina Comunità con tutti i recenti messaggi pubblici su questo sito.";
 $a->strings["Enable OStatus support"] = "Abilita supporto OStatus";
 $a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Fornisce compatibiltà OStatuts (identi.ca, status.net, etc.). Tutte le comunicazioni in OStatus sono pubbliche, per cui avvisi di provacy verranno occasionalmente mostrati.";
-$a->strings["OStatus conversation completion interval"] = "";
+$a->strings["OStatus conversation completion interval"] = "Intervallo completamento conversazioni OStatus";
-$a->strings["How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."] = "";
+$a->strings["How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."] = "quanto spesso il poller deve controllare se esistono nuovi commenti in una conversazione OStatus? Questo è un lavoro che puo' richiedere molte risorse.";
 $a->strings["Enable Diaspora support"] = "Abilita il supporto a Diaspora";
 $a->strings["Provide built-in Diaspora network compatibility."] = "Fornisce compatibilità con il network Diaspora.";
 $a->strings["Only allow Friendica contacts"] = "Permetti solo contatti Friendica";
@@ -872,73 +872,13 @@ $a->strings["No contacts in common."] = "Nessun contatto in comune.";
 $a->strings["You must be logged in to use addons. "] = "Devi aver effettuato il login per usare gli addons.";
 $a->strings["Applications"] = "Applicazioni";
 $a->strings["No installed applications."] = "Nessuna applicazione installata.";
-$a->strings["Could not access contact record."] = "Non è possibile accedere al contatto.";
+$a->strings["Import"] = "Importa";
-$a->strings["Could not locate selected profile."] = "Non riesco a trovare il profilo selezionato.";
+$a->strings["Move account"] = "Muovi account";
-$a->strings["Contact updated."] = "Contatto aggiornato.";
+$a->strings["You can import an account from another Friendica server."] = "Puoi importare un account da un altro server Friendica.";
-$a->strings["Failed to update contact record."] = "Errore nell'aggiornamento del contatto.";
+$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."] = "Devi esportare il tuo account dal vecchio server e caricarlo qui. Noi ricreeremo il tuo vecchio account qui, con tutti i tuoi contatti. Proveremo anche a informare i tuoi amici che ti sei spostato qui.";
-$a->strings["Contact has been blocked"] = "Il contatto è stato bloccato";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "Questa funzione è sperimentale. Non possiamo importare i contatti dalla rete OStatus (status.net/identi.ca) o da Diaspora";
-$a->strings["Contact has been unblocked"] = "Il contatto è stato sbloccato";
+$a->strings["Account file"] = "File account";
-$a->strings["Contact has been ignored"] = "Il contatto è ignorato";
+$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Per esportare il tuo account, vai su \"Impostazioni -> Esporta i tuoi dati personali\" e seleziona \"Esporta account\"";
-$a->strings["Contact has been unignored"] = "Il contatto non è più ignorato";
-$a->strings["Contact has been archived"] = "Il contatto è stato archiviato";
-$a->strings["Contact has been unarchived"] = "Il contatto è stato dearchiviato";
-$a->strings["Do you really want to delete this contact?"] = "Vuoi veramente cancellare questo contatto?";
-$a->strings["Contact has been removed."] = "Il contatto è stato rimosso.";
-$a->strings["You are mutual friends with %s"] = "Sei amico reciproco con %s";
-$a->strings["You are sharing with %s"] = "Stai condividendo con %s";
-$a->strings["%s is sharing with you"] = "%s sta condividendo con te";
-$a->strings["Private communications are not available for this contact."] = "Le comunicazioni private non sono disponibili per questo contatto.";
-$a->strings["(Update was successful)"] = "(L'aggiornamento è stato completato)";
-$a->strings["(Update was not successful)"] = "(L'aggiornamento non è stato completato)";
-$a->strings["Suggest friends"] = "Suggerisci amici";
-$a->strings["Network type: %s"] = "Tipo di rete: %s";
-$a->strings["View all contacts"] = "Vedi tutti i contatti";
-$a->strings["Toggle Blocked status"] = "Inverti stato \"Blocca\"";
-$a->strings["Unignore"] = "Non ignorare";
-$a->strings["Ignore"] = "Ignora";
-$a->strings["Toggle Ignored status"] = "Inverti stato \"Ignora\"";
-$a->strings["Unarchive"] = "Dearchivia";
-$a->strings["Archive"] = "Archivia";
-$a->strings["Toggle Archive status"] = "Inverti stato \"Archiviato\"";
-$a->strings["Repair"] = "Ripara";
-$a->strings["Advanced Contact Settings"] = "Impostazioni avanzate Contatto";
-$a->strings["Communications lost with this contact!"] = "Comunicazione con questo contatto persa!";
-$a->strings["Contact Editor"] = "Editor dei Contatti";
-$a->strings["Profile Visibility"] = "Visibilità del profilo";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo in modo sicuro.";
-$a->strings["Contact Information / Notes"] = "Informazioni / Note sul contatto";
-$a->strings["Edit contact notes"] = "Modifica note contatto";
-$a->strings["Block/Unblock contact"] = "Blocca/Sblocca contatto";
-$a->strings["Ignore contact"] = "Ignora il contatto";
-$a->strings["Repair URL settings"] = "Impostazioni riparazione URL";
-$a->strings["View conversations"] = "Vedi conversazioni";
-$a->strings["Delete contact"] = "Rimuovi contatto";
-$a->strings["Last update:"] = "Ultimo aggiornamento:";
-$a->strings["Update public posts"] = "Aggiorna messaggi pubblici";
-$a->strings["Currently blocked"] = "Bloccato";
-$a->strings["Currently ignored"] = "Ignorato";
-$a->strings["Currently archived"] = "Al momento archiviato";
-$a->strings["Hide this contact from others"] = "Nascondi questo contatto agli altri";
-$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Risposte ai tuoi post pubblici <strong>possono</strong> essere comunque visibili";
-$a->strings["Suggestions"] = "Suggerimenti";
-$a->strings["Suggest potential friends"] = "Suggerisci potenziali amici";
-$a->strings["All Contacts"] = "Tutti i contatti";
-$a->strings["Show all contacts"] = "Mostra tutti i contatti";
-$a->strings["Unblocked"] = "Sbloccato";
-$a->strings["Only show unblocked contacts"] = "Mostra solo contatti non bloccati";
-$a->strings["Blocked"] = "Bloccato";
-$a->strings["Only show blocked contacts"] = "Mostra solo contatti bloccati";
-$a->strings["Ignored"] = "Ignorato";
-$a->strings["Only show ignored contacts"] = "Mostra solo contatti ignorati";
-$a->strings["Archived"] = "Achiviato";
-$a->strings["Only show archived contacts"] = "Mostra solo contatti archiviati";
-$a->strings["Hidden"] = "Nascosto";
-$a->strings["Only show hidden contacts"] = "Mostra solo contatti nascosti";
-$a->strings["Mutual Friendship"] = "Amicizia reciproca";
-$a->strings["is a fan of yours"] = "è un tuo fan";
-$a->strings["you are a fan of"] = "sei un fan di";
-$a->strings["Search your contacts"] = "Cerca nei tuoi contatti";
-$a->strings["Finding: "] = "Ricerca: ";
 $a->strings["everybody"] = "tutti";
 $a->strings["Additional features"] = "Funzionalità aggiuntive";
 $a->strings["Display settings"] = "Impostazioni grafiche";
@@ -1152,6 +1092,7 @@ $a->strings["Unable to resolve your name at the provided location."] = "Impossib
 $a->strings["You have already introduced yourself here."] = "Ti sei già presentato qui.";
 $a->strings["Apparently you are already friends with %s."] = "Pare che tu e %s siate già amici.";
 $a->strings["Invalid profile URL."] = "Indirizzo profilo non valido.";
+$a->strings["Failed to update contact record."] = "Errore nell'aggiornamento del contatto.";
 $a->strings["Your introduction has been sent."] = "La tua presentazione è stata inviata.";
 $a->strings["Please login to confirm introduction."] = "Accedi per confermare la presentazione.";
 $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Non hai fatto accesso con l'identità corretta. Accedi a <strong>questo</strong> profilo.";
@@ -1174,6 +1115,7 @@ $a->strings["Submit Request"] = "Invia richiesta";
 $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s sta seguendo %3\$s di %2\$s";
 $a->strings["Global Directory"] = "Elenco globale";
 $a->strings["Find on this site"] = "Cerca nel sito";
+$a->strings["Finding: "] = "Ricerca: ";
 $a->strings["Site Directory"] = "Elenco del sito";
 $a->strings["Gender: "] = "Genere:";
 $a->strings["No entries (some entries may be hidden)."] = "Nessuna voce (qualche voce potrebbe essere nascosta).";
@@ -1215,13 +1157,6 @@ $a->strings["Export your account info and contacts. Use this to make a backup of
 $a->strings["Export all"] = "Esporta tutto";
 $a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Esporta le informazioni del tuo account, i tuoi contatti e tutti i tuoi elementi in json. Puo' diventare un file veramente molto grosso e metterci un sacco di tempo. Usa questa funzione per fare un backup completo del tuo account (le foto non sono esportate)";
 $a->strings["- select -"] = "- seleziona -";
-$a->strings["Import"] = "Importa";
-$a->strings["Move account"] = "Muovi account";
-$a->strings["You can import an account from another Friendica server."] = "Puoi importare un account da un altro server Friendica.";
-$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."] = "Devi esportare il tuo account dal vecchio server e caricarlo qui. Noi ricreeremo il tuo vecchio account qui, con tutti i tuoi contatti. Proveremo anche a informare i tuoi amici che ti sei spostato qui.";
-$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "Questa funzione è sperimentale. Non possiamo importare i contatti dalla rete OStatus (status.net/identi.ca) o da Diaspora";
-$a->strings["Account file"] = "File account";
-$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "Per esportare il tuo account, vai su \"Impostazioni -> Esporta i tuoi dati personali\" e seleziona \"Esporta account\"";
 $a->strings["[Embedded content - reload page to view]"] = "[Contenuto incorporato - ricarica la pagina per visualizzarlo correttamente]";
 $a->strings["Contact added"] = "Contatto aggiunto";
 $a->strings["This is Friendica, version"] = "Questo è Friendica, versione";
@@ -1244,6 +1179,7 @@ $a->strings["Group removed."] = "Gruppo rimosso.";
 $a->strings["Unable to remove group."] = "Impossibile rimuovere il gruppo.";
 $a->strings["Group Editor"] = "Modifica gruppo";
 $a->strings["Members"] = "Membri";
+$a->strings["All Contacts"] = "Tutti i contatti";
 $a->strings["No profile"] = "Nessun profilo";
 $a->strings["Help:"] = "Guida:";
 $a->strings["Not Found"] = "Non trovato";
@@ -1364,12 +1300,14 @@ $a->strings["Private messages to this person are at risk of public disclosure."]
 $a->strings["Invalid contact."] = "Contatto non valido.";
 $a->strings["Invalid request identifier."] = "L'identificativo della richiesta non è valido.";
 $a->strings["Discard"] = "Scarta";
+$a->strings["Ignore"] = "Ignora";
 $a->strings["System"] = "Sistema";
 $a->strings["Show Ignored Requests"] = "Mostra richieste ignorate";
 $a->strings["Hide Ignored Requests"] = "Nascondi richieste ignorate";
 $a->strings["Notification type: "] = "Tipo di notifica: ";
 $a->strings["Friend Suggestion"] = "Amico suggerito";
 $a->strings["suggested by %s"] = "sugerito da %s";
+$a->strings["Hide this contact from others"] = "Nascondi questo contatto agli altri";
 $a->strings["Post a new friend activity"] = "Invia una attività \"è ora amico con\"";
 $a->strings["if applicable"] = "se applicabile";
 $a->strings["Claims to be known to you: "] = "Dice di conoscerti: ";
@@ -1503,9 +1441,9 @@ $a->strings["If you don't have a command line version of PHP installed on server
 $a->strings["PHP executable path"] = "Percorso eseguibile PHP";
 $a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Inserisci il percorso completo all'eseguibile di php. Puoi lasciare bianco questo campo per continuare l'installazione.";
 $a->strings["Command line PHP"] = "PHP da riga di comando";
-$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "";
+$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "L'eseguibile PHP non è il binario php cli (potrebbe essere la versione cgi-fcgi)";
 $a->strings["Found PHP version: "] = "Versione PHP:";
-$a->strings["PHP cli binary"] = "";
+$a->strings["PHP cli binary"] = "Binario PHP cli";
 $a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La versione da riga di comando di PHP nel sistema non ha abilitato \"register_argc_argv\".";
 $a->strings["This is required for message delivery to work."] = "E' obbligatorio per far funzionare la consegna dei messaggi.";
 $a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
@@ -1540,6 +1478,68 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ
 $a->strings["Errors encountered creating database tables."] = "La creazione delle tabelle del database ha generato errori.";
 $a->strings["<h1>What next</h1>"] = "<h1>Cosa fare ora</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Devi impostare [manualmente] la pianificazione del poller.";
+$a->strings["Could not access contact record."] = "Non è possibile accedere al contatto.";
+$a->strings["Could not locate selected profile."] = "Non riesco a trovare il profilo selezionato.";
+$a->strings["Contact updated."] = "Contatto aggiornato.";
+$a->strings["Contact has been blocked"] = "Il contatto è stato bloccato";
+$a->strings["Contact has been unblocked"] = "Il contatto è stato sbloccato";
+$a->strings["Contact has been ignored"] = "Il contatto è ignorato";
+$a->strings["Contact has been unignored"] = "Il contatto non è più ignorato";
+$a->strings["Contact has been archived"] = "Il contatto è stato archiviato";
+$a->strings["Contact has been unarchived"] = "Il contatto è stato dearchiviato";
+$a->strings["Do you really want to delete this contact?"] = "Vuoi veramente cancellare questo contatto?";
+$a->strings["Contact has been removed."] = "Il contatto è stato rimosso.";
+$a->strings["You are mutual friends with %s"] = "Sei amico reciproco con %s";
+$a->strings["You are sharing with %s"] = "Stai condividendo con %s";
+$a->strings["%s is sharing with you"] = "%s sta condividendo con te";
+$a->strings["Private communications are not available for this contact."] = "Le comunicazioni private non sono disponibili per questo contatto.";
+$a->strings["(Update was successful)"] = "(L'aggiornamento è stato completato)";
+$a->strings["(Update was not successful)"] = "(L'aggiornamento non è stato completato)";
+$a->strings["Suggest friends"] = "Suggerisci amici";
+$a->strings["Network type: %s"] = "Tipo di rete: %s";
+$a->strings["View all contacts"] = "Vedi tutti i contatti";
+$a->strings["Toggle Blocked status"] = "Inverti stato \"Blocca\"";
+$a->strings["Unignore"] = "Non ignorare";
+$a->strings["Toggle Ignored status"] = "Inverti stato \"Ignora\"";
+$a->strings["Unarchive"] = "Dearchivia";
+$a->strings["Archive"] = "Archivia";
+$a->strings["Toggle Archive status"] = "Inverti stato \"Archiviato\"";
+$a->strings["Repair"] = "Ripara";
+$a->strings["Advanced Contact Settings"] = "Impostazioni avanzate Contatto";
+$a->strings["Communications lost with this contact!"] = "Comunicazione con questo contatto persa!";
+$a->strings["Contact Editor"] = "Editor dei Contatti";
+$a->strings["Profile Visibility"] = "Visibilità del profilo";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo in modo sicuro.";
+$a->strings["Contact Information / Notes"] = "Informazioni / Note sul contatto";
+$a->strings["Edit contact notes"] = "Modifica note contatto";
+$a->strings["Block/Unblock contact"] = "Blocca/Sblocca contatto";
+$a->strings["Ignore contact"] = "Ignora il contatto";
+$a->strings["Repair URL settings"] = "Impostazioni riparazione URL";
+$a->strings["View conversations"] = "Vedi conversazioni";
+$a->strings["Delete contact"] = "Rimuovi contatto";
+$a->strings["Last update:"] = "Ultimo aggiornamento:";
+$a->strings["Update public posts"] = "Aggiorna messaggi pubblici";
+$a->strings["Currently blocked"] = "Bloccato";
+$a->strings["Currently ignored"] = "Ignorato";
+$a->strings["Currently archived"] = "Al momento archiviato";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Risposte ai tuoi post pubblici <strong>possono</strong> essere comunque visibili";
+$a->strings["Suggestions"] = "Suggerimenti";
+$a->strings["Suggest potential friends"] = "Suggerisci potenziali amici";
+$a->strings["Show all contacts"] = "Mostra tutti i contatti";
+$a->strings["Unblocked"] = "Sbloccato";
+$a->strings["Only show unblocked contacts"] = "Mostra solo contatti non bloccati";
+$a->strings["Blocked"] = "Bloccato";
+$a->strings["Only show blocked contacts"] = "Mostra solo contatti bloccati";
+$a->strings["Ignored"] = "Ignorato";
+$a->strings["Only show ignored contacts"] = "Mostra solo contatti ignorati";
+$a->strings["Archived"] = "Achiviato";
+$a->strings["Only show archived contacts"] = "Mostra solo contatti archiviati";
+$a->strings["Hidden"] = "Nascosto";
+$a->strings["Only show hidden contacts"] = "Mostra solo contatti nascosti";
+$a->strings["Mutual Friendship"] = "Amicizia reciproca";
+$a->strings["is a fan of yours"] = "è un tuo fan";
+$a->strings["you are a fan of"] = "sei un fan di";
+$a->strings["Search your contacts"] = "Cerca nei tuoi contatti";
 $a->strings["Post successful."] = "Inviato!";
 $a->strings["OpenID protocol error. No ID returned."] = "Errore protocollo OpenID. Nessun ID ricevuto.";
 $a->strings["Account not found and OpenID registration is not permitted on this site."] = "L'account non è stato trovato, e la registrazione via OpenID non è permessa su questo sito.";

view/nl/follow_notify_eml.tpl

@@ -0,0 +1,14 @@
+
+Beste $[myname]
+
+U heeft een nieuw contact op $[sitename] -  '$[requestor]'.
+
+U kunt het profiel bezoeken op $[url]
+
+U moet op uw Friendica-site inloggen om het verzoek goed te keuren, te negeren of the annuleren.
+
+$[siteurl]
+
+Vriendelijke groet,
+
+	Beheerder $[sitename]

view/nl/friend_complete_eml.tpl

@@ -0,0 +1,22 @@
+
+Beste $[username],
+
+	Goed nieuws... '$[fn]' op '$[dfrn_url]' heeft uw 
+contactaanvraag goedgekeurd op '$[sitename]'.
+
+U bent nu in contact met elkaar en kan statusberichten, foto's en e-mail uitwisselen,
+zonder beperkingen.
+
+Bezoek uw 'Contacten'-pagina op $[sitename] wanneer u de instellingen 
+van dit contact wilt veranderen. 
+
+$[siteurl]
+
+[U kunt bijvoorbeeld een apart profiel aanmaken met informatie dat niet door
+iedereen valt in te zien, maar wel door '$[fn]'].
+
+Vriendelijke groet,
+
+	Beheerder $[sitename]
+
+ 

view/nl/intro_complete_eml.tpl

@@ -0,0 +1,22 @@
+
+Beste $[username],
+
+	'$[fn]' op '$[dfrn_url]' heeft uw 
+contactaanvraag goedgekeurd op '$[sitename]'.
+
+	'$[fn]' heeft besloten om u de status van "fan" te geven. 
+Hierdoor kunt u bijvoorbeeld geen privéberichten uitwisselen en gelden er enkele profielrestricties.
+Wanneer dit een pagina voor een beroemdheid of een gemeenschap is, zijn deze
+instellingen automatisch toegepast.
+
+	'$[fn]' kan er voor kiezen om in de toekomst deze contactrestricties uit te breiden of 
+om ze te verminderen. 
+
+	U ontvangt vanaf nu openbare statusupdates van '$[fn]'. 
+Deze kunt u zien op uw 'Netwerk'-pagina op  
+
+$[siteurl]
+
+Vriendelijke groet,
+
+	Beheerder $[sitename]

view/nl/lostpass_eml.tpl

@@ -0,0 +1,32 @@
+
+Beste $[username],
+	Een verzoek werd onlangs ontvangen van $[sitename] om uw account te herstellen 
+wachtwoord. Om dit te bevestigen, selecteert u de verificatie-link
+hieronder of plak deze in je web browser adresbalk. 
+
+Als je GEEN wachtwoord hebt aangevraagd gebruik deze link dan NIET
+verstrekt en te negeren en / of verwijderen van deze e-mail. 
+
+Uw wachtwoord wordt niet gewijzigd, tenzij we kunnen controleren of u
+dit heeft aangevraagd 
+
+Volg deze link om uw identiteit te verifiëren:
+
+$[reset_link]
+
+U ontvangt dan een follow-up bericht met het nieuwe wachtwoord.
+
+U kunt u wachtwoord wijzigen in gebruikers instellingen na het inloggen
+
+De login-gegevens zijn als volgt:
+
+site locatie:»$[siteurl]
+Gebruikers naam:»$[email]
+
+
+
+
+Met vriendelijke groet,
+	$[sitename] Administrator
+
+ 

view/nl/passchanged_eml.tpl

@@ -0,0 +1,20 @@
+
+Beste $[username],
+	Uw wachtwoord is veranderd op uw verzoek. Onthou dit 
+wachtwoord goed (of verander het wachtwoord naar een 
+die u beter kunt onthouden).
+
+
+Uw inloginformatie is als volgt:
+
+Friendica-site:»$[siteurl]
+Inlognaam:$[email]
+Wachtwoord:»$[new_password]
+
+U kunt dit wachtwoord veranderen in uw account-instellingen, nadat u bent ingelogd.
+
+
+Vriendelijke groet,
+	Beheerder: $[sitename]
+
+ 

view/nl/register_open_eml.tpl

@@ -0,0 +1,34 @@
+
+Beste $[username],
+	Bedankt voor uw registratie op $[sitename]. Uw account is gecreëerd.  
+De inloggegevens zijn als volgt:
+
+
+Website-adres:»$[siteurl]
+Inlognaam:»$[email]
+Wachtwoord:»$[password]
+
+U kunt dit wachtwoord veranderen in uw account-instellingen, nadat u bent 
+ingelogd.
+
+Neem even een moment om de overige account-instellingen na te gaan.
+
+U wilt misschien ook wat algemene informatie toevoegen aan uw standaardprofiel 
+(op de "Profiel"-pagina), zodat andere mensen u eenvoudiger kunnen vinden.
+
+Wanneer u niet te specifiek wilt zijn, dan adviseren wij om uw volledige naam,
+een profielfoto, enkele "trefwoorden (erg handig om nieuwe mensen te leren kennen) 
+en het land waar u woont toe
+te voegen.
+
+Wij respecteren volledig uw recht op privacy en u bent daarom niet verplicht om hier iets in te vullen. 
+Wanneer u hier nieuw bent en hier niemand kent, dan kunnen deze
+gegevens u wellicht helpen om enkele nieuwe en interessante mensen te leren kennen.  
+
+
+Bedankt en welkom op $[sitename].
+
+Vriendelijke groet,
+	Beheerder $[sitename]
+
+ 

view/nl/register_verify_eml.tpl

@@ -0,0 +1,25 @@
+
+Er heeft zich op $[sitename] een nieuwe gebruiker aangemeld. Dit verzoek vereist  
+uw toestemming. 
+
+
+De inloggegevens zijn als volgt:
+
+Volledige naam:»$[username]
+Friendica-site:»$[siteurl]
+Inlognaam:»$[email]
+
+
+Om dit verzoek goed te keuren moet u op de volgende link klikken:
+
+
+$[siteurl]/regmod/allow/$[hash] 
+
+
+Om dit verzoek af te keuren en de nieuwe gebruiker weer te verwijderen, moet u op de volgende link klikken:
+
+
+$[siteurl]/regmod/deny/$[hash]
+
+
+Bedankt.

view/nl/request_notify_eml.tpl

@@ -0,0 +1,17 @@
+
+Beste $[myname],
+
+U heeft zojuist een contactaanvraag ontvangen op $[sitename] 
+
+van '$[requestor]'.
+
+U kunt het profiel bezoeken op $[url].
+
+U moet op uw Friendica-site inloggen om de volledige contactaanvraag te bekijken en 
+goed te keuren, of om te negeren/annuleren.
+
+$[siteurl]
+
+Vriendelijke groet,
+
+	Beheerder $[sitename]

view/nl/update_fail_eml.tpl

@@ -0,0 +1,11 @@
+Hallo, 
+Ik ben $sitename;   
+De friendica ontwikkelaars hebben update $update vrijgegeven. 
+Maar toen ik probeerde te installeren ging het vreselijk fout  
+Dit moet snel gerepareerd worden maar dat kan ik niet alleen, Contacteer a.u.b. 
+een Friendica ontwikkelaar als je me niet zelf kunt helpen. Mijn database kan ongeldig zijn. 
+
+De foutmeldimg is '$error'.   
+
+Sorry, 
+je Friendica server op $siteurl

view/pl/strings.php

@@ -277,12 +277,12 @@ $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'"] = "Nie można zlokalizować serwera DNS dla bazy danych '%s'";
+$a->strings["newer"] = "nowsze";
+$a->strings["older"] = "starsze";
 $a->strings["prev"] = "poprzedni";
 $a->strings["first"] = "pierwszy";
 $a->strings["last"] = "ostatni";
 $a->strings["next"] = "następny";
-$a->strings["newer"] = "nowsze";
-$a->strings["older"] = "starsze";
 $a->strings["No contacts"] = "Brak kontaktów";
 $a->strings["%d Contact"] = array(
 	0 => "%d kontakt",
@@ -651,7 +651,7 @@ $a->strings["Community/Celebrity Account"] = "Konto społeczności/gwiazdy";
 $a->strings["Automatic Friend Account"] = "Automatyczny przyjaciel konta";
 $a->strings["Blog Account"] = "Konto Bloga";
 $a->strings["Private Forum"] = "Forum Prywatne";
-$a->strings["Message queues"] = "";
+$a->strings["Message queues"] = "Wiadomości";
 $a->strings["Administration"] = "Administracja";
 $a->strings["Summary"] = "Skrót";
 $a->strings["Registered users"] = "Zarejestrowani użytkownicy";
@@ -659,50 +659,50 @@ $a->strings["Pending registrations"] = "Rejestracje w toku.";
 $a->strings["Version"] = "Wersja";
 $a->strings["Active plugins"] = "Aktywne pluginy";
 $a->strings["Site settings updated."] = "Ustawienia strony zaktualizowane";
-$a->strings["No special theme for mobile devices"] = "";
+$a->strings["No special theme for mobile devices"] = "Brak specialnego motywu dla urządzeń mobilnych";
 $a->strings["Never"] = "Nigdy";
-$a->strings["Multi user instance"] = "";
+$a->strings["Multi user instance"] = "Tryb MultiUsera";
 $a->strings["Closed"] = "Zamknięty";
 $a->strings["Requires approval"] = "Wymagane zatwierdzenie.";
 $a->strings["Open"] = "Otwórz";
-$a->strings["No SSL policy, links will track page SSL state"] = "";
+$a->strings["No SSL policy, links will track page SSL state"] = "Brak SSL , linki będą śledzić stan SSL .";
-$a->strings["Force all links to use SSL"] = "";
+$a->strings["Force all links to use SSL"] = "Wymuś by linki używały SSL.";
-$a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "";
+$a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Wewnętrzne Certyfikaty , użyj SSL tylko dla linków lokalnych . ";
 $a->strings["Registration"] = "Rejestracja";
 $a->strings["File upload"] = "Plik załadowano";
 $a->strings["Policies"] = "zasady";
 $a->strings["Advanced"] = "Zaawansowany";
-$a->strings["Performance"] = "";
+$a->strings["Performance"] = "Ustawienia";
 $a->strings["Site name"] = "Nazwa strony";
 $a->strings["Banner/Logo"] = "Logo";
 $a->strings["System language"] = "Język systemu";
 $a->strings["System theme"] = "Motyw systemowy";
-$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "";
+$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Domyślny motyw systemu - może być nadpisany przez profil użytkownika  <a href='#' id='cnftheme'>zmień ustawienia motywów</a>";
 $a->strings["Mobile system theme"] = "Mobilny motyw systemowy";
 $a->strings["Theme for mobile devices"] = "Szablon dla mobilnych urządzeń";
-$a->strings["SSL link policy"] = "";
+$a->strings["SSL link policy"] = "polityka SSL";
-$a->strings["Determines whether generated links should be forced to use SSL"] = "";
+$a->strings["Determines whether generated links should be forced to use SSL"] = "Określa kiedy generowane linki powinny używać wymuszonego SSl.";
 $a->strings["'Share' element"] = "'Udostępnij' element";
-$a->strings["Activates the bbcode element 'share' for repeating items."] = "";
+$a->strings["Activates the bbcode element 'share' for repeating items."] = "Aktywuje element BBcode 'dziel ' dla powtarzając się części.";
-$a->strings["Hide help entry from navigation menu"] = "";
+$a->strings["Hide help entry from navigation menu"] = "Wyłącz pomoc w menu nawigacyjnym ";
-$a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "";
+$a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Chowa pozycje menu dla stron pomocy ze strony nawigacyjnej. Możesz nadal ją wywołać poprzez komendę /help.";
-$a->strings["Single user instance"] = "";
+$a->strings["Single user instance"] = "Tryb SingleUsera";
-$a->strings["Make this instance multi-user or single-user for the named user"] = "";
+$a->strings["Make this instance multi-user or single-user for the named user"] = "Ustawia tryb multi lub single dla wybranych użytkowników.";
 $a->strings["Maximum image size"] = "Maksymalny rozmiar zdjęcia";
-$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "";
+$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maksymalny rozmiar w bitach dla wczytywanego obrazu . Domyślnie jest to  0 , co oznacza bez limitu .";
 $a->strings["Maximum image length"] = "Maksymalna długość obrazu";
 $a->strings["Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."] = "Maksymalna długość najdłuższej strony przesyłanego obrazu w pikselach.\nDomyślnie jest to -1, co oznacza brak limitu.";
 $a->strings["JPEG image quality"] = "jakość obrazu JPEG";
-$a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "";
+$a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Wczytywanie JPEGS będzie zapisane z tymi ustawieniami jakości [0-100] . Domyslnie jest ustawione 100 co oznacza brak strat jakości . ";
 $a->strings["Register policy"] = "Zarejestruj polisę";
 $a->strings["Maximum Daily Registrations"] = "Maksymalnie dziennych rejestracji";
 $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"] = "Zarejestruj tekst";
 $a->strings["Will be displayed prominently on the registration page."] = "";
 $a->strings["Accounts abandoned after x days"] = "Konto porzucone od x dni.";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "";
+$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Nie będzie marnować zasobów systemu wypytując zewnętrzne strony o opuszczone konta. Ustaw 0 dla braku limitu czasu .";
 $a->strings["Allowed friend domains"] = "Dozwolone domeny przyjaciół";
-$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "";
+$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Lista domen separowana przecinkami  które mogą zaprzyjaźnić się z tą stroną . Wildcards są akceptowane . Pozostaw puste by zezwolić każdej domenie na zapryjaźnienie. ";
 $a->strings["Allowed email domains"] = "Dozwolone domeny e-mailowe";
 $a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "";
 $a->strings["Block public"] = "Blokuj publicznie";
@@ -862,90 +862,30 @@ $a->strings["Item was not found."] = "Element nie znaleziony.";
 $a->strings["Remove My Account"] = "Usuń konto";
 $a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Kompletne usunięcie konta. Jeżeli zostanie wykonane, konto nie może zostać odzyskane.";
 $a->strings["Please enter your password for verification:"] = "Wprowadź hasło w celu weryfikacji.";
-$a->strings["Source (bbcode) text:"] = "";
+$a->strings["Source (bbcode) text:"] = "Źródło - tekst (BBcode) :";
-$a->strings["Source (Diaspora) text to convert to BBcode:"] = "";
+$a->strings["Source (Diaspora) text to convert to BBcode:"] = "Źródło tekst (Diaspora) by przekonwerterować na BBcode :";
-$a->strings["Source input: "] = "";
+$a->strings["Source input: "] = "Źródło wejścia:";
-$a->strings["bb2html (raw HTML): "] = "";
+$a->strings["bb2html (raw HTML): "] = "bb2html (raw HTML): ";
 $a->strings["bb2html: "] = "bb2html: ";
 $a->strings["bb2html2bb: "] = "bb2html2bb: ";
 $a->strings["bb2md: "] = "bb2md: ";
 $a->strings["bb2md2html: "] = "bb2md2html: ";
 $a->strings["bb2dia2bb: "] = "bb2dia2bb: ";
 $a->strings["bb2md2html2bb: "] = "bb2md2html2bb: ";
-$a->strings["Source input (Diaspora format): "] = "";
+$a->strings["Source input (Diaspora format): "] = "Źródło wejścia(format Diaspory):";
 $a->strings["diaspora2bb: "] = "diaspora2bb: ";
 $a->strings["Common Friends"] = "Wspólni znajomi";
 $a->strings["No contacts in common."] = "";
 $a->strings["You must be logged in to use addons. "] = "";
 $a->strings["Applications"] = "Aplikacje";
 $a->strings["No installed applications."] = "Brak zainstalowanych aplikacji.";
-$a->strings["Could not access contact record."] = "Nie można uzyskać dostępu do rejestru kontaktów.";
+$a->strings["Import"] = "Import";
-$a->strings["Could not locate selected profile."] = "Nie można znaleźć wybranego profilu.";
+$a->strings["Move account"] = "Przenieś konto";
-$a->strings["Contact updated."] = "Kontakt zaktualizowany";
+$a->strings["You can import an account from another Friendica server."] = "";
-$a->strings["Failed to update contact record."] = "Aktualizacja nagrania kontaktu nie powiodła się.";
+$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["Contact has been blocked"] = "Kontakt został zablokowany";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "";
-$a->strings["Contact has been unblocked"] = "Kontakt został odblokowany";
+$a->strings["Account file"] = "";
-$a->strings["Contact has been ignored"] = "Kontakt jest ignorowany";
+$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "";
-$a->strings["Contact has been unignored"] = "Kontakt nie jest ignorowany";
-$a->strings["Contact has been archived"] = "Kontakt został zarchiwizowany";
-$a->strings["Contact has been unarchived"] = "";
-$a->strings["Do you really want to delete this contact?"] = "";
-$a->strings["Contact has been removed."] = "Kontakt został usunięty.";
-$a->strings["You are mutual friends with %s"] = "Jesteś już znajomym z %s";
-$a->strings["You are sharing with %s"] = "Współdzielisz z %s";
-$a->strings["%s is sharing with you"] = "%s współdzieli z tobą";
-$a->strings["Private communications are not available for this contact."] = "Prywatna rozmowa jest niemożliwa dla tego kontaktu";
-$a->strings["(Update was successful)"] = "(Aktualizacja przebiegła pomyślnie)";
-$a->strings["(Update was not successful)"] = "(Aktualizacja nie powiodła się)";
-$a->strings["Suggest friends"] = "Osoby, które możesz znać";
-$a->strings["Network type: %s"] = "Typ sieci: %s";
-$a->strings["View all contacts"] = "Zobacz wszystkie kontakty";
-$a->strings["Toggle Blocked status"] = "";
-$a->strings["Unignore"] = "Odblokuj";
-$a->strings["Ignore"] = "Ignoruj";
-$a->strings["Toggle Ignored status"] = "";
-$a->strings["Unarchive"] = "Przywróć z archiwum";
-$a->strings["Archive"] = "Archiwum";
-$a->strings["Toggle Archive status"] = "";
-$a->strings["Repair"] = "Napraw";
-$a->strings["Advanced Contact Settings"] = "Zaawansowane ustawienia kontaktów";
-$a->strings["Communications lost with this contact!"] = "Komunikacja przerwana z tym kontaktem!";
-$a->strings["Contact Editor"] = "Edytor kontaktów";
-$a->strings["Profile Visibility"] = "Widoczność profilu";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Wybierz profil, który chcesz bezpiecznie wyświetlić %s";
-$a->strings["Contact Information / Notes"] = "Informacja o kontakcie / Notka";
-$a->strings["Edit contact notes"] = "Edytuj notatki kontaktu";
-$a->strings["Block/Unblock contact"] = "Zablokuj/odblokuj kontakt";
-$a->strings["Ignore contact"] = "Ignoruj kontakt";
-$a->strings["Repair URL settings"] = "Napraw ustawienia adresu";
-$a->strings["View conversations"] = "Zobacz rozmowę";
-$a->strings["Delete contact"] = "Usuń kontakt";
-$a->strings["Last update:"] = "Ostatnia aktualizacja:";
-$a->strings["Update public posts"] = "Zaktualizuj publiczne posty";
-$a->strings["Currently blocked"] = "Obecnie zablokowany";
-$a->strings["Currently ignored"] = "Obecnie zignorowany";
-$a->strings["Currently archived"] = "Obecnie zarchiwizowany";
-$a->strings["Hide this contact from others"] = "Ukryj ten kontakt przed innymi";
-$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Odpowiedzi/kliknięcia \"lubię to\" do twoich publicznych postów nadal <strong>mogą</strong> być widoczne";
-$a->strings["Suggestions"] = "Sugestie";
-$a->strings["Suggest potential friends"] = "Sugerowani znajomi";
-$a->strings["All Contacts"] = "Wszystkie kontakty";
-$a->strings["Show all contacts"] = "Pokaż wszystkie kontakty";
-$a->strings["Unblocked"] = "Odblokowany";
-$a->strings["Only show unblocked contacts"] = "Pokaż tylko odblokowane kontakty";
-$a->strings["Blocked"] = "Zablokowany";
-$a->strings["Only show blocked contacts"] = "Pokaż tylko zablokowane kontakty";
-$a->strings["Ignored"] = "Zignorowany";
-$a->strings["Only show ignored contacts"] = "Pokaż tylko ignorowane kontakty";
-$a->strings["Archived"] = "Zarchiwizowane";
-$a->strings["Only show archived contacts"] = "Pokaż tylko zarchiwizowane kontakty";
-$a->strings["Hidden"] = "Ukryty";
-$a->strings["Only show hidden contacts"] = "Pokaż tylko ukryte kontakty";
-$a->strings["Mutual Friendship"] = "Wzajemna przyjaźń";
-$a->strings["is a fan of yours"] = "jest twoim fanem";
-$a->strings["you are a fan of"] = "jesteś fanem";
-$a->strings["Search your contacts"] = "Wyszukaj w kontaktach";
-$a->strings["Finding: "] = "Znalezione:";
 $a->strings["everybody"] = "wszyscy";
 $a->strings["Additional features"] = "";
 $a->strings["Display settings"] = "Wyświetl ustawienia";
@@ -1155,11 +1095,12 @@ $a->strings["Spam protection measures have been invoked."] = "Ochrona przed spam
 $a->strings["Friends are advised to please try again in 24 hours."] = "Przyjaciele namawiają do spróbowania za 24h.";
 $a->strings["Invalid locator"] = "Niewłaściwy lokalizator ";
 $a->strings["Invalid email address."] = "Nieprawidłowy adres email.";
-$a->strings["This account has not been configured for email. Request failed."] = "";
+$a->strings["This account has not been configured for email. Request failed."] = "Te konto nie zostało skonfigurowane do poczty e mail . Niepowodzenie .";
 $a->strings["Unable to resolve your name at the provided location."] = "Nie można rozpoznać twojej nazwy w przewidzianym miejscu.";
 $a->strings["You have already introduced yourself here."] = "Już się tu przedstawiłeś.";
 $a->strings["Apparently you are already friends with %s."] = "Widocznie jesteście już znajomymi z %s";
 $a->strings["Invalid profile URL."] = "Zły adres URL profilu.";
+$a->strings["Failed to update contact record."] = "Aktualizacja nagrania kontaktu nie powiodła się.";
 $a->strings["Your introduction has been sent."] = "Twoje dane zostały wysłane.";
 $a->strings["Please login to confirm introduction."] = "Proszę zalogować się do potwierdzenia wstępu.";
 $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Niepoprawna tożsamość obecnego użytkownika. Proszę zalogować się na <strong>tego</strong> użytkownika. ";
@@ -1167,21 +1108,22 @@ $a->strings["Hide this contact"] = "Ukryj kontakt";
 $a->strings["Welcome home %s."] = "Welcome home %s.";
 $a->strings["Please confirm your introduction/connection request to %s."] = "Proszę potwierdzić swój wstęp/prośbę o połączenie do %s.";
 $a->strings["Confirm"] = "Potwierdź";
-$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "";
+$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Proszę podaj swój \"Adres tożsamości \" z jednej z możliwych wspieranych sieci komunikacyjnych .";
-$a->strings["<strike>Connect as an email follower</strike> (Coming soon)"] = "";
+$a->strings["<strike>Connect as an email follower</strike> (Coming soon)"] = "<strike>Połącz jako użytkownika e mail (tylko)</strike> (Niebawem)";
-$a->strings["If you are not yet a member of the free social web, <a href=\"http://dir.friendica.com/siteinfo\">follow this link to find a public Friendica site and join us today</a>."] = "";
+$a->strings["If you are not yet a member of the free social web, <a href=\"http://dir.friendica.com/siteinfo\">follow this link to find a public Friendica site and join us today</a>."] = "Jeśli nie jesteś członkiem darmowej sieci społecznościowej <a href=\"http://dir.friendica.com/siteinfo\"> kliknij w ten link by odkryć czym jest Friendica i dołącz do niej dziś </a>.";
 $a->strings["Friend/Connection Request"] = "Przyjaciel/Prośba o połączenie";
-$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "";
+$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Przykład : jojo@demo.friendica.com , http://demofriendica.com/profile/jojo , testuser@identi.ca";
 $a->strings["Please answer the following:"] = "Proszę odpowiedzieć na poniższe:";
 $a->strings["Does %s know you?"] = "Czy %s Cię zna?";
 $a->strings["Add a personal note:"] = "Dodaj osobistą notkę:";
 $a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Sieć społeczna";
-$a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = "";
+$a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = "- proszę wyraź to inaczej . Zamiast tego ,wprowadź %s do swojej belki wyszukiwarki.";
 $a->strings["Your Identity Address:"] = "Twój zidentyfikowany adres:";
 $a->strings["Submit Request"] = "Wyślij zgłoszenie";
 $a->strings["%1\$s is following %2\$s's %3\$s"] = "";
 $a->strings["Global Directory"] = "Globalne Położenie";
 $a->strings["Find on this site"] = "Znajdź na tej stronie";
+$a->strings["Finding: "] = "Znalezione:";
 $a->strings["Site Directory"] = "Katalog Strony";
 $a->strings["Gender: "] = "Płeć: ";
 $a->strings["No entries (some entries may be hidden)."] = "Brak odwiedzin (niektóre odwiedziny mogą być ukryte).";
@@ -1223,14 +1165,7 @@ $a->strings["Export your account info and contacts. Use this to make a backup of
 $a->strings["Export all"] = "Eksportuj wszystko";
 $a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "";
 $a->strings["- select -"] = "- wybierz -";
-$a->strings["Import"] = "Import";
+$a->strings["[Embedded content - reload page to view]"] = "[Dodatkowa zawartość - odśwież stronę by zobaczyć]";
-$a->strings["Move account"] = "Przenieś konto";
-$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["[Embedded content - reload page to view]"] = "";
 $a->strings["Contact added"] = "Kontakt dodany";
 $a->strings["This is Friendica, version"] = "To jest Friendica, wersja";
 $a->strings["running at web location"] = "otwierane na serwerze";
@@ -1252,6 +1187,7 @@ $a->strings["Group removed."] = "Grupa usunięta.";
 $a->strings["Unable to remove group."] = "Nie można usunąć grupy.";
 $a->strings["Group Editor"] = "Edytor grupy";
 $a->strings["Members"] = "Członkowie";
+$a->strings["All Contacts"] = "Wszystkie kontakty";
 $a->strings["No profile"] = "Brak profilu";
 $a->strings["Help:"] = "Pomoc:";
 $a->strings["Not Found"] = "Nie znaleziono";
@@ -1375,12 +1311,14 @@ $a->strings["Private messages to this person are at risk of public disclosure."]
 $a->strings["Invalid contact."] = "Zły kontakt";
 $a->strings["Invalid request identifier."] = "Niewłaściwy identyfikator wymagania.";
 $a->strings["Discard"] = "Odrzuć";
+$a->strings["Ignore"] = "Ignoruj";
 $a->strings["System"] = "System";
 $a->strings["Show Ignored Requests"] = "Pokaż ignorowane żądania";
 $a->strings["Hide Ignored Requests"] = "Ukryj ignorowane żądania";
 $a->strings["Notification type: "] = "Typ zawiadomień:";
 $a->strings["Friend Suggestion"] = "Propozycja znajomych";
 $a->strings["suggested by %s"] = "zaproponowane przez %s";
+$a->strings["Hide this contact from others"] = "Ukryj ten kontakt przed innymi";
 $a->strings["Post a new friend activity"] = "Pisz o nowej działalności przyjaciela";
 $a->strings["if applicable"] = "jeśli odpowiednie";
 $a->strings["Claims to be known to you: "] = "Twierdzi, że go znasz:";
@@ -1489,7 +1427,7 @@ $a->strings["Go to the Help Section"] = "Idź do części o pomocy";
 $a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "";
 $a->strings["Requested profile is not available."] = "Żądany profil jest niedostępny";
 $a->strings["Tips for New Members"] = "Wskazówki dla nowych użytkowników";
-$a->strings["Friendica Social Communications Server - Setup"] = "";
+$a->strings["Friendica Communications Server - Setup"] = "";
 $a->strings["Could not connect to database."] = "Nie można nawiązać połączenia z bazą danych";
 $a->strings["Could not create table."] = "Nie mogę stworzyć tabeli.";
 $a->strings["Your Friendica site database has been installed."] = "";
@@ -1551,9 +1489,71 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ
 $a->strings["Errors encountered creating database tables."] = "Zostały napotkane błędy przy tworzeniu tabeli bazy danych.";
 $a->strings["<h1>What next</h1>"] = "<h1>Co dalej</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WAŻNE: Musisz [ręcznie] skonfigurowć zaplanowane zadanie dla poller.";
+$a->strings["Could not access contact record."] = "Nie można uzyskać dostępu do rejestru kontaktów.";
+$a->strings["Could not locate selected profile."] = "Nie można znaleźć wybranego profilu.";
+$a->strings["Contact updated."] = "Kontakt zaktualizowany";
+$a->strings["Contact has been blocked"] = "Kontakt został zablokowany";
+$a->strings["Contact has been unblocked"] = "Kontakt został odblokowany";
+$a->strings["Contact has been ignored"] = "Kontakt jest ignorowany";
+$a->strings["Contact has been unignored"] = "Kontakt nie jest ignorowany";
+$a->strings["Contact has been archived"] = "Kontakt został zarchiwizowany";
+$a->strings["Contact has been unarchived"] = "";
+$a->strings["Do you really want to delete this contact?"] = "";
+$a->strings["Contact has been removed."] = "Kontakt został usunięty.";
+$a->strings["You are mutual friends with %s"] = "Jesteś już znajomym z %s";
+$a->strings["You are sharing with %s"] = "Współdzielisz z %s";
+$a->strings["%s is sharing with you"] = "%s współdzieli z tobą";
+$a->strings["Private communications are not available for this contact."] = "Prywatna rozmowa jest niemożliwa dla tego kontaktu";
+$a->strings["(Update was successful)"] = "(Aktualizacja przebiegła pomyślnie)";
+$a->strings["(Update was not successful)"] = "(Aktualizacja nie powiodła się)";
+$a->strings["Suggest friends"] = "Osoby, które możesz znać";
+$a->strings["Network type: %s"] = "Typ sieci: %s";
+$a->strings["View all contacts"] = "Zobacz wszystkie kontakty";
+$a->strings["Toggle Blocked status"] = "";
+$a->strings["Unignore"] = "Odblokuj";
+$a->strings["Toggle Ignored status"] = "";
+$a->strings["Unarchive"] = "Przywróć z archiwum";
+$a->strings["Archive"] = "Archiwum";
+$a->strings["Toggle Archive status"] = "";
+$a->strings["Repair"] = "Napraw";
+$a->strings["Advanced Contact Settings"] = "Zaawansowane ustawienia kontaktów";
+$a->strings["Communications lost with this contact!"] = "Komunikacja przerwana z tym kontaktem!";
+$a->strings["Contact Editor"] = "Edytor kontaktów";
+$a->strings["Profile Visibility"] = "Widoczność profilu";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Wybierz profil, który chcesz bezpiecznie wyświetlić %s";
+$a->strings["Contact Information / Notes"] = "Informacja o kontakcie / Notka";
+$a->strings["Edit contact notes"] = "Edytuj notatki kontaktu";
+$a->strings["Block/Unblock contact"] = "Zablokuj/odblokuj kontakt";
+$a->strings["Ignore contact"] = "Ignoruj kontakt";
+$a->strings["Repair URL settings"] = "Napraw ustawienia adresu";
+$a->strings["View conversations"] = "Zobacz rozmowę";
+$a->strings["Delete contact"] = "Usuń kontakt";
+$a->strings["Last update:"] = "Ostatnia aktualizacja:";
+$a->strings["Update public posts"] = "Zaktualizuj publiczne posty";
+$a->strings["Currently blocked"] = "Obecnie zablokowany";
+$a->strings["Currently ignored"] = "Obecnie zignorowany";
+$a->strings["Currently archived"] = "Obecnie zarchiwizowany";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Odpowiedzi/kliknięcia \"lubię to\" do twoich publicznych postów nadal <strong>mogą</strong> być widoczne";
+$a->strings["Suggestions"] = "Sugestie";
+$a->strings["Suggest potential friends"] = "Sugerowani znajomi";
+$a->strings["Show all contacts"] = "Pokaż wszystkie kontakty";
+$a->strings["Unblocked"] = "Odblokowany";
+$a->strings["Only show unblocked contacts"] = "Pokaż tylko odblokowane kontakty";
+$a->strings["Blocked"] = "Zablokowany";
+$a->strings["Only show blocked contacts"] = "Pokaż tylko zablokowane kontakty";
+$a->strings["Ignored"] = "Zignorowany";
+$a->strings["Only show ignored contacts"] = "Pokaż tylko ignorowane kontakty";
+$a->strings["Archived"] = "Zarchiwizowane";
+$a->strings["Only show archived contacts"] = "Pokaż tylko zarchiwizowane kontakty";
+$a->strings["Hidden"] = "Ukryty";
+$a->strings["Only show hidden contacts"] = "Pokaż tylko ukryte kontakty";
+$a->strings["Mutual Friendship"] = "Wzajemna przyjaźń";
+$a->strings["is a fan of yours"] = "jest twoim fanem";
+$a->strings["you are a fan of"] = "jesteś fanem";
+$a->strings["Search your contacts"] = "Wyszukaj w kontaktach";
 $a->strings["Post successful."] = "Post dodany pomyślnie";
-$a->strings["OpenID protocol error. No ID returned."] = "";
+$a->strings["OpenID protocol error. No ID returned."] = "błąd OpenID . Brak zwróconego ID. ";
-$a->strings["Account not found and OpenID registration is not permitted on this site."] = "";
+$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Nie znaleziono konta i OpenID rejestracja nie jest dopuszczalna na tej stronie.";
 $a->strings["Image uploaded but image cropping failed."] = "Obrazek załadowany, ale oprawanie powiodła się.";
 $a->strings["Image size reduction [%s] failed."] = "Redukcja rozmiaru obrazka [%s] nie powiodła się.";
 $a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "";

view/pt-br/strings.php

@@ -275,12 +275,12 @@ $a->strings["Ability to dislike posts/comments"] = "Habilidade para desgostar (d
 $a->strings["Star Posts"] = "Estrelar Publicações";
 $a->strings["Ability to mark special posts with a star indicator"] = "Habilidade para marcar publicações especiais com uma estrela indicadora";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Não foi possível localizar a informação de DNS para o servidor de banco de dados '%s'";
+$a->strings["newer"] = "mais recente";
+$a->strings["older"] = "antigo";
 $a->strings["prev"] = "anterior";
 $a->strings["first"] = "primeiro";
 $a->strings["last"] = "último";
 $a->strings["next"] = "próximo";
-$a->strings["newer"] = "mais recente";
-$a->strings["older"] = "antigo";
 $a->strings["No contacts"] = "Nenhum contato";
 $a->strings["%d Contact"] = array(
 	0 => "%d contato",
@@ -872,73 +872,13 @@ $a->strings["No contacts in common."] = "Nenhum contato em comum.";
 $a->strings["You must be logged in to use addons. "] = "Você precisa estar logado para usar os addons.";
 $a->strings["Applications"] = "Aplicativos";
 $a->strings["No installed applications."] = "Nenhum aplicativo instalado";
-$a->strings["Could not access contact record."] = "Não foi possível acessar o registro do contato.";
+$a->strings["Import"] = "Importar";
-$a->strings["Could not locate selected profile."] = "Não foi possível localizar o perfil selecionado.";
+$a->strings["Move account"] = "Mover conta";
-$a->strings["Contact updated."] = "O contato foi atualizado.";
+$a->strings["You can import an account from another Friendica server."] = "Você pode importar um conta de outro sevidor Friendica.";
-$a->strings["Failed to update contact record."] = "Não foi possível atualizar o registro do contato.";
+$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."] = "Você precisa exportar sua conta de um servidor antigo e fazer o upload aqui. Nós recriaremos sua conta antiga aqui com todos os seus contatos. Nós também tentaremos informar seus amigos que você se mudou para cá.";
-$a->strings["Contact has been blocked"] = "O contato foi bloqueado";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "Esse recurso é experimental. Nós não podemos importar contatos de uma rede OStatus (statusnet/identi.ca) ou do Diaspora";
-$a->strings["Contact has been unblocked"] = "O contato foi desbloqueado";
+$a->strings["Account file"] = "Arquivo de conta";
-$a->strings["Contact has been ignored"] = "O contato foi ignorado";
+$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Para exportar a sua conta, entre em \"Configurações->Exportar dados pessoais\" e selecione \"Exportar conta\"";
-$a->strings["Contact has been unignored"] = "O contato deixou de ser ignorado";
-$a->strings["Contact has been archived"] = "O contato foi arquivado";
-$a->strings["Contact has been unarchived"] = "O contato foi desarquivado";
-$a->strings["Do you really want to delete this contact?"] = "Você realmente deseja deletar esse contato?";
-$a->strings["Contact has been removed."] = "O contato foi removido.";
-$a->strings["You are mutual friends with %s"] = "Você possui uma amizade mútua com %s";
-$a->strings["You are sharing with %s"] = "Você está compartilhando com %s";
-$a->strings["%s is sharing with you"] = "%s está compartilhando com você";
-$a->strings["Private communications are not available for this contact."] = "As comunicações privadas não estão disponíveis para este contato.";
-$a->strings["(Update was successful)"] = "(A atualização foi bem sucedida)";
-$a->strings["(Update was not successful)"] = "(A atualização não foi bem sucedida)";
-$a->strings["Suggest friends"] = "Sugerir amigos";
-$a->strings["Network type: %s"] = "Tipo de rede: %s";
-$a->strings["View all contacts"] = "Ver todos os contatos";
-$a->strings["Toggle Blocked status"] = "Alternar o status de bloqueio";
-$a->strings["Unignore"] = "Deixar de ignorar";
-$a->strings["Ignore"] = "Ignorar";
-$a->strings["Toggle Ignored status"] = "Alternar o status de ignorado";
-$a->strings["Unarchive"] = "Desarquivar";
-$a->strings["Archive"] = "Arquivar";
-$a->strings["Toggle Archive status"] = "Alternar o status de arquivamento";
-$a->strings["Repair"] = "Reparar";
-$a->strings["Advanced Contact Settings"] = "Configurações avançadas do contato";
-$a->strings["Communications lost with this contact!"] = "As comunicações com esse contato foram perdidas!";
-$a->strings["Contact Editor"] = "Editor de contatos";
-$a->strings["Profile Visibility"] = "Visibilidade do perfil";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor, selecione o perfil que você gostaria de exibir para %s quando estiver visualizando seu perfil de modo seguro.";
-$a->strings["Contact Information / Notes"] = "Informações sobre o contato / Anotações";
-$a->strings["Edit contact notes"] = "Editar as anotações do contato";
-$a->strings["Block/Unblock contact"] = "Bloquear/desbloquear o contato";
-$a->strings["Ignore contact"] = "Ignorar o contato";
-$a->strings["Repair URL settings"] = "Reparar as definições de URL";
-$a->strings["View conversations"] = "Ver as conversas";
-$a->strings["Delete contact"] = "Excluir o contato";
-$a->strings["Last update:"] = "Última atualização:";
-$a->strings["Update public posts"] = "Atualizar publicações públicas";
-$a->strings["Currently blocked"] = "Atualmente bloqueado";
-$a->strings["Currently ignored"] = "Atualmente ignorado";
-$a->strings["Currently archived"] = "Atualmente arquivado";
-$a->strings["Hide this contact from others"] = "Ocultar este contato dos outros";
-$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Respostas/Gostar associados às suas publicações <strong>podem</strong> estar visíveis";
-$a->strings["Suggestions"] = "Sugestões";
-$a->strings["Suggest potential friends"] = "Sugerir amigos em potencial";
-$a->strings["All Contacts"] = "Todos os contatos";
-$a->strings["Show all contacts"] = "Exibe todos os contatos";
-$a->strings["Unblocked"] = "Desbloquear";
-$a->strings["Only show unblocked contacts"] = "Exibe somente contatos desbloqueados";
-$a->strings["Blocked"] = "Bloqueado";
-$a->strings["Only show blocked contacts"] = "Exibe somente contatos bloqueados";
-$a->strings["Ignored"] = "Ignorados";
-$a->strings["Only show ignored contacts"] = "Exibe somente contatos ignorados";
-$a->strings["Archived"] = "Arquivados";
-$a->strings["Only show archived contacts"] = "Exibe somente contatos arquivados";
-$a->strings["Hidden"] = "Ocultos";
-$a->strings["Only show hidden contacts"] = "Exibe somente contatos ocultos";
-$a->strings["Mutual Friendship"] = "Amizade mútua";
-$a->strings["is a fan of yours"] = "é um fã seu";
-$a->strings["you are a fan of"] = "você é um fã de";
-$a->strings["Search your contacts"] = "Pesquisar seus contatos";
-$a->strings["Finding: "] = "Pesquisando: ";
 $a->strings["everybody"] = "todos";
 $a->strings["Additional features"] = "Funcionalidades adicionais";
 $a->strings["Display settings"] = "Configurações de exibição";
@@ -1152,6 +1092,7 @@ $a->strings["Unable to resolve your name at the provided location."] = "Não foi
 $a->strings["You have already introduced yourself here."] = "Você já fez a sua apresentação aqui.";
 $a->strings["Apparently you are already friends with %s."] = "Aparentemente você já é amigo de %s.";
 $a->strings["Invalid profile URL."] = "URL de perfil inválida.";
+$a->strings["Failed to update contact record."] = "Não foi possível atualizar o registro do contato.";
 $a->strings["Your introduction has been sent."] = "A sua apresentação foi enviada.";
 $a->strings["Please login to confirm introduction."] = "Por favor, autentique-se para confirmar a apresentação.";
 $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "A identidade autenticada está incorreta. Por favor, entre como <strong>este</strong> perfil.";
@@ -1174,6 +1115,7 @@ $a->strings["Submit Request"] = "Enviar solicitação";
 $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s está seguindo %2\$s's %3\$s";
 $a->strings["Global Directory"] = "Diretório global";
 $a->strings["Find on this site"] = "Pesquisar neste site";
+$a->strings["Finding: "] = "Pesquisando: ";
 $a->strings["Site Directory"] = "Diretório do site";
 $a->strings["Gender: "] = "Gênero: ";
 $a->strings["No entries (some entries may be hidden)."] = "Nenhuma entrada (algumas entradas podem estar ocultas).";
@@ -1215,13 +1157,6 @@ $a->strings["Export your account info and contacts. Use this to make a backup of
 $a->strings["Export all"] = "Exportar tudo";
 $a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Exportar as informações de sua conta, contatos e todos os seus items como JSON. Pode ser um arquivo muito grande, e pode levar bastante tempo. Use isto para fazer uma cópia de segurança completa da sua conta (fotos não são exportadas)";
 $a->strings["- select -"] = "-selecione-";
-$a->strings["Import"] = "Importar";
-$a->strings["Move account"] = "Mover conta";
-$a->strings["You can import an account from another Friendica server."] = "Você pode importar um conta de outro sevidor Friendica.";
-$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."] = "Você precisa exportar sua conta de um servidor antigo e fazer o upload aqui. Nós recriaremos sua conta antiga aqui com todos os seus contatos. Nós também tentaremos informar seus amigos que você se mudou para cá.";
-$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "Esse recurso é experimental. Nós não podemos importar contatos de uma rede OStatus (statusnet/identi.ca) ou do Diaspora";
-$a->strings["Account file"] = "Arquivo de conta";
-$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "Para exportar sua conta, vá em \"Configurações->Exportar seus dados pessoais\" e selecione \"Exportar conta\"";
 $a->strings["[Embedded content - reload page to view]"] = "[Conteúdo incorporado - recarregue a página para ver]";
 $a->strings["Contact added"] = "O contato foi adicionado";
 $a->strings["This is Friendica, version"] = "Este é o Friendica, versão";
@@ -1244,6 +1179,7 @@ $a->strings["Group removed."] = "O grupo foi removido.";
 $a->strings["Unable to remove group."] = "Não foi possível remover o grupo.";
 $a->strings["Group Editor"] = "Editor de grupo";
 $a->strings["Members"] = "Membros";
+$a->strings["All Contacts"] = "Todos os contatos";
 $a->strings["No profile"] = "Nenhum perfil";
 $a->strings["Help:"] = "Ajuda:";
 $a->strings["Not Found"] = "Não encontrada";
@@ -1364,12 +1300,14 @@ $a->strings["Private messages to this person are at risk of public disclosure."]
 $a->strings["Invalid contact."] = "Contato inválido.";
 $a->strings["Invalid request identifier."] = "Identificador de solicitação inválido";
 $a->strings["Discard"] = "Descartar";
+$a->strings["Ignore"] = "Ignorar";
 $a->strings["System"] = "Sistema";
 $a->strings["Show Ignored Requests"] = "Exibir solicitações ignoradas";
 $a->strings["Hide Ignored Requests"] = "Ocultar solicitações ignoradas";
 $a->strings["Notification type: "] = "Tipo de notificação:";
 $a->strings["Friend Suggestion"] = "Sugestão de amigo";
 $a->strings["suggested by %s"] = "sugerido por %s";
+$a->strings["Hide this contact from others"] = "Ocultar este contato dos outros";
 $a->strings["Post a new friend activity"] = "Publicar a adição de amigo";
 $a->strings["if applicable"] = "se aplicável";
 $a->strings["Claims to be known to you: "] = "Alega ser conhecido por você: ";
@@ -1540,6 +1478,68 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ
 $a->strings["Errors encountered creating database tables."] = "Foram encontrados erros durante a criação das tabelas do banco de dados.";
 $a->strings["<h1>What next</h1>"] = "<h1>A seguir</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Você deve configurar [manualmente] uma tarefa agendada para o captador.";
+$a->strings["Could not access contact record."] = "Não foi possível acessar o registro do contato.";
+$a->strings["Could not locate selected profile."] = "Não foi possível localizar o perfil selecionado.";
+$a->strings["Contact updated."] = "O contato foi atualizado.";
+$a->strings["Contact has been blocked"] = "O contato foi bloqueado";
+$a->strings["Contact has been unblocked"] = "O contato foi desbloqueado";
+$a->strings["Contact has been ignored"] = "O contato foi ignorado";
+$a->strings["Contact has been unignored"] = "O contato deixou de ser ignorado";
+$a->strings["Contact has been archived"] = "O contato foi arquivado";
+$a->strings["Contact has been unarchived"] = "O contato foi desarquivado";
+$a->strings["Do you really want to delete this contact?"] = "Você realmente deseja deletar esse contato?";
+$a->strings["Contact has been removed."] = "O contato foi removido.";
+$a->strings["You are mutual friends with %s"] = "Você possui uma amizade mútua com %s";
+$a->strings["You are sharing with %s"] = "Você está compartilhando com %s";
+$a->strings["%s is sharing with you"] = "%s está compartilhando com você";
+$a->strings["Private communications are not available for this contact."] = "As comunicações privadas não estão disponíveis para este contato.";
+$a->strings["(Update was successful)"] = "(A atualização foi bem sucedida)";
+$a->strings["(Update was not successful)"] = "(A atualização não foi bem sucedida)";
+$a->strings["Suggest friends"] = "Sugerir amigos";
+$a->strings["Network type: %s"] = "Tipo de rede: %s";
+$a->strings["View all contacts"] = "Ver todos os contatos";
+$a->strings["Toggle Blocked status"] = "Alternar o status de bloqueio";
+$a->strings["Unignore"] = "Deixar de ignorar";
+$a->strings["Toggle Ignored status"] = "Alternar o status de ignorado";
+$a->strings["Unarchive"] = "Desarquivar";
+$a->strings["Archive"] = "Arquivar";
+$a->strings["Toggle Archive status"] = "Alternar o status de arquivamento";
+$a->strings["Repair"] = "Reparar";
+$a->strings["Advanced Contact Settings"] = "Configurações avançadas do contato";
+$a->strings["Communications lost with this contact!"] = "As comunicações com esse contato foram perdidas!";
+$a->strings["Contact Editor"] = "Editor de contatos";
+$a->strings["Profile Visibility"] = "Visibilidade do perfil";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor, selecione o perfil que você gostaria de exibir para %s quando estiver visualizando seu perfil de modo seguro.";
+$a->strings["Contact Information / Notes"] = "Informações sobre o contato / Anotações";
+$a->strings["Edit contact notes"] = "Editar as anotações do contato";
+$a->strings["Block/Unblock contact"] = "Bloquear/desbloquear o contato";
+$a->strings["Ignore contact"] = "Ignorar o contato";
+$a->strings["Repair URL settings"] = "Reparar as definições de URL";
+$a->strings["View conversations"] = "Ver as conversas";
+$a->strings["Delete contact"] = "Excluir o contato";
+$a->strings["Last update:"] = "Última atualização:";
+$a->strings["Update public posts"] = "Atualizar publicações públicas";
+$a->strings["Currently blocked"] = "Atualmente bloqueado";
+$a->strings["Currently ignored"] = "Atualmente ignorado";
+$a->strings["Currently archived"] = "Atualmente arquivado";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Respostas/Gostar associados às suas publicações <strong>podem</strong> estar visíveis";
+$a->strings["Suggestions"] = "Sugestões";
+$a->strings["Suggest potential friends"] = "Sugerir amigos em potencial";
+$a->strings["Show all contacts"] = "Exibe todos os contatos";
+$a->strings["Unblocked"] = "Desbloquear";
+$a->strings["Only show unblocked contacts"] = "Exibe somente contatos desbloqueados";
+$a->strings["Blocked"] = "Bloqueado";
+$a->strings["Only show blocked contacts"] = "Exibe somente contatos bloqueados";
+$a->strings["Ignored"] = "Ignorados";
+$a->strings["Only show ignored contacts"] = "Exibe somente contatos ignorados";
+$a->strings["Archived"] = "Arquivados";
+$a->strings["Only show archived contacts"] = "Exibe somente contatos arquivados";
+$a->strings["Hidden"] = "Ocultos";
+$a->strings["Only show hidden contacts"] = "Exibe somente contatos ocultos";
+$a->strings["Mutual Friendship"] = "Amizade mútua";
+$a->strings["is a fan of yours"] = "é um fã seu";
+$a->strings["you are a fan of"] = "você é um fã de";
+$a->strings["Search your contacts"] = "Pesquisar seus contatos";
 $a->strings["Post successful."] = "Publicado com sucesso.";
 $a->strings["OpenID protocol error. No ID returned."] = "Erro no protocolo OpenID. Não foi retornada nenhuma ID.";
 $a->strings["Account not found and OpenID registration is not permitted on this site."] = "A conta não foi encontrada e não são permitidos registros via OpenID nesse site.";

view/smarty3/register_adminadd_eml.tpl

@@ -0,0 +1,32 @@
+Dear {{$username}},
+	the administrator of {{$sitename}} has set up an account for you.
+
+The login details are as follows:
+
+
+Site Location:	{{$siteurl}}
+Login Name:	{{$email}}
+Password:	{{$password}}
+
+You may change your password from your account "Settings" page after logging 
+in.
+
+Please take a few moments to review the other account settings on that page.
+
+You may also wish to add some basic information to your default profile 
+(on the "Profiles" page) so that other people can easily find you.
+
+We recommend setting your full name, adding a profile photo,
+adding some profile "keywords" (very useful in making new friends) - and 
+perhaps what country you live in; if you do not wish to be more specific
+than that.
+
+We fully respect your right to privacy, and none of these items are necessary. 
+If you are new and do not know anybody here, they may help
+you to make some new and interesting friends.  
+
+
+Thank you and welcome to {{$sitename}}.
+
+Sincerely,
+	{{$sitename}} Administrator

view/templates/admin_users.tpl

@@ -52,9 +52,6 @@
 			<p>{{$no_pending}}</p>
 		{{/if}}
 	
-	
-		
-	
 		<h3>{{$h_users}}</h3>
 		{{if $users}}
 			<table id='users'>
@@ -69,7 +66,7 @@
 				<tbody>
 				{{foreach $users as $u}}
 					<tr>
-						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
+						<td><img class='icon' src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
 						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
 						<td class='email'>{{$u.email}}</td>
 						<td class='register_date'>{{$u.register_date}}</td>
@@ -100,4 +97,46 @@
 			NO USERS?!?
 		{{/if}}
 	</form>
+	{{if $deleted}}
+		<h3>{{$h_deleted}}</h3>
+			<table id='deleted'>
+				<thead>
+				<tr>
+					<th></th>
+					{{foreach $th_deleted as $th}}<th>{{$th}}</th>{{/foreach}}
+				</tr>
+				</thead>
+				<tbody>
+				{{foreach $deleted as $u}}
+					<tr>
+						<td><img class='icon' src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
+						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
+						<td class='email'>{{$u.email}}</td>
+						<td class='register_date'>{{$u.register_date}}</td>
+						<td class='login_date'>{{$u.login_date}}</td>
+						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
+						<td class='login_date'>{{$u.deleted}}</td>
+					</tr>
+				{{/foreach}}
+				</tbody>
+			</table>
+		{{/if}}
+  <h3>{{$h_newuser}}</h3> 
+  <form action="{{$baseurl}}/admin/users" method="post"> 
+  <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> 
+  <table id='users'> 
+      <tbody> 
+        <tr> 
+        <td>{{include file="field_input.tpl" field=$newusername}}</td> 
+    </tr> 
+        <tr> 
+        <td>{{include file="field_input.tpl" field=$newusernickname}}</td> 
+    </tr> 
+        <tr> 
+        <td>{{include file="field_input.tpl" field=$newuseremail}}</td> 
+    </tr> 
+      </tbody> 
+  </table> 
+  <div class="submit"><input type="submit" name="add_new_user_submit" value="{{$submit}}" /></div>             
+  </form>
 </div>

view/zh-cn/strings.php

@@ -273,12 +273,12 @@ $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["newer"] = "更新";
+$a->strings["older"] = "更旧";
 $a->strings["prev"] = "上个";
 $a->strings["first"] = "首先";
 $a->strings["last"] = "最后";
 $a->strings["next"] = "下个";
-$a->strings["newer"] = "更新";
-$a->strings["older"] = "更旧";
 $a->strings["No contacts"] = "没有熟人";
 $a->strings["%d Contact"] = array(
 	0 => "%d熟人",
@@ -865,73 +865,13 @@ $a->strings["No contacts in common."] = "没有共同熟人。";
 $a->strings["You must be logged in to use addons. "] = "您用插件前要登录";
 $a->strings["Applications"] = "应用";
 $a->strings["No installed applications."] = "没有安装的应用";
-$a->strings["Could not access contact record."] = "用不了熟人记录。";
+$a->strings["Import"] = "进口";
-$a->strings["Could not locate selected profile."] = "找不到选择的简介。";
+$a->strings["Move account"] = "把账户搬出";
-$a->strings["Contact updated."] = "熟人更新了。";
+$a->strings["You can import an account from another Friendica server."] = "您会从别的Friendica服务器进口账户";
-$a->strings["Failed to update contact record."] = "更新熟人记录失败了。";
+$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["Contact has been blocked"] = "熟人拦了";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "这个特点是在试验阶段。我们进口不了Ostatus网络(statusnet/identi.ca)或Diaspora熟人";
-$a->strings["Contact has been unblocked"] = "熟人否拦了";
+$a->strings["Account file"] = "账户文件";
-$a->strings["Contact has been ignored"] = "熟人不理了";
+$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "为出口您账户，点击「设置→出口您私人信息」和选择「出口账户」";
-$a->strings["Contact has been unignored"] = "熟人否不理了";
-$a->strings["Contact has been archived"] = "把联系存档了";
-$a->strings["Contact has been unarchived"] = "把联系从存档拿来了";
-$a->strings["Do you really want to delete this contact?"] = "您真的想删除这个熟人吗？";
-$a->strings["Contact has been removed."] = "熟人删除了。";
-$a->strings["You are mutual friends with %s"] = "您和%s是共同朋友们";
-$a->strings["You are sharing with %s"] = "您分享给%s";
-$a->strings["%s is sharing with you"] = "%s给您分享";
-$a->strings["Private communications are not available for this contact."] = "没有私人的沟通跟这个熟人";
-$a->strings["(Update was successful)"] = "(更新成功)";
-$a->strings["(Update was not successful)"] = "(更新不成功)";
-$a->strings["Suggest friends"] = "建议朋友们";
-$a->strings["Network type: %s"] = "网络种类: %s";
-$a->strings["View all contacts"] = "看所有的熟人";
-$a->strings["Toggle Blocked status"] = "交替拦配置";
-$a->strings["Unignore"] = "停不理";
-$a->strings["Ignore"] = "忽视";
-$a->strings["Toggle Ignored status"] = "交替忽视现状";
-$a->strings["Unarchive"] = "从存档拿来";
-$a->strings["Archive"] = "存档";
-$a->strings["Toggle Archive status"] = "交替档案现状";
-$a->strings["Repair"] = "维修";
-$a->strings["Advanced Contact Settings"] = "专家熟人设置";
-$a->strings["Communications lost with this contact!"] = "联系跟这个熟人断开了！";
-$a->strings["Contact Editor"] = "熟人编器";
-$a->strings["Profile Visibility"] = "简历可见量";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "请选择简介您想给%s显示他安全地看您的简介的时候。";
-$a->strings["Contact Information / Notes"] = "熟人信息／便条";
-$a->strings["Edit contact notes"] = "编辑熟人便条";
-$a->strings["Block/Unblock contact"] = "拦／否拦熟人";
-$a->strings["Ignore contact"] = "忽视熟人";
-$a->strings["Repair URL settings"] = "维修URL设置";
-$a->strings["View conversations"] = "看交流";
-$a->strings["Delete contact"] = "删除熟人";
-$a->strings["Last update:"] = "上个更新：";
-$a->strings["Update public posts"] = "更新公开文章";
-$a->strings["Currently blocked"] = "现在拦的";
-$a->strings["Currently ignored"] = "现在不理的";
-$a->strings["Currently archived"] = "现在存档着";
-$a->strings["Hide this contact from others"] = "隐藏这个熟人给别人";
-$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "回答／喜欢关您公开文章<strong>会</strong>还可见的";
-$a->strings["Suggestions"] = "建议";
-$a->strings["Suggest potential friends"] = "建议潜在朋友们";
-$a->strings["All Contacts"] = "所有的熟人";
-$a->strings["Show all contacts"] = "表示所有的熟人";
-$a->strings["Unblocked"] = "不拦了";
-$a->strings["Only show unblocked contacts"] = "只表示不拦的熟人";
-$a->strings["Blocked"] = "拦了";
-$a->strings["Only show blocked contacts"] = "只表示拦的熟人";
-$a->strings["Ignored"] = "忽视的";
-$a->strings["Only show ignored contacts"] = "只表示忽视的熟人";
-$a->strings["Archived"] = "在存档";
-$a->strings["Only show archived contacts"] = "只表示档案熟人";
-$a->strings["Hidden"] = "隐藏的";
-$a->strings["Only show hidden contacts"] = "只表示隐藏的熟人";
-$a->strings["Mutual Friendship"] = "共同友谊";
-$a->strings["is a fan of yours"] = "是您迷";
-$a->strings["you are a fan of"] = "你喜欢";
-$a->strings["Search your contacts"] = "搜索您的熟人";
-$a->strings["Finding: "] = "找着：";
 $a->strings["everybody"] = "每人";
 $a->strings["Additional features"] = "附加的特点";
 $a->strings["Display settings"] = "表示设置";
@@ -1144,6 +1084,7 @@ $a->strings["Unable to resolve your name at the provided location."] = "不可
 $a->strings["You have already introduced yourself here."] = "您已经自我介绍这儿。";
 $a->strings["Apparently you are already friends with %s."] = "看上去您已经是%s的朋友。";
 $a->strings["Invalid profile URL."] = "无效的简介URL。";
+$a->strings["Failed to update contact record."] = "更新熟人记录失败了。";
 $a->strings["Your introduction has been sent."] = "您的介绍发布了。";
 $a->strings["Please login to confirm introduction."] = "请登记为确认介绍。";
 $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "错误的用户登记者。请用<strong>这个</strong>用户。";
@@ -1166,6 +1107,7 @@ $a->strings["Submit Request"] = "提交要求";
 $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s关注着%2\$s的%3\$s";
 $a->strings["Global Directory"] = "综合目录";
 $a->strings["Find on this site"] = "找在这网站";
+$a->strings["Finding: "] = "找着：";
 $a->strings["Site Directory"] = "网站目录";
 $a->strings["Gender: "] = "性别：";
 $a->strings["No entries (some entries may be hidden)."] = "没有文章(有的文章会被隐藏)。";
@@ -1207,13 +1149,6 @@ $a->strings["Export your account info and contacts. Use this to make a backup of
 $a->strings["Export all"] = "出口一切";
 $a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "出口您账户信息，熟人和别的项目成json。可能是很大文件，花很多时间。用这个为创造全备份您的账户（照片没被出口）";
 $a->strings["- select -"] = "－选择－";
-$a->strings["Import"] = "进口";
-$a->strings["Move account"] = "把账户搬出";
-$a->strings["You can import an account from another Friendica server."] = "您会从别的Friendica服务器进口账户";
-$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"] = "这个特点是在试验阶段。我们进口不了Ostatus网络(statusnet/identi.ca)或Diaspora熟人";
-$a->strings["Account file"] = "账户文件";
-$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "为出口您账户，点击「设置→出口您私人信息」和选择「出口账户」";
 $a->strings["[Embedded content - reload page to view]"] = "[嵌入内容－重新加载页为看]";
 $a->strings["Contact added"] = "熟人添了";
 $a->strings["This is Friendica, version"] = "这是Friendica，版本";
@@ -1236,6 +1171,7 @@ $a->strings["Group removed."] = "组删除了。";
 $a->strings["Unable to remove group."] = "不能删除组。";
 $a->strings["Group Editor"] = "组编辑器";
 $a->strings["Members"] = "成员";
+$a->strings["All Contacts"] = "所有的熟人";
 $a->strings["No profile"] = "无简介";
 $a->strings["Help:"] = "帮助：";
 $a->strings["Not Found"] = "未发现";
@@ -1353,12 +1289,14 @@ $a->strings["Private messages to this person are at risk of public disclosure."]
 $a->strings["Invalid contact."] = "无效熟人。";
 $a->strings["Invalid request identifier."] = "无效要求身份号。";
 $a->strings["Discard"] = "丢弃";
+$a->strings["Ignore"] = "忽视";
 $a->strings["System"] = "系统";
 $a->strings["Show Ignored Requests"] = "显示不理的要求";
 $a->strings["Hide Ignored Requests"] = "隐藏不理的要求";
 $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["if applicable"] = "或适用";
 $a->strings["Claims to be known to you: "] = "声称被您认识：";
@@ -1529,6 +1467,68 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ
 $a->strings["Errors encountered creating database tables."] = "造成数据库列表相遇错误。";
 $a->strings["<h1>What next</h1>"] = "<h1>下步是什么</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "重要：您要[手工地]准备安排的任务给喂器。";
+$a->strings["Could not access contact record."] = "用不了熟人记录。";
+$a->strings["Could not locate selected profile."] = "找不到选择的简介。";
+$a->strings["Contact updated."] = "熟人更新了。";
+$a->strings["Contact has been blocked"] = "熟人拦了";
+$a->strings["Contact has been unblocked"] = "熟人否拦了";
+$a->strings["Contact has been ignored"] = "熟人不理了";
+$a->strings["Contact has been unignored"] = "熟人否不理了";
+$a->strings["Contact has been archived"] = "把联系存档了";
+$a->strings["Contact has been unarchived"] = "把联系从存档拿来了";
+$a->strings["Do you really want to delete this contact?"] = "您真的想删除这个熟人吗？";
+$a->strings["Contact has been removed."] = "熟人删除了。";
+$a->strings["You are mutual friends with %s"] = "您和%s是共同朋友们";
+$a->strings["You are sharing with %s"] = "您分享给%s";
+$a->strings["%s is sharing with you"] = "%s给您分享";
+$a->strings["Private communications are not available for this contact."] = "没有私人的沟通跟这个熟人";
+$a->strings["(Update was successful)"] = "(更新成功)";
+$a->strings["(Update was not successful)"] = "(更新不成功)";
+$a->strings["Suggest friends"] = "建议朋友们";
+$a->strings["Network type: %s"] = "网络种类: %s";
+$a->strings["View all contacts"] = "看所有的熟人";
+$a->strings["Toggle Blocked status"] = "交替拦配置";
+$a->strings["Unignore"] = "停不理";
+$a->strings["Toggle Ignored status"] = "交替忽视现状";
+$a->strings["Unarchive"] = "从存档拿来";
+$a->strings["Archive"] = "存档";
+$a->strings["Toggle Archive status"] = "交替档案现状";
+$a->strings["Repair"] = "维修";
+$a->strings["Advanced Contact Settings"] = "专家熟人设置";
+$a->strings["Communications lost with this contact!"] = "联系跟这个熟人断开了！";
+$a->strings["Contact Editor"] = "熟人编器";
+$a->strings["Profile Visibility"] = "简历可见量";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "请选择简介您想给%s显示他安全地看您的简介的时候。";
+$a->strings["Contact Information / Notes"] = "熟人信息／便条";
+$a->strings["Edit contact notes"] = "编辑熟人便条";
+$a->strings["Block/Unblock contact"] = "拦／否拦熟人";
+$a->strings["Ignore contact"] = "忽视熟人";
+$a->strings["Repair URL settings"] = "维修URL设置";
+$a->strings["View conversations"] = "看交流";
+$a->strings["Delete contact"] = "删除熟人";
+$a->strings["Last update:"] = "上个更新：";
+$a->strings["Update public posts"] = "更新公开文章";
+$a->strings["Currently blocked"] = "现在拦的";
+$a->strings["Currently ignored"] = "现在不理的";
+$a->strings["Currently archived"] = "现在存档着";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "回答／喜欢关您公开文章<strong>会</strong>还可见的";
+$a->strings["Suggestions"] = "建议";
+$a->strings["Suggest potential friends"] = "建议潜在朋友们";
+$a->strings["Show all contacts"] = "表示所有的熟人";
+$a->strings["Unblocked"] = "不拦了";
+$a->strings["Only show unblocked contacts"] = "只表示不拦的熟人";
+$a->strings["Blocked"] = "拦了";
+$a->strings["Only show blocked contacts"] = "只表示拦的熟人";
+$a->strings["Ignored"] = "忽视的";
+$a->strings["Only show ignored contacts"] = "只表示忽视的熟人";
+$a->strings["Archived"] = "在存档";
+$a->strings["Only show archived contacts"] = "只表示档案熟人";
+$a->strings["Hidden"] = "隐藏的";
+$a->strings["Only show hidden contacts"] = "只表示隐藏的熟人";
+$a->strings["Mutual Friendship"] = "共同友谊";
+$a->strings["is a fan of yours"] = "是您迷";
+$a->strings["you are a fan of"] = "你喜欢";
+$a->strings["Search your contacts"] = "搜索您的熟人";
 $a->strings["Post successful."] = "评论发表了。";
 $a->strings["OpenID protocol error. No ID returned."] = "OpenID协议错误。没ID还。 ";
 $a->strings["Account not found and OpenID registration is not permitted on this site."] = "找不到账户和OpenID注册不允许。";