Commit 0f9116ce authored by Daniel Wolf's avatar Daniel Wolf
Browse files
parents d9c29204 63df4c7a
Pipeline #5080 passed with stage
in 2 minutes and 1 second
......@@ -93,9 +93,15 @@ interface DnsRuleDao {
@Query("SELECT * FROM DnsRule WHERE importedFrom IS NULL ORDER BY host")
fun getAllUserRules():List<DnsRule>
@Query("SELECT * FROM DnsRule WHERE importedFrom IS NULL AND target != '' ORDER BY host")
fun getAllUserRulesWithoutWhitelist():List<DnsRule>
@Query("SELECT * FROM DnsRule WHERE importedFrom IS NOT NULL ORDER BY host LIMIT :limit OFFSET :offset")
fun getAllNonUserRules(offset:Int, limit:Int):List<DnsRule>
@Query("SELECT * FROM DnsRule WHERE importedFrom IS NOT NULL AND target != '' ORDER BY host LIMIT :limit OFFSET :offset")
fun getAllNonUserRulesWithoutWhitelist(offset:Int, limit:Int):List<DnsRule>
@Delete
fun remove(rule:DnsRule)
......
......@@ -148,7 +148,7 @@ class RuleExportService : IntentService("RuleExportService") {
})
updateNotification(0, ruleCount)
if (params.exportUserRules && !isAborted) {
getDatabase().dnsRuleDao().getAllUserRules().forEach {
getDatabase().dnsRuleDao().getAllUserRulesWithoutWhitelist().forEach {
if (!isAborted) {
writtenCount++
writeRule(stream, it)
......@@ -164,7 +164,7 @@ class RuleExportService : IntentService("RuleExportService") {
val limit = 2000
var offset = 0
while (!isAborted && offset < nonUserRuleCount!!) {
getDatabase().dnsRuleDao().getAllNonUserRules(offset, limit).forEach {
getDatabase().dnsRuleDao().getAllNonUserRulesWithoutWhitelist(offset, limit).forEach {
if (!isAborted) {
writtenCount++
writeRule(stream, it)
......
......@@ -87,4 +87,8 @@
<string name="changelog_build_43_4">Die Ansicht der Dns Regeln und Quellen zeigt nun die absolute Anzahl an Regeln</string>
<string name="changelog_build_43_5">Es wird nun ein Dialog gezeigt, wenn das Gerät die App beendet, welcher Informationen über Mögliche Lösungen liefert</string>
<string name="changelog_build_43_6">Einige Abstürze behoben</string>
<string name="changelog_build_44_1">Die App sollte nun richtig funktionieren, wenn das WLAN sich automatisch ausschaltet</string>
<string name="changelog_build_44_2">Hostquellen können nun regelmäßig geupdated werden</string>
<string name="changelog_build_44_3">Hostquellen werden nur noch gedownloaded, wenn sich deren Inhalt geändert hat</string>
<string name="changelog_build_44_4">Die DNS Regeln unterstützen nun Wildcards</string>
</resources>
......@@ -90,12 +90,13 @@
<string name="dialog_clearqueries_message">Bist du dir sicher, dass du alle gespeicherten Anfragen löschen willst\? Dies kann nicht rückgängig gemacht werden.</string>
<string name="dialog_credits_title">Danksagungen</string>
<string name="dialog_credits_message" formatted="true">- App icon von &lt;a href=https://dribbble.com/rkbdi&gt;RKBDI&lt;/a&gt;
\n- Türkische Übersetzung von Kemal Oktay Aktoğan
\n- Russische Übersetzung von bruleto\n
- Niederländische Übersetzung von Bas Koedijk
\n
\n Möchtest du deinen Namen hier sehen\? Trage noch heute &lt;a href=https://git.frostnerd.com/PublicAndroidApps/smokescreen&gt;etwas bei&lt;/a&gt;.</string>
<string name="dialog_credits_message" formatted="true">- App icon von &lt;a href=https://dribbble.com/rkbdi&gt;RKBDI&lt;/a&gt;
\n- Türkische Übersetzung von Kemal Oktay Aktoğan
\n- Russische Übersetzung von bruleto
\n- Niederländische Übersetzung von Bas Koedijk
\n- Portugiesische Übersetzung von Rafael W. Bohnenberger
\n- Indonesische Übersetzung von Gloeyisk
\nMöchtest du deinen Namen hier sehen\? Trage noch heute &lt;a href=https://git.frostnerd.com/PublicAndroidApps/smokescreen&gt;etwas bei&lt;/a&gt;.</string>
<string name="dialog_join_group_title">Der Gemeinde beitreten</string>
<string name="dialog_join_group_message">Hallo!
......@@ -156,4 +157,20 @@
<item quantity="other">%1d Apps sind standardmäßig ausgewählt und können nicht abgewählt werden</item>
</plurals>
<string name="dialog_newhostsource_wildcard_info">Es können Regelquellen genutzt werden, welche Wildcard Domains benutzen.</string>
<string name="dialog_newdnsrule_wildcard_info">Der Host der Regel unterstützt Wildcards. Benutze einen Stern (*), um eine Beliebige Anzahl an Buchstaben, Nummern und Sonderzeichen, außer einem Punkt(.) abzudecken. Nutze zwei Sterne (**), um den Punkt (.) mit einzuschließen.</string>
<string name="dialog_overlaydetected_title">Systemweites Overlay festgestellt</string>
<string name="dialog_overlaydetected_message">Es scheint ein systemweites Overlay (z.B. eine Chatblase, oder ein Farb-/Nachtfilter) aktiv zu sein. Auf den meisten Geräten ist es nicht möglich, der App den benötigten Zugang zum VPN zu gewähren, wenn ein Overlay sichtbar ist.
\n
\nBitte deaktivere dein Overlay, solltest du im nächsten Dialog nicht auf OK klicken können.</string>
<string name="dialog_hostsourcerefresh_title">Hostquellen aktualisieren</string>
<string name="dialog_hostsourcerefresh_automatic_refresh">Hostquellen automatisch aktualisieren</string>
<string name="dialog_hostsourcerefresh_wifi_only">Nur bei WLAN-Verbindung</string>
<string name="dialog_hostsourcerefresh_refresh_every">Aktualisiere alle</string>
<string name="dialog_hostsourcerefresh_refresh_now">Jetzt aktualisieren</string>
<string name="dialog_hostsourcerefresh_timeunit_minutes">Minuten</string>
<string name="dialog_hostsourcerefresh_timeunit_hours">Stunden</string>
<string name="dialog_hostsourcerefresh_timeunit_days">Tage</string>
<string name="dialog_hostsourcerefresh_timeunit_weeks">Wochen</string>
</resources>
......@@ -137,4 +137,7 @@
<string name="title_catch_other_dns_servers">Anderen DNS-Traffic abfangen</string>
<string name="summary_catch_other_dns_servers">Fange den Traffic von bekannten DNS Servern ab und leite ihn durch Nebulo sicher weiter</string>
<string name="title_advanced_logging">Erweiterte Protokollierung</string>
<string name="summary_advanced_logging">Fügt mehr Protokollierung hinzu, was bei persistenteren Problemen unterstützen kann.</string>
</resources>
......@@ -87,4 +87,8 @@
<string name="changelog_build_43_4">De dns-regels weergave toont nu het totale aantal regels</string>
<string name="changelog_build_43_5">Er wordt nu een dialoogvenster weergegeven wanneer het systeem de app afsluit, met informatie over mogelijke oplossingen</string>
<string name="changelog_build_43_6">Een paar kleine foutjes opgelost</string>
<string name="changelog_build_44_1">De app zou nu in staat moeten zijn zichzelf te herstellen wanneer het scherm enige tijd uitgeschakeld is geweest</string>
<string name="changelog_build_44_2">DNS-regels kunnen nu worden geconfigureerd om periodiek te worden bijgewerkt</string>
<string name="changelog_build_44_3">Host bronnen worden nu alleen gedownload/verwerkt wanneer hun inhoud is gewijzigd</string>
<string name="changelog_build_44_4">De dns-regels ondersteunen nu wildcards</string>
</resources>
......@@ -15,9 +15,9 @@
<string name="dialog_appchoosal_whitelist">Gebruik alleen DoH / DoT in geselecteerde apps</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>
<item quantity="one">%1d app is standaard uitgesloten en kan niet worden gedeselecteerd</item>
<item quantity="other">%1d apps zijn standaard uitgesloten en kunnen niet worden geselecteerd</item>
</plurals>
<plurals name="dialog_serverimport_title">
<item quantity="one">Import van %1d server</item>
......@@ -28,13 +28,13 @@
<string name="dialog_serverimport_experimental">Experimenteel</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">Selecteer de servers die u wilt importeren.
\n 
\nAls u serverconfiguraties markeert die al zijn toegevoegd, worden deze gedupliceerd.</string>
<string name="dialog_serverimport_text">Selecteer de servers die u wilt importeren.
\n 
\nAls u servers selecteert die al zijn toegevoegd, worden deze gedupliceerd.</string>
<string name="dialog_serverimportfailed_title">Importeren mislukt</string>
<string name="dialog_serverimportfailed_text">De server(s) kunnen niet worden geïmporteerd.</string>
<string name="dialog_serverimportfailed_text_exception">De server(s) kunnen niet worden geïmporteerd.
<string name="dialog_serverimportfailed_text_exception">De servers kunnen niet worden geïmporteerd.
\n(%1s)</string>
<string name="dialog_logexport_text">Hoe wil je de logs delen\?</string>
......@@ -93,12 +93,14 @@
<string name="dialog_clearqueries_message">Weet u zeker dat u de geregistreerde zoekopdrachten wilt wissen\? Dit kan niet worden teruggedraaid.</string>
<string name="dialog_credits_title">Dankwoord</string>
<string name="dialog_credits_message" formatted="true">- App-icoon door &lt;a href=https://dribbble.com/rkbdi&gt;RKBDI&lt;/a&gt;.
\n- Turkse vertaling door Kemal Oktay Aktoğan
\n- Russische vertaling door bruleto
\n- Nederlandse vertaling door Bas Koedijk
\n 
\n Wil je je naam hier zien\? Aarzel niet om &lt;a href=https://git.frostnerd.com/PublicAndroidApps/smokescreen&gt; een bijdrage te leveren &lt;/a&gt;.</string>
<string name="dialog_credits_message" formatted="true">- App-icoon door &lt;a href=https://dribbble.com/rkbdi&gt;RKBDI&lt;/a&gt;.
\n- Turkse vertaling door Kemal Oktay Aktoğan
\n- Russische vertaling door bruleto
\n- Nederlandse vertaling door Bas Koedijk
\n- Portugese vertaling door Rafael W. Bohnenberger
\n- Indonesische vertaling door Gloeyisk
\n
\nWil je je naam hier zien\? Aarzel niet om &lt;a href=https://git.frostnerd.com/PublicAndroidApps/smokescreen&gt; een bijdrage te leveren &lt;/a&gt;.</string>
<string name="dialog_join_group_title">Word lid van de community</string>
<string name="dialog_join_group_message">Hallo daar!
......@@ -156,4 +158,18 @@
\n
\nAls je ervoor kiest om dit te negeren dan zie je dit dialoogvenster niet meer terug. U kunt meer lezen en tips krijgen om dit op te lossen met de onderstaande knop (opent een externe website in uw browser).</string>
<string name="dialog_servicekilled_more_info">Meer informatie</string>
</resources>
<string name="dialog_newhostsource_wildcard_info">U kunt host bronnen gebruiken met wildcard domeinen.</string>
<string name="dialog_newdnsrule_wildcard_info">De host ondersteunt wildcards. Gebruik ster (*) voor een willekeurig aantal tekens, cijfers en toegestane speciale tekens behalve punt (.). Gebruik twee sterren (**) om de punt (.) Op te nemen.</string>
<string name="dialog_overlaydetected_title">Systeem-brede overlay gedetecteerd</string>
<string name="dialog_overlaydetected_message">Er lijkt een systeem-brede overlay (bijv. Een chatballon, kleuren- of nachtfilter) actief te zijn. Met de meeste apparaten kunt u in dit geval geen VPN inschakelen. Als u in het volgende dialoogvenster niet op OK kunt klikken, schakelt u de overlay uit.</string>
<string name="dialog_hostsourcerefresh_title">Vernieuw host bronnen</string>
<string name="dialog_hostsourcerefresh_automatic_refresh">Host bronnen automatisch vernieuwen</string>
<string name="dialog_hostsourcerefresh_wifi_only">Vernieuw alleen op WIFI</string>
<string name="dialog_hostsourcerefresh_refresh_every">Vernieuw elke</string>
<string name="dialog_hostsourcerefresh_refresh_now">Vernieuw nu</string>
<string name="dialog_hostsourcerefresh_timeunit_minutes">Minuten</string>
<string name="dialog_hostsourcerefresh_timeunit_hours">Uren</string>
<string name="dialog_hostsourcerefresh_timeunit_days">Dagen</string>
<string name="dialog_hostsourcerefresh_timeunit_weeks">Weken</string>
</resources>
......@@ -136,4 +136,7 @@
<string name="title_delete_queries">Wis DNS-verzoeken</string>
<string name="summary_delete_queries">Klik hier om alle geregistreerde DNS-verzoeken te verwijderen.</string>
</resources>
<string name="title_advanced_logging">Geavanceerd loggen</string>
<string name="summary_advanced_logging">Voegt uitgebreid Loggen toe, wat kan helpen bij aanhoudende problemen.</string>
</resources>
......@@ -15,9 +15,9 @@
<string name="dialog_appchoosal_whitelist">Apenas use DoH/DoT em aplicativos selecionados</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>
<item quantity="one">%1d aplicativo é excluído por padrão e não pode ser desmarcado</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>
......@@ -28,13 +28,13 @@
<string name="dialog_serverimport_experimental">Experimental</string>
<string name="dialog_serverimport_servertype_doh">Tipo: DNS-via-HTTPS (DoH)</string>
<string name="dialog_serverimport_servertype_dot">Tipo: Dns-via-TLS (DoT)</string>
<string name="dialog_serverimport_text">Por favor, selecione o(s) servidor(es) que você deseja importar.
\n
<string name="dialog_serverimport_text">Por favor, selecione os servidores que você deseja importar.
\n
\nServidores que já foram importados serão duplicados se você os selecionar.</string>
<string name="dialog_serverimportfailed_title">Importação falhou</string>
<string name="dialog_serverimportfailed_text">Não foi possível importar o(s) servidor(es).</string>
<string name="dialog_serverimportfailed_text_exception">Não foi possível importar o(s) servidor(es).
<string name="dialog_serverimportfailed_text_exception">Não foi possível importar os servidores.
\n(%1s)</string>
<string name="dialog_logexport_text">Como você deseja compartilhar os registros\?</string>
......@@ -94,11 +94,13 @@
<string name="dialog_clearqueries_message">Tem certeza de que deseja limpar as consultas registradas\? Isto não pode ser revertido.</string>
<string name="dialog_credits_title">Créditos</string>
<string name="dialog_credits_message" formatted="true">- Ícone do aplicativo por &lt;a href=https://dribbble.com/rkbdi&gt;RKBDI&lt;/a&gt; .
\n - Tradução turca por Kemal Oktay Aktoğan
\n - Tradução russa por bruleto
<string name="dialog_credits_message" formatted="true">- Ícone do aplicativo por &lt;a href=https://dribbble.com/rkbdi&gt;RKBDI&lt;/a&gt; .
\n - Tradução turca por Kemal Oktay Aktoğan
\n - Tradução russa por bruleto
\n - Tradução holandesa por Bas Koedijk
\n
\n - Tradução portuguesa por Rafael W. Bohnenberger
\n - Tradução indonésia por Gloeyisk
\n
\n Quer ver seu nome aqui\? Sinta-se à vontade para &lt;a href=https://git.frostnerd.com/PublicAndroidApps/smokescreen&gt;contribuir&lt;/a&gt;.</string>
<string name="dialog_join_group_title">Junte-se à comunidade</string>
......@@ -159,4 +161,11 @@
\n
\nSe você optar por ignorar isso, você não verá esta caixa de diálogo novamente. Você pode ler mais e obter dicas para resolver isso com o botão abaixo (abre um site externo em seu navegador).</string>
<string name="dialog_servicekilled_more_info">Mais informações</string>
<string name="dialog_newhostsource_wildcard_info">Você pode usar listas de hosts que fazem uso de domínios curinga.</string>
<string name="dialog_newdnsrule_wildcard_info">O host oferece suporte a caracteres-curinga. Use asterisco (*) para qualquer quantidade de caracteres, números e caracteres especiais permitidos, exceto o ponto (.). Use dois asteriscos (**) para incluir o ponto (.).</string>
<string name="dialog_overlaydetected_title">Sobreposição em todo o sistema detectada</string>
<string name="dialog_overlaydetected_message">Uma sobreposição em todo o sistema (por exemplo, um balão de chat, filtro colorido ou noturno) parece estar ativa. Com a maioria dos dispositivos, você não pode habilitar a VPN nesse caso.
\n
\nSe você não puder clicar em OK na próxima caixa de diálogo, desative a sobreposição.</string>
</resources>
......@@ -136,4 +136,7 @@
<string name="title_delete_queries">Limpar consultas de DNS</string>
<string name="summary_delete_queries">Clique aqui para excluir todas as consultas de DNS do registro.</string>
</resources>
<string name="title_advanced_logging">Registro avançado</string>
<string name="summary_advanced_logging">Adiciona mais registros, o que pode ajudar com problemas mais persistentes.</string>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>
\ No newline at end of file
<?xml version='1.0' encoding='UTF-8'?>
<resources><string name="dialog_crashreportingusages_data_1">Thông tin người dùng</string>
<string name="dialog_crashreportingusages_data_2">Thông tin thiết bị</string>
<string name="dialog_crashreportingusages_data_3">Thông tin ứng dụng</string>
<string name="dialog_crashreportingusages_data_4">Thông tin hệ điều hành</string>
<string name="dialog_crashreportingusages_data_user_1">ID ngẫu nhiên được sử dụng để theo dõi sự cố</string>
<string name="dialog_crashreportingusages_data_device_1">Kiến trúc (x86, arm, ...)</string>
<string name="dialog_crashreportingusages_data_device_4">Trạng thái sạc (có/không)</string>
<string name="dialog_crashreportingusages_data_device_6">Độ phân giải màn hình</string>
<string name="dialog_crashreportingusages_data_device_7">Nhà sản xuất</string>
<string name="dialog_crashreportingusages_data_device_10">Ngôn ngữ</string>
<string name="dialog_crashreportingusages_data_app_2">Phiên bản ứng dụng</string>
<string name="dialog_crashreportingusages_data_app_4">Tên máy chủ DNS</string>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>
\ No newline at end of file
<?xml version='1.0' encoding='UTF-8'?>
<resources><string name="menu_main">Trạng thái ứng dụng</string>
<string name="menu_settings">Cài đặt</string>
<string name="menu_querylogging">Truy vấn đã lưu</string>
<string name="menu_create_shortcut">Tạo lối tắt máy chủ</string>
<string name="menu_rate">Đánh giá</string>
<string name="menu_about">Về ứng dụng này</string>
<string name="menu_show_on_fdroid">Mở trong F-Droid</string>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>
\ No newline at end of file
<?xml version='1.0' encoding='UTF-8'?>
<resources><string name="all_stop">Dừng</string>
<string name="all_start">Khởi động</string>
<string name="all_pause">Tạm dừng</string>
<string name="all_resume">Tiếp tục</string>
<string name="all_no">Không</string>
<string name="all_yes"></string>
<string name="information">Thông tin</string>
<string name="all_close">Đóng</string>
</resources>
Markdown is supported
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