diff options
| author | cyberta <cyberta@riseup.net> | 2018-02-06 10:10:47 -0800 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2018-02-06 10:10:47 -0800 |
| commit | a719b004a5159461b320cfbe808837708149f266 (patch) | |
| tree | bc32fb50b59c415097804fd7bbdb296641310cde /app/src/main/res | |
| parent | edd34192484f4eb618fdcc2a68b18168c155d63c (diff) | |
| parent | 1a37ac3f86e0bd44842a0fcd86de7c160acfbb04 (diff) | |
Merge branch '8826_custom_provider' into '0.9.8'
8826 custom provider
See merge request leap/bitmask_android!34
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/menu/configuration_wizard_activity.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values-es/strings.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/app/src/main/res/menu/configuration_wizard_activity.xml b/app/src/main/res/menu/configuration_wizard_activity.xml index 9936b6dc..21591547 100644 --- a/app/src/main/res/menu/configuration_wizard_activity.xml +++ b/app/src/main/res/menu/configuration_wizard_activity.xml @@ -8,7 +8,7 @@ <item android:id="@+id/new_provider" android:orderInCategory="210" - android:title="@string/new_provider_button" + android:title="@string/add_provider" android:showAsAction="ifRoom|withText" android:icon="@drawable/ic_menu_add" /> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index b5955a95..46b0ceda 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -18,7 +18,7 @@ <string name="status_unknown">Estado no definido.</string> <string name="eip_service_label">Acceso a Internet Encriptado con VPN</string> <string name="configuration_wizard_title">Elige un proveedor</string> - <string name="new_provider_button">Nuevo proveedor</string> + <string name="add_provider">Nuevo proveedor</string> <string name="introduce_new_provider">Añadir un nuevo proveedor</string> <string name="save">Guardar</string> <string name="new_provider_uri">Dominio</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c1443138..515e1f37 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,7 +17,7 @@ <string name="status_unknown">Status unknown.</string> <string name="eip_service_label">Encrypted VPN Internet Access</string> <string name="configuration_wizard_title">Select a service provider</string> - <string name="new_provider_button">Add new Provider</string> + <string name="add_provider">Add new Provider</string> <string name="introduce_new_provider">Add a new service provider</string> <string name="save">Save</string> <string name="new_provider_uri">Domain name</string> @@ -103,4 +103,5 @@ <string name="warning_corrupted_provider_details">Stored provider details are corrupted. You can either update Bitmask (recommended) or update the provider details using a commercial CA certificate.</string> <string name="warning_corrupted_provider_cert">Stored provider certificate is invalid. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.</string> <string name="warning_expired_provider_cert">Stored provider certificate is expired. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.</string> + </resources> |