Rebrand Twitter's share / social login button to X

diff --git a/com.woltlab.wcf/templates/accountManagement.tpl b/com.woltlab.wcf/templates/accountManagement.tpl
index 0d29c70e21c252e357fcc7781eada6908aded2c7..b4e4cbc6a0f840cbc5fc6f71aac05572e5adf6bb 100644 (file)
--- a/com.woltlab.wcf/templates/accountManagement.tpl
+++ b/com.woltlab.wcf/templates/accountManagement.tpl
@@ -240,7 +240,7 @@
                                                                {if $__wcf->session->getVar('__3rdPartyProvider') === 'twitter' && $__wcf->session->getVar('__oauthUser')}
                                                                        <label><input type="checkbox" name="twitterConnect" value="1"{if $twitterConnect} checked{/if}> {lang}wcf.user.3rdparty.twitter.connect{/lang}</label>
                                                                {else}
-                                                                       <a href="{link controller='TwitterAuth'}{/link}" class="thirdPartyLoginButton twitterLoginButton button">{icon size=24 name='twitter' type='brand'} <span>{lang}wcf.user.3rdparty.twitter.connect{/lang}</span></a>
+                                                                       <a href="{link controller='TwitterAuth'}{/link}" class="thirdPartyLoginButton twitterLoginButton button">{icon size=24 name='x-twitter' type='brand'} <span>{lang}wcf.user.3rdparty.twitter.connect{/lang}</span></a>
                                                                {/if}
                                                        </dd>
                                                </dl>

diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
index 9fc91e3d91ee02f00dced8f72caade420616cb2b..0a8f3a08e20eac1ddd2c5b34967742be9b558876 100644 (file)
--- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
+++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
@@ -82,7 +82,7 @@ window.addEventListener('pageshow', function(event) {
                                {assign var='__shareProviders' value="\n"|explode:SHARE_BUTTONS_PROVIDERS}
                                shareButtonProviders: [
                                        {if 'Facebook'|in_array:$__shareProviders}["Facebook", "{jslang}wcf.message.share.facebook{/jslang}", {icon size=24 name='facebook' type='brand' encodeJson=true}],{/if} 
-                                       {if 'Twitter'|in_array:$__shareProviders}["Twitter", "{jslang}wcf.message.share.twitter{/jslang}", {icon size=24 name='twitter' type='brand' encodeJson=true}],{/if} 
+                                       {if 'Twitter'|in_array:$__shareProviders}["Twitter", "{jslang}wcf.message.share.twitter{/jslang}", {icon size=24 name='x-twitter' type='brand' encodeJson=true}],{/if} 
                                        {if 'Reddit'|in_array:$__shareProviders}["Reddit", "{jslang}wcf.message.share.reddit{/jslang}", {icon size=24 name='reddit' type='brand' encodeJson=true}],{/if} 
                                        {if 'WhatsApp'|in_array:$__shareProviders}["WhatsApp", "{jslang}wcf.message.share.whatsApp{/jslang}", {icon size=24 name='whatsapp' type='brand' encodeJson=true}],{/if} 
                                        {if 'LinkedIn'|in_array:$__shareProviders}["LinkedIn", "{jslang}wcf.message.share.linkedIn{/jslang}", {icon size=24 name='linkedin-in' type='brand' encodeJson=true}],{/if} 

diff --git a/com.woltlab.wcf/templates/login.tpl b/com.woltlab.wcf/templates/login.tpl
index 0f0ad93d9aecf59a4f7aec146e27a73d26ffcdaf..c3079760b706b182e293f05c734f39557fb39640 100644 (file)
--- a/com.woltlab.wcf/templates/login.tpl
+++ b/com.woltlab.wcf/templates/login.tpl
@@ -103,7 +103,7 @@
                                                                                        href="{link controller='TwitterAuth'}{/link}"
                                                                                        class="button thirdPartyLoginButton twitterLoginButton"
                                                                                        rel="nofollow"
-                                                                               >{icon size=24 name='twitter' type='brand'} <span>{lang}wcf.user.3rdparty.twitter.login{/lang}</span></a>
+                                                                               >{icon size=24 name='x-twitter' type='brand'} <span>{lang}wcf.user.3rdparty.twitter.login{/lang}</span></a>
                                                                        </li>
                                                                {/if}
                                                                

diff --git a/com.woltlab.wcf/templates/shareButtons.tpl b/com.woltlab.wcf/templates/shareButtons.tpl
index 5516d125ce745564b883ff161c088e563a121625..2553c5e4dc0056c5e7e665afd711cc67abaf03e3 100644 (file)
--- a/com.woltlab.wcf/templates/shareButtons.tpl
+++ b/com.woltlab.wcf/templates/shareButtons.tpl
@@ -12,7 +12,7 @@
                {if 'Twitter'|in_array:$__share_buttons_providers}
                        <li>
                                <button type="button" class="button messageShareProvider" title="{lang}wcf.message.share.twitter{/lang}" aria-label="{lang}wcf.message.share.twitter{/lang}" data-identifier="Twitter">
-                                       {icon size=24 name='twitter' type='brand'}
+                                       {icon size=24 name='x-twitter' type='brand'}
                                </button>
                        </li>
                {/if}

diff --git a/wcfsetup/install/files/style/ui/shareButtons.scss b/wcfsetup/install/files/style/ui/shareButtons.scss
index 82a17e725e85bb2bee02184b79a06e89cf6347e6..879880a1a5b803e64215818d18bc3fedb1f7fc29 100644 (file)
--- a/wcfsetup/install/files/style/ui/shareButtons.scss
+++ b/wcfsetup/install/files/style/ui/shareButtons.scss
@@ -24,7 +24,7 @@
 
        .messageShareProvider {
                --background-color-facebook-rgb: 59 89 153;
-               --background-color-twitter-rgb: 85 172 238;
+               --background-color-twitter-rgb: 20 23 26;
                --background-color-reddit-rgb: 255 69 0;
                --background-color-whatsapp-rgb: 37 211 102;
                --background-color-linkedin-rgb: 0 122 182;

diff --git a/wcfsetup/install/files/style/ui/userLogin.scss b/wcfsetup/install/files/style/ui/userLogin.scss
index 519860a5d9ff7ae90b768e41dcca6ef70f8fa634..6831d82c70af51307c74721a8758d1574da96d4a 100644 (file)
--- a/wcfsetup/install/files/style/ui/userLogin.scss
+++ b/wcfsetup/install/files/style/ui/userLogin.scss
@@ -38,10 +38,10 @@
        }
 
        &.twitterLoginButton {
-               background-color: rgb(85, 172, 238);
+               background-color: rgb(20, 23, 26);
 
                &:hover {
-                       background-color: rgb(48, 154, 234);
+                       background-color: rgb(20 23 26 / 87%);
                }
        }
 

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 7d493eca2da265273827b23096f26ae6de56af8e..fd0330fdd83b7dfaa46b6779ee91f759752913c2 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1378,7 +1378,7 @@ Die Entwickler-Lizenz gestattet ausschließlich den Einsatz während der Entwick
                <item name="wcf.acp.option.mail_use_f_param.description"><![CDATA[Der „-f“-Parameter sorgt bei der PHP-Versandmethode dafür, dass der korrekte Absender gesetzt wird. Diese Einstellung wird möglicherweise nicht von jedem Server unterstützt. {if LANGUAGE_USE_INFORMAL_VARIANT}Versuche{else}Versuchen Sie{/if} in diesem Falle die Option zu deaktivieren.]]></item>
                <item name="wcf.acp.option.meta_description"><![CDATA[Meta Description]]></item>
                <item name="wcf.acp.option.og_image"><![CDATA[Standardwert „Open Graph“-Bild]]></item>
-               <item name="wcf.acp.option.og_image.description"><![CDATA[Pfad zur Bilddatei, die beim Verlinken von Inhalten auf Facebook, Twitter und anderen „Social Media“-Seiten standardmäßig eingebunden wird.]]></item>
+               <item name="wcf.acp.option.og_image.description"><![CDATA[Pfad zur Bilddatei, die beim Verlinken von Inhalten auf Facebook, X und anderen „Social Media“-Seiten standardmäßig eingebunden wird.]]></item>
                <item name="wcf.acp.option.page_description"><![CDATA[Seitenbeschreibung]]></item>
                <item name="wcf.acp.option.page_title"><![CDATA[Titel der Seite]]></item>
                <item name="wcf.acp.option.proxy_server_http"><![CDATA[Proxy-Server (HTTP)]]></item>
@@ -1445,9 +1445,9 @@ Die Entwickler-Lizenz gestattet ausschließlich den Einsatz während der Entwick
                <item name="wcf.acp.option.github_public_key"><![CDATA[GitHub Client ID]]></item>
                <item name="wcf.acp.option.github_public_key.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst deine{else}Sie können Ihre{/if} Client ID und {if LANGUAGE_USE_INFORMAL_VARIANT}dein{else}Ihr{/if} Client Secret bei <a href="https://github.com/settings/developers" class="externalURL">GitHub</a> anfordern. Die Callback URL ist: {link controller="GithubAuth" forceFrontend=true}{/link}]]></item>
                <item name="wcf.acp.option.github_private_key"><![CDATA[GitHub Client Secret]]></item>
-               <item name="wcf.acp.option.twitter_public_key"><![CDATA[Twitter API key]]></item>
-               <item name="wcf.acp.option.twitter_public_key.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst deinen{else}Sie können Ihren{/if} API key und {if LANGUAGE_USE_INFORMAL_VARIANT}dein{else}Ihr{/if} API secret bei <a href="https://developer.twitter.com/en/portal/projects-and-apps" class="externalURL">Twitter</a> anfordern. Die Callback URL ist: {link controller="TwitterAuth" forceFrontend=true}{/link}]]></item>
-               <item name="wcf.acp.option.twitter_private_key"><![CDATA[Twitter API secret]]></item>
+               <item name="wcf.acp.option.twitter_public_key"><![CDATA[X API key]]></item>
+               <item name="wcf.acp.option.twitter_public_key.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst deinen{else}Sie können Ihren{/if} API key und {if LANGUAGE_USE_INFORMAL_VARIANT}dein{else}Ihr{/if} API secret bei <a href="https://developer.twitter.com/en/portal/projects-and-apps" class="externalURL">X</a> anfordern. Die Callback URL ist: {link controller="TwitterAuth" forceFrontend=true}{/link}]]></item>
+               <item name="wcf.acp.option.twitter_private_key"><![CDATA[X API secret]]></item>
                <item name="wcf.acp.option.facebook_public_key"><![CDATA[Facebook APP-ID]]></item>
                <item name="wcf.acp.option.facebook_public_key.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst deine{else}Sie können Ihre{/if} APP-ID und {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Anwendungs-Geheimcode bei <a href="https://developers.facebook.com/apps" class="externalURL">Facebook</a> anfordern. Die OAuth redirect URI ist: {link controller="FacebookAuth" forceFrontend=true}{/link}]]></item>
                <item name="wcf.acp.option.facebook_private_key"><![CDATA[Facebook Anwendungs-Geheimcode]]></item>
@@ -4252,7 +4252,7 @@ Dateianhänge:
                <item name="wcf.message.share.permalink.bbcode"><![CDATA[BBCode]]></item>
                <item name="wcf.message.share.permalink.html"><![CDATA[HTML]]></item>
                <item name="wcf.message.share.reddit"><![CDATA[Reddit]]></item>
-               <item name="wcf.message.share.twitter"><![CDATA[Twitter]]></item>
+               <item name="wcf.message.share.twitter"><![CDATA[X]]></item>
                <item name="wcf.message.share.whatsApp"><![CDATA[WhatsApp]]></item>
                <item name="wcf.message.share.linkedIn"><![CDATA[LinkedIn]]></item>
                <item name="wcf.message.share.pinterest"><![CDATA[Pinterest]]></item>
@@ -5172,14 +5172,14 @@ Sobald {if LANGUAGE_USE_INFORMAL_VARIANT}dein{else}Ihr{/if} Benutzerkonto freige
                <item name="wcf.user.3rdparty.github.connect.error.inuse"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Dein{else}Ihr{/if} GitHub-Konto ist bereits mit einem anderen Benutzerkonto verknüpft.]]></item>
                <item name="wcf.user.3rdparty.github.disconnect"><![CDATA[Verknüpfung mit GitHub trennen]]></item>
                <item name="wcf.user.3rdparty.github.disconnect.success"><![CDATA[Die Verknüpfung mit {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} GitHub-Konto wurde erfolgreich getrennt.]]></item>
-               <item name="wcf.user.3rdparty.twitter"><![CDATA[Twitter]]></item>
-               <item name="wcf.user.3rdparty.twitter.login"><![CDATA[Mit Twitter anmelden]]></item>
-               <item name="wcf.user.3rdparty.twitter.register"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du erstellst{else}Sie erstellen{/if} ein Benutzerkonto über {icon size='16' name='twitter' type='brand'}&nbsp;Twitter. Der Benutzername wurde daher bereits ausgefüllt. {if LANGUAGE_USE_INFORMAL_VARIANT}Gib nun noch deine{else}Geben Sie nun noch Ihre{/if} E-Mail-Adresse an und {if LANGUAGE_USE_INFORMAL_VARIANT}du kannst{else}Sie können{/if} sofort loslegen!]]></item>
-               <item name="wcf.user.3rdparty.twitter.connect"><![CDATA[Mit Twitter-Konto {if $__wcf->session->getVar('__twitterUsername')}(„<a href="https://twitter.com/{$__wcf->session->getVar('__twitterUsername')}"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>{$__wcf->session->getVar('__twitterUsername')}</a>“){/if} verknüpfen]]></item>
-               <item name="wcf.user.3rdparty.twitter.connect.success"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Dein{else}Ihr{/if} Benutzerkonto wurde erfolgreich mit {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Twitter-Konto verknüpft.]]></item>
-               <item name="wcf.user.3rdparty.twitter.connect.error.inuse"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Dein{else}Ihr{/if} Twitter-Konto ist bereits mit einem anderen Benutzerkonto verknüpft.]]></item>
-               <item name="wcf.user.3rdparty.twitter.disconnect"><![CDATA[Verknüpfung mit Twitter trennen]]></item>
-               <item name="wcf.user.3rdparty.twitter.disconnect.success"><![CDATA[Die Verknüpfung mit {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Twitter-Konto wurde erfolgreich getrennt.]]></item>
+               <item name="wcf.user.3rdparty.twitter"><![CDATA[X]]></item>
+               <item name="wcf.user.3rdparty.twitter.login"><![CDATA[Mit X anmelden]]></item>
+               <item name="wcf.user.3rdparty.twitter.register"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du erstellst{else}Sie erstellen{/if} ein Benutzerkonto über {icon size='16' name='x-twitter' type='brand'}&nbsp;X. Der Benutzername wurde daher bereits ausgefüllt. {if LANGUAGE_USE_INFORMAL_VARIANT}Gib nun noch deine{else}Geben Sie nun noch Ihre{/if} E-Mail-Adresse an und {if LANGUAGE_USE_INFORMAL_VARIANT}du kannst{else}Sie können{/if} sofort loslegen!]]></item>
+               <item name="wcf.user.3rdparty.twitter.connect"><![CDATA[Mit X-Konto {if $__wcf->session->getVar('__twitterUsername')}(„<a href="https://twitter.com/{$__wcf->session->getVar('__twitterUsername')}"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>{$__wcf->session->getVar('__twitterUsername')}</a>“){/if} verknüpfen]]></item>
+               <item name="wcf.user.3rdparty.twitter.connect.success"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Dein{else}Ihr{/if} Benutzerkonto wurde erfolgreich mit {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} X-Konto verknüpft.]]></item>
+               <item name="wcf.user.3rdparty.twitter.connect.error.inuse"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Dein{else}Ihr{/if} X-Konto ist bereits mit einem anderen Benutzerkonto verknüpft.]]></item>
+               <item name="wcf.user.3rdparty.twitter.disconnect"><![CDATA[Verknüpfung mit X trennen]]></item>
+               <item name="wcf.user.3rdparty.twitter.disconnect.success"><![CDATA[Die Verknüpfung mit {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} X-Konto wurde erfolgreich getrennt.]]></item>
                <item name="wcf.user.3rdparty.facebook"><![CDATA[Facebook]]></item>
                <item name="wcf.user.3rdparty.facebook.login"><![CDATA[Mit Facebook anmelden]]></item>
                <item name="wcf.user.3rdparty.facebook.register"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du erstellst{else}Sie erstellen{/if} ein Benutzerkonto über {icon size='16' name='facebook' type='brand'}&nbsp;Facebook. Der Benutzername und {if LANGUAGE_USE_INFORMAL_VARIANT}deine{else}Ihre{/if} E-Mail-Adresse wurden daher bereits ausgefüllt.]]></item>
@@ -5521,7 +5521,7 @@ Benachrichtigungen auf <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phra
                <item name="wcf.user.option.timezone"><![CDATA[Zeitzone]]></item>
                <item name="wcf.user.option.skype"><![CDATA[Skype]]></item>
                <item name="wcf.user.option.facebook"><![CDATA[Facebook]]></item>
-               <item name="wcf.user.option.twitter"><![CDATA[Twitter]]></item>
+               <item name="wcf.user.option.twitter"><![CDATA[X]]></item>
                <item name="wcf.user.option.canWriteProfileComments"><![CDATA[Kann Pinnwand-Kommentare schreiben]]></item>
                <item name="wcf.user.option.editorPastePreserveFormatting"><![CDATA[Text-Formatierung beim Einfügen in den Editor übernehmen]]></item>
                <item name="wcf.user.option.editorPastePreserveFormatting.description"><![CDATA[Die Deaktivierung dieser Option erzwingt das Einfügen aus der Zwischenablage in reiner Textform, Formatierungen werden dabei entfernt.]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 202fe0578bf27fbdbe681d981e1cbaa65b097469..19ddec068c7914f7435cb695c76ce3da72460ab4 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1356,7 +1356,7 @@ The developer license permits exclusively the use during the development as well
                <item name="wcf.acp.option.mail_use_f_param.description"><![CDATA[The “-f” parameter sets the proper sender of the email if the PHP send method is used. This parameter may not be supported by every server. Try disabling it, if you have trouble sending emails.]]></item>
                <item name="wcf.acp.option.meta_description"><![CDATA[Meta Description]]></item>
                <item name="wcf.acp.option.og_image"><![CDATA[Open Graph Image]]></item>
-               <item name="wcf.acp.option.og_image.description"><![CDATA[Path to the default image that will be displayed when sharing your site on Facebook, Twitter and other social media sites.]]></item>
+               <item name="wcf.acp.option.og_image.description"><![CDATA[Path to the default image that will be displayed when sharing your site on Facebook, X and other social media sites.]]></item>
                <item name="wcf.acp.option.page_description"><![CDATA[Page Description]]></item>
                <item name="wcf.acp.option.page_title"><![CDATA[Page Title]]></item>
                <item name="wcf.acp.option.proxy_server_http"><![CDATA[Proxy-Server (HTTP)]]></item>
@@ -1425,9 +1425,9 @@ The developer license permits exclusively the use during the development as well
                <item name="wcf.acp.option.github_public_key"><![CDATA[GitHub Client ID]]></item>
                <item name="wcf.acp.option.github_public_key.description"><![CDATA[You can obtain both your Client ID and Client Secret at <a href="https://github.com/settings/developers" class="externalURL">GitHub</a>. The Callback URL is: {link controller="GithubAuth" forceFrontend=true}{/link}]]></item>
                <item name="wcf.acp.option.github_private_key"><![CDATA[GitHub Client Secret]]></item>
-               <item name="wcf.acp.option.twitter_public_key"><![CDATA[Twitter API key]]></item>
+               <item name="wcf.acp.option.twitter_public_key"><![CDATA[X API key]]></item>
                <item name="wcf.acp.option.twitter_public_key.description"><![CDATA[You can obtain both your API key and API secret at <a href="https://developer.twitter.com/en/portal/projects-and-apps" class="externalURL">Twitter</a>. The Callback URL is: {link controller="TwitterAuth" forceFrontend=true}{/link}]]></item>
-               <item name="wcf.acp.option.twitter_private_key"><![CDATA[Twitter API secret]]></item>
+               <item name="wcf.acp.option.twitter_private_key"><![CDATA[X API secret]]></item>
                <item name="wcf.acp.option.facebook_public_key"><![CDATA[Facebook APP-ID]]></item>
                <item name="wcf.acp.option.facebook_public_key.description"><![CDATA[You can obtain your APP-ID and Application Secret at <a href="https://developers.facebook.com/apps" class="externalURL">Facebook</a>. The OAuth redirect URI is: {link controller="FacebookAuth" forceFrontend=true}{/link}]]></item>
                <item name="wcf.acp.option.facebook_private_key"><![CDATA[Facebook Application Secret]]></item>
@@ -4198,7 +4198,7 @@ Attachments:
                <item name="wcf.message.share.permalink.bbcode"><![CDATA[BBCode]]></item>
                <item name="wcf.message.share.permalink.html"><![CDATA[HTML]]></item>
                <item name="wcf.message.share.reddit"><![CDATA[Reddit]]></item>
-               <item name="wcf.message.share.twitter"><![CDATA[Twitter]]></item>
+               <item name="wcf.message.share.twitter"><![CDATA[X]]></item>
                <item name="wcf.message.share.whatsApp"><![CDATA[WhatsApp]]></item>
                <item name="wcf.message.share.linkedIn"><![CDATA[LinkedIn]]></item>
                <item name="wcf.message.share.pinterest"><![CDATA[Pinterest]]></item>
@@ -5173,14 +5173,14 @@ You also received a list of backup codes to use when your second factor becomes
                <item name="wcf.user.3rdparty.github.connect.error.inuse"><![CDATA[Your GitHub account is already connected to a different user.]]></item>
                <item name="wcf.user.3rdparty.github.disconnect"><![CDATA[Cancel connection with GitHub]]></item>
                <item name="wcf.user.3rdparty.github.disconnect.success"><![CDATA[Your account is no longer connected with GitHub.]]></item>
-               <item name="wcf.user.3rdparty.twitter"><![CDATA[Twitter]]></item>
-               <item name="wcf.user.3rdparty.twitter.login"><![CDATA[Login with Twitter]]></item>
-               <item name="wcf.user.3rdparty.twitter.register"><![CDATA[You are creating an account through {icon size='16' name='twitter' type='brand'}&nbsp;Twitter. The username has therefore already been entered. Now enter your email address and you can start right away!]]></item>
-               <item name="wcf.user.3rdparty.twitter.connect"><![CDATA[Connect with your Twitter account{if $__wcf->session->getVar('__twitterUsername')} “<a href="https://twitter.com/{$__wcf->session->getVar('__twitterUsername')}"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>{$__wcf->session->getVar('__twitterUsername')}</a>”{/if}.]]></item>
-               <item name="wcf.user.3rdparty.twitter.connect.success"><![CDATA[Your user account has been connected with Twitter.]]></item>
-               <item name="wcf.user.3rdparty.twitter.connect.error.inuse"><![CDATA[Your Twitter account is already connected to a different user.]]></item>
-               <item name="wcf.user.3rdparty.twitter.disconnect"><![CDATA[Cancel connection with Twitter]]></item>
-               <item name="wcf.user.3rdparty.twitter.disconnect.success"><![CDATA[Your account is no longer connected with Twitter.]]></item>
+               <item name="wcf.user.3rdparty.twitter"><![CDATA[X]]></item>
+               <item name="wcf.user.3rdparty.twitter.login"><![CDATA[Login with X]]></item>
+               <item name="wcf.user.3rdparty.twitter.register"><![CDATA[You are creating an account through {icon size='16' name='x-twitter' type='brand'}&nbsp;X. The username has therefore already been entered. Now enter your email address and you can start right away!]]></item>
+               <item name="wcf.user.3rdparty.twitter.connect"><![CDATA[Connect with your X account{if $__wcf->session->getVar('__twitterUsername')} “<a href="https://twitter.com/{$__wcf->session->getVar('__twitterUsername')}"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>{$__wcf->session->getVar('__twitterUsername')}</a>”{/if}.]]></item>
+               <item name="wcf.user.3rdparty.twitter.connect.success"><![CDATA[Your user account has been connected with X.]]></item>
+               <item name="wcf.user.3rdparty.twitter.connect.error.inuse"><![CDATA[Your X account is already connected to a different user.]]></item>
+               <item name="wcf.user.3rdparty.twitter.disconnect"><![CDATA[Cancel connection with X]]></item>
+               <item name="wcf.user.3rdparty.twitter.disconnect.success"><![CDATA[Your account is no longer connected with X.]]></item>
                <item name="wcf.user.3rdparty.facebook"><![CDATA[Facebook]]></item>
                <item name="wcf.user.3rdparty.facebook.login"><![CDATA[Login with Facebook]]></item>
                <item name="wcf.user.3rdparty.facebook.register"><![CDATA[You are creating an account through {icon size='16' name='facebook' type='brand'}&nbsp;Facebook. The username and your email address have therefore already been entered.]]></item>
@@ -5526,7 +5526,7 @@ your notifications on <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phras
                <item name="wcf.user.option.timezone"><![CDATA[Timezone]]></item>
                <item name="wcf.user.option.skype"><![CDATA[Skype]]></item>
                <item name="wcf.user.option.facebook"><![CDATA[Facebook]]></item>
-               <item name="wcf.user.option.twitter"><![CDATA[Twitter]]></item>
+               <item name="wcf.user.option.twitter"><![CDATA[X]]></item>
                <item name="wcf.user.option.canWriteProfileComments"><![CDATA[Can Write Comments on My Wall]]></item>
                <item name="wcf.user.option.editorPastePreserveFormatting"><![CDATA[Preserve text formatting when pasting into the editor]]></item>
                <item name="wcf.user.option.editorPastePreserveFormatting.description"><![CDATA[Disabling this option will force any content to be pasted from clipboard as plain text, stripping all formatting.]]></item>