diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-01-19 16:31:59 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-01-19 16:31:59 +0100 |
| commit | 1e748855652780d225fd113320ffe1bceca5ba8e (patch) | |
| tree | a0b257591ef9f3b4c662165c20ffad120fcdeba1 /app/src/main/res/values/strings.xml | |
| parent | fab7a89f44d59f3c7ea7505ae05a3c8b4c67c0b8 (diff) | |
| parent | 45cf8b1cc3085a575c5a460eb7d8191ee6033da4 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'app/src/main/res/values/strings.xml')
| -rw-r--r-- | app/src/main/res/values/strings.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 68e71886..1608f487 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -15,12 +15,11 @@ <string name="title_activity_dashboard">Bitmask</string> <string name="provider_label">Provider:</string> <string name="provider_label_none">No provider configured</string> - <string name="eip_settings_button_description">Access EIP connection settings</string> <string name="status_unknown">Status unknown.</string> <string name="anonymous_secured_status">Connection secure using an anonymous certificate.</string> <string name="authed_secured_status">Connection secure using your own certificate.</string> <string name="eip_service_label">Encrypted Internet</string> - <string name="title_activity_configuration_wizard">Select a service provider</string> + <string name="configuration_wizard_title">Select a service provider</string> <string name="new_provider_button">Add new Provider</string> <string name="introduce_new_provider">Add a new service provider</string> <string name="save">Save</string> @@ -55,7 +54,8 @@ <string name="service_is_down_error">Service is down.</string> <string name="configuring_provider">Configuring provider</string> <string name="incorrectly_downloaded_certificate_message">Your anon cert was not downloaded</string> - <string name="updating_certificate_message">Updating EIP certificate</string> + <string name="downloading_certificate_message">Downloading VPN certificate</string> + <string name="updating_certificate_message">Updating VPN certificate</string> <string name="authenticating_message">Logging in</string> <string name="signingup_message">Signing up</string> <string name="logout_message">Logging out from this session.</string> @@ -63,7 +63,7 @@ <string name="log_out_failed_message">Didn\'t log out.</string> <string name="succesful_authentication_message">Authentication succeeded.</string> <string name="authentication_failed_message">Authentication failed.</string> - <string name="registration_failed_message">Registration failed..</string> + <string name="registration_failed_message">Registration failed.</string> <string name="successful_authed_cert_downloaded_message">Your own cert has been correctly downloaded.</string> <string name="authed_cert_download_failed_message">Your own cert has incorrectly been downloaded.</string> <string name="eip_status_start_pending">Initiating connection</string> |