From f82adbac65f30b62c3d5edae29609bcf41a35fac Mon Sep 17 00:00:00 2001 From: lookshe Date: Sun, 3 Apr 2016 19:53:28 +0200 Subject: conversations->conversations+ --- src/main/res/values/strings.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/main/res/values/strings.xml') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 59bf0b9c..3126572d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -59,8 +59,8 @@ 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. + 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 @@ -89,16 +89,16 @@ 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.) + Conversation+s 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 - 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. + 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. + Conversations+ is unable to encrypt your messages because your contacts are not announcing their public key.\n\nPlease ask your contacts to setup OpenPGP. General XMPP resource The name this client identifies itself with @@ -121,7 +121,7 @@ Disable notifications for a short time after a carbon copy was received Advanced Never send crash reports - By sending in stack traces you are helping the ongoing development of Conversations + 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 No confirmation @@ -297,7 +297,7 @@ Warning: This could lead to message loss Expert settings Please be careful with these - About Conversations + About Conversations+ Build and licensing information Conversations+ is the improved version of Conversations. @@ -390,7 +390,7 @@ Verified! Contact requested SMP verification No valid OTR session has been found! - Conversations + Conversations+ Keep service in foreground Prevents the operating system from killing your connection Export Logs @@ -497,7 +497,7 @@ Contact Received %s Disable foreground service - Touch to open Conversations + Touch to open Conversations+ Avatar has been published! Sending %s Offering %s @@ -566,7 +566,7 @@ ask always never - Whether pictures shall be resized or not + Resize pictures before sending? Resize pictures Yes No @@ -636,9 +636,9 @@ Shared file with %s Shared image with %s Shared images with %s - Conversations need access to external storage + 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. + 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 @@ -654,8 +654,8 @@ Always Automatically Battery optimizations enabled - 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. + 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 (No activated accounts) -- cgit v1.2.3