diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-10-11 14:27:41 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-10-11 14:27:41 +0200 |
| commit | 540f6510de41ed3ff899ad4cfe2ab157a2316edf (patch) | |
| tree | 00e16f62f936aa18d91bd2cd790e225683ba520b | |
| parent | 9e1393bc1c8903d400e559b3528a0fe5d04bd389 (diff) | |
| parent | ca1fe61f09107d19d0fee07c9234739cfd8e4344 (diff) | |
Merge branch 'master' of github.com:siacs/Conversations
| -rw-r--r-- | README.md | 10 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 2 |
2 files changed, 5 insertions, 7 deletions
@@ -16,7 +16,7 @@ Conversations: the very last word in instant messaging ## Features -* End-to-end encryption with either [OTR](https://otr.cypherpunks.ca/) or [OpenPGP](http://www.openpgp.org/about_openpgp/) +* End-to-end encryption with [OMEMO](http://conversations.im/omemo/), [OTR](https://otr.cypherpunks.ca/), or [OpenPGP](http://www.openpgp.org/about_openpgp/) * Send and receive images as well as other kind of files * Share your location via an external [plug-in](https://play.google.com/store/apps/details?id=eu.siacs.conversations.sharelocation&referrer=utm_source%3Dgithub) * Indication when your contact has read your message @@ -93,7 +93,7 @@ Translations are managed on [Transifex](https://www.transifex.com/projects/p/con #### How do I install Conversations? Conversations is entirely open source and licensed under GPLv3. So if you are a -software developer you can check out the sources from GitHub and use ant to +software developer you can check out the sources from GitHub and use Gradle to build your apk file. The more convenient way — which not only gives you automatic updates but also @@ -236,11 +236,9 @@ I am available for hire. Contact me via XMPP: `inputmice@siacs.eu` ### Security -#### Why are there two end-to-end encryption methods and which one should I choose? +#### Why are there three end-to-end encryption methods and which one should I choose? -In most cases OTR should be the encryption method of choice. It works out of the -box with most contacts as long as they are online. However PGP can, in some -cases, (message carbons to multiple clients) be more flexible. +In most cases OTR should be the encryption method of choice. It works out of the box with most contacts as long as they are online. However, openPGP can, in some cases, (message carbons to multiple clients) be more flexible. Unlike OTR, OMEMO works even when a contact is offline, and works with multiple devices. It also allows asynchronous file-transfer when the server has [HTTP File Upload](http://xmpp.org/extensions/xep-0363.html). However, OMEMO is not as widely supported as OTR and is currently implemented only by Conversations. OMEMO should be preffered over OTR for contacts who use Conversations. #### How do I use OpenPGP diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 37263ed4..5be80088 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -76,7 +76,7 @@ <string name="clear_conversation_history">Clear Conversation History</string> <string name="clear_histor_msg">Do you want to delete all messages within this Conversation?\n\n<b>Warning:</b> This will not influence messages stored on other devices or servers.</string> <string name="delete_messages">Delete messages</string> - <string name="also_end_conversation">End this conversations afterwards</string> + <string name="also_end_conversation">End this conversation afterwards</string> <string name="choose_presence">Choose presence to contact</string> <string name="send_unencrypted_message">Send unencrypted message</string> <string name="send_otr_message">Send OTR encrypted message</string> |