diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-03-30 22:12:49 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-03-30 22:12:49 +0200 |
| commit | 75c5275f7e9a27019b9517770603ca4c77f1fbd9 (patch) | |
| tree | 567d10bd9e559089487f5627c436000e2a1a8fc8 /src/main/res/values | |
| parent | c8fe93cf0a99481bfe7a30bbc1cd98383205bcaa (diff) | |
| parent | 7eabdfd80f50634282307f45c5f99ab46181805d (diff) | |
Merge tag '1.2.0' into trz/master
Conflicts:
src/main/java/eu/siacs/conversations/parser/AbstractParser.java
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/res/values-de/strings.xml
src/main/res/xml/preferences.xml
Diffstat (limited to 'src/main/res/values')
| -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> |