diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-07-03 18:21:34 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-07-03 18:21:34 +0200 |
| commit | 38e2110aa4832aa9ed19569af7d9762d401d2012 (patch) | |
| tree | 54ab12120d621f24512047b83e81ac9dcec90bdd /res/values | |
| parent | d7f5e5192314249c395a92c1572e861fb4b05ac3 (diff) | |
| parent | 7eaedd296e1abce472747acaa3a9930279bebe15 (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 4f8ff473..af372357 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -8,7 +8,7 @@ <string name="action_refresh">Refresh contact list</string> <string name="action_end_conversation">End this conversation</string> <string name="action_contact_details">Contact details</string> - <string name="action_muc_details">Conferenece details</string> + <string name="action_muc_details">Conference details</string> <string name="action_secure">Secure conversation</string> <string name="action_add_account">Add account</string> <string name="action_edit_contact">Edit name</string> @@ -208,7 +208,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 to large</string> + <string name="error_out_of_memory">Ouf 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> |