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 /src/main | |
| parent | 9e1393bc1c8903d400e559b3528a0fe5d04bd389 (diff) | |
| parent | ca1fe61f09107d19d0fee07c9234739cfd8e4344 (diff) | |
Merge branch 'master' of github.com:siacs/Conversations
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/res/values/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
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> |