aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-17 15:56:54 +0100
committerlookshe <github@lookshe.org>2016-03-17 15:56:54 +0100
commitfb00372269ab0ed9ed0fbc1bd502695ffc17dd1b (patch)
treecf0fb5a62aefaf34fd8e134fa20c91fe641c0898 /src/main/res/values
parent25d3aba4d7dad3edffb92a06b2b018df7ca9b177 (diff)
parentc4b1f6171d2bf82e44a3ba567f7732cc8beef717 (diff)
Merge tag '1.11.1' into trz/merge_1.11.1
Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/utils/FileUtils.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-de/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ru/strings.xml
Diffstat (limited to 'src/main/res/values')
-rw-r--r--src/main/res/values/strings.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 8b34ecf1..11bed337 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -72,6 +72,8 @@
<string name="send_failed">delivery failed</string>
<string name="send_rejected">rejected</string>
<string name="preparing_image">Preparing image for transmission</string>
+ <string name="preparing_images">Preparing images for transmission</string>
+ <string name="sharing_files_please_wait">Sharing files. 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>
@@ -632,6 +634,7 @@
</plurals>
<string name="shared_file_with_x">Shared file with %s</string>
<string name="shared_image_with_x">Shared image with %s</string>
+ <string name="shared_images_with_x">Shared images with %s</string>
<string name="no_storage_permission">Conversations need access to external storage</string>
<string name="sync_with_contacts">Synchronize with contacts</string>
<string name="sync_with_contacts_long">Conversations wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nConversations will only read your contacts and match them locally without uploading them to your server.\n\nYou will now be asked to grant permission to access your contacts.</string>