From 23121459abfbcf87b5f67c130a3cbc9161940eba Mon Sep 17 00:00:00 2001
From: Nik Clayton <nik@ngo.org.uk>
Date: Thu, 10 Oct 2024 20:15:46 +0200
Subject: [PATCH] refactor: Implement
 SharedPreferencesRepository.showSelfUsername property (#996)

---
 app/src/main/java/app/pachli/MainActivity.kt  |  2 +-
 .../components/compose/ComposeActivity.kt     |  2 +-
 .../preference/PreferencesFragment.kt         | 10 +++---
 app/src/main/res/values-ar/strings.xml        |  3 --
 app/src/main/res/values-be/strings.xml        |  3 --
 app/src/main/res/values-ca/strings.xml        |  3 --
 app/src/main/res/values-cs/strings.xml        |  3 --
 app/src/main/res/values-cy/strings.xml        |  3 --
 app/src/main/res/values-de/strings.xml        |  3 --
 app/src/main/res/values-eo/strings.xml        |  3 --
 app/src/main/res/values-es/strings.xml        |  3 --
 app/src/main/res/values-fa/strings.xml        |  3 --
 app/src/main/res/values-fi/strings.xml        |  3 --
 app/src/main/res/values-fr/strings.xml        |  3 --
 app/src/main/res/values-gd/strings.xml        |  3 --
 app/src/main/res/values-gl/strings.xml        |  3 --
 app/src/main/res/values-hu/strings.xml        |  3 --
 app/src/main/res/values-in/strings.xml        |  2 --
 app/src/main/res/values-is/strings.xml        |  3 --
 app/src/main/res/values-it/strings.xml        |  3 --
 app/src/main/res/values-ja/strings.xml        |  3 --
 app/src/main/res/values-kab/strings.xml       |  1 -
 app/src/main/res/values-lv/strings.xml        |  3 --
 app/src/main/res/values-nb-rNO/strings.xml    |  3 --
 app/src/main/res/values-nl/strings.xml        |  3 --
 app/src/main/res/values-oc/strings.xml        |  3 --
 app/src/main/res/values-pl/strings.xml        |  3 --
 app/src/main/res/values-pt-rBR/strings.xml    |  3 --
 app/src/main/res/values-pt-rPT/strings.xml    |  3 --
 app/src/main/res/values-sa/strings.xml        |  2 --
 app/src/main/res/values-sv/strings.xml        |  3 --
 app/src/main/res/values-tr/strings.xml        |  3 --
 app/src/main/res/values-uk/strings.xml        |  3 --
 app/src/main/res/values-vi/strings.xml        |  3 --
 app/src/main/res/values-zh-rCN/strings.xml    |  3 --
 app/src/main/res/values-zh-rTW/strings.xml    |  3 --
 app/src/main/res/values/donottranslate.xml    |  6 ----
 app/src/main/res/values/string-arrays.xml     |  6 ----
 app/src/main/res/values/strings.xml           |  3 --
 .../core/data/repository/AccountManager.kt    | 17 ++++------
 .../SharedPreferencesRepository.kt            |  4 +++
 .../core/preferences/ShowSelfUsername.kt      | 31 +++++++++++++++++++
 .../src/main/res/values-ar/strings.xml        |  3 ++
 .../src/main/res/values-be/strings.xml        |  3 ++
 .../src/main/res/values-ca/strings.xml        |  3 ++
 .../src/main/res/values-cs/strings.xml        |  3 ++
 .../src/main/res/values-cy/strings.xml        |  3 ++
 .../src/main/res/values-de/strings.xml        |  3 ++
 .../src/main/res/values-eo/strings.xml        |  3 ++
 .../src/main/res/values-es/strings.xml        |  3 ++
 .../src/main/res/values-fa/strings.xml        |  3 ++
 .../src/main/res/values-fi/strings.xml        |  3 ++
 .../src/main/res/values-fr/strings.xml        |  3 ++
 .../src/main/res/values-gd/strings.xml        |  3 ++
 .../src/main/res/values-gl/strings.xml        |  3 ++
 .../src/main/res/values-hu/strings.xml        |  3 ++
 .../src/main/res/values-in/strings.xml        |  2 ++
 .../src/main/res/values-is/strings.xml        |  3 ++
 .../src/main/res/values-it/strings.xml        |  3 ++
 .../src/main/res/values-ja/strings.xml        |  3 ++
 .../src/main/res/values-kab/strings.xml       |  1 +
 .../src/main/res/values-lv/strings.xml        |  3 ++
 .../src/main/res/values-nb-rNO/strings.xml    |  3 ++
 .../src/main/res/values-nl/strings.xml        |  3 ++
 .../src/main/res/values-oc/strings.xml        |  3 ++
 .../src/main/res/values-pl/strings.xml        |  3 ++
 .../src/main/res/values-pt-rBR/strings.xml    |  3 ++
 .../src/main/res/values-pt-rPT/strings.xml    |  3 ++
 .../src/main/res/values-sa/strings.xml        |  2 ++
 .../src/main/res/values-sv/strings.xml        |  3 ++
 .../src/main/res/values-tr/strings.xml        |  3 ++
 .../src/main/res/values-uk/strings.xml        |  3 ++
 .../src/main/res/values-vi/strings.xml        |  3 ++
 .../src/main/res/values-zh-rCN/strings.xml    |  3 ++
 .../src/main/res/values-zh-rTW/strings.xml    |  3 ++
 .../src/main/res/values/strings.xml           |  3 ++
 76 files changed, 145 insertions(+), 129 deletions(-)
 create mode 100644 core/preferences/src/main/kotlin/app/pachli/core/preferences/ShowSelfUsername.kt

diff --git a/app/src/main/java/app/pachli/MainActivity.kt b/app/src/main/java/app/pachli/MainActivity.kt
index 88321bcd9..c439416a1 100644
--- a/app/src/main/java/app/pachli/MainActivity.kt
+++ b/app/src/main/java/app/pachli/MainActivity.kt
@@ -1247,7 +1247,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider {
         header.clear()
         header.profiles = profiles
         header.setActiveProfile(accountManager.activeAccount!!.id)
-        binding.mainToolbar.subtitle = if (accountManager.shouldDisplaySelfUsername(this)) {
+        binding.mainToolbar.subtitle = if (accountManager.shouldDisplaySelfUsername()) {
             accountManager.activeAccount!!.fullName
         } else {
             null
diff --git a/app/src/main/java/app/pachli/components/compose/ComposeActivity.kt b/app/src/main/java/app/pachli/components/compose/ComposeActivity.kt
index 4e8499a05..5c3ada3ae 100644
--- a/app/src/main/java/app/pachli/components/compose/ComposeActivity.kt
+++ b/app/src/main/java/app/pachli/components/compose/ComposeActivity.kt
@@ -276,7 +276,7 @@ class ComposeActivity :
         setupButtons()
         subscribeToUpdates(mediaAdapter)
 
-        if (accountManager.shouldDisplaySelfUsername(this)) {
+        if (accountManager.shouldDisplaySelfUsername()) {
             binding.composeUsernameView.text = getString(
                 R.string.compose_active_account_description,
                 activeAccount.fullName,
diff --git a/app/src/main/java/app/pachli/components/preference/PreferencesFragment.kt b/app/src/main/java/app/pachli/components/preference/PreferencesFragment.kt
index 59d2881c6..161327189 100644
--- a/app/src/main/java/app/pachli/components/preference/PreferencesFragment.kt
+++ b/app/src/main/java/app/pachli/components/preference/PreferencesFragment.kt
@@ -55,6 +55,7 @@ import app.pachli.core.preferences.DownloadLocation
 import app.pachli.core.preferences.MainNavigationPosition
 import app.pachli.core.preferences.PrefKeys
 import app.pachli.core.preferences.SharedPreferencesRepository
+import app.pachli.core.preferences.ShowSelfUsername
 import app.pachli.core.ui.extensions.await
 import app.pachli.core.ui.makeIcon
 import app.pachli.databinding.AccountNotificationDetailsListItemBinding
@@ -196,13 +197,10 @@ class PreferencesFragment : PreferenceFragmentCompat() {
                     icon = makeIcon(GoogleMaterial.Icon.gmd_format_size)
                 }
 
-                listPreference {
-                    setDefaultValue("disambiguate")
-                    setEntries(R.array.pref_show_self_username_names)
-                    setEntryValues(R.array.pref_show_self_username_values)
-                    key = PrefKeys.SHOW_SELF_USERNAME
-                    setSummaryProvider { entry }
+                enumListPreference<ShowSelfUsername> {
+                    setDefaultValue(ShowSelfUsername.DISAMBIGUATE)
                     setTitle(R.string.pref_title_show_self_username)
+                    key = PrefKeys.SHOW_SELF_USERNAME
                     isSingleLineTitle = false
                 }
 
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index af22c2fd7..fff13b87c 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -482,7 +482,6 @@
     <string name="error_image_edit_failed">لا يمكن تحرير الصورة.</string>
     <string name="title_edits">التعديلات</string>
     <string name="pref_title_notification_filter_reports">هناك شكوى جديدة</string>
-    <string name="pref_show_self_username_never">أبداً</string>
     <string name="notification_subscription_description">تشغيل الاشعارات عندما يقوم شخص انت مشترك معه بنشر منشور جديد</string>
     <string name="notification_update_description">ارسال إشعار عند تحرير المنشورات التي تفاعلت معها</string>
     <string name="notification_report_name">شكاوي</string>
@@ -529,7 +528,6 @@
     <string name="error_following_hashtags_unsupported">مثيل الخادم هذا لا يدعم متابعة الوسوم.</string>
     <string name="action_discard">تجاهل التعديلات</string>
     <string name="action_continue_edit">الاستمرار في التعديل</string>
-    <string name="pref_show_self_username_always">دائماً</string>
     <string name="post_media_alt">ALT</string>
     <string name="notification_header_report_format">%s أبلغ عن %s</string>
     <string name="notification_summary_report_format">%s · %d منشورات ملحقة</string>
@@ -544,7 +542,6 @@
     <string name="send_account_link_to">شارك رابط الحساب الى…</string>
     <string name="send_account_username_to">شارك اسم مستخدم الحساب إلى…</string>
     <string name="account_username_copied">تم نسخ اسم المستخدم</string>
-    <string name="pref_show_self_username_disambiguate">عند تسجيل الدخول إلى حسابات متعددة</string>
     <string name="status_created_at_now">الآن</string>
     <string name="action_unfollow_hashtag_format">الغاء متابعة #%s ؟</string>
     <string name="mute_notifications_switch">كتم الاشعارات</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index a00006db4..180fcaf36 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -131,12 +131,9 @@
     <string name="post_privacy_unlisted">Схаваныя</string>
     <string name="post_privacy_followers_only">Толькі для падпісчыкаў</string>
     <string name="post_text_size_small">Маленькі</string>
-    <string name="pref_show_self_username_disambiguate">Калі вы ўвайшлі ў некалькі ўліковых запісаў</string>
-    <string name="pref_show_self_username_never">Ніколі</string>
     <string name="post_text_size_medium">Сярэдні</string>
     <string name="post_text_size_large">Вялікі</string>
     <string name="post_text_size_largest">Найбольшы</string>
-    <string name="pref_show_self_username_always">Заўсёды</string>
     <string name="notification_follow_request_name">Запыты на падпіску</string>
     <string name="notification_follow_request_description">Апавяшчаць аб запытах на падпіску</string>
     <string name="notification_boost_name">Пашырэнні</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 296baf7b5..b890b7b15 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -428,9 +428,6 @@
     <string name="pref_summary_http_proxy_invalid">&lt;no vàlid&gt;</string>
     <string name="error_following_hashtags_unsupported">Aquesta instància no admet seguir hashtags.</string>
     <string name="notification_sign_up_format">%s s\'ha registrat</string>
-    <string name="pref_show_self_username_always">Sempre</string>
-    <string name="pref_show_self_username_disambiguate">Quan s\'inicien la sessió amb diversos comptes</string>
-    <string name="pref_show_self_username_never">Mai</string>
     <string name="error_unmuting_hashtag_format">S\'ha produït un error en activar #%s</string>
     <string name="error_muting_hashtag_format">S\'ha produït un error en silenciar #%s</string>
     <string name="post_edited">S\'ha editat %s</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index cdb92d001..edfac90b5 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -437,8 +437,6 @@
     <string name="draft_deleted">Koncept byl smazán</string>
     <string name="failed_to_pin">Připnutí se nezdařilo</string>
     <string name="failed_to_unpin">Zrušení připnutí se nezdařilo</string>
-    <string name="pref_show_self_username_always">Vždy</string>
-    <string name="pref_show_self_username_never">Nikdy</string>
     <string name="filter_expiration_format">%s (%s)</string>
     <string name="action_edit_image">Upravit obrázek</string>
     <string name="duration_14_days">14 dní</string>
@@ -449,7 +447,6 @@
     <string name="pref_title_notification_filter_updates">příspěvek, se kterým jsem interagoval/a, je upraven</string>
     <string name="pref_title_notification_filter_sign_ups">někdo se zaregistroval</string>
     <string name="pref_title_notification_filter_subscriptions">někdo, ke komu jsem přihlášen/a, zveřejnil nový příspěvek</string>
-    <string name="pref_show_self_username_disambiguate">Když je přihlášeno více účtů</string>
     <string name="notification_subscription_name">Nové příspěvky</string>
     <string name="notification_sign_up_name">Registrace</string>
     <string name="notification_sign_up_description">Oznámení o nových uživatelích</string>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 1154ae9b4..cfd436368 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -330,8 +330,6 @@
     <string name="duration_6_hours">6 awr</string>
     <string name="duration_1_day">Diwrnod</string>
     <string name="unpin_action">Dadbinio</string>
-    <string name="pref_show_self_username_never">Byth</string>
-    <string name="pref_show_self_username_always">Bob tro</string>
     <string name="post_media_attachments">Atodiadau</string>
     <string name="action_edit_image">Golygu llun</string>
     <string name="title_reblogged_by">Hybwyd gan</string>
@@ -438,7 +436,6 @@
     </plurals>
     <string name="conversation_1_recipients">%1$s</string>
     <string name="description_post_edited">Golygwyd</string>
-    <string name="pref_show_self_username_disambiguate">Pan fydd cyfrifon lluosog wedi\'u mewngofnodi</string>
     <string name="drafts_failed_loading_reply">Wedi methu llwytho gwybodaeth Ateb</string>
     <string name="pref_title_alway_open_spoiler">Agor negeseuon wedi\'u marcio â rhybudd cynnwys bob tro</string>
     <string name="profile_metadata_label_label">Label</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4543fd55b..e4a50be31 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -470,9 +470,6 @@
     <string name="pref_title_show_self_username">Profilname in der Hauptnavigation anzeigen</string>
     <string name="failed_to_pin">Anheften fehlgeschlagen</string>
     <string name="failed_to_unpin">Lösen fehlgeschlagen</string>
-    <string name="pref_show_self_username_always">Immer</string>
-    <string name="pref_show_self_username_disambiguate">Wenn mit mehreren Konten angemeldet</string>
-    <string name="pref_show_self_username_never">Niemals</string>
     <string name="filter_expiration_format">%s (%s)</string>
     <string name="description_post_language">Sprache des Beitrags</string>
     <string name="action_set_focus">Fokuspunkt setzen</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 0d5b50d4e..df38cd7c3 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -467,9 +467,6 @@
     <string name="delete_scheduled_post_warning">Ĉu forigi tiun planitan mesaĝon\?</string>
     <string name="duration_no_change">(Neniu ŝanĝo)</string>
     <string name="filter_expiration_format">%s (%s)</string>
-    <string name="pref_show_self_username_always">Ĉiam</string>
-    <string name="pref_show_self_username_disambiguate">Kiam vi uzas plurajn kontojn</string>
-    <string name="pref_show_self_username_never">Neniam</string>
     <string name="pref_title_show_self_username">Montri uzantnomon en ilobreto</string>
     <string name="description_post_language">Mesaĝolingvo</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 8e4dd275f..1e8cb8573 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -446,8 +446,6 @@
     <string name="pref_title_confirm_favourites">Pedir confirmación antes de marcar como favorito</string>
     <string name="pref_title_notification_filter_updates">una publicación con la que interactué se editó</string>
     <string name="error_image_edit_failed">Esta imagen no puede ser editada.</string>
-    <string name="pref_show_self_username_always">Siempre</string>
-    <string name="pref_show_self_username_never">Nunca</string>
     <string name="action_add_reaction">añadir reacción</string>
     <string name="pref_title_notification_filter_sign_ups">alguien se registró</string>
     <string name="error_following_hashtag_format">Error al seguir #%s</string>
@@ -464,7 +462,6 @@
     <string name="duration_365_days">365 días</string>
     <string name="failed_to_pin">Fallo al fijar</string>
     <string name="failed_to_unpin">Fallo al quitarlo</string>
-    <string name="pref_show_self_username_disambiguate">Cuando hay varias cuentas ingresadas</string>
     <string name="notification_sign_up_description">Notificaciones de nuevos usuarios</string>
     <string name="notification_update_name">Ediciones de una publicación</string>
     <string name="notification_update_description">Notificaciones cuando se editan publicaciones con las que has interactuado</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index ffd16497f..b9b4201a8 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -461,9 +461,6 @@
     <string name="failed_to_unpin">شکست در برداشتن سنجاق</string>
     <string name="error_image_edit_failed">تصویر نتوانست ویرایش شود.</string>
     <string name="description_post_language">زبان فرسته</string>
-    <string name="pref_show_self_username_always">همیشه</string>
-    <string name="pref_show_self_username_disambiguate">هنگام ورود چندین حساب</string>
-    <string name="pref_show_self_username_never">هرگز</string>
     <string name="pref_title_show_self_username">نمایش نام کاربری در نوارابزارها</string>
     <string name="action_add_reaction">افزودن واکنش</string>
     <string name="action_set_focus">تنظیم نقطهٔ تمرکز</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 54a85af22..b68294b1c 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -229,8 +229,6 @@
     <string name="pref_title_alway_show_sensitive_media">Näytä aina arkaluonteinen sisältö</string>
     <string name="send_post_notification_cancel_title">Lähettäminen peruutettu</string>
     <string name="description_visibility_private">Seuraajat</string>
-    <string name="pref_show_self_username_always">Aina</string>
-    <string name="pref_show_self_username_never">Ei koskaan</string>
     <string name="notification_boost_name">Buustaukset</string>
     <string name="notification_favourite_name">Suosikit</string>
     <string name="notification_poll_name">Äänestykset</string>
@@ -348,7 +346,6 @@
     <string name="pref_title_notification_filter_subscriptions">seuraamani tili on tehnyt uuden julkaisun</string>
     <string name="pref_title_custom_tabs">Käytä Chromen sisäänrakennettuja välilehtiä</string>
     <string name="pref_summary_http_proxy_missing">&lt;ei asetettu&gt;</string>
-    <string name="pref_show_self_username_disambiguate">Kun kirjauduttu useammalla tilille</string>
     <string name="notification_boost_description">Ilmoitukset julkaisujesi tehostuksista</string>
     <string name="notification_favourite_description">Ilmoitukset julkaisujesi tykkäyksistä</string>
     <string name="notification_follow_request_description">Ilmoitukset seuraamispyynnöistä</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index f40ad7245..29dddb2e7 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -469,8 +469,6 @@
     <string name="error_image_edit_failed">L\'image n’a pas pu être retouchée.</string>
     <string name="delete_scheduled_post_warning">Supprimer ce message planifié \?</string>
     <string name="filter_expiration_format">%s (%s)</string>
-    <string name="pref_show_self_username_always">Toujours</string>
-    <string name="pref_show_self_username_never">Jamais</string>
     <string name="description_post_language">Langue du message</string>
     <string name="duration_no_change">(Aucune modification)</string>
     <string name="action_add_reaction">ajouter une réaction</string>
@@ -492,7 +490,6 @@
     <string name="action_set_focus">Définir le point focal</string>
     <string name="hint_description">Description</string>
     <string name="post_media_image">Image</string>
-    <string name="pref_show_self_username_disambiguate">Quand plusieurs comptes sont connectés</string>
     <string name="action_post_failed">Le téléversement a échoué</string>
     <string name="action_post_failed_show_drafts">Afficher les brouillons</string>
     <string name="action_post_failed_do_nothing">Ignorer</string>
diff --git a/app/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml
index 9bdf96330..f316a255e 100644
--- a/app/src/main/res/values-gd/strings.xml
+++ b/app/src/main/res/values-gd/strings.xml
@@ -475,9 +475,6 @@
     <string name="pref_title_show_self_username">Seall an t-ainm-cleachdaiche air na bàraichean-inneal</string>
     <string name="set_focus_description">Thoir gogag no slaod an cearcall a thaghadh puing an fhòcais a chithear air na dealbhagan an-còmhnaidh.</string>
     <string name="description_post_language">Cànan a’ phuist</string>
-    <string name="pref_show_self_username_always">An-còmhnaidh</string>
-    <string name="pref_show_self_username_disambiguate">Nuair a bhios iomadh cunntas air an clàradh a-steach</string>
-    <string name="pref_show_self_username_never">Chan ann idir</string>
     <string name="filter_expiration_format">%s (%s)</string>
     <string name="action_set_focus">Suidhich puing an fhòcais</string>
     <string name="delete_scheduled_post_warning">A bheil thu airson am post sgeidealaichte seo a sguabadh às\?</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index a8a88b287..25ff32fa2 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -460,9 +460,6 @@
     <string name="delete_scheduled_post_warning">Eliminar publicación programada\?</string>
     <string name="failed_to_pin">Fallo ao Fixar</string>
     <string name="failed_to_unpin">Fallo ao Desafixar</string>
-    <string name="pref_show_self_username_always">Sempre</string>
-    <string name="pref_show_self_username_disambiguate">Cando hai máis dunha conta activa</string>
-    <string name="pref_show_self_username_never">Nunca</string>
     <string name="notification_report_description">Notificacións sobre temas de moderación</string>
     <string name="report_category_spam">Spam</string>
     <string name="action_unfollow_hashtag_format">Non seguir #%s\?</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 25ef312ba..8a989af5a 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -459,9 +459,6 @@
     <string name="set_focus_description">Koppintsd vagy húzd a kört, hogy kijelöld azt a fókuszpontot, mely mindig látható lesz az előnézetekben.</string>
     <string name="filter_expiration_format">%s (%s)</string>
     <string name="description_post_language">Bejegyzés nyelve</string>
-    <string name="pref_show_self_username_always">Mindig</string>
-    <string name="pref_show_self_username_disambiguate">Ha több fiók is be van jelentkezve</string>
-    <string name="pref_show_self_username_never">Soha</string>
     <string name="duration_no_change">(Nincs változás)</string>
     <string name="action_set_focus">Fókuszpont beállítása</string>
     <string name="error_following_hashtag_format">Hiba a #%s követésekor</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index d806574bd..449b7d2cc 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -91,8 +91,6 @@
     <string name="post_text_size_medium">Sedang</string>
     <string name="post_text_size_large">Besar</string>
     <string name="post_text_size_largest">Terbesar</string>
-    <string name="pref_show_self_username_always">Selalu</string>
-    <string name="pref_show_self_username_never">Jangan Pernah</string>
     <string name="notification_follow_name">Pengikut Baru</string>
     <string name="notification_follow_description">Notifikasi tentang pengikut baru</string>
     <string name="notification_sign_up_name">Daftar</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 9eb3ca242..408546f88 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -458,10 +458,7 @@
     <string name="compose_save_draft_loses_media">Vista drög\? (Viðhengi verða send inn aftur þegar þú endurheimtir drögin.)</string>
     <string name="failed_to_pin">Mistókst að festa</string>
     <string name="failed_to_unpin">Mistókst að losa</string>
-    <string name="pref_show_self_username_always">Alltaf</string>
-    <string name="pref_show_self_username_disambiguate">Þegar er skráð inn á mörgum aðgöngum</string>
     <string name="action_set_focus">Setja virknistað</string>
-    <string name="pref_show_self_username_never">Aldrei</string>
     <string name="pref_title_show_self_username">Birta notandanafn á verkfærastikum</string>
     <string name="pref_default_post_language">Sjálfgefið tungumál færslna</string>
     <string name="language_display_name_format">%s (%s)</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index dd53c0aec..c27ae5d54 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -493,9 +493,6 @@
     <string name="set_focus_description">Tappa o crea un cerchio per scegliere il punto focale che sarà sempre visibile nelle anteprime.</string>
     <string name="action_set_focus">Imposta punto focale</string>
     <string name="description_post_language">Lingua del post</string>
-    <string name="pref_show_self_username_always">Sempre</string>
-    <string name="pref_show_self_username_never">Mai</string>
-    <string name="pref_show_self_username_disambiguate">Quando connesso con più account</string>
     <string name="duration_no_change">(nessuna modifica)</string>
     <string name="pref_title_show_self_username">Mostra nome utente nella barra strumenti</string>
     <string name="compose_save_draft_loses_media">Salvare bozza? (gli allegati verranno ricaricati quando ripristini la bozza.)</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index d85e85395..a3a984063 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -407,9 +407,6 @@
     <string name="description_post_reblogged">リブログしました</string>
     <string name="saving_draft">下書きの保存中…</string>
     <string name="pref_default_post_language">デフォルトの投稿言語</string>
-    <string name="pref_show_self_username_always">常に表示</string>
-    <string name="pref_show_self_username_disambiguate">複数アカウントでのログイン時</string>
-    <string name="pref_show_self_username_never">表示しない</string>
     <string name="notification_subscription_name">新しい投稿</string>
     <string name="notification_subscription_description">あなたが購読した誰かが新しい投稿をしたときの通知</string>
     <string name="filter_dialog_whole_word">単語全体</string>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 4b10b81b8..bcd780893 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -242,7 +242,6 @@
     <string name="translation_provider_fmt">%1$s</string>
     <string name="hint_description">Aglam</string>
     <string name="label_image">Tugna</string>
-    <string name="pref_show_self_username_never">Werǧin</string>
     <string name="post_media_audio">Imesli</string>
     <string name="status_count_one_plus">1+</string>
     <string name="status_created_at_now">tura</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 5874a47cc..b1239ddc8 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -90,8 +90,6 @@
     <string name="post_text_size_medium">Vidējs</string>
     <string name="post_text_size_large">Liels</string>
     <string name="post_text_size_largest">Lielākais</string>
-    <string name="pref_show_self_username_always">Vienmēr</string>
-    <string name="pref_show_self_username_never">Nekad</string>
     <string name="notification_poll_name">Aptaujas</string>
     <string name="notification_report_name">Ziņojumi</string>
     <string name="about_pachli_version">Pachli %s</string>
@@ -399,7 +397,6 @@
     <string name="add_account_description">Pievienot jaunu Mastodon kontu</string>
     <string name="pref_title_animate_custom_emojis">Animēt pielāgotās emocijzīmes</string>
     <string name="notification_sign_up_name">Jaunu dalībnieku reģistrācija</string>
-    <string name="pref_show_self_username_disambiguate">Kad pievienoti vairāki konti</string>
     <string name="restart_required">Nepieciešama lietotnes restartēšana</string>
     <string name="reblog_private">Pastiprināt sākotnējai auditorijai</string>
     <string name="description_post_reblogged">Pastiprināts</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 436b601b8..c2a2e0ae2 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -456,9 +456,6 @@
     <string name="description_post_language">Innleggspråk</string>
     <string name="action_set_focus">Sett fokuspunkt</string>
     <string name="set_focus_description">Trykk eller dra sirkelen for å velge fokuspunktet som alltid skal være synlig i miniatyrbilder.</string>
-    <string name="pref_show_self_username_always">Alltid</string>
-    <string name="pref_show_self_username_disambiguate">Når flere konti er logget inn</string>
-    <string name="pref_show_self_username_never">Aldri</string>
     <string name="pref_title_show_self_username">Vis brukernavn på verktøylinjer</string>
     <string name="delete_scheduled_post_warning">Slette dette planlagte innlegget\?</string>
     <string name="compose_save_draft_loses_media">Lagre utkast\? (Vedlegg vil bli lastet opp igjen når du fortsetter å jobbe på utkastet.)</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 0fa3c0038..27362b792 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -458,9 +458,6 @@
     <string name="duration_no_change">(geen verandering)</string>
     <string name="pref_title_show_self_username">Gebruikersnaam op werkbalken tonen</string>
     <string name="set_focus_description">Tik of sleep de cirkel naar een centraal focuspunt dat op elke thumbnail zichtbaar moet blijven.</string>
-    <string name="pref_show_self_username_always">Altijd</string>
-    <string name="pref_show_self_username_disambiguate">Wanneer meerdere accounts zijn ingelogd</string>
-    <string name="pref_show_self_username_never">Nooit</string>
     <string name="filter_expiration_format">%s (%s)</string>
     <string name="action_set_focus">Focuspunt instellen</string>
     <string name="error_following_hashtag_format">Fout tijdens het volgen van #%s</string>
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index 8b1147c38..762caf44f 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -427,8 +427,6 @@
     <string name="failed_to_pin">Fracàs en penjant</string>
     <string name="failed_to_unpin">Fracàs en despenjant</string>
     <string name="description_post_language">Lenga de la publicacion</string>
-    <string name="pref_show_self_username_always">Totjorn</string>
-    <string name="pref_show_self_username_never">Jamai</string>
     <string name="notification_update_name">Publicacions modificadas</string>
     <string name="status_count_one_plus">&gt;1</string>
     <string name="duration_14_days">14 jorns</string>
@@ -450,7 +448,6 @@
     <string name="duration_365_days">365 jorns</string>
     <string name="set_focus_description">Tocatz o lisatz lo cercle per causir lo punt focal que deu aparéisser sus las miniaturas.</string>
     <string name="pref_title_show_self_username">Mostrar lo nom d’utilizaire dins la barra d’aisinas</string>
-    <string name="pref_show_self_username_disambiguate">Quand mai d’un compte es connectat</string>
     <string name="action_set_focus">Posicionar lo punt focal</string>
     <string name="title_migration_relogin">Se tornar connectar per recebre las notificacions instantanèas</string>
     <string name="pref_title_confirm_favourites">Demandar confirmacion abans d’apondre en favorit</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 6b2c80e37..1fd5643ba 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -487,9 +487,6 @@
     <string name="set_focus_description">Naciśnij lub przeciągnij kółko, aby wybrać punkt centralny, który będzie zawsze widoczny w miniaturkach.</string>
     <string name="action_unfollow_hashtag_format">Odobserwuj #%s\?</string>
     <string name="pref_default_post_language">Domyślny język wpisów</string>
-    <string name="pref_show_self_username_never">Nigdy</string>
-    <string name="pref_show_self_username_always">Zawsze</string>
-    <string name="pref_show_self_username_disambiguate">Gdy wiele kont jest zalogowanych</string>
     <string name="status_created_at_now">teraz</string>
     <string name="action_add_reaction">dodaj reakcję</string>
     <string name="notification_header_report_format">%s zgłosił/a %s</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 77f3fe3a6..5f00ce429 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -453,10 +453,8 @@
     <string name="pref_summary_http_proxy_disabled">Desabilitado</string>
     <string name="pref_summary_http_proxy_missing">&lt;não definido&gt;</string>
     <string name="pref_summary_http_proxy_invalid">&lt;inválido&gt;</string>
-    <string name="pref_show_self_username_always">Sempre</string>
     <string name="error_image_edit_failed">A imagem não pôde ser editada.</string>
     <string name="hint_media_description_missing">A mídia deve ter uma descrição.</string>
-    <string name="pref_show_self_username_never">Nunca</string>
     <string name="post_media_alt">ALT</string>
     <string name="error_muting_hashtag_format">Erro ao silenciar #%s</string>
     <string name="account_username_copied">Nome de usuário copiado</string>
@@ -479,7 +477,6 @@
     <string name="report_category_violation">Violação de regra</string>
     <string name="report_category_spam">Spam</string>
     <string name="report_category_other">Outros</string>
-    <string name="pref_show_self_username_disambiguate">Quando várias contas estão conectadas</string>
     <string name="pref_title_http_proxy_port_message">A porta deve estar entre %d e %d</string>
     <string name="status_count_one_plus">1+</string>
     <string name="status_created_at_now">agora</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 9cdec2816..b550ff7c6 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -465,9 +465,6 @@
     <string name="set_focus_description">Toca ou arrasta o círculo para escolher o ponto de focagem que estará sempre visível nas pré-visualizações.</string>
     <string name="filter_expiration_format">%s(%s)</string>
     <string name="duration_no_change">(Sem alteração)</string>
-    <string name="pref_show_self_username_always">Sempre</string>
-    <string name="pref_show_self_username_disambiguate">Quando autenticado em várias contas</string>
-    <string name="pref_show_self_username_never">Nunca</string>
     <string name="description_post_language">Idioma da publicação</string>
     <string name="pref_title_show_self_username">Mostrar o nome de utilizador nas barras de ferramentas</string>
     <string name="action_set_focus">Define o ponto de focagem</string>
diff --git a/app/src/main/res/values-sa/strings.xml b/app/src/main/res/values-sa/strings.xml
index fc48d9c14..e2b23c9d5 100644
--- a/app/src/main/res/values-sa/strings.xml
+++ b/app/src/main/res/values-sa/strings.xml
@@ -402,7 +402,6 @@
     <string name="duration_365_days">३६५ दिनानि</string>
     <string name="duration_no_change">(परिवर्तनं नास्ति)</string>
     <string name="review_notifications">सूचनाः सम्दृश्यन्ताम्</string>
-    <string name="pref_show_self_username_never">न कदापि</string>
     <string name="pref_default_post_language">पूर्वनिविष्टा प्रकाशका भाषा</string>
     <string name="notification_report_name">आवेदनानि</string>
     <string name="notification_update_name">सम्पादनानि निवेद्यन्ताम्</string>
@@ -415,7 +414,6 @@
     <string name="report_category_other">अन्यम्</string>
     <string name="dialog_delete_conversation_warning">इदं सम्भाषणं निष्कास्यताम् \?</string>
     <string name="pref_title_notification_filter_sign_ups">कश्चन पञ्जीकरणम् अकरोत्</string>
-    <string name="pref_show_self_username_always">सर्वदा</string>
     <string name="notification_subscription_name">नूतन-प्रकटनानि</string>
     <string name="notification_sign_up_name">पञ्जीकरणानि</string>
     <string name="no_announcements">उद्घोषणाः न सन्ति।</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 7b8762501..92a09aa01 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -426,14 +426,11 @@
     <string name="delete_scheduled_post_warning">Radera detta schemalagda inlägg\?</string>
     <string name="error_unfollowing_hashtag_format">Kunde inte avfölja #%s</string>
     <string name="dialog_delete_conversation_warning">Radera denna konversation\?</string>
-    <string name="pref_show_self_username_always">Alltid</string>
     <string name="set_focus_description">Tryck eller dra cirkeln för att välja fokuspunkten som alltid kommer synas i miniatyrbilder.</string>
     <string name="label_duration">Varaktighet</string>
     <string name="duration_indefinite">Oändligt</string>
     <string name="action_unsubscribe_account">Sluta prenumerera</string>
     <string name="description_post_language">Inläggsspråk</string>
-    <string name="pref_show_self_username_disambiguate">När flera konton är inloggade</string>
-    <string name="pref_show_self_username_never">Aldrig</string>
     <string name="notification_sign_up_name">Registreringar</string>
     <string name="notification_sign_up_description">Notiser om nya användare</string>
     <string name="notification_update_name">Inläggsredigeringar</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index c780d746f..232984d87 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -403,9 +403,6 @@
     <string name="account_note_saved">Kaydedildi!</string>
     <string name="report_category_spam">İstenmeyen</string>
     <string name="report_category_other">Diğer</string>
-    <string name="pref_show_self_username_always">Daima</string>
-    <string name="pref_show_self_username_disambiguate">Birden fazla oturum açıldığında</string>
-    <string name="pref_show_self_username_never">Asla</string>
     <string name="pref_title_confirm_favourites">Gözdelere eklemeden önce onay kutusunu göster</string>
     <string name="error_unmuting_hashtag_format">Susturmayı kaldırma hatası #%s</string>
     <string name="pref_title_notification_filter_reports">yeni bir rapor olduğunda</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 51d509cff..f022b00af 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -475,10 +475,7 @@
     <string name="description_post_language">Мова допису</string>
     <string name="duration_no_change">(Не змінено)</string>
     <string name="action_set_focus">Налаштувати точку фокусування</string>
-    <string name="pref_show_self_username_always">Завжди</string>
     <string name="set_focus_description">Торкніться або перетягніть коло, щоб вибрати точку фокусування, яку завжди буде видно на мініатюрах.</string>
-    <string name="pref_show_self_username_disambiguate">Якщо ви ввійшли у кілька облікових записів</string>
-    <string name="pref_show_self_username_never">Ніколи</string>
     <string name="pref_title_show_self_username">Показувати ім\'я користувача на панелях інструментів</string>
     <string name="delete_scheduled_post_warning">Видалити цей запланований допис\?</string>
     <string name="failed_to_pin">Не вдалося прикріпити</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 761635cc9..0603e96c9 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -445,9 +445,6 @@
     <string name="action_set_focus">Chọn tâm điểm</string>
     <string name="set_focus_description">Nhấn hoặc kéo vòng tròn để chọn tiêu điểm sẽ hiển thị trong hình thu nhỏ.</string>
     <string name="pref_title_show_self_username">Hiện URL của tôi trên tab</string>
-    <string name="pref_show_self_username_always">Luôn luôn</string>
-    <string name="pref_show_self_username_disambiguate">Khi đăng nhập nhiều tài khoản</string>
-    <string name="pref_show_self_username_never">Không hiện</string>
     <string name="delete_scheduled_post_warning">Bạn có chắc muốn xóa tút đã lên lịch\?</string>
     <string name="compose_save_draft_loses_media">Lưu bản nháp\? (Bạn sẽ cần tải lên lại file đính kèm)</string>
     <string name="failed_to_unpin">Không thể bỏ ghim</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 2aa91803d..c1cc4db3d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -458,10 +458,7 @@
     <string name="description_post_language">嘟文语言</string>
     <string name="action_set_focus">设置焦点</string>
     <string name="set_focus_description">轻按或拖动圆圈选择始终在缩略图中可见的焦点。</string>
-    <string name="pref_show_self_username_disambiguate">登录多个账户时</string>
     <string name="pref_title_show_self_username">在工具栏中显示用户名</string>
-    <string name="pref_show_self_username_always">始终</string>
-    <string name="pref_show_self_username_never">从不</string>
     <string name="delete_scheduled_post_warning">删除这条定时嘟文吗？</string>
     <string name="compose_save_draft_loses_media">保存草稿？（恢复草稿时附件将被再次上传）</string>
     <string name="failed_to_pin">固定失败</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index e5064f27b..f4a444cab 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -445,9 +445,6 @@
     <string name="pref_title_show_self_username">在工具列顯示使用者名稱</string>
     <string name="pref_title_confirm_favourites">標註為喜歡前顯示確認對話框</string>
     <string name="account_date_joined">加入自 %1$s</string>
-    <string name="pref_show_self_username_always">總是</string>
-    <string name="pref_show_self_username_disambiguate">登入多個帳號時</string>
-    <string name="pref_show_self_username_never">從不</string>
     <string name="notification_sign_up_name">註冊</string>
     <string name="notification_sign_up_description">新使用者通知</string>
     <string name="notification_update_name">嘟文編輯</string>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 68f1e320f..631b2dd29 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -176,12 +176,6 @@
         <item>ja</item>
     </string-array>
 
-    <string-array name="pref_show_self_username_values">
-        <item>always</item>
-        <item>disambiguate</item>
-        <item>never</item>
-    </string-array>
-
     <string-array name="poll_duration_names">
         <item>@string/duration_5_min</item>
         <item>@string/duration_30_min</item>
diff --git a/app/src/main/res/values/string-arrays.xml b/app/src/main/res/values/string-arrays.xml
index 69a534cc0..98fc722be 100644
--- a/app/src/main/res/values/string-arrays.xml
+++ b/app/src/main/res/values/string-arrays.xml
@@ -14,12 +14,6 @@
         <item>@string/post_text_size_largest</item>
     </string-array>
 
-    <string-array name="pref_show_self_username_names">
-        <item>@string/pref_show_self_username_always</item>
-        <item>@string/pref_show_self_username_disambiguate</item>
-        <item>@string/pref_show_self_username_never</item>
-    </string-array>
-
     <string-array name="filter_contexts">
         <item>@string/title_home</item>
         <item>@string/title_notifications</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c5335d617..b1ea9ae13 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -296,9 +296,6 @@
     <string name="post_text_size_medium">Medium</string>
     <string name="post_text_size_large">Large</string>
     <string name="post_text_size_largest">Largest</string>
-    <string name="pref_show_self_username_always">Always</string>
-    <string name="pref_show_self_username_disambiguate">When multiple accounts logged in</string>
-    <string name="pref_show_self_username_never">Never</string>
     <string name="notification_mention_name">New mentions</string>
     <string name="notification_mention_descriptions">Notifications about new mentions</string>
     <string name="notification_follow_name">New followers</string>
diff --git a/core/data/src/main/kotlin/app/pachli/core/data/repository/AccountManager.kt b/core/data/src/main/kotlin/app/pachli/core/data/repository/AccountManager.kt
index 7703b0c01..35e439de2 100644
--- a/core/data/src/main/kotlin/app/pachli/core/data/repository/AccountManager.kt
+++ b/core/data/src/main/kotlin/app/pachli/core/data/repository/AccountManager.kt
@@ -17,7 +17,6 @@
 
 package app.pachli.core.data.repository
 
-import android.content.Context
 import app.pachli.core.common.di.ApplicationScope
 import app.pachli.core.database.dao.AccountDao
 import app.pachli.core.database.dao.RemoteKeyDao
@@ -25,8 +24,8 @@ import app.pachli.core.database.model.AccountEntity
 import app.pachli.core.network.model.Account
 import app.pachli.core.network.model.Status
 import app.pachli.core.network.retrofit.InstanceSwitchAuthInterceptor
-import app.pachli.core.preferences.PrefKeys
 import app.pachli.core.preferences.SharedPreferencesRepository
+import app.pachli.core.preferences.ShowSelfUsername
 import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -270,15 +269,11 @@ class AccountManager @Inject constructor(
     /**
      * @return true if the name of the currently-selected account should be displayed in UIs
      */
-    fun shouldDisplaySelfUsername(context: Context): Boolean {
-        val showUsernamePreference = sharedPreferencesRepository.getString(PrefKeys.SHOW_SELF_USERNAME, "disambiguate")
-        if (showUsernamePreference == "always") {
-            return true
+    fun shouldDisplaySelfUsername(): Boolean {
+        return when (sharedPreferencesRepository.showSelfUsername) {
+            ShowSelfUsername.ALWAYS -> true
+            ShowSelfUsername.DISAMBIGUATE -> accounts.size > 1
+            ShowSelfUsername.NEVER -> false
         }
-        if (showUsernamePreference == "never") {
-            return false
-        }
-
-        return accounts.size > 1 // "disambiguate"
     }
 }
diff --git a/core/preferences/src/main/kotlin/app/pachli/core/preferences/SharedPreferencesRepository.kt b/core/preferences/src/main/kotlin/app/pachli/core/preferences/SharedPreferencesRepository.kt
index 85e42f8ec..f2e4a5201 100644
--- a/core/preferences/src/main/kotlin/app/pachli/core/preferences/SharedPreferencesRepository.kt
+++ b/core/preferences/src/main/kotlin/app/pachli/core/preferences/SharedPreferencesRepository.kt
@@ -73,6 +73,10 @@ class SharedPreferencesRepository @Inject constructor(
     val mainNavigationPosition: MainNavigationPosition
         get() = getEnum(PrefKeys.MAIN_NAV_POSITION, MainNavigationPosition.TOP)
 
+    /** When to show the account's username in the title. */
+    val showSelfUsername: ShowSelfUsername
+        get() = getEnum(PrefKeys.SHOW_SELF_USERNAME, ShowSelfUsername.DISAMBIGUATE)
+
     val tabTapBehaviour: TabTapBehaviour
         get() = getEnum(PrefKeys.TAB_TAP_BEHAVIOUR, TabTapBehaviour.JUMP_TO_NEXT_PAGE)
 
diff --git a/core/preferences/src/main/kotlin/app/pachli/core/preferences/ShowSelfUsername.kt b/core/preferences/src/main/kotlin/app/pachli/core/preferences/ShowSelfUsername.kt
new file mode 100644
index 000000000..8a697faa7
--- /dev/null
+++ b/core/preferences/src/main/kotlin/app/pachli/core/preferences/ShowSelfUsername.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 Pachli Association
+ *
+ * This file is a part of Pachli.
+ *
+ * This 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.
+ *
+ * Pachli 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.
+ *
+ * You should have received a copy of the GNU General Public License along with Pachli; if not,
+ * see <http://www.gnu.org/licenses>.
+ */
+
+package app.pachli.core.preferences
+
+/** When to show the account's username in the title. */
+enum class ShowSelfUsername(override val displayResource: Int, override val value: String? = null) :
+    PreferenceEnum {
+    /** Always show the username. */
+    ALWAYS(R.string.pref_show_self_username_always, "always"),
+
+    /** Show the username if more than one account is logged in. */
+    DISAMBIGUATE(R.string.pref_show_self_username_disambiguate, "disambiguate"),
+
+    /** Never show the username. */
+    NEVER(R.string.pref_show_self_username_never, "never"),
+}
diff --git a/core/preferences/src/main/res/values-ar/strings.xml b/core/preferences/src/main/res/values-ar/strings.xml
index 127f882a2..e8d16481b 100644
--- a/core/preferences/src/main/res/values-ar/strings.xml
+++ b/core/preferences/src/main/res/values-ar/strings.xml
@@ -16,4 +16,7 @@
     <string name="pref_category_tabs">الألسنة</string>
     <string name="pref_main_nav_position_option_top">الأعلى</string>
     <string name="pref_main_nav_position_option_bottom">الأسفل</string>
+    <string name="pref_show_self_username_always">دائماً</string>
+    <string name="pref_show_self_username_disambiguate">عند تسجيل الدخول إلى حسابات متعددة</string>
+    <string name="pref_show_self_username_never">أبداً</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-be/strings.xml b/core/preferences/src/main/res/values-be/strings.xml
index 6af73c0b4..868a18ad5 100644
--- a/core/preferences/src/main/res/values-be/strings.xml
+++ b/core/preferences/src/main/res/values-be/strings.xml
@@ -10,4 +10,7 @@
     <string name="pref_category_tabs">Укладкі</string>
     <string name="pref_main_nav_position_option_top">Зверху</string>
     <string name="pref_main_nav_position_option_bottom">Знізу</string>
+    <string name="pref_show_self_username_always">Заўсёды</string>
+    <string name="pref_show_self_username_disambiguate">Калі вы ўвайшлі ў некалькі ўліковых запісаў</string>
+    <string name="pref_show_self_username_never">Ніколі</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-ca/strings.xml b/core/preferences/src/main/res/values-ca/strings.xml
index 4e33ec26a..b9ce22e43 100644
--- a/core/preferences/src/main/res/values-ca/strings.xml
+++ b/core/preferences/src/main/res/values-ca/strings.xml
@@ -16,4 +16,7 @@
     <string name="pref_category_tabs">Pestanyes</string>
     <string name="pref_main_nav_position_option_top">A dalt</string>
     <string name="pref_main_nav_position_option_bottom">A baix</string>
+    <string name="pref_show_self_username_always">Sempre</string>
+    <string name="pref_show_self_username_disambiguate">Quan s\'inicien la sessió amb diversos comptes</string>
+    <string name="pref_show_self_username_never">Mai</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-cs/strings.xml b/core/preferences/src/main/res/values-cs/strings.xml
index f345acede..20da45c26 100644
--- a/core/preferences/src/main/res/values-cs/strings.xml
+++ b/core/preferences/src/main/res/values-cs/strings.xml
@@ -16,4 +16,7 @@
     <string name="pref_category_tabs">Panely</string>
     <string name="pref_main_nav_position_option_top">Nahoře</string>
     <string name="pref_main_nav_position_option_bottom">Dole</string>
+    <string name="pref_show_self_username_always">Vždy</string>
+    <string name="pref_show_self_username_disambiguate">Když je přihlášeno více účtů</string>
+    <string name="pref_show_self_username_never">Nikdy</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-cy/strings.xml b/core/preferences/src/main/res/values-cy/strings.xml
index f7982d28f..0370acca8 100644
--- a/core/preferences/src/main/res/values-cy/strings.xml
+++ b/core/preferences/src/main/res/values-cy/strings.xml
@@ -9,4 +9,7 @@
     <string name="pref_category_tabs">Tabiau</string>
     <string name="pref_main_nav_position_option_top">Brig</string>
     <string name="pref_main_nav_position_option_bottom">Gwaelod</string>
+    <string name="pref_show_self_username_always">Bob tro</string>
+    <string name="pref_show_self_username_disambiguate">Pan fydd cyfrifon lluosog wedi\'u mewngofnodi</string>
+    <string name="pref_show_self_username_never">Byth</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-de/strings.xml b/core/preferences/src/main/res/values-de/strings.xml
index a442ac177..f343b6cdf 100644
--- a/core/preferences/src/main/res/values-de/strings.xml
+++ b/core/preferences/src/main/res/values-de/strings.xml
@@ -16,4 +16,7 @@
     <string name="pref_category_tabs">Tabs</string>
     <string name="pref_main_nav_position_option_top">Oben</string>
     <string name="pref_main_nav_position_option_bottom">Unten</string>
+    <string name="pref_show_self_username_always">Immer</string>
+    <string name="pref_show_self_username_disambiguate">Wenn mit mehreren Konten angemeldet</string>
+    <string name="pref_show_self_username_never">Niemals</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-eo/strings.xml b/core/preferences/src/main/res/values-eo/strings.xml
index af3229a65..8dfc16a91 100644
--- a/core/preferences/src/main/res/values-eo/strings.xml
+++ b/core/preferences/src/main/res/values-eo/strings.xml
@@ -16,4 +16,7 @@
     <string name="pref_category_tabs">Langetoj</string>
     <string name="pref_main_nav_position_option_top">Supro</string>
     <string name="pref_main_nav_position_option_bottom">Malsupro</string>
+    <string name="pref_show_self_username_always">Ĉiam</string>
+    <string name="pref_show_self_username_disambiguate">Kiam vi uzas plurajn kontojn</string>
+    <string name="pref_show_self_username_never">Neniam</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-es/strings.xml b/core/preferences/src/main/res/values-es/strings.xml
index cb2e73881..9ab132a5d 100644
--- a/core/preferences/src/main/res/values-es/strings.xml
+++ b/core/preferences/src/main/res/values-es/strings.xml
@@ -16,4 +16,7 @@
     <string name="pref_category_tabs">Pestañas</string>
     <string name="pref_main_nav_position_option_top">Arriba</string>
     <string name="pref_main_nav_position_option_bottom">Abajo</string>
+    <string name="pref_show_self_username_always">Siempre</string>
+    <string name="pref_show_self_username_disambiguate">Cuando hay varias cuentas ingresadas</string>
+    <string name="pref_show_self_username_never">Nunca</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-fa/strings.xml b/core/preferences/src/main/res/values-fa/strings.xml
index cf96d6c39..fe062c007 100644
--- a/core/preferences/src/main/res/values-fa/strings.xml
+++ b/core/preferences/src/main/res/values-fa/strings.xml
@@ -16,4 +16,7 @@
     <string name="pref_category_tabs">زبانه‌ها</string>
     <string name="pref_main_nav_position_option_top">بالا</string>
     <string name="pref_main_nav_position_option_bottom">پایین</string>
+    <string name="pref_show_self_username_always">همیشه</string>
+    <string name="pref_show_self_username_disambiguate">هنگام ورود چندین حساب</string>
+    <string name="pref_show_self_username_never">هرگز</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-fi/strings.xml b/core/preferences/src/main/res/values-fi/strings.xml
index a5d52c90c..726a4f182 100644
--- a/core/preferences/src/main/res/values-fi/strings.xml
+++ b/core/preferences/src/main/res/values-fi/strings.xml
@@ -16,4 +16,7 @@
     <string name="pref_category_tabs">Välilehdet</string>
     <string name="pref_main_nav_position_option_top">Yläreuna</string>
     <string name="pref_main_nav_position_option_bottom">Alareuna</string>
+    <string name="pref_show_self_username_always">Aina</string>
+    <string name="pref_show_self_username_disambiguate">Kun kirjauduttu useammalla tilille</string>
+    <string name="pref_show_self_username_never">Ei koskaan</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-fr/strings.xml b/core/preferences/src/main/res/values-fr/strings.xml
index 836965976..9e1307578 100644
--- a/core/preferences/src/main/res/values-fr/strings.xml
+++ b/core/preferences/src/main/res/values-fr/strings.xml
@@ -16,4 +16,7 @@
     <string name="tab_tap_behaviour_jump_to_newest">Aller au contenu le plus récent</string>
     <string name="pref_main_nav_position_option_top">Haut</string>
     <string name="pref_main_nav_position_option_bottom">Bas</string>
+    <string name="pref_show_self_username_always">Toujours</string>
+    <string name="pref_show_self_username_disambiguate">Quand plusieurs comptes sont connectés</string>
+    <string name="pref_show_self_username_never">Jamais</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-gd/strings.xml b/core/preferences/src/main/res/values-gd/strings.xml
index 07fa20f73..f189e61f5 100644
--- a/core/preferences/src/main/res/values-gd/strings.xml
+++ b/core/preferences/src/main/res/values-gd/strings.xml
@@ -9,4 +9,7 @@
     <string name="pref_category_tabs">Tabaichean</string>
     <string name="pref_main_nav_position_option_top">Aig a’ bhàrr</string>
     <string name="pref_main_nav_position_option_bottom">Aig a’ bhonn</string>
+    <string name="pref_show_self_username_always">An-còmhnaidh</string>
+    <string name="pref_show_self_username_disambiguate">Nuair a bhios iomadh cunntas air an clàradh a-steach</string>
+    <string name="pref_show_self_username_never">Chan ann idir</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-gl/strings.xml b/core/preferences/src/main/res/values-gl/strings.xml
index 8543e7ad2..489e91f92 100644
--- a/core/preferences/src/main/res/values-gl/strings.xml
+++ b/core/preferences/src/main/res/values-gl/strings.xml
@@ -13,4 +13,7 @@
     <string name="pref_category_tabs">Lapelas</string>
     <string name="pref_main_nav_position_option_top">Arriba</string>
     <string name="pref_main_nav_position_option_bottom">Abaixo</string>
+    <string name="pref_show_self_username_always">Sempre</string>
+    <string name="pref_show_self_username_disambiguate">Cando hai máis dunha conta activa</string>
+    <string name="pref_show_self_username_never">Nunca</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-hu/strings.xml b/core/preferences/src/main/res/values-hu/strings.xml
index d0c61457b..b704b3522 100644
--- a/core/preferences/src/main/res/values-hu/strings.xml
+++ b/core/preferences/src/main/res/values-hu/strings.xml
@@ -16,4 +16,7 @@
     <string name="pref_category_tabs">Fülek</string>
     <string name="pref_main_nav_position_option_top">Fent</string>
     <string name="pref_main_nav_position_option_bottom">Lent</string>
+    <string name="pref_show_self_username_always">Mindig</string>
+    <string name="pref_show_self_username_disambiguate">Ha több fiók is be van jelentkezve</string>
+    <string name="pref_show_self_username_never">Soha</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-in/strings.xml b/core/preferences/src/main/res/values-in/strings.xml
index 3224ceb5c..2d6ef1abb 100644
--- a/core/preferences/src/main/res/values-in/strings.xml
+++ b/core/preferences/src/main/res/values-in/strings.xml
@@ -16,4 +16,6 @@
     <string name="pref_category_tabs">Tab</string>
     <string name="pref_main_nav_position_option_top">Atas</string>
     <string name="pref_main_nav_position_option_bottom">Bawah</string>
+    <string name="pref_show_self_username_always">Selalu</string>
+    <string name="pref_show_self_username_never">Jangan Pernah</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-is/strings.xml b/core/preferences/src/main/res/values-is/strings.xml
index 26e2345f3..705f928f8 100644
--- a/core/preferences/src/main/res/values-is/strings.xml
+++ b/core/preferences/src/main/res/values-is/strings.xml
@@ -9,4 +9,7 @@
     <string name="pref_category_tabs">Flipar</string>
     <string name="pref_main_nav_position_option_top">Efst</string>
     <string name="pref_main_nav_position_option_bottom">Neðst</string>
+    <string name="pref_show_self_username_always">Alltaf</string>
+    <string name="pref_show_self_username_disambiguate">Þegar er skráð inn á mörgum aðgöngum</string>
+    <string name="pref_show_self_username_never">Aldrei</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-it/strings.xml b/core/preferences/src/main/res/values-it/strings.xml
index a81a63595..32127b142 100644
--- a/core/preferences/src/main/res/values-it/strings.xml
+++ b/core/preferences/src/main/res/values-it/strings.xml
@@ -16,4 +16,7 @@
     <string name="pref_category_tabs">Schede</string>
     <string name="pref_main_nav_position_option_top">In cima</string>
     <string name="pref_main_nav_position_option_bottom">In fondo</string>
+    <string name="pref_show_self_username_always">Sempre</string>
+    <string name="pref_show_self_username_disambiguate">Quando connesso con più account</string>
+    <string name="pref_show_self_username_never">Mai</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-ja/strings.xml b/core/preferences/src/main/res/values-ja/strings.xml
index 0c3d1a705..8d6986611 100644
--- a/core/preferences/src/main/res/values-ja/strings.xml
+++ b/core/preferences/src/main/res/values-ja/strings.xml
@@ -16,4 +16,7 @@
     <string name="pref_category_tabs">タブ</string>
     <string name="pref_main_nav_position_option_top">上部</string>
     <string name="pref_main_nav_position_option_bottom">下部</string>
+    <string name="pref_show_self_username_always">常に表示</string>
+    <string name="pref_show_self_username_disambiguate">複数アカウントでのログイン時</string>
+    <string name="pref_show_self_username_never">表示しない</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-kab/strings.xml b/core/preferences/src/main/res/values-kab/strings.xml
index e9d797280..ebf30dc58 100644
--- a/core/preferences/src/main/res/values-kab/strings.xml
+++ b/core/preferences/src/main/res/values-kab/strings.xml
@@ -8,4 +8,5 @@
     <string name="pref_category_tabs">Iccaren</string>
     <string name="pref_main_nav_position_option_top">Afella</string>
     <string name="pref_main_nav_position_option_bottom">Adda</string>
+    <string name="pref_show_self_username_never">Werǧin</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-lv/strings.xml b/core/preferences/src/main/res/values-lv/strings.xml
index 594395f4b..36c6900f7 100644
--- a/core/preferences/src/main/res/values-lv/strings.xml
+++ b/core/preferences/src/main/res/values-lv/strings.xml
@@ -11,4 +11,7 @@
     <string name="pref_category_tabs">Cilnes</string>
     <string name="pref_main_nav_position_option_top">Augšā</string>
     <string name="pref_main_nav_position_option_bottom">Apakšā</string>
+    <string name="pref_show_self_username_always">Vienmēr</string>
+    <string name="pref_show_self_username_disambiguate">Kad pievienoti vairāki konti</string>
+    <string name="pref_show_self_username_never">Nekad</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-nb-rNO/strings.xml b/core/preferences/src/main/res/values-nb-rNO/strings.xml
index 46dfe8a0d..feb3ff24b 100644
--- a/core/preferences/src/main/res/values-nb-rNO/strings.xml
+++ b/core/preferences/src/main/res/values-nb-rNO/strings.xml
@@ -11,4 +11,7 @@
     <string name="pref_category_tabs">Faner</string>
     <string name="pref_main_nav_position_option_top">Topp</string>
     <string name="pref_main_nav_position_option_bottom">Bunn</string>
+    <string name="pref_show_self_username_always">Alltid</string>
+    <string name="pref_show_self_username_disambiguate">Når flere konti er logget inn</string>
+    <string name="pref_show_self_username_never">Aldri</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-nl/strings.xml b/core/preferences/src/main/res/values-nl/strings.xml
index cf8a9c033..7198702b6 100644
--- a/core/preferences/src/main/res/values-nl/strings.xml
+++ b/core/preferences/src/main/res/values-nl/strings.xml
@@ -16,4 +16,7 @@
     <string name="pref_category_tabs">Tabs</string>
     <string name="pref_main_nav_position_option_top">Boven</string>
     <string name="pref_main_nav_position_option_bottom">Onder</string>
+    <string name="pref_show_self_username_always">Altijd</string>
+    <string name="pref_show_self_username_disambiguate">Wanneer meerdere accounts zijn ingelogd</string>
+    <string name="pref_show_self_username_never">Nooit</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-oc/strings.xml b/core/preferences/src/main/res/values-oc/strings.xml
index add00ff99..bf42a15b0 100644
--- a/core/preferences/src/main/res/values-oc/strings.xml
+++ b/core/preferences/src/main/res/values-oc/strings.xml
@@ -9,4 +9,7 @@
     <string name="pref_category_tabs">Onglets</string>
     <string name="pref_main_nav_position_option_top">Ennaut</string>
     <string name="pref_main_nav_position_option_bottom">Enbàs</string>
+    <string name="pref_show_self_username_always">Totjorn</string>
+    <string name="pref_show_self_username_disambiguate">Quand mai d’un compte es connectat</string>
+    <string name="pref_show_self_username_never">Jamai</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-pl/strings.xml b/core/preferences/src/main/res/values-pl/strings.xml
index 4a6421f4b..a7d99ef41 100644
--- a/core/preferences/src/main/res/values-pl/strings.xml
+++ b/core/preferences/src/main/res/values-pl/strings.xml
@@ -16,4 +16,7 @@
     <string name="pref_category_tabs">Karty</string>
     <string name="pref_main_nav_position_option_top">Góra</string>
     <string name="pref_main_nav_position_option_bottom">Dół</string>
+    <string name="pref_show_self_username_always">Zawsze</string>
+    <string name="pref_show_self_username_disambiguate">Gdy wiele kont jest zalogowanych</string>
+    <string name="pref_show_self_username_never">Nigdy</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-pt-rBR/strings.xml b/core/preferences/src/main/res/values-pt-rBR/strings.xml
index 5079d1a31..57634c527 100644
--- a/core/preferences/src/main/res/values-pt-rBR/strings.xml
+++ b/core/preferences/src/main/res/values-pt-rBR/strings.xml
@@ -16,4 +16,7 @@
     <string name="pref_category_tabs">Abas</string>
     <string name="pref_main_nav_position_option_top">Superior</string>
     <string name="pref_main_nav_position_option_bottom">Inferior</string>
+    <string name="pref_show_self_username_always">Sempre</string>
+    <string name="pref_show_self_username_disambiguate">Quando várias contas estão conectadas</string>
+    <string name="pref_show_self_username_never">Nunca</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-pt-rPT/strings.xml b/core/preferences/src/main/res/values-pt-rPT/strings.xml
index d52cef969..e54d13d4f 100644
--- a/core/preferences/src/main/res/values-pt-rPT/strings.xml
+++ b/core/preferences/src/main/res/values-pt-rPT/strings.xml
@@ -16,4 +16,7 @@
     <string name="pref_category_tabs">Guias</string>
     <string name="pref_main_nav_position_option_top">Superior</string>
     <string name="pref_main_nav_position_option_bottom">Inferior</string>
+    <string name="pref_show_self_username_always">Sempre</string>
+    <string name="pref_show_self_username_disambiguate">Quando autenticado em várias contas</string>
+    <string name="pref_show_self_username_never">Nunca</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-sa/strings.xml b/core/preferences/src/main/res/values-sa/strings.xml
index dfe9a4e69..6223d7091 100644
--- a/core/preferences/src/main/res/values-sa/strings.xml
+++ b/core/preferences/src/main/res/values-sa/strings.xml
@@ -10,4 +10,6 @@
     <string name="pref_category_tabs">पीठिकाः</string>
     <string name="pref_main_nav_position_option_top">शिखरम्</string>
     <string name="pref_main_nav_position_option_bottom">नितलम्</string>
+    <string name="pref_show_self_username_always">सर्वदा</string>
+    <string name="pref_show_self_username_never">न कदापि</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-sv/strings.xml b/core/preferences/src/main/res/values-sv/strings.xml
index 6c6529d7c..79265be16 100644
--- a/core/preferences/src/main/res/values-sv/strings.xml
+++ b/core/preferences/src/main/res/values-sv/strings.xml
@@ -16,4 +16,7 @@
     <string name="pref_category_tabs">Flikar</string>
     <string name="pref_main_nav_position_option_top">Topp</string>
     <string name="pref_main_nav_position_option_bottom">Botten</string>
+    <string name="pref_show_self_username_always">Alltid</string>
+    <string name="pref_show_self_username_disambiguate">När flera konton är inloggade</string>
+    <string name="pref_show_self_username_never">Aldrig</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-tr/strings.xml b/core/preferences/src/main/res/values-tr/strings.xml
index 5212915dc..345746e17 100644
--- a/core/preferences/src/main/res/values-tr/strings.xml
+++ b/core/preferences/src/main/res/values-tr/strings.xml
@@ -16,4 +16,7 @@
     <string name="pref_category_tabs">Sekmeler</string>
     <string name="pref_main_nav_position_option_top">Üst</string>
     <string name="pref_main_nav_position_option_bottom">Alt</string>
+    <string name="pref_show_self_username_always">Daima</string>
+    <string name="pref_show_self_username_disambiguate">Birden fazla oturum açıldığında</string>
+    <string name="pref_show_self_username_never">Asla</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-uk/strings.xml b/core/preferences/src/main/res/values-uk/strings.xml
index ac71b73ff..e9d111607 100644
--- a/core/preferences/src/main/res/values-uk/strings.xml
+++ b/core/preferences/src/main/res/values-uk/strings.xml
@@ -16,4 +16,7 @@
     <string name="pref_category_tabs">Вкладки</string>
     <string name="pref_main_nav_position_option_top">Вгорі</string>
     <string name="pref_main_nav_position_option_bottom">Внизу</string>
+    <string name="pref_show_self_username_always">Завжди</string>
+    <string name="pref_show_self_username_disambiguate">Якщо ви ввійшли у кілька облікових записів</string>
+    <string name="pref_show_self_username_never">Ніколи</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-vi/strings.xml b/core/preferences/src/main/res/values-vi/strings.xml
index cf4b9373b..106c5ec37 100644
--- a/core/preferences/src/main/res/values-vi/strings.xml
+++ b/core/preferences/src/main/res/values-vi/strings.xml
@@ -10,4 +10,7 @@
     <string name="pref_category_tabs">Tabs</string>
     <string name="pref_main_nav_position_option_top">Trên màn hình</string>
     <string name="pref_main_nav_position_option_bottom">Dưới màn hình</string>
+    <string name="pref_show_self_username_always">Luôn luôn</string>
+    <string name="pref_show_self_username_disambiguate">Khi đăng nhập nhiều tài khoản</string>
+    <string name="pref_show_self_username_never">Không hiện</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-zh-rCN/strings.xml b/core/preferences/src/main/res/values-zh-rCN/strings.xml
index 6598ac0b3..3ecefab9f 100644
--- a/core/preferences/src/main/res/values-zh-rCN/strings.xml
+++ b/core/preferences/src/main/res/values-zh-rCN/strings.xml
@@ -16,4 +16,7 @@
     <string name="pref_title_tab_tap">附件</string>
     <string name="pref_main_nav_position_option_top">顶部</string>
     <string name="pref_main_nav_position_option_bottom">底部</string>
+    <string name="pref_show_self_username_always">始终</string>
+    <string name="pref_show_self_username_disambiguate">登录多个账户时</string>
+    <string name="pref_show_self_username_never">从不</string>
 </resources>
diff --git a/core/preferences/src/main/res/values-zh-rTW/strings.xml b/core/preferences/src/main/res/values-zh-rTW/strings.xml
index 32dfd4e4f..420e86e78 100644
--- a/core/preferences/src/main/res/values-zh-rTW/strings.xml
+++ b/core/preferences/src/main/res/values-zh-rTW/strings.xml
@@ -16,4 +16,7 @@
     <string name="pref_category_tabs">標籤頁</string>
     <string name="pref_main_nav_position_option_top">頂端</string>
     <string name="pref_main_nav_position_option_bottom">底端</string>
+    <string name="pref_show_self_username_always">總是</string>
+    <string name="pref_show_self_username_disambiguate">登入多個帳號時</string>
+    <string name="pref_show_self_username_never">從不</string>
 </resources>
diff --git a/core/preferences/src/main/res/values/strings.xml b/core/preferences/src/main/res/values/strings.xml
index bd5206df7..f16a53b9c 100644
--- a/core/preferences/src/main/res/values/strings.xml
+++ b/core/preferences/src/main/res/values/strings.xml
@@ -34,4 +34,7 @@
     <string name="tab_tap_behaviour_jump_to_newest">Jump to newest content</string>
     <string name="pref_main_nav_position_option_top">Top</string>
     <string name="pref_main_nav_position_option_bottom">Bottom</string>
+    <string name="pref_show_self_username_always">Always</string>
+    <string name="pref_show_self_username_disambiguate">When multiple accounts logged in</string>
+    <string name="pref_show_self_username_never">Never</string>
 </resources>