From: Soren Stoutner <soren@stoutner.com>
Date: Tue, 21 May 2019 02:39:31 +0000 (-0700)
Subject: Manually handle changes in screen layout.  https://redmine.stoutner.com/issues/447
X-Git-Tag: v3.1~4
X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff_plain;h=b692dfc0bae740891c806bb2ea1c18041bf6b66f;hp=8b998387868edeeda06be43e4648ac95782a839c

Manually handle changes in screen layout.  https://redmine.stoutner.com/issues/447
---

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8f306a22..13a58e31 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -86,8 +86,9 @@
         </provider>
         
         <!-- The theme has to be defined here or an ugly title bar is displayed when the app launches.
-             `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes, which preserves scroll location in the WebView.
-             `android:configChanges="keyboard|keyboardHidden"` makes the activity not reload when a bluetooth keyboard is activated/goes to sleep.
+             `android:configChanges="orientation|screenSize"` makes the activity not restart when the orientation changes, which preserves scroll location in the WebView.
+             `android:configChanges="screenLayout"` makes the activity not restart when entering or exiting split screen mode.
+             `android:configChanges="keyboard|keyboardHidden"` makes the activity not restart when a bluetooth keyboard is activated/goes to sleep.
              `android:launchMode="singleTask"` makes the app launch in a new task instead of inside the task of the program that sends it an intent.
              It also makes it reuse an existing Privacy Browser activity if available instead of launching a new one.
              `android:persistableMode="persistNever"` removes Privacy Browser from the recent apps list on a device reboot.
@@ -96,7 +97,7 @@
             android:name=".activities.MainWebViewActivity"
             android:label="@string/privacy_browser"
             android:theme="@style/PrivacyBrowserLight"
-            android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
+            android:configChanges="orientation|screenSize|screenLayout|keyboard|keyboardHidden"
             android:launchMode="singleTask"
             android:screenOrientation="fullUser"
             android:persistableMode="persistNever"
@@ -139,46 +140,50 @@
         </activity>
 
 
-        <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `android:configChanges="keyboard|keyboardHidden"` makes the activity not reload when a bluetooth keyboard is activated/goes to sleep.
+        <!-- `android:configChanges="orientation|screenSize"` makes the activity not restart when the orientation changes, which preserves scroll location in the WebView.
+            `android:configChanges="screenLayout"` makes the activity not restart when entering or exiting split screen mode.
+            `android:configChanges="keyboard|keyboardHidden"` makes the activity not restart when a bluetooth keyboard is activated/goes to sleep.
             `android:persistableMode="persistNever"` removes Privacy Browser from the recent apps list on a device reboot.
             `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
         <activity
             android:name=".activities.BookmarksActivity"
             android:label="@string/bookmarks"
             android:parentActivityName=".activities.MainWebViewActivity"
-            android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
+            android:configChanges="orientation|screenSize|screenLayout|keyboard|keyboardHidden"
             android:screenOrientation="fullUser"
             android:persistableMode="persistNever"
             tools:ignore="UnusedAttribute" />
 
-        <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `android:configChanges="keyboard|keyboardHidden"` makes the activity not reload when a bluetooth keyboard is activated/goes to sleep.
+        <!-- `android:configChanges="orientation|screenSize"` makes the activity not restart when the orientation changes, which preserves scroll location in the WebView.
+            `android:configChanges="screenLayout"` makes the activity not restart when entering or exiting split screen mode.
+            `android:configChanges="keyboard|keyboardHidden"` makes the activity not restart when a bluetooth keyboard is activated/goes to sleep.
             `android:persistableMode="persistNever"` removes Privacy Browser from the recent apps list on a device reboot.
             `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
         <activity
             android:name=".activities.BookmarksDatabaseViewActivity"
             android:label="@string/bookmarks_database_view"
             android:parentActivityName=".activities.BookmarksActivity"
-            android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
+            android:configChanges="orientation|screenSize|screenLayout|keyboard|keyboardHidden"
             android:screenOrientation="fullUser"
             android:persistableMode="persistNever"
             tools:ignore="UnusedAttribute" />
 
-        <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `android:configChanges="keyboard|keyboardHidden"` makes the activity not reload when a bluetooth keyboard is activated/goes to sleep.
+        <!-- `android:configChanges="orientation|screenSize"` makes the activity not restart when the orientation changes, which preserves scroll location in the WebView.
+            `android:configChanges="screenLayout"` makes the activity not restart when entering or exiting split screen mode.
+            `android:configChanges="keyboard|keyboardHidden"` makes the activity not restart when a bluetooth keyboard is activated/goes to sleep.
             `android:persistableMode="persistNever"` removes Privacy Browser from the recent apps list on a device reboot.
             `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
         <activity
             android:name=".activities.RequestsActivity"
             android:label="@string/requests"
             android:parentActivityName=".activities.MainWebViewActivity"
-            android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
+            android:configChanges="orientation|screenSize|screenLayout|keyboard|keyboardHidden"
             android:screenOrientation="fullUser"
             android:persistableMode="persistNever"
             tools:ignore="UnusedAttribute" />
 
-        <!-- `android:configChanges="keyboard|keyboardHidden"` makes the activity not reload when a bluetooth keyboard is activated/goes to sleep.
+        <!-- `android:configChanges="screenLayout"` makes the activity not restart when entering or exiting split screen mode.
+            `android:configChanges="keyboard|keyboardHidden"` makes the activity not reload when a bluetooth keyboard is activated/goes to sleep.
             `android:windowSoftInputMode="stateAlwaysHidden"` keeps the keyboard from displaying when the screen is rotated and after the `AddDomainDialog` is dismissed.
             `android:persistableMode="persistNever"` removes Privacy Browser from the recent apps list on a device reboot.
             `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
@@ -186,86 +191,92 @@
             android:name=".activities.DomainsActivity"
             android:label="@string/domains"
             android:parentActivityName=".activities.MainWebViewActivity"
-            android:configChanges="keyboard|keyboardHidden"
+            android:configChanges="screenLayout|keyboard|keyboardHidden"
             android:screenOrientation="fullUser"
             android:windowSoftInputMode="stateAlwaysHidden"
             android:persistableMode="persistNever"
             tools:ignore="UnusedAttribute" />
 
-        <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
+        <!-- `android:configChanges="orientation|screenSize"` makes the activity not restart when the orientation changes, which preserves scroll location in the WebView.
+            `android:configChanges="screenLayout"` makes the activity not restart when entering or exiting split screen mode.
+            `android:configChanges="keyboard|keyboardHidden"` makes the activity not restart when a bluetooth keyboard is activated/goes to sleep.
             `android:persistableMode="persistNever"` removes Privacy Browser from the recent apps list on a device reboot.
             `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
         <activity
             android:name=".activities.SettingsActivity"
             android:label="@string/settings"
             android:parentActivityName=".activities.MainWebViewActivity"
-            android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
+            android:configChanges="orientation|screenSize|screenLayout|keyboard|keyboardHidden"
             android:screenOrientation="fullUser"
             android:persistableMode="persistNever"
             tools:ignore="UnusedAttribute" />
 
-        <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
+        <!-- `android:configChanges="orientation|screenSize"` makes the activity not restart when the orientation changes, which preserves scroll location in the WebView.
+            `android:configChanges="screenLayout"` makes the activity not restart when entering or exiting split screen mode.
+            `android:configChanges="keyboard|keyboardHidden"` makes the activity not restart when a bluetooth keyboard is activated/goes to sleep.
             `android:persistableMode="persistNever"` removes Privacy Browser from the recent apps list on a device reboot.
             `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
         <activity
             android:name=".activities.ImportExportActivity"
             android:label="@string/import_export"
             android:parentActivityName=".activities.MainWebViewActivity"
-            android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
+            android:configChanges="orientation|screenSize|screenLayout|keyboard|keyboardHidden"
             android:screenOrientation="fullUser"
             android:persistableMode="persistNever"
             tools:ignore="UnusedAttribute" />
 
-        <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
+        <!-- `android:configChanges="orientation|screenSize"` makes the activity not restart when the orientation changes, which preserves scroll location in the WebView.
+            `android:configChanges="screenLayout"` makes the activity not restart when entering or exiting split screen mode.
+            `android:configChanges="keyboard|keyboardHidden"` makes the activity not restart when a bluetooth keyboard is activated/goes to sleep.
             `android:persistableMode="persistNever"` removes Privacy Browser from the recent apps list on a device reboot.
             `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
         <activity
             android:name=".activities.LogcatActivity"
             android:label="@string/logcat"
             android:parentActivityName=".activities.MainWebViewActivity"
-            android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
+            android:configChanges="orientation|screenSize|screenLayout|keyboard|keyboardHidden"
             android:screenOrientation="fullUser"
             android:persistableMode="persistNever"
             tools:ignore="UnusedAttribute" />
 
-        <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
+        <!-- `android:configChanges="orientation|screenSize"` makes the activity not restart when the orientation changes, which preserves scroll location in the WebView.
+            `android:configChanges="screenLayout"` makes the activity not restart when entering or exiting split screen mode.
+            `android:configChanges="keyboard|keyboardHidden"` makes the activity not restart when a bluetooth keyboard is activated/goes to sleep.
             `android:persistableMode="persistNever"` removes Privacy Browser from the recent apps list on a device reboot.
             `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
         <activity
             android:name=".activities.GuideActivity"
             android:label="@string/guide"
             android:parentActivityName=".activities.MainWebViewActivity"
-            android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
+            android:configChanges="orientation|screenSize|screenLayout|keyboard|keyboardHidden"
             android:screenOrientation="fullUser"
             android:persistableMode="persistNever"
             tools:ignore="UnusedAttribute" />
 
-        <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
+        <!-- `android:configChanges="orientation|screenSize"` makes the activity not restart when the orientation changes, which preserves scroll location in the WebView.
+            `android:configChanges="screenLayout"` makes the activity not restart when entering or exiting split screen mode.
+            `android:configChanges="keyboard|keyboardHidden"` makes the activity not restart when a bluetooth keyboard is activated/goes to sleep.
             `android:persistableMode="persistNever"` removes Privacy Browser from the recent apps list on a device reboot.
             `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
         <activity
             android:name=".activities.AboutActivity"
             android:label="@string/about_privacy_browser"
             android:parentActivityName=".activities.MainWebViewActivity"
-            android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
+            android:configChanges="orientation|screenSize|screenLayout|keyboard|keyboardHidden"
             android:screenOrientation="fullUser"
             android:persistableMode="persistNever"
             tools:ignore="UnusedAttribute" />
 
-        <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
+        <!-- `android:configChanges="orientation|screenSize"` makes the activity not restart when the orientation changes, which preserves scroll location in the WebView.
+            `android:configChanges="screenLayout"` makes the activity not restart when entering or exiting split screen mode.
+            `android:configChanges="keyboard|keyboardHidden"` makes the activity not restart when a bluetooth keyboard is activated/goes to sleep.
             `android:persistableMode="persistNever"` removes Privacy Browser from the recent apps list on a device reboot.
             `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
         <activity
             android:name=".activities.ViewSourceActivity"
             android:label="@string/view_source"
             android:parentActivityName=".activities.MainWebViewActivity"
-            android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
+            android:configChanges="orientation|screenSize|screenLayout|keyboard|keyboardHidden"
             android:screenOrientation="fullUser"
             android:persistableMode="persistNever"
             tools:ignore="UnusedAttribute" />
diff --git a/app/src/main/assets/de/guide_ssl_certificates_dark.html b/app/src/main/assets/de/guide_ssl_certificates_dark.html
index d4a6ba89..7f1c0761 100644
--- a/app/src/main/assets/de/guide_ssl_certificates_dark.html
+++ b/app/src/main/assets/de/guide_ssl_certificates_dark.html
@@ -51,6 +51,6 @@
         <p>SSL-Zertifikate können in den Domänen-Einstellungen verankert werden.
 			Neben dem Schutz gegen MITM-Attacken kann das Verankern von Zertifikaten auch für selbst-erzeugte Zertifikate genutzt werden (z.B. bei WLAN-Routern oder Access-Points).
             In diesen Fällen werden die sonst üblichen Fehlermeldungen unterdrückt, wenn die Website des Geräts geladen wird.
-            Tapping on the active tab displays the current website SSL certificate.</p>
+            Durch Antippen des aktiven Tabs wird das SSL-Zertifikat der aktuell darin angezeigten Webseite angezeigt.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/de/guide_ssl_certificates_light.html b/app/src/main/assets/de/guide_ssl_certificates_light.html
index 9f8f05bc..620cb164 100644
--- a/app/src/main/assets/de/guide_ssl_certificates_light.html
+++ b/app/src/main/assets/de/guide_ssl_certificates_light.html
@@ -51,6 +51,6 @@
         <p>SSL-Zertifikate können in den Domänen-Einstellungen verankert werden.
             Neben dem Schutz gegen MITM-Attacken kann das Verankern von Zertifikaten auch für selbst-erzeugte Zertifikate genutzt werden (z.B. bei WLAN-Routern oder Access-Points).
             In diesen Fällen werden die sonst üblichen Fehlermeldungen unterdrückt, wenn die Website des Geräts geladen wird.
-            Tapping on the active tab displays the current website SSL certificate.</p>
+            Durch Antippen des aktiven Tabs wird das SSL-Zertifikat der aktuell darin angezeigten Webseite angezeigt.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/de/guide_tracking_ids_dark.html b/app/src/main/assets/de/guide_tracking_ids_dark.html
index 8c486ed9..8f2e6c09 100644
--- a/app/src/main/assets/de/guide_tracking_ids_dark.html
+++ b/app/src/main/assets/de/guide_tracking_ids_dark.html
@@ -38,9 +38,9 @@
             So ignorieren zum Beispiel mit Yahoo, Google, Microsoft und Facebook so gut wie alle grossen Internet-Anbieter zumindest einige DNT-Header.</p>
 
 
-        <h3><img class="title" src="../shared_images/link_off_blue_dark.png"> URL Modification</h3>
+        <h3><img class="title" src="../shared_images/link_off_blue_dark.png"> URL-Bereinigung</h3>
 
-        <p>Privacy Browser removes tracking ID sections of URLs, like <code>?utm_</code> from <a href="https://support.google.com/analytics/answer/1033867">Google Analytics</a> and
-            <code>?fbclick=</code> from <a href="https://fbclid.com/">Facebook</a>. URL modification can be turned off in the settings if it is causing issues.</p>
+        <p>Privacy Browser entfernt Tracking-relevante Teile aus URLs, wie z.B. <code>?utm_</code> von <a href="https://support.google.com/analytics/answer/1033867">Google Analytics</a> und
+            <code>?fbclick=</code> von <a href="https://fbclid.com/">Facebook</a>. Die URL-Bereinigung kann in den Einstellungen deaktiviert werden, sollte sie Probleme verursachen.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/de/guide_tracking_ids_light.html b/app/src/main/assets/de/guide_tracking_ids_light.html
index a2b9e6ef..1cf57698 100644
--- a/app/src/main/assets/de/guide_tracking_ids_light.html
+++ b/app/src/main/assets/de/guide_tracking_ids_light.html
@@ -38,9 +38,9 @@
             So ignorieren zum Beispiel mit Yahoo, Google, Microsoft und Facebook so gut wie alle grossen Internet-Anbieter zumindest einige DNT-Header.</p>
 
 
-        <h3><img class="title" src="../shared_images/link_off_blue_light.png"> URL Modification</h3>
+        <h3><img class="title" src="../shared_images/link_off_blue_light.png"> URL-Bereinigung</h3>
 
-        <p>Privacy Browser removes tracking ID sections of URLs, like <code>?utm_</code> from <a href="https://support.google.com/analytics/answer/1033867">Google Analytics</a> and
-            <code>?fbclick=</code> from <a href="https://fbclid.com/">Facebook</a>. URL modification can be turned off in the settings if it is causing issues.</p>
+        <p>Privacy Browser entfernt Tracking-relevante Teile aus URLs, wie z.B. <code>?utm_</code> von <a href="https://support.google.com/analytics/answer/1033867">Google Analytics</a> und
+            <code>?fbclick=</code> von <a href="https://fbclid.com/">Facebook</a>. Die URL-Bereinigung kann in den Einstellungen deaktiviert werden, sollte sie Probleme verursachen.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/es/guide_ssl_certificates_dark.html b/app/src/main/assets/es/guide_ssl_certificates_dark.html
index 90db832d..cf7bdbd3 100644
--- a/app/src/main/assets/es/guide_ssl_certificates_dark.html
+++ b/app/src/main/assets/es/guide_ssl_certificates_dark.html
@@ -51,6 +51,6 @@
         <p>Los certificados SSL pueden ser fijados en Configuración de Dominios.
             Además de proteger contra ataques MITM,
             fijar un certificado autofirmado para un dispositivo como un router inalámbrico o punto de acceso eliminará el mensaje de error que se presenta normalmente cada vez que se carga su página web.
-            Tapping on the active tab displays the current website SSL certificate.</p>
+            Al tocar la pestaña activa se muestra el certificado SSL de la página web actual.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/es/guide_ssl_certificates_light.html b/app/src/main/assets/es/guide_ssl_certificates_light.html
index 259e8a8a..b65280a3 100644
--- a/app/src/main/assets/es/guide_ssl_certificates_light.html
+++ b/app/src/main/assets/es/guide_ssl_certificates_light.html
@@ -51,6 +51,6 @@
         <p>Los certificados SSL pueden ser fijados en Configuración de Dominios.
             Además de proteger contra ataques MITM,
             fijar un certificado autofirmado para un dispositivo como un router inalámbrico o punto de acceso eliminará el mensaje de error que se presenta normalmente cada vez que se carga su página web.
-            Tapping on the active tab displays the current website SSL certificate.</p>
+            Al tocar la pestaña activa se muestra el certificado SSL de la página web actual.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/es/guide_tracking_ids_dark.html b/app/src/main/assets/es/guide_tracking_ids_dark.html
index 41559b6c..e03279bc 100644
--- a/app/src/main/assets/es/guide_tracking_ids_dark.html
+++ b/app/src/main/assets/es/guide_tracking_ids_dark.html
@@ -35,9 +35,9 @@
             todos ellos ignoran al menos algunos encabezados DNT.</p>
 
 
-        <h3><img class="title" src="../shared_images/link_off_blue_dark.png"> URL Modification</h3>
+        <h3><img class="title" src="../shared_images/link_off_blue_dark.png"> Modificación de URL</h3>
 
-        <p>Privacy Browser removes tracking ID sections of URLs, like <code>?utm_</code> from <a href="https://support.google.com/analytics/answer/1033867">Google Analytics</a> and
-            <code>?fbclick=</code> from <a href="https://fbclid.com/">Facebook</a>. URL modification can be turned off in the settings if it is causing issues.</p>
+        <p>Navegador Privado elimina las secciones de ID de seguimiento de las URL, como <code>?utm_</code> de <a href="https://support.google.com/analytics/answer/1033867">Google Analytics</a> y
+            <code>?fbclick=</code> de <a href="https://fbclid.com/">Facebook</a>. La modificación de URL puede desactivarse en la configuración si está causando problemas.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/es/guide_tracking_ids_light.html b/app/src/main/assets/es/guide_tracking_ids_light.html
index ff08265e..daa1cd7f 100644
--- a/app/src/main/assets/es/guide_tracking_ids_light.html
+++ b/app/src/main/assets/es/guide_tracking_ids_light.html
@@ -35,9 +35,9 @@
             todos ellos ignoran al menos algunos encabezados DNT.</p>
 
 
-        <h3><img class="title" src="../shared_images/link_off_blue_light.png"> URL Modification</h3>
+        <h3><img class="title" src="../shared_images/link_off_blue_light.png"> Modificación de URL</h3>
 
-        <p>Privacy Browser removes tracking ID sections of URLs, like <code>?utm_</code> from <a href="https://support.google.com/analytics/answer/1033867">Google Analytics</a> and
-            <code>?fbclick=</code> from <a href="https://fbclid.com/">Facebook</a>. URL modification can be turned off in the settings if it is causing issues.</p>
+        <p>Navegador Privado elimina las secciones de ID de seguimiento de las URL, como <code>?utm_</code> de <a href="https://support.google.com/analytics/answer/1033867">Google Analytics</a> y
+            <code>?fbclick=</code> de <a href="https://fbclid.com/">Facebook</a>. La modificación de URL puede desactivarse en la configuración si está causando problemas.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/it/guide_ssl_certificates_dark.html b/app/src/main/assets/it/guide_ssl_certificates_dark.html
index 3efae613..c668f1ce 100644
--- a/app/src/main/assets/it/guide_ssl_certificates_dark.html
+++ b/app/src/main/assets/it/guide_ssl_certificates_dark.html
@@ -52,6 +52,6 @@
         <p>I certificati SSL possono essere appuntati nelle impostazioni dei domini.
             Oltre a proteggere dagli attacchi “MITM”,
             appuntare un certificato auto-firmato per un dispositivo come un router wireless o un access point eliminerà il messaggio di errore che si presenta ogni volta che viene caricato un sito web.
-            Tapping on the active tab displays the current website SSL certificate.</p>
+            Il tocco della scheda attiva mostra il certificato SSL attuale del sito.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/it/guide_ssl_certificates_light.html b/app/src/main/assets/it/guide_ssl_certificates_light.html
index 08d19fa4..ce2cbaf4 100644
--- a/app/src/main/assets/it/guide_ssl_certificates_light.html
+++ b/app/src/main/assets/it/guide_ssl_certificates_light.html
@@ -52,6 +52,6 @@
         <p>I certificati SSL possono essere appuntati nelle impostazioni dei domini.
             Oltre a proteggere dagli attacchi “MITM”,
             appuntare un certificato auto-firmato per un dispositivo come un router wireless o un access point eliminerà il messaggio di errore che si presenta ogni volta che viene caricato un sito web.
-            Tapping on the active tab displays the current website SSL certificate.</p>
+            Il tocco della scheda attiva mostra il certificato SSL attuale del sito.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/it/guide_tracking_ids_dark.html b/app/src/main/assets/it/guide_tracking_ids_dark.html
index abdc6938..96319584 100644
--- a/app/src/main/assets/it/guide_tracking_ids_dark.html
+++ b/app/src/main/assets/it/guide_tracking_ids_dark.html
@@ -35,9 +35,9 @@
             che ignorano tutti almeno alcuni degli header DNT.</p>
 
 
-        <h3><img class="title" src="../shared_images/link_off_blue_dark.png"> URL Modification</h3>
+        <h3><img class="title" src="../shared_images/link_off_blue_dark.png"> Modifica delle URL</h3>
 
-        <p>Privacy Browser removes tracking ID sections of URLs, like <code>?utm_</code> from <a href="https://support.google.com/analytics/answer/1033867">Google Analytics</a> and
-            <code>?fbclick=</code> from <a href="https://fbclid.com/">Facebook</a>. URL modification can be turned off in the settings if it is causing issues.</p>
+        <p>Privacy Browser rimuove le sezioni traccianti delle URL, come ad esempio <code>?utm_</code> di <a href="https://support.google.com/analytics/answer/1033867">Google Analytics</a> e
+            <code>?fbclick=</code> di <a href="https://fbclid.com/">Facebook</a>. La modifica delle URL può essere disattivata nelle opzioni nel caso in cui crei problemi.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/it/guide_tracking_ids_light.html b/app/src/main/assets/it/guide_tracking_ids_light.html
index f076f399..9a3b6cab 100644
--- a/app/src/main/assets/it/guide_tracking_ids_light.html
+++ b/app/src/main/assets/it/guide_tracking_ids_light.html
@@ -35,9 +35,9 @@
             che ignorano tutti almeno alcuni degli header DNT.</p>
 
 
-        <h3><img class="title" src="../shared_images/link_off_blue_light.png"> URL Modification</h3>
+        <h3><img class="title" src="../shared_images/link_off_blue_light.png"> Modifica delle URL</h3>
 
-        <p>Privacy Browser removes tracking ID sections of URLs, like <code>?utm_</code> from <a href="https://support.google.com/analytics/answer/1033867">Google Analytics</a> and
-            <code>?fbclick=</code> from <a href="https://fbclid.com/">Facebook</a>. URL modification can be turned off in the settings if it is causing issues.</p>
+        <p>Privacy Browser rimuove le sezioni traccianti delle URL, come ad esempio <code>?utm_</code> di <a href="https://support.google.com/analytics/answer/1033867">Google Analytics</a> e
+            <code>?fbclick=</code> di <a href="https://fbclid.com/">Facebook</a>. La modifica delle URL può essere disattivata nelle opzioni nel caso in cui crei problemi.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/ru/guide_ssl_certificates_dark.html b/app/src/main/assets/ru/guide_ssl_certificates_dark.html
index cee764f7..dd2212e2 100644
--- a/app/src/main/assets/ru/guide_ssl_certificates_dark.html
+++ b/app/src/main/assets/ru/guide_ssl_certificates_dark.html
@@ -48,6 +48,6 @@
         <p>Сертификаты SSL могут быть закреплены в настройках домена.
             Помимо защиты от атак MITM, закрепление самоподписанного сертификата для устройства, такого как беспроводной маршрутизатор или точка доступа, удалит сообщение об ошибке,
             которое обычно отображается каждый раз, когда загружается его сайт.
-            Tapping on the active tab displays the current website SSL certificate.</p>
+            При нажатии на активную вкладку отображается текущий сертификат SSL веб-сайта.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/ru/guide_ssl_certificates_light.html b/app/src/main/assets/ru/guide_ssl_certificates_light.html
index c21fd524..b3fc3d4c 100644
--- a/app/src/main/assets/ru/guide_ssl_certificates_light.html
+++ b/app/src/main/assets/ru/guide_ssl_certificates_light.html
@@ -48,6 +48,6 @@
         <p>Сертификаты SSL могут быть закреплены в настройках домена.
             Помимо защиты от атак MITM, закрепление самоподписанного сертификата для устройства, такого как беспроводной маршрутизатор или точка доступа, удалит сообщение об ошибке,
             которое обычно отображается каждый раз, когда загружается его сайт.
-            Tapping on the active tab displays the current website SSL certificate.</p>
+            При нажатии на активную вкладку отображается текущий сертификат SSL веб-сайта.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/ru/guide_tracking_ids_dark.html b/app/src/main/assets/ru/guide_tracking_ids_dark.html
index 8df8540f..4d8abd96 100644
--- a/app/src/main/assets/ru/guide_tracking_ids_dark.html
+++ b/app/src/main/assets/ru/guide_tracking_ids_dark.html
@@ -33,9 +33,9 @@
             Например, Yahoo, Google, Microsoft и Facebook игнорируют, по крайней мере, некоторые заголовки DNT.</p>
 
 
-        <h3><img class="title" src="../shared_images/link_off_blue_dark.png"> URL Modification</h3>
+        <h3><img class="title" src="../shared_images/link_off_blue_dark.png"> Модификация URL</h3>
 
-        <p>Privacy Browser removes tracking ID sections of URLs, like <code>?utm_</code> from <a href="https://support.google.com/analytics/answer/1033867">Google Analytics</a> and
-            <code>?fbclick=</code> from <a href="https://fbclid.com/">Facebook</a>. URL modification can be turned off in the settings if it is causing issues.</p>
+        <p>Privacy Browser удаляет идентификаторы отслеживания из URL-адресов, такие как <code>?utm_</code> из <a href="https://support.google.com/analytics/answer/1033867">Google Analytics</a> и
+            <code>?fbclick=</code> из <a href="https://fbclid.com/">Facebook</a>. Модификация URL может быть отключена в настройках, если она вызывает проблемы.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/ru/guide_tracking_ids_light.html b/app/src/main/assets/ru/guide_tracking_ids_light.html
index 83373a6b..ad4d8b33 100644
--- a/app/src/main/assets/ru/guide_tracking_ids_light.html
+++ b/app/src/main/assets/ru/guide_tracking_ids_light.html
@@ -33,9 +33,9 @@
             Например, Yahoo, Google, Microsoft и Facebook игнорируют, по крайней мере, некоторые заголовки DNT.</p>
 
 
-        <h3><img class="title" src="../shared_images/link_off_blue_light.png"> URL Modification</h3>
+        <h3><img class="title" src="../shared_images/link_off_blue_light.png"> Модификация URL</h3>
 
-        <p>Privacy Browser removes tracking ID sections of URLs, like <code>?utm_</code> from <a href="https://support.google.com/analytics/answer/1033867">Google Analytics</a> and
-            <code>?fbclick=</code> from <a href="https://fbclid.com/">Facebook</a>. URL modification can be turned off in the settings if it is causing issues.</p>
+        <p>Privacy Browser удаляет идентификаторы отслеживания из URL-адресов, такие как <code>?utm_</code> из <a href="https://support.google.com/analytics/answer/1033867">Google Analytics</a> и
+            <code>?fbclick=</code> из <a href="https://fbclid.com/">Facebook</a>. Модификация URL может быть отключена в настройках, если она вызывает проблемы.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/tr/guide_ssl_certificates_dark.html b/app/src/main/assets/tr/guide_ssl_certificates_dark.html
index 8cc3e1d5..bc9d6f82 100644
--- a/app/src/main/assets/tr/guide_ssl_certificates_dark.html
+++ b/app/src/main/assets/tr/guide_ssl_certificates_dark.html
@@ -48,6 +48,6 @@
         <p>SSL sertifikaları Domain Ayarlarından sabitlenebilir.
             MITM saldırılarına karşı korumanın yanı sıra, kablosuz bir router veya erişim noktası gibi bir cihaz için kendiliğinden imzalı bir sertifikayı sabitlemek,
             web sitesinin her yüklenmesinde normal olarak gösterilen hata mesajını kaldıracaktır.
-            Tapping on the active tab displays the current website SSL certificate.</p>
+            Aktif sekmeye dokunmak, geçerli web sitesinin SSL sertifikasını gösterir.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/tr/guide_ssl_certificates_light.html b/app/src/main/assets/tr/guide_ssl_certificates_light.html
index c85847e3..100d4dd9 100644
--- a/app/src/main/assets/tr/guide_ssl_certificates_light.html
+++ b/app/src/main/assets/tr/guide_ssl_certificates_light.html
@@ -48,6 +48,6 @@
         <p>SSL sertifikaları Domain Ayarlarından sabitlenebilir.
             MITM saldırılarına karşı korumanın yanı sıra, kablosuz bir router veya erişim noktası gibi bir cihaz için kendiliğinden imzalı bir sertifikayı sabitlemek,
             web sitesinin her yüklenmesinde normal olarak gösterilen hata mesajını kaldıracaktır.
-            Tapping on the active tab displays the current website SSL certificate.</p>
+            Aktif sekmeye dokunmak, geçerli web sitesinin SSL sertifikasını gösterir.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/tr/guide_tracking_ids_dark.html b/app/src/main/assets/tr/guide_tracking_ids_dark.html
index b67e6677..8b444cde 100644
--- a/app/src/main/assets/tr/guide_tracking_ids_dark.html
+++ b/app/src/main/assets/tr/guide_tracking_ids_dark.html
@@ -33,9 +33,9 @@
             Örneğin, Yahoo, Google, Microsoft ve Facebook, en azından bazı DNT başlıklarını yok sayar.</p>
 
 
-        <h3><img class="title" src="../shared_images/link_off_blue_dark.png"> URL Modification</h3>
+        <h3><img class="title" src="../shared_images/link_off_blue_dark.png"> URL Modifikasyonu</h3>
 
-        <p>Privacy Browser removes tracking ID sections of URLs, like <code>?utm_</code> from <a href="https://support.google.com/analytics/answer/1033867">Google Analytics</a> and
-            <code>?fbclick=</code> from <a href="https://fbclid.com/">Facebook</a>. URL modification can be turned off in the settings if it is causing issues.</p>
+        <p>Privacy Browser, <a href="https://support.google.com/analytics/answer/1033867">Google Analytics</a>'ten <code>?utm_</code> ve <a href="https://fbclid.com/">Facebook</a>'tan
+            <code>?fbclick=</code> gibi URL'deki takip id kısımlarını kaldırır. URL modifikasyonu, herhangi bir soruna yol açması halinde ayarlardan kapatılabilir.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/tr/guide_tracking_ids_light.html b/app/src/main/assets/tr/guide_tracking_ids_light.html
index 94abbf45..700db3c1 100644
--- a/app/src/main/assets/tr/guide_tracking_ids_light.html
+++ b/app/src/main/assets/tr/guide_tracking_ids_light.html
@@ -33,9 +33,9 @@
             Örneğin, Yahoo, Google, Microsoft ve Facebook, en azından bazı DNT başlıklarını yok sayar.</p>
 
 
-        <h3><img class="title" src="../shared_images/link_off_blue_light.png"> URL Modification</h3>
+        <h3><img class="title" src="../shared_images/link_off_blue_light.png"> URL Modifikasyonu</h3>
 
-        <p>Privacy Browser removes tracking ID sections of URLs, like <code>?utm_</code> from <a href="https://support.google.com/analytics/answer/1033867">Google Analytics</a> and
-            <code>?fbclick=</code> from <a href="https://fbclid.com/">Facebook</a>. URL modification can be turned off in the settings if it is causing issues.</p>
+        <p>Privacy Browser, <a href="https://support.google.com/analytics/answer/1033867">Google Analytics</a>'ten <code>?utm_</code> ve <a href="https://fbclid.com/">Facebook</a>'tan
+            <code>?fbclick=</code> gibi URL'deki takip id kısımlarını kaldırır. URL modifikasyonu, herhangi bir soruna yol açması halinde ayarlardan kapatılabilir.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.java
index 9b34bf3b..c8ff219b 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.java
@@ -971,8 +971,8 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe
                 System.exit(0);
             };
 
-            // Restart Privacy Browser after 100 milliseconds to allow enough time for the preferences to be saved.
-            restartHandler.postDelayed(restartRunnable, 100);
+            // Restart Privacy Browser after 150 milliseconds to allow enough time for the preferences to be saved.
+            restartHandler.postDelayed(restartRunnable, 150);
 
         } else if (!(encryptionSpinner.getSelectedItemPosition() == OPENPGP_ENCRYPTION)){  // The import was not successful.
             // Display a snack bar with the import error.
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
index 43a17fa5..fbab8bfb 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
@@ -504,7 +504,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
                     // Create a handler to select the tab.
                     Handler selectTabHandler = new Handler();
 
-                    // Create a runnable select the new tab.
+                    // Create a runnable to select the tab.
                     Runnable selectTabRunnable = () -> {
                         // Get a handle for the tab.
                         TabLayout.Tab tab = tabLayout.getTabAt(position);
@@ -516,8 +516,8 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
                         tab.select();
                     };
 
-                    // Select the tab layout after 100 milliseconds, which leaves enough time for a new tab to be created.
-                    selectTabHandler.postDelayed(selectTabRunnable, 100);
+                    // Select the tab layout after 150 milliseconds, which leaves enough time for a new tab to be inflated.
+                    selectTabHandler.postDelayed(selectTabRunnable, 150);
                 }
             }
 
diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
index 1834ea88..7dab898e 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
@@ -1038,8 +1038,8 @@ public class SettingsFragment extends PreferenceFragment {
                         System.exit(0);
                     };
 
-                    // Restart the activity after 100 milliseconds, so that the app has enough time to save the change to the preference.
-                    allowScreenshotsRestartHandler.postDelayed(allowScreenshotsRestartRunnable, 100);
+                    // Restart the activity after 150 milliseconds, so that the app has enough time to save the change to the preference.
+                    allowScreenshotsRestartHandler.postDelayed(allowScreenshotsRestartRunnable, 150);
                     break;
 
                 case "easylist":
@@ -1658,8 +1658,8 @@ public class SettingsFragment extends PreferenceFragment {
                         System.exit(0);
                     };
 
-                    // Restart the activity after 100 milliseconds, so that the app has enough time to save the change to the preference.
-                    changeThemeRestartHandler.postDelayed(changeThemeRestartRunnable, 100);
+                    // Restart the activity after 150 milliseconds, so that the app has enough time to save the change to the preference.
+                    changeThemeRestartHandler.postDelayed(changeThemeRestartRunnable, 150);
                     break;
 
                 case "night_mode":