Merge https://github.com/redmatrix/hubzilla into pending_merge

author: redmatrix <redmatrix@redmatrix.me> 2015-11-01 15:52:35 -0800
committer: redmatrix <redmatrix@redmatrix.me> 2015-11-01 15:52:35 -0800
commit: d3183467e06d6d7a04221c63d26173f97217cc43 (patch)
tree: 1da3ddc58b87a0afdfa0bf262c2d0950a192ccce
parent: b62614bbd48151837e29ab56a53e683d2f4dcb01 (diff)
parent: 618155e6ab1a76b5aaa667aa41a1668ce8f73a20 (diff)
download: volse-hubzilla-d3183467e06d6d7a04221c63d26173f97217cc43.tar.gz
volse-hubzilla-d3183467e06d6d7a04221c63d26173f97217cc43.tar.bz2
volse-hubzilla-d3183467e06d6d7a04221c63d26173f97217cc43.zip
25 files changed, 1565 insertions, 1355 deletions
diff --git a/boot.php b/boot.php
index cdf3c302b..dafe20b83 100755
--- a/boot.php
+++ b/boot.php
@@ -79,7 +79,7 @@ define ( 'DIRECTORY_FALLBACK_MASTER',  'https://zothub.com');
 
 $DIRECTORY_FALLBACK_SERVERS = array( 
 	'https://zothub.com', 
-	'https://zotid.net', 
+	'https://hubzilla.site',
 	'https://red.zottel.red',
 	'https://gravizot.de',
 	'https://my.federated.social'
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 7cba40672..1be7caa19 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -162,10 +162,10 @@ function diaspora2bb($s, $use_zrl = false) {
 	}
 
 	//$s = preg_replace("/([^\]\=]|^)(https?\:\/\/)(vimeo|youtu|www\.youtube|soundcloud)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url=$2$3$4]$2$3$4[/url]',$s);
-	$s = bb_tag_preg_replace("/\[url\=?(.*?)\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/url\]/ism",'[youtube]$2[/youtube]','url',$s);
-	$s = bb_tag_preg_replace("/\[url\=https?:\/\/www.youtube.com\/watch\?v\=(.*?)\].*?\[\/url\]/ism",'[youtube]$1[/youtube]','url',$s);
-	$s = bb_tag_preg_replace("/\[url\=?(.*?)\]https?:\/	\/vimeo.com\/([0-9]+)(.*?)\[\/url\]/ism",'[vimeo]$2[/vimeo]','url',$s);
-	$s = bb_tag_preg_replace("/\[url\=https?:\/\/vimeo.com\/([0-9]+)\](.*?)\[\/url\]/ism",'[vimeo]$1[/vimeo]','url',$s);
+	$s = bb_tag_preg_replace("/\[url\=?(.*?)\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/url\]/ism",'[embed]https://www.youtube.com/watch?v=$2[/embed]','url',$s);
+	$s = bb_tag_preg_replace("/\[url\=https?:\/\/www.youtube.com\/watch\?v\=(.*?)\].*?\[\/url\]/ism",'[embed]https://www.youtube.com/watch?v=$1[/embed]','url',$s);
+	$s = bb_tag_preg_replace("/\[url\=?(.*?)\]https?:\/	\/vimeo.com\/([0-9]+)(.*?)\[\/url\]/ism",'[embed]https://vimeo.com/$2[/embed]','url',$s);
+	$s = bb_tag_preg_replace("/\[url\=https?:\/\/vimeo.com\/([0-9]+)\](.*?)\[\/url\]/ism",'[embed]https://vimeo.com/$1[/embed]','url',$s);
 	// remove duplicate adjacent code tags
 	$s = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/ism","[code]$2[/code]", $s);
 
@@ -440,6 +440,9 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
 	// So take off the angle brackets of any such URL
 	$Text = preg_replace("/<http(.*?)>/is", "http$1", $Text);
 
+	// Remove empty zrl links 
+	$Text = preg_replace("/\[zrl\=\].*?\[\/zrl\]/is", "", $Text);
+
 	// Remove all unconverted tags
 	$Text = strip_tags($Text);
 
diff --git a/include/conversation.php b/include/conversation.php
index c2d9641ba..b2d58a025 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -681,7 +681,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
 
 				$body = prepare_body($item,true);
 
-				$is_photo = ((($item['resource_type'] == 'photo') && (feature_enabled($profile_owner,'large_photos'))) ? true : false);
 				$has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false);
 
 				$tmp_item = array(
@@ -698,6 +697,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
 					'thumb' => $profile_avatar,
 					'title' => $item['title'],
 					'body' => $body['html'],
+					'photo' => $body['photo'],
 					'tags' => $body['tags'],
 					'categories' => $body['categories'],
 					'mentions' => $body['mentions'],
@@ -738,7 +738,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
 					'previewing' => $previewing,
 					'wait' => t('Please wait'),
 					'thread_level' => 1,
-					'is_photo' => $is_photo,
 					'has_tags' => $has_tags,
 				);
 
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index e980a96e1..285cbc8fb 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -734,6 +734,11 @@ function import_channel_photo($photo,$type,$aid,$uid) {
 		$photo_failure = true;
 	}
 
-	return(($photo_failure)? false : true);
+	//return(($photo_failure)? false : true);
+
+	if($photo_failure)
+		return false;
+	else
+		return $hash;
 
 }
diff --git a/include/photo/photo_gd.php b/include/photo/photo_gd.php
index fa1f700e9..2ac7287e4 100644
--- a/include/photo/photo_gd.php
+++ b/include/photo/photo_gd.php
@@ -137,4 +137,4 @@ class photo_gd extends photo_driver {
 		return $string;
 	}
 
-}
-\ No newline at end of file
+}
diff --git a/include/text.php b/include/text.php
index 5df7bb4a1..c2573da0c 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1233,7 +1233,7 @@ function theme_attachments(&$item) {
 			if($label  == ' ')
 				$label = t('Unknown Attachment');
  			
-			$title = t('Attachment') . ' - ' . (($r['length']) ? userReadableSize($r['length']) : t('Size Unknown'));
+			$title = t('Size') . ' ' . (($r['length']) ? userReadableSize($r['length']) : t('unknown'));
 
 			require_once('include/identity.php');
 			if(is_foreigner($item['author_xchan']))
diff --git a/include/zot.php b/include/zot.php
index 793eb6b39..ed4bdc264 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -814,7 +814,34 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
 		if ($local) {
 			$ph = z_fetch_url($arr['photo'], true);
 			if ($ph['success']) {
-				import_channel_photo($ph['body'], $arr['photo_mimetype'], $local[0]['channel_account_id'],$local[0]['channel_id']);
+
+				$hash = import_channel_photo($ph['body'], $arr['photo_mimetype'], $local[0]['channel_account_id'], $local[0]['channel_id']);
+
+				if($hash) {
+					// unless proven otherwise
+					$is_default_profile = 1;
+
+					$profile = q("select is_default from profile where aid = %d and uid = %d limit 1",
+						intval($local[0]['channel_account_id']),
+						intval($local[0]['channel_id'])
+					);
+					if($profile) {
+						if(! intval($profile[0]['is_default']))
+							$is_default_profile = 0;
+					}
+
+					// If setting for the default profile, unset the profile photo flag from any other photos I own
+					if($is_default_profile) {
+						q("UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND resource_id != '%s' AND aid = %d AND uid = %d",
+							intval(PHOTO_NORMAL),
+							intval(PHOTO_PROFILE),
+							dbesc($hash),
+							intval($local[0]['channel_account_id']),
+							intval($local[0]['channel_id'])
+						);
+					}
+				}
+
 				// reset the names in case they got messed up when we had a bug in this function
 				$photos = array(
 					z_root() . '/photo/profile/l/' . $local[0]['channel_id'],
diff --git a/mod/admin.php b/mod/admin.php
index aaf00b14f..8fe9c8336 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -557,7 +557,7 @@ function admin_page_dbsync(&$a) {
 		}
 	}
 	if(! count($failed))
-		return '<h3>' . t('No failed updates.') . '</h3>';
+		return '<div class="generic-content-wrapper-styled"><h3>' . t('No failed updates.') . '</h3></div>';
 
 	$o = replace_macros(get_markup_template('failed_updates.tpl'),array(
 		'$base' => $a->get_baseurl(true),
diff --git a/mod/connedit.php b/mod/connedit.php
index c3fcc6d54..c8f83b0e8 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -654,7 +654,7 @@ function connedit_content(&$a) {
 
 		$locstr = '';
 
-		$locs = q("select hubloc_addr as location from hubloc where hubloc_hash = '%s'",
+		$locs = q("select hubloc_addr as location from hubloc where hubloc_hash = '%s' and hubloc_network = 'zot'",
 			dbesc($contact['xchan_hash'])
 		);
 
diff --git a/mod/pubsites.php b/mod/pubsites.php
index 726c681fa..ae8601366 100644
--- a/mod/pubsites.php
+++ b/mod/pubsites.php
@@ -13,6 +13,8 @@ function pubsites_content(&$a) {
 	}
 	$url .= '/sites';
 
+	$o .= '<div class="generic-content-wrapper-styled">';
+
 	$o .= '<h1>' . t('Public Sites') . '</h1>';
 
 	$o .= '<div class="descriptive-text">' . 
@@ -33,6 +35,9 @@ function pubsites_content(&$a) {
 			}
 	
 			$o .= '</table>';
+
+			$o .= '</div>';
+
 		}
 	}
 	return $o;
diff --git a/view/es/hmessages.po b/view/es/hmessages.po
index e5fcd799e..4074ffa5a 100644
--- a/view/es/hmessages.po
+++ b/view/es/hmessages.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-23 00:03-0700\n"
-"PO-Revision-Date: 2015-10-25 19:03+0000\n"
+"POT-Creation-Date: 2015-10-30 00:03-0700\n"
+"PO-Revision-Date: 2015-10-31 19:26+0000\n"
 "Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/red-matrix/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -23,32 +23,6 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../include/bb2diaspora.php:388
-msgid "Attachments:"
-msgstr "Ficheros adjuntos:"
-
-#: ../../include/bb2diaspora.php:474 ../../include/event.php:22
-msgid "l F d, Y \\@ g:i A"
-msgstr "l d de F, Y \\@ G:i"
-
-#: ../../include/bb2diaspora.php:476
-msgid "$Projectname event notification:"
-msgstr "Notificación de eventos de $Projectname:"
-
-#: ../../include/bb2diaspora.php:480 ../../include/event.php:30
-msgid "Starts:"
-msgstr "Comienza:"
-
-#: ../../include/bb2diaspora.php:488 ../../include/event.php:40
-msgid "Finishes:"
-msgstr "Finaliza:"
-
-#: ../../include/bb2diaspora.php:496 ../../include/event.php:50
-#: ../../include/identity.php:1016 ../../mod/directory.php:302
-#: ../../mod/events.php:701
-msgid "Location:"
-msgstr "Ubicación:"
-
 #: ../../include/Import/import_diaspora.php:17
 msgid "No username found in import file."
 msgstr "No se ha encontrado el nombre de usuario en el fichero importado."
@@ -66,7 +40,7 @@ msgstr "Importación completada."
 msgid "parent"
 msgstr "padre"
 
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2509
+#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2529
 msgid "Collection"
 msgstr "Colección"
 
@@ -92,12 +66,12 @@ msgstr "Programar bandeja de salida"
 
 #: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:360
 #: ../../include/apps.php:415 ../../include/conversation.php:1023
-#: ../../mod/photos.php:756 ../../mod/photos.php:1195
+#: ../../mod/photos.php:759 ../../mod/photos.php:1198
 msgid "Unknown"
 msgstr "Desconocido"
 
 #: ../../include/RedDAV/RedBrowser.php:226 ../../include/apps.php:135
-#: ../../include/conversation.php:1613 ../../include/nav.php:93
+#: ../../include/conversation.php:1620 ../../include/nav.php:93
 #: ../../mod/fbrowser.php:114
 msgid "Files"
 msgstr "Ficheros"
@@ -118,8 +92,8 @@ msgid "Create"
 msgstr "Crear"
 
 #: ../../include/RedDAV/RedBrowser.php:231
-#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/photos.php:781
-#: ../../mod/photos.php:1314 ../../mod/profile_photo.php:450
+#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/photos.php:784
+#: ../../mod/photos.php:1317 ../../mod/profile_photo.php:450
 msgid "Upload"
 msgstr "Subir"
 
@@ -145,7 +119,7 @@ msgstr "Última modificación"
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
 #: ../../include/apps.php:259 ../../include/ItemObject.php:100
 #: ../../mod/layouts.php:183 ../../mod/editblock.php:135
-#: ../../mod/editpost.php:113 ../../mod/menu.php:108
+#: ../../mod/editpost.php:112 ../../mod/menu.php:108
 #: ../../mod/webpages.php:181 ../../mod/blocks.php:153 ../../mod/thing.php:257
 #: ../../mod/settings.php:645 ../../mod/connections.php:235
 #: ../../mod/connections.php:248 ../../mod/connections.php:267
@@ -155,7 +129,7 @@ msgstr "Editar"
 
 #: ../../include/RedDAV/RedBrowser.php:241 ../../include/apps.php:260
 #: ../../include/ItemObject.php:120 ../../include/conversation.php:657
-#: ../../mod/connedit.php:546 ../../mod/photos.php:1126
+#: ../../mod/connedit.php:546 ../../mod/photos.php:1129
 #: ../../mod/editblock.php:181 ../../mod/admin.php:783 ../../mod/admin.php:942
 #: ../../mod/webpages.php:183 ../../mod/blocks.php:155 ../../mod/thing.php:258
 #: ../../mod/settings.php:646 ../../mod/editlayout.php:179
@@ -331,31 +305,31 @@ msgstr "Especificador de sala no válido."
 msgid "Room not found."
 msgstr "Sala no encontrada."
 
-#: ../../include/chat.php:133 ../../include/items.php:4376
-#: ../../include/photos.php:26 ../../include/attach.php:137
-#: ../../include/attach.php:185 ../../include/attach.php:248
-#: ../../include/attach.php:262 ../../include/attach.php:269
-#: ../../include/attach.php:334 ../../include/attach.php:348
-#: ../../include/attach.php:355 ../../include/attach.php:433
-#: ../../include/attach.php:875 ../../include/attach.php:946
-#: ../../include/attach.php:1098 ../../mod/achievements.php:30
+#: ../../include/chat.php:133 ../../include/items.php:4377
+#: ../../include/photos.php:29 ../../include/attach.php:140
+#: ../../include/attach.php:188 ../../include/attach.php:251
+#: ../../include/attach.php:265 ../../include/attach.php:272
+#: ../../include/attach.php:337 ../../include/attach.php:351
+#: ../../include/attach.php:358 ../../include/attach.php:436
+#: ../../include/attach.php:884 ../../include/attach.php:955
+#: ../../include/attach.php:1107 ../../mod/achievements.php:30
 #: ../../mod/fsuggest.php:78 ../../mod/authtest.php:13
 #: ../../mod/bookmarks.php:48 ../../mod/block.php:22 ../../mod/block.php:72
 #: ../../mod/id.php:71 ../../mod/like.php:177 ../../mod/common.php:35
 #: ../../mod/mitem.php:111 ../../mod/connedit.php:347 ../../mod/mood.php:112
-#: ../../mod/photos.php:70 ../../mod/filestorage.php:18
-#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
-#: ../../mod/filestorage.php:115 ../../mod/layouts.php:69
-#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/poke.php:133
-#: ../../mod/network.php:12 ../../mod/chat.php:94 ../../mod/chat.php:99
-#: ../../mod/rate.php:111 ../../mod/mail.php:118 ../../mod/editblock.php:65
+#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
+#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
+#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87
+#: ../../mod/poke.php:133 ../../mod/network.php:12 ../../mod/chat.php:94
+#: ../../mod/chat.php:99 ../../mod/rate.php:111 ../../mod/mail.php:118
+#: ../../mod/photos.php:70 ../../mod/editblock.php:65
 #: ../../mod/editpost.php:13 ../../mod/appman.php:66 ../../mod/profile.php:64
 #: ../../mod/profile.php:72 ../../mod/menu.php:74 ../../mod/page.php:31
 #: ../../mod/page.php:86 ../../mod/new_channel.php:68
 #: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
 #: ../../mod/pdledit.php:21 ../../mod/events.php:256
 #: ../../mod/profile_photo.php:338 ../../mod/profile_photo.php:351
-#: ../../mod/item.php:205 ../../mod/item.php:213 ../../mod/item.php:1002
+#: ../../mod/item.php:205 ../../mod/item.php:213 ../../mod/item.php:1004
 #: ../../mod/message.php:16 ../../mod/webpages.php:69
 #: ../../mod/register.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76
 #: ../../mod/service_limits.php:7 ../../mod/sources.php:66
@@ -599,131 +573,139 @@ msgid ""
 msgstr "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida."
 
 #: ../../include/features.php:61
-msgid "Enable voting tools"
+msgid "Enable Voting Tools"
 msgstr "Activar herramientas de votación"
 
 #: ../../include/features.php:61
 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:67
+#: ../../include/features.php:62
+msgid "Delayed Posting"
+msgstr "Publicación aplazada"
+
+#: ../../include/features.php:62
+msgid "Allow posts to be published at a later date"
+msgstr "Permitir mensajes que se publicarán en una fecha posterior"
+
+#: ../../include/features.php:68
 msgid "Network and Stream Filtering"
 msgstr "Filtrado del contenido"
 
-#: ../../include/features.php:68
+#: ../../include/features.php:69
 msgid "Search by Date"
 msgstr "Buscar por fecha"
 
-#: ../../include/features.php:68
+#: ../../include/features.php:69
 msgid "Ability to select posts by date ranges"
 msgstr "Capacidad de seleccionar entradas por rango de fechas"
 
-#: ../../include/features.php:69
+#: ../../include/features.php:70
 msgid "Collections Filter"
 msgstr "Filtrado de colecciones"
 
-#: ../../include/features.php:69
+#: ../../include/features.php:70
 msgid "Enable widget to display Network posts only from selected collections"
 msgstr "Habilitar la muestra de entradas eligiendo colecciones"
 
-#: ../../include/features.php:70 ../../include/widgets.php:273
+#: ../../include/features.php:71 ../../include/widgets.php:273
 msgid "Saved Searches"
 msgstr "Búsquedas guardadas"
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid "Save search terms for re-use"
 msgstr "Guardar términos de búsqueda para su reutilización"
 
-#: ../../include/features.php:71
+#: ../../include/features.php:72
 msgid "Network Personal Tab"
 msgstr "Actividad personal"
 
-#: ../../include/features.php:71
+#: ../../include/features.php:72
 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:72
+#: ../../include/features.php:73
 msgid "Network New Tab"
 msgstr "Contenido nuevo"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 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:73
+#: ../../include/features.php:74
 msgid "Affinity Tool"
 msgstr "Herramienta de afinidad"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Filter stream activity by depth of relationships"
 msgstr "Filtrar la actividad del flujo por profundidad de relaciones"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Connection Filtering"
 msgstr "Filtrado de conexiones"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid "Suggest Channels"
 msgstr "Sugerir canales"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid "Show channel suggestions"
 msgstr "Mostrar sugerencias de canales"
 
-#: ../../include/features.php:80
+#: ../../include/features.php:81
 msgid "Post/Comment Tools"
 msgstr "Herramientas de entradas/comentarios"
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Tagging"
 msgstr "Etiquetado"
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Ability to tag existing posts"
 msgstr "Capacidad de etiquetar entradas existentes"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Post Categories"
 msgstr "Categorías de entradas"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Add categories to your posts"
 msgstr "Añadir categorías a sus publicaciones"
 
-#: ../../include/features.php:83 ../../include/contact_widgets.php:57
+#: ../../include/features.php:84 ../../include/contact_widgets.php:57
 #: ../../include/widgets.php:303
 msgid "Saved Folders"
 msgstr "Carpetas guardadas"
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 msgid "Ability to file posts under folders"
 msgstr "Capacidad de archivar entradas en carpetas"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85
 msgid "Dislike Posts"
 msgstr "Desagrado de publicaciones"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85
 msgid "Ability to dislike posts/comments"
 msgstr "Capacidad de mostrar desacuerdo con el contenido de  entradas y comentarios"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Star Posts"
 msgstr "Entradas destacadas"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Ability to mark special posts with a star indicator"
 msgstr "Capacidad de marcar entradas destacadas con un indicador de estrella"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Tag Cloud"
 msgstr "Nube de etiquetas"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Proveer nube de etiquetas personal en su página de canal"
 
@@ -736,7 +718,7 @@ msgid "Delete this item?"
 msgstr "¿Borrar este elemento?"
 
 #: ../../include/js_strings.php:6 ../../include/ItemObject.php:681
-#: ../../mod/photos.php:1044 ../../mod/photos.php:1162
+#: ../../mod/photos.php:1047 ../../mod/photos.php:1165
 msgid "Comment"
 msgstr "Comentar"
 
@@ -792,7 +774,7 @@ msgstr "Nada nuevo por aquí"
 msgid "Rate This Channel (this is public)"
 msgstr "Valorar este canal (esto es público)"
 
-#: ../../include/js_strings.php:20 ../../mod/connedit.php:666
+#: ../../include/js_strings.php:20 ../../mod/connedit.php:684
 #: ../../mod/rate.php:157
 msgid "Rating"
 msgstr "Valoración"
@@ -803,17 +785,17 @@ msgstr "Describir (opcional)"
 
 #: ../../include/js_strings.php:22 ../../include/ItemObject.php:682
 #: ../../mod/fsuggest.php:108 ../../mod/mitem.php:231
-#: ../../mod/connedit.php:687 ../../mod/mood.php:135 ../../mod/pconfig.php:108
-#: ../../mod/photos.php:634 ../../mod/photos.php:1005
-#: ../../mod/photos.php:1045 ../../mod/photos.php:1163
+#: ../../mod/connedit.php:705 ../../mod/mood.php:135 ../../mod/pconfig.php:108
 #: ../../mod/filestorage.php:156 ../../mod/poke.php:171 ../../mod/chat.php:184
 #: ../../mod/chat.php:213 ../../mod/rate.php:168 ../../mod/mail.php:371
-#: ../../mod/admin.php:411 ../../mod/admin.php:776 ../../mod/admin.php:940
-#: ../../mod/admin.php:1072 ../../mod/admin.php:1266 ../../mod/admin.php:1351
-#: ../../mod/appman.php:99 ../../mod/pdledit.php:58 ../../mod/events.php:534
-#: ../../mod/events.php:710 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/import.php:517 ../../mod/thing.php:313
-#: ../../mod/thing.php:359 ../../mod/invite.php:142 ../../mod/settings.php:583
+#: ../../mod/photos.php:637 ../../mod/photos.php:1008
+#: ../../mod/photos.php:1048 ../../mod/photos.php:1166 ../../mod/admin.php:411
+#: ../../mod/admin.php:776 ../../mod/admin.php:940 ../../mod/admin.php:1072
+#: ../../mod/admin.php:1266 ../../mod/admin.php:1351 ../../mod/appman.php:99
+#: ../../mod/pdledit.php:58 ../../mod/events.php:534 ../../mod/events.php:710
+#: ../../mod/sources.php:104 ../../mod/sources.php:138
+#: ../../mod/import.php:517 ../../mod/thing.php:313 ../../mod/thing.php:359
+#: ../../mod/invite.php:142 ../../mod/settings.php:583
 #: ../../mod/settings.php:695 ../../mod/settings.php:723
 #: ../../mod/settings.php:746 ../../mod/settings.php:831
 #: ../../mod/settings.php:1020 ../../mod/xchan.php:11 ../../mod/group.php:81
@@ -904,19 +886,19 @@ msgstr " "
 msgid "timeago.numbers"
 msgstr "timeago.numbers"
 
-#: ../../include/js_strings.php:44 ../../include/text.php:1144
+#: ../../include/js_strings.php:44 ../../include/text.php:1153
 msgid "January"
 msgstr "enero"
 
-#: ../../include/js_strings.php:45 ../../include/text.php:1144
+#: ../../include/js_strings.php:45 ../../include/text.php:1153
 msgid "February"
 msgstr "febrero"
 
-#: ../../include/js_strings.php:46 ../../include/text.php:1144
+#: ../../include/js_strings.php:46 ../../include/text.php:1153
 msgid "March"
 msgstr "marzo"
 
-#: ../../include/js_strings.php:47 ../../include/text.php:1144
+#: ../../include/js_strings.php:47 ../../include/text.php:1153
 msgid "April"
 msgstr "abril"
 
@@ -925,31 +907,31 @@ msgctxt "long"
 msgid "May"
 msgstr "mayo"
 
-#: ../../include/js_strings.php:49 ../../include/text.php:1144
+#: ../../include/js_strings.php:49 ../../include/text.php:1153
 msgid "June"
 msgstr "junio"
 
-#: ../../include/js_strings.php:50 ../../include/text.php:1144
+#: ../../include/js_strings.php:50 ../../include/text.php:1153
 msgid "July"
 msgstr "julio"
 
-#: ../../include/js_strings.php:51 ../../include/text.php:1144
+#: ../../include/js_strings.php:51 ../../include/text.php:1153
 msgid "August"
 msgstr "agosto"
 
-#: ../../include/js_strings.php:52 ../../include/text.php:1144
+#: ../../include/js_strings.php:52 ../../include/text.php:1153
 msgid "September"
 msgstr "septiembre"
 
-#: ../../include/js_strings.php:53 ../../include/text.php:1144
+#: ../../include/js_strings.php:53 ../../include/text.php:1153
 msgid "October"
 msgstr "octubre"
 
-#: ../../include/js_strings.php:54 ../../include/text.php:1144
+#: ../../include/js_strings.php:54 ../../include/text.php:1153
 msgid "November"
 msgstr "noviembre"
 
-#: ../../include/js_strings.php:55 ../../include/text.php:1144
+#: ../../include/js_strings.php:55 ../../include/text.php:1153
 msgid "December"
 msgstr "diciembre"
 
@@ -1002,31 +984,31 @@ msgstr "Nov"
 msgid "Dec"
 msgstr "Dic"
 
-#: ../../include/js_strings.php:68 ../../include/text.php:1140
+#: ../../include/js_strings.php:68 ../../include/text.php:1149
 msgid "Sunday"
 msgstr "domingo"
 
-#: ../../include/js_strings.php:69 ../../include/text.php:1140
+#: ../../include/js_strings.php:69 ../../include/text.php:1149
 msgid "Monday"
 msgstr "lunes"
 
-#: ../../include/js_strings.php:70 ../../include/text.php:1140
+#: ../../include/js_strings.php:70 ../../include/text.php:1149
 msgid "Tuesday"
 msgstr "martes"
 
-#: ../../include/js_strings.php:71 ../../include/text.php:1140
+#: ../../include/js_strings.php:71 ../../include/text.php:1149
 msgid "Wednesday"
 msgstr "miércoles"
 
-#: ../../include/js_strings.php:72 ../../include/text.php:1140
+#: ../../include/js_strings.php:72 ../../include/text.php:1149
 msgid "Thursday"
 msgstr "jueves"
 
-#: ../../include/js_strings.php:73 ../../include/text.php:1140
+#: ../../include/js_strings.php:73 ../../include/text.php:1149
 msgid "Friday"
 msgstr "viernes"
 
-#: ../../include/js_strings.php:74 ../../include/text.php:1140
+#: ../../include/js_strings.php:74 ../../include/text.php:1149
 msgid "Saturday"
 msgstr "sábado"
 
@@ -1170,7 +1152,7 @@ msgstr "Visitar %2$s de %1$s"
 #: ../../include/activities.php:63
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr "%1$s actualizó %2$s,  %3$s cambió."
+msgstr "%1$s ha actualizado %2$s cambiando %3$s."
 
 #: ../../include/Contact.php:101 ../../include/identity.php:965
 #: ../../include/conversation.php:949 ../../include/widgets.php:136
@@ -1185,7 +1167,7 @@ msgstr "Nueva ventana"
 
 #: ../../include/Contact.php:119
 msgid "Open the selected location in a different window or browser tab"
-msgstr "Abrir la ubicación seleccionada en una ventana o pestaña aparte"
+msgstr "Abrir la dirección seleccionada en una ventana o pestaña aparte"
 
 #: ../../include/Contact.php:237
 #, php-format
@@ -1241,36 +1223,36 @@ msgstr "Visible para las conexiones permitidas."
 msgid "Visible to specific connections."
 msgstr "Visible para conexiones específicas."
 
-#: ../../include/items.php:4297 ../../mod/display.php:36
+#: ../../include/items.php:4298 ../../mod/display.php:36
 #: ../../mod/filestorage.php:27 ../../mod/admin.php:127
 #: ../../mod/admin.php:979 ../../mod/admin.php:1179 ../../mod/thing.php:86
 #: ../../mod/viewsrc.php:20
 msgid "Item not found."
 msgstr "Elemento no encontrado."
 
-#: ../../include/items.php:4806 ../../mod/group.php:38 ../../mod/group.php:137
+#: ../../include/items.php:4807 ../../mod/group.php:38 ../../mod/group.php:137
 msgid "Collection not found."
 msgstr "Colección no encontrada."
 
-#: ../../include/items.php:4822
+#: ../../include/items.php:4823
 msgid "Collection is empty."
 msgstr "La colección está vacía."
 
-#: ../../include/items.php:4829
+#: ../../include/items.php:4830
 #, php-format
 msgid "Collection: %s"
 msgstr "Colección: %s"
 
-#: ../../include/items.php:4839 ../../mod/connedit.php:657
+#: ../../include/items.php:4840 ../../mod/connedit.php:673
 #, php-format
 msgid "Connection: %s"
 msgstr "Conexión: %s"
 
-#: ../../include/items.php:4841
+#: ../../include/items.php:4842
 msgid "Connection not found."
 msgstr "Conexión no encontrada"
 
-#: ../../include/api.php:1321
+#: ../../include/api.php:1324
 msgid "Public Timeline"
 msgstr "Cronología pública"
 
@@ -1321,15 +1303,14 @@ msgstr "Mostrar"
 msgid "Don't show"
 msgstr "No mostrar"
 
-#: ../../include/acl_selectors.php:247 ../../mod/photos.php:628
-#: ../../mod/photos.php:998 ../../mod/filestorage.php:147
-#: ../../mod/chat.php:211 ../../mod/events.php:708 ../../mod/thing.php:310
-#: ../../mod/thing.php:356
+#: ../../include/acl_selectors.php:247 ../../mod/filestorage.php:147
+#: ../../mod/chat.php:211 ../../mod/photos.php:631 ../../mod/photos.php:1001
+#: ../../mod/events.php:708 ../../mod/thing.php:310 ../../mod/thing.php:356
 msgid "Permissions"
 msgstr "Permisos"
 
 #: ../../include/acl_selectors.php:248 ../../include/ItemObject.php:369
-#: ../../mod/photos.php:1215
+#: ../../mod/photos.php:1218
 msgid "Close"
 msgstr "Cerrar"
 
@@ -1346,28 +1327,28 @@ msgstr "La clonación del canal no ha salido bien. La importación ha fallado."
 msgid "Cloned channel not found. Import failed."
 msgstr "No se ha podido importar el canal porque el canal clonado no se ha encontrado."
 
-#: ../../include/photos.php:109
+#: ../../include/photos.php:112
 #, php-format
 msgid "Image exceeds website size limit of %lu bytes"
 msgstr "La imagen excede el límite de %lu bytes del sitio"
 
-#: ../../include/photos.php:116
+#: ../../include/photos.php:119
 msgid "Image file is empty."
 msgstr "El fichero de imagen está vacío. "
 
-#: ../../include/photos.php:143 ../../mod/profile_photo.php:222
+#: ../../include/photos.php:146 ../../mod/profile_photo.php:222
 msgid "Unable to process image"
 msgstr "No ha sido posible procesar la imagen"
 
-#: ../../include/photos.php:232
+#: ../../include/photos.php:257
 msgid "Photo storage failed."
 msgstr "La foto no ha podido ser guardada."
 
-#: ../../include/photos.php:452 ../../include/conversation.php:1609
+#: ../../include/photos.php:483 ../../include/conversation.php:1616
 msgid "Photo Albums"
 msgstr "Álbumes de fotos"
 
-#: ../../include/photos.php:456
+#: ../../include/photos.php:487
 msgid "Upload New Photos"
 msgstr "Subir nuevas fotos"
 
@@ -1390,8 +1371,8 @@ msgid "View"
 msgstr "Ver"
 
 #: ../../include/page_widgets.php:40 ../../include/ItemObject.php:691
-#: ../../include/conversation.php:1160 ../../mod/photos.php:1046
-#: ../../mod/editblock.php:171 ../../mod/editpost.php:150
+#: ../../include/conversation.php:1160 ../../mod/photos.php:1049
+#: ../../mod/editblock.php:171 ../../mod/editpost.php:149
 #: ../../mod/events.php:707 ../../mod/webpages.php:188
 #: ../../mod/editwebpage.php:212
 msgid "Preview"
@@ -1419,8 +1400,8 @@ msgstr "Creado"
 msgid "Edited"
 msgstr "Editado"
 
-#: ../../include/photo/photo_driver.php:705 ../../mod/photos.php:94
-#: ../../mod/photos.php:696 ../../mod/profile_photo.php:146
+#: ../../include/photo/photo_driver.php:708 ../../mod/photos.php:94
+#: ../../mod/photos.php:699 ../../mod/profile_photo.php:146
 #: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:376
 msgid "Profile Photos"
 msgstr "Fotos del perfil"
@@ -1678,11 +1659,29 @@ msgstr "Contenido incorporado"
 msgid "Embedding disabled"
 msgstr "Incrustación deshabilitada"
 
+#: ../../include/event.php:22 ../../include/bb2diaspora.php:468
+msgid "l F d, Y \\@ g:i A"
+msgstr "l d de F, Y \\@ G:i"
+
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:474
+msgid "Starts:"
+msgstr "Comienza:"
+
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:482
+msgid "Finishes:"
+msgstr "Finaliza:"
+
+#: ../../include/event.php:50 ../../include/identity.php:1016
+#: ../../include/bb2diaspora.php:490 ../../mod/directory.php:302
+#: ../../mod/events.php:701
+msgid "Location:"
+msgstr "Ubicación:"
+
 #: ../../include/event.php:766
 msgid "This event has been added to your calendar."
 msgstr "Este evento ha sido añadido a su calendario."
 
-#: ../../include/event.php:896 ../../include/text.php:1846
+#: ../../include/event.php:896 ../../include/text.php:1866
 #: ../../include/conversation.php:123 ../../mod/like.php:363
 #: ../../mod/tagger.php:47 ../../mod/events.php:245
 msgid "event"
@@ -1712,7 +1711,7 @@ msgstr "Cancelado/a"
 msgid "Site Admin"
 msgstr "Adminstrador del sitio"
 
-#: ../../include/apps.php:129 ../../include/conversation.php:1639
+#: ../../include/apps.php:129 ../../include/conversation.php:1646
 #: ../../include/nav.php:103
 msgid "Bookmarks"
 msgstr "Marcadores"
@@ -1739,7 +1738,7 @@ msgstr "Red"
 msgid "Settings"
 msgstr "Ajustes"
 
-#: ../../include/apps.php:136 ../../include/conversation.php:1649
+#: ../../include/apps.php:136 ../../include/conversation.php:1656
 #: ../../include/nav.php:107 ../../mod/webpages.php:178
 msgid "Webpages"
 msgstr "Páginas web"
@@ -1753,7 +1752,7 @@ msgstr "Mi canal"
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../../include/apps.php:139 ../../include/conversation.php:1606
+#: ../../include/apps.php:139 ../../include/conversation.php:1613
 #: ../../include/nav.php:92 ../../mod/fbrowser.php:25
 msgid "Photos"
 msgstr "Fotos"
@@ -1790,7 +1789,7 @@ msgstr "Chat"
 
 #: ../../include/apps.php:147 ../../include/text.php:857
 #: ../../include/text.php:869 ../../include/nav.php:159
-#: ../../mod/search.php:38
+#: ../../mod/search.php:40
 msgid "Search"
 msgstr "Buscar"
 
@@ -1840,6 +1839,68 @@ msgstr "Instalar"
 msgid "Purchase"
 msgstr "Comprar"
 
+#: ../../include/attach.php:246 ../../include/attach.php:332
+msgid "Item was not found."
+msgstr "Elemento no encontrado."
+
+#: ../../include/attach.php:496
+msgid "No source file."
+msgstr "Ningún fichero de origen"
+
+#: ../../include/attach.php:514
+msgid "Cannot locate file to replace"
+msgstr "No se puede localizar el fichero que va a ser sustituido."
+
+#: ../../include/attach.php:532
+msgid "Cannot locate file to revise/update"
+msgstr "No se puede localizar el fichero para revisar/actualizar"
+
+#: ../../include/attach.php:667
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "El fichero supera el limite de tamaño de %d"
+
+#: ../../include/attach.php:681
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos."
+
+#: ../../include/attach.php:837
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado."
+
+#: ../../include/attach.php:850
+msgid "Stored file could not be verified. Upload failed."
+msgstr "El fichero almacenado no ha podido ser verificado. El envío ha fallado."
+
+#: ../../include/attach.php:898 ../../include/attach.php:914
+msgid "Path not available."
+msgstr "Ruta no disponible."
+
+#: ../../include/attach.php:960 ../../include/attach.php:1112
+msgid "Empty pathname"
+msgstr "Ruta vacía"
+
+#: ../../include/attach.php:986
+msgid "duplicate filename or path"
+msgstr "Nombre duplicado de ruta o fichero"
+
+#: ../../include/attach.php:1008
+msgid "Path not found."
+msgstr "Ruta no encontrada"
+
+#: ../../include/attach.php:1066
+msgid "mkdir failed."
+msgstr "mkdir ha fallado."
+
+#: ../../include/attach.php:1070
+msgid "database storage failed."
+msgstr "el almacenamiento en la base de datos ha fallado."
+
+#: ../../include/attach.php:1118
+msgid "Empty path"
+msgstr "Ruta vacía"
+
 #: ../../include/auth.php:131
 msgid "Logged out."
 msgstr "Desconectado/a."
@@ -2068,22 +2129,22 @@ msgid "I abstain"
 msgstr "Me abstengo"
 
 #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1681 ../../mod/photos.php:1079
-#: ../../mod/photos.php:1091
+#: ../../include/conversation.php:1688 ../../mod/photos.php:1082
+#: ../../mod/photos.php:1094
 msgid "View all"
 msgstr "Ver todo"
 
 #: ../../include/ItemObject.php:179 ../../include/identity.php:1276
-#: ../../include/taxonomy.php:403 ../../include/conversation.php:1705
-#: ../../mod/photos.php:1083
+#: ../../include/taxonomy.php:403 ../../include/conversation.php:1712
+#: ../../mod/photos.php:1086
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "Me gusta"
 msgstr[1] "Me gusta"
 
-#: ../../include/ItemObject.php:184 ../../include/conversation.php:1708
-#: ../../mod/photos.php:1088
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1715
+#: ../../mod/photos.php:1091
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -2118,7 +2179,7 @@ msgstr "Firma de mensaje incorrecta"
 msgid "Add Tag"
 msgstr "Añadir etiqueta"
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:1023
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:1026
 msgid "I like this (toggle)"
 msgstr "me gusta (cambiar)"
 
@@ -2126,7 +2187,7 @@ msgstr "me gusta (cambiar)"
 msgid "like"
 msgstr "me gusta"
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:1024
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:1027
 msgid "I don't like this (toggle)"
 msgstr "No me gusta esto (cambiar)"
 
@@ -2201,54 +2262,54 @@ msgstr "Añadir al calendario"
 msgid "Mark all seen"
 msgstr "Marcar todo como visto"
 
-#: ../../include/ItemObject.php:363 ../../mod/photos.php:1209
+#: ../../include/ItemObject.php:363 ../../mod/photos.php:1212
 msgctxt "noun"
 msgid "Likes"
 msgstr "Me gusta"
 
-#: ../../include/ItemObject.php:364 ../../mod/photos.php:1210
+#: ../../include/ItemObject.php:364 ../../mod/photos.php:1213
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "No me gusta"
 
 #: ../../include/ItemObject.php:374 ../../include/conversation.php:739
-#: ../../include/conversation.php:1214 ../../mod/photos.php:1026
-#: ../../mod/editblock.php:150 ../../mod/editpost.php:130
+#: ../../include/conversation.php:1218 ../../mod/photos.php:1029
+#: ../../mod/editblock.php:150 ../../mod/editpost.php:129
 #: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:190
 msgid "Please wait"
 msgstr "Espere por favor"
 
-#: ../../include/ItemObject.php:679 ../../mod/photos.php:1042
-#: ../../mod/photos.php:1160
+#: ../../include/ItemObject.php:679 ../../mod/photos.php:1045
+#: ../../mod/photos.php:1163
 msgid "This is you"
 msgstr "Este es usted"
 
-#: ../../include/ItemObject.php:683 ../../include/conversation.php:1186
-#: ../../mod/editblock.php:136 ../../mod/editpost.php:114
+#: ../../include/ItemObject.php:683 ../../include/conversation.php:1190
+#: ../../mod/editblock.php:136 ../../mod/editpost.php:113
 #: ../../mod/editlayout.php:135 ../../mod/editwebpage.php:177
 msgid "Bold"
 msgstr "Negrita"
 
-#: ../../include/ItemObject.php:684 ../../include/conversation.php:1187
-#: ../../mod/editblock.php:137 ../../mod/editpost.php:115
+#: ../../include/ItemObject.php:684 ../../include/conversation.php:1191
+#: ../../mod/editblock.php:137 ../../mod/editpost.php:114
 #: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:178
 msgid "Italic"
 msgstr "Itálico "
 
-#: ../../include/ItemObject.php:685 ../../include/conversation.php:1188
-#: ../../mod/editblock.php:138 ../../mod/editpost.php:116
+#: ../../include/ItemObject.php:685 ../../include/conversation.php:1192
+#: ../../mod/editblock.php:138 ../../mod/editpost.php:115
 #: ../../mod/editlayout.php:137 ../../mod/editwebpage.php:179
 msgid "Underline"
 msgstr "Subrayar"
 
-#: ../../include/ItemObject.php:686 ../../include/conversation.php:1189
-#: ../../mod/editblock.php:139 ../../mod/editpost.php:117
+#: ../../include/ItemObject.php:686 ../../include/conversation.php:1193
+#: ../../mod/editblock.php:139 ../../mod/editpost.php:116
 #: ../../mod/editlayout.php:138 ../../mod/editwebpage.php:180
 msgid "Quote"
 msgstr "Citar"
 
-#: ../../include/ItemObject.php:687 ../../include/conversation.php:1190
-#: ../../mod/editblock.php:140 ../../mod/editpost.php:118
+#: ../../include/ItemObject.php:687 ../../include/conversation.php:1194
+#: ../../mod/editblock.php:140 ../../mod/editpost.php:117
 #: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:181
 msgid "Code"
 msgstr "Código"
@@ -2265,8 +2326,8 @@ msgstr "Insertar enlace"
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../../include/ItemObject.php:694 ../../include/conversation.php:1241
-#: ../../mod/mail.php:247 ../../mod/mail.php:376 ../../mod/editpost.php:158
+#: ../../include/ItemObject.php:694 ../../include/conversation.php:1248
+#: ../../mod/mail.php:247 ../../mod/mail.php:376 ../../mod/editpost.php:157
 msgid "Encrypt text"
 msgstr "Cifrar texto"
 
@@ -2316,228 +2377,228 @@ msgstr "Ver conexiones"
 msgid "Save"
 msgstr "Guardar"
 
-#: ../../include/text.php:933
+#: ../../include/text.php:942
 msgid "poke"
 msgstr "un toque"
 
-#: ../../include/text.php:933 ../../include/conversation.php:243
+#: ../../include/text.php:942 ../../include/conversation.php:243
 msgid "poked"
 msgstr "ha recibido un toque"
 
-#: ../../include/text.php:934
+#: ../../include/text.php:943
 msgid "ping"
 msgstr "un \"ping\""
 
-#: ../../include/text.php:934
+#: ../../include/text.php:943
 msgid "pinged"
 msgstr "avisado/a"
 
-#: ../../include/text.php:935
+#: ../../include/text.php:944
 msgid "prod"
 msgstr "una incitación"
 
-#: ../../include/text.php:935
+#: ../../include/text.php:944
 msgid "prodded"
 msgstr "ha recibido una incitación"
 
-#: ../../include/text.php:936
+#: ../../include/text.php:945
 msgid "slap"
 msgstr "una bofetada"
 
-#: ../../include/text.php:936
+#: ../../include/text.php:945
 msgid "slapped"
 msgstr "ha recibido una bofetada"
 
-#: ../../include/text.php:937
+#: ../../include/text.php:946
 msgid "finger"
 msgstr "un \"finger\""
 
-#: ../../include/text.php:937
+#: ../../include/text.php:946
 msgid "fingered"
 msgstr "ha recibido un \"finger\""
 
-#: ../../include/text.php:938
+#: ../../include/text.php:947
 msgid "rebuff"
 msgstr "un rechazo"
 
-#: ../../include/text.php:938
+#: ../../include/text.php:947
 msgid "rebuffed"
 msgstr "ha sido rechazado/a"
 
-#: ../../include/text.php:948
+#: ../../include/text.php:957
 msgid "happy"
 msgstr "feliz"
 
-#: ../../include/text.php:949
+#: ../../include/text.php:958
 msgid "sad"
 msgstr "triste"
 
-#: ../../include/text.php:950
+#: ../../include/text.php:959
 msgid "mellow"
 msgstr "amable"
 
-#: ../../include/text.php:951
+#: ../../include/text.php:960
 msgid "tired"
 msgstr "cansado/a"
 
-#: ../../include/text.php:952
+#: ../../include/text.php:961
 msgid "perky"
 msgstr "fresco/a"
 
-#: ../../include/text.php:953
+#: ../../include/text.php:962
 msgid "angry"
 msgstr "enfadado/a"
 
-#: ../../include/text.php:954
+#: ../../include/text.php:963
 msgid "stupified"
 msgstr "estupefacto/a"
 
-#: ../../include/text.php:955
+#: ../../include/text.php:964
 msgid "puzzled"
 msgstr "perplejo/a"
 
-#: ../../include/text.php:956
+#: ../../include/text.php:965
 msgid "interested"
 msgstr "interesado/a"
 
-#: ../../include/text.php:957
+#: ../../include/text.php:966
 msgid "bitter"
 msgstr "amargado/a"
 
-#: ../../include/text.php:958
+#: ../../include/text.php:967
 msgid "cheerful"
 msgstr "alegre"
 
-#: ../../include/text.php:959
+#: ../../include/text.php:968
 msgid "alive"
 msgstr "vivo/a"
 
-#: ../../include/text.php:960
+#: ../../include/text.php:969
 msgid "annoyed"
 msgstr "molesto/a"
 
-#: ../../include/text.php:961
+#: ../../include/text.php:970
 msgid "anxious"
 msgstr "ansioso/a"
 
-#: ../../include/text.php:962
+#: ../../include/text.php:971
 msgid "cranky"
 msgstr "de mal humor"
 
-#: ../../include/text.php:963
+#: ../../include/text.php:972
 msgid "disturbed"
 msgstr "perturbado/a"
 
-#: ../../include/text.php:964
+#: ../../include/text.php:973
 msgid "frustrated"
 msgstr "frustrado/a"
 
-#: ../../include/text.php:965
+#: ../../include/text.php:974
 msgid "depressed"
 msgstr "deprimido/a"
 
-#: ../../include/text.php:966
+#: ../../include/text.php:975
 msgid "motivated"
 msgstr "motivado/a"
 
-#: ../../include/text.php:967
+#: ../../include/text.php:976
 msgid "relaxed"
 msgstr "relajado/a"
 
-#: ../../include/text.php:968
+#: ../../include/text.php:977
 msgid "surprised"
 msgstr "sorprendido/a"
 
-#: ../../include/text.php:1144
+#: ../../include/text.php:1153
 msgid "May"
 msgstr "mayo"
 
-#: ../../include/text.php:1221 ../../include/text.php:1225
+#: ../../include/text.php:1230 ../../include/text.php:1234
 msgid "Unknown Attachment"
 msgstr "Adjunto no reconocido"
 
-#: ../../include/text.php:1227
+#: ../../include/text.php:1236
 msgid "Attachment"
 msgstr "Fichero adjunto"
 
-#: ../../include/text.php:1227
+#: ../../include/text.php:1236
 msgid "Size Unknown"
 msgstr "Tamaño desconocido"
 
-#: ../../include/text.php:1263
+#: ../../include/text.php:1272
 msgid "remove category"
 msgstr "eliminar categoría"
 
-#: ../../include/text.php:1340
+#: ../../include/text.php:1349
 msgid "remove from file"
 msgstr "eliminar del fichero"
 
-#: ../../include/text.php:1441 ../../include/text.php:1452
+#: ../../include/text.php:1461 ../../include/text.php:1472
 msgid "Click to open/close"
 msgstr "Pulsar para abrir/cerrar"
 
-#: ../../include/text.php:1620 ../../mod/events.php:497
+#: ../../include/text.php:1640 ../../mod/events.php:497
 msgid "Link to Source"
 msgstr "Enlazar con la entrada en su ubicación original"
 
-#: ../../include/text.php:1641 ../../include/text.php:1712
+#: ../../include/text.php:1661 ../../include/text.php:1732
 msgid "default"
 msgstr "por defecto"
 
-#: ../../include/text.php:1649
+#: ../../include/text.php:1669
 msgid "Page layout"
 msgstr "Formato de la página"
 
-#: ../../include/text.php:1649
+#: ../../include/text.php:1669
 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:1690
+#: ../../include/text.php:1710
 msgid "Page content type"
 msgstr "Tipo de contenido de página"
 
-#: ../../include/text.php:1724
+#: ../../include/text.php:1744
 msgid "Select an alternate language"
 msgstr "Seleccionar un idioma alternativo"
 
-#: ../../include/text.php:1843 ../../include/conversation.php:120
+#: ../../include/text.php:1863 ../../include/conversation.php:120
 #: ../../mod/like.php:361 ../../mod/tagger.php:43 ../../mod/subthread.php:72
 #: ../../mod/subthread.php:172
 msgid "photo"
 msgstr "foto"
 
-#: ../../include/text.php:1849 ../../include/conversation.php:148
+#: ../../include/text.php:1869 ../../include/conversation.php:148
 #: ../../mod/like.php:361 ../../mod/subthread.php:72
 #: ../../mod/subthread.php:172
 msgid "status"
 msgstr "el mensaje de estado"
 
-#: ../../include/text.php:1851 ../../include/conversation.php:150
+#: ../../include/text.php:1871 ../../include/conversation.php:150
 #: ../../mod/tagger.php:53
 msgid "comment"
 msgstr "comentario"
 
-#: ../../include/text.php:1856
+#: ../../include/text.php:1876
 msgid "activity"
 msgstr "actividad"
 
-#: ../../include/text.php:2151
+#: ../../include/text.php:2171
 msgid "Design Tools"
 msgstr "Herramientas de diseño"
 
-#: ../../include/text.php:2154 ../../mod/blocks.php:147
+#: ../../include/text.php:2174 ../../mod/blocks.php:147
 msgid "Blocks"
 msgstr "Bloques"
 
-#: ../../include/text.php:2155 ../../mod/menu.php:103
+#: ../../include/text.php:2175 ../../mod/menu.php:103
 msgid "Menus"
 msgstr "Menús"
 
-#: ../../include/text.php:2156 ../../mod/layouts.php:174
+#: ../../include/text.php:2176 ../../mod/layouts.php:174
 msgid "Layouts"
 msgstr "Formato gráfico"
 
-#: ../../include/text.php:2157
+#: ../../include/text.php:2177
 msgid "Pages"
 msgstr "Páginas"
 
@@ -2682,7 +2743,7 @@ msgstr "El canal está bloqueado en este sitio."
 
 #: ../../include/follow.php:33
 msgid "Channel location missing."
-msgstr "Falta la ubicación del canal."
+msgstr "Falta la dirección del canal."
 
 #: ../../include/follow.php:82
 msgid "Response from remote channel was incomplete."
@@ -3095,6 +3156,14 @@ msgstr "Estudios:"
 msgid "Like this thing"
 msgstr "Me gusta esto"
 
+#: ../../include/bb2diaspora.php:382
+msgid "Attachments:"
+msgstr "Ficheros adjuntos:"
+
+#: ../../include/bb2diaspora.php:470
+msgid "$Projectname event notification:"
+msgstr "Notificación de eventos de $Projectname:"
+
 #: ../../include/taxonomy.php:229 ../../include/taxonomy.php:250
 msgid "Tags"
 msgstr "Etiquetas"
@@ -3127,68 +3196,6 @@ msgstr "le gusta"
 msgid "dislikes"
 msgstr "no le gusta"
 
-#: ../../include/attach.php:243 ../../include/attach.php:329
-msgid "Item was not found."
-msgstr "Elemento no encontrado."
-
-#: ../../include/attach.php:493
-msgid "No source file."
-msgstr "Ningún fichero de origen"
-
-#: ../../include/attach.php:511
-msgid "Cannot locate file to replace"
-msgstr "No se puede localizar el fichero que va a ser sustituido."
-
-#: ../../include/attach.php:529
-msgid "Cannot locate file to revise/update"
-msgstr "No se puede localizar el fichero para revisar/actualizar"
-
-#: ../../include/attach.php:664
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "El fichero supera el limite de tamaño de %d"
-
-#: ../../include/attach.php:678
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos."
-
-#: ../../include/attach.php:828
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado."
-
-#: ../../include/attach.php:841
-msgid "Stored file could not be verified. Upload failed."
-msgstr "El fichero almacenado no ha podido ser verificado. El envío ha fallado."
-
-#: ../../include/attach.php:889 ../../include/attach.php:905
-msgid "Path not available."
-msgstr "Ruta no disponible."
-
-#: ../../include/attach.php:951 ../../include/attach.php:1103
-msgid "Empty pathname"
-msgstr "Ruta vacía"
-
-#: ../../include/attach.php:977
-msgid "duplicate filename or path"
-msgstr "Nombre duplicado de ruta o fichero"
-
-#: ../../include/attach.php:999
-msgid "Path not found."
-msgstr "Ruta no encontrada"
-
-#: ../../include/attach.php:1057
-msgid "mkdir failed."
-msgstr "mkdir ha fallado."
-
-#: ../../include/attach.php:1061
-msgid "database storage failed."
-msgstr "el almacenamiento en la base de datos ha fallado."
-
-#: ../../include/attach.php:1109
-msgid "Empty path"
-msgstr "Ruta vacía"
-
 #: ../../include/conversation.php:126 ../../mod/like.php:113
 msgid "channel"
 msgstr "canal"
@@ -3219,42 +3226,42 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s está %2$s"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1060
+#: ../../include/conversation.php:574 ../../mod/photos.php:1063
 msgctxt "title"
 msgid "Likes"
 msgstr "Me gusta"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1060
+#: ../../include/conversation.php:574 ../../mod/photos.php:1063
 msgctxt "title"
 msgid "Dislikes"
 msgstr "No me gusta"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+#: ../../include/conversation.php:575 ../../mod/photos.php:1064
 msgctxt "title"
 msgid "Agree"
 msgstr "De acuerdo"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+#: ../../include/conversation.php:575 ../../mod/photos.php:1064
 msgctxt "title"
 msgid "Disagree"
 msgstr "En desacuerdo"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+#: ../../include/conversation.php:575 ../../mod/photos.php:1064
 msgctxt "title"
 msgid "Abstain"
 msgstr "Abstención"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+#: ../../include/conversation.php:576 ../../mod/photos.php:1065
 msgctxt "title"
 msgid "Attending"
 msgstr "Participaré"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+#: ../../include/conversation.php:576 ../../mod/photos.php:1065
 msgctxt "title"
 msgid "Not attending"
 msgstr "No participaré"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+#: ../../include/conversation.php:576 ../../mod/photos.php:1065
 msgctxt "title"
 msgid "Might attend"
 msgstr "Quizá participe"
@@ -3400,269 +3407,273 @@ msgstr "¿Donde está ahora?"
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Caduca YYYY-MM-DD HH:MM"
 
-#: ../../include/conversation.php:1179 ../../mod/photos.php:1025
-#: ../../mod/layouts.php:184 ../../mod/webpages.php:182
+#: ../../include/conversation.php:1183 ../../mod/layouts.php:184
+#: ../../mod/photos.php:1028 ../../mod/webpages.php:182
 #: ../../mod/blocks.php:154
 msgid "Share"
 msgstr "Compartir"
 
-#: ../../include/conversation.php:1181
+#: ../../include/conversation.php:1185
 msgid "Page link name"
 msgstr "Nombre de enlace de página"
 
-#: ../../include/conversation.php:1184
+#: ../../include/conversation.php:1188
 msgid "Post as"
 msgstr "Publicar como"
 
-#: ../../include/conversation.php:1191 ../../mod/editblock.php:142
-#: ../../mod/editpost.php:119 ../../mod/editlayout.php:140
+#: ../../include/conversation.php:1195 ../../mod/editblock.php:142
+#: ../../mod/editpost.php:118 ../../mod/editlayout.php:140
 #: ../../mod/editwebpage.php:182
 msgid "Upload photo"
 msgstr "Subir foto"
 
-#: ../../include/conversation.php:1192
+#: ../../include/conversation.php:1196
 msgid "upload photo"
 msgstr "subir foto"
 
-#: ../../include/conversation.php:1193 ../../mod/mail.php:240
+#: ../../include/conversation.php:1197 ../../mod/mail.php:240
 #: ../../mod/mail.php:369 ../../mod/editblock.php:143
-#: ../../mod/editpost.php:120 ../../mod/editlayout.php:141
+#: ../../mod/editpost.php:119 ../../mod/editlayout.php:141
 #: ../../mod/editwebpage.php:183
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
-#: ../../include/conversation.php:1194
+#: ../../include/conversation.php:1198
 msgid "attach file"
 msgstr "adjuntar fichero"
 
-#: ../../include/conversation.php:1195 ../../mod/mail.php:241
+#: ../../include/conversation.php:1199 ../../mod/mail.php:241
 #: ../../mod/mail.php:370 ../../mod/editblock.php:144
-#: ../../mod/editpost.php:121 ../../mod/editlayout.php:142
+#: ../../mod/editpost.php:120 ../../mod/editlayout.php:142
 #: ../../mod/editwebpage.php:184
 msgid "Insert web link"
 msgstr "Insertar enlace web"
 
-#: ../../include/conversation.php:1196
+#: ../../include/conversation.php:1200
 msgid "web link"
 msgstr "enlace web"
 
-#: ../../include/conversation.php:1197
+#: ../../include/conversation.php:1201
 msgid "Insert video link"
 msgstr "Insertar enlace de vídeo"
 
-#: ../../include/conversation.php:1198
+#: ../../include/conversation.php:1202
 msgid "video link"
 msgstr "enlace de vídeo"
 
-#: ../../include/conversation.php:1199
+#: ../../include/conversation.php:1203
 msgid "Insert audio link"
 msgstr "Insertar enlace de audio"
 
-#: ../../include/conversation.php:1200
+#: ../../include/conversation.php:1204
 msgid "audio link"
 msgstr "enlace de audio"
 
-#: ../../include/conversation.php:1201 ../../mod/editblock.php:148
-#: ../../mod/editpost.php:125 ../../mod/editlayout.php:146
+#: ../../include/conversation.php:1205 ../../mod/editblock.php:148
+#: ../../mod/editpost.php:124 ../../mod/editlayout.php:146
 #: ../../mod/editwebpage.php:188
 msgid "Set your location"
-msgstr "Configure su localización"
+msgstr "Configure su ubicación"
 
-#: ../../include/conversation.php:1202
+#: ../../include/conversation.php:1206
 msgid "set location"
-msgstr "configure localización"
+msgstr "establecer ubicación"
 
-#: ../../include/conversation.php:1203 ../../mod/editpost.php:127
+#: ../../include/conversation.php:1207 ../../mod/editpost.php:126
 msgid "Toggle voting"
 msgstr "Cambiar votación"
 
-#: ../../include/conversation.php:1206 ../../mod/editblock.php:149
-#: ../../mod/editpost.php:126 ../../mod/editlayout.php:147
+#: ../../include/conversation.php:1210 ../../mod/editblock.php:149
+#: ../../mod/editpost.php:125 ../../mod/editlayout.php:147
 #: ../../mod/editwebpage.php:189
 msgid "Clear browser location"
-msgstr "Eliminar localización del navegador"
+msgstr "Eliminar los datos de ubicación del navegador"
 
-#: ../../include/conversation.php:1207
+#: ../../include/conversation.php:1211
 msgid "clear location"
-msgstr "eliminar localización"
+msgstr "borrar los datos de ubicación"
 
-#: ../../include/conversation.php:1209 ../../mod/editblock.php:162
-#: ../../mod/editpost.php:142 ../../mod/editwebpage.php:205
+#: ../../include/conversation.php:1213 ../../mod/editblock.php:162
+#: ../../mod/editpost.php:141 ../../mod/editwebpage.php:205
 msgid "Title (optional)"
 msgstr "Título (opcional)"
 
-#: ../../include/conversation.php:1213 ../../mod/editblock.php:165
-#: ../../mod/editpost.php:144 ../../mod/editlayout.php:163
+#: ../../include/conversation.php:1217 ../../mod/editblock.php:165
+#: ../../mod/editpost.php:143 ../../mod/editlayout.php:163
 #: ../../mod/editwebpage.php:207
 msgid "Categories (optional, comma-separated list)"
 msgstr "Categorías (opcional, lista separada por comas)"
 
-#: ../../include/conversation.php:1215 ../../mod/editblock.php:151
-#: ../../mod/editpost.php:131 ../../mod/editlayout.php:149
+#: ../../include/conversation.php:1219 ../../mod/editblock.php:151
+#: ../../mod/editpost.php:130 ../../mod/editlayout.php:149
 #: ../../mod/editwebpage.php:191
 msgid "Permission settings"
 msgstr "Configuración de permisos"
 
-#: ../../include/conversation.php:1216
+#: ../../include/conversation.php:1220
 msgid "permissions"
 msgstr "permisos"
 
-#: ../../include/conversation.php:1224 ../../mod/editblock.php:159
-#: ../../mod/editpost.php:139 ../../mod/editlayout.php:156
+#: ../../include/conversation.php:1228 ../../mod/editblock.php:159
+#: ../../mod/editpost.php:138 ../../mod/editlayout.php:156
 #: ../../mod/editwebpage.php:200
 msgid "Public post"
 msgstr "Entrada pública"
 
-#: ../../include/conversation.php:1226 ../../mod/editblock.php:166
-#: ../../mod/editpost.php:145 ../../mod/editlayout.php:164
+#: ../../include/conversation.php:1230 ../../mod/editblock.php:166
+#: ../../mod/editpost.php:144 ../../mod/editlayout.php:164
 #: ../../mod/editwebpage.php:208
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Ejemplo: roberto@ejemplo.com, maría@ejemplo.com"
 
-#: ../../include/conversation.php:1239 ../../mod/mail.php:245
+#: ../../include/conversation.php:1243 ../../mod/mail.php:245
 #: ../../mod/mail.php:374 ../../mod/editblock.php:176
-#: ../../mod/editpost.php:156 ../../mod/editlayout.php:173
+#: ../../mod/editpost.php:155 ../../mod/editlayout.php:173
 #: ../../mod/editwebpage.php:217
 msgid "Set expiration date"
 msgstr "Configurar fecha de caducidad"
 
-#: ../../include/conversation.php:1243 ../../mod/editpost.php:160
+#: ../../include/conversation.php:1246
+msgid "Set publish date"
+msgstr "Establecer la fecha de publicación"
+
+#: ../../include/conversation.php:1250 ../../mod/editpost.php:159
 #: ../../mod/events.php:691
 msgid "OK"
 msgstr "OK"
 
-#: ../../include/conversation.php:1244 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:161
+#: ../../include/conversation.php:1251 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:160
 #: ../../mod/events.php:690 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
 #: ../../mod/settings.php:584 ../../mod/settings.php:610
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../../include/conversation.php:1487
+#: ../../include/conversation.php:1494
 msgid "Discover"
 msgstr "Descubrir"
 
-#: ../../include/conversation.php:1490
+#: ../../include/conversation.php:1497
 msgid "Imported public streams"
 msgstr "Flujos públicos importados"
 
-#: ../../include/conversation.php:1495
+#: ../../include/conversation.php:1502
 msgid "Commented Order"
 msgstr "Comentarios recientes"
 
-#: ../../include/conversation.php:1498
+#: ../../include/conversation.php:1505
 msgid "Sort by Comment Date"
 msgstr "Ordenar por fecha de comentario"
 
-#: ../../include/conversation.php:1502
+#: ../../include/conversation.php:1509
 msgid "Posted Order"
 msgstr "Publicaciones recientes"
 
-#: ../../include/conversation.php:1505
+#: ../../include/conversation.php:1512
 msgid "Sort by Post Date"
 msgstr "Ordenar por fecha de publicación"
 
-#: ../../include/conversation.php:1510 ../../include/widgets.php:94
+#: ../../include/conversation.php:1517 ../../include/widgets.php:94
 msgid "Personal"
 msgstr "Personales"
 
-#: ../../include/conversation.php:1513
+#: ../../include/conversation.php:1520
 msgid "Posts that mention or involve you"
 msgstr "Publicaciones que le mencionan o involucran"
 
-#: ../../include/conversation.php:1519 ../../mod/menu.php:112
+#: ../../include/conversation.php:1526 ../../mod/menu.php:112
 #: ../../mod/connections.php:72 ../../mod/connections.php:82
 msgid "New"
 msgstr "Nuevas"
 
-#: ../../include/conversation.php:1522
+#: ../../include/conversation.php:1529
 msgid "Activity Stream - by date"
 msgstr "Flujo de actividad - por fecha"
 
-#: ../../include/conversation.php:1528
+#: ../../include/conversation.php:1535
 msgid "Starred"
 msgstr "Preferidas"
 
-#: ../../include/conversation.php:1531
+#: ../../include/conversation.php:1538
 msgid "Favourite Posts"
 msgstr "Publicaciones favoritas"
 
-#: ../../include/conversation.php:1538
+#: ../../include/conversation.php:1545
 msgid "Spam"
 msgstr "Correo basura"
 
-#: ../../include/conversation.php:1541
+#: ../../include/conversation.php:1548
 msgid "Posts flagged as SPAM"
 msgstr "Publicaciones marcadas como basura"
 
-#: ../../include/conversation.php:1585 ../../mod/admin.php:947
+#: ../../include/conversation.php:1592 ../../mod/admin.php:947
 msgid "Channel"
 msgstr "Canal"
 
-#: ../../include/conversation.php:1588
+#: ../../include/conversation.php:1595
 msgid "Status Messages and Posts"
 msgstr "Mensajes de estado y publicaciones"
 
-#: ../../include/conversation.php:1597
+#: ../../include/conversation.php:1604
 msgid "About"
 msgstr "Sobre mí"
 
-#: ../../include/conversation.php:1600
+#: ../../include/conversation.php:1607
 msgid "Profile Details"
 msgstr "Detalles del perfil"
 
-#: ../../include/conversation.php:1616
+#: ../../include/conversation.php:1623
 msgid "Files and Storage"
 msgstr "Ficheros y repositorio"
 
-#: ../../include/conversation.php:1626 ../../include/conversation.php:1629
+#: ../../include/conversation.php:1633 ../../include/conversation.php:1636
 msgid "Chatrooms"
 msgstr "Salas de chat"
 
-#: ../../include/conversation.php:1642
+#: ../../include/conversation.php:1649
 msgid "Saved Bookmarks"
 msgstr "Marcadores guardados"
 
-#: ../../include/conversation.php:1652
+#: ../../include/conversation.php:1659
 msgid "Manage Webpages"
 msgstr "Administrar páginas web"
 
-#: ../../include/conversation.php:1711
+#: ../../include/conversation.php:1718
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "Participando"
 msgstr[1] "Participaré"
 
-#: ../../include/conversation.php:1714
+#: ../../include/conversation.php:1721
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "No participando"
 msgstr[1] "No participaré"
 
-#: ../../include/conversation.php:1717
+#: ../../include/conversation.php:1724
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "Indeciso/a"
 msgstr[1] "Indecisos/as"
 
-#: ../../include/conversation.php:1720
+#: ../../include/conversation.php:1727
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] "Está de acuerdo"
 msgstr[1] "De acuerdo"
 
-#: ../../include/conversation.php:1723
+#: ../../include/conversation.php:1730
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] "No está de acuerdo"
 msgstr[1] "En desacuerdo"
 
-#: ../../include/conversation.php:1726
+#: ../../include/conversation.php:1733
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
@@ -3776,7 +3787,7 @@ msgstr "Aplicaciones conectadas"
 msgid "Export channel"
 msgstr "Exportar canal"
 
-#: ../../include/widgets.php:529 ../../mod/connedit.php:657
+#: ../../include/widgets.php:529 ../../mod/connedit.php:673
 msgid "Connection Default Permissions"
 msgstr "Permisos predeterminados de conexión"
 
@@ -3862,7 +3873,7 @@ msgstr "Foros"
 
 #: ../../include/widgets.php:1146
 msgid "Tasks"
-msgstr "Actividad"
+msgstr "Tareas"
 
 #: ../../include/widgets.php:1155
 msgid "Documentation"
@@ -4124,8 +4135,8 @@ msgstr "Modo seguro"
 #: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
 #: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
 #: ../../mod/mitem.php:229 ../../mod/connedit.php:630
-#: ../../mod/connedit.php:658 ../../mod/photos.php:625
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/connedit.php:674 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/photos.php:626
 #: ../../mod/admin.php:386 ../../mod/menu.php:96 ../../mod/menu.php:153
 #: ../../mod/settings.php:574 ../../mod/api.php:106
 #: ../../view/theme/redbasic/php/config.php:104
@@ -4136,8 +4147,8 @@ msgstr "No"
 #: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
 #: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
 #: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../mod/photos.php:625
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/mitem.php:229 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/photos.php:626
 #: ../../mod/admin.php:388 ../../mod/menu.php:96 ../../mod/menu.php:153
 #: ../../mod/settings.php:574 ../../mod/api.php:105
 #: ../../view/theme/redbasic/php/config.php:104
@@ -4174,8 +4185,8 @@ msgstr "Sugerir amigos"
 msgid "Suggest a friend for %s"
 msgstr "Sugerir un amigo a %s"
 
-#: ../../mod/directory.php:59 ../../mod/display.php:13
-#: ../../mod/photos.php:489 ../../mod/search.php:13 ../../mod/ratings.php:82
+#: ../../mod/directory.php:59 ../../mod/display.php:13 ../../mod/search.php:13
+#: ../../mod/photos.php:490 ../../mod/ratings.php:82
 #: ../../mod/viewconnections.php:17
 msgid "Public access denied."
 msgstr "Acceso público denegado."
@@ -4860,100 +4871,109 @@ msgstr "Ajustar el perfil"
 msgid "Set Affinity & Profile"
 msgstr "Ajustar la afinidad y el perfil"
 
-#: ../../mod/connedit.php:658
+#: ../../mod/connedit.php:669
+msgid "none"
+msgstr "nada"
+
+#: ../../mod/connedit.php:674
 msgid "Apply these permissions automatically"
 msgstr "Aplicar estos permisos automaticamente"
 
-#: ../../mod/connedit.php:660
-msgid "This connection's address is"
-msgstr "La dirección de esta conexión es"
+#: ../../mod/connedit.php:676
+msgid "This connection's primary address is"
+msgstr "La dirección primaria de esta conexión es"
+
+#: ../../mod/connedit.php:677
+msgid "Available locations:"
+msgstr "Ubicaciones disponibles:"
 
-#: ../../mod/connedit.php:663
+#: ../../mod/connedit.php:681
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones."
 
-#: ../../mod/connedit.php:665
+#: ../../mod/connedit.php:683
 msgid "Slide to adjust your degree of friendship"
 msgstr "Deslizar para ajustar el grado de amistad"
 
-#: ../../mod/connedit.php:667
+#: ../../mod/connedit.php:685
 msgid "Slide to adjust your rating"
 msgstr "Deslizar para ajustar su valoración"
 
-#: ../../mod/connedit.php:668 ../../mod/connedit.php:673
+#: ../../mod/connedit.php:686 ../../mod/connedit.php:691
 msgid "Optionally explain your rating"
 msgstr "Opcionalmente, puede explicar su valoración"
 
-#: ../../mod/connedit.php:670
+#: ../../mod/connedit.php:688
 msgid "Custom Filter"
 msgstr "Filtro personalizado"
 
-#: ../../mod/connedit.php:671
+#: ../../mod/connedit.php:689
 msgid "Only import posts with this text"
 msgstr "Importar solo entradas que contengan este texto"
 
-#: ../../mod/connedit.php:671 ../../mod/connedit.php:672
+#: ../../mod/connedit.php:689 ../../mod/connedit.php:690
 msgid ""
-"words one per line or #tags or /patterns/, leave blank to import all posts"
-msgstr "palabras, una por línea, o #etiquetas o /patrones/, dejar en blanco para importar todas las entradas"
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
+msgstr "Una por cada línea: palabras, #etiquetas,  /patrones/ o lengua=xx. Dejar en blanco para importarlo todo"
 
-#: ../../mod/connedit.php:672
+#: ../../mod/connedit.php:690
 msgid "Do not import posts with this text"
 msgstr "No importar entradas que contengan este texto"
 
-#: ../../mod/connedit.php:674
+#: ../../mod/connedit.php:692
 msgid "This information is public!"
 msgstr "¡Esta información es pública!"
 
-#: ../../mod/connedit.php:679
+#: ../../mod/connedit.php:697
 msgid "Connection Pending Approval"
 msgstr "Conexión pendiente de aprobación"
 
-#: ../../mod/connedit.php:680
+#: ../../mod/connedit.php:698
 msgid "Connection Request"
 msgstr "Solicitud de conexión"
 
-#: ../../mod/connedit.php:681
+#: ../../mod/connedit.php:699
 #, php-format
 msgid ""
 "(%s) would like to connect with you. Please approve this connection to allow"
 " communication."
 msgstr "(%s) desearía conectar con usted. por favor, apruebe esta conexión para permitir la comunicación."
 
-#: ../../mod/connedit.php:682 ../../mod/admin.php:781
+#: ../../mod/connedit.php:700 ../../mod/admin.php:781
 msgid "Approve"
 msgstr "Aprobar"
 
-#: ../../mod/connedit.php:683
+#: ../../mod/connedit.php:701
 msgid "Approve Later"
 msgstr "Aprobar más tarde"
 
-#: ../../mod/connedit.php:686
+#: ../../mod/connedit.php:704
 msgid "inherited"
 msgstr "heredado"
 
-#: ../../mod/connedit.php:688
+#: ../../mod/connedit.php:706
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura."
 
-#: ../../mod/connedit.php:690
+#: ../../mod/connedit.php:708
 msgid "Their Settings"
 msgstr "Sus ajustes"
 
-#: ../../mod/connedit.php:691
+#: ../../mod/connedit.php:709
 msgid "My Settings"
 msgstr "Mis ajustes"
 
-#: ../../mod/connedit.php:693
+#: ../../mod/connedit.php:711
 msgid "Individual Permissions"
 msgstr "Permisos individuales"
 
-#: ../../mod/connedit.php:694
+#: ../../mod/connedit.php:712
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -4961,7 +4981,7 @@ msgid ""
 " settings here."
 msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. <strong>No</strong> puede cambiar estos ajustes aquí."
 
-#: ../../mod/connedit.php:695
+#: ../../mod/connedit.php:713
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -4969,7 +4989,7 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados."
 
-#: ../../mod/connedit.php:696
+#: ../../mod/connedit.php:714
 msgid "Last update:"
 msgstr "Última actualización:"
 
@@ -4996,165 +5016,6 @@ msgid ""
 " to correctly use this feature."
 msgstr "Atención: El cambio de algunos ajustes puede volver inutilizable su canal. Por favor, abandone la página excepto que esté seguro y sepa cómo usar correctamente esta característica."
 
-#: ../../mod/photos.php:79
-msgid "Page owner information could not be retrieved."
-msgstr "La información del propietario de la página no pudo ser recuperada."
-
-#: ../../mod/photos.php:100
-msgid "Album not found."
-msgstr "Álbum no encontrado."
-
-#: ../../mod/photos.php:127
-msgid "Delete Album"
-msgstr "Borrar álbum"
-
-#: ../../mod/photos.php:171 ../../mod/photos.php:1006
-msgid "Delete Photo"
-msgstr "Borrar foto"
-
-#: ../../mod/photos.php:500
-msgid "No photos selected"
-msgstr "No hay fotos seleccionadas"
-
-#: ../../mod/photos.php:549
-msgid "Access to this item is restricted."
-msgstr "El acceso a este elemento está restringido."
-
-#: ../../mod/photos.php:588
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado."
-
-#: ../../mod/photos.php:591
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "%1$.2f MB de almacenamiento de fotos utilizado."
-
-#: ../../mod/photos.php:619
-msgid "Upload Photos"
-msgstr "Subir fotos"
-
-#: ../../mod/photos.php:623
-msgid "Enter an album name"
-msgstr "Introducir un nombre de álbum"
-
-#: ../../mod/photos.php:624
-msgid "or select an existing album (doubleclick)"
-msgstr "o seleccionar uno existente (doble click)"
-
-#: ../../mod/photos.php:625
-msgid "Create a status post for this upload"
-msgstr "Crear una entrada de estado para esta subida"
-
-#: ../../mod/photos.php:652
-msgid "Album name could not be decoded"
-msgstr "El nombre del álbum no ha podido ser descifrado"
-
-#: ../../mod/photos.php:696 ../../mod/photos.php:1233
-#: ../../mod/photos.php:1250
-msgid "Contact Photos"
-msgstr "Fotos de contacto"
-
-#: ../../mod/photos.php:724
-msgid "Show Newest First"
-msgstr "Mostrar lo más reciente primero"
-
-#: ../../mod/photos.php:726
-msgid "Show Oldest First"
-msgstr "Mostrar lo más antiguo primero"
-
-#: ../../mod/photos.php:750 ../../mod/photos.php:1283
-msgid "View Photo"
-msgstr "Ver foto"
-
-#: ../../mod/photos.php:779
-msgid "Edit Album"
-msgstr "Editar álbum"
-
-#: ../../mod/photos.php:824
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Permiso denegado. El acceso a este elemento puede estar restringido."
-
-#: ../../mod/photos.php:826
-msgid "Photo not available"
-msgstr "Foto no disponible"
-
-#: ../../mod/photos.php:884
-msgid "Use as profile photo"
-msgstr "Usar como foto del perfil"
-
-#: ../../mod/photos.php:891
-msgid "Private Photo"
-msgstr "Foto privada"
-
-#: ../../mod/photos.php:902 ../../mod/events.php:528
-msgid "Previous"
-msgstr "Anterior"
-
-#: ../../mod/photos.php:906
-msgid "View Full Size"
-msgstr "Ver tamaño completo"
-
-#: ../../mod/photos.php:911 ../../mod/events.php:529 ../../mod/setup.php:285
-msgid "Next"
-msgstr "Siguiente"
-
-#: ../../mod/photos.php:951 ../../mod/tagrm.php:133
-msgid "Remove"
-msgstr "Eliminar"
-
-#: ../../mod/photos.php:985
-msgid "Edit photo"
-msgstr "Editar foto"
-
-#: ../../mod/photos.php:987
-msgid "Rotate CW (right)"
-msgstr "Girar CW (a la derecha)"
-
-#: ../../mod/photos.php:988
-msgid "Rotate CCW (left)"
-msgstr "Girar CCW (a la izquierda)"
-
-#: ../../mod/photos.php:991
-msgid "Enter a new album name"
-msgstr "Introducir un nuevo nombre de álbum"
-
-#: ../../mod/photos.php:992
-msgid "or select an existing one (doubleclick)"
-msgstr "o seleccionar uno (doble click) existente"
-
-#: ../../mod/photos.php:995
-msgid "Caption"
-msgstr "Título"
-
-#: ../../mod/photos.php:997
-msgid "Add a Tag"
-msgstr "Añadir una etiqueta"
-
-#: ../../mod/photos.php:1001
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com"
-
-#: ../../mod/photos.php:1004
-msgid "Flag as adult in album view"
-msgstr "Marcar como \"solo para adultos\" en el álbum"
-
-#: ../../mod/photos.php:1196
-msgid "In This Photo:"
-msgstr "En esta foto:"
-
-#: ../../mod/photos.php:1201
-msgid "Map"
-msgstr "Mapa"
-
-#: ../../mod/photos.php:1289
-msgid "View Album"
-msgstr "Ver álbum"
-
-#: ../../mod/photos.php:1312
-msgid "Recent Photos"
-msgstr "Fotos recientes"
-
 #: ../../mod/filestorage.php:82
 msgid "Permission Denied."
 msgstr "Permiso denegado"
@@ -5317,12 +5178,12 @@ msgstr "Tiempo de expiración de los mensajes en los chats (en minutos)"
 msgid "%1$s's Chatrooms"
 msgstr "Salas de chat de %1$s"
 
-#: ../../mod/search.php:209
+#: ../../mod/search.php:211
 #, php-format
 msgid "Items tagged with: %s"
 msgstr "elementos etiquetados con: %s"
 
-#: ../../mod/search.php:211
+#: ../../mod/search.php:213
 #, php-format
 msgid "Search results for: %s"
 msgstr "Resultados de la búsqueda para: %s"
@@ -5431,6 +5292,173 @@ msgstr "Responder"
 msgid "Your message for %s (%s):"
 msgstr "Su mensaje para %s (%s):"
 
+#: ../../mod/photos.php:79
+msgid "Page owner information could not be retrieved."
+msgstr "La información del propietario de la página no pudo ser recuperada."
+
+#: ../../mod/photos.php:100
+msgid "Album not found."
+msgstr "Álbum no encontrado."
+
+#: ../../mod/photos.php:127
+msgid "Delete Album"
+msgstr "Borrar álbum"
+
+#: ../../mod/photos.php:171 ../../mod/photos.php:1009
+msgid "Delete Photo"
+msgstr "Borrar foto"
+
+#: ../../mod/photos.php:501
+msgid "No photos selected"
+msgstr "No hay fotos seleccionadas"
+
+#: ../../mod/photos.php:550
+msgid "Access to this item is restricted."
+msgstr "El acceso a este elemento está restringido."
+
+#: ../../mod/photos.php:589
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado."
+
+#: ../../mod/photos.php:592
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr "%1$.2f MB de almacenamiento de fotos utilizado."
+
+#: ../../mod/photos.php:620
+msgid "Upload Photos"
+msgstr "Subir fotos"
+
+#: ../../mod/photos.php:624
+msgid "Enter an album name"
+msgstr "Introducir un nombre de álbum"
+
+#: ../../mod/photos.php:625
+msgid "or select an existing album (doubleclick)"
+msgstr "o seleccionar uno existente (doble click)"
+
+#: ../../mod/photos.php:626
+msgid "Create a status post for this upload"
+msgstr "Crear una entrada de estado para esta subida"
+
+#: ../../mod/photos.php:627
+msgid "Caption (optional):"
+msgstr "Título (opcional):"
+
+#: ../../mod/photos.php:628
+msgid "Description (optional):"
+msgstr "Descripción (opcional):"
+
+#: ../../mod/photos.php:655
+msgid "Album name could not be decoded"
+msgstr "El nombre del álbum no ha podido ser descifrado"
+
+#: ../../mod/photos.php:699 ../../mod/photos.php:1236
+#: ../../mod/photos.php:1253
+msgid "Contact Photos"
+msgstr "Fotos de contacto"
+
+#: ../../mod/photos.php:727
+msgid "Show Newest First"
+msgstr "Mostrar lo más reciente primero"
+
+#: ../../mod/photos.php:729
+msgid "Show Oldest First"
+msgstr "Mostrar lo más antiguo primero"
+
+#: ../../mod/photos.php:753 ../../mod/photos.php:1286
+msgid "View Photo"
+msgstr "Ver foto"
+
+#: ../../mod/photos.php:782
+msgid "Edit Album"
+msgstr "Editar álbum"
+
+#: ../../mod/photos.php:827
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Permiso denegado. El acceso a este elemento puede estar restringido."
+
+#: ../../mod/photos.php:829
+msgid "Photo not available"
+msgstr "Foto no disponible"
+
+#: ../../mod/photos.php:887
+msgid "Use as profile photo"
+msgstr "Usar como foto del perfil"
+
+#: ../../mod/photos.php:894
+msgid "Private Photo"
+msgstr "Foto privada"
+
+#: ../../mod/photos.php:905 ../../mod/events.php:528
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../../mod/photos.php:909
+msgid "View Full Size"
+msgstr "Ver tamaño completo"
+
+#: ../../mod/photos.php:914 ../../mod/events.php:529 ../../mod/setup.php:285
+msgid "Next"
+msgstr "Siguiente"
+
+#: ../../mod/photos.php:954 ../../mod/tagrm.php:133
+msgid "Remove"
+msgstr "Eliminar"
+
+#: ../../mod/photos.php:988
+msgid "Edit photo"
+msgstr "Editar foto"
+
+#: ../../mod/photos.php:990
+msgid "Rotate CW (right)"
+msgstr "Girar CW (a la derecha)"
+
+#: ../../mod/photos.php:991
+msgid "Rotate CCW (left)"
+msgstr "Girar CCW (a la izquierda)"
+
+#: ../../mod/photos.php:994
+msgid "Enter a new album name"
+msgstr "Introducir un nuevo nombre de álbum"
+
+#: ../../mod/photos.php:995
+msgid "or select an existing one (doubleclick)"
+msgstr "o seleccionar uno (doble click) existente"
+
+#: ../../mod/photos.php:998
+msgid "Caption"
+msgstr "Título"
+
+#: ../../mod/photos.php:1000
+msgid "Add a Tag"
+msgstr "Añadir una etiqueta"
+
+#: ../../mod/photos.php:1004
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com"
+
+#: ../../mod/photos.php:1007
+msgid "Flag as adult in album view"
+msgstr "Marcar como \"solo para adultos\" en el álbum"
+
+#: ../../mod/photos.php:1199
+msgid "In This Photo:"
+msgstr "En esta foto:"
+
+#: ../../mod/photos.php:1204
+msgid "Map"
+msgstr "Mapa"
+
+#: ../../mod/photos.php:1292
+msgid "View Album"
+msgstr "Ver álbum"
+
+#: ../../mod/photos.php:1315
+msgid "Recent Photos"
+msgstr "Fotos recientes"
+
 #: ../../mod/dreport.php:23
 msgid "Invalid message"
 msgstr "Mensaje no válido"
@@ -5498,17 +5526,17 @@ msgstr "Elemento no encontrado"
 msgid "Delete block?"
 msgstr "¿Borrar bloque?"
 
-#: ../../mod/editblock.php:145 ../../mod/editpost.php:122
+#: ../../mod/editblock.php:145 ../../mod/editpost.php:121
 #: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:185
 msgid "Insert YouTube video"
 msgstr "Insertar vídeo de YouTube"
 
-#: ../../mod/editblock.php:146 ../../mod/editpost.php:123
+#: ../../mod/editblock.php:146 ../../mod/editpost.php:122
 #: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:186
 msgid "Insert Vorbis [.ogg] video"
 msgstr "Insertar vídeo Vorbis [.ogg]"
 
-#: ../../mod/editblock.php:147 ../../mod/editpost.php:124
+#: ../../mod/editblock.php:147 ../../mod/editpost.php:123
 #: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:187
 msgid "Insert Vorbis [.ogg] audio"
 msgstr "Insertar audio Vorbis [.ogg]"
@@ -5529,7 +5557,7 @@ msgstr "El elemento no es editable"
 msgid "Delete item?"
 msgstr "¿Borrar elemento?"
 
-#: ../../mod/editpost.php:165 ../../mod/rpost.php:128
+#: ../../mod/editpost.php:164 ../../mod/rpost.php:128
 msgid "Edit post"
 msgstr "Editar la entrada"
 
@@ -6329,7 +6357,7 @@ msgstr "Precio de la aplicación"
 
 #: ../../mod/appman.php:97
 msgid "Location (URL) to purchase app"
-msgstr "Ubicación (URL) donde adquirir la aplicación"
+msgstr "Dirección (URL) donde adquirir la aplicación"
 
 #: ../../mod/menu.php:45
 msgid "Unable to update menu."
@@ -6875,20 +6903,20 @@ msgstr "La entrada vacía ha sido desechada."
 msgid "Executable content type not permitted to this channel."
 msgstr "Contenido de tipo ejecutable no permitido en este canal."
 
-#: ../../mod/item.php:906
+#: ../../mod/item.php:908
 msgid "System error. Post not saved."
 msgstr "Error del sistema. La entrada no se ha podido salvar."
 
-#: ../../mod/item.php:1173
+#: ../../mod/item.php:1175
 msgid "Unable to obtain post information from database."
 msgstr "No ha sido posible obtener información de la entrada en la base de datos."
 
-#: ../../mod/item.php:1180
+#: ../../mod/item.php:1182
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Ha alcanzado su límite de %1$.0f entradas en la página principal."
 
-#: ../../mod/item.php:1187
+#: ../../mod/item.php:1189
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Ha alcanzado su límite de %1$.0f páginas web."
@@ -7051,7 +7079,7 @@ msgstr "Normas de registro"
 
 #: ../../mod/pubsites.php:26 ../../mod/profiles.php:454
 msgid "Location"
-msgstr "Localización"
+msgstr "Ubicación"
 
 #: ../../mod/pubsites.php:26
 msgid "Project"
@@ -7430,7 +7458,7 @@ msgstr "Debe proporcionar este código de invitación:"
 #: ../../mod/invite.php:135
 msgid ""
 "1. Register at any $Projectname location (they are all inter-connected)"
-msgstr "1. Regístrese en cualquier lugar de $Projectname (están todos interconectados)"
+msgstr "1. Regístrese en cualquier sitio de $Projectname (están todos interconectados)"
 
 #: ../../mod/invite.php:137
 msgid "2. Enter my $Projectname network address into the site searchbar."
@@ -7756,7 +7784,7 @@ msgstr "Ubicación geográfica que debe mostrarse en sus publicaciones"
 
 #: ../../mod/settings.php:1030
 msgid "Use Browser Location:"
-msgstr "Usar la localización del navegador:"
+msgstr "Usar la ubicación del navegador:"
 
 #: ../../mod/settings.php:1032
 msgid "Adult Content"
@@ -7822,7 +7850,7 @@ msgstr "Configuración de privacidad avanzada"
 
 #: ../../mod/settings.php:1050
 msgid "Expire other channel content after this many days"
-msgstr "Caducar contenido de otro canal después de este número de días"
+msgstr "Caducar contenido de otros canales después de este número de días"
 
 #: ../../mod/settings.php:1050
 msgid "0 or blank prevents expiration"
@@ -8276,37 +8304,37 @@ msgstr "Visitar el perfil de %s [%s]"
 
 #: ../../mod/locs.php:21 ../../mod/locs.php:49
 msgid "Location not found."
-msgstr "Localización no encontrada."
+msgstr "Dirección no encontrada."
 
 #: ../../mod/locs.php:57
 msgid "Location lookup failed."
-msgstr "Ha fallado la búsqueda de la ubicación."
+msgstr "Ha fallado la búsqueda de la dirección."
 
 #: ../../mod/locs.php:61
 msgid ""
 "Please select another location to become primary before removing the primary"
 " location."
-msgstr "Por favor, seleccione otra ubicación para convertirla en primaria antes de retirar la ubicación principal."
+msgstr "Por favor, seleccione una copia de su canal (un clon) para convertirlo en primario antes de eliminar su canal principal."
 
 #: ../../mod/locs.php:93
 msgid "No locations found."
-msgstr "Ninguna localización encontrada."
+msgstr "No encontrada ninguna dirección."
 
 #: ../../mod/locs.php:104
 msgid "Manage Channel Locations"
-msgstr "Gestionar localizaciones del canal"
+msgstr "Gestionar las direcciones del canal"
 
 #: ../../mod/locs.php:105
 msgid "Location (address)"
-msgstr "Localización (dirección)"
+msgstr "Ubicación (dirección)"
 
 #: ../../mod/locs.php:106
 msgid "Primary Location"
-msgstr "Localización primaria"
+msgstr "Dirección primaria"
 
 #: ../../mod/locs.php:107
 msgid "Drop location"
-msgstr "Eliminar localización"
+msgstr "Eliminar dirección"
 
 #: ../../mod/post.php:234
 msgid ""
@@ -9038,6 +9066,10 @@ msgid ""
 "Use this form to import existing posts and content from an export file."
 msgstr "Utilice este formulario para importar entradas existentes y contenido desde un archivo de exportación."
 
+#: ../../mod/wholikesme.php:13
+msgid "Who likes me?"
+msgstr "¿Quién me ha puesto \"Me gusta\"?"
+
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Focus (Hubzilla default)"
 msgstr "Focus (predefinido)"
diff --git a/view/es/hstrings.php b/view/es/hstrings.php
index d82902fe3..08fd97058 100644
--- a/view/es/hstrings.php
+++ b/view/es/hstrings.php
@@ -5,12 +5,6 @@ function string_plural_select_es($n){
 	return ($n != 1);;
 }}
 ;
-$a->strings["Attachments:"] = "Ficheros adjuntos:";
-$a->strings["l F d, Y \\@ g:i A"] = "l d de F, Y \\@ G:i";
-$a->strings["\$Projectname event notification:"] = "Notificación de eventos de \$Projectname:";
-$a->strings["Starts:"] = "Comienza:";
-$a->strings["Finishes:"] = "Finaliza:";
-$a->strings["Location:"] = "Ubicación:";
 $a->strings["No username found in import file."] = "No se ha encontrado el nombre de usuario en el fichero importado.";
 $a->strings["Unable to create a unique channel address. Import failed."] = "No se ha podido crear una dirección de canal única. Ha fallado la importación.";
 $a->strings["Import completed."] = "Importación completada.";
@@ -127,8 +121,10 @@ $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"] = "Activar herramientas de votación";
+$a->strings["Enable Voting Tools"] = "Activar herramientas de 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["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";
@@ -260,10 +256,10 @@ $a->strings[" and "] = "y";
 $a->strings["public profile"] = "perfil público";
 $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s cambió %2\$s a &ldquo;%3\$s&rdquo;";
 $a->strings["Visit %1\$s's %2\$s"] = "Visitar %2\$s de %1\$s";
-$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s actualizó %2\$s,  %3\$s cambió.";
+$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s ha actualizado %2\$s cambiando %3\$s.";
 $a->strings["Connect"] = "Conectar";
 $a->strings["New window"] = "Nueva ventana";
-$a->strings["Open the selected location in a different window or browser tab"] = "Abrir la ubicación seleccionada en una ventana o pestaña aparte";
+$a->strings["Open the selected location in a different window or browser tab"] = "Abrir la dirección seleccionada en una ventana o pestaña aparte";
 $a->strings["User '%s' deleted"] = "El usuario '%s' ha sido eliminado";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "No se ha podido localizar información de DNS para el servidor de base de datos “%s”";
 $a->strings["Permission denied"] = "Permiso denegado";
@@ -375,6 +371,10 @@ $a->strings["Don't care"] = "No me importa";
 $a->strings["Ask me"] = "Pregúnteme";
 $a->strings["Embedded content"] = "Contenido incorporado";
 $a->strings["Embedding disabled"] = "Incrustación deshabilitada";
+$a->strings["l F d, Y \\@ g:i A"] = "l d de F, Y \\@ G:i";
+$a->strings["Starts:"] = "Comienza:";
+$a->strings["Finishes:"] = "Finaliza:";
+$a->strings["Location:"] = "Ubicación:";
 $a->strings["This event has been added to your calendar."] = "Este evento ha sido añadido a su calendario.";
 $a->strings["event"] = "evento";
 $a->strings["Not specified"] = "Sin especificar";
@@ -412,6 +412,21 @@ $a->strings["Profile Photo"] = "Foto del perfil";
 $a->strings["Update"] = "Actualizar";
 $a->strings["Install"] = "Instalar";
 $a->strings["Purchase"] = "Comprar";
+$a->strings["Item was not found."] = "Elemento no encontrado.";
+$a->strings["No source file."] = "Ningún fichero de origen";
+$a->strings["Cannot locate file to replace"] = "No se puede localizar el fichero que va a ser sustituido.";
+$a->strings["Cannot locate file to revise/update"] = "No se puede localizar el fichero para revisar/actualizar";
+$a->strings["File exceeds size limit of %d"] = "El fichero supera el limite de tamaño de %d";
+$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos.";
+$a->strings["File upload failed. Possible system limit or action terminated."] = "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado.";
+$a->strings["Stored file could not be verified. Upload failed."] = "El fichero almacenado no ha podido ser verificado. El envío ha fallado.";
+$a->strings["Path not available."] = "Ruta no disponible.";
+$a->strings["Empty pathname"] = "Ruta vacía";
+$a->strings["duplicate filename or path"] = "Nombre duplicado de ruta o fichero";
+$a->strings["Path not found."] = "Ruta no encontrada";
+$a->strings["mkdir failed."] = "mkdir ha fallado.";
+$a->strings["database storage failed."] = "el almacenamiento en la base de datos ha fallado.";
+$a->strings["Empty path"] = "Ruta vacía";
 $a->strings["Logged out."] = "Desconectado/a.";
 $a->strings["Failed authentication"] = "Autenticación fallida.";
 $a->strings["Login failed."] = "El acceso ha fallado.";
@@ -610,7 +625,7 @@ $a->strings["Click here to upgrade."] = "Pulse aquí para actualizar";
 $a->strings["This action exceeds the limits set by your subscription plan."] = "Esta acción supera los límites establecidos por su plan de suscripción ";
 $a->strings["This action is not available under your subscription plan."] = "Esta acción no está disponible en su plan de suscripción.";
 $a->strings["Channel is blocked on this site."] = "El canal está bloqueado en este sitio.";
-$a->strings["Channel location missing."] = "Falta la ubicación del canal.";
+$a->strings["Channel location missing."] = "Falta la dirección del canal.";
 $a->strings["Response from remote channel was incomplete."] = "Respuesta incompleta del canal.";
 $a->strings["Channel was deleted and no longer exists."] = "El canal ha sido eliminado y ya no existe.";
 $a->strings["Protocol disabled."] = "Protocolo deshabilitado.";
@@ -713,6 +728,8 @@ $a->strings["Love/Romance:"] = "Vida sentimental/amorosa:";
 $a->strings["Work/employment:"] = "Trabajo:";
 $a->strings["School/education:"] = "Estudios:";
 $a->strings["Like this thing"] = "Me gusta esto";
+$a->strings["Attachments:"] = "Ficheros adjuntos:";
+$a->strings["\$Projectname event notification:"] = "Notificación de eventos de \$Projectname:";
 $a->strings["Tags"] = "Etiquetas";
 $a->strings["Keywords"] = "Palabras clave";
 $a->strings["have"] = "tener";
@@ -721,21 +738,6 @@ $a->strings["want"] = "quiero";
 $a->strings["wants"] = "quiere";
 $a->strings["likes"] = "le gusta";
 $a->strings["dislikes"] = "no le gusta";
-$a->strings["Item was not found."] = "Elemento no encontrado.";
-$a->strings["No source file."] = "Ningún fichero de origen";
-$a->strings["Cannot locate file to replace"] = "No se puede localizar el fichero que va a ser sustituido.";
-$a->strings["Cannot locate file to revise/update"] = "No se puede localizar el fichero para revisar/actualizar";
-$a->strings["File exceeds size limit of %d"] = "El fichero supera el limite de tamaño de %d";
-$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos.";
-$a->strings["File upload failed. Possible system limit or action terminated."] = "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado.";
-$a->strings["Stored file could not be verified. Upload failed."] = "El fichero almacenado no ha podido ser verificado. El envío ha fallado.";
-$a->strings["Path not available."] = "Ruta no disponible.";
-$a->strings["Empty pathname"] = "Ruta vacía";
-$a->strings["duplicate filename or path"] = "Nombre duplicado de ruta o fichero";
-$a->strings["Path not found."] = "Ruta no encontrada";
-$a->strings["mkdir failed."] = "mkdir ha fallado.";
-$a->strings["database storage failed."] = "el almacenamiento en la base de datos ha fallado.";
-$a->strings["Empty path"] = "Ruta vacía";
 $a->strings["channel"] = "canal";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "a %1\$s le gusta %3\$s de %2\$s";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "a %1\$s no le gusta %3\$s de %2\$s";
@@ -803,11 +805,11 @@ $a->strings["Insert video link"] = "Insertar enlace de vídeo";
 $a->strings["video link"] = "enlace de vídeo";
 $a->strings["Insert audio link"] = "Insertar enlace de audio";
 $a->strings["audio link"] = "enlace de audio";
-$a->strings["Set your location"] = "Configure su localización";
-$a->strings["set location"] = "configure localización";
+$a->strings["Set your location"] = "Configure su ubicación";
+$a->strings["set location"] = "establecer ubicación";
 $a->strings["Toggle voting"] = "Cambiar votación";
-$a->strings["Clear browser location"] = "Eliminar localización del navegador";
-$a->strings["clear location"] = "eliminar localización";
+$a->strings["Clear browser location"] = "Eliminar los datos de ubicación del navegador";
+$a->strings["clear location"] = "borrar los datos de ubicación";
 $a->strings["Title (optional)"] = "Título (opcional)";
 $a->strings["Categories (optional, comma-separated list)"] = "Categorías (opcional, lista separada por comas)";
 $a->strings["Permission settings"] = "Configuración de permisos";
@@ -815,6 +817,7 @@ $a->strings["permissions"] = "permisos";
 $a->strings["Public post"] = "Entrada pública";
 $a->strings["Example: bob@example.com, mary@example.com"] = "Ejemplo: roberto@ejemplo.com, maría@ejemplo.com";
 $a->strings["Set expiration date"] = "Configurar fecha de caducidad";
+$a->strings["Set publish date"] = "Establecer la fecha de publicación";
 $a->strings["OK"] = "OK";
 $a->strings["Cancel"] = "Cancelar";
 $a->strings["Discover"] = "Descubrir";
@@ -910,7 +913,7 @@ $a->strings["Rate Me"] = "Valorar este canal";
 $a->strings["View Ratings"] = "Mostrar las valoraciones";
 $a->strings["Public Hubs"] = "Servidores públicos";
 $a->strings["Forums"] = "Foros";
-$a->strings["Tasks"] = "Actividad";
+$a->strings["Tasks"] = "Tareas";
 $a->strings["Documentation"] = "Documentación";
 $a->strings["Project/Site Information"] = "Información sobre el proyecto o sitio";
 $a->strings["For Members"] = "Para los usuarios";
@@ -1146,15 +1149,17 @@ $a->strings["Accept connection to allow communication"] = "Aceptar la conexión
 $a->strings["Set Affinity"] = "Ajustar la afinidad";
 $a->strings["Set Profile"] = "Ajustar el perfil";
 $a->strings["Set Affinity & Profile"] = "Ajustar la afinidad y el perfil";
+$a->strings["none"] = "nada";
 $a->strings["Apply these permissions automatically"] = "Aplicar estos permisos automaticamente";
-$a->strings["This connection's address is"] = "La dirección de esta conexión es";
+$a->strings["This connection's primary address is"] = "La dirección primaria de esta conexión es";
+$a->strings["Available locations:"] = "Ubicaciones disponibles:";
 $a->strings["The permissions indicated on this page will be applied to all new connections."] = "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones.";
 $a->strings["Slide to adjust your degree of friendship"] = "Deslizar para ajustar el grado de amistad";
 $a->strings["Slide to adjust your rating"] = "Deslizar para ajustar su valoración";
 $a->strings["Optionally explain your rating"] = "Opcionalmente, puede explicar su valoración";
 $a->strings["Custom Filter"] = "Filtro personalizado";
 $a->strings["Only import posts with this text"] = "Importar solo entradas que contengan este texto";
-$a->strings["words one per line or #tags or /patterns/, leave blank to import all posts"] = "palabras, una por línea, o #etiquetas o /patrones/, dejar en blanco para importar todas las entradas";
+$a->strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "Una por cada línea: palabras, #etiquetas,  /patrones/ o lengua=xx. Dejar en blanco para importarlo todo";
 $a->strings["Do not import posts with this text"] = "No importar entradas que contengan este texto";
 $a->strings["This information is public!"] = "¡Esta información es pública!";
 $a->strings["Connection Pending Approval"] = "Conexión pendiente de aprobación";
@@ -1175,45 +1180,6 @@ $a->strings["Hub not found."] = "Servidor no encontrado";
 $a->strings["This setting requires special processing and editing has been blocked."] = "Este ajuste necesita de un proceso especial y la edición ha sido bloqueada.";
 $a->strings["Configuration Editor"] = "Editor de configuración";
 $a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Atención: El cambio de algunos ajustes puede volver inutilizable su canal. Por favor, abandone la página excepto que esté seguro y sepa cómo usar correctamente esta característica.";
-$a->strings["Page owner information could not be retrieved."] = "La información del propietario de la página no pudo ser recuperada.";
-$a->strings["Album not found."] = "Álbum no encontrado.";
-$a->strings["Delete Album"] = "Borrar álbum";
-$a->strings["Delete Photo"] = "Borrar foto";
-$a->strings["No photos selected"] = "No hay fotos seleccionadas";
-$a->strings["Access to this item is restricted."] = "El acceso a este elemento está restringido.";
-$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado.";
-$a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB de almacenamiento de fotos utilizado.";
-$a->strings["Upload Photos"] = "Subir fotos";
-$a->strings["Enter an album name"] = "Introducir un nombre de álbum";
-$a->strings["or select an existing album (doubleclick)"] = "o seleccionar uno existente (doble click)";
-$a->strings["Create a status post for this upload"] = "Crear una entrada de estado para esta subida";
-$a->strings["Album name could not be decoded"] = "El nombre del álbum no ha podido ser descifrado";
-$a->strings["Contact Photos"] = "Fotos de contacto";
-$a->strings["Show Newest First"] = "Mostrar lo más reciente primero";
-$a->strings["Show Oldest First"] = "Mostrar lo más antiguo primero";
-$a->strings["View Photo"] = "Ver foto";
-$a->strings["Edit Album"] = "Editar álbum";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Permiso denegado. El acceso a este elemento puede estar restringido.";
-$a->strings["Photo not available"] = "Foto no disponible";
-$a->strings["Use as profile photo"] = "Usar como foto del perfil";
-$a->strings["Private Photo"] = "Foto privada";
-$a->strings["Previous"] = "Anterior";
-$a->strings["View Full Size"] = "Ver tamaño completo";
-$a->strings["Next"] = "Siguiente";
-$a->strings["Remove"] = "Eliminar";
-$a->strings["Edit photo"] = "Editar foto";
-$a->strings["Rotate CW (right)"] = "Girar CW (a la derecha)";
-$a->strings["Rotate CCW (left)"] = "Girar CCW (a la izquierda)";
-$a->strings["Enter a new album name"] = "Introducir un nuevo nombre de álbum";
-$a->strings["or select an existing one (doubleclick)"] = "o seleccionar uno (doble click) existente";
-$a->strings["Caption"] = "Título";
-$a->strings["Add a Tag"] = "Añadir una etiqueta";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com";
-$a->strings["Flag as adult in album view"] = "Marcar como \"solo para adultos\" en el álbum";
-$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["Permission Denied."] = "Permiso denegado";
 $a->strings["File not found."] = "Fichero no encontrado.";
 $a->strings["Edit file permissions"] = "Modificar los permisos del fichero";
@@ -1281,6 +1247,47 @@ $a->strings["Delete Conversation"] = "Eliminar Conversación";
 $a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente.";
 $a->strings["Send Reply"] = "Responder";
 $a->strings["Your message for %s (%s):"] = "Su mensaje para %s (%s):";
+$a->strings["Page owner information could not be retrieved."] = "La información del propietario de la página no pudo ser recuperada.";
+$a->strings["Album not found."] = "Álbum no encontrado.";
+$a->strings["Delete Album"] = "Borrar álbum";
+$a->strings["Delete Photo"] = "Borrar foto";
+$a->strings["No photos selected"] = "No hay fotos seleccionadas";
+$a->strings["Access to this item is restricted."] = "El acceso a este elemento está restringido.";
+$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado.";
+$a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB de almacenamiento de fotos utilizado.";
+$a->strings["Upload Photos"] = "Subir fotos";
+$a->strings["Enter an album name"] = "Introducir un nombre de álbum";
+$a->strings["or select an existing album (doubleclick)"] = "o seleccionar uno existente (doble click)";
+$a->strings["Create a status post for this upload"] = "Crear una entrada de estado para esta subida";
+$a->strings["Caption (optional):"] = "Título (opcional):";
+$a->strings["Description (optional):"] = "Descripción (opcional):";
+$a->strings["Album name could not be decoded"] = "El nombre del álbum no ha podido ser descifrado";
+$a->strings["Contact Photos"] = "Fotos de contacto";
+$a->strings["Show Newest First"] = "Mostrar lo más reciente primero";
+$a->strings["Show Oldest First"] = "Mostrar lo más antiguo primero";
+$a->strings["View Photo"] = "Ver foto";
+$a->strings["Edit Album"] = "Editar álbum";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Permiso denegado. El acceso a este elemento puede estar restringido.";
+$a->strings["Photo not available"] = "Foto no disponible";
+$a->strings["Use as profile photo"] = "Usar como foto del perfil";
+$a->strings["Private Photo"] = "Foto privada";
+$a->strings["Previous"] = "Anterior";
+$a->strings["View Full Size"] = "Ver tamaño completo";
+$a->strings["Next"] = "Siguiente";
+$a->strings["Remove"] = "Eliminar";
+$a->strings["Edit photo"] = "Editar foto";
+$a->strings["Rotate CW (right)"] = "Girar CW (a la derecha)";
+$a->strings["Rotate CCW (left)"] = "Girar CCW (a la izquierda)";
+$a->strings["Enter a new album name"] = "Introducir un nuevo nombre de álbum";
+$a->strings["or select an existing one (doubleclick)"] = "o seleccionar uno (doble click) existente";
+$a->strings["Caption"] = "Título";
+$a->strings["Add a Tag"] = "Añadir una etiqueta";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com";
+$a->strings["Flag as adult in album view"] = "Marcar como \"solo para adultos\" en el álbum";
+$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["Invalid message"] = "Mensaje no válido";
 $a->strings["no results"] = "sin resultados";
 $a->strings["Delivery report for %1\$s"] = "Informe de entrega para %1\$s";
@@ -1499,7 +1506,7 @@ $a->strings["Photo icon URL"] = "Dirección del icono que se va a utilizar para
 $a->strings["80 x 80 pixels - optional"] = "80 x 80 pixels - opcional";
 $a->strings["Version ID"] = "Versión";
 $a->strings["Price of app"] = "Precio de la aplicación";
-$a->strings["Location (URL) to purchase app"] = "Ubicación (URL) donde adquirir la aplicación";
+$a->strings["Location (URL) to purchase app"] = "Dirección (URL) donde adquirir la aplicación";
 $a->strings["Unable to update menu."] = "No se puede actualizar el menú.";
 $a->strings["Unable to create menu."] = "No se puede crear el menú.";
 $a->strings["Menu Name"] = "Nombre del menú";
@@ -1665,7 +1672,7 @@ $a->strings["Rate this hub"] = "Valorar este sitio";
 $a->strings["Site URL"] = "Dirección del sitio";
 $a->strings["Access Type"] = "Tipo de acceso";
 $a->strings["Registration Policy"] = "Normas de registro";
-$a->strings["Location"] = "Localización";
+$a->strings["Location"] = "Ubicación";
 $a->strings["Project"] = "Proyecto";
 $a->strings["View hub ratings"] = "Ver las valoraciones del sitio";
 $a->strings["Rate"] = "Valorar";
@@ -1755,7 +1762,7 @@ $a->strings["Send invitations"] = "Enviar invitaciones";
 $a->strings["Enter email addresses, one per line:"] = "Introduzca las direcciones de correo electrónica, una por línea:";
 $a->strings["Please join my community on \$Projectname."] = "Por favor, únase a mi comunidad en \$Projectname.";
 $a->strings["You will need to supply this invitation code: "] = "Debe proporcionar este código de invitación:";
-$a->strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Regístrese en cualquier lugar de \$Projectname (están todos interconectados)";
+$a->strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Regístrese en cualquier sitio de \$Projectname (están todos interconectados)";
 $a->strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Introduzca mi dirección \$Projectname en la caja de búsqueda del sitio.";
 $a->strings["or visit "] = "o visite";
 $a->strings["3. Click [Connect]"] = "3. Pulse [conectar]";
@@ -1835,7 +1842,7 @@ $a->strings["Basic Settings"] = "Configuración básica";
 $a->strings["Your Timezone:"] = "Su zona horaria:";
 $a->strings["Default Post Location:"] = "Ubicación de publicación predeterminada:";
 $a->strings["Geographical location to display on your posts"] = "Ubicación geográfica que debe mostrarse en sus publicaciones";
-$a->strings["Use Browser Location:"] = "Usar la localización del navegador:";
+$a->strings["Use Browser Location:"] = "Usar la ubicación del navegador:";
 $a->strings["Adult Content"] = "Contenido solo para adultos";
 $a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Este canal publica contenido solo para adultos con frecuencia o regularmente. (Por favor etiquete cualquier material para adultos con la etiqueta #NSFW)";
 $a->strings["Security and Privacy Settings"] = "Configuración de seguridad y privacidad";
@@ -1850,7 +1857,7 @@ $a->strings["Blocked - <em>default blocked to/from everybody</em>"] = "Bloqueado
 $a->strings["Allow others to tag your posts"] = "Permitir a otros etiquetar sus publicaciones";
 $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 otro canal después de este número de días";
+$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["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";
@@ -1959,14 +1966,14 @@ $a->strings["(No specific instructions have been provided by the channel owner.)
 $a->strings["Restricted or Premium Channel"] = "Canal premium o restringido";
 $a->strings["No connections."] = "Sin conexiones.";
 $a->strings["Visit %s's profile [%s]"] = "Visitar el perfil de %s [%s]";
-$a->strings["Location not found."] = "Localización no encontrada.";
-$a->strings["Location lookup failed."] = "Ha fallado la búsqueda de la ubicación.";
-$a->strings["Please select another location to become primary before removing the primary location."] = "Por favor, seleccione otra ubicación para convertirla en primaria antes de retirar la ubicación principal.";
-$a->strings["No locations found."] = "Ninguna localización encontrada.";
-$a->strings["Manage Channel Locations"] = "Gestionar localizaciones del canal";
-$a->strings["Location (address)"] = "Localización (dirección)";
-$a->strings["Primary Location"] = "Localización primaria";
-$a->strings["Drop location"] = "Eliminar localización";
+$a->strings["Location not found."] = "Dirección no encontrada.";
+$a->strings["Location lookup failed."] = "Ha fallado la búsqueda de la dirección.";
+$a->strings["Please select another location to become primary before removing the primary location."] = "Por favor, seleccione una copia de su canal (un clon) para convertirlo en primario antes de eliminar su canal principal.";
+$a->strings["No locations found."] = "No encontrada ninguna dirección.";
+$a->strings["Manage Channel Locations"] = "Gestionar las direcciones del canal";
+$a->strings["Location (address)"] = "Ubicación (dirección)";
+$a->strings["Primary Location"] = "Dirección primaria";
+$a->strings["Drop location"] = "Eliminar dirección";
 $a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "La autenticación desde su servidor está bloqueada. Ha iniciado sesión localmente. Por favor, salga de la sesión y vuelva a intentarlo.";
 $a->strings["\$Projectname Server - Setup"] = "Servidor \$Projectname  - Instalación";
 $a->strings["Could not connect to database."] = "No se ha podido conectar a la base de datos.";
@@ -2130,6 +2137,7 @@ $a->strings["Or enter new bookmark folder name"] = "O introduzca un nuevo nombre
 $a->strings["Import completed"] = "Importación completada";
 $a->strings["Import Items"] = "Importar elementos";
 $a->strings["Use this form to import existing posts and content from an export file."] = "Utilice este formulario para importar entradas existentes y contenido desde un archivo de exportación.";
+$a->strings["Who likes me?"] = "¿Quién me ha puesto \"Me gusta\"?";
 $a->strings["Focus (Hubzilla default)"] = "Focus (predefinido)";
 $a->strings["Theme settings"] = "Ajustes del tema";
 $a->strings["Select scheme"] = "Elegir un esquema";
diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po
index be8c3c262..89a0670ec 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: 2015-10-23 00:03-0700\n"
-"PO-Revision-Date: 2015-10-26 15:20+0000\n"
+"POT-Creation-Date: 2015-10-30 00:03-0700\n"
+"PO-Revision-Date: 2015-10-31 20:03+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"
@@ -18,32 +18,6 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../include/bb2diaspora.php:388
-msgid "Attachments:"
-msgstr "Bijlagen:"
-
-#: ../../include/bb2diaspora.php:474 ../../include/event.php:22
-msgid "l F d, Y \\@ g:i A"
-msgstr "l d F Y \\@ G:i"
-
-#: ../../include/bb2diaspora.php:476
-msgid "$Projectname event notification:"
-msgstr "Notificatie $Projectname-gebeurtenis:"
-
-#: ../../include/bb2diaspora.php:480 ../../include/event.php:30
-msgid "Starts:"
-msgstr "Start:"
-
-#: ../../include/bb2diaspora.php:488 ../../include/event.php:40
-msgid "Finishes:"
-msgstr "Einde:"
-
-#: ../../include/bb2diaspora.php:496 ../../include/event.php:50
-#: ../../include/identity.php:1016 ../../mod/directory.php:302
-#: ../../mod/events.php:701
-msgid "Location:"
-msgstr "Plaats:"
-
 #: ../../include/Import/import_diaspora.php:17
 msgid "No username found in import file."
 msgstr "Geen gebruikersnaam in het importbestand gevonden."
@@ -61,7 +35,7 @@ msgstr "Import voltooid."
 msgid "parent"
 msgstr "omhoog"
 
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2509
+#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2529
 msgid "Collection"
 msgstr "map"
 
@@ -87,12 +61,12 @@ msgstr "Planning-postvak UIT"
 
 #: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:360
 #: ../../include/apps.php:415 ../../include/conversation.php:1023
-#: ../../mod/photos.php:756 ../../mod/photos.php:1195
+#: ../../mod/photos.php:759 ../../mod/photos.php:1198
 msgid "Unknown"
 msgstr "Onbekend"
 
 #: ../../include/RedDAV/RedBrowser.php:226 ../../include/apps.php:135
-#: ../../include/conversation.php:1613 ../../include/nav.php:93
+#: ../../include/conversation.php:1620 ../../include/nav.php:93
 #: ../../mod/fbrowser.php:114
 msgid "Files"
 msgstr "Bestanden"
@@ -113,8 +87,8 @@ msgid "Create"
 msgstr "Aanmaken"
 
 #: ../../include/RedDAV/RedBrowser.php:231
-#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/photos.php:781
-#: ../../mod/photos.php:1314 ../../mod/profile_photo.php:450
+#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/photos.php:784
+#: ../../mod/photos.php:1317 ../../mod/profile_photo.php:450
 msgid "Upload"
 msgstr "Uploaden"
 
@@ -140,7 +114,7 @@ msgstr "Laatst gewijzigd"
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
 #: ../../include/apps.php:259 ../../include/ItemObject.php:100
 #: ../../mod/layouts.php:183 ../../mod/editblock.php:135
-#: ../../mod/editpost.php:113 ../../mod/menu.php:108
+#: ../../mod/editpost.php:112 ../../mod/menu.php:108
 #: ../../mod/webpages.php:181 ../../mod/blocks.php:153 ../../mod/thing.php:257
 #: ../../mod/settings.php:645 ../../mod/connections.php:235
 #: ../../mod/connections.php:248 ../../mod/connections.php:267
@@ -150,7 +124,7 @@ msgstr "Bewerken"
 
 #: ../../include/RedDAV/RedBrowser.php:241 ../../include/apps.php:260
 #: ../../include/ItemObject.php:120 ../../include/conversation.php:657
-#: ../../mod/connedit.php:546 ../../mod/photos.php:1126
+#: ../../mod/connedit.php:546 ../../mod/photos.php:1129
 #: ../../mod/editblock.php:181 ../../mod/admin.php:783 ../../mod/admin.php:942
 #: ../../mod/webpages.php:183 ../../mod/blocks.php:155 ../../mod/thing.php:258
 #: ../../mod/settings.php:646 ../../mod/editlayout.php:179
@@ -326,31 +300,31 @@ msgstr "Ongeldige omschrijving chatkanaal"
 msgid "Room not found."
 msgstr "Chatkanaal niet gevonden"
 
-#: ../../include/chat.php:133 ../../include/items.php:4376
-#: ../../include/photos.php:26 ../../include/attach.php:137
-#: ../../include/attach.php:185 ../../include/attach.php:248
-#: ../../include/attach.php:262 ../../include/attach.php:269
-#: ../../include/attach.php:334 ../../include/attach.php:348
-#: ../../include/attach.php:355 ../../include/attach.php:433
-#: ../../include/attach.php:875 ../../include/attach.php:946
-#: ../../include/attach.php:1098 ../../mod/achievements.php:30
+#: ../../include/chat.php:133 ../../include/items.php:4377
+#: ../../include/photos.php:29 ../../include/attach.php:140
+#: ../../include/attach.php:188 ../../include/attach.php:251
+#: ../../include/attach.php:265 ../../include/attach.php:272
+#: ../../include/attach.php:337 ../../include/attach.php:351
+#: ../../include/attach.php:358 ../../include/attach.php:436
+#: ../../include/attach.php:884 ../../include/attach.php:955
+#: ../../include/attach.php:1107 ../../mod/achievements.php:30
 #: ../../mod/fsuggest.php:78 ../../mod/authtest.php:13
 #: ../../mod/bookmarks.php:48 ../../mod/block.php:22 ../../mod/block.php:72
 #: ../../mod/id.php:71 ../../mod/like.php:177 ../../mod/common.php:35
 #: ../../mod/mitem.php:111 ../../mod/connedit.php:347 ../../mod/mood.php:112
-#: ../../mod/photos.php:70 ../../mod/filestorage.php:18
-#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
-#: ../../mod/filestorage.php:115 ../../mod/layouts.php:69
-#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/poke.php:133
-#: ../../mod/network.php:12 ../../mod/chat.php:94 ../../mod/chat.php:99
-#: ../../mod/rate.php:111 ../../mod/mail.php:118 ../../mod/editblock.php:65
+#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
+#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
+#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87
+#: ../../mod/poke.php:133 ../../mod/network.php:12 ../../mod/chat.php:94
+#: ../../mod/chat.php:99 ../../mod/rate.php:111 ../../mod/mail.php:118
+#: ../../mod/photos.php:70 ../../mod/editblock.php:65
 #: ../../mod/editpost.php:13 ../../mod/appman.php:66 ../../mod/profile.php:64
 #: ../../mod/profile.php:72 ../../mod/menu.php:74 ../../mod/page.php:31
 #: ../../mod/page.php:86 ../../mod/new_channel.php:68
 #: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
 #: ../../mod/pdledit.php:21 ../../mod/events.php:256
 #: ../../mod/profile_photo.php:338 ../../mod/profile_photo.php:351
-#: ../../mod/item.php:205 ../../mod/item.php:213 ../../mod/item.php:1002
+#: ../../mod/item.php:205 ../../mod/item.php:213 ../../mod/item.php:1004
 #: ../../mod/message.php:16 ../../mod/webpages.php:69
 #: ../../mod/register.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76
 #: ../../mod/service_limits.php:7 ../../mod/sources.php:66
@@ -594,131 +568,139 @@ msgid ""
 msgstr "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde geheime sleutel."
 
 #: ../../include/features.php:61
-msgid "Enable voting tools"
+msgid "Enable Voting Tools"
 msgstr "Stemmen inschakelen"
 
 #: ../../include/features.php:61
 msgid "Provide a class of post which others can vote on"
 msgstr "Creëert een berichtenoptie zodat anderen op jouw vraag kunnen stemmen."
 
-#: ../../include/features.php:67
+#: ../../include/features.php:62
+msgid "Delayed Posting"
+msgstr "Berichten uitstellen"
+
+#: ../../include/features.php:62
+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:68
 msgid "Network and Stream Filtering"
 msgstr "Netwerk- en streamfilter"
 
-#: ../../include/features.php:68
+#: ../../include/features.php:69
 msgid "Search by Date"
 msgstr "Zoek op datum"
 
-#: ../../include/features.php:68
+#: ../../include/features.php:69
 msgid "Ability to select posts by date ranges"
 msgstr "Mogelijkheid om berichten op datum te filteren "
 
-#: ../../include/features.php:69
+#: ../../include/features.php:70
 msgid "Collections Filter"
 msgstr "Filter op collecties"
 
-#: ../../include/features.php:69
+#: ../../include/features.php:70
 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:70 ../../include/widgets.php:273
+#: ../../include/features.php:71 ../../include/widgets.php:273
 msgid "Saved Searches"
 msgstr "Opgeslagen zoekopdrachten"
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid "Save search terms for re-use"
 msgstr "Sla zoekopdrachten op voor hergebruik"
 
-#: ../../include/features.php:71
+#: ../../include/features.php:72
 msgid "Network Personal Tab"
 msgstr "Persoonlijke netwerktab"
 
-#: ../../include/features.php:71
+#: ../../include/features.php:72
 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:72
+#: ../../include/features.php:73
 msgid "Network New Tab"
 msgstr "Nieuwe netwerktab"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid "Enable tab to display all new Network activity"
 msgstr "Laat de tab alle nieuwe netwerkactiviteit tonen"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Affinity Tool"
 msgstr "Verwantschapsfilter"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Filter stream activity by depth of relationships"
 msgstr "Filter wat je in de Matrix ziet op hoe goed je iemand kent of mag"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Connection Filtering"
 msgstr "Berichtenfilters"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 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:75
+#: ../../include/features.php:76
 msgid "Suggest Channels"
 msgstr "Kanalen voorstellen"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid "Show channel suggestions"
 msgstr "Voor jou mogelijk interessante kanalen voorstellen"
 
-#: ../../include/features.php:80
+#: ../../include/features.php:81
 msgid "Post/Comment Tools"
 msgstr "Bericht- en reactiehulpmiddelen"
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Tagging"
 msgstr "Taggen"
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Ability to tag existing posts"
 msgstr "Mogelijkheid om bestaande berichten te taggen"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Post Categories"
 msgstr "Categorieën berichten"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Add categories to your posts"
 msgstr "Voeg categorieën toe aan je berichten"
 
-#: ../../include/features.php:83 ../../include/contact_widgets.php:57
+#: ../../include/features.php:84 ../../include/contact_widgets.php:57
 #: ../../include/widgets.php:303
 msgid "Saved Folders"
 msgstr "Bewaarde mappen"
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 msgid "Ability to file posts under folders"
 msgstr "Mogelijkheid om berichten in mappen op te slaan"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85
 msgid "Dislike Posts"
 msgstr "Vind berichten niet leuk"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85
 msgid "Ability to dislike posts/comments"
 msgstr "Mogelijkheid om berichten en reacties niet leuk te vinden"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Star Posts"
 msgstr "Geef berichten een ster"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Ability to mark special posts with a star indicator"
 msgstr "Mogelijkheid om speciale berichten met een ster te markeren"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Tag Cloud"
 msgstr "Tagwolk"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Zorgt voor een persoonlijke wolk met tags op jouw kanaalpagina"
 
@@ -731,7 +713,7 @@ msgid "Delete this item?"
 msgstr "Dit item verwijderen?"
 
 #: ../../include/js_strings.php:6 ../../include/ItemObject.php:681
-#: ../../mod/photos.php:1044 ../../mod/photos.php:1162
+#: ../../mod/photos.php:1047 ../../mod/photos.php:1165
 msgid "Comment"
 msgstr "Reactie"
 
@@ -787,7 +769,7 @@ msgstr "Niets nieuw hier"
 msgid "Rate This Channel (this is public)"
 msgstr "Beoordeel dit kanaal (dit is openbaar)"
 
-#: ../../include/js_strings.php:20 ../../mod/connedit.php:666
+#: ../../include/js_strings.php:20 ../../mod/connedit.php:684
 #: ../../mod/rate.php:157
 msgid "Rating"
 msgstr "Beoordeling"
@@ -798,17 +780,17 @@ msgstr "Omschrijving (optioneel)"
 
 #: ../../include/js_strings.php:22 ../../include/ItemObject.php:682
 #: ../../mod/fsuggest.php:108 ../../mod/mitem.php:231
-#: ../../mod/connedit.php:687 ../../mod/mood.php:135 ../../mod/pconfig.php:108
-#: ../../mod/photos.php:634 ../../mod/photos.php:1005
-#: ../../mod/photos.php:1045 ../../mod/photos.php:1163
+#: ../../mod/connedit.php:705 ../../mod/mood.php:135 ../../mod/pconfig.php:108
 #: ../../mod/filestorage.php:156 ../../mod/poke.php:171 ../../mod/chat.php:184
 #: ../../mod/chat.php:213 ../../mod/rate.php:168 ../../mod/mail.php:371
-#: ../../mod/admin.php:411 ../../mod/admin.php:776 ../../mod/admin.php:940
-#: ../../mod/admin.php:1072 ../../mod/admin.php:1266 ../../mod/admin.php:1351
-#: ../../mod/appman.php:99 ../../mod/pdledit.php:58 ../../mod/events.php:534
-#: ../../mod/events.php:710 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/import.php:517 ../../mod/thing.php:313
-#: ../../mod/thing.php:359 ../../mod/invite.php:142 ../../mod/settings.php:583
+#: ../../mod/photos.php:637 ../../mod/photos.php:1008
+#: ../../mod/photos.php:1048 ../../mod/photos.php:1166 ../../mod/admin.php:411
+#: ../../mod/admin.php:776 ../../mod/admin.php:940 ../../mod/admin.php:1072
+#: ../../mod/admin.php:1266 ../../mod/admin.php:1351 ../../mod/appman.php:99
+#: ../../mod/pdledit.php:58 ../../mod/events.php:534 ../../mod/events.php:710
+#: ../../mod/sources.php:104 ../../mod/sources.php:138
+#: ../../mod/import.php:517 ../../mod/thing.php:313 ../../mod/thing.php:359
+#: ../../mod/invite.php:142 ../../mod/settings.php:583
 #: ../../mod/settings.php:695 ../../mod/settings.php:723
 #: ../../mod/settings.php:746 ../../mod/settings.php:831
 #: ../../mod/settings.php:1020 ../../mod/xchan.php:11 ../../mod/group.php:81
@@ -899,19 +881,19 @@ msgstr " "
 msgid "timeago.numbers"
 msgstr "timeago.numbers"
 
-#: ../../include/js_strings.php:44 ../../include/text.php:1144
+#: ../../include/js_strings.php:44 ../../include/text.php:1153
 msgid "January"
 msgstr "januari"
 
-#: ../../include/js_strings.php:45 ../../include/text.php:1144
+#: ../../include/js_strings.php:45 ../../include/text.php:1153
 msgid "February"
 msgstr "februari"
 
-#: ../../include/js_strings.php:46 ../../include/text.php:1144
+#: ../../include/js_strings.php:46 ../../include/text.php:1153
 msgid "March"
 msgstr "maart"
 
-#: ../../include/js_strings.php:47 ../../include/text.php:1144
+#: ../../include/js_strings.php:47 ../../include/text.php:1153
 msgid "April"
 msgstr "april"
 
@@ -920,31 +902,31 @@ msgctxt "long"
 msgid "May"
 msgstr "mei"
 
-#: ../../include/js_strings.php:49 ../../include/text.php:1144
+#: ../../include/js_strings.php:49 ../../include/text.php:1153
 msgid "June"
 msgstr "juni"
 
-#: ../../include/js_strings.php:50 ../../include/text.php:1144
+#: ../../include/js_strings.php:50 ../../include/text.php:1153
 msgid "July"
 msgstr "juli"
 
-#: ../../include/js_strings.php:51 ../../include/text.php:1144
+#: ../../include/js_strings.php:51 ../../include/text.php:1153
 msgid "August"
 msgstr "augustus"
 
-#: ../../include/js_strings.php:52 ../../include/text.php:1144
+#: ../../include/js_strings.php:52 ../../include/text.php:1153
 msgid "September"
 msgstr "september"
 
-#: ../../include/js_strings.php:53 ../../include/text.php:1144
+#: ../../include/js_strings.php:53 ../../include/text.php:1153
 msgid "October"
 msgstr "oktober"
 
-#: ../../include/js_strings.php:54 ../../include/text.php:1144
+#: ../../include/js_strings.php:54 ../../include/text.php:1153
 msgid "November"
 msgstr "november"
 
-#: ../../include/js_strings.php:55 ../../include/text.php:1144
+#: ../../include/js_strings.php:55 ../../include/text.php:1153
 msgid "December"
 msgstr "december"
 
@@ -997,31 +979,31 @@ msgstr "nov"
 msgid "Dec"
 msgstr "dec"
 
-#: ../../include/js_strings.php:68 ../../include/text.php:1140
+#: ../../include/js_strings.php:68 ../../include/text.php:1149
 msgid "Sunday"
 msgstr "zondag"
 
-#: ../../include/js_strings.php:69 ../../include/text.php:1140
+#: ../../include/js_strings.php:69 ../../include/text.php:1149
 msgid "Monday"
 msgstr "maandag"
 
-#: ../../include/js_strings.php:70 ../../include/text.php:1140
+#: ../../include/js_strings.php:70 ../../include/text.php:1149
 msgid "Tuesday"
 msgstr "dinsdag"
 
-#: ../../include/js_strings.php:71 ../../include/text.php:1140
+#: ../../include/js_strings.php:71 ../../include/text.php:1149
 msgid "Wednesday"
 msgstr "woensdag"
 
-#: ../../include/js_strings.php:72 ../../include/text.php:1140
+#: ../../include/js_strings.php:72 ../../include/text.php:1149
 msgid "Thursday"
 msgstr "donderdag"
 
-#: ../../include/js_strings.php:73 ../../include/text.php:1140
+#: ../../include/js_strings.php:73 ../../include/text.php:1149
 msgid "Friday"
 msgstr "vrijdag"
 
-#: ../../include/js_strings.php:74 ../../include/text.php:1140
+#: ../../include/js_strings.php:74 ../../include/text.php:1149
 msgid "Saturday"
 msgstr "zaterdag"
 
@@ -1236,36 +1218,36 @@ msgstr "Voor alle goedgekeurde connecties zichtbaar."
 msgid "Visible to specific connections."
 msgstr "Voor specifieke connecties zichtbaar."
 
-#: ../../include/items.php:4297 ../../mod/display.php:36
+#: ../../include/items.php:4298 ../../mod/display.php:36
 #: ../../mod/filestorage.php:27 ../../mod/admin.php:127
 #: ../../mod/admin.php:979 ../../mod/admin.php:1179 ../../mod/thing.php:86
 #: ../../mod/viewsrc.php:20
 msgid "Item not found."
 msgstr "Item niet gevonden."
 
-#: ../../include/items.php:4806 ../../mod/group.php:38 ../../mod/group.php:137
+#: ../../include/items.php:4807 ../../mod/group.php:38 ../../mod/group.php:137
 msgid "Collection not found."
 msgstr "Collectie niet gevonden."
 
-#: ../../include/items.php:4822
+#: ../../include/items.php:4823
 msgid "Collection is empty."
 msgstr "Collectie is leeg"
 
-#: ../../include/items.php:4829
+#: ../../include/items.php:4830
 #, php-format
 msgid "Collection: %s"
 msgstr "Collectie: %s"
 
-#: ../../include/items.php:4839 ../../mod/connedit.php:657
+#: ../../include/items.php:4840 ../../mod/connedit.php:673
 #, php-format
 msgid "Connection: %s"
 msgstr "Connectie: %s"
 
-#: ../../include/items.php:4841
+#: ../../include/items.php:4842
 msgid "Connection not found."
 msgstr "Connectie niet gevonden."
 
-#: ../../include/api.php:1321
+#: ../../include/api.php:1324
 msgid "Public Timeline"
 msgstr "Openbare tijdlijn"
 
@@ -1316,15 +1298,14 @@ msgstr "Tonen"
 msgid "Don't show"
 msgstr "Niet tonen"
 
-#: ../../include/acl_selectors.php:247 ../../mod/photos.php:628
-#: ../../mod/photos.php:998 ../../mod/filestorage.php:147
-#: ../../mod/chat.php:211 ../../mod/events.php:708 ../../mod/thing.php:310
-#: ../../mod/thing.php:356
+#: ../../include/acl_selectors.php:247 ../../mod/filestorage.php:147
+#: ../../mod/chat.php:211 ../../mod/photos.php:631 ../../mod/photos.php:1001
+#: ../../mod/events.php:708 ../../mod/thing.php:310 ../../mod/thing.php:356
 msgid "Permissions"
 msgstr "Permissies"
 
 #: ../../include/acl_selectors.php:248 ../../include/ItemObject.php:369
-#: ../../mod/photos.php:1215
+#: ../../mod/photos.php:1218
 msgid "Close"
 msgstr "Sluiten"
 
@@ -1341,28 +1322,28 @@ msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt."
 msgid "Cloned channel not found. Import failed."
 msgstr "Gekloond kanaal niet gevonden. Importeren mislukt."
 
-#: ../../include/photos.php:109
+#: ../../include/photos.php:112
 #, php-format
 msgid "Image exceeds website size limit of %lu bytes"
 msgstr "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes"
 
-#: ../../include/photos.php:116
+#: ../../include/photos.php:119
 msgid "Image file is empty."
 msgstr "Afbeeldingsbestand is leeg"
 
-#: ../../include/photos.php:143 ../../mod/profile_photo.php:222
+#: ../../include/photos.php:146 ../../mod/profile_photo.php:222
 msgid "Unable to process image"
 msgstr "Afbeelding kan niet verwerkt worden"
 
-#: ../../include/photos.php:232
+#: ../../include/photos.php:257
 msgid "Photo storage failed."
 msgstr "Foto kan niet worden opgeslagen"
 
-#: ../../include/photos.php:452 ../../include/conversation.php:1609
+#: ../../include/photos.php:483 ../../include/conversation.php:1616
 msgid "Photo Albums"
 msgstr "Fotoalbums"
 
-#: ../../include/photos.php:456
+#: ../../include/photos.php:487
 msgid "Upload New Photos"
 msgstr "Nieuwe foto's uploaden"
 
@@ -1385,8 +1366,8 @@ msgid "View"
 msgstr "Weergeven"
 
 #: ../../include/page_widgets.php:40 ../../include/ItemObject.php:691
-#: ../../include/conversation.php:1160 ../../mod/photos.php:1046
-#: ../../mod/editblock.php:171 ../../mod/editpost.php:150
+#: ../../include/conversation.php:1160 ../../mod/photos.php:1049
+#: ../../mod/editblock.php:171 ../../mod/editpost.php:149
 #: ../../mod/events.php:707 ../../mod/webpages.php:188
 #: ../../mod/editwebpage.php:212
 msgid "Preview"
@@ -1414,8 +1395,8 @@ msgstr "Aangemaakt"
 msgid "Edited"
 msgstr "Bewerkt"
 
-#: ../../include/photo/photo_driver.php:705 ../../mod/photos.php:94
-#: ../../mod/photos.php:696 ../../mod/profile_photo.php:146
+#: ../../include/photo/photo_driver.php:708 ../../mod/photos.php:94
+#: ../../mod/photos.php:699 ../../mod/profile_photo.php:146
 #: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:376
 msgid "Profile Photos"
 msgstr "Profielfoto's"
@@ -1673,11 +1654,29 @@ msgstr "Ingesloten inhoud"
 msgid "Embedding disabled"
 msgstr "Insluiten uitgeschakeld"
 
+#: ../../include/event.php:22 ../../include/bb2diaspora.php:468
+msgid "l F d, Y \\@ g:i A"
+msgstr "l d F Y \\@ G:i"
+
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:474
+msgid "Starts:"
+msgstr "Start:"
+
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:482
+msgid "Finishes:"
+msgstr "Einde:"
+
+#: ../../include/event.php:50 ../../include/identity.php:1016
+#: ../../include/bb2diaspora.php:490 ../../mod/directory.php:302
+#: ../../mod/events.php:701
+msgid "Location:"
+msgstr "Plaats:"
+
 #: ../../include/event.php:766
 msgid "This event has been added to your calendar."
 msgstr "Dit evenement is aan jouw agenda toegevoegd."
 
-#: ../../include/event.php:896 ../../include/text.php:1846
+#: ../../include/event.php:896 ../../include/text.php:1866
 #: ../../include/conversation.php:123 ../../mod/like.php:363
 #: ../../mod/tagger.php:47 ../../mod/events.php:245
 msgid "event"
@@ -1707,7 +1706,7 @@ msgstr "Geannuleerd"
 msgid "Site Admin"
 msgstr "Hubbeheerder"
 
-#: ../../include/apps.php:129 ../../include/conversation.php:1639
+#: ../../include/apps.php:129 ../../include/conversation.php:1646
 #: ../../include/nav.php:103
 msgid "Bookmarks"
 msgstr "Bladwijzers"
@@ -1734,7 +1733,7 @@ msgstr "Grid"
 msgid "Settings"
 msgstr "Instellingen"
 
-#: ../../include/apps.php:136 ../../include/conversation.php:1649
+#: ../../include/apps.php:136 ../../include/conversation.php:1656
 #: ../../include/nav.php:107 ../../mod/webpages.php:178
 msgid "Webpages"
 msgstr "Webpagina's"
@@ -1748,7 +1747,7 @@ msgstr "Tijdlijn kanaal"
 msgid "Profile"
 msgstr "Profiel"
 
-#: ../../include/apps.php:139 ../../include/conversation.php:1606
+#: ../../include/apps.php:139 ../../include/conversation.php:1613
 #: ../../include/nav.php:92 ../../mod/fbrowser.php:25
 msgid "Photos"
 msgstr "Foto's"
@@ -1785,7 +1784,7 @@ msgstr "Chatten"
 
 #: ../../include/apps.php:147 ../../include/text.php:857
 #: ../../include/text.php:869 ../../include/nav.php:159
-#: ../../mod/search.php:38
+#: ../../mod/search.php:40
 msgid "Search"
 msgstr "Zoeken"
 
@@ -1835,6 +1834,68 @@ msgstr "Installeren"
 msgid "Purchase"
 msgstr "Aanschaffen"
 
+#: ../../include/attach.php:246 ../../include/attach.php:332
+msgid "Item was not found."
+msgstr "Item niet gevonden"
+
+#: ../../include/attach.php:496
+msgid "No source file."
+msgstr "Geen bronbestand."
+
+#: ../../include/attach.php:514
+msgid "Cannot locate file to replace"
+msgstr "Kan het te vervangen bestand niet vinden"
+
+#: ../../include/attach.php:532
+msgid "Cannot locate file to revise/update"
+msgstr "Kan het bestand wat aangepast moet worden niet vinden"
+
+#: ../../include/attach.php:667
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "Bestand is groter dan de toegelaten %d"
+
+#: ../../include/attach.php:681
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt."
+
+#: ../../include/attach.php:837
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken."
+
+#: ../../include/attach.php:850
+msgid "Stored file could not be verified. Upload failed."
+msgstr "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt."
+
+#: ../../include/attach.php:898 ../../include/attach.php:914
+msgid "Path not available."
+msgstr "Pad niet beschikbaar."
+
+#: ../../include/attach.php:960 ../../include/attach.php:1112
+msgid "Empty pathname"
+msgstr "Padnaam leeg"
+
+#: ../../include/attach.php:986
+msgid "duplicate filename or path"
+msgstr "dubbele bestandsnaam of pad"
+
+#: ../../include/attach.php:1008
+msgid "Path not found."
+msgstr "Pad niet gevonden"
+
+#: ../../include/attach.php:1066
+msgid "mkdir failed."
+msgstr "directory aanmaken (mkdir) mislukt."
+
+#: ../../include/attach.php:1070
+msgid "database storage failed."
+msgstr "opslag in database mislukt."
+
+#: ../../include/attach.php:1118
+msgid "Empty path"
+msgstr "Ontbrekend bestandspad"
+
 #: ../../include/auth.php:131
 msgid "Logged out."
 msgstr "Uitgelogd."
@@ -2063,22 +2124,22 @@ msgid "I abstain"
 msgstr "Onthouding"
 
 #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1681 ../../mod/photos.php:1079
-#: ../../mod/photos.php:1091
+#: ../../include/conversation.php:1688 ../../mod/photos.php:1082
+#: ../../mod/photos.php:1094
 msgid "View all"
 msgstr "Toon alles"
 
 #: ../../include/ItemObject.php:179 ../../include/identity.php:1276
-#: ../../include/taxonomy.php:403 ../../include/conversation.php:1705
-#: ../../mod/photos.php:1083
+#: ../../include/taxonomy.php:403 ../../include/conversation.php:1712
+#: ../../mod/photos.php:1086
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "vindt dit leuk"
 msgstr[1] "vinden dit leuk"
 
-#: ../../include/ItemObject.php:184 ../../include/conversation.php:1708
-#: ../../mod/photos.php:1088
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1715
+#: ../../mod/photos.php:1091
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -2113,7 +2174,7 @@ msgstr "Berichtkenmerk onjuist"
 msgid "Add Tag"
 msgstr "Tag toevoegen"
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:1023
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:1026
 msgid "I like this (toggle)"
 msgstr "Vind ik leuk"
 
@@ -2121,7 +2182,7 @@ msgstr "Vind ik leuk"
 msgid "like"
 msgstr "vind dit leuk"
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:1024
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:1027
 msgid "I don't like this (toggle)"
 msgstr "Vind ik niet leuk"
 
@@ -2196,54 +2257,54 @@ msgstr "Aan agenda toevoegen"
 msgid "Mark all seen"
 msgstr "Markeer alles als bekeken"
 
-#: ../../include/ItemObject.php:363 ../../mod/photos.php:1209
+#: ../../include/ItemObject.php:363 ../../mod/photos.php:1212
 msgctxt "noun"
 msgid "Likes"
 msgstr "vinden dit leuk"
 
-#: ../../include/ItemObject.php:364 ../../mod/photos.php:1210
+#: ../../include/ItemObject.php:364 ../../mod/photos.php:1213
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "vinden dit niet leuk"
 
 #: ../../include/ItemObject.php:374 ../../include/conversation.php:739
-#: ../../include/conversation.php:1214 ../../mod/photos.php:1026
-#: ../../mod/editblock.php:150 ../../mod/editpost.php:130
+#: ../../include/conversation.php:1218 ../../mod/photos.php:1029
+#: ../../mod/editblock.php:150 ../../mod/editpost.php:129
 #: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:190
 msgid "Please wait"
 msgstr "Even wachten"
 
-#: ../../include/ItemObject.php:679 ../../mod/photos.php:1042
-#: ../../mod/photos.php:1160
+#: ../../include/ItemObject.php:679 ../../mod/photos.php:1045
+#: ../../mod/photos.php:1163
 msgid "This is you"
 msgstr "Dit ben jij"
 
-#: ../../include/ItemObject.php:683 ../../include/conversation.php:1186
-#: ../../mod/editblock.php:136 ../../mod/editpost.php:114
+#: ../../include/ItemObject.php:683 ../../include/conversation.php:1190
+#: ../../mod/editblock.php:136 ../../mod/editpost.php:113
 #: ../../mod/editlayout.php:135 ../../mod/editwebpage.php:177
 msgid "Bold"
 msgstr "Vet"
 
-#: ../../include/ItemObject.php:684 ../../include/conversation.php:1187
-#: ../../mod/editblock.php:137 ../../mod/editpost.php:115
+#: ../../include/ItemObject.php:684 ../../include/conversation.php:1191
+#: ../../mod/editblock.php:137 ../../mod/editpost.php:114
 #: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:178
 msgid "Italic"
 msgstr "Cursief"
 
-#: ../../include/ItemObject.php:685 ../../include/conversation.php:1188
-#: ../../mod/editblock.php:138 ../../mod/editpost.php:116
+#: ../../include/ItemObject.php:685 ../../include/conversation.php:1192
+#: ../../mod/editblock.php:138 ../../mod/editpost.php:115
 #: ../../mod/editlayout.php:137 ../../mod/editwebpage.php:179
 msgid "Underline"
 msgstr "Onderstrepen"
 
-#: ../../include/ItemObject.php:686 ../../include/conversation.php:1189
-#: ../../mod/editblock.php:139 ../../mod/editpost.php:117
+#: ../../include/ItemObject.php:686 ../../include/conversation.php:1193
+#: ../../mod/editblock.php:139 ../../mod/editpost.php:116
 #: ../../mod/editlayout.php:138 ../../mod/editwebpage.php:180
 msgid "Quote"
 msgstr "Citeren"
 
-#: ../../include/ItemObject.php:687 ../../include/conversation.php:1190
-#: ../../mod/editblock.php:140 ../../mod/editpost.php:118
+#: ../../include/ItemObject.php:687 ../../include/conversation.php:1194
+#: ../../mod/editblock.php:140 ../../mod/editpost.php:117
 #: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:181
 msgid "Code"
 msgstr "Broncode"
@@ -2260,8 +2321,8 @@ msgstr "Link invoegen"
 msgid "Video"
 msgstr "Video"
 
-#: ../../include/ItemObject.php:694 ../../include/conversation.php:1241
-#: ../../mod/mail.php:247 ../../mod/mail.php:376 ../../mod/editpost.php:158
+#: ../../include/ItemObject.php:694 ../../include/conversation.php:1248
+#: ../../mod/mail.php:247 ../../mod/mail.php:376 ../../mod/editpost.php:157
 msgid "Encrypt text"
 msgstr "Tekst versleutelen"
 
@@ -2311,228 +2372,228 @@ msgstr "Connecties weergeven"
 msgid "Save"
 msgstr "Opslaan"
 
-#: ../../include/text.php:933
+#: ../../include/text.php:942
 msgid "poke"
 msgstr "aanstoten"
 
-#: ../../include/text.php:933 ../../include/conversation.php:243
+#: ../../include/text.php:942 ../../include/conversation.php:243
 msgid "poked"
 msgstr "aangestoten"
 
-#: ../../include/text.php:934
+#: ../../include/text.php:943
 msgid "ping"
 msgstr "ping"
 
-#: ../../include/text.php:934
+#: ../../include/text.php:943
 msgid "pinged"
 msgstr "gepingd"
 
-#: ../../include/text.php:935
+#: ../../include/text.php:944
 msgid "prod"
 msgstr "por"
 
-#: ../../include/text.php:935
+#: ../../include/text.php:944
 msgid "prodded"
 msgstr "gepord"
 
-#: ../../include/text.php:936
+#: ../../include/text.php:945
 msgid "slap"
 msgstr "slaan"
 
-#: ../../include/text.php:936
+#: ../../include/text.php:945
 msgid "slapped"
 msgstr "sloeg"
 
-#: ../../include/text.php:937
+#: ../../include/text.php:946
 msgid "finger"
 msgstr "finger"
 
-#: ../../include/text.php:937
+#: ../../include/text.php:946
 msgid "fingered"
 msgstr "gefingerd"
 
-#: ../../include/text.php:938
+#: ../../include/text.php:947
 msgid "rebuff"
 msgstr "afpoeieren"
 
-#: ../../include/text.php:938
+#: ../../include/text.php:947
 msgid "rebuffed"
 msgstr "afgepoeierd"
 
-#: ../../include/text.php:948
+#: ../../include/text.php:957
 msgid "happy"
 msgstr "gelukkig"
 
-#: ../../include/text.php:949
+#: ../../include/text.php:958
 msgid "sad"
 msgstr "bedroefd"
 
-#: ../../include/text.php:950
+#: ../../include/text.php:959
 msgid "mellow"
 msgstr "mellow"
 
-#: ../../include/text.php:951
+#: ../../include/text.php:960
 msgid "tired"
 msgstr "moe"
 
-#: ../../include/text.php:952
+#: ../../include/text.php:961
 msgid "perky"
 msgstr "parmantig"
 
-#: ../../include/text.php:953
+#: ../../include/text.php:962
 msgid "angry"
 msgstr "boos"
 
-#: ../../include/text.php:954
+#: ../../include/text.php:963
 msgid "stupified"
 msgstr "beteuterd"
 
-#: ../../include/text.php:955
+#: ../../include/text.php:964
 msgid "puzzled"
 msgstr "verward"
 
-#: ../../include/text.php:956
+#: ../../include/text.php:965
 msgid "interested"
 msgstr "geïnteresseerd"
 
-#: ../../include/text.php:957
+#: ../../include/text.php:966
 msgid "bitter"
 msgstr "verbitterd"
 
-#: ../../include/text.php:958
+#: ../../include/text.php:967
 msgid "cheerful"
 msgstr "vrolijk"
 
-#: ../../include/text.php:959
+#: ../../include/text.php:968
 msgid "alive"
 msgstr "levendig"
 
-#: ../../include/text.php:960
+#: ../../include/text.php:969
 msgid "annoyed"
 msgstr "geërgerd"
 
-#: ../../include/text.php:961
+#: ../../include/text.php:970
 msgid "anxious"
 msgstr "bezorgd"
 
-#: ../../include/text.php:962
+#: ../../include/text.php:971
 msgid "cranky"
 msgstr "humeurig"
 
-#: ../../include/text.php:963
+#: ../../include/text.php:972
 msgid "disturbed"
 msgstr "verontrust"
 
-#: ../../include/text.php:964
+#: ../../include/text.php:973
 msgid "frustrated"
 msgstr "gefrustreerd "
 
-#: ../../include/text.php:965
+#: ../../include/text.php:974
 msgid "depressed"
 msgstr "gedeprimeerd"
 
-#: ../../include/text.php:966
+#: ../../include/text.php:975
 msgid "motivated"
 msgstr "gemotiveerd"
 
-#: ../../include/text.php:967
+#: ../../include/text.php:976
 msgid "relaxed"
 msgstr "ontspannen"
 
-#: ../../include/text.php:968
+#: ../../include/text.php:977
 msgid "surprised"
 msgstr "verrast"
 
-#: ../../include/text.php:1144
+#: ../../include/text.php:1153
 msgid "May"
 msgstr "mei"
 
-#: ../../include/text.php:1221 ../../include/text.php:1225
+#: ../../include/text.php:1230 ../../include/text.php:1234
 msgid "Unknown Attachment"
 msgstr "Onbekende bijlage"
 
-#: ../../include/text.php:1227
+#: ../../include/text.php:1236
 msgid "Attachment"
 msgstr "Bijlage"
 
-#: ../../include/text.php:1227
+#: ../../include/text.php:1236
 msgid "Size Unknown"
 msgstr "Onbekende grootte"
 
-#: ../../include/text.php:1263
+#: ../../include/text.php:1272
 msgid "remove category"
 msgstr "categorie verwijderen"
 
-#: ../../include/text.php:1340
+#: ../../include/text.php:1349
 msgid "remove from file"
 msgstr "uit map verwijderen"
 
-#: ../../include/text.php:1441 ../../include/text.php:1452
+#: ../../include/text.php:1461 ../../include/text.php:1472
 msgid "Click to open/close"
 msgstr "Klik om te openen of te sluiten"
 
-#: ../../include/text.php:1620 ../../mod/events.php:497
+#: ../../include/text.php:1640 ../../mod/events.php:497
 msgid "Link to Source"
 msgstr "Originele locatie"
 
-#: ../../include/text.php:1641 ../../include/text.php:1712
+#: ../../include/text.php:1661 ../../include/text.php:1732
 msgid "default"
 msgstr "standaard"
 
-#: ../../include/text.php:1649
+#: ../../include/text.php:1669
 msgid "Page layout"
 msgstr "Pagina-lay-out"
 
-#: ../../include/text.php:1649
+#: ../../include/text.php:1669
 msgid "You can create your own with the layouts tool"
 msgstr "Je kan jouw eigen lay-out ontwerpen onder lay-outs"
 
-#: ../../include/text.php:1690
+#: ../../include/text.php:1710
 msgid "Page content type"
 msgstr "Opmaaktype pagina"
 
-#: ../../include/text.php:1724
+#: ../../include/text.php:1744
 msgid "Select an alternate language"
 msgstr "Kies een andere taal"
 
-#: ../../include/text.php:1843 ../../include/conversation.php:120
+#: ../../include/text.php:1863 ../../include/conversation.php:120
 #: ../../mod/like.php:361 ../../mod/tagger.php:43 ../../mod/subthread.php:72
 #: ../../mod/subthread.php:172
 msgid "photo"
 msgstr "foto"
 
-#: ../../include/text.php:1849 ../../include/conversation.php:148
+#: ../../include/text.php:1869 ../../include/conversation.php:148
 #: ../../mod/like.php:361 ../../mod/subthread.php:72
 #: ../../mod/subthread.php:172
 msgid "status"
 msgstr "bericht"
 
-#: ../../include/text.php:1851 ../../include/conversation.php:150
+#: ../../include/text.php:1871 ../../include/conversation.php:150
 #: ../../mod/tagger.php:53
 msgid "comment"
 msgstr "reactie"
 
-#: ../../include/text.php:1856
+#: ../../include/text.php:1876
 msgid "activity"
 msgstr "activiteit"
 
-#: ../../include/text.php:2151
+#: ../../include/text.php:2171
 msgid "Design Tools"
 msgstr "Ontwerp-hulpmiddelen"
 
-#: ../../include/text.php:2154 ../../mod/blocks.php:147
+#: ../../include/text.php:2174 ../../mod/blocks.php:147
 msgid "Blocks"
 msgstr "Blokken"
 
-#: ../../include/text.php:2155 ../../mod/menu.php:103
+#: ../../include/text.php:2175 ../../mod/menu.php:103
 msgid "Menus"
 msgstr "Menu's"
 
-#: ../../include/text.php:2156 ../../mod/layouts.php:174
+#: ../../include/text.php:2176 ../../mod/layouts.php:174
 msgid "Layouts"
 msgstr "Lay-outs"
 
-#: ../../include/text.php:2157
+#: ../../include/text.php:2177
 msgid "Pages"
 msgstr "Pagina's"
 
@@ -3090,6 +3151,14 @@ msgstr "School/opleiding:"
 msgid "Like this thing"
 msgstr "Vind dit ding leuk"
 
+#: ../../include/bb2diaspora.php:382
+msgid "Attachments:"
+msgstr "Bijlagen:"
+
+#: ../../include/bb2diaspora.php:470
+msgid "$Projectname event notification:"
+msgstr "Notificatie $Projectname-gebeurtenis:"
+
 #: ../../include/taxonomy.php:229 ../../include/taxonomy.php:250
 msgid "Tags"
 msgstr "Tags"
@@ -3122,68 +3191,6 @@ msgstr "vindt dit leuk"
 msgid "dislikes"
 msgstr "vindt dit niet leuk"
 
-#: ../../include/attach.php:243 ../../include/attach.php:329
-msgid "Item was not found."
-msgstr "Item niet gevonden"
-
-#: ../../include/attach.php:493
-msgid "No source file."
-msgstr "Geen bronbestand."
-
-#: ../../include/attach.php:511
-msgid "Cannot locate file to replace"
-msgstr "Kan het te vervangen bestand niet vinden"
-
-#: ../../include/attach.php:529
-msgid "Cannot locate file to revise/update"
-msgstr "Kan het bestand wat aangepast moet worden niet vinden"
-
-#: ../../include/attach.php:664
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "Bestand is groter dan de toegelaten %d"
-
-#: ../../include/attach.php:678
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt."
-
-#: ../../include/attach.php:828
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken."
-
-#: ../../include/attach.php:841
-msgid "Stored file could not be verified. Upload failed."
-msgstr "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt."
-
-#: ../../include/attach.php:889 ../../include/attach.php:905
-msgid "Path not available."
-msgstr "Pad niet beschikbaar."
-
-#: ../../include/attach.php:951 ../../include/attach.php:1103
-msgid "Empty pathname"
-msgstr "Padnaam leeg"
-
-#: ../../include/attach.php:977
-msgid "duplicate filename or path"
-msgstr "dubbele bestandsnaam of pad"
-
-#: ../../include/attach.php:999
-msgid "Path not found."
-msgstr "Pad niet gevonden"
-
-#: ../../include/attach.php:1057
-msgid "mkdir failed."
-msgstr "directory aanmaken (mkdir) mislukt."
-
-#: ../../include/attach.php:1061
-msgid "database storage failed."
-msgstr "opslag in database mislukt."
-
-#: ../../include/attach.php:1109
-msgid "Empty path"
-msgstr "Ontbrekend bestandspad"
-
 #: ../../include/conversation.php:126 ../../mod/like.php:113
 msgid "channel"
 msgstr "kanaal"
@@ -3214,42 +3221,42 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s is %2$s"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1060
+#: ../../include/conversation.php:574 ../../mod/photos.php:1063
 msgctxt "title"
 msgid "Likes"
 msgstr "vinden dit leuk"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1060
+#: ../../include/conversation.php:574 ../../mod/photos.php:1063
 msgctxt "title"
 msgid "Dislikes"
 msgstr "vinden dit niet leuk"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+#: ../../include/conversation.php:575 ../../mod/photos.php:1064
 msgctxt "title"
 msgid "Agree"
 msgstr "eens"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+#: ../../include/conversation.php:575 ../../mod/photos.php:1064
 msgctxt "title"
 msgid "Disagree"
 msgstr "oneens"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+#: ../../include/conversation.php:575 ../../mod/photos.php:1064
 msgctxt "title"
 msgid "Abstain"
 msgstr "onthoudingen"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+#: ../../include/conversation.php:576 ../../mod/photos.php:1065
 msgctxt "title"
 msgid "Attending"
 msgstr "aanwezig"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+#: ../../include/conversation.php:576 ../../mod/photos.php:1065
 msgctxt "title"
 msgid "Not attending"
 msgstr "niet aanwezig"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+#: ../../include/conversation.php:576 ../../mod/photos.php:1065
 msgctxt "title"
 msgid "Might attend"
 msgstr "mogelijk aanwezig"
@@ -3395,269 +3402,273 @@ msgstr "Waar bevind je je op dit moment?"
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Verloopt op DD-MM-YYYY om HH:MM"
 
-#: ../../include/conversation.php:1179 ../../mod/photos.php:1025
-#: ../../mod/layouts.php:184 ../../mod/webpages.php:182
+#: ../../include/conversation.php:1183 ../../mod/layouts.php:184
+#: ../../mod/photos.php:1028 ../../mod/webpages.php:182
 #: ../../mod/blocks.php:154
 msgid "Share"
 msgstr "Delen"
 
-#: ../../include/conversation.php:1181
+#: ../../include/conversation.php:1185
 msgid "Page link name"
 msgstr "Linknaam pagina"
 
-#: ../../include/conversation.php:1184
+#: ../../include/conversation.php:1188
 msgid "Post as"
 msgstr "Bericht plaatsen als"
 
-#: ../../include/conversation.php:1191 ../../mod/editblock.php:142
-#: ../../mod/editpost.php:119 ../../mod/editlayout.php:140
+#: ../../include/conversation.php:1195 ../../mod/editblock.php:142
+#: ../../mod/editpost.php:118 ../../mod/editlayout.php:140
 #: ../../mod/editwebpage.php:182
 msgid "Upload photo"
 msgstr "Foto uploaden"
 
-#: ../../include/conversation.php:1192
+#: ../../include/conversation.php:1196
 msgid "upload photo"
 msgstr "foto uploaden"
 
-#: ../../include/conversation.php:1193 ../../mod/mail.php:240
+#: ../../include/conversation.php:1197 ../../mod/mail.php:240
 #: ../../mod/mail.php:369 ../../mod/editblock.php:143
-#: ../../mod/editpost.php:120 ../../mod/editlayout.php:141
+#: ../../mod/editpost.php:119 ../../mod/editlayout.php:141
 #: ../../mod/editwebpage.php:183
 msgid "Attach file"
 msgstr "Bestand toevoegen"
 
-#: ../../include/conversation.php:1194
+#: ../../include/conversation.php:1198
 msgid "attach file"
 msgstr "bestand toevoegen"
 
-#: ../../include/conversation.php:1195 ../../mod/mail.php:241
+#: ../../include/conversation.php:1199 ../../mod/mail.php:241
 #: ../../mod/mail.php:370 ../../mod/editblock.php:144
-#: ../../mod/editpost.php:121 ../../mod/editlayout.php:142
+#: ../../mod/editpost.php:120 ../../mod/editlayout.php:142
 #: ../../mod/editwebpage.php:184
 msgid "Insert web link"
 msgstr "Weblink invoegen"
 
-#: ../../include/conversation.php:1196
+#: ../../include/conversation.php:1200
 msgid "web link"
 msgstr "Weblink"
 
-#: ../../include/conversation.php:1197
+#: ../../include/conversation.php:1201
 msgid "Insert video link"
 msgstr "Videolink invoegen"
 
-#: ../../include/conversation.php:1198
+#: ../../include/conversation.php:1202
 msgid "video link"
 msgstr "videolink"
 
-#: ../../include/conversation.php:1199
+#: ../../include/conversation.php:1203
 msgid "Insert audio link"
 msgstr "Audiolink invoegen"
 
-#: ../../include/conversation.php:1200
+#: ../../include/conversation.php:1204
 msgid "audio link"
 msgstr "audiolink"
 
-#: ../../include/conversation.php:1201 ../../mod/editblock.php:148
-#: ../../mod/editpost.php:125 ../../mod/editlayout.php:146
+#: ../../include/conversation.php:1205 ../../mod/editblock.php:148
+#: ../../mod/editpost.php:124 ../../mod/editlayout.php:146
 #: ../../mod/editwebpage.php:188
 msgid "Set your location"
 msgstr "Locatie instellen"
 
-#: ../../include/conversation.php:1202
+#: ../../include/conversation.php:1206
 msgid "set location"
 msgstr "locatie instellen"
 
-#: ../../include/conversation.php:1203 ../../mod/editpost.php:127
+#: ../../include/conversation.php:1207 ../../mod/editpost.php:126
 msgid "Toggle voting"
 msgstr "Stemmen in- of uitschakelen"
 
-#: ../../include/conversation.php:1206 ../../mod/editblock.php:149
-#: ../../mod/editpost.php:126 ../../mod/editlayout.php:147
+#: ../../include/conversation.php:1210 ../../mod/editblock.php:149
+#: ../../mod/editpost.php:125 ../../mod/editlayout.php:147
 #: ../../mod/editwebpage.php:189
 msgid "Clear browser location"
 msgstr "Locatie van webbrowser wissen"
 
-#: ../../include/conversation.php:1207
+#: ../../include/conversation.php:1211
 msgid "clear location"
 msgstr "locatie wissen"
 
-#: ../../include/conversation.php:1209 ../../mod/editblock.php:162
-#: ../../mod/editpost.php:142 ../../mod/editwebpage.php:205
+#: ../../include/conversation.php:1213 ../../mod/editblock.php:162
+#: ../../mod/editpost.php:141 ../../mod/editwebpage.php:205
 msgid "Title (optional)"
 msgstr "Titel (optioneel)"
 
-#: ../../include/conversation.php:1213 ../../mod/editblock.php:165
-#: ../../mod/editpost.php:144 ../../mod/editlayout.php:163
+#: ../../include/conversation.php:1217 ../../mod/editblock.php:165
+#: ../../mod/editpost.php:143 ../../mod/editlayout.php:163
 #: ../../mod/editwebpage.php:207
 msgid "Categories (optional, comma-separated list)"
 msgstr "Categorieën (optioneel, door komma's gescheiden lijst)"
 
-#: ../../include/conversation.php:1215 ../../mod/editblock.php:151
-#: ../../mod/editpost.php:131 ../../mod/editlayout.php:149
+#: ../../include/conversation.php:1219 ../../mod/editblock.php:151
+#: ../../mod/editpost.php:130 ../../mod/editlayout.php:149
 #: ../../mod/editwebpage.php:191
 msgid "Permission settings"
 msgstr "Permissies"
 
-#: ../../include/conversation.php:1216
+#: ../../include/conversation.php:1220
 msgid "permissions"
 msgstr "permissies"
 
-#: ../../include/conversation.php:1224 ../../mod/editblock.php:159
-#: ../../mod/editpost.php:139 ../../mod/editlayout.php:156
+#: ../../include/conversation.php:1228 ../../mod/editblock.php:159
+#: ../../mod/editpost.php:138 ../../mod/editlayout.php:156
 #: ../../mod/editwebpage.php:200
 msgid "Public post"
 msgstr "Openbaar bericht"
 
-#: ../../include/conversation.php:1226 ../../mod/editblock.php:166
-#: ../../mod/editpost.php:145 ../../mod/editlayout.php:164
+#: ../../include/conversation.php:1230 ../../mod/editblock.php:166
+#: ../../mod/editpost.php:144 ../../mod/editlayout.php:164
 #: ../../mod/editwebpage.php:208
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be"
 
-#: ../../include/conversation.php:1239 ../../mod/mail.php:245
+#: ../../include/conversation.php:1243 ../../mod/mail.php:245
 #: ../../mod/mail.php:374 ../../mod/editblock.php:176
-#: ../../mod/editpost.php:156 ../../mod/editlayout.php:173
+#: ../../mod/editpost.php:155 ../../mod/editlayout.php:173
 #: ../../mod/editwebpage.php:217
 msgid "Set expiration date"
 msgstr "Verloopdatum instellen"
 
-#: ../../include/conversation.php:1243 ../../mod/editpost.php:160
+#: ../../include/conversation.php:1246
+msgid "Set publish date"
+msgstr "Publicatiedatum instellen"
+
+#: ../../include/conversation.php:1250 ../../mod/editpost.php:159
 #: ../../mod/events.php:691
 msgid "OK"
 msgstr "OK"
 
-#: ../../include/conversation.php:1244 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:161
+#: ../../include/conversation.php:1251 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:160
 #: ../../mod/events.php:690 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
 #: ../../mod/settings.php:584 ../../mod/settings.php:610
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../../include/conversation.php:1487
+#: ../../include/conversation.php:1494
 msgid "Discover"
 msgstr "Ontdekken"
 
-#: ../../include/conversation.php:1490
+#: ../../include/conversation.php:1497
 msgid "Imported public streams"
 msgstr "Openbare streams importeren"
 
-#: ../../include/conversation.php:1495
+#: ../../include/conversation.php:1502
 msgid "Commented Order"
 msgstr "Nieuwe reacties bovenaan"
 
-#: ../../include/conversation.php:1498
+#: ../../include/conversation.php:1505
 msgid "Sort by Comment Date"
 msgstr "Berichten met nieuwe reacties bovenaan"
 
-#: ../../include/conversation.php:1502
+#: ../../include/conversation.php:1509
 msgid "Posted Order"
 msgstr "Nieuwe berichten bovenaan"
 
-#: ../../include/conversation.php:1505
+#: ../../include/conversation.php:1512
 msgid "Sort by Post Date"
 msgstr "Nieuwe berichten bovenaan"
 
-#: ../../include/conversation.php:1510 ../../include/widgets.php:94
+#: ../../include/conversation.php:1517 ../../include/widgets.php:94
 msgid "Personal"
 msgstr "Persoonlijk"
 
-#: ../../include/conversation.php:1513
+#: ../../include/conversation.php:1520
 msgid "Posts that mention or involve you"
 msgstr "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent"
 
-#: ../../include/conversation.php:1519 ../../mod/menu.php:112
+#: ../../include/conversation.php:1526 ../../mod/menu.php:112
 #: ../../mod/connections.php:72 ../../mod/connections.php:82
 msgid "New"
 msgstr "Nieuw"
 
-#: ../../include/conversation.php:1522
+#: ../../include/conversation.php:1529
 msgid "Activity Stream - by date"
 msgstr "Activiteitenstroom - volgens datum"
 
-#: ../../include/conversation.php:1528
+#: ../../include/conversation.php:1535
 msgid "Starred"
 msgstr "Met ster"
 
-#: ../../include/conversation.php:1531
+#: ../../include/conversation.php:1538
 msgid "Favourite Posts"
 msgstr "Favoriete berichten"
 
-#: ../../include/conversation.php:1538
+#: ../../include/conversation.php:1545
 msgid "Spam"
 msgstr "Spam"
 
-#: ../../include/conversation.php:1541
+#: ../../include/conversation.php:1548
 msgid "Posts flagged as SPAM"
 msgstr "Berichten gemarkeerd als SPAM"
 
-#: ../../include/conversation.php:1585 ../../mod/admin.php:947
+#: ../../include/conversation.php:1592 ../../mod/admin.php:947
 msgid "Channel"
 msgstr "Kanaal"
 
-#: ../../include/conversation.php:1588
+#: ../../include/conversation.php:1595
 msgid "Status Messages and Posts"
 msgstr "Berichten in dit kanaal"
 
-#: ../../include/conversation.php:1597
+#: ../../include/conversation.php:1604
 msgid "About"
 msgstr "Over"
 
-#: ../../include/conversation.php:1600
+#: ../../include/conversation.php:1607
 msgid "Profile Details"
 msgstr "Profiel"
 
-#: ../../include/conversation.php:1616
+#: ../../include/conversation.php:1623
 msgid "Files and Storage"
 msgstr "Bestanden en opslagruimte"
 
-#: ../../include/conversation.php:1626 ../../include/conversation.php:1629
+#: ../../include/conversation.php:1633 ../../include/conversation.php:1636
 msgid "Chatrooms"
 msgstr "Chatkanalen"
 
-#: ../../include/conversation.php:1642
+#: ../../include/conversation.php:1649
 msgid "Saved Bookmarks"
 msgstr "Opgeslagen bladwijzers"
 
-#: ../../include/conversation.php:1652
+#: ../../include/conversation.php:1659
 msgid "Manage Webpages"
 msgstr "Webpagina's beheren"
 
-#: ../../include/conversation.php:1711
+#: ../../include/conversation.php:1718
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "aanwezig"
 msgstr[1] "aanwezig"
 
-#: ../../include/conversation.php:1714
+#: ../../include/conversation.php:1721
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "niet aanwezig"
 msgstr[1] "niet aanwezig"
 
-#: ../../include/conversation.php:1717
+#: ../../include/conversation.php:1724
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "nog niet beslist"
 msgstr[1] "nog niet beslist"
 
-#: ../../include/conversation.php:1720
+#: ../../include/conversation.php:1727
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] "eens"
 msgstr[1] "eens"
 
-#: ../../include/conversation.php:1723
+#: ../../include/conversation.php:1730
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] "oneens"
 msgstr[1] "oneens"
 
-#: ../../include/conversation.php:1726
+#: ../../include/conversation.php:1733
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
@@ -3771,7 +3782,7 @@ msgstr "Verbonden applicaties"
 msgid "Export channel"
 msgstr "Kanaal exporteren"
 
-#: ../../include/widgets.php:529 ../../mod/connedit.php:657
+#: ../../include/widgets.php:529 ../../mod/connedit.php:673
 msgid "Connection Default Permissions"
 msgstr "Standaard permissies voor connecties"
 
@@ -4119,8 +4130,8 @@ msgstr "Veilig zoeken"
 #: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
 #: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
 #: ../../mod/mitem.php:229 ../../mod/connedit.php:630
-#: ../../mod/connedit.php:658 ../../mod/photos.php:625
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/connedit.php:674 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/photos.php:626
 #: ../../mod/admin.php:386 ../../mod/menu.php:96 ../../mod/menu.php:153
 #: ../../mod/settings.php:574 ../../mod/api.php:106
 #: ../../view/theme/redbasic/php/config.php:104
@@ -4131,8 +4142,8 @@ msgstr "Nee"
 #: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
 #: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
 #: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../mod/photos.php:625
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/mitem.php:229 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/photos.php:626
 #: ../../mod/admin.php:388 ../../mod/menu.php:96 ../../mod/menu.php:153
 #: ../../mod/settings.php:574 ../../mod/api.php:105
 #: ../../view/theme/redbasic/php/config.php:104
@@ -4169,8 +4180,8 @@ msgstr "Kanalen voorstellen"
 msgid "Suggest a friend for %s"
 msgstr "Stel een kanaal voor aan %s"
 
-#: ../../mod/directory.php:59 ../../mod/display.php:13
-#: ../../mod/photos.php:489 ../../mod/search.php:13 ../../mod/ratings.php:82
+#: ../../mod/directory.php:59 ../../mod/display.php:13 ../../mod/search.php:13
+#: ../../mod/photos.php:490 ../../mod/ratings.php:82
 #: ../../mod/viewconnections.php:17
 msgid "Public access denied."
 msgstr "Openbare toegang geweigerd."
@@ -4760,7 +4771,7 @@ msgstr "Aangepaste permissies ophalen"
 
 #: ../../mod/connedit.php:507
 msgid "Recent Activity"
-msgstr "Recente activiteit"
+msgstr "Kanaal-activiteit"
 
 #: ../../mod/connedit.php:510
 msgid "View recent posts and comments"
@@ -4855,100 +4866,109 @@ msgstr "Profiel instellen"
 msgid "Set Affinity & Profile"
 msgstr "Verwantschapsfilter en profiel instellen"
 
-#: ../../mod/connedit.php:658
+#: ../../mod/connedit.php:669
+msgid "none"
+msgstr "geen"
+
+#: ../../mod/connedit.php:674
 msgid "Apply these permissions automatically"
 msgstr "Deze permissies automatisch toepassen"
 
-#: ../../mod/connedit.php:660
-msgid "This connection's address is"
-msgstr "Het adres van deze connectie is"
+#: ../../mod/connedit.php:676
+msgid "This connection's primary address is"
+msgstr "Het primaire kanaaladres van deze connectie is"
+
+#: ../../mod/connedit.php:677
+msgid "Available locations:"
+msgstr "Beschikbare locaties:"
 
-#: ../../mod/connedit.php:663
+#: ../../mod/connedit.php:681
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "Permissies die op deze pagina staan vermeld worden op alle nieuwe connecties toegepast."
 
-#: ../../mod/connedit.php:665
+#: ../../mod/connedit.php:683
 msgid "Slide to adjust your degree of friendship"
 msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag"
 
-#: ../../mod/connedit.php:667
+#: ../../mod/connedit.php:685
 msgid "Slide to adjust your rating"
 msgstr "Gebruik de schuif om je beoordeling te geven"
 
-#: ../../mod/connedit.php:668 ../../mod/connedit.php:673
+#: ../../mod/connedit.php:686 ../../mod/connedit.php:691
 msgid "Optionally explain your rating"
 msgstr "Verklaar jouw beoordeling (niet verplicht)"
 
-#: ../../mod/connedit.php:670
+#: ../../mod/connedit.php:688
 msgid "Custom Filter"
 msgstr "Berichtenfilter"
 
-#: ../../mod/connedit.php:671
+#: ../../mod/connedit.php:689
 msgid "Only import posts with this text"
 msgstr "Importeer alleen berichten met deze tekst"
 
-#: ../../mod/connedit.php:671 ../../mod/connedit.php:672
+#: ../../mod/connedit.php:689 ../../mod/connedit.php:690
 msgid ""
-"words one per line or #tags or /patterns/, leave blank to import all posts"
-msgstr "woorden, #tags, /regex/ of talen (lang=iso639-1) (één per regel) - laat leeg om alle berichten te importeren"
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
+msgstr "woorden (één per regel), #tags, /regex/ of talen (lang=iso639-1)  - laat leeg om alle berichten te importeren"
 
-#: ../../mod/connedit.php:672
+#: ../../mod/connedit.php:690
 msgid "Do not import posts with this text"
 msgstr "Importeer geen berichten met deze tekst"
 
-#: ../../mod/connedit.php:674
+#: ../../mod/connedit.php:692
 msgid "This information is public!"
 msgstr "Deze informatie is openbaar!"
 
-#: ../../mod/connedit.php:679
+#: ../../mod/connedit.php:697
 msgid "Connection Pending Approval"
 msgstr "Connectie moet nog goedgekeurd worden"
 
-#: ../../mod/connedit.php:680
+#: ../../mod/connedit.php:698
 msgid "Connection Request"
 msgstr "Connectieverzoek"
 
-#: ../../mod/connedit.php:681
+#: ../../mod/connedit.php:699
 #, php-format
 msgid ""
 "(%s) would like to connect with you. Please approve this connection to allow"
 " communication."
 msgstr "(%s) wil met jou verbinden. Keur dit connectieverzoek goed om onderling te kunnen communiceren."
 
-#: ../../mod/connedit.php:682 ../../mod/admin.php:781
+#: ../../mod/connedit.php:700 ../../mod/admin.php:781
 msgid "Approve"
 msgstr "Goedkeuren"
 
-#: ../../mod/connedit.php:683
+#: ../../mod/connedit.php:701
 msgid "Approve Later"
 msgstr "Later goedkeuren"
 
-#: ../../mod/connedit.php:686
+#: ../../mod/connedit.php:704
 msgid "inherited"
 msgstr "geërfd"
 
-#: ../../mod/connedit.php:688
+#: ../../mod/connedit.php:706
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken."
 
-#: ../../mod/connedit.php:690
+#: ../../mod/connedit.php:708
 msgid "Their Settings"
 msgstr "Hun instellingen"
 
-#: ../../mod/connedit.php:691
+#: ../../mod/connedit.php:709
 msgid "My Settings"
 msgstr "Mijn instellingen"
 
-#: ../../mod/connedit.php:693
+#: ../../mod/connedit.php:711
 msgid "Individual Permissions"
 msgstr "Individuele permissies"
 
-#: ../../mod/connedit.php:694
+#: ../../mod/connedit.php:712
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -4956,7 +4976,7 @@ msgid ""
 " settings here."
 msgstr "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele instellingen. Je kan je deze overgeërfde permissies hier <strong>niet</strong> veranderen."
 
-#: ../../mod/connedit.php:695
+#: ../../mod/connedit.php:713
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -4964,7 +4984,7 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele permissies. Je kan de permissies hier veranderen, maar die hebben geen effect, tenzij de overgeërfde permissies worden veranderd. "
 
-#: ../../mod/connedit.php:696
+#: ../../mod/connedit.php:714
 msgid "Last update:"
 msgstr "Laatste wijziging:"
 
@@ -4991,165 +5011,6 @@ msgid ""
 " to correctly use this feature."
 msgstr "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. "
 
-#: ../../mod/photos.php:79
-msgid "Page owner information could not be retrieved."
-msgstr "Informatie over de pagina-eigenaar werd niet ontvangen."
-
-#: ../../mod/photos.php:100
-msgid "Album not found."
-msgstr "Album niet gevonden."
-
-#: ../../mod/photos.php:127
-msgid "Delete Album"
-msgstr "Verwijder album"
-
-#: ../../mod/photos.php:171 ../../mod/photos.php:1006
-msgid "Delete Photo"
-msgstr "Verwijder foto"
-
-#: ../../mod/photos.php:500
-msgid "No photos selected"
-msgstr "Geen foto's geselecteerd"
-
-#: ../../mod/photos.php:549
-msgid "Access to this item is restricted."
-msgstr "Toegang tot dit item is beperkt."
-
-#: ../../mod/photos.php:588
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt."
-
-#: ../../mod/photos.php:591
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "%1$.2f MB aan foto-opslag gebruikt."
-
-#: ../../mod/photos.php:619
-msgid "Upload Photos"
-msgstr "Foto's uploaden"
-
-#: ../../mod/photos.php:623
-msgid "Enter an album name"
-msgstr "Vul een albumnaam in"
-
-#: ../../mod/photos.php:624
-msgid "or select an existing album (doubleclick)"
-msgstr "of kies een bestaand album (dubbelklikken)"
-
-#: ../../mod/photos.php:625
-msgid "Create a status post for this upload"
-msgstr "Plaats een bericht voor deze upload."
-
-#: ../../mod/photos.php:652
-msgid "Album name could not be decoded"
-msgstr "Albumnaam kon niet gedecodeerd worden"
-
-#: ../../mod/photos.php:696 ../../mod/photos.php:1233
-#: ../../mod/photos.php:1250
-msgid "Contact Photos"
-msgstr "Connectiefoto's"
-
-#: ../../mod/photos.php:724
-msgid "Show Newest First"
-msgstr "Nieuwste eerst weergeven"
-
-#: ../../mod/photos.php:726
-msgid "Show Oldest First"
-msgstr "Oudste eerst weergeven"
-
-#: ../../mod/photos.php:750 ../../mod/photos.php:1283
-msgid "View Photo"
-msgstr "Foto weergeven"
-
-#: ../../mod/photos.php:779
-msgid "Edit Album"
-msgstr "Album bewerken"
-
-#: ../../mod/photos.php:824
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Toegang geweigerd. Toegang tot dit item kan zijn beperkt."
-
-#: ../../mod/photos.php:826
-msgid "Photo not available"
-msgstr "Foto niet aanwezig"
-
-#: ../../mod/photos.php:884
-msgid "Use as profile photo"
-msgstr "Als profielfoto gebruiken"
-
-#: ../../mod/photos.php:891
-msgid "Private Photo"
-msgstr "Privéfoto"
-
-#: ../../mod/photos.php:902 ../../mod/events.php:528
-msgid "Previous"
-msgstr "Vorige"
-
-#: ../../mod/photos.php:906
-msgid "View Full Size"
-msgstr "Volledige grootte weergeven"
-
-#: ../../mod/photos.php:911 ../../mod/events.php:529 ../../mod/setup.php:285
-msgid "Next"
-msgstr "Volgende"
-
-#: ../../mod/photos.php:951 ../../mod/tagrm.php:133
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: ../../mod/photos.php:985
-msgid "Edit photo"
-msgstr "Foto bewerken"
-
-#: ../../mod/photos.php:987
-msgid "Rotate CW (right)"
-msgstr "Draai met de klok mee (naar rechts)"
-
-#: ../../mod/photos.php:988
-msgid "Rotate CCW (left)"
-msgstr "Draai tegen de klok in (naar links)"
-
-#: ../../mod/photos.php:991
-msgid "Enter a new album name"
-msgstr "Vul een nieuwe albumnaam in"
-
-#: ../../mod/photos.php:992
-msgid "or select an existing one (doubleclick)"
-msgstr "of kies een bestaand album (dubbelklikken)"
-
-#: ../../mod/photos.php:995
-msgid "Caption"
-msgstr "Bijschrift"
-
-#: ../../mod/photos.php:997
-msgid "Add a Tag"
-msgstr "Tag toevoegen"
-
-#: ../../mod/photos.php:1001
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl"
-
-#: ../../mod/photos.php:1004
-msgid "Flag as adult in album view"
-msgstr "Markeer als voor volwassenen in albumweergave"
-
-#: ../../mod/photos.php:1196
-msgid "In This Photo:"
-msgstr "Op deze foto:"
-
-#: ../../mod/photos.php:1201
-msgid "Map"
-msgstr "Kaart"
-
-#: ../../mod/photos.php:1289
-msgid "View Album"
-msgstr "Album weergeven"
-
-#: ../../mod/photos.php:1312
-msgid "Recent Photos"
-msgstr "Recente foto's"
-
 #: ../../mod/filestorage.php:82
 msgid "Permission Denied."
 msgstr "Toegang geweigerd"
@@ -5312,12 +5173,12 @@ msgstr "Aantal minuten voordat chatberichten worden verwijderd"
 msgid "%1$s's Chatrooms"
 msgstr "Chatkanalen van %1$s"
 
-#: ../../mod/search.php:209
+#: ../../mod/search.php:211
 #, php-format
 msgid "Items tagged with: %s"
 msgstr "Items getagd met %s"
 
-#: ../../mod/search.php:211
+#: ../../mod/search.php:213
 #, php-format
 msgid "Search results for: %s"
 msgstr "Zoekresultaten voor %s"
@@ -5426,6 +5287,173 @@ msgstr "Antwoord versturen"
 msgid "Your message for %s (%s):"
 msgstr "Jouw privébericht aan %s (%s):"
 
+#: ../../mod/photos.php:79
+msgid "Page owner information could not be retrieved."
+msgstr "Informatie over de pagina-eigenaar werd niet ontvangen."
+
+#: ../../mod/photos.php:100
+msgid "Album not found."
+msgstr "Album niet gevonden."
+
+#: ../../mod/photos.php:127
+msgid "Delete Album"
+msgstr "Verwijder album"
+
+#: ../../mod/photos.php:171 ../../mod/photos.php:1009
+msgid "Delete Photo"
+msgstr "Verwijder foto"
+
+#: ../../mod/photos.php:501
+msgid "No photos selected"
+msgstr "Geen foto's geselecteerd"
+
+#: ../../mod/photos.php:550
+msgid "Access to this item is restricted."
+msgstr "Toegang tot dit item is beperkt."
+
+#: ../../mod/photos.php:589
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt."
+
+#: ../../mod/photos.php:592
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr "%1$.2f MB aan foto-opslag gebruikt."
+
+#: ../../mod/photos.php:620
+msgid "Upload Photos"
+msgstr "Foto's uploaden"
+
+#: ../../mod/photos.php:624
+msgid "Enter an album name"
+msgstr "Vul een albumnaam in"
+
+#: ../../mod/photos.php:625
+msgid "or select an existing album (doubleclick)"
+msgstr "of kies een bestaand album (dubbelklikken)"
+
+#: ../../mod/photos.php:626
+msgid "Create a status post for this upload"
+msgstr "Plaats een bericht voor deze upload."
+
+#: ../../mod/photos.php:627
+msgid "Caption (optional):"
+msgstr "Bijschrift (optioneel):"
+
+#: ../../mod/photos.php:628
+msgid "Description (optional):"
+msgstr "Omschrijving (optioneel):"
+
+#: ../../mod/photos.php:655
+msgid "Album name could not be decoded"
+msgstr "Albumnaam kon niet gedecodeerd worden"
+
+#: ../../mod/photos.php:699 ../../mod/photos.php:1236
+#: ../../mod/photos.php:1253
+msgid "Contact Photos"
+msgstr "Connectiefoto's"
+
+#: ../../mod/photos.php:727
+msgid "Show Newest First"
+msgstr "Nieuwste eerst weergeven"
+
+#: ../../mod/photos.php:729
+msgid "Show Oldest First"
+msgstr "Oudste eerst weergeven"
+
+#: ../../mod/photos.php:753 ../../mod/photos.php:1286
+msgid "View Photo"
+msgstr "Foto weergeven"
+
+#: ../../mod/photos.php:782
+msgid "Edit Album"
+msgstr "Album bewerken"
+
+#: ../../mod/photos.php:827
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Toegang geweigerd. Toegang tot dit item kan zijn beperkt."
+
+#: ../../mod/photos.php:829
+msgid "Photo not available"
+msgstr "Foto niet aanwezig"
+
+#: ../../mod/photos.php:887
+msgid "Use as profile photo"
+msgstr "Als profielfoto gebruiken"
+
+#: ../../mod/photos.php:894
+msgid "Private Photo"
+msgstr "Privéfoto"
+
+#: ../../mod/photos.php:905 ../../mod/events.php:528
+msgid "Previous"
+msgstr "Vorige"
+
+#: ../../mod/photos.php:909
+msgid "View Full Size"
+msgstr "Volledige grootte weergeven"
+
+#: ../../mod/photos.php:914 ../../mod/events.php:529 ../../mod/setup.php:285
+msgid "Next"
+msgstr "Volgende"
+
+#: ../../mod/photos.php:954 ../../mod/tagrm.php:133
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: ../../mod/photos.php:988
+msgid "Edit photo"
+msgstr "Foto bewerken"
+
+#: ../../mod/photos.php:990
+msgid "Rotate CW (right)"
+msgstr "Draai met de klok mee (naar rechts)"
+
+#: ../../mod/photos.php:991
+msgid "Rotate CCW (left)"
+msgstr "Draai tegen de klok in (naar links)"
+
+#: ../../mod/photos.php:994
+msgid "Enter a new album name"
+msgstr "Vul een nieuwe albumnaam in"
+
+#: ../../mod/photos.php:995
+msgid "or select an existing one (doubleclick)"
+msgstr "of kies een bestaand album (dubbelklikken)"
+
+#: ../../mod/photos.php:998
+msgid "Caption"
+msgstr "Bijschrift"
+
+#: ../../mod/photos.php:1000
+msgid "Add a Tag"
+msgstr "Tag toevoegen"
+
+#: ../../mod/photos.php:1004
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl"
+
+#: ../../mod/photos.php:1007
+msgid "Flag as adult in album view"
+msgstr "Markeer als voor volwassenen in albumweergave"
+
+#: ../../mod/photos.php:1199
+msgid "In This Photo:"
+msgstr "Op deze foto:"
+
+#: ../../mod/photos.php:1204
+msgid "Map"
+msgstr "Kaart"
+
+#: ../../mod/photos.php:1292
+msgid "View Album"
+msgstr "Album weergeven"
+
+#: ../../mod/photos.php:1315
+msgid "Recent Photos"
+msgstr "Recente foto's"
+
 #: ../../mod/dreport.php:23
 msgid "Invalid message"
 msgstr "Ongeldig bericht"
@@ -5493,17 +5521,17 @@ msgstr "Item niet gevonden"
 msgid "Delete block?"
 msgstr "Blok verwijderen"
 
-#: ../../mod/editblock.php:145 ../../mod/editpost.php:122
+#: ../../mod/editblock.php:145 ../../mod/editpost.php:121
 #: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:185
 msgid "Insert YouTube video"
 msgstr "YouTube-video invoegen"
 
-#: ../../mod/editblock.php:146 ../../mod/editpost.php:123
+#: ../../mod/editblock.php:146 ../../mod/editpost.php:122
 #: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:186
 msgid "Insert Vorbis [.ogg] video"
 msgstr "Vorbis-video [.ogg] invoegen"
 
-#: ../../mod/editblock.php:147 ../../mod/editpost.php:124
+#: ../../mod/editblock.php:147 ../../mod/editpost.php:123
 #: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:187
 msgid "Insert Vorbis [.ogg] audio"
 msgstr "Vorbis-audio [.ogg] invoegen"
@@ -5524,7 +5552,7 @@ msgstr "Item is niet te bewerken"
 msgid "Delete item?"
 msgstr "Item verwijderen?"
 
-#: ../../mod/editpost.php:165 ../../mod/rpost.php:128
+#: ../../mod/editpost.php:164 ../../mod/rpost.php:128
 msgid "Edit post"
 msgstr "Bericht bewerken"
 
@@ -6870,20 +6898,20 @@ msgstr "Leeg bericht geannuleerd"
 msgid "Executable content type not permitted to this channel."
 msgstr "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal."
 
-#: ../../mod/item.php:906
+#: ../../mod/item.php:908
 msgid "System error. Post not saved."
 msgstr "Systeemfout. Bericht niet opgeslagen."
 
-#: ../../mod/item.php:1173
+#: ../../mod/item.php:1175
 msgid "Unable to obtain post information from database."
 msgstr "Niet in staat om informatie over dit bericht uit de database te verkrijgen."
 
-#: ../../mod/item.php:1180
+#: ../../mod/item.php:1182
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Je hebt jouw limiet van %1$.0f berichten bereikt."
 
-#: ../../mod/item.php:1187
+#: ../../mod/item.php:1189
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Je hebt jouw limiet van %1$.0f webpagina's bereikt."
@@ -9033,6 +9061,10 @@ msgid ""
 "Use this form to import existing posts and content from an export file."
 msgstr "Gebruik dit formulier om bestaande berichten en andere inhoud vanuit een exportbestand te importeren."
 
+#: ../../mod/wholikesme.php:13
+msgid "Who likes me?"
+msgstr "Wie vindt mij leuk?"
+
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Focus (Hubzilla default)"
 msgstr "Focus (Hubzilla-standaard)"
diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php
index b04679372..f48043c76 100644
--- a/view/nl/hstrings.php
+++ b/view/nl/hstrings.php
@@ -5,12 +5,6 @@ function string_plural_select_nl($n){
 	return ($n != 1);;
 }}
 ;
-$a->strings["Attachments:"] = "Bijlagen:";
-$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
-$a->strings["\$Projectname event notification:"] = "Notificatie \$Projectname-gebeurtenis:";
-$a->strings["Starts:"] = "Start:";
-$a->strings["Finishes:"] = "Einde:";
-$a->strings["Location:"] = "Plaats:";
 $a->strings["No username found in import file."] = "Geen gebruikersnaam in het importbestand gevonden.";
 $a->strings["Unable to create a unique channel address. Import failed."] = "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislukt.";
 $a->strings["Import completed."] = "Import voltooid.";
@@ -127,8 +121,10 @@ $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"] = "Stemmen inschakelen";
+$a->strings["Enable Voting Tools"] = "Stemmen inschakelen";
 $a->strings["Provide a class of post which others can vote on"] = "Creëert een berichtenoptie zodat anderen op jouw vraag 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["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 ";
@@ -375,6 +371,10 @@ $a->strings["Don't care"] = "Maakt mij niks uit";
 $a->strings["Ask me"] = "Vraag het me";
 $a->strings["Embedded content"] = "Ingesloten inhoud";
 $a->strings["Embedding disabled"] = "Insluiten uitgeschakeld";
+$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
+$a->strings["Starts:"] = "Start:";
+$a->strings["Finishes:"] = "Einde:";
+$a->strings["Location:"] = "Plaats:";
 $a->strings["This event has been added to your calendar."] = "Dit evenement is aan jouw agenda toegevoegd.";
 $a->strings["event"] = "gebeurtenis";
 $a->strings["Not specified"] = "Niet aangegeven";
@@ -412,6 +412,21 @@ $a->strings["Profile Photo"] = "Profielfoto";
 $a->strings["Update"] = "Bijwerken";
 $a->strings["Install"] = "Installeren";
 $a->strings["Purchase"] = "Aanschaffen";
+$a->strings["Item was not found."] = "Item niet gevonden";
+$a->strings["No source file."] = "Geen bronbestand.";
+$a->strings["Cannot locate file to replace"] = "Kan het te vervangen bestand niet vinden";
+$a->strings["Cannot locate file to revise/update"] = "Kan het bestand wat aangepast moet worden niet vinden";
+$a->strings["File exceeds size limit of %d"] = "Bestand is groter dan de toegelaten %d";
+$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt.";
+$a->strings["File upload failed. Possible system limit or action terminated."] = "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken.";
+$a->strings["Stored file could not be verified. Upload failed."] = "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt.";
+$a->strings["Path not available."] = "Pad niet beschikbaar.";
+$a->strings["Empty pathname"] = "Padnaam leeg";
+$a->strings["duplicate filename or path"] = "dubbele bestandsnaam of pad";
+$a->strings["Path not found."] = "Pad niet gevonden";
+$a->strings["mkdir failed."] = "directory aanmaken (mkdir) mislukt.";
+$a->strings["database storage failed."] = "opslag in database mislukt.";
+$a->strings["Empty path"] = "Ontbrekend bestandspad";
 $a->strings["Logged out."] = "Uitgelogd.";
 $a->strings["Failed authentication"] = "Mislukte authenticatie";
 $a->strings["Login failed."] = "Inloggen mislukt.";
@@ -713,6 +728,8 @@ $a->strings["Love/Romance:"] = "Liefde/romantiek:";
 $a->strings["Work/employment:"] = "Werk/beroep:";
 $a->strings["School/education:"] = "School/opleiding:";
 $a->strings["Like this thing"] = "Vind dit ding leuk";
+$a->strings["Attachments:"] = "Bijlagen:";
+$a->strings["\$Projectname event notification:"] = "Notificatie \$Projectname-gebeurtenis:";
 $a->strings["Tags"] = "Tags";
 $a->strings["Keywords"] = "Trefwoorden";
 $a->strings["have"] = "heb";
@@ -721,21 +738,6 @@ $a->strings["want"] = "wil";
 $a->strings["wants"] = "wil";
 $a->strings["likes"] = "vindt dit leuk";
 $a->strings["dislikes"] = "vindt dit niet leuk";
-$a->strings["Item was not found."] = "Item niet gevonden";
-$a->strings["No source file."] = "Geen bronbestand.";
-$a->strings["Cannot locate file to replace"] = "Kan het te vervangen bestand niet vinden";
-$a->strings["Cannot locate file to revise/update"] = "Kan het bestand wat aangepast moet worden niet vinden";
-$a->strings["File exceeds size limit of %d"] = "Bestand is groter dan de toegelaten %d";
-$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt.";
-$a->strings["File upload failed. Possible system limit or action terminated."] = "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken.";
-$a->strings["Stored file could not be verified. Upload failed."] = "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt.";
-$a->strings["Path not available."] = "Pad niet beschikbaar.";
-$a->strings["Empty pathname"] = "Padnaam leeg";
-$a->strings["duplicate filename or path"] = "dubbele bestandsnaam of pad";
-$a->strings["Path not found."] = "Pad niet gevonden";
-$a->strings["mkdir failed."] = "directory aanmaken (mkdir) mislukt.";
-$a->strings["database storage failed."] = "opslag in database mislukt.";
-$a->strings["Empty path"] = "Ontbrekend bestandspad";
 $a->strings["channel"] = "kanaal";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s leuk";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s niet leuk";
@@ -815,6 +817,7 @@ $a->strings["permissions"] = "permissies";
 $a->strings["Public post"] = "Openbaar bericht";
 $a->strings["Example: bob@example.com, mary@example.com"] = "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be";
 $a->strings["Set expiration date"] = "Verloopdatum instellen";
+$a->strings["Set publish date"] = "Publicatiedatum instellen";
 $a->strings["OK"] = "OK";
 $a->strings["Cancel"] = "Annuleren";
 $a->strings["Discover"] = "Ontdekken";
@@ -1122,7 +1125,7 @@ $a->strings["Connection has been removed."] = "Connectie is verwijderd";
 $a->strings["View %s's profile"] = "Profiel van %s weergeven";
 $a->strings["Refresh Permissions"] = "Permissies vernieuwen";
 $a->strings["Fetch updated permissions"] = "Aangepaste permissies ophalen";
-$a->strings["Recent Activity"] = "Recente activiteit";
+$a->strings["Recent Activity"] = "Kanaal-activiteit";
 $a->strings["View recent posts and comments"] = "Recente berichten en reacties weergeven";
 $a->strings["Unblock"] = "Deblokkeren";
 $a->strings["Block"] = "Blokkeren";
@@ -1146,15 +1149,17 @@ $a->strings["Accept connection to allow communication"] = "Keur deze connectie g
 $a->strings["Set Affinity"] = "Verwantschapsfilter instellen";
 $a->strings["Set Profile"] = "Profiel instellen";
 $a->strings["Set Affinity & Profile"] = "Verwantschapsfilter en profiel instellen";
+$a->strings["none"] = "geen";
 $a->strings["Apply these permissions automatically"] = "Deze permissies automatisch toepassen";
-$a->strings["This connection's address is"] = "Het adres van deze connectie is";
+$a->strings["This connection's primary address is"] = "Het primaire kanaaladres van deze connectie is";
+$a->strings["Available locations:"] = "Beschikbare locaties:";
 $a->strings["The permissions indicated on this page will be applied to all new connections."] = "Permissies die op deze pagina staan vermeld worden op alle nieuwe connecties toegepast.";
 $a->strings["Slide to adjust your degree of friendship"] = "Schuif om te bepalen hoe goed je iemand kent en/of mag";
 $a->strings["Slide to adjust your rating"] = "Gebruik de schuif om je beoordeling te geven";
 $a->strings["Optionally explain your rating"] = "Verklaar jouw beoordeling (niet verplicht)";
 $a->strings["Custom Filter"] = "Berichtenfilter";
 $a->strings["Only import posts with this text"] = "Importeer alleen berichten met deze tekst";
-$a->strings["words one per line or #tags or /patterns/, leave blank to import all posts"] = "woorden, #tags, /regex/ of talen (lang=iso639-1) (één per regel) - laat leeg om alle berichten te importeren";
+$a->strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "woorden (één per regel), #tags, /regex/ of talen (lang=iso639-1)  - laat leeg om alle berichten te importeren";
 $a->strings["Do not import posts with this text"] = "Importeer geen berichten met deze tekst";
 $a->strings["This information is public!"] = "Deze informatie is openbaar!";
 $a->strings["Connection Pending Approval"] = "Connectie moet nog goedgekeurd worden";
@@ -1175,45 +1180,6 @@ $a->strings["Hub not found."] = "Hub niet gevonden.";
 $a->strings["This setting requires special processing and editing has been blocked."] = "Deze instelling vereist een speciaal proces  en bewerken is geblokkeerd.";
 $a->strings["Configuration Editor"] = "Configuratiebewerker";
 $a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. ";
-$a->strings["Page owner information could not be retrieved."] = "Informatie over de pagina-eigenaar werd niet ontvangen.";
-$a->strings["Album not found."] = "Album niet gevonden.";
-$a->strings["Delete Album"] = "Verwijder album";
-$a->strings["Delete Photo"] = "Verwijder foto";
-$a->strings["No photos selected"] = "Geen foto's geselecteerd";
-$a->strings["Access to this item is restricted."] = "Toegang tot dit item is beperkt.";
-$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt.";
-$a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB aan foto-opslag gebruikt.";
-$a->strings["Upload Photos"] = "Foto's uploaden";
-$a->strings["Enter an album name"] = "Vul een albumnaam in";
-$a->strings["or select an existing album (doubleclick)"] = "of kies een bestaand album (dubbelklikken)";
-$a->strings["Create a status post for this upload"] = "Plaats een bericht voor deze upload.";
-$a->strings["Album name could not be decoded"] = "Albumnaam kon niet gedecodeerd worden";
-$a->strings["Contact Photos"] = "Connectiefoto's";
-$a->strings["Show Newest First"] = "Nieuwste eerst weergeven";
-$a->strings["Show Oldest First"] = "Oudste eerst weergeven";
-$a->strings["View Photo"] = "Foto weergeven";
-$a->strings["Edit Album"] = "Album bewerken";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Toegang geweigerd. Toegang tot dit item kan zijn beperkt.";
-$a->strings["Photo not available"] = "Foto niet aanwezig";
-$a->strings["Use as profile photo"] = "Als profielfoto gebruiken";
-$a->strings["Private Photo"] = "Privéfoto";
-$a->strings["Previous"] = "Vorige";
-$a->strings["View Full Size"] = "Volledige grootte weergeven";
-$a->strings["Next"] = "Volgende";
-$a->strings["Remove"] = "Verwijderen";
-$a->strings["Edit photo"] = "Foto bewerken";
-$a->strings["Rotate CW (right)"] = "Draai met de klok mee (naar rechts)";
-$a->strings["Rotate CCW (left)"] = "Draai tegen de klok in (naar links)";
-$a->strings["Enter a new album name"] = "Vul een nieuwe albumnaam in";
-$a->strings["or select an existing one (doubleclick)"] = "of kies een bestaand album (dubbelklikken)";
-$a->strings["Caption"] = "Bijschrift";
-$a->strings["Add a Tag"] = "Tag toevoegen";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl";
-$a->strings["Flag as adult in album view"] = "Markeer als voor volwassenen in albumweergave";
-$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["Permission Denied."] = "Toegang geweigerd";
 $a->strings["File not found."] = "Bestand niet gevonden.";
 $a->strings["Edit file permissions"] = "Bestandsrechten bewerken";
@@ -1281,6 +1247,47 @@ $a->strings["Delete Conversation"] = "Verwijder conversatie";
 $a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender.";
 $a->strings["Send Reply"] = "Antwoord versturen";
 $a->strings["Your message for %s (%s):"] = "Jouw privébericht aan %s (%s):";
+$a->strings["Page owner information could not be retrieved."] = "Informatie over de pagina-eigenaar werd niet ontvangen.";
+$a->strings["Album not found."] = "Album niet gevonden.";
+$a->strings["Delete Album"] = "Verwijder album";
+$a->strings["Delete Photo"] = "Verwijder foto";
+$a->strings["No photos selected"] = "Geen foto's geselecteerd";
+$a->strings["Access to this item is restricted."] = "Toegang tot dit item is beperkt.";
+$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt.";
+$a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB aan foto-opslag gebruikt.";
+$a->strings["Upload Photos"] = "Foto's uploaden";
+$a->strings["Enter an album name"] = "Vul een albumnaam in";
+$a->strings["or select an existing album (doubleclick)"] = "of kies een bestaand album (dubbelklikken)";
+$a->strings["Create a status post for this upload"] = "Plaats een bericht voor deze upload.";
+$a->strings["Caption (optional):"] = "Bijschrift (optioneel):";
+$a->strings["Description (optional):"] = "Omschrijving (optioneel):";
+$a->strings["Album name could not be decoded"] = "Albumnaam kon niet gedecodeerd worden";
+$a->strings["Contact Photos"] = "Connectiefoto's";
+$a->strings["Show Newest First"] = "Nieuwste eerst weergeven";
+$a->strings["Show Oldest First"] = "Oudste eerst weergeven";
+$a->strings["View Photo"] = "Foto weergeven";
+$a->strings["Edit Album"] = "Album bewerken";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Toegang geweigerd. Toegang tot dit item kan zijn beperkt.";
+$a->strings["Photo not available"] = "Foto niet aanwezig";
+$a->strings["Use as profile photo"] = "Als profielfoto gebruiken";
+$a->strings["Private Photo"] = "Privéfoto";
+$a->strings["Previous"] = "Vorige";
+$a->strings["View Full Size"] = "Volledige grootte weergeven";
+$a->strings["Next"] = "Volgende";
+$a->strings["Remove"] = "Verwijderen";
+$a->strings["Edit photo"] = "Foto bewerken";
+$a->strings["Rotate CW (right)"] = "Draai met de klok mee (naar rechts)";
+$a->strings["Rotate CCW (left)"] = "Draai tegen de klok in (naar links)";
+$a->strings["Enter a new album name"] = "Vul een nieuwe albumnaam in";
+$a->strings["or select an existing one (doubleclick)"] = "of kies een bestaand album (dubbelklikken)";
+$a->strings["Caption"] = "Bijschrift";
+$a->strings["Add a Tag"] = "Tag toevoegen";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl";
+$a->strings["Flag as adult in album view"] = "Markeer als voor volwassenen in albumweergave";
+$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["Invalid message"] = "Ongeldig bericht";
 $a->strings["no results"] = "geen resultaten";
 $a->strings["Delivery report for %1\$s"] = "Afleveringsrapport voor %1\$s";
@@ -2130,6 +2137,7 @@ $a->strings["Or enter new bookmark folder name"] = "Of geef de naam op van een n
 $a->strings["Import completed"] = "Importeren voltooid";
 $a->strings["Import Items"] = "Importeer items";
 $a->strings["Use this form to import existing posts and content from an export file."] = "Gebruik dit formulier om bestaande berichten en andere inhoud vanuit een exportbestand te importeren.";
+$a->strings["Who likes me?"] = "Wie vindt mij leuk?";
 $a->strings["Focus (Hubzilla default)"] = "Focus (Hubzilla-standaard)";
 $a->strings["Theme settings"] = "Thema-instellingen";
 $a->strings["Select scheme"] = "Kies schema van thema";
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 9403b078e..e83610f51 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -757,6 +757,7 @@ a.rateme, div.rateme {
 
 .wall-item-conv {
 	padding: 7px 10px;
+	background-color: $comment_item_colour;
 }
 
 
diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css
index a2b795be9..15e17c48b 100644
--- a/view/theme/redbasic/schema/bluegrid.css
+++ b/view/theme/redbasic/schema/bluegrid.css
@@ -33,17 +33,43 @@ body 	{
 }
 
 .generic-content-wrapper-styled .generic-content-wrapper {
-		color: #4d4d4d;
+		color: #4D4D4D;
 }
+
 .generic-content-wrapper-styled .generic-content-wrapper a {
 		color: #43488A;
 }
 
+.generic-content-wrapper #profile-jot-wrapper {
+    background-color: transparent;
+	color: #4D4D4D;
+}
+
+.generic-content-wrapper input#jot-title, .generic-content-wrapper input#jot-pagetitle {
+    color: #4D4D4D;
+}
+
+.generic-content-wrapper input#jot-title:hover, .generic-content-wrapper input#jot-title:focus {
+    color: #4D4D4D;
+    border-radius: 0px;
+}
+
+
 .fn, .widget h3, .nav-tabs a, .generic-content-wrapper-styled a, .dropdown-menu > li > a, #channels-desc, input#jot-title {
     color: #fff;
 	border-radius: 0px
 }
 
+ul.dropdown-menu.acpopup > li.textcomplete-item > a {
+	color: #43488A;
+}
+
+ul.dropdown-menu.acpopup > li.textcomplete-item > a:hover, ul.dropdown-menu.acpopup > li.textcomplete-item > a:focus {
+	background-color: #43488A;
+	color: #FFF;
+	cursor: pointer;
+}
+
 input#jot-title:hover, input#jot-title:focus {
 	color: #43488A;
 	border-radius: 0px;
@@ -134,10 +160,22 @@ nav .badge:hover, nav .badge:focus {
     color: rgba(255,255,255,.8);
 }
 
-.help-block, .comment-icon, .jot-icons {
+.help-block, .comment-icon, .jot-icons, .admin-icons {
 	color: inherit;
 }
 
+#adminpage table tr:hover, #adminpage table tr:hover a, #adminpage table tr td.tools a:hover, #adminpage table tr:focus, #adminpage table tr:focus a, #adminpage table tr td.tools a:focus {
+    color: #43488A;
+}
+
+#adminpage table tr:hover .tools a, #adminpage table tr:focus .tools a, .generic-content-wrapper-styled > .descriptive-text {
+	color: #FFF;
+}
+
+.generic-content-wrapper-styled > .sources-links {
+	font-weight: bold;
+}
+
 .wall-item-tools .btn {
 	border-color: #43488A;
 }
@@ -224,6 +262,20 @@ div.rateme:hover, div.rateme:focus, a.rateme:hover, a.rateme:focus {
 	color: #FFF !important;
 }
 
+#chatTopBar {
+	background-color: rgba(255,255,255,.8);
+	color: #4d4d4d;
+    height: 500px;
+    width: 596px;
+    overflow-y: auto;
+}
+
+.chat-item-text {
+    border-radius: 0px;
+	padding: 5px;
+    background-color: #FFF;
+}
+
 input {
 	border-radius: 0px;	
 }
@@ -233,6 +285,16 @@ input {
     margin-top: 0;
 }
 
+.directory-item {
+    margin-bottom: 0px;
+	padding-bottom: 20px;
+	background-color: #FFF;
+}
+
+.directory-item.lframe {
+	background-color: transparent !important;
+}
+
 .contact-entry-wrapper {
 	border: 1px solid rgba(255,255,255,.5);
 }
@@ -241,7 +303,7 @@ input {
 	color: #43488A;
 }
 
-.profile-edit-side-link, input#profile-photo-upload, .allcontact-link {
+.profile-edit-side-link, input#profile-photo-upload, .allcontact-link, #newchannel-form .descriptive-paragraph	 {
 	color: #FFF;
 }
 
@@ -250,7 +312,7 @@ input {
 	text-decoration: none;
 }
 
-.btn, #event-edit-form .btn {
+.btn, #event-edit-form .btn, input.directory-rating-submit {
     border: 1px solid #FFF;
     color: #FFF; 
     background-color: #43488A;
@@ -268,26 +330,14 @@ input {
     background-color: #FFF;
 }
 
-.btn-default:hover, .btn-default:focus, .open > .dropdown-toggle.btn-default {
+.btn-default:hover, .btn-default:focus, .open > .dropdown-toggle.btn-default, input.directory-rating-submit:hover, input.directory-rating-submit:focus {
     border: 1px solid #43488A;
     outline: 0;
     color: #43488A;
     background-color: #FFF;
 }
 
-.btn-success {
-    color: #FFF;
-    background-color: #5CB85C;
-    border-color: #4CAE4C;
-}
-
-.btn-success:hover, .btn-success:focus {
-    color: #FFF;
-    background-color: #449D44;
-    border-color: #398439;
-}
-
-.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit {
+.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit, form#chat-form > input, div#adminpage > form > div.submit > input, input.sources-submit, input.contact-edit-submit {
     background-color: #FFF;
     color: #43488A;
 	border-radius: 0px;
@@ -296,45 +346,74 @@ input {
     transition: all .3s ease-in-out;
 }
 
-.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus {
+.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus, form#chat-form > input:hover, form#chat-form > input:focus, div#adminpage > form > div.submit > input:hover, div#adminpage > form > div.submit > input:focus, input.sources-submit:hover, input.sources-submit:focus, input.contact-edit-submit:focus, input.contact-edit-submit:hover {
     border-color: #FFF;
     background-color: #43488A;
     color: #FFF;
 	border-radius: 0px;
 }
 
-.comment-tools .btn, #prvmail-tools .btn {
+.comment-tools .btn, #prvmail-tools .btn, .generic-content-wrapper .btn {
     border: 1px solid #43488A;
     color: #43488A; 
     background-color: #FFF;
 }
 
-.comment-tools .btn:hover, .comment-tools .btn:focus, #prvmail-tools .btn:hover, #prvmail-tools .btn:focus {
-    border: 1px solid #43488A;
+.comment-tools .btn:hover, .comment-tools .btn:focus, #prvmail-tools .btn:hover, #prvmail-tools .btn:focus, .generic-content-wrapper .btn:hover, .generic-content-wrapper .btn:focus {
+    border: 1px solid #43488A !important;
     color: #FFF; 
     background-color: #43488A;
 }
 
-.comment-tools .btn-primary, #prvmail-submit .btn-primary, .settings-submit-wrapper .btn-primary {
+.comment-tools .btn-primary, #prvmail-submit .btn-primary, .settings-submit-wrapper .btn-primary, .generic-content-wrapper .btn-primary {
     background-color: #43488A;
     color: #FFF;
     border: 1px solid #43488A;
 }
 
-.comment-tools .btn-primary:hover, .comment-tools .btn-primary:focus, #prvmail-submit .btn-primary:hover, #prvmail-submit .btn-primary:focus, .settings-submit-wrapper .btn-primary:hover, .settings-submit-wrapper .btn-primary:focus {
+.comment-tools .btn-primary:hover, .comment-tools .btn-primary:focus, #prvmail-submit .btn-primary:hover, #prvmail-submit .btn-primary:focus, .settings-submit-wrapper .btn-primary:hover, .settings-submit-wrapper .btn-primary:focus, .generic-content-wrapper .btn-primary:hover, .generic-content-wrapper .btn-primary:focus {
     border-color: #43488A;
     background-color: #FFF;
     color: #43488A;
 }
 
-.btn-danger {
-    background-color: #D9534F;
-    border-color: #D43F3A;
+.btn-success {
+    color: #FFF !important;
+    background-color: #5CB85C !important;
+    border-color: #4CAE4C !important;
 }
-.btn-danger:hover, .btn-danger:focus {
-	color: #FFF;
-    background-color: #C9302C;
-    border-color: #AC2925;
+
+.btn-success:hover, .btn-success:focus {
+    color: #FFF !important;
+    background-color: #449D44 !important;
+    border-color: #398439 !important;
+}
+
+.btn-warning {
+    color: #FFF !important;
+    background-color: #F0AD4E !important;
+    border-color: #EEA236 !important;
+}
+
+.btn-warning:hover, .btn-warning:focus {
+	color: #FFF !important;
+	background-color: #EC971F !important;
+	border-color: #D58512 !important;
+}
+
+.btn-danger, form#chat-destroy > input {
+    background-color: #D9534F !important;
+    border-color: #D43F3A !important;
+	color: #FFF !important;
+}
+.btn-danger:hover, .btn-danger:focus, form#chat-destroy > input:hover, form#chat-destroy > input:focus {
+	color: #FFF !important;
+    background-color: #C9302C !important;		
+    border-color: #AC2925 !important;
+}
+
+a:hover > .icon-trash {
+	color: #C9302C !important;	
 }
 
 @media screen and (max-width: 767px) {
diff --git a/view/tpl/admin_queue.tpl b/view/tpl/admin_queue.tpl
index 85b476266..56b70bbee 100644
--- a/view/tpl/admin_queue.tpl
+++ b/view/tpl/admin_queue.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h3>{{$banner}}</h3>
 
 {{if $hasentries}}
@@ -11,4 +12,4 @@
 
 </table>
 
-{{/if}}
-\ No newline at end of file
+{{/if}}
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 760d64db0..4782f827b 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -69,11 +69,6 @@
 						<span class="tag">{{$item.folders}}</span>
 					</div>
 					{{/if}}
-					{{if $item.attachments}}
-					<div class="body-tags" id="item-attachments">
-						<span class='tag'>{{$item.attachments}}</span>
-					</div>
-					{{/if}}
 					<div class="clear"></div>
 				</div>
 				{{/if}}
@@ -157,9 +152,15 @@
 					</div>
 					<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
 
-					{{if $item.responses }}
-					<div class="wall-item-tools-left{{if $item.responses.count > 1}} btn-group{{/if}}">
-					{{foreach $item.responses as $verb=>$response}}
+					{{if $item.responses || $item.attachments}}
+					<div class="wall-item-tools-left{{if ($item.responses.count > 1) || ($item.responses.count &&  $item.attachments)}} btn-group{{/if}}">
+						{{if $item.attachments}}
+						<div class="btn-group">
+							<button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="icon-paperclip"></i></button>
+							<ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul>
+						</div>
+						{{/if}}
+						{{foreach $item.responses as $verb=>$response}}
 						{{if $response.count}}
 						<div class="btn-group">
 							<button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button>
@@ -188,7 +189,7 @@
 							{{/if}}
 						</div>
 						{{/if}}
-					{{/foreach}}
+						{{/foreach}}
 					</div>
 					{{/if}}
 					<div class="clear"></div>
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index a3fb642ce..53f65bc78 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -66,11 +66,6 @@
 						<span class="tag">{{$item.folders}}</span>
 					</div>
 					{{/if}}
-					{{if $item.attachments}}
-					<div class="body-tags" id="item-attachments">
-						<span class='tag'>{{$item.attachments}}</span>
-					</div>
-					{{/if}}
 					<div class="clear"></div>
 				</div>
 				{{/if}}
@@ -151,7 +146,13 @@
 						</ul>
 					</div>
 					<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
-					<div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count}} btn-group{{/if}}">
+					<div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count || $item.attachments}} btn-group{{/if}}">
+						{{if $item.attachments}}
+						<div class="btn-group">
+							<button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="icon-paperclip"></i></button>
+							<ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul>
+						</div>
+						{{/if}}
 						<div class="wall-item-list-comments btn-group">
 							<button class="btn btn-default btn-sm" onclick="window.location.href='{{$item.viewthread}}'; return false;">
 								{{$item.comment_count_txt}}{{if $item.unseen_comments}}<span class="unseen-wall-indicator-{{$item.id}}">, {{$item.list_unseen_txt}}</span>{{/if}}
@@ -164,7 +165,6 @@
 							</button>
 						</div>
 						{{/if}}
-
 						{{if $item.responses }}
 						{{foreach $item.responses as $verb=>$response}}
 						{{if $response.count}}
diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl
index 7638f39e7..67accc1ec 100644
--- a/view/tpl/item_attach.tpl
+++ b/view/tpl/item_attach.tpl
@@ -1,5 +1,5 @@
 {{if $attaches}}
 {{foreach $attaches as $a}}
-<a href="{{$a.url}}" title="{{$a.title}}" class="btn btn-xs btn-default"><i class="{{$a.icon}} attach-icons"></i>&nbsp;{{$a.label}}</a>
+<li><a href="{{$a.url}}" title="{{$a.title}}"><i class="{{$a.icon}} attach-icons"></i>&nbsp;{{$a.label}}</a></li>
 {{/foreach}}
 {{/if}}
diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index ff2011181..f78a3fc2d 100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h2>{{$title}}</h2>
 
 <form action="new_channel" method="post" id="newchannel-form" class="stylish-select">
@@ -34,3 +35,4 @@
 	<div id="newchannel-submit-end" class="newchannel-field-end"></div>
 
 </form>
+</div>
diff --git a/view/tpl/rating_form.tpl b/view/tpl/rating_form.tpl
index d072a0b3c..4bd826484 100644
--- a/view/tpl/rating_form.tpl
+++ b/view/tpl/rating_form.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h3>{{$header}}</h3>
 
 <div class="rating-target-name">{{if $site}}{{$website}} {{$site}}{{else}}{{$tgt_name}}{{/if}}</div>
@@ -12,6 +13,7 @@
 <input type="hidden" name="target" value="{{$target}}" />
 
 <input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" />
+<br />
 <h3 class="abook-rating-text-desc">{{$lbl_rating_txt}}</h3>
 <textarea name="rating_text" id="rating-text" >{{$rating_txt}}</textarea>
 
@@ -20,3 +22,4 @@
 <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
 
 </form>
+</div>
diff --git a/view/tpl/sources_edit.tpl b/view/tpl/sources_edit.tpl
index 34023e03f..a5b384ca3 100644
--- a/view/tpl/sources_edit.tpl
+++ b/view/tpl/sources_edit.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h1>{{$title}}</h1>
 
 <div class="descriptive-text">{{$desc}}</div>
@@ -15,7 +16,7 @@
 <br />
 <br />
 <a href="sources/{{$id}}/drop">{{$drop}}</a>
-
+</div>
 
 
 
diff --git a/view/tpl/sources_list.tpl b/view/tpl/sources_list.tpl
index 5fe50ba98..76be35b1a 100644
--- a/view/tpl/sources_list.tpl
+++ b/view/tpl/sources_list.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h1>{{$title}}</h1>
 
 <div class="descriptive-text">{{$desc}}</div>
@@ -12,4 +13,5 @@
 <li><a href="sources/{{$source.src_id}}">{{$source.xchan_name}}</a></li>
 {{/foreach}}
 </ul>
-{{/if}}
-\ No newline at end of file
+{{/if}}
+</div>
diff --git a/view/tpl/sources_new.tpl b/view/tpl/sources_new.tpl
index 3c6a4be30..3c8a54373 100644
--- a/view/tpl/sources_new.tpl
+++ b/view/tpl/sources_new.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h1>{{$title}}</h1>
 
 <div class="descriptive-text">{{$desc}}</div>
@@ -11,5 +12,5 @@
 <input type="submit" name="submit" class="sources-submit" value="{{$submit}}" />
 </div>
 </form>
-
+</div>
author	redmatrix <redmatrix@redmatrix.me>	2015-11-01 15:52:35 -0800
committer	redmatrix <redmatrix@redmatrix.me>	2015-11-01 15:52:35 -0800
commit	d3183467e06d6d7a04221c63d26173f97217cc43 (patch)
tree	1da3ddc58b87a0afdfa0bf262c2d0950a192ccce
parent	b62614bbd48151837e29ab56a53e683d2f4dcb01 (diff)
parent	618155e6ab1a76b5aaa667aa41a1668ce8f73a20 (diff)
download	volse-hubzilla-d3183467e06d6d7a04221c63d26173f97217cc43.tar.gz volse-hubzilla-d3183467e06d6d7a04221c63d26173f97217cc43.tar.bz2 volse-hubzilla-d3183467e06d6d7a04221c63d26173f97217cc43.zip