summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2013-10-07 16:15:50 +0200
committercyBerta <richy@cyborgsociety.org>2013-11-15 23:53:51 +0100
commitd9c8729bfdead18aa695ceddac3a12efe6c8b568 (patch)
tree2d498408730d65b8b943f2133459a709bfd177e7 /res
parent76d52773a237da8fcae3670a959bbe2bfe609796 (diff)
Dashboard asks for real VPN state.
Right now, the answer is always "disconnected", I think it's a problem in EIP.isRunning(). I've also added some new strings, trying to minimize the number of them scattered through litterals around the code.
Diffstat (limited to 'res')
-rw-r--r--res/layout/eip_service_fragment.xml2
-rwxr-xr-xres/values/strings.xml7
2 files changed, 7 insertions, 2 deletions
diff --git a/res/layout/eip_service_fragment.xml b/res/layout/eip_service_fragment.xml
index e67f5651..8f5a93d0 100644
--- a/res/layout/eip_service_fragment.xml
+++ b/res/layout/eip_service_fragment.xml
@@ -65,7 +65,7 @@
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:clickable="true"
- android:text="@string/eip_status" />
+ android:text="@string/status_unknown" />
</RelativeLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dde3ad3f..b4839763 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -261,7 +261,12 @@
<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="eip_status">Status unknown</string>
+ <string name="status_unknown">Status unknown.</string>
+ <string name="connection_secure">Connection secure.</string>
+ <string name="future_anonymous_secured_status">Connection will be secure using an anonymous certificate.</string>
+ <string name="anonymous_secured_status">Connection secure using an anonymous certificate.</string>
+ <string name="future_authed_secured_status">Connection will be secure using your own 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">Configure Bitmask</string>
<string name="provider_list_fragment_tag">Provider list fragment</string>