diff options
| author | Christian S <kriztan@users.noreply.github.com> | 2015-11-01 10:21:59 +0100 |
|---|---|---|
| committer | Christian S <kriztan@users.noreply.github.com> | 2015-11-01 10:21:59 +0100 |
| commit | 06b218c1a62cf8eaf71546541921812025a392fc (patch) | |
| tree | 0e95f9b07d2e03da7eebc5335b927084fab2dfff /src/main/res/values | |
| parent | 1e50c4c55c583612b4e1796024f87c83803c55c3 (diff) | |
| parent | fb9ba0a734c4b854918f1c58940977c6037a6afa (diff) | |
Merge pull request #47 from siacs/master
copy commits
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/strings.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 44e038bea..953bd1981 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -82,6 +82,7 @@ <string name="send_unencrypted_message">Send unencrypted message</string> <string name="send_otr_message">Send OTR encrypted message</string> <string name="send_omemo_message">Send OMEMO encrypted message</string> + <string name="send_omemo_x509_message">Send OMEMO (X.509 verified) encrypted message</string> <string name="send_pgp_message">Send OpenPGP encrypted message</string> <string name="your_nick_has_been_changed">Your nickname has been changed</string> <string name="send_unencrypted">Send unencrypted</string> @@ -211,7 +212,9 @@ <string name="your_fingerprint">Your fingerprint</string> <string name="otr_fingerprint">OTR fingerprint</string> <string name="omemo_fingerprint">OMEMO fingerprint</string> + <string name="omemo_fingerprint_x509">OMEMO fingerprint (X.509 verified)</string> <string name="omemo_fingerprint_selected_message">OMEMO fingerprint of message</string> + <string name="omemo_fingerprint_x509_selected_message">OMEMO fingerprint (X.509 verified) of message</string> <string name="this_device_omemo_fingerprint">Own OMEMO fingerprint</string> <string name="other_devices">Other devices</string> <string name="trust_omemo_fingerprints">Trust OMEMO Fingerprints</string> |