From 1a450b8d51f92ed501e51d2303e1be31129f1bf2 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Mon, 21 Feb 2022 09:15:12 -0500 Subject: [PATCH] Say XMPP a lot less and Jabber a lot more To be more user friendly --- src/cheogram/res/values/strings.xml | 12 ++++---- src/main/res/values/strings.xml | 46 ++++++++++++++--------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/cheogram/res/values/strings.xml b/src/cheogram/res/values/strings.xml index f9aaec9ee76c1d13908cbde31e32755d139e29b9..9b3ed33aed85bc6d5108850aff0327d45b367e15 100644 --- a/src/cheogram/res/values/strings.xml +++ b/src/cheogram/res/values/strings.xml @@ -1,16 +1,16 @@ - Pick your XMPP provider + Pick your Jabber service Use conversations.im Create new account - Do you already have an XMPP account? This might be the case if you are already using a different XMPP client or have used Conversations before. If not you can create a new XMPP account right now.\nHint: Some email providers also provide XMPP accounts. - XMPP is a provider independent instant messaging network. You can use this client with what ever XMPP server you choose.\nHowever for your convenience we made it easy to create an account on conversations.im¹; a provider specially suited for the use with Conversations. - You have been invited to %1$s. We will guide you through the process of creating an account.\nWhen picking %1$s as a provider you will be able to communicate with users of other providers by giving them your full XMPP address. - You have been invited to %1$s. A username has already been picked for you. We will guide you through the process of creating an account.\nYou will be able to communicate with users of other providers by giving them your full XMPP address. + Do you already have a Jabber ID? This might be the case if you are already using a different Jabber client or have used Cheogram before. If not you can create a new Jabber ID right now.\nHint: Some email providers also provide Jabber IDs. + Jabber is a provider independent instant messaging network, powered by the XMPP protocol. You can use this client with whatever Jabber service you choose. + You have been invited to %1$s. We will guide you through the process of creating an account.\nWhen picking %1$s as a provider you will be able to communicate with users of other providers by giving them your full Jabber ID. + You have been invited to %1$s. A username has already been picked for you. We will guide you through the process of creating an account.\nYou will be able to communicate with users of other providers by giving them your full Jabber ID. Your server invitation Improperly formatted provisioning code Tap the share button to send your contact an invitation to %1$s. If your contact is nearby, they can also scan the code below to accept your invitation. Join %1$s and chat with me: %2$s Share invite with… - \ No newline at end of file + diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 5ad945e6f25d8b903419df06af6b596c02256e5d..c7e986a14a18c1c6cdd3bf2c5067d30547b982fd 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -71,7 +71,7 @@ Save OK %1$s has crashed - Using your XMPP account to send in stack traces helps the ongoing development of %1$s. + Using your Jabber ID to send in stack traces helps the ongoing development of %1$s. Send now Never ask again Could not connect to account @@ -186,11 +186,11 @@ Are you sure? Deleting your account erases your entire conversation history Record voice - XMPP address - Block XMPP address + Jabber ID + Block Jabber ID username@example.com Password - This is not a valid XMPP address + This is not a valid Jabber ID Out of memory. Image too big Do you want to add %s to your address book? Server info @@ -315,7 +315,7 @@ Send again File URL Copied URL to clipboard - Copied XMPP address to clipboard + Copied Jabber ID to clipboard Copied error message to clipboard web address Scan 2D Barcode @@ -397,7 +397,7 @@ Private group chat configuration Public channel configuration Private, members only - Make XMPP addresses visible to anyone + Make Jabber IDs visible to anyone Make channel moderated You are not participating Modified group chat options! @@ -487,7 +487,7 @@ CAPTCHA required Enter the text from the image above Untrusted certificate chain - XMPP address does not match certificate + Jabber ID does not match certificate Renew certificate Error fetching OMEMO key! Verified OMEMO key with certificate! @@ -513,7 +513,7 @@ Grant %1$s access to external storage Grant %1$s access to the camera Synchronize with contacts - %1$s wants permission to access your address book to match it with your XMPP contact list.\nThis will display your contacts’ full names and avatars.\n\n%1$s will only read your address book and match it locally without uploading anything to your server. + %1$s wants permission to access your address book to match it with your Jabber contact list.\nThis will display your contacts’ full names and avatars.\n\n%1$s will only read your address book and match it locally without uploading anything to your server.
We will not store a copy of those phone numbers.\n\nFor more information read our privacy policy.

You will now be asked to grant permission to access your contacts.]]> Notify on all messages Notify only when mentioned @@ -541,8 +541,8 @@ Have some Quick Conversations
You sign up with your phone number and Quicksy will automatically—based on the phone numbers in your address book—suggest possible contacts to you.

By signing up you agree to our privacy policy.]]> Agree and continue - A guide is set up for account creation on conversations.im.¹\nWhen picking conversations.im as a provider you will be able to communicate with users of other providers by giving them your full XMPP address. - Your full XMPP address will be: %s + A guide is set up for account creation on conversations.im.¹\nWhen picking conversations.im as a provider you will be able to communicate with users of other providers by giving them your full Jabber ID. + Your full Jabber ID will be: %s Create Account Use my own provider Pick your username @@ -591,7 +591,7 @@ Remote server not found Remote server timeout Could not update account - Report this XMPP address for spamming. + Report this Jabber ID for spamming. Delete OMEMO identities Regenerate your OMEMO keys. All your contacts will have to verify you again. Only use this as a last resort. Delete selected keys @@ -679,7 +679,7 @@ Yesterday Validate hostname with DNSSEC Server certificates that contain the validated hostname are considered verified - Certificate does not contain a XMPP address + Certificate does not contain a Jabber ID partial Record video Copy to clipboard @@ -741,7 +741,7 @@ Share Location Plugin Use the Share Location Plugin instead of the built-in map Copy web address - Copy XMPP address + Copy Jabber ID HTTP File Sharing for S3 Direct Search At ‘Start Conversation’ screen open keyboard and place cursor in search field @@ -832,7 +832,7 @@ Install Orbot Start Orbot No market app installed. - This channel will make your XMPP address public + This channel will make your Jabber ID public e-book Original (uncompressed) Open with… @@ -845,16 +845,16 @@ Could not restore backup. Could not decrypt backup. Is the password correct? Backup & Restore - Enter XMPP address + Enter Jabber ID Create group chat Join public channel Create private group chat Create public channel Channel name - XMPP address + Jabber ID Please provide a name for the channel - Please provide an XMPP address - This is an XMPP address. Please provide a name. + Please provide a Jabber ID + This is a Jabber ID. Please provide a name. Creating public channel… This channel already exists You’ve joined an existing channel @@ -866,9 +866,9 @@ Admins can edit the topic. Owners can invite others. Anyone can invite others. - XMPP addresses are visible to admins. - XMPP addresses are visible to anyone. - This public channel has no participants. Invite your contacts or use the share button to distribute its XMPP address. + Jabber IDs are visible to admins. + Jabber IDs are visible to anyone. + This public channel has no participants. Invite your contacts or use the share button to distribute its Jabber ID. This private group chat has no participants. Manage privileges Search participants @@ -897,7 +897,7 @@ jabber.network Local server - Most users should choose ‘jabber.network’ for better suggestions from the entirety of the public XMPP ecosystem. + Most users should choose ‘jabber.network’ for better suggestions from the entirety of the public Jabber ecosystem. Channel discovery method Backup About @@ -975,6 +975,6 @@ Unable to enable video. Plain text document Account registrations are not supported - No XMPP address found + No Jabber ID found