Merge https://github.com/friendica/red into pending_merge

4 files changed, 469 insertions, 405 deletions

diff --git a/include/attach.php b/include/attach.php
index 1daa42aef..2ca302949 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -976,6 +976,18 @@ function pipe_streams($in, $out) {
 	return $size;
 }
 
+/**
+ * @brief Activity for files
+ *
+ * @param $channel_id
+ * @param $object
+ * @param $allow_cid
+ * @param $allow_gid
+ * @param $deny_cid
+ * @param $deny_gid
+ * @param $verb
+ * @param $no_activity
+ */
 function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $verb, $no_activity) {
 
 	require_once('include/items.php');
@@ -1030,7 +1042,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
 	$jsonobject = json_encode($object);
 
 	//check if item for this object exists
-	$y = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND resource_id = '%s' AND uid = %d LIMIT 1",
+	$y = q("SELECT mid FROM item WHERE verb = '%s' AND obj_type = '%s' AND resource_id = '%s' AND uid = %d LIMIT 1",
 		dbesc(ACTIVITY_POST),
 		dbesc($objtype),
 		dbesc($object['hash']),
@@ -1143,6 +1155,13 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
 
 }
 
+/**
+ * @brief Create file activity object
+ *
+ * @param $channel_id
+ * @param $hash
+ * @param $cloudpath
+ */
 function get_file_activity_object($channel_id, $hash, $cloudpath) {
 
 	$x = q("SELECT creator, filename, filetype, filesize, revision, folder, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid FROM attach WHERE uid = %d AND hash = '%s' LIMIT 1",
@@ -1184,6 +1203,15 @@ function get_file_activity_object($channel_id, $hash, $cloudpath) {
 
 }
 
+/**
+ * @brief Returns array of channels which have recursive permission for a file
+ *
+ * @param $arr_allow_cid
+ * @param $arr_allow_gid
+ * @param $arr_deny_cid
+ * @param $arr_deny_gid
+ * @param $folder_hash
+ */
 function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny_cid, $arr_deny_gid, $folder_hash) {
 
 	$ret = array();
@@ -1295,6 +1323,12 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny
 	return $ret;
 }
 
+
+/**
+ * @brief Returns members of a group
+ *
+ * @param $group_id
+ */
 function in_group($group_id) {
 	$group_members = array();
 
diff --git a/include/poller.php b/include/poller.php
index b70ef75b0..4786188af 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -41,6 +41,12 @@ function poller_run($argv, $argc){
 	// run queue delivery process in the background
 
 	proc_run('php',"include/queue.php");
+
+
+	// maintenance for mod sharedwithme - check for updated items and remove them
+
+	require_once('include/sharedwithme.php');
+	apply_updates();
 	
 
 	// expire any expired mail
diff --git a/view/it/messages.po b/view/it/messages.po
index 500b52c57..781e5f971 100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Red Matrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-13 00:03-0700\n"
-"PO-Revision-Date: 2015-03-17 12:35+0000\n"
+"POT-Creation-Date: 2015-03-20 00:03-0700\n"
+"PO-Revision-Date: 2015-03-24 10:11+0000\n"
 "Last-Translator: tuscanhobbit <pynolo@tarine.net>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/red-matrix/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Non trovo le informazioni DNS per il database server '%s'"
 
-#: ../../include/photo/photo_driver.php:680 ../../mod/profile_photo.php:143
+#: ../../include/photo/photo_driver.php:687 ../../mod/profile_photo.php:143
 #: ../../mod/profile_photo.php:302 ../../mod/profile_photo.php:424
 #: ../../mod/photos.php:91 ../../mod/photos.php:625
 msgid "Profile Photos"
@@ -301,7 +301,7 @@ msgstr "Mi piace questo canale"
 
 #: ../../include/identity.php:1158 ../../include/conversation.php:1692
 #: ../../include/ItemObject.php:179 ../../include/taxonomy.php:391
-#: ../../mod/photos.php:1001
+#: ../../mod/photos.php:1007
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
@@ -428,7 +428,7 @@ msgstr "Guarda"
 
 #: ../../include/page_widgets.php:40 ../../include/conversation.php:1152
 #: ../../include/ItemObject.php:677 ../../mod/events.php:651
-#: ../../mod/webpages.php:166 ../../mod/photos.php:964
+#: ../../mod/webpages.php:166 ../../mod/photos.php:970
 msgid "Preview"
 msgstr "Anteprima"
 
@@ -511,8 +511,8 @@ msgstr "Per esempio: mario@pippo.it oppure http://pluto.com/barbara"
 msgid "Notes"
 msgstr "Note"
 
-#: ../../include/widgets.php:192 ../../include/text.php:835
-#: ../../include/text.php:847 ../../mod/rbmark.php:28 ../../mod/rbmark.php:98
+#: ../../include/widgets.php:192 ../../include/text.php:833
+#: ../../include/text.php:845 ../../mod/rbmark.php:28 ../../mod/rbmark.php:98
 #: ../../mod/filer.php:50 ../../mod/admin.php:1412 ../../mod/admin.php:1432
 msgid "Save"
 msgstr "Salva"
@@ -521,11 +521,11 @@ msgstr "Salva"
 msgid "Remove term"
 msgstr "Rimuovi termine"
 
-#: ../../include/widgets.php:274 ../../include/features.php:72
+#: ../../include/widgets.php:274 ../../include/features.php:73
 msgid "Saved Searches"
 msgstr "Ricerche salvate"
 
-#: ../../include/widgets.php:304 ../../include/features.php:84
+#: ../../include/widgets.php:304 ../../include/features.php:85
 #: ../../include/contact_widgets.php:57
 msgid "Saved Folders"
 msgstr "Cartelle salvate"
@@ -603,7 +603,7 @@ msgstr "Permessi predefiniti dei nuovi contatti"
 msgid "Premium Channel Settings"
 msgstr "Canale premium - impostazioni"
 
-#: ../../include/widgets.php:529 ../../include/features.php:61
+#: ../../include/widgets.php:529 ../../include/features.php:62
 #: ../../mod/sources.php:88
 msgid "Channel Sources"
 msgstr "Sorgenti del canale"
@@ -655,14 +655,14 @@ msgstr "Vedi le valutazioni ricevute"
 msgid "Public Hubs"
 msgstr "Hub pubblici"
 
-#: ../../include/conversation.php:120 ../../include/diaspora.php:1921
-#: ../../include/text.php:1749 ../../mod/like.php:335
+#: ../../include/conversation.php:120 ../../include/text.php:1747
+#: ../../include/diaspora.php:2030 ../../mod/like.php:335
 #: ../../mod/subthread.php:72 ../../mod/subthread.php:174
 #: ../../mod/tagger.php:43
 msgid "photo"
 msgstr "la foto"
 
-#: ../../include/conversation.php:123 ../../include/text.php:1752
+#: ../../include/conversation.php:123 ../../include/text.php:1750
 #: ../../mod/like.php:337 ../../mod/tagger.php:47
 msgid "event"
 msgstr "l'evento"
@@ -671,19 +671,19 @@ msgstr "l'evento"
 msgid "channel"
 msgstr "canale"
 
-#: ../../include/conversation.php:148 ../../include/diaspora.php:1921
-#: ../../include/text.php:1755 ../../mod/like.php:335
+#: ../../include/conversation.php:148 ../../include/text.php:1753
+#: ../../include/diaspora.php:2030 ../../mod/like.php:335
 #: ../../mod/subthread.php:72 ../../mod/subthread.php:174
 #: ../../mod/tagger.php:51
 msgid "status"
 msgstr "il messaggio di stato"
 
-#: ../../include/conversation.php:150 ../../include/text.php:1757
+#: ../../include/conversation.php:150 ../../include/text.php:1755
 #: ../../mod/tagger.php:53
 msgid "comment"
 msgstr "il commento"
 
-#: ../../include/conversation.php:164 ../../include/diaspora.php:1950
+#: ../../include/conversation.php:164 ../../include/diaspora.php:2059
 #: ../../mod/like.php:383
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
@@ -704,7 +704,7 @@ msgstr "%1$s adesso è connesso con %2$s"
 msgid "%1$s poked %2$s"
 msgstr "%1$s ha mandato un poke a %2$s"
 
-#: ../../include/conversation.php:243 ../../include/text.php:913
+#: ../../include/conversation.php:243 ../../include/text.php:911
 msgid "poked"
 msgstr "ha ricevuto un poke"
 
@@ -714,42 +714,42 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s è %2$s"
 
-#: ../../include/conversation.php:556 ../../mod/photos.php:978
+#: ../../include/conversation.php:556 ../../mod/photos.php:984
 msgctxt "title"
 msgid "Likes"
 msgstr "Mi piace"
 
-#: ../../include/conversation.php:556 ../../mod/photos.php:978
+#: ../../include/conversation.php:556 ../../mod/photos.php:984
 msgctxt "title"
 msgid "Dislikes"
 msgstr "Non mi piace"
 
-#: ../../include/conversation.php:557 ../../mod/photos.php:979
+#: ../../include/conversation.php:557 ../../mod/photos.php:985
 msgctxt "title"
 msgid "Agree"
 msgstr "D'accordo"
 
-#: ../../include/conversation.php:557 ../../mod/photos.php:979
+#: ../../include/conversation.php:557 ../../mod/photos.php:985
 msgctxt "title"
 msgid "Disagree"
 msgstr "Non d'accordo"
 
-#: ../../include/conversation.php:557 ../../mod/photos.php:979
+#: ../../include/conversation.php:557 ../../mod/photos.php:985
 msgctxt "title"
 msgid "Abstain"
 msgstr "Astenuti"
 
-#: ../../include/conversation.php:558 ../../mod/photos.php:980
+#: ../../include/conversation.php:558 ../../mod/photos.php:986
 msgctxt "title"
 msgid "Attending"
 msgstr "Partecipano"
 
-#: ../../include/conversation.php:558 ../../mod/photos.php:980
+#: ../../include/conversation.php:558 ../../mod/photos.php:986
 msgctxt "title"
 msgid "Not attending"
 msgstr "Non partecipano"
 
-#: ../../include/conversation.php:558 ../../mod/photos.php:980
+#: ../../include/conversation.php:558 ../../mod/photos.php:986
 msgctxt "title"
 msgid "Might attend"
 msgstr "Forse partecipano"
@@ -762,7 +762,7 @@ msgstr "Seleziona"
 #: ../../include/ItemObject.php:120 ../../include/apps.php:255
 #: ../../mod/settings.php:645 ../../mod/connedit.php:533
 #: ../../mod/group.php:176 ../../mod/thing.php:234 ../../mod/admin.php:816
-#: ../../mod/admin.php:945 ../../mod/photos.php:1044
+#: ../../mod/admin.php:945 ../../mod/photos.php:1050
 msgid "Delete"
 msgstr "Elimina"
 
@@ -813,7 +813,7 @@ msgstr "Vedi nel contesto"
 #: ../../include/conversation.php:725 ../../include/conversation.php:1203
 #: ../../include/ItemObject.php:364 ../../mod/editlayout.php:153
 #: ../../mod/editwebpage.php:188 ../../mod/editpost.php:130
-#: ../../mod/editblock.php:157 ../../mod/photos.php:944 ../../mod/mail.php:241
+#: ../../mod/editblock.php:157 ../../mod/photos.php:950 ../../mod/mail.php:241
 #: ../../mod/mail.php:356
 msgid "Please wait"
 msgstr "Attendere"
@@ -870,7 +870,7 @@ msgstr "Poke"
 #: ../../include/conversation.php:1019 ../../include/RedDAV/RedBrowser.php:163
 #: ../../include/apps.php:336 ../../include/apps.php:387
 #: ../../mod/connedit.php:570 ../../mod/photos.php:681
-#: ../../mod/photos.php:1113
+#: ../../mod/photos.php:1119
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -955,7 +955,7 @@ msgstr "Scade il YYYY-MM-DD HH:MM"
 
 #: ../../include/conversation.php:1169 ../../mod/editlayout.php:198
 #: ../../mod/editwebpage.php:235 ../../mod/editblock.php:203
-#: ../../mod/photos.php:943 ../../mod/layouts.php:168
+#: ../../mod/photos.php:949 ../../mod/layouts.php:168
 msgid "Share"
 msgstr "Condividi"
 
@@ -1198,7 +1198,7 @@ msgstr "Dettagli del profilo"
 msgid "Photos"
 msgstr "Foto"
 
-#: ../../include/conversation.php:1592 ../../include/photos.php:340
+#: ../../include/conversation.php:1592 ../../include/photos.php:356
 msgid "Photo Albums"
 msgstr "Album foto"
 
@@ -1235,13 +1235,13 @@ msgid "Manage Webpages"
 msgstr "Gestisci le pagine web"
 
 #: ../../include/conversation.php:1667 ../../include/ItemObject.php:175
-#: ../../include/ItemObject.php:187 ../../mod/photos.php:997
-#: ../../mod/photos.php:1009
+#: ../../include/ItemObject.php:187 ../../mod/photos.php:1003
+#: ../../mod/photos.php:1015
 msgid "View all"
 msgstr "Vedi tutto"
 
 #: ../../include/conversation.php:1695 ../../include/ItemObject.php:184
-#: ../../mod/photos.php:1006
+#: ../../mod/photos.php:1012
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -1295,19 +1295,18 @@ msgstr[1] "Astenuti"
 #: ../../include/attach.php:301 ../../include/attach.php:315
 #: ../../include/attach.php:339 ../../include/attach.php:532
 #: ../../include/attach.php:606 ../../include/items.php:4093
-#: ../../include/chat.php:116 ../../include/photos.php:15
+#: ../../include/photos.php:15 ../../include/chat.php:131
 #: ../../mod/profile.php:64 ../../mod/profile.php:72
 #: ../../mod/achievements.php:30 ../../mod/manage.php:6
 #: ../../mod/settings.php:564 ../../mod/api.php:26 ../../mod/api.php:31
 #: ../../mod/blocks.php:67 ../../mod/blocks.php:75
 #: ../../mod/profile_photo.php:264 ../../mod/profile_photo.php:277
 #: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178
-#: ../../mod/events.php:219 ../../mod/network.php:12
-#: ../../mod/connedit.php:321 ../../mod/group.php:9 ../../mod/setup.php:207
-#: ../../mod/common.php:35 ../../mod/id.php:50 ../../mod/connections.php:169
-#: ../../mod/item.php:197 ../../mod/item.php:205 ../../mod/item.php:938
-#: ../../mod/thing.php:247 ../../mod/thing.php:264 ../../mod/thing.php:299
-#: ../../mod/pdledit.php:21 ../../mod/authtest.php:13
+#: ../../mod/events.php:219 ../../mod/connedit.php:321 ../../mod/group.php:9
+#: ../../mod/setup.php:207 ../../mod/common.php:35 ../../mod/id.php:61
+#: ../../mod/connections.php:169 ../../mod/item.php:197 ../../mod/item.php:205
+#: ../../mod/item.php:938 ../../mod/thing.php:247 ../../mod/thing.php:264
+#: ../../mod/thing.php:299 ../../mod/pdledit.php:21 ../../mod/authtest.php:13
 #: ../../mod/editlayout.php:64 ../../mod/editlayout.php:89
 #: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/editwebpage.php:64
 #: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:118
@@ -1324,10 +1323,10 @@ msgstr[1] "Astenuti"
 #: ../../mod/mitem.php:106 ../../mod/mood.php:111 ../../mod/layouts.php:67
 #: ../../mod/layouts.php:74 ../../mod/layouts.php:85 ../../mod/mail.php:114
 #: ../../mod/notifications.php:66 ../../mod/regmod.php:17
-#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99
-#: ../../mod/appman.php:66 ../../mod/page.php:28 ../../mod/page.php:78
-#: ../../mod/bookmarks.php:46 ../../mod/channel.php:90
-#: ../../mod/channel.php:199 ../../mod/channel.php:242
+#: ../../mod/network.php:12 ../../mod/new_channel.php:68
+#: ../../mod/new_channel.php:99 ../../mod/appman.php:66 ../../mod/page.php:28
+#: ../../mod/page.php:78 ../../mod/bookmarks.php:46 ../../mod/channel.php:95
+#: ../../mod/channel.php:206 ../../mod/channel.php:249
 #: ../../mod/suggest.php:26 ../../mod/service_limits.php:7
 #: ../../mod/sharedwithme.php:7 ../../index.php:190 ../../index.php:393
 msgid "Permission denied."
@@ -1391,12 +1390,89 @@ msgstr "mkdir fallito."
 msgid "database storage failed."
 msgstr "scrittura su database fallita."
 
+#: ../../include/account.php:23
+msgid "Not a valid email address"
+msgstr "Email non valida"
+
+#: ../../include/account.php:25
+msgid "Your email domain is not among those allowed on this site"
+msgstr "Il dominio della tua email attualmente non è permesso su questo sito"
+
+#: ../../include/account.php:31
+msgid "Your email address is already registered at this site."
+msgstr "La tua email è già registrata su questo sito."
+
+#: ../../include/account.php:64
+msgid "An invitation is required."
+msgstr "È necessario un invito."
+
+#: ../../include/account.php:68
+msgid "Invitation could not be verified."
+msgstr "L'invito non può essere verificato."
+
+#: ../../include/account.php:119
+msgid "Please enter the required information."
+msgstr "Inserisci le informazioni richieste."
+
+#: ../../include/account.php:187
+msgid "Failed to store account information."
+msgstr "Non è stato possibile salvare le informazioni del tuo account."
+
+#: ../../include/account.php:245
+#, php-format
+msgid "Registration confirmation for %s"
+msgstr "Registrazione di %s confermata"
+
+#: ../../include/account.php:313
+#, php-format
+msgid "Registration request at %s"
+msgstr "Richiesta di registrazione su %s"
+
+#: ../../include/account.php:315 ../../include/account.php:342
+#: ../../include/account.php:399
+msgid "Administrator"
+msgstr "Amministratore"
+
+#: ../../include/account.php:337
+msgid "your registration password"
+msgstr "la password di registrazione"
+
+#: ../../include/account.php:340 ../../include/account.php:397
+#, php-format
+msgid "Registration details for %s"
+msgstr "Dettagli della registrazione di %s"
+
+#: ../../include/account.php:406
+msgid "Account approved."
+msgstr "Account approvato."
+
+#: ../../include/account.php:440
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registrazione revocata per %s"
+
+#: ../../include/account.php:486
+msgid "Account verified. Please login."
+msgstr "Registrazione verificata. Adesso puoi effettuare login."
+
+#: ../../include/account.php:706 ../../include/account.php:708
+msgid "Click here to upgrade."
+msgstr "Clicca qui per aggiornare."
+
+#: ../../include/account.php:714
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Questa operazione supera i limiti del tuo abbonamento."
+
+#: ../../include/account.php:719
+msgid "This action is not available under your subscription plan."
+msgstr "Questa operazione non è prevista dal tuo abbonamento."
+
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr "Eliminare questo elemento?"
 
 #: ../../include/js_strings.php:6 ../../include/ItemObject.php:667
-#: ../../mod/photos.php:962 ../../mod/photos.php:1080
+#: ../../mod/photos.php:968 ../../mod/photos.php:1086
 msgid "Comment"
 msgstr "Commento"
 
@@ -1475,11 +1551,11 @@ msgstr "Descrizione (facoltativa)"
 #: ../../mod/profiles.php:667 ../../mod/admin.php:441 ../../mod/admin.php:809
 #: ../../mod/admin.php:943 ../../mod/admin.php:1074 ../../mod/admin.php:1269
 #: ../../mod/admin.php:1352 ../../mod/photos.php:565 ../../mod/photos.php:642
-#: ../../mod/photos.php:923 ../../mod/photos.php:963 ../../mod/photos.php:1081
+#: ../../mod/photos.php:929 ../../mod/photos.php:969 ../../mod/photos.php:1087
 #: ../../mod/mood.php:134 ../../mod/mail.php:355 ../../mod/appman.php:99
 #: ../../mod/poll.php:68 ../../mod/bulksetclose.php:24
 #: ../../view/theme/apw/php/config.php:256
-#: ../../view/theme/redbasic/php/config.php:99
+#: ../../view/theme/redbasic/php/config.php:97
 msgid "Submit"
 msgstr "Salva"
 
@@ -1565,7 +1641,7 @@ msgstr "timeago.numbers"
 msgid "parent"
 msgstr "cartella superiore"
 
-#: ../../include/RedDAV/RedBrowser.php:130 ../../include/text.php:2397
+#: ../../include/RedDAV/RedBrowser.php:130 ../../include/text.php:2395
 msgid "Collection"
 msgstr "Cartella"
 
@@ -1615,7 +1691,7 @@ msgstr "Crea"
 
 #: ../../include/RedDAV/RedBrowser.php:255
 #: ../../include/RedDAV/RedBrowser.php:305 ../../mod/profile_photo.php:362
-#: ../../mod/photos.php:706 ../../mod/photos.php:1228
+#: ../../mod/photos.php:706 ../../mod/photos.php:1236
 msgid "Upload"
 msgstr "Carica"
 
@@ -1715,186 +1791,194 @@ msgstr "Scegli il canale attivo dal menu"
 msgid "Change channels directly from within the navigation dropdown menu"
 msgstr "Scegli il canale attivo direttamente dal menu di navigazione"
 
-#: ../../include/features.php:50
+#: ../../include/features.php:47
+msgid "Photo Location"
+msgstr "Posizione geografica"
+
+#: ../../include/features.php:47
+msgid "If location data is available on uploaded photos, link this to a map."
+msgstr "Collega la foto a una mappa quando contiene indicazioni geografiche."
+
+#: ../../include/features.php:51
 msgid "Extended Identity Sharing"
 msgstr "Condivisione avanzata dell'identità"
 
-#: ../../include/features.php:50
+#: ../../include/features.php:51
 msgid ""
 "Share your identity with all websites on the internet. When disabled, "
 "identity is only shared with sites in the matrix."
 msgstr "Rendi nota la tua identità a tutti i siti internet. Se disabilitato, la tua identità sarà comunicata solo ai siti RedMatrix."
 
-#: ../../include/features.php:51
+#: ../../include/features.php:52
 msgid "Expert Mode"
 msgstr "Modalità esperto"
 
-#: ../../include/features.php:51
+#: ../../include/features.php:52
 msgid "Enable Expert Mode to provide advanced configuration options"
 msgstr "Abilita la modalità esperto per vedere le opzioni di configurazione avanzate"
 
-#: ../../include/features.php:52
+#: ../../include/features.php:53
 msgid "Premium Channel"
 msgstr "Canale premium"
 
-#: ../../include/features.php:52
+#: ../../include/features.php:53
 msgid ""
 "Allows you to set restrictions and terms on those that connect with your "
 "channel"
 msgstr "Ti permette di impostare delle restrizioni e dei termini d'uso a chi segue il canale"
 
-#: ../../include/features.php:57
+#: ../../include/features.php:58
 msgid "Post Composition Features"
 msgstr "Modalità di scrittura articoli"
 
-#: ../../include/features.php:59
+#: ../../include/features.php:60
 msgid "Use Markdown"
 msgstr "Usa il markdown"
 
-#: ../../include/features.php:59
+#: ../../include/features.php:60
 msgid "Allow use of \"Markdown\" to format posts"
 msgstr "Consenti l'uso del markdown per formattare gli articoli"
 
-#: ../../include/features.php:60
+#: ../../include/features.php:61
 msgid "Large Photos"
 msgstr "Foto grandi"
 
-#: ../../include/features.php:60
+#: ../../include/features.php:61
 msgid ""
 "Include large (640px) photo thumbnails in posts. If not enabled, use small "
 "(320px) photo thumbnails"
 msgstr "Includi anteprime grandi delle foto nei post (640px). Se disabilitato le anteprime saranno piccole (320px)"
 
-#: ../../include/features.php:61
+#: ../../include/features.php:62
 msgid "Automatically import channel content from other channels or feeds"
 msgstr "Importa automaticamente il contenuto del canale da altri canali o feed"
 
-#: ../../include/features.php:62
+#: ../../include/features.php:63
 msgid "Even More Encryption"
 msgstr "Crittografia addizionale"
 
-#: ../../include/features.php:62
+#: ../../include/features.php:63
 msgid ""
 "Allow optional encryption of content end-to-end with a shared secret key"
 msgstr "Rendi possibile la crittografia tra mittente e destinatario che condividono una chiave segreta"
 
-#: ../../include/features.php:63
+#: ../../include/features.php:64
 msgid "Enable voting tools"
 msgstr "Permetti i post con votazione"
 
-#: ../../include/features.php:63
+#: ../../include/features.php:64
 msgid "Provide a class of post which others can vote on"
 msgstr "Rende possibile la creazione di articoli in cui sarà possibile votare"
 
-#: ../../include/features.php:64
+#: ../../include/features.php:65
 msgid "Flag Adult Photos"
 msgstr "Marca le foto per adulti"
 
-#: ../../include/features.php:64
+#: ../../include/features.php:65
 msgid "Provide photo edit option to hide adult photos from default album view"
 msgstr "Permette di marcare e nascondere negli album le foto per adulti"
 
-#: ../../include/features.php:69
+#: ../../include/features.php:70
 msgid "Network and Stream Filtering"
 msgstr "Filtraggio dei contenuti"
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid "Search by Date"
 msgstr "Ricerca per data"
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid "Ability to select posts by date ranges"
 msgstr "Per selezionare gli articoli in un intervallo tra date"
 
-#: ../../include/features.php:71
+#: ../../include/features.php:72
 msgid "Collections Filter"
 msgstr "Filtra per insiemi di canali"
 
-#: ../../include/features.php:71
+#: ../../include/features.php:72
 msgid "Enable widget to display Network posts only from selected collections"
 msgstr "Mostra il riquadro per filtrare gli articoli di certi insiemi di canali"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid "Save search terms for re-use"
 msgstr "Salva i termini delle ricerche per poterle ripetere"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Network Personal Tab"
 msgstr "Attività personale"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr "Abilita il link per mostrare solamente i contenuti con cui hai interagito"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Network New Tab"
 msgstr "Contenuti nuovi"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Enable tab to display all new Network activity"
 msgstr "Abilita il link per visualizzare solo i nuovi contenuti"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid "Affinity Tool"
 msgstr "Filtro per affinità"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid "Filter stream activity by depth of relationships"
 msgstr "Permette di selezionare i contenuti in base al livello di amicizia"
 
-#: ../../include/features.php:76
+#: ../../include/features.php:77
 msgid "Suggest Channels"
 msgstr "Suggerisci canali"
 
-#: ../../include/features.php:76
+#: ../../include/features.php:77
 msgid "Show channel suggestions"
 msgstr "Mostra alcuni canali che potrebbero interessarti"
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Post/Comment Tools"
 msgstr "Gestione articoli e commenti"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Tagging"
 msgstr "Tag"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Ability to tag existing posts"
 msgstr "Permetti l'aggiunta di tag su articoli già esistenti"
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 msgid "Post Categories"
 msgstr "Categorie degli articoli"
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 msgid "Add categories to your posts"
 msgstr "Abilita le categorie per i tuoi articoli"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85
 msgid "Ability to file posts under folders"
 msgstr "Abilita la raccolta dei tuoi articoli in cartelle"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Dislike Posts"
 msgstr "Non mi piace"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Ability to dislike posts/comments"
 msgstr "Abilità la funzionalità \"non mi piace\" per i tuoi articoli"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Star Posts"
 msgstr "Articoli stella (preferiti)"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Ability to mark special posts with a star indicator"
 msgstr "Mostra la stella per scegliere gli articoli preferiti"
 
-#: ../../include/features.php:87
+#: ../../include/features.php:88
 msgid "Tag Cloud"
 msgstr "Nuvola di tag"
 
-#: ../../include/features.php:87
+#: ../../include/features.php:88
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Mostra la nuvola dei tag che usi di più sulla pagina del tuo canale"
 
@@ -2007,8 +2091,8 @@ msgstr "OStatus"
 msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
-#: ../../include/contact_selectors.php:79 ../../mod/id.php:148
-#: ../../mod/id.php:149 ../../mod/admin.php:812 ../../mod/admin.php:821
+#: ../../include/contact_selectors.php:79 ../../mod/id.php:12
+#: ../../mod/id.php:13 ../../mod/admin.php:812 ../../mod/admin.php:821
 #: ../../boot.php:1554
 msgid "Email"
 msgstr "Email"
@@ -2133,7 +2217,7 @@ msgstr "preferito"
 msgid "Add Tag"
 msgstr "Aggiungi un tag"
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:941
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:947
 msgid "I like this (toggle)"
 msgstr "Attiva/disattiva Mi piace"
 
@@ -2141,7 +2225,7 @@ msgstr "Attiva/disattiva Mi piace"
 msgid "like"
 msgstr "mi piace"
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:942
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:948
 msgid "I don't like this (toggle)"
 msgstr "Attiva/disattiva Non mi piace"
 
@@ -2197,23 +2281,23 @@ msgstr "Aggiungi al calendario"
 msgid "Mark all seen"
 msgstr "Marca tutto come letto"
 
-#: ../../include/ItemObject.php:353 ../../mod/photos.php:1125
+#: ../../include/ItemObject.php:353 ../../mod/photos.php:1133
 msgctxt "noun"
 msgid "Likes"
 msgstr "Mi piace"
 
-#: ../../include/ItemObject.php:354 ../../mod/photos.php:1126
+#: ../../include/ItemObject.php:354 ../../mod/photos.php:1134
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "Non mi piace"
 
 #: ../../include/ItemObject.php:359 ../../include/acl_selectors.php:249
-#: ../../mod/photos.php:1131
+#: ../../mod/photos.php:1139
 msgid "Close"
 msgstr "Chiudi"
 
-#: ../../include/ItemObject.php:665 ../../mod/photos.php:960
-#: ../../mod/photos.php:1078
+#: ../../include/ItemObject.php:665 ../../mod/photos.php:966
+#: ../../mod/photos.php:1084
 msgid "This is you"
 msgstr "Questo sei tu"
 
@@ -2354,26 +2438,6 @@ msgstr "Inizio:"
 msgid "Finishes:"
 msgstr "Fine:"
 
-#: ../../include/chat.php:10
-msgid "Missing room name"
-msgstr "Area chat senza nome"
-
-#: ../../include/chat.php:19
-msgid "Duplicate room name"
-msgstr "Il nome dell'area chat è duplicato"
-
-#: ../../include/chat.php:68 ../../include/chat.php:76
-msgid "Invalid room specifier."
-msgstr "Il nome dell'area chat non è valido."
-
-#: ../../include/chat.php:105
-msgid "Room not found."
-msgstr "Area chat non trovata."
-
-#: ../../include/chat.php:126
-msgid "Room is full"
-msgstr "L'area chat è al completo"
-
 #: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1551
 msgid "Logout"
 msgstr "Esci"
@@ -2477,7 +2541,7 @@ msgid "Applications, utilities, links, games"
 msgstr "Applicazioni, utilità, link, giochi"
 
 #: ../../include/nav.php:165 ../../include/apps.php:147
-#: ../../include/text.php:834 ../../include/text.php:846
+#: ../../include/text.php:832 ../../include/text.php:844
 #: ../../mod/search.php:34
 msgid "Search"
 msgstr "Cerca"
@@ -3015,7 +3079,7 @@ msgstr "Non mostrare"
 
 #: ../../include/acl_selectors.php:248 ../../mod/events.php:652
 #: ../../mod/chat.php:209 ../../mod/filestorage.php:146
-#: ../../mod/photos.php:559 ../../mod/photos.php:916
+#: ../../mod/photos.php:559 ../../mod/photos.php:922
 msgid "Permissions"
 msgstr "Permessi"
 
@@ -3032,21 +3096,21 @@ msgstr "Il file dell'immagine è vuoto."
 msgid "Unable to process image"
 msgstr "Impossibile elaborare l'immagine"
 
-#: ../../include/photos.php:192
+#: ../../include/photos.php:194
 msgid "Photo storage failed."
 msgstr "Impossibile caricare la foto."
 
-#: ../../include/photos.php:344
+#: ../../include/photos.php:360
 msgid "Upload New Photos"
 msgstr "Carica nuove foto"
 
 #: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:85
+#: ../../include/profile_selectors.php:23 ../../mod/id.php:93
 msgid "Male"
 msgstr "Maschio"
 
 #: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:87
+#: ../../include/profile_selectors.php:23 ../../mod/id.php:95
 msgid "Female"
 msgstr "Femmina"
 
@@ -3315,7 +3379,7 @@ msgstr "Invita"
 msgid "Features"
 msgstr "Funzionalità"
 
-#: ../../include/apps.php:153 ../../mod/id.php:161
+#: ../../include/apps.php:153 ../../mod/id.php:25
 msgid "Language"
 msgstr "Lingua"
 
@@ -3323,8 +3387,8 @@ msgstr "Lingua"
 msgid "Post"
 msgstr "Articolo"
 
-#: ../../include/apps.php:155 ../../mod/id.php:150 ../../mod/id.php:151
-#: ../../mod/id.php:152
+#: ../../include/apps.php:155 ../../mod/id.php:14 ../../mod/id.php:15
+#: ../../mod/id.php:16
 msgid "Profile Photo"
 msgstr "Foto del profilo"
 
@@ -3369,362 +3433,305 @@ msgstr "più nuovi"
 msgid "No connections"
 msgstr "Nessun contatto"
 
-#: ../../include/text.php:764
+#: ../../include/text.php:762
 #, php-format
 msgid "%d Connection"
 msgid_plural "%d Connections"
 msgstr[0] "%d contatto"
 msgstr[1] "%d contatti"
 
-#: ../../include/text.php:777 ../../mod/viewconnections.php:86
+#: ../../include/text.php:775 ../../mod/viewconnections.php:86
 msgid "View Connections"
 msgstr "Elenco contatti"
 
-#: ../../include/text.php:913
+#: ../../include/text.php:911
 msgid "poke"
 msgstr "poke"
 
-#: ../../include/text.php:914
+#: ../../include/text.php:912
 msgid "ping"
 msgstr "ping"
 
-#: ../../include/text.php:914
+#: ../../include/text.php:912
 msgid "pinged"
 msgstr "ha ricevuto un ping"
 
-#: ../../include/text.php:915
+#: ../../include/text.php:913
 msgid "prod"
 msgstr "spintone"
 
-#: ../../include/text.php:915
+#: ../../include/text.php:913
 msgid "prodded"
 msgstr "ha ricevuto uno spintone"
 
-#: ../../include/text.php:916
+#: ../../include/text.php:914
 msgid "slap"
 msgstr "schiaffo"
 
-#: ../../include/text.php:916
+#: ../../include/text.php:914
 msgid "slapped"
 msgstr "ha ricevuto uno schiaffo"
 
-#: ../../include/text.php:917
+#: ../../include/text.php:915
 msgid "finger"
 msgstr "finger"
 
-#: ../../include/text.php:917
+#: ../../include/text.php:915
 msgid "fingered"
 msgstr "ha ricevuto un finger"
 
-#: ../../include/text.php:918
+#: ../../include/text.php:916
 msgid "rebuff"
 msgstr "rifiuto"
 
-#: ../../include/text.php:918
+#: ../../include/text.php:916
 msgid "rebuffed"
 msgstr "ha ricevuto un rifiuto"
 
-#: ../../include/text.php:928
+#: ../../include/text.php:926
 msgid "happy"
 msgstr "felice"
 
-#: ../../include/text.php:929
+#: ../../include/text.php:927
 msgid "sad"
 msgstr "triste"
 
-#: ../../include/text.php:930
+#: ../../include/text.php:928
 msgid "mellow"
 msgstr "calmo"
 
-#: ../../include/text.php:931
+#: ../../include/text.php:929
 msgid "tired"
 msgstr "stanco"
 
-#: ../../include/text.php:932
+#: ../../include/text.php:930
 msgid "perky"
 msgstr "vivace"
 
-#: ../../include/text.php:933
+#: ../../include/text.php:931
 msgid "angry"
 msgstr "arrabbiato"
 
-#: ../../include/text.php:934
+#: ../../include/text.php:932
 msgid "stupified"
 msgstr "stordito"
 
-#: ../../include/text.php:935
+#: ../../include/text.php:933
 msgid "puzzled"
 msgstr "confuso"
 
-#: ../../include/text.php:936
+#: ../../include/text.php:934
 msgid "interested"
 msgstr "attento"
 
-#: ../../include/text.php:937
+#: ../../include/text.php:935
 msgid "bitter"
 msgstr "amaro"
 
-#: ../../include/text.php:938
+#: ../../include/text.php:936
 msgid "cheerful"
 msgstr "allegro"
 
-#: ../../include/text.php:939
+#: ../../include/text.php:937
 msgid "alive"
 msgstr "vivace"
 
-#: ../../include/text.php:940
+#: ../../include/text.php:938
 msgid "annoyed"
 msgstr "seccato"
 
-#: ../../include/text.php:941
+#: ../../include/text.php:939
 msgid "anxious"
 msgstr "ansioso"
 
-#: ../../include/text.php:942
+#: ../../include/text.php:940
 msgid "cranky"
 msgstr "irritabile"
 
-#: ../../include/text.php:943
+#: ../../include/text.php:941
 msgid "disturbed"
 msgstr "turbato"
 
-#: ../../include/text.php:944
+#: ../../include/text.php:942
 msgid "frustrated"
 msgstr "frustrato"
 
-#: ../../include/text.php:945
+#: ../../include/text.php:943
 msgid "depressed"
 msgstr "in depressione"
 
-#: ../../include/text.php:946
+#: ../../include/text.php:944
 msgid "motivated"
 msgstr "motivato"
 
-#: ../../include/text.php:947
+#: ../../include/text.php:945
 msgid "relaxed"
 msgstr "rilassato"
 
-#: ../../include/text.php:948
+#: ../../include/text.php:946
 msgid "surprised"
 msgstr "sorpreso"
 
-#: ../../include/text.php:1113
+#: ../../include/text.php:1111
 msgid "Monday"
 msgstr "lunedì"
 
-#: ../../include/text.php:1113
+#: ../../include/text.php:1111
 msgid "Tuesday"
 msgstr "martedì"
 
-#: ../../include/text.php:1113
+#: ../../include/text.php:1111
 msgid "Wednesday"
 msgstr "mercoledì"
 
-#: ../../include/text.php:1113
+#: ../../include/text.php:1111
 msgid "Thursday"
 msgstr "giovedì"
 
-#: ../../include/text.php:1113
+#: ../../include/text.php:1111
 msgid "Friday"
 msgstr "venerdì"
 
-#: ../../include/text.php:1113
+#: ../../include/text.php:1111
 msgid "Saturday"
 msgstr "sabato"
 
-#: ../../include/text.php:1113
+#: ../../include/text.php:1111
 msgid "Sunday"
 msgstr "domenica"
 
-#: ../../include/text.php:1117
+#: ../../include/text.php:1115
 msgid "January"
 msgstr "gennaio"
 
-#: ../../include/text.php:1117
+#: ../../include/text.php:1115
 msgid "February"
 msgstr "febbraio"
 
-#: ../../include/text.php:1117
+#: ../../include/text.php:1115
 msgid "March"
 msgstr "marzo"
 
-#: ../../include/text.php:1117
+#: ../../include/text.php:1115
 msgid "April"
 msgstr "aprile"
 
-#: ../../include/text.php:1117
+#: ../../include/text.php:1115
 msgid "May"
 msgstr "maggio"
 
-#: ../../include/text.php:1117
+#: ../../include/text.php:1115
 msgid "June"
 msgstr "giugno"
 
-#: ../../include/text.php:1117
+#: ../../include/text.php:1115
 msgid "July"
 msgstr "luglio"
 
-#: ../../include/text.php:1117
+#: ../../include/text.php:1115
 msgid "August"
 msgstr "agosto"
 
-#: ../../include/text.php:1117
+#: ../../include/text.php:1115
 msgid "September"
 msgstr "settembre"
 
-#: ../../include/text.php:1117
+#: ../../include/text.php:1115
 msgid "October"
 msgstr "ottobre"
 
-#: ../../include/text.php:1117
+#: ../../include/text.php:1115
 msgid "November"
 msgstr "novembre"
 
-#: ../../include/text.php:1117
+#: ../../include/text.php:1115
 msgid "December"
 msgstr "dicembre"
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1193
 msgid "unknown.???"
 msgstr "sconosciuto???"
 
-#: ../../include/text.php:1196
+#: ../../include/text.php:1194
 msgid "bytes"
 msgstr "byte"
 
-#: ../../include/text.php:1232
+#: ../../include/text.php:1230
 msgid "remove category"
 msgstr "rimuovi la categoria"
 
-#: ../../include/text.php:1301
+#: ../../include/text.php:1299
 msgid "remove from file"
 msgstr "rimuovi dal file"
 
-#: ../../include/text.php:1377 ../../include/text.php:1388
+#: ../../include/text.php:1375 ../../include/text.php:1386
 #: ../../mod/connedit.php:635
 msgid "Click to open/close"
 msgstr "Clicca per aprire/chiudere"
 
-#: ../../include/text.php:1536 ../../mod/events.php:444
+#: ../../include/text.php:1534 ../../mod/events.php:444
 msgid "Link to Source"
 msgstr "Link al sito d'origine"
 
-#: ../../include/text.php:1555
+#: ../../include/text.php:1553
 msgid "Select a page layout: "
 msgstr "Scegli il layout della pagina:"
 
-#: ../../include/text.php:1558 ../../include/text.php:1618
+#: ../../include/text.php:1556 ../../include/text.php:1616
 msgid "default"
 msgstr "predefinito"
 
-#: ../../include/text.php:1591
+#: ../../include/text.php:1589
 msgid "Page content type: "
 msgstr "Contenuto della pagina:"
 
-#: ../../include/text.php:1630
+#: ../../include/text.php:1628
 msgid "Select an alternate language"
 msgstr "Seleziona una lingua diversa"
 
-#: ../../include/text.php:1762
+#: ../../include/text.php:1760
 msgid "activity"
 msgstr "l'attività"
 
-#: ../../include/text.php:2049
+#: ../../include/text.php:2047
 msgid "Design"
 msgstr "Design"
 
-#: ../../include/text.php:2052
+#: ../../include/text.php:2050
 msgid "Blocks"
 msgstr "Riquadri"
 
-#: ../../include/text.php:2053
+#: ../../include/text.php:2051
 msgid "Menus"
 msgstr "Menù"
 
-#: ../../include/text.php:2054
+#: ../../include/text.php:2052
 msgid "Layouts"
 msgstr "Layout"
 
-#: ../../include/text.php:2055
+#: ../../include/text.php:2053
 msgid "Pages"
 msgstr "Pagine"
 
-#: ../../include/account.php:23
-msgid "Not a valid email address"
-msgstr "Email non valida"
-
-#: ../../include/account.php:25
-msgid "Your email domain is not among those allowed on this site"
-msgstr "Il dominio della tua email attualmente non è permesso su questo sito"
-
-#: ../../include/account.php:31
-msgid "Your email address is already registered at this site."
-msgstr "La tua email è già registrata su questo sito."
-
-#: ../../include/account.php:64
-msgid "An invitation is required."
-msgstr "È necessario un invito."
-
-#: ../../include/account.php:68
-msgid "Invitation could not be verified."
-msgstr "L'invito non può essere verificato."
-
-#: ../../include/account.php:119
-msgid "Please enter the required information."
-msgstr "Inserisci le informazioni richieste."
-
-#: ../../include/account.php:187
-msgid "Failed to store account information."
-msgstr "Non è stato possibile salvare le informazioni del tuo account."
-
-#: ../../include/account.php:245
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr "Registrazione di %s confermata"
-
-#: ../../include/account.php:313
-#, php-format
-msgid "Registration request at %s"
-msgstr "Richiesta di registrazione su %s"
-
-#: ../../include/account.php:315 ../../include/account.php:342
-#: ../../include/account.php:399
-msgid "Administrator"
-msgstr "Amministratore"
-
-#: ../../include/account.php:337
-msgid "your registration password"
-msgstr "la password di registrazione"
-
-#: ../../include/account.php:340 ../../include/account.php:397
-#, php-format
-msgid "Registration details for %s"
-msgstr "Dettagli della registrazione di %s"
-
-#: ../../include/account.php:406
-msgid "Account approved."
-msgstr "Account approvato."
-
-#: ../../include/account.php:440
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Registrazione revocata per %s"
+#: ../../include/chat.php:23
+msgid "Missing room name"
+msgstr "Area chat senza nome"
 
-#: ../../include/account.php:486
-msgid "Account verified. Please login."
-msgstr "Registrazione verificata. Adesso puoi effettuare login."
+#: ../../include/chat.php:32
+msgid "Duplicate room name"
+msgstr "Il nome dell'area chat è duplicato"
 
-#: ../../include/account.php:674 ../../include/account.php:676
-msgid "Click here to upgrade."
-msgstr "Clicca qui per aggiornare."
+#: ../../include/chat.php:82 ../../include/chat.php:90
+msgid "Invalid room specifier."
+msgstr "Il nome dell'area chat non è valido."
 
-#: ../../include/account.php:682
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Questa operazione supera i limiti del tuo abbonamento."
+#: ../../include/chat.php:120
+msgid "Room not found."
+msgstr "Area chat non trovata."
 
-#: ../../include/account.php:687
-msgid "This action is not available under your subscription plan."
-msgstr "Questa operazione non è prevista dal tuo abbonamento."
+#: ../../include/chat.php:141
+msgid "Room is full"
+msgstr "L'area chat è al completo"
 
 #: ../../include/permissions.php:26
 msgid "Can view my normal stream and posts"
@@ -3945,14 +3952,14 @@ msgid "Settings updated."
 msgstr "Impostazioni aggiornate."
 
 #: ../../mod/settings.php:573 ../../mod/api.php:106 ../../mod/admin.php:419
-#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1556
+#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102
+#: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1556
 msgid "No"
 msgstr "No"
 
 #: ../../mod/settings.php:573 ../../mod/api.php:105 ../../mod/admin.php:421
-#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1556
+#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102
+#: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1556
 msgid "Yes"
 msgstr "Si"
 
@@ -4540,7 +4547,7 @@ msgstr "Rimuovi il tag"
 msgid "Select a tag to remove: "
 msgstr "Seleziona un tag da rimuovere: "
 
-#: ../../mod/tagrm.php:133 ../../mod/photos.php:873
+#: ../../mod/tagrm.php:133 ../../mod/photos.php:875
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -4922,30 +4929,6 @@ msgstr "Valuta"
 msgid "View ratings"
 msgstr "Vedi le valutazioni"
 
-#: ../../mod/network.php:90
-msgid "No such group"
-msgstr "Impossibile trovare l'insieme"
-
-#: ../../mod/network.php:128
-msgid "Search Results For:"
-msgstr "Cerca risultati con:"
-
-#: ../../mod/network.php:182
-msgid "Collection is empty"
-msgstr "L'insieme di canali è vuoto"
-
-#: ../../mod/network.php:190
-msgid "Collection: "
-msgstr "Insieme:"
-
-#: ../../mod/network.php:203
-msgid "Connection: "
-msgstr "Contatto:"
-
-#: ../../mod/network.php:206
-msgid "Invalid connection."
-msgstr "Contatto non valido."
-
 #: ../../mod/connedit.php:75 ../../mod/connections.php:37
 msgid "Could not access contact record."
 msgstr "Non è possibile accedere alle informazioni sul contatto."
@@ -5801,71 +5784,71 @@ msgstr "Contatti in comune"
 msgid "No connections in common."
 msgstr "Nessun contatto in comune."
 
-#: ../../mod/id.php:144
+#: ../../mod/id.php:8
 msgid "First Name"
 msgstr "Nome"
 
-#: ../../mod/id.php:145
+#: ../../mod/id.php:9
 msgid "Last Name"
 msgstr "Cognome"
 
-#: ../../mod/id.php:146
+#: ../../mod/id.php:10
 msgid "Nickname"
 msgstr "Nick"
 
-#: ../../mod/id.php:147
+#: ../../mod/id.php:11
 msgid "Full Name"
 msgstr "Nome e cognome"
 
-#: ../../mod/id.php:153
+#: ../../mod/id.php:17
 msgid "Profile Photo 16px"
 msgstr "Foto del profilo 16px"
 
-#: ../../mod/id.php:154
+#: ../../mod/id.php:18
 msgid "Profile Photo 32px"
 msgstr "Foto del profilo 32px"
 
-#: ../../mod/id.php:155
+#: ../../mod/id.php:19
 msgid "Profile Photo 48px"
 msgstr "Foto del profilo 48px"
 
-#: ../../mod/id.php:156
+#: ../../mod/id.php:20
 msgid "Profile Photo 64px"
 msgstr "Foto del profilo 64px"
 
-#: ../../mod/id.php:157
+#: ../../mod/id.php:21
 msgid "Profile Photo 80px"
 msgstr "Foto del profilo 80px"
 
-#: ../../mod/id.php:158
+#: ../../mod/id.php:22
 msgid "Profile Photo 128px"
 msgstr "Foto del profilo 128px"
 
-#: ../../mod/id.php:159
+#: ../../mod/id.php:23
 msgid "Timezone"
 msgstr "Fuso orario"
 
-#: ../../mod/id.php:160
+#: ../../mod/id.php:24
 msgid "Homepage URL"
 msgstr "Indirizzo home page"
 
-#: ../../mod/id.php:162
+#: ../../mod/id.php:26
 msgid "Birth Year"
 msgstr "Anno di nascita"
 
-#: ../../mod/id.php:163
+#: ../../mod/id.php:27
 msgid "Birth Month"
 msgstr "Mese di nascita"
 
-#: ../../mod/id.php:164
+#: ../../mod/id.php:28
 msgid "Birth Day"
 msgstr "Giorno di nascita"
 
-#: ../../mod/id.php:165
+#: ../../mod/id.php:29
 msgid "Birthdate"
 msgstr "Nascita"
 
-#: ../../mod/id.php:166 ../../mod/profiles.php:431
+#: ../../mod/id.php:30 ../../mod/profiles.php:431
 msgid "Gender"
 msgstr "Sesso"
 
@@ -6403,7 +6386,7 @@ msgstr "Canale remoto [%s] (non ancora conosciuto da questo sito)"
 msgid "Item is not editable"
 msgstr "L'elemento non è modificabile"
 
-#: ../../mod/editpost.php:42 ../../mod/rpost.php:97
+#: ../../mod/editpost.php:42 ../../mod/rpost.php:98
 msgid "Edit post"
 msgstr "Modifica articolo"
 
@@ -8019,7 +8002,7 @@ msgstr "Album non trovato."
 msgid "Delete Album"
 msgstr "Elimina album"
 
-#: ../../mod/photos.php:159 ../../mod/photos.php:924
+#: ../../mod/photos.php:159 ../../mod/photos.php:930
 msgid "Delete Photo"
 msgstr "Elimina foto"
 
@@ -8045,11 +8028,11 @@ msgstr "Hai usato %1$.2f Mb del tuo spazio disponibile."
 msgid "Upload Photos"
 msgstr "Carica foto"
 
-#: ../../mod/photos.php:554 ../../mod/photos.php:636 ../../mod/photos.php:909
+#: ../../mod/photos.php:554 ../../mod/photos.php:636 ../../mod/photos.php:915
 msgid "Enter a new album name"
 msgstr "Inserisci il nome di un nuovo album"
 
-#: ../../mod/photos.php:555 ../../mod/photos.php:637 ../../mod/photos.php:910
+#: ../../mod/photos.php:555 ../../mod/photos.php:637 ../../mod/photos.php:916
 msgid "or select an existing one (doubleclick)"
 msgstr "o seleziona uno esistente (doppio click)"
 
@@ -8061,8 +8044,8 @@ msgstr "Pubblica questo caricamento sulla bacheca"
 msgid "Album name could not be decoded"
 msgstr "Non è stato possibile leggere il nome dell'album"
 
-#: ../../mod/photos.php:625 ../../mod/photos.php:1149
-#: ../../mod/photos.php:1165
+#: ../../mod/photos.php:625 ../../mod/photos.php:1157
+#: ../../mod/photos.php:1173
 msgid "Contact Photos"
 msgstr "Foto dei contatti"
 
@@ -8074,7 +8057,7 @@ msgstr "Prima i più recenti"
 msgid "Show Oldest First"
 msgstr "Prima i più vecchi"
 
-#: ../../mod/photos.php:675 ../../mod/photos.php:1197
+#: ../../mod/photos.php:675 ../../mod/photos.php:1205
 msgid "View Photo"
 msgstr "Guarda la foto"
 
@@ -8102,43 +8085,47 @@ msgstr "Foto privata"
 msgid "View Full Size"
 msgstr "Vedi nelle dimensioni originali"
 
-#: ../../mod/photos.php:903
+#: ../../mod/photos.php:909
 msgid "Edit photo"
 msgstr "Modifica la foto"
 
-#: ../../mod/photos.php:905
+#: ../../mod/photos.php:911
 msgid "Rotate CW (right)"
 msgstr "Ruota (senso orario)"
 
-#: ../../mod/photos.php:906
+#: ../../mod/photos.php:912
 msgid "Rotate CCW (left)"
 msgstr "Ruota (senso antiorario)"
 
-#: ../../mod/photos.php:913
+#: ../../mod/photos.php:919
 msgid "Caption"
 msgstr "Titolo"
 
-#: ../../mod/photos.php:915
+#: ../../mod/photos.php:921
 msgid "Add a Tag"
 msgstr "Aggiungi tag"
 
-#: ../../mod/photos.php:919
+#: ../../mod/photos.php:925
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr "Esempio: @bob, @Barbara_Jensen, @jim@example.com"
 
-#: ../../mod/photos.php:922
+#: ../../mod/photos.php:928
 msgid "Flag as adult in album view"
 msgstr "Marca come 'per adulti'"
 
-#: ../../mod/photos.php:1114
+#: ../../mod/photos.php:1120
 msgid "In This Photo:"
 msgstr "In questa foto:"
 
-#: ../../mod/photos.php:1203
+#: ../../mod/photos.php:1125
+msgid "Map"
+msgstr "Mappa"
+
+#: ../../mod/photos.php:1211
 msgid "View Album"
 msgstr "Guarda l'album"
 
-#: ../../mod/photos.php:1226
+#: ../../mod/photos.php:1234
 msgid "Recent Photos"
 msgstr "Foto recenti"
 
@@ -8416,6 +8403,30 @@ msgstr "Rifiuta"
 msgid "Please login."
 msgstr "Effettua l'accesso."
 
+#: ../../mod/network.php:90
+msgid "No such group"
+msgstr "Impossibile trovare l'insieme"
+
+#: ../../mod/network.php:128
+msgid "Search Results For:"
+msgstr "Cerca risultati con:"
+
+#: ../../mod/network.php:182
+msgid "Collection is empty"
+msgstr "L'insieme di canali è vuoto"
+
+#: ../../mod/network.php:190
+msgid "Collection: "
+msgstr "Insieme:"
+
+#: ../../mod/network.php:203
+msgid "Connection: "
+msgstr "Contatto:"
+
+#: ../../mod/network.php:206
+msgid "Invalid connection."
+msgstr "Contatto non valido."
+
 #: ../../mod/new_channel.php:109
 msgid "Add a Channel"
 msgstr "Aggiungi un canale"
@@ -8532,7 +8543,7 @@ msgstr "I miei segnalibri"
 msgid "My Connections Bookmarks"
 msgstr "I segnalibri dei miei contatti"
 
-#: ../../mod/channel.php:87
+#: ../../mod/channel.php:92
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Permessi insufficienti. Sarà visualizzata la pagina del profilo."
 
@@ -8580,7 +8591,7 @@ msgid "Monospace"
 msgstr "Monospace"
 
 #: ../../view/theme/apw/php/config.php:259
-#: ../../view/theme/redbasic/php/config.php:102
+#: ../../view/theme/redbasic/php/config.php:100
 msgid "Theme settings"
 msgstr "Impostazioni del tema"
 
@@ -8589,7 +8600,7 @@ msgid "Set scheme"
 msgstr "Schema"
 
 #: ../../view/theme/apw/php/config.php:261
-#: ../../view/theme/redbasic/php/config.php:124
+#: ../../view/theme/redbasic/php/config.php:122
 msgid "Set font-size for posts and comments"
 msgstr "Dimensioni del carattere per articoli e commenti"
 
@@ -8709,123 +8720,131 @@ msgstr "Margine sinistro della colonna laterale"
 msgid "Right offset of the aside element"
 msgstr "Margine destro della colonna laterale"
 
-#: ../../view/theme/redbasic/php/config.php:84
+#: ../../view/theme/redbasic/php/config.php:82
 msgid "Light (Red Matrix default)"
 msgstr "Light (predefinito)"
 
-#: ../../view/theme/redbasic/php/config.php:103
+#: ../../view/theme/redbasic/php/config.php:101
 msgid "Select scheme"
 msgstr "Scegli uno schema"
 
-#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:102
 msgid "Narrow navbar"
 msgstr "Barra di navigazione ristretta"
 
-#: ../../view/theme/redbasic/php/config.php:105
+#: ../../view/theme/redbasic/php/config.php:103
 msgid "Navigation bar background color"
 msgstr "Barra di navigazione: Colore di sfondo"
 
-#: ../../view/theme/redbasic/php/config.php:106
+#: ../../view/theme/redbasic/php/config.php:104
 msgid "Navigation bar gradient top color"
 msgstr "Barra di navigazione: Gradiente superiore"
 
-#: ../../view/theme/redbasic/php/config.php:107
+#: ../../view/theme/redbasic/php/config.php:105
 msgid "Navigation bar gradient bottom color"
 msgstr "Barra di navigazione: Gradiente inferiore"
 
-#: ../../view/theme/redbasic/php/config.php:108
+#: ../../view/theme/redbasic/php/config.php:106
 msgid "Navigation active button gradient top color"
 msgstr "Bottone di navigazione attivo: Gradiente superiore"
 
-#: ../../view/theme/redbasic/php/config.php:109
+#: ../../view/theme/redbasic/php/config.php:107
 msgid "Navigation active button gradient bottom color"
 msgstr "Bottone di navigazione attivo: Gradiente inferiore"
 
-#: ../../view/theme/redbasic/php/config.php:110
+#: ../../view/theme/redbasic/php/config.php:108
 msgid "Navigation bar border color "
 msgstr "Barra di navigazione: Colore del bordo"
 
-#: ../../view/theme/redbasic/php/config.php:111
+#: ../../view/theme/redbasic/php/config.php:109
 msgid "Navigation bar icon color "
 msgstr "Barra di navigazione: Colore delle icone"
 
-#: ../../view/theme/redbasic/php/config.php:112
+#: ../../view/theme/redbasic/php/config.php:110
 msgid "Navigation bar active icon color "
 msgstr "Barra di navigazione: Colore dell'icona attiva"
 
-#: ../../view/theme/redbasic/php/config.php:113
+#: ../../view/theme/redbasic/php/config.php:111
 msgid "link color"
 msgstr "colore del link"
 
-#: ../../view/theme/redbasic/php/config.php:114
+#: ../../view/theme/redbasic/php/config.php:112
 msgid "Set font-color for banner"
 msgstr "Colore del font del banner"
 
-#: ../../view/theme/redbasic/php/config.php:115
+#: ../../view/theme/redbasic/php/config.php:113
 msgid "Set the background color"
 msgstr "Imposta il colore di sfondo"
 
-#: ../../view/theme/redbasic/php/config.php:116
+#: ../../view/theme/redbasic/php/config.php:114
 msgid "Set the background image"
 msgstr "Immagine di sfondo"
 
-#: ../../view/theme/redbasic/php/config.php:117
+#: ../../view/theme/redbasic/php/config.php:115
 msgid "Set the background color of items"
 msgstr "Imposta il colore di sfondo degli oggetti"
 
-#: ../../view/theme/redbasic/php/config.php:118
+#: ../../view/theme/redbasic/php/config.php:116
 msgid "Set the background color of comments"
 msgstr "Imposta il colore di sfondo dei commenti"
 
-#: ../../view/theme/redbasic/php/config.php:119
+#: ../../view/theme/redbasic/php/config.php:117
 msgid "Set the border color of comments"
 msgstr "Imposta il colore del bordo dei commenti"
 
-#: ../../view/theme/redbasic/php/config.php:120
+#: ../../view/theme/redbasic/php/config.php:118
 msgid "Set the indent for comments"
 msgstr "Imposta il lo spostamento a destra dei commenti"
 
-#: ../../view/theme/redbasic/php/config.php:121
+#: ../../view/theme/redbasic/php/config.php:119
 msgid "Set the basic color for item icons"
 msgstr "Colore di base per le icone"
 
-#: ../../view/theme/redbasic/php/config.php:122
+#: ../../view/theme/redbasic/php/config.php:120
 msgid "Set the hover color for item icons"
 msgstr "Colore per le icone in mouse-over"
 
-#: ../../view/theme/redbasic/php/config.php:123
+#: ../../view/theme/redbasic/php/config.php:121
 msgid "Set font-size for the entire application"
 msgstr "Dimensione font per tutto il sito"
 
-#: ../../view/theme/redbasic/php/config.php:125
+#: ../../view/theme/redbasic/php/config.php:121
+msgid "Example: 14px"
+msgstr "Esempio: 14px"
+
+#: ../../view/theme/redbasic/php/config.php:123
 msgid "Set font-color for posts and comments"
 msgstr "Imposta il colore del carattere per articoli e commenti"
 
-#: ../../view/theme/redbasic/php/config.php:126
+#: ../../view/theme/redbasic/php/config.php:124
 msgid "Set radius of corners"
 msgstr "Raggio degli angoli stondati"
 
-#: ../../view/theme/redbasic/php/config.php:127
+#: ../../view/theme/redbasic/php/config.php:125
 msgid "Set shadow depth of photos"
 msgstr "Profondità dell'ombra delle foto"
 
-#: ../../view/theme/redbasic/php/config.php:128
-msgid "Set maximum width of conversation regions"
-msgstr "Larghezza massima dell'area delle conversazioni"
+#: ../../view/theme/redbasic/php/config.php:126
+msgid "Set maximum width of content region in pixel"
+msgstr "Larghezza massima dell'area dei contenuti in pixel"
 
-#: ../../view/theme/redbasic/php/config.php:129
-msgid "Center conversation regions"
-msgstr "Centra l'area delle conversazioni"
+#: ../../view/theme/redbasic/php/config.php:126
+msgid "Leave empty for default width"
+msgstr "Lascia vuoto per usare il valore predefinito"
 
-#: ../../view/theme/redbasic/php/config.php:130
+#: ../../view/theme/redbasic/php/config.php:127
+msgid "Center page content"
+msgstr "Centra il contenuto della pagina"
+
+#: ../../view/theme/redbasic/php/config.php:128
 msgid "Set minimum opacity of nav bar - to hide it"
 msgstr "Imposta l'opacità minima della barra di navigazione per nasconderla"
 
-#: ../../view/theme/redbasic/php/config.php:131
+#: ../../view/theme/redbasic/php/config.php:129
 msgid "Set size of conversation author photo"
 msgstr "Dimensione foto dell'autore della conversazione"
 
-#: ../../view/theme/redbasic/php/config.php:132
+#: ../../view/theme/redbasic/php/config.php:130
 msgid "Set size of followup author photos"
 msgstr "Dimensione foto dei partecipanti alla conversazione"
 
diff --git a/view/it/strings.php b/view/it/strings.php
index 341dc9f0f..781638ae3 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -323,6 +323,24 @@ $a->strings["duplicate filename or path"] = "il file o il percorso del file è d
 $a->strings["Path not found."] = "Percorso del file non trovato.";
 $a->strings["mkdir failed."] = "mkdir fallito.";
 $a->strings["database storage failed."] = "scrittura su database fallita.";
+$a->strings["Not a valid email address"] = "Email non valida";
+$a->strings["Your email domain is not among those allowed on this site"] = "Il dominio della tua email attualmente non è permesso su questo sito";
+$a->strings["Your email address is already registered at this site."] = "La tua email è già registrata su questo sito.";
+$a->strings["An invitation is required."] = "È necessario un invito.";
+$a->strings["Invitation could not be verified."] = "L'invito non può essere verificato.";
+$a->strings["Please enter the required information."] = "Inserisci le informazioni richieste.";
+$a->strings["Failed to store account information."] = "Non è stato possibile salvare le informazioni del tuo account.";
+$a->strings["Registration confirmation for %s"] = "Registrazione di %s confermata";
+$a->strings["Registration request at %s"] = "Richiesta di registrazione su %s";
+$a->strings["Administrator"] = "Amministratore";
+$a->strings["your registration password"] = "la password di registrazione";
+$a->strings["Registration details for %s"] = "Dettagli della registrazione di %s";
+$a->strings["Account approved."] = "Account approvato.";
+$a->strings["Registration revoked for %s"] = "Registrazione revocata per %s";
+$a->strings["Account verified. Please login."] = "Registrazione verificata. Adesso puoi effettuare login.";
+$a->strings["Click here to upgrade."] = "Clicca qui per aggiornare.";
+$a->strings["This action exceeds the limits set by your subscription plan."] = "Questa operazione supera i limiti del tuo abbonamento.";
+$a->strings["This action is not available under your subscription plan."] = "Questa operazione non è prevista dal tuo abbonamento.";
 $a->strings["Delete this item?"] = "Eliminare questo elemento?";
 $a->strings["Comment"] = "Commento";
 $a->strings["[+] show all"] = "[+] mostra tutto";
@@ -395,6 +413,8 @@ $a->strings["Private Notes"] = "Note private";
 $a->strings["Enables a tool to store notes and reminders"] = "Abilita il riquadro per scrivere annotazioni";
 $a->strings["Navigation Channel Select"] = "Scegli il canale attivo dal menu";
 $a->strings["Change channels directly from within the navigation dropdown menu"] = "Scegli il canale attivo direttamente dal menu di navigazione";
+$a->strings["Photo Location"] = "Posizione geografica";
+$a->strings["If location data is available on uploaded photos, link this to a map."] = "Collega la foto a una mappa quando contiene indicazioni geografiche.";
 $a->strings["Extended Identity Sharing"] = "Condivisione avanzata dell'identità";
 $a->strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "Rendi nota la tua identità a tutti i siti internet. Se disabilitato, la tua identità sarà comunicata solo ai siti RedMatrix.";
 $a->strings["Expert Mode"] = "Modalità esperto";
@@ -550,11 +570,6 @@ $a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
 $a->strings["Redmatrix event notification:"] = "Notifica eventi RedMatrix:";
 $a->strings["Starts:"] = "Inizio:";
 $a->strings["Finishes:"] = "Fine:";
-$a->strings["Missing room name"] = "Area chat senza nome";
-$a->strings["Duplicate room name"] = "Il nome dell'area chat è duplicato";
-$a->strings["Invalid room specifier."] = "Il nome dell'area chat non è valido.";
-$a->strings["Room not found."] = "Area chat non trovata.";
-$a->strings["Room is full"] = "L'area chat è al completo";
 $a->strings["Logout"] = "Esci";
 $a->strings["End this session"] = "Chiudi questa sessione";
 $a->strings["Home"] = "Bacheca";
@@ -863,24 +878,11 @@ $a->strings["Blocks"] = "Riquadri";
 $a->strings["Menus"] = "Menù";
 $a->strings["Layouts"] = "Layout";
 $a->strings["Pages"] = "Pagine";
-$a->strings["Not a valid email address"] = "Email non valida";
-$a->strings["Your email domain is not among those allowed on this site"] = "Il dominio della tua email attualmente non è permesso su questo sito";
-$a->strings["Your email address is already registered at this site."] = "La tua email è già registrata su questo sito.";
-$a->strings["An invitation is required."] = "È necessario un invito.";
-$a->strings["Invitation could not be verified."] = "L'invito non può essere verificato.";
-$a->strings["Please enter the required information."] = "Inserisci le informazioni richieste.";
-$a->strings["Failed to store account information."] = "Non è stato possibile salvare le informazioni del tuo account.";
-$a->strings["Registration confirmation for %s"] = "Registrazione di %s confermata";
-$a->strings["Registration request at %s"] = "Richiesta di registrazione su %s";
-$a->strings["Administrator"] = "Amministratore";
-$a->strings["your registration password"] = "la password di registrazione";
-$a->strings["Registration details for %s"] = "Dettagli della registrazione di %s";
-$a->strings["Account approved."] = "Account approvato.";
-$a->strings["Registration revoked for %s"] = "Registrazione revocata per %s";
-$a->strings["Account verified. Please login."] = "Registrazione verificata. Adesso puoi effettuare login.";
-$a->strings["Click here to upgrade."] = "Clicca qui per aggiornare.";
-$a->strings["This action exceeds the limits set by your subscription plan."] = "Questa operazione supera i limiti del tuo abbonamento.";
-$a->strings["This action is not available under your subscription plan."] = "Questa operazione non è prevista dal tuo abbonamento.";
+$a->strings["Missing room name"] = "Area chat senza nome";
+$a->strings["Duplicate room name"] = "Il nome dell'area chat è duplicato";
+$a->strings["Invalid room specifier."] = "Il nome dell'area chat non è valido.";
+$a->strings["Room not found."] = "Area chat non trovata.";
+$a->strings["Room is full"] = "L'area chat è al completo";
 $a->strings["Can view my normal stream and posts"] = "Può vedere i miei contenuti e articoli normali";
 $a->strings["Can view my default channel profile"] = "Può vedere il profilo predefinito del canale";
 $a->strings["Can view my photo albums"] = "Può vedere i miei album fotografici";
@@ -1166,12 +1168,6 @@ $a->strings["Location"] = "Posizione geografica";
 $a->strings["View hub ratings"] = "Vedi le valutazioni del hub";
 $a->strings["Rate"] = "Valuta";
 $a->strings["View ratings"] = "Vedi le valutazioni";
-$a->strings["No such group"] = "Impossibile trovare l'insieme";
-$a->strings["Search Results For:"] = "Cerca risultati con:";
-$a->strings["Collection is empty"] = "L'insieme di canali è vuoto";
-$a->strings["Collection: "] = "Insieme:";
-$a->strings["Connection: "] = "Contatto:";
-$a->strings["Invalid connection."] = "Contatto non valido.";
 $a->strings["Could not access contact record."] = "Non è possibile accedere alle informazioni sul contatto.";
 $a->strings["Could not locate selected profile."] = "Non riesco a trovare il profilo selezionato.";
 $a->strings["Connection updated."] = "Contatto aggiornato.";
@@ -1925,6 +1921,7 @@ $a->strings["Add a Tag"] = "Aggiungi tag";
 $a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Esempio: @bob, @Barbara_Jensen, @jim@example.com";
 $a->strings["Flag as adult in album view"] = "Marca come 'per adulti'";
 $a->strings["In This Photo:"] = "In questa foto:";
+$a->strings["Map"] = "Mappa";
 $a->strings["View Album"] = "Guarda l'album";
 $a->strings["Recent Photos"] = "Foto recenti";
 $a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "L'autenticazione magica dal tuo sito non è disponibile. Hai accesso solamente a questo sito. Puoi provare a disconnetterti per tentare di nuovo.";
@@ -1993,6 +1990,12 @@ $a->strings["Send Reply"] = "Invia la risposta";
 $a->strings["Invalid request identifier."] = "L'identificativo della richiesta non è valido.";
 $a->strings["Discard"] = "Rifiuta";
 $a->strings["Please login."] = "Effettua l'accesso.";
+$a->strings["No such group"] = "Impossibile trovare l'insieme";
+$a->strings["Search Results For:"] = "Cerca risultati con:";
+$a->strings["Collection is empty"] = "L'insieme di canali è vuoto";
+$a->strings["Collection: "] = "Insieme:";
+$a->strings["Connection: "] = "Contatto:";
+$a->strings["Invalid connection."] = "Contatto non valido.";
 $a->strings["Add a Channel"] = "Aggiungi un canale";
 $a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "I contenuti che pubblichi sono mostrati nel tuo \"canale\". Un canale può essere usato come bacheca personale, come blog, oppure può essere un forum di discussione, un gruppo di interesse, una pagina di celebrità e molto altro. Puoi creare tanti canali quanti ne permette il tuo sito.";
 $a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Per esempio: \"Mario Rossi\", \"Lisa e le sue ricette\", \"Il campionato\", \"Il gruppo di escursionismo\"";
@@ -2085,11 +2088,13 @@ $a->strings["Set the indent for comments"] = "Imposta il lo spostamento a destra
 $a->strings["Set the basic color for item icons"] = "Colore di base per le icone";
 $a->strings["Set the hover color for item icons"] = "Colore per le icone in mouse-over";
 $a->strings["Set font-size for the entire application"] = "Dimensione font per tutto il sito";
+$a->strings["Example: 14px"] = "Esempio: 14px";
 $a->strings["Set font-color for posts and comments"] = "Imposta il colore del carattere per articoli e commenti";
 $a->strings["Set radius of corners"] = "Raggio degli angoli stondati";
 $a->strings["Set shadow depth of photos"] = "Profondità dell'ombra delle foto";
-$a->strings["Set maximum width of conversation regions"] = "Larghezza massima dell'area delle conversazioni";
-$a->strings["Center conversation regions"] = "Centra l'area delle conversazioni";
+$a->strings["Set maximum width of content region in pixel"] = "Larghezza massima dell'area dei contenuti in pixel";
+$a->strings["Leave empty for default width"] = "Lascia vuoto per usare il valore predefinito";
+$a->strings["Center page content"] = "Centra il contenuto della pagina";
 $a->strings["Set minimum opacity of nav bar - to hide it"] = "Imposta l'opacità minima della barra di navigazione per nasconderla";
 $a->strings["Set size of conversation author photo"] = "Dimensione foto dell'autore della conversazione";
 $a->strings["Set size of followup author photos"] = "Dimensione foto dei partecipanti alla conversazione";