diff options
| author | lookshe <github@lookshe.org> | 2016-04-17 16:54:19 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-04-17 16:54:19 +0200 |
| commit | 4b11fa4c69834d8e03b18032e12b0ce788da2f70 (patch) | |
| tree | 05dac279672a3a207699dc78d44e6cede0f07fb5 /src/main/res/values/strings.xml | |
| parent | 2fdd4e6518e16949ce483b15471714b10e9cb92e (diff) | |
| parent | bfe01c432244e04daf6804d5cfc3b838ea247c4b (diff) | |
Merge tag '1.11.7' into trz/merge_1.11.7
Conflicts:
README.md
build.gradle
gradle/wrapper/gradle-wrapper.properties
src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
src/main/java/eu/siacs/conversations/persistance/FileBackend.java
src/main/java/eu/siacs/conversations/services/AvatarService.java
src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java
src/main/java/eu/siacs/conversations/services/NotificationService.java
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
src/main/res/values-cs/strings.xml
src/main/res/values-de/strings.xml
src/main/res/values-es/strings.xml
src/main/res/values-fr/strings.xml
src/main/res/values-it/strings.xml
src/main/res/values-pt-rBR/strings.xml
src/main/res/values-zh-rCN/strings.xml
src/main/res/values/strings.xml
src/main/res/xml/preferences.xml
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/values/strings.xml | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 2578f0a8..63f76a59 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -104,6 +104,9 @@ <string name="pref_xmpp_resource_summary">The name this client identifies itself with</string> <string name="pref_accept_files">Accept files</string> <string name="pref_accept_files_summary">Automatically accept files smaller than…</string> + <string name="pref_attachments">Attachments</string> + <string name="pref_return_to_previous">Quick Sharing</string> + <string name="pref_return_to_previous_summary">Immediately return to previous activity instead of opening the conversation after sharing something</string> <string name="pref_accept_files_size">Size</string> <string name="pref_accept_files_size_summary">Automatically accept files smaller than…</string> <string name="pref_accept_files_download">Wi-Fi only</string> @@ -114,9 +117,11 @@ <string name="pref_notifications">Notifications</string> <string name="pref_notifications_summary">Notify when a new message arrives</string> <string name="pref_vibrate">Vibrate</string> - <string name="pref_vibrate_summary">Also vibrate when a new message arrives</string> - <string name="pref_sound">Sound</string> - <string name="pref_sound_summary">Play ringtone with notification</string> + <string name="pref_vibrate_summary">Vibrate when a new message arrives</string> + <string name="pref_led">LED Notification</string> + <string name="pref_led_summary">Blink notification light when a new message arrives</string> + <string name="pref_sound">Ringtone</string> + <string name="pref_sound_summary">Play sound when a new message arrives</string> <string name="pref_notification_grace_period">Notification grace period</string> <string name="pref_notification_grace_period_summary">Disable notifications for a short time after a carbon copy was received</string> <string name="pref_advanced_options">Advanced</string> @@ -636,6 +641,7 @@ <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="shared_text_with_x">Shared text 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> @@ -660,11 +666,13 @@ <string name="selection_too_large">The selected area is too large</string> <string name="no_accounts">(No activated accounts)</string> <string name="this_field_is_required">This field is required</string> - <string name="retry_decryption">Retry decryption</string> <string name="pref_omemo_enabled_summary">Enable OMEMO?</string> <string name="pref_omemo_enabled_title">Enable OMEMO</string> <string name="no_keys_just_confirm">You already trust this contact. By selecting \'done\' you are just confirming that %s is part of this conference.</string> <string name="select_image_and_crop">Select image and crop</string> <string name="this_account_is_disabled">You have disabled this account</string> <string name="cplus_copy_item">Copy item</string> + <string name="security_error_invalid_file_access">Security error: Invalid file access</string> + <string name="no_application_to_share_uri">No application found to share URI</string> + <string name="share_uri_with">Share URI with…</string> </resources> |