From 01c216ac32ac5b58b6e142e7fd3e540bddb5a119 Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Wed, 15 Mar 2017 04:16:05 -0700
Subject: [PATCH] =?utf8?q?Updated=20Spanish=20translation=20by=20Jose=20A.?=
 =?utf8?q?=20Le=C3=B3n=20Becerra=20and=20updated=20Italian=20translation?=
 =?utf8?q?=20by=20Francesco=20Buratti.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |  2 +-
 app/src/free/res/values-es/strings.xml        |  2 ++
 .../fragments/DomainSettingsFragment.java     |  2 +-
 app/src/main/res/values-es/strings.xml        | 10 ++++++-
 app/src/main/res/values-it/strings.xml        | 28 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  2 +-
 6 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 95f0f031..1caa1363 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/free/res/values-es/strings.xml b/app/src/free/res/values-es/strings.xml
index c3554498..6416972f 100644
--- a/app/src/free/res/values-es/strings.xml
+++ b/app/src/free/res/values-es/strings.xml
@@ -3,6 +3,8 @@
 <!--
   Copyright 2016 Soren Stoutner <soren@stoutner.com>.
 
+  Translation 2017 Jose A. León Becerra <emails@joseleon.me>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
+
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
   Privacy Browser is free software: you can redistribute it and/or modify
diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java
index 25467730..0d35ead6 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java
@@ -184,7 +184,7 @@ public class DomainSettingsFragment extends Fragment {
                 domStorageEnabledSwitch.setChecked(true);
                 domStorageEnabledSwitch.setEnabled(false);
                 domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_ghosted));
-            } else {  // Both JavaScript and DOM storae are disabled.
+            } else {  // Both JavaScript and DOM storage are disabled.
                 domStorageEnabledSwitch.setChecked(false);
                 domStorageEnabledSwitch.setEnabled(false);
                 domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_ghosted));
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1199cf56..28ac7b07 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -3,7 +3,7 @@
 <!--
   Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
-  Translation 2017 Jose A. León Becerra.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
+  Translation 2017 Jose A. León Becerra <emails@joseleon.me>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
   Este archivo es parte de Navegador Privado (Privacy Browser) <https://www.stoutner.com/privacy-browser>.
 
@@ -180,6 +180,13 @@
 
     <!-- Domains. -->
     <string name="domains">Dominios</string>
+    <string name="domain_settings">Configuración de dominio</string>
+    <string name="add_domain">Añadir dominio</string>
+    <string name="add">Añadir</string>
+    <string name="domain_name">Nombre de dominio</string>
+    <string name="domain_settings_saved">Configuración de dominio guardada</string>
+    <string name="domain_deleted">Dominio eliminado</string>
+    <string name="domain_name_instructions">*. puede ser añadido a un dominio para incluir todos los subdominios (p.ej. *.stoutner.com)</string>
 
     <!-- Guide. -->
     <string name="privacy_browser_guide">Guía de Navegador Privado</string>
@@ -290,6 +297,7 @@
 
     <!-- Orbot. -->
     <string name="orbot_proxy_not_installed">Enviar a través de Orbot no funcionará a menos que se instale Orbot.</string>
+    <string name="waiting_for_orbot">Esperando a Orbot para conectar...</string>
 
     <!-- About Activity. -->
     <string name="about_privacy_browser">Acerca de Navegador Privado</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e76eca5e..5edc706a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -51,6 +51,8 @@
     <string name="image_name">Nome Immagine</string>
     <string name="unknown_size">Dimensione sconosciuta</string>
     <string name="download">Scarica</string>
+    <string name="cannot_download_file">Il file non può essere scaricato perchè non ha un URL HTTP o HTTPS</string>
+    <string name="cannot_download_image">L\'immagine non può essere scaricata perchè non ha un URL HTTP o HTTPS</string>
 
     <!-- Custom App Bar. -->
     <string name="favorite_icon">FavIcon</string>
@@ -178,6 +180,16 @@
     <string name="bookmarks_database_view">Database dei Segnalibri</string>
     <string name="home_folder">Cartella principale</string>
 
+    <!-- Domains. -->
+    <string name="domains">Domini</string>
+    <string name="domain_settings">Impostazioni Domini</string>
+    <string name="add_domain">Aggiungi Dominio</string>
+    <string name="add">Aggiungi</string>
+    <string name="domain_name">Nome del Dominio</string>
+    <string name="domain_settings_saved">Impostazioni Domini Salvate</string>
+    <string name="domain_deleted">Dominio Eliminato</string>
+    <string name="domain_name_instructions">è possibile anteporre *. a un dominio per includere tutti i sottodomini (es. *.stoutner.com)</string>
+
     <!-- Guide. -->
     <string name="privacy_browser_guide">Guida di Privacy Browser</string>
     <string name="overview">Descrizione</string>
@@ -253,6 +265,21 @@
     <string name="tor">Tor</string>
         <string name="proxy_through_orbot">Utilizza Proxy con Orbot</string>
         <string name="proxy_through_orbot_summary">Utilizza Proxy attraverso Orbot su localhost:8118.</string>
+        <string name="tor_homepage">Tor Homepage</string>
+        <string name="tor_javascript_disabled_search">Tor - Ricerca con JavaScript disabilitato</string>
+        <string-array name="tor_javascript_disabled_search_entries">
+            <item>DuckDuckGo</item>
+            <item>Torch</item>
+            <item>Custom</item>
+        </string-array>
+        <string name="tor_javascript_disabled_search_custom_url">Tor - Ricerca personalizzata con JavaScript disabilitato</string>
+        <string name="tor_javascript_enabled_search">Tor - Ricerca con JavaScript abilitato</string>
+        <string-array name="tor_javascript_enabled_search_entries">
+            <item>DuckDuckGo</item>
+            <item>Torch</item>
+            <item>Custom</item>
+        </string-array>
+        <string name="tor_javascript_enabled_search_custom_url">Tor - Ricerca personalizzata con JavaScript abilitato</string>
     <string name="general">Generale</string>
         <string name="homepage">Homepage</string>
         <string name="default_font_size">Dimensione standard carattere</string>
@@ -272,6 +299,7 @@
 
     <!-- Orbot. -->
     <string name="orbot_proxy_not_installed">Il Proxy con Orbot funziona solo se è installato Orbot.</string>
+    <string name="waiting_for_orbot">In attesa della connessione di Orbot...</string>
 
     <!-- About Activity. -->
     <string name="about_privacy_browser">Informazioni su Privacy Browser</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7e0c5d5a..e77e9497 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -169,7 +169,7 @@
 
     <!-- Bookmarks Contextual App Bar. -->
     <string name="one_selected">1 Selected</string>
-    <string name="selected">Selected</string>  <!--This should be the plural form of the word.-->
+    <string name="selected">Selected</string>  <!--This is a plural adjective.-->
     <string name="move_up">Move Up</string>
     <string name="move_down">Move Down</string>
     <string name="edit">Edit</string>
-- 
2.45.2