diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-10-30 11:20:35 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-10-30 11:20:35 +0100 |
| commit | f2c1a80059af89caeb299a5cc02c401da6b4b138 (patch) | |
| tree | c868409a94abdee41313e4509c8625701bfdd4ff /res/values/strings.xml | |
| parent | 15c05dc3c3dfe7eee82dac2f180e3505b503fe81 (diff) | |
| parent | 7b4f3637db8c99d84fe3c825d583bfc0fa91fada (diff) | |
Merge branch 'development'
Diffstat (limited to '')
| -rw-r--r-- | res/values/strings.xml | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 58af226b..e941ed6d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -250,13 +250,15 @@ <string name="pref_force_encryption_summary">Always send messages encrypted (except for conferences)</string> <string name="pref_dont_save_encrypted">Don’t save encrypted messages</string> <string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string> + <string name="pref_enable_legacy_ssl">Enable legacy SSL</string> + <string name="pref_enable_legacy_ssl_summary">Enables SSLv3 support for legacy servers. Warning: SSLv3 is considered insecure.</string> <string name="pref_expert_options">Expert options</string> - <string name="pref_expert_options_summary">Please be very careful with those</string> + <string name="pref_expert_options_summary">Please be careful with these</string> <string name="pref_use_larger_font">Increase font size</string> <string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string> <string name="pref_use_send_button_to_indicate_status">Send button indicates status</string> <string name="pref_use_indicate_received">Request message receipts</string> - <string name="pref_use_indicate_received_summary">Received masseges will be marked with a green tick. Be aware that this might no work in every case.</string> + <string name="pref_use_indicate_received_summary">Received messages will be marked with a green tick if supported</string> <string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string> <string name="pref_expert_options_other">Other</string> <string name="pref_conference_name">Conference name</string> @@ -265,5 +267,20 @@ <string name="conference_banned">You are banned from this conference</string> <string name="conference_members_only">This conference is members only</string> <string name="conference_kicked">You have been kicked from this conference</string> + <string name="using_account">using account %s</string> + <string name="checking_image">Checking image on HTTP host</string> + <string name="image_file_deleted">The image file has been deleted</string> + <string name="not_connected_try_again">You are not connected. Try again later</string> + <string name="check_image_filesize">Check image file size</string> + <string name="message_options">Message options</string> + <string name="copy_text">Copy text</string> + <string name="share_image">Share image</string> + <string name="copy_original_url">Copy original URL</string> + <string name="send_again">Send again</string> + <string name="image_url">Image URL</string> + <string name="message_text">Message text</string> + <string name="url_copied_to_clipboard">URL copied to clipboard</string> + <string name="message_copied_to_clipboard">Message copied to clipboard</string> + <string name="image_transmission_failed">Image transmission failed</string> -</resources> +</resources>
\ No newline at end of file |