summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-08-03 05:27:24 +0200
committerParménides GV <parmegv@sdf.org>2014-08-03 05:27:24 +0200
commit9b6f5499e6d5e9efd0b7b372c28b5c71d940e785 (patch)
tree6d8f9bf881b801282f89d2f263b6f35026ceb778 /app/src/main/res
parent3790d1aef8feedd27ac7ca2a780b2475109315ed (diff)
Just a small glitch after cancelling a disconnect.
I don't use the eip status receiver because it wasn't reliable on timing: updated messages were arriving before the receiver was notifying a new state. Current and last ConnectionStatus is now managed at EIP. More refactoring on the eip fragment, now there are separate methods for setting up the UI depending on the message received.
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/values/strings.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1dbe8fee..cecb4ea1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -67,8 +67,8 @@
<string name="eip_status_start_pending">Initiating connection</string>
<string name="eip_cancel_connect_title">Cancel connection?</string>
<string name="eip_cancel_connect_text">There is a connection attempt in progress. Do you wish to cancel it?</string>
- <string name="eip_cancel_connect_cancel">Yes</string>
- <string name="eip_cancel_connect_false">No</string>
+ <string name="yes">Yes</string>
+ <string name="no">No</string>
<string name="eip_state_not_connected">"Not running! Connection not secure!"</string>
<string name="eip_state_connected">Connection Secure.</string>
</resources>