From 12042264a50769030361cf51b0ac197050209f0f Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Wed, 29 Mar 2023 14:45:22 -0700 Subject: [PATCH] Remove AsyncTask from SSLCertificateErrorDialog. https://redmine.stoutner.com/issues/987 --- app/src/main/assets/de/about_changelog.html | 4 +- app/src/main/assets/en/about_changelog.html | 4 +- app/src/main/assets/es/about_changelog.html | 4 +- app/src/main/assets/fr/about_changelog.html | 4 +- app/src/main/assets/it/about_changelog.html | 4 +- .../main/assets/pt-rBR/about_changelog.html | 4 +- app/src/main/assets/ru/about_changelog.html | 4 +- app/src/main/assets/tr/about_changelog.html | 4 +- .../main/assets/zh-rCN/about_changelog.html | 4 +- .../activities/BookmarksActivity.java | 6 +- .../BookmarksDatabaseViewActivity.java | 6 +- .../activities/MainWebViewActivity.java | 16 +-- .../adapters/PinnedMismatchPagerAdapter.kt | 16 +-- .../coroutines/GetHostIpAddressesCoroutine.kt | 62 ++++++++-- .../dialogs/HttpAuthenticationDialog.kt | 4 +- .../dialogs/SslCertificateErrorDialog.kt | 111 +++--------------- .../dialogs/ViewSslCertificateDialog.kt | 16 +-- .../fragments/AboutVersionFragment.kt | 70 +++++------ .../fragments/DomainSettingsFragment.kt | 12 +- .../fragments/WebViewTabFragment.kt | 10 +- .../views/NestedScrollWebView.kt | 5 +- app/src/main/res/values-de/strings.xml | 105 +++++++++-------- app/src/main/res/values-es/strings.xml | 105 +++++++++-------- app/src/main/res/values-fr/strings.xml | 105 +++++++++-------- app/src/main/res/values-it/strings.xml | 105 +++++++++-------- app/src/main/res/values-pt-rBR/strings.xml | 105 +++++++++-------- app/src/main/res/values-ru/strings.xml | 105 +++++++++-------- app/src/main/res/values-tr/strings.xml | 85 +++++++------- app/src/main/res/values-zh-rCN/strings.xml | 95 +++++++-------- app/src/main/res/values/strings.xml | 105 +++++++++-------- 30 files changed, 632 insertions(+), 653 deletions(-) diff --git a/app/src/main/assets/de/about_changelog.html b/app/src/main/assets/de/about_changelog.html index 761c5cd0..5ee5088d 100644 --- a/app/src/main/assets/de/about_changelog.html +++ b/app/src/main/assets/de/about_changelog.html @@ -33,8 +33,8 @@ -

3.13.4 (Version Code 68)

27. MÃ¤rz 2023 - Mindest-API 24, Ziel-API 33

3.13.4 (Version Code 68)

27. MÃ¤rz 2023 - Mindest-API 24, Ziel-API 33

Problem mit gelegentlich bei Neustarts auftretenden AbstÃ¼rzen, die durch eine in Version 3.13.3. Fehlerbehebung verursacht wurden, behoben.

3.13.4 (version code 68)

27 March 2023 - minimum API 24, target API 33

3.13.4 (version code 68)

27 March 2023 - minimum API 24, target API 33

Fix an intermittent crash on restart caused by the race condition fix introduced in 3.13.3.

3.13.4 (cÃ³digo de versiÃ³n 68)

27 de marzo de 2023 - API mÃnimo 24, API objetivo 33

3.13.4 (cÃ³digo de versiÃ³n 68)

27 de marzo de 2023 - API mÃnimo 24, API objetivo 33

Corregir una caÃda intermitente en el reinicio causada por la correcciÃ³n de la condiciÃ³n de carrera introducida en 3.13.3.

3.13.4 (version du code 68)

27 Mars 2023 - API minimale : 24, API optimale : 33

3.13.4 (version du code 68)

27 Mars 2023 - API minimale : 24, API optimale : 33

Fix an intermittent crash on restart caused by the race condition fix introduced in 3.13.3.

3.13.4 (versione codice 68)

27 Marzo 2023 - minima API 24, target API 33

3.13.4 (versione codice 68)

27 Marzo 2023 - minima API 24, target API 33

Correzione di un crash intermittente al riavvio provocato da una correzione per una "situazione di corsa" introdotta nella versione 3.13.3.

3.13.4 (cÃ³digo de versÃ£o 68)

27 March 2023 - API mÃnimo 24, API alvo 33

3.13.4 (cÃ³digo de versÃ£o 68)

27 March 2023 - API mÃnimo 24, API alvo 33

Fix an intermittent crash on restart caused by the race condition fix introduced in 3.13.3.

3.13.4 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 68)

3.13.4 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 68)

ÐÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½ ÑÐ±Ð¾Ð¹, Ð¿ÐµÑÐ¸Ð¾Ð´Ð¸ÑÐµÑÐºÐ¸ Ð²Ð¾Ð·Ð½Ð¸ÐºÐ°Ð²ÑÐ¸Ð¹ Ð¿Ð¾ÑÐ»Ðµ ÑÑÑÑÐ°Ð½ÐµÐ½Ð¸Ñ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ñ Ð³Ð¾Ð½ÐºÐ¸ Ð² Ð²ÐµÑÑÐ¸Ð¸ 3.13.3.

3.13.4 (version code 68)

27 Mart 2023 - minimum API 24, target API 33

3.13.4 (version code 68)

27 Mart 2023 - minimum API 24, target API 33

Fix an intermittent crash on restart caused by the race condition fix introduced in 3.13.3.

3.13.4 (version code 68)

27 March 2023 - æä½æ¯æAPI 24, æé«æ¯æAPI 33

3.13.4 (version code 68)

27 March 2023 - æä½æ¯æAPI 24, æé«æ¯æAPI 33

å¢å é»ç½å¾æ éé¡¹ã

. + * Copyright Â© 2021-2023 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -90,13 +90,13 @@ class PinnedMismatchPagerAdapter(private val context: Context, private val layou val endDateTextView = tabLayout.findViewById(R.id.end_date) // Setup the labels. - val domainNameLabel = context.getString(R.string.domain_label) + " " - val ipAddressesLabel = context.getString(R.string.ip_addresses) + " " - val cNameLabel = context.getString(R.string.common_name) + " " - val oNameLabel = context.getString(R.string.organization) + " " - val uNameLabel = context.getString(R.string.organizational_unit) + " " - val startDateLabel = context.getString(R.string.start_date) + " " - val endDateLabel = context.getString(R.string.end_date) + " " + val domainNameLabel = context.getString(R.string.domain_label) + val ipAddressesLabel = context.getString(R.string.ip_addresses) + val cNameLabel = context.getString(R.string.common_name) + val oNameLabel = context.getString(R.string.organization) + val uNameLabel = context.getString(R.string.organizational_unit) + val startDateLabel = context.getString(R.string.start_date) + val endDateLabel = context.getString(R.string.end_date) // Convert the URL to a URI. val currentUri = Uri.parse(nestedScrollWebView.url) diff --git a/app/src/main/java/com/stoutner/privacybrowser/coroutines/GetHostIpAddressesCoroutine.kt b/app/src/main/java/com/stoutner/privacybrowser/coroutines/GetHostIpAddressesCoroutine.kt index 985bc506..4d3ed5ba 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/coroutines/GetHostIpAddressesCoroutine.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/coroutines/GetHostIpAddressesCoroutine.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019,2021-2022 Soren Stoutner . + * Copyright 2019,2021-2023 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -19,7 +19,13 @@ package com.stoutner.privacybrowser.coroutines +import android.text.SpannableStringBuilder +import android.text.Spanned +import android.text.style.ForegroundColorSpan +import android.widget.TextView + import androidx.fragment.app.FragmentManager + import com.stoutner.privacybrowser.helpers.CheckPinnedMismatchHelper import com.stoutner.privacybrowser.views.NestedScrollWebView @@ -33,8 +39,50 @@ import java.net.InetAddress import java.net.UnknownHostException object GetHostIpAddressesCoroutine { + fun getAddresses(domainName: String, ipAddressesLabel: String, blueColorSpan: ForegroundColorSpan, ipAddressesTextView: TextView) { + // Get the IP addresses using a coroutine. + CoroutineScope(Dispatchers.Main).launch { + // Get the IP addresses on the IO thread. + withContext(Dispatchers.IO) { + // Get an array with the IP addresses for the host. + try { + // Initialize an IP address string builder. + val ipAddressesStringBuilder = StringBuilder() + + // Get an array with all the IP addresses for the domain. + val inetAddressesArray = InetAddress.getAllByName(domainName) + + // Add each IP address to the string builder. + for (inetAddress in inetAddressesArray) { + // Add a line break to the string builder if this is not the first IP address. + if (ipAddressesStringBuilder.isNotEmpty()) { + ipAddressesStringBuilder.append("\n") + } + + // Add the IP address to the string builder. + ipAddressesStringBuilder.append(inetAddress.hostAddress) + } + + // Create a spannable string builder. + val addressesStringBuilder = SpannableStringBuilder(ipAddressesLabel + ipAddressesStringBuilder) + + // Set the string builder to display the certificate information in blue. `SPAN_INCLUSIVE_INCLUSIVE` allows the span to grow in either direction. + addressesStringBuilder.setSpan(blueColorSpan, ipAddressesLabel.length, addressesStringBuilder.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE) + + // Populate the IP addresses text view on the UI thread. + withContext(Dispatchers.Main) { + // Populate the IP addresses text view. + ipAddressesTextView.text = addressesStringBuilder + } + } catch (exception: UnknownHostException) { + // Do nothing. + } + } + } + } + @JvmStatic - fun getAddresses(domainName: String, nestedScrollWebView: NestedScrollWebView, supportFragmentManager: FragmentManager, pinnedMismatchString: String) { + fun checkPinnedMismatch(domainName: String, nestedScrollWebView: NestedScrollWebView, supportFragmentManager: FragmentManager, pinnedMismatchString: String) { // Get the IP addresses using a coroutine. CoroutineScope(Dispatchers.Main).launch { // Get the IP addresses on the IO thread. @@ -42,7 +90,7 @@ object GetHostIpAddressesCoroutine { // Get an array with the IP addresses for the host. try { // Initialize an IP address string builder. - val ipAddresses = StringBuilder() + val ipAddressesStringBuilder = StringBuilder() // Get an array with all the IP addresses for the domain. val inetAddressesArray = InetAddress.getAllByName(domainName) @@ -50,16 +98,16 @@ object GetHostIpAddressesCoroutine { // Add each IP address to the string builder. for (inetAddress in inetAddressesArray) { // Add a line break to the string builder if this is not the first IP address. - if (ipAddresses.isNotEmpty()) { - ipAddresses.append("\n") + if (ipAddressesStringBuilder.isNotEmpty()) { + ipAddressesStringBuilder.append("\n") } // Add the IP address to the string builder. - ipAddresses.append(inetAddress.hostAddress) + ipAddressesStringBuilder.append(inetAddress.hostAddress) } // Store the IP addresses. - nestedScrollWebView.currentIpAddresses = ipAddresses.toString() + nestedScrollWebView.currentIpAddresses = ipAddressesStringBuilder.toString() // Checked for pinned mismatches if there is pinned information and it is not ignored. This must be done on the UI thread because checking the pinned mismatch interacts with the WebView. withContext(Dispatchers.Main) { diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt index d7fe8f9b..7866ff48 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt @@ -1,5 +1,5 @@ /* - * Copyright Â© 2017-2022 Soren Stoutner . + * Copyright Â© 2017-2023 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -164,7 +164,7 @@ class HttpAuthenticationDialog : DialogFragment() { realmTextView.text = httpAuthRealm // Initialize the host label and the spannable string builder. - val hostLabel = getString(R.string.host) + " " + val hostLabel = getString(R.string.host) val hostStringBuilder = SpannableStringBuilder(hostLabel + httpAuthHost) // Set the blue color span. diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.kt index 1090bedd..e0b27230 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.kt @@ -1,5 +1,5 @@ /* - * Copyright 2016-2022 Soren Stoutner . + * Copyright 2016-2023 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -19,12 +19,10 @@ package com.stoutner.privacybrowser.dialogs -import android.app.Activity import android.app.Dialog import android.content.DialogInterface import android.net.Uri import android.net.http.SslError -import android.os.AsyncTask import android.os.Bundle import android.text.SpannableStringBuilder import android.text.Spanned @@ -38,11 +36,9 @@ import androidx.preference.PreferenceManager import com.stoutner.privacybrowser.R import com.stoutner.privacybrowser.activities.MainWebViewActivity +import com.stoutner.privacybrowser.coroutines.GetHostIpAddressesCoroutine import com.stoutner.privacybrowser.views.NestedScrollWebView -import java.lang.ref.WeakReference -import java.net.InetAddress -import java.net.UnknownHostException import java.text.DateFormat // Define the class constants. @@ -186,15 +182,13 @@ class SslCertificateErrorDialog : DialogFragment() { // Get a URI for the URL with errors. val uriWithErrors = Uri.parse(urlWithErrors) - // Get the IP addresses for the URI. - GetIpAddresses(requireActivity(), alertDialog).execute(uriWithErrors.host) - // The alert dialog must be shown before the contents can be modified. alertDialog.show() // Get handles for the views. val primaryErrorTextView = alertDialog.findViewById(R.id.primary_error)!! val urlTextView = alertDialog.findViewById(R.id.url)!! + val ipAddressesTextView = alertDialog.findViewById(R.id.ip_addresses)!! val issuedToCNameTextView = alertDialog.findViewById(R.id.issued_to_cname)!! val issuedToONameTextView = alertDialog.findViewById(R.id.issued_to_oname)!! val issuedToUNameTextView = alertDialog.findViewById(R.id.issued_to_uname)!! @@ -206,13 +200,20 @@ class SslCertificateErrorDialog : DialogFragment() { val startDateTextView = alertDialog.findViewById(R.id.start_date)!! val endDateTextView = alertDialog.findViewById(R.id.end_date)!! + // Define the color spans. + val blueColorSpan = ForegroundColorSpan(requireContext().getColor(R.color.alt_blue_text)) + val redColorSpan = ForegroundColorSpan(requireContext().getColor(R.color.red_text)) + + // Get the IP Addresses for the URI. + GetHostIpAddressesCoroutine.getAddresses(uriWithErrors.host!!, getString(R.string.ip_addresses), blueColorSpan, ipAddressesTextView) + // Setup the common strings. - val urlLabel = getString(R.string.url_label) + " " - val cNameLabel = getString(R.string.common_name) + " " - val oNameLabel = getString(R.string.organization) + " " - val uNameLabel = getString(R.string.organizational_unit) + " " - val startDateLabel = getString(R.string.start_date) + " " - val endDateLabel = getString(R.string.end_date) + " " + val urlLabel = getString(R.string.url_label) + val cNameLabel = getString(R.string.common_name) + val oNameLabel = getString(R.string.organization) + val uNameLabel = getString(R.string.organizational_unit) + val startDateLabel = getString(R.string.start_date) + val endDateLabel = getString(R.string.end_date) // Create a spannable string builder for each text view that needs multiple colors of text. val urlStringBuilder = SpannableStringBuilder(urlLabel + urlWithErrors) @@ -225,10 +226,6 @@ class SslCertificateErrorDialog : DialogFragment() { val startDateStringBuilder = SpannableStringBuilder(startDateLabel + startDate) val endDateStringBuilder = SpannableStringBuilder(endDateLabel + endDate) - // Define the color spans. - val blueColorSpan = ForegroundColorSpan(requireContext().getColor(R.color.alt_blue_text)) - val redColorSpan = ForegroundColorSpan(requireContext().getColor(R.color.red_text)) - // Setup the spans to display the certificate information in blue. `SPAN_INCLUSIVE_INCLUSIVE` allows the span to grow in either direction. urlStringBuilder.setSpan(blueColorSpan, urlLabel.length, urlStringBuilder.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE) issuedToCNameStringBuilder.setSpan(blueColorSpan, cNameLabel.length, issuedToCNameStringBuilder.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE) @@ -315,80 +312,4 @@ class SslCertificateErrorDialog : DialogFragment() { // Return the alert dialog. return alertDialog } - - // This must run asynchronously because it involves a network request. `String` declares the parameters. `Void` does not declare progress units. `SpannableStringBuilder` contains the results. - private class GetIpAddresses constructor(activity: Activity, alertDialog: AlertDialog) : AsyncTask() { - // Define the weak references. - private val activityWeakReference: WeakReference = WeakReference(activity) - private val alertDialogWeakReference: WeakReference = WeakReference(alertDialog) - - @Deprecated("Deprecated in Java") - override fun doInBackground(vararg domainName: String): SpannableStringBuilder { - // Get handles for the activity and the alert dialog. - val activity = activityWeakReference.get() - val alertDialog = alertDialogWeakReference.get() - - // Abort if the activity or the dialog is gone. - if (activity == null || activity.isFinishing || alertDialog == null) { - return SpannableStringBuilder() - } - - // Initialize an IP address string builder. - val ipAddresses = StringBuilder() - - // Get an array with the IP addresses for the host. - try { - // Get an array with all the IP addresses for the domain. - val inetAddressesArray = InetAddress.getAllByName(domainName[0]) - - // Add each IP address to the string builder. - for (inetAddress in inetAddressesArray) { - // Check to see if this is not the first IP address. - if (ipAddresses.isNotEmpty()) { - // Add a line break to the string builder first. - ipAddresses.append("\n") - } - - // Add the IP Address to the string builder. - ipAddresses.append(inetAddress.hostAddress) - } - } catch (exception: UnknownHostException) { - // Do nothing. - } - - // Set the label. - val ipAddressesLabel = activity.getString(R.string.ip_addresses) + " " - - // Create a spannable string builder. - val ipAddressesStringBuilder = SpannableStringBuilder(ipAddressesLabel + ipAddresses) - - // Create a blue color span according to the theme. - val blueColorSpan = ForegroundColorSpan(activity.getColor(R.color.alt_blue_text)) - - // Set the string builder to display the certificate information in blue. `SPAN_INCLUSIVE_INCLUSIVE` allows the span to grow in either direction. - ipAddressesStringBuilder.setSpan(blueColorSpan, ipAddressesLabel.length, ipAddressesStringBuilder.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE) - - // Return the formatted string. - return ipAddressesStringBuilder - } - - // `onPostExecute()` operates on the UI thread. - @Deprecated("Deprecated in Java") - override fun onPostExecute(ipAddresses: SpannableStringBuilder) { - // Get handles for the activity and the alert dialog. - val activity = activityWeakReference.get() - val alertDialog = alertDialogWeakReference.get() - - // Abort if the activity or the alert dialog is gone. - if (activity == null || activity.isFinishing || alertDialog == null) { - return - } - - // Get a handle for the IP addresses text view. - val ipAddressesTextView = alertDialog.findViewById(R.id.ip_addresses)!! - - // Populate the IP addresses text view. - ipAddressesTextView.text = ipAddresses - } - } } diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewSslCertificateDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewSslCertificateDialog.kt index 04cdad8d..5edaae62 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewSslCertificateDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewSslCertificateDialog.kt @@ -1,5 +1,5 @@ /* - * Copyright Â© 2016-2022 Soren Stoutner . + * Copyright Â© 2016-2023 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -229,13 +229,13 @@ class ViewSslCertificateDialog : DialogFragment() { val endDateTextView = alertDialog.findViewById(R.id.end_date)!! // Setup the labels. - val domainLabel = getString(R.string.domain_label) + " " - val ipAddressesLabel = getString(R.string.ip_addresses) + " " - val cNameLabel = getString(R.string.common_name) + " " - val oNameLabel = getString(R.string.organization) + " " - val uNameLabel = getString(R.string.organizational_unit) + " " - val startDateLabel = getString(R.string.start_date) + " " - val endDateLabel = getString(R.string.end_date) + " " + val domainLabel = getString(R.string.domain_label) + val ipAddressesLabel = getString(R.string.ip_addresses) + val cNameLabel = getString(R.string.common_name) + val oNameLabel = getString(R.string.organization) + val uNameLabel = getString(R.string.organizational_unit) + val startDateLabel = getString(R.string.start_date) + val endDateLabel = getString(R.string.end_date) // Create spannable string builders for each text view that needs multiple colors of text. val domainStringBuilder = SpannableStringBuilder(domainLabel + domainString) diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt index 079b2ac8..2bac1522 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt @@ -276,35 +276,35 @@ class AboutVersionFragment : Fragment() { // Setup the labels. val version = getString(R.string.version_code, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE) - val brandLabel = getString(R.string.brand) + " " - val manufacturerLabel = getString(R.string.manufacturer) + " " - val modelLabel = getString(R.string.model) + " " - val deviceLabel = getString(R.string.device) + " " - val bootloaderLabel = getString(R.string.bootloader) + " " - val androidLabel = getString(R.string.android) + " " - val buildLabel = getString(R.string.build) + " " - val kernelLabel = getString(R.string.kernel) + " " - val webViewVersionLabel = getString(R.string.webview_version) + " " - appConsumedMemoryLabel = getString(R.string.app_consumed_memory) + " " - appAvailableMemoryLabel = getString(R.string.app_available_memory) + " " - appTotalMemoryLabel = getString(R.string.app_total_memory) + " " - appMaximumMemoryLabel = getString(R.string.app_maximum_memory) + " " - systemConsumedMemoryLabel = getString(R.string.system_consumed_memory) + " " - systemAvailableMemoryLabel = getString(R.string.system_available_memory) + " " - systemTotalMemoryLabel = getString(R.string.system_total_memory) + " " - val easyListLabel = getString(R.string.easylist_label) + " " - val easyPrivacyLabel = getString(R.string.easyprivacy_label) + " " - val fanboyAnnoyanceLabel = getString(R.string.fanboys_annoyance_label) + " " - val fanboySocialLabel = getString(R.string.fanboys_social_label) + " " - val ultraListLabel = getString(R.string.ultralist_label) + " " - val ultraPrivacyLabel = getString(R.string.ultraprivacy_label) + " " - val issuerDNLabel = getString(R.string.issuer_dn) + " " - val subjectDNLabel = getString(R.string.subject_dn) + " " - val startDateLabel = getString(R.string.start_date) + " " - val endDateLabel = getString(R.string.end_date) + " " - val certificateVersionLabel = getString(R.string.certificate_version) + " " - val serialNumberLabel = getString(R.string.serial_number) + " " - val signatureAlgorithmLabel = getString(R.string.signature_algorithm) + " " + val brandLabel = getString(R.string.brand) + val manufacturerLabel = getString(R.string.manufacturer) + val modelLabel = getString(R.string.model) + val deviceLabel = getString(R.string.device) + val bootloaderLabel = getString(R.string.bootloader) + val androidLabel = getString(R.string.android) + val buildLabel = getString(R.string.build) + val kernelLabel = getString(R.string.kernel) + val webViewVersionLabel = getString(R.string.webview_version) + appConsumedMemoryLabel = getString(R.string.app_consumed_memory) + appAvailableMemoryLabel = getString(R.string.app_available_memory) + appTotalMemoryLabel = getString(R.string.app_total_memory) + appMaximumMemoryLabel = getString(R.string.app_maximum_memory) + systemConsumedMemoryLabel = getString(R.string.system_consumed_memory) + systemAvailableMemoryLabel = getString(R.string.system_available_memory) + systemTotalMemoryLabel = getString(R.string.system_total_memory) + val easyListLabel = getString(R.string.easylist_label) + val easyPrivacyLabel = getString(R.string.easyprivacy_label) + val fanboyAnnoyanceLabel = getString(R.string.fanboys_annoyance_label) + val fanboySocialLabel = getString(R.string.fanboys_social_label) + val ultraListLabel = getString(R.string.ultralist_label) + val ultraPrivacyLabel = getString(R.string.ultraprivacy_label) + val issuerDNLabel = getString(R.string.issuer_dn) + val subjectDNLabel = getString(R.string.subject_dn) + val startDateLabel = getString(R.string.start_date) + val endDateLabel = getString(R.string.end_date) + val certificateVersionLabel = getString(R.string.certificate_version) + val serialNumberLabel = getString(R.string.serial_number) + val signatureAlgorithmLabel = getString(R.string.signature_algorithm) // The WebView layout is only used to get the default user agent from `bare_webview`. It is not used to render content on the screen. // Once the minimum API >= 26 this can be accomplished with the WebView package info. @@ -421,7 +421,7 @@ class AboutVersionFragment : Fragment() { // Null must be checked because some Samsung tablets report a null value for the radio instead of an empty string. Grrrr. if (radio != null && radio.isNotEmpty()) { // Setup the label. - val radioLabel = getString(R.string.radio) + " " + val radioLabel = getString(R.string.radio) // Create a spannable string builder. val radioStringBuilder = SpannableStringBuilder(radioLabel + radio) @@ -437,7 +437,7 @@ class AboutVersionFragment : Fragment() { } // Setup the label. - val securityPatchLabel = getString(R.string.security_patch) + " " + val securityPatchLabel = getString(R.string.security_patch) // Get the security patch version. val securityPatch = Build.VERSION.SECURITY_PATCH @@ -452,7 +452,7 @@ class AboutVersionFragment : Fragment() { securityPatchTextView.text = securityPatchStringBuilder // Create the WebView provider label. - val webViewProviderLabel = getString(R.string.webview_provider) + " " + val webViewProviderLabel = getString(R.string.webview_provider) // Get the current WebView package info. val webViewPackageInfo = WebViewCompat.getCurrentWebViewPackage(requireContext())!! @@ -472,7 +472,7 @@ class AboutVersionFragment : Fragment() { // Only populate the Orbot text view if it is installed. if (orbot.isNotEmpty()) { // Setup the label. - val orbotLabel = getString(R.string.orbot) + " " + val orbotLabel = getString(R.string.orbot) // Create a spannable string builder. val orbotStringBuilder = SpannableStringBuilder(orbotLabel + orbot) @@ -490,7 +490,7 @@ class AboutVersionFragment : Fragment() { // Only populate the I2P text view if it is installed. if (i2p.isNotEmpty()) { // Setup the label. - val i2pLabel = getString(R.string.i2p) + " " + val i2pLabel = getString(R.string.i2p) // Create a spannable string builder. val i2pStringBuilder = SpannableStringBuilder(i2pLabel + i2p) @@ -508,7 +508,7 @@ class AboutVersionFragment : Fragment() { // Only populate the OpenKeychain text view if it is installed. if (openKeychain.isNotEmpty()) { // Setup the label. - val openKeychainLabel = getString(R.string.openkeychain) + " " + val openKeychainLabel = getString(R.string.openkeychain) // Create a spannable string builder. val openKeychainStringBuilder = SpannableStringBuilder(openKeychainLabel + openKeychain) diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.kt index 0e351b94..6b69e711 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.kt @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 Soren Stoutner . + * Copyright 2017-2023 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -185,11 +185,11 @@ class DomainSettingsFragment : Fragment() { webViewThemeLinearLayout.visibility = View.GONE // Setup the pinned labels. - val cNameLabel = getString(R.string.common_name) + " " - val oNameLabel = getString(R.string.organization) + " " - val uNameLabel = getString(R.string.organizational_unit) + " " - val startDateLabel = getString(R.string.start_date) + " " - val endDateLabel = getString(R.string.end_date) + " " + val cNameLabel = getString(R.string.common_name) + val oNameLabel = getString(R.string.organization) + val uNameLabel = getString(R.string.organizational_unit) + val startDateLabel = getString(R.string.start_date) + val endDateLabel = getString(R.string.end_date) // Initialize the database handler. val domainsDatabaseHelper = DomainsDatabaseHelper(requireContext()) diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/WebViewTabFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/WebViewTabFragment.kt index 154ea2dd..6f480438 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/WebViewTabFragment.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/WebViewTabFragment.kt @@ -105,8 +105,8 @@ class WebViewTabFragment : Fragment() { } override fun onCreateView(layoutInflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - // Check to see if the fragment is being restarted. - return if (savedInstanceState == null) { // The fragment is not being restarted. Load and configure a new fragment. + // Check to see if the fragment is being restarted without the app being killed. + return if (savedInstanceState == null) { // The fragment is not being restarted. It is either new or is being restored after the app was killed. // Check to see if a new page is being created. if (requireArguments().getBoolean(CREATE_NEW_PAGE)) { // A new page is being created. // Get the variables from the arguments @@ -129,9 +129,9 @@ class WebViewTabFragment : Fragment() { // Return the new page view. newPageView - } else { // A page is being restored. + } else { // A page is being restored after the app was killed. // Get the saved states from the arguments. - val savedState = requireArguments().getBundle(SAVED_STATE) + val savedState = requireArguments().getBundle(SAVED_STATE)!! val savedNestedScrollWebViewState = requireArguments().getBundle(SAVED_NESTED_SCROLL_WEBVIEW_STATE)!! // Inflate the tab's WebView. Setting false at the end of inflater.inflate does not attach the inflated layout as a child of container. @@ -149,7 +149,7 @@ class WebViewTabFragment : Fragment() { nestedScrollWebView.restoreNestedScrollWebViewState(savedNestedScrollWebViewState) // Restore the WebView state. - nestedScrollWebView.restoreState(savedState!!) + nestedScrollWebView.restoreState(savedState) // Initialize the WebView. newTabListener.initializeWebView(nestedScrollWebView, 0, progressBar, "", true) diff --git a/app/src/main/java/com/stoutner/privacybrowser/views/NestedScrollWebView.kt b/app/src/main/java/com/stoutner/privacybrowser/views/NestedScrollWebView.kt index eafe10fe..fb8e84e4 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/views/NestedScrollWebView.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/views/NestedScrollWebView.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Soren Stoutner . + * Copyright 2019-2023 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -394,7 +394,7 @@ class NestedScrollWebView @JvmOverloads constructor(context: Context, attributeS } - // Save and restore state. + // Save the state. fun saveNestedScrollWebViewState(): Bundle { // Create a saved state bundle. val savedState = Bundle() @@ -434,6 +434,7 @@ class NestedScrollWebView @JvmOverloads constructor(context: Context, attributeS return savedState } + // Restore the state. fun restoreNestedScrollWebViewState(savedState: Bundle) { // Restore the class variables. domainSettingsApplied = savedState.getBoolean(DOMAIN_SETTINGS_APPLIED) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 2b68bfc8..bf45a9bb 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -31,7 +31,7 @@ de - + Privater Modus JavaScript aktiviert JavaScript deaktiviert @@ -47,12 +47,12 @@ Navigationspanel Ã¶ffnen Navigationspanel schlieÃen MenÃ¼ anpinnen - Unbekannte URL: + Unbekannte URL: \u0020 Tab hinzufÃ¼gen Tab schlieÃen Neuer Tab Ladenâ¦ - Fehler: + Fehler: \u0020 Anwenden @@ -67,7 +67,7 @@ Website-Icon URL oder Suchbegriff - + SSL-Zertifikat ansehen UnverschlÃ¼sselte Website Die Kommunikation mit dieser Website erfolgt nicht verschlÃ¼sselt. @@ -75,18 +75,18 @@ SSL-Zertifikat SchlieÃen Domain - IP-Addressen: - Domain: + Domain: \u0020 + IP-Addressen: \u0020 Ausgestellt fÃ¼r Ausgestellt von - Allgemeiner Name (CN): - Organisation (O): - Organisierende Einheit (OU): + Allgemeiner Name (CN): \u0020 + Organisation (O): \u0020 + Organisierende Einheit (OU): \u0020 GÃ¼ltige Daten - Startdatum: - Enddatum: + Startdatum: \u0020 + Enddatum: \u0020 - + SSL-Zertifikatsfehler Fortfahren Das Startdatum des SSL-Zertifikats liegt in der Zukunft @@ -96,7 +96,7 @@ Das Datum des Zertifikats ist ungÃ¼ltig Das Zertifikat ist ungÃ¼ltig URL - URL: + URL: \u0020 Verankerungs-Fehler @@ -104,9 +104,9 @@ Aktuelles Verankert - + HTTP-Authentifizierung - Host: + Host: \u0020 Benutzername Passwort @@ -252,14 +252,14 @@ In Ordner verschieben Verschieben - - AusgewÃ¤hlt: + + AusgewÃ¤hlt: \u0020 Nach oben verschieben Nach unten verschieben Bearbeiten LÃ¶schen Alle auswÃ¤hlen - Lesezeichen gelÃ¶scht: + Lesezeichen gelÃ¶scht: \u0020 RÃ¼ckgÃ¤ngig @@ -404,51 +404,52 @@ Warte auf die Verbindung zum Orbot-Proxy. Die benutzerdefinierte Proxy-URL ist ungÃ¼ltig. - + Ãber Privacy Browser Version Version %1$s (Versions-Code %2$d) Hardware - Marke: - Hersteller: - Modell: - GerÃ¤t: - Bootloader: - Radio: + Marke: \u0020 + Hersteller: \u0020 + Modell: \u0020 + GerÃ¤t: \u0020 + Bootloader: \u0020 + Radio: \u0020 Software - Android: + Android: \u0020 %1$s (API %2$d) - Sicherheits-Patch: - Build: - Kernel: - WebView-Anbieter: - WebView-Version: - Orbot: - I2P: + Sicherheits-Patch: \u0020 + Build: \u0020 + Kernel: \u0020 + WebView-Anbieter: \u0020 + WebView-Version: \u0020 + Orbot: \u0020 + I2P: \u0020 %1$s (F-Droid-Version) %1$s (Google-Play-Version) - OpenKeychain: + OpenKeychain: \u0020 Speicher-Nutzung - von der App genutzter Speicher: - fÃ¼r die App verfÃ¼gbarer Speicher: - gesamter App-Speicher: - maximaler App-Speicher: - vom System genutzter Speicher: - fÃ¼r das System verfÃ¼gbarer Speicher: - gesamter System-Speicher: + von der App genutzter Speicher: \u0020 + fÃ¼r die App verfÃ¼gbarer Speicher: \u0020 + gesamter App-Speicher: \u0020 + maximaler App-Speicher: \u0020 + vom System genutzter Speicher: \u0020 + fÃ¼r das System verfÃ¼gbarer Speicher: \u0020 + gesamter System-Speicher: \u0020 MiB - EasyList: - EasyPrivacy: - Fanboyâs Annoyance Sperrliste: - Fanboyâs Social Blocking Sperrliste: - UltraList: - UltraPrivacy: + EasyList: \u0020 + EasyPrivacy: \u0020 + Fanboyâs Annoyance Sperrliste: \u0020 + Fanboyâs Social Blocking Sperrliste: \u0020 + UltraList: \u0020 + UltraPrivacy: \u0020 Paket-Signatur - Aussteller-DN: - Subject DN: - Zertifikat-Version: - Seriennummer: - Signaturalgorithmus: + Aussteller-DN: \u0020 + Subject DN: \u0020 + Zertifikat-Version: \u0020 + Seriennummer: \u0020 + Signaturalgorithmus: \u0020 Versions-Information wurde kopiert. Privacy Browser Version %1$s.txt Privacy Browser Version %1$s.png diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index bad35e6a..98a063af 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -27,7 +27,7 @@ es - + Modo Privado Javascript habilitado Javascript deshabilitado @@ -43,12 +43,12 @@ Abrir la caja de navegaciÃ³n Cerrar la caja de navegaciÃ³n Fijar el cajÃ³n - URL no reconocida: + URL no reconocida: \u0020 AÃ±adir pestaÃ±a Cerrar pestaÃ±a Nueva pestaÃ±a Cargandoâ¦ - Error: + Error: \u0020 Apply @@ -63,7 +63,7 @@ Icono favorito URL o bÃºsqueda - + Ver certificado SSL Web sin cifrar La comunicaciÃ³n con esta pÃ¡gina web no estÃ¡ cifrada. @@ -71,18 +71,18 @@ Certificado SSL Cerrar Dominio - Dominio: - Direcciones IP: + Dominio: \u0020 + Direcciones IP: \u0020 Emitido a Emitido por - Nombre ComÃºn (CN): - OrganizaciÃ³n (O): - Unidad Organizativa (OU): + Nombre ComÃºn (CN): \u0020 + OrganizaciÃ³n (O): \u0020 + Unidad Organizativa (OU): \u0020 Periodo de validez - Comienza el: - Caduca el: + Comienza el: \u0020 + Caduca el: \u0020 - + Error de certificado SSL Proceder La fecha inicio del certificado estÃ¡ en el futuro @@ -92,7 +92,7 @@ La fecha del certificado es invÃ¡lida El certificado es invÃ¡lido URL - URL: + URL: \u0020 Desajuste fijado @@ -100,9 +100,9 @@ Actual Fijado - + AutenticaciÃ³n HTTP - Host: + Host: \u0020 Usuario ContraseÃ±a @@ -249,14 +249,14 @@ Mover a carpeta Mover - - Seleccionados: + + Seleccionados: \u0020 Subir Bajar Editar Borrar Selectionar todo - Favoritos borrados: + Favoritos borrados: \u0020 Deshacer @@ -401,51 +401,52 @@ Esperando a que Orbot se conecte. La URL del proxy personalizado no es vÃ¡lida. - + Acerca de Navegador Privado VersiÃ³n VersiÃ³n %1$s (cÃ³digo de versiÃ³n %2$d) Hardware - Marca: - Fabricante: - Modelo: - Dispositivo: - Cargador de arranque: - Radio: + Marca: \u0020 + Fabricante: \u0020 + Modelo: \u0020 + Dispositivo: \u0020 + Cargador de arranque: \u0020 + Radio: \u0020 Software - Android: + Android: \u0020 %1$s (API %2$d) - Parche de seguridad: - VersiÃ³n de compilaciÃ³n: - Kernel: - Proveedor de WebView: - VersiÃ³n de WebView: - Orbot: - I2P: + Parche de seguridad: \u0020 + VersiÃ³n de compilaciÃ³n: \u0020 + Kernel: \u0020 + Proveedor de WebView: \u0020 + VersiÃ³n de WebView: \u0020 + Orbot: \u0020 + I2P: \u0020 %1$s (variante de F-Droid) %1$s (variante de Google Play) - OpenKeychain: + OpenKeychain: \u0020 Uso de memoria - Memoria conumida de la app: - Memoria disponible de la app: - Memoria total de la app: - Memoria mÃ¡xima de la app: - Memoria consumida del sistema: - Memoria disponible del sistema: - Memoria total del sistema: + Memoria conumida de la app: \u0020 + Memoria disponible de la app: \u0020 + Memoria total de la app: \u0020 + Memoria mÃ¡xima de la app: \u0020 + Memoria consumida del sistema: \u0020 + Memoria disponible del sistema: \u0020 + Memoria total del sistema: \u0020 MiB - EasyList: - EasyPrivacy: - Lista molesta de Fanboy: - Lista de bloqueo social de Fanboy: - UltraList: - Ultra Privacidad: + EasyList: \u0020 + EasyPrivacy: \u0020 + Lista molesta de Fanboy: \u0020 + Lista de bloqueo social de Fanboy: \u0020 + UltraList: \u0020 + Ultra Privacidad: \u0020 Firma del paquete - DN del emisor: - DN del sujeto: - VersiÃ³n del certificado: - NÃºmero de serie: - Algoritmo de firma: + DN del emisor: \u0020 + DN del sujeto: \u0020 + VersiÃ³n del certificado: \u0020 + NÃºmero de serie: \u0020 + Algoritmo de firma: \u0020 InformaciÃ³n de la versiÃ³n copiada. VersiÃ³n de Navegador Privado %1$s.txt VersiÃ³n de Navegador Privado %1$s.png diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5d68d58f..94cb5ace 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -28,7 +28,7 @@ fr - + Mode privÃ© JavaScript activÃ© JavaScript dÃ©sactivÃ© @@ -44,12 +44,12 @@ Ouvrir le panneau de navigation Fermer le panneau de navigation Ãpingler le panneau - URL inconnue : + URL inconnue :\u0020 Ajouter un onglet Fermer l\'onglet Nouvel onglet Chargementâ¦ - Erreur : + Erreur :\u0020 Appliquer @@ -64,7 +64,7 @@ IcÃ´ne de Favoris Rechercher ou saisir adresse - + Voir le certificat SSL Site Web non-chiffrÃ© La communication avec ce site n\'est pas chiffrÃ©e. Cela permet Ã des tiers d\'intercepter des informations, traquer votre activitÃ©, @@ -72,18 +72,18 @@ Certificat SSL Fermer Domaine - Domaine : - Addresse(s) IP : + Domaine :\u0020 + Addresse(s) IP :\u0020 DelivrÃ© Ã DÃ©livrÃ© par - Nom courant (CN) : - Organisation (O) : - UnitÃ© Organisationelle (OU) : + Nom courant (CN) :\u0020 + Organisation (O) :\u0020 + UnitÃ© Organisationelle (OU) :\u0020 Dates de validitÃ©s - DÃ©but : - Fin : + DÃ©but :\u0020 + Fin :\u0020 - + Erreur de certificat SSL Continuer La date de dÃ©but du certificat est dans le futur @@ -93,7 +93,7 @@ La date du certificat est invalide Le certificat est invalide URL - URL : + URL :\u0020 ProblÃ¨me de localisation @@ -101,9 +101,9 @@ Actuelle LocalisÃ© - + Authentification HTTP - Nom d\'hÃ´te : + Nom d\'hÃ´te :\u0020 Nom d\'utilisateur Mot de passe @@ -249,14 +249,14 @@ DÃ©placer vers dossier DÃ©placer - - SelectionnÃ©s : + + SelectionnÃ©s :\u0020 Monter Descendre Modifier Supprimer Tout sÃ©lectionner - Favoris supprimÃ©s : + Favoris supprimÃ©s :\u0020 Annuler @@ -399,51 +399,52 @@ En attente de la connexion d\'Orbot. L\'URL du proxy personnalisÃ© n\'est pas valide. - + Ã propos Version Version %1$s (Code de la version %2$d) MatÃ©riel - Marque : - Constructeur : - ModÃ¨le : - Terminal : - Bootloader : - Radio : + Marque :\u0020 + Constructeur :\u0020 + ModÃ¨le :\u0020 + Terminal :\u0020 + Bootloader :\u0020 + Radio :\u0020 Logiciel - Android : + Android :\u0020 %1$s (API %2$d) - MAJ de sÃ©curitÃ© : - Version : - Noyau: - Fournisseur WebView : - Version WebView : - Orbot : - I2P : + MAJ de sÃ©curitÃ© :\u0020 + Version :\u0020 + Noyau :\u0020 + Fournisseur WebView :\u0020 + Version WebView :\u0020 + Orbot :\u0020 + I2P :\u0020 %1$s (Version F-Droid) %1$s (Version Google Play) - OpenKeychain : + OpenKeychain :\u0020 Utilisation de la mÃ©moire - MÃ©moire consommÃ©e par l\'application : - MÃ©moire disponible de l\'application : - MÃ©moire totale de l\'application : - MÃ©moire maximale de l\'application : - MÃ©moire consommÃ©e par le systÃ¨me : - MÃ©moire systÃ¨me disponible : - MÃ©moire totale du systÃ¨me : + MÃ©moire consommÃ©e par l\'application :\u0020 + MÃ©moire disponible de l\'application :\u0020 + MÃ©moire totale de l\'application :\u0020 + MÃ©moire maximale de l\'application :\u0020 + MÃ©moire consommÃ©e par le systÃ¨me :\u0020 + MÃ©moire systÃ¨me disponible :\u0020 + MÃ©moire totale du systÃ¨me :\u0020 Mio - EasyList : - EasyPrivacy : - Fanboyâs Annoyance List : - Fanboyâs Social Blocking List : - UltraList : - UltraPrivacy : + EasyList :\u0020 + EasyPrivacy :\u0020 + Fanboyâs Annoyance List :\u0020 + Fanboyâs Social Blocking List :\u0020 + UltraList :\u0020 + UltraPrivacy :\u0020 Signature de paquets - DN Ã©metteur : - Dn sujet : - Version du certificat : - NumÃ©ro de sÃ©rie : - Algorithme de chiffrement : + DN Ã©metteur :\u0020 + Dn sujet :\u0020 + Version du certificat :\u0020 + NumÃ©ro de sÃ©rie :\u0020 + Algorithme de chiffrement :\u0020 Informations de version copiÃ©es. Privacy Browser Version %1$s.txt Privacy Browser Version %1$s.png diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 3fde1f5c..2991c561 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -27,7 +27,7 @@ it - + ModalitÃ privata JavaScript abilitato JavaScript disabilitato @@ -43,12 +43,12 @@ Apri il menu di navigazione Chiudi il menu di navigazione Fissa il cassetto - URL non riconosciuta: + URL non riconosciuta: \u0020 Aggiungi Scheda Chiudi Scheda Nuova Scheda Caricamentoâ¦ - Errore: + Errore: \u0020 Applica @@ -63,7 +63,7 @@ FavIcon Digita URL o Ricerca - + Visualizza il certificato SSL Sito non criptato La comunicazione con questo sito web non Ã¨ criptata. Questo consente a terze parti la possibilitÃ di intercettare le informazioni scambiate, @@ -71,18 +71,18 @@ Certificato SSL Chiudi Dominio - Dominio: - Indirizzi IP: + Dominio: \u0020 + Indirizzi IP: \u0020 Emesso a Emesso da - Nome comune (NC): - Organizzazione (O): - UnitÃ organizzativa (UO): + Nome comune (NC): \u0020 + Organizzazione (O): \u0020 + UnitÃ organizzativa (UO): \u0020 Date valide - Data di inizio: - Data finale: + Data di inizio: \u0020 + Data finale: \u0020 - + Errore certificato SSL Continua La data di inizio del certificato Ã¨ nel futuro @@ -92,7 +92,7 @@ La data del certificato non Ã¨ valida Il certificato non Ã¨ valido URL - URL: + URL: \u0020 Discrepanza certificato @@ -100,9 +100,9 @@ Attuale Appuntato - + Autenticazione HTTP - Host: + Host: \u0020 Nome utente Password @@ -248,14 +248,14 @@ Sposta nella Cartella Sposta - - Selezionato: + + Selezionato: \u0020 Sposta sopra Sposta sotto Modifica Elimina Seleziona tutto - Segnalibri eliminati: + Segnalibri eliminati: \u0020 Annulla @@ -400,51 +400,52 @@ In attesa della connessione di Orbot. La URL del proxy personalizzato non Ã¨ valida. - + Informazioni su Privacy Browser Versione Versione %1$s (codice versione %2$d) Hardware - Brand: - Costruttore: - Modello: - Dispositivo: - Bootloader: - Radio: + Brand: \u0020 + Costruttore: \u0020 + Modello: \u0020 + Dispositivo: \u0020 + Bootloader: \u0020 + Radio: \u0020 Software - Android: + Android: \u0020 %1$s (API %2$d) - Patch si sicurezza: - Build: - Kernel: - Provider di WebView: - Versione di WebView: - Orbot: - I2P: + Patch si sicurezza: \u0020 + Build: \u0020 + Kernel: \u0020 + Provider di WebView: \u0020 + Versione di WebView: \u0020 + Orbot: \u0020 + I2P: \u0020 %1$s (Versione F-Droid) %1$s (Versione Google Play) - OpenKeychain: + OpenKeychain: \u0020 Utilizzo della Memoria - Memoria utilizzata dalla App: - Memoria disponibile App: - Memoria totale App: - Memoria massima App: - Memoria di sistema utilizzata: - Memoria di sistema disponibile: - Memoria totale del sistema: + Memoria utilizzata dalla App: \u0020 + Memoria disponibile App: \u0020 + Memoria totale App: \u0020 + Memoria massima App: \u0020 + Memoria di sistema utilizzata: \u0020 + Memoria di sistema disponibile: \u0020 + Memoria totale del sistema: \u0020 MiB - EasyList: - EasyPrivacy: - Fanboyâs Annoyance List: - Fanboyâs Social Blocking List: - UltraList: - UltraPrivacy: + EasyList: \u0020 + EasyPrivacy: \u0020 + Fanboyâs Annoyance List: \u0020 + Fanboyâs Social Blocking List: \u0020 + UltraList: \u0020 + UltraPrivacy: \u0020 Firma del Pacchetto - Emittente: - Soggetto: - Versione del Certificato: - Numero di Serie: - Algoritmo di firma: + Emittente: \u0020 + Soggetto: \u0020 + Versione del Certificato: \u0020 + Numero di Serie: \u0020 + Algoritmo di firma: \u0020 Info sulla Versione copiate. Versione di Privacy Browser %1$s.txt Versione di Privacy Browser %1$s.png diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index fc55bb85..e5a4eb6e 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -27,7 +27,7 @@ pt-rBR - + Modo Privado JavaScript ativado JavaScript desativado @@ -42,12 +42,12 @@ Dados do formulÃ¡rio excluÃdos Abrir a caixa de navegaÃ§Ã£o Fechar a caixa de navegaÃ§Ã£o - URL desconhecida: + URL desconhecida: \u0020 Adicionar aba Fechar aba Nova aba Carregando... - Erro: + Erro: \u0020 Aplicar @@ -62,25 +62,25 @@ Ãcone dos Favoritos URL ou termos de pesquisa - + Ver certificado SSL Site nÃ£o criptografado A comunicaÃ§Ã£o com este site nÃ£o Ã© criptografada. Isso permite que terceiros interceptem informaÃ§Ãµes, rastreiem sua navegaÃ§Ã£o e insiram conteÃºdo malicioso. Certificado SSL Fecha DomÃnio - DomÃnio: - EndereÃ§o de IP: + DomÃnio: \u0020 + EndereÃ§o de IP: \u0020 Emitido para Emitido por - Nome Comum: - OrganizaÃ§Ã£o: - Unidade da OrganizaÃ§Ã£o: + Nome Comum: \u0020 + OrganizaÃ§Ã£o: \u0020 + Unidade da OrganizaÃ§Ã£o: \u0020 Datas VÃ¡lidas - Data Inicial: - Data Final: + Data Inicial: \u0020 + Data Final: \u0020 - + Erro de certificado SSL Prosseguir A data de inÃcio do certificado estÃ¡ no futuro @@ -90,7 +90,7 @@ A data do certificado Ã© invÃ¡lida O certificado Ã© invÃ¡lido URL - URL: + URL: \u0020 Incompatibilidade fixada @@ -98,9 +98,9 @@ Atual Fixada - + AutenticaÃ§Ã£o HTTP - Host: + Host: \u0020 Nome do usuÃ¡rio Senha @@ -246,14 +246,14 @@ Mover para a pasta Mover - - Selecionados: + + Selecionados: \u0020 Subir Descer Editar Apagar Selecionar Tudo - Favoritos excluÃdos: + Favoritos excluÃdos: \u0020 Desfazer @@ -396,51 +396,52 @@ Esperando que o Orbot se conecte. O URL do proxy personalizado Ã© invÃ¡lido. - + Sobre o Privacy Browser VersÃ£o VersÃ£o %1$s (CÃ³digo da VersÃ£o %2$d) Hardware - Marca: - Fabricante: - Modelo: - Dispositivo: - Bootloader: - RÃ¡dio: + Marca: \u0020 + Fabricante: \u0020 + Modelo: \u0020 + Dispositivo: \u0020 + Bootloader: \u0020 + RÃ¡dio: \u0020 Software - Android: + Android: \u0020 %1$s (API %2$d) - Patch de seguranÃ§a: - Build: - Kernel: - Fornecedor WebView: - VersÃ£o do WebView: - Orbot: - I2P: + Patch de seguranÃ§a: \u0020 + Build: \u0020 + Kernel: \u0020 + Fornecedor WebView: \u0020 + VersÃ£o do WebView: \u0020 + Orbot: \u0020 + I2P: \u0020 %1$s (DerivaÃ§Ã£o do F-Droid) %1$s (DerivaÃ§Ã£o do Google Play) - OpenKeychain: + OpenKeychain: \u0020 Uso da MemÃ³ria - Consumo da MemÃ³ria do Aplicativo: - MemÃ³ria DisponÃvel do Aplicativo: - MemÃ³ria Total do Aplicativo: - MemÃ³ria MÃ¡xima do Aplicativo: - MemÃ³ria Consumida do Sistema: - MemÃ³ria DisponÃvel do Sistema: - MemÃ³ria Total do Sistema: + Consumo da MemÃ³ria do Aplicativo: \u0020 + MemÃ³ria DisponÃvel do Aplicativo: \u0020 + MemÃ³ria Total do Aplicativo: \u0020 + MemÃ³ria MÃ¡xima do Aplicativo: \u0020 + MemÃ³ria Consumida do Sistema: \u0020 + MemÃ³ria DisponÃvel do Sistema: \u0020 + MemÃ³ria Total do Sistema: \u0020 MiB - EasyList: - EasyPrivacy: - Fanboyâs Annoyance List: - Fanboyâs Social Blocking List: - UltraList: - UltraPrivacy: + EasyList: \u0020 + EasyPrivacy: \u0020 + Fanboyâs Annoyance List: \u0020 + Fanboyâs Social Blocking List: \u0020 + UltraList: \u0020 + UltraPrivacy: \u0020 Assinatura do Pacote - DN do emissor: - Assunto DN: - VersÃ£o do certificado: - NÃºmero de sÃ©rie: - Algoritmo de Assinatura: + DN do emissor: \u0020 + Assunto DN: \u0020 + VersÃ£o do certificado: \u0020 + NÃºmero de sÃ©rie: \u0020 + Algoritmo de Assinatura: \u0020 InformaÃ§Ãµes de versÃ£o copiada. Privacy Browser VersÃ£o %1$s.txt Privacy Browser VersÃ£o %1$s.png diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e6263a6b..0d8c94d5 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -25,7 +25,7 @@ ru --> - + Ð ÐµÐ¶Ð¸Ð¼ Ð¿ÑÐ¸Ð²Ð°ÑÐ½Ð¾ÑÑÐ¸ JavaScript Ð²ÐºÐ»ÑÑÐµÐ½ JavaScript Ð¾ÑÐºÐ»ÑÑÐµÐ½ @@ -41,12 +41,12 @@ ÐÑÐºÑÑÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð½Ð°Ð²Ð¸Ð³Ð°ÑÐ¸Ð¸ ÐÐ°ÐºÑÑÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð½Ð°Ð²Ð¸Ð³Ð°ÑÐ¸Ð¸ ÐÐ°ÐºÑÐµÐ¿Ð¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ - ÐÐµÑÐ°ÑÐ¿Ð¾Ð·Ð½Ð°Ð½Ð½ÑÐ¹ URL: + ÐÐµÑÐ°ÑÐ¿Ð¾Ð·Ð½Ð°Ð½Ð½ÑÐ¹ URL: \u0020 ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð²ÐºÐ»Ð°Ð´ÐºÑ ÐÐ°ÐºÑÑÑÑ Ð²ÐºÐ»Ð°Ð´ÐºÑ ÐÐ¾Ð²Ð°Ñ Ð²ÐºÐ»Ð°Ð´ÐºÐ° ÐÐ°Ð³ÑÑÐ·ÐºÐ°â¦ - ÐÑÐ¸Ð±ÐºÐ°: + ÐÑÐ¸Ð±ÐºÐ°: \u0020 ÐÑÐ¸Ð¼ÐµÐ½Ð¸ÑÑ @@ -61,25 +61,25 @@ ÐÐ½Ð°ÑÐ¾Ðº ÑÐ°Ð¹ÑÐ° URL Ð¸Ð»Ð¸ Ð¿Ð¾Ð¸ÑÐºÐ¾Ð²ÑÐ¹ Ð·Ð°Ð¿ÑÐ¾Ñ - + ÐÑÐ¾ÑÐ¼Ð¾ÑÑ ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ° SSL ÐÐµÐ·Ð°ÑÐ¸ÑÑÐ¾Ð²Ð°Ð½Ð½ÑÐ¹ Ð²ÐµÐ±-ÑÐ°Ð¹Ñ Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ ÑÑÐ¸Ð¼ ÑÐ°Ð¹ÑÐ¾Ð¼ Ð½Ðµ Ð·Ð°ÑÐ¸ÑÑÐ¾Ð²Ð°Ð½Ð¾. ÐÑÐ¾ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐµÑ ÑÑÐµÑÑÐ¸Ð¼ ÑÑÐ¾ÑÐ¾Ð½Ð°Ð¼ Ð¿ÐµÑÐµÑÐ²Ð°ÑÑÐ²Ð°ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ, Ð¾ÑÑÐ»ÐµÐ¶Ð¸Ð²Ð°ÑÑ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑ Ð¸ Ð²Ð½ÐµÐ´ÑÑÑÑ Ð²ÑÐµÐ´Ð¾Ð½Ð¾ÑÐ½ÑÐ¹ ÐºÐ¾Ð½ÑÐµÐ½Ñ. Ð¡ÐµÑÑÐ¸ÑÐ¸ÐºÐ°Ñ SSL ÐÐ°ÐºÑÑÑÑ ÐÐ¾Ð¼ÐµÐ½ - ÐÐ¾Ð¼ÐµÐ½: - IP-Ð°Ð´ÑÐµÑÐ°: + ÐÐ¾Ð¼ÐµÐ½: \u0020 + IP-Ð°Ð´ÑÐµÑÐ°: \u0020 ÐÐ¾Ð¼Ñ Ð²ÑÐ´Ð°Ð½ ÐÐµÐ¼ Ð²ÑÐ´Ð°Ð½ - ÐÐ±ÑÐµÐ¿ÑÐ¸Ð½ÑÑÐ¾Ðµ Ð¸Ð¼Ñ (CN): - ÐÑÐ³Ð°Ð½Ð¸Ð·Ð°ÑÐ¸Ñ (O): - ÐÐ¾Ð´ÑÐ°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ðµ (OU): + ÐÐ±ÑÐµÐ¿ÑÐ¸Ð½ÑÑÐ¾Ðµ Ð¸Ð¼Ñ (CN): \u0020 + ÐÑÐ³Ð°Ð½Ð¸Ð·Ð°ÑÐ¸Ñ (O): \u0020 + ÐÐ¾Ð´ÑÐ°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ðµ (OU): \u0020 Ð¡ÑÐ¾Ðº Ð´ÐµÐ¹ÑÑÐ²Ð¸Ñ - ÐÐ°ÑÐ°Ð»Ð¾: - ÐÐ¾Ð½ÐµÑ: + ÐÐ°ÑÐ°Ð»Ð¾: \u0020 + ÐÐ¾Ð½ÐµÑ: \u0020 - + ÐÑÐ¸Ð±ÐºÐ° ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ° SSL ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÐÐ°ÑÐ° Ð½Ð°ÑÐ°Ð»Ð° Ð´ÐµÐ¹ÑÑÐ²Ð¸Ñ ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ° ÐµÑÐµ Ð½Ðµ Ð½Ð°ÑÑÑÐ¿Ð¸Ð»Ð° @@ -89,7 +89,7 @@ ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð°Ñ Ð´Ð°ÑÐ° ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ° ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°Ñ. URL - URL: + URL: \u0020 ÐÐµÑÐ¾Ð¾ÑÐ²ÐµÑÑÑÐ²Ð¸Ðµ Ð·Ð°ÐºÑÐµÐ¿Ð»ÐµÐ½Ð½ÑÑ @@ -97,9 +97,9 @@ Ð¢ÐµÐºÑÑÐ¸Ð¹ ÐÐ°ÐºÑÐµÐ¿Ð»ÐµÐ½Ð½ÑÐ¹ - + ÐÑÑÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸Ñ HTTP - Host: + Host: \u0020 ÐÐ¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ ÐÐ°ÑÐ¾Ð»Ñ @@ -245,14 +245,14 @@ ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ Ð² Ð¿Ð°Ð¿ÐºÑ ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ - - Ð²ÑÐ±ÑÐ°Ð½Ñ: + + Ð²ÑÐ±ÑÐ°Ð½Ñ: \u0020 ÐÐ²ÐµÑÑ ÐÐ½Ð¸Ð· ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ Ð£Ð´Ð°Ð»Ð¸ÑÑ ÐÑÐ±ÑÐ°ÑÑ Ð²ÑÐµ - ÐÐ°ÐºÐ»Ð°Ð´Ð¾Ðº ÑÐ´Ð°Ð»ÐµÐ½Ñ: + ÐÐ°ÐºÐ»Ð°Ð´Ð¾Ðº ÑÐ´Ð°Ð»ÐµÐ½Ñ: \u0020 ÐÐµÑÐ½ÑÑÑ @@ -397,51 +397,52 @@ ÐÐ¶Ð¸Ð´Ð°Ð½Ð¸Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ Orbot. URL Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¾Ð³Ð¾ Ð¿ÑÐ¾ÐºÑÐ¸ Ð½ÐµÐ´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÐµÐ½. - + Ð Privacy Browser ÐÐµÑÑÐ¸Ñ ÐÐµÑÑÐ¸Ñ %1$s (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ %2$d) ÐÐ±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ðµ - ÐÑÐµÐ½Ð´: - ÐÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ»Ñ: - ÐÐ¾Ð´ÐµÐ»Ñ: - Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾: - ÐÐ°Ð³ÑÑÐ·ÑÐ¸Ðº: - Ð Ð°Ð´Ð¸Ð¾: + ÐÑÐµÐ½Ð´: \u0020 + ÐÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ»Ñ: \u0020 + ÐÐ¾Ð´ÐµÐ»Ñ: \u0020 + Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾: \u0020 + ÐÐ°Ð³ÑÑÐ·ÑÐ¸Ðº: \u0020 + Ð Ð°Ð´Ð¸Ð¾: \u0020 ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð½Ð¾Ðµ Ð¾Ð±ÐµÑÐ¿ÐµÑÐµÐ½Ð¸Ðµ - Android: + Android: \u0020 %1$s (API %2$d) - ÐÐ°ÑÑ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸: - Ð¡Ð±Ð¾ÑÐºÐ°: - Ð¯Ð´ÑÐ¾: - ÐÑÐ¾Ð²Ð°Ð¹Ð´ÐµÑ WebView: - ÐÐµÑÑÐ¸Ñ WebView: - Orbot: - I2P: + ÐÐ°ÑÑ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸: \u0020 + Ð¡Ð±Ð¾ÑÐºÐ°: \u0020 + Ð¯Ð´ÑÐ¾: \u0020 + ÐÑÐ¾Ð²Ð°Ð¹Ð´ÐµÑ WebView: \u0020 + ÐÐµÑÑÐ¸Ñ WebView: \u0020 + Orbot: \u0020 + I2P: \u0020 %1$s (F-Droid-Ð²ÐµÑÑÐ¸Ñ) %1$s (Google Play-Ð²ÐµÑÑÐ¸Ñ) - OpenKeychain: + OpenKeychain: \u0020 ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¿Ð°Ð¼ÑÑÐ¸ - ÐÐ¾ÑÑÐµÐ±Ð»ÑÐµÐ¼Ð°Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÐ¼ Ð¿Ð°Ð¼ÑÑÑ: - ÐÐ¾ÑÑÑÐ¿Ð½Ð°Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¼ÑÑÑ: - ÐÐ±ÑÐ°Ñ Ð¿Ð°Ð¼ÑÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ: - ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð°Ñ Ð¿Ð°Ð¼ÑÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ: - ÐÐ¾ÑÑÐµÐ±Ð»ÑÐµÐ¼Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð¾Ð¹ Ð¿Ð°Ð¼ÑÑÑ: - ÐÐ¾ÑÑÑÐ¿Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ðµ Ð¿Ð°Ð¼ÑÑÑ: - ÐÐ±ÑÐ°Ñ Ð¿Ð°Ð¼ÑÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ: + ÐÐ¾ÑÑÐµÐ±Ð»ÑÐµÐ¼Ð°Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÐ¼ Ð¿Ð°Ð¼ÑÑÑ: \u0020 + ÐÐ¾ÑÑÑÐ¿Ð½Ð°Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¼ÑÑÑ: \u0020 + ÐÐ±ÑÐ°Ñ Ð¿Ð°Ð¼ÑÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ: \u0020 + ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð°Ñ Ð¿Ð°Ð¼ÑÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ: \u0020 + ÐÐ¾ÑÑÐµÐ±Ð»ÑÐµÐ¼Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð¾Ð¹ Ð¿Ð°Ð¼ÑÑÑ: \u0020 + ÐÐ¾ÑÑÑÐ¿Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ðµ Ð¿Ð°Ð¼ÑÑÑ: \u0020 + ÐÐ±ÑÐ°Ñ Ð¿Ð°Ð¼ÑÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ: \u0020 ÐÐ¸Ð - EasyList: - EasyPrivacy: - Fanboyâs Annoyance List: - Fanboyâs Social Blocking List: - UltraList: - UltraPrivacy: + EasyList: \u0020 + EasyPrivacy: \u0020 + Fanboyâs Annoyance List: \u0020 + Fanboyâs Social Blocking List: \u0020 + UltraList: \u0020 + UltraPrivacy: \u0020 ÐÐ¾Ð´Ð¿Ð¸ÑÑ Ð¿Ð°ÐºÐµÑÐ° - DN ÑÐ¼Ð¸ÑÐµÐ½ÑÐ°: - DN ÑÑÐ±ÑÐµÐºÑÐ°: - ÐÐµÑÑÐ¸Ñ ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ°: - Ð¡ÐµÑÐ¸Ð¹Ð½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ: - ÐÐ»Ð³Ð¾ÑÐ¸ÑÐ¼ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸: + DN ÑÐ¼Ð¸ÑÐµÐ½ÑÐ°: \u0020 + DN ÑÑÐ±ÑÐµÐºÑÐ°: \u0020 + ÐÐµÑÑÐ¸Ñ ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ°: \u0020 + Ð¡ÐµÑÐ¸Ð¹Ð½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ: \u0020 + ÐÐ»Ð³Ð¾ÑÐ¸ÑÐ¼ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸: \u0020 ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð²ÐµÑÑÐ¸Ð¸ ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð°. ÐÐµÑÑÐ¸Ñ Privacy Browser %1$s.txt ÐÐµÑÑÐ¸Ñ Privacy Browser %1$s.png diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 2fd4676c..39a0b500 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -24,7 +24,7 @@ tr - + Gizlilik Modu JavaScript etkin JavaScript devre dÄ±ÅÄ± @@ -37,12 +37,12 @@ Form Verisi silindi Gezinti MenÃ¼sÃ¼nÃ¼ aÃ§ Gezinti MenÃ¼sÃ¼nÃ¼ kapa - OnaylanmamÄ±Å URL: + OnaylanmamÄ±Å URL: \u0020 Sekme ekle Sekmeyi kapa Yeni sekme YÃ¼kleniyorâ¦ - Hata: + Hata: \u0020 EasyList yÃ¼kleniyor @@ -56,7 +56,7 @@ Site Simgesi URL veya Arama Terimleri - + SSL Sertifika gÃ¶rÃ¼ntÃ¼le ÅifrelenmemiÅ web sitesi Bu web sitesiyle baÄlantÄ±nÄ±z ÅifrelenmemiÅtir. @@ -64,18 +64,18 @@ SSL Sertifika Kapat Domain - Domain: - IP Adresleri: + Domain: \u0020 + IP Adresleri: \u0020 Verilen Veren - Ortak Ad (CN): - Organizasyon (O): - Organizasyon Birimi (OU): + Ortak Ad (CN): \u0020 + Organizasyon (O): \u0020 + Organizasyon Birimi (OU): \u0020 GeÃ§erli Tarihler - BaÅlangÄ±Ã§ Tarihi: - BitiÅ Tarihi: + BaÅlangÄ±Ã§ Tarihi: \u0020 + BitiÅ Tarihi: \u0020 - + SSL Sertifika HatasÄ± Ä°lerle Bu sertifika henÃ¼z geÃ§erli deÄil @@ -85,7 +85,7 @@ Bu sertifikanÄ±n tarihi geÃ§erli deÄil Bu sertifika geÃ§erli deÄil URL - URL: + URL: \u0020 Sabit UyumsuzluÄu @@ -93,9 +93,9 @@ GeÃ§erli Sabit - + HTTP Kimlik DoÄrulama - Ana makine: + Ana makine: \u0020 KullanÄ±cÄ± AdÄ± Åifre @@ -213,14 +213,14 @@ KlasÃ¶re taÅÄ± TaÅÄ± - - SeÃ§ili: + + SeÃ§ili: \u0020 YukarÄ± taÅÄ± AÅaÄÄ± taÅÄ± DÃ¼zenle Sil Hepsini seÃ§ - Yer imleri silindi: + Yer imleri silindi: \u0020 Geri al @@ -349,38 +349,39 @@ Orbot\'un baÄlanmasÄ± bekleniyor. - + Privacy Browser HakkÄ±nda Versiyon Versiyon %1$s (versiyon kodu %2$d) DonanÄ±m - Marka: - Ãretici: - Model: - Cihaz: - Bootloader: - DonanÄ±m YazÄ±lÄ±mÄ±: + Marka: \u0020 + Ãretici: \u0020 + Model: \u0020 + Cihaz: \u0020 + Bootloader: \u0020 + DonanÄ±m YazÄ±lÄ±mÄ±: \u0020 YazÄ±lÄ±m - Android: + Android: \u0020 %1$s (API %2$d) - GÃ¼venlik YamasÄ±: - Derleme: - WebView SaÄlayÄ±cÄ±sÄ±: - WebView Versiyonu: + GÃ¼venlik YamasÄ±: \u0020 + Derleme: \u0020 + WebView SaÄlayÄ±cÄ±sÄ±: \u0020 + WebView Versiyonu: \u0020 Orbot: - OpenKeychain: - EasyList: - EasyPrivacy: - Fanboyâs Annoyance List: - Fanboyâs Social Blocking List: - UltraList: - UltraPrivacy: + OpenKeychain: \u0020 + EasyList: \u0020 + EasyPrivacy: \u0020 + Fanboyâs Annoyance List: \u0020 + Fanboyâs Social Blocking List: \u0020 + UltraList: \u0020 + UltraPrivacy: \u0020 Paket Ä°mzasÄ± - YayÄ±nlayan DN: - Ãzne DN: - Sertifika Versiyonu: - Seri NumarasÄ±: - Ä°mza AlgoritmasÄ±: + YayÄ±nlayan DN: \u0020 + Ãzne DN: \u0020 + Sertifika Versiyonu: \u0020 + Seri NumarasÄ±: \u0020 + Ä°mza AlgoritmasÄ±: \u0020 Ä°zinler Privacy PolitikasÄ± DeÄiÅiklik GÃ¼nlÃ¼ÄÃ¼ diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index a2053024..b90de0cf 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -31,7 +31,7 @@ zh-rCN - + éç§æ¨¡å¼ å¼å¯ JavaScript å³é JavaScript @@ -47,12 +47,12 @@ æå¼å¯¼èªæ å³éå¯¼èªæ å¼èæ - æ æ³è¯å«çé¾æ¥: + æ æ³è¯å«çé¾æ¥: \u0020 å¢å æ°ççªå£ å³éçªå£ æ°çªå£ å è½½ä¸â¦ - éè¯¯: + éè¯¯: \u0020 è¯·æ± @@ -67,25 +67,25 @@ åç±çå¾æ è¾å¥ç½åæå³é®è¯ - + æ¥ç SSL è¯ä¹¦ æªå å¯çç½ç« è¯¥ç½ç«æªå å¯. è¿å°åè®¸ç¬¬ä¸æ¹æ¦æªä¿¡æ¯, æ»å»ä½ çæµè§å¨å¹¶æ³¨å¥æ¶æççæ¯. SSL è¯ä¹¦ å³é åå - åå: - IP å°å: + åå: \u0020 + IP å°å: \u0020 æ¥æ¶è åéè - å¸¸ç¨å (CN): - ç»ç» (O): - ç»ç»åä½ (OU): + å¸¸ç¨å (CN): \u0020 + ç»ç» (O): \u0020 + ç»ç»åä½ (OU): \u0020 æææ - å¼å§æ¶é´: - ç»ææ¶é´: + å¼å§æ¶é´: \u0020 + ç»ææ¶é´: \u0020 - + SSL è¯ä¹¦éè¯¯ ç»§ç» è¿ä¸ªè¯ä¹¦è¿æªå¼å§ @@ -95,7 +95,7 @@ è¯ä¹¦æ¥ææ æ è¯ä¹¦æ æ é¾æ¥ - é¾æ¥: + é¾æ¥: \u0020 åºå®ä¸å¹é @@ -103,9 +103,9 @@ å½åç åºå® - + HTTP éªè¯ - Host: + Host: \u0020 ç¨æ·å å¯ç @@ -250,14 +250,14 @@ ç§»å¨å°æä»¶å¤¹ ç§»å¨ - - éä¸: + + éä¸: \u0020 åä¸ åä¸ ç¼è¾ å é¤ éä¸ææ - ä¹¦ç¾å·²å é¤: + ä¹¦ç¾å·²å é¤: \u0020 åæ¶ @@ -401,45 +401,46 @@ çå¾Orboté¾æ¥. èªå®ä¹ä»£çæ æ. - + å³äº Privacy Browser çæ¬ çæ¬ %1$s (çæ¬ä»£ç %2$d) ç¡¬ä»¶ - åç: - å¶é å: - åå·: - è®¾å¤: - Bootloader: - Radio: + åç: \u0020 + å¶é å: \u0020 + åå·: \u0020 + è®¾å¤: \u0020 + Bootloader: \u0020 + Radio: \u0020 è½¯ä»¶ - å®å: + å®å: \u0020 %1$s (API %2$d) - å®å¨è¡¥ä¸: - Build: - åæ ¸: - WebView Provider: - WebView Version: - Orbot: - I2P: + å®å¨è¡¥ä¸: \u0020 + Build: \u0020 + åæ ¸: \u0020 + WebView Provider: \u0020 + WebView Version: \u0020 + Orbot: \u0020 + I2P: \u0020 %1$s (F-Droid flavor) %1$s (Google Play flavor) - OpenKeychain: + OpenKeychain: \u0020 ååä½¿ç¨æåµ - åºç¨ç¨åºå ç¨åå: - åºç¨å¯ç¨åå: - åºç¨ææåå: - åºç¨æå¤§åå: - ç³»ç»å ç¨åå: - ç³»ç»å¯ç¨åå: - ç³»ç»ææåå: + åºç¨ç¨åºå ç¨åå: \u0020 + åºç¨å¯ç¨åå: \u0020 + åºç¨ææåå: \u0020 + åºç¨æå¤§åå: \u0020 + ç³»ç»å ç¨åå: \u0020 + ç³»ç»å¯ç¨åå: \u0020 + ç³»ç»ææåå: \u0020 å - EasyList: - EasyPrivacy: - Fanboyâs Annoyance List: - Fanboyâs Social Blocking List: - UltraList: - UltraPrivacy: + EasyList: \u0020 + EasyPrivacy: \u0020 + Fanboyâs Annoyance List: \u0020 + Fanboyâs Social Blocking List: \u0020 + UltraList: \u0020 + UltraPrivacy: \u0020 åå åè¡äºº DN: ä¸»é¢ DN: diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 22a67a33..822b8788 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -33,7 +33,7 @@ en - + Privacy Mode JavaScript enabled JavaScript disabled @@ -49,12 +49,12 @@ Open navigation drawer Close navigation drawer Pin drawer - Unrecognized URL: + Unrecognized URL: \u0020 Add tab Close tab New tab Loadingâ¦ - Error: + Error: \u0020 Apply @@ -69,25 +69,25 @@ Favorite Icon URL or Search Terms - + View SSL Certificate Unencrypted Website Communication with this website is not encrypted. This allows third parties to intercept information, track your browsing, and inject malicious content. SSL Certificate Close Domain - Domain: - IP Addresses: + Domain: \u0020 + IP Addresses: \u0020 Issued To Issued By - Common Name (CN): - Organization (O): - Organizational Unit (OU): + Common Name (CN): \u0020 + Organization (O): \u0020 + Organizational Unit (OU): \u0020 Valid Dates - Start Date: - End Date: + Start Date: \u0020 + End Date: \u0020 - + SSL Certificate Error Proceed The certificate start date is in the future @@ -97,7 +97,7 @@ The date on the certificate is invalid The certificate is invalid URL - URL: + URL: \u0020 Pinned Mismatch @@ -105,9 +105,9 @@ Current Pinned - + HTTP Authentication - Host: + Host: \u0020 Username Password @@ -256,14 +256,14 @@ Move to Folder Move - - Selected: + + Selected: \u0020 Move Up Move Down Edit Delete Select All - Bookmarks Deleted: + Bookmarks Deleted: \u0020 Undo @@ -409,51 +409,52 @@ Waiting for Orbot to connect. The custom proxy URL is invalid. - + About Privacy Browser Version Version %1$s (version code %2$d) Hardware - Brand: - Manufacturer: - Model: - Device: - Bootloader: - Radio: + Brand: \u0020 + Manufacturer: \u0020 + Model: \u0020 + Device: \u0020 + Bootloader: \u0020 + Radio: \u0020 Software - Android: + Android: \u0020 %1$s (API %2$d) - Security Patch: - Build: - Kernel: - WebView Provider: - WebView Version: - Orbot: - I2P: + Security Patch: \u0020 + Build: \u0020 + Kernel: \u0020 + WebView Provider: \u0020 + WebView Version: \u0020 + Orbot: \u0020 + I2P: \u0020 %1$s (F-Droid flavor) %1$s (Google Play flavor) - OpenKeychain: + OpenKeychain: \u0020 Memory Usage - App Consumed Memory: - App Available Memory: - App Total Memory: - App Maximum Memory: - System Consumed Memory: - System Available Memory: - System Total Memory: + App Consumed Memory: \u0020 + App Available Memory: \u0020 + App Total Memory: \u0020 + App Maximum Memory: \u0020 + System Consumed Memory: \u0020 + System Available Memory: \u0020 + System Total Memory: \u0020 MiB - EasyList: - EasyPrivacy: - Fanboyâs Annoyance List: - Fanboyâs Social Blocking List: - UltraList: - UltraPrivacy: + EasyList: \u0020 + EasyPrivacy: \u0020 + Fanboyâs Annoyance List: \u0020 + Fanboyâs Social Blocking List: \u0020 + UltraList: \u0020 + UltraPrivacy: \u0020 Package Signature - Issuer DN: - Subject DN: - Certificate Version: - Serial Number: - Signature Algorithm: + Issuer DN: \u0020 + Subject DN: \u0020 + Certificate Version: \u0020 + Serial Number: \u0020 + Signature Algorithm: \u0020 Version info copied. Privacy Browser Version %1$s.txt Privacy Browser Version %1$s.png -- 2.43.0

3.13.4 (Version Code 68)

3.13.4 (Version Code 68)

3.13.4 (version code 68)

3.13.4 (version code 68)

3.13.4 (cÃ³digo de versiÃ³n 68)

3.13.4 (cÃ³digo de versiÃ³n 68)

3.13.4 (version du code 68)

3.13.4 (version du code 68)

3.13.4 (versione codice 68)

3.13.4 (versione codice 68)

3.13.4 (cÃ³digo de versÃ£o 68)

3.13.4 (cÃ³digo de versÃ£o 68)

3.13.4 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 68)

3.13.4 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 68)

3.13.4 (version code 68)

3.13.4 (version code 68)

3.13.4 (version code 68)

3.13.4 (version code 68)

3.13.4 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 68)

3.13.4 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 68)