Commit b339a3a7 authored by Daniel Wolf's avatar Daniel Wolf
Browse files

Moved some strings to plurals

parent c306eed7
Pipeline #5043 passed with stage
in 1 minute and 47 seconds
......@@ -45,7 +45,9 @@ class ServerImportDialog(context: Context, loadedServers: List<DnsServerInformat
}
init {
setTitle(context.getString(R.string.dialog_serverimport_title, servers.size))
setTitle(servers.size.let {
context.resources.getQuantityString(R.plurals.dialog_serverimport_title, it, it)
})
setCancelable(false)
setCanceledOnTouchOutside(false)
setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(android.R.string.cancel)) { dialog, _ ->
......
......@@ -432,7 +432,7 @@ class DnsRuleFragment : Fragment() {
private fun updateRuleCountTitle() {
activity?.runOnUiThread {
(activity as AppCompatActivity?)?.supportActionBar?.subtitle = getString(R.string.window_dnsrules_subtitle, totalRuleCount)
(activity as AppCompatActivity?)?.supportActionBar?.subtitle = resources.getQuantityString(R.plurals.window_dnsrules_subtitle, totalRuleCount!!.toInt(), totalRuleCount)
}
}
......
......@@ -16,7 +16,11 @@
<string name="dialog_appchoosal_showsystemapps">Zeige Systemapps</string>
<string name="dialog_appchoosal_whitelist">Nutze DoH/DoT nur in ausgewählten Apps</string>
<string name="dialog_serverimport_title">Import von %1d Servern</string>
<plurals name="dialog_serverimport_title">
<item quantity="one">Import von %1d Server</item>
<item quantity="other">Import von %1d Servern</item>
</plurals>
<string name="dialog_serverimport_done">Fertig</string>
<string name="dialog_serverimport_priority">Priorität %1d</string>
<string name="dialog_serverimport_experimental">Experimental</string>
......
......@@ -70,5 +70,8 @@
<string name="error_invalid_servername">Bitte gebe einen Namen an.</string>
<string name="window_dnsrules_hostalreadyexists">Es existiert bereits eine Regel für diesen Host.</string>
<string name="window_dnsrules_subtitle">%1d Regeln</string>
<plurals name="window_dnsrules_subtitle">
<item quantity="one">%1d Regel</item>
<item quantity="other">%1d Regeln</item>
</plurals>
</resources>
......@@ -14,9 +14,14 @@
<string name="dialog_appchoosal_showsystemapps">Tampilkan apl sistem</string>
<string name="dialog_appchoosal_whitelist">Hanya gunakan DoH/DoT di apl yang dipilih</string>
<string name="dialog_excludedapps_infotext">%1d apl dikecualikan secara default dan tidak dapat dipilih</string>
<string name="dialog_serverimport_title">Impor server %1d</string>
<plurals name="dialog_excludedapps_infotext">
<item quantity="other">%1d apl dikecualikan secara default dan tidak dapat dipilih</item>
</plurals>
<plurals name="dialog_serverimport_title">
<item quantity="one">Impor server %1d</item>
<item quantity="other">Impor server %1d</item>
</plurals>
<string name="dialog_serverimport_done">Selesai</string>
<string name="dialog_serverimport_priority">Prioritas %1d</string>
<string name="dialog_serverimport_experimental">Eksperimental</string>
......
......@@ -14,9 +14,13 @@
<string name="dialog_appchoosal_showsystemapps">システムアプリを表示する</string>
<string name="dialog_appchoosal_whitelist">選択したアプリでのみDoH / DoTを使用する</string>
<string name="dialog_excludedapps_infotext">%1dのアプリはデフォルトで除外されており、選択を解除できません</string>
<plurals name="dialog_excludedapps_infotext">
<item quantity="other">%1dのアプリはデフォルトで除外されており、選択を解除できません</item>
</plurals>
<string name="dialog_serverimport_title">%1dサーバーのインポート</string>
<plurals name="dialog_serverimport_title">
<item quantity="other">Import of %1d servers</item>
</plurals>
<string name="dialog_serverimport_done">完了</string>
<string name="dialog_serverimport_priority">優先度%1d</string>
<string name="dialog_serverimport_experimental">実験的</string>
......
......@@ -14,9 +14,15 @@
<string name="dialog_appchoosal_showsystemapps">Systeem-apps weergeven</string>
<string name="dialog_appchoosal_whitelist">Gebruik alleen DoH / DoT in geselecteerde apps</string>
<string name="dialog_excludedapps_infotext">%1d apps zijn standaard uitgesloten en kunnen niet worden gedeselecteerd</string>
<string name="dialog_serverimport_title">Import van %1d server (s)</string>
<plurals name="dialog_excludedapps_infotext">
<item quantity="one">%%1d app is standaard uitgesloten en kunnen niet worden gedeselecteerd</item>
<item quantity="other">%1d apps zijn standaard uitgesloten en kunnen niet worden gedeselecteerd</item>
</plurals>
<plurals name="dialog_serverimport_title">
<item quantity="one">Import van %1d server</item>
<item quantity="other">Import van %1d servers</item>
</plurals>
<string name="dialog_serverimport_done">Klaar</string>
<string name="dialog_serverimport_priority">Prioriteit %1d</string>
<string name="dialog_serverimport_experimental">Experimenteel</string>
......
......@@ -63,5 +63,8 @@
<string name="error_invalid_servername">Geef een naam op.</string>
<string name="window_dnsrules_hostalreadyexists">Er is al een regel voor deze host.</string>
<string name="window_dnsrules_subtitle">%1d regels</string>
<plurals name="window_dnsrules_subtitle">
<item quantity="one">%1d regel</item>
<item quantity="other">%1d regels</item>
</plurals>
</resources>
......@@ -14,9 +14,15 @@
<string name="dialog_appchoosal_showsystemapps">Mostrar aplicativos do sistema</string>
<string name="dialog_appchoosal_whitelist">Apenas use DoH/DoT em aplicativos selecionados</string>
<string name="dialog_excludedapps_infotext">%1d aplicativos são excluídos por padrão e não podem ser desmarcados</string>
<string name="dialog_serverimport_title">Importação de %1d servidor(es)</string>
<plurals name="dialog_excludedapps_infotext">
<item quantity="one">%1d aplicação é excluídos por padrão e não podem ser desmarcados</item>
<item quantity="other">%1d aplicativos são excluídos por padrão e não podem ser desmarcados</item>
</plurals>
<plurals name="dialog_serverimport_title">
<item quantity="one">Importação de %1d servidor</item>
<item quantity="other">Importação de %1d servidores</item>
</plurals>
<string name="dialog_serverimport_done">Feito</string>
<string name="dialog_serverimport_priority">Prioridade %1d</string>
<string name="dialog_serverimport_experimental">Experimental</string>
......
......@@ -60,5 +60,8 @@
<string name="window_dnsrules_customhosts_message">Defina todos os seus hosts personalizados aqui.</string>
<string name="window_dnsrules_customhosts_hostsource_rulecount_pending">Regras desta fonte: -</string>
<string name="window_dnsrules_customhosts_hostsource_rulecount">Regras desta fonte: %1d (%2$d duplicatas não usadas)</string>
<string name="window_dnsrules_subtitle">%1d regras</string>
<plurals name="window_dnsrules_subtitle">
<item quantity="one">%1d regra</item>
<item quantity="other">%1d regras</item>
</plurals>
</resources>
......@@ -16,9 +16,17 @@
<string name="dialog_appchoosal_showsystemapps">Показать системные приложения</string>
<string name="dialog_appchoosal_whitelist">Использовать DoH/DoT только в отмеченных приложениях</string>
<string name="dialog_excludedapps_infotext">Исключенные приложения по умолчанию (%1d)</string>
<string name="dialog_serverimport_title">Импортировать %1d сервер(а)</string>
<plurals name="dialog_excludedapps_infotext">
<item quantity="one">Исключенные приложения по умолчанию (%1d)</item>
<item quantity="other">Исключенные приложения по умолчанию (%1d)</item>
<item quantity="many">Исключенные приложения по умолчанию (%1d)</item>
<item quantity="few">Исключенные приложения по умолчанию (%1d)</item>
</plurals>
<plurals name="dialog_serverimport_title">
<item quantity="one">Импортировать %1d сервер</item>
<item quantity="other">Импортировать %1d сервер(а)</item>
</plurals>
<string name="dialog_serverimport_done">Готово</string>
<string name="dialog_serverimport_priority">Приоритет %1d</string>
<string name="dialog_serverimport_experimental">Экспериментальный</string>
......
......@@ -16,9 +16,15 @@
<string name="dialog_appchoosal_showsystemapps">Sistem uygulamalarını göster</string>
<string name="dialog_appchoosal_whitelist">Yalnızca seçili uygulamalarda DoH/DoT kullanın</string>
<string name="dialog_excludedapps_infotext">%1d uygulama varsayılan olarak hariç tutulur ve seçilemez</string>
<string name="dialog_serverimport_title">%1d sunucunun içe aktarılması</string>
<plurals name="dialog_excludedapps_infotext">
<item quantity="one">%1d uygulaması varsayılan olarak hariç tutuldu ve seçilemiyor</item>
<item quantity="other">%1d uygulama varsayılan olarak hariç tutulur ve seçilemez</item>
</plurals>
<plurals name="dialog_serverimport_title">
<item quantity="one">%1d sunucunun içe aktarılması</item>
<item quantity="other">%1d sunucunun içe aktarılması</item>
</plurals>
<string name="dialog_serverimport_done">Tamamlandı</string>
<string name="dialog_serverimport_priority">Öncelik %1d</string>
<string name="dialog_serverimport_experimental">Deneysel</string>
......
......@@ -27,17 +27,20 @@
<item quantity="other">%1d apps are excluded by default and cannot be de-selected</item>
</plurals>
<string name="dialog_serverimport_title">Import of %1d server(s)</string>
<plurals name="dialog_serverimport_title">
<item quantity="one">Import of %1d server</item>
<item quantity="other">Import of %1d servers</item>
</plurals>
<string name="dialog_serverimport_done">Done</string>
<string name="dialog_serverimport_priority">Priority %1d</string>
<string name="dialog_serverimport_experimental">Experimental</string>
<string name="dialog_serverimport_servertype_doh">Type: Dns-over-HTTPS (DoH)</string>
<string name="dialog_serverimport_servertype_dot">Type: Dns-over-TLS (DoT)</string>
<string name="dialog_serverimport_text">Please select the server(s) you wish to import.\n\nServers which are already imported will be duplicate if you select them.</string>
<string name="dialog_serverimport_text" xmlns:tools="http://schemas.android.com/tools" tools:ignore="PluralsCandidate">Please select the servers you wish to import.\n\nServers which are already imported will be duplicate if you select them.</string>
<string name="dialog_serverimportfailed_title">Import failed</string>
<string name="dialog_serverimportfailed_text">The server(s) could not be imported.</string>
<string name="dialog_serverimportfailed_text_exception">The server(s) could not be imported.\n(%1s)</string>
<string name="dialog_serverimportfailed_text_exception" xmlns:tools="http://schemas.android.com/tools" tools:ignore="PluralsCandidate">The servers could not be imported.\n(%1s)</string>
<string name="dialog_logexport_text">How do you want to share the logs?</string>
<string name="dialog_logexport_general">General export</string>
......@@ -100,7 +103,7 @@
\n\nThat\'s why I\'m kindly asking for your help translating this app to reach as broad of an audience as possible. If you are willing to help translating this app into your language feel free to either contact me or <![CDATA[<a href="https://git.frostnerd.com/PublicAndroidApps/smokescreen/blob/master/TRANSLATING.md">read here on how to help.</a>]]></string>
<string name="dialog_speedresult_title">Speed test results</string>
<string name="dialog_speedresult_message">
<string name="dialog_speedresult_message" xmlns:tools="http://schemas.android.com/tools" tools:ignore="PluralsCandidate">
%1d servers tested\n
%2d DoT servers reachable, %3d not reachable\n
%4d DoH servers reachable, %5d not reachable\n
......
......@@ -68,9 +68,12 @@
<string name="button_main_dnsrules">DNS rules</string>
<string name="window_dnsrules_customhosts">Custom hosts</string>
<string name="window_dnsrules_subtitle">%1d rules</string>
<plurals name="window_dnsrules_subtitle">
<item quantity="one">%1d rule</item>
<item quantity="other">%1d rules</item>
</plurals>
<string name="window_dnsrules_hostalreadyexists">There already is a rule for this host.</string>
<string name="window_dnsrules_customhosts_message">Define all your custom hosts here.</string>
<string name="window_dnsrules_customhosts_hostsource_rulecount_pending">Rules from this source: -</string>
<string name="window_dnsrules_customhosts_hostsource_rulecount">Rules from this source: %1d (%2$d duplicates not in use)</string>
<string name="window_dnsrules_customhosts_hostsource_rulecount" xmlns:tools="http://schemas.android.com/tools" tools:ignore="PluralsCandidate">Rules from this source: %1d (%2$d duplicates not in use)</string>
</resources>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment