From 846289b8cca550e1dfb97bb9d8d73cd4ca010983 Mon Sep 17 00:00:00 2001 From: Nik Clayton Date: Sun, 6 Aug 2023 20:29:34 +0200 Subject: [PATCH] Add support for setting a list's "exclusivity" option (#3932) Fixes #3831 --- .../com/keylesspalace/tusky/ListsActivity.kt | 46 +++++++++---------- .../keylesspalace/tusky/entity/MastoList.kt | 3 +- .../tusky/network/MastodonApi.kt | 6 ++- .../tusky/viewmodel/ListsViewModel.kt | 12 ++--- app/src/main/res/layout/dialog_list.xml | 37 +++++++++++++++ app/src/main/res/menu/list_actions.xml | 4 +- app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-be/strings.xml | 1 - app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-bn-rBD/strings.xml | 1 - app/src/main/res/values-bn-rIN/strings.xml | 1 - app/src/main/res/values-ca/strings.xml | 1 - app/src/main/res/values-ckb/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - 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 | 1 - app/src/main/res/values-es/strings.xml | 3 +- app/src/main/res/values-eu/strings.xml | 1 - app/src/main/res/values-fa/strings.xml | 3 +- app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-fy/strings.xml | 1 - app/src/main/res/values-ga/strings.xml | 1 - app/src/main/res/values-gd/strings.xml | 3 +- app/src/main/res/values-gl/strings.xml | 3 +- app/src/main/res/values-hi/strings.xml | 3 +- app/src/main/res/values-hu/strings.xml | 3 +- app/src/main/res/values-in/strings.xml | 3 +- 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 | 3 +- app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-lv/strings.xml | 1 - app/src/main/res/values-nb-rNO/strings.xml | 7 ++- 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 | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-pt-rPT/strings.xml | 3 +- app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sa/strings.xml | 1 - app/src/main/res/values-sl/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 3 +- app/src/main/res/values-th/strings.xml | 1 - 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-rHK/strings.xml | 1 - app/src/main/res/values-zh-rMO/strings.xml | 1 - app/src/main/res/values-zh-rSG/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 6 +-- 55 files changed, 101 insertions(+), 109 deletions(-) create mode 100644 app/src/main/res/layout/dialog_list.xml diff --git a/app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt b/app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt index 1ce760e92..89b442a3a 100644 --- a/app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt @@ -23,8 +23,6 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.EditText -import android.widget.FrameLayout import android.widget.ImageButton import android.widget.PopupMenu import android.widget.TextView @@ -38,10 +36,10 @@ import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import at.connyduck.sparkbutton.helpers.Utils import com.google.android.material.color.MaterialColors import com.google.android.material.snackbar.Snackbar import com.keylesspalace.tusky.databinding.ActivityListsBinding +import com.keylesspalace.tusky.databinding.DialogListBinding import com.keylesspalace.tusky.di.Injectable import com.keylesspalace.tusky.di.ViewModelFactory import com.keylesspalace.tusky.entity.MastoList @@ -118,7 +116,7 @@ class ListsActivity : BaseActivity(), Injectable, HasAndroidInjector { viewModel.events.collect { event -> when (event) { Event.CREATE_ERROR -> showMessage(R.string.error_create_list) - Event.RENAME_ERROR -> showMessage(R.string.error_rename_list) + Event.UPDATE_ERROR -> showMessage(R.string.error_rename_list) Event.DELETE_ERROR -> showMessage(R.string.error_delete_list) } } @@ -126,16 +124,9 @@ class ListsActivity : BaseActivity(), Injectable, HasAndroidInjector { } private fun showlistNameDialog(list: MastoList?) { - val layout = FrameLayout(this) - val editText = EditText(this) - editText.setHint(R.string.hint_list_name) - layout.addView(editText) - val margin = Utils.dpToPx(this, 8) - (editText.layoutParams as ViewGroup.MarginLayoutParams) - .setMargins(margin, margin, margin, 0) - + val binding = DialogListBinding.inflate(layoutInflater) val dialog = AlertDialog.Builder(this) - .setView(layout) + .setView(binding.root) .setPositiveButton( if (list == null) { R.string.action_create_list @@ -143,17 +134,26 @@ class ListsActivity : BaseActivity(), Injectable, HasAndroidInjector { R.string.action_rename_list } ) { _, _ -> - onPickedDialogName(editText.text, list?.id) + onPickedDialogName(binding.nameText.text.toString(), list?.id, binding.exclusiveCheckbox.isChecked) } .setNegativeButton(android.R.string.cancel, null) .show() - val positiveButton = dialog.getButton(Dialog.BUTTON_POSITIVE) - editText.doOnTextChanged { s, _, _, _ -> - positiveButton.isEnabled = s?.isNotBlank() == true + binding.nameText.let { editText -> + editText.doOnTextChanged { s, _, _, _ -> + dialog.getButton(Dialog.BUTTON_POSITIVE).isEnabled = s?.isNotBlank() == true + } + editText.setText(list?.title) + editText.text?.let { editText.setSelection(it.length) } + } + + list?.let { + if (it.exclusive == null) { + binding.exclusiveCheckbox.visible(false) + } else { + binding.exclusiveCheckbox.isChecked = it.exclusive + } } - editText.setText(list?.title) - editText.text?.let { editText.setSelection(it.length) } } private fun showListDeleteDialog(list: MastoList) { @@ -226,7 +226,7 @@ class ListsActivity : BaseActivity(), Injectable, HasAndroidInjector { setOnMenuItemClickListener { item -> when (item.itemId) { R.id.list_edit -> openListSettings(list) - R.id.list_rename -> renameListDialog(list) + R.id.list_update -> renameListDialog(list) R.id.list_delete -> showListDeleteDialog(list) else -> return@setOnMenuItemClickListener false } @@ -287,11 +287,11 @@ class ListsActivity : BaseActivity(), Injectable, HasAndroidInjector { } } - private fun onPickedDialogName(name: CharSequence, listId: String?) { + private fun onPickedDialogName(name: String, listId: String?, exclusive: Boolean) { if (listId == null) { - viewModel.createNewList(name.toString()) + viewModel.createNewList(name, exclusive) } else { - viewModel.renameList(listId, name.toString()) + viewModel.updateList(listId, name, exclusive) } } diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/MastoList.kt b/app/src/main/java/com/keylesspalace/tusky/entity/MastoList.kt index bfec7cc52..a74337ef5 100644 --- a/app/src/main/java/com/keylesspalace/tusky/entity/MastoList.kt +++ b/app/src/main/java/com/keylesspalace/tusky/entity/MastoList.kt @@ -22,5 +22,6 @@ package com.keylesspalace.tusky.entity data class MastoList( val id: String, - val title: String + val title: String, + val exclusive: Boolean? ) diff --git a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt index a50ca7964..c64690d1a 100644 --- a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt +++ b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt @@ -538,14 +538,16 @@ interface MastodonApi { @FormUrlEncoded @POST("api/v1/lists") suspend fun createList( - @Field("title") title: String + @Field("title") title: String, + @Field("exclusive") exclusive: Boolean? ): NetworkResult @FormUrlEncoded @PUT("api/v1/lists/{listId}") suspend fun updateList( @Path("listId") listId: String, - @Field("title") title: String + @Field("title") title: String, + @Field("exclusive") exclusive: Boolean? ): NetworkResult @DELETE("api/v1/lists/{listId}") diff --git a/app/src/main/java/com/keylesspalace/tusky/viewmodel/ListsViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/viewmodel/ListsViewModel.kt index f701847c6..e13328a90 100644 --- a/app/src/main/java/com/keylesspalace/tusky/viewmodel/ListsViewModel.kt +++ b/app/src/main/java/com/keylesspalace/tusky/viewmodel/ListsViewModel.kt @@ -38,7 +38,7 @@ internal class ListsViewModel @Inject constructor(private val api: MastodonApi) } enum class Event { - CREATE_ERROR, DELETE_ERROR, RENAME_ERROR + CREATE_ERROR, DELETE_ERROR, UPDATE_ERROR } data class State(val lists: List, val loadingState: LoadingState) @@ -84,9 +84,9 @@ internal class ListsViewModel @Inject constructor(private val api: MastodonApi) } } - fun createNewList(listName: String) { + fun createNewList(listName: String, exclusive: Boolean) { viewModelScope.launch { - api.createList(listName).fold( + api.createList(listName, exclusive).fold( { list -> updateState { copy(lists = lists + list) @@ -99,16 +99,16 @@ internal class ListsViewModel @Inject constructor(private val api: MastodonApi) } } - fun renameList(listId: String, listName: String) { + fun updateList(listId: String, listName: String, exclusive: Boolean) { viewModelScope.launch { - api.updateList(listId, listName).fold( + api.updateList(listId, listName, exclusive).fold( { list -> updateState { copy(lists = lists.replacedFirstWhich(list) { it.id == listId }) } }, { - sendEvent(Event.RENAME_ERROR) + sendEvent(Event.UPDATE_ERROR) } ) } diff --git a/app/src/main/res/layout/dialog_list.xml b/app/src/main/res/layout/dialog_list.xml new file mode 100644 index 000000000..5a75c1bed --- /dev/null +++ b/app/src/main/res/layout/dialog_list.xml @@ -0,0 +1,37 @@ + + + + + + + + diff --git a/app/src/main/res/menu/list_actions.xml b/app/src/main/res/menu/list_actions.xml index 307fbf741..32bb8367f 100644 --- a/app/src/main/res/menu/list_actions.xml +++ b/app/src/main/res/menu/list_actions.xml @@ -2,9 +2,9 @@ + android:title="@string/action_add_or_remove_from_list" /> إنشاء قائمة إعادة تسمية القائمة حذف القائمة - تعديل القائمة البحث عن أشخاص قصد متابعتهم إضافة الحساب إلى القائمة إزالة الحساب مِن القائمة diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 0c4ec3198..e7cca1754 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -377,7 +377,6 @@ %1$s, %2$s і яшчэ %3$d Скасаваць змены Працягнуць рэдагаванне - Змяніць спіс Пошук сярод вашых падпісак Дадаць уліковы запіс Выдаліць уліковы запіс са спіса diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 8b25a281e..e17dec5f9 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -143,7 +143,6 @@ Премахване на акаунт от списъка Добавяне на акаунт към списъка Търсене на хора, които следвате - Редакция на списъка Изтриване на списъка Преименуване на списъка Създаване на списък diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml index bfb397558..35b9be7cc 100644 --- a/app/src/main/res/values-bn-rBD/strings.xml +++ b/app/src/main/res/values-bn-rBD/strings.xml @@ -67,7 +67,6 @@ তালিকা থেকে অ্যাকাউন্ট সরান তালিকায় অ্যাকাউন্ট যোগ করুন আপনি অনুসরণ মানুষের জন্য অনুসন্ধান করুন - তালিকা সম্পাদনা করুন তালিকা মুছে দিন তালিকা পুনঃ নামকরণ কর একটি তালিকা তৈরি করুন diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml index 738a5a0cc..a76961828 100644 --- a/app/src/main/res/values-bn-rIN/strings.xml +++ b/app/src/main/res/values-bn-rIN/strings.xml @@ -279,7 +279,6 @@ একটি তালিকা তৈরি করুন তালিকা পুনঃ নামকরণ কর তালিকা মুছে দিন - তালিকা সম্পাদনা করুন আপনি অনুসরণ মানুষের জন্য অনুসন্ধান করুন তালিকায় অ্যাকাউন্ট যোগ করুন তালিকা থেকে অ্যাকাউন্ট সরান diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index ccdd3ee58..bf7afb43f 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -280,7 +280,6 @@ Crear una llista Reanomenar la llista Suprimir la llista - Modificar la llista Cercar persones que segueixes Afegir un compte a la llista Suprimir un compte de la llista diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml index a5f6cadec..18429d3d9 100644 --- a/app/src/main/res/values-ckb/strings.xml +++ b/app/src/main/res/values-ckb/strings.xml @@ -390,7 +390,6 @@ لابردنی ئەژمێر لە لیستەکە زیادکردنی ئەژمێر بۆ لیستەکە گەڕان بەدوای ئەو کەسانەی کە پەیڕەوی ان دەکەیت - دەستکاریکردنی لیستەکە سڕینەوەی لیستەکە ناونانەوەی لیستەکە دروستکردنی لیستێک diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index bffa862f3..6daf4ec2f 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -280,7 +280,6 @@ Vytvořit seznam Přejmenovat seznam Smazat seznam - Upravit seznam Hledejte mezi lidmi, které sledujete Přidat účet na seznam Odstranit účet ze seznamu diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 531a1d5bf..2c4c0dc93 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -396,7 +396,6 @@ Atodiadau Creu rhestr Ailenwi\'r rhestr - Golygu\'r rhestr Chwilio am bobl rydych chi\'n eu dilyn Bot CC-BY-SA 4.0 @@ -731,4 +730,4 @@ \nFersiwn: %s Copïo fersiwn a gwybodaeth dyfais Copïwyd fersiwn a gwybodaeth dyfais - \ No newline at end of file + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f7f26cf3e..60c827558 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -257,7 +257,6 @@ Liste erstellen Liste umbenennen Liste löschen - Liste bearbeiten Konto zur Liste hinzufügen Veröffentlichen als %1$s @@ -674,4 +673,4 @@ Deinem Server ist bekannt, dass dieser Beitrag bearbeitet wurde. Allerdings besitzt er keine Kopien der Änderungen, weshalb diese nicht angezeigt werden können. \n \nHierbei handelt es sich um Mastodon Issue #25398. - \ No newline at end of file + diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index e78cbc28f..13a210482 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -275,7 +275,6 @@ Krei liston Ŝanĝi la nomon de la listo Forigi la liston - Redakti la liston Serĉi homojn, kiujn vi sekvas Aldoni konton al la listo Forigi konton el la listo diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c5eaed5b0..553e39318 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -389,7 +389,6 @@ No se pudo renombrar la lista No se pudo eliminar la lista Eliminar la lista - Editar la lista Buscar personas que sigues Contenido: %s Aviso de contenido: %s @@ -689,4 +688,4 @@ Obteniendo notificaciones… Cargar nuevas notificaciones ¿Eliminar borrador\? - \ No newline at end of file + diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index fcd2ddb8f..4bef977f8 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -341,7 +341,6 @@ Zerrenda sortu Zerrenda berrizendatu Ezabatu zerrenda - Editatu zerrenda Bilatu jarraitzen dituzun pertsonak Gehitu kontua zerrendan Kendu kontua zerrendatik diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 6ad46bda1..bdc6e412a 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -330,7 +330,6 @@ ایجاد یک فهرست تغییر نام فهرست حذف فهرست - ویرایش فهرست جست‌وجوی افرادی که پی می‌گیرید افزودن حساب به فهرست برداشتن حساب از فهرست @@ -683,4 +682,4 @@ \nنگارش: %s رونوشت از اطّلاعات افزاره و نگارش اطّلاعات افزاره و نگارش رونوشت شد - \ No newline at end of file + diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 6a9af96c6..fe029d9e9 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -211,7 +211,6 @@ %s lisäsi julkaisusi suosikkeihinsa Näytä jaot Näytä jaetut julkaisut - Muokkaa listaa %1$s, %2$s, %3$s ja %4$d muuta Kuvaa näkövammaisille diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 3eb21848d..6dcff090d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -280,7 +280,6 @@ Créer une liste Renommer la liste Supprimer la liste - Modifier la liste Chercher des personnes que vous suivez Ajouter un compte à la liste Supprimer un compte de la liste diff --git a/app/src/main/res/values-fy/strings.xml b/app/src/main/res/values-fy/strings.xml index 824b4d547..e30402b80 100644 --- a/app/src/main/res/values-fy/strings.xml +++ b/app/src/main/res/values-fy/strings.xml @@ -14,7 +14,6 @@ Ûnderskrift pleatse Account oan de list tafoegje Sykje om minsken dy\'t jo folgje - Pas de list oan Smyt de list fuort Neam de list om Meitsje in list oan diff --git a/app/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml index 65f21b79e..b453d522b 100644 --- a/app/src/main/res/values-ga/strings.xml +++ b/app/src/main/res/values-ga/strings.xml @@ -311,7 +311,6 @@ Cruthaigh liosta Athainmnigh an liosta Scrios an liosta - Cuir an liosta in eagar Cuardaigh daoine a leanann tú Cuir cuntas leis an liosta Bain cuntas ón liosta diff --git a/app/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml index 42f9b602a..389bb14c2 100644 --- a/app/src/main/res/values-gd/strings.xml +++ b/app/src/main/res/values-gd/strings.xml @@ -13,7 +13,6 @@ Dè a th’ ann an ionstans\? Deasaich Deasaich a’ chriathrag - Deasaich an liosta Brathan Deasaich Deasaich @@ -691,4 +690,4 @@ Brathan nuair a bhios Tusky ag obair sa chùlaibh A’ faighinn nam brathan… Obair-ghlèidhidh air an tasgadan… - \ No newline at end of file + diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 9a0738340..362b50d43 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -262,7 +262,6 @@ Eliminar conta da listaxe Engadir conta á listaxe Atopar persoas ás que segues - Editar a listaxe Eliminar a listaxe Renomear a listaxe Crear unha listaxe @@ -668,4 +667,4 @@ Obtendo as notificacións… Mantemento da caché… Fallou a subida: %s - \ No newline at end of file + diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 323b4a225..aa2a10716 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -315,7 +315,6 @@ सूची से खाता निकालें सूची में खाता जोड़ें उन लोगों की खोज करें जिन्हें आप फ़ॉलो करते हैं - सूची एडिट करें सूची हटाएँ सूची का नाम बदलें एक सूची बनाएं @@ -406,4 +405,4 @@ फोटो और वीडियो दोनों को एक ही पोस्ट से अटैच नहीं किया जा सकता है। खाता विवरण लोड करने में विफल रहा लॉगिन पेज लोड नहीं किया जा सका। - \ No newline at end of file + diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 3d02893fc..6433e7815 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -318,7 +318,6 @@ Lista létrehozása Lista átnevezése Lista törlése - Lista szerkesztése Rejtett domainek Megtolás visszavonása Rejtett domainek @@ -675,4 +674,4 @@ A kiszolgálód tudja, hogy ezt a bejegyzést szerkesztették, de erről nincs másolata, így ezt nem tudjuk neked megmutatni. \n \nEz egy Mastodon hiba #25398. - \ No newline at end of file + diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 04a74ab0e..289bcc4d7 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -133,7 +133,6 @@ Buat daftar Ubah nama daftar Hapus daftar - Ubah daftar Kunci akun Bawaan sistem Tulis @@ -251,4 +250,4 @@ Kesalahan mengaktifkan #%s Gagal memuat sumber status dari server. Hashtag yang sedang tren - \ No newline at end of file + diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index 0412db2ef..e738d6c78 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -292,7 +292,6 @@ Búa til lista Endurnefna listann Eyða listanum - Sýsla með listann Leita að fólki sem þú fylgist með Bæta notandaaðgangi á listann Fjarlægja notandaaðganginn af listanum @@ -667,4 +666,4 @@ Þjónninn þinn veit að þessari færslu hefur verið breytt, en er hins vegar ekki með afrit af breytingunum, þannig að ekki er hægt að sýna þér þær. \n \nÞetta er Mastodon verkbeiðni #25398. - \ No newline at end of file + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 5b521f98a..96ba59a8c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -274,7 +274,6 @@ Crea una lista Rinomina la lista Elimina la lista - Modifica la lista Cerca tra le persone che segui Aggiungi un account alla lista Rimuovi un account dalla lista @@ -688,4 +687,4 @@ Il tuo server sa che questo post è stato modificato, ma non ha una copia delle modifiche, quindi non ti può essere mostrato. \n \nQuesto è il problema Mastodon #25398. - \ No newline at end of file + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c9e7247e5..87b3ed243 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -365,7 +365,6 @@ リストを削除できませんでした リストの作成 リストの削除 - リストの編集 フォロワーを検索 リストにアカウントを追加 リストからアカウントを削除 @@ -662,4 +661,4 @@ あなたのサーバーは、この投稿が変更されたことを把握していますが、編集履歴のコピーを備えていないので、表示できません。 \n \nこれはMastodonのissue #25398です。 - \ No newline at end of file + diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml index bd93ba948..d28739f46 100644 --- a/app/src/main/res/values-kab/strings.xml +++ b/app/src/main/res/values-kab/strings.xml @@ -126,7 +126,6 @@ Snulfu-d tabdart Snifel isem n tabdart Kkes tabdart-a - Ẓreg tabdart-a Rnu yiwen umiḍan ɣer tabdart Kkes amiḍan seg tabdart Rnu isefka @@ -274,4 +273,4 @@ Sken-d beṭuyat Ihacṭagen Isuturen n teḍfeṛt - \ No newline at end of file + diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index b25608abe..af4dd08ca 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -286,7 +286,6 @@ 리스트 생성 리스트 이름 바꾸기 리스트 삭제 - 리스트 편집 당신을 팔로우하는 사람 검색 리스트에 계정 추가 리스트에서 계정 삭제 diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 677745138..c8059b046 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -130,7 +130,6 @@ Izveidot sarakstu Pārsaukt sarakstu Dzēst sarakstu - Labot sarakstu Pievienot kontu sarakstam Noņemt kontu no saraksta Labot attēlu diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 8ca193b3e..21455f74d 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -246,7 +246,6 @@ Opprett en liste Gi listen nytt navn Fjern listen - Endre listen Søk etter personer du følger Legg til konto i listen Fjern konto fra listen @@ -578,7 +577,7 @@ Slutte å følge #%s\? Sluttet å følge #%s Laster tråd - Dette er Hjemmetidslinjendin. Den viser de nyeste innleggene av kontoer du følger. + Dette er Hjemmetidslinjendin. Den viser de nyeste innleggene av kontoer du følger. \n \nFor å utforske kontoer kan du enten oppdage dem i en av tidslinjene dine, for eksempel den lokale tidslinjen for instansen din [iconics gmd_group], eller du kan søke etter navnet deres [iconics gmd_search]; søk for eksempel etter Tusky før å finne Mastodonkonten vår. Leserekkefølge @@ -666,7 +665,7 @@ Vis poststatistikk i tidslinjen Last de nyeste varslene Del utkast\? - Serveren din vet at denne posten ble endret, men har ingen kopi av entringene så de kann ikke vises. + Serveren din vet at denne posten ble endret, men har ingen kopi av entringene så de kann ikke vises. \n \nDette er Mastodon issue #25398. - \ No newline at end of file + diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f57522a2f..c5d78c2e5 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -347,7 +347,6 @@ Lijst aanmaken Lijst hernoemen Lijst verwijderen - Lijst bewerken Naar mensen zoeken die je volgt Account aan de lijst toevoegen Account uit de lijst verwijderen @@ -651,4 +650,4 @@ Titel Laad nieuwste meldingen Verwijder concept\? - \ No newline at end of file + diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml index 76d586564..ec6b17199 100644 --- a/app/src/main/res/values-oc/strings.xml +++ b/app/src/main/res/values-oc/strings.xml @@ -315,7 +315,6 @@ Crear una lista Renomenar la lista Suprimir la lista - Modificar la lista Cercar lo monde que seguètz Ajustar un compte a la lista Suprimir aqueste compte de la lista @@ -684,4 +683,4 @@ \@%s@%s \nVersion : %s Fracàs del mandadís : %s - \ No newline at end of file + diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 38ebf6cde..98aadf4bd 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -330,7 +330,6 @@ Stwórz listę Zmień nazwę listy Usuń listę - Edytuj listę Szukaj osób, których obserwujesz Dodaj konto do listy Usuń konto z listy diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 4f901bbef..04677e85a 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -321,7 +321,6 @@ Criar uma lista Renomear lista Excluir lista - Editar lista Pesquisar pessoas que você segue Adicionar conta à lista Remover conta da lista diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 927055e71..68ba08e5a 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -10,7 +10,6 @@ %d novas interações A responder a @%s - Editar a lista Necessita de aprovar manualmente os seguidores Guardar rascunho\? Depois @@ -596,4 +595,4 @@ Editado %s Hashtags seguidas Hashtags populares - \ No newline at end of file + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index a0266819a..e08bc57ee 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -300,7 +300,6 @@ Создать список Переименовать список Удалить список - Изменить список Поиск по вашим подпискам Добавить аккаунт в список Удалить аккаунт из списка diff --git a/app/src/main/res/values-sa/strings.xml b/app/src/main/res/values-sa/strings.xml index b16160da6..1538e9d72 100644 --- a/app/src/main/res/values-sa/strings.xml +++ b/app/src/main/res/values-sa/strings.xml @@ -189,7 +189,6 @@ \n \nअधिकमत्र प्राप्यते joinmastodon.org. येषामुसरणं करोषि तेष्वन्विष्यताम् - सूचिः सम्पाद्यताम् सूचिर्नश्यताम् पुनः सूचिनामकरणं क्रियताम् सूचिः निर्मीयताम् diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 2fb6930d5..5a0741fee 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -251,7 +251,6 @@ Ustvari seznam Preimenuj seznam Izbriši seznam - Uredi seznam Poiščite osebe, katerim sledite Dodaj račun na seznam Odstrani račun iz seznama diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index d80bebab1..5b75bfbb8 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -274,7 +274,6 @@ Skapa en lista Byt namn på listan Ta bort listan - Redigera lista Sök efter personer du följer Lägg till konto i listan Ta bort kontot från listan @@ -683,4 +682,4 @@ Din server vet att det här inlägget har redigerats, men har ingen kopia av ändringarna, så de kan inte visas för dig. \n \nDet är Mastodon problem #25398. - \ No newline at end of file + diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 15040fedf..4f07e5498 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -136,7 +136,6 @@ ลบบัญชีออกจากรายการ เพิ่มบัญชีไปใส่รายการ ค้นหาผู้ติดตาม - แก้ไขรายการ ลบรายการ เปลี่ยนชื่อรายการ สร้างรายการ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index eacdb6c57..10c32a6b0 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -339,7 +339,6 @@ Liste oluştur Listeyi yeniden adlandır Listeyi sil - Listeyi düzenle Takip ettiğim kişilerde ara Listeye hesap ekle Hesabı listeden kaldır @@ -675,4 +674,4 @@ \n \nBu Mastodon sorununu #25398. Yükleme başarısız oldu: %s - \ No newline at end of file + diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 4ff42002e..31cb5d721 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -274,7 +274,6 @@ Вилучити обліковий запис зі списку Додати обліковий запис до списку Пошук серед тих, на кого ви підписані - Змінити список Видалити список Змінити назву списку Створити список @@ -692,4 +691,4 @@ \n \nЦе помилка #25398 у Mastodon. Не вдалося вивантажити: %s - \ No newline at end of file + diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 0e9f68791..084123ce5 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -439,7 +439,6 @@ Thêm người này vào danh sách Xóa người này khỏi danh sách Tìm người để theo dõi - Sửa danh sách Xóa danh sách Đổi tên danh sách Tạo danh sách @@ -665,4 +664,4 @@ Sao chép phiên bản và thông tin thiết bị Đã sao chép phiên bản và thông tin thiết bị Thiết bị của bạn - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index da07e0b6d..1682974d2 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -276,7 +276,6 @@ 新建列表 重命名列表 删除列表 - 编辑列表 搜索已关注的用户 添加用户到列表 从列表中移除用户 @@ -679,4 +678,4 @@ \nAndroid 系统版本: %s \nSDK 版本: %d 复制版本及设备信息 - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 027f4ef7b..887c5db6e 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -280,7 +280,6 @@ 新建列表 重命名列表 刪除列表 - 編輯列表 搜索已關注的用戶 添加用戶到列表 從列表中移除用戶 diff --git a/app/src/main/res/values-zh-rMO/strings.xml b/app/src/main/res/values-zh-rMO/strings.xml index 972c65b98..7e22f0d65 100644 --- a/app/src/main/res/values-zh-rMO/strings.xml +++ b/app/src/main/res/values-zh-rMO/strings.xml @@ -274,7 +274,6 @@ 新建列表 重命名列表 刪除列表 - 編輯列表 搜索已關注的用戶 添加用戶到列表 從列表中移除用戶 diff --git a/app/src/main/res/values-zh-rSG/strings.xml b/app/src/main/res/values-zh-rSG/strings.xml index 9fb552a9e..fc96f0629 100644 --- a/app/src/main/res/values-zh-rSG/strings.xml +++ b/app/src/main/res/values-zh-rSG/strings.xml @@ -279,7 +279,6 @@ 新建列表 重命名列表 删除列表 - 编辑列表 搜索已关注的用户 添加用户到列表 从列表中移除用户 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 4c5698c69..653bba4af 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -280,7 +280,6 @@ 新建列表 重命名列表 刪除列表 - 編輯列表 搜索已關注的用戶 添加用戶到列表 從列表中移除用戶 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 05761a9e4..c00363661 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -460,12 +460,11 @@ Lists Lists Could not create list - Could not rename list + Could not update list Could not delete list Create a list - Rename the list + Update the list Delete the list - Edit the list Search for people you follow Add account to the list Remove account from the list @@ -609,6 +608,7 @@ You have no lists, yet Manage lists Error loading lists + Hide from the home timeline List Clear Filter