diff options
| author | cyberta <cyberta@riseup.net> | 2017-12-14 10:19:03 -0800 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2017-12-14 10:19:03 -0800 |
| commit | 67ff3447f10c43770dc9ee4dccf358321063d131 (patch) | |
| tree | cb29df26bec196f8628947897a5fe9977b00a229 /app/src/main/res | |
| parent | 18e24819eed388d349dbf6d7cd21534d7074bf5d (diff) | |
| parent | 25d215400d500bdb7537e604ed91ced586821ef2 (diff) | |
Merge branch '8742_always-on_VPN' into '0.9.8'
8742 always on vpn
See merge request leap/bitmask_android!20
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/drawable-hdpi/ic_stat_vpn_blocking.png | bin | 0 -> 1427 bytes | |||
| -rw-r--r-- | app/src/main/res/drawable-ldpi/ic_stat_vpn_blocking.png | bin | 0 -> 514 bytes | |||
| -rw-r--r-- | app/src/main/res/drawable-mdpi/ic_stat_vpn_blocking.png | bin | 0 -> 514 bytes | |||
| -rw-r--r-- | app/src/main/res/drawable-xhdpi/ic_stat_vpn_blocking.png | bin | 0 -> 1427 bytes | |||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 5 |
5 files changed, 5 insertions, 0 deletions
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_vpn_blocking.png b/app/src/main/res/drawable-hdpi/ic_stat_vpn_blocking.png Binary files differnew file mode 100644 index 00000000..22ea5603 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/ic_stat_vpn_blocking.png diff --git a/app/src/main/res/drawable-ldpi/ic_stat_vpn_blocking.png b/app/src/main/res/drawable-ldpi/ic_stat_vpn_blocking.png Binary files differnew file mode 100644 index 00000000..bbf8e5fd --- /dev/null +++ b/app/src/main/res/drawable-ldpi/ic_stat_vpn_blocking.png diff --git a/app/src/main/res/drawable-mdpi/ic_stat_vpn_blocking.png b/app/src/main/res/drawable-mdpi/ic_stat_vpn_blocking.png Binary files differnew file mode 100644 index 00000000..bbf8e5fd --- /dev/null +++ b/app/src/main/res/drawable-mdpi/ic_stat_vpn_blocking.png diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_vpn_blocking.png b/app/src/main/res/drawable-xhdpi/ic_stat_vpn_blocking.png Binary files differnew file mode 100644 index 00000000..a6840a41 --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/ic_stat_vpn_blocking.png diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 04e83a18..70f6f4ab 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -76,5 +76,10 @@ <string name="signingup_message">is being registered.</string> <string name="vpn.button.turn.on">Turn on</string> <string name="vpn.button.turn.off">Turn off</string> + <string name="vpn_button_turn_off_blocking">Stop blocking</string> <string name="bitmask_log">Bitmask Log</string> + <string name="void_vpn_establish">Bitmask blocks all outgoing internet traffic.</string> + <string name="void_vpn_error_establish">Failed to establish blocking VPN.</string> + <string name="void_vpn_stopped">Stopped blocking all outgoing internet traffic.</string> + <string name="void_vpn_title">Blocking traffic</string> </resources> |
