aboutsummaryrefslogtreecommitdiffstats
path: root/res/values/strings.xml
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-07-15 22:33:49 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-07-15 22:33:49 +0200
commiteb8253d49a432412b8a27d4f61f8f009ace4d79b (patch)
tree888be2a26429effa2e9ac10b48b6ff75206eb4fc /res/values/strings.xml
parent9532a9889b9c606b3cf965595abf2af7de29698c (diff)
parent31b5322570323dbbd0237b1988cbbe61dda85a7e (diff)
Merge pull request #278 from rostovtsev/development
Russian Translations, fixed typos for English version
Diffstat (limited to 'res/values/strings.xml')
-rw-r--r--res/values/strings.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 23972d3c..5aa7afe1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -106,9 +106,9 @@
<string name="contact_offline_otr">Sending OTR encrypted messages to an offline contact is unfortunately not supported.\nWould you like to send the message in plain text?</string>
<string name="contact_offline_file">Sending files to an offline contact is unfortunately not supported.</string>
<string name="send_unencrypted">Send unencrypted</string>
- <string name="decryption_failed">Decrpytion failed. Maybe you don’t have the proper private key.</string>
+ <string name="decryption_failed">Decryption failed. Maybe you don’t have the proper private key.</string>
<string name="openkeychain_required">OpenKeychain</string>
- <string name="openkeychain_required_long">Conversations utilizes a third party app called <b>OpenKeychain</b> to encrypt and decrypt messages and to mange your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n<small>(Please restart Conversations afterwards.)</small></string>
+ <string name="openkeychain_required_long">Conversations utilizes a third party app called <b>OpenKeychain</b> to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n<small>(Please restart Conversations afterwards.)</small></string>
<string name="restart">Restart</string>
<string name="install">Install</string>
<string name="offering">offering&#8230;</string>
@@ -210,7 +210,7 @@
<string name="confirm_password">Confirm password</string>
<string name="passwords_do_not_match">Passwords do not match</string>
<string name="invalid_jid">This is not a valid Jabber ID</string>
- <string name="error_out_of_memory">Ouf of memory. Image is too large</string>
+ <string name="error_out_of_memory">Out of memory. Image is too large</string>
<string name="add_phone_book_text">Do you want to add %s to your phones contact list?</string>
<string name="contact_status_online">online</string>
<string name="contact_status_free_to_chat">free to chat</string>
@@ -270,4 +270,4 @@
<string name="save_as_bookmark">Save as bookmark</string>
<string name="delete_bookmark">Delete bookmark</string>
<string name="bookmark_already_exists">This bookmark already exists</string>
-</resources> \ No newline at end of file
+</resources>