Merge remote-tracking branch 'upstream/master'

Merge upstream

19 files changed, 2 insertions, 2 deletions

diff --git a/view/it/cmnt_received_eml.tpl b/view/it/cmnt_received_eml.tpl
index 1991d29ae..1991d29ae 100755..100644
--- a/view/it/cmnt_received_eml.tpl
+++ b/view/it/cmnt_received_eml.tpl
diff --git a/view/it/cmnt_received_html_body_eml.tpl b/view/it/cmnt_received_html_body_eml.tpl
index 5f2edb84b..5f2edb84b 100755..100644
--- a/view/it/cmnt_received_html_body_eml.tpl
+++ b/view/it/cmnt_received_html_body_eml.tpl
diff --git a/view/it/cmnt_received_text_body_eml.tpl b/view/it/cmnt_received_text_body_eml.tpl
index 1991d29ae..1991d29ae 100755..100644
--- a/view/it/cmnt_received_text_body_eml.tpl
+++ b/view/it/cmnt_received_text_body_eml.tpl
diff --git a/view/it/follow_notify_eml.tpl b/view/it/follow_notify_eml.tpl
index 635dbbc29..635dbbc29 100755..100644
--- a/view/it/follow_notify_eml.tpl
+++ b/view/it/follow_notify_eml.tpl
diff --git a/view/it/friend_complete_eml.tpl b/view/it/friend_complete_eml.tpl
index 67ad67b05..67ad67b05 100755..100644
--- a/view/it/friend_complete_eml.tpl
+++ b/view/it/friend_complete_eml.tpl
diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl
index 6158f6a33..6158f6a33 100755..100644
--- a/view/it/htconfig.tpl
+++ b/view/it/htconfig.tpl
diff --git a/view/it/intro_complete_eml.tpl b/view/it/intro_complete_eml.tpl
index 9da946a56..9da946a56 100755..100644
--- a/view/it/intro_complete_eml.tpl
+++ b/view/it/intro_complete_eml.tpl
diff --git a/view/it/lostpass_eml.tpl b/view/it/lostpass_eml.tpl
index 7349717ea..7349717ea 100755..100644
--- a/view/it/lostpass_eml.tpl
+++ b/view/it/lostpass_eml.tpl
diff --git a/view/it/mail_received_html_body_eml.tpl b/view/it/mail_received_html_body_eml.tpl
index 847954550..847954550 100755..100644
--- a/view/it/mail_received_html_body_eml.tpl
+++ b/view/it/mail_received_html_body_eml.tpl
diff --git a/view/it/mail_received_text_body_eml.tpl b/view/it/mail_received_text_body_eml.tpl
index c7da9533f..c7da9533f 100755..100644
--- a/view/it/mail_received_text_body_eml.tpl
+++ b/view/it/mail_received_text_body_eml.tpl
diff --git a/view/it/messages.po b/view/it/messages.po
index e0375764f..855a24ee8 100755..100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -3104,7 +3104,7 @@ msgstr "Account abbandonati dopo x giorni"
 
 #: ../../mod/admin.php:313
 msgid ""
-"Will not waste system resources polling external sites for abandonded "
+"Will not waste system resources polling external sites for abandoned "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 "Non spreca risorse di sistema controllando siti esterni per gli account "
diff --git a/view/it/passchanged_eml.tpl b/view/it/passchanged_eml.tpl
index 290e4db94..290e4db94 100755..100644
--- a/view/it/passchanged_eml.tpl
+++ b/view/it/passchanged_eml.tpl
diff --git a/view/it/register_open_eml.tpl b/view/it/register_open_eml.tpl
index e5f5af80c..e5f5af80c 100755..100644
--- a/view/it/register_open_eml.tpl
+++ b/view/it/register_open_eml.tpl
diff --git a/view/it/register_verify_eml.tpl b/view/it/register_verify_eml.tpl
index f1a34dbf4..f1a34dbf4 100755..100644
--- a/view/it/register_verify_eml.tpl
+++ b/view/it/register_verify_eml.tpl
diff --git a/view/it/request_notify_eml.tpl b/view/it/request_notify_eml.tpl
index 50532cbd4..50532cbd4 100755..100644
--- a/view/it/request_notify_eml.tpl
+++ b/view/it/request_notify_eml.tpl
diff --git a/view/it/strings.php b/view/it/strings.php
index 5fd187f7a..93bcbd465 100755..100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -674,7 +674,7 @@ $a->strings["Maximum image size"] = "Massima dimensione immagini";
 $a->strings["Register policy"] = "Politica di registrazione";
 $a->strings["Register text"] = "Testo registrazione";
 $a->strings["Accounts abandoned after x days"] = "Account abbandonati dopo x giorni";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Non spreca risorse di sistema controllando siti esterni per gli account abbandonati. Immettere 0 per nessun limite di tempo.";
+$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "Non spreca risorse di sistema controllando siti esterni per gli account abbandonati. Immettere 0 per nessun limite di tempo.";
 $a->strings["Allowed friend domains"] = "Domini amici consentiti";
 $a->strings["Allowed email domains"] = "Domini email consentiti";
 $a->strings["Block public"] = "Blocca pagine pubbliche";
diff --git a/view/it/wall_received_eml.tpl b/view/it/wall_received_eml.tpl
index ba9e25901..ba9e25901 100755..100644
--- a/view/it/wall_received_eml.tpl
+++ b/view/it/wall_received_eml.tpl
diff --git a/view/it/wall_received_html_body_eml.tpl b/view/it/wall_received_html_body_eml.tpl
index cdc05cfa3..cdc05cfa3 100755..100644
--- a/view/it/wall_received_html_body_eml.tpl
+++ b/view/it/wall_received_html_body_eml.tpl
diff --git a/view/it/wall_received_text_body_eml.tpl b/view/it/wall_received_text_body_eml.tpl
index 327557ea1..327557ea1 100755..100644
--- a/view/it/wall_received_text_body_eml.tpl
+++ b/view/it/wall_received_text_body_eml.tpl