diff options
| author | cyBerta <cyberta@riseup.net> | 2018-01-17 14:35:48 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-01-17 14:35:48 +0100 |
| commit | 20582f79321627257d1b66b22af791e9e22817fd (patch) | |
| tree | 0402daf13f51dcf7f9eba319eb8e26dcc2a79d10 /app/src/main/res/values/strings.xml | |
| parent | 1bb789a9ee39ea8ef652855d8fc4add01848d88f (diff) | |
| parent | 58f13c43e70cad2429c9fa10efbc0b6756798800 (diff) | |
Merge branch 'fupduck_drawer' into mirror_0xacab_0.9.8
Diffstat (limited to 'app/src/main/res/values/strings.xml')
| -rw-r--r-- | app/src/main/res/values/strings.xml | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 75b690ac..9536d96e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -23,14 +23,17 @@ <string name="new_provider_uri">Domain name</string> <string name="valid_url_entered">The URL is valid</string> <string name="not_valid_url_entered">Malformed URL</string> - <string name="provider_details_fragment_title">Provider details</string> + <string name="provider_details_title">Provider details</string> <string name="use_anonymously_button">Use anonymously</string> <string name="username_hint">username</string> <string name="username_ask">Please enter your username</string> + <string name="password_ask">Please enter your password</string> <string name="password_hint">password</string> + <string name="password_match">Passwords match</string> + <string name="password_mismatch">Passwords do not match</string> <string name="user_message">User message</string> - <string name="title_about_activity">About</string> - <string name="error_srp_math_error_user_message">Try again: Server math error.</string> + <string name="about_fragment_title">About</string> + <string name="error_srp_math_error_user_message">Try again: Server math error.</string> <string name="error_bad_user_password_user_message">Incorrect username or password.</string> <string name="error_not_valid_password_user_message">It must be at least 8 characters long.</string> <string name="error_client_http_user_message">Try again: Client HTTP error</string> @@ -78,6 +81,13 @@ <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> + <string name="log_fragment_title">Log</string> + <string name="vpn_fragment_title">VPN</string> + <string name="navigation_drawer_open">Open navigation drawer</string> + <string name="navigation_drawer_close">Close navigation drawer</string> + <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> |