From 200fda141b7789a2667f3cac4604953e1d592f04 Mon Sep 17 00:00:00 2001
From: licaon-kter <licaon.kter@protonmail.com>
Date: Sat, 9 Sep 2017 18:58:21 +0300
Subject: [PATCH] Cleanup some unused strings

---
 src/main/res/values/colors.xml  |  1 -
 src/main/res/values/dimens.xml  |  1 -
 src/main/res/values/strings.xml | 42 ++-------------------------------
 3 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 51437478e..9794b8e09 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -17,7 +17,6 @@
 	<color name="grey500">#ff9e9e9e</color>
 	<color name="grey800">#ff424242</color>
 	<color name="grey900">#ff282828</color>
-	<color name="red500">#fff44336</color>
 	<color name="red800">#ffc62828</color>
 	<color name="orange500">#ffff9800</color>
 	<color name="green500">#ff259b24</color>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 379a7eb95..39234304e 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -5,6 +5,5 @@
 	<dimen name="infocard_padding">16dp</dimen>
 	<dimen name="image_button_padding">8dp</dimen>
 	<dimen name="fineprint_size">11sp</dimen>
-	<dimen name="menu_item_icon_size">24dp</dimen>
 	<dimen name="swipe_handle_size">32dp</dimen>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 9c3575fdf..5e86ca708 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -70,7 +70,6 @@
 	<string name="not_in_roster">The contact is not in your roster. Would you like to add it?</string>
 	<string name="add_contact">Add contact</string>
 	<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>
@@ -127,14 +126,11 @@
 	<string name="pref_confirm_messages_summary">Let your contacts know when you have received and read their messages</string>
 	<string name="pref_ui_options">UI</string>
 	<string name="openpgp_error">OpenKeychain reported an error</string>
-	<string name="error_decrypting_file">I/O Error decrypting file</string>
 	<string name="accept">Accept</string>
 	<string name="error">An error has occurred</string>
 	<string name="pref_grant_presence_updates">Grant presence updates</string>
 	<string name="pref_grant_presence_updates_summary">Preemptively grant and request presence subscriptions for contacts you have created</string>
-	<string name="subscriptions">Subscriptions</string>
 	<string name="your_account">Your account</string>
-	<string name="keys">Keys</string>
 	<string name="send_presence_updates">Send presence updates</string>
 	<string name="receive_presence_updates">Receive presence updates</string>
 	<string name="ask_for_presence_updates">Ask for presence updates</string>
@@ -166,7 +162,6 @@
 	<string name="encryption_choice_otr">OTR</string>
 	<string name="encryption_choice_pgp">OpenPGP</string>
 	<string name="encryption_choice_omemo">OMEMO</string>
-	<string name="mgmt_account_edit">Edit account</string>
 	<string name="mgmt_account_delete">Delete account</string>
 	<string name="mgmt_account_disable">Temporarily disable</string>
 	<string name="mgmt_account_publish_avatar">Publish avatar</string>
@@ -190,14 +185,6 @@
 	<string name="invalid_jid">This is not a valid Jabber ID</string>
 	<string name="error_out_of_memory">Out of memory. Image is too large</string>
 	<string name="add_phone_book_text">Do you want to add %s to your address book?</string>
-	<string name="contact_status_online">online</string>
-	<string name="contact_status_free_to_chat">free to chat</string>
-	<string name="contact_status_away">away</string>
-	<string name="contact_status_extended_away">extended away</string>
-	<string name="contact_status_do_not_disturb">do not disturb</string>
-	<string name="contact_status_offline">offline</string>
-	<string name="muc_details_conference">Conference</string>
-	<string name="muc_details_other_members">Other Members</string>
 	<string name="server_info_show_more">Server info</string>
 	<string name="server_info_mam">XEP-0313: MAM</string>
 	<string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
@@ -218,11 +205,9 @@
 	<string name="last_seen_hours">last seen %d hours ago</string>
 	<string name="last_seen_day">last seen 1 day ago</string>
 	<string name="last_seen_days">last seen %d days ago</string>
-	<string name="never_seen">never seen</string>
 	<string name="install_openkeychain">Encrypted message. Please install OpenKeychain to decrypt.</string>
 	<string name="unknown_otr_fingerprint">Unknown OTR fingerprint</string>
 	<string name="openpgp_messages_found">OpenPGP encrypted messages found</string>
-	<string name="reception_failed">Reception failed</string>
 	<string name="your_fingerprint">Your fingerprint</string>
 	<string name="otr_fingerprint">OTR fingerprint</string>
 	<string name="otr_fingerprint_selected_message">OTR fingerprint of message</string>
@@ -255,7 +240,6 @@
 	<string name="save_as_bookmark">Save as bookmark</string>
 	<string name="delete_bookmark">Delete bookmark</string>
 	<string name="bookmark_already_exists">This bookmark already exists</string>
-	<string name="you">You</string>
 	<string name="action_edit_subject">Edit conference subject</string>
 	<string name="edit_subject_hint">The subject of this conference</string>
 	<string name="joining_conference">Joining conference…</string>
@@ -279,14 +263,11 @@
 	<string name="account_already_exists">This account already exists</string>
 	<string name="next">Next</string>
 	<string name="server_info_session_established">Current session established</string>
-	<string name="additional_information">Additional Information</string>
 	<string name="skip">Skip</string>
 	<string name="disable_notifications">Disable notifications</string>
-	<string name="disable_notifications_for_this_conversation">Disable notifications for this conversation</string>
 	<string name="enable">Enable</string>
 	<string name="conference_requires_password">Conference requires password</string>
 	<string name="enter_password">Enter password</string>
-	<string name="missing_presence_updates">Missing presence updates from contact</string>
 	<string name="missing_presence_subscription">Missing presence subscription</string>
 	<string name="request_presence_updates">Please request presence updates from your contact first.\n\n<small>This will be used to determine what client(s) your contact is using.</small></string>
 	<string name="request_now">Request now</string>
@@ -295,12 +276,8 @@
 	<string name="ignore">Ignore</string>
 	<string name="without_mutual_presence_updates"><b>Warning:</b> Sending this without mutual presence updates could cause unexpected problems.\n\n<small>Go to contact details to verify your presence subscriptions.</small></string>
 	<string name="pref_security_settings">Security</string>
-	<string name="pref_force_encryption">Force end-to-end encryption</string>
-	<string name="pref_force_encryption_summary">Always send messages encrypted (except for conferences)</string>
 	<string name="pref_allow_message_correction">Allow message correction</string>
 	<string name="pref_allow_message_correction_summary">Allow your contacts to retroactively edit their messages</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_expert_options">Expert settings</string>
 	<string name="pref_expert_options_summary">Please be careful with these</string>
 	<string name="title_activity_about">About Conversations</string>
@@ -371,24 +348,18 @@
 	<string name="copy_original_url">Copy original URL</string>
 	<string name="send_again">Send again</string>
 	<string name="file_url">File 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>
 	<string name="scan_qr_code">Scan 2D Barcode</string>
 	<string name="show_qr_code">Show 2D Barcode</string>
 	<string name="show_block_list">Show block list</string>
 	<string name="account_details">Account details</string>
 	<string name="verify_otr">Verify OTR</string>
 	<string name="remote_fingerprint">Remote Fingerprint</string>
-	<string name="scan">scan</string>
-	<string name="smp">Socialist Millionaire Protocol</string>
 	<string name="shared_secret_hint">Hint or Question</string>
 	<string name="shared_secret_secret">Shared Secret</string>
 	<string name="confirm">Confirm</string>
 	<string name="in_progress">In progress</string>
 	<string name="respond">Respond</string>
-	<string name="failed">Failed</string>
 	<string name="secrets_do_not_match">Secrets do not match</string>
 	<string name="try_again">Try again</string>
 	<string name="finish">Finish</string>
@@ -420,16 +391,12 @@
 	<string name="pref_show_dynamic_tags">Show dynamic tags</string>
 	<string name="pref_show_dynamic_tags_summary">Display read-only tags underneath contacts</string>
 	<string name="enable_notifications">Enable notifications</string>
-	<string name="conference_with">Create conference with…</string>
 	<string name="no_conference_server_found">No conference server found</string>
 	<string name="conference_creation_failed">Conference creation failed!</string>
-	<string name="secret_accepted">Secret accepted!</string>
-	<string name="reset">Reset</string>
 	<string name="account_image_description">Account avatar</string>
 	<string name="copy_otr_clipboard_description">Copy OTR fingerprint to clipboard</string>
 	<string name="copy_omemo_clipboard_description">Copy OMEMO fingerprint to clipboard</string>
 	<string name="regenerate_omemo_key">Regenerate OMEMO key</string>
-	<string name="wipe_omemo_pep">Wipe other devices from PEP</string>
 	<string name="clear_other_devices">Clear devices</string>
 	<string name="clear_other_devices_desc">Are you sure you want to clear all other devices from the OMEMO announcement? The next time your devices connect, they will reannounce themselves, but they might not receive messages sent in the meantime.</string>
 	<string name="error_no_keys_to_trust_server_error">There are no usable keys available for this contact.\nFetching new keys from the server has been unsuccessful. Maybe there is something wrong with your contacts server.</string>
@@ -503,7 +470,6 @@
 	<string name="sending_x_file">Sending %s</string>
 	<string name="offering_x_file">Offering %s</string>
 	<string name="hide_offline">Hide offline</string>
-	<string name="disable_account">Disable Account</string>
 	<string name="contact_is_typing">%s is typing…</string>
 	<string name="contact_has_stopped_typing">%s has stopped typing</string>
 	<string name="contacts_are_typing">%s are typing…</string>
@@ -544,14 +510,10 @@
 	<string name="username">Username</string>
 	<string name="username_hint">Username</string>
 	<string name="invalid_username">This is not a valid username</string>
-	<string name="conference_name">Conference name</string>
-	<string name="invalid_conference_name">This is not a valid conference name</string>
 	<string name="download_failed_server_not_found">Download failed: Server not found</string>
 	<string name="download_failed_file_not_found">Download failed: File not found</string>
 	<string name="download_failed_could_not_connect">Download failed: Could not connect to host</string>
 	<string name="download_failed_could_not_write_file">Download failed: Could not write file</string>
-	<string name="pref_use_white_background">Use white background</string>
-	<string name="pref_use_white_background_summary">Show received messages as black text on a white background</string>
 	<string name="account_status_tor_unavailable">Tor network unavailable</string>
 	<string name="account_status_bind_failure">Bind failure</string>
 	<string name="account_status_host_unknown">Server not responsible for domain</string>
@@ -760,6 +722,6 @@
 	<string name="pref_validate_hostname">Validate hostname with DNSSEC</string>
 	<string name="pref_validate_hostname_summary">Server certificates that contain the validated hostname are considered verified</string>
 	<string name="network_is_unreachable">Network is unreachable</string>
-    <string name="certificate_does_not_contain_jid">Certificate does not contain a Jabber ID</string>
-    <string name="server_info_partial">partial</string>
+	<string name="certificate_does_not_contain_jid">Certificate does not contain a Jabber ID</string>
+	<string name="server_info_partial">partial</string>
 </resources>