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

1 files changed, 7 insertions, 7 deletions

diff --git a/view/it/strings.php b/view/it/strings.php
index 46fd30dc2..1f81286f5 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -27,7 +27,7 @@ $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s non piace %3\$s di %2
 $a->strings["%1\$s is now connected with %2\$s"] = "%1\$s adesso è connesso con %2\$s";
 $a->strings["%1\$s poked %2\$s"] = "%1\$s ha mandato un poke a %2\$s";
 $a->strings["poked"] = "ha ricevuto un poke";
-$a->strings["%1\$s is %2\$s"] = "%1\$s è %2\$s";
+$a->strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s è %2\$s";
 $a->strings["Select"] = "Seleziona";
 $a->strings["Delete"] = "Elimina";
 $a->strings["Private Message"] = "Messaggio privato";
@@ -293,7 +293,7 @@ $a->strings["%d invitation available"] = array(
 $a->strings["Advanced"] = "Avanzate";
 $a->strings["Find Channels"] = "Ricerca canali";
 $a->strings["Enter name or interest"] = "Scrivi un nome o un interesse";
-$a->strings["Connect/Follow"] = "Entra in contatto";
+$a->strings["Connect/Follow"] = "Aggiungi";
 $a->strings["Examples: Robert Morgenstein, Fishing"] = "Per esempio: Mario Rossi, Pesca";
 $a->strings["Find"] = "Cerca";
 $a->strings["Channel Suggestions"] = "Canali suggeriti";
@@ -458,7 +458,7 @@ $a->strings["Default Profile"] = "Profilo predefinito";
 $a->strings["Friends"] = "Amici";
 $a->strings["Requested channel is not available."] = "Il canale che cerchi non è disponibile.";
 $a->strings["Requested profile is not available."] = "Il profilo richiesto non è disponibile.";
-$a->strings["Connect"] = "Entra in contatto";
+$a->strings["Connect"] = "Aggiungi";
 $a->strings["Change profile photo"] = "Cambia la foto del profilo";
 $a->strings["Profiles"] = "Profili";
 $a->strings["Manage/edit profiles"] = "Gestisci/modifica i profili";
@@ -639,11 +639,11 @@ $a->strings["Bookmarked Chatrooms"] = "Chat nei segnalibri";
 $a->strings["Suggested Chatrooms"] = "Chat suggerite";
 $a->strings["Save to Folder"] = "Salva nella cartella";
 $a->strings["View all"] = "Vedi tutto";
-$a->strings["Like"] = array(
+$a->strings["__ctx:noun__ Like"] = array(
 	0 => "Mi piace",
 	1 => "Mi piace",
 );
-$a->strings["Dislike"] = array(
+$a->strings["__ctx:noun__ Dislike"] = array(
 	0 => "Non mi piace",
 	1 => "Non mi piace",
 );
@@ -663,8 +663,8 @@ $a->strings["Wall-to-Wall"] = "Da bacheca a bacheca";
 $a->strings["via Wall-To-Wall:"] = "da bacheca a bacheca:";
 $a->strings["Save Bookmarks"] = "Salva segnalibro";
 $a->strings["Add to Calendar"] = "Aggiungi al calendario";
-$a->strings["Likes"] = "Mi piace";
-$a->strings["Dislikes"] = "Non mi piace";
+$a->strings["__ctx:noun__ Likes"] = "Mi piace";
+$a->strings["__ctx:noun__ Dislikes"] = "Non mi piace";
 $a->strings["%d comment"] = array(
 	0 => "%d commento",
 	1 => "%d commenti",