From 28ff08809e55f8fc2dd0fbbaeeb5b3a7d842e91d Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Sat, 7 Apr 2018 07:01:49 +0000 Subject: [PATCH] Remove leftover strings from legacy (#2948) --- src/main/res/values/defaults.xml | 1 - src/main/res/values/dimens.xml | 1 - src/main/res/values/strings.xml | 58 -------------------------------- 3 files changed, 60 deletions(-) diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index ab306ea0e..f3a641dd4 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -21,7 +21,6 @@ light true true - false false recent false diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index 9cacbf79d..52e02559a 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -9,7 +9,6 @@ 48dp 11sp 224dp - 32dp 16dp 4dp diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 7252c3b9b..00a8e049f 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -82,7 +82,6 @@ Send unencrypted message Send message Send message to %s - Send OTR encrypted message Send OMEMO encrypted message Send v\\OMEMO encrypted message Send OpenPGP encrypted message @@ -171,9 +170,7 @@ Record voice Jabber ID Block Jabber ID - Password username@example.com - Confirm password Password This is not a valid Jabber ID Out of memory. Image is too large @@ -199,11 +196,7 @@ last seen 1 day ago last seen %d days ago Encrypted message. Please install OpenKeychain to decrypt. - Unknown OTR fingerprint OpenPGP encrypted messages found - Your fingerprint - OTR fingerprint - OTR fingerprint of message OpenPGP Key ID OMEMO fingerprint v\\OMEMO fingerprint @@ -213,11 +206,9 @@ Trust OMEMO Fingerprints Fetching keys… Done - Verify Decrypt Group chats Search - Create contact Create Contact Enter Contact Join group chat @@ -264,11 +255,8 @@ Enable Group chat requires password Enter password - Missing presence subscription Please request presence updates from your contact first.\n\nThis will be used to determine what client(s) your contact is using. Request now - Delete Fingerprint - Are you sure you would like to delete this fingerprint? Ignore Warning: Sending this without mutual presence updates could cause unexpected problems.\n\nGo to contact details to verify your presence subscriptions. Security @@ -292,7 +280,6 @@ Use subject instead of JID to identify group chats Automatically join group chats Respect the autojoin flag in group chat bookmarks - OTR fingerprint copied to clipboard! OMEMO fingerprint copied to clipboard! You are banned from this group chat This group chat is members only @@ -314,19 +301,8 @@ Show 2D Barcode Show block list Account details - Verify OTR - Remote Fingerprint - Hint or Question - Shared Secret Confirm - In progress - Respond - Secrets do not match Try again - Finish - Verified! - Contact requested SMP verification - No valid OTR session has been found! Conversations Keep service in foreground Prevents the operating system from killing your connection @@ -347,36 +323,24 @@ The file has been deleted No application found to open file No application found to open link - Could not verify fingerprint - Manually verify - Are you sure that you want to verify your contact’s OTR fingerprint? Dynamic Tags Display read-only tags underneath contacts Enable notifications No group chat server found Group chat creation failed! Account avatar - Copy OTR fingerprint to clipboard Copy OMEMO fingerprint to clipboard Regenerate OMEMO key Clear devices 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. 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 contact’s server. There are no usable keys available for this contact.\nMake sure you have mutual presence subscription. - There are no usable keys available for this contact. If you have purged any of their keys, they need to generate new ones. Something went wrong Fetching history from server No more history on server Updating… Password changed! Could not change password - Send a message to start an encrypted chat - Ask question - If you and your contact have a secret in common that no one else knows (like an inside joke or simply what you had for lunch the last time you met) you can use that secret to verify each other’s fingerprints.\n\nYou provide a hint or a question for your contact who will respond with a case-sensitive answer. - Your contact would like to verify your fingerprint by challenging you with a shared secret. Your contact provided the following hint or question for that secret. - Your hint should not be empty - Your shared secret can not be empty - Carefully compare the fingerprint shown below with the fingerprint of your contact.\nYou can use any trusted form of communication like an encrypted e-mail or a telephone call to exchange those. Change password Current password New password @@ -425,7 +389,6 @@ Android App Contact Received %s - Disable foreground service Touch to open Conversations Avatar has been published! Sending %s @@ -526,14 +489,6 @@ Conversations needs access to the camera Synchronize with contacts Conversations wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nConversations will only read your contacts and match them locally without uploading them to your server.\n\nYou will now be asked to grant permission to access your contacts. - Certificate Information - Subject - Issuer - Common Name - Organization - SHA-1 - (Not available) - No certificate found Notify on all messages Notify only when mentioned Notifications disabled @@ -566,9 +521,7 @@ Pick your username Manage availability manually Set your availability when editing your status message. - Change Presence Status message - Set for all accounts on this device Free for Chat Online Away @@ -576,13 +529,9 @@ Busy A secure password has been generated Your device does not support opting out of battery optimization - Show password Registration failed: Try again later Registration failed: Password too weak - Create group chat Create Group Chat - Join or create group chat - Subject Choose participants Creating group chat… Invite again @@ -613,11 +562,6 @@ No permission to access %s Remote server not found Unable to update account - Missing presence subscription with %s. - Missing OMEMO keys from %s. - Missing OMEMO keys - This is not a private, non-anonymous group chat. - There are no members in this group chat. Report this JID as sending unwanted messages. Delete OMEMO identities Regenerate your OMEMO keys. All your contacts will have to verify you again. Use this only as a last resort. @@ -716,12 +660,10 @@ To keep receiving notifications, even when the screen is turned off, you need to add Conversations to the list of protected apps. Accept Unknown Certificate? The server certificate is not signed by a known Certificate Authority. - The server certificate is expired. Accept Mismatching Server Name? Server could not authenticate as \"%s\". The certificate is only valid for: Do you want to connect anyway? Certificate details: - Certificate Verification Once The QR code scanner needs access to the camera Scroll to bottom