diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-06-26 23:11:14 -0600 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-06-26 23:11:14 -0600 |
| commit | a34d46d4ccf6f5fb87ce11de6be79179d50b30ec (patch) | |
| tree | 01be83de660e7a3c689b0a89e8a3b9abe73766ef /res | |
| parent | 50db5b5816476751f39bb7b8adc927562a0cc677 (diff) | |
| parent | abd581dd08ec50d8b93b244e5e09596b6acb8a0d (diff) | |
Merge branch 'feature/bigger-letter-configuration-wizard' into develop
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/provider_list_fragment.xml | 5 | ||||
| -rwxr-xr-x | res/values/strings.xml | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/res/layout/provider_list_fragment.xml b/res/layout/provider_list_fragment.xml index 9bb775d7..0db0734b 100644 --- a/res/layout/provider_list_fragment.xml +++ b/res/layout/provider_list_fragment.xml @@ -10,12 +10,13 @@ android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
+ android:layout_alignParentTop="true"
android:drawSelectorOnTop="false" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:onClick="addNewProvider"
+ android:onClick="addAndSelectNewProvider"
android:text="@string/new_provider_button" />
-</LinearLayout>
\ No newline at end of file +</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml index c0ba6ebd..80dd85bd 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -262,7 +262,7 @@ <string name="eip_service_label">EIP:</string> <string name="eip_type_active">EIP</string> <string name="title_activity_configuration_wizard">Configure LEAP</string> - <string name="new_provider_button">Add new Provider</string> + <string name="new_provider_button">Select new Provider</string> <string name="introduce_new_provider">Introduce new provider</string> <string name="save">Save</string> <string name="new_provider_uri">New provider\'s main URL</string> @@ -287,7 +287,7 @@ <string name="incorrectly_downloaded_json_files_message">You have not entered a LEAP provider URL or it is unavailable</string> <string name="correctly_downloaded_json_files_message">Your anon cert has been correctly downloaded</string> <string name="incorrectly_downloaded_certificate_message">Your anon cert was not downloaded</string> - <string name="incorrectly_updated_provider_dot_json_message">Install a new version of this app.</string> + <string name="incorrectly_updated_provider_dot_json_message">Server is down.</string> <string name="not_valid_password_message">Your password is not well-formed: it should have at least 8 characters.</string> <string name="succesful_authentication_message">Authentication succeeded.</string> <string name="authentication_failed_message">Authentication failed.</string> @@ -297,4 +297,4 @@ <string name="authed_cert_download_failed_message">Your own cert has incorrectly been downloaded.</string> -</resources>
\ No newline at end of file +</resources> |