aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values/strings.xml
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-15 15:50:35 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-15 15:50:35 +0100
commit5b9c690c47cbb6fd352d7ddce3b13e6bf119fc22 (patch)
treed6f19365a8a72d1f711e3d4055d354d16fe5bcaf /src/main/res/values/strings.xml
parent4c504dea7ac7b0413df89ec630408b91f4abddb4 (diff)
parentf1e2be4096d1c023adc2c9eec49bcf64b9a453de (diff)
Merge branch 'feature/otr_verification' into development
Diffstat (limited to 'src/main/res/values/strings.xml')
-rw-r--r--src/main/res/values/strings.xml17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 414de73b..645dc8e5 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -311,4 +311,21 @@
<string name="scan_qr_code">Scan QR code</string>
<string name="show_qr_code">Show QR code</string>
<string name="account_details">Account details</string>
+ <string name="verify_otr">Verify OTR</string>
+ <string name="remote_fingerprint">Remote Fingerprint</string>
+ <string name="scan">scan</string>
+ <string name="or_touch_phones">(or touch phones)</string>
+ <string name="smp">Socialist Millionaire Protocol</string>
+ <string name="shared_secret_hint">Hint or Question</string>
+ <string name="shared_secret_secret">Shared Secret</string>
+ <string name="confirm">Confirm</string>
+ <string name="in_progress">In progress</string>
+ <string name="respond">Respond</string>
+ <string name="failed">Failed</string>
+ <string name="secrets_do_not_match">Secrets do not match</string>
+ <string name="try_again">Try again</string>;
+ <string name="finish">Finish</string>
+ <string name="verified">Verified!</string>
+ <string name="smp_requested">Contact requested SMP verification</string>
+ <string name="no_otr_session_found">No valid OTR session has been found!</string>
</resources>