diff options
| author | lookshe <github@lookshe.org> | 2015-04-11 14:15:07 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-04-11 14:15:07 +0200 |
| commit | df63c14617bc8d665bfeac62cde0b29e6aa98873 (patch) | |
| tree | b825c0c87bcd9833ecfad85ecc5c0901ea4d77eb /src/main/res/values/strings.xml | |
| parent | 87e56b534ad41199380c97e16ad25acbd077878c (diff) | |
| parent | e17b75511e7c9d8206939b742972021c5c9d6b86 (diff) | |
Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz/master
Diffstat (limited to 'src/main/res/values/strings.xml')
| -rw-r--r-- | src/main/res/values/strings.xml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index ccb4b67a..b6e897cf 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -446,4 +446,18 @@ <string name="sending_x_file">Sending %s</string> <string name="offering_x_file">Offering %s</string> <string name="hide_offline">Hide offline</string> + <string name="disable_account">Disable Account</string> + <string name="contact_is_typing">%s is typing...</string> + <string name="contact_has_stopped_typing">%s has stopped typing</string> + <string name="pref_chat_states">Typing notifications</string> + <string name="pref_chat_states_summary">Let your contact know when you are writing a new message</string> + <string name="send_location">Send location</string> + <string name="show_location">Show location</string> + <string name="no_application_found_to_display_location">No application found to display location</string> + <string name="location">Location</string> + <string name="received_location">Received location</string> + <plurals name="select_contact"> + <item quantity="one">Select %d contact</item> + <item quantity="other">Select %d contacts</item> + </plurals> </resources> |