diff options
| author | Fup Duck <fupduck@sacknagel.com> | 2017-12-14 22:48:03 +0100 |
|---|---|---|
| committer | Fup Duck <fupduck@sacknagel.com> | 2017-12-14 22:48:03 +0100 |
| commit | 673c4221554fc92d87fa306c8a95cefb75693d78 (patch) | |
| tree | c2e74c1ab1d42f05a27f64b6d915a39f639ee7dc /app/src/main/res | |
| parent | f10380f7d8bc85d8127328a9d9c092bc109bb340 (diff) | |
| parent | 67ff3447f10c43770dc9ee4dccf358321063d131 (diff) | |
Merge remote-tracking branch '0xacab/0.9.8' into 0.9.8/sidebar
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 6d63c619..c82fad35 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -76,6 +76,7 @@ <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="title_activity_main">Bitmask</string> @@ -89,4 +90,8 @@ <string name="action_example">Example action</string> <string name="action_settings">Settings</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> |
