From d3c309fe8c26c856d96229ed947eb7f2d9f750e8 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Fri, 4 Nov 2022 13:38:43 -0700 Subject: [PATCH] Use Kotlin string templates in About Version. https://redmine.stoutner.com/issues/778 --- app/src/main/assets/es/guide_interface.html | 15 ++++++++------- app/src/main/assets/ru/guide_interface.html | 14 +++++++------- .../fragments/AboutVersionFragment.kt | 10 +++++----- app/src/main/res/values-de/strings.xml | 17 +++++++++-------- app/src/main/res/values-es/strings.xml | 18 ++++++++++-------- app/src/main/res/values-fr/strings.xml | 13 +++++++------ app/src/main/res/values-it/strings.xml | 17 +++++++++-------- app/src/main/res/values-pt-rBR/strings.xml | 13 +++++++------ app/src/main/res/values-ru/strings.xml | 18 ++++++++++-------- app/src/main/res/values-tr/strings.xml | 11 ++++++----- app/src/main/res/values/strings.xml | 17 +++++++++-------- 11 files changed, 87 insertions(+), 76 deletions(-) diff --git a/app/src/main/assets/es/guide_interface.html b/app/src/main/assets/es/guide_interface.html index c0a03f67..47dd1e8b 100644 --- a/app/src/main/assets/es/guide_interface.html +++ b/app/src/main/assets/es/guide_interface.html @@ -29,14 +29,15 @@ -

Bookmarks

+

Marcadores

-

The bookmark drawer may be opened by swiping from the right edge of the screen. - If Android's gesture navigation is enabled, - the drawer may be opened by long-pressing on the edge of the screen until the drawer peaks out and then swiping it open. - Sometimes it can be difficult to get the bookmarks drawer to reliably peak on devices with curved edges, so it is also possible to open the bookmarks drawer from the options menu.

+

El cajón de marcadores puede abrirse deslizando el dedo desde el borde derecho de la pantalla. + Si la navegación por gestos de Android está activada, + el cajón puede abrirse pulsando prolongadamente en el borde de la pantalla hasta que el cajón asome y luego deslizar para abrirlo. + A veces puede ser difícil conseguir que el cajón de marcadores llegue a su punto máximo de forma fiable en dispositivos con bordes curvos, + por lo que también es posible abrir el cajón de marcadores desde el menú de opciones.

-

Tapping on a bookmark opens it in the current tab and long-pressing on a bookmark opens it in a new tab. - Tapping the top floating action button in the bookmarks drawer opens the bookmarks activity, where bookmarks can be edited and reorganized.

+

Al tocar un marcador se abre en la pestaña actual y al pulsar prolongadamente sobre un marcador se abre en una nueva pestaña. + Al tocar el botón de acción superior flotante en el cajón de marcadores se abre la actividad de marcadores, donde se pueden editar y reorganizar los marcadores.

diff --git a/app/src/main/assets/ru/guide_interface.html b/app/src/main/assets/ru/guide_interface.html index 0dfa4390..4c7104f8 100644 --- a/app/src/main/assets/ru/guide_interface.html +++ b/app/src/main/assets/ru/guide_interface.html @@ -27,14 +27,14 @@ -

Bookmarks

+

Закладки

-

The bookmark drawer may be opened by swiping from the right edge of the screen. - If Android's gesture navigation is enabled, - the drawer may be opened by long-pressing on the edge of the screen until the drawer peaks out and then swiping it open. - Sometimes it can be difficult to get the bookmarks drawer to reliably peak on devices with curved edges, so it is also possible to open the bookmarks drawer from the options menu.

+

Панель закладок можно открыть, проведя пальцем от правого края экрана. + Если в Android включена навигация жестами, + панель можно открыть длительным нажатием на край экрана до ее появления, а затем смахнув. + На устройствах с изогнутыми краями иногда бывает непросто добиться появления панели закладок, поэтому можно открыть ее из меню параметров.

-

Tapping on a bookmark opens it in the current tab and long-pressing on a bookmark opens it in a new tab. - Tapping the top floating action button in the bookmarks drawer opens the bookmarks activity, where bookmarks can be edited and reorganized.

+

При нажатии на закладку она открывается на текущей вкладке, а при длительном нажатии - на новой вкладке. + При нажатии верхней кнопки действия в панели закладок открывается страница действий с закладками, где их можно редактировать и упорядочивать.

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 0078fcc1..e5d0c543 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt @@ -203,7 +203,7 @@ class AboutVersionFragment : Fragment() { Snackbar.make(aboutVersionLayout, getString(R.string.saved, fileNameString), Snackbar.LENGTH_SHORT).show() } catch (exception: Exception) { // Display a snackbar with the error message. - Snackbar.make(aboutVersionLayout, getString(R.string.error_saving_file) + " " + exception.toString(), Snackbar.LENGTH_INDEFINITE).show() + Snackbar.make(aboutVersionLayout, getString(R.string.error_saving_file, exception.toString()), Snackbar.LENGTH_INDEFINITE).show() } } } @@ -277,7 +277,7 @@ class AboutVersionFragment : Fragment() { certificateSignatureAlgorithmTextView = aboutVersionLayout.findViewById(R.id.certificate_signature_algorithm) // Setup the labels. - val version = getString(R.string.version) + " " + BuildConfig.VERSION_NAME + " (" + getString(R.string.version_code) + " " + BuildConfig.VERSION_CODE + ")" + 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) + " " @@ -321,7 +321,7 @@ class AboutVersionFragment : Fragment() { val device = Build.DEVICE val bootloader = Build.BOOTLOADER val radio = Build.getRadioVersion() - val android = Build.VERSION.RELEASE + " (" + getString(R.string.api) + " " + Build.VERSION.SDK_INT + ")" + val android = getString(R.string.api, Build.VERSION.RELEASE, Build.VERSION.SDK_INT) val build = Build.DISPLAY val kernel = System.getProperty("os.version") @@ -342,12 +342,12 @@ class AboutVersionFragment : Fragment() { val i2p: String = try { // Check to see if the F-Droid flavor is installed. The newer `getPackageInfo()` may be used once the minimum API >= 33. @Suppress("DEPRECATION") - requireContext().packageManager.getPackageInfo("net.i2p.android.router", 0).versionName + " " + requireContext().getString(R.string.fdroid_flavor) + requireContext().getString(R.string.fdroid_flavor, requireContext().packageManager.getPackageInfo("net.i2p.android.router", 0).versionName) } catch (exception: PackageManager.NameNotFoundException) { // The F-Droid flavor is not installed. try { // Check to see if the F-Droid flavor is installed. The newer `getPackageInfo()` may be used once the minimum API >= 33. @Suppress("DEPRECATION") - requireContext().packageManager.getPackageInfo("net.i2p.android", 0).versionName + " " + requireContext().getString(R.string.google_play_flavor) + requireContext().getString(R.string.google_play_flavor, requireContext().packageManager.getPackageInfo("net.i2p.android", 0).versionName) } catch (exception: PackageManager.NameNotFoundException) { // The Google Play flavor is not installed either. // Store an empty string. "" diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index dbf1653d..d331954c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -192,7 +192,8 @@ Die Datei ist ein MHT-Web-Archiv. Manchmal müssen MIME-gekapselte HTML-Web-Archive (MHT) manuell festgelegt werden, um korrekt geöffnet zu werden. - + URL speichern Archiv speichern Text speichern @@ -206,7 +207,7 @@ Datei gespeichert: Bild wird bearbeitet… : Bild gespeichert: - Fehler beim Speichern der Datei: + Fehler beim Speichern der Datei: \u0020 %1$sFf Anfragekopfzeilen @@ -371,7 +372,7 @@ Import fehlgeschlagen: + The `%1$s` code inserts variables into the displayed text and should be preserved in translation. --> kopieren leeren Logcat kopiert. @@ -394,10 +395,10 @@ Warte auf die Verbindung zum Orbot-Proxy. Die benutzerdefinierte Proxy-URL ist ungültig. - + Über Privacy Browser Version - Versions-Code + Version %1$s (Versions-Code %2$d) Hardware Marke: Hersteller: @@ -407,7 +408,7 @@ Radio: Software Android: - API + %1$s (API %2$d) Sicherheits-Patch: Build: Kernel: @@ -415,8 +416,8 @@ WebView-Version: Orbot: I2P: - (F-Droid-Version) - (Google-Play-Version) + %1$s (F-Droid-Version) + %1$s (Google-Play-Version) OpenKeychain: Speicher-Nutzung von der App genutzter Speicher: diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 772bd806..df943b88 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -188,7 +188,8 @@ El archivo es un archivo de web MHT. A veces se necesita especificar manualmente los archivos web MIME Encapsulated HTML (MHT) para que se abran correctamente. - + Guardar URL Guardar archivo Guardar texto @@ -202,7 +203,7 @@ Archivo guardado: Procesando imagen… : Imagen guardada: - Error guardando archivo: + Error guardando archivo: \u0020 %1$s Cabeceras de solicitud @@ -368,7 +369,7 @@ Importación fallida: + The `%1$s` code inserts variables into the displayed text and should be preserved in translation. --> Copiar Borrar Logcat copiado. @@ -382,6 +383,7 @@ Certificados SSL Proxis Rastreo de IDs + Interfaz Orbot No Instalado @@ -391,10 +393,10 @@ Esperando a que Orbot se conecte. La URL del proxy personalizado no es válida. - + Acerca de Navegador Privado Versión - código de versión + Versión %1$s (código de versión %2$d) Hardware Marca: Fabricante: @@ -404,7 +406,7 @@ Radio: Software Android: - API + %1$s (API %2$d) Parche de seguridad: Versión de compilación: Kernel: @@ -412,8 +414,8 @@ Versión de WebView: Orbot: I2P: - (variante de F-Droid) - (variante de Google Play) + %1$s (variante de F-Droid) + %1$s (variante de Google Play) OpenKeychain: Uso de memoria Memoria conumida de la app: diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ed44a4a9..45b1f334 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -189,7 +189,8 @@ Le fichier est une archive web MHT. Parfois, les archives web MHT (MIME Encapsulated HTML) doivent être spécifiées manuellement pour être ouvertes correctement. - + Enregistrer l\'URL Enregistrer l\'archive Sauvegarder le texte @@ -203,7 +204,7 @@ Fichier enregistré : Traitement de l\'image… : Image sauvegardée : - Erreur lors de l\'enregistrement du fichier : + Erreur lors de l\'enregistrement du fichier : \u0020 %1$s En-tête de la requête @@ -368,7 +369,7 @@ L\'import a échoué : + The `%1$s` code inserts variables into the displayed text and should be preserved in translation. --> Copie Vider Journal système copié. @@ -391,10 +392,10 @@ En attente de la connexion d\'Orbot. L\'URL du proxy personnalisé n\'est pas valide. - + À propos Version - Code de la version + Version %1$s (Code de la version %2$d) Matériel Marque : Constructeur : @@ -404,7 +405,7 @@ Radio : Logiciel Android : - API + %1$s (API %2$d) MAJ de sécurité : Version : Noyau: diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 748e983f..3593b8a6 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -188,7 +188,8 @@ Questo file è un archivio web MHT. Talvolta gli archivi web del tipo MIME Encapsulated HTML (MHT) devono essere specificati manualmente per essere aperti correttamente. - + Salva URL Salva Archivio Salva Testo @@ -202,7 +203,7 @@ File salvato: Creazione immagine… : Immagine salvata: - Errore salvataggio file: + Errore salvataggio file: \u0020 %1$s Richiesta Intestazioni @@ -367,7 +368,7 @@ Importazione fallita: + The `%1$s` code inserts variables into the displayed text and should be preserved in translation. --> Copia Cancella Logcat copiato. @@ -390,10 +391,10 @@ In attesa della connessione di Orbot. La URL del proxy personalizzato non è valida. - + Informazioni su Privacy Browser Versione - codice versione + Versione %1$s (codice versione %2$d) Hardware Brand: Costruttore: @@ -403,7 +404,7 @@ Radio: Software Android: - API + %1$s (API %2$d) Patch si sicurezza: Build: Kernel: @@ -411,8 +412,8 @@ Versione di WebView: Orbot: I2P: - (Versione F-Droid) - (Versione Google Play) + %1$s (Versione F-Droid) + %1$s (Versione Google Play) OpenKeychain: Utilizzo della Memoria Memoria utilizzata dalla App: diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index f6fc08c2..387aed8e 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -186,7 +186,8 @@ Este é um arquivo MHT da web. Às vezes, os arquivos da web MIME Encapsulated HTML (MHT) precisam ser especificados manualmente para serem abertos corretamente. - + Salvar URL Salvar Arquivo Salvar Texto @@ -200,7 +201,7 @@ Arquivo Salvo: Processando imagem… : Image saved: - Erro ao salvar o arquivo: + Erro ao salvar o arquivo: \u0020 %1$s Solicitar cabeçalhos @@ -365,7 +366,7 @@ A importação falhou: + The `%1$s` code inserts variables into the displayed text and should be preserved in translation. --> Cópia Limpar Logcat copiado. @@ -388,10 +389,10 @@ Esperando que o Orbot se conecte. O URL do proxy personalizado é inválido. - + Sobre o Privacy Browser Versão - Código da Versão + Versão %1$s (Código da Versão %2$d) Hardware Marca: Fabricante: @@ -401,7 +402,7 @@ Rádio: Software Android: - API + %1$s (API %2$d) Patch de segurança: Build: Kernel: diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 016c7a4d..1cfa2fbf 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -185,7 +185,8 @@ Файл представляет собой веб-архив MHT. Иногда для корректного открытия веб-архивов MIME Encapsulated HTML (MHT) необходимо указать вручную. - + Сохранить URL Сохранить архив Сохранить текст @@ -199,7 +200,7 @@ Файл сохранен: Обработка изображения… : Изображение сохранено: - Ошибка сохранения файла: + Ошибка сохранения файла: \u0020 %1$s Заголовки запроса @@ -364,7 +365,7 @@ Сбой при импорте: + The `%1$s` code inserts variables into the displayed text and should be preserved in translation. --> Копировать Очистить Logcat скопирован. @@ -378,6 +379,7 @@ Сертификаты SSL Прокси Идентификаторы отслеживания + Интерфейс Orbot не установлен @@ -387,10 +389,10 @@ Ожидание подключения Orbot. URL пользовательского прокси недействителен. - + О Privacy Browser Версия - код версии + Версия %1$s (код версии %2$d) Оборудование Бренд: Производитель: @@ -400,7 +402,7 @@ Радио: Программное обеспечение Android: - API + %1$s (API %2$d) Патч безопасности: Сборка: Ядро: @@ -408,8 +410,8 @@ Версия WebView: Orbot: I2P: - (F-Droid-версия) - (Google Play-версия) + %1$s (F-Droid-версия) + %1$s (Google Play-версия) OpenKeychain: Использование памяти Потребляемая приложением память: diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 52f337f3..90a66064 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -172,7 +172,8 @@ Önceki Sonraki - + Resmi kaydet Dosya adı Bilinmeyen boyut @@ -330,7 +331,7 @@ İçe aktarım başarısız: + The `%1$s` code inserts variables into the displayed text and should be preserved in translation. --> Kopyala Temizle Logcat kopyalandı. @@ -345,10 +346,10 @@ Orbot\'un bağlanması bekleniyor. - + Privacy Browser Hakkında Versiyon - versiyon kodu + Versiyon %1$s (versiyon kodu %2$d) Donanım Marka: Üretici: @@ -358,7 +359,7 @@ Donanım Yazılımı: Yazılım Android: - API + %1$s (API %2$d) Güvenlik Yaması: Derleme: WebView Sağlayıcısı: diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 34f15a63..14d73897 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -194,7 +194,8 @@ The file is an MHT web archive. Sometimes MIME Encapsulated HTML (MHT) web archives need to be manually specified to be opened correctly. - + Save Dialog Save URL Save Archive @@ -209,7 +210,7 @@ File saved: Processing image… : Image saved: - Error saving file: + Error saving file: \u0020 %1$s Request Headers @@ -374,7 +375,7 @@ Import failed: + The `%1$s` code inserts variables into the displayed text and should be preserved in translation. --> Copy Clear Logcat copied. @@ -400,10 +401,10 @@ Waiting for Orbot to connect. The custom proxy URL is invalid. - + About Privacy Browser Version - version code + Version %1$s (version code %2$d) Hardware Brand: Manufacturer: @@ -413,7 +414,7 @@ Radio: Software Android: - API + %1$s (API %2$d) Security Patch: Build: Kernel: @@ -421,8 +422,8 @@ WebView Version: Orbot: I2P: - (F-Droid flavor) - (Google Play flavor) + %1$s (F-Droid flavor) + %1$s (Google Play flavor) OpenKeychain: Memory Usage App Consumed Memory: -- 2.45.2