summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-01-19 16:29:40 +0100
committerParménides GV <parmegv@sdf.org>2015-01-19 16:29:40 +0100
commitae37fca1b733620951c8c90325beeef27e93c4bf (patch)
tree725ff1c7c9d22a2f6bda112da4a2983e98a315cf /app/src/main/res
parent67633d1bf6e63028cfac1e9d719d5ed4e7574124 (diff)
parentdbc8bc453d71a6c485a40f021fb66436c8e63616 (diff)
Merge branch 'develop' into release-0.9.0
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/provider_detail_fragment.xml1
-rw-r--r--app/src/main/res/values/strings.xml2
2 files changed, 2 insertions, 1 deletions
diff --git a/app/src/main/res/layout/provider_detail_fragment.xml b/app/src/main/res/layout/provider_detail_fragment.xml
index eb90fad9..3b35bae7 100644
--- a/app/src/main/res/layout/provider_detail_fragment.xml
+++ b/app/src/main/res/layout/provider_detail_fragment.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/provider_detail_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7d03c221..1608f487 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,7 +19,7 @@
<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>