diff options
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | src/main/res/values/colors.xml | 2 | ||||
| -rw-r--r-- | src/main/res/values/defaults.xml | 3 | ||||
| -rw-r--r-- | src/main/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 26 | ||||
| -rw-r--r-- | src/main/res/values/themes.xml | 14 |
6 files changed, 32 insertions, 17 deletions
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 672cb00fb..c537fd248 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -58,6 +58,7 @@ <attr name="icon_chat" format="reference" /> <attr name="icon_copy" format="reference" /> <attr name="icon_discard" format="reference" /> + <attr name="icon_show_qr_code" format="reference" /> <attr name="icon_download" format="reference" /> <attr name="icon_edit" format="reference" /> <attr name="icon_edit_body" format="reference" /> @@ -74,6 +75,7 @@ <attr name="icon_secure" format="reference" /> <attr name="icon_settings" format="reference" /> <attr name="icon_share" format="reference" /> + <attr name="icon_delete" format="reference" /> <attr name="icon_import_export" format="reference" /> <attr name="icon_scan_qr_code" format="reference" /> <attr name="icon_enable_undecided_device" format="reference" /> diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 6ea10548f..8dfec1519 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -27,7 +27,7 @@ <color name="grey900">#ff282828</color> <color name="red800">#ffc62828</color> <color name="red500">#fff44336</color> - <color name="red_a700">#ffd50000</color> + <color name="red700">#ffd50000</color> <color name="orange500">#ffff9800</color> <color name="bubble">#ff2e4272</color> <color name="realwhite">#ffffffff</color> diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index e213ea773..29e560124 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -41,7 +41,7 @@ \n\nhttp://hc.apache.org/httpcomponents-client\n(Apache License, Version 2.0) \n\nhttp://hc.apache.org/httpcomponents-core\n(Apache License, Version 2.0) \n\nhttps://github.com/bumptech/glide\n(BSD, The MIT License (MIT) and Apache License, Version 2.0) - \n\nhttps://github.com/chrisbanes/PhotoView\n(Apache License, Version 2.0) + \n\nhttps://github.com/davemorrissey/subsampling-scale-image-view\n(Apache License, Version 2.0) \n\nhttps://github.com/rtoshiro/FullscreenVideoView\n(Apache License, Version 2.0) \n\nhttps://github.com/mangstadt/ez-vcard\n(FreeBSD) \n\nhttps://github.com/googlesamples/easypermissions\n(Apache License, Version 2.0) @@ -51,7 +51,6 @@ \n\nhttp://leafletjs.com/\n(BSD 2-Clause) \n\nhttps://www.openstreetmap.org/\n(Open Database License) \n\nhttp://xmpp.rocks/\n(The MIT License (MIT)) - \n\nhttps://github.com/championswimmer/SimpleFingerGestures_Android_Library/\n(Apache License, Version 2.0) </string> <string name="default_resource" translatable="false">Phone</string> diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index 526eb7d40..0c6ef41fb 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -27,5 +27,5 @@ <dimen name="scan_dot_size">8dp</dimen> <dimen name="background_image_opacity">0.12</dimen> - <dimen name="rounded_image_border">8dp</dimen> + <dimen name="rounded_image_border">5dp</dimen> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 62b415cf3..34c227331 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -75,7 +75,7 @@ <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> + <string name="clear_histor_msg">Are you sure you want to delete all messages within this conversation?\n\n<b>Warning:</b> This will not delete copies of those messages that are stored on other devices or servers.</string> <string name="delete_messages">Delete messages</string> <string name="also_end_conversation">End this conversation afterwards</string> <string name="choose_presence">Choose device</string> @@ -295,8 +295,8 @@ <string name="send_again">Send again</string> <string name="file_url">File URL</string> <string name="url_copied_to_clipboard">URL copied to clipboard</string> - <string name="scan_qr_code">Scan barcode</string> - <string name="show_qr_code">Show barcode</string> + <string name="scan_qr_code">Scan QR code</string> + <string name="show_qr_code">Show QR code</string> <string name="show_block_list">Show block list</string> <string name="account_details">Account details</string> <string name="verify_otr">Verify OTR</string> @@ -611,19 +611,19 @@ <string name="this_device_has_been_verified">This device has been verified</string> <string name="copy_fingerprint">Copy fingerprint</string> <string name="all_omemo_keys_have_been_verified">All OMEMO keys have been verified</string> - <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Barcode does not contain fingerprints for this conversation.</string> + <string name="barcode_does_not_contain_fingerprints_for_this_conversation">QR code does not contain fingerprints for this conversation.</string> <string name="verified_fingerprints">Verified fingerprints</string> - <string name="use_camera_icon_to_scan_barcode">Use the camera to scan a contacts barcode</string> + <string name="use_camera_icon_to_scan_barcode">Use the camera to scan a contacts QR code</string> <string name="please_wait_for_keys_to_be_fetched">Please wait for keys to be fetched</string> - <string name="share_as_barcode">Share as Barcode</string> + <string name="share_as_barcode">Share as QR code</string> <string name="share_as_uri">Share as XMPP URI</string> <string name="share_as_http">Share as HTTP link</string> <string name="blindly_trusted_omemo_keys">Blindly trusted OMEMO keys</string> <string name="pref_blind_trust_before_verification">Blind Trust Before Verification</string> <string name="pref_blind_trust_before_verification_summary">Automatically trust all new devices from contacts that haven’t been verified before.</string> <string name="not_trusted">Untrusted</string> - <string name="invalid_barcode">Invalid barcode</string> - <string name="verify_with_qr_code">verify with barcode</string> + <string name="invalid_barcode">Invalid QR code</string> + <string name="verify_with_qr_code">verify with QR code</string> <string name="i_followed_this_link_from_a_trusted_source">I followed this link from a trusted source</string> <string name="verifying_omemo_keys_trusted_source">You are about to verify the OMEMO keys of %1$s after clicking a link. This is only secure if you followed this link from a trusted source where only %2$s could have published this link.</string> <string name="verify_omemo_keys">Verify OMEMO fingerprints</string> @@ -826,4 +826,14 @@ <string name="action_group_details">Group details</string> <string name="view_media">View media</string> <string name="media_browser">Media browser</string> + <string name="account_status_stream_opening_error">Stream opening error</string> + <string name="action_open">Open</string> + <string name="action_delete">Delete</string> + <string name="security_violation_not_attaching_file">File omitted due to security violation.</string> + <string name="delete_file_dialog">Delete file</string> + <string name="delete_file_dialog_msg">Are you sure you want to delete this file?\n\n<b>Warning:</b> This will not delete copies of this file that are stored on other devices or servers. </string> + <string name="cancelled">cancelled</string> + <string name="remote_server_timeout">Remote server timeout</string> + <string name="already_drafting_message">You are already drafting a message.</string> + </resources> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index bbfaf6060..342ed8aa1 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -13,7 +13,7 @@ <item name="color_background_primary">@color/grey50</item> <item name="color_background_secondary">@color/grey200</item> <item name="color_background_tertiary">@color/grey300</item> - <item name="color_warning">@color/red_a700</item> + <item name="color_warning">@color/red700</item> <item name="TextColorOnline">@color/green500</item> <item name="TextColorError">@color/red800</item> @@ -80,6 +80,7 @@ <item name="icon_cancel" type="reference">@drawable/ic_cancel_black_24dp</item> <item name="icon_chat" type="reference">@drawable/ic_action_chat</item> <item name="icon_copy" type="reference">@drawable/ic_content_copy_grey600_24dp</item> + <item name="icon_show_qr_code" type="reference">@drawable/ic_qrcode_grey600_24dp</item> <item name="icon_discard" type="reference">@drawable/ic_delete_white_24dp</item> <item name="icon_download" type="reference">@drawable/ic_file_download_white_24dp</item> <item name="icon_edit" type="reference">@drawable/ic_edit_white_24dp</item> @@ -98,8 +99,9 @@ <item name="icon_settings" type="reference">@drawable/ic_settings_black_24dp</item> <item name="icon_import_export" type="reference">@drawable/ic_import_export_white_24dp </item> - <item name="icon_share" type="reference">@drawable/ic_share_white_24dp</item> - <item name="icon_scan_qr_code" type="reference">@drawable/ic_barcode_scan_white_24dp</item> + <item name="icon_delete" type="reference">@drawable/ic_delete_black_24dp</item> + <item name="icon_share" type="reference">@drawable/ic_share_black_24dp</item> + <item name="icon_scan_qr_code" type="reference">@drawable/ic_qrcode_scan_white_24dp</item> <item name="icon_scroll_down" type="reference">@drawable/ic_scroll_to_end_black</item> <!-- settings--> @@ -165,7 +167,7 @@ <item name="color_background_primary">@color/grey700</item> <item name="color_background_secondary">@color/grey800</item> <item name="color_background_tertiary">@color/grey900</item> - <item name="color_warning">@color/red_a700</item> + <item name="color_warning">@color/red700</item> <item name="TextColorOnline">@color/green500</item> <item name="TextColorError">@color/red500</item> @@ -251,6 +253,7 @@ <item name="icon_add_person" type="reference">@drawable/ic_person_add_white_24dp</item> <item name="icon_cancel" type="reference">@drawable/ic_cancel_white_24dp</item> <item name="icon_copy" type="reference">@drawable/ic_content_copy_white_24dp</item> + <item name="icon_show_qr_code" type="reference">@drawable/ic_qrcode_white_24dp</item> <item name="icon_discard" type="reference">@drawable/ic_delete_white_24dp</item> <item name="icon_download" type="reference">@drawable/ic_file_download_white_24dp</item> <item name="icon_edit" type="reference">@drawable/ic_edit_white_24dp</item> @@ -269,8 +272,9 @@ <item name="icon_settings" type="reference">@drawable/ic_settings_white_24dp</item> <item name="icon_import_export" type="reference">@drawable/ic_import_export_white_24dp </item> + <item name="icon_delete" type="reference">@drawable/ic_delete_white_24dp</item> <item name="icon_share" type="reference">@drawable/ic_share_white_24dp</item> - <item name="icon_scan_qr_code" type="reference">@drawable/ic_barcode_scan_white_24dp</item> + <item name="icon_scan_qr_code" type="reference">@drawable/ic_qrcode_scan_white_24dp</item> <item name="icon_scroll_down" type="reference">@drawable/ic_scroll_to_end_white</item> <item name="icon_notifications" type="reference">@drawable/ic_notifications_white_24dp |