From d3b0bcab827024f02dd88134e73cef5e29163acf Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Tue, 21 Feb 2017 13:02:01 -0700
Subject: [PATCH] =?utf8?q?Updated=20Spanish=20translation=20provided=20by?=
 =?utf8?q?=20Jose=20A.=20Le=C3=B3n=20Becerra=20and=20Italian=20translation?=
 =?utf8?q?=20provided=20by=20Francesco=20Buratti.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/it/about_changelog.html | 16 +++++++++-------
 app/src/main/res/values-es/strings.xml      | 18 ++++++++++++++++++
 app/src/main/res/values/strings.xml         |  1 -
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/app/src/main/assets/it/about_changelog.html b/app/src/main/assets/it/about_changelog.html
index 8919c531..0f38f30d 100644
--- a/app/src/main/assets/it/about_changelog.html
+++ b/app/src/main/assets/it/about_changelog.html
@@ -1,6 +1,8 @@
 <!--
   Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
+  Translation 2017 Francesco Buratti.  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
@@ -29,13 +31,13 @@
         <h3>1.15 (version code 18)</h3>
         <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=8f4d6373a35a43a36050ed383f58c4074143b264">11 February 2017</a> - minimum API 19, target API 25</p>
         <ul>
-            <li>Delete the <a href="https://redmine.stoutner.com/issues/84">secret, undocumented WebView cache</a> on Clear and Exit.</li>
-            <li><a href="https://redmine.stoutner.com/issues/83">Automatically start Orbot</a> when proxying through Orbot is enabled.</li>
-            <li><a href="https://redmine.stoutner.com/issues/82">Localize the dates</a> on the SSL certificate dialogs.</li>
-            <li>Enable downloading of files from <a href="https://redmine.stoutner.com/issues/73">websites that require a login</a>. Code contributed by Hendrik Knackstedt.</li>
-            <li>Fix a crash when attempting to <a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commit;h=da8974edd917b868957fa78bb3843fefb93b8cb7">download a file that does not have an HTTP or HTTPS URI</a>.</li>
-            <li>Initial Italian translation provided by Francesco Buratti.</li>
-            <li>Updated Spanish translation provided by <a href="mailto:emails@joseleon.me">Jose A. Le&oacute;n Becerra</a>.</li>
+            <li>Eliminazione della <a href="https://redmine.stoutner.com/issues/84">cache nascosta e misteriosa di WebView</a> con il comando Elimina Dati ed Esci.</li>
+            <li><a href="https://redmine.stoutner.com/issues/83">Avvio automatico di Orbot</a> quando si abilita il proxy con Orbot.</li>
+            <li><a href="https://redmine.stoutner.com/issues/82">Localizzazione delle date</a> nelle schermate di dialogo dei certificati SSL.</li>
+            <li>Abilitazione del download di file da <a href="https://redmine.stoutner.com/issues/73">siti web che richiedono il login</a>. Codice sviluppato con il contributo di Hendrik Knackstedt.</li>
+            <li>Eliminazione dei crash in caso di <a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commit;h=da8974edd917b868957fa78bb3843fefb93b8cb7">download di file che non hanno URL HTTP o HTTPS</a>.</li>
+            <li>Prima traduzione Italiana di Francesco Buratti.</li>
+            <li>Aggiornamento della traduzione Spagnola di <a href="mailto:emails@joseleon.me">Jose A. Le&oacute;n Becerra</a>.</li>
         </ul>
 
         <h3>1.14.1 (version code 17)</h3>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1b5688bc..76a16e6f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -178,6 +178,9 @@
     <string name="bookmarks_database_view">Vista de base de datos de marcadores</string>
     <string name="home_folder">Carpeta inicio</string>
 
+    <!-- Domains. -->
+    <string name="domains">Dominios</string>
+
     <!-- Guide. -->
     <string name="privacy_browser_guide">Guía de Navegador Privado</string>
     <string name="overview">Visión general</string>
@@ -253,6 +256,21 @@
     <string name="tor">Tor</string>
         <string name="proxy_through_orbot">Enviar a través de Orbot</string>
         <string name="proxy_through_orbot_summary">Enviar todo el tráfico web a través de Orbot en localhost:8118.</string>
+        <string name="tor_homepage">Página de inicio de Tor</string>
+        <string name="tor_javascript_disabled_search">Buscar en Tor con Javascript deshabilitado.</string>
+        <string-array name="tor_javascript_disabled_search_entries">
+            <item>DuckDuckGo</item>
+            <item>Torch</item>
+            <item>Personalizado</item>
+        </string-array>
+        <string name="tor_javascript_disabled_search_custom_url">URL personalizada de búsqueda en Tor con Javascript deshabilitado</string>
+        <string name="tor_javascript_enabled_search">Buscar en Tor con JavaScript habilitado</string>
+        <string-array name="tor_javascript_enabled_search_entries">
+            <item>DuckDuckGo</item>
+            <item>Torch</item>
+            <item>Personalizado</item>
+        </string-array>
+        <string name="tor_javascript_enabled_search_custom_url">URL personalizada de búsqueda en Tor con JavaScript habilitado</string>
     <string name="general">General</string>
         <string name="homepage">Página de inicio</string>
         <string name="default_font_size">Tamaño de fuente por defecto</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f0bc0c20..cfaa785d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -183,7 +183,6 @@
     <string name="bookmarks_database_view">Bookmarks Database View</string>
     <string name="home_folder">Home Folder</string>
 
-
     <!-- Domains. -->
     <string name="domains">Domains</string>
 
-- 
2.43.0