Merge branch 'betheg-unused_resources' into development

1 files changed, 0 insertions, 49 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 223ed984..e799b0ae 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5,7 +5,6 @@
     <string name="action_settings">Settings</string>
     <string name="action_add">New conversation</string>
     <string name="action_accounts">Manage accounts</string>
-    <string name="action_refresh">Refresh contact list</string>
     <string name="action_end_conversation">End this conversation</string>
     <string name="action_contact_details">Contact details</string>
     <string name="action_muc_details">Conference details</string>
@@ -14,7 +13,6 @@
     <string name="action_edit_contact">Edit name</string>
     <string name="action_add_phone_book">Add to phone book</string>
     <string name="action_delete_contact">Delete from roster</string>
-    <string name="title_activity_contacts">Contacts</string>
     <string name="title_activity_manage_accounts">Manage Accounts</string>
     <string name="title_activity_settings">Settings</string>
     <string name="title_activity_conference_details">Conference Details</string>
@@ -28,45 +26,26 @@
     <string name="minutes_ago">%d mins ago</string>
     <string name="unread_conversations">unread Conversations</string>
     <string name="sending">sending&#8230;</string>
-    <string name="announce_pgp">Renew PGP announcement</string>
     <string name="encrypted_message">Decrypting message. Please wait&#8230;</string>
-    <string name="conference_details">Conference Details</string>
     <string name="nick_in_use">Nickname is already in use</string>
     <string name="admin">Admin</string>
     <string name="owner">Owner</string>
     <string name="moderator">Moderator</string>
     <string name="participant">Participant</string>
     <string name="visitor">Visitor</string>
-    <string name="enter_new_name">Enter a new name:</string>
     <string name="remove_contact_text">Would you like to remove %s from your roster? The conversation associated with this contact will not be removed.</string>
     <string name="remove_bookmark_text">Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed.</string>
-    <string name="untrusted_cert_hint">The server %s presented you with an untrusted, possible self signed, certificate.</string>
-    <string name="account_info">Server Info</string>
     <string name="register_account">Register new account on server</string>
     <string name="share_with">Share with</string>
-    <string name="ask_again"><u>Click to ask again</u></string>
-    <string name="show_otr_key">OTR fingerprint</string>
-    <string name="no_otr_fingerprint">No OTR Fingerprint generated. Just go ahead and start an encrypted conversation</string>
     <string name="start_conversation">Start Conversation</string>
     <string name="invite_contact">Invite Contact</string>
     <string name="contacts">Contacts</string>
-    <string name="search_jabber_id">Search or enter Jabber ID</string>
-    <string name="choose_account">Choose account</string>
-    <string name="multi_user_conference">Multi User Conference</string>
-    <string name="trying_join_conference">Are you trying to join a conference?</string>
     <string name="cancel">Cancel</string>
     <string name="add">Add</string>
     <string name="edit">Edit</string>
     <string name="delete">Delete</string>
     <string name="save">Save</string>
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
     <string name="ok">OK</string>
-    <string name="done">Done</string>
-    <string name="hide">Hide</string>
-    <string name="invitation_sent">Invitation sent</string>
-    <string name="account_offline">Account offline</string>
-    <string name="cant_invite_while_offline">You have to be online to invite people to conferences</string>
     <string name="crash_report_title">Conversations has crashed</string>
     <string name="crash_report_message">By sending in stack traces you are helping the ongoing development of Conversations\n<b>Warning:</b> This will use your XMPP account to send the stack trace to the developer.</string>
     <string name="send_now">Send now</string>
@@ -92,14 +71,7 @@
     <string name="send_pgp_message">Send OpenPGP encrypted message</string>
     <string name="your_nick_has_been_changed">Your nickname has been changed</string>
     <string name="download_image">Download Image</string>
-    <string name="error_loading_image">Error loading image (File not found)</string>
     <string name="image_offered_for_download"><i>Image file offered for download</i></string>
-    <string name="not_connected">Not Connected</string>
-    <string name="otr_messages">OTR encrypted messages</string>
-    <string name="manage_account">Manage account</string>
-    <string name="contact_offline">Your Contact is Offline</string>
-    <string name="contact_offline_otr">Sending OTR encrypted messages to an offline contact is unfortunately not supported.\nWould you like to send the message in plain text?</string>
-    <string name="contact_offline_file">Sending files to an offline contact is unfortunately not supported.</string>
     <string name="send_unencrypted">Send unencrypted</string>
     <string name="decryption_failed">Decryption failed. Maybe you don’t have the proper private key.</string>
     <string name="openkeychain_required">OpenKeychain</string>
@@ -115,9 +87,6 @@
     <string name="encrypted_message_received"><i>Encrypted message received. Touch to view and decrypt.</i></string>
     <string name="encrypted_image_received"><i>Encrypted image received. Touch to view and decrypt.</i></string>
     <string name="image_file"><i>Image received. Touch to view</i></string>
-    <string name="otr_file_transfer">OTR encryption not available</string>
-    <string name="otr_file_transfer_msg">Unfortunaly OTR encryption is not available for file transfer. You can choose either OpenPGP or no encryption.</string>
-    <string name="use_pgp_encryption">Use OpenPGP encryption</string>
     <string name="pref_general">General</string>
     <string name="pref_xmpp_resource">XMPP resource</string>
     <string name="pref_xmpp_resource_summary">The name this client identifies itself with</string>
@@ -135,8 +104,6 @@
     <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_ui_options">UI Options</string>
-    <string name="pref_use_phone_self_picture">Use Phones self contact picture</string>
-    <string name="pref_use_phone_self_picture_summary">You may no longer be able to distinguish which account you are using in a conversation</string>
     <string name="pref_conference_name">Conference name</string>
     <string name="pref_conference_name_summary">Use room’s subject to identify Conferences</string>
     <string name="pref_advanced_options">Advanced Options</string>
@@ -144,11 +111,8 @@
     <string name="pref_never_send_crash_summary">By sending in stack traces you are helping the ongoing development of Conversations</string>
     <string name="pref_confirm_messages">Confirm Messages</string>
     <string name="pref_confirm_messages_summary">Let your contact know when you have received and read a message</string>
-    <string name="pref_show_last_seen">Display last seen</string>
-    <string name="pref_show_last_seen_summary">Display the latest time a contact has been seen online</string>
     <string name="openpgp_error">OpenKeychain reported an error</string>
     <string name="error_decrypting_file">I/O Error decrypting file</string>
-    <string name="error_copying_image_file">Error copying image 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>
@@ -159,7 +123,6 @@
     <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>
-    <string name="asked_for_presence_updates">Asked for presence updates</string>
     <string name="attach_choose_picture">Choose picture</string>
     <string name="attach_take_picture">Take picture</string>
     <string name="preemptively_grant">Preemptively grant subscription request</string>
@@ -168,7 +131,6 @@
     <string name="error_file_not_found">File not found</string>
     <string name="error_io_exception">General I/O error. Maybe you ran out of storage space?</string>
     <string name="error_security_exception_during_image_copy">The app you used to select this image did not provide us with enough permissions to read the file.\n\n<small>Use a different file manager to choose an image</small></string>
-    <string name="account_status">Status:</string>
     <string name="account_status_unknown">Unknown</string>
     <string name="account_status_disabled">Temporarily disabled</string>
     <string name="account_status_online">Online</string>
@@ -177,7 +139,6 @@
     <string name="account_status_unauthorized">Unauthorized</string>
     <string name="account_status_not_found">Server not found</string>
     <string name="account_status_no_internet">No connectivity</string>
-    <string name="account_status_requires_tls">Server requires TLS</string>
     <string name="account_status_regis_fail">Registration failed</string>
     <string name="account_status_regis_conflict">Username already in use</string>
     <string name="account_status_regis_success">Registration completed</string>
@@ -193,9 +154,7 @@
     <string name="mgmt_account_enable">Enable account</string>
     <string name="mgmt_account_are_you_sure">Are you sure?</string>
     <string name="mgmt_account_delete_confirm_text">If you delete your account your entire conversation history will be lost</string>
-    <string name="mgmt_account_account_offline">Account is offline</string>
     <string name="attach_record_voice">Record voice</string>
-    <string name="account_settings">Account Settings</string>
     <string name="account_settings_jabber_id">Jabber ID</string>
     <string name="account_settings_password">Password</string>
     <string name="account_settings_example_jabber_id">username@example.com</string>
@@ -213,18 +172,13 @@
     <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_conference_subject">Conference Subject</string>
-    <string name="muc_details_your_nickname">Your nickname</string>
     <string name="muc_details_other_members">Other Members</string>
-    <string name="subscription_not_updated_offline">Account offline. Could not update subscription</string>
     <string name="share_with_active_conversations">Active Conversations</string>
     <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
     <string name="server_info_stream_management">XEP-0198: Stream Management</string>
     <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
     <string name="server_info_available">available</string>
     <string name="server_info_unavailable">unavailable</string>
-    <string name="hours">hours</string>
-    <string name="mins">mins</string>
     <string name="missing_public_keys">Missing public key announcements</string>
     <string name="last_seen_now">last seen just now</string>
     <string name="last_seen_min">last seen 1 minute ago</string>
@@ -236,11 +190,8 @@
     <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="edit_conference_details">Touch to edit conference details</string>
     <string name="openpgp_messages_found">OpenPGP encrypted messages found</string>
-    <string name="openpgp_click_to_decrypt">Click here to enter passphrase and decrypt messages</string>
     <string name="reception_failed">Reception failed</string>
-    <string name="no_muc_server_found">No suitable Conference Server found</string>
     <string name="your_fingerprint">Your fingerprint</string>
     <string name="otr_fingerprint">OTR fingerprint</string>
     <string name="verify">Verify</string>