From 35a9a468ceeb7b8e8b5ae2f026d3bdd76dff68be Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Thu, 28 Jan 2016 15:23:42 -0800
Subject: widget_item - provide ability to use the page title instead of the
 message_id to locate the desired item. You can use either, but the page title
 is often easier to use and discover.

---
 doc/Widgets.md      |  7 +++++--
 include/widgets.php | 20 +++++++++++++++-----
 version.inc         |  2 +-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/doc/Widgets.md b/doc/Widgets.md
index 10fc75cf8..8442bf687 100644
--- a/doc/Widgets.md
+++ b/doc/Widgets.md
@@ -74,8 +74,11 @@ Some/many of these widgets have restrictions which may restrict the type of page
 
 * suggestedchats - "interesting" chatrooms chosen for the current observer
 
-* item - displays a single webpage item by mid
-    * args: mid - message_id of webpage to display (must be webpage, not a conversation item)
+* item - displays a single webpage item by mid or page title
+    * args:
+	* channel_id - channel that owns the content, defualt is the profile_uid 
+	* mid - message_id of webpage to display (must be webpage, not a conversation item)
+	* title - URL page title of webpage (must provide one of either title or mid)
 <br />&nbsp;<br />
 
 * photo - display a single photo
diff --git a/include/widgets.php b/include/widgets.php
index 891e9c018..7e502e4c2 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -817,7 +817,7 @@ function widget_item($arr) {
 		return '';
 
 
-	if(! $arr['mid'])
+	if((! $arr['mid']) && (! $arr['title']))
 		return '';
 
 	if(! perm_is_allowed($channel_id, get_observer_hash(), 'view_pages'))
@@ -826,10 +826,20 @@ function widget_item($arr) {
 	require_once('include/security.php');
 	$sql_extra = item_permissions_sql($channel_id);
 
-	$r = q("select * from item where mid = '%s' and uid = %d and item_type = " . intval(ITEM_TYPE_WEBPAGE) . " $sql_extra limit 1",
-		dbesc($arr['mid']),
-		intval($channel_id)
-	);
+	if($arr['title']) {
+		$r = q("select item.* from item left join item_id on item.id = item_id.iid
+			where item.uid = %d and sid = '%s' and service = 'WEBPAGE' and item_type = %d $sql_options $revision limit 1",
+			intval($channel_id),
+			dbesc($arr['title']),
+			intval(ITEM_TYPE_WEBPAGE)
+		);
+	}
+	else {
+		$r = q("select * from item where mid = '%s' and uid = %d and item_type = " . intval(ITEM_TYPE_WEBPAGE) . " $sql_extra limit 1",
+			dbesc($arr['mid']),
+			intval($channel_id)
+		);
+	}
 
 	if(! $r)
 		return '';
diff --git a/version.inc b/version.inc
index a9ccde1f5..b9468dd8c 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-01-27.1291H
+2016-01-28.1292H
-- 
cgit v1.2.3


From c214692f661488df30eaf00ca85da94a5ecc1e14 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Thu, 28 Jan 2016 17:06:13 -0800
Subject: add peer filtering to all .well-known services

---
 boot.php            |  3 ++-
 mod/_well_known.php | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/boot.php b/boot.php
index 76baba361..4b49cacb5 100755
--- a/boot.php
+++ b/boot.php
@@ -863,7 +863,7 @@ class App {
 			&& array_key_exists('baseurl',$this->config['system'])
 			&& strlen($this->config['system']['baseurl'])) {
 			$url = $this->config['system']['baseurl'];
-
+			$url = trim($url,'\\/');
 			return $url;
 		}
 
@@ -881,6 +881,7 @@ class App {
 			&& array_key_exists('baseurl',$this->config['system'])
 			&& strlen($this->config['system']['baseurl'])) {
 			$url = $this->config['system']['baseurl'];
+			$url = trim($url,'\\/');
 		}
 
 		$parsed = @parse_url($url);
diff --git a/mod/_well_known.php b/mod/_well_known.php
index 58ed13ece..47cfe1512 100644
--- a/mod/_well_known.php
+++ b/mod/_well_known.php
@@ -7,6 +7,22 @@ function _well_known_init(&$a){
 		$arr = array('server' => $_SERVER, 'request' => $_REQUEST);
 		call_hooks('well_known', $arr);
 
+
+		if(! check_siteallowed($_SERVER['REMOTE_ADDR'])) {
+			logger('well_known: site not allowed. ' . $_SERVER['REMOTE_ADDR']);
+			killme();
+		}
+
+		// from php.net re: REMOTE_HOST:
+		//     Note: Your web server must be configured to create this variable. For example in Apache 
+		// you'll need HostnameLookups On inside httpd.conf for it to exist. See also gethostbyaddr(). 
+
+		if(get_config('system','siteallowed_remote_host') && (! check_siteallowed($_SERVER['REMOTE_HOST']))) {
+			logger('well_known: site not allowed. ' . $_SERVER['REMOTE_HOST']);
+			killme();
+		}
+
+
 		switch(argv(1)) {
 			case 'zot-info':
 				$a->argc -= 1;
-- 
cgit v1.2.3


From 08aeeadd7157d48fa3f4aff0cc2b58a314e508d2 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Fri, 29 Jan 2016 14:07:10 -0800
Subject: move permission check before global block check

---
 include/identity.php |    7 +-
 util/hmessages.po    | 1245 +++++++++++++++++++++++++-------------------------
 version.inc          |    2 +-
 3 files changed, 628 insertions(+), 626 deletions(-)

diff --git a/include/identity.php b/include/identity.php
index fd0b4d7f5..e1e79394a 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -924,6 +924,10 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
 	$pdesc = true;
 	$reddress = true;
 
+	if(! perm_is_allowed($profile['uid'],((is_array($observer)) ? $observer['xchan_hash'] : ''),'view_profile')) {
+		$block = true;
+	}
+
 	if($block && intval(get_config('system','block_public_blackout')))
 		return $o;
 
@@ -1012,9 +1016,6 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
 
 //	logger('online: ' . $profile['online']);
 
-	if(! perm_is_allowed($profile['uid'],((is_array($observer)) ? $observer['xchan_hash'] : ''),'view_profile')) {
-		$block = true;
-	}
 
 	if(($profile['hidewall'] && (! local_channel()) && (! remote_channel())) || $block ) {
 		$location = $reddress = $pdesc = $gender = $marital = $homepage = False;
diff --git a/util/hmessages.po b/util/hmessages.po
index f4ca7b494..e1a35325e 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2016-01-26.1290H\n"
+"Project-Id-Version: 2016-01-29.1293H\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-26 23:37-0800\n"
+"POT-Creation-Date: 2016-01-29 00:03-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,7 +30,7 @@ msgid "Welcome %s. Remote authentication successful."
 msgstr ""
 
 #: ../../include/Contact.php:101 ../../include/conversation.php:961
-#: ../../include/identity.php:949 ../../include/widgets.php:137
+#: ../../include/identity.php:953 ../../include/widgets.php:137
 #: ../../include/widgets.php:175 ../../mod/directory.php:321
 #: ../../mod/match.php:64 ../../mod/suggest.php:52
 msgid "Connect"
@@ -127,8 +127,8 @@ msgid "View all"
 msgstr ""
 
 #: ../../include/ItemObject.php:179 ../../include/conversation.php:1731
-#: ../../include/taxonomy.php:414 ../../include/identity.php:1262
-#: ../../mod/photos.php:1083
+#: ../../include/taxonomy.php:414 ../../include/identity.php:1266
+#: ../../mod/photos.php:1083 ../../mod/zcard.php:56
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
@@ -400,7 +400,7 @@ msgstr ""
 
 #: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:360
 #: ../../include/apps.php:415 ../../include/conversation.php:1037
-#: ../../include/widgets.php:1376 ../../mod/photos.php:754
+#: ../../include/widgets.php:1386 ../../mod/photos.php:754
 #: ../../mod/photos.php:1195
 msgid "Unknown"
 msgstr ""
@@ -428,7 +428,7 @@ msgid "Create"
 msgstr ""
 
 #: ../../include/RedDAV/RedBrowser.php:231
-#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1389
+#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1399
 #: ../../mod/photos.php:781 ../../mod/photos.php:1316
 #: ../../mod/profile_photo.php:453 ../../mod/cover_photo.php:353
 msgid "Upload"
@@ -614,7 +614,7 @@ msgstr ""
 msgid "Address Book"
 msgstr ""
 
-#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1517
+#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1518
 msgid "Login"
 msgstr ""
 
@@ -642,8 +642,8 @@ msgstr ""
 msgid "Channel Home"
 msgstr ""
 
-#: ../../include/apps.php:138 ../../include/identity.php:1236
-#: ../../include/identity.php:1353 ../../mod/profperm.php:112
+#: ../../include/apps.php:138 ../../include/identity.php:1240
+#: ../../include/identity.php:1357 ../../mod/profperm.php:112
 msgid "Profile"
 msgstr ""
 
@@ -703,7 +703,7 @@ msgstr ""
 msgid "Invite"
 msgstr ""
 
-#: ../../include/apps.php:152 ../../include/widgets.php:1262
+#: ../../include/apps.php:152 ../../include/widgets.php:1272
 msgid "Features"
 msgstr ""
 
@@ -876,7 +876,7 @@ msgid "Finishes:"
 msgstr ""
 
 #: ../../include/bb2diaspora.php:487 ../../include/event.php:52
-#: ../../include/identity.php:1000 ../../include/text.php:1425
+#: ../../include/identity.php:1004 ../../include/text.php:1425
 #: ../../mod/directory.php:307
 msgid "Location:"
 msgstr ""
@@ -1022,8 +1022,8 @@ msgstr ""
 msgid "Advanced example: name=fred and country=iceland"
 msgstr ""
 
-#: ../../include/contact_widgets.php:57 ../../include/features.php:93
-#: ../../include/widgets.php:304
+#: ../../include/contact_widgets.php:57 ../../include/widgets.php:304
+#: ../../include/features.php:93
 msgid "Saved Folders"
 msgstr ""
 
@@ -1570,7 +1570,7 @@ msgstr ""
 msgid "Required"
 msgstr ""
 
-#: ../../include/datetime.php:263 ../../boot.php:2347
+#: ../../include/datetime.php:263 ../../boot.php:2348
 msgid "never"
 msgstr ""
 
@@ -1672,7 +1672,7 @@ msgstr ""
 #: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
 #: ../../mod/photos.php:626 ../../mod/removeme.php:60
 #: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1521
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1522
 msgid "No"
 msgstr ""
 
@@ -1684,7 +1684,7 @@ msgstr ""
 #: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
 #: ../../mod/photos.php:626 ../../mod/removeme.php:60
 #: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1521
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1522
 msgid "Yes"
 msgstr ""
 
@@ -2146,7 +2146,7 @@ msgstr ""
 msgid "Stored post could not be verified."
 msgstr ""
 
-#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1516
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1517
 msgid "Logout"
 msgstr ""
 
@@ -2174,7 +2174,7 @@ msgstr ""
 msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../include/nav.php:90 ../../include/identity.php:972
+#: ../../include/nav.php:90 ../../include/identity.php:976
 msgid "Edit Profile"
 msgstr ""
 
@@ -2223,7 +2223,7 @@ msgstr ""
 msgid "Home Page"
 msgstr ""
 
-#: ../../include/nav.php:149 ../../mod/register.php:264 ../../boot.php:1499
+#: ../../include/nav.php:149 ../../mod/register.php:264 ../../boot.php:1500
 msgid "Register"
 msgstr ""
 
@@ -2333,7 +2333,7 @@ msgstr ""
 msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/nav.php:210 ../../include/widgets.php:1289
+#: ../../include/nav.php:210 ../../include/widgets.php:1299
 msgid "Admin"
 msgstr ""
 
@@ -2927,7 +2927,7 @@ msgstr ""
 
 #: ../../include/contact_selectors.php:79 ../../mod/admin.php:891
 #: ../../mod/admin.php:900 ../../mod/id.php:15 ../../mod/id.php:16
-#: ../../boot.php:1519
+#: ../../boot.php:1520
 msgid "Email"
 msgstr ""
 
@@ -2955,756 +2955,733 @@ msgstr ""
 msgid "MySpace"
 msgstr ""
 
-#: ../../include/features.php:45
-msgid "General Features"
+#: ../../include/identity.php:32
+msgid "Unable to obtain identity information from database"
 msgstr ""
 
-#: ../../include/features.php:47
-msgid "Content Expiration"
+#: ../../include/identity.php:66
+msgid "Empty name"
 msgstr ""
 
-#: ../../include/features.php:47
-msgid "Remove posts/comments and/or private messages at a future time"
+#: ../../include/identity.php:69
+msgid "Name too long"
 msgstr ""
 
-#: ../../include/features.php:48
-msgid "Multiple Profiles"
+#: ../../include/identity.php:181
+msgid "No account identifier"
 msgstr ""
 
-#: ../../include/features.php:48
-msgid "Ability to create multiple profiles"
+#: ../../include/identity.php:193
+msgid "Nickname is required."
 msgstr ""
 
-#: ../../include/features.php:49
-msgid "Advanced Profiles"
+#: ../../include/identity.php:207
+msgid "Reserved nickname. Please choose another."
 msgstr ""
 
-#: ../../include/features.php:49
-msgid "Additional profile sections and selections"
+#: ../../include/identity.php:212
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
 msgstr ""
 
-#: ../../include/features.php:50
-msgid "Profile Import/Export"
+#: ../../include/identity.php:288
+msgid "Unable to retrieve created identity"
 msgstr ""
 
-#: ../../include/features.php:50
-msgid "Save and load profile details across sites/channels"
+#: ../../include/identity.php:346
+msgid "Default Profile"
 msgstr ""
 
-#: ../../include/features.php:51
-msgid "Web Pages"
+#: ../../include/identity.php:772
+msgid "Requested channel is not available."
 msgstr ""
 
-#: ../../include/features.php:51
-msgid "Provide managed web pages on your channel"
+#: ../../include/identity.php:818 ../../mod/achievements.php:11
+#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29
+#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
+#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
+#: ../../mod/profile.php:16 ../../mod/webpages.php:29
+msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../include/features.php:52
-msgid "Hide Rating"
+#: ../../include/identity.php:966 ../../mod/profiles.php:782
+msgid "Change profile photo"
 msgstr ""
 
-#: ../../include/features.php:52
-msgid ""
-"Hide the rating buttons on your channel and profile pages. Note: People can "
-"still rate you somewhere else."
+#: ../../include/identity.php:972
+msgid "Profiles"
 msgstr ""
 
-#: ../../include/features.php:53
-msgid "Private Notes"
+#: ../../include/identity.php:972
+msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/features.php:53
-msgid "Enables a tool to store notes and reminders"
+#: ../../include/identity.php:973 ../../mod/profiles.php:783
+msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/features.php:54
-msgid "Navigation Channel Select"
+#: ../../include/identity.php:988 ../../mod/profiles.php:794
+msgid "Profile Image"
 msgstr ""
 
-#: ../../include/features.php:54
-msgid "Change channels directly from within the navigation dropdown menu"
+#: ../../include/identity.php:991
+msgid "visible to everybody"
 msgstr ""
 
-#: ../../include/features.php:55
-msgid "Photo Location"
+#: ../../include/identity.php:992 ../../mod/profiles.php:677
+#: ../../mod/profiles.php:798
+msgid "Edit visibility"
 msgstr ""
 
-#: ../../include/features.php:55
-msgid "If location data is available on uploaded photos, link this to a map."
+#: ../../include/identity.php:1008 ../../include/identity.php:1250
+msgid "Gender:"
 msgstr ""
 
-#: ../../include/features.php:57
-msgid "Expert Mode"
+#: ../../include/identity.php:1009 ../../include/identity.php:1294
+msgid "Status:"
 msgstr ""
 
-#: ../../include/features.php:57
-msgid "Enable Expert Mode to provide advanced configuration options"
+#: ../../include/identity.php:1010 ../../include/identity.php:1305
+msgid "Homepage:"
 msgstr ""
 
-#: ../../include/features.php:58
-msgid "Premium Channel"
+#: ../../include/identity.php:1011
+msgid "Online Now"
 msgstr ""
 
-#: ../../include/features.php:58
-msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
+#: ../../include/identity.php:1097 ../../include/identity.php:1175
+#: ../../mod/ping.php:318
+msgid "g A l F d"
 msgstr ""
 
-#: ../../include/features.php:63
-msgid "Post Composition Features"
+#: ../../include/identity.php:1098 ../../include/identity.php:1176
+msgid "F d"
 msgstr ""
 
-#: ../../include/features.php:65
-msgid "Use Markdown"
+#: ../../include/identity.php:1143 ../../include/identity.php:1215
+#: ../../mod/ping.php:341
+msgid "[today]"
 msgstr ""
 
-#: ../../include/features.php:65
-msgid "Allow use of \"Markdown\" to format posts"
+#: ../../include/identity.php:1154
+msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/features.php:66
-msgid "Large Photos"
+#: ../../include/identity.php:1155
+msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/features.php:66
-msgid ""
-"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
-"(640px) photo thumbnails"
+#: ../../include/identity.php:1208
+msgid "[No description]"
 msgstr ""
 
-#: ../../include/features.php:67 ../../include/widgets.php:549
-#: ../../mod/sources.php:88
-msgid "Channel Sources"
+#: ../../include/identity.php:1226
+msgid "Event Reminders"
 msgstr ""
 
-#: ../../include/features.php:67
-msgid "Automatically import channel content from other channels or feeds"
+#: ../../include/identity.php:1227
+msgid "Events this week:"
 msgstr ""
 
-#: ../../include/features.php:68
-msgid "Even More Encryption"
+#: ../../include/identity.php:1248 ../../mod/settings.php:1030
+msgid "Full Name:"
 msgstr ""
 
-#: ../../include/features.php:68
-msgid ""
-"Allow optional encryption of content end-to-end with a shared secret key"
+#: ../../include/identity.php:1255
+msgid "Like this channel"
 msgstr ""
 
-#: ../../include/features.php:69
-msgid "Enable Voting Tools"
+#: ../../include/identity.php:1279
+msgid "j F, Y"
 msgstr ""
 
-#: ../../include/features.php:69
-msgid "Provide a class of post which others can vote on"
+#: ../../include/identity.php:1280
+msgid "j F"
 msgstr ""
 
-#: ../../include/features.php:70
-msgid "Delayed Posting"
+#: ../../include/identity.php:1287
+msgid "Birthday:"
 msgstr ""
 
-#: ../../include/features.php:70
-msgid "Allow posts to be published at a later date"
+#: ../../include/identity.php:1291 ../../mod/directory.php:302
+msgid "Age:"
 msgstr ""
 
-#: ../../include/features.php:71
-msgid "Suppress Duplicate Posts/Comments"
+#: ../../include/identity.php:1300
+#, php-format
+msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/features.php:71
-msgid ""
-"Prevent posts with identical content to be published with less than two "
-"minutes in between submissions."
+#: ../../include/identity.php:1303 ../../mod/profiles.php:699
+msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/features.php:77
-msgid "Network and Stream Filtering"
+#: ../../include/identity.php:1307 ../../mod/directory.php:318
+#: ../../mod/profiles.php:701
+msgid "Hometown:"
 msgstr ""
 
-#: ../../include/features.php:78
-msgid "Search by Date"
+#: ../../include/identity.php:1309
+msgid "Tags:"
 msgstr ""
 
-#: ../../include/features.php:78
-msgid "Ability to select posts by date ranges"
+#: ../../include/identity.php:1311 ../../mod/profiles.php:702
+msgid "Political Views:"
 msgstr ""
 
-#: ../../include/features.php:79
-msgid "Enable management and selection of privacy groups"
+#: ../../include/identity.php:1313
+msgid "Religion:"
 msgstr ""
 
-#: ../../include/features.php:80 ../../include/widgets.php:274
-msgid "Saved Searches"
+#: ../../include/identity.php:1315 ../../mod/directory.php:320
+msgid "About:"
 msgstr ""
 
-#: ../../include/features.php:80
-msgid "Save search terms for re-use"
+#: ../../include/identity.php:1317
+msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/features.php:81
-msgid "Network Personal Tab"
+#: ../../include/identity.php:1319 ../../mod/profiles.php:705
+msgid "Likes:"
 msgstr ""
 
-#: ../../include/features.php:81
-msgid "Enable tab to display only Network posts that you've interacted on"
+#: ../../include/identity.php:1321 ../../mod/profiles.php:706
+msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/features.php:82
-msgid "Network New Tab"
+#: ../../include/identity.php:1323
+msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/features.php:82
-msgid "Enable tab to display all new Network activity"
+#: ../../include/identity.php:1325
+msgid "My other channels:"
 msgstr ""
 
-#: ../../include/features.php:83
-msgid "Affinity Tool"
+#: ../../include/identity.php:1327
+msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/features.php:83
-msgid "Filter stream activity by depth of relationships"
+#: ../../include/identity.php:1329
+msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/features.php:84
-msgid "Connection Filtering"
+#: ../../include/identity.php:1331
+msgid "Television:"
 msgstr ""
 
-#: ../../include/features.php:84
-msgid "Filter incoming posts from connections based on keywords/content"
+#: ../../include/identity.php:1333
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/features.php:85
-msgid "Suggest Channels"
+#: ../../include/identity.php:1335
+msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/features.php:85
-msgid "Show channel suggestions"
+#: ../../include/identity.php:1337
+msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/features.php:90
-msgid "Post/Comment Tools"
+#: ../../include/identity.php:1339
+msgid "School/education:"
 msgstr ""
 
-#: ../../include/features.php:91
-msgid "Community Tagging"
+#: ../../include/identity.php:1359
+msgid "Like this thing"
 msgstr ""
 
-#: ../../include/features.php:91
-msgid "Ability to tag existing posts"
+#: ../../include/identity.php:1767 ../../mod/cover_photo.php:236
+msgid "cover photo"
 msgstr ""
 
-#: ../../include/features.php:92
-msgid "Post Categories"
+#: ../../include/text.php:394
+msgid "prev"
 msgstr ""
 
-#: ../../include/features.php:92
-msgid "Add categories to your posts"
+#: ../../include/text.php:396
+msgid "first"
 msgstr ""
 
-#: ../../include/features.php:93
-msgid "Ability to file posts under folders"
+#: ../../include/text.php:425
+msgid "last"
 msgstr ""
 
-#: ../../include/features.php:94
-msgid "Dislike Posts"
+#: ../../include/text.php:428
+msgid "next"
 msgstr ""
 
-#: ../../include/features.php:94
-msgid "Ability to dislike posts/comments"
+#: ../../include/text.php:438
+msgid "older"
 msgstr ""
 
-#: ../../include/features.php:95
-msgid "Star Posts"
+#: ../../include/text.php:440
+msgid "newer"
 msgstr ""
 
-#: ../../include/features.php:95
-msgid "Ability to mark special posts with a star indicator"
+#: ../../include/text.php:803
+msgid "No connections"
 msgstr ""
 
-#: ../../include/features.php:96
-msgid "Tag Cloud"
+#: ../../include/text.php:828
+#, php-format
+msgid "View all %s connections"
 msgstr ""
 
-#: ../../include/features.php:96
-msgid "Provide a personal tag cloud on your channel page"
+#: ../../include/text.php:886 ../../include/text.php:898
+#: ../../include/widgets.php:192 ../../mod/admin.php:1568
+#: ../../mod/admin.php:1588 ../../mod/filer.php:49 ../../mod/rbmark.php:28
+#: ../../mod/rbmark.php:100
+msgid "Save"
 msgstr ""
 
-#: ../../include/identity.php:32
-msgid "Unable to obtain identity information from database"
+#: ../../include/text.php:972
+msgid "poke"
 msgstr ""
 
-#: ../../include/identity.php:66
-msgid "Empty name"
-msgstr ""
-
-#: ../../include/identity.php:69
-msgid "Name too long"
-msgstr ""
-
-#: ../../include/identity.php:181
-msgid "No account identifier"
-msgstr ""
-
-#: ../../include/identity.php:193
-msgid "Nickname is required."
-msgstr ""
-
-#: ../../include/identity.php:207
-msgid "Reserved nickname. Please choose another."
-msgstr ""
-
-#: ../../include/identity.php:212
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr ""
-
-#: ../../include/identity.php:288
-msgid "Unable to retrieve created identity"
-msgstr ""
-
-#: ../../include/identity.php:346
-msgid "Default Profile"
-msgstr ""
-
-#: ../../include/identity.php:772
-msgid "Requested channel is not available."
+#: ../../include/text.php:973
+msgid "ping"
 msgstr ""
 
-#: ../../include/identity.php:818 ../../mod/achievements.php:11
-#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29
-#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
-#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
-#: ../../mod/profile.php:16 ../../mod/webpages.php:29
-msgid "Requested profile is not available."
+#: ../../include/text.php:973
+msgid "pinged"
 msgstr ""
 
-#: ../../include/identity.php:962 ../../mod/profiles.php:782
-msgid "Change profile photo"
+#: ../../include/text.php:974
+msgid "prod"
 msgstr ""
 
-#: ../../include/identity.php:968
-msgid "Profiles"
+#: ../../include/text.php:974
+msgid "prodded"
 msgstr ""
 
-#: ../../include/identity.php:968
-msgid "Manage/edit profiles"
+#: ../../include/text.php:975
+msgid "slap"
 msgstr ""
 
-#: ../../include/identity.php:969 ../../mod/profiles.php:783
-msgid "Create New Profile"
+#: ../../include/text.php:975
+msgid "slapped"
 msgstr ""
 
-#: ../../include/identity.php:984 ../../mod/profiles.php:794
-msgid "Profile Image"
+#: ../../include/text.php:976
+msgid "finger"
 msgstr ""
 
-#: ../../include/identity.php:987
-msgid "visible to everybody"
+#: ../../include/text.php:976
+msgid "fingered"
 msgstr ""
 
-#: ../../include/identity.php:988 ../../mod/profiles.php:677
-#: ../../mod/profiles.php:798
-msgid "Edit visibility"
+#: ../../include/text.php:977
+msgid "rebuff"
 msgstr ""
 
-#: ../../include/identity.php:1004 ../../include/identity.php:1246
-msgid "Gender:"
+#: ../../include/text.php:977
+msgid "rebuffed"
 msgstr ""
 
-#: ../../include/identity.php:1005 ../../include/identity.php:1290
-msgid "Status:"
+#: ../../include/text.php:987
+msgid "happy"
 msgstr ""
 
-#: ../../include/identity.php:1006 ../../include/identity.php:1301
-msgid "Homepage:"
+#: ../../include/text.php:988
+msgid "sad"
 msgstr ""
 
-#: ../../include/identity.php:1007
-msgid "Online Now"
+#: ../../include/text.php:989
+msgid "mellow"
 msgstr ""
 
-#: ../../include/identity.php:1093 ../../include/identity.php:1171
-#: ../../mod/ping.php:318
-msgid "g A l F d"
+#: ../../include/text.php:990
+msgid "tired"
 msgstr ""
 
-#: ../../include/identity.php:1094 ../../include/identity.php:1172
-msgid "F d"
+#: ../../include/text.php:991
+msgid "perky"
 msgstr ""
 
-#: ../../include/identity.php:1139 ../../include/identity.php:1211
-#: ../../mod/ping.php:341
-msgid "[today]"
+#: ../../include/text.php:992
+msgid "angry"
 msgstr ""
 
-#: ../../include/identity.php:1150
-msgid "Birthday Reminders"
+#: ../../include/text.php:993
+msgid "stupefied"
 msgstr ""
 
-#: ../../include/identity.php:1151
-msgid "Birthdays this week:"
+#: ../../include/text.php:994
+msgid "puzzled"
 msgstr ""
 
-#: ../../include/identity.php:1204
-msgid "[No description]"
+#: ../../include/text.php:995
+msgid "interested"
 msgstr ""
 
-#: ../../include/identity.php:1222
-msgid "Event Reminders"
+#: ../../include/text.php:996
+msgid "bitter"
 msgstr ""
 
-#: ../../include/identity.php:1223
-msgid "Events this week:"
+#: ../../include/text.php:997
+msgid "cheerful"
 msgstr ""
 
-#: ../../include/identity.php:1244 ../../mod/settings.php:1030
-msgid "Full Name:"
+#: ../../include/text.php:998
+msgid "alive"
 msgstr ""
 
-#: ../../include/identity.php:1251
-msgid "Like this channel"
+#: ../../include/text.php:999
+msgid "annoyed"
 msgstr ""
 
-#: ../../include/identity.php:1275
-msgid "j F, Y"
+#: ../../include/text.php:1000
+msgid "anxious"
 msgstr ""
 
-#: ../../include/identity.php:1276
-msgid "j F"
+#: ../../include/text.php:1001
+msgid "cranky"
 msgstr ""
 
-#: ../../include/identity.php:1283
-msgid "Birthday:"
+#: ../../include/text.php:1002
+msgid "disturbed"
 msgstr ""
 
-#: ../../include/identity.php:1287 ../../mod/directory.php:302
-msgid "Age:"
+#: ../../include/text.php:1003
+msgid "frustrated"
 msgstr ""
 
-#: ../../include/identity.php:1296
-#, php-format
-msgid "for %1$d %2$s"
+#: ../../include/text.php:1004
+msgid "depressed"
 msgstr ""
 
-#: ../../include/identity.php:1299 ../../mod/profiles.php:699
-msgid "Sexual Preference:"
+#: ../../include/text.php:1005
+msgid "motivated"
 msgstr ""
 
-#: ../../include/identity.php:1303 ../../mod/directory.php:318
-#: ../../mod/profiles.php:701
-msgid "Hometown:"
+#: ../../include/text.php:1006
+msgid "relaxed"
 msgstr ""
 
-#: ../../include/identity.php:1305
-msgid "Tags:"
+#: ../../include/text.php:1007
+msgid "surprised"
 msgstr ""
 
-#: ../../include/identity.php:1307 ../../mod/profiles.php:702
-msgid "Political Views:"
+#: ../../include/text.php:1183
+msgid "May"
 msgstr ""
 
-#: ../../include/identity.php:1309
-msgid "Religion:"
+#: ../../include/text.php:1260 ../../include/text.php:1264
+msgid "Unknown Attachment"
 msgstr ""
 
-#: ../../include/identity.php:1311 ../../mod/directory.php:320
-msgid "About:"
+#: ../../include/text.php:1266
+msgid "unknown"
 msgstr ""
 
-#: ../../include/identity.php:1313
-msgid "Hobbies/Interests:"
+#: ../../include/text.php:1302
+msgid "remove category"
 msgstr ""
 
-#: ../../include/identity.php:1315 ../../mod/profiles.php:705
-msgid "Likes:"
+#: ../../include/text.php:1379
+msgid "remove from file"
 msgstr ""
 
-#: ../../include/identity.php:1317 ../../mod/profiles.php:706
-msgid "Dislikes:"
+#: ../../include/text.php:1521 ../../include/text.php:1532
+msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/identity.php:1319
-msgid "Contact information and Social Networks:"
+#: ../../include/text.php:1716 ../../mod/events.php:623
+msgid "Link to Source"
 msgstr ""
 
-#: ../../include/identity.php:1321
-msgid "My other channels:"
+#: ../../include/text.php:1737 ../../include/text.php:1809
+msgid "default"
 msgstr ""
 
-#: ../../include/identity.php:1323
-msgid "Musical interests:"
+#: ../../include/text.php:1745
+msgid "Page layout"
 msgstr ""
 
-#: ../../include/identity.php:1325
-msgid "Books, literature:"
+#: ../../include/text.php:1745
+msgid "You can create your own with the layouts tool"
 msgstr ""
 
-#: ../../include/identity.php:1327
-msgid "Television:"
+#: ../../include/text.php:1787
+msgid "Page content type"
 msgstr ""
 
-#: ../../include/identity.php:1329
-msgid "Film/dance/culture/entertainment:"
+#: ../../include/text.php:1821
+msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/identity.php:1331
-msgid "Love/Romance:"
+#: ../../include/text.php:1953
+msgid "activity"
 msgstr ""
 
-#: ../../include/identity.php:1333
-msgid "Work/employment:"
+#: ../../include/text.php:2248
+msgid "Design Tools"
 msgstr ""
 
-#: ../../include/identity.php:1335
-msgid "School/education:"
+#: ../../include/text.php:2251 ../../mod/blocks.php:147
+msgid "Blocks"
 msgstr ""
 
-#: ../../include/identity.php:1355
-msgid "Like this thing"
+#: ../../include/text.php:2252 ../../mod/menu.php:103
+msgid "Menus"
 msgstr ""
 
-#: ../../include/identity.php:1763 ../../mod/cover_photo.php:236
-msgid "cover photo"
+#: ../../include/text.php:2253 ../../mod/layouts.php:174
+msgid "Layouts"
 msgstr ""
 
-#: ../../include/text.php:394
-msgid "prev"
+#: ../../include/text.php:2254
+msgid "Pages"
 msgstr ""
 
-#: ../../include/text.php:396
-msgid "first"
+#: ../../include/items.php:423 ../../index.php:370 ../../mod/dreport.php:6
+#: ../../mod/dreport.php:45 ../../mod/group.php:68
+#: ../../mod/import_items.php:108 ../../mod/like.php:280
+#: ../../mod/profperm.php:23 ../../mod/subthread.php:58
+msgid "Permission denied"
 msgstr ""
 
-#: ../../include/text.php:425
-msgid "last"
+#: ../../include/items.php:1130 ../../include/items.php:1176
+msgid "(Unknown)"
 msgstr ""
 
-#: ../../include/text.php:428
-msgid "next"
+#: ../../include/items.php:1373
+msgid "Visible to anybody on the internet."
 msgstr ""
 
-#: ../../include/text.php:438
-msgid "older"
+#: ../../include/items.php:1375
+msgid "Visible to you only."
 msgstr ""
 
-#: ../../include/text.php:440
-msgid "newer"
+#: ../../include/items.php:1377
+msgid "Visible to anybody in this network."
 msgstr ""
 
-#: ../../include/text.php:803
-msgid "No connections"
+#: ../../include/items.php:1379
+msgid "Visible to anybody authenticated."
 msgstr ""
 
-#: ../../include/text.php:828
+#: ../../include/items.php:1381
 #, php-format
-msgid "View all %s connections"
-msgstr ""
-
-#: ../../include/text.php:886 ../../include/text.php:898
-#: ../../include/widgets.php:192 ../../mod/admin.php:1568
-#: ../../mod/admin.php:1588 ../../mod/filer.php:49 ../../mod/rbmark.php:28
-#: ../../mod/rbmark.php:100
-msgid "Save"
-msgstr ""
-
-#: ../../include/text.php:972
-msgid "poke"
-msgstr ""
-
-#: ../../include/text.php:973
-msgid "ping"
-msgstr ""
-
-#: ../../include/text.php:973
-msgid "pinged"
-msgstr ""
-
-#: ../../include/text.php:974
-msgid "prod"
-msgstr ""
-
-#: ../../include/text.php:974
-msgid "prodded"
+msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/text.php:975
-msgid "slap"
+#: ../../include/items.php:1383
+msgid "Visible to all connections."
 msgstr ""
 
-#: ../../include/text.php:975
-msgid "slapped"
+#: ../../include/items.php:1385
+msgid "Visible to approved connections."
 msgstr ""
 
-#: ../../include/text.php:976
-msgid "finger"
+#: ../../include/items.php:1387
+msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/text.php:976
-msgid "fingered"
+#: ../../include/items.php:4350 ../../mod/admin.php:135
+#: ../../mod/admin.php:1091 ../../mod/admin.php:1336 ../../mod/display.php:36
+#: ../../mod/filestorage.php:27 ../../mod/thing.php:85
+#: ../../mod/viewsrc.php:20
+msgid "Item not found."
 msgstr ""
 
-#: ../../include/text.php:977
-msgid "rebuff"
+#: ../../include/items.php:4862 ../../mod/group.php:38 ../../mod/group.php:137
+msgid "Privacy group not found."
 msgstr ""
-
-#: ../../include/text.php:977
-msgid "rebuffed"
+
+#: ../../include/items.php:4878
+msgid "Privacy group is empty."
 msgstr ""
 
-#: ../../include/text.php:987
-msgid "happy"
+#: ../../include/items.php:4885
+#, php-format
+msgid "Privacy group: %s"
 msgstr ""
 
-#: ../../include/text.php:988
-msgid "sad"
+#: ../../include/items.php:4895 ../../mod/connedit.php:692
+#, php-format
+msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/text.php:989
-msgid "mellow"
+#: ../../include/items.php:4897
+msgid "Connection not found."
 msgstr ""
 
-#: ../../include/text.php:990
-msgid "tired"
+#: ../../include/enotify.php:96
+#, php-format
+msgid "%s <!item_type!>"
 msgstr ""
 
-#: ../../include/text.php:991
-msgid "perky"
+#: ../../include/enotify.php:100
+#, php-format
+msgid "[Hubzilla:Notify] New mail received at %s"
 msgstr ""
 
-#: ../../include/text.php:992
-msgid "angry"
+#: ../../include/enotify.php:102
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
 msgstr ""
 
-#: ../../include/text.php:993
-msgid "stupefied"
+#: ../../include/enotify.php:103
+#, php-format
+msgid "%1$s sent you %2$s."
 msgstr ""
 
-#: ../../include/text.php:994
-msgid "puzzled"
+#: ../../include/enotify.php:103
+msgid "a private message"
 msgstr ""
 
-#: ../../include/text.php:995
-msgid "interested"
+#: ../../include/enotify.php:104
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: ../../include/text.php:996
-msgid "bitter"
+#: ../../include/enotify.php:160
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
 msgstr ""
 
-#: ../../include/text.php:997
-msgid "cheerful"
+#: ../../include/enotify.php:168
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr ""
 
-#: ../../include/text.php:998
-msgid "alive"
+#: ../../include/enotify.php:177
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
 msgstr ""
 
-#: ../../include/text.php:999
-msgid "annoyed"
+#: ../../include/enotify.php:188
+#, php-format
+msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../include/text.php:1000
-msgid "anxious"
+#: ../../include/enotify.php:189
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../include/text.php:1001
-msgid "cranky"
+#: ../../include/enotify.php:192 ../../include/enotify.php:207
+#: ../../include/enotify.php:233 ../../include/enotify.php:251
+#: ../../include/enotify.php:265
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: ../../include/text.php:1002
-msgid "disturbed"
+#: ../../include/enotify.php:198
+#, php-format
+msgid "[Hubzilla:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: ../../include/text.php:1003
-msgid "frustrated"
+#: ../../include/enotify.php:200
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
 msgstr ""
 
-#: ../../include/text.php:1004
-msgid "depressed"
+#: ../../include/enotify.php:202
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
 msgstr ""
 
-#: ../../include/text.php:1005
-msgid "motivated"
+#: ../../include/enotify.php:226
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged you"
 msgstr ""
 
-#: ../../include/text.php:1006
-msgid "relaxed"
+#: ../../include/enotify.php:227
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
 msgstr ""
 
-#: ../../include/text.php:1007
-msgid "surprised"
+#: ../../include/enotify.php:228
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
 msgstr ""
 
-#: ../../include/text.php:1183
-msgid "May"
+#: ../../include/enotify.php:240
+#, php-format
+msgid "[Hubzilla:Notify] %1$s poked you"
 msgstr ""
 
-#: ../../include/text.php:1260 ../../include/text.php:1264
-msgid "Unknown Attachment"
+#: ../../include/enotify.php:241
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
 msgstr ""
 
-#: ../../include/text.php:1266
-msgid "unknown"
+#: ../../include/enotify.php:242
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
 msgstr ""
 
-#: ../../include/text.php:1302
-msgid "remove category"
+#: ../../include/enotify.php:258
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged your post"
 msgstr ""
 
-#: ../../include/text.php:1379
-msgid "remove from file"
+#: ../../include/enotify.php:259
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
 msgstr ""
 
-#: ../../include/text.php:1521 ../../include/text.php:1532
-msgid "Click to open/close"
+#: ../../include/enotify.php:260
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr ""
 
-#: ../../include/text.php:1716 ../../mod/events.php:623
-msgid "Link to Source"
+#: ../../include/enotify.php:272
+msgid "[Hubzilla:Notify] Introduction received"
 msgstr ""
 
-#: ../../include/text.php:1737 ../../include/text.php:1809
-msgid "default"
+#: ../../include/enotify.php:273
+#, php-format
+msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../include/text.php:1745
-msgid "Page layout"
+#: ../../include/enotify.php:274
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
 msgstr ""
 
-#: ../../include/text.php:1745
-msgid "You can create your own with the layouts tool"
+#: ../../include/enotify.php:278 ../../include/enotify.php:297
+#, php-format
+msgid "You may visit their profile at %s"
 msgstr ""
 
-#: ../../include/text.php:1787
-msgid "Page content type"
+#: ../../include/enotify.php:280
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
 msgstr ""
 
-#: ../../include/text.php:1821
-msgid "Select an alternate language"
+#: ../../include/enotify.php:287
+msgid "[Hubzilla:Notify] Friend suggestion received"
 msgstr ""
 
-#: ../../include/text.php:1953
-msgid "activity"
+#: ../../include/enotify.php:288
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../include/text.php:2248
-msgid "Design Tools"
+#: ../../include/enotify.php:289
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
 msgstr ""
 
-#: ../../include/text.php:2251 ../../mod/blocks.php:147
-msgid "Blocks"
+#: ../../include/enotify.php:295
+msgid "Name:"
 msgstr ""
 
-#: ../../include/text.php:2252 ../../mod/menu.php:103
-msgid "Menus"
+#: ../../include/enotify.php:296
+msgid "Photo:"
 msgstr ""
 
-#: ../../include/text.php:2253 ../../mod/layouts.php:174
-msgid "Layouts"
+#: ../../include/enotify.php:299
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/text.php:2254
-msgid "Pages"
+#: ../../include/enotify.php:514
+msgid "[Hubzilla:Notify]"
 msgstr ""
 
 #: ../../include/widgets.php:93
@@ -3756,6 +3733,10 @@ msgstr ""
 msgid "Remove term"
 msgstr ""
 
+#: ../../include/widgets.php:274 ../../include/features.php:80
+msgid "Saved Searches"
+msgstr ""
+
 #: ../../include/widgets.php:349
 msgid "Archives"
 msgstr ""
@@ -3817,6 +3798,11 @@ msgstr ""
 msgid "Premium Channel Settings"
 msgstr ""
 
+#: ../../include/widgets.php:549 ../../include/features.php:67
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
+msgstr ""
+
 #: ../../include/widgets.php:571
 msgid "Private Mail Menu"
 msgstr ""
@@ -3893,359 +3879,373 @@ msgstr ""
 msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:939 ../../include/widgets.php:1029
+#: ../../include/widgets.php:949 ../../include/widgets.php:1039
 msgid "photo/image"
 msgstr ""
 
-#: ../../include/widgets.php:1123
+#: ../../include/widgets.php:1133
 msgid "Rating Tools"
 msgstr ""
 
-#: ../../include/widgets.php:1127 ../../include/widgets.php:1129
+#: ../../include/widgets.php:1137 ../../include/widgets.php:1139
 msgid "Rate Me"
 msgstr ""
 
-#: ../../include/widgets.php:1132
+#: ../../include/widgets.php:1142
 msgid "View Ratings"
 msgstr ""
 
-#: ../../include/widgets.php:1143
+#: ../../include/widgets.php:1153
 msgid "Public Hubs"
 msgstr ""
 
-#: ../../include/widgets.php:1191
+#: ../../include/widgets.php:1201
 msgid "Forums"
 msgstr ""
 
-#: ../../include/widgets.php:1220
+#: ../../include/widgets.php:1230
 msgid "Tasks"
 msgstr ""
 
-#: ../../include/widgets.php:1229
+#: ../../include/widgets.php:1239
 msgid "Documentation"
 msgstr ""
 
-#: ../../include/widgets.php:1231
+#: ../../include/widgets.php:1241
 msgid "Project/Site Information"
 msgstr ""
 
-#: ../../include/widgets.php:1232
+#: ../../include/widgets.php:1242
 msgid "For Members"
 msgstr ""
 
-#: ../../include/widgets.php:1233
+#: ../../include/widgets.php:1243
 msgid "For Administrators"
 msgstr ""
 
-#: ../../include/widgets.php:1234
+#: ../../include/widgets.php:1244
 msgid "For Developers"
 msgstr ""
 
-#: ../../include/widgets.php:1259 ../../mod/admin.php:452
+#: ../../include/widgets.php:1269 ../../mod/admin.php:452
 msgid "Site"
 msgstr ""
 
-#: ../../include/widgets.php:1260
+#: ../../include/widgets.php:1270
 msgid "Accounts"
 msgstr ""
 
-#: ../../include/widgets.php:1261 ../../mod/admin.php:1051
+#: ../../include/widgets.php:1271 ../../mod/admin.php:1051
 msgid "Channels"
 msgstr ""
 
-#: ../../include/widgets.php:1263 ../../mod/admin.php:1166
+#: ../../include/widgets.php:1273 ../../mod/admin.php:1166
 #: ../../mod/admin.php:1227
 msgid "Plugins"
 msgstr ""
 
-#: ../../include/widgets.php:1264 ../../mod/admin.php:1388
+#: ../../include/widgets.php:1274 ../../mod/admin.php:1388
 #: ../../mod/admin.php:1422
 msgid "Themes"
 msgstr ""
 
-#: ../../include/widgets.php:1265
+#: ../../include/widgets.php:1275
 msgid "Inspect queue"
 msgstr ""
 
-#: ../../include/widgets.php:1266
+#: ../../include/widgets.php:1276
 msgid "Profile Config"
 msgstr ""
 
-#: ../../include/widgets.php:1267
+#: ../../include/widgets.php:1277
 msgid "DB updates"
 msgstr ""
 
-#: ../../include/widgets.php:1285 ../../include/widgets.php:1291
+#: ../../include/widgets.php:1295 ../../include/widgets.php:1301
 #: ../../mod/admin.php:1507
 msgid "Logs"
 msgstr ""
 
-#: ../../include/widgets.php:1290
+#: ../../include/widgets.php:1300
 msgid "Plugin Features"
 msgstr ""
 
-#: ../../include/widgets.php:1292
+#: ../../include/widgets.php:1302
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../include/widgets.php:1370 ../../mod/photos.php:748
+#: ../../include/widgets.php:1380 ../../mod/photos.php:748
 #: ../../mod/photos.php:1283
 msgid "View Photo"
 msgstr ""
 
-#: ../../include/widgets.php:1387 ../../mod/photos.php:779
+#: ../../include/widgets.php:1397 ../../mod/photos.php:779
 msgid "Edit Album"
 msgstr ""
 
-#: ../../include/items.php:423 ../../index.php:370 ../../mod/dreport.php:6
-#: ../../mod/dreport.php:45 ../../mod/group.php:68
-#: ../../mod/import_items.php:108 ../../mod/like.php:280
-#: ../../mod/profperm.php:23 ../../mod/subthread.php:58
-msgid "Permission denied"
+#: ../../include/features.php:45
+msgid "General Features"
+msgstr ""
+
+#: ../../include/features.php:47
+msgid "Content Expiration"
+msgstr ""
+
+#: ../../include/features.php:47
+msgid "Remove posts/comments and/or private messages at a future time"
+msgstr ""
+
+#: ../../include/features.php:48
+msgid "Multiple Profiles"
+msgstr ""
+
+#: ../../include/features.php:48
+msgid "Ability to create multiple profiles"
+msgstr ""
+
+#: ../../include/features.php:49
+msgid "Advanced Profiles"
+msgstr ""
+
+#: ../../include/features.php:49
+msgid "Additional profile sections and selections"
+msgstr ""
+
+#: ../../include/features.php:50
+msgid "Profile Import/Export"
+msgstr ""
+
+#: ../../include/features.php:50
+msgid "Save and load profile details across sites/channels"
+msgstr ""
+
+#: ../../include/features.php:51
+msgid "Web Pages"
+msgstr ""
+
+#: ../../include/features.php:51
+msgid "Provide managed web pages on your channel"
+msgstr ""
+
+#: ../../include/features.php:52
+msgid "Hide Rating"
+msgstr ""
+
+#: ../../include/features.php:52
+msgid ""
+"Hide the rating buttons on your channel and profile pages. Note: People can "
+"still rate you somewhere else."
 msgstr ""
 
-#: ../../include/items.php:1130 ../../include/items.php:1176
-msgid "(Unknown)"
+#: ../../include/features.php:53
+msgid "Private Notes"
 msgstr ""
 
-#: ../../include/items.php:1373
-msgid "Visible to anybody on the internet."
+#: ../../include/features.php:53
+msgid "Enables a tool to store notes and reminders (note: not encrypted)"
 msgstr ""
 
-#: ../../include/items.php:1375
-msgid "Visible to you only."
+#: ../../include/features.php:54
+msgid "Navigation Channel Select"
 msgstr ""
 
-#: ../../include/items.php:1377
-msgid "Visible to anybody in this network."
+#: ../../include/features.php:54
+msgid "Change channels directly from within the navigation dropdown menu"
 msgstr ""
 
-#: ../../include/items.php:1379
-msgid "Visible to anybody authenticated."
+#: ../../include/features.php:55
+msgid "Photo Location"
 msgstr ""
 
-#: ../../include/items.php:1381
-#, php-format
-msgid "Visible to anybody on %s."
+#: ../../include/features.php:55
+msgid "If location data is available on uploaded photos, link this to a map."
 msgstr ""
 
-#: ../../include/items.php:1383
-msgid "Visible to all connections."
+#: ../../include/features.php:57
+msgid "Expert Mode"
 msgstr ""
 
-#: ../../include/items.php:1385
-msgid "Visible to approved connections."
+#: ../../include/features.php:57
+msgid "Enable Expert Mode to provide advanced configuration options"
 msgstr ""
 
-#: ../../include/items.php:1387
-msgid "Visible to specific connections."
+#: ../../include/features.php:58
+msgid "Premium Channel"
 msgstr ""
 
-#: ../../include/items.php:4350 ../../mod/admin.php:135
-#: ../../mod/admin.php:1091 ../../mod/admin.php:1336 ../../mod/display.php:36
-#: ../../mod/filestorage.php:27 ../../mod/thing.php:85
-#: ../../mod/viewsrc.php:20
-msgid "Item not found."
+#: ../../include/features.php:58
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
 msgstr ""
 
-#: ../../include/items.php:4862 ../../mod/group.php:38 ../../mod/group.php:137
-msgid "Privacy group not found."
+#: ../../include/features.php:63
+msgid "Post Composition Features"
 msgstr ""
 
-#: ../../include/items.php:4878
-msgid "Privacy group is empty."
+#: ../../include/features.php:65
+msgid "Use Markdown"
 msgstr ""
 
-#: ../../include/items.php:4885
-#, php-format
-msgid "Privacy group: %s"
+#: ../../include/features.php:65
+msgid "Allow use of \"Markdown\" to format posts"
 msgstr ""
 
-#: ../../include/items.php:4895 ../../mod/connedit.php:692
-#, php-format
-msgid "Connection: %s"
+#: ../../include/features.php:66
+msgid "Large Photos"
 msgstr ""
 
-#: ../../include/items.php:4897
-msgid "Connection not found."
+#: ../../include/features.php:66
+msgid ""
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
 msgstr ""
 
-#: ../../include/enotify.php:96
-#, php-format
-msgid "%s <!item_type!>"
+#: ../../include/features.php:67
+msgid "Automatically import channel content from other channels or feeds"
 msgstr ""
 
-#: ../../include/enotify.php:100
-#, php-format
-msgid "[Hubzilla:Notify] New mail received at %s"
+#: ../../include/features.php:68
+msgid "Even More Encryption"
 msgstr ""
 
-#: ../../include/enotify.php:102
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
+#: ../../include/features.php:68
+msgid ""
+"Allow optional encryption of content end-to-end with a shared secret key"
 msgstr ""
 
-#: ../../include/enotify.php:103
-#, php-format
-msgid "%1$s sent you %2$s."
+#: ../../include/features.php:69
+msgid "Enable Voting Tools"
 msgstr ""
 
-#: ../../include/enotify.php:103
-msgid "a private message"
+#: ../../include/features.php:69
+msgid "Provide a class of post which others can vote on"
 msgstr ""
 
-#: ../../include/enotify.php:104
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
+#: ../../include/features.php:70
+msgid "Delayed Posting"
 msgstr ""
 
-#: ../../include/enotify.php:160
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+#: ../../include/features.php:70
+msgid "Allow posts to be published at a later date"
 msgstr ""
 
-#: ../../include/enotify.php:168
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+#: ../../include/features.php:71
+msgid "Suppress Duplicate Posts/Comments"
 msgstr ""
 
-#: ../../include/enotify.php:177
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+#: ../../include/features.php:71
+msgid ""
+"Prevent posts with identical content to be published with less than two "
+"minutes in between submissions."
 msgstr ""
 
-#: ../../include/enotify.php:188
-#, php-format
-msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
+#: ../../include/features.php:77
+msgid "Network and Stream Filtering"
 msgstr ""
 
-#: ../../include/enotify.php:189
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
+#: ../../include/features.php:78
+msgid "Search by Date"
 msgstr ""
 
-#: ../../include/enotify.php:192 ../../include/enotify.php:207
-#: ../../include/enotify.php:233 ../../include/enotify.php:251
-#: ../../include/enotify.php:265
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
+#: ../../include/features.php:78
+msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: ../../include/enotify.php:198
-#, php-format
-msgid "[Hubzilla:Notify] %s posted to your profile wall"
+#: ../../include/features.php:79
+msgid "Enable management and selection of privacy groups"
 msgstr ""
 
-#: ../../include/enotify.php:200
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
+#: ../../include/features.php:80
+msgid "Save search terms for re-use"
 msgstr ""
 
-#: ../../include/enotify.php:202
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+#: ../../include/features.php:81
+msgid "Network Personal Tab"
 msgstr ""
 
-#: ../../include/enotify.php:226
-#, php-format
-msgid "[Hubzilla:Notify] %s tagged you"
+#: ../../include/features.php:81
+msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr ""
 
-#: ../../include/enotify.php:227
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
+#: ../../include/features.php:82
+msgid "Network New Tab"
 msgstr ""
 
-#: ../../include/enotify.php:228
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+#: ../../include/features.php:82
+msgid "Enable tab to display all new Network activity"
 msgstr ""
 
-#: ../../include/enotify.php:240
-#, php-format
-msgid "[Hubzilla:Notify] %1$s poked you"
+#: ../../include/features.php:83
+msgid "Affinity Tool"
 msgstr ""
 
-#: ../../include/enotify.php:241
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
+#: ../../include/features.php:83
+msgid "Filter stream activity by depth of relationships"
 msgstr ""
 
-#: ../../include/enotify.php:242
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+#: ../../include/features.php:84
+msgid "Connection Filtering"
 msgstr ""
 
-#: ../../include/enotify.php:258
-#, php-format
-msgid "[Hubzilla:Notify] %s tagged your post"
+#: ../../include/features.php:84
+msgid "Filter incoming posts from connections based on keywords/content"
 msgstr ""
 
-#: ../../include/enotify.php:259
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
+#: ../../include/features.php:85
+msgid "Suggest Channels"
 msgstr ""
 
-#: ../../include/enotify.php:260
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+#: ../../include/features.php:85
+msgid "Show channel suggestions"
 msgstr ""
 
-#: ../../include/enotify.php:272
-msgid "[Hubzilla:Notify] Introduction received"
+#: ../../include/features.php:90
+msgid "Post/Comment Tools"
 msgstr ""
 
-#: ../../include/enotify.php:273
-#, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+#: ../../include/features.php:91
+msgid "Community Tagging"
 msgstr ""
 
-#: ../../include/enotify.php:274
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+#: ../../include/features.php:91
+msgid "Ability to tag existing posts"
 msgstr ""
 
-#: ../../include/enotify.php:278 ../../include/enotify.php:297
-#, php-format
-msgid "You may visit their profile at %s"
+#: ../../include/features.php:92
+msgid "Post Categories"
 msgstr ""
 
-#: ../../include/enotify.php:280
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
+#: ../../include/features.php:92
+msgid "Add categories to your posts"
 msgstr ""
 
-#: ../../include/enotify.php:287
-msgid "[Hubzilla:Notify] Friend suggestion received"
+#: ../../include/features.php:93
+msgid "Ability to file posts under folders"
 msgstr ""
 
-#: ../../include/enotify.php:288
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+#: ../../include/features.php:94
+msgid "Dislike Posts"
 msgstr ""
 
-#: ../../include/enotify.php:289
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
+#: ../../include/features.php:94
+msgid "Ability to dislike posts/comments"
 msgstr ""
 
-#: ../../include/enotify.php:295
-msgid "Name:"
+#: ../../include/features.php:95
+msgid "Star Posts"
 msgstr ""
 
-#: ../../include/enotify.php:296
-msgid "Photo:"
+#: ../../include/features.php:95
+msgid "Ability to mark special posts with a star indicator"
 msgstr ""
 
-#: ../../include/enotify.php:299
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
+#: ../../include/features.php:96
+msgid "Tag Cloud"
 msgstr ""
 
-#: ../../include/enotify.php:514
-msgid "[Hubzilla:Notify]"
+#: ../../include/features.php:96
+msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
 #: ../../index.php:242 ../../mod/help.php:213
@@ -5149,6 +5149,7 @@ msgid "Invalid item."
 msgstr ""
 
 #: ../../mod/block.php:39 ../../mod/page.php:52 ../../mod/wall_upload.php:29
+#: ../../mod/zcard.php:19
 msgid "Channel not found."
 msgstr ""
 
@@ -8902,7 +8903,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:86 ../../boot.php:1525
+#: ../../mod/lostpass.php:86 ../../boot.php:1526
 msgid "Password Reset"
 msgstr ""
 
@@ -9404,51 +9405,51 @@ msgstr ""
 msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../boot.php:1328
+#: ../../boot.php:1329
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1331
+#: ../../boot.php:1332
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1498
+#: ../../boot.php:1499
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr ""
 
-#: ../../boot.php:1520
+#: ../../boot.php:1521
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1521
+#: ../../boot.php:1522
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1524
+#: ../../boot.php:1525
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2154
+#: ../../boot.php:2155
 msgid "toggle mobile"
 msgstr ""
 
-#: ../../boot.php:2306
+#: ../../boot.php:2307
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2309
+#: ../../boot.php:2310
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2346
+#: ../../boot.php:2347
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
 
-#: ../../boot.php:2350
+#: ../../boot.php:2351
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr ""
diff --git a/version.inc b/version.inc
index b9468dd8c..1c457edcc 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-01-28.1292H
+2016-01-29.1293H
-- 
cgit v1.2.3


From d7abacb7b2737699d983862aa03628ee3d758545 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sat, 30 Jan 2016 00:30:49 +0100
Subject: it is not perfect but it still may ease the collapsing of items above
 the viewport a little...

---
 view/js/main.js | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 3 deletions(-)

diff --git a/view/js/main.js b/view/js/main.js
index d670b704a..3906953f6 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -630,14 +630,29 @@ function updateConvItems(mode,data) {
 	} else {
 		collapseHeight();
 	}
+
 }
 
 
+var contentHeightDiff = 0;
 function collapseHeight() {
+	var origContentHeight = parseInt($("#region_2").height());
+	var cDiff = 0;
+	var i = 0;
 	$(".wall-item-content, .directory-collapse").each(function() {
-		var orgHeight = $(this).outerHeight(true);
-		if(orgHeight > divmore_height + 10) {
+		var orgHeight = parseInt($(this).height());
+		if(orgHeight > divmore_height) {
 			if(! $(this).hasClass('divmore')) {
+
+				// check if we will collapse some content above the visible content and compensate the diff later
+				if(($(this).offset().top + orgHeight - $(window).scrollTop()) < 50) {
+					diff = orgHeight - divmore_height;
+					//console.log('diff: ' + diff);
+
+					cDiff = cDiff + diff;
+					i++;
+				}
+
 				$(this).readmore({
 					speed: 0,
 					heightMargin: 50,
@@ -653,9 +668,38 @@ function collapseHeight() {
 					}
 				});
 				$(this).addClass('divmore');
+
 			}
 		}
 	});
+
+	var collapsedContentHeight = parseInt($("#region_2").height());
+	contentHeightDiff = origContentHeight - collapsedContentHeight;
+
+	if(i){
+
+		var position = $(window).scrollTop();
+
+		//console.log('cDiff: ' + cDiff);
+
+		//console.log('position: ' + position);
+
+		//console.log('origContentHeight: ' + origContentHeight);
+
+		//console.log('collapsedContentHeight: ' + collapsedContentHeight);
+
+		//console.log('contentHeightDiff: ' + contentHeightDiff);
+
+		var sval = position - cDiff + (i*3); // i*3 is possibly some border or margin/padding which might not be calculated correct
+
+		//console.log('sval: ' + sval);
+		console.log('collapsed above content count: ' + i);
+
+		$(window).scrollTop(sval);
+
+		//var nposition = $(document).scrollTop();
+		//console.log('nposition: ' + nposition);
+	}
 }
 
 function liveUpdate() {
@@ -708,7 +752,7 @@ function liveUpdate() {
 		$("#profile-jot-text-loading").spin(false);
 
 		if(update_mode === 'update') {
-			$(window).scrollTop($(window).scrollTop() + $("#region_2").height() - orgHeight);
+			$(window).scrollTop($(window).scrollTop() + $("#region_2").height() - orgHeight + contentHeightDiff);
 		}
 
 		in_progress = false;
-- 
cgit v1.2.3


From da198fdda50389d79f1c792d6e11369ec869a88e Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sat, 30 Jan 2016 01:28:01 +0100
Subject: more on collapsing

---
 view/js/main.js | 73 ++++++++++++++++-----------------------------------------
 1 file changed, 20 insertions(+), 53 deletions(-)

diff --git a/view/js/main.js b/view/js/main.js
index 3906953f6..a37c23cf0 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -248,6 +248,7 @@ var updateCountsOnly = false;
 var divmore_height = 400;
 var last_filestorage_id = null;
 var mediaPlaying = false;
+var contentHeightDiff = 0;
 
 $(function() {
 	$.ajaxSetup({cache: false});
@@ -624,7 +625,7 @@ function updateConvItems(mode,data) {
 		bimgs.load(function() {
 			bimgcount--;
 			if (! bimgcount) {
-				collapseHeight();
+				collapseHeight(true);
 			}
 		});
 	} else {
@@ -633,42 +634,29 @@ function updateConvItems(mode,data) {
 
 }
 
-
-var contentHeightDiff = 0;
-function collapseHeight() {
+function collapseHeight(below=false) {
 	var origContentHeight = parseInt($("#region_2").height());
-	var cDiff = 0;
-	var i = 0;
 	$(".wall-item-content, .directory-collapse").each(function() {
 		var orgHeight = parseInt($(this).height());
 		if(orgHeight > divmore_height) {
 			if(! $(this).hasClass('divmore')) {
-
-				// check if we will collapse some content above the visible content and compensate the diff later
-				if(($(this).offset().top + orgHeight - $(window).scrollTop()) < 50) {
-					diff = orgHeight - divmore_height;
-					//console.log('diff: ' + diff);
-
-					cDiff = cDiff + diff;
-					i++;
-				}
-
-				$(this).readmore({
-					speed: 0,
-					heightMargin: 50,
-					collapsedHeight: divmore_height, 
-					moreLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowmore + '</a>',
-					lessLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowless + '</a>',
-					beforeToggle: function(trigger, element, expanded) {
-						if(expanded) {
-							if((($(element).offset().top + divmore_height) - $(window).scrollTop()) < 65 ) {
-								$('html, body').animate( { scrollTop: $(window).scrollTop() - (orgHeight - divmore_height) }, {duration: 0 } );
+				if((below=true) && ($(window).scrollTop() + ($(window).height() - divmore_height) < $(this).offset().top)) {
+					$(this).readmore({
+						speed: 0,
+						heightMargin: 50,
+						collapsedHeight: divmore_height,
+						moreLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowmore + '</a>',
+						lessLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowless + '</a>',
+						beforeToggle: function(trigger, element, expanded) {
+							if(expanded) {
+								if((($(element).offset().top + divmore_height) - $(window).scrollTop()) < 65 ) {
+									$('html, body').animate( { scrollTop: $(window).scrollTop() - (orgHeight - divmore_height) }, {duration: 0 } );
+								}
 							}
 						}
-					}
-				});
-				$(this).addClass('divmore');
-
+					});
+					$(this).addClass('divmore');
+				}
 			}
 		}
 	});
@@ -676,30 +664,7 @@ function collapseHeight() {
 	var collapsedContentHeight = parseInt($("#region_2").height());
 	contentHeightDiff = origContentHeight - collapsedContentHeight;
 
-	if(i){
 
-		var position = $(window).scrollTop();
-
-		//console.log('cDiff: ' + cDiff);
-
-		//console.log('position: ' + position);
-
-		//console.log('origContentHeight: ' + origContentHeight);
-
-		//console.log('collapsedContentHeight: ' + collapsedContentHeight);
-
-		//console.log('contentHeightDiff: ' + contentHeightDiff);
-
-		var sval = position - cDiff + (i*3); // i*3 is possibly some border or margin/padding which might not be calculated correct
-
-		//console.log('sval: ' + sval);
-		console.log('collapsed above content count: ' + i);
-
-		$(window).scrollTop(sval);
-
-		//var nposition = $(document).scrollTop();
-		//console.log('nposition: ' + nposition);
-	}
 }
 
 function liveUpdate() {
@@ -751,6 +716,8 @@ function liveUpdate() {
 		$("#page-spinner").spin(false);
 		$("#profile-jot-text-loading").spin(false);
 
+		console.log('contentHeightDiff: ' + contentHeightDiff);
+
 		if(update_mode === 'update') {
 			$(window).scrollTop($(window).scrollTop() + $("#region_2").height() - orgHeight + contentHeightDiff);
 		}
-- 
cgit v1.2.3


From b6543beca2f0e5e353b497099e3fa6b29bf47233 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sat, 30 Jan 2016 01:34:27 +0100
Subject: do not make a difference if there are images or not for now

---
 view/js/main.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/view/js/main.js b/view/js/main.js
index a37c23cf0..16f6b9213 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -625,7 +625,7 @@ function updateConvItems(mode,data) {
 		bimgs.load(function() {
 			bimgcount--;
 			if (! bimgcount) {
-				collapseHeight(true);
+				collapseHeight();
 			}
 		});
 	} else {
@@ -634,13 +634,13 @@ function updateConvItems(mode,data) {
 
 }
 
-function collapseHeight(below=false) {
+function collapseHeight() {
 	var origContentHeight = parseInt($("#region_2").height());
 	$(".wall-item-content, .directory-collapse").each(function() {
 		var orgHeight = parseInt($(this).height());
 		if(orgHeight > divmore_height) {
 			if(! $(this).hasClass('divmore')) {
-				if((below=true) && ($(window).scrollTop() + ($(window).height() - divmore_height) < $(this).offset().top)) {
+				if($(window).scrollTop() + ($(window).height() - divmore_height) < $(this).offset().top) {
 					$(this).readmore({
 						speed: 0,
 						heightMargin: 50,
-- 
cgit v1.2.3


From 0405a49df19663d92a8e660a4193dbf2f582f04d Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sat, 30 Jan 2016 13:47:58 +0100
Subject: fix a slight regression

---
 view/js/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/js/main.js b/view/js/main.js
index 16f6b9213..220898efd 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -637,7 +637,7 @@ function updateConvItems(mode,data) {
 function collapseHeight() {
 	var origContentHeight = parseInt($("#region_2").height());
 	$(".wall-item-content, .directory-collapse").each(function() {
-		var orgHeight = parseInt($(this).height());
+		var orgHeight = parseInt($(this).css('height'));
 		if(orgHeight > divmore_height) {
 			if(! $(this).hasClass('divmore')) {
 				if($(window).scrollTop() + ($(window).height() - divmore_height) < $(this).offset().top) {
-- 
cgit v1.2.3


From 385709853b7db64bbb660824e033674d594b3ac0 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sat, 30 Jan 2016 14:26:38 +0100
Subject: css fixes

---
 view/css/conversation.css         |  2 +-
 view/theme/redbasic/css/style.css | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/view/css/conversation.css b/view/css/conversation.css
index d49359f46..9063ffa60 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -49,7 +49,7 @@ code {
 	height: 30px;
 }
 
-#profile-jot-end {
+#profile-jot-wrapper {
 	margin-bottom: 30px;
 }
 
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 4ae08dec8..ffa613bc9 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1160,6 +1160,13 @@ img.mail-conv-sender-photo {
 	background-color: #fff;
 }
 
+#profile-jot-wrapper {
+	background-color: rgba(254,254,254,.5);
+	border: 1px solid rgba(254,254,254,.5);
+	border-radius: $radiuspx;
+
+}
+
 #profile-jot-text {
 	color:#000;
 	border: 1px solid #cccccc;
@@ -1361,8 +1368,8 @@ img.mail-conv-sender-photo {
 /* widgets */
 
 .widget {
-	background-color: rgba(254,254,254,0.5);
-	border-bottom: 1px solid rgba(238,238,238,0.8);
+	background-color: rgba(254,254,254,.5);
+	border: 1px solid rgba(254,254,254,.5);
 	-moz-border-radius: $radiuspx;
 	-webkit-border-radius: $radiuspx;
 	border-radius: $radiuspx;
@@ -1691,6 +1698,13 @@ nav .badge.mail-update:hover {
 	padding: 7px 10px;
 }
 
+.nav-tabs.nav-justified {
+	background-color: rgba(254,254,254,.5);
+	border: 1px solid rgba(254,254,254,.5);
+	border-top-left-radius: $radiuspx;
+	border-top-right-radius: $radiuspx;
+}
+
 .nav-tabs.nav-justified > .active > a,
 .nav-tabs.nav-justified > .active > a:hover,
 .nav-tabs.nav-justified > .active > a:focus {
-- 
cgit v1.2.3


From c8d0a2b4bbb7b56f4ab82bfcb96df9d9025f3d15 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sat, 30 Jan 2016 14:40:45 +0100
Subject: one more css fix

---
 view/theme/redbasic/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index ffa613bc9..7b4a3ddd7 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -297,7 +297,7 @@ footer {
 	margin-bottom: 10px;
 	padding: 10px;
 	background-color: rgba(254,254,254,0.5);
-	border-bottom: 1px solid rgba(238,238,238,0.8);
+	border: 1px solid rgba(254,254,254,0.5);
 	-moz-border-radius: $radiuspx;
 	-webkit-border-radius: $radiuspx;
 	border-radius: $radiuspx;
-- 
cgit v1.2.3


From 1f87fef9684a29da91fcb41a5d1d3bd4fb9a4619 Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Sat, 30 Jan 2016 23:44:45 +0100
Subject: es-es+nl strings and fixing css maintained schemas

---
 view/es-es/hmessages.po                            | 1822 ++++++++++----------
 view/es-es/hstrings.php                            |  308 ++--
 view/nl/hmessages.po                               | 1808 +++++++++----------
 view/nl/hstrings.php                               |  288 ++--
 view/theme/redbasic/schema/bluegrid.css            |    7 +
 view/theme/redbasic/schema/dark.css                |   12 +-
 .../redbasic/schema/simple_black_on_white.css      |    9 +
 .../redbasic/schema/simple_green_on_black.css      |    9 +
 .../redbasic/schema/simple_white_on_black.css      |    9 +
 9 files changed, 2161 insertions(+), 2111 deletions(-)

diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index c8a63af9d..87b6a8beb 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-22 00:03-0800\n"
-"PO-Revision-Date: 2016-01-24 08:19+0000\n"
+"POT-Creation-Date: 2016-01-29 00:03-0800\n"
+"PO-Revision-Date: 2016-01-30 19:23+0000\n"
 "Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n"
 "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/red-matrix/language/es_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -34,8 +34,8 @@ msgid "Welcome %s. Remote authentication successful."
 msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente."
 
 #: ../../include/Contact.php:101 ../../include/conversation.php:961
-#: ../../include/identity.php:949 ../../include/widgets.php:137
-#: ../../include/widgets.php:175 ../../mod/directory.php:318
+#: ../../include/identity.php:953 ../../include/widgets.php:137
+#: ../../include/widgets.php:175 ../../mod/directory.php:321
 #: ../../mod/match.php:64 ../../mod/suggest.php:52
 msgid "Connect"
 msgstr "Conectar"
@@ -72,11 +72,11 @@ msgstr "Mensaje Privado"
 #: ../../include/ItemObject.php:100 ../../include/RedDAV/RedBrowser.php:240
 #: ../../include/apps.php:259 ../../include/menu.php:108
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
-#: ../../mod/blocks.php:153 ../../mod/connections.php:284
-#: ../../mod/connections.php:304 ../../mod/editblock.php:135
+#: ../../mod/blocks.php:153 ../../mod/connections.php:286
+#: ../../mod/connections.php:306 ../../mod/editblock.php:135
 #: ../../mod/editlayout.php:134 ../../mod/editpost.php:112
 #: ../../mod/editwebpage.php:176 ../../mod/layouts.php:183
-#: ../../mod/menu.php:108 ../../mod/settings.php:648 ../../mod/thing.php:257
+#: ../../mod/menu.php:108 ../../mod/settings.php:648 ../../mod/thing.php:256
 #: ../../mod/webpages.php:181
 msgid "Edit"
 msgstr "Editar"
@@ -88,7 +88,7 @@ msgstr "Editar"
 #: ../../mod/editblock.php:181 ../../mod/editlayout.php:179
 #: ../../mod/editwebpage.php:223 ../../mod/group.php:173
 #: ../../mod/photos.php:1126 ../../mod/settings.php:649
-#: ../../mod/thing.php:258 ../../mod/webpages.php:183
+#: ../../mod/thing.php:257 ../../mod/webpages.php:183
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -131,8 +131,8 @@ msgid "View all"
 msgstr "Ver todo"
 
 #: ../../include/ItemObject.php:179 ../../include/conversation.php:1731
-#: ../../include/taxonomy.php:414 ../../include/identity.php:1262
-#: ../../mod/photos.php:1083
+#: ../../include/taxonomy.php:414 ../../include/identity.php:1266
+#: ../../mod/photos.php:1083 ../../mod/zcard.php:56
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
@@ -311,9 +311,9 @@ msgstr "Comentar"
 #: ../../mod/profiles.php:675 ../../mod/rate.php:168
 #: ../../mod/settings.php:586 ../../mod/settings.php:698
 #: ../../mod/settings.php:726 ../../mod/settings.php:749
-#: ../../mod/settings.php:834 ../../mod/settings.php:1023
+#: ../../mod/settings.php:834 ../../mod/settings.php:1024
 #: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/thing.php:313 ../../mod/thing.php:359
+#: ../../mod/sources.php:138 ../../mod/thing.php:312 ../../mod/thing.php:358
 #: ../../mod/xchan.php:11 ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr "Enviar"
@@ -404,7 +404,7 @@ msgstr "Programar bandeja de salida"
 
 #: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:360
 #: ../../include/apps.php:415 ../../include/conversation.php:1037
-#: ../../include/widgets.php:1368 ../../mod/photos.php:754
+#: ../../include/widgets.php:1386 ../../mod/photos.php:754
 #: ../../mod/photos.php:1195
 msgid "Unknown"
 msgstr "Desconocido"
@@ -426,13 +426,13 @@ msgstr "Compartido"
 #: ../../include/RedDAV/RedBrowser.php:230
 #: ../../include/RedDAV/RedBrowser.php:303 ../../mod/blocks.php:152
 #: ../../mod/layouts.php:175 ../../mod/menu.php:114
-#: ../../mod/new_channel.php:133 ../../mod/register.php:255
+#: ../../mod/new_channel.php:144 ../../mod/register.php:255
 #: ../../mod/webpages.php:180
 msgid "Create"
 msgstr "Crear"
 
 #: ../../include/RedDAV/RedBrowser.php:231
-#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1381
+#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1399
 #: ../../mod/photos.php:781 ../../mod/photos.php:1316
 #: ../../mod/profile_photo.php:453 ../../mod/cover_photo.php:353
 msgid "Upload"
@@ -574,7 +574,7 @@ msgstr "Otras redes y servicios de publicación"
 
 #: ../../include/acl_selectors.php:251 ../../mod/chat.php:211
 #: ../../mod/filestorage.php:147 ../../mod/photos.php:631
-#: ../../mod/photos.php:998 ../../mod/thing.php:310 ../../mod/thing.php:356
+#: ../../mod/photos.php:998 ../../mod/thing.php:309 ../../mod/thing.php:355
 msgid "Permissions"
 msgstr "Permisos"
 
@@ -618,12 +618,12 @@ msgstr "Marcadores"
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
-#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1508
+#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1518
 msgid "Login"
 msgstr "Iniciar sesión"
 
 #: ../../include/apps.php:132 ../../include/nav.php:200
-#: ../../mod/manage.php:160
+#: ../../mod/manage.php:162
 msgid "Channel Manager"
 msgstr "Administración de canales"
 
@@ -646,8 +646,8 @@ msgstr "Páginas web"
 msgid "Channel Home"
 msgstr "Mi canal"
 
-#: ../../include/apps.php:138 ../../include/identity.php:1236
-#: ../../include/identity.php:1353 ../../mod/profperm.php:112
+#: ../../include/apps.php:138 ../../include/identity.php:1240
+#: ../../include/identity.php:1357 ../../mod/profperm.php:112
 msgid "Profile"
 msgstr "Perfil"
 
@@ -687,7 +687,7 @@ msgstr "Chat"
 
 #: ../../include/apps.php:147 ../../include/nav.php:159
 #: ../../include/text.php:885 ../../include/text.php:897
-#: ../../mod/connections.php:300 ../../mod/search.php:40
+#: ../../mod/connections.php:302 ../../mod/search.php:40
 msgid "Search"
 msgstr "Buscar"
 
@@ -707,7 +707,7 @@ msgstr "Canal aleatorio"
 msgid "Invite"
 msgstr "Invitar"
 
-#: ../../include/apps.php:152 ../../include/widgets.php:1254
+#: ../../include/apps.php:152 ../../include/widgets.php:1272
 msgid "Features"
 msgstr "Funcionalidades"
 
@@ -744,12 +744,12 @@ msgstr "Comprar"
 #: ../../include/attach.php:436 ../../include/attach.php:888
 #: ../../include/attach.php:959 ../../include/attach.php:1111
 #: ../../include/chat.php:133 ../../include/photos.php:29
-#: ../../include/items.php:4407 ../../index.php:186 ../../index.php:371
+#: ../../include/items.php:4429 ../../index.php:186 ../../index.php:371
 #: ../../mod/achievements.php:30 ../../mod/api.php:26 ../../mod/api.php:31
 #: ../../mod/appman.php:66 ../../mod/authtest.php:13 ../../mod/block.php:22
 #: ../../mod/block.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76
 #: ../../mod/bookmarks.php:48 ../../mod/channel.php:100
-#: ../../mod/channel.php:214 ../../mod/channel.php:254 ../../mod/chat.php:94
+#: ../../mod/channel.php:215 ../../mod/channel.php:255 ../../mod/chat.php:94
 #: ../../mod/chat.php:99 ../../mod/common.php:35 ../../mod/connections.php:29
 #: ../../mod/connedit.php:355 ../../mod/editblock.php:65
 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
@@ -765,7 +765,7 @@ msgstr "Comprar"
 #: ../../mod/locs.php:83 ../../mod/mail.php:126 ../../mod/manage.php:6
 #: ../../mod/menu.php:74 ../../mod/message.php:16 ../../mod/mitem.php:111
 #: ../../mod/mood.php:112 ../../mod/network.php:12
-#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99
+#: ../../mod/new_channel.php:75 ../../mod/new_channel.php:109
 #: ../../mod/notifications.php:66 ../../mod/page.php:31 ../../mod/page.php:86
 #: ../../mod/pdledit.php:22 ../../mod/photos.php:70 ../../mod/poke.php:133
 #: ../../mod/profile.php:64 ../../mod/profile.php:72
@@ -774,8 +774,8 @@ msgstr "Comprar"
 #: ../../mod/rate.php:111 ../../mod/register.php:73 ../../mod/regmod.php:17
 #: ../../mod/service_limits.php:7 ../../mod/settings.php:568
 #: ../../mod/setup.php:227 ../../mod/sharedwithme.php:7
-#: ../../mod/sources.php:66 ../../mod/suggest.php:26 ../../mod/thing.php:271
-#: ../../mod/thing.php:291 ../../mod/thing.php:328
+#: ../../mod/sources.php:66 ../../mod/suggest.php:26 ../../mod/thing.php:270
+#: ../../mod/thing.php:290 ../../mod/thing.php:327
 #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
 #: ../../mod/viewsrc.php:14 ../../mod/webpages.php:69
 #: ../../mod/cover_photo.php:273 ../../mod/cover_photo.php:286
@@ -880,8 +880,8 @@ msgid "Finishes:"
 msgstr "Finaliza:"
 
 #: ../../include/bb2diaspora.php:487 ../../include/event.php:52
-#: ../../include/identity.php:1000 ../../include/text.php:1425
-#: ../../mod/directory.php:304
+#: ../../include/identity.php:1004 ../../include/text.php:1425
+#: ../../mod/directory.php:307
 msgid "Location:"
 msgstr "Ubicación:"
 
@@ -934,7 +934,7 @@ msgstr "%1$s escribió la siguiente %2$s %3$s"
 
 #: ../../include/bbcode.php:259 ../../mod/tagger.php:51
 msgid "post"
-msgstr "entrada"
+msgstr "la entrada"
 
 #: ../../include/bbcode.php:547
 msgid "Different viewers will see this text differently"
@@ -1004,12 +1004,12 @@ msgstr "Conectar/Seguir"
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Ejemplos: José Fernández, Pesca"
 
-#: ../../include/contact_widgets.php:26 ../../mod/connections.php:303
-#: ../../mod/directory.php:381 ../../mod/directory.php:386
+#: ../../include/contact_widgets.php:26 ../../mod/connections.php:305
+#: ../../mod/directory.php:384 ../../mod/directory.php:389
 msgid "Find"
 msgstr "Encontrar"
 
-#: ../../include/contact_widgets.php:27 ../../mod/directory.php:385
+#: ../../include/contact_widgets.php:27 ../../mod/directory.php:388
 #: ../../mod/suggest.php:60
 msgid "Channel Suggestions"
 msgstr "Sugerencias de canales"
@@ -1026,8 +1026,8 @@ msgstr "Invitar a amigos"
 msgid "Advanced example: name=fred and country=iceland"
 msgstr "Ejemplo avanzado: nombre=juan y país=españa"
 
-#: ../../include/contact_widgets.php:57 ../../include/features.php:93
-#: ../../include/widgets.php:304
+#: ../../include/contact_widgets.php:57 ../../include/widgets.php:304
+#: ../../include/features.php:93
 msgid "Saved Folders"
 msgstr "Carpetas guardadas"
 
@@ -1574,7 +1574,7 @@ msgstr "AAAA-MM-DD o MM-DD"
 msgid "Required"
 msgstr "Obligatorio"
 
-#: ../../include/datetime.php:263 ../../boot.php:2330
+#: ../../include/datetime.php:263 ../../boot.php:2348
 msgid "never"
 msgstr "nunca"
 
@@ -1676,7 +1676,7 @@ msgstr "Modo seguro"
 #: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
 #: ../../mod/photos.php:626 ../../mod/removeme.php:60
 #: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1512
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1522
 msgid "No"
 msgstr "No"
 
@@ -1688,7 +1688,7 @@ msgstr "No"
 #: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
 #: ../../mod/photos.php:626 ../../mod/removeme.php:60
 #: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1512
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1522
 msgid "Yes"
 msgstr "Sí"
 
@@ -1700,202 +1700,6 @@ msgstr "Solo foros públicos"
 msgid "This Website Only"
 msgstr "Solo este sitio web"
 
-#: ../../include/enotify.php:57 ../../include/network.php:1612
-msgid "$Projectname Notification"
-msgstr "Notificación de $Projectname"
-
-#: ../../include/enotify.php:58 ../../include/network.php:1613
-msgid "$projectname"
-msgstr "$projectname"
-
-#: ../../include/enotify.php:60 ../../include/network.php:1615
-msgid "Thank You,"
-msgstr "Gracias,"
-
-#: ../../include/enotify.php:62 ../../include/network.php:1617
-#, php-format
-msgid "%s Administrator"
-msgstr "%s Administrador"
-
-#: ../../include/enotify.php:96
-#, php-format
-msgid "%s <!item_type!>"
-msgstr "%s <!item_type!>"
-
-#: ../../include/enotify.php:100
-#, php-format
-msgid "[Hubzilla:Notify] New mail received at %s"
-msgstr "[Hubzilla:Aviso] Nuevo mensaje en %s"
-
-#: ../../include/enotify.php:102
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
-msgstr "%1$s, %2$s le ha enviado un nuevo mensaje privado en %3$s."
-
-#: ../../include/enotify.php:103
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s le ha enviado %2$s."
-
-#: ../../include/enotify.php:103
-msgid "a private message"
-msgstr "un mensaje privado"
-
-#: ../../include/enotify.php:104
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "Por favor visite %s para ver y/o responder a su mensaje privado."
-
-#: ../../include/enotify.php:160
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
-msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%4$s[/zrl]"
-
-#: ../../include/enotify.php:168
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
-msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%5$s de %4$s[/zrl] "
-
-#: ../../include/enotify.php:177
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
-msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%4$s creado por usted[/zrl]"
-
-#: ../../include/enotify.php:188
-#, php-format
-msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Hubzilla:Aviso] Nuevo comentario de %2$s a la conversación #%1$d"
-
-#: ../../include/enotify.php:189
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
-msgstr "%1$s, %2$s ha comentado un elemento/conversación que ha estado siguiendo."
-
-#: ../../include/enotify.php:192 ../../include/enotify.php:207
-#: ../../include/enotify.php:233 ../../include/enotify.php:251
-#: ../../include/enotify.php:265
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Para ver o comentar la conversación, visite %s"
-
-#: ../../include/enotify.php:198
-#, php-format
-msgid "[Hubzilla:Notify] %s posted to your profile wall"
-msgstr "[Hubzilla:Aviso] %s ha publicado una entrada en su página de inicio del perfil (\"muro\")"
-
-#: ../../include/enotify.php:200
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
-msgstr "%1$s, %2$s ha publicado en su página del perfil en %3$s"
-
-#: ../../include/enotify.php:202
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
-msgstr "%1$s, %2$s ha publicado en [zrl=%3$s]su página del perfil[/zrl]"
-
-#: ../../include/enotify.php:226
-#, php-format
-msgid "[Hubzilla:Notify] %s tagged you"
-msgstr "[Hubzilla:Aviso] %s le ha etiquetado"
-
-#: ../../include/enotify.php:227
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
-msgstr "%1$s, %2$s le ha etiquetado en %3$s"
-
-#: ../../include/enotify.php:228
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%3$s]le etiquetó[/zrl]."
-
-#: ../../include/enotify.php:240
-#, php-format
-msgid "[Hubzilla:Notify] %1$s poked you"
-msgstr "[Hubzilla:Aviso] %1$s le ha dado un toque"
-
-#: ../../include/enotify.php:241
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
-msgstr "%1$s, %2$s le ha dado un toque en %3$s"
-
-#: ../../include/enotify.php:242
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%2$s]le ha dado un toque[/zrl]."
-
-#: ../../include/enotify.php:258
-#, php-format
-msgid "[Hubzilla:Notify] %s tagged your post"
-msgstr "[Hubzilla:Aviso] %s ha etiquetado su publicación"
-
-#: ../../include/enotify.php:259
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
-msgstr "%1$s, %2$s ha etiquetado su publicación en %3$s"
-
-#: ../../include/enotify.php:260
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr "%1$s, %2$s ha etiquetado [zrl=%3$s]su publicación[/zrl]"
-
-#: ../../include/enotify.php:272
-msgid "[Hubzilla:Notify] Introduction received"
-msgstr "[Hubzilla:Aviso] Ha recibido una solicitud de conexión"
-
-#: ../../include/enotify.php:273
-#, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
-msgstr "%1$s, ha recibido una nueva solicitud de conexión de '%2$s' en  %3$s"
-
-#: ../../include/enotify.php:274
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
-msgstr "%1$s, ha recibido [zrl=%2$s]una nueva solicitud de conexión[/zrl] de %3$s."
-
-#: ../../include/enotify.php:278 ../../include/enotify.php:297
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "Puede visitar su perfil en %s"
-
-#: ../../include/enotify.php:280
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
-msgstr "Por favor, visite %s para permitir o rechazar la solicitad de conexión."
-
-#: ../../include/enotify.php:287
-msgid "[Hubzilla:Notify] Friend suggestion received"
-msgstr "[Hubzilla:Aviso] Ha recibido una sugerencia de amistad"
-
-#: ../../include/enotify.php:288
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
-msgstr "%1$s, ha recibido una sugerencia de conexión de '%2$s' en %3$s"
-
-#: ../../include/enotify.php:289
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
-"%4$s."
-msgstr "%1$s, ha recibido [zrl=%2$s]una sugerencia de conexión[/zrl] para %3$s de %4$s."
-
-#: ../../include/enotify.php:295
-msgid "Name:"
-msgstr "Nombre:"
-
-#: ../../include/enotify.php:296
-msgid "Photo:"
-msgstr "Foto:"
-
-#: ../../include/enotify.php:299
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr "Por favor, visite %s para aprobar o rechazar la sugerencia."
-
-#: ../../include/enotify.php:514
-msgid "[Hubzilla:Notify]"
-msgstr "[Hubzilla:Aviso]"
-
 #: ../../include/event.php:768
 msgid "This event has been added to your calendar."
 msgstr "Este evento ha sido añadido a su calendario."
@@ -1960,8 +1764,8 @@ msgid ""
 msgstr "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos existentes  sean aplicados a este grupo y sus futuros miembros. Si no quiere esto, por favor cree otro grupo con un nombre diferente."
 
 #: ../../include/group.php:232
-msgid "Add new connections to this collection (privacy group)"
-msgstr "Añadir nuevas conexiones a esta colección (privacidad del grupo)"
+msgid "Add new connections to this privacy group"
+msgstr "Añadir las conexiones nuevas a este grupo privado"
 
 #: ../../include/group.php:251 ../../mod/admin.php:900
 msgid "All Channels"
@@ -1971,21 +1775,21 @@ msgstr "Todos los canales"
 msgid "edit"
 msgstr "editar"
 
-#: ../../include/group.php:295
-msgid "Collections"
-msgstr "Colecciones"
+#: ../../include/group.php:295 ../../include/features.php:79
+msgid "Privacy Groups"
+msgstr "Grupos privados"
 
 #: ../../include/group.php:296
-msgid "Edit collection"
-msgstr "Editar colección"
+msgid "Edit group"
+msgstr "Editar grupo"
 
 #: ../../include/group.php:297
-msgid "Add new collection"
-msgstr "Añadir nueva colección"
+msgid "Add privacy group"
+msgstr "Añadir un grupo privado"
 
 #: ../../include/group.php:298
-msgid "Channels not in any collection"
-msgstr "El canal no se encuentra en ninguna colección"
+msgid "Channels not in any privacy group"
+msgstr "Sin canales en ningún grupo privado"
 
 #: ../../include/group.php:300 ../../include/widgets.php:275
 msgid "add"
@@ -2346,7 +2150,7 @@ msgstr "No ha sido posible determinar el remitente. "
 msgid "Stored post could not be verified."
 msgstr "No se han podido verificar las publicaciones guardadas."
 
-#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1507
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1517
 msgid "Logout"
 msgstr "Finalizar sesión"
 
@@ -2374,7 +2178,7 @@ msgstr "Editar perfiles"
 msgid "Manage/Edit profiles"
 msgstr "Administrar/editar perfiles"
 
-#: ../../include/nav.php:90 ../../include/identity.php:972
+#: ../../include/nav.php:90 ../../include/identity.php:976
 msgid "Edit Profile"
 msgstr "Editar el perfil"
 
@@ -2423,7 +2227,7 @@ msgstr "Pulsar para identificarse en su servidor de inicio"
 msgid "Home Page"
 msgstr "Página de inicio"
 
-#: ../../include/nav.php:149 ../../mod/register.php:264 ../../boot.php:1490
+#: ../../include/nav.php:149 ../../mod/register.php:264 ../../boot.php:1500
 msgid "Register"
 msgstr "Registrarse"
 
@@ -2469,7 +2273,7 @@ msgid "Mark all channel notifications seen"
 msgstr "Marcar todas las notificaciones del canal como leídas"
 
 #: ../../include/nav.php:181 ../../include/text.php:815
-#: ../../mod/connections.php:296
+#: ../../mod/connections.php:298
 msgid "Connections"
 msgstr "Conexiones"
 
@@ -2533,7 +2337,7 @@ msgstr "Gestionar sus canales"
 msgid "Account/Channel Settings"
 msgstr "Ajustes de cuenta/canales"
 
-#: ../../include/nav.php:210 ../../include/widgets.php:1281
+#: ../../include/nav.php:210 ../../include/widgets.php:1299
 msgid "Admin"
 msgstr "Administrador"
 
@@ -2553,6 +2357,23 @@ msgstr "Espere por favor…"
 msgid "view full size"
 msgstr "Ver en el tamaño original"
 
+#: ../../include/network.php:1612 ../../include/enotify.php:57
+msgid "$Projectname Notification"
+msgstr "Notificación de $Projectname"
+
+#: ../../include/network.php:1613 ../../include/enotify.php:58
+msgid "$projectname"
+msgstr "$projectname"
+
+#: ../../include/network.php:1615 ../../include/enotify.php:60
+msgid "Thank You,"
+msgstr "Gracias,"
+
+#: ../../include/network.php:1617 ../../include/enotify.php:62
+#, php-format
+msgid "%s Administrator"
+msgstr "%s Administrador"
+
 #: ../../include/network.php:1674
 msgid "No Subject"
 msgstr "Sin asunto"
@@ -3069,7 +2890,7 @@ msgstr "No ha sido posible de verificar la firma del canal"
 msgid "Unable to verify site signature for %s"
 msgstr "No ha sido posible de verificar la firma del sitio para %s"
 
-#: ../../include/zot.php:3584
+#: ../../include/zot.php:3585
 msgid "invalid target signature"
 msgstr "La firma recibida no es válida"
 
@@ -3111,7 +2932,7 @@ msgstr "RSS/Atom"
 
 #: ../../include/contact_selectors.php:79 ../../mod/admin.php:891
 #: ../../mod/admin.php:900 ../../mod/id.php:15 ../../mod/id.php:16
-#: ../../boot.php:1510
+#: ../../boot.php:1520
 msgid "Email"
 msgstr "Correo electrónico"
 
@@ -3139,316 +2960,38 @@ msgstr "XMPP/IM"
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../../include/features.php:45
-msgid "General Features"
-msgstr "Funcionalidades básicas"
+#: ../../include/identity.php:32
+msgid "Unable to obtain identity information from database"
+msgstr "No ha sido posible obtener información sobre la identidad desde la base de datos"
 
-#: ../../include/features.php:47
-msgid "Content Expiration"
-msgstr "Caducidad del contenido"
+#: ../../include/identity.php:66
+msgid "Empty name"
+msgstr "Nombre vacío"
 
-#: ../../include/features.php:47
-msgid "Remove posts/comments and/or private messages at a future time"
-msgstr "Eliminar publicaciones/comentarios y/o mensajes privados más adelante"
+#: ../../include/identity.php:69
+msgid "Name too long"
+msgstr "Nombre demasiado largo"
 
-#: ../../include/features.php:48
-msgid "Multiple Profiles"
-msgstr "Múltiples perfiles"
+#: ../../include/identity.php:181
+msgid "No account identifier"
+msgstr "Ningún identificador de la cuenta"
 
-#: ../../include/features.php:48
-msgid "Ability to create multiple profiles"
-msgstr "Capacidad de crear múltiples perfiles"
+#: ../../include/identity.php:193
+msgid "Nickname is required."
+msgstr "Se requiere un sobrenombre (alias)."
 
-#: ../../include/features.php:49
-msgid "Advanced Profiles"
-msgstr "Perfiles avanzados"
+#: ../../include/identity.php:207
+msgid "Reserved nickname. Please choose another."
+msgstr "Sobrenombre en uso. Por favor, elija otro."
 
-#: ../../include/features.php:49
-msgid "Additional profile sections and selections"
-msgstr "Secciones y selecciones de perfil adicionales"
+#: ../../include/identity.php:212
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "El alias contiene caracteres no admitidos o está ya en uso por otros usuarios de este sitio."
 
-#: ../../include/features.php:50
-msgid "Profile Import/Export"
-msgstr "Importar/Exportar perfil"
-
-#: ../../include/features.php:50
-msgid "Save and load profile details across sites/channels"
-msgstr "Guardar y cargar detalles del perfil a través de sitios/canales"
-
-#: ../../include/features.php:51
-msgid "Web Pages"
-msgstr "Páginas web"
-
-#: ../../include/features.php:51
-msgid "Provide managed web pages on your channel"
-msgstr "Proveer páginas web gestionadas en su canal"
-
-#: ../../include/features.php:52
-msgid "Hide Rating"
-msgstr "Ocultar las valoraciones"
-
-#: ../../include/features.php:52
-msgid ""
-"Hide the rating buttons on your channel and profile pages. Note: People can "
-"still rate you somewhere else."
-msgstr "Ocultar los botones de valoración en su canal y página de perfil. Tenga en cuenta, sin embargo, que la gente podrá expresar su valoración en otros lugares."
-
-#: ../../include/features.php:53
-msgid "Private Notes"
-msgstr "Notas privadas"
-
-#: ../../include/features.php:53
-msgid "Enables a tool to store notes and reminders"
-msgstr "Activar una herramienta para almacenar notas y recordatorios"
-
-#: ../../include/features.php:54
-msgid "Navigation Channel Select"
-msgstr "Navegación por el selector de canales"
-
-#: ../../include/features.php:54
-msgid "Change channels directly from within the navigation dropdown menu"
-msgstr "Cambiar de canales directamente desde el menú de navegación desplegable"
-
-#: ../../include/features.php:55
-msgid "Photo Location"
-msgstr "Ubicación de las fotos"
-
-#: ../../include/features.php:55
-msgid "If location data is available on uploaded photos, link this to a map."
-msgstr "Si los datos de ubicación están disponibles en las fotos subidas, enlazar estas a un mapa."
-
-#: ../../include/features.php:57
-msgid "Expert Mode"
-msgstr "Modo de experto"
-
-#: ../../include/features.php:57
-msgid "Enable Expert Mode to provide advanced configuration options"
-msgstr "Habilitar el modo de experto para acceder a opciones avanzadas de configuración"
-
-#: ../../include/features.php:58
-msgid "Premium Channel"
-msgstr "Canal premium"
-
-#: ../../include/features.php:58
-msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
-msgstr "Le permite configurar restricciones y normas de uso a aquellos que conectan con su canal"
-
-#: ../../include/features.php:63
-msgid "Post Composition Features"
-msgstr "Opciones para la redacción de entradas"
-
-#: ../../include/features.php:65
-msgid "Use Markdown"
-msgstr "Usar Markdown"
-
-#: ../../include/features.php:65
-msgid "Allow use of \"Markdown\" to format posts"
-msgstr "Permitir el uso de \"Markdown\" para formatear publicaciones"
-
-#: ../../include/features.php:66
-msgid "Large Photos"
-msgstr "Fotos de gran tamaño"
-
-#: ../../include/features.php:66
-msgid ""
-"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
-"(640px) photo thumbnails"
-msgstr "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)"
-
-#: ../../include/features.php:67 ../../include/widgets.php:549
-#: ../../mod/sources.php:88
-msgid "Channel Sources"
-msgstr "Orígenes de los contenidos del canal"
-
-#: ../../include/features.php:67
-msgid "Automatically import channel content from other channels or feeds"
-msgstr "Importar automáticamente contenido de otros canales o \"feeds\""
-
-#: ../../include/features.php:68
-msgid "Even More Encryption"
-msgstr "Más cifrado todavía"
-
-#: ../../include/features.php:68
-msgid ""
-"Allow optional encryption of content end-to-end with a shared secret key"
-msgstr "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida."
-
-#: ../../include/features.php:69
-msgid "Enable Voting Tools"
-msgstr "Permitir entradas con votación"
-
-#: ../../include/features.php:69
-msgid "Provide a class of post which others can vote on"
-msgstr "Proveer una clase de publicación en la que otros puedan votar"
-
-#: ../../include/features.php:70
-msgid "Delayed Posting"
-msgstr "Publicación aplazada"
-
-#: ../../include/features.php:70
-msgid "Allow posts to be published at a later date"
-msgstr "Permitir mensajes que se publicarán en una fecha posterior"
-
-#: ../../include/features.php:71
-msgid "Suppress Duplicate Posts/Comments"
-msgstr "Prevenir entradas o comentarios duplicados"
-
-#: ../../include/features.php:71
-msgid ""
-"Prevent posts with identical content to be published with less than two "
-"minutes in between submissions."
-msgstr "Prevenir que entradas con contenido idéntico se publiquen con menos de dos minutos de intervalo."
-
-#: ../../include/features.php:77
-msgid "Network and Stream Filtering"
-msgstr "Filtrado del contenido"
-
-#: ../../include/features.php:78
-msgid "Search by Date"
-msgstr "Buscar por fecha"
-
-#: ../../include/features.php:78
-msgid "Ability to select posts by date ranges"
-msgstr "Capacidad de seleccionar entradas por rango de fechas"
-
-#: ../../include/features.php:79
-msgid "Collections (Privacy Groups)"
-msgstr "Colecciones (grupos privados)"
-
-#: ../../include/features.php:79
-msgid "Enable widget to display Network posts only from selected collections"
-msgstr "Habilitar la muestra de entradas eligiendo colecciones"
-
-#: ../../include/features.php:80 ../../include/widgets.php:274
-msgid "Saved Searches"
-msgstr "Búsquedas guardadas"
-
-#: ../../include/features.php:80
-msgid "Save search terms for re-use"
-msgstr "Guardar términos de búsqueda para su reutilización"
-
-#: ../../include/features.php:81
-msgid "Network Personal Tab"
-msgstr "Actividad personal"
-
-#: ../../include/features.php:81
-msgid "Enable tab to display only Network posts that you've interacted on"
-msgstr "Habilitar una pestaña en la cual se muestren solo las entradas en las que ha participado."
-
-#: ../../include/features.php:82
-msgid "Network New Tab"
-msgstr "Contenido nuevo"
-
-#: ../../include/features.php:82
-msgid "Enable tab to display all new Network activity"
-msgstr "Habilitar una pestaña en la que se muestre solo el contenido nuevo"
-
-#: ../../include/features.php:83
-msgid "Affinity Tool"
-msgstr "Herramienta de afinidad"
-
-#: ../../include/features.php:83
-msgid "Filter stream activity by depth of relationships"
-msgstr "Filtrar el contenido según la profundidad de las relaciones"
-
-#: ../../include/features.php:84
-msgid "Connection Filtering"
-msgstr "Filtrado de conexiones"
-
-#: ../../include/features.php:84
-msgid "Filter incoming posts from connections based on keywords/content"
-msgstr "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido"
-
-#: ../../include/features.php:85
-msgid "Suggest Channels"
-msgstr "Sugerir canales"
-
-#: ../../include/features.php:85
-msgid "Show channel suggestions"
-msgstr "Mostrar sugerencias de canales"
-
-#: ../../include/features.php:90
-msgid "Post/Comment Tools"
-msgstr "Gestión de entradas y comentarios"
-
-#: ../../include/features.php:91
-msgid "Community Tagging"
-msgstr "Etiquetas de la comunidad"
-
-#: ../../include/features.php:91
-msgid "Ability to tag existing posts"
-msgstr "Capacidad de etiquetar entradas existentes"
-
-#: ../../include/features.php:92
-msgid "Post Categories"
-msgstr "Categorías de entradas"
-
-#: ../../include/features.php:92
-msgid "Add categories to your posts"
-msgstr "Añadir categorías a sus publicaciones"
-
-#: ../../include/features.php:93
-msgid "Ability to file posts under folders"
-msgstr "Capacidad de archivar entradas en carpetas"
-
-#: ../../include/features.php:94
-msgid "Dislike Posts"
-msgstr "Desagrado de publicaciones"
-
-#: ../../include/features.php:94
-msgid "Ability to dislike posts/comments"
-msgstr "Capacidad de mostrar desacuerdo con el contenido de  entradas y comentarios"
-
-#: ../../include/features.php:95
-msgid "Star Posts"
-msgstr "Entradas destacadas"
-
-#: ../../include/features.php:95
-msgid "Ability to mark special posts with a star indicator"
-msgstr "Capacidad de marcar entradas destacadas con un indicador de estrella"
-
-#: ../../include/features.php:96
-msgid "Tag Cloud"
-msgstr "Nube de etiquetas"
-
-#: ../../include/features.php:96
-msgid "Provide a personal tag cloud on your channel page"
-msgstr "Proveer nube de etiquetas personal en su página de canal"
-
-#: ../../include/identity.php:32
-msgid "Unable to obtain identity information from database"
-msgstr "No ha sido posible obtener información sobre la identidad desde la base de datos"
-
-#: ../../include/identity.php:66
-msgid "Empty name"
-msgstr "Nombre vacío"
-
-#: ../../include/identity.php:69
-msgid "Name too long"
-msgstr "Nombre demasiado largo"
-
-#: ../../include/identity.php:181
-msgid "No account identifier"
-msgstr "Ningún identificador de la cuenta"
-
-#: ../../include/identity.php:193
-msgid "Nickname is required."
-msgstr "Se requiere un sobrenombre (alias)."
-
-#: ../../include/identity.php:207
-msgid "Reserved nickname. Please choose another."
-msgstr "Sobrenombre en uso. Por favor, elija otro."
-
-#: ../../include/identity.php:212
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "El alias contiene caracteres no admitidos o está ya en uso por otros usuarios de este sitio."
-
-#: ../../include/identity.php:288
-msgid "Unable to retrieve created identity"
-msgstr "No ha sido posible recuperar la identidad creada"
+#: ../../include/identity.php:288
+msgid "Unable to retrieve created identity"
+msgstr "No ha sido posible recuperar la identidad creada"
 
 #: ../../include/identity.php:346
 msgid "Default Profile"
@@ -3466,192 +3009,192 @@ msgstr "El canal solicitado no está disponible."
 msgid "Requested profile is not available."
 msgstr "El perfil solicitado no está disponible."
 
-#: ../../include/identity.php:962 ../../mod/profiles.php:782
+#: ../../include/identity.php:966 ../../mod/profiles.php:782
 msgid "Change profile photo"
 msgstr "Cambiar la foto del perfil"
 
-#: ../../include/identity.php:968
+#: ../../include/identity.php:972
 msgid "Profiles"
 msgstr "Perfiles"
 
-#: ../../include/identity.php:968
+#: ../../include/identity.php:972
 msgid "Manage/edit profiles"
 msgstr "Administrar/editar perfiles"
 
-#: ../../include/identity.php:969 ../../mod/profiles.php:783
+#: ../../include/identity.php:973 ../../mod/profiles.php:783
 msgid "Create New Profile"
 msgstr "Crear un nuevo perfil"
 
-#: ../../include/identity.php:984 ../../mod/profiles.php:794
+#: ../../include/identity.php:988 ../../mod/profiles.php:794
 msgid "Profile Image"
 msgstr "Imagen del perfil"
 
-#: ../../include/identity.php:987
+#: ../../include/identity.php:991
 msgid "visible to everybody"
 msgstr "visible para cualquiera"
 
-#: ../../include/identity.php:988 ../../mod/profiles.php:677
+#: ../../include/identity.php:992 ../../mod/profiles.php:677
 #: ../../mod/profiles.php:798
 msgid "Edit visibility"
 msgstr "Editar visibilidad"
 
-#: ../../include/identity.php:1004 ../../include/identity.php:1246
+#: ../../include/identity.php:1008 ../../include/identity.php:1250
 msgid "Gender:"
 msgstr "Género:"
 
-#: ../../include/identity.php:1005 ../../include/identity.php:1290
+#: ../../include/identity.php:1009 ../../include/identity.php:1294
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../../include/identity.php:1006 ../../include/identity.php:1301
+#: ../../include/identity.php:1010 ../../include/identity.php:1305
 msgid "Homepage:"
 msgstr "Página personal:"
 
-#: ../../include/identity.php:1007
+#: ../../include/identity.php:1011
 msgid "Online Now"
 msgstr "Ahora en línea"
 
-#: ../../include/identity.php:1093 ../../include/identity.php:1171
+#: ../../include/identity.php:1097 ../../include/identity.php:1175
 #: ../../mod/ping.php:318
 msgid "g A l F d"
 msgstr "g A l d F"
 
-#: ../../include/identity.php:1094 ../../include/identity.php:1172
+#: ../../include/identity.php:1098 ../../include/identity.php:1176
 msgid "F d"
 msgstr "d F"
 
-#: ../../include/identity.php:1139 ../../include/identity.php:1211
+#: ../../include/identity.php:1143 ../../include/identity.php:1215
 #: ../../mod/ping.php:341
 msgid "[today]"
 msgstr "[hoy]"
 
-#: ../../include/identity.php:1150
+#: ../../include/identity.php:1154
 msgid "Birthday Reminders"
 msgstr "Recordatorios de cumpleaños"
 
-#: ../../include/identity.php:1151
+#: ../../include/identity.php:1155
 msgid "Birthdays this week:"
 msgstr "Cumpleaños de esta semana:"
 
-#: ../../include/identity.php:1204
+#: ../../include/identity.php:1208
 msgid "[No description]"
 msgstr "[Sin descripción]"
 
-#: ../../include/identity.php:1222
+#: ../../include/identity.php:1226
 msgid "Event Reminders"
 msgstr "Recordatorios de eventos"
 
-#: ../../include/identity.php:1223
+#: ../../include/identity.php:1227
 msgid "Events this week:"
 msgstr "Eventos de esta semana:"
 
-#: ../../include/identity.php:1244 ../../mod/settings.php:1029
+#: ../../include/identity.php:1248 ../../mod/settings.php:1030
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
-#: ../../include/identity.php:1251
+#: ../../include/identity.php:1255
 msgid "Like this channel"
 msgstr "Me gusta este canal"
 
-#: ../../include/identity.php:1275
+#: ../../include/identity.php:1279
 msgid "j F, Y"
 msgstr "j F Y"
 
-#: ../../include/identity.php:1276
+#: ../../include/identity.php:1280
 msgid "j F"
 msgstr "j F"
 
-#: ../../include/identity.php:1283
+#: ../../include/identity.php:1287
 msgid "Birthday:"
 msgstr "Cumpleaños:"
 
-#: ../../include/identity.php:1287 ../../mod/directory.php:299
+#: ../../include/identity.php:1291 ../../mod/directory.php:302
 msgid "Age:"
 msgstr "Edad:"
 
-#: ../../include/identity.php:1296
+#: ../../include/identity.php:1300
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "por %1$d %2$s"
 
-#: ../../include/identity.php:1299 ../../mod/profiles.php:699
+#: ../../include/identity.php:1303 ../../mod/profiles.php:699
 msgid "Sexual Preference:"
 msgstr "Orientación sexual:"
 
-#: ../../include/identity.php:1303 ../../mod/directory.php:315
+#: ../../include/identity.php:1307 ../../mod/directory.php:318
 #: ../../mod/profiles.php:701
 msgid "Hometown:"
 msgstr "Ciudad de origen:"
 
-#: ../../include/identity.php:1305
+#: ../../include/identity.php:1309
 msgid "Tags:"
 msgstr "Etiquetas:"
 
-#: ../../include/identity.php:1307 ../../mod/profiles.php:702
+#: ../../include/identity.php:1311 ../../mod/profiles.php:702
 msgid "Political Views:"
 msgstr "Posición política:"
 
-#: ../../include/identity.php:1309
+#: ../../include/identity.php:1313
 msgid "Religion:"
 msgstr "Religión:"
 
-#: ../../include/identity.php:1311 ../../mod/directory.php:317
+#: ../../include/identity.php:1315 ../../mod/directory.php:320
 msgid "About:"
 msgstr "Sobre mí:"
 
-#: ../../include/identity.php:1313
+#: ../../include/identity.php:1317
 msgid "Hobbies/Interests:"
 msgstr "Aficciones/Intereses:"
 
-#: ../../include/identity.php:1315 ../../mod/profiles.php:705
+#: ../../include/identity.php:1319 ../../mod/profiles.php:705
 msgid "Likes:"
 msgstr "Me gusta:"
 
-#: ../../include/identity.php:1317 ../../mod/profiles.php:706
+#: ../../include/identity.php:1321 ../../mod/profiles.php:706
 msgid "Dislikes:"
 msgstr "No me gusta:"
 
-#: ../../include/identity.php:1319
+#: ../../include/identity.php:1323
 msgid "Contact information and Social Networks:"
 msgstr "Información de contacto y redes sociales:"
 
-#: ../../include/identity.php:1321
+#: ../../include/identity.php:1325
 msgid "My other channels:"
 msgstr "Mis otros canales:"
 
-#: ../../include/identity.php:1323
+#: ../../include/identity.php:1327
 msgid "Musical interests:"
 msgstr "Intereses musicales:"
 
-#: ../../include/identity.php:1325
+#: ../../include/identity.php:1329
 msgid "Books, literature:"
 msgstr "Libros, literatura:"
 
-#: ../../include/identity.php:1327
+#: ../../include/identity.php:1331
 msgid "Television:"
 msgstr "Televisión:"
 
-#: ../../include/identity.php:1329
+#: ../../include/identity.php:1333
 msgid "Film/dance/culture/entertainment:"
 msgstr "Cine/danza/cultura/entretenimiento:"
 
-#: ../../include/identity.php:1331
+#: ../../include/identity.php:1335
 msgid "Love/Romance:"
 msgstr "Vida sentimental/amorosa:"
 
-#: ../../include/identity.php:1333
+#: ../../include/identity.php:1337
 msgid "Work/employment:"
 msgstr "Trabajo:"
 
-#: ../../include/identity.php:1335
+#: ../../include/identity.php:1339
 msgid "School/education:"
 msgstr "Estudios:"
 
-#: ../../include/identity.php:1355
+#: ../../include/identity.php:1359
 msgid "Like this thing"
 msgstr "Me gusta esto"
 
-#: ../../include/identity.php:1763 ../../mod/cover_photo.php:236
+#: ../../include/identity.php:1767 ../../mod/cover_photo.php:236
 msgid "cover photo"
 msgstr "Imagen de portada del perfil"
 
@@ -3863,37 +3406,289 @@ msgstr "Formato de la página"
 msgid "You can create your own with the layouts tool"
 msgstr "Puede crear su propio formato gráfico con las herramientas de diseño"
 
-#: ../../include/text.php:1787
-msgid "Page content type"
-msgstr "Tipo de contenido de página"
+#: ../../include/text.php:1787
+msgid "Page content type"
+msgstr "Tipo de contenido de página"
+
+#: ../../include/text.php:1821
+msgid "Select an alternate language"
+msgstr "Seleccionar un idioma alternativo"
+
+#: ../../include/text.php:1953
+msgid "activity"
+msgstr "la actividad"
+
+#: ../../include/text.php:2248
+msgid "Design Tools"
+msgstr "Herramientas de diseño"
+
+#: ../../include/text.php:2251 ../../mod/blocks.php:147
+msgid "Blocks"
+msgstr "Bloques"
+
+#: ../../include/text.php:2252 ../../mod/menu.php:103
+msgid "Menus"
+msgstr "Menús"
+
+#: ../../include/text.php:2253 ../../mod/layouts.php:174
+msgid "Layouts"
+msgstr "Formato gráfico"
+
+#: ../../include/text.php:2254
+msgid "Pages"
+msgstr "Páginas"
+
+#: ../../include/items.php:423 ../../index.php:370 ../../mod/dreport.php:6
+#: ../../mod/dreport.php:45 ../../mod/group.php:68
+#: ../../mod/import_items.php:108 ../../mod/like.php:280
+#: ../../mod/profperm.php:23 ../../mod/subthread.php:58
+msgid "Permission denied"
+msgstr "Permiso denegado"
+
+#: ../../include/items.php:1130 ../../include/items.php:1176
+msgid "(Unknown)"
+msgstr "(Desconocido)"
+
+#: ../../include/items.php:1373
+msgid "Visible to anybody on the internet."
+msgstr "Visible para cualquiera en internet."
+
+#: ../../include/items.php:1375
+msgid "Visible to you only."
+msgstr "Visible sólo para usted."
+
+#: ../../include/items.php:1377
+msgid "Visible to anybody in this network."
+msgstr "Visible para cualquiera en esta red."
+
+#: ../../include/items.php:1379
+msgid "Visible to anybody authenticated."
+msgstr "Visible para cualquiera que haya sido autenticado."
+
+#: ../../include/items.php:1381
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr "Visible para cualquiera en %s."
+
+#: ../../include/items.php:1383
+msgid "Visible to all connections."
+msgstr "Visible para todas las conexiones."
+
+#: ../../include/items.php:1385
+msgid "Visible to approved connections."
+msgstr "Visible para las conexiones permitidas."
+
+#: ../../include/items.php:1387
+msgid "Visible to specific connections."
+msgstr "Visible para conexiones específicas."
+
+#: ../../include/items.php:4350 ../../mod/admin.php:135
+#: ../../mod/admin.php:1091 ../../mod/admin.php:1336 ../../mod/display.php:36
+#: ../../mod/filestorage.php:27 ../../mod/thing.php:85
+#: ../../mod/viewsrc.php:20
+msgid "Item not found."
+msgstr "Elemento no encontrado."
+
+#: ../../include/items.php:4862 ../../mod/group.php:38 ../../mod/group.php:137
+msgid "Privacy group not found."
+msgstr "Grupo privado no encontrado."
+
+#: ../../include/items.php:4878
+msgid "Privacy group is empty."
+msgstr "El grupo privado está vacío."
+
+#: ../../include/items.php:4885
+#, php-format
+msgid "Privacy group: %s"
+msgstr "Grupo privado: %s"
+
+#: ../../include/items.php:4895 ../../mod/connedit.php:692
+#, php-format
+msgid "Connection: %s"
+msgstr "Conexión: %s"
+
+#: ../../include/items.php:4897
+msgid "Connection not found."
+msgstr "Conexión no encontrada"
+
+#: ../../include/enotify.php:96
+#, php-format
+msgid "%s <!item_type!>"
+msgstr "%s <!item_type!>"
+
+#: ../../include/enotify.php:100
+#, php-format
+msgid "[Hubzilla:Notify] New mail received at %s"
+msgstr "[Hubzilla:Aviso] Nuevo mensaje en %s"
+
+#: ../../include/enotify.php:102
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
+msgstr "%1$s, %2$s le ha enviado un nuevo mensaje privado en %3$s."
+
+#: ../../include/enotify.php:103
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "%1$s le ha enviado %2$s."
+
+#: ../../include/enotify.php:103
+msgid "a private message"
+msgstr "un mensaje privado"
+
+#: ../../include/enotify.php:104
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Por favor visite %s para ver y/o responder a su mensaje privado."
+
+#: ../../include/enotify.php:160
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%4$s[/zrl]"
+
+#: ../../include/enotify.php:168
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%5$s de %4$s[/zrl] "
+
+#: ../../include/enotify.php:177
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%4$s creado por usted[/zrl]"
+
+#: ../../include/enotify.php:188
+#, php-format
+msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Hubzilla:Aviso] Nuevo comentario de %2$s a la conversación #%1$d"
+
+#: ../../include/enotify.php:189
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
+msgstr "%1$s, %2$s ha comentado un elemento/conversación que ha estado siguiendo."
+
+#: ../../include/enotify.php:192 ../../include/enotify.php:207
+#: ../../include/enotify.php:233 ../../include/enotify.php:251
+#: ../../include/enotify.php:265
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Para ver o comentar la conversación, visite %s"
+
+#: ../../include/enotify.php:198
+#, php-format
+msgid "[Hubzilla:Notify] %s posted to your profile wall"
+msgstr "[Hubzilla:Aviso] %s ha publicado una entrada en su página de inicio del perfil (\"muro\")"
+
+#: ../../include/enotify.php:200
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
+msgstr "%1$s, %2$s ha publicado en su página del perfil en %3$s"
+
+#: ../../include/enotify.php:202
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+msgstr "%1$s, %2$s ha publicado en [zrl=%3$s]su página del perfil[/zrl]"
+
+#: ../../include/enotify.php:226
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged you"
+msgstr "[Hubzilla:Aviso] %s le ha etiquetado"
+
+#: ../../include/enotify.php:227
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
+msgstr "%1$s, %2$s le ha etiquetado en %3$s"
+
+#: ../../include/enotify.php:228
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%3$s]le etiquetó[/zrl]."
+
+#: ../../include/enotify.php:240
+#, php-format
+msgid "[Hubzilla:Notify] %1$s poked you"
+msgstr "[Hubzilla:Aviso] %1$s le ha dado un toque"
+
+#: ../../include/enotify.php:241
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
+msgstr "%1$s, %2$s le ha dado un toque en %3$s"
+
+#: ../../include/enotify.php:242
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%2$s]le ha dado un toque[/zrl]."
+
+#: ../../include/enotify.php:258
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged your post"
+msgstr "[Hubzilla:Aviso] %s ha etiquetado su publicación"
+
+#: ../../include/enotify.php:259
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
+msgstr "%1$s, %2$s ha etiquetado su publicación en %3$s"
+
+#: ../../include/enotify.php:260
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+msgstr "%1$s, %2$s ha etiquetado [zrl=%3$s]su publicación[/zrl]"
+
+#: ../../include/enotify.php:272
+msgid "[Hubzilla:Notify] Introduction received"
+msgstr "[Hubzilla:Aviso] Ha recibido una solicitud de conexión"
+
+#: ../../include/enotify.php:273
+#, php-format
+msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+msgstr "%1$s, ha recibido una nueva solicitud de conexión de '%2$s' en  %3$s"
+
+#: ../../include/enotify.php:274
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+msgstr "%1$s, ha recibido [zrl=%2$s]una nueva solicitud de conexión[/zrl] de %3$s."
+
+#: ../../include/enotify.php:278 ../../include/enotify.php:297
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Puede visitar su perfil en %s"
 
-#: ../../include/text.php:1821
-msgid "Select an alternate language"
-msgstr "Seleccionar un idioma alternativo"
+#: ../../include/enotify.php:280
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
+msgstr "Por favor, visite %s para permitir o rechazar la solicitad de conexión."
 
-#: ../../include/text.php:1953
-msgid "activity"
-msgstr "actividad"
+#: ../../include/enotify.php:287
+msgid "[Hubzilla:Notify] Friend suggestion received"
+msgstr "[Hubzilla:Aviso] Ha recibido una sugerencia de amistad"
 
-#: ../../include/text.php:2248
-msgid "Design Tools"
-msgstr "Herramientas de diseño"
+#: ../../include/enotify.php:288
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+msgstr "%1$s, ha recibido una sugerencia de conexión de '%2$s' en %3$s"
 
-#: ../../include/text.php:2251 ../../mod/blocks.php:147
-msgid "Blocks"
-msgstr "Bloques"
+#: ../../include/enotify.php:289
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
+"%4$s."
+msgstr "%1$s, ha recibido [zrl=%2$s]una sugerencia de conexión[/zrl] para %3$s de %4$s."
 
-#: ../../include/text.php:2252 ../../mod/menu.php:103
-msgid "Menus"
-msgstr "Menús"
+#: ../../include/enotify.php:295
+msgid "Name:"
+msgstr "Nombre:"
 
-#: ../../include/text.php:2253 ../../mod/layouts.php:174
-msgid "Layouts"
-msgstr "Formato gráfico"
+#: ../../include/enotify.php:296
+msgid "Photo:"
+msgstr "Foto:"
 
-#: ../../include/text.php:2254
-msgid "Pages"
-msgstr "Páginas"
+#: ../../include/enotify.php:299
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Por favor, visite %s para aprobar o rechazar la sugerencia."
+
+#: ../../include/enotify.php:514
+msgid "[Hubzilla:Notify]"
+msgstr "[Hubzilla:Aviso]"
 
 #: ../../include/widgets.php:93
 msgid "System"
@@ -3944,6 +3739,10 @@ msgstr "Notas"
 msgid "Remove term"
 msgstr "Eliminar término"
 
+#: ../../include/widgets.php:274 ../../include/features.php:80
+msgid "Saved Searches"
+msgstr "Búsquedas guardadas"
+
 #: ../../include/widgets.php:349
 msgid "Archives"
 msgstr "Hemeroteca"
@@ -4005,6 +3804,11 @@ msgstr "Permisos predeterminados de conexión"
 msgid "Premium Channel Settings"
 msgstr "Configuración del canal premium"
 
+#: ../../include/widgets.php:549 ../../include/features.php:67
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
+msgstr "Orígenes de los contenidos del canal"
+
 #: ../../include/widgets.php:571
 msgid "Private Mail Menu"
 msgstr "Menú de correo privado"
@@ -4081,182 +3885,374 @@ msgstr "Salas de chat preferidas"
 msgid "Suggested Chatrooms"
 msgstr "Salas de chat sugeridas"
 
-#: ../../include/widgets.php:931 ../../include/widgets.php:1021
+#: ../../include/widgets.php:949 ../../include/widgets.php:1039
 msgid "photo/image"
 msgstr "foto/imagen"
 
-#: ../../include/widgets.php:1115
+#: ../../include/widgets.php:1133
 msgid "Rating Tools"
 msgstr "Valoraciones"
 
-#: ../../include/widgets.php:1119 ../../include/widgets.php:1121
+#: ../../include/widgets.php:1137 ../../include/widgets.php:1139
 msgid "Rate Me"
 msgstr "Valorar este canal"
 
-#: ../../include/widgets.php:1124
+#: ../../include/widgets.php:1142
 msgid "View Ratings"
 msgstr "Mostrar las valoraciones"
 
-#: ../../include/widgets.php:1135
+#: ../../include/widgets.php:1153
 msgid "Public Hubs"
 msgstr "Servidores públicos"
 
-#: ../../include/widgets.php:1183
+#: ../../include/widgets.php:1201
 msgid "Forums"
 msgstr "Foros"
 
-#: ../../include/widgets.php:1212
+#: ../../include/widgets.php:1230
 msgid "Tasks"
 msgstr "Tareas"
 
-#: ../../include/widgets.php:1221
+#: ../../include/widgets.php:1239
 msgid "Documentation"
 msgstr "Documentación"
 
-#: ../../include/widgets.php:1223
+#: ../../include/widgets.php:1241
 msgid "Project/Site Information"
 msgstr "Información sobre el proyecto o sitio"
 
-#: ../../include/widgets.php:1224
+#: ../../include/widgets.php:1242
 msgid "For Members"
 msgstr "Para los usuarios"
 
-#: ../../include/widgets.php:1225
+#: ../../include/widgets.php:1243
 msgid "For Administrators"
 msgstr "Para los administradores"
 
-#: ../../include/widgets.php:1226
+#: ../../include/widgets.php:1244
 msgid "For Developers"
 msgstr "Para los desarrolladores"
 
-#: ../../include/widgets.php:1251 ../../mod/admin.php:452
+#: ../../include/widgets.php:1269 ../../mod/admin.php:452
 msgid "Site"
 msgstr "Sitio"
 
-#: ../../include/widgets.php:1252
+#: ../../include/widgets.php:1270
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: ../../include/widgets.php:1253 ../../mod/admin.php:1051
+#: ../../include/widgets.php:1271 ../../mod/admin.php:1051
 msgid "Channels"
 msgstr "Canales"
 
-#: ../../include/widgets.php:1255 ../../mod/admin.php:1166
+#: ../../include/widgets.php:1273 ../../mod/admin.php:1166
 #: ../../mod/admin.php:1227
 msgid "Plugins"
 msgstr "Extensiones"
 
-#: ../../include/widgets.php:1256 ../../mod/admin.php:1388
+#: ../../include/widgets.php:1274 ../../mod/admin.php:1388
 #: ../../mod/admin.php:1422
 msgid "Themes"
 msgstr "Temas"
 
-#: ../../include/widgets.php:1257
+#: ../../include/widgets.php:1275
 msgid "Inspect queue"
 msgstr "Examinar la cola"
 
-#: ../../include/widgets.php:1258
+#: ../../include/widgets.php:1276
 msgid "Profile Config"
 msgstr "Ajustes del perfil"
 
-#: ../../include/widgets.php:1259
+#: ../../include/widgets.php:1277
 msgid "DB updates"
 msgstr "Actualizaciones de la base de datos"
 
-#: ../../include/widgets.php:1277 ../../include/widgets.php:1283
-#: ../../mod/admin.php:1507
-msgid "Logs"
-msgstr "Informes"
+#: ../../include/widgets.php:1295 ../../include/widgets.php:1301
+#: ../../mod/admin.php:1507
+msgid "Logs"
+msgstr "Informes"
+
+#: ../../include/widgets.php:1300
+msgid "Plugin Features"
+msgstr "Extensiones"
+
+#: ../../include/widgets.php:1302
+msgid "User registrations waiting for confirmation"
+msgstr "Registros de usuarios pendientes de confirmación"
+
+#: ../../include/widgets.php:1380 ../../mod/photos.php:748
+#: ../../mod/photos.php:1283
+msgid "View Photo"
+msgstr "Ver foto"
+
+#: ../../include/widgets.php:1397 ../../mod/photos.php:779
+msgid "Edit Album"
+msgstr "Editar álbum"
+
+#: ../../include/features.php:45
+msgid "General Features"
+msgstr "Funcionalidades básicas"
+
+#: ../../include/features.php:47
+msgid "Content Expiration"
+msgstr "Caducidad del contenido"
+
+#: ../../include/features.php:47
+msgid "Remove posts/comments and/or private messages at a future time"
+msgstr "Eliminar publicaciones/comentarios y/o mensajes privados más adelante"
+
+#: ../../include/features.php:48
+msgid "Multiple Profiles"
+msgstr "Múltiples perfiles"
+
+#: ../../include/features.php:48
+msgid "Ability to create multiple profiles"
+msgstr "Capacidad de crear múltiples perfiles"
+
+#: ../../include/features.php:49
+msgid "Advanced Profiles"
+msgstr "Perfiles avanzados"
+
+#: ../../include/features.php:49
+msgid "Additional profile sections and selections"
+msgstr "Secciones y selecciones de perfil adicionales"
+
+#: ../../include/features.php:50
+msgid "Profile Import/Export"
+msgstr "Importar/Exportar perfil"
+
+#: ../../include/features.php:50
+msgid "Save and load profile details across sites/channels"
+msgstr "Guardar y cargar detalles del perfil a través de sitios/canales"
+
+#: ../../include/features.php:51
+msgid "Web Pages"
+msgstr "Páginas web"
+
+#: ../../include/features.php:51
+msgid "Provide managed web pages on your channel"
+msgstr "Proveer páginas web gestionadas en su canal"
+
+#: ../../include/features.php:52
+msgid "Hide Rating"
+msgstr "Ocultar las valoraciones"
+
+#: ../../include/features.php:52
+msgid ""
+"Hide the rating buttons on your channel and profile pages. Note: People can "
+"still rate you somewhere else."
+msgstr "Ocultar los botones de valoración en su canal y página de perfil. Tenga en cuenta, sin embargo, que la gente podrá expresar su valoración en otros lugares."
+
+#: ../../include/features.php:53
+msgid "Private Notes"
+msgstr "Notas privadas"
+
+#: ../../include/features.php:53
+msgid "Enables a tool to store notes and reminders (note: not encrypted)"
+msgstr "Habilita una herramienta para guardar notas y recordatorios (advertencia: las notas no estarán cifradas)"
+
+#: ../../include/features.php:54
+msgid "Navigation Channel Select"
+msgstr "Navegación por el selector de canales"
+
+#: ../../include/features.php:54
+msgid "Change channels directly from within the navigation dropdown menu"
+msgstr "Cambiar de canales directamente desde el menú de navegación desplegable"
+
+#: ../../include/features.php:55
+msgid "Photo Location"
+msgstr "Ubicación de las fotos"
+
+#: ../../include/features.php:55
+msgid "If location data is available on uploaded photos, link this to a map."
+msgstr "Si los datos de ubicación están disponibles en las fotos subidas, enlazar estas a un mapa."
+
+#: ../../include/features.php:57
+msgid "Expert Mode"
+msgstr "Modo de experto"
+
+#: ../../include/features.php:57
+msgid "Enable Expert Mode to provide advanced configuration options"
+msgstr "Habilitar el modo de experto para acceder a opciones avanzadas de configuración"
+
+#: ../../include/features.php:58
+msgid "Premium Channel"
+msgstr "Canal premium"
+
+#: ../../include/features.php:58
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
+msgstr "Le permite configurar restricciones y normas de uso a aquellos que conectan con su canal"
+
+#: ../../include/features.php:63
+msgid "Post Composition Features"
+msgstr "Opciones para la redacción de entradas"
+
+#: ../../include/features.php:65
+msgid "Use Markdown"
+msgstr "Usar Markdown"
+
+#: ../../include/features.php:65
+msgid "Allow use of \"Markdown\" to format posts"
+msgstr "Permitir el uso de \"Markdown\" para formatear publicaciones"
+
+#: ../../include/features.php:66
+msgid "Large Photos"
+msgstr "Fotos de gran tamaño"
+
+#: ../../include/features.php:66
+msgid ""
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
+msgstr "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)"
+
+#: ../../include/features.php:67
+msgid "Automatically import channel content from other channels or feeds"
+msgstr "Importar automáticamente contenido de otros canales o \"feeds\""
+
+#: ../../include/features.php:68
+msgid "Even More Encryption"
+msgstr "Más cifrado todavía"
+
+#: ../../include/features.php:68
+msgid ""
+"Allow optional encryption of content end-to-end with a shared secret key"
+msgstr "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida."
+
+#: ../../include/features.php:69
+msgid "Enable Voting Tools"
+msgstr "Permitir entradas con votación"
+
+#: ../../include/features.php:69
+msgid "Provide a class of post which others can vote on"
+msgstr "Proveer una clase de publicación en la que otros puedan votar"
+
+#: ../../include/features.php:70
+msgid "Delayed Posting"
+msgstr "Publicación aplazada"
+
+#: ../../include/features.php:70
+msgid "Allow posts to be published at a later date"
+msgstr "Permitir mensajes que se publicarán en una fecha posterior"
+
+#: ../../include/features.php:71
+msgid "Suppress Duplicate Posts/Comments"
+msgstr "Prevenir entradas o comentarios duplicados"
+
+#: ../../include/features.php:71
+msgid ""
+"Prevent posts with identical content to be published with less than two "
+"minutes in between submissions."
+msgstr "Prevenir que entradas con contenido idéntico se publiquen con menos de dos minutos de intervalo."
+
+#: ../../include/features.php:77
+msgid "Network and Stream Filtering"
+msgstr "Filtrado del contenido"
+
+#: ../../include/features.php:78
+msgid "Search by Date"
+msgstr "Buscar por fecha"
+
+#: ../../include/features.php:78
+msgid "Ability to select posts by date ranges"
+msgstr "Capacidad de seleccionar entradas por rango de fechas"
+
+#: ../../include/features.php:79
+msgid "Enable management and selection of privacy groups"
+msgstr "Activar la gestión y selección de grupos privados"
+
+#: ../../include/features.php:80
+msgid "Save search terms for re-use"
+msgstr "Guardar términos de búsqueda para su reutilización"
+
+#: ../../include/features.php:81
+msgid "Network Personal Tab"
+msgstr "Actividad personal"
 
-#: ../../include/widgets.php:1282
-msgid "Plugin Features"
-msgstr "Extensiones"
+#: ../../include/features.php:81
+msgid "Enable tab to display only Network posts that you've interacted on"
+msgstr "Habilitar una pestaña en la cual se muestren solo las entradas en las que ha participado."
 
-#: ../../include/widgets.php:1284
-msgid "User registrations waiting for confirmation"
-msgstr "Registros de usuarios pendientes de confirmación"
+#: ../../include/features.php:82
+msgid "Network New Tab"
+msgstr "Contenido nuevo"
 
-#: ../../include/widgets.php:1362 ../../mod/photos.php:748
-#: ../../mod/photos.php:1283
-msgid "View Photo"
-msgstr "Ver foto"
+#: ../../include/features.php:82
+msgid "Enable tab to display all new Network activity"
+msgstr "Habilitar una pestaña en la que se muestre solo el contenido nuevo"
 
-#: ../../include/widgets.php:1379 ../../mod/photos.php:779
-msgid "Edit Album"
-msgstr "Editar álbum"
+#: ../../include/features.php:83
+msgid "Affinity Tool"
+msgstr "Herramienta de afinidad"
 
-#: ../../include/items.php:423 ../../index.php:370 ../../mod/dreport.php:6
-#: ../../mod/dreport.php:45 ../../mod/group.php:68
-#: ../../mod/import_items.php:108 ../../mod/like.php:280
-#: ../../mod/profperm.php:23 ../../mod/subthread.php:58
-msgid "Permission denied"
-msgstr "Permiso denegado"
+#: ../../include/features.php:83
+msgid "Filter stream activity by depth of relationships"
+msgstr "Filtrar el contenido según la profundidad de las relaciones"
 
-#: ../../include/items.php:1130 ../../include/items.php:1176
-msgid "(Unknown)"
-msgstr "(Desconocido)"
+#: ../../include/features.php:84
+msgid "Connection Filtering"
+msgstr "Filtrado de conexiones"
 
-#: ../../include/items.php:1373
-msgid "Visible to anybody on the internet."
-msgstr "Visible para cualquiera en internet."
+#: ../../include/features.php:84
+msgid "Filter incoming posts from connections based on keywords/content"
+msgstr "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido"
 
-#: ../../include/items.php:1375
-msgid "Visible to you only."
-msgstr "Visible sólo para usted."
+#: ../../include/features.php:85
+msgid "Suggest Channels"
+msgstr "Sugerir canales"
 
-#: ../../include/items.php:1377
-msgid "Visible to anybody in this network."
-msgstr "Visible para cualquiera en esta red."
+#: ../../include/features.php:85
+msgid "Show channel suggestions"
+msgstr "Mostrar sugerencias de canales"
 
-#: ../../include/items.php:1379
-msgid "Visible to anybody authenticated."
-msgstr "Visible para cualquiera que haya sido autenticado."
+#: ../../include/features.php:90
+msgid "Post/Comment Tools"
+msgstr "Gestión de entradas y comentarios"
 
-#: ../../include/items.php:1381
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr "Visible para cualquiera en %s."
+#: ../../include/features.php:91
+msgid "Community Tagging"
+msgstr "Etiquetas de la comunidad"
 
-#: ../../include/items.php:1383
-msgid "Visible to all connections."
-msgstr "Visible para todas las conexiones."
+#: ../../include/features.php:91
+msgid "Ability to tag existing posts"
+msgstr "Capacidad de etiquetar entradas existentes"
 
-#: ../../include/items.php:1385
-msgid "Visible to approved connections."
-msgstr "Visible para las conexiones permitidas."
+#: ../../include/features.php:92
+msgid "Post Categories"
+msgstr "Categorías de entradas"
 
-#: ../../include/items.php:1387
-msgid "Visible to specific connections."
-msgstr "Visible para conexiones específicas."
+#: ../../include/features.php:92
+msgid "Add categories to your posts"
+msgstr "Añadir categorías a sus publicaciones"
 
-#: ../../include/items.php:4328 ../../mod/admin.php:135
-#: ../../mod/admin.php:1091 ../../mod/admin.php:1336 ../../mod/display.php:36
-#: ../../mod/filestorage.php:27 ../../mod/thing.php:86
-#: ../../mod/viewsrc.php:20
-msgid "Item not found."
-msgstr "Elemento no encontrado."
+#: ../../include/features.php:93
+msgid "Ability to file posts under folders"
+msgstr "Capacidad de archivar entradas en carpetas"
 
-#: ../../include/items.php:4840 ../../mod/group.php:38 ../../mod/group.php:137
-msgid "Collection not found."
-msgstr "Colección no encontrada."
+#: ../../include/features.php:94
+msgid "Dislike Posts"
+msgstr "Desagrado de publicaciones"
 
-#: ../../include/items.php:4856
-msgid "Collection is empty."
-msgstr "La colección está vacía."
+#: ../../include/features.php:94
+msgid "Ability to dislike posts/comments"
+msgstr "Capacidad de mostrar desacuerdo con el contenido de  entradas y comentarios"
 
-#: ../../include/items.php:4863
-#, php-format
-msgid "Collection: %s"
-msgstr "Colección: %s"
+#: ../../include/features.php:95
+msgid "Star Posts"
+msgstr "Entradas destacadas"
 
-#: ../../include/items.php:4873 ../../mod/connedit.php:692
-#, php-format
-msgid "Connection: %s"
-msgstr "Conexión: %s"
+#: ../../include/features.php:95
+msgid "Ability to mark special posts with a star indicator"
+msgstr "Capacidad de marcar entradas destacadas con un indicador de estrella"
 
-#: ../../include/items.php:4875
-msgid "Connection not found."
-msgstr "Conexión no encontrada"
+#: ../../include/features.php:96
+msgid "Tag Cloud"
+msgstr "Nube de etiquetas"
+
+#: ../../include/features.php:96
+msgid "Provide a personal tag cloud on your channel page"
+msgstr "Proveer nube de etiquetas personal en su página de canal"
 
 #: ../../index.php:242 ../../mod/help.php:213
 msgid "Not Found"
@@ -4580,7 +4576,7 @@ msgstr "Importar y permitir acceso al contenido público sacado de otros sitios.
 
 #: ../../mod/admin.php:484
 msgid "login on Homepage"
-msgstr "acceso a la página personal"
+msgstr "Iniciar sesión en la página personal"
 
 #: ../../mod/admin.php:484
 msgid ""
@@ -4635,13 +4631,13 @@ msgstr "Numero de envíos a intentar en un único proceso del sistema operativo.
 
 #: ../../mod/admin.php:493
 msgid "Poll interval"
-msgstr "Intervalo de sondeo"
+msgstr "Intervalo máximo de tiempo entre dos mensajes sucesivos"
 
 #: ../../mod/admin.php:493
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
-msgstr "Retrasar el sondeo en segundo plano, en esta cantidad de segundos, para reducir la carga del sistema. Si es 0, usar el intervalo de transmisión."
+msgstr "Retrasar el intervalo de envío en segundo plano, en esta cantidad de segundos, para reducir la carga del sistema. Si es 0, usar el intervalo de entrega."
 
 #: ../../mod/admin.php:494
 msgid "Maximum Load Average"
@@ -4651,7 +4647,7 @@ msgstr "Carga media máxima"
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
-msgstr "Carga máxima del sistema antes de que los procesos de transmisión y sondeo se hayan retardado - por defecto, 50."
+msgstr "Carga máxima del sistema antes de que los procesos de entrega y envío se hayan retardado - por defecto, 50."
 
 #: ../../mod/admin.php:495
 msgid "Expiration period in days for imported (grid/network) content"
@@ -5090,7 +5086,7 @@ msgstr "Volver a su aplicación e introducir este código de seguridad:"
 
 #: ../../mod/api.php:85
 msgid "Please login to continue."
-msgstr "Por favor inicia sesión para continuar."
+msgstr "Por favor inicie sesión para continuar."
 
 #: ../../mod/api.php:100
 msgid ""
@@ -5159,6 +5155,7 @@ msgid "Invalid item."
 msgstr "Elemento no válido."
 
 #: ../../mod/block.php:39 ../../mod/page.php:52 ../../mod/wall_upload.php:29
+#: ../../mod/zcard.php:19
 msgid "Channel not found."
 msgstr "Canal no encontrado."
 
@@ -5228,7 +5225,7 @@ msgstr "Nombre de la sala de chat"
 
 #: ../../mod/chat.php:210
 msgid "Expiration of chats (minutes)"
-msgstr "Tiempo de expiración de los mensajes en los chats (en minutos)"
+msgstr "Caducidad de los mensajes en los chats (en minutos)"
 
 #: ../../mod/chat.php:227
 #, php-format
@@ -5384,14 +5381,23 @@ msgid "Approve connection"
 msgstr "Aprobar esta conexión"
 
 #: ../../mod/connections.php:272
+msgid "Ignore connection"
+msgstr "Ignorar esta conexión"
+
+#: ../../mod/connections.php:273 ../../mod/connedit.php:536
+#: ../../mod/notifications.php:51
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: ../../mod/connections.php:274
 msgid "Recent activity"
 msgstr "Actividad reciente"
 
-#: ../../mod/connections.php:301
+#: ../../mod/connections.php:303
 msgid "Search your connections"
 msgstr "Buscar sus conexiones"
 
-#: ../../mod/connections.php:302
+#: ../../mod/connections.php:304
 msgid "Connections search"
 msgstr "Buscar conexiones"
 
@@ -5466,10 +5472,6 @@ msgstr "¡Esta conexión está bloqueada!"
 msgid "Unignore"
 msgstr "Dejar de ignorar"
 
-#: ../../mod/connedit.php:536 ../../mod/notifications.php:51
-msgid "Ignore"
-msgstr "Ignorar"
-
 #: ../../mod/connedit.php:539
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión"
@@ -5648,86 +5650,86 @@ msgstr "Canal $Projectname"
 msgid "Public access denied."
 msgstr "Acceso público denegado."
 
-#: ../../mod/directory.php:236
+#: ../../mod/directory.php:239
 #, php-format
 msgid "%d rating"
 msgid_plural "%d ratings"
 msgstr[0] "%d valoración"
 msgstr[1] "%d valoraciones"
 
-#: ../../mod/directory.php:247
+#: ../../mod/directory.php:250
 msgid "Gender: "
 msgstr "Género:"
 
-#: ../../mod/directory.php:249
+#: ../../mod/directory.php:252
 msgid "Status: "
 msgstr "Estado:"
 
-#: ../../mod/directory.php:251
+#: ../../mod/directory.php:254
 msgid "Homepage: "
 msgstr "Página personal:"
 
-#: ../../mod/directory.php:310
+#: ../../mod/directory.php:313
 msgid "Description:"
 msgstr "Descripción:"
 
-#: ../../mod/directory.php:319
+#: ../../mod/directory.php:322
 msgid "Public Forum:"
 msgstr "Foro público:"
 
-#: ../../mod/directory.php:322
+#: ../../mod/directory.php:325
 msgid "Keywords: "
 msgstr "Palabras clave:"
 
-#: ../../mod/directory.php:325
+#: ../../mod/directory.php:328
 msgid "Don't suggest"
 msgstr "No sugerir:"
 
-#: ../../mod/directory.php:327
+#: ../../mod/directory.php:330
 msgid "Common connections:"
 msgstr "Conexiones comunes:"
 
-#: ../../mod/directory.php:376
+#: ../../mod/directory.php:379
 msgid "Global Directory"
 msgstr "Directorio global:"
 
-#: ../../mod/directory.php:376
+#: ../../mod/directory.php:379
 msgid "Local Directory"
 msgstr "Directorio local:"
 
-#: ../../mod/directory.php:382
+#: ../../mod/directory.php:385
 msgid "Finding:"
 msgstr "Encontrar:"
 
-#: ../../mod/directory.php:387
+#: ../../mod/directory.php:390
 msgid "next page"
 msgstr "siguiente página"
 
-#: ../../mod/directory.php:387
+#: ../../mod/directory.php:390
 msgid "previous page"
 msgstr "página anterior"
 
-#: ../../mod/directory.php:388
+#: ../../mod/directory.php:391
 msgid "Sort options"
 msgstr "Ordenar opciones"
 
-#: ../../mod/directory.php:389
+#: ../../mod/directory.php:392
 msgid "Alphabetic"
 msgstr "Alfabético"
 
-#: ../../mod/directory.php:390
+#: ../../mod/directory.php:393
 msgid "Reverse Alphabetic"
 msgstr "Alfabético inverso"
 
-#: ../../mod/directory.php:391
+#: ../../mod/directory.php:394
 msgid "Newest to Oldest"
 msgstr "De más nuevo a más antiguo"
 
-#: ../../mod/directory.php:392
+#: ../../mod/directory.php:395
 msgid "Oldest to Newest"
 msgstr "De más antiguo a más nuevo"
 
-#: ../../mod/directory.php:409
+#: ../../mod/directory.php:412
 msgid "No entries (some entries may be hidden)."
 msgstr "Sin entradas (algunas entradas pueden estar ocultas)."
 
@@ -6079,40 +6081,40 @@ msgid "Suggest a friend for %s"
 msgstr "Sugerir un amigo a %s"
 
 #: ../../mod/group.php:20
-msgid "Collection created."
-msgstr "La colección ha sido creada."
+msgid "Privacy group created."
+msgstr "El grupo privado ha sido creado."
 
 #: ../../mod/group.php:26
-msgid "Could not create collection."
-msgstr "No se puede crear la colección."
+msgid "Could not create privacy group."
+msgstr "No se puede crear el grupo privado."
 
 #: ../../mod/group.php:54
-msgid "Collection updated."
-msgstr "La colección ha sido actualizada."
+msgid "Privacy group updated."
+msgstr "Grupo privado actualizado."
 
 #: ../../mod/group.php:86
-msgid "Create a collection of channels."
-msgstr "Crear una colección de canales."
+msgid "Create a group of channels."
+msgstr "Crear un grupo de canales."
 
 #: ../../mod/group.php:87 ../../mod/group.php:180
-msgid "Collection Name: "
-msgstr "Nombre de la colección:"
+msgid "Privacy group name: "
+msgstr "Nombre del grupo:"
 
 #: ../../mod/group.php:89 ../../mod/group.php:183
 msgid "Members are visible to other channels"
 msgstr "Los miembros son visibles para otros canales"
 
 #: ../../mod/group.php:107
-msgid "Collection removed."
-msgstr "La colección ha sido eliminada."
+msgid "Privacy group removed."
+msgstr "Grupo privado eliminado."
 
 #: ../../mod/group.php:109
-msgid "Unable to remove collection."
-msgstr "No ha sido posible de eliminar la colección."
+msgid "Unable to remove privacy group."
+msgstr "Imposible eliminar el grupo."
 
 #: ../../mod/group.php:179
-msgid "Collection Editor"
-msgstr "Editor de colecciones"
+msgid "Privacy group editor"
+msgstr "Editor de grupos privados"
 
 #: ../../mod/group.php:193
 msgid "Members"
@@ -6571,6 +6573,18 @@ msgstr "Cuando sea posible, elimine una ubicación iniciando sesión en el sitio
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr "Utilice este formulario para eliminar la dirección si el \"hub\" no está funcionando desde hace tiempo."
 
+#: ../../mod/ping.php:260
+msgid "sent you a private message"
+msgstr "le ha enviado un mensaje privado"
+
+#: ../../mod/ping.php:308
+msgid "added your channel"
+msgstr "añadió este canal a sus conexiones"
+
+#: ../../mod/ping.php:350
+msgid "posted an event"
+msgstr "publicó un evento"
+
 #: ../../mod/magic.php:69
 msgid "Hub not found."
 msgstr "Servidor no encontrado"
@@ -6667,33 +6681,33 @@ msgstr "Ha creado %1$.0f de %2$.0f canales permitidos."
 msgid "Create a new channel"
 msgstr "Crear un nuevo canal"
 
-#: ../../mod/manage.php:161
+#: ../../mod/manage.php:163
 msgid "Current Channel"
 msgstr "Canal actual"
 
-#: ../../mod/manage.php:163
+#: ../../mod/manage.php:165
 msgid "Switch to one of your channels by selecting it."
 msgstr "Cambiar a uno de sus canales seleccionándolo."
 
-#: ../../mod/manage.php:164
+#: ../../mod/manage.php:166
 msgid "Default Channel"
 msgstr "Canal principal"
 
-#: ../../mod/manage.php:165
+#: ../../mod/manage.php:167
 msgid "Make Default"
 msgstr "Convertir en predeterminado"
 
-#: ../../mod/manage.php:168
+#: ../../mod/manage.php:170
 #, php-format
 msgid "%d new messages"
 msgstr "%d mensajes nuevos"
 
-#: ../../mod/manage.php:169
+#: ../../mod/manage.php:171
 #, php-format
 msgid "%d new introductions"
 msgstr "%d nuevas isolicitudes de conexión"
 
-#: ../../mod/manage.php:171
+#: ../../mod/manage.php:173
 msgid "Delegated Channels"
 msgstr "Canales delegados"
 
@@ -6825,7 +6839,7 @@ msgstr "No es posible añadir el elemento al menú"
 msgid "Menu Item Permissions"
 msgstr "Permisos del elemento del menú"
 
-#: ../../mod/mitem.php:150 ../../mod/mitem.php:223 ../../mod/settings.php:1056
+#: ../../mod/mitem.php:150 ../../mod/mitem.php:223 ../../mod/settings.php:1057
 msgid "(click to open/close)"
 msgstr "(pulsar para abrir o cerrar)"
 
@@ -6946,22 +6960,22 @@ msgid "Search Results For:"
 msgstr "Buscar resultados para:"
 
 #: ../../mod/network.php:207
-msgid "Collection is empty"
-msgstr "La colección está vacía"
+msgid "Privacy group is empty"
+msgstr "El grupo privado está vacío"
 
 #: ../../mod/network.php:216
-msgid "Collection: "
-msgstr "Colección:"
+msgid "Privacy group: "
+msgstr "Grupo privado:"
 
 #: ../../mod/network.php:242
 msgid "Invalid connection."
 msgstr "Conexión no válida."
 
-#: ../../mod/new_channel.php:120
+#: ../../mod/new_channel.php:130
 msgid "Add a Channel"
 msgstr "Añadir un canal"
 
-#: ../../mod/new_channel.php:121
+#: ../../mod/new_channel.php:131
 msgid ""
 "A channel is your own collection of related web pages. A channel can be used"
 " to hold social network profiles, blogs, conversation groups and forums, "
@@ -6969,40 +6983,40 @@ msgid ""
 "service provider allows."
 msgstr "Un canal está formado por su propia colección de páginas web relacionadas. Se puede utilizar para almacenar los perfiles sociales de la red, blogs, grupos de conversación y foros, páginas de famosos y mucho más. Puede crear tantos canales como su proveedor de servicio permita."
 
-#: ../../mod/new_channel.php:123 ../../mod/register.php:246
+#: ../../mod/new_channel.php:133 ../../mod/register.php:246
 #: ../../mod/sources.php:103 ../../mod/sources.php:137
 msgid "Channel Name"
 msgstr "Nombre del canal"
 
-#: ../../mod/new_channel.php:124
+#: ../../mod/new_channel.php:134
 msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
 msgstr "Ejemplos: \"Juan García\", \"Isabel y sus caballos\", \"Fútbol\", \"Grupo de parapente\" "
 
-#: ../../mod/new_channel.php:125 ../../mod/register.php:248
+#: ../../mod/new_channel.php:135 ../../mod/register.php:248
 msgid "Choose a short nickname"
 msgstr "Elija un alias corto"
 
-#: ../../mod/new_channel.php:126 ../../mod/register.php:249
+#: ../../mod/new_channel.php:137 ../../mod/register.php:249
 msgid ""
 "Your nickname will be used to create an easily remembered channel address "
 "(like an email address) which you can share with others."
 msgstr "Su alias podrá usarse para crear una dirección de canal fácilmente memorizable (como una dirección de correo electrónico) que puede ser compartido con otros."
 
-#: ../../mod/new_channel.php:127
+#: ../../mod/new_channel.php:138
 msgid "Or <a href=\"import\">import an existing channel</a> from another location"
 msgstr "O <a href=\"import\">importar un canal existente</a> de otro lugar"
 
-#: ../../mod/new_channel.php:129 ../../mod/register.php:251
+#: ../../mod/new_channel.php:140 ../../mod/register.php:251
 msgid ""
 "Please choose a channel type (such as social networking or community forum) "
 "and privacy requirements so we can select the best permissions for you"
 msgstr "Elija el tipo de canal (como red social o foro de discusión) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted"
 
-#: ../../mod/new_channel.php:130 ../../mod/register.php:252
+#: ../../mod/new_channel.php:141 ../../mod/register.php:252
 msgid "Channel Type"
 msgstr "Tipo de canal"
 
-#: ../../mod/new_channel.php:130 ../../mod/register.php:252
+#: ../../mod/new_channel.php:141 ../../mod/register.php:252
 msgid "Read more about roles"
 msgstr "Leer más sobre los roles"
 
@@ -7231,18 +7245,6 @@ msgstr "Ver álbum"
 msgid "Recent Photos"
 msgstr "Fotos recientes"
 
-#: ../../mod/ping.php:260
-msgid "sent you a private message"
-msgstr "le ha enviado un mensaje privado"
-
-#: ../../mod/ping.php:308
-msgid "added your channel"
-msgstr "añadió este canal a sus conexiones"
-
-#: ../../mod/ping.php:350
-msgid "posted an event"
-msgstr "publicó un evento"
-
 #: ../../mod/poke.php:164
 msgid "Poke/Prod"
 msgstr "Toque/Incitación"
@@ -7334,7 +7336,7 @@ msgstr "Seleccionar un perfil:"
 msgid "Upload Profile Photo"
 msgstr "Subir foto del perfil"
 
-#: ../../mod/profile_photo.php:457 ../../mod/settings.php:975
+#: ../../mod/profile_photo.php:457 ../../mod/settings.php:976
 #: ../../mod/cover_photo.php:357
 msgid "or"
 msgstr "o"
@@ -7873,7 +7875,7 @@ msgid ""
 "removed from the network"
 msgstr "Por defecto, solo la instancia del canal alojado en este servidor será eliminado de la red"
 
-#: ../../mod/removeme.php:61 ../../mod/settings.php:1112
+#: ../../mod/removeme.php:61 ../../mod/settings.php:1113
 msgid "Remove Channel"
 msgstr "Eliminar el canal"
 
@@ -8040,7 +8042,7 @@ msgstr "Confirme la nueva contraseña:"
 msgid "Leave password fields blank unless changing"
 msgstr "Dejar en blanco los campos de contraseña a menos que cambie"
 
-#: ../../mod/settings.php:699 ../../mod/settings.php:1030
+#: ../../mod/settings.php:699 ../../mod/settings.php:1031
 msgid "Email Address:"
 msgstr "Dirección de correo electrónico:"
 
@@ -8177,305 +8179,307 @@ msgstr "Cualquiera que esté autenticado"
 msgid "Anybody on the internet"
 msgstr "Cualquiera en internet"
 
-#: ../../mod/settings.php:966
+#: ../../mod/settings.php:967
 msgid "Publish your default profile in the network directory"
 msgstr "Publicar su perfil principal en el directorio de la red"
 
-#: ../../mod/settings.php:971
+#: ../../mod/settings.php:972
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "¿Nos permite sugerirle como amigo potencial a los nuevos miembros?"
 
-#: ../../mod/settings.php:980
+#: ../../mod/settings.php:981
 msgid "Your channel address is"
 msgstr "Su dirección de canal es"
 
-#: ../../mod/settings.php:1021
+#: ../../mod/settings.php:1022
 msgid "Channel Settings"
 msgstr "Ajustes del canal"
 
-#: ../../mod/settings.php:1028
+#: ../../mod/settings.php:1029
 msgid "Basic Settings"
 msgstr "Configuración básica"
 
-#: ../../mod/settings.php:1031
+#: ../../mod/settings.php:1032
 msgid "Your Timezone:"
 msgstr "Su zona horaria:"
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1033
 msgid "Default Post Location:"
 msgstr "Ubicación de publicación predeterminada:"
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1033
 msgid "Geographical location to display on your posts"
 msgstr "Ubicación geográfica que debe mostrarse en sus publicaciones"
 
-#: ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034
 msgid "Use Browser Location:"
 msgstr "Usar la ubicación del navegador:"
 
-#: ../../mod/settings.php:1035
+#: ../../mod/settings.php:1036
 msgid "Adult Content"
 msgstr "Contenido solo para adultos"
 
-#: ../../mod/settings.php:1035
+#: ../../mod/settings.php:1036
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr "Este canal publica contenido solo para adultos con frecuencia o regularmente. (Por favor etiquete cualquier material para adultos con la etiqueta #NSFW)"
 
-#: ../../mod/settings.php:1037
+#: ../../mod/settings.php:1038
 msgid "Security and Privacy Settings"
 msgstr "Configuración de seguridad y privacidad"
 
-#: ../../mod/settings.php:1039
+#: ../../mod/settings.php:1040
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "Sus permisos ya están configurados. Pulse para ver/ajustar"
 
-#: ../../mod/settings.php:1041
+#: ../../mod/settings.php:1042
 msgid "Hide my online presence"
 msgstr "Ocultar mi presencia en línea"
 
-#: ../../mod/settings.php:1041
+#: ../../mod/settings.php:1042
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Evitar mostrar en su perfil que está en línea"
 
-#: ../../mod/settings.php:1043
+#: ../../mod/settings.php:1044
 msgid "Simple Privacy Settings:"
 msgstr "Configuración de privacidad sencilla:"
 
-#: ../../mod/settings.php:1044
+#: ../../mod/settings.php:1045
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr "Muy Público - <em>extremadamente permisivo (debería ser usado con precaución)</em>"
 
-#: ../../mod/settings.php:1045
+#: ../../mod/settings.php:1046
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr "Típico - <em>por defecto público, privado cuando se desee (similar a los permisos de una red social pero con privacidad mejorada)</em>"
 
-#: ../../mod/settings.php:1046
+#: ../../mod/settings.php:1047
 msgid "Private - <em>default private, never open or public</em>"
 msgstr "Privado - <em>por defecto, privado, nunca abierto o público</em>"
 
-#: ../../mod/settings.php:1047
+#: ../../mod/settings.php:1048
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr "Bloqueado - <em>por defecto, bloqueado/a para cualquiera</em>"
 
-#: ../../mod/settings.php:1049
+#: ../../mod/settings.php:1050
 msgid "Allow others to tag your posts"
 msgstr "Permitir a otros etiquetar sus publicaciones"
 
-#: ../../mod/settings.php:1049
+#: ../../mod/settings.php:1050
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr "A menudo usado por la comunidad para marcar contenido inapropiado de forma retroactiva."
 
-#: ../../mod/settings.php:1051
+#: ../../mod/settings.php:1052
 msgid "Advanced Privacy Settings"
 msgstr "Configuración de privacidad avanzada"
 
-#: ../../mod/settings.php:1053
+#: ../../mod/settings.php:1054
 msgid "Expire other channel content after this many days"
 msgstr "Caducar contenido de otros canales después de este número de días"
 
-#: ../../mod/settings.php:1053
-msgid "0 or blank prevents expiration"
-msgstr "0 o en claro evitan la caducidad"
-
 #: ../../mod/settings.php:1054
+#, php-format
+msgid ""
+"0 or blank to use the website limit. The website expires after %d days."
+msgstr "0 o en blanco para usar el límite del sitio. El sitio web caduca después de %d días."
+
+#: ../../mod/settings.php:1055
 msgid "Maximum Friend Requests/Day:"
 msgstr "Máximo de solicitudes de amistad por día:"
 
-#: ../../mod/settings.php:1054
+#: ../../mod/settings.php:1055
 msgid "May reduce spam activity"
 msgstr "Podría reducir la actividad de spam"
 
-#: ../../mod/settings.php:1055
+#: ../../mod/settings.php:1056
 msgid "Default Post Permissions"
 msgstr "Permisos de publicación predeterminados"
 
-#: ../../mod/settings.php:1060
+#: ../../mod/settings.php:1061
 msgid "Channel permissions category:"
 msgstr "Categoría de permisos del canal:"
 
-#: ../../mod/settings.php:1066
+#: ../../mod/settings.php:1067
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Máximo de mensajes privados por día de gente desconocida:"
 
-#: ../../mod/settings.php:1066
+#: ../../mod/settings.php:1067
 msgid "Useful to reduce spamming"
 msgstr "Útil para reducir el envío de correo no deseado"
 
-#: ../../mod/settings.php:1069
+#: ../../mod/settings.php:1070
 msgid "Notification Settings"
 msgstr "Configuración de notificaciones"
 
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1071
 msgid "By default post a status message when:"
 msgstr "Por defecto, enviar un mensaje de estado cuando:"
 
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1072
 msgid "accepting a friend request"
 msgstr "Acepte una solicitud de amistad"
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1073
 msgid "joining a forum/community"
 msgstr "al unirse a un foro o comunidad"
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1074
 msgid "making an <em>interesting</em> profile change"
 msgstr "Realice un cambio <em>interesante</em> en su perfil"
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1075
 msgid "Send a notification email when:"
 msgstr "Enviar una notificación por correo electrónico cuando:"
 
-#: ../../mod/settings.php:1075
+#: ../../mod/settings.php:1076
 msgid "You receive a connection request"
 msgstr "Reciba una solicitud de conexión"
 
-#: ../../mod/settings.php:1076
+#: ../../mod/settings.php:1077
 msgid "Your connections are confirmed"
 msgstr "Sus conexiones hayan sido confirmadas"
 
-#: ../../mod/settings.php:1077
+#: ../../mod/settings.php:1078
 msgid "Someone writes on your profile wall"
 msgstr "Alguien escriba en la página de su perfil (\"muro\")"
 
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1079
 msgid "Someone writes a followup comment"
 msgstr "Alguien escriba un comentario sobre sus publicaciones"
 
-#: ../../mod/settings.php:1079
+#: ../../mod/settings.php:1080
 msgid "You receive a private message"
 msgstr "Reciba un mensaje privado"
 
-#: ../../mod/settings.php:1080
+#: ../../mod/settings.php:1081
 msgid "You receive a friend suggestion"
 msgstr "Reciba una sugerencia de amistad"
 
-#: ../../mod/settings.php:1081
+#: ../../mod/settings.php:1082
 msgid "You are tagged in a post"
 msgstr "Usted sea etiquetado en una publicación"
 
-#: ../../mod/settings.php:1082
+#: ../../mod/settings.php:1083
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Reciba un toque o incitación en una publicación"
 
-#: ../../mod/settings.php:1085
+#: ../../mod/settings.php:1086
 msgid "Show visual notifications including:"
 msgstr "Mostrar notificaciones visuales que incluyan:"
 
-#: ../../mod/settings.php:1087
+#: ../../mod/settings.php:1088
 msgid "Unseen grid activity"
 msgstr "Nueva actividad en la red"
 
-#: ../../mod/settings.php:1088
+#: ../../mod/settings.php:1089
 msgid "Unseen channel activity"
 msgstr "Actividad no vista en el canal"
 
-#: ../../mod/settings.php:1089
+#: ../../mod/settings.php:1090
 msgid "Unseen private messages"
 msgstr "Mensajes privados no leídos"
 
-#: ../../mod/settings.php:1089 ../../mod/settings.php:1094
-#: ../../mod/settings.php:1095 ../../mod/settings.php:1096
+#: ../../mod/settings.php:1090 ../../mod/settings.php:1095
+#: ../../mod/settings.php:1096 ../../mod/settings.php:1097
 msgid "Recommended"
 msgstr "Recomendado"
 
-#: ../../mod/settings.php:1090
+#: ../../mod/settings.php:1091
 msgid "Upcoming events"
 msgstr "Próximos eventos"
 
-#: ../../mod/settings.php:1091
+#: ../../mod/settings.php:1092
 msgid "Events today"
 msgstr "Eventos de hoy"
 
-#: ../../mod/settings.php:1092
+#: ../../mod/settings.php:1093
 msgid "Upcoming birthdays"
 msgstr "Próximos cumpleaños"
 
-#: ../../mod/settings.php:1092
+#: ../../mod/settings.php:1093
 msgid "Not available in all themes"
 msgstr "No disponible en todos los temas"
 
-#: ../../mod/settings.php:1093
+#: ../../mod/settings.php:1094
 msgid "System (personal) notifications"
 msgstr "Notificaciones del sistema (personales)"
 
-#: ../../mod/settings.php:1094
+#: ../../mod/settings.php:1095
 msgid "System info messages"
 msgstr "Mensajes de información del sistema"
 
-#: ../../mod/settings.php:1095
+#: ../../mod/settings.php:1096
 msgid "System critical alerts"
 msgstr "Alertas críticas del sistema"
 
-#: ../../mod/settings.php:1096
+#: ../../mod/settings.php:1097
 msgid "New connections"
 msgstr "Nuevas conexiones"
 
-#: ../../mod/settings.php:1097
+#: ../../mod/settings.php:1098
 msgid "System Registrations"
 msgstr "Registros del sistema"
 
-#: ../../mod/settings.php:1098
+#: ../../mod/settings.php:1099
 msgid ""
 "Also show new wall posts, private messages and connections under Notices"
 msgstr "Mostrar también en Avisos las nuevas publicaciones, los mensajes privados y las conexiones"
 
-#: ../../mod/settings.php:1100
+#: ../../mod/settings.php:1101
 msgid "Notify me of events this many days in advance"
 msgstr "Avisarme de los eventos con algunos días de antelación"
 
-#: ../../mod/settings.php:1100
+#: ../../mod/settings.php:1101
 msgid "Must be greater than 0"
 msgstr "Debe ser mayor que 0"
 
-#: ../../mod/settings.php:1102
+#: ../../mod/settings.php:1103
 msgid "Advanced Account/Page Type Settings"
 msgstr "Ajustes avanzados de la cuenta y de los tipos de página"
 
-#: ../../mod/settings.php:1103
+#: ../../mod/settings.php:1104
 msgid "Change the behaviour of this account for special situations"
 msgstr "Cambiar el comportamiento de esta cuenta en situaciones especiales"
 
-#: ../../mod/settings.php:1106
+#: ../../mod/settings.php:1107
 msgid ""
 "Please enable expert mode (in <a href=\"settings/features\">Settings > "
 "Additional features</a>) to adjust!"
 msgstr "¡Activar el modo de experto (en <a href=\"settings/features\">Ajustes > Funcionalidades</a>) para realizar cambios!."
 
-#: ../../mod/settings.php:1107
+#: ../../mod/settings.php:1108
 msgid "Miscellaneous Settings"
 msgstr "Ajustes diversos"
 
-#: ../../mod/settings.php:1108
+#: ../../mod/settings.php:1109
 msgid "Default photo upload folder"
 msgstr "Carpeta por defecto de las fotos subidas"
 
-#: ../../mod/settings.php:1108 ../../mod/settings.php:1109
+#: ../../mod/settings.php:1109 ../../mod/settings.php:1110
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - año en curso, %m - mes actual"
 
-#: ../../mod/settings.php:1109
+#: ../../mod/settings.php:1110
 msgid "Default file upload folder"
 msgstr "Carpeta por defecto de los archivos subidos"
 
-#: ../../mod/settings.php:1111
+#: ../../mod/settings.php:1112
 msgid "Personal menu to display in your channel pages"
 msgstr "Menú personal que debe mostrarse en las páginas de su canal"
 
-#: ../../mod/settings.php:1113
+#: ../../mod/settings.php:1114
 msgid "Remove this channel."
 msgstr "Eliminar este canal."
 
-#: ../../mod/settings.php:1114
+#: ../../mod/settings.php:1115
 msgid "Firefox Share $Projectname provider"
 msgstr "Servicio de compartición de Firefox: proveedor $Projectname"
 
-#: ../../mod/settings.php:1115
+#: ../../mod/settings.php:1116
 msgid "Start calendar week on monday"
 msgstr "Comenzar el calendario semanal por el lunes"
 
@@ -8607,7 +8611,7 @@ msgstr "No se puede encontrar una versión en línea de comandos de PHP en la ru
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron."
-msgstr "Si no tiene instalada la versión de línea de comandos de PHP en su servidor, no podrá ejecutar sondeos en segundo plano mediante cron."
+msgstr "Si no tiene instalada la versión de línea de comandos de PHP en su servidor, no podrá realizar envíos en segundo plano mediante cron."
 
 #: ../../mod/setup.php:422
 msgid "PHP executable path"
@@ -8911,7 +8915,7 @@ msgid ""
 "Password reset failed."
 msgstr "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado."
 
-#: ../../mod/lostpass.php:86 ../../boot.php:1516
+#: ../../mod/lostpass.php:86 ../../boot.php:1526
 msgid "Password Reset"
 msgstr "Restablecer la contraseña"
 
@@ -9096,7 +9100,7 @@ msgstr "Imposible eliminar la fuente."
 #: ../../mod/subthread.php:114
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s está siguiendo %2$s de %3$s"
+msgstr "%1$s está siguiendo %3$s de %2$s"
 
 #: ../../mod/subthread.php:116
 #, php-format
@@ -9112,7 +9116,7 @@ msgstr "No hay sugerencias disponibles. Si es un sitio nuevo, espere 24 horas y
 #: ../../mod/tagger.php:96
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s ha etiquetado la %3$s de %2$s con %4$s"
+msgstr "%1$s ha etiquetado %3$s de %2$s con %4$s"
 
 #: ../../mod/tagrm.php:44 ../../mod/tagrm.php:94
 msgid "Tag removed"
@@ -9126,60 +9130,60 @@ msgstr "Eliminar etiqueta del elemento."
 msgid "Select a tag to remove: "
 msgstr "Seleccionar una etiqueta para eliminar:"
 
-#: ../../mod/thing.php:111
+#: ../../mod/thing.php:110
 msgid "Thing updated"
 msgstr "Elemento actualizado."
 
-#: ../../mod/thing.php:163
+#: ../../mod/thing.php:162
 msgid "Object store: failed"
 msgstr "Guardar objeto: ha fallado"
 
-#: ../../mod/thing.php:167
+#: ../../mod/thing.php:166
 msgid "Thing added"
 msgstr "Elemento añadido"
 
-#: ../../mod/thing.php:193
+#: ../../mod/thing.php:192
 #, php-format
 msgid "OBJ: %1$s %2$s %3$s"
 msgstr "OBJ: %1$s %2$s %3$s"
 
-#: ../../mod/thing.php:256
+#: ../../mod/thing.php:255
 msgid "Show Thing"
 msgstr "Mostrar elemento"
 
-#: ../../mod/thing.php:263
+#: ../../mod/thing.php:262
 msgid "item not found."
 msgstr "elemento no encontrado."
 
-#: ../../mod/thing.php:296
+#: ../../mod/thing.php:295
 msgid "Edit Thing"
 msgstr "Editar elemento"
 
-#: ../../mod/thing.php:298 ../../mod/thing.php:348
+#: ../../mod/thing.php:297 ../../mod/thing.php:347
 msgid "Select a profile"
 msgstr "Seleccionar un perfil"
 
-#: ../../mod/thing.php:302 ../../mod/thing.php:351
+#: ../../mod/thing.php:301 ../../mod/thing.php:350
 msgid "Post an activity"
 msgstr "Publicar una actividad"
 
-#: ../../mod/thing.php:302 ../../mod/thing.php:351
+#: ../../mod/thing.php:301 ../../mod/thing.php:350
 msgid "Only sends to viewers of the applicable profile"
 msgstr "Sólo enviar a espectadores del perfil pertinente."
 
-#: ../../mod/thing.php:304 ../../mod/thing.php:353
+#: ../../mod/thing.php:303 ../../mod/thing.php:352
 msgid "Name of thing e.g. something"
 msgstr "Nombre del elemento, p. ej.:. \"algo\""
 
-#: ../../mod/thing.php:306 ../../mod/thing.php:354
+#: ../../mod/thing.php:305 ../../mod/thing.php:353
 msgid "URL of thing (optional)"
 msgstr "Dirección del elemento (opcional)"
 
-#: ../../mod/thing.php:308 ../../mod/thing.php:355
+#: ../../mod/thing.php:307 ../../mod/thing.php:354
 msgid "URL for photo of thing (optional)"
 msgstr "Dirección para la foto o elemento (opcional)"
 
-#: ../../mod/thing.php:346
+#: ../../mod/thing.php:345
 msgid "Add Thing to your Profile"
 msgstr "Añadir alguna cosa a su perfil"
 
@@ -9414,51 +9418,51 @@ msgstr "Ajustar el tamaño de la foto del autor de la conversación"
 msgid "Set size of followup author photos"
 msgstr "Ajustar el tamaño de foto de los seguidores del autor"
 
-#: ../../boot.php:1319
+#: ../../boot.php:1329
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "La actualización %s ha fallado. Mire el informe de errores."
 
-#: ../../boot.php:1322
+#: ../../boot.php:1332
 #, php-format
 msgid "Update Error at %s"
 msgstr "Error de actualización en %s"
 
-#: ../../boot.php:1489
+#: ../../boot.php:1499
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr "Crear una cuenta para acceder a los servicios y aplicaciones dentro de Hubzilla"
 
-#: ../../boot.php:1511
+#: ../../boot.php:1521
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../../boot.php:1512
+#: ../../boot.php:1522
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: ../../boot.php:1515
+#: ../../boot.php:1525
 msgid "Forgot your password?"
 msgstr "¿Olvidó su contraseña?"
 
-#: ../../boot.php:2137
+#: ../../boot.php:2155
 msgid "toggle mobile"
 msgstr "cambiar a modo móvil"
 
-#: ../../boot.php:2289
+#: ../../boot.php:2307
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "El certificado SSL del sitio web no es válido. Por favor, solucione el problema."
 
-#: ../../boot.php:2292
+#: ../../boot.php:2310
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Error SSL del sitio web en %s"
 
-#: ../../boot.php:2329
+#: ../../boot.php:2347
 msgid "Cron/Scheduled tasks not running."
 msgstr "Las tareas del Planificador/Cron no están funcionando."
 
-#: ../../boot.php:2333
+#: ../../boot.php:2351
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr "[hubzilla] Las tareas de Cron no están funcionando en %s"
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index 397d52f6a..49b616c93 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -196,7 +196,7 @@ $a->strings["layout"] = "disposición";
 $a->strings["block"] = "bloque";
 $a->strings["menu"] = "menú";
 $a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s escribió la siguiente %2\$s %3\$s";
-$a->strings["post"] = "entrada";
+$a->strings["post"] = "la entrada";
 $a->strings["Different viewers will see this text differently"] = "Visitantes diferentes verán este texto de forma distinta";
 $a->strings["$1 spoiler"] = "$1 spoiler";
 $a->strings["$1 wrote:"] = "$1 escribió:";
@@ -392,46 +392,6 @@ $a->strings["No"] = "No";
 $a->strings["Yes"] = "Sí";
 $a->strings["Public Forums Only"] = "Solo foros públicos";
 $a->strings["This Website Only"] = "Solo este sitio web";
-$a->strings["\$Projectname Notification"] = "Notificación de \$Projectname";
-$a->strings["\$projectname"] = "\$projectname";
-$a->strings["Thank You,"] = "Gracias,";
-$a->strings["%s Administrator"] = "%s Administrador";
-$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
-$a->strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Aviso] Nuevo mensaje en %s";
-$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s le ha enviado un nuevo mensaje privado en %3\$s.";
-$a->strings["%1\$s sent you %2\$s."] = "%1\$s le ha enviado %2\$s.";
-$a->strings["a private message"] = "un mensaje privado";
-$a->strings["Please visit %s to view and/or reply to your private messages."] = "Por favor visite %s para ver y/o responder a su mensaje privado.";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s[/zrl]";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%5\$s de %4\$s[/zrl] ";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s creado por usted[/zrl]";
-$a->strings["[Hubzilla:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla:Aviso] Nuevo comentario de %2\$s a la conversación #%1\$d";
-$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s ha comentado un elemento/conversación que ha estado siguiendo.";
-$a->strings["Please visit %s to view and/or reply to the conversation."] = "Para ver o comentar la conversación, visite %s";
-$a->strings["[Hubzilla:Notify] %s posted to your profile wall"] = "[Hubzilla:Aviso] %s ha publicado una entrada en su página de inicio del perfil (\"muro\")";
-$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s ha publicado en su página del perfil en %3\$s";
-$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s ha publicado en [zrl=%3\$s]su página del perfil[/zrl]";
-$a->strings["[Hubzilla:Notify] %s tagged you"] = "[Hubzilla:Aviso] %s le ha etiquetado";
-$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s le ha etiquetado en %3\$s";
-$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]le etiquetó[/zrl].";
-$a->strings["[Hubzilla:Notify] %1\$s poked you"] = "[Hubzilla:Aviso] %1\$s le ha dado un toque";
-$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s le ha dado un toque en %3\$s";
-$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]le ha dado un toque[/zrl].";
-$a->strings["[Hubzilla:Notify] %s tagged your post"] = "[Hubzilla:Aviso] %s ha etiquetado su publicación";
-$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s ha etiquetado su publicación en %3\$s";
-$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s ha etiquetado [zrl=%3\$s]su publicación[/zrl]";
-$a->strings["[Hubzilla:Notify] Introduction received"] = "[Hubzilla:Aviso] Ha recibido una solicitud de conexión";
-$a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, ha recibido una nueva solicitud de conexión de '%2\$s' en  %3\$s";
-$a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, ha recibido [zrl=%2\$s]una nueva solicitud de conexión[/zrl] de %3\$s.";
-$a->strings["You may visit their profile at %s"] = "Puede visitar su perfil en %s";
-$a->strings["Please visit %s to approve or reject the connection request."] = "Por favor, visite %s para permitir o rechazar la solicitad de conexión.";
-$a->strings["[Hubzilla:Notify] Friend suggestion received"] = "[Hubzilla:Aviso] Ha recibido una sugerencia de amistad";
-$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, ha recibido una sugerencia de conexión de '%2\$s' en %3\$s";
-$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, ha recibido [zrl=%2\$s]una sugerencia de conexión[/zrl] para %3\$s de %4\$s.";
-$a->strings["Name:"] = "Nombre:";
-$a->strings["Photo:"] = "Foto:";
-$a->strings["Please visit %s to approve or reject the suggestion."] = "Por favor, visite %s para aprobar o rechazar la sugerencia.";
-$a->strings["[Hubzilla:Notify]"] = "[Hubzilla:Aviso]";
 $a->strings["This event has been added to your calendar."] = "Este evento ha sido añadido a su calendario.";
 $a->strings["Not specified"] = "Sin especificar";
 $a->strings["Needs Action"] = "Necesita de una intervención";
@@ -447,13 +407,13 @@ $a->strings["Channel discovery failed."] = "El intento de acceder al canal ha fa
 $a->strings["local account not found."] = "No se ha encontrado la cuenta local.";
 $a->strings["Cannot connect to yourself."] = "No puede conectarse consigo mismo.";
 $a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos existentes  sean aplicados a este grupo y sus futuros miembros. Si no quiere esto, por favor cree otro grupo con un nombre diferente.";
-$a->strings["Add new connections to this collection (privacy group)"] = "Añadir nuevas conexiones a esta colección (privacidad del grupo)";
+$a->strings["Add new connections to this privacy group"] = "Añadir las conexiones nuevas a este grupo privado";
 $a->strings["All Channels"] = "Todos los canales";
 $a->strings["edit"] = "editar";
-$a->strings["Collections"] = "Colecciones";
-$a->strings["Edit collection"] = "Editar colección";
-$a->strings["Add new collection"] = "Añadir nueva colección";
-$a->strings["Channels not in any collection"] = "El canal no se encuentra en ninguna colección";
+$a->strings["Privacy Groups"] = "Grupos privados";
+$a->strings["Edit group"] = "Editar grupo";
+$a->strings["Add privacy group"] = "Añadir un grupo privado";
+$a->strings["Channels not in any privacy group"] = "Sin canales en ningún grupo privado";
 $a->strings["add"] = "añadir";
 $a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "No se ha podido crear un canal con un identificador que ya existe en este sistema. La importación ha fallado.";
 $a->strings["Channel clone failed. Import failed."] = "La clonación del canal no ha salido bien. La importación ha fallado.";
@@ -591,6 +551,10 @@ $a->strings["Site Setup and Configuration"] = "Ajustes y configuración del siti
 $a->strings["@name, #tag, ?doc, content"] = "@nombre, #etiqueta, ?ayuda, contenido";
 $a->strings["Please wait..."] = "Espere por favor…";
 $a->strings["view full size"] = "Ver en el tamaño original";
+$a->strings["\$Projectname Notification"] = "Notificación de \$Projectname";
+$a->strings["\$projectname"] = "\$projectname";
+$a->strings["Thank You,"] = "Gracias,";
+$a->strings["%s Administrator"] = "%s Administrador";
 $a->strings["No Subject"] = "Sin asunto";
 $a->strings["created a new post"] = "ha creado una nueva entrada";
 $a->strings["commented on %s's post"] = "ha comentado la entrada de %s";
@@ -728,73 +692,6 @@ $a->strings["Zot"] = "Zot";
 $a->strings["LinkedIn"] = "LinkedIn";
 $a->strings["XMPP/IM"] = "XMPP/IM";
 $a->strings["MySpace"] = "MySpace";
-$a->strings["General Features"] = "Funcionalidades básicas";
-$a->strings["Content Expiration"] = "Caducidad del contenido";
-$a->strings["Remove posts/comments and/or private messages at a future time"] = "Eliminar publicaciones/comentarios y/o mensajes privados más adelante";
-$a->strings["Multiple Profiles"] = "Múltiples perfiles";
-$a->strings["Ability to create multiple profiles"] = "Capacidad de crear múltiples perfiles";
-$a->strings["Advanced Profiles"] = "Perfiles avanzados";
-$a->strings["Additional profile sections and selections"] = "Secciones y selecciones de perfil adicionales";
-$a->strings["Profile Import/Export"] = "Importar/Exportar perfil";
-$a->strings["Save and load profile details across sites/channels"] = "Guardar y cargar detalles del perfil a través de sitios/canales";
-$a->strings["Web Pages"] = "Páginas web";
-$a->strings["Provide managed web pages on your channel"] = "Proveer páginas web gestionadas en su canal";
-$a->strings["Hide Rating"] = "Ocultar las valoraciones";
-$a->strings["Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else."] = "Ocultar los botones de valoración en su canal y página de perfil. Tenga en cuenta, sin embargo, que la gente podrá expresar su valoración en otros lugares.";
-$a->strings["Private Notes"] = "Notas privadas";
-$a->strings["Enables a tool to store notes and reminders"] = "Activar una herramienta para almacenar notas y recordatorios";
-$a->strings["Navigation Channel Select"] = "Navegación por el selector de canales";
-$a->strings["Change channels directly from within the navigation dropdown menu"] = "Cambiar de canales directamente desde el menú de navegación desplegable";
-$a->strings["Photo Location"] = "Ubicación de las fotos";
-$a->strings["If location data is available on uploaded photos, link this to a map."] = "Si los datos de ubicación están disponibles en las fotos subidas, enlazar estas a un mapa.";
-$a->strings["Expert Mode"] = "Modo de experto";
-$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Habilitar el modo de experto para acceder a opciones avanzadas de configuración";
-$a->strings["Premium Channel"] = "Canal premium";
-$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Le permite configurar restricciones y normas de uso a aquellos que conectan con su canal";
-$a->strings["Post Composition Features"] = "Opciones para la redacción de entradas";
-$a->strings["Use Markdown"] = "Usar Markdown";
-$a->strings["Allow use of \"Markdown\" to format posts"] = "Permitir el uso de \"Markdown\" para formatear publicaciones";
-$a->strings["Large Photos"] = "Fotos de gran tamaño";
-$a->strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)";
-$a->strings["Channel Sources"] = "Orígenes de los contenidos del canal";
-$a->strings["Automatically import channel content from other channels or feeds"] = "Importar automáticamente contenido de otros canales o \"feeds\"";
-$a->strings["Even More Encryption"] = "Más cifrado todavía";
-$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida.";
-$a->strings["Enable Voting Tools"] = "Permitir entradas con votación";
-$a->strings["Provide a class of post which others can vote on"] = "Proveer una clase de publicación en la que otros puedan votar";
-$a->strings["Delayed Posting"] = "Publicación aplazada";
-$a->strings["Allow posts to be published at a later date"] = "Permitir mensajes que se publicarán en una fecha posterior";
-$a->strings["Suppress Duplicate Posts/Comments"] = "Prevenir entradas o comentarios duplicados";
-$a->strings["Prevent posts with identical content to be published with less than two minutes in between submissions."] = "Prevenir que entradas con contenido idéntico se publiquen con menos de dos minutos de intervalo.";
-$a->strings["Network and Stream Filtering"] = "Filtrado del contenido";
-$a->strings["Search by Date"] = "Buscar por fecha";
-$a->strings["Ability to select posts by date ranges"] = "Capacidad de seleccionar entradas por rango de fechas";
-$a->strings["Collections (Privacy Groups)"] = "Colecciones (grupos privados)";
-$a->strings["Enable widget to display Network posts only from selected collections"] = "Habilitar la muestra de entradas eligiendo colecciones";
-$a->strings["Saved Searches"] = "Búsquedas guardadas";
-$a->strings["Save search terms for re-use"] = "Guardar términos de búsqueda para su reutilización";
-$a->strings["Network Personal Tab"] = "Actividad personal";
-$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Habilitar una pestaña en la cual se muestren solo las entradas en las que ha participado.";
-$a->strings["Network New Tab"] = "Contenido nuevo";
-$a->strings["Enable tab to display all new Network activity"] = "Habilitar una pestaña en la que se muestre solo el contenido nuevo";
-$a->strings["Affinity Tool"] = "Herramienta de afinidad";
-$a->strings["Filter stream activity by depth of relationships"] = "Filtrar el contenido según la profundidad de las relaciones";
-$a->strings["Connection Filtering"] = "Filtrado de conexiones";
-$a->strings["Filter incoming posts from connections based on keywords/content"] = "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido";
-$a->strings["Suggest Channels"] = "Sugerir canales";
-$a->strings["Show channel suggestions"] = "Mostrar sugerencias de canales";
-$a->strings["Post/Comment Tools"] = "Gestión de entradas y comentarios";
-$a->strings["Community Tagging"] = "Etiquetas de la comunidad";
-$a->strings["Ability to tag existing posts"] = "Capacidad de etiquetar entradas existentes";
-$a->strings["Post Categories"] = "Categorías de entradas";
-$a->strings["Add categories to your posts"] = "Añadir categorías a sus publicaciones";
-$a->strings["Ability to file posts under folders"] = "Capacidad de archivar entradas en carpetas";
-$a->strings["Dislike Posts"] = "Desagrado de publicaciones";
-$a->strings["Ability to dislike posts/comments"] = "Capacidad de mostrar desacuerdo con el contenido de  entradas y comentarios";
-$a->strings["Star Posts"] = "Entradas destacadas";
-$a->strings["Ability to mark special posts with a star indicator"] = "Capacidad de marcar entradas destacadas con un indicador de estrella";
-$a->strings["Tag Cloud"] = "Nube de etiquetas";
-$a->strings["Provide a personal tag cloud on your channel page"] = "Proveer nube de etiquetas personal en su página de canal";
 $a->strings["Unable to obtain identity information from database"] = "No ha sido posible obtener información sobre la identidad desde la base de datos";
 $a->strings["Empty name"] = "Nombre vacío";
 $a->strings["Name too long"] = "Nombre demasiado largo";
@@ -905,12 +802,64 @@ $a->strings["Page layout"] = "Formato de la página";
 $a->strings["You can create your own with the layouts tool"] = "Puede crear su propio formato gráfico con las herramientas de diseño";
 $a->strings["Page content type"] = "Tipo de contenido de página";
 $a->strings["Select an alternate language"] = "Seleccionar un idioma alternativo";
-$a->strings["activity"] = "actividad";
+$a->strings["activity"] = "la actividad";
 $a->strings["Design Tools"] = "Herramientas de diseño";
 $a->strings["Blocks"] = "Bloques";
 $a->strings["Menus"] = "Menús";
 $a->strings["Layouts"] = "Formato gráfico";
 $a->strings["Pages"] = "Páginas";
+$a->strings["Permission denied"] = "Permiso denegado";
+$a->strings["(Unknown)"] = "(Desconocido)";
+$a->strings["Visible to anybody on the internet."] = "Visible para cualquiera en internet.";
+$a->strings["Visible to you only."] = "Visible sólo para usted.";
+$a->strings["Visible to anybody in this network."] = "Visible para cualquiera en esta red.";
+$a->strings["Visible to anybody authenticated."] = "Visible para cualquiera que haya sido autenticado.";
+$a->strings["Visible to anybody on %s."] = "Visible para cualquiera en %s.";
+$a->strings["Visible to all connections."] = "Visible para todas las conexiones.";
+$a->strings["Visible to approved connections."] = "Visible para las conexiones permitidas.";
+$a->strings["Visible to specific connections."] = "Visible para conexiones específicas.";
+$a->strings["Item not found."] = "Elemento no encontrado.";
+$a->strings["Privacy group not found."] = "Grupo privado no encontrado.";
+$a->strings["Privacy group is empty."] = "El grupo privado está vacío.";
+$a->strings["Privacy group: %s"] = "Grupo privado: %s";
+$a->strings["Connection: %s"] = "Conexión: %s";
+$a->strings["Connection not found."] = "Conexión no encontrada";
+$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
+$a->strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Aviso] Nuevo mensaje en %s";
+$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s le ha enviado un nuevo mensaje privado en %3\$s.";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s le ha enviado %2\$s.";
+$a->strings["a private message"] = "un mensaje privado";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "Por favor visite %s para ver y/o responder a su mensaje privado.";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s[/zrl]";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%5\$s de %4\$s[/zrl] ";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s creado por usted[/zrl]";
+$a->strings["[Hubzilla:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla:Aviso] Nuevo comentario de %2\$s a la conversación #%1\$d";
+$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s ha comentado un elemento/conversación que ha estado siguiendo.";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "Para ver o comentar la conversación, visite %s";
+$a->strings["[Hubzilla:Notify] %s posted to your profile wall"] = "[Hubzilla:Aviso] %s ha publicado una entrada en su página de inicio del perfil (\"muro\")";
+$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s ha publicado en su página del perfil en %3\$s";
+$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s ha publicado en [zrl=%3\$s]su página del perfil[/zrl]";
+$a->strings["[Hubzilla:Notify] %s tagged you"] = "[Hubzilla:Aviso] %s le ha etiquetado";
+$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s le ha etiquetado en %3\$s";
+$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]le etiquetó[/zrl].";
+$a->strings["[Hubzilla:Notify] %1\$s poked you"] = "[Hubzilla:Aviso] %1\$s le ha dado un toque";
+$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s le ha dado un toque en %3\$s";
+$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]le ha dado un toque[/zrl].";
+$a->strings["[Hubzilla:Notify] %s tagged your post"] = "[Hubzilla:Aviso] %s ha etiquetado su publicación";
+$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s ha etiquetado su publicación en %3\$s";
+$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s ha etiquetado [zrl=%3\$s]su publicación[/zrl]";
+$a->strings["[Hubzilla:Notify] Introduction received"] = "[Hubzilla:Aviso] Ha recibido una solicitud de conexión";
+$a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, ha recibido una nueva solicitud de conexión de '%2\$s' en  %3\$s";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, ha recibido [zrl=%2\$s]una nueva solicitud de conexión[/zrl] de %3\$s.";
+$a->strings["You may visit their profile at %s"] = "Puede visitar su perfil en %s";
+$a->strings["Please visit %s to approve or reject the connection request."] = "Por favor, visite %s para permitir o rechazar la solicitad de conexión.";
+$a->strings["[Hubzilla:Notify] Friend suggestion received"] = "[Hubzilla:Aviso] Ha recibido una sugerencia de amistad";
+$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, ha recibido una sugerencia de conexión de '%2\$s' en %3\$s";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, ha recibido [zrl=%2\$s]una sugerencia de conexión[/zrl] para %3\$s de %4\$s.";
+$a->strings["Name:"] = "Nombre:";
+$a->strings["Photo:"] = "Foto:";
+$a->strings["Please visit %s to approve or reject the suggestion."] = "Por favor, visite %s para aprobar o rechazar la sugerencia.";
+$a->strings["[Hubzilla:Notify]"] = "[Hubzilla:Aviso]";
 $a->strings["System"] = "Sistema";
 $a->strings["Create Personal App"] = "Crear una aplicación personal";
 $a->strings["Edit Personal App"] = "Editar una aplicación personal";
@@ -923,6 +872,7 @@ $a->strings["Enter channel address"] = "Dirección del canal";
 $a->strings["Examples: bob@example.com, https://example.com/barbara"] = "Ejemplos: manuel@ejemplo.com, https://ejemplo.com/carmen";
 $a->strings["Notes"] = "Notas";
 $a->strings["Remove term"] = "Eliminar término";
+$a->strings["Saved Searches"] = "Búsquedas guardadas";
 $a->strings["Archives"] = "Hemeroteca";
 $a->strings["Me"] = "Yo";
 $a->strings["Family"] = "Familia";
@@ -938,6 +888,7 @@ $a->strings["Connected apps"] = "Aplicaciones conectadas";
 $a->strings["Export channel"] = "Exportar canal";
 $a->strings["Connection Default Permissions"] = "Permisos predeterminados de conexión";
 $a->strings["Premium Channel Settings"] = "Configuración del canal premium";
+$a->strings["Channel Sources"] = "Orígenes de los contenidos del canal";
 $a->strings["Private Mail Menu"] = "Menú de correo privado";
 $a->strings["Combined View"] = "Vista combinada";
 $a->strings["Conversations"] = "Conversaciones";
@@ -982,22 +933,70 @@ $a->strings["Plugin Features"] = "Extensiones";
 $a->strings["User registrations waiting for confirmation"] = "Registros de usuarios pendientes de confirmación";
 $a->strings["View Photo"] = "Ver foto";
 $a->strings["Edit Album"] = "Editar álbum";
-$a->strings["Permission denied"] = "Permiso denegado";
-$a->strings["(Unknown)"] = "(Desconocido)";
-$a->strings["Visible to anybody on the internet."] = "Visible para cualquiera en internet.";
-$a->strings["Visible to you only."] = "Visible sólo para usted.";
-$a->strings["Visible to anybody in this network."] = "Visible para cualquiera en esta red.";
-$a->strings["Visible to anybody authenticated."] = "Visible para cualquiera que haya sido autenticado.";
-$a->strings["Visible to anybody on %s."] = "Visible para cualquiera en %s.";
-$a->strings["Visible to all connections."] = "Visible para todas las conexiones.";
-$a->strings["Visible to approved connections."] = "Visible para las conexiones permitidas.";
-$a->strings["Visible to specific connections."] = "Visible para conexiones específicas.";
-$a->strings["Item not found."] = "Elemento no encontrado.";
-$a->strings["Collection not found."] = "Colección no encontrada.";
-$a->strings["Collection is empty."] = "La colección está vacía.";
-$a->strings["Collection: %s"] = "Colección: %s";
-$a->strings["Connection: %s"] = "Conexión: %s";
-$a->strings["Connection not found."] = "Conexión no encontrada";
+$a->strings["General Features"] = "Funcionalidades básicas";
+$a->strings["Content Expiration"] = "Caducidad del contenido";
+$a->strings["Remove posts/comments and/or private messages at a future time"] = "Eliminar publicaciones/comentarios y/o mensajes privados más adelante";
+$a->strings["Multiple Profiles"] = "Múltiples perfiles";
+$a->strings["Ability to create multiple profiles"] = "Capacidad de crear múltiples perfiles";
+$a->strings["Advanced Profiles"] = "Perfiles avanzados";
+$a->strings["Additional profile sections and selections"] = "Secciones y selecciones de perfil adicionales";
+$a->strings["Profile Import/Export"] = "Importar/Exportar perfil";
+$a->strings["Save and load profile details across sites/channels"] = "Guardar y cargar detalles del perfil a través de sitios/canales";
+$a->strings["Web Pages"] = "Páginas web";
+$a->strings["Provide managed web pages on your channel"] = "Proveer páginas web gestionadas en su canal";
+$a->strings["Hide Rating"] = "Ocultar las valoraciones";
+$a->strings["Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else."] = "Ocultar los botones de valoración en su canal y página de perfil. Tenga en cuenta, sin embargo, que la gente podrá expresar su valoración en otros lugares.";
+$a->strings["Private Notes"] = "Notas privadas";
+$a->strings["Enables a tool to store notes and reminders (note: not encrypted)"] = "Habilita una herramienta para guardar notas y recordatorios (advertencia: las notas no estarán cifradas)";
+$a->strings["Navigation Channel Select"] = "Navegación por el selector de canales";
+$a->strings["Change channels directly from within the navigation dropdown menu"] = "Cambiar de canales directamente desde el menú de navegación desplegable";
+$a->strings["Photo Location"] = "Ubicación de las fotos";
+$a->strings["If location data is available on uploaded photos, link this to a map."] = "Si los datos de ubicación están disponibles en las fotos subidas, enlazar estas a un mapa.";
+$a->strings["Expert Mode"] = "Modo de experto";
+$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Habilitar el modo de experto para acceder a opciones avanzadas de configuración";
+$a->strings["Premium Channel"] = "Canal premium";
+$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Le permite configurar restricciones y normas de uso a aquellos que conectan con su canal";
+$a->strings["Post Composition Features"] = "Opciones para la redacción de entradas";
+$a->strings["Use Markdown"] = "Usar Markdown";
+$a->strings["Allow use of \"Markdown\" to format posts"] = "Permitir el uso de \"Markdown\" para formatear publicaciones";
+$a->strings["Large Photos"] = "Fotos de gran tamaño";
+$a->strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)";
+$a->strings["Automatically import channel content from other channels or feeds"] = "Importar automáticamente contenido de otros canales o \"feeds\"";
+$a->strings["Even More Encryption"] = "Más cifrado todavía";
+$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida.";
+$a->strings["Enable Voting Tools"] = "Permitir entradas con votación";
+$a->strings["Provide a class of post which others can vote on"] = "Proveer una clase de publicación en la que otros puedan votar";
+$a->strings["Delayed Posting"] = "Publicación aplazada";
+$a->strings["Allow posts to be published at a later date"] = "Permitir mensajes que se publicarán en una fecha posterior";
+$a->strings["Suppress Duplicate Posts/Comments"] = "Prevenir entradas o comentarios duplicados";
+$a->strings["Prevent posts with identical content to be published with less than two minutes in between submissions."] = "Prevenir que entradas con contenido idéntico se publiquen con menos de dos minutos de intervalo.";
+$a->strings["Network and Stream Filtering"] = "Filtrado del contenido";
+$a->strings["Search by Date"] = "Buscar por fecha";
+$a->strings["Ability to select posts by date ranges"] = "Capacidad de seleccionar entradas por rango de fechas";
+$a->strings["Enable management and selection of privacy groups"] = "Activar la gestión y selección de grupos privados";
+$a->strings["Save search terms for re-use"] = "Guardar términos de búsqueda para su reutilización";
+$a->strings["Network Personal Tab"] = "Actividad personal";
+$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Habilitar una pestaña en la cual se muestren solo las entradas en las que ha participado.";
+$a->strings["Network New Tab"] = "Contenido nuevo";
+$a->strings["Enable tab to display all new Network activity"] = "Habilitar una pestaña en la que se muestre solo el contenido nuevo";
+$a->strings["Affinity Tool"] = "Herramienta de afinidad";
+$a->strings["Filter stream activity by depth of relationships"] = "Filtrar el contenido según la profundidad de las relaciones";
+$a->strings["Connection Filtering"] = "Filtrado de conexiones";
+$a->strings["Filter incoming posts from connections based on keywords/content"] = "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido";
+$a->strings["Suggest Channels"] = "Sugerir canales";
+$a->strings["Show channel suggestions"] = "Mostrar sugerencias de canales";
+$a->strings["Post/Comment Tools"] = "Gestión de entradas y comentarios";
+$a->strings["Community Tagging"] = "Etiquetas de la comunidad";
+$a->strings["Ability to tag existing posts"] = "Capacidad de etiquetar entradas existentes";
+$a->strings["Post Categories"] = "Categorías de entradas";
+$a->strings["Add categories to your posts"] = "Añadir categorías a sus publicaciones";
+$a->strings["Ability to file posts under folders"] = "Capacidad de archivar entradas en carpetas";
+$a->strings["Dislike Posts"] = "Desagrado de publicaciones";
+$a->strings["Ability to dislike posts/comments"] = "Capacidad de mostrar desacuerdo con el contenido de  entradas y comentarios";
+$a->strings["Star Posts"] = "Entradas destacadas";
+$a->strings["Ability to mark special posts with a star indicator"] = "Capacidad de marcar entradas destacadas con un indicador de estrella";
+$a->strings["Tag Cloud"] = "Nube de etiquetas";
+$a->strings["Provide a personal tag cloud on your channel page"] = "Proveer nube de etiquetas personal en su página de canal";
 $a->strings["Not Found"] = "No encontrado";
 $a->strings["Page not found."] = "Página no encontrada.";
 $a->strings["Some blurb about what to do when you're new here"] = "Algunas propuestas para el nuevo usuario sobre qué se puede hacer aquí";
@@ -1070,7 +1069,7 @@ $a->strings["Force publish"] = "Forzar la publicación";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Intentar forzar todos los perfiles para que sean listados en el directorio de este sitio.";
 $a->strings["Import Public Streams"] = "Importar contenido público";
 $a->strings["Import and allow access to public content pulled from other sites. Warning: this content is unmoderated."] = "Importar y permitir acceso al contenido público sacado de otros sitios. Advertencia: este contenido no está moderado, por lo que podría encontrar cosas inapropiadas u ofensivas.";
-$a->strings["login on Homepage"] = "acceso a la página personal";
+$a->strings["login on Homepage"] = "Iniciar sesión en la página personal";
 $a->strings["Present a login box to visitors on the home page if no other content has been configured."] = "Presentar a los visitantes una casilla de identificación en la página de inicio, si no se ha configurado otro tipo de contenido.";
 $a->strings["Directory Server URL"] = "URL del servidor de directorio";
 $a->strings["Default directory server"] = "Servidor de directorio predeterminado";
@@ -1082,10 +1081,10 @@ $a->strings["Delivery interval"] = "Intervalo de entrega";
 $a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Retrasar los procesos de transmisión en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendado: 4-5 para sitios compartidos, 2-3 para servidores virtuales privados, 0-1 para grandes servidores dedicados.";
 $a->strings["Deliveries per process"] = "Intentos de envío por proceso";
 $a->strings["Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5."] = "Numero de envíos a intentar en un único proceso del sistema operativo. Ajustar si es necesario mejorar el rendimiento. Se recomienda: 1-5.";
-$a->strings["Poll interval"] = "Intervalo de sondeo";
-$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Retrasar el sondeo en segundo plano, en esta cantidad de segundos, para reducir la carga del sistema. Si es 0, usar el intervalo de transmisión.";
+$a->strings["Poll interval"] = "Intervalo máximo de tiempo entre dos mensajes sucesivos";
+$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Retrasar el intervalo de envío en segundo plano, en esta cantidad de segundos, para reducir la carga del sistema. Si es 0, usar el intervalo de entrega.";
 $a->strings["Maximum Load Average"] = "Carga media máxima";
-$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Carga máxima del sistema antes de que los procesos de transmisión y sondeo se hayan retardado - por defecto, 50.";
+$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Carga máxima del sistema antes de que los procesos de entrega y envío se hayan retardado - por defecto, 50.";
 $a->strings["Expiration period in days for imported (grid/network) content"] = "Caducidad del contenido importado de otros sitios (en días)";
 $a->strings["0 for no expiration of imported content"] = "0 para que no caduque el contenido importado";
 $a->strings["Off"] = "Desactivado";
@@ -1200,7 +1199,7 @@ $a->strings["Field definition not found"] = "Definición del campo no encontrada
 $a->strings["Edit Profile Field"] = "Modificar el campo del perfil";
 $a->strings["Authorize application connection"] = "Autorizar una conexión de aplicación";
 $a->strings["Return to your app and insert this Securty Code:"] = "Volver a su aplicación e introducir este código de seguridad:";
-$a->strings["Please login to continue."] = "Por favor inicia sesión para continuar.";
+$a->strings["Please login to continue."] = "Por favor inicie sesión para continuar.";
 $a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "¿Desea autorizar a esta aplicación a acceder a sus publicaciones y contactos, y/o crear nuevas publicaciones por usted?";
 $a->strings["App installed."] = "Aplicación instalada.";
 $a->strings["Malformed app."] = "Aplicación con errores";
@@ -1234,7 +1233,7 @@ $a->strings["I am online"] = "Estoy conectado/a";
 $a->strings["Bookmark this room"] = "Añadir esta sala a Marcadores";
 $a->strings["New Chatroom"] = "Nueva sala de chat";
 $a->strings["Chatroom Name"] = "Nombre de la sala de chat";
-$a->strings["Expiration of chats (minutes)"] = "Tiempo de expiración de los mensajes en los chats (en minutos)";
+$a->strings["Expiration of chats (minutes)"] = "Caducidad de los mensajes en los chats (en minutos)";
 $a->strings["%1\$s's Chatrooms"] = "Salas de chat de %1\$s";
 $a->strings["Away"] = "Ausente";
 $a->strings["Online"] = "Conectado/a";
@@ -1270,6 +1269,8 @@ $a->strings["Channel address"] = "Dirección del canal";
 $a->strings["Network"] = "Red";
 $a->strings["Connected"] = "Conectado/a";
 $a->strings["Approve connection"] = "Aprobar esta conexión";
+$a->strings["Ignore connection"] = "Ignorar esta conexión";
+$a->strings["Ignore"] = "Ignorar";
 $a->strings["Recent activity"] = "Actividad reciente";
 $a->strings["Search your connections"] = "Buscar sus conexiones";
 $a->strings["Connections search"] = "Buscar conexiones";
@@ -1290,7 +1291,6 @@ $a->strings["View recent posts and comments"] = "Ver publicaciones y comentarios
 $a->strings["Block (or Unblock) all communications with this connection"] = "Bloquear (o desbloquear) todas las comunicaciones con esta conexión";
 $a->strings["This connection is blocked!"] = "¡Esta conexión está bloqueada!";
 $a->strings["Unignore"] = "Dejar de ignorar";
-$a->strings["Ignore"] = "Ignorar";
 $a->strings["Ignore (or Unignore) all inbound communications from this connection"] = "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión";
 $a->strings["This connection is ignored!"] = "¡Esta conexión es ignorada!";
 $a->strings["Unarchive"] = "Desarchivar";
@@ -1438,15 +1438,15 @@ $a->strings["Contact not found."] = "Contacto no encontrado";
 $a->strings["Friend suggestion sent."] = "Enviar sugerencia a un amigo.";
 $a->strings["Suggest Friends"] = "Sugerir amigos";
 $a->strings["Suggest a friend for %s"] = "Sugerir un amigo a %s";
-$a->strings["Collection created."] = "La colección ha sido creada.";
-$a->strings["Could not create collection."] = "No se puede crear la colección.";
-$a->strings["Collection updated."] = "La colección ha sido actualizada.";
-$a->strings["Create a collection of channels."] = "Crear una colección de canales.";
-$a->strings["Collection Name: "] = "Nombre de la colección:";
+$a->strings["Privacy group created."] = "El grupo privado ha sido creado.";
+$a->strings["Could not create privacy group."] = "No se puede crear el grupo privado.";
+$a->strings["Privacy group updated."] = "Grupo privado actualizado.";
+$a->strings["Create a group of channels."] = "Crear un grupo de canales.";
+$a->strings["Privacy group name: "] = "Nombre del grupo:";
 $a->strings["Members are visible to other channels"] = "Los miembros son visibles para otros canales";
-$a->strings["Collection removed."] = "La colección ha sido eliminada.";
-$a->strings["Unable to remove collection."] = "No ha sido posible de eliminar la colección.";
-$a->strings["Collection Editor"] = "Editor de colecciones";
+$a->strings["Privacy group removed."] = "Grupo privado eliminado.";
+$a->strings["Unable to remove privacy group."] = "Imposible eliminar el grupo.";
+$a->strings["Privacy group editor"] = "Editor de grupos privados";
 $a->strings["Members"] = "Miembros";
 $a->strings["All Connected Channels"] = "Todos los canales conectados";
 $a->strings["Click on a channel to add or remove."] = "Haga clic en un canal para agregarlo o quitarlo.";
@@ -1555,6 +1555,9 @@ $a->strings["Sync now"] = "Sincronizar ahora";
 $a->strings["Please wait several minutes between consecutive operations."] = "Por favor, espere algunos minutos entre operaciones consecutivas.";
 $a->strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Cuando sea posible, elimine una ubicación iniciando sesión en el sitio web o \"hub\" y borrando su canal.";
 $a->strings["Use this form to drop the location if the hub is no longer operating."] = "Utilice este formulario para eliminar la dirección si el \"hub\" no está funcionando desde hace tiempo.";
+$a->strings["sent you a private message"] = "le ha enviado un mensaje privado";
+$a->strings["added your channel"] = "añadió este canal a sus conexiones";
+$a->strings["posted an event"] = "publicó un evento";
 $a->strings["Hub not found."] = "Servidor no encontrado";
 $a->strings["Unable to lookup recipient."] = "Imposible asociar a un destinatario.";
 $a->strings["Unable to communicate with requested channel."] = "Imposible comunicar con el canal solicitado.";
@@ -1647,8 +1650,8 @@ $a->strings["No such group"] = "No se encuentra el grupo";
 $a->strings["No such channel"] = "No se encuentra el  canal";
 $a->strings["forum"] = "foro";
 $a->strings["Search Results For:"] = "Buscar resultados para:";
-$a->strings["Collection is empty"] = "La colección está vacía";
-$a->strings["Collection: "] = "Colección:";
+$a->strings["Privacy group is empty"] = "El grupo privado está vacío";
+$a->strings["Privacy group: "] = "Grupo privado:";
 $a->strings["Invalid connection."] = "Conexión no válida.";
 $a->strings["Add a Channel"] = "Añadir un canal";
 $a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "Un canal está formado por su propia colección de páginas web relacionadas. Se puede utilizar para almacenar los perfiles sociales de la red, blogs, grupos de conversación y foros, páginas de famosos y mucho más. Puede crear tantos canales como su proveedor de servicio permita.";
@@ -1713,9 +1716,6 @@ $a->strings["In This Photo:"] = "En esta foto:";
 $a->strings["Map"] = "Mapa";
 $a->strings["View Album"] = "Ver álbum";
 $a->strings["Recent Photos"] = "Fotos recientes";
-$a->strings["sent you a private message"] = "le ha enviado un mensaje privado";
-$a->strings["added your channel"] = "añadió este canal a sus conexiones";
-$a->strings["posted an event"] = "publicó un evento";
 $a->strings["Poke/Prod"] = "Toque/Incitación";
 $a->strings["poke, prod or do other things to somebody"] = "dar un toque, incitar u otras cosas a alguien";
 $a->strings["Recipient"] = "Destinatario";
@@ -1963,7 +1963,7 @@ $a->strings["Allow others to tag your posts"] = "Permitir a otros etiquetar sus
 $a->strings["Often used by the community to retro-actively flag inappropriate content"] = "A menudo usado por la comunidad para marcar contenido inapropiado de forma retroactiva.";
 $a->strings["Advanced Privacy Settings"] = "Configuración de privacidad avanzada";
 $a->strings["Expire other channel content after this many days"] = "Caducar contenido de otros canales después de este número de días";
-$a->strings["0 or blank prevents expiration"] = "0 o en claro evitan la caducidad";
+$a->strings["0 or blank to use the website limit. The website expires after %d days."] = "0 o en blanco para usar el límite del sitio. El sitio web caduca después de %d días.";
 $a->strings["Maximum Friend Requests/Day:"] = "Máximo de solicitudes de amistad por día:";
 $a->strings["May reduce spam activity"] = "Podría reducir la actividad de spam";
 $a->strings["Default Post Permissions"] = "Permisos de publicación predeterminados";
@@ -2040,7 +2040,7 @@ $a->strings["Please use SSL (https) URL if available."] = "Por favor, use SSL (h
 $a->strings["Please select a default timezone for your website"] = "Por favor, selecciones la zona horaria por defecto de su sitio web";
 $a->strings["Site settings"] = "Ajustes del sitio";
 $a->strings["Could not find a command line version of PHP in the web server PATH."] = "No se puede encontrar una versión en línea de comandos de PHP en la ruta del servidor web.";
-$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Si no tiene instalada la versión de línea de comandos de PHP en su servidor, no podrá ejecutar sondeos en segundo plano mediante cron.";
+$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Si no tiene instalada la versión de línea de comandos de PHP en su servidor, no podrá realizar envíos en segundo plano mediante cron.";
 $a->strings["PHP executable path"] = "Ruta del ejecutable PHP";
 $a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Introducir la ruta completa del ejecutable PHP. Puede dejar la línea en blanco para continuar la instalación.";
 $a->strings["Command line PHP"] = "PHP en línea de comandos";
@@ -2143,10 +2143,10 @@ $a->strings["Edit Source"] = "Editar fuente";
 $a->strings["Delete Source"] = "Eliminar fuente";
 $a->strings["Source removed"] = "Fuente eliminada";
 $a->strings["Unable to remove source."] = "Imposible eliminar la fuente.";
-$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s está siguiendo %2\$s de %3\$s";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s está siguiendo %3\$s de %2\$s";
 $a->strings["%1\$s stopped following %2\$s's %3\$s"] = "%1\$s ha dejado de seguir %3\$s de %2\$s";
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "No hay sugerencias disponibles. Si es un sitio nuevo, espere 24 horas y pruebe de nuevo.";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha etiquetado la %3\$s de %2\$s con %4\$s";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha etiquetado %3\$s de %2\$s con %4\$s";
 $a->strings["Tag removed"] = "Etiqueta eliminada.";
 $a->strings["Remove Item Tag"] = "Eliminar etiqueta del elemento.";
 $a->strings["Select a tag to remove: "] = "Seleccionar una etiqueta para eliminar:";
diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po
index 511368a1f..b53da9868 100644
--- a/view/nl/hmessages.po
+++ b/view/nl/hmessages.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-22 00:03-0800\n"
-"PO-Revision-Date: 2016-01-22 14:31+0000\n"
+"POT-Creation-Date: 2016-01-29 00:03-0800\n"
+"PO-Revision-Date: 2016-01-30 22:19+0000\n"
 "Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n"
 "Language-Team: Dutch (http://www.transifex.com/Friendica/red-matrix/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -31,8 +31,8 @@ msgid "Welcome %s. Remote authentication successful."
 msgstr "Welkom %s. Authenticatie op afstand geslaagd."
 
 #: ../../include/Contact.php:101 ../../include/conversation.php:961
-#: ../../include/identity.php:949 ../../include/widgets.php:137
-#: ../../include/widgets.php:175 ../../mod/directory.php:318
+#: ../../include/identity.php:953 ../../include/widgets.php:137
+#: ../../include/widgets.php:175 ../../mod/directory.php:321
 #: ../../mod/match.php:64 ../../mod/suggest.php:52
 msgid "Connect"
 msgstr "Verbinden"
@@ -69,11 +69,11 @@ msgstr "Niet voor iedereen zichtbaar"
 #: ../../include/ItemObject.php:100 ../../include/RedDAV/RedBrowser.php:240
 #: ../../include/apps.php:259 ../../include/menu.php:108
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
-#: ../../mod/blocks.php:153 ../../mod/connections.php:284
-#: ../../mod/connections.php:304 ../../mod/editblock.php:135
+#: ../../mod/blocks.php:153 ../../mod/connections.php:286
+#: ../../mod/connections.php:306 ../../mod/editblock.php:135
 #: ../../mod/editlayout.php:134 ../../mod/editpost.php:112
 #: ../../mod/editwebpage.php:176 ../../mod/layouts.php:183
-#: ../../mod/menu.php:108 ../../mod/settings.php:648 ../../mod/thing.php:257
+#: ../../mod/menu.php:108 ../../mod/settings.php:648 ../../mod/thing.php:256
 #: ../../mod/webpages.php:181
 msgid "Edit"
 msgstr "Bewerken"
@@ -85,7 +85,7 @@ msgstr "Bewerken"
 #: ../../mod/editblock.php:181 ../../mod/editlayout.php:179
 #: ../../mod/editwebpage.php:223 ../../mod/group.php:173
 #: ../../mod/photos.php:1126 ../../mod/settings.php:649
-#: ../../mod/thing.php:258 ../../mod/webpages.php:183
+#: ../../mod/thing.php:257 ../../mod/webpages.php:183
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -128,8 +128,8 @@ msgid "View all"
 msgstr "Toon alles"
 
 #: ../../include/ItemObject.php:179 ../../include/conversation.php:1731
-#: ../../include/taxonomy.php:414 ../../include/identity.php:1262
-#: ../../mod/photos.php:1083
+#: ../../include/taxonomy.php:414 ../../include/identity.php:1266
+#: ../../mod/photos.php:1083 ../../mod/zcard.php:56
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
@@ -308,9 +308,9 @@ msgstr "Reactie"
 #: ../../mod/profiles.php:675 ../../mod/rate.php:168
 #: ../../mod/settings.php:586 ../../mod/settings.php:698
 #: ../../mod/settings.php:726 ../../mod/settings.php:749
-#: ../../mod/settings.php:834 ../../mod/settings.php:1023
+#: ../../mod/settings.php:834 ../../mod/settings.php:1024
 #: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/thing.php:313 ../../mod/thing.php:359
+#: ../../mod/sources.php:138 ../../mod/thing.php:312 ../../mod/thing.php:358
 #: ../../mod/xchan.php:11 ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr "Opslaan"
@@ -401,7 +401,7 @@ msgstr "Planning-postvak UIT"
 
 #: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:360
 #: ../../include/apps.php:415 ../../include/conversation.php:1037
-#: ../../include/widgets.php:1368 ../../mod/photos.php:754
+#: ../../include/widgets.php:1386 ../../mod/photos.php:754
 #: ../../mod/photos.php:1195
 msgid "Unknown"
 msgstr "Onbekend"
@@ -423,13 +423,13 @@ msgstr "Gedeeld"
 #: ../../include/RedDAV/RedBrowser.php:230
 #: ../../include/RedDAV/RedBrowser.php:303 ../../mod/blocks.php:152
 #: ../../mod/layouts.php:175 ../../mod/menu.php:114
-#: ../../mod/new_channel.php:133 ../../mod/register.php:255
+#: ../../mod/new_channel.php:144 ../../mod/register.php:255
 #: ../../mod/webpages.php:180
 msgid "Create"
 msgstr "Aanmaken"
 
 #: ../../include/RedDAV/RedBrowser.php:231
-#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1381
+#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1399
 #: ../../mod/photos.php:781 ../../mod/photos.php:1316
 #: ../../mod/profile_photo.php:453 ../../mod/cover_photo.php:353
 msgid "Upload"
@@ -571,7 +571,7 @@ msgstr "Andere netwerken en diensten"
 
 #: ../../include/acl_selectors.php:251 ../../mod/chat.php:211
 #: ../../mod/filestorage.php:147 ../../mod/photos.php:631
-#: ../../mod/photos.php:998 ../../mod/thing.php:310 ../../mod/thing.php:356
+#: ../../mod/photos.php:998 ../../mod/thing.php:309 ../../mod/thing.php:355
 msgid "Permissions"
 msgstr "Permissies"
 
@@ -615,12 +615,12 @@ msgstr "Bladwijzers"
 msgid "Address Book"
 msgstr "Connecties"
 
-#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1508
+#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1518
 msgid "Login"
 msgstr "Inloggen"
 
 #: ../../include/apps.php:132 ../../include/nav.php:200
-#: ../../mod/manage.php:160
+#: ../../mod/manage.php:162
 msgid "Channel Manager"
 msgstr "Kanaalbeheer"
 
@@ -643,8 +643,8 @@ msgstr "Webpagina's"
 msgid "Channel Home"
 msgstr "Jouw kanaal"
 
-#: ../../include/apps.php:138 ../../include/identity.php:1236
-#: ../../include/identity.php:1353 ../../mod/profperm.php:112
+#: ../../include/apps.php:138 ../../include/identity.php:1240
+#: ../../include/identity.php:1357 ../../mod/profperm.php:112
 msgid "Profile"
 msgstr "Profiel"
 
@@ -684,7 +684,7 @@ msgstr "Chatten"
 
 #: ../../include/apps.php:147 ../../include/nav.php:159
 #: ../../include/text.php:885 ../../include/text.php:897
-#: ../../mod/connections.php:300 ../../mod/search.php:40
+#: ../../mod/connections.php:302 ../../mod/search.php:40
 msgid "Search"
 msgstr "Zoeken"
 
@@ -704,7 +704,7 @@ msgstr "Willekeurig kanaal"
 msgid "Invite"
 msgstr "Uitnodigen "
 
-#: ../../include/apps.php:152 ../../include/widgets.php:1254
+#: ../../include/apps.php:152 ../../include/widgets.php:1272
 msgid "Features"
 msgstr "Extra functies"
 
@@ -741,12 +741,12 @@ msgstr "Aanschaffen"
 #: ../../include/attach.php:436 ../../include/attach.php:888
 #: ../../include/attach.php:959 ../../include/attach.php:1111
 #: ../../include/chat.php:133 ../../include/photos.php:29
-#: ../../include/items.php:4407 ../../index.php:186 ../../index.php:371
+#: ../../include/items.php:4429 ../../index.php:186 ../../index.php:371
 #: ../../mod/achievements.php:30 ../../mod/api.php:26 ../../mod/api.php:31
 #: ../../mod/appman.php:66 ../../mod/authtest.php:13 ../../mod/block.php:22
 #: ../../mod/block.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76
 #: ../../mod/bookmarks.php:48 ../../mod/channel.php:100
-#: ../../mod/channel.php:214 ../../mod/channel.php:254 ../../mod/chat.php:94
+#: ../../mod/channel.php:215 ../../mod/channel.php:255 ../../mod/chat.php:94
 #: ../../mod/chat.php:99 ../../mod/common.php:35 ../../mod/connections.php:29
 #: ../../mod/connedit.php:355 ../../mod/editblock.php:65
 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
@@ -762,7 +762,7 @@ msgstr "Aanschaffen"
 #: ../../mod/locs.php:83 ../../mod/mail.php:126 ../../mod/manage.php:6
 #: ../../mod/menu.php:74 ../../mod/message.php:16 ../../mod/mitem.php:111
 #: ../../mod/mood.php:112 ../../mod/network.php:12
-#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99
+#: ../../mod/new_channel.php:75 ../../mod/new_channel.php:109
 #: ../../mod/notifications.php:66 ../../mod/page.php:31 ../../mod/page.php:86
 #: ../../mod/pdledit.php:22 ../../mod/photos.php:70 ../../mod/poke.php:133
 #: ../../mod/profile.php:64 ../../mod/profile.php:72
@@ -771,8 +771,8 @@ msgstr "Aanschaffen"
 #: ../../mod/rate.php:111 ../../mod/register.php:73 ../../mod/regmod.php:17
 #: ../../mod/service_limits.php:7 ../../mod/settings.php:568
 #: ../../mod/setup.php:227 ../../mod/sharedwithme.php:7
-#: ../../mod/sources.php:66 ../../mod/suggest.php:26 ../../mod/thing.php:271
-#: ../../mod/thing.php:291 ../../mod/thing.php:328
+#: ../../mod/sources.php:66 ../../mod/suggest.php:26 ../../mod/thing.php:270
+#: ../../mod/thing.php:290 ../../mod/thing.php:327
 #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
 #: ../../mod/viewsrc.php:14 ../../mod/webpages.php:69
 #: ../../mod/cover_photo.php:273 ../../mod/cover_photo.php:286
@@ -877,8 +877,8 @@ msgid "Finishes:"
 msgstr "Einde:"
 
 #: ../../include/bb2diaspora.php:487 ../../include/event.php:52
-#: ../../include/identity.php:1000 ../../include/text.php:1425
-#: ../../mod/directory.php:304
+#: ../../include/identity.php:1004 ../../include/text.php:1425
+#: ../../mod/directory.php:307
 msgid "Location:"
 msgstr "Plaats:"
 
@@ -1001,12 +1001,12 @@ msgstr "Verbinden/volgen"
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Voorbeeld: Robert Morgenstein, vissen"
 
-#: ../../include/contact_widgets.php:26 ../../mod/connections.php:303
-#: ../../mod/directory.php:381 ../../mod/directory.php:386
+#: ../../include/contact_widgets.php:26 ../../mod/connections.php:305
+#: ../../mod/directory.php:384 ../../mod/directory.php:389
 msgid "Find"
 msgstr "Vinden"
 
-#: ../../include/contact_widgets.php:27 ../../mod/directory.php:385
+#: ../../include/contact_widgets.php:27 ../../mod/directory.php:388
 #: ../../mod/suggest.php:60
 msgid "Channel Suggestions"
 msgstr "Voorgestelde kanalen"
@@ -1023,8 +1023,8 @@ msgstr "Vrienden uitnodigen"
 msgid "Advanced example: name=fred and country=iceland"
 msgstr "Geavanceerd voorbeeld (Engels): name=jan en country=nederland"
 
-#: ../../include/contact_widgets.php:57 ../../include/features.php:93
-#: ../../include/widgets.php:304
+#: ../../include/contact_widgets.php:57 ../../include/widgets.php:304
+#: ../../include/features.php:93
 msgid "Saved Folders"
 msgstr "Bewaarde mappen"
 
@@ -1204,7 +1204,7 @@ msgstr "Bericht"
 
 #: ../../include/conversation.php:964 ../../mod/ratings.php:99
 msgid "Ratings"
-msgstr "Waarderingen"
+msgstr "Beoordelingen"
 
 #: ../../include/conversation.php:1080
 #, php-format
@@ -1571,7 +1571,7 @@ msgstr "JJJJ-MM-DD of MM-DD"
 msgid "Required"
 msgstr "Vereist"
 
-#: ../../include/datetime.php:263 ../../boot.php:2330
+#: ../../include/datetime.php:263 ../../boot.php:2348
 msgid "never"
 msgstr "nooit"
 
@@ -1673,7 +1673,7 @@ msgstr "Veilig zoeken"
 #: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
 #: ../../mod/photos.php:626 ../../mod/removeme.php:60
 #: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1512
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1522
 msgid "No"
 msgstr "Nee"
 
@@ -1685,7 +1685,7 @@ msgstr "Nee"
 #: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
 #: ../../mod/photos.php:626 ../../mod/removeme.php:60
 #: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1512
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1522
 msgid "Yes"
 msgstr "Ja"
 
@@ -1697,202 +1697,6 @@ msgstr "Alleen openbare forums"
 msgid "This Website Only"
 msgstr "Alleen deze hub"
 
-#: ../../include/enotify.php:57 ../../include/network.php:1612
-msgid "$Projectname Notification"
-msgstr "$Projectname-notificatie"
-
-#: ../../include/enotify.php:58 ../../include/network.php:1613
-msgid "$projectname"
-msgstr "$projectname"
-
-#: ../../include/enotify.php:60 ../../include/network.php:1615
-msgid "Thank You,"
-msgstr "Bedankt,"
-
-#: ../../include/enotify.php:62 ../../include/network.php:1617
-#, php-format
-msgid "%s Administrator"
-msgstr "Beheerder %s"
-
-#: ../../include/enotify.php:96
-#, php-format
-msgid "%s <!item_type!>"
-msgstr "%s <!item_type!>"
-
-#: ../../include/enotify.php:100
-#, php-format
-msgid "[Hubzilla:Notify] New mail received at %s"
-msgstr "[Hubzilla:Notificatie] Nieuw privébericht ontvangen op %s"
-
-#: ../../include/enotify.php:102
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
-msgstr "%1$s, %2$s zond jou een nieuw privébericht om %3$s."
-
-#: ../../include/enotify.php:103
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s zond jou %2$s."
-
-#: ../../include/enotify.php:103
-msgid "a private message"
-msgstr "een privébericht"
-
-#: ../../include/enotify.php:104
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "Bezoek %s om je privéberichten te bekijken en/of er op te reageren."
-
-#: ../../include/enotify.php:160
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
-msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]een %4$s[/zrl]"
-
-#: ../../include/enotify.php:168
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
-msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]een %5$s van %4$s[/zrl]"
-
-#: ../../include/enotify.php:177
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
-msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]jouw %4$s[/zrl]"
-
-#: ../../include/enotify.php:188
-#, php-format
-msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Hubzilla:Notificatie] Reactie op conversatie #%1$d door %2$s"
-
-#: ../../include/enotify.php:189
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
-msgstr "%1$s, %2$s gaf een reactie op een bericht/conversatie die jij volgt."
-
-#: ../../include/enotify.php:192 ../../include/enotify.php:207
-#: ../../include/enotify.php:233 ../../include/enotify.php:251
-#: ../../include/enotify.php:265
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Bezoek %s om de conversatie te bekijken en/of er op te reageren."
-
-#: ../../include/enotify.php:198
-#, php-format
-msgid "[Hubzilla:Notify] %s posted to your profile wall"
-msgstr "[Hubzilla:Notificatie] %s heeft een bericht op jouw kanaal geplaatst"
-
-#: ../../include/enotify.php:200
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
-msgstr "%1$s, %2$s heeft om %3$s een bericht op jouw kanaal geplaatst"
-
-#: ../../include/enotify.php:202
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
-msgstr "%1$s, %2$s heeft een bericht op [zrl=%3$s]jouw kanaal[/zrl] geplaatst"
-
-#: ../../include/enotify.php:226
-#, php-format
-msgid "[Hubzilla:Notify] %s tagged you"
-msgstr "[Hubzilla:Notificatie] %s heeft je genoemd"
-
-#: ../../include/enotify.php:227
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
-msgstr "%1$s, %2$s noemde jou op %3$s"
-
-#: ../../include/enotify.php:228
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%3$s]noemde jou[/zrl]."
-
-#: ../../include/enotify.php:240
-#, php-format
-msgid "[Hubzilla:Notify] %1$s poked you"
-msgstr "[Hubzilla:Notificatie] %1$s heeft je aangestoten"
-
-#: ../../include/enotify.php:241
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
-msgstr "%1$s, %2$s heeft je aangestoten op %3$s"
-
-#: ../../include/enotify.php:242
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%2$s]heeft je aangestoten[/zrl]."
-
-#: ../../include/enotify.php:258
-#, php-format
-msgid "[Hubzilla:Notify] %s tagged your post"
-msgstr "[Hubzilla:Notificatie] %s heeft jouw bericht getagd"
-
-#: ../../include/enotify.php:259
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
-msgstr "%1$s, %2$s heeft jouw bericht om %3$s getagd"
-
-#: ../../include/enotify.php:260
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr "%1$s, %2$s heeft [zrl=%3$s]jouw bericht[/zrl] getagd"
-
-#: ../../include/enotify.php:272
-msgid "[Hubzilla:Notify] Introduction received"
-msgstr "[Hubzilla:Notificatie] Connectieverzoek ontvangen"
-
-#: ../../include/enotify.php:273
-#, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
-msgstr "%1$s, je hebt een nieuw connectieverzoek ontvangen van '%2$s' op %3$s"
-
-#: ../../include/enotify.php:274
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
-msgstr "%1$s, je hebt een [zrl=%2$s]nieuw connectieverzoek[/zrl] ontvangen van %3$s."
-
-#: ../../include/enotify.php:278 ../../include/enotify.php:297
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "Je kan het profiel bekijken op %s"
-
-#: ../../include/enotify.php:280
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
-msgstr "Bezoek %s om het connectieverzoek te accepteren of af te wijzen."
-
-#: ../../include/enotify.php:287
-msgid "[Hubzilla:Notify] Friend suggestion received"
-msgstr "[Hubzilla:Notificatie] Kanaalvoorstel ontvangen"
-
-#: ../../include/enotify.php:288
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
-msgstr "%1$s, je hebt een kanaalvoorstel ontvangen van '%2$s' om %3$s"
-
-#: ../../include/enotify.php:289
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
-"%4$s."
-msgstr "%1$s, je hebt [zrl=%2$s]een kanaalvoorstel[/zrl] ontvangen voor %3$s van %4$s."
-
-#: ../../include/enotify.php:295
-msgid "Name:"
-msgstr "Naam:"
-
-#: ../../include/enotify.php:296
-msgid "Photo:"
-msgstr "Foto:"
-
-#: ../../include/enotify.php:299
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr "Bezoek %s om het voorstel te accepteren of af te wijzen."
-
-#: ../../include/enotify.php:514
-msgid "[Hubzilla:Notify]"
-msgstr "[Hubzilla:Notificatie]"
-
 #: ../../include/event.php:768
 msgid "This event has been added to your calendar."
 msgstr "Dit evenement is aan jouw agenda toegevoegd."
@@ -1957,8 +1761,8 @@ msgid ""
 msgstr "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande itemrechten  <strong>kunnen</strong> van toepassing zijn op deze collectie en toekomstige leden. Wanneer je dit niet zo bedoeld hebt, moet je een nieuwe collectie met een andere naam aanmaken."
 
 #: ../../include/group.php:232
-msgid "Add new connections to this collection (privacy group)"
-msgstr "Voeg nieuwe connecties aan deze collectie toe (privacygroep)"
+msgid "Add new connections to this privacy group"
+msgstr "Voeg nieuwe connecties aan deze privacygroep toe"
 
 #: ../../include/group.php:251 ../../mod/admin.php:900
 msgid "All Channels"
@@ -1968,21 +1772,21 @@ msgstr "Alle kanalen"
 msgid "edit"
 msgstr "bewerken"
 
-#: ../../include/group.php:295
-msgid "Collections"
-msgstr "Collecties"
+#: ../../include/group.php:295 ../../include/features.php:79
+msgid "Privacy Groups"
+msgstr "Privacygroepen"
 
 #: ../../include/group.php:296
-msgid "Edit collection"
-msgstr "Collectie bewerken"
+msgid "Edit group"
+msgstr "Privacygroep bewerken"
 
 #: ../../include/group.php:297
-msgid "Add new collection"
-msgstr "Nieuwe collectie toevoegen"
+msgid "Add privacy group"
+msgstr "Privacygroep toevoegen"
 
 #: ../../include/group.php:298
-msgid "Channels not in any collection"
-msgstr "Kanalen die zich in geen enkele collectie bevinden"
+msgid "Channels not in any privacy group"
+msgstr "Kanalen die zich in geen enkele privacygroep bevinden"
 
 #: ../../include/group.php:300 ../../include/widgets.php:275
 msgid "add"
@@ -2343,7 +2147,7 @@ msgstr "Afzender kan niet bepaald worden."
 msgid "Stored post could not be verified."
 msgstr "Opgeslagen bericht kon niet worden geverifieerd."
 
-#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1507
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1517
 msgid "Logout"
 msgstr "Uitloggen"
 
@@ -2371,7 +2175,7 @@ msgstr "Bewerk profielen"
 msgid "Manage/Edit profiles"
 msgstr "Beheer/wijzig profielen"
 
-#: ../../include/nav.php:90 ../../include/identity.php:972
+#: ../../include/nav.php:90 ../../include/identity.php:976
 msgid "Edit Profile"
 msgstr "Profiel bewerken"
 
@@ -2420,7 +2224,7 @@ msgstr "Authenticeer jezelf via (bijvoorbeeld) jouw hub"
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../../include/nav.php:149 ../../mod/register.php:264 ../../boot.php:1490
+#: ../../include/nav.php:149 ../../mod/register.php:264 ../../boot.php:1500
 msgid "Register"
 msgstr "Registreren"
 
@@ -2466,7 +2270,7 @@ msgid "Mark all channel notifications seen"
 msgstr "Alle kanaalnotificaties als gelezen markeren"
 
 #: ../../include/nav.php:181 ../../include/text.php:815
-#: ../../mod/connections.php:296
+#: ../../mod/connections.php:298
 msgid "Connections"
 msgstr "Connecties"
 
@@ -2530,7 +2334,7 @@ msgstr "Beheer je kanalen"
 msgid "Account/Channel Settings"
 msgstr "Account-/kanaal-instellingen"
 
-#: ../../include/nav.php:210 ../../include/widgets.php:1281
+#: ../../include/nav.php:210 ../../include/widgets.php:1299
 msgid "Admin"
 msgstr "Beheer"
 
@@ -2550,6 +2354,23 @@ msgstr "Wachten aub..."
 msgid "view full size"
 msgstr "volledige grootte tonen"
 
+#: ../../include/network.php:1612 ../../include/enotify.php:57
+msgid "$Projectname Notification"
+msgstr "$Projectname-notificatie"
+
+#: ../../include/network.php:1613 ../../include/enotify.php:58
+msgid "$projectname"
+msgstr "$projectname"
+
+#: ../../include/network.php:1615 ../../include/enotify.php:60
+msgid "Thank You,"
+msgstr "Bedankt,"
+
+#: ../../include/network.php:1617 ../../include/enotify.php:62
+#, php-format
+msgid "%s Administrator"
+msgstr "Beheerder %s"
+
 #: ../../include/network.php:1674
 msgid "No Subject"
 msgstr "Geen onderwerp"
@@ -3066,7 +2887,7 @@ msgstr "Kanaalkenmerk kon niet worden geverifieerd.  "
 msgid "Unable to verify site signature for %s"
 msgstr "Hubkenmerk voor %s kon niet worden geverifieerd"
 
-#: ../../include/zot.php:3584
+#: ../../include/zot.php:3585
 msgid "invalid target signature"
 msgstr "ongeldig doelkenmerk"
 
@@ -3108,7 +2929,7 @@ msgstr "RSS/Atom"
 
 #: ../../include/contact_selectors.php:79 ../../mod/admin.php:891
 #: ../../mod/admin.php:900 ../../mod/id.php:15 ../../mod/id.php:16
-#: ../../boot.php:1510
+#: ../../boot.php:1520
 msgid "Email"
 msgstr "E-mail"
 
@@ -3136,316 +2957,38 @@ msgstr "XMPP/IM"
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../../include/features.php:45
-msgid "General Features"
-msgstr "Algemene functies"
+#: ../../include/identity.php:32
+msgid "Unable to obtain identity information from database"
+msgstr "Niet in staat om identiteitsinformatie uit de database te verkrijgen"
 
-#: ../../include/features.php:47
-msgid "Content Expiration"
-msgstr "Inhoud laten verlopen"
+#: ../../include/identity.php:66
+msgid "Empty name"
+msgstr "Ontbrekende naam"
 
-#: ../../include/features.php:47
-msgid "Remove posts/comments and/or private messages at a future time"
-msgstr "Berichten, reacties en/of privéberichten na een bepaalde tijd verwijderen"
+#: ../../include/identity.php:69
+msgid "Name too long"
+msgstr "Naam te lang"
 
-#: ../../include/features.php:48
-msgid "Multiple Profiles"
-msgstr "Meerdere profielen"
+#: ../../include/identity.php:181
+msgid "No account identifier"
+msgstr "Geen account-identificator"
 
-#: ../../include/features.php:48
-msgid "Ability to create multiple profiles"
-msgstr "Mogelijkheid om meerdere profielen aan te maken"
+#: ../../include/identity.php:193
+msgid "Nickname is required."
+msgstr "Bijnaam is verplicht"
 
-#: ../../include/features.php:49
-msgid "Advanced Profiles"
-msgstr "Geavanceerde profielen"
+#: ../../include/identity.php:207
+msgid "Reserved nickname. Please choose another."
+msgstr "Deze naam is gereserveerd. Kies een andere."
 
-#: ../../include/features.php:49
-msgid "Additional profile sections and selections"
-msgstr "Extra onderdelen en keuzes voor je profiel"
+#: ../../include/identity.php:212
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik."
 
-#: ../../include/features.php:50
-msgid "Profile Import/Export"
-msgstr "Profiel importen/exporteren"
-
-#: ../../include/features.php:50
-msgid "Save and load profile details across sites/channels"
-msgstr "Profielgegevens opslaan en in andere hubs/kanalen gebruiken."
-
-#: ../../include/features.php:51
-msgid "Web Pages"
-msgstr "Webpagina's"
-
-#: ../../include/features.php:51
-msgid "Provide managed web pages on your channel"
-msgstr "Sta beheerde webpagina's op jouw kanaal toe"
-
-#: ../../include/features.php:52
-msgid "Hide Rating"
-msgstr "Beoordelingen verbergen"
-
-#: ../../include/features.php:52
-msgid ""
-"Hide the rating buttons on your channel and profile pages. Note: People can "
-"still rate you somewhere else."
-msgstr "Verbergt de beoordelingsknoppen op jouw kanaal- en profielpagina's. Let op: Mensen kunnen jou nog steeds ergens anders beoordelen. "
-
-#: ../../include/features.php:53
-msgid "Private Notes"
-msgstr "Privé-aantekeningen"
-
-#: ../../include/features.php:53
-msgid "Enables a tool to store notes and reminders"
-msgstr "Schakelt een eenvoudige toepassing in om aantekeningen en herinneringen in op te slaan"
-
-#: ../../include/features.php:54
-msgid "Navigation Channel Select"
-msgstr "Kanaal kiezen in navigatiemenu"
-
-#: ../../include/features.php:54
-msgid "Change channels directly from within the navigation dropdown menu"
-msgstr "Kies een ander kanaal direct vanuit het dropdown-menu op de navigatiebalk"
-
-#: ../../include/features.php:55
-msgid "Photo Location"
-msgstr "Fotolocatie"
-
-#: ../../include/features.php:55
-msgid "If location data is available on uploaded photos, link this to a map."
-msgstr "Wanneer in de geüploade foto's locatiegegevens aanwezig zijn, link dit dan aan een kaart."
-
-#: ../../include/features.php:57
-msgid "Expert Mode"
-msgstr "Expertmodus"
-
-#: ../../include/features.php:57
-msgid "Enable Expert Mode to provide advanced configuration options"
-msgstr "Schakel de expertmodus in voor geavanceerde instellingen"
-
-#: ../../include/features.php:58
-msgid "Premium Channel"
-msgstr "Premiumkanaal"
-
-#: ../../include/features.php:58
-msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
-msgstr "Stelt je in staat om beperkingen en voorwaarden in te stellen voor jouw kanaal"
-
-#: ../../include/features.php:63
-msgid "Post Composition Features"
-msgstr "Functies voor het opstellen van berichten"
-
-#: ../../include/features.php:65
-msgid "Use Markdown"
-msgstr "Markdown gebruiken"
-
-#: ../../include/features.php:65
-msgid "Allow use of \"Markdown\" to format posts"
-msgstr "Sta het gebruik van \"markdown\" toe om berichten mee op te maken."
-
-#: ../../include/features.php:66
-msgid "Large Photos"
-msgstr "Grote foto's"
-
-#: ../../include/features.php:66
-msgid ""
-"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
-"(640px) photo thumbnails"
-msgstr "Gebruik grotere foto's (1024px) in berichten. Wanneer dit is uitgeschakeld worden er kleinere foto's (640px) gebruikt."
-
-#: ../../include/features.php:67 ../../include/widgets.php:549
-#: ../../mod/sources.php:88
-msgid "Channel Sources"
-msgstr "Kanaalbronnen"
-
-#: ../../include/features.php:67
-msgid "Automatically import channel content from other channels or feeds"
-msgstr "Automatisch inhoud uit andere kanalen of feeds importeren."
-
-#: ../../include/features.php:68
-msgid "Even More Encryption"
-msgstr "Extra encryptie"
-
-#: ../../include/features.php:68
-msgid ""
-"Allow optional encryption of content end-to-end with a shared secret key"
-msgstr "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde geheime sleutel."
-
-#: ../../include/features.php:69
-msgid "Enable Voting Tools"
-msgstr "Peilingen inschakelen"
-
-#: ../../include/features.php:69
-msgid "Provide a class of post which others can vote on"
-msgstr "Maakt het mogelijk om een bericht op te stellen, waar mensen op kunnen stemmen."
-
-#: ../../include/features.php:70
-msgid "Delayed Posting"
-msgstr "Berichten uitstellen"
-
-#: ../../include/features.php:70
-msgid "Allow posts to be published at a later date"
-msgstr "Maakt het mogelijk dat berichten op een toekomstig moment gepubliceerd kunnen worden."
-
-#: ../../include/features.php:71
-msgid "Suppress Duplicate Posts/Comments"
-msgstr "Dubbele berichten/reacties tegenhouden"
-
-#: ../../include/features.php:71
-msgid ""
-"Prevent posts with identical content to be published with less than two "
-"minutes in between submissions."
-msgstr "Voorkomt dat berichten en reacties met identieke inhoud en die binnen twee minuten zijn verstuurd, worden gepubliceerd. "
-
-#: ../../include/features.php:77
-msgid "Network and Stream Filtering"
-msgstr "Netwerk- en streamfilter"
-
-#: ../../include/features.php:78
-msgid "Search by Date"
-msgstr "Zoek op datum"
-
-#: ../../include/features.php:78
-msgid "Ability to select posts by date ranges"
-msgstr "Mogelijkheid om berichten op datum te filteren "
-
-#: ../../include/features.php:79
-msgid "Collections (Privacy Groups)"
-msgstr "Collecties (privacygroepen)"
-
-#: ../../include/features.php:79
-msgid "Enable widget to display Network posts only from selected collections"
-msgstr "Sta de widget toe om netwerkberichten te tonen van bepaalde collecties"
-
-#: ../../include/features.php:80 ../../include/widgets.php:274
-msgid "Saved Searches"
-msgstr "Opgeslagen zoekopdrachten"
-
-#: ../../include/features.php:80
-msgid "Save search terms for re-use"
-msgstr "Sla zoekopdrachten op voor hergebruik"
-
-#: ../../include/features.php:81
-msgid "Network Personal Tab"
-msgstr "Persoonlijke netwerktab"
-
-#: ../../include/features.php:81
-msgid "Enable tab to display only Network posts that you've interacted on"
-msgstr "Sta het toe dat de tab netwerkberichten toont waarmee je interactie had"
-
-#: ../../include/features.php:82
-msgid "Network New Tab"
-msgstr "Nieuwe netwerktab"
-
-#: ../../include/features.php:82
-msgid "Enable tab to display all new Network activity"
-msgstr "Laat de tab alle nieuwe netwerkactiviteit tonen"
-
-#: ../../include/features.php:83
-msgid "Affinity Tool"
-msgstr "Verwantschapsfilter"
-
-#: ../../include/features.php:83
-msgid "Filter stream activity by depth of relationships"
-msgstr "Filter wat je in jouw grid ziet op hoe goed je iemand kent of mag"
-
-#: ../../include/features.php:84
-msgid "Connection Filtering"
-msgstr "Berichtenfilters"
-
-#: ../../include/features.php:84
-msgid "Filter incoming posts from connections based on keywords/content"
-msgstr "Filter binnenkomende berichten van connecties aan de hand van trefwoorden en taal"
-
-#: ../../include/features.php:85
-msgid "Suggest Channels"
-msgstr "Kanalen voorstellen"
-
-#: ../../include/features.php:85
-msgid "Show channel suggestions"
-msgstr "Voor jou mogelijk interessante kanalen voorstellen"
-
-#: ../../include/features.php:90
-msgid "Post/Comment Tools"
-msgstr "Bericht- en reactiehulpmiddelen"
-
-#: ../../include/features.php:91
-msgid "Community Tagging"
-msgstr "Taggen door anderen"
-
-#: ../../include/features.php:91
-msgid "Ability to tag existing posts"
-msgstr "Geeft andere mensen de mogelijkheid om jouw (bestaande) berichten te taggen"
-
-#: ../../include/features.php:92
-msgid "Post Categories"
-msgstr "Categorieën berichten"
-
-#: ../../include/features.php:92
-msgid "Add categories to your posts"
-msgstr "Voeg categorieën toe aan je berichten"
-
-#: ../../include/features.php:93
-msgid "Ability to file posts under folders"
-msgstr "Mogelijkheid om berichten in mappen op te slaan"
-
-#: ../../include/features.php:94
-msgid "Dislike Posts"
-msgstr "Vind berichten niet leuk"
-
-#: ../../include/features.php:94
-msgid "Ability to dislike posts/comments"
-msgstr "Mogelijkheid om berichten en reacties niet leuk te vinden"
-
-#: ../../include/features.php:95
-msgid "Star Posts"
-msgstr "Geef berichten een ster"
-
-#: ../../include/features.php:95
-msgid "Ability to mark special posts with a star indicator"
-msgstr "Mogelijkheid om speciale berichten met een ster te markeren"
-
-#: ../../include/features.php:96
-msgid "Tag Cloud"
-msgstr "Tagwolk"
-
-#: ../../include/features.php:96
-msgid "Provide a personal tag cloud on your channel page"
-msgstr "Zorgt voor een persoonlijke wolk met tags op jouw kanaalpagina"
-
-#: ../../include/identity.php:32
-msgid "Unable to obtain identity information from database"
-msgstr "Niet in staat om identiteitsinformatie uit de database te verkrijgen"
-
-#: ../../include/identity.php:66
-msgid "Empty name"
-msgstr "Ontbrekende naam"
-
-#: ../../include/identity.php:69
-msgid "Name too long"
-msgstr "Naam te lang"
-
-#: ../../include/identity.php:181
-msgid "No account identifier"
-msgstr "Geen account-identificator"
-
-#: ../../include/identity.php:193
-msgid "Nickname is required."
-msgstr "Bijnaam is verplicht"
-
-#: ../../include/identity.php:207
-msgid "Reserved nickname. Please choose another."
-msgstr "Deze naam is gereserveerd. Kies een andere."
-
-#: ../../include/identity.php:212
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik."
-
-#: ../../include/identity.php:288
-msgid "Unable to retrieve created identity"
-msgstr "Niet in staat om aangemaakte identiteit te vinden"
+#: ../../include/identity.php:288
+msgid "Unable to retrieve created identity"
+msgstr "Niet in staat om aangemaakte identiteit te vinden"
 
 #: ../../include/identity.php:346
 msgid "Default Profile"
@@ -3463,192 +3006,192 @@ msgstr "Opgevraagd kanaal is niet beschikbaar."
 msgid "Requested profile is not available."
 msgstr "Opgevraagd profiel is niet beschikbaar"
 
-#: ../../include/identity.php:962 ../../mod/profiles.php:782
+#: ../../include/identity.php:966 ../../mod/profiles.php:782
 msgid "Change profile photo"
 msgstr "Profielfoto veranderen"
 
-#: ../../include/identity.php:968
+#: ../../include/identity.php:972
 msgid "Profiles"
 msgstr "Profielen"
 
-#: ../../include/identity.php:968
+#: ../../include/identity.php:972
 msgid "Manage/edit profiles"
 msgstr "Profielen beheren/bewerken"
 
-#: ../../include/identity.php:969 ../../mod/profiles.php:783
+#: ../../include/identity.php:973 ../../mod/profiles.php:783
 msgid "Create New Profile"
 msgstr "Nieuw profiel aanmaken"
 
-#: ../../include/identity.php:984 ../../mod/profiles.php:794
+#: ../../include/identity.php:988 ../../mod/profiles.php:794
 msgid "Profile Image"
 msgstr "Profielfoto"
 
-#: ../../include/identity.php:987
+#: ../../include/identity.php:991
 msgid "visible to everybody"
 msgstr "Voor iedereen zichtbaar"
 
-#: ../../include/identity.php:988 ../../mod/profiles.php:677
+#: ../../include/identity.php:992 ../../mod/profiles.php:677
 #: ../../mod/profiles.php:798
 msgid "Edit visibility"
 msgstr "Zichtbaarheid bewerken"
 
-#: ../../include/identity.php:1004 ../../include/identity.php:1246
+#: ../../include/identity.php:1008 ../../include/identity.php:1250
 msgid "Gender:"
 msgstr "Geslacht:"
 
-#: ../../include/identity.php:1005 ../../include/identity.php:1290
+#: ../../include/identity.php:1009 ../../include/identity.php:1294
 msgid "Status:"
 msgstr "Status:"
 
-#: ../../include/identity.php:1006 ../../include/identity.php:1301
+#: ../../include/identity.php:1010 ../../include/identity.php:1305
 msgid "Homepage:"
 msgstr "Homepagina:"
 
-#: ../../include/identity.php:1007
+#: ../../include/identity.php:1011
 msgid "Online Now"
 msgstr "Nu online"
 
-#: ../../include/identity.php:1093 ../../include/identity.php:1171
+#: ../../include/identity.php:1097 ../../include/identity.php:1175
 #: ../../mod/ping.php:318
 msgid "g A l F d"
 msgstr "G:i, l d F"
 
-#: ../../include/identity.php:1094 ../../include/identity.php:1172
+#: ../../include/identity.php:1098 ../../include/identity.php:1176
 msgid "F d"
 msgstr "d F"
 
-#: ../../include/identity.php:1139 ../../include/identity.php:1211
+#: ../../include/identity.php:1143 ../../include/identity.php:1215
 #: ../../mod/ping.php:341
 msgid "[today]"
 msgstr "[vandaag]"
 
-#: ../../include/identity.php:1150
+#: ../../include/identity.php:1154
 msgid "Birthday Reminders"
 msgstr "Verjaardagsherinneringen"
 
-#: ../../include/identity.php:1151
+#: ../../include/identity.php:1155
 msgid "Birthdays this week:"
 msgstr "Verjaardagen deze week:"
 
-#: ../../include/identity.php:1204
+#: ../../include/identity.php:1208
 msgid "[No description]"
 msgstr "[Geen omschrijving]"
 
-#: ../../include/identity.php:1222
+#: ../../include/identity.php:1226
 msgid "Event Reminders"
 msgstr "Herinneringen"
 
-#: ../../include/identity.php:1223
+#: ../../include/identity.php:1227
 msgid "Events this week:"
 msgstr "Gebeurtenissen deze week:"
 
-#: ../../include/identity.php:1244 ../../mod/settings.php:1029
+#: ../../include/identity.php:1248 ../../mod/settings.php:1030
 msgid "Full Name:"
 msgstr "Volledige naam:"
 
-#: ../../include/identity.php:1251
+#: ../../include/identity.php:1255
 msgid "Like this channel"
 msgstr "Vind dit kanaal leuk"
 
-#: ../../include/identity.php:1275
+#: ../../include/identity.php:1279
 msgid "j F, Y"
 msgstr "F j Y"
 
-#: ../../include/identity.php:1276
+#: ../../include/identity.php:1280
 msgid "j F"
 msgstr "F j"
 
-#: ../../include/identity.php:1283
+#: ../../include/identity.php:1287
 msgid "Birthday:"
 msgstr "Geboortedatum:"
 
-#: ../../include/identity.php:1287 ../../mod/directory.php:299
+#: ../../include/identity.php:1291 ../../mod/directory.php:302
 msgid "Age:"
 msgstr "Leeftijd:"
 
-#: ../../include/identity.php:1296
+#: ../../include/identity.php:1300
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "voor %1$d %2$s"
 
-#: ../../include/identity.php:1299 ../../mod/profiles.php:699
+#: ../../include/identity.php:1303 ../../mod/profiles.php:699
 msgid "Sexual Preference:"
 msgstr "Seksuele voorkeur:"
 
-#: ../../include/identity.php:1303 ../../mod/directory.php:315
+#: ../../include/identity.php:1307 ../../mod/directory.php:318
 #: ../../mod/profiles.php:701
 msgid "Hometown:"
 msgstr "Oorspronkelijk uit:"
 
-#: ../../include/identity.php:1305
+#: ../../include/identity.php:1309
 msgid "Tags:"
 msgstr "Tags:"
 
-#: ../../include/identity.php:1307 ../../mod/profiles.php:702
+#: ../../include/identity.php:1311 ../../mod/profiles.php:702
 msgid "Political Views:"
 msgstr "Politieke overtuigingen:"
 
-#: ../../include/identity.php:1309
+#: ../../include/identity.php:1313
 msgid "Religion:"
 msgstr "Religie:"
 
-#: ../../include/identity.php:1311 ../../mod/directory.php:317
+#: ../../include/identity.php:1315 ../../mod/directory.php:320
 msgid "About:"
 msgstr "Over:"
 
-#: ../../include/identity.php:1313
+#: ../../include/identity.php:1317
 msgid "Hobbies/Interests:"
 msgstr "Hobby's/interesses:"
 
-#: ../../include/identity.php:1315 ../../mod/profiles.php:705
+#: ../../include/identity.php:1319 ../../mod/profiles.php:705
 msgid "Likes:"
 msgstr "Houdt van:"
 
-#: ../../include/identity.php:1317 ../../mod/profiles.php:706
+#: ../../include/identity.php:1321 ../../mod/profiles.php:706
 msgid "Dislikes:"
 msgstr "Houdt niet van:"
 
-#: ../../include/identity.php:1319
+#: ../../include/identity.php:1323
 msgid "Contact information and Social Networks:"
 msgstr "Contactinformatie en sociale netwerken:"
 
-#: ../../include/identity.php:1321
+#: ../../include/identity.php:1325
 msgid "My other channels:"
 msgstr "Mijn andere kanalen"
 
-#: ../../include/identity.php:1323
+#: ../../include/identity.php:1327
 msgid "Musical interests:"
 msgstr "Muzikale interesses:"
 
-#: ../../include/identity.php:1325
+#: ../../include/identity.php:1329
 msgid "Books, literature:"
 msgstr "Boeken, literatuur:"
 
-#: ../../include/identity.php:1327
+#: ../../include/identity.php:1331
 msgid "Television:"
 msgstr "Televisie:"
 
-#: ../../include/identity.php:1329
+#: ../../include/identity.php:1333
 msgid "Film/dance/culture/entertainment:"
 msgstr "Films/dansen/cultuur/vermaak:"
 
-#: ../../include/identity.php:1331
+#: ../../include/identity.php:1335
 msgid "Love/Romance:"
 msgstr "Liefde/romantiek:"
 
-#: ../../include/identity.php:1333
+#: ../../include/identity.php:1337
 msgid "Work/employment:"
 msgstr "Werk/beroep:"
 
-#: ../../include/identity.php:1335
+#: ../../include/identity.php:1339
 msgid "School/education:"
 msgstr "School/opleiding:"
 
-#: ../../include/identity.php:1355
+#: ../../include/identity.php:1359
 msgid "Like this thing"
 msgstr "Vind dit ding leuk"
 
-#: ../../include/identity.php:1763 ../../mod/cover_photo.php:236
+#: ../../include/identity.php:1767 ../../mod/cover_photo.php:236
 msgid "cover photo"
 msgstr "omslagfoto"
 
@@ -3860,37 +3403,289 @@ msgstr "Pagina-lay-out"
 msgid "You can create your own with the layouts tool"
 msgstr "Je kan jouw eigen lay-out ontwerpen onder lay-outs"
 
-#: ../../include/text.php:1787
-msgid "Page content type"
-msgstr "Opmaaktype pagina"
+#: ../../include/text.php:1787
+msgid "Page content type"
+msgstr "Opmaaktype pagina"
+
+#: ../../include/text.php:1821
+msgid "Select an alternate language"
+msgstr "Kies een andere taal"
+
+#: ../../include/text.php:1953
+msgid "activity"
+msgstr "activiteit"
+
+#: ../../include/text.php:2248
+msgid "Design Tools"
+msgstr "Ontwerp-hulpmiddelen"
+
+#: ../../include/text.php:2251 ../../mod/blocks.php:147
+msgid "Blocks"
+msgstr "Blokken"
+
+#: ../../include/text.php:2252 ../../mod/menu.php:103
+msgid "Menus"
+msgstr "Menu's"
+
+#: ../../include/text.php:2253 ../../mod/layouts.php:174
+msgid "Layouts"
+msgstr "Lay-outs"
+
+#: ../../include/text.php:2254
+msgid "Pages"
+msgstr "Pagina's"
+
+#: ../../include/items.php:423 ../../index.php:370 ../../mod/dreport.php:6
+#: ../../mod/dreport.php:45 ../../mod/group.php:68
+#: ../../mod/import_items.php:108 ../../mod/like.php:280
+#: ../../mod/profperm.php:23 ../../mod/subthread.php:58
+msgid "Permission denied"
+msgstr "Toegang geweigerd"
+
+#: ../../include/items.php:1130 ../../include/items.php:1176
+msgid "(Unknown)"
+msgstr "(Onbekend)"
+
+#: ../../include/items.php:1373
+msgid "Visible to anybody on the internet."
+msgstr "Voor iedereen op het internet zichtbaar."
+
+#: ../../include/items.php:1375
+msgid "Visible to you only."
+msgstr "Alleen voor jou zichtbaar."
+
+#: ../../include/items.php:1377
+msgid "Visible to anybody in this network."
+msgstr "Voor iedereen in dit netwerk zichtbaar."
+
+#: ../../include/items.php:1379
+msgid "Visible to anybody authenticated."
+msgstr "Voor iedereen die geauthenticeerd is zichtbaar."
+
+#: ../../include/items.php:1381
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr "Voor iedereen op %s zichtbaar."
+
+#: ../../include/items.php:1383
+msgid "Visible to all connections."
+msgstr "Voor alle connecties zichtbaar."
+
+#: ../../include/items.php:1385
+msgid "Visible to approved connections."
+msgstr "Voor alle geaccepteerde connecties zichtbaar."
+
+#: ../../include/items.php:1387
+msgid "Visible to specific connections."
+msgstr "Voor specifieke connecties zichtbaar."
+
+#: ../../include/items.php:4350 ../../mod/admin.php:135
+#: ../../mod/admin.php:1091 ../../mod/admin.php:1336 ../../mod/display.php:36
+#: ../../mod/filestorage.php:27 ../../mod/thing.php:85
+#: ../../mod/viewsrc.php:20
+msgid "Item not found."
+msgstr "Item niet gevonden."
+
+#: ../../include/items.php:4862 ../../mod/group.php:38 ../../mod/group.php:137
+msgid "Privacy group not found."
+msgstr "Privacygroep niet gevonden"
+
+#: ../../include/items.php:4878
+msgid "Privacy group is empty."
+msgstr "Privacygroep is leeg"
+
+#: ../../include/items.php:4885
+#, php-format
+msgid "Privacy group: %s"
+msgstr "Privacygroep: %s"
+
+#: ../../include/items.php:4895 ../../mod/connedit.php:692
+#, php-format
+msgid "Connection: %s"
+msgstr "Connectie: %s"
+
+#: ../../include/items.php:4897
+msgid "Connection not found."
+msgstr "Connectie niet gevonden."
+
+#: ../../include/enotify.php:96
+#, php-format
+msgid "%s <!item_type!>"
+msgstr "%s <!item_type!>"
+
+#: ../../include/enotify.php:100
+#, php-format
+msgid "[Hubzilla:Notify] New mail received at %s"
+msgstr "[Hubzilla:Notificatie] Nieuw privébericht ontvangen op %s"
+
+#: ../../include/enotify.php:102
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
+msgstr "%1$s, %2$s zond jou een nieuw privébericht om %3$s."
+
+#: ../../include/enotify.php:103
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "%1$s zond jou %2$s."
+
+#: ../../include/enotify.php:103
+msgid "a private message"
+msgstr "een privébericht"
+
+#: ../../include/enotify.php:104
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Bezoek %s om je privéberichten te bekijken en/of er op te reageren."
+
+#: ../../include/enotify.php:160
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]een %4$s[/zrl]"
+
+#: ../../include/enotify.php:168
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]een %5$s van %4$s[/zrl]"
+
+#: ../../include/enotify.php:177
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]jouw %4$s[/zrl]"
+
+#: ../../include/enotify.php:188
+#, php-format
+msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Hubzilla:Notificatie] Reactie op conversatie #%1$d door %2$s"
+
+#: ../../include/enotify.php:189
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
+msgstr "%1$s, %2$s gaf een reactie op een bericht/conversatie die jij volgt."
+
+#: ../../include/enotify.php:192 ../../include/enotify.php:207
+#: ../../include/enotify.php:233 ../../include/enotify.php:251
+#: ../../include/enotify.php:265
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Bezoek %s om de conversatie te bekijken en/of er op te reageren."
+
+#: ../../include/enotify.php:198
+#, php-format
+msgid "[Hubzilla:Notify] %s posted to your profile wall"
+msgstr "[Hubzilla:Notificatie] %s heeft een bericht op jouw kanaal geplaatst"
+
+#: ../../include/enotify.php:200
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
+msgstr "%1$s, %2$s heeft om %3$s een bericht op jouw kanaal geplaatst"
+
+#: ../../include/enotify.php:202
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+msgstr "%1$s, %2$s heeft een bericht op [zrl=%3$s]jouw kanaal[/zrl] geplaatst"
+
+#: ../../include/enotify.php:226
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged you"
+msgstr "[Hubzilla:Notificatie] %s heeft je genoemd"
+
+#: ../../include/enotify.php:227
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
+msgstr "%1$s, %2$s noemde jou op %3$s"
+
+#: ../../include/enotify.php:228
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%3$s]noemde jou[/zrl]."
+
+#: ../../include/enotify.php:240
+#, php-format
+msgid "[Hubzilla:Notify] %1$s poked you"
+msgstr "[Hubzilla:Notificatie] %1$s heeft je aangestoten"
+
+#: ../../include/enotify.php:241
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
+msgstr "%1$s, %2$s heeft je aangestoten op %3$s"
+
+#: ../../include/enotify.php:242
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%2$s]heeft je aangestoten[/zrl]."
+
+#: ../../include/enotify.php:258
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged your post"
+msgstr "[Hubzilla:Notificatie] %s heeft jouw bericht getagd"
+
+#: ../../include/enotify.php:259
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
+msgstr "%1$s, %2$s heeft jouw bericht om %3$s getagd"
+
+#: ../../include/enotify.php:260
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+msgstr "%1$s, %2$s heeft [zrl=%3$s]jouw bericht[/zrl] getagd"
+
+#: ../../include/enotify.php:272
+msgid "[Hubzilla:Notify] Introduction received"
+msgstr "[Hubzilla:Notificatie] Connectieverzoek ontvangen"
+
+#: ../../include/enotify.php:273
+#, php-format
+msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+msgstr "%1$s, je hebt een nieuw connectieverzoek ontvangen van '%2$s' op %3$s"
+
+#: ../../include/enotify.php:274
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+msgstr "%1$s, je hebt een [zrl=%2$s]nieuw connectieverzoek[/zrl] ontvangen van %3$s."
+
+#: ../../include/enotify.php:278 ../../include/enotify.php:297
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Je kan het profiel bekijken op %s"
 
-#: ../../include/text.php:1821
-msgid "Select an alternate language"
-msgstr "Kies een andere taal"
+#: ../../include/enotify.php:280
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
+msgstr "Bezoek %s om het connectieverzoek te accepteren of af te wijzen."
 
-#: ../../include/text.php:1953
-msgid "activity"
-msgstr "activiteit"
+#: ../../include/enotify.php:287
+msgid "[Hubzilla:Notify] Friend suggestion received"
+msgstr "[Hubzilla:Notificatie] Kanaalvoorstel ontvangen"
 
-#: ../../include/text.php:2248
-msgid "Design Tools"
-msgstr "Ontwerp-hulpmiddelen"
+#: ../../include/enotify.php:288
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+msgstr "%1$s, je hebt een kanaalvoorstel ontvangen van '%2$s' om %3$s"
 
-#: ../../include/text.php:2251 ../../mod/blocks.php:147
-msgid "Blocks"
-msgstr "Blokken"
+#: ../../include/enotify.php:289
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
+"%4$s."
+msgstr "%1$s, je hebt [zrl=%2$s]een kanaalvoorstel[/zrl] ontvangen voor %3$s van %4$s."
 
-#: ../../include/text.php:2252 ../../mod/menu.php:103
-msgid "Menus"
-msgstr "Menu's"
+#: ../../include/enotify.php:295
+msgid "Name:"
+msgstr "Naam:"
 
-#: ../../include/text.php:2253 ../../mod/layouts.php:174
-msgid "Layouts"
-msgstr "Lay-outs"
+#: ../../include/enotify.php:296
+msgid "Photo:"
+msgstr "Foto:"
 
-#: ../../include/text.php:2254
-msgid "Pages"
-msgstr "Pagina's"
+#: ../../include/enotify.php:299
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Bezoek %s om het voorstel te accepteren of af te wijzen."
+
+#: ../../include/enotify.php:514
+msgid "[Hubzilla:Notify]"
+msgstr "[Hubzilla:Notificatie]"
 
 #: ../../include/widgets.php:93
 msgid "System"
@@ -3941,6 +3736,10 @@ msgstr "Aantekeningen"
 msgid "Remove term"
 msgstr "Verwijder zoekterm"
 
+#: ../../include/widgets.php:274 ../../include/features.php:80
+msgid "Saved Searches"
+msgstr "Opgeslagen zoekopdrachten"
+
 #: ../../include/widgets.php:349
 msgid "Archives"
 msgstr "Archieven"
@@ -4002,6 +3801,11 @@ msgstr "Standaard permissies voor connecties"
 msgid "Premium Channel Settings"
 msgstr "Instellingen premiumkanaal"
 
+#: ../../include/widgets.php:549 ../../include/features.php:67
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
+msgstr "Kanaalbronnen"
+
 #: ../../include/widgets.php:571
 msgid "Private Mail Menu"
 msgstr "Privéberichten"
@@ -4078,182 +3882,374 @@ msgstr "Bladwijzers van chatkanalen"
 msgid "Suggested Chatrooms"
 msgstr "Voorgestelde chatkanalen"
 
-#: ../../include/widgets.php:931 ../../include/widgets.php:1021
+#: ../../include/widgets.php:949 ../../include/widgets.php:1039
 msgid "photo/image"
 msgstr "foto/afbeelding"
 
-#: ../../include/widgets.php:1115
+#: ../../include/widgets.php:1133
 msgid "Rating Tools"
 msgstr "Beoordelingen"
 
-#: ../../include/widgets.php:1119 ../../include/widgets.php:1121
+#: ../../include/widgets.php:1137 ../../include/widgets.php:1139
 msgid "Rate Me"
 msgstr "Beoordeel mij"
 
-#: ../../include/widgets.php:1124
+#: ../../include/widgets.php:1142
 msgid "View Ratings"
 msgstr "Bekijk beoordelingen"
 
-#: ../../include/widgets.php:1135
+#: ../../include/widgets.php:1153
 msgid "Public Hubs"
 msgstr "Openbare hubs"
 
-#: ../../include/widgets.php:1183
+#: ../../include/widgets.php:1201
 msgid "Forums"
 msgstr "Forums"
 
-#: ../../include/widgets.php:1212
+#: ../../include/widgets.php:1230
 msgid "Tasks"
 msgstr "Taken"
 
-#: ../../include/widgets.php:1221
+#: ../../include/widgets.php:1239
 msgid "Documentation"
 msgstr "Documentatie"
 
-#: ../../include/widgets.php:1223
+#: ../../include/widgets.php:1241
 msgid "Project/Site Information"
 msgstr "Project- en hub-informatie"
 
-#: ../../include/widgets.php:1224
+#: ../../include/widgets.php:1242
 msgid "For Members"
 msgstr "Voor leden"
 
-#: ../../include/widgets.php:1225
+#: ../../include/widgets.php:1243
 msgid "For Administrators"
 msgstr "Voor beheerders"
 
-#: ../../include/widgets.php:1226
+#: ../../include/widgets.php:1244
 msgid "For Developers"
 msgstr "Voor ontwikkelaars"
 
-#: ../../include/widgets.php:1251 ../../mod/admin.php:452
+#: ../../include/widgets.php:1269 ../../mod/admin.php:452
 msgid "Site"
 msgstr "Hub-instellingen"
 
-#: ../../include/widgets.php:1252
+#: ../../include/widgets.php:1270
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ../../include/widgets.php:1253 ../../mod/admin.php:1051
+#: ../../include/widgets.php:1271 ../../mod/admin.php:1051
 msgid "Channels"
 msgstr "Kanalen"
 
-#: ../../include/widgets.php:1255 ../../mod/admin.php:1166
+#: ../../include/widgets.php:1273 ../../mod/admin.php:1166
 #: ../../mod/admin.php:1227
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: ../../include/widgets.php:1256 ../../mod/admin.php:1388
+#: ../../include/widgets.php:1274 ../../mod/admin.php:1388
 #: ../../mod/admin.php:1422
 msgid "Themes"
 msgstr "Thema's"
 
-#: ../../include/widgets.php:1257
+#: ../../include/widgets.php:1275
 msgid "Inspect queue"
 msgstr "Inspecteer berichtenwachtrij"
 
-#: ../../include/widgets.php:1258
+#: ../../include/widgets.php:1276
 msgid "Profile Config"
 msgstr "Profielconfiguratie"
 
-#: ../../include/widgets.php:1259
+#: ../../include/widgets.php:1277
 msgid "DB updates"
 msgstr "Database-updates"
 
-#: ../../include/widgets.php:1277 ../../include/widgets.php:1283
-#: ../../mod/admin.php:1507
-msgid "Logs"
-msgstr "Logboeken"
+#: ../../include/widgets.php:1295 ../../include/widgets.php:1301
+#: ../../mod/admin.php:1507
+msgid "Logs"
+msgstr "Logboeken"
+
+#: ../../include/widgets.php:1300
+msgid "Plugin Features"
+msgstr "Plug-in-opties"
+
+#: ../../include/widgets.php:1302
+msgid "User registrations waiting for confirmation"
+msgstr "Accounts die op goedkeuring wachten"
+
+#: ../../include/widgets.php:1380 ../../mod/photos.php:748
+#: ../../mod/photos.php:1283
+msgid "View Photo"
+msgstr "Foto weergeven"
+
+#: ../../include/widgets.php:1397 ../../mod/photos.php:779
+msgid "Edit Album"
+msgstr "Album bewerken"
+
+#: ../../include/features.php:45
+msgid "General Features"
+msgstr "Algemene functies"
+
+#: ../../include/features.php:47
+msgid "Content Expiration"
+msgstr "Inhoud laten verlopen"
+
+#: ../../include/features.php:47
+msgid "Remove posts/comments and/or private messages at a future time"
+msgstr "Berichten, reacties en/of privéberichten na een bepaalde tijd verwijderen"
+
+#: ../../include/features.php:48
+msgid "Multiple Profiles"
+msgstr "Meerdere profielen"
+
+#: ../../include/features.php:48
+msgid "Ability to create multiple profiles"
+msgstr "Mogelijkheid om meerdere profielen aan te maken"
+
+#: ../../include/features.php:49
+msgid "Advanced Profiles"
+msgstr "Geavanceerde profielen"
+
+#: ../../include/features.php:49
+msgid "Additional profile sections and selections"
+msgstr "Extra onderdelen en keuzes voor je profiel"
+
+#: ../../include/features.php:50
+msgid "Profile Import/Export"
+msgstr "Profiel importen/exporteren"
+
+#: ../../include/features.php:50
+msgid "Save and load profile details across sites/channels"
+msgstr "Profielgegevens opslaan en in andere hubs/kanalen gebruiken."
+
+#: ../../include/features.php:51
+msgid "Web Pages"
+msgstr "Webpagina's"
+
+#: ../../include/features.php:51
+msgid "Provide managed web pages on your channel"
+msgstr "Sta beheerde webpagina's op jouw kanaal toe"
+
+#: ../../include/features.php:52
+msgid "Hide Rating"
+msgstr "Beoordelingen verbergen"
+
+#: ../../include/features.php:52
+msgid ""
+"Hide the rating buttons on your channel and profile pages. Note: People can "
+"still rate you somewhere else."
+msgstr "Verbergt de beoordelingsknoppen op jouw kanaal- en profielpagina's. Let op: Mensen kunnen jou nog steeds ergens anders beoordelen. "
+
+#: ../../include/features.php:53
+msgid "Private Notes"
+msgstr "Privé-aantekeningen"
+
+#: ../../include/features.php:53
+msgid "Enables a tool to store notes and reminders (note: not encrypted)"
+msgstr "Een eenvoudige toepassing om aantekeningen en herinneringen in te bewaren (let op: niet versleuteld)"
+
+#: ../../include/features.php:54
+msgid "Navigation Channel Select"
+msgstr "Kanaal kiezen in navigatiemenu"
+
+#: ../../include/features.php:54
+msgid "Change channels directly from within the navigation dropdown menu"
+msgstr "Kies een ander kanaal direct vanuit het dropdown-menu op de navigatiebalk"
+
+#: ../../include/features.php:55
+msgid "Photo Location"
+msgstr "Fotolocatie"
+
+#: ../../include/features.php:55
+msgid "If location data is available on uploaded photos, link this to a map."
+msgstr "Wanneer in de geüploade foto's locatiegegevens aanwezig zijn, link dit dan aan een kaart."
+
+#: ../../include/features.php:57
+msgid "Expert Mode"
+msgstr "Expertmodus"
+
+#: ../../include/features.php:57
+msgid "Enable Expert Mode to provide advanced configuration options"
+msgstr "Schakel de expertmodus in voor geavanceerde instellingen"
+
+#: ../../include/features.php:58
+msgid "Premium Channel"
+msgstr "Premiumkanaal"
+
+#: ../../include/features.php:58
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
+msgstr "Stelt je in staat om beperkingen en voorwaarden in te stellen voor jouw kanaal"
+
+#: ../../include/features.php:63
+msgid "Post Composition Features"
+msgstr "Functies voor het opstellen van berichten"
+
+#: ../../include/features.php:65
+msgid "Use Markdown"
+msgstr "Markdown gebruiken"
+
+#: ../../include/features.php:65
+msgid "Allow use of \"Markdown\" to format posts"
+msgstr "Sta het gebruik van \"markdown\" toe om berichten mee op te maken."
+
+#: ../../include/features.php:66
+msgid "Large Photos"
+msgstr "Grote foto's"
+
+#: ../../include/features.php:66
+msgid ""
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
+msgstr "Gebruik grotere foto's (1024px) in berichten. Wanneer dit is uitgeschakeld worden er kleinere foto's (640px) gebruikt."
+
+#: ../../include/features.php:67
+msgid "Automatically import channel content from other channels or feeds"
+msgstr "Automatisch inhoud uit andere kanalen of feeds importeren."
+
+#: ../../include/features.php:68
+msgid "Even More Encryption"
+msgstr "Extra encryptie"
+
+#: ../../include/features.php:68
+msgid ""
+"Allow optional encryption of content end-to-end with a shared secret key"
+msgstr "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde geheime sleutel."
+
+#: ../../include/features.php:69
+msgid "Enable Voting Tools"
+msgstr "Peilingen inschakelen"
+
+#: ../../include/features.php:69
+msgid "Provide a class of post which others can vote on"
+msgstr "Maakt het mogelijk om een bericht op te stellen, waar mensen op kunnen stemmen."
+
+#: ../../include/features.php:70
+msgid "Delayed Posting"
+msgstr "Berichten uitstellen"
+
+#: ../../include/features.php:70
+msgid "Allow posts to be published at a later date"
+msgstr "Maakt het mogelijk dat berichten op een toekomstig moment gepubliceerd kunnen worden."
+
+#: ../../include/features.php:71
+msgid "Suppress Duplicate Posts/Comments"
+msgstr "Dubbele berichten/reacties tegenhouden"
+
+#: ../../include/features.php:71
+msgid ""
+"Prevent posts with identical content to be published with less than two "
+"minutes in between submissions."
+msgstr "Voorkomt dat berichten en reacties met identieke inhoud en die binnen twee minuten zijn verstuurd, worden gepubliceerd. "
+
+#: ../../include/features.php:77
+msgid "Network and Stream Filtering"
+msgstr "Netwerk- en streamfilter"
+
+#: ../../include/features.php:78
+msgid "Search by Date"
+msgstr "Zoek op datum"
+
+#: ../../include/features.php:78
+msgid "Ability to select posts by date ranges"
+msgstr "Mogelijkheid om berichten op datum te filteren "
+
+#: ../../include/features.php:79
+msgid "Enable management and selection of privacy groups"
+msgstr "Beheer en selectie van privacygroepen inschakelen"
+
+#: ../../include/features.php:80
+msgid "Save search terms for re-use"
+msgstr "Sla zoekopdrachten op voor hergebruik"
+
+#: ../../include/features.php:81
+msgid "Network Personal Tab"
+msgstr "Persoonlijke netwerktab"
 
-#: ../../include/widgets.php:1282
-msgid "Plugin Features"
-msgstr "Plug-in-opties"
+#: ../../include/features.php:81
+msgid "Enable tab to display only Network posts that you've interacted on"
+msgstr "Sta het toe dat de tab netwerkberichten toont waarmee je interactie had"
 
-#: ../../include/widgets.php:1284
-msgid "User registrations waiting for confirmation"
-msgstr "Accounts die op goedkeuring wachten"
+#: ../../include/features.php:82
+msgid "Network New Tab"
+msgstr "Nieuwe netwerktab"
 
-#: ../../include/widgets.php:1362 ../../mod/photos.php:748
-#: ../../mod/photos.php:1283
-msgid "View Photo"
-msgstr "Foto weergeven"
+#: ../../include/features.php:82
+msgid "Enable tab to display all new Network activity"
+msgstr "Laat de tab alle nieuwe netwerkactiviteit tonen"
 
-#: ../../include/widgets.php:1379 ../../mod/photos.php:779
-msgid "Edit Album"
-msgstr "Album bewerken"
+#: ../../include/features.php:83
+msgid "Affinity Tool"
+msgstr "Verwantschapsfilter"
 
-#: ../../include/items.php:423 ../../index.php:370 ../../mod/dreport.php:6
-#: ../../mod/dreport.php:45 ../../mod/group.php:68
-#: ../../mod/import_items.php:108 ../../mod/like.php:280
-#: ../../mod/profperm.php:23 ../../mod/subthread.php:58
-msgid "Permission denied"
-msgstr "Toegang geweigerd"
+#: ../../include/features.php:83
+msgid "Filter stream activity by depth of relationships"
+msgstr "Filter wat je in jouw grid ziet op hoe goed je iemand kent of mag"
 
-#: ../../include/items.php:1130 ../../include/items.php:1176
-msgid "(Unknown)"
-msgstr "(Onbekend)"
+#: ../../include/features.php:84
+msgid "Connection Filtering"
+msgstr "Berichtenfilters"
 
-#: ../../include/items.php:1373
-msgid "Visible to anybody on the internet."
-msgstr "Voor iedereen op het internet zichtbaar."
+#: ../../include/features.php:84
+msgid "Filter incoming posts from connections based on keywords/content"
+msgstr "Filter binnenkomende berichten van connecties aan de hand van trefwoorden en taal"
 
-#: ../../include/items.php:1375
-msgid "Visible to you only."
-msgstr "Alleen voor jou zichtbaar."
+#: ../../include/features.php:85
+msgid "Suggest Channels"
+msgstr "Kanalen voorstellen"
 
-#: ../../include/items.php:1377
-msgid "Visible to anybody in this network."
-msgstr "Voor iedereen in dit netwerk zichtbaar."
+#: ../../include/features.php:85
+msgid "Show channel suggestions"
+msgstr "Voor jou mogelijk interessante kanalen voorstellen"
 
-#: ../../include/items.php:1379
-msgid "Visible to anybody authenticated."
-msgstr "Voor iedereen die geauthenticeerd is zichtbaar."
+#: ../../include/features.php:90
+msgid "Post/Comment Tools"
+msgstr "Bericht- en reactiehulpmiddelen"
 
-#: ../../include/items.php:1381
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr "Voor iedereen op %s zichtbaar."
+#: ../../include/features.php:91
+msgid "Community Tagging"
+msgstr "Taggen door anderen"
 
-#: ../../include/items.php:1383
-msgid "Visible to all connections."
-msgstr "Voor alle connecties zichtbaar."
+#: ../../include/features.php:91
+msgid "Ability to tag existing posts"
+msgstr "Geeft andere mensen de mogelijkheid om jouw (bestaande) berichten te taggen"
 
-#: ../../include/items.php:1385
-msgid "Visible to approved connections."
-msgstr "Voor alle geaccepteerde connecties zichtbaar."
+#: ../../include/features.php:92
+msgid "Post Categories"
+msgstr "Categorieën berichten"
 
-#: ../../include/items.php:1387
-msgid "Visible to specific connections."
-msgstr "Voor specifieke connecties zichtbaar."
+#: ../../include/features.php:92
+msgid "Add categories to your posts"
+msgstr "Voeg categorieën toe aan je berichten"
 
-#: ../../include/items.php:4328 ../../mod/admin.php:135
-#: ../../mod/admin.php:1091 ../../mod/admin.php:1336 ../../mod/display.php:36
-#: ../../mod/filestorage.php:27 ../../mod/thing.php:86
-#: ../../mod/viewsrc.php:20
-msgid "Item not found."
-msgstr "Item niet gevonden."
+#: ../../include/features.php:93
+msgid "Ability to file posts under folders"
+msgstr "Mogelijkheid om berichten in mappen op te slaan"
 
-#: ../../include/items.php:4840 ../../mod/group.php:38 ../../mod/group.php:137
-msgid "Collection not found."
-msgstr "Collectie niet gevonden."
+#: ../../include/features.php:94
+msgid "Dislike Posts"
+msgstr "Vind berichten niet leuk"
 
-#: ../../include/items.php:4856
-msgid "Collection is empty."
-msgstr "Collectie is leeg"
+#: ../../include/features.php:94
+msgid "Ability to dislike posts/comments"
+msgstr "Mogelijkheid om berichten en reacties niet leuk te vinden"
 
-#: ../../include/items.php:4863
-#, php-format
-msgid "Collection: %s"
-msgstr "Collectie: %s"
+#: ../../include/features.php:95
+msgid "Star Posts"
+msgstr "Geef berichten een ster"
 
-#: ../../include/items.php:4873 ../../mod/connedit.php:692
-#, php-format
-msgid "Connection: %s"
-msgstr "Connectie: %s"
+#: ../../include/features.php:95
+msgid "Ability to mark special posts with a star indicator"
+msgstr "Mogelijkheid om speciale berichten met een ster te markeren"
 
-#: ../../include/items.php:4875
-msgid "Connection not found."
-msgstr "Connectie niet gevonden."
+#: ../../include/features.php:96
+msgid "Tag Cloud"
+msgstr "Tagwolk"
+
+#: ../../include/features.php:96
+msgid "Provide a personal tag cloud on your channel page"
+msgstr "Zorgt voor een persoonlijke wolk met tags op jouw kanaalpagina"
 
 #: ../../index.php:242 ../../mod/help.php:213
 msgid "Not Found"
@@ -5156,6 +5152,7 @@ msgid "Invalid item."
 msgstr "Ongeldig item."
 
 #: ../../mod/block.php:39 ../../mod/page.php:52 ../../mod/wall_upload.php:29
+#: ../../mod/zcard.php:19
 msgid "Channel not found."
 msgstr "Kanaal niet gevonden."
 
@@ -5381,14 +5378,23 @@ msgid "Approve connection"
 msgstr "Connectie accepteren"
 
 #: ../../mod/connections.php:272
+msgid "Ignore connection"
+msgstr "Connectie negeren"
+
+#: ../../mod/connections.php:273 ../../mod/connedit.php:536
+#: ../../mod/notifications.php:51
+msgid "Ignore"
+msgstr "Negeren"
+
+#: ../../mod/connections.php:274
 msgid "Recent activity"
 msgstr "Recente activiteit"
 
-#: ../../mod/connections.php:301
+#: ../../mod/connections.php:303
 msgid "Search your connections"
 msgstr "Doorzoek jouw connecties"
 
-#: ../../mod/connections.php:302
+#: ../../mod/connections.php:304
 msgid "Connections search"
 msgstr "Connecties zoeken"
 
@@ -5463,10 +5469,6 @@ msgstr "Deze connectie is geblokkeerd!"
 msgid "Unignore"
 msgstr "Niet meer negeren"
 
-#: ../../mod/connedit.php:536 ../../mod/notifications.php:51
-msgid "Ignore"
-msgstr "Negeren"
-
 #: ../../mod/connedit.php:539
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie"
@@ -5645,86 +5647,86 @@ msgstr "$Projectname-kanaal"
 msgid "Public access denied."
 msgstr "Openbare toegang geweigerd."
 
-#: ../../mod/directory.php:236
+#: ../../mod/directory.php:239
 #, php-format
 msgid "%d rating"
 msgid_plural "%d ratings"
 msgstr[0] "%d beoordeling"
 msgstr[1] "%d beoordelingen"
 
-#: ../../mod/directory.php:247
+#: ../../mod/directory.php:250
 msgid "Gender: "
 msgstr "Geslacht:"
 
-#: ../../mod/directory.php:249
+#: ../../mod/directory.php:252
 msgid "Status: "
 msgstr "Status: "
 
-#: ../../mod/directory.php:251
+#: ../../mod/directory.php:254
 msgid "Homepage: "
 msgstr "Homepage: "
 
-#: ../../mod/directory.php:310
+#: ../../mod/directory.php:313
 msgid "Description:"
 msgstr "Omschrijving:"
 
-#: ../../mod/directory.php:319
+#: ../../mod/directory.php:322
 msgid "Public Forum:"
 msgstr "Openbaar forum:"
 
-#: ../../mod/directory.php:322
+#: ../../mod/directory.php:325
 msgid "Keywords: "
 msgstr "Trefwoorden: "
 
-#: ../../mod/directory.php:325
+#: ../../mod/directory.php:328
 msgid "Don't suggest"
 msgstr "Niet voorstellen"
 
-#: ../../mod/directory.php:327
+#: ../../mod/directory.php:330
 msgid "Common connections:"
 msgstr "Gemeenschappelijke connecties:"
 
-#: ../../mod/directory.php:376
+#: ../../mod/directory.php:379
 msgid "Global Directory"
 msgstr "Volledige kanalengids"
 
-#: ../../mod/directory.php:376
+#: ../../mod/directory.php:379
 msgid "Local Directory"
 msgstr "Lokale kanalengids"
 
-#: ../../mod/directory.php:382
+#: ../../mod/directory.php:385
 msgid "Finding:"
 msgstr "Gezocht naar:"
 
-#: ../../mod/directory.php:387
+#: ../../mod/directory.php:390
 msgid "next page"
 msgstr "volgende pagina"
 
-#: ../../mod/directory.php:387
+#: ../../mod/directory.php:390
 msgid "previous page"
 msgstr "vorige pagina"
 
-#: ../../mod/directory.php:388
+#: ../../mod/directory.php:391
 msgid "Sort options"
 msgstr "Sorteeropties"
 
-#: ../../mod/directory.php:389
+#: ../../mod/directory.php:392
 msgid "Alphabetic"
 msgstr "Alfabetisch"
 
-#: ../../mod/directory.php:390
+#: ../../mod/directory.php:393
 msgid "Reverse Alphabetic"
 msgstr "Omgekeerd alfabetisch"
 
-#: ../../mod/directory.php:391
+#: ../../mod/directory.php:394
 msgid "Newest to Oldest"
 msgstr "Nieuw naar oud"
 
-#: ../../mod/directory.php:392
+#: ../../mod/directory.php:395
 msgid "Oldest to Newest"
 msgstr "Oud naar nieuw"
 
-#: ../../mod/directory.php:409
+#: ../../mod/directory.php:412
 msgid "No entries (some entries may be hidden)."
 msgstr "Niets gevonden (sommige kanalen kunnen verborgen zijn)."
 
@@ -6076,40 +6078,40 @@ msgid "Suggest a friend for %s"
 msgstr "Stel een kanaal voor aan %s"
 
 #: ../../mod/group.php:20
-msgid "Collection created."
-msgstr "Collectie aangemaakt"
+msgid "Privacy group created."
+msgstr "Privacygroep aangemaakt"
 
 #: ../../mod/group.php:26
-msgid "Could not create collection."
-msgstr "Collectie kon niet aangemaakt worden"
+msgid "Could not create privacy group."
+msgstr "Kon privacygroep niet aanmaken"
 
 #: ../../mod/group.php:54
-msgid "Collection updated."
-msgstr "Collectie bijgewerkt."
+msgid "Privacy group updated."
+msgstr "Privacygroep bijgewerkt"
 
 #: ../../mod/group.php:86
-msgid "Create a collection of channels."
-msgstr "Kanaalcollectie aanmaken"
+msgid "Create a group of channels."
+msgstr "Privacygroep met kanalen aanmaken"
 
 #: ../../mod/group.php:87 ../../mod/group.php:180
-msgid "Collection Name: "
-msgstr "Naam collectie:"
+msgid "Privacy group name: "
+msgstr "Naam privacygroep: "
 
 #: ../../mod/group.php:89 ../../mod/group.php:183
 msgid "Members are visible to other channels"
-msgstr "Kanalen in deze collectie zijn zichtbaar voor andere kanalen"
+msgstr "Kanalen in deze privacygroep zijn zichtbaar voor andere kanalen"
 
 #: ../../mod/group.php:107
-msgid "Collection removed."
-msgstr "Collectie verwijderd"
+msgid "Privacy group removed."
+msgstr "Privacygroep verwijderd."
 
 #: ../../mod/group.php:109
-msgid "Unable to remove collection."
-msgstr "Verwijderen collectie mislukt"
+msgid "Unable to remove privacy group."
+msgstr "Verwijderen privacygroep mislukt"
 
 #: ../../mod/group.php:179
-msgid "Collection Editor"
-msgstr "Collectiebewerker"
+msgid "Privacy group editor"
+msgstr "Privacygroep bewerken"
 
 #: ../../mod/group.php:193
 msgid "Members"
@@ -6568,6 +6570,18 @@ msgstr "Wij adviseren, wanneer dit (nog) mogelijk is, de locatie te verwijderen
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr "Gebruik dit formulier om de locatie te verwijderen wanneer de hub van de kloon niet meer operationeel is."
 
+#: ../../mod/ping.php:260
+msgid "sent you a private message"
+msgstr "stuurde jou een privébericht"
+
+#: ../../mod/ping.php:308
+msgid "added your channel"
+msgstr "voegde jouw kanaal toe"
+
+#: ../../mod/ping.php:350
+msgid "posted an event"
+msgstr "plaatste een gebeurtenis"
+
 #: ../../mod/magic.php:69
 msgid "Hub not found."
 msgstr "Hub niet gevonden."
@@ -6664,33 +6678,33 @@ msgstr "Je hebt %1$.0f van totaal %2$.0f toegestane kanalen aangemaakt."
 msgid "Create a new channel"
 msgstr "Nieuw kanaal aanmaken"
 
-#: ../../mod/manage.php:161
+#: ../../mod/manage.php:163
 msgid "Current Channel"
 msgstr "Huidig kanaal"
 
-#: ../../mod/manage.php:163
+#: ../../mod/manage.php:165
 msgid "Switch to one of your channels by selecting it."
 msgstr "Activeer een van jouw andere kanalen door er op te klikken."
 
-#: ../../mod/manage.php:164
+#: ../../mod/manage.php:166
 msgid "Default Channel"
 msgstr "Standaardkanaal"
 
-#: ../../mod/manage.php:165
+#: ../../mod/manage.php:167
 msgid "Make Default"
 msgstr "Als standaard instellen"
 
-#: ../../mod/manage.php:168
+#: ../../mod/manage.php:170
 #, php-format
 msgid "%d new messages"
 msgstr "%d nieuwe berichten"
 
-#: ../../mod/manage.php:169
+#: ../../mod/manage.php:171
 #, php-format
 msgid "%d new introductions"
 msgstr "%d nieuwe connectieverzoeken"
 
-#: ../../mod/manage.php:171
+#: ../../mod/manage.php:173
 msgid "Delegated Channels"
 msgstr "Uitbestede kanalen"
 
@@ -6822,7 +6836,7 @@ msgstr "Menu-onderdeel kan niet worden toegevoegd."
 msgid "Menu Item Permissions"
 msgstr "Permissies menu-item"
 
-#: ../../mod/mitem.php:150 ../../mod/mitem.php:223 ../../mod/settings.php:1056
+#: ../../mod/mitem.php:150 ../../mod/mitem.php:223 ../../mod/settings.php:1057
 msgid "(click to open/close)"
 msgstr "(klik om te openen/sluiten)"
 
@@ -6943,22 +6957,22 @@ msgid "Search Results For:"
 msgstr "Zoekresultaten voor:"
 
 #: ../../mod/network.php:207
-msgid "Collection is empty"
-msgstr "Collectie is leeg"
+msgid "Privacy group is empty"
+msgstr "Privacygroep is leeg"
 
 #: ../../mod/network.php:216
-msgid "Collection: "
-msgstr "Collectie: "
+msgid "Privacy group: "
+msgstr "Privacygroep: "
 
 #: ../../mod/network.php:242
 msgid "Invalid connection."
 msgstr "Ongeldige connectie."
 
-#: ../../mod/new_channel.php:120
+#: ../../mod/new_channel.php:130
 msgid "Add a Channel"
 msgstr "Kanaal toevoegen"
 
-#: ../../mod/new_channel.php:121
+#: ../../mod/new_channel.php:131
 msgid ""
 "A channel is your own collection of related web pages. A channel can be used"
 " to hold social network profiles, blogs, conversation groups and forums, "
@@ -6966,40 +6980,40 @@ msgid ""
 "service provider allows."
 msgstr "Naast een account moet je tenminste één kanaal aanmaken. Een kanaal is een persoonlijke verzameling (gerelateerde) berichten en media, zoals je misschien gewend bent van sociale netwerken. Een kanaal kan gebruikt worden voor social media, een blog, forum, en voor veel meer. Je kan net zoveel kanalen aanmaken als dat de eigenaar/beheerder van jouw hub toestaat."
 
-#: ../../mod/new_channel.php:123 ../../mod/register.php:246
+#: ../../mod/new_channel.php:133 ../../mod/register.php:246
 #: ../../mod/sources.php:103 ../../mod/sources.php:137
 msgid "Channel Name"
 msgstr "Kanaalnaam"
 
-#: ../../mod/new_channel.php:124
+#: ../../mod/new_channel.php:134
 msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
 msgstr "Jouw naam of een andere relevante naam. Voorbeelden: \"Jan Pietersen\", \"Willems weblog\", \"Familieforum\""
 
-#: ../../mod/new_channel.php:125 ../../mod/register.php:248
+#: ../../mod/new_channel.php:135 ../../mod/register.php:248
 msgid "Choose a short nickname"
 msgstr "Korte bijnaam"
 
-#: ../../mod/new_channel.php:126 ../../mod/register.php:249
+#: ../../mod/new_channel.php:137 ../../mod/register.php:249
 msgid ""
 "Your nickname will be used to create an easily remembered channel address "
 "(like an email address) which you can share with others."
 msgstr "Deze bijnaam (geen spaties) wordt gebruikt om een makkelijk te onthouden kanaaladres (zoals een e-mailadres) en het internetadres (URL) van jouw kanaal aan te maken, die je dan met anderen kunt delen. Voorbeeld: <b>janp</b> wordt <em>janp@jouw_hub.nl</em> en <em>https://jouw_hub.nl/channel/janp</em>."
 
-#: ../../mod/new_channel.php:127
+#: ../../mod/new_channel.php:138
 msgid "Or <a href=\"import\">import an existing channel</a> from another location"
 msgstr "Of <a href=\"import\">importeer een bestaand kanaal</a> vanaf een andere locatie."
 
-#: ../../mod/new_channel.php:129 ../../mod/register.php:251
+#: ../../mod/new_channel.php:140 ../../mod/register.php:251
 msgid ""
 "Please choose a channel type (such as social networking or community forum) "
 "and privacy requirements so we can select the best permissions for you"
 msgstr "Kies een kanaaltype en het door jouw gewenste privacy-niveau, zodat  automatisch de beste permissies kunnen worden ingesteld. Dit kan later, indien gewenst, worden veranderd."
 
-#: ../../mod/new_channel.php:130 ../../mod/register.php:252
+#: ../../mod/new_channel.php:141 ../../mod/register.php:252
 msgid "Channel Type"
 msgstr "Kanaaltype"
 
-#: ../../mod/new_channel.php:130 ../../mod/register.php:252
+#: ../../mod/new_channel.php:141 ../../mod/register.php:252
 msgid "Read more about roles"
 msgstr "Lees meer over kanaaltypes"
 
@@ -7228,18 +7242,6 @@ msgstr "Album weergeven"
 msgid "Recent Photos"
 msgstr "Recente foto's"
 
-#: ../../mod/ping.php:260
-msgid "sent you a private message"
-msgstr "stuurde jou een privébericht"
-
-#: ../../mod/ping.php:308
-msgid "added your channel"
-msgstr "voegde jouw kanaal toe"
-
-#: ../../mod/ping.php:350
-msgid "posted an event"
-msgstr "plaatste een gebeurtenis"
-
 #: ../../mod/poke.php:164
 msgid "Poke/Prod"
 msgstr "Aanstoten/porren"
@@ -7331,7 +7333,7 @@ msgstr "Kies een profiel:"
 msgid "Upload Profile Photo"
 msgstr "Profielfoto uploaden"
 
-#: ../../mod/profile_photo.php:457 ../../mod/settings.php:975
+#: ../../mod/profile_photo.php:457 ../../mod/settings.php:976
 #: ../../mod/cover_photo.php:357
 msgid "or"
 msgstr "of"
@@ -7689,7 +7691,7 @@ msgstr "Geen beoordelingen"
 
 #: ../../mod/ratings.php:100
 msgid "Rating: "
-msgstr "Waardering: "
+msgstr "Beoordeling: "
 
 #: ../../mod/ratings.php:101
 msgid "Website: "
@@ -7870,7 +7872,7 @@ msgid ""
 "removed from the network"
 msgstr "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het $Projectname-netwerk verwijderd"
 
-#: ../../mod/removeme.php:61 ../../mod/settings.php:1112
+#: ../../mod/removeme.php:61 ../../mod/settings.php:1113
 msgid "Remove Channel"
 msgstr "Kanaal verwijderen"
 
@@ -8037,7 +8039,7 @@ msgstr "Nieuw wachtwoord bevestigen:"
 msgid "Leave password fields blank unless changing"
 msgstr "Laat de wachtwoordvelden leeg, behalve wanneer je deze wil veranderen"
 
-#: ../../mod/settings.php:699 ../../mod/settings.php:1030
+#: ../../mod/settings.php:699 ../../mod/settings.php:1031
 msgid "Email Address:"
 msgstr "E-mailadres:"
 
@@ -8174,305 +8176,307 @@ msgstr "Geauthenticeerd"
 msgid "Anybody on the internet"
 msgstr "Iedereen op het internet"
 
-#: ../../mod/settings.php:966
+#: ../../mod/settings.php:967
 msgid "Publish your default profile in the network directory"
 msgstr "Publiceer je standaardprofiel in de kanalengids"
 
-#: ../../mod/settings.php:971
+#: ../../mod/settings.php:972
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Sta ons toe om jouw kanaal als mogelijke connectie voor te stellen aan nieuwe kanalen"
 
-#: ../../mod/settings.php:980
+#: ../../mod/settings.php:981
 msgid "Your channel address is"
 msgstr "Jouw kanaaladres is"
 
-#: ../../mod/settings.php:1021
+#: ../../mod/settings.php:1022
 msgid "Channel Settings"
 msgstr "Kanaal-instellingen"
 
-#: ../../mod/settings.php:1028
+#: ../../mod/settings.php:1029
 msgid "Basic Settings"
 msgstr "Basis-instellingen"
 
-#: ../../mod/settings.php:1031
+#: ../../mod/settings.php:1032
 msgid "Your Timezone:"
 msgstr "Jouw tijdzone:"
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1033
 msgid "Default Post Location:"
 msgstr "Standaardlocatie bericht:"
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1033
 msgid "Geographical location to display on your posts"
 msgstr "Geografische locatie die bij het bericht moet worden vermeld"
 
-#: ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034
 msgid "Use Browser Location:"
 msgstr "Locatie van webbrowser gebruiken:"
 
-#: ../../mod/settings.php:1035
+#: ../../mod/settings.php:1036
 msgid "Adult Content"
 msgstr "Inhoud voor volwassenen"
 
-#: ../../mod/settings.php:1035
+#: ../../mod/settings.php:1036
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr "Dit kanaal publiceert regelmatig of vaak materiaal dat alleen geschikt is voor volwassenen. (Gebruik de tag #NSFW in berichten met een seksueel getinte inhoud of ander voor minderjarigen ongeschikt materiaal)"
 
-#: ../../mod/settings.php:1037
+#: ../../mod/settings.php:1038
 msgid "Security and Privacy Settings"
 msgstr "Veiligheids- en privacy-instellingen"
 
-#: ../../mod/settings.php:1039
+#: ../../mod/settings.php:1040
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "Jouw permissies zijn al ingesteld. Klik om ze te bekijken of aan te passen."
 
-#: ../../mod/settings.php:1041
+#: ../../mod/settings.php:1042
 msgid "Hide my online presence"
 msgstr "Verberg mijn aanwezigheid"
 
-#: ../../mod/settings.php:1041
+#: ../../mod/settings.php:1042
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Voorkomt dat op je kanaalpagina te zien valt dat je momenteel op $Projectname aanwezig bent"
 
-#: ../../mod/settings.php:1043
+#: ../../mod/settings.php:1044
 msgid "Simple Privacy Settings:"
 msgstr "Eenvoudige privacy-instellingen:"
 
-#: ../../mod/settings.php:1044
+#: ../../mod/settings.php:1045
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr "Zeer openbaar <em>(kanaal staat volledig open - moet met grote zorgvuldigheid gebruikt worden)</em>"
 
-#: ../../mod/settings.php:1045
+#: ../../mod/settings.php:1046
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr "Normaal <em>(standaard openbaar, maar privacy wanneer noodzakelijk - vergelijkbaar met die van sociale netwerken, maar met verbeterde privacy)</em>"
 
-#: ../../mod/settings.php:1046
+#: ../../mod/settings.php:1047
 msgid "Private - <em>default private, never open or public</em>"
 msgstr "Privé <em>(standaard privé en nooit openbaar)</em>"
 
-#: ../../mod/settings.php:1047
+#: ../../mod/settings.php:1048
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr "Geblokkeerd <em>(standaard geblokkeerd naar/van iedereen)</em>"
 
-#: ../../mod/settings.php:1049
+#: ../../mod/settings.php:1050
 msgid "Allow others to tag your posts"
 msgstr "Anderen toestaan om je berichten te taggen"
 
-#: ../../mod/settings.php:1049
+#: ../../mod/settings.php:1050
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr "Vaak in groepen/forums gebruikt om met terugwerkende kracht ongepast materiaal te markeren"
 
-#: ../../mod/settings.php:1051
+#: ../../mod/settings.php:1052
 msgid "Advanced Privacy Settings"
 msgstr "Geavanceerde privacy-instellingen"
 
-#: ../../mod/settings.php:1053
+#: ../../mod/settings.php:1054
 msgid "Expire other channel content after this many days"
 msgstr "Inhoud van andere kanalen na zoveel aantal dagen laten verlopen:"
 
-#: ../../mod/settings.php:1053
-msgid "0 or blank prevents expiration"
-msgstr "0 of leeg voorkomt het verlopen"
-
 #: ../../mod/settings.php:1054
+#, php-format
+msgid ""
+"0 or blank to use the website limit. The website expires after %d days."
+msgstr "0 of leeg om het standaard aantal dagen van deze hub te gebruiken. Deze hub laat de inhoud van andere kanalen na %d dagen verlopen."
+
+#: ../../mod/settings.php:1055
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximum aantal connectieverzoeken per dag:"
 
-#: ../../mod/settings.php:1054
+#: ../../mod/settings.php:1055
 msgid "May reduce spam activity"
 msgstr "Kan eventuele spam verminderen"
 
-#: ../../mod/settings.php:1055
+#: ../../mod/settings.php:1056
 msgid "Default Post Permissions"
 msgstr "Standaard permissies voor nieuwe berichten"
 
-#: ../../mod/settings.php:1060
+#: ../../mod/settings.php:1061
 msgid "Channel permissions category:"
 msgstr "Kanaaltype en -permissies:"
 
-#: ../../mod/settings.php:1066
+#: ../../mod/settings.php:1067
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximum aantal privé-berichten per dag van onbekende personen:"
 
-#: ../../mod/settings.php:1066
+#: ../../mod/settings.php:1067
 msgid "Useful to reduce spamming"
 msgstr "Kan eventuele spam verminderen"
 
-#: ../../mod/settings.php:1069
+#: ../../mod/settings.php:1070
 msgid "Notification Settings"
 msgstr "Notificatie-instellingen"
 
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1071
 msgid "By default post a status message when:"
 msgstr "Plaats automatisch een statusbericht wanneer:"
 
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1072
 msgid "accepting a friend request"
 msgstr "Een connectieverzoek wordt geaccepteerd"
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1073
 msgid "joining a forum/community"
 msgstr "Je lid wordt van een forum/groep"
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1074
 msgid "making an <em>interesting</em> profile change"
 msgstr "Er sprake is van een <em>interessante</em> profielwijziging"
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1075
 msgid "Send a notification email when:"
 msgstr "Verzend een notificatie per e-mail wanneer:"
 
-#: ../../mod/settings.php:1075
+#: ../../mod/settings.php:1076
 msgid "You receive a connection request"
 msgstr "Je een connectieverzoek ontvangt"
 
-#: ../../mod/settings.php:1076
+#: ../../mod/settings.php:1077
 msgid "Your connections are confirmed"
 msgstr "Jouw connecties zijn bevestigd"
 
-#: ../../mod/settings.php:1077
+#: ../../mod/settings.php:1078
 msgid "Someone writes on your profile wall"
 msgstr "Iemand iets op jouw kanaal heeft geschreven"
 
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1079
 msgid "Someone writes a followup comment"
 msgstr "Iemand een reactie schrijft"
 
-#: ../../mod/settings.php:1079
+#: ../../mod/settings.php:1080
 msgid "You receive a private message"
 msgstr "Je een privé-bericht ontvangt"
 
-#: ../../mod/settings.php:1080
+#: ../../mod/settings.php:1081
 msgid "You receive a friend suggestion"
 msgstr "Je een kanaalvoorstel ontvangt"
 
-#: ../../mod/settings.php:1081
+#: ../../mod/settings.php:1082
 msgid "You are tagged in a post"
 msgstr "Je expliciet in een bericht bent genoemd"
 
-#: ../../mod/settings.php:1082
+#: ../../mod/settings.php:1083
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Je bent in een bericht aangestoten/gepord/etc."
 
-#: ../../mod/settings.php:1085
+#: ../../mod/settings.php:1086
 msgid "Show visual notifications including:"
 msgstr "Toon de volgende zichtbare notificaties:"
 
-#: ../../mod/settings.php:1087
+#: ../../mod/settings.php:1088
 msgid "Unseen grid activity"
 msgstr "Niet bekeken grid-activiteit"
 
-#: ../../mod/settings.php:1088
+#: ../../mod/settings.php:1089
 msgid "Unseen channel activity"
 msgstr "Niet bekeken kanaal-activiteit"
 
-#: ../../mod/settings.php:1089
+#: ../../mod/settings.php:1090
 msgid "Unseen private messages"
 msgstr "Niet bekeken privéberichten"
 
-#: ../../mod/settings.php:1089 ../../mod/settings.php:1094
-#: ../../mod/settings.php:1095 ../../mod/settings.php:1096
+#: ../../mod/settings.php:1090 ../../mod/settings.php:1095
+#: ../../mod/settings.php:1096 ../../mod/settings.php:1097
 msgid "Recommended"
 msgstr "Aanbevolen"
 
-#: ../../mod/settings.php:1090
+#: ../../mod/settings.php:1091
 msgid "Upcoming events"
 msgstr "Aankomende gebeurtenissen"
 
-#: ../../mod/settings.php:1091
+#: ../../mod/settings.php:1092
 msgid "Events today"
 msgstr "Gebeurtenissen van vandaag"
 
-#: ../../mod/settings.php:1092
+#: ../../mod/settings.php:1093
 msgid "Upcoming birthdays"
 msgstr "Aankomende verjaardagen"
 
-#: ../../mod/settings.php:1092
+#: ../../mod/settings.php:1093
 msgid "Not available in all themes"
 msgstr "Niet in alle thema's beschikbaar"
 
-#: ../../mod/settings.php:1093
+#: ../../mod/settings.php:1094
 msgid "System (personal) notifications"
 msgstr "(Persoonlijke) systeemnotificaties"
 
-#: ../../mod/settings.php:1094
+#: ../../mod/settings.php:1095
 msgid "System info messages"
 msgstr "Systeemmededelingen"
 
-#: ../../mod/settings.php:1095
+#: ../../mod/settings.php:1096
 msgid "System critical alerts"
 msgstr "Kritische systeemwaarschuwingen"
 
-#: ../../mod/settings.php:1096
+#: ../../mod/settings.php:1097
 msgid "New connections"
 msgstr "Nieuwe connecties"
 
-#: ../../mod/settings.php:1097
+#: ../../mod/settings.php:1098
 msgid "System Registrations"
 msgstr "Nieuwe accountregistraties op deze hub"
 
-#: ../../mod/settings.php:1098
+#: ../../mod/settings.php:1099
 msgid ""
 "Also show new wall posts, private messages and connections under Notices"
 msgstr "Toon tevens nieuwe kanaalberichten, privéberichten en connecties onder Notificaties"
 
-#: ../../mod/settings.php:1100
+#: ../../mod/settings.php:1101
 msgid "Notify me of events this many days in advance"
 msgstr "Herinner mij zoveel dagen van te voren aan gebeurtenissen"
 
-#: ../../mod/settings.php:1100
+#: ../../mod/settings.php:1101
 msgid "Must be greater than 0"
 msgstr "Moet hoger dan 0 zijn"
 
-#: ../../mod/settings.php:1102
+#: ../../mod/settings.php:1103
 msgid "Advanced Account/Page Type Settings"
 msgstr "Instellingen geavanceerd account/paginatype"
 
-#: ../../mod/settings.php:1103
+#: ../../mod/settings.php:1104
 msgid "Change the behaviour of this account for special situations"
 msgstr "Verander het gedrag van dit account voor speciale situaties"
 
-#: ../../mod/settings.php:1106
+#: ../../mod/settings.php:1107
 msgid ""
 "Please enable expert mode (in <a href=\"settings/features\">Settings > "
 "Additional features</a>) to adjust!"
 msgstr "Schakel de expertmodus in (in <a href=\"settings/features\">Instellingen > Extra functies</a>) om aan te kunnen passen!"
 
-#: ../../mod/settings.php:1107
+#: ../../mod/settings.php:1108
 msgid "Miscellaneous Settings"
 msgstr "Diverse instellingen"
 
-#: ../../mod/settings.php:1108
+#: ../../mod/settings.php:1109
 msgid "Default photo upload folder"
 msgstr "Standaard fotoalbum voor uploads"
 
-#: ../../mod/settings.php:1108 ../../mod/settings.php:1109
+#: ../../mod/settings.php:1109 ../../mod/settings.php:1110
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - dit jaar, %m -  deze maand"
 
-#: ../../mod/settings.php:1109
+#: ../../mod/settings.php:1110
 msgid "Default file upload folder"
 msgstr "Standaard bestandsmap voor uploads"
 
-#: ../../mod/settings.php:1111
+#: ../../mod/settings.php:1112
 msgid "Personal menu to display in your channel pages"
 msgstr "Persoonlijk menu om op je kanaalpagina's weer te geven"
 
-#: ../../mod/settings.php:1113
+#: ../../mod/settings.php:1114
 msgid "Remove this channel."
 msgstr "Verwijder dit kanaal."
 
-#: ../../mod/settings.php:1114
+#: ../../mod/settings.php:1115
 msgid "Firefox Share $Projectname provider"
 msgstr "$Projectname-service voor Firefox Share"
 
-#: ../../mod/settings.php:1115
+#: ../../mod/settings.php:1116
 msgid "Start calendar week on monday"
 msgstr "Begin in de agenda de week op maandag"
 
@@ -8908,7 +8912,7 @@ msgid ""
 "Password reset failed."
 msgstr "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt."
 
-#: ../../mod/lostpass.php:86 ../../boot.php:1516
+#: ../../mod/lostpass.php:86 ../../boot.php:1526
 msgid "Password Reset"
 msgstr "Wachtwoord vergeten?"
 
@@ -9123,60 +9127,60 @@ msgstr "Verwijder item-tag"
 msgid "Select a tag to remove: "
 msgstr "Kies een tag om te verwijderen"
 
-#: ../../mod/thing.php:111
+#: ../../mod/thing.php:110
 msgid "Thing updated"
 msgstr "Ding bijgewerkt"
 
-#: ../../mod/thing.php:163
+#: ../../mod/thing.php:162
 msgid "Object store: failed"
 msgstr "Opslaan van ding mislukt"
 
-#: ../../mod/thing.php:167
+#: ../../mod/thing.php:166
 msgid "Thing added"
 msgstr "Ding toegevoegd"
 
-#: ../../mod/thing.php:193
+#: ../../mod/thing.php:192
 #, php-format
 msgid "OBJ: %1$s %2$s %3$s"
 msgstr "OBJ: %1$s %2$s %3$s"
 
-#: ../../mod/thing.php:256
+#: ../../mod/thing.php:255
 msgid "Show Thing"
 msgstr "Ding weergeven"
 
-#: ../../mod/thing.php:263
+#: ../../mod/thing.php:262
 msgid "item not found."
 msgstr "Item niet gevonden"
 
-#: ../../mod/thing.php:296
+#: ../../mod/thing.php:295
 msgid "Edit Thing"
 msgstr "Ding bewerken"
 
-#: ../../mod/thing.php:298 ../../mod/thing.php:348
+#: ../../mod/thing.php:297 ../../mod/thing.php:347
 msgid "Select a profile"
 msgstr "Kies een profiel"
 
-#: ../../mod/thing.php:302 ../../mod/thing.php:351
+#: ../../mod/thing.php:301 ../../mod/thing.php:350
 msgid "Post an activity"
 msgstr "Plaats een bericht"
 
-#: ../../mod/thing.php:302 ../../mod/thing.php:351
+#: ../../mod/thing.php:301 ../../mod/thing.php:350
 msgid "Only sends to viewers of the applicable profile"
 msgstr "Toont dit alleen aan diegene die het gekozen profiel mogen zien."
 
-#: ../../mod/thing.php:304 ../../mod/thing.php:353
+#: ../../mod/thing.php:303 ../../mod/thing.php:352
 msgid "Name of thing e.g. something"
 msgstr "Naam van ding"
 
-#: ../../mod/thing.php:306 ../../mod/thing.php:354
+#: ../../mod/thing.php:305 ../../mod/thing.php:353
 msgid "URL of thing (optional)"
 msgstr "URL van ding (optioneel)"
 
-#: ../../mod/thing.php:308 ../../mod/thing.php:355
+#: ../../mod/thing.php:307 ../../mod/thing.php:354
 msgid "URL for photo of thing (optional)"
 msgstr "URL van foto van ding (optioneel)"
 
-#: ../../mod/thing.php:346
+#: ../../mod/thing.php:345
 msgid "Add Thing to your Profile"
 msgstr "Ding aan je profiel toevoegen"
 
@@ -9411,51 +9415,51 @@ msgstr "Grootte profielfoto's van berichten instellen"
 msgid "Set size of followup author photos"
 msgstr "Grootte profielfoto's van reacties instellen"
 
-#: ../../boot.php:1319
+#: ../../boot.php:1329
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s mislukt. Zie foutenlogboek."
 
-#: ../../boot.php:1322
+#: ../../boot.php:1332
 #, php-format
 msgid "Update Error at %s"
 msgstr "Update-fout op %s"
 
-#: ../../boot.php:1489
+#: ../../boot.php:1499
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr "Maak een account aan om toegang te krijgen tot diensten en toepassingen van Hubzilla"
 
-#: ../../boot.php:1511
+#: ../../boot.php:1521
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../../boot.php:1512
+#: ../../boot.php:1522
 msgid "Remember me"
 msgstr "Aangemeld blijven"
 
-#: ../../boot.php:1515
+#: ../../boot.php:1525
 msgid "Forgot your password?"
 msgstr "Wachtwoord vergeten?"
 
-#: ../../boot.php:2137
+#: ../../boot.php:2155
 msgid "toggle mobile"
 msgstr "mobiele weergave omschakelen"
 
-#: ../../boot.php:2289
+#: ../../boot.php:2307
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "Het SSL-certificaat van deze website is ongeldig. Corrigeer dit a.u.b."
 
-#: ../../boot.php:2292
+#: ../../boot.php:2310
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Probleem met SSL-certificaat voor %s"
 
-#: ../../boot.php:2329
+#: ../../boot.php:2347
 msgid "Cron/Scheduled tasks not running."
 msgstr "Cron is niet actief"
 
-#: ../../boot.php:2333
+#: ../../boot.php:2351
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr "[hubzilla] Cron-taken zijn niet actief op %s"
diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php
index ca021ad76..3ca0eaa27 100644
--- a/view/nl/hstrings.php
+++ b/view/nl/hstrings.php
@@ -392,46 +392,6 @@ $a->strings["No"] = "Nee";
 $a->strings["Yes"] = "Ja";
 $a->strings["Public Forums Only"] = "Alleen openbare forums";
 $a->strings["This Website Only"] = "Alleen deze hub";
-$a->strings["\$Projectname Notification"] = "\$Projectname-notificatie";
-$a->strings["\$projectname"] = "\$projectname";
-$a->strings["Thank You,"] = "Bedankt,";
-$a->strings["%s Administrator"] = "Beheerder %s";
-$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
-$a->strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Notificatie] Nieuw privébericht ontvangen op %s";
-$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s zond jou een nieuw privébericht om %3\$s.";
-$a->strings["%1\$s sent you %2\$s."] = "%1\$s zond jou %2\$s.";
-$a->strings["a private message"] = "een privébericht";
-$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bezoek %s om je privéberichten te bekijken en/of er op te reageren.";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]een %4\$s[/zrl]";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]een %5\$s van %4\$s[/zrl]";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]jouw %4\$s[/zrl]";
-$a->strings["[Hubzilla:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla:Notificatie] Reactie op conversatie #%1\$d door %2\$s";
-$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s gaf een reactie op een bericht/conversatie die jij volgt.";
-$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bezoek %s om de conversatie te bekijken en/of er op te reageren.";
-$a->strings["[Hubzilla:Notify] %s posted to your profile wall"] = "[Hubzilla:Notificatie] %s heeft een bericht op jouw kanaal geplaatst";
-$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s heeft om %3\$s een bericht op jouw kanaal geplaatst";
-$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s heeft een bericht op [zrl=%3\$s]jouw kanaal[/zrl] geplaatst";
-$a->strings["[Hubzilla:Notify] %s tagged you"] = "[Hubzilla:Notificatie] %s heeft je genoemd";
-$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s noemde jou op %3\$s";
-$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]noemde jou[/zrl].";
-$a->strings["[Hubzilla:Notify] %1\$s poked you"] = "[Hubzilla:Notificatie] %1\$s heeft je aangestoten";
-$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s heeft je aangestoten op %3\$s";
-$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]heeft je aangestoten[/zrl].";
-$a->strings["[Hubzilla:Notify] %s tagged your post"] = "[Hubzilla:Notificatie] %s heeft jouw bericht getagd";
-$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s heeft jouw bericht om %3\$s getagd";
-$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s heeft [zrl=%3\$s]jouw bericht[/zrl] getagd";
-$a->strings["[Hubzilla:Notify] Introduction received"] = "[Hubzilla:Notificatie] Connectieverzoek ontvangen";
-$a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, je hebt een nieuw connectieverzoek ontvangen van '%2\$s' op %3\$s";
-$a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, je hebt een [zrl=%2\$s]nieuw connectieverzoek[/zrl] ontvangen van %3\$s.";
-$a->strings["You may visit their profile at %s"] = "Je kan het profiel bekijken op %s";
-$a->strings["Please visit %s to approve or reject the connection request."] = "Bezoek %s om het connectieverzoek te accepteren of af te wijzen.";
-$a->strings["[Hubzilla:Notify] Friend suggestion received"] = "[Hubzilla:Notificatie] Kanaalvoorstel ontvangen";
-$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, je hebt een kanaalvoorstel ontvangen van '%2\$s' om %3\$s";
-$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, je hebt [zrl=%2\$s]een kanaalvoorstel[/zrl] ontvangen voor %3\$s van %4\$s.";
-$a->strings["Name:"] = "Naam:";
-$a->strings["Photo:"] = "Foto:";
-$a->strings["Please visit %s to approve or reject the suggestion."] = "Bezoek %s om het voorstel te accepteren of af te wijzen.";
-$a->strings["[Hubzilla:Notify]"] = "[Hubzilla:Notificatie]";
 $a->strings["This event has been added to your calendar."] = "Dit evenement is aan jouw agenda toegevoegd.";
 $a->strings["Not specified"] = "Niet aangegeven";
 $a->strings["Needs Action"] = "Actie vereist";
@@ -447,13 +407,13 @@ $a->strings["Channel discovery failed."] = "Kanaal ontdekken mislukt.";
 $a->strings["local account not found."] = "lokale account niet gevonden.";
 $a->strings["Cannot connect to yourself."] = "Kan niet met jezelf verbinden";
 $a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande itemrechten  <strong>kunnen</strong> van toepassing zijn op deze collectie en toekomstige leden. Wanneer je dit niet zo bedoeld hebt, moet je een nieuwe collectie met een andere naam aanmaken.";
-$a->strings["Add new connections to this collection (privacy group)"] = "Voeg nieuwe connecties aan deze collectie toe (privacygroep)";
+$a->strings["Add new connections to this privacy group"] = "Voeg nieuwe connecties aan deze privacygroep toe";
 $a->strings["All Channels"] = "Alle kanalen";
 $a->strings["edit"] = "bewerken";
-$a->strings["Collections"] = "Collecties";
-$a->strings["Edit collection"] = "Collectie bewerken";
-$a->strings["Add new collection"] = "Nieuwe collectie toevoegen";
-$a->strings["Channels not in any collection"] = "Kanalen die zich in geen enkele collectie bevinden";
+$a->strings["Privacy Groups"] = "Privacygroepen";
+$a->strings["Edit group"] = "Privacygroep bewerken";
+$a->strings["Add privacy group"] = "Privacygroep toevoegen";
+$a->strings["Channels not in any privacy group"] = "Kanalen die zich in geen enkele privacygroep bevinden";
 $a->strings["add"] = "toevoegen";
 $a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt.";
 $a->strings["Channel clone failed. Import failed."] = "Het klonen van het kanaal is mislukt. Importeren mislukt.";
@@ -591,6 +551,10 @@ $a->strings["Site Setup and Configuration"] = "Hub instellen en beheren";
 $a->strings["@name, #tag, ?doc, content"] = "@kanaal, #tag, inhoud, ?hulp";
 $a->strings["Please wait..."] = "Wachten aub...";
 $a->strings["view full size"] = "volledige grootte tonen";
+$a->strings["\$Projectname Notification"] = "\$Projectname-notificatie";
+$a->strings["\$projectname"] = "\$projectname";
+$a->strings["Thank You,"] = "Bedankt,";
+$a->strings["%s Administrator"] = "Beheerder %s";
 $a->strings["No Subject"] = "Geen onderwerp";
 $a->strings["created a new post"] = "maakte een nieuw bericht aan";
 $a->strings["commented on %s's post"] = "gaf een reactie op een bericht van %s";
@@ -728,73 +692,6 @@ $a->strings["Zot"] = "Zot";
 $a->strings["LinkedIn"] = "LinkedIn";
 $a->strings["XMPP/IM"] = "XMPP/IM";
 $a->strings["MySpace"] = "MySpace";
-$a->strings["General Features"] = "Algemene functies";
-$a->strings["Content Expiration"] = "Inhoud laten verlopen";
-$a->strings["Remove posts/comments and/or private messages at a future time"] = "Berichten, reacties en/of privéberichten na een bepaalde tijd verwijderen";
-$a->strings["Multiple Profiles"] = "Meerdere profielen";
-$a->strings["Ability to create multiple profiles"] = "Mogelijkheid om meerdere profielen aan te maken";
-$a->strings["Advanced Profiles"] = "Geavanceerde profielen";
-$a->strings["Additional profile sections and selections"] = "Extra onderdelen en keuzes voor je profiel";
-$a->strings["Profile Import/Export"] = "Profiel importen/exporteren";
-$a->strings["Save and load profile details across sites/channels"] = "Profielgegevens opslaan en in andere hubs/kanalen gebruiken.";
-$a->strings["Web Pages"] = "Webpagina's";
-$a->strings["Provide managed web pages on your channel"] = "Sta beheerde webpagina's op jouw kanaal toe";
-$a->strings["Hide Rating"] = "Beoordelingen verbergen";
-$a->strings["Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else."] = "Verbergt de beoordelingsknoppen op jouw kanaal- en profielpagina's. Let op: Mensen kunnen jou nog steeds ergens anders beoordelen. ";
-$a->strings["Private Notes"] = "Privé-aantekeningen";
-$a->strings["Enables a tool to store notes and reminders"] = "Schakelt een eenvoudige toepassing in om aantekeningen en herinneringen in op te slaan";
-$a->strings["Navigation Channel Select"] = "Kanaal kiezen in navigatiemenu";
-$a->strings["Change channels directly from within the navigation dropdown menu"] = "Kies een ander kanaal direct vanuit het dropdown-menu op de navigatiebalk";
-$a->strings["Photo Location"] = "Fotolocatie";
-$a->strings["If location data is available on uploaded photos, link this to a map."] = "Wanneer in de geüploade foto's locatiegegevens aanwezig zijn, link dit dan aan een kaart.";
-$a->strings["Expert Mode"] = "Expertmodus";
-$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Schakel de expertmodus in voor geavanceerde instellingen";
-$a->strings["Premium Channel"] = "Premiumkanaal";
-$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Stelt je in staat om beperkingen en voorwaarden in te stellen voor jouw kanaal";
-$a->strings["Post Composition Features"] = "Functies voor het opstellen van berichten";
-$a->strings["Use Markdown"] = "Markdown gebruiken";
-$a->strings["Allow use of \"Markdown\" to format posts"] = "Sta het gebruik van \"markdown\" toe om berichten mee op te maken.";
-$a->strings["Large Photos"] = "Grote foto's";
-$a->strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Gebruik grotere foto's (1024px) in berichten. Wanneer dit is uitgeschakeld worden er kleinere foto's (640px) gebruikt.";
-$a->strings["Channel Sources"] = "Kanaalbronnen";
-$a->strings["Automatically import channel content from other channels or feeds"] = "Automatisch inhoud uit andere kanalen of feeds importeren.";
-$a->strings["Even More Encryption"] = "Extra encryptie";
-$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde geheime sleutel.";
-$a->strings["Enable Voting Tools"] = "Peilingen inschakelen";
-$a->strings["Provide a class of post which others can vote on"] = "Maakt het mogelijk om een bericht op te stellen, waar mensen op kunnen stemmen.";
-$a->strings["Delayed Posting"] = "Berichten uitstellen";
-$a->strings["Allow posts to be published at a later date"] = "Maakt het mogelijk dat berichten op een toekomstig moment gepubliceerd kunnen worden.";
-$a->strings["Suppress Duplicate Posts/Comments"] = "Dubbele berichten/reacties tegenhouden";
-$a->strings["Prevent posts with identical content to be published with less than two minutes in between submissions."] = "Voorkomt dat berichten en reacties met identieke inhoud en die binnen twee minuten zijn verstuurd, worden gepubliceerd. ";
-$a->strings["Network and Stream Filtering"] = "Netwerk- en streamfilter";
-$a->strings["Search by Date"] = "Zoek op datum";
-$a->strings["Ability to select posts by date ranges"] = "Mogelijkheid om berichten op datum te filteren ";
-$a->strings["Collections (Privacy Groups)"] = "Collecties (privacygroepen)";
-$a->strings["Enable widget to display Network posts only from selected collections"] = "Sta de widget toe om netwerkberichten te tonen van bepaalde collecties";
-$a->strings["Saved Searches"] = "Opgeslagen zoekopdrachten";
-$a->strings["Save search terms for re-use"] = "Sla zoekopdrachten op voor hergebruik";
-$a->strings["Network Personal Tab"] = "Persoonlijke netwerktab";
-$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Sta het toe dat de tab netwerkberichten toont waarmee je interactie had";
-$a->strings["Network New Tab"] = "Nieuwe netwerktab";
-$a->strings["Enable tab to display all new Network activity"] = "Laat de tab alle nieuwe netwerkactiviteit tonen";
-$a->strings["Affinity Tool"] = "Verwantschapsfilter";
-$a->strings["Filter stream activity by depth of relationships"] = "Filter wat je in jouw grid ziet op hoe goed je iemand kent of mag";
-$a->strings["Connection Filtering"] = "Berichtenfilters";
-$a->strings["Filter incoming posts from connections based on keywords/content"] = "Filter binnenkomende berichten van connecties aan de hand van trefwoorden en taal";
-$a->strings["Suggest Channels"] = "Kanalen voorstellen";
-$a->strings["Show channel suggestions"] = "Voor jou mogelijk interessante kanalen voorstellen";
-$a->strings["Post/Comment Tools"] = "Bericht- en reactiehulpmiddelen";
-$a->strings["Community Tagging"] = "Taggen door anderen";
-$a->strings["Ability to tag existing posts"] = "Geeft andere mensen de mogelijkheid om jouw (bestaande) berichten te taggen";
-$a->strings["Post Categories"] = "Categorieën berichten";
-$a->strings["Add categories to your posts"] = "Voeg categorieën toe aan je berichten";
-$a->strings["Ability to file posts under folders"] = "Mogelijkheid om berichten in mappen op te slaan";
-$a->strings["Dislike Posts"] = "Vind berichten niet leuk";
-$a->strings["Ability to dislike posts/comments"] = "Mogelijkheid om berichten en reacties niet leuk te vinden";
-$a->strings["Star Posts"] = "Geef berichten een ster";
-$a->strings["Ability to mark special posts with a star indicator"] = "Mogelijkheid om speciale berichten met een ster te markeren";
-$a->strings["Tag Cloud"] = "Tagwolk";
-$a->strings["Provide a personal tag cloud on your channel page"] = "Zorgt voor een persoonlijke wolk met tags op jouw kanaalpagina";
 $a->strings["Unable to obtain identity information from database"] = "Niet in staat om identiteitsinformatie uit de database te verkrijgen";
 $a->strings["Empty name"] = "Ontbrekende naam";
 $a->strings["Name too long"] = "Naam te lang";
@@ -911,6 +808,58 @@ $a->strings["Blocks"] = "Blokken";
 $a->strings["Menus"] = "Menu's";
 $a->strings["Layouts"] = "Lay-outs";
 $a->strings["Pages"] = "Pagina's";
+$a->strings["Permission denied"] = "Toegang geweigerd";
+$a->strings["(Unknown)"] = "(Onbekend)";
+$a->strings["Visible to anybody on the internet."] = "Voor iedereen op het internet zichtbaar.";
+$a->strings["Visible to you only."] = "Alleen voor jou zichtbaar.";
+$a->strings["Visible to anybody in this network."] = "Voor iedereen in dit netwerk zichtbaar.";
+$a->strings["Visible to anybody authenticated."] = "Voor iedereen die geauthenticeerd is zichtbaar.";
+$a->strings["Visible to anybody on %s."] = "Voor iedereen op %s zichtbaar.";
+$a->strings["Visible to all connections."] = "Voor alle connecties zichtbaar.";
+$a->strings["Visible to approved connections."] = "Voor alle geaccepteerde connecties zichtbaar.";
+$a->strings["Visible to specific connections."] = "Voor specifieke connecties zichtbaar.";
+$a->strings["Item not found."] = "Item niet gevonden.";
+$a->strings["Privacy group not found."] = "Privacygroep niet gevonden";
+$a->strings["Privacy group is empty."] = "Privacygroep is leeg";
+$a->strings["Privacy group: %s"] = "Privacygroep: %s";
+$a->strings["Connection: %s"] = "Connectie: %s";
+$a->strings["Connection not found."] = "Connectie niet gevonden.";
+$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
+$a->strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Notificatie] Nieuw privébericht ontvangen op %s";
+$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s zond jou een nieuw privébericht om %3\$s.";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s zond jou %2\$s.";
+$a->strings["a private message"] = "een privébericht";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bezoek %s om je privéberichten te bekijken en/of er op te reageren.";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]een %4\$s[/zrl]";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]een %5\$s van %4\$s[/zrl]";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]jouw %4\$s[/zrl]";
+$a->strings["[Hubzilla:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla:Notificatie] Reactie op conversatie #%1\$d door %2\$s";
+$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s gaf een reactie op een bericht/conversatie die jij volgt.";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bezoek %s om de conversatie te bekijken en/of er op te reageren.";
+$a->strings["[Hubzilla:Notify] %s posted to your profile wall"] = "[Hubzilla:Notificatie] %s heeft een bericht op jouw kanaal geplaatst";
+$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s heeft om %3\$s een bericht op jouw kanaal geplaatst";
+$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s heeft een bericht op [zrl=%3\$s]jouw kanaal[/zrl] geplaatst";
+$a->strings["[Hubzilla:Notify] %s tagged you"] = "[Hubzilla:Notificatie] %s heeft je genoemd";
+$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s noemde jou op %3\$s";
+$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]noemde jou[/zrl].";
+$a->strings["[Hubzilla:Notify] %1\$s poked you"] = "[Hubzilla:Notificatie] %1\$s heeft je aangestoten";
+$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s heeft je aangestoten op %3\$s";
+$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]heeft je aangestoten[/zrl].";
+$a->strings["[Hubzilla:Notify] %s tagged your post"] = "[Hubzilla:Notificatie] %s heeft jouw bericht getagd";
+$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s heeft jouw bericht om %3\$s getagd";
+$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s heeft [zrl=%3\$s]jouw bericht[/zrl] getagd";
+$a->strings["[Hubzilla:Notify] Introduction received"] = "[Hubzilla:Notificatie] Connectieverzoek ontvangen";
+$a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, je hebt een nieuw connectieverzoek ontvangen van '%2\$s' op %3\$s";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, je hebt een [zrl=%2\$s]nieuw connectieverzoek[/zrl] ontvangen van %3\$s.";
+$a->strings["You may visit their profile at %s"] = "Je kan het profiel bekijken op %s";
+$a->strings["Please visit %s to approve or reject the connection request."] = "Bezoek %s om het connectieverzoek te accepteren of af te wijzen.";
+$a->strings["[Hubzilla:Notify] Friend suggestion received"] = "[Hubzilla:Notificatie] Kanaalvoorstel ontvangen";
+$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, je hebt een kanaalvoorstel ontvangen van '%2\$s' om %3\$s";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, je hebt [zrl=%2\$s]een kanaalvoorstel[/zrl] ontvangen voor %3\$s van %4\$s.";
+$a->strings["Name:"] = "Naam:";
+$a->strings["Photo:"] = "Foto:";
+$a->strings["Please visit %s to approve or reject the suggestion."] = "Bezoek %s om het voorstel te accepteren of af te wijzen.";
+$a->strings["[Hubzilla:Notify]"] = "[Hubzilla:Notificatie]";
 $a->strings["System"] = "Systeem";
 $a->strings["Create Personal App"] = "Persoonlijke app maken";
 $a->strings["Edit Personal App"] = "Persoonlijke app bewerken";
@@ -923,6 +872,7 @@ $a->strings["Enter channel address"] = "Vul kanaaladres in";
 $a->strings["Examples: bob@example.com, https://example.com/barbara"] = "Voorbeelden: bob@example.com, http://example.com/barbara";
 $a->strings["Notes"] = "Aantekeningen";
 $a->strings["Remove term"] = "Verwijder zoekterm";
+$a->strings["Saved Searches"] = "Opgeslagen zoekopdrachten";
 $a->strings["Archives"] = "Archieven";
 $a->strings["Me"] = "Ik";
 $a->strings["Family"] = "Familie";
@@ -938,6 +888,7 @@ $a->strings["Connected apps"] = "Verbonden applicaties";
 $a->strings["Export channel"] = "Kanaal exporteren";
 $a->strings["Connection Default Permissions"] = "Standaard permissies voor connecties";
 $a->strings["Premium Channel Settings"] = "Instellingen premiumkanaal";
+$a->strings["Channel Sources"] = "Kanaalbronnen";
 $a->strings["Private Mail Menu"] = "Privéberichten";
 $a->strings["Combined View"] = "Gecombineerd postvak";
 $a->strings["Conversations"] = "Conversaties";
@@ -982,22 +933,70 @@ $a->strings["Plugin Features"] = "Plug-in-opties";
 $a->strings["User registrations waiting for confirmation"] = "Accounts die op goedkeuring wachten";
 $a->strings["View Photo"] = "Foto weergeven";
 $a->strings["Edit Album"] = "Album bewerken";
-$a->strings["Permission denied"] = "Toegang geweigerd";
-$a->strings["(Unknown)"] = "(Onbekend)";
-$a->strings["Visible to anybody on the internet."] = "Voor iedereen op het internet zichtbaar.";
-$a->strings["Visible to you only."] = "Alleen voor jou zichtbaar.";
-$a->strings["Visible to anybody in this network."] = "Voor iedereen in dit netwerk zichtbaar.";
-$a->strings["Visible to anybody authenticated."] = "Voor iedereen die geauthenticeerd is zichtbaar.";
-$a->strings["Visible to anybody on %s."] = "Voor iedereen op %s zichtbaar.";
-$a->strings["Visible to all connections."] = "Voor alle connecties zichtbaar.";
-$a->strings["Visible to approved connections."] = "Voor alle geaccepteerde connecties zichtbaar.";
-$a->strings["Visible to specific connections."] = "Voor specifieke connecties zichtbaar.";
-$a->strings["Item not found."] = "Item niet gevonden.";
-$a->strings["Collection not found."] = "Collectie niet gevonden.";
-$a->strings["Collection is empty."] = "Collectie is leeg";
-$a->strings["Collection: %s"] = "Collectie: %s";
-$a->strings["Connection: %s"] = "Connectie: %s";
-$a->strings["Connection not found."] = "Connectie niet gevonden.";
+$a->strings["General Features"] = "Algemene functies";
+$a->strings["Content Expiration"] = "Inhoud laten verlopen";
+$a->strings["Remove posts/comments and/or private messages at a future time"] = "Berichten, reacties en/of privéberichten na een bepaalde tijd verwijderen";
+$a->strings["Multiple Profiles"] = "Meerdere profielen";
+$a->strings["Ability to create multiple profiles"] = "Mogelijkheid om meerdere profielen aan te maken";
+$a->strings["Advanced Profiles"] = "Geavanceerde profielen";
+$a->strings["Additional profile sections and selections"] = "Extra onderdelen en keuzes voor je profiel";
+$a->strings["Profile Import/Export"] = "Profiel importen/exporteren";
+$a->strings["Save and load profile details across sites/channels"] = "Profielgegevens opslaan en in andere hubs/kanalen gebruiken.";
+$a->strings["Web Pages"] = "Webpagina's";
+$a->strings["Provide managed web pages on your channel"] = "Sta beheerde webpagina's op jouw kanaal toe";
+$a->strings["Hide Rating"] = "Beoordelingen verbergen";
+$a->strings["Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else."] = "Verbergt de beoordelingsknoppen op jouw kanaal- en profielpagina's. Let op: Mensen kunnen jou nog steeds ergens anders beoordelen. ";
+$a->strings["Private Notes"] = "Privé-aantekeningen";
+$a->strings["Enables a tool to store notes and reminders (note: not encrypted)"] = "Een eenvoudige toepassing om aantekeningen en herinneringen in te bewaren (let op: niet versleuteld)";
+$a->strings["Navigation Channel Select"] = "Kanaal kiezen in navigatiemenu";
+$a->strings["Change channels directly from within the navigation dropdown menu"] = "Kies een ander kanaal direct vanuit het dropdown-menu op de navigatiebalk";
+$a->strings["Photo Location"] = "Fotolocatie";
+$a->strings["If location data is available on uploaded photos, link this to a map."] = "Wanneer in de geüploade foto's locatiegegevens aanwezig zijn, link dit dan aan een kaart.";
+$a->strings["Expert Mode"] = "Expertmodus";
+$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Schakel de expertmodus in voor geavanceerde instellingen";
+$a->strings["Premium Channel"] = "Premiumkanaal";
+$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Stelt je in staat om beperkingen en voorwaarden in te stellen voor jouw kanaal";
+$a->strings["Post Composition Features"] = "Functies voor het opstellen van berichten";
+$a->strings["Use Markdown"] = "Markdown gebruiken";
+$a->strings["Allow use of \"Markdown\" to format posts"] = "Sta het gebruik van \"markdown\" toe om berichten mee op te maken.";
+$a->strings["Large Photos"] = "Grote foto's";
+$a->strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Gebruik grotere foto's (1024px) in berichten. Wanneer dit is uitgeschakeld worden er kleinere foto's (640px) gebruikt.";
+$a->strings["Automatically import channel content from other channels or feeds"] = "Automatisch inhoud uit andere kanalen of feeds importeren.";
+$a->strings["Even More Encryption"] = "Extra encryptie";
+$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde geheime sleutel.";
+$a->strings["Enable Voting Tools"] = "Peilingen inschakelen";
+$a->strings["Provide a class of post which others can vote on"] = "Maakt het mogelijk om een bericht op te stellen, waar mensen op kunnen stemmen.";
+$a->strings["Delayed Posting"] = "Berichten uitstellen";
+$a->strings["Allow posts to be published at a later date"] = "Maakt het mogelijk dat berichten op een toekomstig moment gepubliceerd kunnen worden.";
+$a->strings["Suppress Duplicate Posts/Comments"] = "Dubbele berichten/reacties tegenhouden";
+$a->strings["Prevent posts with identical content to be published with less than two minutes in between submissions."] = "Voorkomt dat berichten en reacties met identieke inhoud en die binnen twee minuten zijn verstuurd, worden gepubliceerd. ";
+$a->strings["Network and Stream Filtering"] = "Netwerk- en streamfilter";
+$a->strings["Search by Date"] = "Zoek op datum";
+$a->strings["Ability to select posts by date ranges"] = "Mogelijkheid om berichten op datum te filteren ";
+$a->strings["Enable management and selection of privacy groups"] = "Beheer en selectie van privacygroepen inschakelen";
+$a->strings["Save search terms for re-use"] = "Sla zoekopdrachten op voor hergebruik";
+$a->strings["Network Personal Tab"] = "Persoonlijke netwerktab";
+$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Sta het toe dat de tab netwerkberichten toont waarmee je interactie had";
+$a->strings["Network New Tab"] = "Nieuwe netwerktab";
+$a->strings["Enable tab to display all new Network activity"] = "Laat de tab alle nieuwe netwerkactiviteit tonen";
+$a->strings["Affinity Tool"] = "Verwantschapsfilter";
+$a->strings["Filter stream activity by depth of relationships"] = "Filter wat je in jouw grid ziet op hoe goed je iemand kent of mag";
+$a->strings["Connection Filtering"] = "Berichtenfilters";
+$a->strings["Filter incoming posts from connections based on keywords/content"] = "Filter binnenkomende berichten van connecties aan de hand van trefwoorden en taal";
+$a->strings["Suggest Channels"] = "Kanalen voorstellen";
+$a->strings["Show channel suggestions"] = "Voor jou mogelijk interessante kanalen voorstellen";
+$a->strings["Post/Comment Tools"] = "Bericht- en reactiehulpmiddelen";
+$a->strings["Community Tagging"] = "Taggen door anderen";
+$a->strings["Ability to tag existing posts"] = "Geeft andere mensen de mogelijkheid om jouw (bestaande) berichten te taggen";
+$a->strings["Post Categories"] = "Categorieën berichten";
+$a->strings["Add categories to your posts"] = "Voeg categorieën toe aan je berichten";
+$a->strings["Ability to file posts under folders"] = "Mogelijkheid om berichten in mappen op te slaan";
+$a->strings["Dislike Posts"] = "Vind berichten niet leuk";
+$a->strings["Ability to dislike posts/comments"] = "Mogelijkheid om berichten en reacties niet leuk te vinden";
+$a->strings["Star Posts"] = "Geef berichten een ster";
+$a->strings["Ability to mark special posts with a star indicator"] = "Mogelijkheid om speciale berichten met een ster te markeren";
+$a->strings["Tag Cloud"] = "Tagwolk";
+$a->strings["Provide a personal tag cloud on your channel page"] = "Zorgt voor een persoonlijke wolk met tags op jouw kanaalpagina";
 $a->strings["Not Found"] = "Niet gevonden";
 $a->strings["Page not found."] = "Pagina niet gevonden.";
 $a->strings["Some blurb about what to do when you're new here"] = "Welkom op \$Projectname. Klik op de tab ontdekken of klik rechtsboven op de <a href=\"directory\">kanalengids</a>, om kanalen te vinden. Rechtsboven vind je ook <a href=\"directory\">apps</a>, waar je vrijwel alle functies van \$Projectname kunt vinden. Voor <a href=\"directory\">hulp</a> met \$Projectname klik je op het vraagteken.";
@@ -1270,6 +1269,8 @@ $a->strings["Channel address"] = "Kanaaladres";
 $a->strings["Network"] = "Netwerk";
 $a->strings["Connected"] = "Verbonden";
 $a->strings["Approve connection"] = "Connectie accepteren";
+$a->strings["Ignore connection"] = "Connectie negeren";
+$a->strings["Ignore"] = "Negeren";
 $a->strings["Recent activity"] = "Recente activiteit";
 $a->strings["Search your connections"] = "Doorzoek jouw connecties";
 $a->strings["Connections search"] = "Connecties zoeken";
@@ -1290,7 +1291,6 @@ $a->strings["View recent posts and comments"] = "Recente berichten en reacties w
 $a->strings["Block (or Unblock) all communications with this connection"] = "Blokkeer (of deblokkeer) alle communicatie met deze connectie";
 $a->strings["This connection is blocked!"] = "Deze connectie is geblokkeerd!";
 $a->strings["Unignore"] = "Niet meer negeren";
-$a->strings["Ignore"] = "Negeren";
 $a->strings["Ignore (or Unignore) all inbound communications from this connection"] = "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie";
 $a->strings["This connection is ignored!"] = "Deze connectie wordt genegeerd!";
 $a->strings["Unarchive"] = "Niet meer archiveren";
@@ -1438,15 +1438,15 @@ $a->strings["Contact not found."] = "Contact niet gevonden";
 $a->strings["Friend suggestion sent."] = "Kanaalvoorstel verzonden.";
 $a->strings["Suggest Friends"] = "Kanalen voorstellen";
 $a->strings["Suggest a friend for %s"] = "Stel een kanaal voor aan %s";
-$a->strings["Collection created."] = "Collectie aangemaakt";
-$a->strings["Could not create collection."] = "Collectie kon niet aangemaakt worden";
-$a->strings["Collection updated."] = "Collectie bijgewerkt.";
-$a->strings["Create a collection of channels."] = "Kanaalcollectie aanmaken";
-$a->strings["Collection Name: "] = "Naam collectie:";
-$a->strings["Members are visible to other channels"] = "Kanalen in deze collectie zijn zichtbaar voor andere kanalen";
-$a->strings["Collection removed."] = "Collectie verwijderd";
-$a->strings["Unable to remove collection."] = "Verwijderen collectie mislukt";
-$a->strings["Collection Editor"] = "Collectiebewerker";
+$a->strings["Privacy group created."] = "Privacygroep aangemaakt";
+$a->strings["Could not create privacy group."] = "Kon privacygroep niet aanmaken";
+$a->strings["Privacy group updated."] = "Privacygroep bijgewerkt";
+$a->strings["Create a group of channels."] = "Privacygroep met kanalen aanmaken";
+$a->strings["Privacy group name: "] = "Naam privacygroep: ";
+$a->strings["Members are visible to other channels"] = "Kanalen in deze privacygroep zijn zichtbaar voor andere kanalen";
+$a->strings["Privacy group removed."] = "Privacygroep verwijderd.";
+$a->strings["Unable to remove privacy group."] = "Verwijderen privacygroep mislukt";
+$a->strings["Privacy group editor"] = "Privacygroep bewerken";
 $a->strings["Members"] = "Kanalen";
 $a->strings["All Connected Channels"] = "Alle kanaalconnecties";
 $a->strings["Click on a channel to add or remove."] = "Klik op een kanaal om deze toe te voegen of te verwijderen.";
@@ -1555,6 +1555,9 @@ $a->strings["Sync now"] = "Nu synchroniseren";
 $a->strings["Please wait several minutes between consecutive operations."] = "Wacht enkele minuten tussen opeenvolgende handelingen.";
 $a->strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Wij adviseren, wanneer dit (nog) mogelijk is, de locatie te verwijderen door op de hub van de kloon in te loggen en het kanaal daar te verwijderen.";
 $a->strings["Use this form to drop the location if the hub is no longer operating."] = "Gebruik dit formulier om de locatie te verwijderen wanneer de hub van de kloon niet meer operationeel is.";
+$a->strings["sent you a private message"] = "stuurde jou een privébericht";
+$a->strings["added your channel"] = "voegde jouw kanaal toe";
+$a->strings["posted an event"] = "plaatste een gebeurtenis";
 $a->strings["Hub not found."] = "Hub niet gevonden.";
 $a->strings["Unable to lookup recipient."] = "Niet in staat om ontvanger op te zoeken.";
 $a->strings["Unable to communicate with requested channel."] = "Niet in staat om met het aangevraagde kanaal te communiceren.";
@@ -1647,8 +1650,8 @@ $a->strings["No such group"] = "Collectie niet gevonden";
 $a->strings["No such channel"] = "Niet zo'n kanaal";
 $a->strings["forum"] = "forum";
 $a->strings["Search Results For:"] = "Zoekresultaten voor:";
-$a->strings["Collection is empty"] = "Collectie is leeg";
-$a->strings["Collection: "] = "Collectie: ";
+$a->strings["Privacy group is empty"] = "Privacygroep is leeg";
+$a->strings["Privacy group: "] = "Privacygroep: ";
 $a->strings["Invalid connection."] = "Ongeldige connectie.";
 $a->strings["Add a Channel"] = "Kanaal toevoegen";
 $a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "Naast een account moet je tenminste één kanaal aanmaken. Een kanaal is een persoonlijke verzameling (gerelateerde) berichten en media, zoals je misschien gewend bent van sociale netwerken. Een kanaal kan gebruikt worden voor social media, een blog, forum, en voor veel meer. Je kan net zoveel kanalen aanmaken als dat de eigenaar/beheerder van jouw hub toestaat.";
@@ -1713,9 +1716,6 @@ $a->strings["In This Photo:"] = "Op deze foto:";
 $a->strings["Map"] = "Kaart";
 $a->strings["View Album"] = "Album weergeven";
 $a->strings["Recent Photos"] = "Recente foto's";
-$a->strings["sent you a private message"] = "stuurde jou een privébericht";
-$a->strings["added your channel"] = "voegde jouw kanaal toe";
-$a->strings["posted an event"] = "plaatste een gebeurtenis";
 $a->strings["Poke/Prod"] = "Aanstoten/porren";
 $a->strings["poke, prod or do other things to somebody"] = "aanstoten, porren of andere dingen met iemand doen";
 $a->strings["Recipient"] = "Ontvanger";
@@ -1963,7 +1963,7 @@ $a->strings["Allow others to tag your posts"] = "Anderen toestaan om je berichte
 $a->strings["Often used by the community to retro-actively flag inappropriate content"] = "Vaak in groepen/forums gebruikt om met terugwerkende kracht ongepast materiaal te markeren";
 $a->strings["Advanced Privacy Settings"] = "Geavanceerde privacy-instellingen";
 $a->strings["Expire other channel content after this many days"] = "Inhoud van andere kanalen na zoveel aantal dagen laten verlopen:";
-$a->strings["0 or blank prevents expiration"] = "0 of leeg voorkomt het verlopen";
+$a->strings["0 or blank to use the website limit. The website expires after %d days."] = "0 of leeg om het standaard aantal dagen van deze hub te gebruiken. Deze hub laat de inhoud van andere kanalen na %d dagen verlopen.";
 $a->strings["Maximum Friend Requests/Day:"] = "Maximum aantal connectieverzoeken per dag:";
 $a->strings["May reduce spam activity"] = "Kan eventuele spam verminderen";
 $a->strings["Default Post Permissions"] = "Standaard permissies voor nieuwe berichten";
diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css
index 38701024f..36e26302a 100644
--- a/view/theme/redbasic/schema/bluegrid.css
+++ b/view/theme/redbasic/schema/bluegrid.css
@@ -11,6 +11,11 @@ body 	{
 	border: 1px solid #FFF;
 }
 
+#profile-jot-wrapper {
+	background-color: inherit;
+	border: none;
+}
+
 .generic-content-wrapper-styled a:hover, .generic-content-wrapper-styled a:focus, .generic-content-wrapper-styled .field.checkbox:hover label, .generic-content-wrapper-styled .field.checkbox:focus label, .allcontact-link:hover, .allcontact-link:focus {
 	color: rgba(255,255,255,.8);
 }
@@ -458,3 +463,5 @@ a:hover > .icon-trash {
 		background-color: #43488A !important;
 	}
 }
+
+
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index b667dca5c..16044b224 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -5,6 +5,7 @@
 
 .vcard, #contact-block, .widget {
 	background-color: transparent;
+	border: none;
 	border-bottom: 1px solid #333;
 	border-radius: 0px
 }
@@ -336,11 +337,18 @@ pre {
 	text-decoration: underline;
 }
 
-
-
 @media (min-width: 768px) {
   .nav-tabs.nav-justified > li > a {
     border-bottom: 1px solid #333;
   }
 }
 
+#profile-jot-wrapper {
+	background-color: inherit;
+	border: none;
+}
+
+.nav-tabs.nav-justified {
+	background-color: inherit;
+	border: none;
+}
diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css
index 5a6b2655b..ba9771a40 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.css
+++ b/view/theme/redbasic/schema/simple_black_on_white.css
@@ -5,6 +5,7 @@
 
 .vcard, #contact-block, .widget {
 	background-color: transparent;
+	border: none;
 	border-bottom: 1px solid #fff;
 }
 
@@ -265,4 +266,12 @@ pre {
   }
 }
 
+#profile-jot-wrapper {
+	background-color: inherit;
+	border: none;
+}
 
+.nav-tabs.nav-justified {
+	background-color: inherit;
+	border: none;
+}
diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css
index d25585f98..0928c64f3 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.css
+++ b/view/theme/redbasic/schema/simple_green_on_black.css
@@ -5,6 +5,7 @@
 
 .vcard, #contact-block, .widget {
 	background-color: transparent;
+	border: none;
 	border-bottom: 1px solid #fff;
 }
 
@@ -282,4 +283,12 @@ pre {
   }
 }
 
+#profile-jot-wrapper {
+	background-color: inherit;
+	border: none;
+}
 
+.nav-tabs.nav-justified {
+	background-color: inherit;
+	border: none;
+}
diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css
index 277ac7a12..45bdba1cd 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.css
+++ b/view/theme/redbasic/schema/simple_white_on_black.css
@@ -5,6 +5,7 @@
 
 .vcard, #contact-block, .widget {
 	background-color: transparent;
+	border: none;
 	border-bottom: 1px solid #fff;
 }
 
@@ -261,4 +262,12 @@ pre {
   }
 }
 
+#profile-jot-wrapper {
+	background-color: inherit;
+	border: none;
+}
 
+.nav-tabs.nav-justified {
+	background-color: inherit;
+	border: none;
+}
-- 
cgit v1.2.3


From a341c889b751055e90eba9b7a14da5b7cd0e8032 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 31 Jan 2016 15:55:27 -0800
Subject: add oembed provider for photos

---
 boot.php             |  2 +-
 include/oembed.php   |  7 ++--
 include/security.php |  2 +-
 index.php            | 11 ++++---
 mod/oep.php          | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 mod/photos.php       |  2 ++
 version.inc          |  2 +-
 7 files changed, 110 insertions(+), 9 deletions(-)
 create mode 100644 mod/oep.php

diff --git a/boot.php b/boot.php
index 4b49cacb5..8b5e75326 100755
--- a/boot.php
+++ b/boot.php
@@ -48,7 +48,7 @@ require_once('include/AccessList.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')));
-define ( 'STD_VERSION',             '1.1.3' );
+define ( 'STD_VERSION',             '1.1.4' );
 define ( 'ZOT_REVISION',            1     );
 
 define ( 'DB_UPDATE_VERSION',       1161  );
diff --git a/include/oembed.php b/include/oembed.php
index e50d34c7d..b95f93f91 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -78,7 +78,6 @@ function oembed_fetch_url($embedurl){
 		else {
 			// try oembed autodiscovery
 			$redirects = 0;
-
 			$result = z_fetch_url($embedurl, false, $redirects, array('timeout' => 15, 'accept_content' => "text/*", 'novalidate' => true ));
 			if($result['success'])
 				$html_text = $result['body'];
@@ -88,8 +87,8 @@ function oembed_fetch_url($embedurl){
 				if ($dom){
 					$xpath = new DOMXPath($dom);
 					$attr = "oembed";
-				
 					$xattr = oe_build_xpath("class","oembed");
+
 					$entries = $xpath->query("//link[@type='application/json+oembed']");
 					foreach($entries as $e){
 						$href = $e->getAttributeNode("href")->nodeValue;
@@ -173,6 +172,10 @@ function oembed_format_object($j){
 			$ret.="<br>";
 		}; break;  
 		case "link": {
+			if($j->thumbnail_url) {
+				$ret = '<a href="' . $embedurl . '" ><img src="' . $j->thumbnail_url . '" alt="thumbnail" /></a><br /><br />';
+			}
+
 			//$ret = "<a href='".$embedurl."'>".$j->title."</a>";
 		}; break;  
 		case "rich": {
diff --git a/include/security.php b/include/security.php
index 2a9a6e39e..ee94dba82 100644
--- a/include/security.php
+++ b/include/security.php
@@ -181,7 +181,7 @@ function permissions_sql($owner_id, $remote_observer = null) {
 	 */
 
 	else {
-		$observer = (($remote_observer) ? $remote_observer : get_observer_hash());
+		$observer = ((! is_null($remote_observer)) ? $remote_observer : get_observer_hash());
 		if($observer) {
 			$groups = init_groups_visitor($observer);
 
diff --git a/index.php b/index.php
index 7e9cde9bb..2d8116f96 100755
--- a/index.php
+++ b/index.php
@@ -289,9 +289,12 @@ if($a->module_loaded) {
 	 */
 
 	if(function_exists($a->module . '_init')) {
-		call_hooks($a->module . '_mod_init', $placeholder);
-		$func = $a->module . '_init';
-		$func($a);
+		$arr = array('init' => true, 'replace' => false);		
+		call_hooks($a->module . '_mod_init', $arr);
+		if(! $arr['replace']) {
+			$func = $a->module . '_init';
+			$func($a);
+		}
 	}
 
 	/**
@@ -333,7 +336,7 @@ if($a->module_loaded) {
 
 	if(($_SERVER['REQUEST_METHOD'] === 'POST') && (! $a->error)
 		&& (function_exists($a->module . '_post'))
-		&& (! x($_POST, 'auth-params'))) {
+		&& (! x($_POST, 'auth-params'))) {		
 		call_hooks($a->module . '_mod_post', $_POST);
 		$func = $a->module . '_post';
 		$func($a);
diff --git a/mod/oep.php b/mod/oep.php
new file mode 100644
index 000000000..d0f4bd193
--- /dev/null
+++ b/mod/oep.php
@@ -0,0 +1,93 @@
+<?php
+
+// oembed provider
+
+
+
+function oep_init(&$a) {
+
+
+
+	$url = $_REQUEST['url'];
+	if(! $url)
+		http_status_exit(404, 'Not found');
+
+	$maxwidth  = $_REQUEST['maxwidth'];
+	$maxheight = $_REQUEST['maxheight'];
+	$format = $_REQUEST['format'];
+	if($format && $format !== 'json')
+		http_status_exit(501, 'Not implemented');
+
+	if(fnmatch('*/photos/*/album/*',$url))
+		$arr = oep_album_reply($_REQUEST);
+	elseif(fnmatch('*/photos/*',$url))
+		$arr = oep_photo_reply($_REQUEST);
+
+
+	if($arr) {
+		header('Content-Type: application/json+oembed');
+		echo json_encode($arr);
+		killme();
+	}
+
+	http_status_exit(404,'Not found');
+
+}
+
+
+function oep_album_reply() {
+
+}
+
+function oep_photo_reply($args) {
+
+	$ret = array();
+	$url = $args['url'];
+	$maxwidth  = intval($args['maxwidth']);
+	$maxheight = intval($args['maxheight']);
+
+	if(preg_match('|//(.*?)/(.*?)/(.*?)/image/|',$url,$matches)) {
+		$chn = $matches[3];
+		$res = basename($url);
+	}
+
+	if(! ($chn && $res))
+		return;
+	$c = q("select * from channel where channel_address = '%s' limit 1",
+		dbesc($chn)
+	);
+
+	if(! $c)
+		return;
+
+	$sql_extra = permissions_sql($c[0]['channel_id']);
+
+
+	$r = q("select height, width, scale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by scale asc",
+		intval($c[0]['channel_id']),
+		dbesc($res)
+	);
+
+	if($r) {
+		foreach($r as $rr) {
+			$foundres = false;
+			if($maxheight && $rr['height'] > $maxheight)
+				continue;
+			if($maxwidth && $rr['width'] > $maxwidth)
+				continue;
+			$foundres = true;			
+			break;
+		}
+
+		if($foundres) {
+			$ret['type'] = 'link';
+			$ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['scale'];
+			$ret['thumbnail_width'] = $rr['width'];
+			$ret['thumbnail_height'] = $rr['height'];
+		}
+			
+
+	}
+	return $ret;
+
+}
\ No newline at end of file
diff --git a/mod/photos.php b/mod/photos.php
index f1b7aceed..d187e1d45 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -804,6 +804,8 @@ function photos_content(&$a) {
 
 	if($datatype === 'image') {
 
+		$a->page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . $a->cmd) . '" title="oembed" />' . "\r\n";
+
 		// fetch image, item containing image, then comments
 
 		$ph = q("SELECT id,aid,uid,xchan,resource_id,created,edited,title,`description`,album,filename,`type`,height,width,`size`,scale,photo_usage,is_nsfw,allow_cid,allow_gid,deny_cid,deny_gid FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s' 
diff --git a/version.inc b/version.inc
index 1c457edcc..0ee245598 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-01-29.1293H
+2016-01-31.1295H
-- 
cgit v1.2.3


From f26c698f4ae4b1fbc42d7f0ef149c64953439521 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 31 Jan 2016 16:33:25 -0800
Subject: add zid

---
 include/oembed.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/oembed.php b/include/oembed.php
index b95f93f91..2d3e0d3f9 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -173,6 +173,10 @@ function oembed_format_object($j){
 		}; break;  
 		case "link": {
 			if($j->thumbnail_url) {
+				if(is_matrix_url($embedurl)) {
+					$embedurl = zid($embedurl);
+					$j->thumbnail_url = zid($j->thumbnail_url);
+				}
 				$ret = '<a href="' . $embedurl . '" ><img src="' . $j->thumbnail_url . '" alt="thumbnail" /></a><br /><br />';
 			}
 
-- 
cgit v1.2.3


From b0e098bb686800734a07984d9a470d893de231cd Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 31 Jan 2016 19:16:32 -0800
Subject: rev update

---
 CHANGELOG | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 boot.php  |  2 +-
 2 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 000000000..b59f94c79
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,92 @@
+
+Hubzilla 1.2
+	Provide extra HTTP security headers (several of them).
+	Allow a site to disable delivery reports
+	Regression: Wrong theme when viewing single post as non-member
+	Some Diaspora profile photos use relative URLs - force absolute
+	Add locked features to siteinfo report to aid remote debugging
+	Provide version compatibility checking to plugins (minversion, maxversion and minphpversion)
+	Account config storage
+	Provide optional integrated registration and channel create form 
+	cli utility for managing addons
+	issue sharing photo "items"
+	cover photos: upload, crop, and store
+	cover photo widget created
+	rework the connections list page and provide a few management features there
+	fixed issue with Comanche layout definitions loaded by plugins
+	provide ability to separate delivery functions from item_store() and item_store_update() - some forum messages were being redelivered when cloned.
+	call build_sync_packet() on pdledit changes
+	Abstract the project name and version so these can be customised or removed
+	Allow hiding the ratings links on a per-site basis
+	db_type not present in international setup templates - was unable to choose postgres.
+	item_photo_menu logically divided into a) actions on the post, b) actions related to the author
+	bug: default channel not reset to 0 when last channel removed
+	create widget containing only the contact block
+	regression: public forums granted send stream permissions to connections
+	workaround Firefox's refusal to honour disabling autocomplete of passwords
+	regression: photo's uploaded to a channel by a guest (with file write permissions) not saved correctly.
+	provide mechanisms for custom .well-known handlers (needed for LetsEncrypt ownership verification)
+	proc_run modified to use exec() instead of proc_open() - causing issues on some PHP installations
+	remote delegation failure under a specific set of circumstances which we were finally able to duplicate
+	Delegation section of Channel Manager was missing names and contained useless notification icons.
+	Change "expire" channel setting to show system limit if there is one. 
+	Regression: provide a one-click ignore of pending connection
+	Config to control directory keyword generation on client and server.
+	"Collections" renamed to "Privacy Groups", documentation improved
+	widget_item - allow use of page title instead of message id
+	Add site black/white list checking to all .well-known services
+	reduce incidents of screen jumping when "showmore" is activated
+	add oembed provider for photos
+
+	Addons:
+
+	CSS theming of pageheader plugin
+	xmpp addon ported from Friendica
+	Diaspora private mail issues after the third reply
+	Occasional issue with Diaspora connection requests
+	Add notification email to Diaspora PMs
+	Allow anonymising platform and version for statistics
+	msgfooter addon created
+	removed embedly plugin
+	sync clones after superblock addition
+	"keepout" plugin created
+
+
+Hubzilla 1.1
+
+	Rewrote and simplified the Queue manager and delivery system
+	Rewrote and simplified the outer layers of the Zot protocol
+	Use a standard version numbering scheme in addition to the snapshot tags
+	Provide a channel blacklist for blocking channels with abusive or illegal content at the hub level
+	Make the black/white lists pluggable
+	Update template library
+	Support for letsencrypt certs in various places
+	Cleanup of login and register pages
+	Better error responses for permission denied on channel file repositories
+	Disabled the public stream by default for new installs (can be enabled if desired)
+	Cleanup of API authentication and rework the old OAuth1 stuff
+	Add API "status with media" support compatible with Twitter and conflicting method for GNU-social
+	Rework photo ActivityStreams objects to align better with ActivityStreams producers/consumers
+	Several minor API fixes to work better with AndStatus client
+	Invitation only site - experimental support added, needs more work
+	Fix delivery loop condition due to corrupted data which resulted in recursive upstream delivery
+	Provide more support for external (git) widget collections.
+	Extend the Queue API to 3rd-party network addons which have experienced downtime recently.
+	Regression: Inherited permissions were not explicitly set
+	Regression: "Xyz posted on your wall" notification sent when creating webpages at another channel
+	Regression: Custom permissions not pre-populated on channel creation with named role.
+	Provide "Public" string when a post can be made public, instead of "visible to default audience"
+	Allow hub admin to specify a default role type for the first channel created, reducing complexity
+	Ability for a hub admin to set feature defaults and lock them, reducing complexity
+	Change default expiration of delivery reports to 10 days to accomodate sites with reduced resources
+	Addons/Plugins:
+		Pageheader addon ported from Friendica
+		Hubwall (allow admin to send email to all accounts on this hub) created
+		GNU-social - queueing added 
+		Diaspora - fixes for various failures to update profile photos, updates to queue API 
+		Cross Domain Authenticated Chess (Andrew Manning's repository)
+	
+	And... the normal "lots of bugs fixed, translations updated, and documentation improved" 
+	
+
+	
diff --git a/boot.php b/boot.php
index 8b5e75326..238935da3 100755
--- a/boot.php
+++ b/boot.php
@@ -48,7 +48,7 @@ require_once('include/AccessList.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')));
-define ( 'STD_VERSION',             '1.1.4' );
+define ( 'STD_VERSION',             '1.2' );
 define ( 'ZOT_REVISION',            1     );
 
 define ( 'DB_UPDATE_VERSION',       1161  );
-- 
cgit v1.2.3


From e8ded61efbf678aa49f7c4445948bb91a41d41ea Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 31 Jan 2016 19:26:02 -0800
Subject: minor changes to changelog

---
 CHANGELOG | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index b59f94c79..819347552 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,16 +1,16 @@
 
 Hubzilla 1.2
 	Provide extra HTTP security headers (several of them).
-	Allow a site to disable delivery reports
+	Allow a site to disable delivery reports if disk space is limited
 	Regression: Wrong theme when viewing single post as non-member
 	Some Diaspora profile photos use relative URLs - force absolute
 	Add locked features to siteinfo report to aid remote debugging
-	Provide version compatibility checking to plugins (minversion, maxversion and minphpversion)
+	Provide version compatibility checking to plugins (minversion, maxversion, and minphpversion)
 	Account config storage
 	Provide optional integrated registration and channel create form 
 	cli utility for managing addons
-	issue sharing photo "items"
-	cover photos: upload, crop, and store
+	issue with sharing photo "items"
+	cover photo manager: upload, crop, and store
 	cover photo widget created
 	rework the connections list page and provide a few management features there
 	fixed issue with Comanche layout definitions loaded by plugins
-- 
cgit v1.2.3


From fd9f792f90c2aa173627d38685829ac94909763e Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 31 Jan 2016 20:05:47 -0800
Subject: add album embed (embed the most recent photo with link to album)

---
 mod/oep.php    | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 mod/photos.php |  4 ++++
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/mod/oep.php b/mod/oep.php
index d0f4bd193..1cea83e95 100644
--- a/mod/oep.php
+++ b/mod/oep.php
@@ -35,7 +35,64 @@ function oep_init(&$a) {
 }
 
 
-function oep_album_reply() {
+function oep_album_reply($args) {
+
+	$ret = array();
+	$url = $args['url'];
+	$maxwidth  = intval($args['maxwidth']);
+	$maxheight = intval($args['maxheight']);
+
+	if(preg_match('|//(.*?)/(.*?)/(.*?)/album/|',$url,$matches)) {
+		$chn = $matches[3];
+		$res = hex2bin(basename($url));
+	}
+
+	if(! ($chn && $res))
+		return;
+	$c = q("select * from channel where channel_address = '%s' limit 1",
+		dbesc($chn)
+	);
+
+	if(! $c)
+		return;
+
+	$sql_extra = permissions_sql($c[0]['channel_id']);
+
+	$p = q("select resource_id from photo where album = '%s' and uid = %d group by resource_id $sql_extra order by created desc",
+  		dbesc($res),
+		intval($c[0]['channel_id'])
+	);
+	if(! $p)
+		return;
+
+	$res = $p[0]['resource_id'];
+
+	$r = q("select height, width, scale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by scale asc",
+		intval($c[0]['channel_id']),
+		dbesc($res)
+	);
+
+	if($r) {
+		foreach($r as $rr) {
+			$foundres = false;
+			if($maxheight && $rr['height'] > $maxheight)
+				continue;
+			if($maxwidth && $rr['width'] > $maxwidth)
+				continue;
+			$foundres = true;			
+			break;
+		}
+
+		if($foundres) {
+			$ret['type'] = 'link';
+			$ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['scale'];
+			$ret['thumbnail_width'] = $rr['width'];
+			$ret['thumbnail_height'] = $rr['height'];
+		}
+			
+
+	}
+	return $ret;
 
 }
 
diff --git a/mod/photos.php b/mod/photos.php
index d187e1d45..7864b9a18 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -660,6 +660,10 @@ function photos_content(&$a) {
 
 		$album = (($datum) ? hex2bin($datum) : '');
 
+
+		$a->page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . $a->cmd) . '" title="oembed" />' . "\r\n";
+
+
 		$r = q("SELECT `resource_id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' 
 			AND `scale` <= 4 and photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY `resource_id`",
 			intval($owner_uid),
-- 
cgit v1.2.3


From 01b5b1347521951ca78b1718b03c45897800bf5e Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 31 Jan 2016 20:44:54 -0800
Subject: oep for the photo top page

---
 mod/oep.php    | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 mod/photos.php |  3 +++
 2 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/mod/oep.php b/mod/oep.php
index 1cea83e95..9bc0de98f 100644
--- a/mod/oep.php
+++ b/mod/oep.php
@@ -20,9 +20,10 @@ function oep_init(&$a) {
 
 	if(fnmatch('*/photos/*/album/*',$url))
 		$arr = oep_album_reply($_REQUEST);
-	elseif(fnmatch('*/photos/*',$url))
+	elseif(fnmatch('*/photos/*/image/*',$url))
 		$arr = oep_photo_reply($_REQUEST);
-
+	elseif(fnmatch('*/photos*',$url))
+		$arr = oep_phototop_reply($_REQUEST);
 
 	if($arr) {
 		header('Content-Type: application/json+oembed');
@@ -58,7 +59,7 @@ function oep_album_reply($args) {
 
 	$sql_extra = permissions_sql($c[0]['channel_id']);
 
-	$p = q("select resource_id from photo where album = '%s' and uid = %d group by resource_id $sql_extra order by created desc",
+	$p = q("select resource_id from photo where album = '%s' and uid = %d and scale = 0 $sql_extra order by created desc limit 1",
   		dbesc($res),
 		intval($c[0]['channel_id'])
 	);
@@ -96,6 +97,67 @@ function oep_album_reply($args) {
 
 }
 
+
+function oep_phototop_reply($args) {
+
+	$ret = array();
+	$url = $args['url'];
+	$maxwidth  = intval($args['maxwidth']);
+	$maxheight = intval($args['maxheight']);
+
+	if(preg_match('|//(.*?)/(.*?)/(.*?)$|',$url,$matches)) {
+		$chn = $matches[3];
+	}
+
+	if(! $chn)
+		return;
+	$c = q("select * from channel where channel_address = '%s' limit 1",
+		dbesc($chn)
+	);
+
+	if(! $c)
+		return;
+
+	$sql_extra = permissions_sql($c[0]['channel_id']);
+
+	$p = q("select resource_id from photo where uid = %d and scale = 0 $sql_extra order by created desc limit 1",
+		intval($c[0]['channel_id'])
+	);
+	if(! $p)
+		return;
+
+	$res = $p[0]['resource_id'];
+
+	$r = q("select height, width, scale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by scale asc",
+		intval($c[0]['channel_id']),
+		dbesc($res)
+	);
+
+	if($r) {
+		foreach($r as $rr) {
+			$foundres = false;
+			if($maxheight && $rr['height'] > $maxheight)
+				continue;
+			if($maxwidth && $rr['width'] > $maxwidth)
+				continue;
+			$foundres = true;			
+			break;
+		}
+
+		if($foundres) {
+			$ret['type'] = 'link';
+			$ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['scale'];
+			$ret['thumbnail_width'] = $rr['width'];
+			$ret['thumbnail_height'] = $rr['height'];
+		}
+			
+
+	}
+	return $ret;
+
+}
+
+
 function oep_photo_reply($args) {
 
 	$ret = array();
diff --git a/mod/photos.php b/mod/photos.php
index 7864b9a18..d6105c580 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1232,6 +1232,9 @@ function photos_content(&$a) {
 	// Default - show recent photos with upload link (if applicable)
 	//$o = '';
 
+		$a->page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . $a->cmd) . '" title="oembed" />' . "\r\n";
+
+
 	$r = q("SELECT `resource_id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' 
 		and photo_usage in ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY `resource_id`",
 		intval($a->data['channel']['channel_id']),
-- 
cgit v1.2.3