From 720c1357277e2bb9ad5f9b4f2d23b2834fb1c659 Mon Sep 17 00:00:00 2001
From: Sylke Vicious <41053887+silkevicious@users.noreply.github.com>
Date: Thu, 10 Jan 2019 19:42:14 +0000
Subject: [PATCH] Updated italian translation (#979)

* Updated italian translation

* Updated italian translation

* Fix for CircleCI failing test
---
 app/src/main/res/values-it/strings.xml | 47 +++++++++++++++++---------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 782b7eba..c8e0610f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <string name="error_generic">Si è verificato un errore.</string>
     <string name="error_empty">Questo non può esser vuoto.</string>
@@ -83,6 +82,7 @@
     <string name="action_close">Chiudi</string>
     <string name="action_view_profile">Profilo</string>
     <string name="action_view_preferences">Preferenze</string>
+	<string name="action_view_account_preferences">Preferenze Account</string>
     <string name="action_view_favourites">Preferiti</string>
     <string name="action_view_mutes">Utenti silenziati</string>
     <string name="action_view_blocks">Utenti bloccati</string>
@@ -176,6 +176,7 @@
     <string name="pref_title_notification_filter_reblogs">i miei post sono boostati</string>
     <string name="pref_title_notification_filter_favourites">i miei post sono messi nei preferiti</string>
     <string name="pref_title_appearance_settings">Aspetto</string>
+	<string name="pref_title_timelines">Timelines</string>
     <string name="pref_title_app_theme">Tema dell\'app</string>
 
     <string-array name="app_theme_names">
@@ -201,7 +202,9 @@
     <string name="pref_title_http_proxy_port">Porta proxy HTTP</string>
 
     <string name="pref_default_post_privacy">Privacy di default dei post</string>
-    <string name="pref_publishing">Pubblicando</string>
+    <string name="pref_default_media_sensitivity">Segna sempre media come contenuto sensibile</string>
+    <string name="pref_publishing">Pubblicando (sincronizzato con il server)</string>
+    <string name="pref_failed_to_sync">Sincronizzazione delle impostazioni fallita</string>
 
     <string-array name="post_privacy_names">
         <item>Pubblico</item>
@@ -218,7 +221,15 @@
         <item>Grande</item>
         <item>Grandissimo</item>
     </string-array>
-
+	
+	<string name="pref_media_display">Media mostrati</string>
+	
+	<string-array name="media_display_names">
+		<item>Nascondi media segnati come sensibili</item>
+		<item>Mostra sempre media segnati come sensibili</item>
+		<item>Nascondi sempre tutti i media</item>
+	</string-array>
+	
     <string name="notification_channel_mention_name">Nuove Menzioni</string>
     <string name="notification_channel_mention_descriptions">Notifiche quando qualcuno ti menziona</string>
     <string name="notification_channel_follow_name">Nuove persone che ti seguono</string>
@@ -295,7 +306,8 @@
     <string name="compose_active_account_description">Pubblicando con l\'account %1$s</string>
 
     <string name="error_failed_set_caption">Impostazione del sottotitolo non riuscita</string>
-    <string name="action_set_caption">Inserisci sottotitolo</string>
+	<string name="hint_describe_for_visually_impaired">Descrivi per ipovedenti\n(limite di %d caratteri)</string>
+    <string name="action_set_caption">Inserisci descrizione</string>
     <string name="action_remove_media">Rimuovi</string>
     <string name="lock_account_label">Blocca account</string>
     <string name="lock_account_label_description">Richiede la tua approvazione manuale di chi ti segue</string>
@@ -320,7 +332,7 @@
     <string name="later">Più tardi</string>
     <string name="restart">Riavvia</string>
     <string name="caption_systememoji">Le emoji predefinite del tuo dispositivo</string>
-    <string name="caption_blobmoji" tools:ignore="TypographyDashes">Le emoji Blob conosciute da Android 4.4-7.1</string>
+    <string name="caption_blobmoji">Le emoji Blob conosciute da Android 4.4-7.1</string>
     <string name="caption_twemoji">Le emoji standard di Mastodon</string>
 
     <string name="download_failed">Scaricamento fallito</string>
@@ -347,15 +359,18 @@
 
     <string name="unpin_action">Non fissare</string>
     <string name="pin_action">Fissa</string>
+	
+	<plurals name="favs">
+		<item quantity="one">&lt;b>%1$s&lt;/b> Mi piace</item>
+		<item quantity="other">&lt;b>%1$s&lt;/b> Mi piace</item>
+	</plurals>
+
+	<plurals name="reblogs">
+		<item quantity="one">&lt;b>%s&lt;/b> Boost</item>
+		<item quantity="other">&lt;b>%s&lt;/b> Boosts</item>
+	</plurals>
+	
+	<string name="title_reblogged_by">Boostato da</string>
+	<string name="title_favourited_by">Preferito da</string>
 
-<string name="action_view_account_preferences">Preferenze dell\'Account</string>
-    <string name="pref_title_timelines">Timeline</string>
-
-    <string name="pref_default_media_sensitivity">Segna sempre media come sensibili</string>
-    <string name="pref_failed_to_sync">Sincronizzazione delle impostazioni fallita</string>
-
-    <string name="pref_media_display">Media mostrati</string>
-
-    <string name="hint_describe_for_visually_impaired">Descrivi per ipovedenti
-\n(%d caratteri limite)</string>
     </resources>