diff --git a/app/build.gradle b/app/build.gradle index cd74193f..12c82c0f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ model { applicationId = "eu.faircode.netguard" minSdkVersion.apiLevel = 21 targetSdkVersion.apiLevel = 23 - versionCode = 2015112701 + versionCode = 2015112702 versionName = "0.44" archivesBaseName = "NetGuard-v$versionName-$versionCode" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1b135b5c..c09b7268 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -53,7 +53,9 @@ + + diff --git a/app/src/main/java/eu/faircode/netguard/ActivityMain.java b/app/src/main/java/eu/faircode/netguard/ActivityMain.java index 65fc5158..a11a8ea7 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivityMain.java +++ b/app/src/main/java/eu/faircode/netguard/ActivityMain.java @@ -71,6 +71,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences private static final int REQUEST_INVITE = 3; private static final int REQUEST_LOGCAT = 4; + public static final String EXTRA_PACKAGE_NAME = "package"; public static final String ACTION_RULES_CHANGED = "eu.faircode.netguard.ACTION_RULES_CHANGED"; @Override diff --git a/app/src/main/java/eu/faircode/netguard/Receiver.java b/app/src/main/java/eu/faircode/netguard/Receiver.java index e1cb3950..0d0bd1ef 100644 --- a/app/src/main/java/eu/faircode/netguard/Receiver.java +++ b/app/src/main/java/eu/faircode/netguard/Receiver.java @@ -19,12 +19,19 @@ package eu.faircode.netguard; Copyright 2015 by Marcel Bokhorst (M66B) */ +import android.app.Notification; +import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; import android.net.VpnService; import android.preference.PreferenceManager; +import android.support.v4.app.NotificationCompat; +import android.support.v4.app.NotificationManagerCompat; +import android.support.v4.content.ContextCompat; import android.util.Log; import java.util.Map; @@ -37,9 +44,41 @@ public class Receiver extends BroadcastReceiver { Log.i(TAG, "Received " + intent); Util.logExtras(intent); - if (Intent.ACTION_PACKAGE_REMOVED.equals(intent.getAction())) { + if (Intent.ACTION_PACKAGE_ADDED.equals(intent.getAction())) { + if (!intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) { + int uid = intent.getIntExtra(Intent.EXTRA_UID, 0); + String packageName = intent.getData().getSchemeSpecificPart(); + + Intent main = new Intent(context, ActivityMain.class); + main.putExtra(ActivityMain.EXTRA_PACKAGE_NAME, packageName); + main.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + PendingIntent pi = PendingIntent.getActivity(context, uid, main, PendingIntent.FLAG_UPDATE_CURRENT); + + String name; + try { + ApplicationInfo appInfo = context.getPackageManager().getApplicationInfo(packageName, 0); + name = context.getPackageManager().getApplicationLabel(appInfo).toString(); + } catch (PackageManager.NameNotFoundException ex) { + name = ex.toString(); + } + + NotificationCompat.Builder notification = new NotificationCompat.Builder(context) + .setSmallIcon(R.drawable.ic_error_outline_white_24dp) + .setContentTitle(context.getString(R.string.app_name)) + .setContentText(context.getString(R.string.msg_installed, name)) + .setContentIntent(pi) + .setCategory(Notification.CATEGORY_STATUS) + .setVisibility(Notification.VISIBILITY_SECRET) + .setColor(ContextCompat.getColor(context, R.color.colorPrimary)) + .setAutoCancel(true); + + NotificationManagerCompat.from(context).notify(uid, notification.build()); + } + + } else if (Intent.ACTION_PACKAGE_REMOVED.equals(intent.getAction())) { // Remove settings if (intent.getBooleanExtra(Intent.EXTRA_DATA_REMOVED, false)) { + int uid = intent.getIntExtra(Intent.EXTRA_UID, 0); String packageName = intent.getData().getSchemeSpecificPart(); Log.i(TAG, "Deleting settings package=" + packageName); context.getSharedPreferences("wifi", Context.MODE_PRIVATE).edit().remove(packageName).apply(); @@ -47,6 +86,7 @@ public class Receiver extends BroadcastReceiver { context.getSharedPreferences("screen_wifi", Context.MODE_PRIVATE).edit().remove(packageName).apply(); context.getSharedPreferences("screen_other", Context.MODE_PRIVATE).edit().remove(packageName).apply(); context.getSharedPreferences("roaming", Context.MODE_PRIVATE).edit().remove(packageName).apply(); + NotificationManagerCompat.from(context).cancel(uid); } } else { diff --git a/app/src/main/java/eu/faircode/netguard/SinkholeService.java b/app/src/main/java/eu/faircode/netguard/SinkholeService.java index 1af7b5e6..b2981246 100644 --- a/app/src/main/java/eu/faircode/netguard/SinkholeService.java +++ b/app/src/main/java/eu/faircode/netguard/SinkholeService.java @@ -530,7 +530,7 @@ public class SinkholeService extends VpnService { PendingIntent pi = PendingIntent.getActivity(this, 0, main, PendingIntent.FLAG_UPDATE_CURRENT); NotificationCompat.Builder notification = new NotificationCompat.Builder(this) - .setSmallIcon(R.drawable.ic_error_white_24dp) + .setSmallIcon(R.drawable.ic_error_outline_white_24dp) .setContentTitle(getString(R.string.app_name)) .setContentText(getString(R.string.msg_revoked)) .setContentIntent(pi) diff --git a/app/src/main/res/drawable-hdpi/ic_error_outline_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_error_outline_white_24dp.png new file mode 100644 index 00000000..00d5646e Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_error_outline_white_24dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_error_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_error_white_24dp.png deleted file mode 100644 index 69cbb1e0..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_error_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_error_outline_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_error_outline_white_24dp.png new file mode 100644 index 00000000..13f9e90b Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_error_outline_white_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_error_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_error_white_24dp.png deleted file mode 100644 index ca148fc7..00000000 Binary files a/app/src/main/res/drawable-mdpi/ic_error_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_error_outline_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_error_outline_white_24dp.png new file mode 100644 index 00000000..4f519d87 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_error_outline_white_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_error_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_error_white_24dp.png deleted file mode 100644 index 9829698d..00000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_error_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_error_outline_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_error_outline_white_24dp.png new file mode 100644 index 00000000..c1dee406 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_error_outline_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_error_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_error_white_24dp.png deleted file mode 100644 index abe2573b..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_error_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_error_outline_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_error_outline_white_24dp.png new file mode 100644 index 00000000..b144939b Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_error_outline_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_error_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_error_white_24dp.png deleted file mode 100644 index 830fb7e1..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_error_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml index 7e0f3c51..c3c48cfe 100644 --- a/app/src/main/res/values-af/strings.xml +++ b/app/src/main/res/values-af/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index c3e211fd..f34f4130 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked التطبيق غير مُفعّل, قم بتفعيل التطبيق من الخيار أعلاه. NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 7e0f3c51..c3c48cfe 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 7e0f3c51..c3c48cfe 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 7e0f3c51..c3c48cfe 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 7e0f3c51..c3c48cfe 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 89a54fe4..e4df43c8 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -30,6 +30,7 @@ Das wird von Fehlern in Android oder in Software vom Hersteller verursacht. Bitt %1$d erlaubt, %2$d blockiert NetGuard ist deaktiviert. Verwenden Sie den Schalter, um NetGuard zu aktivieren NetGuard wurde deaktiviert. Wahrscheinlich durch Verwendung einer VPN-Anwendung + %1$s installed Aktion abgeschlossen NetGuard verwendet ein lokales VPN, um einen Internet-Verkehr zu blockieren. Deshalb erlauben Sie eine VPN-Verbindung im nächsten Fenster. Da NetGuard keine Internet-Berechtigung hat, wird der Internet-Verkehr auch nirgendwo weitergeleitet. NetGuard ausprobieren diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 7e0f3c51..c3c48cfe 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index c8023e14..97fdb767 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f5d4ca6f..8e2cecf1 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -31,6 +31,7 @@ Estos problemas son causados por errores en Android, o en el software provisto p %1$d permitido, %2$d bloqueado NetGuard está deshabilitado, utiliza el interruptor de arriba para habilitar a NetGuard NetGuard ha sido desactivado, probablemente por usar otra aplicación de VPN + %1$s installed Acción completada NetGuard utiliza una VPN local como un pozo ciego para bloquear el tráfico de internet. Por esta razón, por favor permite la conexión VPN en el próximo diálogo. diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 7e0f3c51..c3c48cfe 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 7e0f3c51..c3c48cfe 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 94a749b5..85c3e000 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -31,6 +31,7 @@ Ceci est causé par des bugs dans Android, ou dans le logiciel fourni par le con %1$d allowed, %2$d blocked NetGuard est désactivé, utilisez le bouton ci-dessus pour activer NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completé NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 7e0f3c51..c3c48cfe 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 7e0f3c51..c3c48cfe 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 7e0f3c51..c3c48cfe 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index c5375361..a6259a4e 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -32,6 +32,7 @@ Ció è causato da alcuni bug contenuti in Android, o in programmi forniti dal p %1$d permesse, %2$d bloccate NetGuard è disabilitata, usa lo switch per abilitarla nuovamente NetGuard è stata disabilitata, probabilmente a causa di un\'altra applicazione che usa il servizio VPN + %1$s installed Azione completata Per bloccare il traffico internet, NetGuard utilizza una VPN locale come \"pozzo\". Per questo motivo, abilita la connessione VPN nella prossima schermata. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 4094acdf..1a4f6b10 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -31,6 +31,7 @@ %1$d allowed, %2$d blocked NetGuard は無効です。NetGuard を有効にするには上のスイッチを使用してください NetGuard has been disabled, likely by using another VPN based application + %1$s installed 操作を完了しました NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index f9bda4b6..0186fd1f 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked 넷가드가 해제되어 있습니다. 상단 스위치를 사용해 넷가드를 활성화하세요. NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 7e0f3c51..c3c48cfe 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 7e0f3c51..c3c48cfe 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index b533a6d8..3169e042 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d toegestaan, %2$d geblokkeerd NetGuard staat uit, gebruik de schakelaar boven om NetGuard aan te zetten NetGuard is uitgezet, waarschijnlijk door een andere VPN applicatie + %1$s installed Actie uitgevoerd NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 7e0f3c51..c3c48cfe 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 413e938e..03c91ffb 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -31,6 +31,7 @@ Problemy te są spowodowane błędami w samym Androidzie, lub oprogramowaniu dos %1$d allowed, %2$d blocked NetGuard jest wyłączony, użyj przełącznika u góry by go uruchomić NetGuard has been disabled, likely by using another VPN based application + %1$s installed Wykonano NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index d3f3a636..313184ee 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -31,6 +31,7 @@ Esses problemas são causados por bugs/falhas no Android ou no sotfware fornecid %1$d permitido, %2$d bloqueado NetGuard desativado, use o interruptor acima para ativar o NetGuard NetGuard foi desativado, provavelmente outro aplicativo baseado em VPN esta sendo usado + %1$s installed Ação concluída NetGuard usa uma VPN local como um sumidouro para bloquear o tráfego de dados. Por essa razão, por favor, permita a conexão VPN na tela a seguir. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index f4e30739..c74b1a30 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -31,6 +31,7 @@ Esses problemas são causados por bugs/falhas no Android ou no sotfware fornecid %1$d permitido, %2$d bloqueado NetGuard desativado, use o interruptor acima para ativar o NetGuard NetGuard foi desativado, provavelmente outro aplicativo baseado em VPN esta sendo usado + %1$s installed Ação concluída NetGuard usa uma VPN local como um sumidouro para bloquear o tráfego de dados. Por essa razão, por favor, permita a conexão VPN na tela a seguir. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 6a77f815..1b16f66e 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -31,6 +31,7 @@ Acest lucru este cauzat de bug-uri in Android sau in software-ul pus la dispozit %1$d permise, %2$d blocate NetGuard este momentan dezactivat, foloseste comutatorul de mai sus pentru a il activa NetGuard a fost dezactivat, probabil de o alta aplicatie ce foloseste o conexiune VPN + %1$s installed Actiune realizata NetGuard foloseste o conexiune locala VPN ca o \"gaura neagra\" pentru traficul de internet blocat. Din acest motiv la urmatoarea fereastra de dialog trebuie sa acceptati crearea conexiunii VPN. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 28e1f2a0..28f5850f 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -28,6 +28,7 @@ %1$d разрешен, %2$d заблокирован NetGuard отключен, используйте переключатель выше для включения NetGuard был отключен, скорее всего, из-за применения другого VPN-подключения + %1$s installed Действие завершено NetGuard использует локальный VPN, чтобы блокировать интернет трафик. По этой причине, пожалуйста, разрешите VPN-подключение в следующем диалоговом окне. diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index f8c00d56..0d781b5a 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -31,6 +31,7 @@ Je to spôsobené chybami v Androide alebo v softvéri poskytovanom výrobcom, p %1$d allowed, %2$d blocked NetGuard je vypnutý, použite prepínač vyššie na zapnutie NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Akcia bola dokončená NetGuard používa lokálnu VPN sieť na zablokovanie sieťovej prevádzky, a preto by ste mali povoliť VPN pripojenie v ďalšom okne. diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 7e0f3c51..c3c48cfe 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 7e0f3c51..c3c48cfe 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index 7e0f3c51..c3c48cfe 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index be26599c..acc1c6f2 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d izin verilen, %2$d engellenen NetGuard devre dışı, NetGuard etkinleştirmek için yukarıdaki anahtarını kullanın. NetGuard, büyük olasılıkla başka bir VPN tabanlı uygulama kullanılarak devre dışı bırakıldı + %1$s installed Eylem tamamlandı NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 7089b01b..360967c4 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -27,6 +27,7 @@ %1$d дозволено, %2$d заблоковано NetGuard вимкнено, аби увімкнути, використовуй перемикач, що знаходиться вище NetGuard було вимкнено, скоріш за все через використання іншого VPN-підключення + %1$s installed Дію завершено NetGuard використовує локальний VPN, аби заблокувати інтернет трафік. Через це, будь ласка, дозвольте VPN-підключення в наступному діалоговому вікні. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 7e0f3c51..c3c48cfe 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 8f4431dc..1c1eb3cb 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -31,6 +31,7 @@ %1$d 已允许, %2$d 已拦截 NetGuard已被停用, 请使用上方的开关启用NetGuard NetGuard已被停用, 可能是由于您启动了另一个基于VPN的应用 + %1$s installed 操作完成 NetGuard使用一个本地VPN来重定向被阻止的网络流量. 因此请在下一个对话框中允许建立VPN连接. diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 7e0f3c51..c3c48cfe 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -31,6 +31,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cb0f3089..b9be7802 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -34,6 +34,7 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application + %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/strings.sh b/strings.sh index 3062a6f1..856c9145 100644 --- a/strings.sh +++ b/strings.sh @@ -1,12 +1,8 @@ #!/bin/bash -grep -RIl "\Default allow mobile when screen is on' -#grep -RIl "\Default allow Wi-Fi when screen is on' -#grep -RIl "\%1$s installed' #grep -RIl "\