Updated italian translation

2015-11-21 11:04:13 +01:00 · 2015-11-21 11:04:13 +01:00 · 1d989c307d
parent 9155379873 c0e48b95aa
commit 1d989c307d
59 changed files with 1089 additions and 770 deletions
--- a/PLAY-ro.md
+++ b/PLAY-ro.md
@ -48,6 +48,8 @@ Cum NetGuard efectiv nu are permisiunea de a accesa internetul, esti sigur ca tr

 Pentru informatii la zi despre compatibilitatea dispozitivelor, intrebari si raspunsuri va rugam sa cititi mai multe aici: http://forum.xda-developers.com/showthread.php?t=3233012

+Daca vrei sa ii ajuti pe cei ce nu vorbesc limba engleza, poti ajuta la traducerea NetGuard in limba ta materna: https://crowdin.com/project/netguard/
+
 Daca doriti sa testati caracteristile in dezvoltare ale aplicatiei, va puteti alatura programului de testare: https://play.google.com/apps/testing/eu.faircode.netguard

 Codul sursa este disponibil aici: https://github.com/M66B/NetGuard
--- a/PLAY.md
+++ b/PLAY.md
@ -48,6 +48,8 @@ Since NetGuard has no internet permission, you know your internet traffic is not

 For up to date info on device compatibility, questions and answers please read more here: http://forum.xda-developers.com/showthread.php?t=3233012

+If you like to help people less fluent in English, you can help translate NetGuard in your language: https://crowdin.com/project/netguard/
+
 If you like to test new features, you can participate in the test program: https://play.google.com/apps/testing/eu.faircode.netguard

 The source code is available here: https://github.com/M66B/NetGuard
--- a/README.md
+++ b/README.md
@ -158,11 +158,8 @@ Contributing
 Translations:

 * Translations to other languages are welcomed
-* Check if the language [is supported by Android](http://stackoverflow.com/questions/7973023/what-is-the-list-of-supported-languages-locales-on-android) and find its locale
-* Copy [this file](https://github.com/M66B/NetGuard/blob/master/app/src/main/res/values/strings.xml) to the [correct locale folder](https://github.com/M66B/NetGuard/blob/master/app/src/main/res/)
-* Translate the strings in the copied file and omit all lines with **translatable="false"**
-* Create a [pull request on GitHub](https://help.github.com/articles/using-pull-requests) for the new/updated translation
-* If you don't feel comfortable using GitHub, you can sent the translation to *marcel(plus)netguard(at)faircode.eu*
+* You can translate online [here](https://crowdin.com/project/netguard/)
+* If your language is not listed, please send a message to marcel(plus)netguard(at)faircode(dot)eu

 Current translations:

--- a/app/app.iml
+++ b/app/app.iml
@ -65,27 +65,23 @@
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes-proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/release" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
    </content>
--- a/app/build.gradle
+++ b/app/build.gradle
@ -8,8 +8,8 @@ android {
        applicationId "eu.faircode.netguard"
        minSdkVersion 21
        targetSdkVersion 23
-        versionCode 36
-        versionName "0.36"
+        versionCode 38
+        versionName "0.38"
    }
    buildTypes {
        release {
--- a/app/src/main/java/eu/faircode/netguard/ActivityMain.java
+++ b/app/src/main/java/eu/faircode/netguard/ActivityMain.java
@ -83,6 +83,10 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences

        running = true;
        boolean enabled = prefs.getBoolean("enabled", false);
+        boolean initialized = prefs.getBoolean("initialized", false);
+
+        // Upgrade
+        Receiver.upgrade(initialized, this);

        if (enabled)
            SinkholeService.start(this);
@ -124,8 +128,8 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
                                                startActivityForResult(prepare, REQUEST_VPN);
                                            } catch (Throwable ex) {
                                                Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
+                                                Util.sendCrashReport(ex, ActivityMain.this);
                                                onActivityResult(REQUEST_VPN, RESULT_CANCELED, null);
-                                                Toast.makeText(ActivityMain.this, ex.toString(), Toast.LENGTH_LONG).show();
                                            }
                                        }
                                    }
@ -180,7 +184,6 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
        registerReceiver(packageChangedReceiver, intentFilter);

        // First use
-        boolean initialized = prefs.getBoolean("initialized", false);
        if (!initialized) {
            // Create view
            LayoutInflater inflater = LayoutInflater.from(this);
@ -215,9 +218,6 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
            dialogFirst.show();
        }

-        // Upgrade
-        Receiver.upgrade(initialized, this);
-
        // Fill application list
        updateApplicationList();
    }
@ -250,7 +250,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
    @Override
    protected void onActivityResult(int requestCode, int resultCode, final Intent data) {
        Log.i(TAG, "onActivityResult request=" + requestCode + " result=" + requestCode + " ok=" + (resultCode == RESULT_OK));
-        Util.logExtras(TAG, data);
+        Util.logExtras(data);

        if (requestCode == REQUEST_VPN) {
            // Handle VPN approval
@ -294,7 +294,8 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences

        } else if ("whitelist_wifi".equals(name) ||
                "whitelist_other".equals(name) ||
-                "unused".equals(name) ||
+                "screen_wifi".equals(name) ||
+                "screen_other".equals(name) ||
                "whitelist_roaming".equals(name) ||
                "manage_system".equals(name) ||
                "imported".equals(name))
@ -308,7 +309,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
        @Override
        public void onReceive(Context context, Intent intent) {
            Log.i(TAG, "Received " + intent);
-            Util.logExtras(TAG, intent);
+            Util.logExtras(intent);
            updateApplicationList();
        }
    };
@ -381,7 +382,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
            }
        });

-        if (!Util.hasValidFingerprint(TAG, this) || getIntentInvite(this).resolveActivity(getPackageManager()) == null)
+        if (!Util.hasValidFingerprint(this) || getIntentInvite(this).resolveActivity(getPackageManager()) == null)
            menu.removeItem(R.id.menu_invite);

        if (getIntentSupport().resolveActivity(getPackageManager()) == null)
@ -427,7 +428,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences

        // Show version
        tvVersion.setText(Util.getSelfVersionName(this));
-        if (!Util.hasValidFingerprint(TAG, this))
+        if (!Util.hasValidFingerprint(this))
            tvVersion.setTextColor(Color.GRAY);

        // Handle license
@ -436,12 +437,18 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
        // Handle logcat
        view.setOnClickListener(new View.OnClickListener() {
            private short tap = 0;
+            private Toast toast = Toast.makeText(ActivityMain.this, "", Toast.LENGTH_SHORT);

            @Override
            public void onClick(View view) {
-                if (++tap == 7) {
+                tap++;
+                if (tap == 7) {
                    tap = 0;
-                    Util.sendLogcat(TAG, ActivityMain.this);
+                    toast.cancel();
+                    Util.sendLogcat(null, ActivityMain.this);
+                } else if (tap > 3) {
+                    toast.setText(Integer.toString(7 - tap));
+                    toast.show();
                }
            }
        });
@ -476,6 +483,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
                    }
                } catch (Throwable ex) {
                    Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
+                    Util.sendCrashReport(ex, ActivityMain.this);
                }
            }
        });
@ -530,7 +538,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
        dialogAbout.show();

        // Connect to billing
-        if (Util.hasValidFingerprint(TAG, this))
+        if (Util.hasValidFingerprint(this))
            iab.bind();
    }

--- a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java
+++ b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java
@ -143,7 +143,8 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
        else if ("whitelist_roaming".equals(name))
            SinkholeService.reload("other", this);

-        else if ("unused".equals(name) ||
+        else if ("screen_wifi".equals(name) ||
+                "screen_other".equals(name) ||
                "use_metered".equals(name) ||
                "manage_system".equals(name))
            SinkholeService.reload(null, this);
@ -156,7 +157,7 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
        @Override
        public void onReceive(Context context, Intent intent) {
            Log.i(TAG, "Received " + intent);
-            Util.logExtras(TAG, intent);
+            Util.logExtras(intent);
            updateTechinicalInfo();
        }
    };
@ -165,7 +166,7 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
        @Override
        public void onReceive(Context context, Intent intent) {
            Log.i(TAG, "Received " + intent);
-            Util.logExtras(TAG, intent);
+            Util.logExtras(intent);
            updateTechinicalInfo();
        }
    };
@ -219,6 +220,7 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
                    return null;
                } catch (Throwable ex) {
                    Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
+                    Util.sendCrashReport(ex, ActivitySettings.this);
                    return ex;
                } finally {
                    if (out != null)
@ -267,6 +269,7 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
                    return null;
                } catch (Throwable ex) {
                    Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
+                    Util.sendCrashReport(ex, ActivitySettings.this);
                    return ex;
                } finally {
                    if (in != null)
@ -307,9 +310,13 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
        xmlExport(getSharedPreferences("other", Context.MODE_PRIVATE), serializer);
        serializer.endTag(null, "mobile");

-        serializer.startTag(null, "unused");
-        xmlExport(getSharedPreferences("unused", Context.MODE_PRIVATE), serializer);
-        serializer.endTag(null, "unused");
+        serializer.startTag(null, "screen_wifi");
+        xmlExport(getSharedPreferences("screen_wifi", Context.MODE_PRIVATE), serializer);
+        serializer.endTag(null, "screen_wifi");
+
+        serializer.startTag(null, "screen_other");
+        xmlExport(getSharedPreferences("screen_other", Context.MODE_PRIVATE), serializer);
+        serializer.endTag(null, "screen_other");

        serializer.endTag(null, "netguard");
        serializer.endDocument();
@ -356,7 +363,13 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
        xmlImport(handler.application, prefs);
        xmlImport(handler.wifi, getSharedPreferences("wifi", Context.MODE_PRIVATE));
        xmlImport(handler.mobile, getSharedPreferences("other", Context.MODE_PRIVATE));
-        xmlImport(handler.unused, getSharedPreferences("unused", Context.MODE_PRIVATE));
+        if (handler.unused.size() > 0) {
+            xmlImport(handler.unused, getSharedPreferences("screen_wifi", Context.MODE_PRIVATE));
+            xmlImport(handler.unused, getSharedPreferences("screen_other", Context.MODE_PRIVATE));
+        } else {
+            xmlImport(handler.screen_wifi, getSharedPreferences("screen_wifi", Context.MODE_PRIVATE));
+            xmlImport(handler.screen_other, getSharedPreferences("screen_other", Context.MODE_PRIVATE));
+        }
        xmlImport(handler.roaming, getSharedPreferences("roaming", Context.MODE_PRIVATE));

        // Refresh UI
@ -375,7 +388,11 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
        for (String key : settings.keySet()) {
            Object value = settings.get(key);
            if (value instanceof Boolean)
-                editor.putBoolean(key, (Boolean) value);
+                if ("unused".equals(key)) {
+                    editor.putBoolean("screen_wifi", (Boolean) value);
+                    editor.putBoolean("screen_other", (Boolean) value);
+                } else
+                    editor.putBoolean(key, (Boolean) value);
            else if (value instanceof Integer)
                editor.putInt(key, (Integer) value);
            else
@ -391,6 +408,8 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
        public Map<String, Object> wifi = new HashMap<>();
        public Map<String, Object> mobile = new HashMap<>();
        public Map<String, Object> unused = new HashMap<>();
+        public Map<String, Object> screen_wifi = new HashMap<>();
+        public Map<String, Object> screen_other = new HashMap<>();
        public Map<String, Object> roaming = new HashMap<>();
        private Map<String, Object> current = null;

@ -411,8 +430,14 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
            else if (qName.equals("unused"))
                current = unused;

+            else if (qName.equals("screen_wifi"))
+                current = screen_wifi;
+
+            else if (qName.equals("screen_other"))
+                current = screen_other;
+
            else if (qName.equals("roaming"))
-                roaming = unused;
+                current = roaming;

            else if (qName.equals("setting")) {
                String key = attributes.getValue("key");
--- a/app/src/main/java/eu/faircode/netguard/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/netguard/ApplicationEx.java
@ -37,6 +37,7 @@ public class ApplicationEx extends Application {
            @Override
            public void uncaughtException(Thread thread, Throwable ex) {
                Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
+                Util.sendCrashReport(ex, ApplicationEx.this);
                if (mPrevHandler != null)
                    mPrevHandler.uncaughtException(thread, ex);
            }
--- a/app/src/main/java/eu/faircode/netguard/IAB.java
+++ b/app/src/main/java/eu/faircode/netguard/IAB.java
@ -91,6 +91,7 @@ public class IAB implements ServiceConnection {

        } catch (Throwable ex) {
            Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
+            Util.sendCrashReport(ex, context);
        }
    }

@ -109,7 +110,7 @@ public class IAB implements ServiceConnection {
        query.putStringArrayList("ITEM_ID_LIST", skuList);
        Bundle bundle = service.getSkuDetails(IAB_VERSION, context.getPackageName(), "inapp", query);
        Log.i(TAG, "getSkuDetails");
-        Util.logBundle(TAG, bundle);
+        Util.logBundle(bundle);
        int response = (bundle == null ? -1 : bundle.getInt("RESPONSE_CODE", -1));
        Log.i(TAG, "Response=" + getIABResult(response));
        if (response != 0)
@ -135,7 +136,7 @@ public class IAB implements ServiceConnection {
        // Get purchases
        Bundle bundle = service.getPurchases(IAB_VERSION, context.getPackageName(), "inapp", null);
        Log.i(TAG, "getPurchases");
-        Util.logBundle(TAG, bundle);
+        Util.logBundle(bundle);
        int response = (bundle == null ? -1 : bundle.getInt("RESPONSE_CODE", -1));
        Log.i(TAG, "Response=" + getIABResult(response));
        if (response != 0)
@ -149,7 +150,7 @@ public class IAB implements ServiceConnection {
    private PendingIntent IABgetBuyIntent(String sku) throws RemoteException {
        Bundle bundle = service.getBuyIntent(IAB_VERSION, context.getPackageName(), sku, "inapp", "netguard");
        Log.i(TAG, "getBuyIntent");
-        Util.logBundle(TAG, bundle);
+        Util.logBundle(bundle);
        int response = (bundle == null ? -1 : bundle.getInt("RESPONSE_CODE", -1));
        Log.i(TAG, "Response=" + getIABResult(response));
        if (response != 0 || !bundle.containsKey("BUY_INTENT"))
--- a/app/src/main/java/eu/faircode/netguard/Receiver.java
+++ b/app/src/main/java/eu/faircode/netguard/Receiver.java
@ -27,13 +27,15 @@ import android.net.VpnService;
 import android.preference.PreferenceManager;
 import android.util.Log;

+import java.util.Map;
+
 public class Receiver extends BroadcastReceiver {
    private static final String TAG = "NetGuard.Receiver";

    @Override
    public void onReceive(final Context context, Intent intent) {
        Log.i(TAG, "Received " + intent);
-        Util.logExtras(TAG, intent);
+        Util.logExtras(intent);

        if (Intent.ACTION_PACKAGE_REMOVED.equals(intent.getAction())) {
            // Remove settings
@ -42,11 +44,13 @@ public class Receiver extends BroadcastReceiver {
                Log.i(TAG, "Deleting settings package=" + packageName);
                context.getSharedPreferences("wifi", Context.MODE_PRIVATE).edit().remove(packageName).apply();
                context.getSharedPreferences("other", Context.MODE_PRIVATE).edit().remove(packageName).apply();
-                context.getSharedPreferences("unused", Context.MODE_PRIVATE).edit().remove(packageName).apply();
+                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();
            }

        } else {
+            // Upgrade settings
            upgrade(true, context);

            // Start service
@ -58,17 +62,44 @@ public class Receiver extends BroadcastReceiver {
    }

    public static void upgrade(boolean initialized, Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        int oldVersion = prefs.getInt("version", -1);
-        int newVersion = Util.getSelfVersionCode(context);
-        Log.i(TAG, "Upgrading from version " + oldVersion + " to " + newVersion);
+        synchronized (context.getApplicationContext()) {
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+            int oldVersion = prefs.getInt("version", -1);
+            int newVersion = Util.getSelfVersionCode(context);
+            Log.i(TAG, "Upgrading from version " + oldVersion + " to " + newVersion);

-        SharedPreferences.Editor editor = prefs.edit();
-        if (!initialized) {
-            editor.putBoolean("whitelist_wifi", false);
-            editor.putBoolean("whitelist_other", false);
+            SharedPreferences.Editor editor = prefs.edit();
+            if (initialized) {
+                if (oldVersion < 38) {
+                    Log.i(TAG, "Converting screen wifi/mobile");
+                    SharedPreferences.Editor edit = prefs.edit();
+                    edit.putBoolean("screen_wifi", prefs.getBoolean("unused", false));
+                    edit.putBoolean("screen_other", prefs.getBoolean("unused", false));
+                    edit.remove("unused");
+                    edit.apply();
+
+                    SharedPreferences unused = context.getSharedPreferences("unused", Context.MODE_PRIVATE);
+                    SharedPreferences screen_wifi = context.getSharedPreferences("screen_wifi", Context.MODE_PRIVATE);
+                    SharedPreferences screen_other = context.getSharedPreferences("screen_other", Context.MODE_PRIVATE);
+
+                    Map<String, ?> punused = unused.getAll();
+                    SharedPreferences.Editor edit_screen_wifi = screen_wifi.edit();
+                    SharedPreferences.Editor edit_screen_other = screen_other.edit();
+                    for (String key : punused.keySet()) {
+                        edit_screen_wifi.putBoolean(key, (Boolean) punused.get(key));
+                        edit_screen_other.putBoolean(key, (Boolean) punused.get(key));
+                    }
+                    edit_screen_wifi.apply();
+                    edit_screen_other.apply();
+
+                    // TODO: delete unused
+                }
+            } else {
+                editor.putBoolean("whitelist_wifi", false);
+                editor.putBoolean("whitelist_other", false);
+            }
+            editor.putInt("version", newVersion);
+            editor.apply();
        }
-        editor.putInt("version", newVersion);
-        editor.apply();
    }
 }
--- a/app/src/main/java/eu/faircode/netguard/Rule.java
+++ b/app/src/main/java/eu/faircode/netguard/Rule.java
@ -47,12 +47,14 @@ public class Rule implements Comparable<Rule> {

    public boolean wifi_default;
    public boolean other_default;
-    public boolean unused_default;
+    public boolean screen_wifi_default;
+    public boolean screen_other_default;
    public boolean roaming_default;

    public boolean wifi_blocked;
    public boolean other_blocked;
-    public boolean unused;
+    public boolean screen_wifi;
+    public boolean screen_other;
    public boolean roaming;

    public String[] related = null;
@ -84,19 +86,20 @@ public class Rule implements Comparable<Rule> {
        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
        SharedPreferences wifi = context.getSharedPreferences("wifi", Context.MODE_PRIVATE);
        SharedPreferences other = context.getSharedPreferences("other", Context.MODE_PRIVATE);
-        SharedPreferences unused = context.getSharedPreferences("unused", Context.MODE_PRIVATE);
+        SharedPreferences screen_wifi = context.getSharedPreferences("screen_wifi", Context.MODE_PRIVATE);
+        SharedPreferences screen_other = context.getSharedPreferences("screen_other", Context.MODE_PRIVATE);
        SharedPreferences roaming = context.getSharedPreferences("roaming", Context.MODE_PRIVATE);

        // Get settings
        boolean default_wifi = prefs.getBoolean("whitelist_wifi", true);
        boolean default_other = prefs.getBoolean("whitelist_other", true);
-        boolean default_unused = prefs.getBoolean("unused", false);
+        boolean default_screen_wifi = prefs.getBoolean("screen_wifi", true);
+        boolean default_screen_other = prefs.getBoolean("screen_other", true);
        boolean default_roaming = prefs.getBoolean("whitelist_roaming", true);
        boolean manage_system = prefs.getBoolean("manage_system", false);

        // Get predefined rules
        Map<String, Boolean> pre_blocked = new HashMap<>();
-        Map<String, Boolean> pre_unused = new HashMap<>();
        Map<String, Boolean> pre_roaming = new HashMap<>();
        Map<String, String[]> pre_related = new HashMap<>();
        try {
@ -107,25 +110,24 @@ public class Rule implements Comparable<Rule> {
                    if ("rule".equals(xml.getName())) {
                        String pkg = xml.getAttributeValue(null, "package");
                        boolean pblocked = xml.getAttributeBooleanValue(null, "blocked", false);
-                        boolean punused = xml.getAttributeBooleanValue(null, "unused", default_unused);
                        boolean proaming = xml.getAttributeBooleanValue(null, "roaming", default_roaming);
                        pre_blocked.put(pkg, pblocked);
-                        pre_unused.put(pkg, punused);
                        pre_roaming.put(pkg, proaming);
-                        Log.i(tag, "Predefined " + pkg + " blocked=" + pblocked + " unused=" + punused + " roaming=" + proaming);
+                        Log.d(tag, "Predefined " + pkg + " blocked=" + pblocked + " roaming=" + proaming);

                    } else if ("relation".equals(xml.getName())) {
                        String pkg = xml.getAttributeValue(null, "package");
                        String[] rel = xml.getAttributeValue(null, "related").split(",");
                        pre_related.put(pkg, rel);

-                        Log.i(tag, "Relation " + pkg + " related=" + TextUtils.join(",", rel));
+                        Log.d(tag, "Relation " + pkg + " related=" + TextUtils.join(",", rel));
                    }

                eventType = xml.next();
            }
        } catch (Throwable ex) {
            Log.e(tag, ex.toString() + "\n" + Log.getStackTraceString(ex));
+            Util.sendCrashReport(ex, context);
        }

        // Build rule list
@ -139,12 +141,14 @@ public class Rule implements Comparable<Rule> {

                rule.wifi_default = (pre_blocked.containsKey(info.packageName) ? pre_blocked.get(info.packageName) : default_wifi);
                rule.other_default = (pre_blocked.containsKey(info.packageName) ? pre_blocked.get(info.packageName) : default_other);
-                rule.unused_default = (pre_unused.containsKey(info.packageName) ? pre_unused.get(info.packageName) : default_unused);
+                rule.screen_wifi_default = default_screen_wifi;
+                rule.screen_other_default = default_screen_other;
                rule.roaming_default = (pre_roaming.containsKey(info.packageName) ? pre_roaming.get(info.packageName) : default_roaming);

                rule.wifi_blocked = (system && !manage_system ? false : wifi.getBoolean(info.packageName, rule.wifi_default));
                rule.other_blocked = (system && !manage_system ? false : other.getBoolean(info.packageName, rule.other_default));
-                rule.unused = unused.getBoolean(info.packageName, rule.unused_default);
+                rule.screen_wifi = screen_wifi.getBoolean(info.packageName, rule.screen_wifi_default);
+                rule.screen_other = screen_other.getBoolean(info.packageName, rule.screen_other_default);
                rule.roaming = roaming.getBoolean(info.packageName, rule.roaming_default);

                if (pre_related.containsKey(info.packageName))
@ -152,8 +156,9 @@ public class Rule implements Comparable<Rule> {

                rule.changed = (rule.wifi_blocked != default_wifi ||
                        rule.other_blocked != default_other ||
-                        ((rule.wifi_blocked || rule.other_blocked) && rule.unused != default_unused) ||
-                        ((!rule.other_blocked || rule.unused) && rule.roaming != default_roaming));
+                        (rule.wifi_blocked && rule.screen_wifi != rule.screen_wifi_default) ||
+                        (rule.other_blocked && rule.screen_other != rule.screen_other_default) ||
+                        ((!rule.other_blocked || rule.screen_other) && rule.roaming != default_roaming));

                listRules.add(rule);
            }
--- a/app/src/main/java/eu/faircode/netguard/RuleAdapter.java
+++ b/app/src/main/java/eu/faircode/netguard/RuleAdapter.java
@ -68,8 +68,11 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
        public CheckBox cbWifi;
        public CheckBox cbOther;

-        public LinearLayout llAttributes;
-        public ImageView ivUsing;
+        public LinearLayout llAttributesWifi;
+        public ImageView ivScreenWifi;
+
+        public LinearLayout llAttributesOther;
+        public ImageView ivScreenOther;
        public TextView tvRoaming;

        public LinearLayout llConfiguration;
@ -78,7 +81,8 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
        public TextView tvVersion;
        public TextView tvDisabled;
        public TextView tvInternet;
-        public CheckBox cbUsing;
+        public CheckBox cbScreenWifi;
+        public CheckBox cbScreenOther;
        public CheckBox cbRoaming;
        public ImageButton btnSettings;
        public Button btnLaunch;
@ -95,8 +99,11 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
            cbWifi = (CheckBox) itemView.findViewById(R.id.cbWifi);
            cbOther = (CheckBox) itemView.findViewById(R.id.cbOther);

-            llAttributes = (LinearLayout) itemView.findViewById(R.id.llAttributes);
-            ivUsing = (ImageView) itemView.findViewById(R.id.ivUsing);
+            llAttributesWifi = (LinearLayout) itemView.findViewById(R.id.llAttributesWifi);
+            ivScreenWifi = (ImageView) itemView.findViewById(R.id.ivScreenWifi);
+
+            llAttributesOther = (LinearLayout) itemView.findViewById(R.id.llAttributesOther);
+            ivScreenOther = (ImageView) itemView.findViewById(R.id.ivScreenOther);
            tvRoaming = (TextView) itemView.findViewById(R.id.tvRoaming);

            llConfiguration = (LinearLayout) itemView.findViewById(R.id.llConfiguration);
@ -105,7 +112,8 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
            tvVersion = (TextView) itemView.findViewById(R.id.tvVersion);
            tvDisabled = (TextView) itemView.findViewById(R.id.tvDisabled);
            tvInternet = (TextView) itemView.findViewById(R.id.tvInternet);
-            cbUsing = (CheckBox) itemView.findViewById(R.id.cbUsing);
+            cbScreenWifi = (CheckBox) itemView.findViewById(R.id.cbScreenWifi);
+            cbScreenOther = (CheckBox) itemView.findViewById(R.id.cbScreenOther);
            cbRoaming = (CheckBox) itemView.findViewById(R.id.cbRoaming);
            btnSettings = (ImageButton) itemView.findViewById(R.id.btnSettings);
            btnLaunch = (Button) itemView.findViewById(R.id.btnLaunch);
@ -178,7 +186,8 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
                        for (Rule related : listAll)
                            if (related.info.packageName.equals(pkg)) {
                                updateRule(related, network, isChecked);
-                                updateUnused(related, rule.unused);
+                                updateScreenWifi(related, rule.screen_wifi);
+                                updateScreenOther(related, rule.screen_other);
                                updateRoaming(related, rule.roaming);
                            }
                    notifyDataSetChanged();
@ -206,7 +215,7 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
            Picasso.with(context).load(uri).into(holder.ivIcon);
        }

-        holder.ivExpander.setImageResource(rule.attributes ? android.R.drawable.arrow_up_float : android.R.drawable.arrow_down_float);
+        holder.ivExpander.setImageLevel(rule.attributes ? 1 : 0);
        holder.tvName.setText(rule.name);

        int color = rule.system ? colorAccent : colorText;
@ -222,9 +231,11 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
        holder.cbOther.setChecked(rule.other_blocked);
        holder.cbOther.setOnCheckedChangeListener(cbListener);

-        holder.llAttributes.setOnClickListener(llListener);
-        holder.ivUsing.setVisibility(rule.unused && (rule.wifi_blocked || rule.other_blocked) ? View.VISIBLE : View.INVISIBLE);
-        holder.tvRoaming.setVisibility(rule.roaming && (!rule.other_blocked || rule.unused) ? View.VISIBLE : View.INVISIBLE);
+        holder.llAttributesWifi.setOnClickListener(llListener);
+        holder.ivScreenWifi.setVisibility(rule.screen_wifi && rule.wifi_blocked ? View.VISIBLE : View.INVISIBLE);
+        holder.llAttributesOther.setOnClickListener(llListener);
+        holder.ivScreenOther.setVisibility(rule.screen_other && rule.other_blocked ? View.VISIBLE : View.INVISIBLE);
+        holder.tvRoaming.setVisibility(rule.roaming && (!rule.other_blocked || rule.screen_other) ? View.VISIBLE : View.INVISIBLE);

        holder.llConfiguration.setVisibility(rule.attributes ? View.VISIBLE : View.GONE);

@ -239,15 +250,15 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
        holder.tvDisabled.setVisibility(rule.disabled ? View.VISIBLE : View.GONE);
        holder.tvInternet.setVisibility(rule.internet ? View.GONE : View.VISIBLE);

-        holder.cbUsing.setOnCheckedChangeListener(null);
-        holder.cbUsing.setChecked(rule.unused);
-        holder.cbUsing.setEnabled(rule.wifi_blocked || rule.other_blocked);
+        holder.cbScreenWifi.setOnCheckedChangeListener(null);
+        holder.cbScreenWifi.setChecked(rule.screen_wifi);
+        holder.cbScreenWifi.setEnabled(rule.wifi_blocked);

-        holder.cbUsing.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+        holder.cbScreenWifi.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
            @Override
            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                // Update rule
-                updateUnused(rule, isChecked);
+                updateScreenWifi(rule, isChecked);

                // Update relations
                if (rule.related == null)
@ -256,7 +267,33 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
                    for (String pkg : rule.related)
                        for (Rule related : listAll)
                            if (related.info.packageName.equals(pkg))
-                                updateUnused(related, rule.unused);
+                                updateScreenWifi(related, rule.screen_wifi);
+                    notifyDataSetChanged();
+                }
+
+                // Apply updated rule
+                SinkholeService.reload(null, context);
+            }
+        });
+
+        holder.cbScreenOther.setOnCheckedChangeListener(null);
+        holder.cbScreenOther.setChecked(rule.screen_other);
+        holder.cbScreenOther.setEnabled(rule.other_blocked);
+
+        holder.cbScreenOther.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                // Update rule
+                updateScreenOther(rule, isChecked);
+
+                // Update relations
+                if (rule.related == null)
+                    notifyItemChanged(position);
+                else {
+                    for (String pkg : rule.related)
+                        for (Rule related : listAll)
+                            if (related.info.packageName.equals(pkg))
+                                updateScreenOther(related, rule.screen_other);
                    notifyDataSetChanged();
                }

@ -267,7 +304,7 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im

        holder.cbRoaming.setOnCheckedChangeListener(null);
        holder.cbRoaming.setChecked(rule.roaming);
-        holder.cbRoaming.setEnabled(!rule.other_blocked || rule.unused);
+        holder.cbRoaming.setEnabled(!rule.other_blocked || rule.screen_other);

        holder.cbRoaming.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
            @Override
@ -339,13 +376,22 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
        }
    }

-    private void updateUnused(Rule rule, boolean enabled) {
-        rule.unused = enabled;
-        SharedPreferences unused = context.getSharedPreferences("unused", Context.MODE_PRIVATE);
-        if (rule.unused == rule.unused_default)
-            unused.edit().remove(rule.info.packageName).apply();
+    private void updateScreenWifi(Rule rule, boolean enabled) {
+        rule.screen_wifi = enabled;
+        SharedPreferences screen_wifi = context.getSharedPreferences("screen_wifi", Context.MODE_PRIVATE);
+        if (rule.screen_wifi == rule.screen_wifi_default)
+            screen_wifi.edit().remove(rule.info.packageName).apply();
        else
-            unused.edit().putBoolean(rule.info.packageName, rule.unused).apply();
+            screen_wifi.edit().putBoolean(rule.info.packageName, rule.screen_wifi).apply();
+    }
+
+    private void updateScreenOther(Rule rule, boolean enabled) {
+        rule.screen_other = enabled;
+        SharedPreferences screen_other = context.getSharedPreferences("screen_other", Context.MODE_PRIVATE);
+        if (rule.screen_other == rule.screen_other_default)
+            screen_other.edit().remove(rule.info.packageName).apply();
+        else
+            screen_other.edit().putBoolean(rule.info.packageName, rule.screen_other).apply();
    }

    private void updateRoaming(Rule rule, boolean enabled) {
--- a/app/src/main/java/eu/faircode/netguard/SinkholeService.java
+++ b/app/src/main/java/eu/faircode/netguard/SinkholeService.java
@ -94,6 +94,7 @@ public class SinkholeService extends VpnService {
                    Log.i(TAG, "wakelock=" + wl.isHeld());
                } catch (Exception ex) {
                    Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
+                    Util.sendCrashReport(ex, SinkholeService.this);
                }
            }
        }
@ -168,7 +169,8 @@ public class SinkholeService extends VpnService {
        int nBlocked = 0;
        for (Rule rule : Rule.getRules(true, TAG, this)) {
            boolean blocked = (metered ? rule.other_blocked : rule.wifi_blocked);
-            if ((!blocked || (rule.unused && interactive)) && (!metered || !(rule.roaming && last_roaming))) {
+            boolean screen = (metered ? rule.screen_other : rule.screen_wifi);
+            if ((!blocked || (screen && interactive)) && (!metered || !(rule.roaming && last_roaming))) {
                nAllowed++;
                if (debug)
                    Log.i(TAG, "Allowing " + rule.info.packageName);
@ -176,6 +178,7 @@ public class SinkholeService extends VpnService {
                    builder.addDisallowedApplication(rule.info.packageName);
                } catch (PackageManager.NameNotFoundException ex) {
                    Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
+                    Util.sendCrashReport(ex, this);
                }
            } else
                nBlocked++;
@ -209,7 +212,7 @@ public class SinkholeService extends VpnService {
            prefs.edit().putBoolean("enabled", false).apply();

            // Feedback
-            Util.toast(ex.toString(), Toast.LENGTH_LONG, this);
+            Util.sendCrashReport(ex, this);
            Widget.updateWidgets(this);

            return null;
@ -222,6 +225,7 @@ public class SinkholeService extends VpnService {
            pfd.close();
        } catch (IOException ex) {
            Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
+            Util.sendCrashReport(ex, this);
        }
    }

@ -275,10 +279,12 @@ public class SinkholeService extends VpnService {
                            }
                        } catch (Throwable ex) {
                            Log.e(TAG, ex.toString());
+                            Util.sendCrashReport(ex, SinkholeService.this);
                        }
                    Log.i(TAG, "End receiving");
                } catch (Throwable ex) {
                    Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
+                    Util.sendCrashReport(ex, SinkholeService.this);
                } finally {
                    try {
                        if (in != null)
@ -305,7 +311,7 @@ public class SinkholeService extends VpnService {
        @Override
        public void onReceive(Context context, Intent intent) {
            Log.i(TAG, "Received " + intent);
-            Util.logExtras(TAG, intent);
+            Util.logExtras(intent);

            // Yield system
            try {
@ -326,7 +332,7 @@ public class SinkholeService extends VpnService {
                return;

            Log.i(TAG, "Received " + intent);
-            Util.logExtras(TAG, intent);
+            Util.logExtras(intent);

            if (last_roaming != Util.isRoaming(SinkholeService.this)) {
                // Roaming state changed
@ -345,7 +351,7 @@ public class SinkholeService extends VpnService {
        @Override
        public void onReceive(Context context, Intent intent) {
            Log.i(TAG, "Received " + intent);
-            Util.logExtras(TAG, intent);
+            Util.logExtras(intent);
            reload(null, SinkholeService.this);
        }
    };
--- a/app/src/main/java/eu/faircode/netguard/Util.java
+++ b/app/src/main/java/eu/faircode/netguard/Util.java
@ -19,7 +19,10 @@ package eu.faircode.netguard;
    Copyright 2015 by Marcel Bokhorst (M66B)
 */

+import android.app.AlertDialog;
+import android.app.ApplicationErrorReport;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
@ -38,6 +41,9 @@ import android.os.PowerManager;
 import android.preference.PreferenceManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
 import android.widget.Toast;

 import java.io.BufferedReader;
@ -45,11 +51,15 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.security.MessageDigest;
 import java.util.Map;
 import java.util.Set;

 public class Util {
+    private static final String TAG = "NetGuard.Util";
+
    public static String getSelfVersionName(Context context) {
        try {
            PackageInfo pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
@ -102,16 +112,7 @@ public class Util {
        return ((context.getApplicationContext().getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0);
    }

-    public static void toast(final String text, final int length, final Context context) {
-        new Handler(Looper.getMainLooper()).post(new Runnable() {
-            @Override
-            public void run() {
-                Toast.makeText(context, text, length).show();
-            }
-        });
-    }
-
-    public static boolean hasValidFingerprint(String tag, Context context) {
+    public static boolean hasValidFingerprint(Context context) {
        try {
            PackageManager pm = context.getPackageManager();
            String pkg = context.getPackageName();
@ -126,17 +127,17 @@ public class Util {
            String expected = context.getString(R.string.fingerprint);
            return calculated.equals(expected);
        } catch (Throwable ex) {
-            Log.e(tag, ex.toString() + "\n" + Log.getStackTraceString(ex));
+            Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
            return false;
        }
    }

-    public static void logExtras(String tag, Intent intent) {
+    public static void logExtras(Intent intent) {
        if (intent != null)
-            logBundle(tag, intent.getExtras());
+            logBundle(intent.getExtras());
    }

-    public static void logBundle(String tag, Bundle data) {
+    public static void logBundle(Bundle data) {
        if (data != null) {
            Set<String> keys = data.keySet();
            StringBuilder stringBuilder = new StringBuilder();
@ -148,11 +149,58 @@ public class Util {
                        .append(value == null ? "" : " (" + value.getClass().getSimpleName() + ")")
                        .append("\r\n");
            }
-            Log.d(tag, stringBuilder.toString());
+            Log.d(TAG, stringBuilder.toString());
        }
    }

-    public static void sendLogcat(final String tag, final Context context) {
+    public static void sendCrashReport(Throwable ex, final Context context) {
+        ApplicationErrorReport report = new ApplicationErrorReport();
+        report.packageName = report.processName = context.getPackageName();
+        report.time = System.currentTimeMillis();
+        report.type = ApplicationErrorReport.TYPE_CRASH;
+        report.systemApp = false;
+
+        ApplicationErrorReport.CrashInfo crash = new ApplicationErrorReport.CrashInfo();
+        crash.exceptionClassName = ex.getClass().getSimpleName();
+        crash.exceptionMessage = ex.getMessage();
+
+        StringWriter writer = new StringWriter();
+        PrintWriter printer = new PrintWriter(writer);
+        ex.printStackTrace(printer);
+
+        crash.stackTrace = writer.toString();
+
+        StackTraceElement stack = ex.getStackTrace()[0];
+        crash.throwClassName = stack.getClassName();
+        crash.throwFileName = stack.getFileName();
+        crash.throwLineNumber = stack.getLineNumber();
+        crash.throwMethodName = stack.getMethodName();
+
+        report.crashInfo = crash;
+
+        final Intent bug = new Intent(Intent.ACTION_APP_ERROR);
+        bug.putExtra(Intent.EXTRA_BUG_REPORT, report);
+        if (bug.resolveActivity(context.getPackageManager()) == null)
+            sendLogcat(ex.toString() + "\n" + Log.getStackTraceString(ex), context);
+        else {
+            LayoutInflater inflater = LayoutInflater.from(context);
+            View view = inflater.inflate(R.layout.bug, null);
+            TextView tvBug = (TextView) view.findViewById(R.id.tvBug);
+            tvBug.setText(ex.toString());
+            new AlertDialog.Builder(context)
+                    .setView(view)
+                    .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            context.startActivity(bug);
+                        }
+                    })
+                    .create()
+                    .show();
+        }
+    }
+
+    public static void sendLogcat(final String message, final Context context) {
        AsyncTask task = new AsyncTask<Object, Object, Intent>() {
            @Override
            protected Intent doInBackground(Object... objects) {
@ -160,7 +208,7 @@ public class Util {
                try {
                    pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
                } catch (PackageManager.NameNotFoundException ex) {
-                    Log.e(tag, ex.toString() + "\n" + Log.getStackTraceString(ex));
+                    Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
                    return null;
                }

@ -176,7 +224,7 @@ public class Util {
                sb.append(String.format("Host: %s\r\n", Build.HOST));
                sb.append(String.format("Display: %s\r\n", Build.DISPLAY));
                sb.append(String.format("Id: %s\r\n", Build.ID));
-                sb.append(String.format("Fingerprint: %b\r\n", hasValidFingerprint(tag, context)));
+                sb.append(String.format("Fingerprint: %b\r\n", hasValidFingerprint(context)));
                sb.append(String.format("VPN dialogs: %b\r\n", isPackageInstalled("com.android.vpndialogs", context)));
                sb.append(String.format("Interactive: %b\r\n", isInteractive(context)));
                sb.append(String.format("WiFi: %b\r\n", isWifiActive(context)));
@ -201,6 +249,9 @@ public class Util {
                for (String key : all.keySet())
                    sb.append("Setting: ").append(key).append('=').append(all.get(key)).append("\r\n");

+                if (message != null)
+                    sb.append(message).append("\r\n");
+
                sb.append("\r\n");
                sb.append("Please describe your problem:\r\n");
                sb.append("\r\n");
@ -214,13 +265,13 @@ public class Util {
                File logcatFolder = context.getExternalCacheDir();
                logcatFolder.mkdirs();
                File logcatFile = new File(logcatFolder, "logcat.txt");
-                Log.i(tag, "Writing " + logcatFile);
+                Log.i(TAG, "Writing " + logcatFile);
                FileOutputStream fos = null;
                try {
                    fos = new FileOutputStream(logcatFile);
-                    fos.write(getLogcat(tag).toString().getBytes());
+                    fos.write(getLogcat().toString().getBytes());
                } catch (Throwable ex) {
-                    Log.e(tag, ex.toString() + "\n" + Log.getStackTraceString(ex));
+                    Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
                } finally {
                    if (fos != null)
                        try {
@ -241,14 +292,14 @@ public class Util {
                    try {
                        context.startActivity(sendEmail);
                    } catch (Throwable ex) {
-                        Log.e(tag, ex.toString() + "\n" + Log.getStackTraceString(ex));
+                        Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
                    }
            }
        };
        task.execute();
    }

-    private static StringBuilder getLogcat(String tag) {
+    private static StringBuilder getLogcat() {
        String pid = Integer.toString(android.os.Process.myPid());
        StringBuilder builder = new StringBuilder();
        Process process = null;
@ -264,7 +315,7 @@ public class Util {
                    builder.append("\r\n");
                }
        } catch (IOException ex) {
-            Log.e(tag, ex.toString() + "\n" + Log.getStackTraceString(ex));
+            Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
        } finally {
            if (br != null)
                try {
--- a/app/src/main/java/eu/faircode/netguard/Widget.java
+++ b/app/src/main/java/eu/faircode/netguard/Widget.java
@ -47,7 +47,7 @@ public class Widget extends AppWidgetProvider {
        super.onReceive(context, intent);

        Log.i(TAG, "Received " + intent);
-        Util.logExtras(TAG, intent);
+        Util.logExtras(intent);

        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

--- a/app/src/main/res/drawable-hdpi/ic_arrow_drop_down_black_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_arrow_drop_down_black_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_arrow_drop_down_white_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_arrow_drop_down_white_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_arrow_drop_up_black_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_arrow_drop_up_black_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_arrow_drop_up_white_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_arrow_drop_up_white_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_arrow_drop_down_black_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_arrow_drop_down_black_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_arrow_drop_down_white_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_arrow_drop_down_white_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_arrow_drop_up_black_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_arrow_drop_up_black_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_arrow_drop_up_white_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_arrow_drop_up_white_24dp.png
--- a/app/src/main/res/drawable-xhdpi/ic_arrow_drop_down_black_24dp.png
+++ b/app/src/main/res/drawable-xhdpi/ic_arrow_drop_down_black_24dp.png
--- a/app/src/main/res/drawable-xhdpi/ic_arrow_drop_down_white_24dp.png
+++ b/app/src/main/res/drawable-xhdpi/ic_arrow_drop_down_white_24dp.png
--- a/app/src/main/res/drawable-xhdpi/ic_arrow_drop_up_black_24dp.png
+++ b/app/src/main/res/drawable-xhdpi/ic_arrow_drop_up_black_24dp.png
--- a/app/src/main/res/drawable-xhdpi/ic_arrow_drop_up_white_24dp.png
+++ b/app/src/main/res/drawable-xhdpi/ic_arrow_drop_up_white_24dp.png
--- a/app/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_black_24dp.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_black_24dp.png
--- a/app/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_white_24dp.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_white_24dp.png
--- a/app/src/main/res/drawable-xxhdpi/ic_arrow_drop_up_black_24dp.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_arrow_drop_up_black_24dp.png
--- a/app/src/main/res/drawable-xxhdpi/ic_arrow_drop_up_white_24dp.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_arrow_drop_up_white_24dp.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_down_black_24dp.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_down_black_24dp.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_down_white_24dp.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_down_white_24dp.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_up_black_24dp.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_up_black_24dp.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_up_white_24dp.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_up_white_24dp.png
--- a/app/src/main/res/drawable/expander_black.xml
+++ b/app/src/main/res/drawable/expander_black.xml
@ -0,0 +1,8 @@
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@drawable/ic_arrow_drop_down_black_24dp"
+        android:maxLevel="0" />
+    <item
+        android:drawable="@drawable/ic_arrow_drop_up_black_24dp"
+        android:maxLevel="1" />
+</level-list>
--- a/app/src/main/res/drawable/expander_white.xml
+++ b/app/src/main/res/drawable/expander_white.xml
@ -0,0 +1,8 @@
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@drawable/ic_arrow_drop_down_white_24dp"
+        android:maxLevel="0" />
+    <item
+        android:drawable="@drawable/ic_arrow_drop_up_white_24dp"
+        android:maxLevel="1" />
+</level-list>
--- a/app/src/main/res/drawable/screen_on.xml
+++ b/app/src/main/res/drawable/screen_on.xml
--- a/app/src/main/res/layout/bug.xml
+++ b/app/src/main/res/layout/bug.xml
@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="20dp"
+    android:paddingEnd="20dp"
+    android:paddingStart="20dp"
+    android:paddingTop="20dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:src="@mipmap/ic_launcher" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="8dp"
+            android:text="@string/app_name"
+            android:textAppearance="@android:style/TextAppearance.Material.Large"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/msg_bug"
+                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+
+            <TextView
+                android:id="@+id/tvBug"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textStyle="italic" />
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>
--- a/app/src/main/res/layout/rule.xml
+++ b/app/src/main/res/layout/rule.xml
@ -25,16 +25,15 @@

            <ImageView
                android:id="@+id/ivExpander"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
                android:layout_gravity="center_vertical"
-                android:layout_marginStart="4dp" />
+                android:src="?attr/expander" />

            <TextView
                android:id="@+id/tvName"
                android:layout_width="0dp"
                android:layout_height="match_parent"
-                android:layout_marginStart="4dp"
                android:layout_weight="1"
                android:ellipsize="end"
                android:gravity="center_vertical"
@ -42,7 +41,7 @@
        </LinearLayout>

        <RelativeLayout
-            android:layout_width="?android:attr/listPreferredItemHeightSmall"
+            android:layout_width="wrap_content"
            android:layout_height="?android:attr/listPreferredItemHeightSmall">

            <CheckBox
@ -53,9 +52,31 @@
                android:button="@drawable/wifi" />
        </RelativeLayout>

+        <LinearLayout
+            android:id="@+id/llAttributesWifi"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/ivScreenWifi"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:layout_gravity="center_horizontal"
+                android:src="@drawable/screen_on" />
+
+            <View
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:layout_gravity="center_horizontal"
+                android:visibility="invisible" />
+        </LinearLayout>
+
        <RelativeLayout
-            android:layout_width="?android:attr/listPreferredItemHeightSmall"
-            android:layout_height="?android:attr/listPreferredItemHeightSmall">
+            android:layout_width="wrap_content"
+            android:layout_height="?android:attr/listPreferredItemHeightSmall"
+            android:layout_marginStart="8dp">

            <CheckBox
                android:id="@+id/cbOther"
@ -66,25 +87,25 @@
        </RelativeLayout>

        <LinearLayout
-            android:id="@+id/llAttributes"
+            android:id="@+id/llAttributesOther"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center_vertical"
-            android:layout_marginStart="4dp"
            android:orientation="vertical">

            <ImageView
-                android:id="@+id/ivUsing"
+                android:id="@+id/ivScreenOther"
                android:layout_width="16dp"
                android:layout_height="16dp"
                android:layout_gravity="center_horizontal"
-                android:src="@drawable/using" />
+                android:src="@drawable/screen_on" />

            <TextView
                android:id="@+id/tvRoaming"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:layout_gravity="center_vertical"
+                android:gravity="center_horizontal"
                android:text="R"
                android:textAppearance="@android:style/TextAppearance.Material.Small"
                android:textColor="@color/colorAccent"
@ -96,7 +117,7 @@
        android:id="@+id/llConfiguration"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:layout_marginStart="4dp"
+        android:layout_marginStart="8dp"
        android:orientation="vertical"
        android:paddingStart="?android:attr/listPreferredItemHeightSmall"
        android:paddingTop="0dp"
@ -144,21 +165,69 @@
            android:textStyle="italic"
            android:visibility="gone" />

-        <CheckBox
-            android:id="@+id/cbUsing"
+        <LinearLayout
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginTop="4dp"
-            android:text="@string/title_using"
-            android:textAppearance="@android:style/TextAppearance.Material.Small" />
+            android:orientation="horizontal">

-        <CheckBox
-            android:id="@+id/cbRoaming"
+            <ImageView
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/screen_on" />
+
+            <CheckBox
+                android:id="@+id/cbScreenWifi"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/title_screen_wifi"
+                android:textAppearance="@android:style/TextAppearance.Material.Small" />
+        </LinearLayout>
+
+        <LinearLayout
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginTop="4dp"
-            android:text="@string/title_roaming"
-            android:textAppearance="@android:style/TextAppearance.Material.Small" />
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/screen_on" />
+
+            <CheckBox
+                android:id="@+id/cbScreenOther"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/title_screen_other"
+                android:textAppearance="@android:style/TextAppearance.Material.Small" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:layout_gravity="center_vertical"
+                android:gravity="center_horizontal"
+                android:text="R"
+                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textColor="@color/colorAccent"
+                android:textSize="12dp" />
+
+            <CheckBox
+                android:id="@+id/cbRoaming"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/title_roaming"
+                android:textAppearance="@android:style/TextAppearance.Material.Small" />
+        </LinearLayout>

        <LinearLayout
            android:layout_width="wrap_content"
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -1,51 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <resources>
-    <string name="app_copyright">الحقوق /u00A9 2015 بواسطة M. Bokhorst (M66B)</string>
-    <string name="app_license">By using NetGuard, you agree to the <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
-    <string name="app_first">Great care has been taken to develop and test NetGuard,
+  <string name="app_copyright">الحقوق /u00A9 2015 بواسطة M. Bokhorst (M66B)</string>
+  <string name="app_license">By using NetGuard, you agree to the <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
+  <string name="app_first">Great care has been taken to develop and test NetGuard,
 however it is impossible to guarantee it will work correctly on every device.
 NetGuard is known to crash when activated on some devices. It is also known to block all traffic on some other devices.
 These issues are caused by bugs in Android, or in the software provided by the manufacturer, so please don\'t blame NetGuard.
 \n\nBy using NetGuard, you agree to the <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
-
-    <string name="menu_search">البحث عن تطبيقات</string>
-    <string name="menu_settings">Settings</string>
-    <string name="menu_invite">Invite</string>
-    <string name="menu_support">الدعم</string>
-    <string name="menu_about">حول</string>
-
-    <string name="setting_whitelist_wifi">حظر الواي فاي بشكل افتراضي</string>
-    <string name="setting_whitelist_other">حظر الشبكة بشكل افتراضي</string>
-    <string name="setting_unused">Default allow when screen is on</string>
-    <string name="setting_whitelist_roaming">Block roaming by default</string>
-    <string name="setting_metered">Handle metered Wi-Fi networks</string>
-    <string name="setting_system">Manage system applications</string>
-    <string name="setting_dark">استخدام الثيم الداكن</string>
-    <string name="setting_export">Export settings</string>
-    <string name="setting_import">Import settings</string>
-    <string name="setting_technical">Technical information</string>
-
-    <string name="summary_system">Define rules for system applications (for experts)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
-
-    <string name="msg_sure">هل أنت متأكد؟</string>
-    <string name="msg_started">Enforcing rules</string>
-    <string name="msg_packages">%1$d allowed, %2$d blocked</string>
-    <string name="msg_disabled">التطبيق غير مُفعّل, قم بتفعيل التطبيق من الخيار أعلاه.</string>
-    <string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>
-    <string name="msg_completed">Action completed</string>
-    <string name="msg_vpn">NetGuard uses a local VPN as a sinkhole to block internet traffic.
+  <string name="menu_search">البحث عن تطبيقات</string>
+  <string name="menu_settings">Settings</string>
+  <string name="menu_invite">Invite</string>
+  <string name="menu_support">الدعم</string>
+  <string name="menu_about">حول</string>
+  <string name="setting_whitelist_wifi">حظر الواي فاي بشكل افتراضي</string>
+  <string name="setting_whitelist_other">حظر الشبكة بشكل افتراضي</string>
+  <string name="setting_screen_wifi">Default allow Wi-Fi when screen is on</string>
+  <string name="setting_screen_other">Default allow mobile when screen is on</string>
+  <string name="setting_whitelist_roaming">Block roaming by default</string>
+  <string name="setting_metered">Handle metered Wi-Fi networks</string>
+  <string name="setting_system">Manage system applications</string>
+  <string name="setting_dark">استخدام الثيم الداكن</string>
+  <string name="setting_export">Export settings</string>
+  <string name="setting_import">Import settings</string>
+  <string name="setting_technical">Technical information</string>
+  <string name="summary_system">Define rules for system applications (for experts)</string>
+  <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
+  <string name="msg_sure">هل أنت متأكد؟</string>
+  <string name="msg_started">Enforcing rules</string>
+  <string name="msg_packages">%1$d allowed, %2$d blocked</string>
+  <string name="msg_disabled">التطبيق غير مُفعّل, قم بتفعيل التطبيق من الخيار أعلاه.</string>
+  <string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>
+  <string name="msg_completed">Action completed</string>
+  <string name="msg_vpn">NetGuard uses a local VPN as a sinkhole to block internet traffic.
 For this reason, please allow a VPN connection in the next dialog.
 Since NetGuard has no internet permission, you know your internet traffic is not being sent anywhere.</string>
-    <string name="msg_try">Try NetGuard</string>
-    <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
-    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
-
-    <string name="title_using">Allow when screen is on</string>
-    <string name="title_roaming">Block when roaming</string>
-    <string name="title_disabled">is disabled</string>
-    <string name="title_internet">has no internet permission</string>
-    <string name="title_launch">Start application</string>
-    <string name="title_donate">Donate</string>
-    <string name="title_rate">Rate</string>
-    <string name="title_thanks">Thank you for your donation!</string>
+  <string name="msg_try">Try NetGuard</string>
+  <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
+  <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
+  <string name="msg_bug">Something has gone wrong, please describe in the next dialog what you were doing to help improve NetGuard</string>
+  <string name="title_screen_wifi">Allow Wi-Fi when screen is on</string>
+  <string name="title_screen_other">Allow mobile when screen is on</string>
+  <string name="title_roaming">Block when roaming</string>
+  <string name="title_disabled">is disabled</string>
+  <string name="title_internet">has no internet permission</string>
+  <string name="title_launch">Start application</string>
+  <string name="title_donate">Donate</string>
+  <string name="title_rate">Rate</string>
+  <string name="title_thanks">Thank you for your donation!</string>
 </resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -1,48 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <resources>
-    <string name="app_copyright">Copyright \u00A9 2015 by M. Bokhorst (M66B)</string>
-    <string name="app_license">Mit der Verwendung von NetGuard, akzeptieren Sie die <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
-    <string name="app_first">Netguard wurde mit großer Sorgfalt entwickelt, jedoch ist es unmöglich zu garantieren, dass es auf jedem Gerät korrekt arbeitet.
+  <string name="app_copyright">Copyright \u00A9 2015 von M. Bokhorst (M66B)</string>
+  <string name="app_license">Mit der Verwendung von NetGuard, akzeptieren Sie die <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
+  <string name="app_first">Netguard wurde mit großer Sorgfalt entwickelt, jedoch ist es unmöglich zu garantieren, dass es auf jedem Gerät korrekt arbeitet.
 Es ist bekannt, dass Netguard zu Abstürzen führen kann und, dass auf manchen Geräten sämtlicher Netzwerkverkehr blockiert wird.
 Das wird von Fehlern in Android oder in Software vom Hersteller verursacht. Bitte beschuldigen Sie bei solchen Fehlern nicht Netguard.
 \n\nMit der Verwendung von NetGuard, akzeptieren Sie die <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
-
-    <string name="menu_search">Nach Apps suchen</string>
-    <string name="menu_settings">Einstellungen</string>
-    <string name="menu_invite">Einladung</string>
-    <string name="menu_support">Hilfe</string>
-    <string name="menu_about">Über</string>
-
-    <string name="setting_whitelist_wifi">WLAN standardmäßig blockieren</string>
-    <string name="setting_whitelist_other">Mobilfunk standardmäßig blockieren</string>
-    <string name="setting_unused">Standardmäßig erlauben, wenn Bildschirm an</string>
-    <string name="setting_whitelist_roaming">Roaming standardmäßig blockieren</string>
-    <string name="setting_metered">Gemessenes WLAN-Netzwerk handhaben</string>
-    <string name="setting_system">System-Apps anzeigen</string>
-    <string name="setting_dark">Dunkles Thema verwenden</string>
-    <string name="setting_export">Einstellungen exportieren</string>
-    <string name="setting_import">Einstellungen importieren</string>
-    <string name="setting_technical">Technische information</string>
-
-    <string name="summary_system">Regeln für System-Apps definieren (für Experten)</string>
-    <string name="summary_metered">Mobilfunk-Regeln gemessenen (bezahlten, tethered) WLAN-Netzwerken anwenden</string>
-
-    <string name="msg_sure">Sind Sie sicher?</string>
-    <string name="msg_started">Regeln werden angewendet</string>
-    <string name="msg_packages">%1$d allowed, %2$d blocked</string>
-    <string name="msg_disabled">NetGuard ist deaktiviert. Verwenden Sie den Schalter, um NetGuard zu aktivieren</string>
-    <string name="msg_revoked">NetGuard wurde deaktiviert. Wahrscheinlich durch Verwendung einer VPN-Anwendung</string>
-    <string name="msg_completed">Aktion abgeschlossen</string>
-    <string name="msg_vpn">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.</string>
-    <string name="msg_try">NetGuard ausprobieren</string>
-    <string name="msg_voluntary">Spenden sind vollkommen freiwillig und schalten keine Funktionen frei. Spenden helfen, die App weiterzuentwickeln und stellen eine Anerkennung für die Arbeit dar.</string>
-    <string name="msg_dimming">Falls Sie nicht auf OK im nächsten Fenster tippen können, manipuliert eine andere Anwendung Ihren Bildschirm.</string>
-
-    <string name="title_using">Erlauben, wenn Bildschirm an</string>
-    <string name="title_roaming">Bei Roaming blockieren</string>
-    <string name="title_disabled">ist deaktiviert</string>
-    <string name="title_internet">hat keine Internet-Berechtigung</string>
-    <string name="title_launch">App starten</string>
-    <string name="title_donate">Spenden</string>
-    <string name="title_rate">Bewerten</string>
-    <string name="title_thanks">Danke für die Spende!</string>
+  <string name="menu_search">Nach Apps suchen</string>
+  <string name="menu_settings">Einstellungen</string>
+  <string name="menu_invite">Einladung</string>
+  <string name="menu_support">Hilfe</string>
+  <string name="menu_about">Über</string>
+  <string name="setting_whitelist_wifi">WLAN standardmäßig blockieren</string>
+  <string name="setting_whitelist_other">Mobilfunk standardmäßig blockieren</string>
+  <string name="setting_screen_wifi">WLAN immer erlauben, wenn Bildschirm eingeschaltet ist</string>
+  <string name="setting_screen_other">Mobilfunk immer erlauben, wenn Bildschirm eingeschaltet ist</string>
+  <string name="setting_whitelist_roaming">Roaming standardmäßig blockieren</string>
+  <string name="setting_metered">Gemessenes WLAN-Netzwerk handhaben</string>
+  <string name="setting_system">System-Apps anzeigen</string>
+  <string name="setting_dark">Dunkles Thema verwenden</string>
+  <string name="setting_export">Einstellungen exportieren</string>
+  <string name="setting_import">Einstellungen importieren</string>
+  <string name="setting_technical">Technische information</string>
+  <string name="summary_system">Regeln für System-Apps definieren (für Experten)</string>
+  <string name="summary_metered">Mobilfunk-Regeln gemessenen (bezahlten, tethered) WLAN-Netzwerken anwenden</string>
+  <string name="msg_sure">Sind Sie sicher?</string>
+  <string name="msg_started">Regeln werden angewendet</string>
+  <string name="msg_packages">%1$d erlaubt, %2$d blockiert</string>
+  <string name="msg_disabled">NetGuard ist deaktiviert. Verwenden Sie den Schalter, um NetGuard zu aktivieren</string>
+  <string name="msg_revoked">NetGuard wurde deaktiviert. Wahrscheinlich durch Verwendung einer VPN-Anwendung</string>
+  <string name="msg_completed">Aktion abgeschlossen</string>
+  <string name="msg_vpn">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.</string>
+  <string name="msg_try">NetGuard ausprobieren</string>
+  <string name="msg_voluntary">Spenden sind vollkommen freiwillig und schalten keine Funktionen frei. Spenden helfen, die App weiterzuentwickeln und stellen eine Anerkennung für die Arbeit dar.</string>
+  <string name="msg_dimming">Falls Sie nicht auf OK im nächsten Fenster tippen können, manipuliert eine andere Anwendung Ihren Bildschirm.</string>
+  <string name="msg_bug">Etwas ist schief gelaufen. Beschreiben Sie bitte im nächsten Fenster, was Sie gemacht haben, um NetGuard zu verbessern.</string>
+  <string name="title_screen_wifi">WLAN erlauben, wenn Bildschirm eingeschaltet ist</string>
+  <string name="title_screen_other">Mobilfunk erlauben, wenn Bildschirm eingeschaltet ist</string>
+  <string name="title_roaming">Bei Roaming blockieren</string>
+  <string name="title_disabled">ist deaktiviert</string>
+  <string name="title_internet">hat keine Internet-Berechtigung</string>
+  <string name="title_launch">App starten</string>
+  <string name="title_donate">Spenden</string>
+  <string name="title_rate">Bewerten</string>
+  <string name="title_thanks">Danke für die Spende!</string>
 </resources>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -1,51 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <resources>
-    <string name="app_copyright">Copyright \u00A9 2015 por M. Bokhorst (M66B)</string>
-    <string name="app_license">Al utilizar NetGuard, estás aceptando la <a href="http://www.gnu.org/licenses/gpl.txt">Licencia Pública GNU General Public versión 3</a></string>
-    <string name="app_first">NetGuard ha sido desarrollada y probada con mucho cuidado,
+  <string name="app_copyright">Copyright \u00A9 2015 por M. Bokhorst (M66B)</string>
+  <string name="app_license">Al utilizar NetGuard, estás aceptando la <a href="http://www.gnu.org/licenses/gpl.txt">Licencia Pública GNU General Public versión 3</a></string>
+  <string name="app_first">NetGuard ha sido desarrollada y probada con mucho cuidado,
 sin embargo es imposible garantizar que funcionará correctamente en todos los dispositivos.
 Es conocido que NetGuard tiene un fallo cuando se activa o que bloquea todo el tráfico en algunos dispositivos.
 Esto es causado por errores en Android, o por el software proporcionado por el fabricante, así que por favor no culpes a NetGuard.
 \n\nAl utilizar NetGuard, estás aceptando la <a href="http://www.gnu.org/licenses/gpl.txt">Licencia Pública GNU General Public versión 3</a></string>
-
-    <string name="menu_search">Buscar aplicación</string>
-    <string name="menu_settings">Configuración</string>
-    <string name="menu_invite">Invitar</string>
-    <string name="menu_support">Soporte</string>
-    <string name="menu_about">Acerca de</string>
-
-    <string name="setting_whitelist_wifi">Bloquear Wi-Fi por defecto</string>
-    <string name="setting_whitelist_other">Bloquear red móvil por defecto</string>
-    <string name="setting_unused">Default allow when screen is on</string>
-    <string name="setting_whitelist_roaming">Bloquear roaming por defecto</string>
-    <string name="setting_metered">Handle metered Wi-Fi networks</string>
-    <string name="setting_system">Administrar aplicaciones de sistema</string>
-    <string name="setting_dark">Usar tema oscuro</string>
-    <string name="setting_export">Exportar configuración</string>
-    <string name="setting_import">Importar configuración</string>
-    <string name="setting_technical">Technical information</string>
-
-    <string name="summary_system">Definir reglas para aplicaciones de sistema (para expertos)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
-
-    <string name="msg_sure">¿Estás seguro?</string>
-    <string name="msg_started">Aplicando reglas</string>
-    <string name="msg_packages">%1$d allowed, %2$d blocked</string>
-    <string name="msg_disabled">NetGuard está deshabilitado, utiliza el interruptor de arriba para habilitar a NetGuard</string>
-    <string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>
-    <string name="msg_completed">Acción completada</string>
-    <string name="msg_vpn">NetGuard utiliza un VPN local como sumidero para bloquear el acceso a internet.
+  <string name="menu_search">Buscar aplicación</string>
+  <string name="menu_settings">Configuración</string>
+  <string name="menu_invite">Invitar</string>
+  <string name="menu_support">Soporte</string>
+  <string name="menu_about">Acerca de</string>
+  <string name="setting_whitelist_wifi">Bloquear Wi-Fi por defecto</string>
+  <string name="setting_whitelist_other">Bloquear red móvil por defecto</string>
+  <string name="setting_screen_wifi">Default allow Wi-Fi when screen is on</string>
+  <string name="setting_screen_other">Default allow mobile when screen is on</string>
+  <string name="setting_whitelist_roaming">Bloquear roaming por defecto</string>
+  <string name="setting_metered">Handle metered Wi-Fi networks</string>
+  <string name="setting_system">Administrar aplicaciones de sistema</string>
+  <string name="setting_dark">Usar tema oscuro</string>
+  <string name="setting_export">Exportar configuración</string>
+  <string name="setting_import">Importar configuración</string>
+  <string name="setting_technical">Technical information</string>
+  <string name="summary_system">Definir reglas para aplicaciones de sistema (para expertos)</string>
+  <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
+  <string name="msg_sure">¿Estás seguro?</string>
+  <string name="msg_started">Aplicando reglas</string>
+  <string name="msg_packages">%1$d allowed, %2$d blocked</string>
+  <string name="msg_disabled">NetGuard está deshabilitado, utiliza el interruptor de arriba para habilitar a NetGuard</string>
+  <string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>
+  <string name="msg_completed">Acción completada</string>
+  <string name="msg_vpn">NetGuard utiliza un VPN local como sumidero para bloquear el acceso a internet.
 Por esta razón, por favor permite la conexión VPN en el próximo diálogo.
 Puesto que NetGuard no tiene permisos de internet, ya sabes que tu tráfico de internet no está siendo enviado a ninguna parte.</string>
-    <string name="msg_try">Prueba NetGuard</string>
-    <string name="msg_voluntary">Las donaciones son completamente voluntarias y no desbloquean ninguna funcionalidad. Las donaciones son una forma de mostrar tu apreciación por el trabajo hecho.</string>
-    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
-
-    <string name="title_using">Permitir cuando la pantalla esté encendida</string>
-    <string name="title_roaming">Bloquear cuando se esté en roaming</string>
-    <string name="title_disabled">is disabled</string>
-    <string name="title_internet">has no internet permission</string>
-    <string name="title_launch">Iniciar aplicación</string>
-    <string name="title_donate">Donar</string>
-    <string name="title_rate">Calificar</string>
-    <string name="title_thanks">¡Gracias por tu donación!</string>
+  <string name="msg_try">Prueba NetGuard</string>
+  <string name="msg_voluntary">Las donaciones son completamente voluntarias y no desbloquean ninguna funcionalidad. Las donaciones son una forma de mostrar tu apreciación por el trabajo hecho.</string>
+  <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
+  <string name="msg_bug">Something has gone wrong, please describe in the next dialog what you were doing to help improve NetGuard</string>
+  <string name="title_screen_wifi">Allow Wi-Fi when screen is on</string>
+  <string name="title_screen_other">Allow mobile when screen is on</string>
+  <string name="title_roaming">Bloquear cuando se esté en roaming</string>
+  <string name="title_disabled">is disabled</string>
+  <string name="title_internet">has no internet permission</string>
+  <string name="title_launch">Iniciar aplicación</string>
+  <string name="title_donate">Donar</string>
+  <string name="title_rate">Calificar</string>
+  <string name="title_thanks">¡Gracias por tu donación!</string>
 </resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -1,53 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <resources>
-    <string name="app_copyright">Copyright \u00A9 2015 par M. Bokhorst (M66B)</string>
-    <string name="app_license">En utilisant NetGuard, vous acceptez la <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
-    <string name="app_first">Une grande précaution a été prise pour développer et tester NetGuard,
+  <string name="app_copyright">Copyright \u00A9 2015 par M. Bokhorst (M66B)</string>
+  <string name="app_license">En utilisant NetGuard, vous acceptez la <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
+  <string name="app_first">Une grande précaution a été prise pour développer et tester NetGuard,
 cependant il est impossible de garantir qu\'elle fonctionnera sur chaque appareil.
 NetGuard est connu pour planter lorsqu\'il est activé ou pour bloquer tout le trafic sur certains appareils.
 Ceci est causé par des bugs dans Android, ou dans le logiciel fourni par le constructeur, alors veuillez ne pas en vouloir à NetGuard.
 \n\nEn utilisant NetGuard, vous acceptez la <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
-
-    <string name="menu_search">Recherche application</string>
-    <string name="menu_settings">Paramètres</string>
-    <string name="menu_invite">Invité</string>
-    <string name="menu_support">Support</string>
-    <string name="menu_about">À propos</string>
-
-    <string name="setting_whitelist_wifi">Blocage Wi-Fi par défaut</string>
-    <string name="setting_whitelist_other">Blocage données mobiles par défaut</string>
-    <string name="setting_unused">Default allow when screen is on</string>
-    <string name="setting_whitelist_roaming">Blocage roaming par défaut</string>
-    <string name="setting_metered">Handle metered Wi-Fi networks</string>
-    <string name="setting_system">Gérer les applications système</string>
-    <string name="setting_dark">Utiliser le thème sombre</string>
-    <string name="setting_export">Exporter paramètres</string>
-    <string name="setting_import">Importer paramètres</string>
-    <string name="setting_technical">Technical information</string>
-
-    <string name="summary_system">Definisé les regeles pour les applications du système (Pour experts)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
-
-    <string name="msg_sure">Etes-vous sûr ?</string>
-    <string name="msg_started">Enforcing rules</string>
-    <string name="msg_packages">%1$d allowed, %2$d blocked</string>
-    <string name="msg_disabled">NetGuard est désactivé, utilisez le bouton ci-dessus pour activer NetGuard</string>
-    <string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>
-    <string name="msg_completed">Action completé</string>
-    <string name="msg_vpn">NetGuard uses a local VPN as a sinkhole to block internet traffic.
+  <string name="menu_search">Recherche application</string>
+  <string name="menu_settings">Paramètres</string>
+  <string name="menu_invite">Invité</string>
+  <string name="menu_support">Support</string>
+  <string name="menu_about">À propos</string>
+  <string name="setting_whitelist_wifi">Blocage Wi-Fi par défaut</string>
+  <string name="setting_whitelist_other">Blocage données mobiles par défaut</string>
+  <string name="setting_screen_wifi">Default allow Wi-Fi when screen is on</string>
+  <string name="setting_screen_other">Default allow mobile when screen is on</string>
+  <string name="setting_whitelist_roaming">Blocage roaming par défaut</string>
+  <string name="setting_metered">Handle metered Wi-Fi networks</string>
+  <string name="setting_system">Gérer les applications système</string>
+  <string name="setting_dark">Utiliser le thème sombre</string>
+  <string name="setting_export">Exporter paramètres</string>
+  <string name="setting_import">Importer paramètres</string>
+  <string name="setting_technical">Technical information</string>
+  <string name="summary_system">Definisé les regeles pour les applications du système (Pour experts)</string>
+  <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
+  <string name="msg_sure">Etes-vous sûr ?</string>
+  <string name="msg_started">Enforcing rules</string>
+  <string name="msg_packages">%1$d allowed, %2$d blocked</string>
+  <string name="msg_disabled">NetGuard est désactivé, utilisez le bouton ci-dessus pour activer NetGuard</string>
+  <string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>
+  <string name="msg_completed">Action completé</string>
+  <string name="msg_vpn">NetGuard uses a local VPN as a sinkhole to block internet traffic.
 For this reason, please allow a VPN connection in the next dialog.
 Netguard n\'a pas access a internet,vous savez que votre trafic Internet n\'est pas envoyée partout.</string>
-
-    <string name="msg_try">Essayer NetGuard</string>
-    <string name="msg_voluntary">Les dons sont completement a votre volonté et ils ne débloqueront aucune nouvelle fonctionalitée.
-    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
+  <string name="msg_try">Essayer NetGuard</string>
+  <string name="msg_voluntary">Les dons sont completement a votre volonté et ils ne débloqueront aucune nouvelle fonctionalitée.
 Faire un don est une de façon de montrer votre soutiens aux développeur et votre appréciation pour le travail accompli.</string>
-
-    <string name="title_using">Accepter si l\'ecran est allumé</string>
-    <string name="title_roaming">Bloquer si roaming</string>
-    <string name="title_disabled">is disabled</string>
-    <string name="title_internet">has no internet permission</string>
-    <string name="title_launch">Lancer l\'application</string>
-    <string name="title_donate">Faire un don</string>
-    <string name="title_rate">Rate</string>
-    <string name="title_thanks">Merci pour votre don !</string>
+  <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
+  <string name="msg_bug">Something has gone wrong, please describe in the next dialog what you were doing to help improve NetGuard</string>
+  <string name="title_screen_wifi">Allow Wi-Fi when screen is on</string>
+  <string name="title_screen_other">Allow mobile when screen is on</string>
+  <string name="title_roaming">Bloquer si roaming</string>
+  <string name="title_disabled">is disabled</string>
+  <string name="title_internet">has no internet permission</string>
+  <string name="title_launch">Lancer l\'application</string>
+  <string name="title_donate">Faire un don</string>
+  <string name="title_rate">Rate</string>
+  <string name="title_thanks">Merci pour votre don !</string>
 </resources>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -1,53 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <resources>
-    <string name="app_copyright">Copyright \u00A9 2015 by M. Bokhorst (M66B)</string>
-    <string name="app_license">Utilizzando NetGuard, acconsenti a quanto contenuto nella seguente licenza: <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
-    <string name="app_first">Nonostante NetGuard sia stata sviluppata attentamente,
+  <string name="app_copyright">Copyright \u00A9 2015 by M. Bokhorst (M66B)</string>
+  <string name="app_license">Utilizzando NetGuard, acconsenti a quanto contenuto nella seguente licenza: <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
+  <string name="app_first">Nonostante NetGuard sia stata sviluppata attentamente,
 è impossibile garantirne il corretto funzionamento su ciascun dispositivo.
 È noto infatti che NetGuard si interrompe all\'avvio o blocca tutto il traffico di rete su alcuni dispositivi.
 Ció è causato da alcuni bug contenuti in Android, o in programmi forniti dal produttore del dispositivo, quindi si prega di non attribuirne la colpa a NetGuard.
 \n\nUtilizzando NetGuard, acconsenti a quanto contenuto nella seguente licenza: <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a>
-    </string>
-
-    <string name="menu_search">Cerca applicazione</string>
-    <string name="menu_settings">Impostazioni</string>
-    <string name="menu_invite">Invita</string>
-    <string name="menu_support">Supporto</string>
-    <string name="menu_about">Info</string>
-
-    <string name="setting_whitelist_wifi">Blocca Wi-Fi di default</string>
-    <string name="setting_whitelist_other">Blocca rete dati di default</string>
-    <string name="setting_unused">Permetti di default quando lo schermo è acceso</string>
-    <string name="setting_whitelist_roaming">Blocca roaming di default</string>
-    <string name="setting_metered">Gestisci reti Wi-Fi a consumo</string>
-    <string name="setting_system">Gestisci applicazioni di sistema</string>
-    <string name="setting_dark">Usa il tema scuro</string>
-    <string name="setting_export">Esporta impostazioni</string>
-    <string name="setting_import">Importa impostazioni</string>
-    <string name="setting_technical">Informazioni tecniche</string>
-
-    <string name="summary_system">Definisci regole per le applicazioni di sistema (solo per esperti)</string>
-    <string name="summary_metered">Applica le regole per le reti cellulari anche alle reti Wi-Fi a consumo (a pagamento, condivise)</string>
-
-    <string name="msg_sure">Sei sicuro?</string>
-    <string name="msg_started">Regole applicate</string>
-    <string name="msg_packages">%1$d permesse, %2$d bloccate</string>
-    <string name="msg_disabled">NetGuard è disabilitata, usa lo switch per abilitarla nuovamente</string>
-    <string name="msg_revoked">NetGuard è stata disabilitata, probabilmente a causa di un\'altra applicazione che usa il servizio VPN</string>
-    <string name="msg_completed">Azione completata</string>
-    <string name="msg_vpn">Per bloccare il traffico internet, NetGuard utilizza una VPN locale come \"pozzo\".
+  </string>
+  <string name="menu_search">Cerca applicazione</string>
+  <string name="menu_settings">Impostazioni</string>
+  <string name="menu_invite">Invita</string>
+  <string name="menu_support">Supporto</string>
+  <string name="menu_about">Info</string>
+  <string name="setting_whitelist_wifi">Blocca Wi-Fi di default</string>
+  <string name="setting_whitelist_other">Blocca rete dati di default</string>
+  <string name="setting_screen_wifi">Permetti il Wi-Fi di default quando lo schermo è accesso</string>
+  <string name="setting_screen_other">Permetti reti mobili di default quando lo schermo è accesso</string>
+  <string name="setting_whitelist_roaming">Blocca roaming di default</string>
+  <string name="setting_metered">Gestisci reti Wi-Fi a consumo</string>
+  <string name="setting_system">Gestisci applicazioni di sistema</string>
+  <string name="setting_dark">Usa il tema scuro</string>
+  <string name="setting_export">Esporta impostazioni</string>
+  <string name="setting_import">Importa impostazioni</string>
+  <string name="setting_technical">Informazioni tecniche</string>
+  <string name="summary_system">Definisci regole per le applicazioni di sistema (solo per esperti)</string>
+  <string name="summary_metered">Applica le regole per le reti cellulari anche alle reti Wi-Fi a consumo (a pagamento, condivise)</string>
+  <string name="msg_sure">Sei sicuro?</string>
+  <string name="msg_started">Regole applicate</string>
+  <string name="msg_packages">%1$d permesse, %2$d bloccate</string>
+  <string name="msg_disabled">NetGuard è disabilitata, usa lo switch per abilitarla nuovamente</string>
+  <string name="msg_revoked">NetGuard è stata disabilitata, probabilmente a causa di un\'altra applicazione che usa il servizio VPN</string>
+  <string name="msg_completed">Azione completata</string>
+  <string name="msg_vpn">Per bloccare il traffico internet, NetGuard utilizza una VPN locale come \"pozzo\".
        Per questo motivo, abilita la connessione VPN nella prossima schermata.
        Dato che NetGuard non richede nessun permesso per connettersi ad internet, puoi star certo che il tuo traffico internet non è spedito altrove.
    </string>
-    <string name="msg_try">Prova NetGuard</string>
-    <string name="msg_voluntary">Le donazioni sono totalmente volontarie e non sbloccano nessuna funzionalitá aggiuntiva. Le donazioni mostrano il tuo apprezzamento per il lavoro svolto.</string>
-    <string name="msg_dimming">Se non riesci a cliccare OK nella prossima schermata, è probabile che un\'altra applicazione (di oscuramento schermo) stia manipolando lo schermo.</string>
-
-    <string name="title_using">Permetti quando lo schermo è acceso</string>
-    <string name="title_roaming">Blocca quando in roaming</string>
-    <string name="title_disabled">è disabilitata</string>
-    <string name="title_internet">non ha accesso a internet</string>
-    <string name="title_launch">Avvia applicazione</string>
-    <string name="title_donate">Dona</string>
-    <string name="title_rate">Vota</string>
-    <string name="title_thanks">Grazie della donazione!</string>
+  <string name="msg_try">Prova NetGuard</string>
+  <string name="msg_voluntary">Le donazioni sono totalmente volontarie e non sbloccano nessuna funzionalitá aggiuntiva. Le donazioni mostrano il tuo apprezzamento per il lavoro svolto.</string>
+  <string name="msg_dimming">Se non riesci a cliccare OK nella prossima schermata, è probabile che un\'altra applicazione (di oscuramento schermo) stia manipolando lo schermo.</string>
+  <string name="msg_bug">Something has gone wrong, please describe in the next dialog what you were doing to help improve NetGuard</string>
+  <string name="title_screen_wifi">Permetti il Wi-Fi quando lo schermo è accesso</string>
+  <string name="title_screen_other">Permetti le reti mobili quando lo schermo è accesso</string>
+  <string name="title_roaming">Blocca quando in roaming</string>
+  <string name="title_disabled">è disabilitata</string>
+  <string name="title_internet">non ha accesso a internet</string>
+  <string name="title_launch">Avvia applicazione</string>
+  <string name="title_donate">Dona</string>
+  <string name="title_rate">Vota</string>
+  <string name="title_thanks">Grazie della donazione!</string>
 </resources>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -1,51 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <resources>
-    <string name="app_copyright">Copyright \u00A9 2015 by M. Bokhorst (M66B)</string>
-    <string name="app_license">NetGuard を使用すると <a href="http://www.gnu.org/licenses/gpl.txt">GNU 一般公衆利用許諾書バージョン 3</a> に同意したことになります</string>
-    <string name="app_first">細心の注意で NetGuard を開発およびテストしていますが、
+  <string name="app_copyright">Copyright \u00A9 2015 by M. Bokhorst (M66B)</string>
+  <string name="app_license">NetGuard を使用すると <a href="http://www.gnu.org/licenses/gpl.txt">GNU 一般公衆利用許諾書バージョン 3</a> に同意したことになります</string>
+  <string name="app_first">細心の注意で NetGuard を開発およびテストしていますが、
 すべてのデバイス上で正しく動作することを保証することは不可能です。
 一部のデバイスで、起動時に NetGuard がクラッシュすることがわかっています。また、他の一部のデバイスで、すべてのトラフィックをブロックすることが知られています。
 これらの問題は Android のバグ、または製造元が提供するソフトウェアに起因します。そのために NetGuard を非難しないでください。
 \n\nNetGuard を使用すると <a href="http://www.gnu.org/licenses/gpl.txt">GNU 一般公衆利用許諾書バージョン 3</a> に同意したことになります</string>
-
-    <string name="menu_search">アプリケーションの検索</string>
-    <string name="menu_settings">設定</string>
-    <string name="menu_invite">Invite</string>
-    <string name="menu_support">サポート</string>
-    <string name="menu_about">アプリについて</string>
-
-    <string name="setting_whitelist_wifi">デフォルトで Wi-Fi をブロック</string>
-    <string name="setting_whitelist_other">デフォルトでモバイル通信をブロック</string>
-    <string name="setting_unused">Default allow when screen is on</string>
-    <string name="setting_whitelist_roaming">デフォルトでローミングをブロック</string>
-    <string name="setting_metered">Handle metered Wi-Fi networks</string>
-    <string name="setting_system">システムアプリケーションの管理</string>
-    <string name="setting_dark">ダークテーマを使用する</string>
-    <string name="setting_export">設定をエクスポート</string>
-    <string name="setting_import">設定をインポート</string>
-    <string name="setting_technical">Technical information</string>
-    <string name="msg_try">Try NetGuard</string>
-    <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
-    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
-
-    <string name="summary_system">システムアプリケーションのルールを定義します (エキスパート向け)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
-
-    <string name="msg_sure">よろしいですか?</string>
-    <string name="msg_started">Enforcing rules</string>
-    <string name="msg_packages">%1$d allowed, %2$d blocked</string>
-    <string name="msg_disabled">NetGuard は無効です。NetGuard を有効にするには上のスイッチを使用してください</string>
-    <string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>
-    <string name="msg_completed">操作を完了しました</string>
-    <string name="msg_vpn">NetGuard uses a local VPN as a sinkhole to block internet traffic.
+  <string name="menu_search">アプリケーションの検索</string>
+  <string name="menu_settings">設定</string>
+  <string name="menu_invite">Invite</string>
+  <string name="menu_support">サポート</string>
+  <string name="menu_about">アプリについて</string>
+  <string name="setting_whitelist_wifi">デフォルトで Wi-Fi をブロック</string>
+  <string name="setting_whitelist_other">デフォルトでモバイル通信をブロック</string>
+  <string name="setting_screen_wifi">Default allow Wi-Fi when screen is on</string>
+  <string name="setting_screen_other">Default allow mobile when screen is on</string>
+  <string name="setting_whitelist_roaming">デフォルトでローミングをブロック</string>
+  <string name="setting_metered">Handle metered Wi-Fi networks</string>
+  <string name="setting_system">システムアプリケーションの管理</string>
+  <string name="setting_dark">ダークテーマを使用する</string>
+  <string name="setting_export">設定をエクスポート</string>
+  <string name="setting_import">設定をインポート</string>
+  <string name="setting_technical">Technical information</string>
+  <string name="summary_system">システムアプリケーションのルールを定義します (エキスパート向け)</string>
+  <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
+  <string name="msg_sure">よろしいですか?</string>
+  <string name="msg_started">Enforcing rules</string>
+  <string name="msg_packages">%1$d allowed, %2$d blocked</string>
+  <string name="msg_disabled">NetGuard は無効です。NetGuard を有効にするには上のスイッチを使用してください</string>
+  <string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>
+  <string name="msg_completed">操作を完了しました</string>
+  <string name="msg_vpn">NetGuard uses a local VPN as a sinkhole to block internet traffic.
 For this reason, please allow a VPN connection in the next dialog.
 Since NetGuard has no internet permission, you know your internet traffic is not being sent anywhere.</string>
-
-    <string name="title_using">Allow when screen is on</string>
-    <string name="title_roaming">ローミング時にブロック</string>
-    <string name="title_disabled">is disabled</string>
-    <string name="title_internet">has no internet permission</string>
-    <string name="title_launch">アプリケーションを開始</string>
-    <string name="title_donate">寄付する</string>
-    <string name="title_rate">Rate</string>
-    <string name="title_thanks">寄付をありがとうございます!</string>
+  <string name="msg_try">Try NetGuard</string>
+  <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
+  <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
+  <string name="msg_bug">Something has gone wrong, please describe in the next dialog what you were doing to help improve NetGuard</string>
+  <string name="title_screen_wifi">Allow Wi-Fi when screen is on</string>
+  <string name="title_screen_other">Allow mobile when screen is on</string>
+  <string name="title_roaming">ローミング時にブロック</string>
+  <string name="title_disabled">is disabled</string>
+  <string name="title_internet">has no internet permission</string>
+  <string name="title_launch">アプリケーションを開始</string>
+  <string name="title_donate">寄付する</string>
+  <string name="title_rate">Rate</string>
+  <string name="title_thanks">寄付をありがとうございます!</string>
 </resources>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -1,51 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <resources>
-    <string name="app_copyright">Copyright \u00A9 2015 by M. Bokhorst (M66B)</string>
-    <string name="app_license">By using NetGuard, you agree to the <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
-    <string name="app_first">Great care has been taken to develop and test NetGuard,
+  <string name="app_copyright">Copyright \u00A9 2015 by M. Bokhorst (M66B)</string>
+  <string name="app_license">By using NetGuard, you agree to the <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
+  <string name="app_first">Great care has been taken to develop and test NetGuard,
 however it is impossible to guarantee it will work correctly on every device.
 NetGuard is known to crash when activated on some devices. It is also known to block all traffic on some other devices.
 These issues are caused by bugs in Android, or in the software provided by the manufacturer, so please don\'t blame NetGuard.
 \n\nBy using NetGuard, you agree to the <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
-
-    <string name="menu_search">앱 검색</string>
-    <string name="menu_settings">Settings</string>
-    <string name="menu_invite">Invite</string>
-    <string name="menu_support">지원</string>
-    <string name="menu_about">넷가드 정보</string>
-
-    <string name="setting_whitelist_wifi">Wi-Fi 차단을 기본 설정으로</string>
-    <string name="setting_whitelist_other">모바일 데이터 차단을 기본 설정으로</string>
-    <string name="setting_unused">Default allow when screen is on</string>
-    <string name="setting_whitelist_roaming">Block roaming by default</string>
-    <string name="setting_metered">Handle metered Wi-Fi networks</string>
-    <string name="setting_system">Manage system applications</string>
-    <string name="setting_dark">어두운 테마 사용</string>
-    <string name="setting_export">Export settings</string>
-    <string name="setting_import">Import settings</string>
-    <string name="setting_technical">Technical information</string>
-
-    <string name="summary_system">Define rules for system applications (for experts)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
-
-    <string name="msg_sure">계속 하시겠습니까?</string>
-    <string name="msg_started">Enforcing rules</string>
-    <string name="msg_packages">%1$d allowed, %2$d blocked</string>
-    <string name="msg_disabled">넷가드가 해제되어 있습니다. 상단 스위치를 사용해 넷가드를 활성화하세요.</string>
-    <string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>
-    <string name="msg_completed">Action completed</string>
-    <string name="msg_vpn">NetGuard uses a local VPN as a sinkhole to block internet traffic.
+  <string name="menu_search">앱 검색</string>
+  <string name="menu_settings">Settings</string>
+  <string name="menu_invite">Invite</string>
+  <string name="menu_support">지원</string>
+  <string name="menu_about">넷가드 정보</string>
+  <string name="setting_whitelist_wifi">Wi-Fi 차단을 기본 설정으로</string>
+  <string name="setting_whitelist_other">모바일 데이터 차단을 기본 설정으로</string>
+  <string name="setting_screen_wifi">Default allow Wi-Fi when screen is on</string>
+  <string name="setting_screen_other">Default allow mobile when screen is on</string>
+  <string name="setting_whitelist_roaming">Block roaming by default</string>
+  <string name="setting_metered">Handle metered Wi-Fi networks</string>
+  <string name="setting_system">Manage system applications</string>
+  <string name="setting_dark">어두운 테마 사용</string>
+  <string name="setting_export">Export settings</string>
+  <string name="setting_import">Import settings</string>
+  <string name="setting_technical">Technical information</string>
+  <string name="summary_system">Define rules for system applications (for experts)</string>
+  <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
+  <string name="msg_sure">계속 하시겠습니까?</string>
+  <string name="msg_started">Enforcing rules</string>
+  <string name="msg_packages">%1$d allowed, %2$d blocked</string>
+  <string name="msg_disabled">넷가드가 해제되어 있습니다. 상단 스위치를 사용해 넷가드를 활성화하세요.</string>
+  <string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>
+  <string name="msg_completed">Action completed</string>
+  <string name="msg_vpn">NetGuard uses a local VPN as a sinkhole to block internet traffic.
 For this reason, please allow a VPN connection in the next dialog.
 Since NetGuard has no internet permission, you know your internet traffic is not being sent anywhere.</string>
-    <string name="msg_try">Try NetGuard</string>
-    <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
-    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
-
-    <string name="title_using">Allow when screen is on</string>
-    <string name="title_roaming">Block when roaming</string>
-    <string name="title_disabled">is disabled</string>
-    <string name="title_internet">has no internet permission</string>
-    <string name="title_launch">앱 시작</string>
-    <string name="title_donate">기부</string>
-    <string name="title_rate">Rate</string>
-    <string name="title_thanks">기부해주셔서 감사합니다!</string>
+  <string name="msg_try">Try NetGuard</string>
+  <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
+  <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
+  <string name="msg_bug">Something has gone wrong, please describe in the next dialog what you were doing to help improve NetGuard</string>
+  <string name="title_screen_wifi">Allow Wi-Fi when screen is on</string>
+  <string name="title_screen_other">Allow mobile when screen is on</string>
+  <string name="title_roaming">Block when roaming</string>
+  <string name="title_disabled">is disabled</string>
+  <string name="title_internet">has no internet permission</string>
+  <string name="title_launch">앱 시작</string>
+  <string name="title_donate">기부</string>
+  <string name="title_rate">Rate</string>
+  <string name="title_thanks">기부해주셔서 감사합니다!</string>
 </resources>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -1,51 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <resources>
-    <string name="app_copyright">Copyright \u00A9 2015 by M. Bokhorst (M66B)</string>
-    <string name="app_license">Door NetGuard te gebruiken, gaat u akkoord met de <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
-    <string name="app_first">Great care has been taken to develop and test NetGuard,
+  <string name="app_copyright">Copyright \u00A9 2015 by M. Bokhorst (M66B)</string>
+  <string name="app_license">Door NetGuard te gebruiken, gaat u akkoord met de <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
+  <string name="app_first">Great care has been taken to develop and test NetGuard,
 however it is impossible to guarantee it will work correctly on every device.
 NetGuard is known to crash when activated on some devices. It is also known to block all traffic on some other devices.
 These issues are caused by bugs in Android, or in the software provided by the manufacturer, so please don\'t blame NetGuard.
 \n\nBy using NetGuard, you agree to the <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
-
-    <string name="menu_search">Zoek naar applicatie</string>
-    <string name="menu_settings">Instellingen</string>
-    <string name="menu_invite">Uitnodigen</string>
-    <string name="menu_support">Ondersteuning</string>
-    <string name="menu_about">Over</string>
-
-    <string name="setting_whitelist_wifi">Blokkeer standaard Wi-Fi</string>
-    <string name="setting_whitelist_other">Blokkeer standaard mobiel</string>
-    <string name="setting_unused">Sta standaard toe als scherm aan is</string>
-    <string name="setting_whitelist_roaming">Blokkeer standaard roaming</string>
-    <string name="setting_metered">Behandel gemeten Wi-Fi netwerken</string>
-    <string name="setting_system">Beheer systeemapplicaties</string>
-    <string name="setting_dark">Gebruik donker thema</string>
-    <string name="setting_export">Exporteer instellingen</string>
-    <string name="setting_import">Importeer instellingen</string>
-    <string name="setting_technical">Technische informatie</string>
-
-    <string name="summary_system">Define rules for system applications (for experts)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
-
-    <string name="msg_sure">Weet u het zeker?</string>
-    <string name="msg_started">Regels worden afgedwongen</string>
-    <string name="msg_packages">%1$d allowed, %2$d blocked</string>
-    <string name="msg_disabled">NetGuard staat uit, gebruik de schakelaar boven om NetGuard aan te zetten</string>
-    <string name="msg_revoked">NetGuard is uitgezet, waarschijnlijk door een andere VPN applicatie</string>
-    <string name="msg_completed">Actie uitgevoerd</string>
-    <string name="msg_vpn">NetGuard uses a local VPN as a sinkhole to block internet traffic.
+  <string name="menu_search">Zoek naar applicatie</string>
+  <string name="menu_settings">Instellingen</string>
+  <string name="menu_invite">Uitnodigen</string>
+  <string name="menu_support">Ondersteuning</string>
+  <string name="menu_about">Over</string>
+  <string name="setting_whitelist_wifi">Blokkeer standaard Wi-Fi</string>
+  <string name="setting_whitelist_other">Blokkeer standaard mobiel</string>
+  <string name="setting_screen_wifi">Sta standaard Wi-Fi toe als screen aan</string>
+  <string name="setting_screen_other">Sta standaard mobiel toe als scherm aan</string>
+  <string name="setting_whitelist_roaming">Blokkeer standaard roaming</string>
+  <string name="setting_metered">Behandel gemeten Wi-Fi netwerken</string>
+  <string name="setting_system">Beheer systeemapplicaties</string>
+  <string name="setting_dark">Gebruik donker thema</string>
+  <string name="setting_export">Exporteer instellingen</string>
+  <string name="setting_import">Importeer instellingen</string>
+  <string name="setting_technical">Technische informatie</string>
+  <string name="summary_system">Define rules for system applications (for experts)</string>
+  <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
+  <string name="msg_sure">Weet u het zeker?</string>
+  <string name="msg_started">Regels worden afgedwongen</string>
+  <string name="msg_packages">%1$d toegestaan, %2$d geblokkeerd</string>
+  <string name="msg_disabled">NetGuard staat uit, gebruik de schakelaar boven om NetGuard aan te zetten</string>
+  <string name="msg_revoked">NetGuard is uitgezet, waarschijnlijk door een andere VPN applicatie</string>
+  <string name="msg_completed">Actie uitgevoerd</string>
+  <string name="msg_vpn">NetGuard uses a local VPN as a sinkhole to block internet traffic.
 For this reason, please allow a VPN connection in the next dialog.
 Since NetGuard has no internet permission, you know your internet traffic is not being sent anywhere.</string>
-    <string name="msg_try">Probeer NetGuard</string>
-    <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
-    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
-
-    <string name="title_using">Sta toe als scherm aan is</string>
-    <string name="title_roaming">Blokkeer bij roamen</string>
-    <string name="title_disabled">is uitgezet</string>
-    <string name="title_internet">heeft geen internet toegang</string>
-    <string name="title_launch">Start applicatie</string>
-    <string name="title_donate">Doneer</string>
-    <string name="title_rate">Beoordeel</string>
-    <string name="title_thanks">Bedankt voor uw donatie!</string>
+  <string name="msg_try">Probeer NetGuard</string>
+  <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
+  <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
+  <string name="msg_bug">Something has gone wrong, please describe in the next dialog what you were doing to help improve NetGuard</string>
+  <string name="title_screen_wifi">Sta Wi-Fi toe als het scherm aan is</string>
+  <string name="title_screen_other">Sta mobiel toe als het scherm aan is</string>
+  <string name="title_roaming">Blokkeer bij roamen</string>
+  <string name="title_disabled">is uitgezet</string>
+  <string name="title_internet">heeft geen internet toegang</string>
+  <string name="title_launch">Start applicatie</string>
+  <string name="title_donate">Doneer</string>
+  <string name="title_rate">Beoordeel</string>
+  <string name="title_thanks">Bedankt voor uw donatie!</string>
 </resources>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -1,51 +1,51 @@
-<resources>
-    <string name="app_copyright">Prawa autorskie \u00A9 2015 by M. Bokhorst (M66B)</string>
-    <string name="app_license">Używając NetGuard, zgadzasz się z <a href="//www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
-    <string name="app_first">Wiele pracy zostało włożone w stworzenie i testy NetGuard,
-niemniej jednak, niemożliwe jest zagwarantowanie, iż aplikacja będzie działać poprawnie na wszytskich urządzeniach.
-Znane są przypadki gdzie NetGuard wyłącza się po włączeniu na niektórych urządzeniach, a także blokuje cały ruch internetowy na innych.
-Problemy te są spowodowane błędami w samym Androidzie, lub oprogramowaniu dostarczonym przez producenta urządzenia, nie jest to wina programu NetGuard.
-\n\nUżywając NetGuard, zgadzasz się z <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
-
-    <string name="menu_search">Szukaj aplikacji</string>
-    <string name="menu_settings">Ustawienia</string>
-    <string name="menu_invite">Zaproś</string>
-    <string name="menu_support">Wsparcie</string>
-    <string name="menu_about">O...</string>
-
-    <string name="setting_whitelist_wifi">Domyślnie blokuj Wi-Fi</string>
-    <string name="setting_whitelist_other">Domyślnie blokuj Mobilne</string>
-    <string name="setting_unused">Default allow when screen is on</string>
-    <string name="setting_whitelist_roaming">Domyślnie blokuj Roaming</string>
-    <string name="setting_metered">Handle metered Wi-Fi networks</string>
-    <string name="setting_system">Zarządzaj aplikacjami systemowymi</string>
-    <string name="setting_dark">Użyj ciemnej skórki</string>
-    <string name="setting_export">Eksport ustawień</string>
-    <string name="setting_import">Import ustawień</string>
-    <string name="setting_technical">Technical information</string>
-
-    <string name="summary_system">Stwórz reguły dla aplikacji systemowych(zaawansowane)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
-
-    <string name="msg_sure">Na pewno?</string>
-    <string name="msg_started">Wymuś Reguły</string>
-    <string name="msg_packages">%1$d allowed, %2$d blocked</string>
-    <string name="msg_disabled">NetGuard jest wyłączony, użyj przełącznika u góry by go uruchomić</string>
-    <string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>
-    <string name="msg_completed">Wykonano</string>
-    <string name="msg_vpn">NetGuard uses a local VPN as a sinkhole to block internet traffic.
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="app_copyright">Prawa autorskie \u00A9 2015 by M. Bokhorst (M66B)</string>
+  <string name="app_license">Używając NetGuard, zgadzasz się z <a href="//www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
+  <string name="app_first">Wiele pracy zostało włożone w stworzenie i testy NetGuard,
+niemniej jednak, niemożliwe jest zagwarantowanie, iż aplikacja będzie działać poprawnie na wszytskich urządzeniach.
+Znane są przypadki gdzie NetGuard wyłącza się po włączeniu na niektórych urządzeniach, a także blokuje cały ruch internetowy na innych.
+Problemy te są spowodowane błędami w samym Androidzie, lub oprogramowaniu dostarczonym przez producenta urządzenia, nie jest to wina programu NetGuard.
+\n\nUżywając NetGuard, zgadzasz się z <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
+  <string name="menu_search">Szukaj aplikacji</string>
+  <string name="menu_settings">Ustawienia</string>
+  <string name="menu_invite">Zaproś</string>
+  <string name="menu_support">Wsparcie</string>
+  <string name="menu_about">O...</string>
+  <string name="setting_whitelist_wifi">Domyślnie blokuj Wi-Fi</string>
+  <string name="setting_whitelist_other">Domyślnie blokuj Mobilne</string>
+  <string name="setting_screen_wifi">Default allow Wi-Fi when screen is on</string>
+  <string name="setting_screen_other">Default allow mobile when screen is on</string>
+  <string name="setting_whitelist_roaming">Domyślnie blokuj Roaming</string>
+  <string name="setting_metered">Handle metered Wi-Fi networks</string>
+  <string name="setting_system">Zarządzaj aplikacjami systemowymi</string>
+  <string name="setting_dark">Użyj ciemnej skórki</string>
+  <string name="setting_export">Eksport ustawień</string>
+  <string name="setting_import">Import ustawień</string>
+  <string name="setting_technical">Technical information</string>
+  <string name="summary_system">Stwórz reguły dla aplikacji systemowych(zaawansowane)</string>
+  <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
+  <string name="msg_sure">Na pewno?</string>
+  <string name="msg_started">Wymuś Reguły</string>
+  <string name="msg_packages">%1$d allowed, %2$d blocked</string>
+  <string name="msg_disabled">NetGuard jest wyłączony, użyj przełącznika u góry by go uruchomić</string>
+  <string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>
+  <string name="msg_completed">Wykonano</string>
+  <string name="msg_vpn">NetGuard uses a local VPN as a sinkhole to block internet traffic.
 For this reason, please allow a VPN connection in the next dialog.
 Since NetGuard has no internet permission, you know your internet traffic is not being sent anywhere.</string>
-    <string name="msg_try">Spróbuj NetGuard</string>
-    <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
-    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
-
-    <string name="title_using">Allow when screen is on</string>
-    <string name="title_roaming">Blokuj gdy roaming</string>
-    <string name="title_disabled">is disabled</string>
-    <string name="title_internet">has no internet permission</string>
-    <string name="title_launch">Start aplikacji</string>
-    <string name="title_donate">Wspomóż</string>
-    <string name="title_rate">Oceń</string>
-    <string name="title_thanks">Dziękuję za wsparcie!</string>
-</resources>
+  <string name="msg_try">Spróbuj NetGuard</string>
+  <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
+  <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
+  <string name="msg_bug">Something has gone wrong, please describe in the next dialog what you were doing to help improve NetGuard</string>
+  <string name="title_screen_wifi">Allow Wi-Fi when screen is on</string>
+  <string name="title_screen_other">Allow mobile when screen is on</string>
+  <string name="title_roaming">Blokuj gdy roaming</string>
+  <string name="title_disabled">is disabled</string>
+  <string name="title_internet">has no internet permission</string>
+  <string name="title_launch">Start aplikacji</string>
+  <string name="title_donate">Wspomóż</string>
+  <string name="title_rate">Oceń</string>
+  <string name="title_thanks">Dziękuję za wsparcie!</string>
+</resources>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@ -1,51 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <resources>
-    <string name="app_copyright">Copyright \u00A9 2015 by M. Bokhorst (M66B)</string>
-    <string name="app_license">Folosind NetGuard, sunteti de acord cu <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
-    <string name="app_first">NetGuard este dezvoltat si testat cu mare atentie si grija, 
+  <string name="app_copyright">Copyright \u00A9 2015 by M. Bokhorst (M66B)</string>
+  <string name="app_license">Folosind NetGuard, sunteti de acord cu <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
+  <string name="app_first">NetGuard este dezvoltat si testat cu mare atentie si grija, 
 cu toate acestea este imposibil sa se garanteze ca va functiona corect pe toate dispozitivele.
 NetGuard se poate opri brusc sau poate bloca tot traficul internet atunci cand este activat pe unele dispozitive.
 Acest lucru este cauzat de bug-uri in Android sau in software-ul pus la dispozitie de catre producatorul dispozitivului, va rugam sa nu dati vina pe NetGuard pentru asta.
 \n\nFolosind NetGuard, sunteti de acord cu <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
-
-    <string name="menu_search">Cauta aplicatii</string>
-    <string name="menu_settings">Setari</string>
-    <string name="menu_invite">Invita</string>
-    <string name="menu_support">Asistenta</string>
-    <string name="menu_about">Despre</string>
-
-    <string name="setting_whitelist_wifi">Blocheaza implicit Wi-Fi</string>
-    <string name="setting_whitelist_other">Blocheaza implicit date mobile</string>
-    <string name="setting_unused">Permite implicit cand ecranul este pornit</string>
-    <string name="setting_whitelist_roaming">Blocheaza implicit in roaming</string>
-    <string name="setting_metered">Gestionati conexiunile Wi-Fi contorizate</string>
-    <string name="setting_system">Gestionati aplicatiile de sistem</string>
-    <string name="setting_dark">Foloseste tema intunecata</string>
-    <string name="setting_export">Exporta setari</string>
-    <string name="setting_import">Importa setari</string>
-    <string name="setting_technical">Informatii tehnice</string>
-
-    <string name="summary_system">Defineste reguli pentru aplicatiile de sistem (setare expert)</string>
-    <string name="summary_metered">Trateaza conexiunile Wi-Fi contorizate (cu plata, hot-spot) precum date mobile</string>
-
-    <string name="msg_sure">Esti sigur?</string>
-    <string name="msg_started">Limitari activate</string>
-    <string name="msg_packages">%1$d allowed, %2$d blocked</string>
-    <string name="msg_disabled">NetGuard este momentan dezactivat, foloseste comutatorul de mai sus pentru a il activa</string>
-    <string name="msg_revoked">NetGuard a fost dezactivat, probabil de o alta aplicatie ce foloseste o conexiune VPN</string>
-    <string name="msg_completed">Setari aplicate</string>
-    <string name="msg_vpn">NetGuard foloseste o conexiune locala VPN ca o \"gaura neagra\" pentru traficul de internet blocat.
+  <string name="menu_search">Cauta aplicatii</string>
+  <string name="menu_settings">Setari</string>
+  <string name="menu_invite">Invita</string>
+  <string name="menu_support">Asistenta</string>
+  <string name="menu_about">Despre</string>
+  <string name="setting_whitelist_wifi">Blocheaza implicit Wi-Fi</string>
+  <string name="setting_whitelist_other">Blocheaza implicit date mobile</string>
+  <string name="setting_screen_wifi">Permite Wi-Fi cu ecranul pornit</string>
+  <string name="setting_screen_other">Permite date mobile cu ecranul pornit</string>
+  <string name="setting_whitelist_roaming">Blocheaza implicit in roaming</string>
+  <string name="setting_metered">Gestionati conexiunile Wi-Fi contorizate</string>
+  <string name="setting_system">Gestionati aplicatiile de sistem</string>
+  <string name="setting_dark">Foloseste tema intunecata</string>
+  <string name="setting_export">Exporta setari</string>
+  <string name="setting_import">Importa setari</string>
+  <string name="setting_technical">Informatii tehnice</string>
+  <string name="summary_system">Defineste reguli pentru aplicatiile de sistem (setare expert)</string>
+  <string name="summary_metered">Trateaza conexiunile Wi-Fi contorizate (cu plata, hot-spot) precum date mobile</string>
+  <string name="msg_sure">Esti sigur?</string>
+  <string name="msg_started">Limitari activate</string>
+  <string name="msg_packages">%1$d permise, %2$d blocate</string>
+  <string name="msg_disabled">NetGuard este momentan dezactivat, foloseste comutatorul de mai sus pentru a il activa</string>
+  <string name="msg_revoked">NetGuard a fost dezactivat, probabil de o alta aplicatie ce foloseste o conexiune VPN</string>
+  <string name="msg_completed">Setari aplicate</string>
+  <string name="msg_vpn">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.
 Cum NetGuard efectiv nu are permisiunea de a accesa internetul, esti sigur ca traficul tau de internet nu este redirectionat nicaieri.</string>
-    <string name="msg_try">Incearca NetGuard</string>
-    <string name="msg_voluntary">Donatiile sunt voluntare si nu deblocheaza vreo functie ascunsa. Donatiile sunt doar un mod de a iti arata aprecierea pentru munca depusa la aceasta aplicatie.</string>
-    <string name="msg_dimming">Daca in urmatoarea fereastra de dialog nu poti apasa OK inseamna ca o aplicatie ce manipuleaza ecranul (luminozitatea sau nuanta) blocheaza interactiunea.</string>
- 
-    <string name="title_using">Permite doar cand ecranul este pornit</string>
-    <string name="title_roaming">Blocheaza in roaming</string>
-    <string name="title_disabled">Este dezactivata</string>
-    <string name="title_internet">Nu are permisiunea de a accesa internetul</string>
-    <string name="title_launch">Porneste aplicatia</string>
-    <string name="title_donate">Doneaza</string>
-    <string name="title_rate">Evalueaza aplicatia</string>
-    <string name="title_thanks">Iti multumesc pentru donatie!</string>
+  <string name="msg_try">Incearca NetGuard</string>
+  <string name="msg_voluntary">Donatiile sunt voluntare si nu deblocheaza vreo functie ascunsa. Donatiile sunt doar un mod de a iti arata aprecierea pentru munca depusa la aceasta aplicatie.</string>
+  <string name="msg_dimming">Daca in urmatoarea fereastra de dialog nu poti apasa OK inseamna ca o aplicatie ce manipuleaza ecranul (luminozitatea sau nuanta) blocheaza interactiunea.</string>
+  <string name="msg_bug">A aparut o problema, pentru a ajuta la imbunatatirea NetGuard te rog ca in urmatoarea fereastra de dialog sa descrii ce operatii realizai.</string>
+  <string name="title_screen_wifi">Permite Wi-Fi atunci cand ecranul este pornit</string>
+  <string name="title_screen_other">Permite date mobile atunci cand ecranul este pornit</string>
+  <string name="title_roaming">Blocheaza in roaming</string>
+  <string name="title_disabled">Este dezactivata</string>
+  <string name="title_internet">Nu are permisiunea de a accesa internetul</string>
+  <string name="title_launch">Porneste aplicatia</string>
+  <string name="title_donate">Doneaza</string>
+  <string name="title_rate">Evalueaza aplicatia</string>
+  <string name="title_thanks">Iti multumesc pentru donatie!</string>
 </resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -1,49 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <resources>
-    <string name="app_copyright">Авторское право © 2015 М. Bokhorst (M66B)</string>
-    <string name="app_license">Используя NetGuard, вы принимаете <a href="http://www.gnu.org/licenses/gpl.txt">Открытое лицензионное соглашение GNU версии 3</a></string>
-    <string name="app_first">Были приложены большие усилия для разработки и тестирования NetGuard, однако невозможно гарантировать, что оно будет корректно работать на любом устройстве. NetGuard известен сбой при активации на некоторых устройствах. Известно также, что блокируется весь трафик на некоторых устройствах. Эти проблемы вызваны ошибками в Android, или в программном обеспечении, поставляемом изготовителем, поэтому, пожалуйста, не вините NetGuard.
+  <string name="app_copyright">Авторское право © 2015 М. Bokhorst (M66B)</string>
+  <string name="app_license">Используя NetGuard, вы принимаете <a href="http://www.gnu.org/licenses/gpl.txt">Открытое лицензионное соглашение GNU версии 3</a></string>
+  <string name="app_first">Были приложены большие усилия для разработки и тестирования NetGuard, однако невозможно гарантировать, что оно будет корректно работать на любом устройстве. NetGuard известен сбой при активации на некоторых устройствах. Известно также, что блокируется весь трафик на некоторых устройствах. Эти проблемы вызваны ошибками в Android, или в программном обеспечении, поставляемом изготовителем, поэтому, пожалуйста, не вините NetGuard.
 \n\nИспользуя NetGuard, вы принимаете <a href="http://www.gnu.org/licenses/gpl.txt">Открытое лицензионное соглашение GNU версии 3</a></string>
-
-    <string name="menu_search">Поиск приложения</string>
-    <string name="menu_settings">Настройки</string>
-    <string name="menu_invite">Пригласить</string>
-    <string name="menu_support">Поддержка</string>
-    <string name="menu_about">О приложении</string>
-
-    <string name="setting_whitelist_wifi">Блокировать Wi-Fi по умолч.</string>
-    <string name="setting_whitelist_other">Блокировать моб. сеть по умолч.</string>
-    <string name="setting_unused">Разрешить сети, когда экран включен, по умолч.</string>
-    <string name="setting_whitelist_roaming">Блокировать роуминг по умолч.</string>
-    <string name="setting_metered">Регулировать огранич. Wi-Fi сети</string>
-    <string name="setting_system">Управлять сист. приложениями</string>
-    <string name="setting_dark">Использовать темную тему</string>
-    <string name="setting_export">Экспорт настроек</string>
-    <string name="setting_import">Импорт настроек</string>
-    <string name="setting_technical">Техническая информация</string>
-
-    <string name="summary_system">Определить правила для системных приложений (для профи)</string>
-    <string name="summary_metered">Применить правила для лимитированных (платных, ограниченных) Wi-Fi сетей</string>
-
-    <string name="msg_sure">Вы уверены?</string>
-    <string name="msg_started">Определить правила</string>
-    <string name="msg_packages">%1$d allowed, %2$d blocked</string>
-    <string name="msg_disabled">NetGuard отключен, используйте переключатель выше для включения</string>
-    <string name="msg_revoked">NetGuard был отключен, скорее всего, из-за применения другого VPN-подключения</string>
-    <string name="msg_completed">Действие завершено</string>
-    <string name="msg_vpn">NetGuard использует локальный VPN, чтобы блокировать интернет трафик.
+  <string name="menu_search">Поиск приложения</string>
+  <string name="menu_settings">Настройки</string>
+  <string name="menu_invite">Пригласить</string>
+  <string name="menu_support">Поддержка</string>
+  <string name="menu_about">О приложении</string>
+  <string name="setting_whitelist_wifi">Блокировать Wi-Fi по умолч.</string>
+  <string name="setting_whitelist_other">Блокировать моб. сеть по умолч.</string>
+  <string name="setting_screen_wifi">Default allow Wi-Fi when screen is on</string>
+  <string name="setting_screen_other">Default allow mobile when screen is on</string>
+  <string name="setting_whitelist_roaming">Блокировать роуминг по умолч.</string>
+  <string name="setting_metered">Регулировать огранич. Wi-Fi сети</string>
+  <string name="setting_system">Управлять сист. приложениями</string>
+  <string name="setting_dark">Использовать темную тему</string>
+  <string name="setting_export">Экспорт настроек</string>
+  <string name="setting_import">Импорт настроек</string>
+  <string name="setting_technical">Техническая информация</string>
+  <string name="summary_system">Определить правила для системных приложений (для профи)</string>
+  <string name="summary_metered">Применить правила для лимитированных (платных, ограниченных) Wi-Fi сетей</string>
+  <string name="msg_sure">Вы уверены?</string>
+  <string name="msg_started">Определить правила</string>
+  <string name="msg_packages">%1$d allowed, %2$d blocked</string>
+  <string name="msg_disabled">NetGuard отключен, используйте переключатель выше для включения</string>
+  <string name="msg_revoked">NetGuard был отключен, скорее всего, из-за применения другого VPN-подключения</string>
+  <string name="msg_completed">Действие завершено</string>
+  <string name="msg_vpn">NetGuard использует локальный VPN, чтобы блокировать интернет трафик.
 По этой причине, пожалуйста, разрешите VPN-подключение в следующем диалоговом окне.
 NetGuard не имеет разрешения доступа в интернет, поэтому вы можете быть уверены, что ваш интернет-трафик никуда не отправляется.</string>
-    <string name="msg_try">Попробуйте новый фаервол NetGuard</string>
-    <string name="msg_voluntary">Пожертвования являются абсолютно добровольными и не добавляют никаких возможностей в программу. Пожертвования предназначены сугубо для того, чтобы выразить вашу признательность за проделанную работу.</string>
-    <string name="msg_dimming">Если вам не удается нажать ОК в следующем диалоговом окне (затемнение экрана), то, скорее всего, какое то другое приложение использует экран.</string>
-
-    <string name="title_using">Разрешить сети, когда экран включен</string>
-    <string name="title_roaming">Блокировать в роуминге</string>
-    <string name="title_disabled">отключено</string>
-    <string name="title_internet">не имеет доступа в интернет</string>
-    <string name="title_launch">Запуск приложения</string>
-    <string name="title_donate">Пожертвовать</string>
-    <string name="title_rate">Оценить</string>
-    <string name="title_thanks">Благодарим Вас за ваше пожертвование!</string>
+  <string name="msg_try">Попробуйте новый фаервол NetGuard</string>
+  <string name="msg_voluntary">Пожертвования являются абсолютно добровольными и не добавляют никаких возможностей в программу. Пожертвования предназначены сугубо для того, чтобы выразить вашу признательность за проделанную работу.</string>
+  <string name="msg_dimming">Если вам не удается нажать ОК в следующем диалоговом окне (затемнение экрана), то, скорее всего, какое то другое приложение использует экран.</string>
+  <string name="msg_bug">Something has gone wrong, please describe in the next dialog what you were doing to help improve NetGuard</string>
+  <string name="title_screen_wifi">Allow Wi-Fi when screen is on</string>
+  <string name="title_screen_other">Allow mobile when screen is on</string>
+  <string name="title_roaming">Блокировать в роуминге</string>
+  <string name="title_disabled">отключено</string>
+  <string name="title_internet">не имеет доступа в интернет</string>
+  <string name="title_launch">Запуск приложения</string>
+  <string name="title_donate">Пожертвовать</string>
+  <string name="title_rate">Оценить</string>
+  <string name="title_thanks">Благодарим Вас за ваше пожертвование!</string>
 </resources>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -1,51 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <resources>
-    <string name="app_copyright">Autorské práva \u00A9 2015 od M. Bokhorst (M66B)</string>
-    <string name="app_license">Používaním aplikácie NetGuard súhlasíte so <a href="http://www.gnu.org/licenses/gpl.txt">Všeobecnou verejnou licenciou GNU, verzia 3</a></string>
-    <string name="app_first">Značné úsilie bolo venované vývoju a testovaniu NetGuard,
+  <string name="app_copyright">Autorské práva \u00A9 2015 od M. Bokhorst (M66B)</string>
+  <string name="app_license">Používaním aplikácie NetGuard súhlasíte so <a href="http://www.gnu.org/licenses/gpl.txt">Všeobecnou verejnou licenciou GNU, verzia 3</a></string>
+  <string name="app_first">Značné úsilie bolo venované vývoju a testovaniu NetGuard,
 avšak nie je možné zaručiť správne fungovanie na každom zariadení.
 Pri aktivácii NetGuard dochádza k pádu aplikácie alebo sa blokuje všetka sieťová prevádzka na niektorých zariadeniach.
 Je to spôsobené chybami v Androide alebo v softvéri poskytovanom výrobcom, preto sa nesťažujte kvôli tomu na NetGuard.
 \n\nPoužívaním aplikácie NetGuard súhlasíte so <a href="http://www.gnu.org/licenses/gpl.txt">Všeobecnou verejnou licenciou GNU, verzia 3</a></string>
-
-    <string name="menu_search">Hľadať aplikáciu</string>
-    <string name="menu_settings">Nastavenia</string>
-    <string name="menu_invite">Pozvať</string>
-    <string name="menu_support">Podpora</string>
-    <string name="menu_about">O aplikácii</string>
-
-    <string name="setting_whitelist_wifi">Predvolene blokovať Wi-Fi</string>
-    <string name="setting_whitelist_other">Predvolene blokovať mobilné dáta</string>
-    <string name="setting_unused">Predvolene povoliť pri zapnutej obrazovke</string>
-    <string name="setting_whitelist_roaming">Predvolene blokovať roaming</string>
-    <string name="setting_metered">Handle metered Wi-Fi networks</string>
-    <string name="setting_system">Spravovať systémové aplikácie</string>
-    <string name="setting_dark">Použiť tmavú tému</string>
-    <string name="setting_export">Exportovať nastavenia</string>
-    <string name="setting_import">Importovať nastavenia</string>
-    <string name="setting_technical">Technical information</string>
-
-    <string name="summary_system">Určiť pravidlá pre systémové pravidlá (pre expertov)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
-
-    <string name="msg_sure">Ste si istý?</string>
-    <string name="msg_started">Pravidlá vynútenia</string>
-    <string name="msg_packages">%1$d allowed, %2$d blocked</string>
-    <string name="msg_disabled">NetGuard je vypnutý, použite prepínač vyššie na zapnutie NetGuard</string>
-    <string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>
-    <string name="msg_completed">Akcia bola dokončená</string>
-    <string name="msg_vpn">NetGuard používa lokálnu VPN sieť na zablokovanie sieťovej prevádzky,
+  <string name="menu_search">Hľadať aplikáciu</string>
+  <string name="menu_settings">Nastavenia</string>
+  <string name="menu_invite">Pozvať</string>
+  <string name="menu_support">Podpora</string>
+  <string name="menu_about">O aplikácii</string>
+  <string name="setting_whitelist_wifi">Predvolene blokovať Wi-Fi</string>
+  <string name="setting_whitelist_other">Predvolene blokovať mobilné dáta</string>
+  <string name="setting_screen_wifi">Default allow Wi-Fi when screen is on</string>
+  <string name="setting_screen_other">Default allow mobile when screen is on</string>
+  <string name="setting_whitelist_roaming">Predvolene blokovať roaming</string>
+  <string name="setting_metered">Handle metered Wi-Fi networks</string>
+  <string name="setting_system">Spravovať systémové aplikácie</string>
+  <string name="setting_dark">Použiť tmavú tému</string>
+  <string name="setting_export">Exportovať nastavenia</string>
+  <string name="setting_import">Importovať nastavenia</string>
+  <string name="setting_technical">Technical information</string>
+  <string name="summary_system">Určiť pravidlá pre systémové pravidlá (pre expertov)</string>
+  <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
+  <string name="msg_sure">Ste si istý?</string>
+  <string name="msg_started">Pravidlá vynútenia</string>
+  <string name="msg_packages">%1$d allowed, %2$d blocked</string>
+  <string name="msg_disabled">NetGuard je vypnutý, použite prepínač vyššie na zapnutie NetGuard</string>
+  <string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>
+  <string name="msg_completed">Akcia bola dokončená</string>
+  <string name="msg_vpn">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.
 Keďže NetGuard nemá internetové povolenie, vaša sieťová prevádzka nemôže byť nikde odosielaná.</string>
-    <string name="msg_try">Skúsiť NetGuard</string>
-    <string name="msg_voluntary">Dary sú úplne dobrovoľné a neodomknú žiadne funkcie. Dary sú určené ako spôsob, akým možete prejaviť vašu vďačnosť za vykonanú prácu.</string>
-    <string name="msg_dimming">Ak nemôžete stlačiť tlačidlo OK na ďalšom okne, tak iná aplikácia (na ovladanie jasu) prekrýva obrazovkou.</string>
-
-    <string name="title_using">Povoliť pri zapnutej obrazovke</string>
-    <string name="title_roaming">Blokovať pri roamingu</string>
-    <string name="title_disabled">Zakázané</string>
-    <string name="title_internet">Nemá prístup k internetu</string>
-    <string name="title_launch">Spustiť aplikáciu</string>
-    <string name="title_donate">Prispieť</string>
-    <string name="title_rate">Ohodnotiť</string>
-    <string name="title_thanks">Ďakujeme vám za váš príspevok!</string>
+  <string name="msg_try">Skúsiť NetGuard</string>
+  <string name="msg_voluntary">Dary sú úplne dobrovoľné a neodomknú žiadne funkcie. Dary sú určené ako spôsob, akým možete prejaviť vašu vďačnosť za vykonanú prácu.</string>
+  <string name="msg_dimming">Ak nemôžete stlačiť tlačidlo OK na ďalšom okne, tak iná aplikácia (na ovladanie jasu) prekrýva obrazovkou.</string>
+  <string name="msg_bug">Something has gone wrong, please describe in the next dialog what you were doing to help improve NetGuard</string>
+  <string name="title_screen_wifi">Allow Wi-Fi when screen is on</string>
+  <string name="title_screen_other">Allow mobile when screen is on</string>
+  <string name="title_roaming">Blokovať pri roamingu</string>
+  <string name="title_disabled">Zakázané</string>
+  <string name="title_internet">Nemá prístup k internetu</string>
+  <string name="title_launch">Spustiť aplikáciu</string>
+  <string name="title_donate">Prispieť</string>
+  <string name="title_rate">Ohodnotiť</string>
+  <string name="title_thanks">Ďakujeme vám za váš príspevok!</string>
 </resources>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -1,48 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <resources>
-    <string name="app_copyright">Авторське право \u00A9 2015 M. Bokhorst (M66B)</string>
-    <string name="app_license">Використовуючи NetGuard, ви погоджуєтесь із <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
-    <string name="app_first">Було докладено великі зусилля під час розробки та тестування NetGuard, проте, неможливо гарантувати, що воно буде коректно працювати на будь-якому пристрої. NetGuard відомо про збій, під час активації на деяких пристроях. Відомо також, що на деяких пристроях блокується весь трафік. Ці помилки викликані вадами в системі Android, чи програмному забезпеченні від постачальника, тому, будь ласка, не звинувачуйте в цьому NetGuard. \n\nВикористовуючи NetGuard, ви погоджуєтесь із <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
-
-    <string name="menu_search">Пошук додатку</string>
-    <string name="menu_settings">Налаштування</string>
-    <string name="menu_invite">Запросити</string>
-    <string name="menu_support">Підтримка</string>
-    <string name="menu_about">Про</string>
-
-    <string name="setting_whitelist_wifi">Блокувати типово у Wi-Fi мережі</string>
-    <string name="setting_whitelist_other">Блокувати типово у мобільній мережі</string>
-    <string name="setting_unused">Default allow when screen is on</string>
-    <string name="setting_whitelist_roaming">Блокувати типово у роумінгу</string>
-    <string name="setting_metered">Handle metered Wi-Fi networks</string>
-    <string name="setting_system">Керувати системними додатками</string>
-    <string name="setting_dark">Використовувати темну тему</string>
-    <string name="setting_export">Експорт налаштувань</string>
-    <string name="setting_import">Імпорт налаштувань</string>
-    <string name="setting_technical">Technical information</string>
-
-    <string name="summary_system">Визначити правила для системних додатків (для експертів)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
-
-    <string name="msg_sure">Ви впевнені?</string>
-    <string name="msg_started">Визначити правила</string>
-    <string name="msg_packages">%1$d allowed, %2$d blocked</string>
-    <string name="msg_disabled">NetGuard вимкнено, аби увімкнути, використовуй перемикач, що знаходиться вище</string>
-    <string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>
-    <string name="msg_completed">Дію завершено</string>
-    <string name="msg_vpn">NetGuard uses a local VPN as a sinkhole to block internet traffic.
+  <string name="app_copyright">Авторське право \u00A9 2015 M. Bokhorst (M66B)</string>
+  <string name="app_license">Використовуючи NetGuard, ви погоджуєтесь із <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
+  <string name="app_first">Було докладено великі зусилля під час розробки та тестування NetGuard, проте, неможливо гарантувати, що воно буде коректно працювати на будь-якому пристрої. NetGuard відомо про збій, під час активації на деяких пристроях. Відомо також, що на деяких пристроях блокується весь трафік. Ці помилки викликані вадами в системі Android, чи програмному забезпеченні від постачальника, тому, будь ласка, не звинувачуйте в цьому NetGuard. \n\nВикористовуючи NetGuard, ви погоджуєтесь із <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License version 3</a></string>
+  <string name="menu_search">Пошук додатку</string>
+  <string name="menu_settings">Налаштування</string>
+  <string name="menu_invite">Запросити</string>
+  <string name="menu_support">Підтримка</string>
+  <string name="menu_about">Про</string>
+  <string name="setting_whitelist_wifi">Блокувати типово у Wi-Fi мережі</string>
+  <string name="setting_whitelist_other">Блокувати типово у мобільній мережі</string>
+  <string name="setting_screen_wifi">Default allow Wi-Fi when screen is on</string>
+  <string name="setting_screen_other">Default allow mobile when screen is on</string>
+  <string name="setting_whitelist_roaming">Блокувати типово у роумінгу</string>
+  <string name="setting_metered">Handle metered Wi-Fi networks</string>
+  <string name="setting_system">Керувати системними додатками</string>
+  <string name="setting_dark">Використовувати темну тему</string>
+  <string name="setting_export">Експорт налаштувань</string>
+  <string name="setting_import">Імпорт налаштувань</string>
+  <string name="setting_technical">Technical information</string>
+  <string name="summary_system">Визначити правила для системних додатків (для експертів)</string>
+  <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
+  <string name="msg_sure">Ви впевнені?</string>
+  <string name="msg_started">Визначити правила</string>
+  <string name="msg_packages">%1$d allowed, %2$d blocked</string>
+  <string name="msg_disabled">NetGuard вимкнено, аби увімкнути, використовуй перемикач, що знаходиться вище</string>
+  <string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>
+  <string name="msg_completed">Дію завершено</string>
+  <string name="msg_vpn">NetGuard uses a local VPN as a sinkhole to block internet traffic.
 For this reason, please allow a VPN connection in the next dialog.
 Since NetGuard has no internet permission, you know your internet traffic is not being sent anywhere.</string>
-
-    <string name="msg_try">Спробуйте NetGuard</string>
-    <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
-    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
-
-    <string name="title_using">Дозволити, коли екран увімкнуто</string>
-    <string name="title_roaming">Блокувати у роумінгу</string>
-    <string name="title_disabled">is disabled</string>
-    <string name="title_internet">has no internet permission</string>
-    <string name="title_launch">Запуск додатку</string>
-    <string name="title_donate">Матеріально подякувати</string>
-    <string name="title_rate">Оцінити</string>
-    <string name="title_thanks">Дякуємо за підтримку!</string>
+  <string name="msg_try">Спробуйте NetGuard</string>
+  <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
+  <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
+  <string name="msg_bug">Something has gone wrong, please describe in the next dialog what you were doing to help improve NetGuard</string>
+  <string name="title_screen_wifi">Allow Wi-Fi when screen is on</string>
+  <string name="title_screen_other">Allow mobile when screen is on</string>
+  <string name="title_roaming">Блокувати у роумінгу</string>
+  <string name="title_disabled">is disabled</string>
+  <string name="title_internet">has no internet permission</string>
+  <string name="title_launch">Запуск додатку</string>
+  <string name="title_donate">Матеріально подякувати</string>
+  <string name="title_rate">Оцінити</string>
+  <string name="title_thanks">Дякуємо за підтримку!</string>
 </resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -1,51 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <resources>
-    <string name="app_copyright">版权所有 \u00A9 2015 by M. Bokhorst (M66B)</string>
-    <string name="app_license">使用NetGuard即表明您接受 <a href="http://www.gnu.org/licenses/gpl.txt">GNU通用公共许可协议第三版</a></string>
-    <string name="app_first">开发者在开发和测试NetGuard过程中已悉心尽力,
+  <string name="app_copyright">版权所有 \u00A9 2015 by M. Bokhorst (M66B)</string>
+  <string name="app_license">使用NetGuard即表明您接受 <a href="http://www.gnu.org/licenses/gpl.txt">GNU通用公共许可协议第三版</a></string>
+  <string name="app_first">开发者在开发和测试NetGuard过程中已悉心尽力,
 但开发者无法确保本软件在所有设备上均可正常运行.
 在某些设备上NetGuard已知会在启动时崩溃或完全阻止所有网络通讯.
 这是由安卓系统或设备厂商软件缺陷所致, 请不要归咎于NetGuard.
 \n\n使用NetGuard即表明您接受 <a href="http://www.gnu.org/licenses/gpl.txt">GNU通用公共许可协议第三版</a></string>
-
-    <string name="menu_search">搜索应用</string>
-    <string name="menu_settings">设置</string>
-    <string name="menu_invite">邀请</string>
-    <string name="menu_support">软件支持</string>
-    <string name="menu_about">关于</string>
-
-    <string name="setting_whitelist_wifi">默认阻止Wi-Fi网络</string>
-    <string name="setting_whitelist_other">默认阻止移动网络</string>
-    <string name="setting_unused">默认亮屏时允许</string>
-    <string name="setting_whitelist_roaming">默认阻止漫游</string>
-    <string name="setting_metered">控制按流量计费Wi-Fi网络</string>
-    <string name="setting_system">管理系统应用</string>
-    <string name="setting_dark">使用暗色主题</string>
-    <string name="setting_export">导出设置</string>
-    <string name="setting_import">导入设置</string>
-    <string name="setting_technical">技术信息</string>
-
-    <string name="summary_system">定义系统应用规则, 仅供专业用户</string>
-    <string name="summary_metered">将移动网络规则应用于按流量计费的 (付费, 共享) Wi-Fi网络</string>
-
-    <string name="msg_sure">是否确认?</string>
-    <string name="msg_started">规则加载中</string>
-    <string name="msg_packages">%1$d allowed, %2$d blocked</string>
-    <string name="msg_disabled">NetGuard已被停用, 请使用上方的开关启用NetGuard</string>
-    <string name="msg_revoked">NetGuard已被停用, 可能是由于您启动了另一个基于VPN的应用</string>
-    <string name="msg_completed">操作完成</string>
-    <string name="msg_vpn">NetGuard使用一个本地VPN来重定向被阻止的网络流量.
+  <string name="menu_search">搜索应用</string>
+  <string name="menu_settings">设置</string>
+  <string name="menu_invite">邀请</string>
+  <string name="menu_support">软件支持</string>
+  <string name="menu_about">关于</string>
+  <string name="setting_whitelist_wifi">默认阻止Wi-Fi网络</string>
+  <string name="setting_whitelist_other">默认阻止移动网络</string>
+  <string name="setting_screen_wifi">Default allow Wi-Fi when screen is on</string>
+  <string name="setting_screen_other">Default allow mobile when screen is on</string>
+  <string name="setting_whitelist_roaming">默认阻止漫游</string>
+  <string name="setting_metered">控制按流量计费Wi-Fi网络</string>
+  <string name="setting_system">管理系统应用</string>
+  <string name="setting_dark">使用暗色主题</string>
+  <string name="setting_export">导出设置</string>
+  <string name="setting_import">导入设置</string>
+  <string name="setting_technical">技术信息</string>
+  <string name="summary_system">定义系统应用规则, 仅供专业用户</string>
+  <string name="summary_metered">将移动网络规则应用于按流量计费的 (付费, 共享) Wi-Fi网络</string>
+  <string name="msg_sure">是否确认?</string>
+  <string name="msg_started">规则加载中</string>
+  <string name="msg_packages">%1$d 已允许, %2$d 已拦截</string>
+  <string name="msg_disabled">NetGuard已被停用, 请使用上方的开关启用NetGuard</string>
+  <string name="msg_revoked">NetGuard已被停用, 可能是由于您启动了另一个基于VPN的应用</string>
+  <string name="msg_completed">操作完成</string>
+  <string name="msg_vpn">NetGuard使用一个本地VPN来重定向被阻止的网络流量.
 因此请在下一个对话框中允许建立VPN连接.
 NetGuard不具有网络访问权限, 所以您无需担心您的网络流量被发送至任何第三方.</string>
-    <string name="msg_try">试用NetGuard</string>
-    <string name="msg_voluntary">捐赠完全出于自愿并且不会解锁任何功能. 捐赠仅作为您对开发者付出劳动的感谢.</string>
-    <string name="msg_dimming">如果您在下一个对话框中无法点击确定, 可能是另一个应用正在控制屏幕(如屏幕亮度调节软件).</string>
-
-    <string name="title_using">亮屏时允许</string>
-    <string name="title_roaming">漫游时阻止</string>
-    <string name="title_disabled">已禁用</string>
-    <string name="title_internet">无网络访问权限</string>
-    <string name="title_launch">启动应用</string>
-    <string name="title_donate">捐赠</string>
-    <string name="title_rate">评分</string>
-    <string name="title_thanks">感谢您的捐赠!</string>
+  <string name="msg_try">试用NetGuard</string>
+  <string name="msg_voluntary">捐赠完全出于自愿并且不会解锁任何功能. 捐赠仅作为您对开发者付出劳动的感谢.</string>
+  <string name="msg_dimming">如果您在下一个对话框中无法点击确定, 可能是另一个应用正在控制屏幕(如屏幕亮度调节软件).</string>
+  <string name="msg_bug">程序发生错误, 请在下一个对话框中描述您刚才的操作过程以便帮助我们改进NetGuard</string>
+  <string name="title_screen_wifi">Allow Wi-Fi when screen is on</string>
+  <string name="title_screen_other">Allow mobile when screen is on</string>
+  <string name="title_roaming">漫游时阻止</string>
+  <string name="title_disabled">已禁用</string>
+  <string name="title_internet">无网络访问权限</string>
+  <string name="title_launch">启动应用</string>
+  <string name="title_donate">捐赠</string>
+  <string name="title_rate">评分</string>
+  <string name="title_thanks">感谢您的捐赠!</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -16,7 +16,8 @@ These issues are caused by bugs in Android, or in the software provided by the m

    <string name="setting_whitelist_wifi">Block Wi-Fi by default</string>
    <string name="setting_whitelist_other">Block mobile by default</string>
-    <string name="setting_unused">Default allow when screen is on</string>
+    <string name="setting_screen_wifi">Default allow Wi-Fi when screen is on</string>
+    <string name="setting_screen_other">Default allow mobile when screen is on</string>
    <string name="setting_whitelist_roaming">Block roaming by default</string>
    <string name="setting_metered">Handle metered Wi-Fi networks</string>
    <string name="setting_system">Manage system applications</string>
@ -40,8 +41,10 @@ Since NetGuard has no internet permission, you know your internet traffic is not
    <string name="msg_try">Try NetGuard</string>
    <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
+    <string name="msg_bug">Something has gone wrong, please describe in the next dialog what you were doing to help improve NetGuard</string>

-    <string name="title_using">Allow when screen is on</string>
+    <string name="title_screen_wifi">Allow Wi-Fi when screen is on</string>
+    <string name="title_screen_other">Allow mobile when screen is on</string>
    <string name="title_roaming">Block when roaming</string>
    <string name="title_disabled">is disabled</string>
    <string name="title_internet">has no internet permission</string>
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@ -1,10 +1,12 @@
 <resources>
+    <attr name="expander" format="reference" />

    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
        <item name="colorPrimary">@color/colorPrimary</item>
        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
        <item name="colorAccent">@color/colorAccent</item>
        <item name="android:windowDisablePreview">true</item>
+        <item name="expander">@drawable/expander_black</item>
    </style>

    <style name="AppThemeDark" parent="Theme.AppCompat">
@ -12,5 +14,6 @@
        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
        <item name="colorAccent">@color/colorAccent</item>
        <item name="android:windowDisablePreview">true</item>
+        <item name="expander">@drawable/expander_white</item>
    </style>
 </resources>
--- a/app/src/main/res/xml/predefined.xml
+++ b/app/src/main/res/xml/predefined.xml
@ -13,13 +13,4 @@
        package="com.android.chrome"
        related="com.android.providers.downloads"
        title="Chrome" />
-    <!--rule
-        blocked="true"
-        package="com.android.chrome"
-        title="Chrome Browser"
-        unused="true" /-->
-    <!--rule
-        blocked="false"
-        package="com.fsck.k9"
-        title="K-9 Mail" /-->
 </predefined>
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@ -10,8 +10,12 @@
        android:title="@string/setting_whitelist_other" />
    <SwitchPreference
        android:defaultValue="false"
-        android:key="unused"
-        android:title="@string/setting_unused" />
+        android:key="screen_wifi"
+        android:title="@string/setting_screen_wifi" />
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="screen_other"
+        android:title="@string/setting_screen_other" />
    <SwitchPreference
        android:defaultValue="true"
        android:key="whitelist_roaming"
--- a/strings.sh
+++ b/strings.sh
@ -1,9 +1,16 @@
 #!/bin/bash

-grep -RIl "\<string name=\"msg_packages" app/src/main/res | xargs sed -i -e '/msg_packages/d'
-grep -RIl "\<string name=\"msg_started" app/src/main/res | xargs sed -i -e '/msg_started/a\
-\ \ \ \ <string name="msg_packages">%1$d allowed, %2$d blocked</string>'
+#grep -RIl "\<string name=\"title_using" app/src/main/res | xargs sed -i -e '/title_using/a\
+#\ \ \ \ <string name="title_screen_other">Allow mobile when screen is on</string>'
+#grep -RIl "\<string name=\"title_using" app/src/main/res | xargs sed -i -e '/title_using/a\
+#\ \ \ \ <string name="title_screen_wifi">Allow Wi-Fi when screen is on</string>'
+#grep -RIl "\<string name=\"title_using" app/src/main/res | xargs sed -i -e '/title_using/d'

+grep -RIl "\<string name=\"setting_unused" app/src/main/res | xargs sed -i -e '/setting_unused/a\
+\ \ \ \ <string name="setting_screen_other">Default allow mobile when screen is on</string>'
+grep -RIl "\<string name=\"setting_unused" app/src/main/res | xargs sed -i -e '/setting_unused/a\
+\ \ \ \ <string name="setting_screen_wifi">Default allow Wi-Fi when screen is on</string>'
+grep -RIl "\<string name=\"setting_unused" app/src/main/res | xargs sed -i -e '/setting_unused/d'

 #grep -RIl "\<string name=\"title_disabled" app/src/main/res | xargs sed -i -e 's/Is disabled/is disabled/g'
 #grep -RIl "\<string name=\"title_internet" app/src/main/res | xargs sed -i -e 's/Has no internet access/has no internet permission/g'