aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-05-30 12:36:38 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-05-30 12:36:38 +0200
commit6f2a0c010735e4fc6bb38f3d5727f955597eae1b (patch)
tree19d133df0d9e238968278f54afc8e6d6c6f6a958 /res
parent1a9e97c3142f98f614d2bf2089d0d3f8d2327b26 (diff)
parentcb127add56cc34126e7c5527b6299f7a7c2e3aaf (diff)
Merge pull request #160 from alethea/development
Spelling and changed "unsuccessful delivery" to "delivery failed"
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 50235c43..9d6e5b38 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -35,7 +35,7 @@
<string name="participant">Participant</string>
<string name="visitor">Visitor</string>
<string name="enter_new_name">Enter a new name:</string>
- <string name="remove_contact_text">Do you want to delete %s from your roster. The conversation associated with this account will not be removed.</string>
+ <string name="remove_contact_text">Do you want to delete %s from your roster? The conversation associated with this account will not be removed.</string>
<string name="untrusted_cert_hint">The server %s presented you with an untrusted, possible self signed, certificate.</string>
<string name="account_info">Server Info</string>
<string name="register_account">Register new account on server</string>
@@ -79,7 +79,7 @@
<string name="attach_file">Attach file</string>
<string name="not_in_roster">The contact is not in your roster. Would you like to add it?</string>
<string name="add_contact">Add contact</string>
- <string name="send_failed">unsuccessful delivery</string>
+ <string name="send_failed">delivery failed</string>
<string name="send_rejected">rejected</string>
<string name="receiving_image">Receiving image file. Please wait&#8230;</string>
<string name="preparing_image">Preparing image for transmission</string>