aboutsummaryrefslogtreecommitdiffstats
path: root/res/values/strings.xml
diff options
context:
space:
mode:
authorkruks23 <scardenas@openmailbox.org>2014-07-09 22:05:48 +0200
committerkruks23 <scardenas@openmailbox.org>2014-07-09 22:05:48 +0200
commitc7088489bd339e4b8b5128e909a1b4377864a5c9 (patch)
tree56974ad74bfdb025a56e817b952221ce4f2dbbe6 /res/values/strings.xml
parent71324261e5560fa70ef028fba35bd121f2527578 (diff)
parentda79e2cca2ffce6e4e5c3b479c4de702ecca1872 (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'res/values/strings.xml')
-rw-r--r--res/values/strings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dcaf58d2..80bd2052 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -252,4 +252,6 @@
<string name="no_muc_server_found">No suitable Conference Server found</string>
<string name="your_fingerprint">Your fingerprint</string>
<string name="otr_fingerprint">OTR fingerprint</string>
+ <string name="verify">Verify</string>
+ <string name="decrypt">Decrypt</string>
</resources> \ No newline at end of file