diff options
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 12 | ||||
| -rw-r--r-- | res/values/strings.xml | 22 |
2 files changed, 32 insertions, 2 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 2210fbb8..09fd3cc7 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -7,4 +7,16 @@ <item>Conversations</item> <item>Android</item> </array> + <string-array name="filesizes"> + <item>never</item> + <item>256 KB</item> + <item>512 KB</item> + <item>1 MB</item> + </string-array> + <string-array name="filesizes_values"> + <item>0</item> + <item>262144</item> + <item>524288</item> + <item>1048576</item> + </string-array> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 9d1b42ac..738332c2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -14,14 +14,14 @@ <string name="just_now">just now</string> <string name="sending">sending…</string> <string name="announce_pgp">Renew PGP announcement</string> - <string name="encrypted_message">Decrypting message. please wait…</string> + <string name="encrypted_message">Decrypting message. Please wait…</string> <string name="conference_details">Conference Details</string> <string name="nick_in_use">Nickname is already in use</string> <string name="moderator">Moderator</string> <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 assoziated 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> @@ -47,4 +47,22 @@ <string name="problem_connecting_to_account">Unable to connect to account</string> <string name="problem_connecting_to_accounts">Unable to connect to multiple accounts</string> <string name="touch_to_fix">Touch here to manage your accounts</string> + <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_rejected">rejected</string> + <string name="receiving_image">Receiving image file. Please wait…</string> + <string name="preparing_image">Preparing image for transmission. Please wait…</string> + <string name="action_clear_history">Clear history</string> + <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="choose_presence">Choose presence to contact</string> + <string name="send_message_to_conference">Send message to conference</string> + <string name="send_plain_text_message">Send plain text message</string> + <string name="send_otr_message">Send OTR encrypted message</string> + <string name="send_pgp_message">Send openPGP encrypted message</string> + <string name="your_nick_has_been_changed">Your nickname has been changed</string> </resources> |