diff options
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 23 | ||||
| -rw-r--r-- | res/values/styles.xml | 11 |
3 files changed, 22 insertions, 16 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 1a4fd25d..4acc9e62 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -22,7 +22,7 @@ </string-array> <string-array name="mute_options_descriptions"> <item>30 minutes</item> - <item>one hour</item> + <item>1 hour</item> <item>2 hours</item> <item>8 hours</item> <item>until further notice</item> @@ -36,4 +36,4 @@ <item>-1</item> </integer-array> -</resources>
\ No newline at end of file +</resources> 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 diff --git a/res/values/styles.xml b/res/values/styles.xml index a827fe36..64bde770 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -1,15 +1,4 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - - <style name="sectionHeader" parent="android:Widget.Holo.Light.TextView"> - <item name="android:drawableBottom">@drawable/section_header</item> - <item name="android:drawablePadding">4dp</item> - <item name="android:layout_marginTop">8dp</item> - <item name="android:textSize">14sp</item> - <item name="android:textAllCaps">true</item> - <item name="android:textColor">@color/primarytext</item> - <item name="android:textStyle">bold</item> - </style> - <style name="Divider"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">1.5dp</item> |