diff --git a/.travis.yml b/.travis.yml
index 8f769e4..b226663 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ sudo: false
 android:
   components:
     - build-tools-22.0.1
-    - build-tools-23.0.0
+    - build-tools-23.0.1
     - android-23
     - android-22
     - extra-android-support
diff --git a/README.md b/README.md
index 5c76c02..14ef3fe 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,11 @@
 ####Download
 * [Download APK from here](https://github.com/anthonycr/Lightning-Browser/releases)
 
-* [Download from Google Play](https://play.google.com/store/apps/details?id=acr.browser.barebones)
+* [Download from F-Droid](https://f-droid.org/repository/browse/?fdfilter=lightning&fdid=acr.browser.lightning)
+
+* [Download Free from Google Play](https://play.google.com/store/apps/details?id=acr.browser.barebones)
+
+* [Download Paid from Google Play](https://play.google.com/store/apps/details?id=acr.browser.lightning)
 
 ####Master Branch
 * [![Build Status](https://travis-ci.org/anthonycr/Lightning-Browser.svg?branch=master)](https://travis-ci.org/anthonycr/Lightning-Browser)
diff --git a/app/build.gradle b/app/build.gradle
index 8453c1a..b735e6c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,7 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionName "4.2.0a"
+        versionName "4.2.3a"
     }
     sourceSets {
         lightningPlus.setRoot('src/LightningPlus')
@@ -30,16 +30,16 @@ android {
         lightningPlus {
             buildConfigField "boolean", "FULL_VERSION", "true"
             applicationId "acr.browser.lightning"
-            versionCode 81
+            versionCode 84
         }
         lightningLite {
             buildConfigField "boolean", "FULL_VERSION", "false"
             applicationId "acr.browser.barebones"
-            versionCode 82
+            versionCode 85
         }
     }
     lintOptions {
-        abortOnError true
+        abortOnError false
     }
 }
 
diff --git a/app/proguard-project.txt b/app/proguard-project.txt
index edc15dc..40cddda 100644
--- a/app/proguard-project.txt
+++ b/app/proguard-project.txt
@@ -50,6 +50,18 @@
     public static *** i(...);
 }
 
+-keep class butterknife.** { *; }
+-dontwarn butterknife.internal.**
+-keep class **$$ViewBinder { *; }
+
+-keepclasseswithmembernames class * {
+    @butterknife.* <fields>;
+}
+
+-keepclasseswithmembernames class * {
+    @butterknife.* <methods>;
+}
+
 # this will fix a force close in ReadingActivity
 -keep public class org.jsoup.** {
     public *;
diff --git a/app/src/main/java/acr/browser/lightning/view/LightningView.java b/app/src/main/java/acr/browser/lightning/view/LightningView.java
index ffae42d..f541c74 100644
--- a/app/src/main/java/acr/browser/lightning/view/LightningView.java
+++ b/app/src/main/java/acr/browser/lightning/view/LightningView.java
@@ -39,6 +39,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 
 import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
 
 import acr.browser.lightning.R;
 import acr.browser.lightning.activity.BrowserActivity;
@@ -408,7 +410,7 @@ public class LightningView {
         if (mWebView != null && Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
             //noinspection deprecation
             mWebView.freeMemory();
-    }
+        }
     }
 
     public void setForegroundTab(boolean isForeground) {
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f30e7d9..c332fc1 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -123,7 +123,6 @@
     <string name="licenses">Open Source-Lizenzen</string>
     <string name="suggestion">Suche nach</string>
     <string name="block_ads">Werbung blockieren</string>
-    <string name="message_untrusted_certificate">Das Zertifikat dieser Webseite ist nicht vertrauenswürdig. Trotzdem fortsetzen?</string>
     <string name="title_form_resubmission">Formularneuzustellung</string>
     <string name="message_form_resubmission">Daten erneut senden?</string>
     <string name="message_location">\nMeine Position verwenden?</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b6c61a0..1503551 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -106,7 +106,6 @@
     <string name="licenses">Licencias de código abierto (open source)</string>
     <string name="suggestion">Buscar</string>
     <string name="block_ads">Bloquear anuncios</string>
-    <string name="message_untrusted_certificate">El certificado del sitio no es de fiar. ¿Continuar de todas maneras?</string>
     <string name="title_form_resubmission">Resubir el formulario</string>
     <string name="message_form_resubmission">¿Quieres mandar los datos de nuevo?</string>
     <string name="message_location">\n¿Quieres usar tu geolocalización?</string>
diff --git a/app/src/main/res/values-gr/strings.xml b/app/src/main/res/values-gr/strings.xml
index 55ab54d..fc5a410 100644
--- a/app/src/main/res/values-gr/strings.xml
+++ b/app/src/main/res/values-gr/strings.xml
@@ -107,7 +107,6 @@
     <string name="licenses">Άδειες ανοιχτού κώδικα</string>
     <string name="suggestion">Αναζήτηση για</string>
     <string name="block_ads">Μπλοκάρισμα διαφημίσεων</string>
-    <string name="message_untrusted_certificate">Το πιστοποιητικό δεν είναι αξιόπιστο. Συνέχεια παρ\'όλα αυτά;</string>
     <string name="title_form_resubmission">Επαναυποβολή φόρμας</string>
     <string name="message_form_resubmission">Θα θέλατε να ξαναστείλετε τα στοιχεία;</string>
     <string name="message_location">\nΘα θέλατε να χρησιμοποιήσετε την τοποθεσία σας;</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 5c03fb8..39d13db 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -123,7 +123,6 @@
     <string name="licenses">Nyílt forráskódú licencek</string>
     <string name="suggestion">Keresés</string>
     <string name="block_ads">Reklámok blokkolása</string>
-    <string name="message_untrusted_certificate">Az oldal tanusítványa nem megfelelő.Folytatja mindenképpen?</string>
     <string name="title_form_resubmission">Űrlap újraküldése</string>
     <string name="message_form_resubmission">Szeretnél újból elküldi az adatokat?</string>
     <string name="message_location">\nSzeretné használni a saját helyét?</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a547cea..5c4c744 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   Copyright 2013 The Android Open Source Project
-  
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
       http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
@@ -22,190 +22,194 @@
     <string name="action_history">Cronologia</string>
     <string name="action_bookmarks">Segnalibri</string>
     <string name="action_add_bookmark">Aggiungi segnalibro</string>
-    <string name="action_copy">Copia link</string>
+    <string name="action_copy">Copia Link</string>
     <string name="action_forward">Avanti</string>
-    <string name="settings">Impostazioni del browser</string>
-    <string name="location">Accesso alla posizione</string>
-    <string name="password">Salva Password</string>
+    <string name="settings">Impostazioni</string>
+    <string name="location">Localizzazione</string>
+    <string name="password">Salva password</string>
     <string name="agent">User Agent</string>
     <string name="flash">Abilita Adobe Flash</string>
-    <string name="home">Homepage</string>
-    <string name="fullscreen">Mod. Schermo intero</string>
+    <string name="home">Home</string>
+    <string name="fullscreen">Schermo Intero</string>
     <string name="java">Abilita JavaScript</string>
-    <string name="download">Percorso download</string>
-    <string name="settings_advanced">Impostazioni avanzate</string>
-    <string name="apache">Licenza Apache 2.0</string>
-    <string name="version">Versione Applicazione</string>
-    <string name="cache">Pulisci la cache alla chiusura</string>
-    <string name="reflow">Abilità reflow del testo</string>
-    <string name="block">Blocca immagini</string>
-    <string name="window">Consenti l\'apertura di nuove finestre</string>
+    <string name="download">Scegli un percorso</string>
+    <string name="settings_advanced">Avanzate</string>
+    <string name="apache">Apache License 2.0</string>
+    <string name="version">Versione App</string>
+    <string name="cache">Cancella la cache in chiusura</string>
+    <string name="reflow">Abilità il reflow del testo</string>
+    <string name="block">Blocca Immagini</string>
+    <string name="window">Consenti a siti di aprire nuove finestre</string>
     <string name="cookies">Abilita Cookies</string>
-    <string name="importbookmarks">Importa Segnalibri</string>
-    <string name="size">Dimensione testo</string>
+    <string name="importbookmarks">Importa preferiti da browser</string>
+    <string name="size">Dimensioni carattere</string>
     <string name="recommended">Consigliato</string>
     <string name="search">Motore di ricerca</string>
     <string name="search_hint">Cerca</string>
-    <string name="wideViewPort">Use wide viewport</string>
-    <string name="overViewMode">Carica le pagine in modalità overview</string>
-    <string name="restore">Ricarica le schede perse all\'avvio</string>
+    <string name="wideViewPort">Utilizza ampia finestra</string>
+    <string name="overViewMode">Carica le pagine in modalità panoramica</string>
+    <string name="restore">Restore lost tabs on start</string>
     <string name="stock_browser_unavailable">Nessun browser stock trovato</string>
     <string name="stock_browser_available">Browser stock supportato trovato</string>
-    <string name="fullScreenOption">Nascondi la barra di stato durante la navigazione</string>
+    <string name="fullScreenOption">Nascondi la barra di stato mentre navighi</string>
     <string name="clear_cookies">Cancella i cookies</string>
-    <string name="dialog_image">Cosa vorresti fare con questa immagine?</string>
+    <string name="dialog_image">Cosa vuoi fare con questa immagine?</string>
     <string name="action_download">Scarica</string>
     <string name="action_open">Apri</string>
-    <string name="dialog_link">Cosa vorresti fare con questo link?</string>
+    <string name="dialog_link">Cosa vuoi fare con questo link?</string>
     <string name="dialog_title_share">Condividi questa pagina</string>
-    <string name="dialog_bookmark">Cosa vorresti fare con questo segnalibro?</string>
-    <string name="action_delete">Cancella</string>
+    <string name="dialog_history_long_press">Cosa vuoi fare con questo elemento di cronologia?</string>
+    <string name="dialog_bookmark">Cosa vorresti fare con questo preferito?</string>
+    <string name="action_delete">Elimina</string>
     <string name="action_blank">Pagina vuota</string>
     <string name="agent_default">Default</string>
     <string name="agent_desktop">Desktop</string>
     <string name="agent_mobile">Mobile</string>
-    <string name="agent_custom">Personalizzato</string>
-    <string name="title_search_engine">Motore di ricerca</string>
+    <string name="agent_custom">Custom</string>
+    <string name="title_search_engine">Motore di Ricerca</string>
     <string name="action_ok">OK</string>
-    <string name="dialog_download">Vuoi scaricare questo file?</string>
+    <string name="dialog_download">Vuoi scaricarlo?</string>
     <string name="action_cancel">Annulla</string>
     <string name="title_warning">Attenzione</string>
-    <string name="dialog_adobe_not_installed">Adobe Flash Player non rilevato.\nSi prega di installare Flash Player.</string>
+    <string name="dialog_adobe_not_installed">Adobe Flash Player non è stato trovato.\nSi prega di installare Flash Player.</string>
     <string name="title_user_agent">User Agent</string>
-    <string name="title_download_location">Percorso download</string>
-    <string name="title_custom_homepage">Homepage personale</string>
-    <string name="title_clear_history">Cancella cronologia</string>
-    <string name="title_clear_cookies">Cancella i cookie</string>
-    <string name="dialog_history">Vorresti eliminare tutta la cronologia del browser?</string>
-    <string name="dialog_cookies">Vorresti eliminare tutti i cookie del browser?</string>
+    <string name="title_download_location">Percorso Download</string>
+    <string name="title_custom_homepage">Pagina iniziale</string>
+    <string name="action_webpage">Pagina Web</string>
+    <string name="title_clear_history">Cancella la cronologia</string>
+    <string name="title_clear_cookies">Cancella i cookies</string>
+    <string name="dialog_history">Vorresti cancellare tutta la cronologia?</string>
+    <string name="dialog_cookies">Vorresti cancellare tutti i cookies?</string>
     <string name="action_yes">Si</string>
     <string name="action_no">No</string>
-    <string name="title_text_size">Dimensione testo</string>
-    <string name="size_largest">Più Grande</string>
+    <string name="title_text_size">Dimensioni carattere</string>
+    <string name="size_largest">Più grande</string>
     <string name="size_large">Grande</string>
     <string name="size_normal">Normale</string>
     <string name="size_small">Piccolo</string>
-    <string name="size_smallest">Più Piccolo</string>
+    <string name="size_smallest">Più piccolo</string>
     <string name="title_error">Errore</string>
-    <string name="dialog_import_error">Nessun browser rilevato da cui importare segnalibri.</string>
+    <string name="dialog_import_error">Nessun browser è stato trovato.</string>
     <string name="hint_title">Titolo</string>
     <string name="hint_url">URL</string>
-    <string name="title_edit_bookmark">Modifica Segnalibro</string>
-    <string name="action_edit">Modifica</string>
-    <string name="action_incognito">Nuova scheda anonima</string>
+    <string name="title_edit_bookmark">Edita</string>
+    <string name="action_edit">Edita</string>
+    <string name="action_incognito">Nuova scheda in incognito</string>
     <string name="action_homepage">Default</string>
     <string name="action_back">Indietro</string>
     <string name="action_find">Trova nella pagina</string>
-    <string name="download_pending">Avvio scaricamento\u2026</string>
-    <string name="cannot_download">Possibile scaricare solo da URL \"http\" o \"https\".</string>
-    <string name="download_no_sdcard_dlg_title">Nessuna scheda SD</string>
-    <string name="download_no_sdcard_dlg_msg">Una memoria USB è necessaria per scaricare il file.</string>
-    <string name="download_sdcard_busy_dlg_title">Memoria USB non disponibile</string>
-    <string name="download_sdcard_busy_dlg_msg">La memoria di archiviazione è occupata. Per permettere i download, tocca Disattiva Memoria USB nella notifica.</string>
-    <string name="incognito_cookies">Abilita Cookies in modalità incognito</string>
+    <string name="download_pending">Inizio download\u2026</string>
+    <string name="cannot_download">Può solo scaricare \"http\" or \"https\" URLs.</string>
+    <string name="download_no_sdcard_dlg_title" >Nessuna SD Card trovata.</string>
+    <string name="download_no_sdcard_dlg_msg" >USB storage is required to download the file.</string>
+    <string name="download_sdcard_busy_dlg_title">USB storage unavailable</string>
+    <string name="download_sdcard_busy_dlg_msg" >The storage is busy. To allow downloads, touch Turn Off USB Storage in the notification.</string>
+    <string name="incognito_cookies">Enable Cookies in Incognito Mode</string>
     <string name="title_flash">Adobe Flash</string>
     <string name="action_manual">Manuale</string>
-    <string name="action_auto">Auto</string>
+    <string name="action_auto">Automatica</string>
     <string name="action_follow_me">Contattami</string>
-    <string name="url_twitter">twitter.com/ACRDevelopment</string>
-    <string name="clear_cache">Pulisci la Cache</string>
-    <string name="message_cache_cleared">Cache Cancellata</string>
-    <string name="message_import">Segnalibri importati!</string>
-    <string name="message_clear_history">Cronologia Cancellata</string>
-    <string name="message_cookies_cleared">Cookies Cancellati</string>
-    <string name="max_tabs">Numero massimo di pagine raggiunto</string>
+    <string name="url_twitter">twitter.com/RestainoAnthony</string>
+    <string name="clear_cache">Cancella la cache</string>
+    <string name="message_cache_cleared">Cache cancellata</string>
+    <string name="message_import">Segnalibri importati</string>
+    <string name="message_clear_history">Cronologia cancellata</string>
+    <string name="message_cookies_cleared">Cookies cancellati</string>
+    <string name="max_tabs">Massimo numero di schede raggiunto!</string>
     <string name="message_text_copied">Testo copiato negli appunti</string>
     <string name="message_link_copied">Link copiato negli appunti</string>
-    <string name="block_ads">Blocca Annunci</string>
-    <string name="custom_url">URL personale</string>
-    <string name="message_blocked_local">Il caricamento del file locale è stato bloccato</string>
+    <string name="custom_url">URL Personalizzato</string>
+    <string name="message_blocked_local">Local file has been blocked from loading</string>
+    <string name="licenses">Licenze Open Source</string>
     <string name="suggestion">Cerca</string>
-    <string name="message_untrusted_certificate">Il certificato del sito non è fidato. Procedere comunque?</string>
-    <string name="title_form_resubmission">Reinvio form</string>
-    <string name="message_form_resubmission">Vuoi reinviare i dati?</string>
+    <string name="block_ads">Blocca Annunci</string>
+    <string name="message_untrusted_certificate">Il certificato di questo sito non è sicuro. Vuoi procedere lo stesso?</string>
+    <string name="title_form_resubmission">Reinvio Modulo</string>
+    <string name="message_form_resubmission">Vuoi inviare nuovamente i dati?</string>
     <string name="message_location">\nVorrebbe usare la tua posizione</string>
-    <string name="action_allow">Permetti</string>
-    <string name="action_dont_allow">Nega</string>
-    <string name="title_sign_in">Accedi</string>
-    <string name="hint_username">Nome utente</string>
+    <string name="action_allow">Consenti</string>
+    <string name="action_dont_allow">Non consentire</string>
+    <string name="title_sign_in">Registrati</string>
+    <string name="hint_username">Username</string>
     <string name="hint_password">Password</string>
     <string name="google_suggestions">Suggerimenti di ricerca</string>
-    <string name="powered_by_google">In collaborazione con Google</string>
+    <string name="powered_by_google">Powered by Google</string>
+    <string name="http_proxy">HTTP Proxy</string>
+    <string-array name="proxy_choices_array">
+        <item>Nessuno</item>
+        <item>Orbot</item>
+        <item>I2P</item>
+        <item>Manuale</item>
+    </string-array>
     <string name="manual_proxy">Proxy manuale</string>
     <string name="host">Host:</string>
     <string name="port">Porta:</string>
-    <string name="use_tor_prompt">Sembra che tu abbia Orbot installato. Vuoi usare Tor?</string>
-    <string name="use_i2p_prompt">Sembra che tu abbia I2P installato. Vuoi usare I2P?</string>
-    <string name="install_orbot">Devi installare Orbot per navigare con Tor.</string>
-    <string name="i2p_not_running">I2P non è attivo.</string>
-    <string name="i2p_tunnels_not_ready">I tunnel I2P non sono ancora pronti.</string>
-    <string name="yes">Sì</string>
+    <string name="use_tor_prompt">Sembra che tu abbia Orbot installato. Vorresti usare Tor?</string>
+    <string name="use_i2p_prompt">Sembra che tu abbia I2P installato. Vorresti usare I2P?</string>
+    <string name="install_orbot">Si prega di installare Orbot per creare un proxy con Tor.</string>
+    <string name="i2p_not_running">I2P non è in esecuzione.</string>
+    <string name="i2p_tunnels_not_ready">I tunnel I2P non sono pronti al momento.</string>
+    <string name="yes">Si</string>
     <string name="no">No</string>
-    <string name="clear_cookies_exit">Elimina i cookie all\'uscita</string>
-    <string name="clear_history_exit">Elimina la cronologia all\'uscita</string>
-    <string name="folder_default">Predefinito</string>
-    <string name="folder_custom">Personale</string>
+    <string name="clear_cookies_exit">Cancella i cookies in chiusura</string>
+    <string name="clear_history_exit">Cancella la cronologia in chiusura</string>
+    <string name="folder_default">Default</string>
+    <string name="folder_custom">Custom</string>
     <string name="untitled">Senza titolo</string>
     <string name="mpl_license">Mozilla Public License v. 2.0</string>
     <string name="freeware">Freeware</string>
     <string name="android_open_source_project">Android Open Source Project</string>
     <string name="hphosts_ad_server_list">hpHosts Ad Server List</string>
-    <string name="deleted_tab">Vecchia scheda riaperta</string>
-    <string name="rendering_mode">Modalità rendering</string>
-    <string name="sync_history">Sincronizza cronologia con Google</string>
-    <string name="title_file_chooser">Selezione file</string>
+    <string name="deleted_tab">Reopened old tab</string>
+    <string name="rendering_mode">Rendering Mode</string>
+    <string name="name_inverted">Inverso</string>
+    <string name="name_grayscale">Scala di grigi</string>
+    <string name="name_inverted_grayscale">Scala di grigi invertita</string>
+    <string name="name_normal">Normale</string>
+    <string name="sync_history">Sincronizza la cronologia con l\'account Google</string>
+    <string name="title_file_chooser">Seleziona file</string>
     <string name="library_netcipher">NetCipher</string>
     <string name="license_gnu">GNU Lesser General Public License</string>
-    <string name="export_bookmarks">Esporta segnalibri</string>
-    <string name="import_backup">Importa segnalibri da backup</string>
+    <string name="export_bookmarks">Esporta i segnalibri per il backup</string>
+    <string name="import_backup">Importa i segnalibri da un backup</string>
     <string name="bookmark_export_path">Segnalibri esportati</string>
     <string name="bookmark_settings">Segnalibri</string>
-    <string name="import_bookmark_error">Impossibile importare i segnalibri dal file</string>
-    <string name="title_chooser">Seleziona un file</string>
+    <string name="import_bookmark_error">Impossibile importare i segnalibri da file</string>
+    <string name="title_chooser">Scegli un file</string>
     <string name="settings_general">Generali</string>
     <string name="settings_display">Display</string>
     <string name="settings_privacy">Privacy</string>
     <string name="settings_about">Informazioni</string>
-    <string name="settings_about_explain">Informazioni sull\'autore, versione e license.</string>
-    <string name="name_inverted">Inverso</string>
-    <string name="name_grayscale">Scala di grigi</string>
-    <string name="name_inverted_grayscale">Scala di grigi inversa</string>
-    <string name="name_normal">Normale</string>
-    <string name="licenses">Licenze Open Source</string>
-    <string name="action_webpage">Pagina Web</string>
+    <string name="settings_about_explain">Informazioni sulla versione, l\'autore e licenze.</string>
     <string name="close_tab">Chiudi scheda</string>
     <string name="close_all_tabs">Chiudi tutte le schede</string>
-    <string name="third_party">Blocca i cookie di terze parti</string>
+    <string name="third_party">Blocca cookies di terze parti.</string>
     <string name="color_mode">Attiva modalità colore</string>
     <string name="reading_mode">Modalità lettura</string>
     <string name="loading">Caricamento&#8230;</string>
-    <string name="loading_failed">Impossibile caricare la pagina.</string>
+    <string name="loading_failed">Impossibile caricare nulla dalla pagina.</string>
     <string name="snacktory">Snacktory</string>
     <string name="jsoup">jsoup: Java HTML Parser</string>
-    <string name="mit_license">Licenza MIT</string>
-    <string name="url_contents">Contenuti campo URL</string>
+    <string name="mit_license">MIT License</string>
+    <string name="url_contents">URL Box Contents</string>
+    <string name="text_encoding">Text Encoding</string>
     <string-array name="url_content_array">
-        <item>Dominio (predefinito)</item>
-        <item>URL</item>
-        <item>Titolo</item>
+        <item >Dominio (default)</item>
+        <item >URL</item>
+        <item >Titolo</item>
     </string-array>
-    <string name="invert_color">Inverti colori</string>
-    <string name="dark_theme">Tema Scuro</string>
-    <string name="tabs">Schede</string>
-    <string name="theme">Temi</string>
-    <string name="light_theme">Tema Chiaro</string>
-    <string name="black_theme">Tema Nero (AMOLED)</string>
-    <string name="folder">Nomne Cartella</string>
+        <string name="invert_color">Inverti colori</string>
+        <string name="dark_theme">Scuro</string>
+        <string name="tabs">Schede</string>
+    <string name="theme">Tema App</string>
+    <string name="light_theme">Chiaro</string>
+    <string name="black_theme">Nero (AMOLED)</string>
+    <string name="folder">Nome cartella</string>
     <string name="action_folder">Cartella</string>
     <string name="action_rename">Rinomina</string>
-    <string name="title_rename_folder">Rinomina Cartellar</string>
-    <string name="dialog_folder">Cosa vorresti fare con questa cartella?</string>
+    <string name="title_rename_folder">Rinomina cartella</string>
+    <string name="dialog_folder">Cosa vuoi fare con questa cartella?</string>
     <string name="clear_web_storage">Clear Web Storage</string>
-    <string name="http_proxy">Proxy HTTP</string>
-    <string-array name="proxy_choices_array">
-        <item>Nessuno</item>
-        <item>Orbot</item>
-        <item>I2P</item>
-        <item>Manuale</item>
-    </string-array>
+    <string name="clear_web_storage_exit">Clear web storage on exit</string>
+    <string name="message_web_storage_cleared">Web Storage Cleared</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index ea17fbf..d1bc5b6 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -120,7 +120,6 @@
     <string name="licenses">オープンソースライセンス</string>
     <string name="suggestion">Search for</string>
     <string name="block_ads">広告ブロック</string>
-    <string name="message_untrusted_certificate">このページに信用性の証明書がありません。読み込みを続けますか?</string>
     <string name="title_form_resubmission">フォームの再送</string>
     <string name="message_form_resubmission">データを再送しますか?</string>
     <string name="message_location">\n位置情報の提供を許可しますか?</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 6522596..2da2861 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -106,7 +106,6 @@
     <string name="licenses">오픈 소스 라이센스</string>
     <string name="suggestion">다음을 검색</string>
     <string name="block_ads">광고 차단</string>
-    <string name="message_untrusted_certificate">이 웹사이트의 인증서는 신뢰할 수 없습니다. 계속할까요?</string>
     <string name="title_form_resubmission">양식 다시 제출</string>
     <string name="message_form_resubmission">다시 전송할까요?</string>
     <string name="message_location">\n 이(가) 위치를 사용하고자 합니다</string>
@@ -170,4 +169,4 @@
     <string name="invert_color">색상 반전</string>
     <string name="dark_theme">어두운 테마 사용</string>
     <string name="tabs">탭</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 6cb9792..8660b80 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -5,7 +5,7 @@
     <string name="action_share">Udostępnij</string>
     <string name="action_history">Historia</string>
     <string name="action_bookmarks">Zakładki</string>
-    <string name="action_add_bookmark">Dodaj do zakładek</string>
+    <string name="action_add_bookmark">Dodaj zakładkę</string>
     <string name="action_copy">Kopiuj link</string>
     <string name="action_forward">Dalej</string>
     <string name="settings">Ustawienia</string>
@@ -18,7 +18,7 @@
     <string name="java">Włącz Javascript</string>
     <string name="download">Miejsce zapisu pobieranych plików</string>
     <string name="settings_advanced">Zaawansowane</string>
-    <string name="apache">Apache License 2.0</string>
+    <string name="apache">Licencja Apache 2.0</string>
     <string name="version">Wersja aplikacji</string>
     <string name="cache">Wyczyść pamięć podręczną po zamknięciu</string>
     <string name="reflow">Zawijaj tekst do rozmiaru ekranu</string>
@@ -42,6 +42,7 @@
     <string name="action_open">Otwórz</string>
     <string name="dialog_link">Co chciałbyś zrobić z tym linkiem?</string>
     <string name="dialog_title_share">Udostępnij tę stronę</string>
+    <string name="dialog_history_long_press">Co chciałbyś zrobić z tym wpisem historii przeglądania?</string>
     <string name="dialog_bookmark">Co chciałbyś zrobić z tą zakładką?</string>
     <string name="action_delete">Usuń</string>
     <string name="action_blank">Pusta</string>
@@ -83,6 +84,8 @@
     <string name="action_find">Znajdź na stronie</string>
     <string name="download_pending">Rozpoczynanie pobierania\u2026</string>
     <string name="cannot_download">Pliki mogą być pobierane tylko z linków zaczynających się od \"http\" lub \"https\".</string>
+    <string name="problem_download">Nie można pobrać - nieprawidłowy URL</string>
+    <string name="problem_location_download">Nie można pobrać pliku do wskazanej lokalizacji</string>
     <string name="download_no_sdcard_dlg_title" >Brak karty SD</string>
     <string name="download_no_sdcard_dlg_msg" >Pamięć USB jest wymagana do pobrania tego pliku.</string>
     <string name="download_sdcard_busy_dlg_title">Pamięć USB niedostępna</string>
@@ -106,7 +109,13 @@
     <string name="licenses">Licencje Open Source</string>
     <string name="suggestion">Wyszukaj</string>
     <string name="block_ads">Blokuj reklamy</string>
-    <string name="message_untrusted_certificate">Certyfikat używany przez tę stronę nie jest zaufany. Kontynuować mimo wszystko?</string>
+    <string name="message_insecure_connection">Połączenie z tą stroną jest niezaufane:\n%1$s\nKontynuuować mimo wszystko?</string>
+    <string name="message_certificate_date_invalid">data ważności certyfikatu jest nieprawidłowa</string>
+    <string name="message_certificate_domain_mismatch">domena dla której wystawiono certyfikat jest różna od domeny odwiedzanej strony</string>
+    <string name="message_certificate_expired">data ważności certyfikatu już upłynęła</string>
+    <string name="message_certificate_invalid">ceryfikat jest nieprawidłowy</string>
+    <string name="message_certificate_not_yet_valid">certyfikat nie jest jeszcze ważny</string>
+    <string name="message_certificate_untrusted">certyfikat jest niezaufany</string>
     <string name="title_form_resubmission">Ponowne wysyłanie formularza</string>
     <string name="message_form_resubmission">Czy chciałbyś ponownie wysłać dane wprowadzone do formularza?</string>
     <string name="message_location">\nTa strona prosi o dostęp do twojej geolokalizacji</string>
@@ -117,8 +126,21 @@
     <string name="hint_password">Hasło</string>
     <string name="google_suggestions">Podpowiedzi wyszukiwania</string>
     <string name="powered_by_google">Dostarczane przez Google</string>
-    <string name="use_tor_prompt">Wygląda na to że Orbot jest zainstalowany. Chciałbyś go włączyć i użyć sieci Tor do łączenia się z internetem?</string>
-    <string name="install_orbot">Zanistaluj Orbota by móc używać sieci Tor do łączenia się z internetem.</string>
+    <string name="http_proxy">Konfiguracja serwera proxy</string>
+    <string-array name="proxy_choices_array">
+        <item>Bez proxy</item>
+        <item>Orbot</item>
+        <item>I2P</item>
+        <item>Ręczne ustawienia</item>
+    </string-array>
+    <string name="manual_proxy">Ręczne ustawienia proxy</string>
+    <string name="host">Host:</string>
+    <string name="port">Port:</string>
+    <string name="use_tor_prompt">Wygląda na to że Orbot jest zainstalowany. Chciałbyś go włączyć i użyć sieci TOR do łączenia się z internetem?</string>
+    <string name="use_i2p_prompt">Wygląda na to że I2P jest zainstalowany. Chciałbyś go użyć do łączenia się z internetem?</string>
+    <string name="install_orbot">Zainstaluj Orbota by móc używać sieci TOR do łączenia się z internetem.</string>
+    <string name="i2p_not_running">I2P nie jest uruchomiony.</string>
+    <string name="i2p_tunnels_not_ready">Tunele I2P nie są jeszcze gotowe.</string>
     <string name="yes">Tak</string>
     <string name="no">Nie</string>
     <string name="clear_cookies_exit">Wyczyść ciasteczka po zamknięciu</string>
@@ -129,19 +151,19 @@
     <string name="mpl_license">Mozilla Public License v. 2.0</string>
     <string name="freeware">Freeware</string>
     <string name="android_open_source_project">Android Open Source Project</string>
-    <string name="hphosts_ad_server_list">hpHosts Ad Server List</string>
+    <string name="hphosts_ad_server_list">Lista filtrów hpHosts</string>
     <string name="deleted_tab">Przywrócono kartę</string>
-    <string name="rendering_mode">Tryb Renderowania</string>
+    <string name="rendering_mode">Tryb renderowania</string>
     <string name="name_inverted">Odwrócony</string>
-    <string name="name_grayscale">Odcienie Szarości</string>
-    <string name="name_inverted_grayscale">Odwrócone Odcienie Szarości</string>
+    <string name="name_grayscale">Odcienie szarości</string>
+    <string name="name_inverted_grayscale">Odwrócone odcienie szarości</string>
     <string name="name_normal">Normalny</string>
     <string name="sync_history">Synchronizuj historię z Google</string>
     <string name="title_file_chooser">Wybierz plik</string>
     <string name="library_netcipher">NetCipher</string>
     <string name="license_gnu">GNU Lesser General Public License</string>
-    <string name="export_bookmarks">Eksportuj zakładki do backupu</string>
-    <string name="import_backup">Importuj zakładki z backupu</string>
+    <string name="export_bookmarks">Eksportuj zakładki</string>
+    <string name="import_backup">Importuj zakładki</string>
     <string name="bookmark_export_path">Zakładki wyeksportowane do</string>
     <string name="bookmark_settings">Zakładki</string>
     <string name="import_bookmark_error">Nie udało się zaimportować zakładek z</string>
@@ -149,10 +171,40 @@
     <string name="settings_general">Ogólne</string>
     <string name="settings_display">Wyświetlanie</string>
     <string name="settings_privacy">Prywatność</string>
-    <string name="settings_about">O Przeglądarce</string>
+    <string name="settings_about">O przeglądarce</string>
     <string name="settings_about_explain">Szczegóły o wersji, autorze i licencji.</string>
     <string name="close_tab">Zamknij kartę</string>
     <string name="close_all_tabs">Zamknij wszystkie karty</string>
     <string name="third_party">Blokuj ciasteczka z innych witryn</string>
-    <string name="color_mode">Włącz Tryb zmieniania koloru</string>
+    <string name="color_mode">Włącz tryb zmieniania koloru</string>
+    <string name="reading_mode">Tryb czytania</string>
+    <string name="loading">Ładowanie&#8230;</string>
+    <string name="loading_failed">Nie udało się wczytać tekstu ze strony.</string>
+    <string name="snacktory">Snacktory</string>
+    <string name="jsoup">jsoup: Java HTML Parser</string>
+    <string name="mit_license">Licencja MIT</string>
+    <string name="url_contents">Zawartość paska adresu</string>
+    <string name="text_encoding">Kodowanie tekstu</string>
+    <string-array name="url_content_array">
+        <item >Tylko domena (domyślne)</item>
+        <item >Pełny URL</item>
+        <item >Tytuł strony</item>
+    </string-array>
+    <string name="invert_color">Odwróć kolory</string>
+    <string name="dark_theme">Ciemny motyw</string>
+    <string name="tabs">Karty</string>
+    <string name="theme">Wygląd aplikacji</string>
+    <string name="light_theme">Jasny motyw</string>
+    <string name="black_theme">Czarny motyw (AMOLED)</string>
+    <string name="folder">Nazwa folderu</string>
+    <string name="action_folder">Folder</string>
+    <string name="action_rename">Zmień nazwę</string>
+    <string name="title_rename_folder">Zmień nazwę folderu</string>
+    <string name="dialog_folder">Co chciałbyś zrobić z tym folderem?</string>
+    <string name="clear_web_storage">Wyczyść dane i ustawienia witryn</string>
+    <string name="clear_web_storage_exit">Wyczyść dane i ustawienia witryn po zamknięciu</string>
+    <string name="message_web_storage_cleared">Dane i ustawienia witryn zostały wyczyszczone</string>
+    <string name="hosts_source">Źródło filtrów blokujących reklamy</string>
+    <string name="settings_adblock">Ustawienia blokowania reklam</string>
+    <string name="tabs_in_drawer">Pokazuj karty w bocznym menu</string>
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 4812dd3..e05a5d6 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -122,7 +122,6 @@
     <string name="licenses">Licenças Open Source</string>
     <string name="suggestion">Pesquisar por</string>
     <string name="block_ads">Bloquear anúncios</string>
-    <string name="message_untrusted_certificate">O certificado deste sítio web não é fiável. Continuar?</string>
     <string name="title_form_resubmission">Submissão de formulário</string>
     <string name="message_form_resubmission">Gostaria de reenviar os dados?</string>
     <string name="message_location">\nGostaria de utilizar a sua localização</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f01682d..be8cc51 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -106,7 +106,6 @@
     <string name="licenses">Open Source Licenses</string>
     <string name="suggestion">Искать</string>
     <string name="block_ads">Блокировать рекламу</string>
-    <string name="message_untrusted_certificate">Сертификат сайта не является доверенным. Все равно продолжить?</string>
     <string name="title_form_resubmission">Повторная форма</string>
     <string name="message_form_resubmission">Вы действительно хотите отправить данные?</string>
     <string name="message_location">\Хотите использовать своё местоположение?</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 2101586..d2951cd 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -120,7 +120,6 @@
     <string name="licenses">Лиценце отвореног кôда</string>
     <string name="suggestion">Тражи</string>
     <string name="block_ads">Блокирај рекламе</string>
-    <string name="message_untrusted_certificate">Сертификат овог сајта није поуздан. Да наставим свеједно?</string>
     <string name="title_form_resubmission">Поновно слање формулара</string>
     <string name="message_form_resubmission">Желите ли да поново пошаљете податке?</string>
     <string name="message_location">\nЖелите ли да користите вашу локацију</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 311cd92..c39a470 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -107,7 +107,6 @@
     <string name="licenses">Open Source Licenses</string>
     <string name="suggestion">Ara</string>
     <string name="block_ads">Reklamları Engelle</string>
-    <string name="message_untrusted_certificate">Sitenin sertifikası güvenilir değil. Yine de devam edilsin mi?</string>
     <string name="title_form_resubmission">Formu yeniden gönder</string>
     <string name="message_form_resubmission">Veriyi yeniden göndermek istiyor musun?</string>
     <string name="message_location">\nKonum bilgisi isteniyor</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 9947540..e35777b 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -107,7 +107,6 @@
     <string name="licenses">开源许可</string>
     <string name="suggestion">搜索目标</string>
     <string name="block_ads">拦截广告</string>
-    <string name="message_untrusted_certificate">该网站的证书不被信任。是否仍要继续？</string>
     <string name="title_form_resubmission">重新提交表单</string>
     <string name="message_form_resubmission">你想重新发送数据吗？</string>
     <string name="message_location">\n你想使用你的位置吗？</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9183d6c..2e7ef0e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -126,7 +126,13 @@
     <string name="licenses">Open Source Licenses</string>
     <string name="suggestion">Search for</string>
     <string name="block_ads">Block Ads</string>
-    <string name="message_untrusted_certificate">The certificate of the site is not trusted. Proceed anyway?</string>
+    <string name="message_insecure_connection">Connection to this site is not secure:\n%1$s\nProceed anyway?</string>
+    <string name="message_certificate_date_invalid">date of certificate is invalid</string>
+    <string name="message_certificate_expired">certificate is expired</string>
+    <string name="message_certificate_domain_mismatch">domain in certificate does not match the site domain</string>
+    <string name="message_certificate_invalid">certificate is invalid</string>
+    <string name="message_certificate_not_yet_valid">certificate is not yet valid</string>
+    <string name="message_certificate_untrusted">certificate is not trusted</string>
     <string name="title_form_resubmission">Form Resubmission</string>
     <string name="message_form_resubmission">Would you like to resend the data?</string>
     <string name="message_location">\nWould like to use your location</string>