From dace8ba3d3815599a70d5e369cd3b1f418842a0e Mon Sep 17 00:00:00 2001 From: BrianBlade Date: Fri, 3 Apr 2015 00:06:37 +0200 Subject: Enable end-conversation by swipe gesture Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4 to enable swipe-out for ListViews Re-enable selectableItemBackground Dont end selectedConversation on swipe Call mConversationFragment.reinit() instead. Add separate undo string for swipe MUC. Add blacklistedConversation for undo swipe Update title_undo_swipe_* strings Fix undo(), rename blacklistedConversation Fix discardUndo(); re-init selectedConversation maintain scroll position after undo clear notification when dismissing a conversation modified / simplified maintain scroll position code simplify handling of selectedConversation change undo_muc string, remove notifyDataSetChanged() --- src/main/res/values/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index af56c014..50e9d9e4 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -296,6 +296,7 @@ \n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0) \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0) \n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0) + \n\nhttps://github.com/timroes/EnhancedListView\n(Apache License, Version 2.0) Quiet Hours Start time @@ -454,6 +455,8 @@ No application found to display location Location Received location + Conversation closed + Left conference Select %d contact Select %d contacts -- cgit v1.2.3 From 878066ca99c1170479fb217d68ecdb9cf5498975 Mon Sep 17 00:00:00 2001 From: BrianBlade Date: Thu, 2 Apr 2015 13:35:42 +0200 Subject: Add option to use MTM without default TrustManager Add a new "Don't trust system CAs" preference under advanced options that will change the behaviour of the MemorizingTrustManager. All formerly unknown certificates will raise a warning if checked. --- src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index af56c014..28bb71e9 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -454,6 +454,8 @@ No application found to display location Location Received location + Don\'t trust system CAs + All certificates must be manually approved Select %d contact Select %d contacts -- cgit v1.2.3 From da367dd752b6c92a3d0dbc558c80ebc71ef7b1fe Mon Sep 17 00:00:00 2001 From: BrianBlade Date: Sun, 19 Apr 2015 18:08:13 +0200 Subject: Add option to remove manually approved certificates - "Remove certificates" option brings up a dialog that allows to delete certificates from MemorizingTrustManager's keystore - Reconnect active accounts when certificate-settings are changed - new preference category "Certificate options" --- src/main/res/values/strings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 4a36163c..cc7727d2 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -457,8 +457,19 @@ Received location Conversation closed Left conference + Certificate options Don’t trust system CAs All certificates must be manually approved + Remove certificates + Delete manually approved certificates + No manually approved certificates + Remove certificates + Delete selection + Cancel + + %d certificate deleted + %d certificates deleted + Select %d contact Select %d contacts -- cgit v1.2.3 From 92d14c4a0090c71842440d96be1f84dab5a82d16 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 28 Apr 2015 14:46:52 +0200 Subject: increased padding on image buttons on v21 to match material guidelines --- src/main/res/values/dimens.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index 79e920e9..95e80055 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -1,7 +1,8 @@ - - 8dp - 8dp + + 8dp + 8dp 16dp 288dp + 8dp -- cgit v1.2.3 From 53fea9e1fe25a1f0f2a7fe219195b0009ecb4f5b Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 2 May 2015 11:38:56 +0200 Subject: replace send button with quick action button as long as no text has been entered --- src/main/res/values/arrays.xml | 15 + src/main/res/values/strings.xml | 813 ++++++++++++++++++++-------------------- 2 files changed, 424 insertions(+), 404 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index c413a3c4..fec077cc 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -40,4 +40,19 @@ -1 + + @string/none + @string/recently_used + @string/attach_take_picture + @string/attach_record_voice + @string/send_location + + + + none + recent + photo + voice + location + diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index cc7727d2..4631bd60 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -1,397 +1,397 @@ - Conversations - Settings - New conversation - Manage accounts - End this conversation - Contact details - Conference details - Secure conversation - Add account - Edit name - Add to phone book - Delete from roster - Block contact - Unblock contact - Block domain - Unblock domain - Manage Accounts - Settings - Conference Details - Contact Details - Share with Conversation - Start Conversation - Choose contact - Block list - just now - 1 min ago - %d mins ago - unread Conversations - sending… - Decrypting message. Please wait… - Nickname is already in use - Admin - Owner - Moderator - Participant - Visitor - Would you like to remove %s from your roster? The conversation associated with this contact will not be removed. - Would you like to block %s from sending you messages? - Would you like to unblock %s and allow them to send you messages? - Block all contacts from %s? - Unblock all contacts from %s? - Contact blocked - Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed. - Register new account on server - Change password on server - Share with… - Start Conversation - Invite Contact - Contacts - Cancel - Set - Add - Edit - Delete - Block - Unblock - Save - OK - Conversations has crashed - By sending in stack traces you are helping the ongoing development of Conversations\nWarning: This will use your XMPP account to send the stack trace to the developer. - Send now - Never ask again - Unable to connect to account - Unable to connect to multiple accounts - Touch here to manage your accounts - Attach file - The contact is not in your roster. Would you like to add it? - Add contact - delivery failed - rejected - Preparing image for transmission - Clear history - Clear Conversation History - Do you want to delete all messages within this Conversation?\n\nWarning: This will not influence messages stored on other devices or servers. - Delete messages - End this conversations afterwards - Choose presence to contact - Send plain text message - Send OTR encrypted message - Send OpenPGP encrypted message - Your nickname has been changed - Download Image - Send unencrypted - Decryption failed. Maybe you don’t have the proper private key. - OpenKeychain - Conversations utilizes a third party app called OpenKeychain to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n(Please restart Conversations afterwards.) - Restart - Install - offering… - waiting… - No OpenPGP Key found - Conversations is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\nPlease ask your contact to setup OpenPGP. - No OpenPGP Keys found - Conversations is unable to encrypt your messages because your contacts are not announcing their public key.\n\nPlease ask your contacts to setup OpenPGP. - Encrypted message received. Touch to view and decrypt. - General - XMPP resource - The name this client identifies itself with - Accept files - Automatically accept files smaller than… - Notification Settings - Notifications - Notify when a new message arrives - Vibrate - Also vibrate when a new message arrives - Sound - Play ringtone with notification - Conference notifications - Always notify when a new conference message arrives instead of only when highlighted - Notification grace period - Disable notifications for a short time after a carbon copy was received - Advanced Options - Never send crash reports - By sending in stack traces you are helping the ongoing development of Conversations - Confirm Messages - Let your contact know when you have received and read a message - UI Options - OpenKeychain reported an error - I/O Error decrypting file - Accept - An error has occurred - Grant presence updates - Preemptively grant and ask for presence subscription for contacts you created - Subscriptions - Your account - Keys - Send presence updates - Receive presence updates - Ask for presence updates - Choose picture - Take picture - Preemptively grant subscription request - The file you selected is not an image - Error while converting the image file - File not found - General I/O error. Maybe you ran out of storage space? - The app you used to select this image did not provide us with enough permissions to read the file.\n\nUse a different file manager to choose an image - Unknown - Temporarily disabled - Online - Connecting\u2026 - Offline - Unauthorized - Server not found - No connectivity - Registration failed - Username already in use - Registration completed - Server does not support registration - Security error - Incompatible server - Plain text - OTR - OpenPGP - Edit account - Delete account - Temporarily disable - Publish avatar - Publish OpenPGP public key - Enable account - Are you sure? - If you delete your account your entire conversation history will be lost - Record voice - Jabber ID - Password - username@example.com - Confirm password - Password - Confirm password - Passwords do not match - This is not a valid Jabber ID - Out of memory. Image is too large - Do you want to add %s to your phones contact list? - online - free to chat - away - extended away - do not disturb - offline - Conference - Other Members - Server info - XEP-0313: MAM - XEP-0280: Message Carbons - XEP-0352: Client State Indication - XEP-0191: Blocking Command - XEP-0237: Roster Versioning - XEP-0198: Stream Management - XEP-0163: PEP (Avatars) - available - unavailable - Missing public key announcements - last seen just now - last seen 1 minute ago - last seen %d minutes ago - last seen 1 hour ago - last seen %d hours ago - last seen 1 day ago - last seen %d days ago - never seen - Encrypted message. Please install OpenKeychain to decrypt. - Unknown OTR fingerprint - OpenPGP encrypted messages found - Reception failed - Your fingerprint - OTR fingerprint - Verify - Decrypt - Conferences - Search - Create Contact - Join Conference - Delete Contact - View contact details - Block contact - Unblock contact - Create - The contact already exists - Join - Conference address - room@conference.example.com - Save as bookmark - Delete bookmark - This bookmark already exists - You - Edit conference subject - Conference not found - Leave - Contact added you to contact list - Add back - %s has read up to this point - Publish - Touch avatar to select picture from gallery - Please note: Everyone subscribed to your presence updates will be allowed to see this picture. - Publishing… - The server rejected your publication - Something went wrong while converting your picture - Could not save avatar to disk - (Or long press to bring back default) - Your server does not support the publication of avatars - whispered - to %s - Send private message to %s - Connect - This account already exists - Next - Current session established - Additional Information - Skip - Disable notifications - Disable notifications for this conversation - Notifications are disabled - Enable - Conference requires password - Enter password - Missing presence updates from contact - 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. - Encryption settings - Force end-to-end encryption - Always send messages encrypted (except for conferences) - Don’t save encrypted messages - Warning: This could lead to message loss - Expert options - Please be careful with these - About Conversations - Build and licensing information - - Conversations • the very last word in instant messaging. - \n\nCopyright © 2014 Daniel Gultsch - \n\nThis program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - \n\nThis program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - \n\nYou should have received a copy of the GNU General Public License - along with this program. If not, see https://www.gnu.org/licenses - \n\nDownload the full source code at https://github.com/siacs/Conversations - \n\n\nLibraries - \n\nhttps://www.bouncycastle.org\n(The MIT License (MIT)) - \n\nhttps://www.gnu.org/software/libidn\n(Apache License, Version 2.0) - \n\nhttps://github.com/ge0rg/MemorizingTrustManager\n(The MIT License (MIT)) - \n\nhttps://github.com/rtreffer/minidns\n(WTFPL) - \n\nhttps://github.com/open-keychain/openkeychain-api-lib\n(Apache License, Version 2.0) - \n\nhttps://github.com/jitsi/otr4j\n(LGPL-3.0) - \n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0) - \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0) - \n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0) - \n\nhttps://github.com/timroes/EnhancedListView\n(Apache License, Version 2.0) - - Quiet Hours - Start time - End time - Enable quiet hours - Notifications will be silenced during quiet hours - Increase font size - Use larger font sizes across the entire app - Send button indicates status - Request message receipts - Received messages will be marked with a green tick if supported - Colorize send button to indicate contact status - Other - Conference name - Use room’s subject instead of JID to identify conferences - OTR fingerprint copied to clipboard! - You are banned from this conference - This conference is members only - You have been kicked from this conference - using account %s - Checking image on HTTP host - The image file has been deleted - You are not connected. Try again later - Check image file size - Message options - Copy text - Copy original URL - Send again - Image URL - Message text - URL copied to clipboard - Message copied to clipboard - Image transmission failed - Scan QR code - Show QR code - Show block list - Account details - Verify OTR - Remote Fingerprint - scan - (or touch phones) - Socialist Millionaire Protocol - Hint or Question - Shared Secret - Confirm - In progress - Respond - Failed - 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 - Choose file - Receiving %1$s (%2$d%% completed) - Download %s - file - Open %s - sending (%1$d%% completed) - Preparing file for transmission - %s offered for download - Cancel transmission - file transmission failed - The file has been deleted - No application found to open file - Could not verify fingerprint - Manually verify - Are you sure that you want to verify your contacts OTR fingerprint? - Show dynamic tags - Display read-only tags underneath contacts - Enable notifications - Create conference with… - No conference server found - Conference creation failed! - Conference created! - Secret accepted! - Reset - Account avatar - Copy OTR fingerprint to clipboard - 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. + Conversations + Settings + New conversation + Manage accounts + End this conversation + Contact details + Conference details + Secure conversation + Add account + Edit name + Add to phone book + Delete from roster + Block contact + Unblock contact + Block domain + Unblock domain + Manage Accounts + Settings + Conference Details + Contact Details + Share with Conversation + Start Conversation + Choose contact + Block list + just now + 1 min ago + %d mins ago + unread Conversations + sending… + Decrypting message. Please wait… + Nickname is already in use + Admin + Owner + Moderator + Participant + Visitor + Would you like to remove %s from your roster? The conversation associated with this contact will not be removed. + Would you like to block %s from sending you messages? + Would you like to unblock %s and allow them to send you messages? + Block all contacts from %s? + Unblock all contacts from %s? + Contact blocked + Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed. + Register new account on server + Change password on server + Share with… + Start Conversation + Invite Contact + Contacts + Cancel + Set + Add + Edit + Delete + Block + Unblock + Save + OK + Conversations has crashed + By sending in stack traces you are helping the ongoing development of Conversations\nWarning: This will use your XMPP account to send the stack trace to the developer. + Send now + Never ask again + Unable to connect to account + Unable to connect to multiple accounts + Touch here to manage your accounts + Attach file + The contact is not in your roster. Would you like to add it? + Add contact + delivery failed + rejected + Preparing image for transmission + Clear history + Clear Conversation History + Do you want to delete all messages within this Conversation?\n\nWarning: This will not influence messages stored on other devices or servers. + Delete messages + End this conversations afterwards + Choose presence to contact + Send plain text message + Send OTR encrypted message + Send OpenPGP encrypted message + Your nickname has been changed + Download Image + Send unencrypted + Decryption failed. Maybe you don’t have the proper private key. + OpenKeychain + Conversations utilizes a third party app called OpenKeychain to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n(Please restart Conversations afterwards.) + Restart + Install + offering… + waiting… + No OpenPGP Key found + Conversations is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\nPlease ask your contact to setup OpenPGP. + No OpenPGP Keys found + Conversations is unable to encrypt your messages because your contacts are not announcing their public key.\n\nPlease ask your contacts to setup OpenPGP. + Encrypted message received. Touch to view and decrypt. + General + XMPP resource + The name this client identifies itself with + Accept files + Automatically accept files smaller than… + Notification Settings + Notifications + Notify when a new message arrives + Vibrate + Also vibrate when a new message arrives + Sound + Play ringtone with notification + Conference notifications + Always notify when a new conference message arrives instead of only when highlighted + Notification grace period + Disable notifications for a short time after a carbon copy was received + Advanced Options + Never send crash reports + By sending in stack traces you are helping the ongoing development of Conversations + Confirm Messages + Let your contact know when you have received and read a message + UI Options + OpenKeychain reported an error + I/O Error decrypting file + Accept + An error has occurred + Grant presence updates + Preemptively grant and ask for presence subscription for contacts you created + Subscriptions + Your account + Keys + Send presence updates + Receive presence updates + Ask for presence updates + Choose picture + Take picture + Preemptively grant subscription request + The file you selected is not an image + Error while converting the image file + File not found + General I/O error. Maybe you ran out of storage space? + The app you used to select this image did not provide us with enough permissions to read the file.\n\nUse a different file manager to choose an image + Unknown + Temporarily disabled + Online + Connecting\u2026 + Offline + Unauthorized + Server not found + No connectivity + Registration failed + Username already in use + Registration completed + Server does not support registration + Security error + Incompatible server + Plain text + OTR + OpenPGP + Edit account + Delete account + Temporarily disable + Publish avatar + Publish OpenPGP public key + Enable account + Are you sure? + If you delete your account your entire conversation history will be lost + Record voice + Jabber ID + Password + username@example.com + Confirm password + Password + Confirm password + Passwords do not match + This is not a valid Jabber ID + Out of memory. Image is too large + Do you want to add %s to your phones contact list? + online + free to chat + away + extended away + do not disturb + offline + Conference + Other Members + Server info + XEP-0313: MAM + XEP-0280: Message Carbons + XEP-0352: Client State Indication + XEP-0191: Blocking Command + XEP-0237: Roster Versioning + XEP-0198: Stream Management + XEP-0163: PEP (Avatars) + available + unavailable + Missing public key announcements + last seen just now + last seen 1 minute ago + last seen %d minutes ago + last seen 1 hour ago + last seen %d hours ago + last seen 1 day ago + last seen %d days ago + never seen + Encrypted message. Please install OpenKeychain to decrypt. + Unknown OTR fingerprint + OpenPGP encrypted messages found + Reception failed + Your fingerprint + OTR fingerprint + Verify + Decrypt + Conferences + Search + Create Contact + Join Conference + Delete Contact + View contact details + Block contact + Unblock contact + Create + The contact already exists + Join + Conference address + room@conference.example.com + Save as bookmark + Delete bookmark + This bookmark already exists + You + Edit conference subject + Conference not found + Leave + Contact added you to contact list + Add back + %s has read up to this point + Publish + Touch avatar to select picture from gallery + Please note: Everyone subscribed to your presence updates will be allowed to see this picture. + Publishing… + The server rejected your publication + Something went wrong while converting your picture + Could not save avatar to disk + (Or long press to bring back default) + Your server does not support the publication of avatars + whispered + to %s + Send private message to %s + Connect + This account already exists + Next + Current session established + Additional Information + Skip + Disable notifications + Disable notifications for this conversation + Notifications are disabled + Enable + Conference requires password + Enter password + Missing presence updates from contact + 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. + Encryption settings + Force end-to-end encryption + Always send messages encrypted (except for conferences) + Don’t save encrypted messages + Warning: This could lead to message loss + Expert options + Please be careful with these + About Conversations + Build and licensing information + + Conversations • the very last word in instant messaging. + \n\nCopyright © 2014 Daniel Gultsch + \n\nThis program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + \n\nThis program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + \n\nYou should have received a copy of the GNU General Public License + along with this program. If not, see https://www.gnu.org/licenses + \n\nDownload the full source code at https://github.com/siacs/Conversations + \n\n\nLibraries + \n\nhttps://www.bouncycastle.org\n(The MIT License (MIT)) + \n\nhttps://www.gnu.org/software/libidn\n(Apache License, Version 2.0) + \n\nhttps://github.com/ge0rg/MemorizingTrustManager\n(The MIT License (MIT)) + \n\nhttps://github.com/rtreffer/minidns\n(WTFPL) + \n\nhttps://github.com/open-keychain/openkeychain-api-lib\n(Apache License, Version 2.0) + \n\nhttps://github.com/jitsi/otr4j\n(LGPL-3.0) + \n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0) + \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0) + \n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0) + \n\nhttps://github.com/timroes/EnhancedListView\n(Apache License, Version 2.0) + + Quiet Hours + Start time + End time + Enable quiet hours + Notifications will be silenced during quiet hours + Increase font size + Use larger font sizes across the entire app + Send button indicates status + Request message receipts + Received messages will be marked with a green tick if supported + Colorize send button to indicate contact status + Other + Conference name + Use room’s subject instead of JID to identify conferences + OTR fingerprint copied to clipboard! + You are banned from this conference + This conference is members only + You have been kicked from this conference + using account %s + Checking image on HTTP host + The image file has been deleted + You are not connected. Try again later + Check image file size + Message options + Copy text + Copy original URL + Send again + Image URL + Message text + URL copied to clipboard + Message copied to clipboard + Image transmission failed + Scan QR code + Show QR code + Show block list + Account details + Verify OTR + Remote Fingerprint + scan + (or touch phones) + Socialist Millionaire Protocol + Hint or Question + Shared Secret + Confirm + In progress + Respond + Failed + 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 + Choose file + Receiving %1$s (%2$d%% completed) + Download %s + file + Open %s + sending (%1$d%% completed) + Preparing file for transmission + %s offered for download + Cancel transmission + file transmission failed + The file has been deleted + No application found to open file + Could not verify fingerprint + Manually verify + Are you sure that you want to verify your contacts OTR fingerprint? + Show dynamic tags + Display read-only tags underneath contacts + Enable notifications + Create conference with… + No conference server found + Conference creation failed! + Conference created! + Secret accepted! + Reset + Account avatar + Copy OTR fingerprint to clipboard + 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 @@ -442,19 +442,19 @@ Disable foreground service Touch to open Conversations Avatar has been published! - Sending %s - Offering %s - Hide offline - Disable Account - %s is typing... - %s has stopped typing - Typing notifications - Let your contact know when you are writing a new message - Send location - Show location - No application found to display location - Location - Received location + Sending %s + Offering %s + Hide offline + Disable Account + %s is typing... + %s has stopped typing + Typing notifications + Let your contact know when you are writing a new message + Send location + Show location + No application found to display location + Location + Received location Conversation closed Left conference Certificate options @@ -474,4 +474,9 @@ Select %d contact Select %d contacts + Replace send button with quick action + Quick Action + None + Most recently used + Choose quick action -- cgit v1.2.3 From 1e28f600386f1f1dcd734363c932d5ccbd6267fb Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 10 May 2015 03:14:13 +0200 Subject: changed conversation red to material red --- src/main/res/values/colors.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index c21650a5..753a56df 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -11,7 +11,7 @@ #ffeeeeee #ff323232 #1f000000 - #ffe51c23 + #fff44336 #ffff9800 #ff259b24 -- cgit v1.2.3 From 997b11dbecc6023ad0679843d8a267d843a2951c Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 26 May 2015 05:34:58 +0200 Subject: added choose picture as another quick action. fixes #1221 --- src/main/res/values/arrays.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index fec077cc..5be352d1 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -44,6 +44,7 @@ @string/none @string/recently_used @string/attach_take_picture + @string/attach_choose_picture @string/attach_record_voice @string/send_location @@ -52,6 +53,7 @@ none recent photo + picture voice location -- cgit v1.2.3 From f5ba9d4223ca8e5dc9ce00024f69a8374d170a31 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 2 Jul 2015 23:13:00 +0200 Subject: refactored message context menu --- src/main/res/values/strings.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 4631bd60..444d9ecf 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -82,7 +82,6 @@ Send OTR encrypted message Send OpenPGP encrypted message Your nickname has been changed - Download Image Send unencrypted Decryption failed. Maybe you don’t have the proper private key. OpenKeychain @@ -320,12 +319,12 @@ Checking image on HTTP host The image file has been deleted You are not connected. Try again later - Check image file size + Check %s size Message options Copy text Copy original URL Send again - Image URL + File URL Message text URL copied to clipboard Message copied to clipboard -- cgit v1.2.3 From 0f5c87ca1f3dc25e0f76ff1fa4308326d1d287f0 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 10 Jul 2015 13:28:50 +0200 Subject: display toast in ui on failed http download fixes #954 --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 444d9ecf..1af33587 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -478,4 +478,5 @@ None Most recently used Choose quick action + File not found on remote server -- cgit v1.2.3 From ffffca10f0c3e399fbbcde200ea4758acc5ba03f Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 13 Jul 2015 12:55:13 +0200 Subject: renamed colors --- src/main/res/values/colors.xml | 28 +++++++++++++--------------- src/main/res/values/strings.xml | 1 + src/main/res/values/styles.xml | 2 +- src/main/res/values/themes.xml | 4 ++-- 4 files changed, 17 insertions(+), 18 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 753a56df..3a778a21 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -1,18 +1,16 @@ - - #ff259b24 - #ff0a7e07 - #ff0091ea - #de000000 - #8a000000 - #fffafafa - #fffafafa - #ffeeeeee - #ff323232 - #1f000000 - #fff44336 - #ffff9800 - #ff259b24 - + #ff259b24 + #ff0a7e07 + #ff0091ea + #de000000 + #8a000000 + #1f000000 + #ffffffff + #b2ffffff + #fffafafa + #ffeeeeee + #ff424242 + #fff44336 + #ffff9800 \ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 1af33587..d2dfb4f8 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -479,4 +479,5 @@ Most recently used Choose quick action File not found on remote server + Search for contacts or groups diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index b329eee4..b98a37fc 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -2,7 +2,7 @@ -- cgit v1.2.3 From 7bd66549d87e6c690c115ef3995c4606d0a9415f Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 16 Jul 2015 13:25:52 +0200 Subject: made 'check image on http host' message more generic. fixed #1281 --- src/main/res/values/strings.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index d2dfb4f8..ff05b5b4 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -316,8 +316,7 @@ This conference is members only You have been kicked from this conference using account %s - Checking image on HTTP host - The image file has been deleted + Checking %s on HTTP host You are not connected. Try again later Check %s size Message options -- cgit v1.2.3 From 4f62793a67415e91f589924b70fdd5bdd35c284d Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 16 Jul 2015 14:27:36 +0200 Subject: version bump to 1.5.0-beta.2 --- src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index ff05b5b4..dc29ffd3 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -273,7 +273,7 @@ Build and licensing information Conversations • the very last word in instant messaging. - \n\nCopyright © 2014 Daniel Gultsch + \n\nCopyright © 2014-2015 Daniel Gultsch \n\nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or -- cgit v1.2.3 From f58b2afcaaf1977f02c590a8832bb67f77ee7be3 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 18 Jul 2015 19:38:52 +0200 Subject: changed switch widget --- src/main/res/values/styles.xml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index b98a37fc..e8572d9d 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -4,8 +4,18 @@ 1.5dp @color/black12 - \ No newline at end of file -- cgit v1.2.3 From 077932eb558853e4c3c3046c54db18c530495d8c Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Fri, 29 May 2015 11:18:25 +0200 Subject: CryptoNext Menu entries added --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index dc29ffd3..30a3e4d2 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -154,6 +154,7 @@ Plain text OTR OpenPGP + Axolotl Edit account Delete account Temporarily disable -- cgit v1.2.3 From 7049904c326e6dabc02138fa436d209bf724e0bc Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Tue, 7 Jul 2015 19:36:22 +0200 Subject: Add basic PEP managemend UI to EditAccountActivity EditAccountActivity now show own fingerprint, and gives an option to regenerate local keying material (and wipe all sessions associated with the old keys in the process). It also now displays a list of other own devices, and gives an option to remove all but the current device. --- src/main/res/values/strings.xml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 30a3e4d2..60ca5613 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -207,6 +207,8 @@ Reception failed Your fingerprint OTR fingerprint + Axolotl fingerprint + Other own Axolotl Devices Verify Decrypt Conferences @@ -313,6 +315,7 @@ Conference name Use room’s subject instead of JID to identify conferences OTR fingerprint copied to clipboard! + Axolotl fingerprint copied to clipboard! You are banned from this conference This conference is members only You have been kicked from this conference @@ -379,6 +382,9 @@ Reset Account avatar Copy OTR fingerprint to clipboard + Copy Axolotl fingerprint to clipboard + Copy Axolotl fingerprint to clipboard + Wipe other devices from PEP Fetching history from server No more history on server Updating… -- cgit v1.2.3 From 2628662a7f374dc7cbb01869afb6f5f8fdf5f619 Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Wed, 8 Jul 2015 18:14:28 +0200 Subject: Display axolotl chat message hint --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 60ca5613..6808f1bb 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -80,6 +80,7 @@ Choose presence to contact Send plain text message Send OTR encrypted message + Send Axolotl encrypted message Send OpenPGP encrypted message Your nickname has been changed Send unencrypted -- cgit v1.2.3 From 3d339460889644c859d932eb3f2e324bd5696707 Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Fri, 10 Jul 2015 02:56:44 +0200 Subject: Add key trust toggle to ContactDetailsActivity Can now toggle IdentityKey trust --- src/main/res/values/attrs.xml | 1 + src/main/res/values/themes.xml | 1 + 2 files changed, 2 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index e314f752..d471e54a 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -14,6 +14,7 @@ + diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 5c67203b..afdc3e80 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -18,6 +18,7 @@ @drawable/ic_action_download @drawable/ic_action_edit @drawable/ic_action_edit_dark + @drawable/ic_action_done @drawable/ic_action_group @drawable/ic_action_new -- cgit v1.2.3 From 6f67469bda0ffe97cb8cd8d400affed5a17c34c5 Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Sun, 19 Jul 2015 14:09:49 +0200 Subject: Refactor trust key ui and show in account details Refactored the trust key row UI element so it can be used in multiple places. It now also uses a slider to toggle the trust state, and the redundant trust state description was removed. EditAccountActivity now shows the keys of other devices associated with that account. --- src/main/res/values/strings.xml | 2 ++ src/main/res/values/styles.xml | 6 ++++++ 2 files changed, 8 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 6808f1bb..f4c75ee1 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -209,6 +209,8 @@ Your fingerprint OTR fingerprint Axolotl fingerprint + Own Axolotl fingerprint + Other devices Other own Axolotl Devices Verify Decrypt diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index e8572d9d..d609b5fb 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -18,4 +18,10 @@ 16dp + + \ No newline at end of file -- cgit v1.2.3 From 14010bf5a6198e4e53ba3f86328d061cf20b8da1 Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Sun, 19 Jul 2015 18:36:28 +0200 Subject: Ask for key trust when sending messages If the contact (or the own account) has keys that have UNDECIDED trust, we now drop the user into the new TrustKeysActivity, where they have to decide for each new key whether it should be TRUSTED or UNTRUSTED. --- src/main/res/values/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index f4c75ee1..8537c118 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -211,6 +211,9 @@ Axolotl fingerprint Own Axolotl fingerprint Other devices + Trust Axolotl Keys + Fetching keys... + Done Other own Axolotl Devices Verify Decrypt -- cgit v1.2.3 From 480b1cde810e0ed2afc6ea424fb36fd973ae24b9 Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Sun, 19 Jul 2015 23:35:03 +0200 Subject: Add clear devices to overflow menu in EditAccount --- src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 8537c118..0f992884 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -391,6 +391,8 @@ Copy Axolotl fingerprint to clipboard Copy Axolotl fingerprint to clipboard Wipe other devices from PEP + Clear devices + Are you sure you want to clear all other devices from the axolotl announcement? The next time your devices connect, they will reannounce themselves, but they might not receive messages sent in the meantime. Fetching history from server No more history on server Updating… -- cgit v1.2.3 From 576330f6a937d2294bb3fd4f197acd0c3340ae8f Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Mon, 20 Jul 2015 14:14:27 +0200 Subject: Use MD style for key trust toggle switch --- src/main/res/values/styles.xml | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index d609b5fb..e8572d9d 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -18,10 +18,4 @@ 16dp - - \ No newline at end of file -- cgit v1.2.3 From e6cb12dfe414497b4317820497985c110cb81864 Mon Sep 17 00:00:00 2001 From: Raphael Pohl Date: Sun, 19 Jul 2015 14:26:03 +0200 Subject: changed message bubble appearance --- src/main/res/values/dimens.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index 95e80055..0e5dbf0f 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -5,4 +5,5 @@ 16dp 288dp 8dp + 0dp -- cgit v1.2.3 From dcf9117451877b1add21543910224b2120367393 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 19 Jul 2015 22:34:47 +0200 Subject: changed sizes of avatars and padding in new message bubbles --- src/main/res/values/dimens.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index 0e5dbf0f..95e80055 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -5,5 +5,4 @@ 16dp 288dp 8dp - 0dp -- cgit v1.2.3 From ab2d114bbc21a5c2d684f8760cb8e4cea54be5de Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Mon, 20 Jul 2015 22:18:24 +0200 Subject: Add purge axolotl key option Can now long-press a key to permanently purge it. --- src/main/res/values/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 0f992884..7f3408fc 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -393,6 +393,9 @@ Wipe other devices from PEP Clear devices Are you sure you want to clear all other devices from the axolotl announcement? The next time your devices connect, they will reannounce themselves, but they might not receive messages sent in the meantime. + Purge key + Are you sure you want to purge this key? + It will irreversibly be considered compromised, and you can never build a session with it again. Fetching history from server No more history on server Updating… -- cgit v1.2.3 From 1aeb5874b042b7461e82dddbb34f70c5149a789f Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 21 Jul 2015 13:15:59 +0200 Subject: allow for private messages being started from muc details in anonymous mucs --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 7f3408fc..cc514ef3 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -497,4 +497,5 @@ Choose quick action File not found on remote server Search for contacts or groups + Send private message -- cgit v1.2.3 From 92b5081b5ebac1a3108a821a270beb3f7d9c39ee Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Tue, 21 Jul 2015 14:18:16 +0200 Subject: Add INACTIVE state for removed keys We introduce a new trust state: INACTIVE. This state is intended for old keys that have been removed. When a TRUSTED device is removed from the PEP devicelist, it's status will be set to INACTIVE. INACTIVE keys are shown in the UI as greyed out, non-interactible key rows. Messages are not encrypted for INACTIVE devices. When an INACTIVE device reappears in PEP, or a message is received from an INACTIVE device, it is set back to trusted. --- src/main/res/values/colors.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 3a778a21..85a442c8 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -5,6 +5,7 @@ #ff0091ea #de000000 #8a000000 + #42000000 #1f000000 #ffffffff #b2ffffff -- cgit v1.2.3 From f7634a85be516feef753bdb32fed8df7da1573ed Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 22 Jul 2015 15:31:00 +0200 Subject: treat private, non-anonymous mucs like 1:1 chats notification wise --- src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index cc514ef3..1adb8235 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -108,8 +108,8 @@ Also vibrate when a new message arrives Sound Play ringtone with notification - Conference notifications - Always notify when a new conference message arrives instead of only when highlighted + Notifications in Public Conferences + Always notify when a message arrives in a public conference instead of only when highlighted Notification grace period Disable notifications for a short time after a carbon copy was received Advanced Options -- cgit v1.2.3 From cd204d5931a6cf0289d2df120f278864b8b94fdf Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 22 Jul 2015 15:57:17 +0200 Subject: show warning when trying to highlight users that have left the conference --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 1adb8235..5c8c0dbb 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -498,4 +498,5 @@ File not found on remote server Search for contacts or groups Send private message + %s has left the conference! -- cgit v1.2.3 From 2b3bb0226121acb173080e4893421eefef4a9571 Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Wed, 29 Jul 2015 20:21:37 +0200 Subject: Highlight selected message's fingerprint in list --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 5c8c0dbb..e07c72fe 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -209,6 +209,7 @@ Your fingerprint OTR fingerprint Axolotl fingerprint + Axolotl fingerprint of message Own Axolotl fingerprint Other devices Trust Axolotl Keys -- cgit v1.2.3 From 1ed550b5c54ff873375c30fd94e4f20523f15187 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 30 Jul 2015 12:40:50 +0200 Subject: fixed some colors in message adapter --- src/main/res/values/colors.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 85a442c8..a5d7eea3 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -13,5 +13,6 @@ #ffeeeeee #ff424242 #fff44336 + #ffc62828 #ffff9800 \ No newline at end of file -- cgit v1.2.3 From 5191e4ce95031b83353ec9ceacbbd57f53f01c6a Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 31 Jul 2015 00:51:30 +0200 Subject: removed expert setting to 'force encryption'. merged certifcate and encryption settings into same category --- src/main/res/values/strings.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index e07c72fe..e0e472bf 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -474,7 +474,6 @@ Received location Conversation closed Left conference - Certificate options Don’t trust system CAs All certificates must be manually approved Remove certificates -- cgit v1.2.3 From 2bf30bb296eb92912fc5307c4831861068c65d16 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 1 Aug 2015 23:36:59 +0200 Subject: temporarily renamed new encryption method to 'Multi-End' until a better name has been found --- src/main/res/values/strings.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index e0e472bf..722eec2d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -80,7 +80,7 @@ Choose presence to contact Send plain text message Send OTR encrypted message - Send Axolotl encrypted message + Send Multi-End encrypted message Send OpenPGP encrypted message Your nickname has been changed Send unencrypted @@ -155,7 +155,7 @@ Plain text OTR OpenPGP - Axolotl + Multi-End Edit account Delete account Temporarily disable @@ -208,14 +208,14 @@ Reception failed Your fingerprint OTR fingerprint - Axolotl fingerprint - Axolotl fingerprint of message - Own Axolotl fingerprint + Multi-End fingerprint + Multi-End fingerprint of message + Own Multi-End fingerprint Other devices - Trust Axolotl Keys + Trust Multi-End Keys Fetching keys... Done - Other own Axolotl Devices + Other own Multi-End Devices Verify Decrypt Conferences @@ -322,7 +322,7 @@ Conference name Use room’s subject instead of JID to identify conferences OTR fingerprint copied to clipboard! - Axolotl fingerprint copied to clipboard! + Multi-End fingerprint copied to clipboard! You are banned from this conference This conference is members only You have been kicked from this conference @@ -389,11 +389,11 @@ Reset Account avatar Copy OTR fingerprint to clipboard - Copy Axolotl fingerprint to clipboard + Copy Multi-End fingerprint to clipboard Copy Axolotl fingerprint to clipboard Wipe other devices from PEP Clear devices - Are you sure you want to clear all other devices from the axolotl announcement? The next time your devices connect, they will reannounce themselves, but they might not receive messages sent in the meantime. + Are you sure you want to clear all other devices from the Multi-End announcement? The next time your devices connect, they will reannounce themselves, but they might not receive messages sent in the meantime. Purge key Are you sure you want to purge this key? It will irreversibly be considered compromised, and you can never build a session with it again. -- cgit v1.2.3 From c617cf6ef8ad0b00523a40f886ea64afe47b1712 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 3 Aug 2015 22:58:17 +0200 Subject: added Config.java varibale to lock account creation to specfic domain --- src/main/res/values/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 722eec2d..41e1ccff 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -499,4 +499,7 @@ Search for contacts or groups Send private message %s has left the conference! + Username + Username + This is not a valid username -- cgit v1.2.3 From e10e9942ded6eac8c7c82244c0209c6d67d17370 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 5 Aug 2015 18:30:49 +0200 Subject: changed text selection color --- src/main/res/values/colors.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index a5d7eea3..c2a3ad60 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -11,6 +11,7 @@ #b2ffffff #fffafafa #ffeeeeee + #ff9e9e9e #ff424242 #fff44336 #ffc62828 -- cgit v1.2.3 From 8b9b74ff7ee863160e0cf2827e2a5a431d4fb90f Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 8 Aug 2015 13:29:21 +0200 Subject: renamed multi-end / axolotl to OMEMO --- src/main/res/values/strings.xml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 41e1ccff..50c0ecf8 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -80,7 +80,7 @@ Choose presence to contact Send plain text message Send OTR encrypted message - Send Multi-End encrypted message + Send OMEMO encrypted message Send OpenPGP encrypted message Your nickname has been changed Send unencrypted @@ -155,7 +155,7 @@ Plain text OTR OpenPGP - Multi-End + OMEMO Edit account Delete account Temporarily disable @@ -208,14 +208,13 @@ Reception failed Your fingerprint OTR fingerprint - Multi-End fingerprint - Multi-End fingerprint of message - Own Multi-End fingerprint + OMEMO fingerprint + OMEMO fingerprint of message + Own OMEMO fingerprint Other devices - Trust Multi-End Keys + Trust OMEMO Fingerprints Fetching keys... Done - Other own Multi-End Devices Verify Decrypt Conferences @@ -322,7 +321,7 @@ Conference name Use room’s subject instead of JID to identify conferences OTR fingerprint copied to clipboard! - Multi-End fingerprint copied to clipboard! + OMEMO fingerprint copied to clipboard! You are banned from this conference This conference is members only You have been kicked from this conference @@ -389,11 +388,11 @@ Reset Account avatar Copy OTR fingerprint to clipboard - Copy Multi-End fingerprint to clipboard - Copy Axolotl fingerprint to clipboard - Wipe other devices from PEP + Copy OMEMO fingerprint to clipboard + Regenerate OMEMO key + Wipe other devices from PEP Clear devices - Are you sure you want to clear all other devices from the Multi-End announcement? The next time your devices connect, they will reannounce themselves, but they might not receive messages sent in the meantime. + 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. Purge key Are you sure you want to purge this key? It will irreversibly be considered compromised, and you can never build a session with it again. -- cgit v1.2.3 From b5e90850d88d3fe29387697b8976b52e2e35b1f6 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 10 Aug 2015 12:15:14 +0200 Subject: provide more detailed error toasts for http file download --- src/main/res/values/strings.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 50c0ecf8..aa5bbec5 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -494,11 +494,13 @@ None Most recently used Choose quick action - File not found on remote server Search for contacts or groups Send private message %s has left the conference! Username Username This is not a valid username + Download failed: Server not found + Download failed: File not found + Download failed: Could not connect to host -- cgit v1.2.3 From 4539643f27ce38e7de121655effcae4070e25385 Mon Sep 17 00:00:00 2001 From: hlad Date: Fri, 14 Aug 2015 22:24:05 +0200 Subject: show HTTP upload availability on Edit account screen --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index aa5bbec5..0e396491 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -191,6 +191,7 @@ XEP-0237: Roster Versioning XEP-0198: Stream Management XEP-0163: PEP (Avatars) + XEP-xxxx: HTTP File Upload available unavailable Missing public key announcements -- cgit v1.2.3 From 45d68c200e8573abf43a6584d045baf4fcafd196 Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Sat, 15 Aug 2015 18:52:47 +0200 Subject: Display error message if all contact keys purged --- src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 0e396491..417c1a44 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -397,6 +397,8 @@ Purge key Are you sure you want to purge this key? It will irreversibly be considered compromised, and you can never build a session with it again. + There are no usable keys available for this contact. If you have purged any of their keys, they need to generate new ones. + Error Fetching history from server No more history on server Updating… -- cgit v1.2.3 From 6aec49f06d3d6be9695a4f4f958f201880d09abc Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Sat, 15 Aug 2015 19:07:55 +0200 Subject: Update license string with libraries --- src/main/res/values/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 417c1a44..2a03847d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -306,6 +306,10 @@ \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0) \n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0) \n\nhttps://github.com/timroes/EnhancedListView\n(Apache License, Version 2.0) + \n\nhttps://github.com/leolin310148/ShortcutBadger\n(Apache License, Version 2.0) + \n\nhttps://github.com/kyleduo/SwitchButton\n(Apache License, Version 2.0) + \n\nhttps://github.com/WhisperSystems/libaxolotl-java\n(GPLv3) + \n\nhttps://github.com/vinc3m1/RoundedImageView\n(Apache License, Version 2.0) Quiet Hours Start time -- cgit v1.2.3 From fb0b4bb4453568b10a830ff14f751318cbcd85d7 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 24 Aug 2015 20:56:25 +0200 Subject: added setting to allow for white backgrounds in incoming message bubbles --- src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 2a03847d..6abc17b1 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -510,4 +510,6 @@ Download failed: Server not found Download failed: File not found Download failed: Could not connect to host + Use white background + Show received messages as black text on a white background -- cgit v1.2.3 From 730a5c644bbacea3189479ef067b3ebbd7dcffd6 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 24 Aug 2015 21:15:47 +0200 Subject: renamed plain text to unencrypted. fixes #1331 --- src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 6abc17b1..0ee8676d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -78,7 +78,7 @@ Delete messages End this conversations afterwards Choose presence to contact - Send plain text message + Send unencrypted message Send OTR encrypted message Send OMEMO encrypted message Send OpenPGP encrypted message @@ -152,7 +152,7 @@ Server does not support registration Security error Incompatible server - Plain text + Unencrypted OTR OpenPGP OMEMO -- cgit v1.2.3 From eff9e417e02bef9c4d94b659f7a90f3ff334ce25 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 26 Aug 2015 21:17:29 +0200 Subject: use dedicated colors for primary and primary_dark --- src/main/res/values/colors.xml | 5 +++-- src/main/res/values/themes.xml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index c2a3ad60..b3567b44 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -1,7 +1,7 @@ - #ff259b24 - #ff0a7e07 + #ff259b24 + #ff0a7e07 #ff0091ea #de000000 #8a000000 @@ -16,4 +16,5 @@ #fff44336 #ffc62828 #ffff9800 + #ff259b24 \ No newline at end of file diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index afdc3e80..0f8b95bb 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -39,8 +39,8 @@ -- cgit v1.2.3 From cb70df7a343d55196c9ad1d7ae3e30acae117fc6 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 27 Aug 2015 19:18:35 +0200 Subject: added XEP number for http file upload --- src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 0ee8676d..ae2a38dc 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -190,8 +190,8 @@ XEP-0191: Blocking Command XEP-0237: Roster Versioning XEP-0198: Stream Management - XEP-0163: PEP (Avatars) - XEP-xxxx: HTTP File Upload + XEP-0163: PEP (Avatars / OMEMO) + XEP-0363: HTTP File Upload available unavailable Missing public key announcements -- cgit v1.2.3 From fc594e249a89d0bd333bca1a9958a53b7640e659 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 1 Sep 2015 22:37:52 +0200 Subject: added special error state for dns timeout --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index ae2a38dc..a1394a46 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -512,4 +512,5 @@ Download failed: Could not connect to host Use white background Show received messages as black text on a white background + Timeout in DNS -- cgit v1.2.3 From eff173ebc21fd77918dfcdf5d62de938152d0895 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 6 Sep 2015 19:40:28 +0200 Subject: indicate broken pep in server info --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index a1394a46..5f3a587a 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -513,4 +513,5 @@ Use white background Show received messages as black text on a white background Timeout in DNS + Broken -- cgit v1.2.3 From 96575d6290d3fc28c79ec37c493e1062735cbf41 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 13 Sep 2015 17:13:46 +0200 Subject: added possibiltiy to set conferences as moderated (only visible in advanced mode) --- src/main/res/values/strings.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 5f3a587a..aafcc2af 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -440,8 +440,10 @@ Publicly accessible conference Private, members only conference Conference options - Private (Members only) + Private, members only Non-anonymous + Moderated + You are not participating Modified conference options! Could not modify conference options Never -- cgit v1.2.3 From a3a13dd9dc69280f84b60321388ce4b8f674f012 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Sun, 20 Sep 2015 22:33:42 +0100 Subject: Export logs to SD card preference --- src/main/res/values/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index aafcc2af..22e810ea 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -367,6 +367,9 @@ Conversations Keep service in foreground Prevents the operating system from killing your connection + Export Logs + Write logs to SD card + Writing logs to SD card Choose file Receiving %1$s (%2$d%% completed) Download %s -- cgit v1.2.3 From 52a5e72b02e748780dc14b2a5f595df41f8c3f92 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 8 Oct 2015 00:35:04 +0200 Subject: introduced expert options to set status to away and xa if screen is off or if phone is silenced --- src/main/res/values/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 22e810ea..29b53155 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -519,4 +519,9 @@ Show received messages as black text on a white background Timeout in DNS Broken + Presence settings + Away when screen is off + Marks your resource as away when the screen is turned off + Not available in silent mode + Marks your resource as not available when phone is in silent mode -- cgit v1.2.3 From b23cb5a9e43d804551dc18f399ffbec991479ee6 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 9 Oct 2015 13:37:08 +0200 Subject: initial UI work to allow setting up accounts from certifcates --- src/main/res/values/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 29b53155..37263ed4 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -524,4 +524,7 @@ Marks your resource as away when the screen is turned off Not available in silent mode Marks your resource as not available when phone is in silent mode + Add account from key + Unable to parse certificate + Leave empty to authenticate w/ certificate -- cgit v1.2.3 From 08174e3b0585c0dddd1cfc1d9bf60d84a8b6d5db Mon Sep 17 00:00:00 2001 From: Safwat Halaby Date: Sat, 10 Oct 2015 12:03:25 +0300 Subject: Fixed a typo in string.xml --- src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 37263ed4..5be80088 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -76,7 +76,7 @@ Clear Conversation History Do you want to delete all messages within this Conversation?\n\nWarning: This will not influence messages stored on other devices or servers. Delete messages - End this conversations afterwards + End this conversation afterwards Choose presence to contact Send unencrypted message Send OTR encrypted message -- cgit v1.2.3 From 6a6cb43b17df1557033c217d199706bd4e09673e Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Sun, 11 Oct 2015 13:11:50 +0200 Subject: Captcha support. --- src/main/res/values/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 5be80088..3307b973 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -527,4 +527,7 @@ Add account from key Unable to parse certificate Leave empty to authenticate w/ certificate + Captcha text + Captcha required + enter the text from the image -- cgit v1.2.3 From 7be331bbb2ae2abde55eb031f4fdf4616846360e Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 11 Oct 2015 15:48:58 +0200 Subject: add menu item in account details to renew certificate --- src/main/res/values/strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 3307b973..20b861f4 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -524,10 +524,13 @@ Marks your resource as away when the screen is turned off Not available in silent mode Marks your resource as not available when phone is in silent mode - Add account from key + Add account from certificate Unable to parse certificate Leave empty to authenticate w/ certificate Captcha text Captcha required enter the text from the image + Certificate chain is not trusted + Jabber ID does not match certificate + Renew certificate -- cgit v1.2.3 From 212d1a8c91d5b83d1132d3a02664607ce37f8ecf Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 12 Oct 2015 13:18:20 +0200 Subject: add config variable to enable x509 verification --- src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 20b861f4..162c277b 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -524,7 +524,7 @@ Marks your resource as away when the screen is turned off Not available in silent mode Marks your resource as not available when phone is in silent mode - Add account from certificate + Add account with certificate Unable to parse certificate Leave empty to authenticate w/ certificate Captcha text -- cgit v1.2.3 From 4b93351f8f4585548dbc9ce162f68e2bfc003f43 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 14 Oct 2015 23:03:01 +0200 Subject: changed some source strings --- src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 162c277b..3f3e29d1 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -95,7 +95,7 @@ Conversations is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\nPlease ask your contact to setup OpenPGP. No OpenPGP Keys found Conversations is unable to encrypt your messages because your contacts are not announcing their public key.\n\nPlease ask your contacts to setup OpenPGP. - Encrypted message received. Touch to view and decrypt. + Encrypted message received. Touch to decrypt. General XMPP resource The name this client identifies itself with @@ -174,7 +174,7 @@ Passwords do not match This is not a valid Jabber ID Out of memory. Image is too large - Do you want to add %s to your phones contact list? + Do you want to add %s to your devices’s contact list? online free to chat away -- cgit v1.2.3 From a83aae341fc681edc43928af1e37d4bb67e733d8 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 17 Oct 2015 14:09:26 +0200 Subject: improved error reporting in trust keys activity --- src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 3f3e29d1..6a6bfa46 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -533,4 +533,6 @@ Certificate chain is not trusted Jabber ID does not match certificate Renew certificate + Error fetching OMEMO key! + Verified OMEMO key with certificate! -- cgit v1.2.3 From 569b9f4e66bab9dc9481ca374289c07b9200bac7 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 20 Oct 2015 15:27:33 +0200 Subject: open manage account + certificate chooser when cbe mode is enabled --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 6a6bfa46..c4ba759b 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -535,4 +535,5 @@ Renew certificate Error fetching OMEMO key! Verified OMEMO key with certificate! + Your device does not support the selection of client certificates! -- cgit v1.2.3 From 016a57f123dad15b4dabce320759f29155a150a5 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Thu, 15 Oct 2015 23:27:12 +0100 Subject: Show PGP "please wait" message only when actually decrypting --- src/main/res/values/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index c4ba759b..7ed0d386 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -30,7 +30,8 @@ %d mins ago unread Conversations sending… - Decrypting message. Please wait… + Decrypting message. Please wait… + OpenPGP encrypted message Nickname is already in use Admin Owner -- cgit v1.2.3 From bca29cf7fd6fcf7438f39d81833cda18a94eefd9 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 31 Oct 2015 10:57:57 +0100 Subject: explicitly mark verified omemo keys in UI --- src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 7ed0d386..e3dfb79d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -211,7 +211,9 @@ Your fingerprint OTR fingerprint OMEMO fingerprint + OMEMO fingerprint (X509 verified) OMEMO fingerprint of message + OMEMO fingerprint (X509 verified) of message Own OMEMO fingerprint Other devices Trust OMEMO Fingerprints -- cgit v1.2.3 From baf76d883cd513251445c31680dc9847d6fa3877 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 31 Oct 2015 22:55:04 +0100 Subject: indicate cbe in chat message hint --- src/main/res/values/strings.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index e3dfb79d..fa484a82 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -82,6 +82,7 @@ Send unencrypted message Send OTR encrypted message Send OMEMO encrypted message + Send OMEMO (X.509 verified) encrypted message Send OpenPGP encrypted message Your nickname has been changed Send unencrypted @@ -211,9 +212,9 @@ Your fingerprint OTR fingerprint OMEMO fingerprint - OMEMO fingerprint (X509 verified) + OMEMO fingerprint (X.509 verified) OMEMO fingerprint of message - OMEMO fingerprint (X509 verified) of message + OMEMO fingerprint (X.509 verified) of message Own OMEMO fingerprint Other devices Trust OMEMO Fingerprints -- cgit v1.2.3 From f0b1761ec3826b72fe3b20032b532dc5b1adfc1c Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 28 Nov 2015 20:11:38 +0100 Subject: initial tor support --- src/main/res/values/strings.xml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index fa484a82..eaff3534 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -540,4 +540,12 @@ Error fetching OMEMO key! Verified OMEMO key with certificate! Your device does not support the selection of client certificates! + Connection options + Connect via Tor + Tunnel all connections through the TOR network. Requires Orbot + Hostname + Port + Server- or .onion-Address + This is not a valid port number + This is not a valid hostname -- cgit v1.2.3 From 2225b0b6d5586d608b15d4e1ac13faa99b8971bf Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 30 Nov 2015 16:01:48 +0100 Subject: add error state for unavailable tor network --- src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index eaff3534..9f257363 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -521,7 +521,7 @@ Download failed: Could not connect to host Use white background Show received messages as black text on a white background - Timeout in DNS + TOR network unavailable Broken Presence settings Away when screen is off -- cgit v1.2.3 From 65b5504e68e36116234bd69126304d6d764b678b Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 1 Dec 2015 17:15:36 +0100 Subject: introduce config.java variable to optionally show number of connected accounts in notification --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 9f257363..e312bd59 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -548,4 +548,5 @@ Server- or .onion-Address This is not a valid port number This is not a valid hostname + %1$d of %2$d accounts connected -- cgit v1.2.3 From e1aeb376ac80af214947143572cc381660fe3023 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Wed, 4 Nov 2015 21:08:06 -0600 Subject: =?UTF-8?q?s/.../=E2=80=A6/=20in=20default=20strings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index e312bd59..5b3ef186 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -218,7 +218,7 @@ Own OMEMO fingerprint Other devices Trust OMEMO Fingerprints - Fetching keys... + Fetching keys… Done Verify Decrypt @@ -478,7 +478,7 @@ Offering %s Hide offline Disable Account - %s is typing... + %s is typing… %s has stopped typing Typing notifications Let your contact know when you are writing a new message -- cgit v1.2.3 From 8455e5b5dd82371d58b2d5e7474779cd6ee5d5f3 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 2 Dec 2015 12:54:55 +0100 Subject: hide message content in notifications in paranoia mode --- src/main/res/values/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index e312bd59..69f964d7 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -549,4 +549,8 @@ This is not a valid port number This is not a valid hostname %1$d of %2$d accounts connected + + %d message + %d messages + -- cgit v1.2.3 From 0329c9c7384b4518514555fca70a968241acb1be Mon Sep 17 00:00:00 2001 From: Philip Flohr Date: Fri, 6 Nov 2015 11:14:05 +0100 Subject: users are now able to crop their avatar pictures using the android-crop library --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 69f964d7..59c5e1c0 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -314,6 +314,7 @@ \n\nhttps://github.com/kyleduo/SwitchButton\n(Apache License, Version 2.0) \n\nhttps://github.com/WhisperSystems/libaxolotl-java\n(GPLv3) \n\nhttps://github.com/vinc3m1/RoundedImageView\n(Apache License, Version 2.0) + \n\nhttps://github.com/jdamcd/android-crop\n(Apache License, Version 2.0) Quiet Hours Start time -- cgit v1.2.3 From 3553b15c9f018471172bfce83c536baf2812b6d4 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 2 Dec 2015 17:24:56 +0100 Subject: renamed x509 verified omemo to v\OMEMO --- src/main/res/values/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 0726375d..584b419f 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -82,7 +82,7 @@ Send unencrypted message Send OTR encrypted message Send OMEMO encrypted message - Send OMEMO (X.509 verified) encrypted message + Send v\\OMEMO encrypted message Send OpenPGP encrypted message Your nickname has been changed Send unencrypted @@ -212,9 +212,9 @@ Your fingerprint OTR fingerprint OMEMO fingerprint - OMEMO fingerprint (X.509 verified) + v\\OMEMO fingerprint OMEMO fingerprint of message - OMEMO fingerprint (X.509 verified) of message + v\\OMEMO fingerprint of message Own OMEMO fingerprint Other devices Trust OMEMO Fingerprints -- cgit v1.2.3 From 739a2d609d15be7472575adb937e9a0b164dd4a9 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 6 Dec 2015 11:55:37 +0100 Subject: implement direct sharing in android 6.0. fixes #1321 --- src/main/res/values/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 584b419f..ffbb69ce 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -91,6 +91,7 @@ Conversations utilizes a third party app called OpenKeychain to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n(Please restart Conversations afterwards.) Restart Install + Please install OpenKeychain offering… waiting… No OpenPGP Key found @@ -554,4 +555,6 @@ %d message %d messages + Shared file with %s + Shared image with %s -- cgit v1.2.3 From c3e8fb3446237dee34bf49436076a10d07e2efdf Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 6 Dec 2015 18:23:59 +0100 Subject: request storage permission when needed on Android 6.0 --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index ffbb69ce..78046040 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -557,4 +557,5 @@ Shared file with %s Shared image with %s + Conversations need access to external storage -- cgit v1.2.3 From 739648e909446c83fe1474636b8465a7ef91cce2 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 7 Dec 2015 00:33:50 +0100 Subject: ask for contact permissions when first opening StartConversationActivity --- src/main/res/values/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 78046040..25af5be1 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -558,4 +558,7 @@ Shared file with %s Shared image with %s Conversations need access to external storage + 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. + Synchronize now -- cgit v1.2.3 From ac06cb2e4f8f4d2821265847376e651b08c38e31 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 7 Dec 2015 13:17:06 +0100 Subject: modified contact permission dialog --- src/main/res/values/strings.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 25af5be1..d3cda866 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -559,6 +559,5 @@ Shared image with %s Conversations need access to external storage 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. - Synchronize now + 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. -- cgit v1.2.3 From f46cbb38a92ff5281a974ecc0932ba5459c7334e Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 23 Dec 2015 19:18:53 +0100 Subject: show certificate information --- src/main/res/values/strings.xml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index d3cda866..2666e98d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -560,4 +560,11 @@ Conversations need access to external storage 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 + SHA1 + (Not available) -- cgit v1.2.3 From c40372fc0d1bc81650321b0166c06a0be05ac0a2 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 23 Dec 2015 22:30:14 +0100 Subject: code cleanup --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 2666e98d..1035ff83 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -567,4 +567,5 @@ Organization SHA1 (Not available) + No certificate found -- cgit v1.2.3 From 501034fe0eb267f5100f4dd799fb1454fe7ba1a4 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 4 Jan 2016 17:27:51 +0100 Subject: Allow entering a JID from 'choose contact'. thanks @singpolyma fixes #1611 fixes #1602 --- src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 1035ff83..3e4d2c68 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -226,12 +226,14 @@ Conferences Search Create Contact + Enter Contact Join Conference Delete Contact View contact details Block contact Unblock contact Create + Select The contact already exists Join Conference address -- cgit v1.2.3 From a3e136b5504641f9782b9d94e35311dad19fbc1d Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 8 Jan 2016 21:30:46 +0100 Subject: show per conference notification settings in details activity --- src/main/res/values/strings.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 3e4d2c68..b0d630a9 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -111,8 +111,6 @@ Also vibrate when a new message arrives Sound Play ringtone with notification - Notifications in Public Conferences - Always notify when a message arrives in a public conference instead of only when highlighted Notification grace period Disable notifications for a short time after a carbon copy was received Advanced Options @@ -570,4 +568,8 @@ SHA1 (Not available) No certificate found + Notify on all messages + Notify only when highlighted + Notifications disabled + Notifications paused -- cgit v1.2.3 From 9dce42ac7f5270614fdc89282f2799fd92378dbe Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 8 Jan 2016 21:35:20 +0100 Subject: don't show snackbar when notifications are disabled or paused --- src/main/res/values/strings.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index b0d630a9..049a5dc6 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -266,7 +266,6 @@ Skip Disable notifications Disable notifications for this conversation - Notifications are disabled Enable Conference requires password Enter password -- cgit v1.2.3 From 4ab8fe13dea85e23f856bbe853fbf81af908edea Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 9 Jan 2016 16:17:39 +0100 Subject: let the user decide on whether or not to compress pictures --- src/main/res/values/arrays.xml | 12 ++++++++++++ src/main/res/values/strings.xml | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index 5be352d1..ca63a0f1 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -57,4 +57,16 @@ voice location + + + never + auto + always + + + + @string/never + @string/automatically + @string/always + diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 049a5dc6..deffa64e 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -287,7 +287,7 @@ Build and licensing information Conversations • the very last word in instant messaging. - \n\nCopyright © 2014-2015 Daniel Gultsch + \n\nCopyright © 2014-2016 Daniel Gultsch \n\nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or @@ -571,4 +571,8 @@ Notify only when highlighted Notifications disabled Notifications paused + Compress Pictures + Resize and compressed pictures + Always + Automatically -- cgit v1.2.3 From c296d6f4466e2616432660bb01465f3746e1bb65 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 11 Jan 2016 11:17:45 +0100 Subject: ask to be excluded from battery optimization --- src/main/res/values/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index deffa64e..2185d099 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -575,4 +575,8 @@ Resize and compressed pictures Always Automatically + Battery optimizations enabled + Your phone is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss. It is recommended to disable those. + Your phone is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those. + Disable -- cgit v1.2.3 From 7f1de73784348562b8236b61ba88147196782861 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 11 Jan 2016 15:34:26 +0100 Subject: don't use the word phone in strings --- src/main/res/values/strings.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 2185d099..cdb5ae22 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -11,7 +11,7 @@ Secure conversation Add account Edit name - Add to phone book + Add to address book Delete from roster Block contact Unblock contact @@ -175,7 +175,7 @@ Passwords do not match This is not a valid Jabber ID Out of memory. Image is too large - Do you want to add %s to your devices’s contact list? + Do you want to add %s to your address book? online free to chat away @@ -355,7 +355,6 @@ Verify OTR Remote Fingerprint scan - (or touch phones) Socialist Millionaire Protocol Hint or Question Shared Secret @@ -528,7 +527,7 @@ Away when screen is off Marks your resource as away when the screen is turned off Not available in silent mode - Marks your resource as not available when phone is in silent mode + Marks your resource as not available when device is in silent mode Add account with certificate Unable to parse certificate Leave empty to authenticate w/ certificate @@ -576,7 +575,7 @@ Always Automatically Battery optimizations enabled - Your phone is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss. It is recommended to disable those. - Your phone is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those. + Your device is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\nIt is recommended to disable those. + Your device is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those. Disable -- cgit v1.2.3 From 3bea5b25cd5496cd3f14a66c208b34d0c8e48b03 Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Tue, 12 Jan 2016 09:32:22 +0100 Subject: Add additional warnings to OMEMO purge key function People continue to press the "don't press this" button. Maybe adding some warnings indicating that this button will not fix their problems will help... --- src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index cdb5ae22..4eb518e5 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -408,6 +408,8 @@ Purge key Are you sure you want to purge this key? It will irreversibly be considered compromised, and you can never build a session with it again. + Did you press purge because you are trying to fix some problem? If so, please cancel. This functionality will NOT fix your problem. + Are you sure? You CAN NOT undo this. You have been warned. There are no usable keys available for this contact. If you have purged any of their keys, they need to generate new ones. Error Fetching history from server -- cgit v1.2.3 From da6076028f722d7847cd2e49d69cd17bf0fa012a Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 12 Jan 2016 09:48:49 +0100 Subject: Revert "Add additional warnings to OMEMO purge key function" This reverts commit 3bea5b25cd5496cd3f14a66c208b34d0c8e48b03. --- src/main/res/values/strings.xml | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 4eb518e5..cdb5ae22 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -408,8 +408,6 @@ Purge key Are you sure you want to purge this key? It will irreversibly be considered compromised, and you can never build a session with it again. - Did you press purge because you are trying to fix some problem? If so, please cancel. This functionality will NOT fix your problem. - Are you sure? You CAN NOT undo this. You have been warned. There are no usable keys available for this contact. If you have purged any of their keys, they need to generate new ones. Error Fetching history from server -- cgit v1.2.3 From a6b729df43f30be81ef2f1467fbeb6af47e36761 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Tue, 12 Jan 2016 15:41:39 -0600 Subject: s/TOR/Tor/g --- src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index cdb5ae22..4f17c411 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -521,7 +521,7 @@ Download failed: Could not connect to host Use white background Show received messages as black text on a white background - TOR network unavailable + Tor network unavailable Broken Presence settings Away when screen is off @@ -542,7 +542,7 @@ Your device does not support the selection of client certificates! Connection options Connect via Tor - Tunnel all connections through the TOR network. Requires Orbot + Tunnel all connections through the Tor network. Requires Orbot Hostname Port Server- or .onion-Address -- cgit v1.2.3 From 14428da10835f21d486b746308dfa198b1c87637 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 13 Jan 2016 12:19:56 +0100 Subject: show key fetch error in activity when there are no keys to be used --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 4f17c411..4949fba3 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -408,6 +408,7 @@ Purge key Are you sure you want to purge this key? It will irreversibly be considered compromised, and you can never build a session with it again. + 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. There are no usable keys available for this contact. If you have purged any of their keys, they need to generate new ones. Error Fetching history from server -- cgit v1.2.3 From d85854b686a886d06b4c92b6aaf80e9a3a6d9a2f Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 15 Jan 2016 23:47:16 +0100 Subject: show toast when image cropper get oom --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 4949fba3..69e0eff7 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -579,4 +579,5 @@ Your device is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\nIt is recommended to disable those. Your device is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those. Disable + The selected area is too large -- cgit v1.2.3 From 77c0fb0b2ae257b7bf257417ed689f2334507f2c Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 22 Jan 2016 11:14:56 +0100 Subject: changed spacing in create dialogs and notify user when no accounts are activated --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 69e0eff7..a354435d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -580,4 +580,5 @@ Your device is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those. Disable The selected area is too large + (No activated accounts) -- cgit v1.2.3 From 8850a1fbe3d8affd734b94eb0eb650dc1dfa5bd6 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 23 Jan 2016 20:32:00 +0100 Subject: added FormWrapper and form field validation --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index a354435d..38368383 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -581,4 +581,5 @@ Disable The selected area is too large (No activated accounts) + This field is required -- cgit v1.2.3 From 7c0eae80591ec6b1562168be3d2a56315afc872a Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 25 Jan 2016 21:17:53 +0100 Subject: expert setting to trigger extended connection options --- src/main/res/values/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 38368383..2034082d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -529,6 +529,9 @@ Marks your resource as away when the screen is turned off Not available in silent mode Marks your resource as not available when device is in silent mode + Extended connection options + Show hostname and port options when setting up an account + xmpp.example.com Add account with certificate Unable to parse certificate Leave empty to authenticate w/ certificate -- cgit v1.2.3 From a3e11415ec06945bea88b49c99a5662773c8bf17 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 1 Feb 2016 12:11:40 +0100 Subject: refactored user handling in conferences. show try again button when conference has errors --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 2034082d..febe2ae3 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -242,6 +242,7 @@ You Edit conference subject Conference not found + Unknown error received2 Leave Contact added you to contact list Add back -- cgit v1.2.3 From 1e7647e385a55598843f80fe39fadeda64295f87 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 1 Feb 2016 13:54:08 +0100 Subject: opt out handling of the autojoin flag. fixes #1666 --- src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index febe2ae3..9c472d0c 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -331,6 +331,8 @@ Other Conference name Use room’s subject instead of JID to identify conferences + Automatically join conferences + Respect the autojoin flag in conference bookmarks OTR fingerprint copied to clipboard! OMEMO fingerprint copied to clipboard! You are banned from this conference -- cgit v1.2.3