Merge branch 'master' of git://github.com/friendika/friendika

6 files changed, 282 insertions, 153 deletions

diff --git a/boot.php b/boot.php
index 3636288b2..66d4bc124 100644
--- a/boot.php
+++ b/boot.php
@@ -2,7 +2,7 @@
 
 set_time_limit(0);
 
-define ( 'FRIENDIKA_VERSION',      '2.1.921' );
+define ( 'FRIENDIKA_VERSION',      '2.1.922' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.1'  );
 define ( 'DB_UPDATE_VERSION',      1043   );
 
@@ -1603,9 +1603,15 @@ function lrdd($uri) {
 if(! function_exists('fetch_lrdd_template')) {
 function fetch_lrdd_template($host) {
 	$tpl = '';
-	$url = 'http://' . $host . '/.well-known/host-meta' ;
-	$links = fetch_xrd_links($url);
-logger('template: ' . print_r($links,true));
+
+	$url1 = 'https://' . $host . '/.well-known/host-meta' ;
+	$url2 = 'http://' . $host . '/.well-known/host-meta' ;
+	$links = fetch_xrd_links($url1);
+	logger('template (https): ' . print_r($links,true));
+	if(! count($links)) {
+		$links = fetch_xrd_links($url2);
+		logger('template (http): ' . print_r($links,true));
+	}
 	if(count($links)) {
 		foreach($links as $link)
 			if($link['@attributes']['rel'] && $link['@attributes']['rel'] === 'lrdd')
diff --git a/include/items.php b/include/items.php
index 051659321..6900c5920 100644
--- a/include/items.php
+++ b/include/items.php
@@ -905,6 +905,8 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) {
 
 	require_once('simplepie/simplepie.inc');
 
+	if(! $contact)
+		logger('consume feed: anonymous');
 	$feed = new SimplePie();
 	$feed->set_raw_data($xml);
 	if($datedir)
diff --git a/mod/follow.php b/mod/follow.php
index 689ae8232..4ce3ccb82 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -11,7 +11,7 @@ function follow_post(&$a) {
 	}
 
 	$url = $orig_url = notags(trim($_POST['url']));
-	
+	$diaspora = false;	
 	$email_conversant = false;
 
 	if($url) {
@@ -28,6 +28,9 @@ function follow_post(&$a) {
 					$hcard = unamp($link['@attributes']['href']);
 				if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
 					$profile = unamp($link['@attributes']['href']);
+				if($link['@attributes']['rel'] === 'http://joindiaspora.com/seed_location')
+					$diaspora = true;
+
 
 			}
 
@@ -90,9 +93,12 @@ function follow_post(&$a) {
 		}
 	}
 
-	if(! $profile)
-		$profile = $url;
-
+	if(! $profile) {
+		if($diaspora)
+			$profile = $hcard;
+		else
+			$profile = $url;
+	}
 
 	if(! x($vcard,'fn'))
 		if(x($vcard,'nick'))
diff --git a/util/po2php.php b/util/po2php.php
index 66edd290c..eed126e32 100644
--- a/util/po2php.php
+++ b/util/po2php.php
@@ -26,6 +26,10 @@ function po2php_run($argv, $argc) {
 	$arr = False;
 	$ink = False;
 	$inv = False;
+	$escape_s_exp = '|[^\\\\]\$[a-z]|';
+	function escape_s($match){
+		return str_replace('$','\$',$match[0]);
+	}
 	foreach ($infile as $l) {
 		$len = strlen($l);
 		if ($l[0]=="#") $l="";
@@ -46,6 +50,7 @@ function po2php_run($argv, $argc) {
 			if ($inv) {	$inv = False; $out .= '"'.$v.'"'; }
 			
 			$v = substr($l,8,$len-10);
+			$v = preg_replace_callback($escape_s_exp,'escape_s',$v);
 			$inv = True;
 			//$out .= $v;
 		}
@@ -59,7 +64,10 @@ function po2php_run($argv, $argc) {
 			}
 			$match=Array();
 			preg_match("|\[([0-9]*)\] (.*)|", $l, $match);
-			$out .= "\t". $match[1]." => ". $match[2] .",\n";
+			$out .= "\t". 
+				preg_replace_callback($escape_s_exp,'escape_s',$match[1])
+				." => "
+				.preg_replace_callback($escape_s_exp,'escape_s',$match[2]) .",\n";
 		}
 	
 		if (substr($l,0,6)=="msgid_") { $ink = False; $out .= '$a->strings["'.$k.'"] = '; };
@@ -67,6 +75,7 @@ function po2php_run($argv, $argc) {
 
 		if ($ink) {
 			$k .= trim($l,"\"\r\n"); 
+			$k = preg_replace_callback($escape_s_exp,'escape_s',$k);
 			//$out .= '$a->strings['.$k.'] = ';
 		}
 		
@@ -80,11 +89,14 @@ function po2php_run($argv, $argc) {
 			} else {
 				$k = "";
 			}
+			
+			$k = preg_replace_callback($escape_s_exp,'escape_s',$k);
 			$ink = True;
 		}
 		
 		if ($inv && substr($l,0,6)!="msgstr") {
 			$v .= trim($l,"\"\r\n"); 
+			$v = preg_replace_callback($escape_s_exp,'escape_s',$v);
 			//$out .= '$a->strings['.$k.'] = ';
 		}
 	
diff --git a/view/it/messages.po b/view/it/messages.po
index 2c1b144bb..73ee9e3ad 100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -20,15 +20,15 @@ msgstr ""
 "X-Language: it_IT\n"
 "X-Source-Language: C\n"
 
-#: ../../index.php:187
+#: ../../index.php:187 ../../index.php:194
 msgid "Not Found"
 msgstr "Non Trovato"
 
-#: ../../index.php:188
+#: ../../index.php:188 ../../index.php:195
 msgid "Page not found."
 msgstr "Pagina non trovata."
 
-#: ../../index.php:243 ../../mod/group.php:88
+#: ../../index.php:243 ../../mod/group.php:88 ../../index.php:250
 msgid "Permission denied"
 msgstr "Permesso negato"
 
@@ -45,6 +45,9 @@ msgstr "Permesso negato"
 #: ../../mod/message.php:8 ../../mod/message.php:116
 #: ../../mod/dfrn_confirm.php:53 ../../mod/viewcontacts.php:13
 #: ../../mod/group.php:19 ../../addon/facebook/facebook.php:110
+#: ../../index.php:251 ../../mod/profiles.php:227 ../../mod/settings.php:208
+#: ../../mod/photos.php:773 ../../mod/display.php:308 ../../mod/editpost.php:10
+#: ../../mod/item.php:668
 msgid "Permission denied."
 msgstr "Permesso negato."
 
@@ -53,6 +56,7 @@ msgid "Create a New Account"
 msgstr "Crea un Nuovo Account"
 
 #: ../../boot.php:809 ../../mod/register.php:443 ../../include/nav.php:61
+#: ../../mod/register.php:445
 msgid "Register"
 msgstr "Regitrati"
 
@@ -265,19 +269,19 @@ msgstr "Novembre"
 msgid "December"
 msgstr "Dicembre"
 
-#: ../../boot.php:2413
+#: ../../boot.php:2413 ../../boot.php:2419
 msgid "Birthdays this week:"
 msgstr "Compleanni questa settimana:"
 
-#: ../../boot.php:2414
+#: ../../boot.php:2414 ../../boot.php:2420
 msgid "(Adjusted for local time)"
 msgstr "(Convertiti all'ora locale)"
 
-#: ../../boot.php:2423
+#: ../../boot.php:2423 ../../boot.php:2431
 msgid "[today]"
 msgstr "[oggi]"
 
-#: ../../boot.php:2620
+#: ../../boot.php:2620 ../../boot.php:2628
 msgid "link to source"
 msgstr "Collegamento all'originale"
 
@@ -308,7 +312,9 @@ msgstr "Seleziona una identità da gestire:"
 #: ../../addon/statusnet/statusnet.php:163
 #: ../../addon/statusnet/statusnet.php:189
 #: ../../addon/statusnet/statusnet.php:207
-#: ../../addon/facebook/facebook.php:151 ../../addon/randplace/randplace.php:179
+#: ../../addon/facebook/facebook.php:151
+#: ../../addon/randplace/randplace.php:179 ../../mod/photos.php:801
+#: ../../mod/photos.php:858 ../../mod/photos.php:1066
 msgid "Submit"
 msgstr "Invia"
 
@@ -318,17 +324,18 @@ msgid "Image exceeds size limit of %d"
 msgstr "La dimensionde dell'immagine supera il limite di %d"
 
 #: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118
-#: ../../mod/photos.php:570
+#: ../../mod/photos.php:570 ../../mod/photos.php:571
 msgid "Unable to process image."
 msgstr "Impossibile elaborare l'immagine."
 
 #: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88
 #: ../../mod/wall_upload.php:95 ../../mod/item.php:184 ../../mod/message.php:93
+#: ../../mod/item.php:212
 msgid "Wall Photos"
 msgstr "Foto Bacheca"
 
 #: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:230
-#: ../../mod/photos.php:588
+#: ../../mod/photos.php:588 ../../mod/photos.php:589
 msgid "Image upload failed."
 msgstr "Caricamento immagine fallito."
 
@@ -337,7 +344,8 @@ msgstr "Caricamento immagine fallito."
 #: ../../mod/register.php:348 ../../mod/dfrn_request.php:545
 #: ../../mod/lostpass.php:39 ../../mod/item.php:423
 #: ../../mod/dfrn_confirm.php:649 ../../include/items.php:1350
-#: ../../mod/dfrn_notify.php:475
+#: ../../mod/dfrn_notify.php:475 ../../mod/item.php:475 ../../mod/item.php:498
+#: ../../include/items.php:1373
 msgid "Administrator"
 msgstr "Amministratore"
 
@@ -354,83 +362,107 @@ msgstr "Nuova mail ricevuta su "
 msgid "%s commented on an item at %s"
 msgstr "%s ha commentato un elemento su %s"
 
-#: ../../mod/profile.php:151 ../../mod/network.php:91
+#: ../../mod/profile.php:151 ../../mod/network.php:91 ../../mod/profile.php:156
+#: ../../mod/profile.php:317 ../../mod/photos.php:1086
+#: ../../mod/display.php:158 ../../mod/network.php:370
 msgid "Share"
 msgstr "Condividi"
 
 #: ../../mod/profile.php:152 ../../mod/network.php:92 ../../mod/message.php:185
-#: ../../mod/message.php:319
+#: ../../mod/message.php:319 ../../mod/profile.php:157 ../../mod/editpost.php:63
 msgid "Upload photo"
 msgstr "Carica foto"
 
 #: ../../mod/profile.php:153 ../../mod/network.php:93 ../../mod/message.php:186
-#: ../../mod/message.php:320
+#: ../../mod/message.php:320 ../../mod/profile.php:158 ../../mod/editpost.php:64
 msgid "Insert web link"
 msgstr "Inserisci link"
 
-#: ../../mod/profile.php:154 ../../mod/network.php:94
+#: ../../mod/profile.php:154 ../../mod/network.php:94 ../../mod/profile.php:159
+#: ../../mod/editpost.php:65
 msgid "Insert YouTube video"
 msgstr "Inserisci video da YouTube"
 
-#: ../../mod/profile.php:155 ../../mod/network.php:95
+#: ../../mod/profile.php:155 ../../mod/network.php:95 ../../mod/profile.php:162
+#: ../../mod/editpost.php:68 ../../mod/network.php:97
 msgid "Set your location"
 msgstr "Imposta la tua posizione"
 
-#: ../../mod/profile.php:156 ../../mod/network.php:96
+#: ../../mod/profile.php:156 ../../mod/network.php:96 ../../mod/profile.php:163
+#: ../../mod/editpost.php:69 ../../mod/network.php:98
 msgid "Clear browser location"
 msgstr "Cancella la tua posizione data dal browser"
 
 #: ../../mod/profile.php:157 ../../mod/profile.php:309
 #: ../../mod/photos.php:1052 ../../mod/display.php:158 ../../mod/network.php:97
-#: ../../mod/network.php:367 ../../mod/message.php:187 ../../mod/message.php:321
+#: ../../mod/network.php:367 ../../mod/message.php:187
+#: ../../mod/message.php:321 ../../mod/profile.php:164
+#: ../../mod/profile.php:318 ../../mod/photos.php:1087
+#: ../../mod/display.php:159 ../../mod/editpost.php:70 ../../mod/network.php:99
+#: ../../mod/network.php:371
 msgid "Please wait"
 msgstr "Attendi"
 
-#: ../../mod/profile.php:158 ../../mod/network.php:98
+#: ../../mod/profile.php:158 ../../mod/network.php:98 ../../mod/profile.php:165
+#: ../../mod/editpost.php:71 ../../mod/network.php:100
 msgid "Permission settings"
 msgstr "Impostazione permessi"
 
 #: ../../mod/profile.php:165 ../../mod/network.php:104
+#: ../../mod/profile.php:172 ../../mod/editpost.php:77 ../../mod/network.php:106
 msgid "CC: email addresses"
 msgstr "CC: indirizzi email"
 
 #: ../../mod/profile.php:167 ../../mod/network.php:106
+#: ../../mod/profile.php:174 ../../mod/editpost.php:79 ../../mod/network.php:108
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Esempio: bob@example.com, mary@example.com"
 
 #: ../../mod/profile.php:300 ../../mod/photos.php:935 ../../mod/display.php:149
-#: ../../mod/network.php:321
+#: ../../mod/network.php:321 ../../mod/profile.php:308 ../../mod/photos.php:962
+#: ../../mod/network.php:324
 msgid "Private Message"
 msgstr "Messaggio privato"
 
 #: ../../mod/profile.php:307 ../../mod/photos.php:1050
 #: ../../mod/display.php:156 ../../mod/network.php:365
+#: ../../mod/profile.php:315 ../../mod/photos.php:1084 ../../mod/network.php:368
 msgid "I like this (toggle)"
 msgstr "Mi piace questo (metti/togli)"
 
 #: ../../mod/profile.php:308 ../../mod/photos.php:1051
 #: ../../mod/display.php:157 ../../mod/network.php:366
+#: ../../mod/profile.php:316 ../../mod/photos.php:1085 ../../mod/network.php:369
 msgid "I don't like this (toggle)"
 msgstr "Non mi piace questo (metti/togli)"
 
 #: ../../mod/profile.php:321 ../../mod/photos.php:1071
 #: ../../mod/photos.php:1111 ../../mod/photos.php:1140
 #: ../../mod/display.php:170 ../../mod/network.php:380
+#: ../../mod/profile.php:330 ../../mod/photos.php:1106
+#: ../../mod/photos.php:1146 ../../mod/photos.php:1175
+#: ../../mod/display.php:171 ../../mod/network.php:384
 msgid "This is you"
 msgstr "Questo sei tu"
 
 #: ../../mod/profile.php:361 ../../mod/photos.php:1168
 #: ../../mod/display.php:234 ../../mod/network.php:386 ../../mod/group.php:137
+#: ../../mod/profile.php:376 ../../mod/photos.php:1203
+#: ../../mod/display.php:238 ../../mod/network.php:393
 msgid "Delete"
 msgstr "Cancella"
 
 #: ../../mod/profile.php:382 ../../mod/search.php:116 ../../mod/display.php:258
 #: ../../mod/network.php:272 ../../mod/network.php:434
+#: ../../mod/profile.php:397 ../../mod/display.php:262
+#: ../../mod/network.php:275 ../../mod/network.php:441
 msgid "View $name's profile"
 msgstr "Guarda il profilo di $name"
 
 #: ../../mod/profile.php:414 ../../mod/display.php:312
 #: ../../mod/register.php:422 ../../mod/network.php:471
+#: ../../mod/profile.php:430 ../../mod/display.php:317
+#: ../../mod/register.php:424 ../../mod/network.php:479
 msgid ""
 "Shared content is covered by the <a "
 "href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons "
@@ -471,6 +503,7 @@ msgstr "L'immagine è stata caricata, ma il ritaglio è fallito."
 #: ../../mod/photos.php:106 ../../mod/photos.php:530 ../../mod/photos.php:849
 #: ../../mod/photos.php:864 ../../mod/register.php:267
 #: ../../mod/register.php:274 ../../mod/register.php:281
+#: ../../mod/photos.php:531 ../../mod/photos.php:850 ../../mod/photos.php:865
 msgid "Profile Photos"
 msgstr "Foto del profilo"
 
@@ -513,6 +546,7 @@ msgstr "Account approvato."
 
 #: ../../mod/profiles.php:21 ../../mod/profiles.php:234
 #: ../../mod/profiles.php:339 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:237 ../../mod/profiles.php:342
 msgid "Profile not found."
 msgstr "Profilo non trovato."
 
@@ -520,27 +554,29 @@ msgstr "Profilo non trovato."
 msgid "Profile Name is required."
 msgstr "Il Nome Profilo è richiesto ."
 
-#: ../../mod/profiles.php:196
+#: ../../mod/profiles.php:196 ../../mod/profiles.php:199
 msgid "Profile updated."
 msgstr "Profilo aggiornato."
 
-#: ../../mod/profiles.php:251
+#: ../../mod/profiles.php:251 ../../mod/profiles.php:254
 msgid "Profile deleted."
 msgstr "Profilo elminato."
 
 #: ../../mod/profiles.php:267 ../../mod/profiles.php:298
+#: ../../mod/profiles.php:270 ../../mod/profiles.php:301
 msgid "Profile-"
 msgstr "Profilo-"
 
 #: ../../mod/profiles.php:286 ../../mod/profiles.php:325
+#: ../../mod/profiles.php:289 ../../mod/profiles.php:328
 msgid "New profile created."
 msgstr "Nuovo profilo creato."
 
-#: ../../mod/profiles.php:304
+#: ../../mod/profiles.php:304 ../../mod/profiles.php:307
 msgid "Profile unavailable to clone."
 msgstr "Impossibile duplicare il plrofilo."
 
-#: ../../mod/profiles.php:367
+#: ../../mod/profiles.php:367 ../../mod/profiles.php:370
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
@@ -548,11 +584,11 @@ msgstr ""
 "Questo è il tuo profilo <strong>publico</strong>.<br "
 "/><strong>Potrebbe</strong> essere visto da chiunque attraverso internet."
 
-#: ../../mod/profiles.php:377
+#: ../../mod/profiles.php:377 ../../mod/profiles.php:380
 msgid "Age: "
 msgstr "Età : "
 
-#: ../../mod/profiles.php:418
+#: ../../mod/profiles.php:418 ../../mod/profiles.php:422
 msgid "Profile Image"
 msgstr "Immagine del Profilo"
 
@@ -572,56 +608,56 @@ msgstr "Password cambiata."
 msgid "Password update failed. Please try again."
 msgstr "Aggiornamento password fallito. Prova ancora."
 
-#: ../../mod/settings.php:95
+#: ../../mod/settings.php:95 ../../mod/settings.php:96
 msgid " Please use a shorter name."
 msgstr " Usa un nome più corto."
 
-#: ../../mod/settings.php:97
+#: ../../mod/settings.php:97 ../../mod/settings.php:98
 msgid " Name too short."
 msgstr " Nome troppo corto."
 
-#: ../../mod/settings.php:103
+#: ../../mod/settings.php:103 ../../mod/settings.php:104
 msgid " Not valid email."
 msgstr " Email non valida."
 
-#: ../../mod/settings.php:105
+#: ../../mod/settings.php:105 ../../mod/settings.php:106
 msgid " Cannot change to that email."
 msgstr "Non puoi usare quella email."
 
-#: ../../mod/settings.php:161
+#: ../../mod/settings.php:161 ../../mod/settings.php:163
 msgid "Settings updated."
 msgstr "Impostazioni aggiornate."
 
-#: ../../mod/settings.php:211
+#: ../../mod/settings.php:211 ../../mod/settings.php:213
 msgid "Plugin Settings"
 msgstr "Impostazioni Plugin"
 
-#: ../../mod/settings.php:212
+#: ../../mod/settings.php:212 ../../mod/settings.php:214
 msgid "Account Settings"
 msgstr "Impostazioni Account"
 
-#: ../../mod/settings.php:218
+#: ../../mod/settings.php:218 ../../mod/settings.php:220
 msgid "No Plugin settings configured"
 msgstr "Nessun Plugin ha delle configurazioni che puoi modificare"
 
-#: ../../mod/settings.php:263
+#: ../../mod/settings.php:263 ../../mod/settings.php:266
 msgid "OpenID: "
 msgstr "OpenID: "
 
-#: ../../mod/settings.php:263
+#: ../../mod/settings.php:263 ../../mod/settings.php:266
 msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
 msgstr ""
 "&nbsp;(Opzionale) Permetti a questo OpenID di accedere a questo account."
 
-#: ../../mod/settings.php:295
+#: ../../mod/settings.php:295 ../../mod/settings.php:298
 msgid "Profile is <strong>not published</strong>."
 msgstr "Il profilo <strong>non è pubblicato</strong>."
 
-#: ../../mod/settings.php:352
+#: ../../mod/settings.php:352 ../../mod/settings.php:355
 msgid "Default Post Permissions"
 msgstr "Permessi di default per i messaggi"
 
-#: ../../mod/search.php:131 ../../mod/network.php:287
+#: ../../mod/search.php:131 ../../mod/network.php:287 ../../mod/network.php:290
 msgid "View in context"
 msgstr "Vedi nel contesto"
 
@@ -634,7 +670,10 @@ msgstr "Album Foto"
 #: ../../mod/photos.php:1209 ../../include/Photo.php:225
 #: ../../include/Photo.php:232 ../../include/Photo.php:239
 #: ../../include/items.php:959 ../../include/items.php:962
-#: ../../include/items.php:965
+#: ../../include/items.php:965 ../../mod/photos.php:781
+#: ../../mod/photos.php:850 ../../mod/photos.php:865 ../../mod/photos.php:1233
+#: ../../mod/photos.php:1244 ../../include/items.php:982
+#: ../../include/items.php:985 ../../include/items.php:988
 msgid "Contact Photos"
 msgstr "Foto dei contatti"
 
@@ -646,132 +685,141 @@ msgstr "Informazione sul contatto non disponibile"
 msgid "Album not found."
 msgstr "Album non trovato."
 
-#: ../../mod/photos.php:134 ../../mod/photos.php:858
+#: ../../mod/photos.php:134 ../../mod/photos.php:858 ../../mod/photos.php:859
 msgid "Delete Album"
 msgstr "Elimina album"
 
-#: ../../mod/photos.php:197 ../../mod/photos.php:1033
+#: ../../mod/photos.php:197 ../../mod/photos.php:1033 ../../mod/photos.php:1067
 msgid "Delete Photo"
 msgstr "Elimina foto"
 
-#: ../../mod/photos.php:468
+#: ../../mod/photos.php:468 ../../mod/photos.php:469
 msgid "was tagged in a"
 msgstr "è stato taggato in"
 
-#: ../../mod/photos.php:468 ../../mod/like.php:110
+#: ../../mod/photos.php:468 ../../mod/like.php:110 ../../mod/photos.php:469
 msgid "photo"
 msgstr "foto"
 
-#: ../../mod/photos.php:468
+#: ../../mod/photos.php:468 ../../mod/photos.php:469
 msgid "by"
 msgstr "da"
 
 #: ../../mod/photos.php:558 ../../addon/js_upload/js_upload.php:306
+#: ../../mod/photos.php:559
 msgid "Image exceeds size limit of "
 msgstr "L'immagine supera il limite di dimensione di "
 
-#: ../../mod/photos.php:660
+#: ../../mod/photos.php:660 ../../mod/photos.php:661
 msgid "No photos selected"
 msgstr "Nessuna foto selezionata"
 
-#: ../../mod/photos.php:807
+#: ../../mod/photos.php:807 ../../mod/photos.php:808
 msgid "Upload Photos"
 msgstr "Carica foto"
 
-#: ../../mod/photos.php:810 ../../mod/photos.php:853
+#: ../../mod/photos.php:810 ../../mod/photos.php:853 ../../mod/photos.php:811
+#: ../../mod/photos.php:854
 msgid "New album name: "
 msgstr "Nome nuovo album: "
 
-#: ../../mod/photos.php:811
+#: ../../mod/photos.php:811 ../../mod/photos.php:812
 msgid "or existing album name: "
 msgstr "o nome di un album esistente: "
 
-#: ../../mod/photos.php:813 ../../mod/photos.php:1028
+#: ../../mod/photos.php:813 ../../mod/photos.php:1028 ../../mod/photos.php:814
+#: ../../mod/photos.php:1062
 msgid "Permissions"
 msgstr "Permessi"
 
-#: ../../mod/photos.php:868
+#: ../../mod/photos.php:868 ../../mod/photos.php:869
 msgid "Edit Album"
 msgstr "Modifica album"
 
-#: ../../mod/photos.php:878 ../../mod/photos.php:1228
+#: ../../mod/photos.php:878 ../../mod/photos.php:1228 ../../mod/photos.php:879
+#: ../../mod/photos.php:1263
 msgid "View Photo"
 msgstr "Vedi foto"
 
-#: ../../mod/photos.php:908
+#: ../../mod/photos.php:908 ../../mod/photos.php:909
 msgid "Photo not available"
 msgstr "Foto non disponibile"
 
-#: ../../mod/photos.php:929
+#: ../../mod/photos.php:929 ../../mod/photos.php:956
 msgid "Edit photo"
 msgstr "Modifica foto"
 
-#: ../../mod/photos.php:931
+#: ../../mod/photos.php:931 ../../mod/photos.php:958
 msgid "Use as profile photo"
 msgstr "Usa come foto del profilo"
 
-#: ../../mod/photos.php:944
+#: ../../mod/photos.php:944 ../../mod/photos.php:973
 msgid "View Full Size"
 msgstr "Vedi dimensione intera"
 
-#: ../../mod/photos.php:1002
+#: ../../mod/photos.php:1002 ../../mod/photos.php:1036
 msgid "Tags: "
 msgstr "Tag: "
 
-#: ../../mod/photos.php:1012
+#: ../../mod/photos.php:1012 ../../mod/photos.php:1046
 msgid "[Remove any tag]"
 msgstr "[Rimuovi tutti i tag]"
 
-#: ../../mod/photos.php:1021
+#: ../../mod/photos.php:1021 ../../mod/photos.php:1055
 msgid "New album name"
 msgstr "Nuovo nome album"
 
-#: ../../mod/photos.php:1024
+#: ../../mod/photos.php:1024 ../../mod/photos.php:1058
 msgid "Caption"
 msgstr "Didascalia"
 
-#: ../../mod/photos.php:1026
+#: ../../mod/photos.php:1026 ../../mod/photos.php:1060
 msgid "Add a Tag"
 msgstr "Aggiungi un tag"
 
-#: ../../mod/photos.php:1030
+#: ../../mod/photos.php:1030 ../../mod/photos.php:1064
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 "Esempio: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: ../../mod/photos.php:1214
+#: ../../mod/photos.php:1214 ../../mod/photos.php:1249
 msgid "Recent Photos"
 msgstr "Foto recenti"
 
-#: ../../mod/photos.php:1218
+#: ../../mod/photos.php:1218 ../../mod/photos.php:1253
 msgid "Upload New Photos"
 msgstr "Carica nuova foto"
 
-#: ../../mod/photos.php:1234
+#: ../../mod/photos.php:1234 ../../mod/photos.php:1269
 msgid "View Album"
 msgstr "Vedi album"
 
 #: ../../mod/display.php:15 ../../mod/display.php:307 ../../mod/item.php:546
+#: ../../mod/display.php:312 ../../mod/item.php:598
 msgid "Item not found."
 msgstr "Elemento non trovato."
 
 #: ../../mod/display.php:259 ../../mod/network.php:435
+#: ../../mod/display.php:263 ../../mod/network.php:442
 msgid "View $owner_name's profile"
 msgstr "Guarda il profilo di $owner_name"
 
 #: ../../mod/display.php:260 ../../mod/network.php:436
+#: ../../mod/display.php:264 ../../mod/network.php:443
 msgid "to"
 msgstr "a"
 
 #: ../../mod/display.php:261 ../../mod/network.php:437
+#: ../../mod/display.php:265 ../../mod/network.php:444
 msgid "Wall-to-Wall"
 msgstr "Bacheca-A-Bacheca"
 
 #: ../../mod/display.php:262 ../../mod/network.php:438
+#: ../../mod/display.php:266 ../../mod/network.php:445
 msgid "via Wall-To-Wall:"
 msgstr "sulla sua Bacheca:"
 
-#: ../../mod/display.php:300
+#: ../../mod/display.php:300 ../../mod/display.php:305
 msgid "Item has been removed."
 msgstr "L'elemento è stato rimosso."
 
@@ -1105,31 +1153,33 @@ msgstr ""
 "I membri di questo network preferiscono comunicare con persone reali che "
 "usano i loro nomi reali."
 
-#: ../../mod/register.php:413
+#: ../../mod/register.php:413 ../../mod/register.php:415
 msgid "Include your profile in member directory?"
 msgstr "Includi il tuo profilo nell'elenco dei membir?"
 
 #: ../../mod/register.php:416 ../../mod/dfrn_request.php:618
+#: ../../mod/register.php:418
 msgid "Yes"
 msgstr "Si"
 
 #: ../../mod/register.php:417 ../../mod/dfrn_request.php:619
+#: ../../mod/register.php:419
 msgid "No"
 msgstr "No"
 
-#: ../../mod/register.php:429
+#: ../../mod/register.php:429 ../../mod/register.php:431
 msgid "Registration"
 msgstr "Registrazione"
 
-#: ../../mod/register.php:437
+#: ../../mod/register.php:437 ../../mod/register.php:439
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr "Il tuo Nome Completo (p.e. Mario Rossi): "
 
-#: ../../mod/register.php:438
+#: ../../mod/register.php:438 ../../mod/register.php:440
 msgid "Your Email Address: "
 msgstr "Il tuo Indirizzo Email: "
 
-#: ../../mod/register.php:439
+#: ../../mod/register.php:439 ../../mod/register.php:441
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be "
@@ -1138,7 +1188,7 @@ msgstr ""
 "Scegli un soprannome. Deve cominciare con un carattere. L'indirizzo del tuo "
 "profilo sarà '<strong>soprannome@$sitename</strong>'."
 
-#: ../../mod/register.php:440
+#: ../../mod/register.php:440 ../../mod/register.php:442
 msgid "Choose a nickname: "
 msgstr "Scegli un soprannome: "
 
@@ -1300,15 +1350,15 @@ msgstr "Vista normale"
 msgid "New Item View"
 msgstr "Vista Nuovi Elementi"
 
-#: ../../mod/network.php:149
+#: ../../mod/network.php:149 ../../mod/network.php:151
 msgid "No such group"
 msgstr "Nessun gruppo"
 
-#: ../../mod/network.php:160
+#: ../../mod/network.php:160 ../../mod/network.php:162
 msgid "Group is empty"
 msgstr "Il gruppo è vuoto"
 
-#: ../../mod/network.php:164
+#: ../../mod/network.php:164 ../../mod/network.php:166
 msgid "Group: "
 msgstr "Gruppo: "
 
@@ -1471,6 +1521,7 @@ msgstr ""
 "Accesso con identà incorretta. Accedi a <strong>questo</strong> profilo."
 
 #: ../../mod/dfrn_request.php:536 ../../include/items.php:1341
+#: ../../include/items.php:1364
 msgid "[Name Withheld]"
 msgstr "[Nome Nascosto]"
 
@@ -1578,25 +1629,25 @@ msgstr "Elenco Globale"
 msgid "Unable to locate original post."
 msgstr "Impossibile trovare il messaggio originale."
 
-#: ../../mod/item.php:98
+#: ../../mod/item.php:98 ../../mod/item.php:126
 msgid "Empty post discarded."
 msgstr "Messaggio vuoto scartato."
 
-#: ../../mod/item.php:422
+#: ../../mod/item.php:422 ../../mod/item.php:474
 #, php-format
 msgid "%s commented on your item at %s"
 msgstr "%s ha commentato un tuo elemento su %s"
 
-#: ../../mod/item.php:445
+#: ../../mod/item.php:445 ../../mod/item.php:497
 #, php-format
 msgid "%s posted on your profile wall at %s"
 msgstr "%s ha scritto sulla tua bacheca su %s"
 
-#: ../../mod/item.php:471
+#: ../../mod/item.php:471 ../../mod/item.php:523
 msgid "System error. Post not saved."
 msgstr "Errore di sistema. Messaggio non salvato."
 
-#: ../../mod/item.php:489
+#: ../../mod/item.php:489 ../../mod/item.php:541
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendika social network."
@@ -1604,11 +1655,11 @@ msgstr ""
 "Questo messaggio ti è stato inviato da %s, un membro del social network "
 "Friendika."
 
-#: ../../mod/item.php:491
+#: ../../mod/item.php:491 ../../mod/item.php:543
 msgid "You may visit them online at"
 msgstr "Puoi visitarli online a "
 
-#: ../../mod/item.php:493
+#: ../../mod/item.php:493 ../../mod/item.php:545
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
@@ -1616,7 +1667,7 @@ msgstr ""
 "Contatta il mittente rispondendo a questo post se non vuoi ricevere questi "
 "messaggi."
 
-#: ../../mod/item.php:495
+#: ../../mod/item.php:495 ../../mod/item.php:547
 #, php-format
 msgid "%s posted an update."
 msgstr "%s ha inviato un aggiornamento."
@@ -2486,11 +2537,11 @@ msgstr "Impostazioni"
 msgid "Profiles"
 msgstr "Profili"
 
-#: ../../include/items.php:1004
+#: ../../include/items.php:1004 ../../include/items.php:1027
 msgid "Birthday:"
 msgstr "Compleanno:"
 
-#: ../../include/items.php:1348
+#: ../../include/items.php:1348 ../../include/items.php:1371
 msgid "You have a new follower at "
 msgstr "Hai un nuovo seguace su "
 
@@ -2505,3 +2556,45 @@ msgstr "Tutti"
 #: ../../include/oembed.php:57
 msgid "Embedding disabled"
 msgstr "Inclusione disabilitata"
+
+#: ../../boot.php:2418
+msgid "Birthday Reminders"
+msgstr "Promemoria Compleanni"
+
+#: ../../mod/profile.php:160 ../../mod/editpost.php:66 ../../mod/network.php:95
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Inserisci video Theora [.ogg]"
+
+#: ../../mod/profile.php:161 ../../mod/editpost.php:67 ../../mod/network.php:96
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Inserisci audio Vorbis [.ogg]"
+
+#: ../../mod/profile.php:354 ../../mod/display.php:222
+#: ../../mod/editpost.php:62 ../../mod/network.php:392
+msgid "Edit"
+msgstr "Modifica"
+
+#: ../../mod/search.php:54
+msgid "No results."
+msgstr "Nessun risultato."
+
+#: ../../mod/photos.php:969
+msgid "<< Prev"
+msgstr "<< Prec"
+
+#: ../../mod/photos.php:977
+msgid "Next >>"
+msgstr "Succ >>"
+
+#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
+msgid "Item not found"
+msgstr "Elemento non trovato"
+
+#: ../../mod/editpost.php:32
+msgid "Edit post"
+msgstr "Modifica messaggio"
+
+#: ../../include/dba.php:31
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
+msgstr "Non trovo le informazioni DNS per il database server '%s'"
diff --git a/view/it/strings.php b/view/it/strings.php
index a09d9288e..68cf11793 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -24,8 +24,8 @@ $a->strings["last"] = "ultimo";
 $a->strings["next"] = "succ";
 $a->strings["%s likes this."] = "Piace a %s.";
 $a->strings["%s doesn't like this."] = "Non piace a %s.";
-$a->strings["<span  %1$s>%2$d people</span> like this."] = "Piace a <span %1$s>%2$d persone</span>.";
-$a->strings["<span  %1$s>%2$d people</span> don't like this."] = "Non piace a <span %1$s>%2$d persone</span>.";
+$a->strings["<span  %1\$s>%2\$d people</span> like this."] = "Piace a <span %1\$s>%2\$d persone</span>.";
+$a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = "Non piace a <span %1\$s>%2\$d persone</span>.";
 $a->strings["and"] = "e";
 $a->strings[", and %d other people"] = ", e altre %d persone";
 $a->strings["%s like this."] = "Piace a %s.";
@@ -66,7 +66,7 @@ $a->strings["[today]"] = "[oggi]";
 $a->strings["link to source"] = "Collegamento all'originale";
 $a->strings["Welcome back %s"] = "Bentornato %s";
 $a->strings["Manage Identities and/or Pages"] = "Gestisci Indentità e/o Pagine";
-$a->strings["(Toggle between different identities or community/group pages which shareyour account details.)"] = "";
+$a->strings["(Toggle between different identities or community/group pages which share your account details.)"] = "(Passa tra diverse identità o pagine di comunità/gruppi che condividono i dettagli del tuo account.)";
 $a->strings["Select an identity to manage: "] = "Seleziona una identità da gestire:";
 $a->strings["Submit"] = "Invia";
 $a->strings["Image exceeds size limit of %d"] = "La dimensionde dell'immagine supera il limite di %d";
@@ -92,10 +92,10 @@ $a->strings["I like this (toggle)"] = "Mi piace questo (metti/togli)";
 $a->strings["I don't like this (toggle)"] = "Non mi piace questo (metti/togli)";
 $a->strings["This is you"] = "Questo sei tu";
 $a->strings["Delete"] = "Cancella";
-$a->strings["View $name's profile"] = "Guarda il profilo di $name";
-$a->strings["Shared content is covered by the <ahref=\"http://creativecommons.org/licenses/by/3.0/\">Creative CommonsAttribution 3.0</a> license."] = "";
-$a->strings["The profile address specified does not provide adequate information."] = "";
-$a->strings["Limited profile. This person will be unable to receive direct/personalnotifications from you."] = "";
+$a->strings["View \$name's profile"] = "Guarda il profilo di \$name";
+$a->strings["Shared content is covered by the <a href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."] = "Il contenuto in comune è coperto dalla licenza <a href=\"http://creativecommons.org/licenses/by/3.0/deed.it\">Creative Commons Attribuzione 3.0</a>.";
+$a->strings["The profile address specified does not provide adequate information."] = "L'indirizzo del profilo specificato non fornisce adeguate informazioni.";
+$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Profilo limitato. Questa persona non sarà in grado di ricevere nofiche dirette/personali da te.";
 $a->strings["Unable to retrieve contact information."] = "Impossibile recuperare informazioni sul contatto.";
 $a->strings["following"] = "segue";
 $a->strings["Image uploaded but image cropping failed."] = "L'immagine è stata caricata, ma il ritaglio è fallito.";
@@ -115,7 +115,7 @@ $a->strings["Profile deleted."] = "Profilo elminato.";
 $a->strings["Profile-"] = "Profilo-";
 $a->strings["New profile created."] = "Nuovo profilo creato.";
 $a->strings["Profile unavailable to clone."] = "Impossibile duplicare il plrofilo.";
-$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong>be visible to anybody using the internet."] = "";
+$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Questo è il tuo profilo <strong>publico</strong>.<br /><strong>Potrebbe</strong> essere visto da chiunque attraverso internet.";
 $a->strings["Age: "] = "Età : ";
 $a->strings["Profile Image"] = "Immagine del Profilo";
 $a->strings["Passwords do not match. Password unchanged."] = "Le password non corrispondono. Passoword non cambiata.";
@@ -131,7 +131,7 @@ $a->strings["Plugin Settings"] = "Impostazioni Plugin";
 $a->strings["Account Settings"] = "Impostazioni Account";
 $a->strings["No Plugin settings configured"] = "Nessun Plugin ha delle configurazioni che puoi modificare";
 $a->strings["OpenID: "] = "OpenID: ";
-$a->strings["&nbsp;(Optional) Allow this OpenID to login to this account."] = "";
+$a->strings["&nbsp;(Optional) Allow this OpenID to login to this account."] = "&nbsp;(Opzionale) Permetti a questo OpenID di accedere a questo account.";
 $a->strings["Profile is <strong>not published</strong>."] = "Il profilo <strong>non è pubblicato</strong>.";
 $a->strings["Default Post Permissions"] = "Permessi di default per i messaggi";
 $a->strings["View in context"] = "Vedi nel contesto";
@@ -161,12 +161,12 @@ $a->strings["[Remove any tag]"] = "[Rimuovi tutti i tag]";
 $a->strings["New album name"] = "Nuovo nome album";
 $a->strings["Caption"] = "Didascalia";
 $a->strings["Add a Tag"] = "Aggiungi un tag";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Esempio: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
 $a->strings["Recent Photos"] = "Foto recenti";
 $a->strings["Upload New Photos"] = "Carica nuova foto";
 $a->strings["View Album"] = "Vedi album";
 $a->strings["Item not found."] = "Elemento non trovato.";
-$a->strings["View $owner_name's profile"] = "Guarda il profilo di $owner_name";
+$a->strings["View \$owner_name's profile"] = "Guarda il profilo di \$owner_name";
 $a->strings["to"] = "a";
 $a->strings["Wall-to-Wall"] = "Bacheca-A-Bacheca";
 $a->strings["via Wall-To-Wall:"] = "sulla sua Bacheca:";
@@ -206,7 +206,7 @@ $a->strings["Never"] = "Mai";
 $a->strings["(Update was successful)"] = "(L'aggiornamento è stato completato)";
 $a->strings["(Update was not successful)"] = "(L'aggiornamento non è stato completato)";
 $a->strings["Contact Editor"] = "Editor dei Contatti";
-$a->strings["Visit $name's profile"] = "Visita il profilo di $name";
+$a->strings["Visit \$name's profile"] = "Visita il profilo di \$name";
 $a->strings["Block/Unblock contact"] = "Blocca/Sblocca contatto";
 $a->strings["Ignore contact"] = "Ingnora il contatto";
 $a->strings["Delete contact"] = "Rimuovi contatto";
@@ -223,7 +223,7 @@ $a->strings["Show Blocked Connections"] = "Mostra connessioni bloccate";
 $a->strings["Hide Blocked Connections"] = "Nascondi connessioni bloccate";
 $a->strings["Finding: "] = "Cerco: ";
 $a->strings["Find"] = "Trova";
-$a->strings["Visit $username's profile"] = "Visita il profilo di $username";
+$a->strings["Visit \$username's profile"] = "Visita il profilo di \$username";
 $a->strings["Edit contact"] = "Modifca contatto";
 $a->strings["Remote privacy information not available."] = "Informazioni remote sulla privacy non disponibili.";
 $a->strings["Visible to:"] = "Visibile a:";
@@ -232,55 +232,55 @@ $a->strings["Please enter the required information."] = "Inserisci le informazio
 $a->strings["Please use a shorter name."] = "Usa un nome più corto.";
 $a->strings["Name too short."] = "Il Nome è troppo corto.";
 $a->strings["That doesn\\'t appear to be your full (First Last) name."] = "Questo non sembra essere il tuo nome completo (Nome Cognome).";
-$a->strings["Your email domain is not among those allowed on this site."] = "";
+$a->strings["Your email domain is not among those allowed on this site."] = "Il dominio della tua email non è tra quelli autorizzati su questo sito.";
 $a->strings["Not a valid email address."] = "Indirizzo email invaildo.";
 $a->strings["Cannot use that email."] = "Questa email non si puo' usare.";
-$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", andmust also begin with a letter."] = "";
+$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "Il tuo \"soprannome\" puo' contenere solo \"a-z\", \"0-9\", \"-\", e \"_\", e deve cominciare con una lettera.";
 $a->strings["Nickname is already registered. Please choose another."] = "Soprannome già registrato. Scegline un'altro.";
 $a->strings["SERIOUS ERROR: Generation of security keys failed."] = "ERRORE GRAVE: Generazione delle chiavi di sicurezza fallito.";
 $a->strings["An error occurred during registration. Please try again."] = "Si è verificato un errore durante la registrazione. Prova ancora.";
 $a->strings["An error occurred creating your default profile. Please try again."] = "Si è verificato un errore creando il tuo profilo. Prova ancora.";
-$a->strings["Registration successful. Please check your email for further instructions."] = "";
+$a->strings["Registration successful. Please check your email for further instructions."] = "Registrazione completata. Controlla la tua mail per ulteriori informazioni.";
 $a->strings["Failed to send email message. Here is the message that failed."] = "Errore inviando il messaggio email. Questo è il messaggio non inviato.";
 $a->strings["Your registration can not be processed."] = "La tua registrazione non puo' essere elaborata.";
 $a->strings["Registration request at %s"] = "Richiesta di registrazione su %s";
-$a->strings["Your registration is pending approval by the site owner."] = "";
-$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenIDand clicking 'Register'."] = "";
-$a->strings["If you are not familiar with OpenID, please leave that field blank and fillin the rest of the items."] = "";
+$a->strings["Your registration is pending approval by the site owner."] = "La tua richiesta è in attesa di approvazione da parte del prorietario del sito.";
+$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Puoi (opzionalmento) riempire questa maschera via OpenID inserendo il tuo OpenID e cliccando 'Registra'.";
+$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Se non hai familiarità con OpenID, lascia quel campo in bianco e riempi il resto della maschera.";
 $a->strings["Your OpenID (optional): "] = "Il tuo OpenID (opzionale): ";
-$a->strings["Members of this network prefer to communicate with real people who use theirreal names."] = "";
+$a->strings["Members of this network prefer to communicate with real people who use their real names."] = "I membri di questo network preferiscono comunicare con persone reali che usano i loro nomi reali.";
 $a->strings["Include your profile in member directory?"] = "Includi il tuo profilo nell'elenco dei membir?";
 $a->strings["Yes"] = "Si";
 $a->strings["No"] = "No";
 $a->strings["Registration"] = "Registrazione";
 $a->strings["Your Full Name (e.g. Joe Smith): "] = "Il tuo Nome Completo (p.e. Mario Rossi): ";
 $a->strings["Your Email Address: "] = "Il tuo Indirizzo Email: ";
-$a->strings["Choose a profile nickname. This must begin with a text character. Yourprofile address on this site will then be'<strong>nickname@$sitename</strong>'."] = "";
+$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Scegli un soprannome. Deve cominciare con un carattere. L'indirizzo del tuo profilo sarà '<strong>soprannome@\$sitename</strong>'.";
 $a->strings["Choose a nickname: "] = "Scegli un soprannome: ";
 $a->strings["Could not create/connect to database."] = "Impossibile creare/collegarsi al database.";
 $a->strings["Connected to database."] = "Collegato al database.";
 $a->strings["Database import succeeded."] = "Importazione database completata.";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Devi impostare manualmente un operazione pianificata per il poller";
 $a->strings["Please see the file \"INSTALL.txt\"."] = "Guarda il file \"INSTALL.txt\".";
 $a->strings["Database import failed."] = "Importazione database fallita.";
-$a->strings["You may need to import the file \"database.sql\" manually using phpmyadminor mysql."] = "";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Potresti dover importare il file \"database.sql\" manualmente con phpmyadmin o mysql";
 $a->strings["Welcome to Friendika."] = "Benvenuto su Friendika.";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "";
-$a->strings["This is required. Please adjust the configuration file .htconfig.phpaccordingly."] = "E' richiesto. Aggiorna il file .htconfig.php di conseguenza.";
-$a->strings["The command line version of PHP on your system does not have\"register_argc_argv\" enabled."] = "";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Non riesco a trovare una versione da riga di comando di PHP nel PATH del server web";
+$a->strings["This is required. Please adjust the configuration file .htconfig.php accordingly."] = "E' richiesto. Aggiorna il file .htconfig.php di conseguenza.";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La versione da riga di comando di PHP nel sistema non ha abilitato \"register_argc_argv\".";
 $a->strings["This is required for message delivery to work."] = "Ciò è richiesto per far funzionare la consegna dei messaggi.";
-$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able togenerate encryption keys"] = "";
-$a->strings["If running under Windows, please see\"http://www.php.net/manual/en/openssl.installation.php\"."] = "";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Errore: la funzione \"openssl_pkey_new\" in questo sistema non è in grado di generare le chiavi di criptazione";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Se stai eseguendo friendika su windows, guarda \"http://www.php.net/manual/en/openssl.installation.php\".";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Errore: il modulo mod-rewrite di Apache &egreve; richiesto ma non installato";
 $a->strings["Error: libCURL PHP module required but not installed."] = "Errore: il modulo libCURL di PHP è richiesto ma non installato.";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Errore: Il modulo GD graphics di PHP con supporto a JPEG è richiesto ma non installato.";
 $a->strings["Error: openssl PHP module required but not installed."] = "Errore: il modulo openssl di PHP è richiesto ma non installato.";
 $a->strings["Error: mysqli PHP module required but not installed."] = "Errore: il modulo mysqli di PHP è richiesto ma non installato";
-$a->strings["The web installer needs to be able to create a file called \".htconfig.php\in the top folder of your web server and it is unable to do so."] = "";
-$a->strings["This is most often a permission setting, as the web server may not be ableto write files in your folder - even if you can."] = "";
-$a->strings["Please check with your site documentation or support people to see if thissituation can be corrected."] = "";
-$a->strings["If not, you may be required to perform a manual installation. Please see thefile \"INSTALL.txt\" for instructions."] = "";
-$a->strings["The database configuration file \".htconfig.php\" could not be written.Please use the enclosed text to create a configuration file in your webserver root."] = "";
+$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "L'installazione web deve poter creare un file chiamato \".htconfig.php\" nella cartella principale del tuo web server ma non è in grado di farlo.";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Ciò è dovuto spesso a impostazioni di permessi, dato che il web server puo' scrivere il file nella tua cartella, anche se tu puoi.";
+$a->strings["Please check with your site documentation or support people to see if this situation can be corrected."] = "Controlla la documentazione del tuo sito o con il personale di suporto se la situazione puo' essere corretta.";
+$a->strings["If not, you may be required to perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Altrimenti dovrai procedere con l'installazione manuale. Guarda il file \"INSTALL.txt\" per istuzioni";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Il file di configurazione del database \".htconfig.php\" non puo' essere scritto. Usa il testo qui di seguito per creare un file di configurazione nella cartella principale del tuo sito.";
 $a->strings["Errors encountered creating database tables."] = "Errori creando le tabelle nel database.";
 $a->strings["Normal View"] = "Vista normale";
 $a->strings["New Item View"] = "Vista Nuovi Elementi";
@@ -305,8 +305,8 @@ $a->strings["Approve"] = "Approva";
 $a->strings["No notifications."] = "Nessuna notifica.";
 $a->strings["No registrations."] = "Nessuna registrazione.";
 $a->strings["This introduction has already been accepted."] = "Questa presentazione è già stata accettata.";
-$a->strings["Profile location is not valid or does not contain profile information."] = "";
-$a->strings["Warning: profile location has no identifiable owner name."] = "";
+$a->strings["Profile location is not valid or does not contain profile information."] = "La posizione del profilo non è valida o non contiene informazioni di profilo.";
+$a->strings["Warning: profile location has no identifiable owner name."] = "Attenzione: la posizione del profilo non ha un identificabile proprietario.";
 $a->strings["Warning: profile location has no profile photo."] = "Attenzione: la posizione del profilo non ha una foto.";
 $a->strings["%d required parameter was not found at the given location"] = array(
 	0 => "%d parametro richiesto non è stato trovato nella posizione data",
@@ -326,14 +326,14 @@ $a->strings["Invalid profile URL."] = "Indirizzo profilo invalido.";
 $a->strings["Disallowed profile URL."] = "Indirizzo profilo non permesso.";
 $a->strings["Your introduction has been sent."] = "La tua presentazione è stata inviata.";
 $a->strings["Please login to confirm introduction."] = "Accedi per confermare la presentazione.";
-$a->strings["Incorrect identity currently logged in. Please login to<strong>this</strong> profile."] = "";
+$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Accesso con identà incorretta. Accedi a <strong>questo</strong> profilo.";
 $a->strings["[Name Withheld]"] = "[Nome Nascosto]";
 $a->strings["Introduction received at "] = "Introduzione ricevuta su ";
 $a->strings["Friend/Connection Request"] = "Richieste di Amicizia/Connessione";
 $a->strings["Please answer the following:"] = "Rispondi al seguente:";
-$a->strings["Does $name know you?"] = "$name ti conosce?";
+$a->strings["Does \$name know you?"] = "$name ti conosce?";
 $a->strings["Add a personal note:"] = "Aggiungi una nota personale:";
-$a->strings["Please enter your profile address from one of the following supported socialnetworks:"] = "";
+$a->strings["Please enter your profile address from one of the following supported social networks:"] = "Inserisci l'indirizzo del tue profilo da uno dei seguenti supportati seocial network:";
 $a->strings["Friendika"] = "Friendika";
 $a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web";
 $a->strings["Private (secure) network"] = "Network (sicuro) privato";
@@ -342,11 +342,11 @@ $a->strings["Your profile address:"] = "L'indirizzo del tuo profilo:";
 $a->strings["Submit Request"] = "Invia richiesta";
 $a->strings["Cancel"] = "Annulla";
 $a->strings["status"] = "stato";
-$a->strings["%1$s likes %2$s's %3$s"] = "A %1$s piace %3$s di %2$s";
-$a->strings["%1$s doesn't like %2$s's %3$s"] = "A %1$s non piace %3$s di %2$s";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s piace %3\$s di %2\$s";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s non piace %3\$s di %2\$s";
 $a->strings["Password reset requested at %s"] = "Richiesta recupero password su %s";
 $a->strings["Remove My Account"] = "Rimuovi il mio Account";
-$a->strings["This will completely remove your account. Once this has been done it is notrecoverable."] = "";
+$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Questo rimuoverà completamente il tuo account. Una volta rimosso non si potrà recuperarlo.";
 $a->strings["Please enter your password for verification:"] = "Inserisci la tua password per verifica:";
 $a->strings["Applications"] = "Applicazioni";
 $a->strings["Global Directory"] = "Elenco Globale";
@@ -355,9 +355,9 @@ $a->strings["Empty post discarded."] = "Messaggio vuoto scartato.";
 $a->strings["%s commented on your item at %s"] = "%s ha commentato un tuo elemento su %s";
 $a->strings["%s posted on your profile wall at %s"] = "%s ha scritto sulla tua bacheca su %s";
 $a->strings["System error. Post not saved."] = "Errore di sistema. Messaggio non salvato.";
-$a->strings["This message was sent to you by %s, a member of the Friendika social network."] = "";
+$a->strings["This message was sent to you by %s, a member of the Friendika social network."] = "Questo messaggio ti è stato inviato da %s, un membro del social network Friendika.";
 $a->strings["You may visit them online at"] = "Puoi visitarli online a ";
-$a->strings["Please contact the sender by replying to this post if you do not wish toreceive these messages."] = "";
+$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Contatta il mittente rispondendo a questo post se non vuoi ricevere questi messaggi.";
 $a->strings["%s posted an update."] = "%s ha inviato un aggiornamento.";
 $a->strings["Tag removed"] = "TAg rimosso";
 $a->strings["Remove Item Tag"] = "Rimuovi tag dall'elemento";
@@ -392,10 +392,10 @@ $a->strings["Unable to set contact photo."] = "Impossibile impostare la foto del
 $a->strings["is now friends with"] = "ora è amico di";
 $a->strings["No user record found for '%s' "] = "Nessun utente trovato per '%s'";
 $a->strings["Our site encryption key is apparently messed up."] = "La nostra chiave di criptazione del sito è apparentemente incasinata.";
-$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "";
+$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "E' stato fornito un indirizzo vuoto o non possiamo decriptare l'indirizzo.";
 $a->strings["Contact record was not found for you on our site."] = "Il contatto non è stato trovato sul nostro sito.";
-$a->strings["The ID provided by your system is a duplicate on our system. It should workif you try again."] = "";
-$a->strings["Unable to set your contact credentials on our system."] = "";
+$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "L'ID fornito dal tuo sistema è duplicato sul nostro sistema. Dovrebbe funzionare se provi ancora.";
+$a->strings["Unable to set your contact credentials on our system."] = "Impossibile impostare le credenziali del tuo contatto sul nostro sistema.";
 $a->strings["Unable to update your contact profile details on our system"] = "Impossibile aggiornare i dettagli del tuo contatto sul nostro sistema";
 $a->strings["Connection accepted at %s"] = "Connession accettata su %s";
 $a->strings["Login failed."] = "Accesso fallito.";
@@ -411,39 +411,39 @@ $a->strings["Group removed."] = "Gruppo rimosso.";
 $a->strings["Unable to remove group."] = "Impossibile rimuovere il gruppo.";
 $a->strings["Post to Twitter"] = "Inva a Twitter";
 $a->strings["Twitter Posting Settings"] = "Impostazioni Invio a Twitter";
-$a->strings["No consumer key pair for Twitter found. Please contact your siteadministrator."] = "";
-$a->strings["At this Friendika instance the Twitter plugin was enabled but you have notyet connected your account to your Twitter account. To do so click thebutton below to get a PIN from Twitter which you have to copy into the inputbox below and submit the form. Only your <strong>public</strong> posts willbe posted to Twitter."] = "";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nessuna coopia di chiavi per Twitter trovata. Contatta il tuo amministratore del sito.";
+$a->strings["At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Questa installazione di Friendika ha il plugin Twitter abilitato, ma non hai ancora collegato il tuo account locale con il tuo account su Twitter. Per farlo, clicca il bottone qui sotto per ottenere un PIN da Twitter, che dovrai copiare nel box più sotto per poi inviare la form. Solo i tuoi messaggi <strong>pubblici</strong> verranno inviati anche su Twitter.";
 $a->strings["Log in with Twitter"] = "Accedi con Twitter";
 $a->strings["Copy the PIN from Twitter here"] = "Copia il PIN da Twitter qui";
 $a->strings["Currently connected to: "] = "Al momento collegato con:";
-$a->strings["If enabled all your <strong>public</strong> postings will be posted to theassociated Twitter account as well."] = "";
+$a->strings["If enabled all your <strong>public</strong> postings will be posted to the associated Twitter account as well."] = "Se abilitato tutti i tuoi messaggi <strong>pubblici</strong> verranno inviati anche sull'account Twitter associato.";
 $a->strings["Send public postings to Twitter"] = "Invia messaggi pubblici su Twitter";
 $a->strings["Clear OAuth configuration"] = "Cancella la configurazione OAuth";
 $a->strings["Post to StatusNet"] = "Invia a StatusNet";
 $a->strings["StatusNet Posting Settings"] = "Impostazioni di invio a StatusNet";
-$a->strings["No consumer key pair for StatusNet found. Register your Friendika Account asan desktop client on your StatusNet account, copy the consumer key pair hereand enter the API base root.<br />Before you register your own OAuth keypair ask the administrator if there is already a key pair for this Friendikainstallation at your favorited StatusNet installation."] = "";
+$a->strings["No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation."] = "Nessuna coppia di chiavi consumer per StatusNet trovata. Regitstra il tuo Account Friendika come un client desktop sul tuo account StatusNet, copia la coppia di chiavi qui e inserisci l'url di base delle API.<br />Prima di registrare la tua coppia di chiavi OAuth, chiedi all'amministratore se esiste già una coppia di chiavi per questa installazione di Friendika sulla installazione di StatusNet che ti interessa.";
 $a->strings["OAuth Consumer Key"] = "OAuth Consumer Key";
 $a->strings["OAuth Consumer Secret"] = "OAuth Consumer Secret";
 $a->strings["Base API Path (remember the trailing /)"] = "Indirizzo di base per le API (ricorda la / alla fine)";
-$a->strings["To connect to your StatusNet account click the button below to get asecurity code from StatusNet which you have to copy into the input box belowand submit the form. Only your <strong>public</strong> posts will be postedto StatusNet."] = "";
+$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet."] = "Per collegare il tuo account StatusNet, clicca sul bottone qui sotto per ottenere un codice di sicurezza da StatusNet, che dovrai copiare nel box più sotto per poi inviare la form. Solo i tuoi messaggi <strong>pubblci</strong> saranno inviati a StatusNet.";
 $a->strings["Log in with StatusNet"] = "Login con StatuNet";
 $a->strings["Copy the security code from StatusNet here"] = "Copia il codice di sicurezza da StatusNet qui";
-$a->strings["If enabled all your <strong>public</strong> postings will be posted to theassociated StatusNet account as well."] = "";
+$a->strings["If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account as well."] = "Se abilitato tutti i tuoi messaggi <strong>pubblici</strong> verranno inviati anche sull'account StatusNet associato.";
 $a->strings["Send public postings to StatusNet"] = "Invia messaggi pubblici su StatusNet";
 $a->strings["Three Dimensional Tic-Tac-Toe"] = "Tic-Tac-Toe tridimensionale";
 $a->strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
 $a->strings["New game"] = "Nuovo gioco";
 $a->strings["New game with handicap"] = "Nuovo gioco con l'handicap";
-$a->strings["Three dimensional tic-tac-toe is just like the traditional game except thatit is played on multiple levels simultaneously."] = "";
-$a->strings["In this case there are three levels. You win by getting three in a row onany level, as well as up, down, and diagonally across the different levels."] = "";
-$a->strings["The handicap game disables the center position on the middle level becausethe player claiming this square often has an unfair advantage."] = "";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Tic-tac-toe tridimensionale è come il gioco tradizionale, solo che si gioca su livelli multipli contemporaneamente.";
+$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "In questo caso ci sono tra livelli. Puoi vincere facendo tre caselle in fila su ogni livello, anche verso l'alto, il basso e diagonalmente anche attraverso i diversi livelli.";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "L'handicap disabilita la casella centrale sul livello di mezzo, perchè il giocatore che si prende quella casella spesso ha un deciso vantaggio.";
 $a->strings["You go first..."] = "Cominci tu...";
 $a->strings["I'm going first this time..."] = "Comincio io questa volta...";
 $a->strings["You won!"] = "Hai vinto!";
 $a->strings["\"Cat\" game!"] = "Stallo!";
 $a->strings["I won!"] = "Ho vinto!";
 $a->strings["Select files to upload: "] = "Seleziona i file da caricare: ";
-$a->strings["Use the following controls only if the Java uploader [above] fails to launch."] = "";
+$a->strings["Use the following controls only if the Java uploader [above] fails to launch."] = "Usa il seguente controllo solo se il il caricatore Java (qui sopra) non parte.";
 $a->strings["Facebook disabled"] = "Facebook disabilitato";
 $a->strings["Facebook API key is missing."] = "Chiave API Facebook mancante.";
 $a->strings["Facebook Connect"] = "Facebook Connect";
@@ -463,7 +463,7 @@ $a->strings["No files were uploaded."] = "Nessun file è stato caricato.";
 $a->strings["Uploaded file is empty"] = "Il file caricato è vuoto";
 $a->strings["Uploaded file is too large"] = "Il file caricato è troppo grande";
 $a->strings["File has an invalid extension, it should be one of "] = "Il file ha una estensione non valida, dovrebbe essere una di ";
-$a->strings["Upload was cancelled, or server error encountered"] = "";
+$a->strings["Upload was cancelled, or server error encountered"] = "Il caricamento è stato cancellato, o si è verificato un errore sul server";
 $a->strings["Unknown | Not categorised"] = "Sconosciuto | non categorizzato";
 $a->strings["Block immediately"] = "Blocca immediatamente";
 $a->strings["Shady, spammer, self-marketer"] = "Shady, spammer, self-marketer";
@@ -563,3 +563,13 @@ $a->strings["You have a new follower at "] = "Hai un nuovo seguace su ";
 $a->strings["Create a new group"] = "Crea un nuovo gruppo";
 $a->strings["Everybody"] = "Tutti";
 $a->strings["Embedding disabled"] = "Inclusione disabilitata";
+$a->strings["Birthday Reminders"] = "Promemoria Compleanni";
+$a->strings["Insert Vorbis [.ogg] video"] = "Inserisci video Theora [.ogg]";
+$a->strings["Insert Vorbis [.ogg] audio"] = "Inserisci audio Vorbis [.ogg]";
+$a->strings["Edit"] = "Modifica";
+$a->strings["No results."] = "Nessun risultato.";
+$a->strings["<< Prev"] = "<< Prec";
+$a->strings["Next >>"] = "Succ >>";
+$a->strings["Item not found"] = "Elemento non trovato";
+$a->strings["Edit post"] = "Modifica messaggio";
+$a->strings["Cannot locate DNS info for database server '%s'"] = "Non trovo le informazioni DNS per il database server '%s'";