s/Jabber ID/XMPP address/

Daniel Gultsch created 7 years ago

There are countless arguments on both sides of the Jabber ID vs XMPP address
debate which makes deciding between them a really tough decision.

Pro Jabber ID
* Jabber is easier pronounce
* We have always called it Jabber
* Jabber is more recognizable (This claim can not be backed up by Google Trends)
* Jabber ID has a nicer typography

Pro XMPP address
* People like the term address. People also liked 'Chat address' or
  'Conversations address'. Address is also used in Email address or other
  protocols. Even if people don’t understand the 'XMPP' part of the term they
  might understand the 'address' part and know what is going on.
* While people might have heard of Jabber rather than XMPP; people have heard
  of it in the 00s and associate it with something old. Depending on the
  target audience this is a good thing. And people who value sustainability
  know what XMPP is anyway.
* Jabber is a Cisco product. If we were to succeed in making 'Jabber' cool
  again we don’t want to share that success with Cisco. What has Cisco ever
  done for us? Aside from providing us with a venue for the XSF summit. And
  building nice aqueducts.
* The Cisco owned trademark is a damocles sword. While the XSF technically
  has the right to hand out sublicenses to use the term this can be a lengthy
  process. And automated filter system that for example monitor Google Play
  store descriptions don’t care that the XSF has the rights or that the terms
  of use are more nuanced. They just see a trademark and reject the
  publication. And we all know how impossible it is to speak to an actual
  human at Google.

Change summary

src/main/res/values/strings.xml | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)

Detailed changes

src/main/res/values/strings.xml

@@ -173,11 +173,11 @@
     <string name="mgmt_account_are_you_sure">Are you sure?</string>
     <string name="mgmt_account_delete_confirm_text">If you delete your account, your entire conversation history will be lost</string>
     <string name="attach_record_voice">Record voice</string>
-    <string name="account_settings_jabber_id">Jabber ID</string>
-    <string name="block_jabber_id">Block Jabber ID</string>
+    <string name="account_settings_jabber_id">XMPP address</string>
+    <string name="block_jabber_id">Block XMPP address</string>
     <string name="account_settings_example_jabber_id">[e-mail]</string>
     <string name="password">Password</string>
-    <string name="invalid_jid">This is not a valid Jabber ID</string>
+    <string name="invalid_jid">This is not a valid XMPP address</string>
     <string name="error_out_of_memory">Out of memory. Image is too large</string>
     <string name="add_phone_book_text">Do you want to add %s to your address book?</string>
     <string name="server_info_show_more">Server info</string>
@@ -305,7 +305,7 @@
     <string name="send_again">Send again</string>
     <string name="file_url">File URL</string>
     <string name="url_copied_to_clipboard">Copied URL to clipboard</string>
-    <string name="jabber_id_copied_to_clipboard">Copied Jabber ID to clipboard</string>
+    <string name="jabber_id_copied_to_clipboard">Copied XMPP address to clipboard</string>
     <string name="error_message_copied_to_clipboard">Copied error message to clipboard</string>
     <string name="web_address">web address</string>
     <string name="scan_qr_code">Scan 2D Barcode</string>
@@ -386,7 +386,7 @@
     <string name="conference_options">Private group chat configuration</string>
     <string name="channel_options">Public channel configuration</string>
     <string name="members_only">Private, members only</string>
-    <string name="non_anonymous">Make Jabber IDs visible to anyone</string>
+    <string name="non_anonymous">Make XMPP addresses visible to anyone</string>
     <string name="moderated">Make channel moderated</string>
     <string name="you_are_not_participating">You are not participating</string>
     <string name="modified_conference_options">Modified group chat options!</string>
@@ -476,7 +476,7 @@
     <string name="captcha_required">Captcha required</string>
     <string name="captcha_hint">Enter the text from the image above</string>
     <string name="certificate_chain_is_not_trusted">Certificate chain is not trusted</string>
-    <string name="jid_does_not_match_certificate">Jabber ID does not match certificate</string>
+    <string name="jid_does_not_match_certificate">XMPP address does not match certificate</string>
     <string name="action_renew_certificate">Renew certificate</string>
     <string name="error_fetching_omemo_key">Error fetching OMEMO key!</string>
     <string name="verified_omemo_key_with_certificate">Verified OMEMO key with certificate!</string>
@@ -527,12 +527,12 @@
     <string name="no_application_to_share_uri">No application found to share URI</string>
     <string name="share_uri_with">Share URI with…</string>
     <string name="welcome_header" translatable="false">Join the Conversation</string>
-    <string name="welcome_text">Jabber is a provider independent instant messaging network. You can use this client with what ever Jabber 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.</string>
+    <string name="welcome_text">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.</string>
     <string name="welcome_header_quicksy" translatable="false">Have some Quick Conversations</string>
-    <string name="welcome_text_quicksy"><![CDATA[Quicksy is a spin off of the popular Jabber/XMPP client Conversations with automatic contact discovery.<br><br>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.<br><br>By signing up you agree to our <a href="https://quicksy.im/#privacy">privacy policy</a>.]]></string>
+    <string name="welcome_text_quicksy"><![CDATA[Quicksy is a spin off of the popular XMPP client Conversations with automatic contact discovery.<br><br>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.<br><br>By signing up you agree to our <a href="https://quicksy.im/#privacy">privacy policy</a>.]]></string>
     <string name="agree_and_continue">Agree &amp; continue</string>
-    <string name="magic_create_text">We will guide you through the process of creating an account 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.</string>
-    <string name="your_full_jid_will_be">Your full Jabber ID will be: %s</string>
+    <string name="magic_create_text">We will guide you through the process of creating an account 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.</string>
+    <string name="your_full_jid_will_be">Your full XMPP address will be: %s</string>
     <string name="create_account">Create Account</string>
     <string name="use_own_provider">Use my own provider</string>
     <string name="pick_your_username">Pick your username</string>
@@ -666,7 +666,7 @@
     <string name="yesterday">Yesterday</string>
     <string name="pref_validate_hostname">Validate hostname with DNSSEC</string>
     <string name="pref_validate_hostname_summary">Server certificates that contain the validated hostname are considered verified</string>
-    <string name="certificate_does_not_contain_jid">Certificate does not contain a Jabber ID</string>
+    <string name="certificate_does_not_contain_jid">Certificate does not contain a XMPP address</string>
     <string name="server_info_partial">partial</string>
     <string name="attach_record_video">Record video</string>
     <string name="copy_to_clipboard">Copy to clipboard</string>
@@ -728,7 +728,7 @@
     <string name="pref_use_share_location_plugin">Share Location Plugin</string>
     <string name="pref_use_share_location_plugin_summary">Use the Share Location Plugin instead of the built-in map</string>
     <string name="copy_link">Copy web address</string>
-    <string name="copy_jabber_id">Copy Jabber ID</string>
+    <string name="copy_jabber_id">Copy XMPP address</string>
     <string name="p1_s3_filetransfer">HTTP File Sharing for S3</string>
     <string name="pref_start_search">Direct Search</string>
     <string name="pref_start_search_summary">At ‘Start Conversation’ screen open keyboard and place cursor in search field</string>
@@ -815,7 +815,7 @@
     <string name="install_orbot">Install Orbot</string>
     <string name="start_orbot">Start Orbot</string>
     <string name="no_market_app_installed">No market app installed.</string>
-    <string name="group_chat_will_make_your_jabber_id_public">This channel will make your Jabber ID public</string>
+    <string name="group_chat_will_make_your_jabber_id_public">This channel will make your XMPP address public</string>
     <string name="ebook">e-book</string>
     <string name="video_original">Original (uncompressed)</string>
     <string name="open_with">Open with…</string>
@@ -828,7 +828,7 @@
     <string name="unable_to_restore_backup">Unable to restore backup.</string>
     <string name="unable_to_decrypt_backup">Unable to decrypt backup. Is the password correct?</string>
     <string name="backup_channel_name">Backup &amp; Restore</string>
-    <string name="enter_jabber_id">Enter Jabber ID</string>
+    <string name="enter_jabber_id">Enter XMPP address</string>
     <string name="create_group_chat">Create group chat</string>
     <string name="join_public_channel">Join public channel</string>
     <string name="create_private_group_chat">Create private group chat</string>
@@ -849,8 +849,8 @@
     <string name="admins_can_edit_subject">Admins can edit the topic.</string>
     <string name="owners_can_invite_others">Owners can invite others.</string>
     <string name="anyone_can_invite_others">Anyone can invite others.</string>
-    <string name="jabber_ids_are_visible_to_admins">Jabber IDs are visible to admins.</string>
-    <string name="jabber_ids_are_visible_to_anyone">Jabber IDs are visible to anyone.</string>
+    <string name="jabber_ids_are_visible_to_admins">XMPP addresses are visible to admins.</string>
+    <string name="jabber_ids_are_visible_to_anyone">XMPP addresses are visible to anyone.</string>
     <string name="no_users_hint_channel">This public channel has no participants. Invite your contacts or use the share button to distribute its XMPP address.</string>
     <string name="no_users_hint_group_chat">This private group chat has no participants.</string>
     <string name="manage_permission">Manage privileges</string>