Mastodon
/
Yuito-app-android
mirror of https://github.com/accelforce/Yuito
1
0
Fork 0
Code Issues Releases Wiki Activity

Add support for setting a list's "exclusivity" option (#3932) 

Fixes #3831
This commit is contained in:
Nik Clayton 2023-08-06 20:29:34 +02:00 committed by GitHub
parent 6766509977
commit 846289b8cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
55 changed files with 101 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt
View File

@ -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)
}
}

3
app/src/main/java/com/keylesspalace/tusky/entity/MastoList.kt
View File

@ -22,5 +22,6 @@ package com.keylesspalace.tusky.entity
data class MastoList(
val id: String,
val title: String
val title: String,
val exclusive: Boolean?
)

6
app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
View File

@ -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<MastoList>
@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<MastoList>
@DELETE("api/v1/lists/{listId}")

12
app/src/main/java/com/keylesspalace/tusky/viewmodel/ListsViewModel.kt
View File

@ -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<MastoList>, 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)
}
)
}

37
app/src/main/res/layout/dialog_list.xml Normal file
View File

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
<EditText
android:id="@+id/nameText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:inputType="text"
android:hint="@string/hint_list_name"
android:importantForAutofill="no"
/>
<CheckBox
android:id="@+id/exclusiveCheckbox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="0dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="0dp"
app:layout_constraintTop_toBottomOf="@id/nameText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:text="@string/list_exclusive_label"
/>
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/menu/list_actions.xml
View File

@ -2,9 +2,9 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/list_edit"
android:title="@string/action_edit_list" />
android:title="@string/action_add_or_remove_from_list" />
<item
android:id="@+id/list_rename"
android:id="@+id/list_update"
android:title="@string/action_rename_list" />
<item
android:id="@+id/list_delete"

1
app/src/main/res/values-ar/strings.xml
View File

@ -273,7 +273,6 @@
<string name="action_create_list">إنشاء قائمة</string>
<string name="action_rename_list">إعادة تسمية القائمة</string>
<string name="action_delete_list">حذف القائمة</string>
<string name="action_edit_list">تعديل القائمة</string>
<string name="hint_search_people_list">البحث عن أشخاص قصد متابعتهم</string>
<string name="action_add_to_list">إضافة الحساب إلى القائمة</string>
<string name="action_remove_from_list">إزالة الحساب مِن القائمة</string>

1
app/src/main/res/values-be/strings.xml
View File

@ -377,7 +377,6 @@
<string name="conversation_more_recipients">%1$s, %2$s і яшчэ %3$d</string>
<string name="action_discard">Скасаваць змены</string>
<string name="action_continue_edit">Працягнуць рэдагаванне</string>
<string name="action_edit_list">Змяніць спіс</string>
<string name="hint_search_people_list">Пошук сярод вашых падпісак</string>
<string name="add_account_name">Дадаць уліковы запіс</string>
<string name="action_remove_from_list">Выдаліць уліковы запіс са спіса</string>

1
app/src/main/res/values-bg/strings.xml
View File

@ -143,7 +143,6 @@
<string name="action_remove_from_list">Премахване на акаунт от списъка</string>
<string name="action_add_to_list">Добавяне на акаунт към списъка</string>
<string name="hint_search_people_list">Търсене на хора, които следвате</string>
<string name="action_edit_list">Редакция на списъка</string>
<string name="action_delete_list">Изтриване на списъка</string>
<string name="action_rename_list">Преименуване на списъка</string>
<string name="action_create_list">Създаване на списък</string>

1
app/src/main/res/values-bn-rBD/strings.xml
View File

@ -67,7 +67,6 @@
<string name="action_remove_from_list">তালিকা থেকে অ্যাকাউন্ট সরান</string>
<string name="action_add_to_list">তালিকায় অ্যাকাউন্ট যোগ করুন</string>
<string name="hint_search_people_list">আপনি অনুসরণ মানুষের জন্য অনুসন্ধান করুন</string>
<string name="action_edit_list">তালিকা সম্পাদনা করুন</string>
<string name="action_delete_list">তালিকা মুছে দিন</string>
<string name="action_rename_list">তালিকা পুনঃ নামকরণ কর</string>
<string name="action_create_list">একটি তালিকা তৈরি করুন</string>

1
app/src/main/res/values-bn-rIN/strings.xml
View File

@ -279,7 +279,6 @@
<string name="action_create_list">একটি তালিকা তৈরি করুন</string>
<string name="action_rename_list">তালিকা পুনঃ নামকরণ কর</string>
<string name="action_delete_list">তালিকা মুছে দিন</string>
<string name="action_edit_list">তালিকা সম্পাদনা করুন</string>
<string name="hint_search_people_list">আপনি অনুসরণ মানুষের জন্য অনুসন্ধান করুন</string>
<string name="action_add_to_list">তালিকায় অ্যাকাউন্ট যোগ করুন</string>
<string name="action_remove_from_list">তালিকা থেকে অ্যাকাউন্ট সরান</string>

1
app/src/main/res/values-ca/strings.xml
View File

@ -280,7 +280,6 @@
<string name="action_create_list">Crear una llista</string>
<string name="action_rename_list">Reanomenar la llista</string>
<string name="action_delete_list">Suprimir la llista</string>
<string name="action_edit_list">Modificar la llista</string>
<string name="hint_search_people_list">Cercar persones que segueixes</string>
<string name="action_add_to_list">Afegir un compte a la llista</string>
<string name="action_remove_from_list">Suprimir un compte de la llista</string>

1
app/src/main/res/values-ckb/strings.xml
View File

@ -390,7 +390,6 @@
<string name="action_remove_from_list">لابردنی ئەژمێر لە لیستەکە</string>
<string name="action_add_to_list">زیادکردنی ئەژمێر بۆ لیستەکە</string>
<string name="hint_search_people_list">گەڕان بەدوای ئەو کەسانەی کە پەیڕەوی ان دەکەیت</string>
<string name="action_edit_list">دەستکاریکردنی لیستەکە</string>
<string name="action_delete_list">سڕینەوەی لیستەکە</string>
<string name="action_rename_list">ناونانەوەی لیستەکە</string>
<string name="action_create_list">دروستکردنی لیستێک</string>

1
app/src/main/res/values-cs/strings.xml
View File

@ -280,7 +280,6 @@
<string name="action_create_list">Vytvořit seznam</string>
<string name="action_rename_list">Přejmenovat seznam</string>
<string name="action_delete_list">Smazat seznam</string>
<string name="action_edit_list">Upravit seznam</string>
<string name="hint_search_people_list">Hledejte mezi lidmi, které sledujete</string>
<string name="action_add_to_list">Přidat účet na seznam</string>
<string name="action_remove_from_list">Odstranit účet ze seznamu</string>

3
app/src/main/res/values-cy/strings.xml
View File

@ -396,7 +396,6 @@
<string name="post_media_attachments">Atodiadau</string>
<string name="action_create_list">Creu rhestr</string>
<string name="action_rename_list">Ailenwi\'r rhestr</string>
<string name="action_edit_list">Golygu\'r rhestr</string>
<string name="hint_search_people_list">Chwilio am bobl rydych chi\'n eu dilyn</string>
<string name="profile_badge_bot_text">Bot</string>
<string name="license_cc_by_sa_4">CC-BY-SA 4.0</string>
@ -731,4 +730,4 @@
\nFersiwn: %s</string>
<string name="about_copy">Copïo fersiwn a gwybodaeth dyfais</string>
<string name="about_copied">Copïwyd fersiwn a gwybodaeth dyfais</string>
</resources>
</resources>

3
app/src/main/res/values-de/strings.xml
View File

@ -257,7 +257,6 @@
<string name="action_create_list">Liste erstellen</string>
<string name="action_rename_list">Liste umbenennen</string>
<string name="action_delete_list">Liste löschen</string>
<string name="action_edit_list">Liste bearbeiten</string>
<string name="action_add_to_list">Konto zur Liste hinzufügen</string>
<string name="compose_active_account_description">Veröffentlichen als %1$s</string>
<plurals name="hint_describe_for_visually_impaired">
@ -674,4 +673,4 @@
<string name="error_missing_edits">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 <a href="https://github.com/mastodon/mastodon/issues/25398">Mastodon Issue #25398</a>.</string>
</resources>
</resources>

1
app/src/main/res/values-eo/strings.xml
View File

@ -275,7 +275,6 @@
<string name="action_create_list">Krei liston</string>
<string name="action_rename_list">Ŝanĝi la nomon de la listo</string>
<string name="action_delete_list">Forigi la liston</string>
<string name="action_edit_list">Redakti la liston</string>
<string name="hint_search_people_list">Serĉi homojn, kiujn vi sekvas</string>
<string name="action_add_to_list">Aldoni konton al la listo</string>
<string name="action_remove_from_list">Forigi konton el la listo</string>

3
app/src/main/res/values-es/strings.xml
View File

@ -389,7 +389,6 @@
<string name="error_rename_list">No se pudo renombrar la lista</string>
<string name="error_delete_list">No se pudo eliminar la lista</string>
<string name="action_delete_list">Eliminar la lista</string>
<string name="action_edit_list">Editar la lista</string>
<string name="hint_search_people_list">Buscar personas que sigues</string>
<string name="description_post_media">Contenido: %s</string>
<string name="description_post_cw">Aviso de contenido: %s</string>
@ -689,4 +688,4 @@
<string name="notification_notification_worker">Obteniendo notificaciones…</string>
<string name="load_newest_notifications">Cargar nuevas notificaciones</string>
<string name="compose_delete_draft">¿Eliminar borrador\?</string>
</resources>
</resources>

1
app/src/main/res/values-eu/strings.xml
View File

@ -341,7 +341,6 @@
<string name="action_create_list">Zerrenda sortu</string>
<string name="action_rename_list">Zerrenda berrizendatu</string>
<string name="action_delete_list">Ezabatu zerrenda</string>
<string name="action_edit_list">Editatu zerrenda</string>
<string name="hint_search_people_list">Bilatu jarraitzen dituzun pertsonak</string>
<string name="action_add_to_list">Gehitu kontua zerrendan</string>
<string name="action_remove_from_list">Kendu kontua zerrendatik</string>

3
app/src/main/res/values-fa/strings.xml
View File

@ -330,7 +330,6 @@
<string name="action_create_list">ایجاد یک فهرست</string>
<string name="action_rename_list">تغییر نام فهرست</string>
<string name="action_delete_list">حذف فهرست</string>
<string name="action_edit_list">ویرایش فهرست</string>
<string name="hint_search_people_list">جست‌وجوی افرادی که پی می‌گیرید</string>
<string name="action_add_to_list">افزودن حساب به فهرست</string>
<string name="action_remove_from_list">برداشتن حساب از فهرست</string>
@ -683,4 +682,4 @@
\nنگارش: %s</string>
<string name="about_copy">رونوشت از اطّلاعات افزاره و نگارش</string>
<string name="about_copied">اطّلاعات افزاره و نگارش رونوشت شد</string>
</resources>
</resources>

1
app/src/main/res/values-fi/strings.xml
View File

@ -211,7 +211,6 @@
<string name="notification_favourite_format">%s lisäsi julkaisusi suosikkeihinsa</string>
<string name="action_open_reblogged_by">Näytä jaot</string>
<string name="action_show_reblogs">Näytä jaetut julkaisut</string>
<string name="action_edit_list">Muokkaa listaa</string>
<string name="notification_summary_large">%1$s, %2$s, %3$s ja %4$d muuta</string>
<plurals name="hint_describe_for_visually_impaired">
<item quantity="one">Kuvaa näkövammaisille

1
app/src/main/res/values-fr/strings.xml
View File

@ -280,7 +280,6 @@
<string name="action_create_list">Créer une liste</string>
<string name="action_rename_list">Renommer la liste</string>
<string name="action_delete_list">Supprimer la liste</string>
<string name="action_edit_list">Modifier la liste</string>
<string name="hint_search_people_list">Chercher des personnes que vous suivez</string>
<string name="action_add_to_list">Ajouter un compte à la liste</string>
<string name="action_remove_from_list">Supprimer un compte de la liste</string>

1
app/src/main/res/values-fy/strings.xml
View File

@ -14,7 +14,6 @@
<string name="action_set_caption">Ûnderskrift pleatse</string>
<string name="action_add_to_list">Account oan de list tafoegje</string>
<string name="hint_search_people_list">Sykje om minsken dy\'t jo folgje</string>
<string name="action_edit_list">Pas de list oan</string>
<string name="action_delete_list">Smyt de list fuort</string>
<string name="action_rename_list">Neam de list om</string>
<string name="action_create_list">Meitsje in list oan</string>

1
app/src/main/res/values-ga/strings.xml
View File

@ -311,7 +311,6 @@
<string name="action_create_list">Cruthaigh liosta</string>
<string name="action_rename_list">Athainmnigh an liosta</string>
<string name="action_delete_list">Scrios an liosta</string>
<string name="action_edit_list">Cuir an liosta in eagar</string>
<string name="hint_search_people_list">Cuardaigh daoine a leanann tú</string>
<string name="action_add_to_list">Cuir cuntas leis an liosta</string>
<string name="action_remove_from_list">Bain cuntas ón liosta</string>

3
app/src/main/res/values-gd/strings.xml
View File

@ -13,7 +13,6 @@
<string name="link_whats_an_instance">Dè a th’ ann an ionstans\?</string>
<string name="edit_poll">Deasaich</string>
<string name="filter_edit_title">Deasaich a’ chriathrag</string>
<string name="action_edit_list">Deasaich an liosta</string>
<string name="pref_title_edit_notification_settings">Brathan</string>
<string name="action_edit_own_profile">Deasaich</string>
<string name="action_edit">Deasaich</string>
@ -691,4 +690,4 @@
<string name="notification_listenable_worker_description">Brathan nuair a bhios Tusky ag obair sa chùlaibh</string>
<string name="notification_notification_worker">A’ faighinn nam brathan…</string>
<string name="notification_prune_cache">Obair-ghlèidhidh air an tasgadan…</string>
</resources>
</resources>

3
app/src/main/res/values-gl/strings.xml
View File

@ -262,7 +262,6 @@
<string name="action_remove_from_list">Eliminar conta da listaxe</string>
<string name="action_add_to_list">Engadir conta á listaxe</string>
<string name="hint_search_people_list">Atopar persoas ás que segues</string>
<string name="action_edit_list">Editar a listaxe</string>
<string name="action_delete_list">Eliminar a listaxe</string>
<string name="action_rename_list">Renomear a listaxe</string>
<string name="action_create_list">Crear unha listaxe</string>
@ -668,4 +667,4 @@
<string name="notification_notification_worker">Obtendo as notificacións…</string>
<string name="notification_prune_cache">Mantemento da caché…</string>
<string name="error_media_upload_sending_fmt">Fallou a subida: %s</string>
</resources>
</resources>

3
app/src/main/res/values-hi/strings.xml
View File

@ -315,7 +315,6 @@
<string name="action_remove_from_list">सूची से खाता निकालें</string>
<string name="action_add_to_list">सूची में खाता जोड़ें</string>
<string name="hint_search_people_list">उन लोगों की खोज करें जिन्हें आप फ़ॉलो करते हैं</string>
<string name="action_edit_list">सूची एडिट करें</string>
<string name="action_delete_list">सूची हटाएँ</string>
<string name="action_rename_list">सूची का नाम बदलें</string>
<string name="action_create_list">एक सूची बनाएं</string>
@ -406,4 +405,4 @@
<string name="error_media_upload_image_or_video">फोटो और वीडियो दोनों को एक ही पोस्ट से अटैच नहीं किया जा सकता है।</string>
<string name="error_loading_account_details">खाता विवरण लोड करने में विफल रहा</string>
<string name="error_could_not_load_login_page">लॉगिन पेज लोड नहीं किया जा सका।</string>
</resources>
</resources>

3
app/src/main/res/values-hu/strings.xml
View File

@ -318,7 +318,6 @@
<string name="action_create_list">Lista létrehozása</string>
<string name="action_rename_list">Lista átnevezése</string>
<string name="action_delete_list">Lista törlése</string>
<string name="action_edit_list">Lista szerkesztése</string>
<string name="title_domain_mutes">Rejtett domainek</string>
<string name="action_unreblog">Megtolás visszavonása</string>
<string name="action_view_domain_mutes">Rejtett domainek</string>
@ -675,4 +674,4 @@
<string name="error_missing_edits">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 <a href="https://github.com/mastodon/mastodon/issues/25398">Mastodon hiba #25398</a>.</string>
</resources>
</resources>

3
app/src/main/res/values-in/strings.xml
View File

@ -133,7 +133,6 @@
<string name="action_create_list">Buat daftar</string>
<string name="action_rename_list">Ubah nama daftar</string>
<string name="action_delete_list">Hapus daftar</string>
<string name="action_edit_list">Ubah daftar</string>
<string name="lock_account_label">Kunci akun</string>
<string name="system_default">Bawaan sistem</string>
<string name="action_compose_shortcut">Tulis</string>
@ -251,4 +250,4 @@
<string name="error_unmuting_hashtag_format">Kesalahan mengaktifkan #%s</string>
<string name="error_status_source_load">Gagal memuat sumber status dari server.</string>
<string name="title_public_trending_hashtags">Hashtag yang sedang tren</string>
</resources>
</resources>

3
app/src/main/res/values-is/strings.xml
View File

@ -292,7 +292,6 @@
<string name="action_create_list">Búa til lista</string>
<string name="action_rename_list">Endurnefna listann</string>
<string name="action_delete_list">Eyða listanum</string>
<string name="action_edit_list">Sýsla með listann</string>
<string name="hint_search_people_list">Leita að fólki sem þú fylgist með</string>
<string name="action_add_to_list">Bæta notandaaðgangi á listann</string>
<string name="action_remove_from_list">Fjarlægja notandaaðganginn af listanum</string>
@ -667,4 +666,4 @@
<string name="error_missing_edits">Þ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 <a href="https://github.com/mastodon/mastodon/issues/25398">Mastodon verkbeiðni #25398</a>.</string>
</resources>
</resources>

3
app/src/main/res/values-it/strings.xml
View File

@ -274,7 +274,6 @@
<string name="action_create_list">Crea una lista</string>
<string name="action_rename_list">Rinomina la lista</string>
<string name="action_delete_list">Elimina la lista</string>
<string name="action_edit_list">Modifica la lista</string>
<string name="hint_search_people_list">Cerca tra le persone che segui</string>
<string name="action_add_to_list">Aggiungi un account alla lista</string>
<string name="action_remove_from_list">Rimuovi un account dalla lista</string>
@ -688,4 +687,4 @@
<string name="error_missing_edits">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 <a href="https://github.com/mastodon/mastodon/issues/25398">problema Mastodon #25398</a>.</string>
</resources>
</resources>

3
app/src/main/res/values-ja/strings.xml
View File

@ -365,7 +365,6 @@
<string name="error_delete_list">リストを削除できませんでした</string>
<string name="action_create_list">リストの作成</string>
<string name="action_delete_list">リストの削除</string>
<string name="action_edit_list">リストの編集</string>
<string name="hint_search_people_list">フォロワーを検索</string>
<string name="action_add_to_list">リストにアカウントを追加</string>
<string name="action_remove_from_list">リストからアカウントを削除</string>
@ -662,4 +661,4 @@
<string name="error_missing_edits">あなたのサーバーは、この投稿が変更されたことを把握していますが、編集履歴のコピーを備えていないので、表示できません。
\n
\nこれは<a href="https://github.com/mastodon/mastodon/issues/25398">Mastodonのissue #25398</a>です。</string>
</resources>
</resources>

3
app/src/main/res/values-kab/strings.xml
View File

@ -126,7 +126,6 @@
<string name="action_create_list">Snulfu-d tabdart</string>
<string name="action_rename_list">Snifel isem n tabdart</string>
<string name="action_delete_list">Kkes tabdart-a</string>
<string name="action_edit_list">Ẓreg tabdart-a</string>
<string name="action_add_to_list">Rnu yiwen umiḍan ɣer tabdart</string>
<string name="action_remove_from_list">Kkes amiḍan seg tabdart</string>
<string name="profile_metadata_add">Rnu isefka</string>
@ -274,4 +273,4 @@
<string name="pref_title_show_boosts">Sken-d beṭuyat</string>
<string name="hashtags">Ihacṭagen</string>
<string name="notification_follow_request_name">Isuturen n teḍfeṛt</string>
</resources>
</resources>

1
app/src/main/res/values-ko/strings.xml
View File

@ -286,7 +286,6 @@
<string name="action_create_list">리스트 생성</string>
<string name="action_rename_list">리스트 이름 바꾸기</string>
<string name="action_delete_list">리스트 삭제</string>
<string name="action_edit_list">리스트 편집</string>
<string name="hint_search_people_list">당신을 팔로우하는 사람 검색</string>
<string name="action_add_to_list">리스트에 계정 추가</string>
<string name="action_remove_from_list">리스트에서 계정 삭제</string>

1
app/src/main/res/values-lv/strings.xml
View File

@ -130,7 +130,6 @@
<string name="action_create_list">Izveidot sarakstu</string>
<string name="action_rename_list">Pārsaukt sarakstu</string>
<string name="action_delete_list">Dzēst sarakstu</string>
<string name="action_edit_list">Labot sarakstu</string>
<string name="action_add_to_list">Pievienot kontu sarakstam</string>
<string name="action_remove_from_list">Noņemt kontu no saraksta</string>
<string name="action_edit_image">Labot attēlu</string>

7
app/src/main/res/values-nb-rNO/strings.xml
View File

@ -246,7 +246,6 @@
<string name="action_create_list">Opprett en liste</string>
<string name="action_rename_list">Gi listen nytt navn</string>
<string name="action_delete_list">Fjern listen</string>
<string name="action_edit_list">Endre listen</string>
<string name="hint_search_people_list">Søk etter personer du følger</string>
<string name="action_add_to_list">Legg til konto i listen</string>
<string name="action_remove_from_list">Fjern konto fra listen</string>
@ -578,7 +577,7 @@
<string name="action_unfollow_hashtag_format">Slutte å følge #%s\?</string>
<string name="confirmation_hashtag_unfollowed">Sluttet å følge #%s</string>
<string name="a11y_label_loading_thread">Laster tråd</string>
<string name="help_empty_home">Dette er <b>Hjemmetidslinjen</b>din. Den viser de nyeste innleggene av kontoer du følger.
<string name="help_empty_home">Dette er <b>Hjemmetidslinjen</b>din. 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.</string>
<string name="pref_title_reading_order">Leserekkefølge</string>
@ -666,7 +665,7 @@
<string name="pref_title_show_stat_inline">Vis poststatistikk i tidslinjen</string>
<string name="load_newest_notifications">Last de nyeste varslene</string>
<string name="compose_delete_draft">Del utkast\?</string>
<string name="error_missing_edits">Serveren din vet at denne posten ble endret, men har ingen kopi av entringene så de kann ikke vises.
<string name="error_missing_edits">Serveren din vet at denne posten ble endret, men har ingen kopi av entringene så de kann ikke vises.
\n
\nDette er <a href="https://github.com/mastodon/mastodon/issues/25398">Mastodon issue #25398</a>.</string>
</resources>
</resources>

3
app/src/main/res/values-nl/strings.xml
View File

@ -347,7 +347,6 @@
<string name="action_create_list">Lijst aanmaken</string>
<string name="action_rename_list">Lijst hernoemen</string>
<string name="action_delete_list">Lijst verwijderen</string>
<string name="action_edit_list">Lijst bewerken</string>
<string name="hint_search_people_list">Naar mensen zoeken die je volgt</string>
<string name="action_add_to_list">Account aan de lijst toevoegen</string>
<string name="action_remove_from_list">Account uit de lijst verwijderen</string>
@ -651,4 +650,4 @@
<string name="label_filter_title">Titel</string>
<string name="load_newest_notifications">Laad nieuwste meldingen</string>
<string name="compose_delete_draft">Verwijder concept\?</string>
</resources>
</resources>

3
app/src/main/res/values-oc/strings.xml
View File

@ -315,7 +315,6 @@
<string name="action_create_list">Crear una lista</string>
<string name="action_rename_list">Renomenar la lista</string>
<string name="action_delete_list">Suprimir la lista</string>
<string name="action_edit_list">Modificar la lista</string>
<string name="hint_search_people_list">Cercar lo monde que seguètz</string>
<string name="action_add_to_list">Ajustar un compte a la lista</string>
<string name="action_remove_from_list">Suprimir aqueste compte de la lista</string>
@ -684,4 +683,4 @@
<string name="about_account_info">\@%s@%s
\nVersion : %s</string>
<string name="error_media_upload_sending_fmt">Fracàs del mandadís : %s</string>
</resources>
</resources>

1
app/src/main/res/values-pl/strings.xml
View File

@ -330,7 +330,6 @@
<string name="action_create_list">Stwórz listę</string>
<string name="action_rename_list">Zmień nazwę listy</string>
<string name="action_delete_list">Usuń listę</string>
<string name="action_edit_list">Edytuj listę</string>
<string name="hint_search_people_list">Szukaj osób, których obserwujesz</string>
<string name="action_add_to_list">Dodaj konto do listy</string>
<string name="action_remove_from_list">Usuń konto z listy</string>

1
app/src/main/res/values-pt-rBR/strings.xml
View File

@ -321,7 +321,6 @@
<string name="action_create_list">Criar uma lista</string>
<string name="action_rename_list">Renomear lista</string>
<string name="action_delete_list">Excluir lista</string>
<string name="action_edit_list">Editar lista</string>
<string name="hint_search_people_list">Pesquisar pessoas que você segue</string>
<string name="action_add_to_list">Adicionar conta à lista</string>
<string name="action_remove_from_list">Remover conta da lista</string>

3
app/src/main/res/values-pt-rPT/strings.xml
View File

@ -10,7 +10,6 @@
<item quantity="other">%d novas interações</item>
</plurals>
<string name="replying_to">A responder a @%s</string>
<string name="action_edit_list">Editar a lista</string>
<string name="lock_account_label_description">Necessita de aprovar manualmente os seguidores</string>
<string name="compose_save_draft">Guardar rascunho\?</string>
<string name="later">Depois</string>
@ -596,4 +595,4 @@
<string name="post_edited">Editado %s</string>
<string name="title_followed_hashtags">Hashtags seguidas</string>
<string name="title_public_trending_hashtags">Hashtags populares</string>
</resources>
</resources>

1
app/src/main/res/values-ru/strings.xml
View File

@ -300,7 +300,6 @@
<string name="action_create_list">Создать список</string>
<string name="action_rename_list">Переименовать список</string>
<string name="action_delete_list">Удалить список</string>
<string name="action_edit_list">Изменить список</string>
<string name="hint_search_people_list">Поиск по вашим подпискам</string>
<string name="action_add_to_list">Добавить аккаунт в список</string>
<string name="action_remove_from_list">Удалить аккаунт из списка</string>

1
app/src/main/res/values-sa/strings.xml
View File

@ -189,7 +189,6 @@
\n
\nअधिकमत्र प्राप्यते <a href="https://joinmastodon.org">joinmastodon.org</a>. </string>
<string name="hint_search_people_list">येषामुसरणं करोषि तेष्वन्विष्यताम्</string>
<string name="action_edit_list">सूचिः सम्पाद्यताम्</string>
<string name="action_delete_list">सूचिर्नश्यताम्</string>
<string name="action_rename_list">पुनः सूचिनामकरणं क्रियताम्</string>
<string name="action_create_list">सूचिः निर्मीयताम्</string>

1
app/src/main/res/values-sl/strings.xml
View File

@ -251,7 +251,6 @@
<string name="action_create_list">Ustvari seznam</string>
<string name="action_rename_list">Preimenuj seznam</string>
<string name="action_delete_list">Izbriši seznam</string>
<string name="action_edit_list">Uredi seznam</string>
<string name="hint_search_people_list">Poiščite osebe, katerim sledite</string>
<string name="action_add_to_list">Dodaj račun na seznam</string>
<string name="action_remove_from_list">Odstrani račun iz seznama</string>

3
app/src/main/res/values-sv/strings.xml
View File

@ -274,7 +274,6 @@
<string name="action_create_list">Skapa en lista</string>
<string name="action_rename_list">Byt namn på listan</string>
<string name="action_delete_list">Ta bort listan</string>
<string name="action_edit_list">Redigera lista</string>
<string name="hint_search_people_list">Sök efter personer du följer</string>
<string name="action_add_to_list">Lägg till konto i listan</string>
<string name="action_remove_from_list">Ta bort kontot från listan</string>
@ -683,4 +682,4 @@
<string name="error_missing_edits">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 <a href="https://github.com/mastodon/mastodon/issues/25398">Mastodon problem #25398</a>.</string>
</resources>
</resources>

1
app/src/main/res/values-th/strings.xml
View File

@ -136,7 +136,6 @@
<string name="action_remove_from_list">ลบบัญชีออกจากรายการ</string>
<string name="action_add_to_list">เพิ่มบัญชีไปใส่รายการ</string>
<string name="hint_search_people_list">ค้นหาผู้ติดตาม</string>
<string name="action_edit_list">แก้ไขรายการ</string>
<string name="action_delete_list">ลบรายการ</string>
<string name="action_rename_list">เปลี่ยนชื่อรายการ</string>
<string name="action_create_list">สร้างรายการ</string>

3
app/src/main/res/values-tr/strings.xml
View File

@ -339,7 +339,6 @@
<string name="action_create_list">Liste oluştur</string>
<string name="action_rename_list">Listeyi yeniden adlandır</string>
<string name="action_delete_list">Listeyi sil</string>
<string name="action_edit_list">Listeyi düzenle</string>
<string name="hint_search_people_list">Takip ettiğim kişilerde ara</string>
<string name="action_add_to_list">Listeye hesap ekle</string>
<string name="action_remove_from_list">Hesabı listeden kaldır</string>
@ -675,4 +674,4 @@
\n
\nBu <a href="https://github.com/mastodon/mastodon/issues/25398">Mastodon sorununu #25398</a>.</string>
<string name="error_media_upload_sending_fmt">Yükleme başarısız oldu: %s</string>
</resources>
</resources>

3
app/src/main/res/values-uk/strings.xml
View File

@ -274,7 +274,6 @@
<string name="action_remove_from_list">Вилучити обліковий запис зі списку</string>
<string name="action_add_to_list">Додати обліковий запис до списку</string>
<string name="hint_search_people_list">Пошук серед тих, на кого ви підписані</string>
<string name="action_edit_list">Змінити список</string>
<string name="action_delete_list">Видалити список</string>
<string name="action_rename_list">Змінити назву списку</string>
<string name="action_create_list">Створити список</string>
@ -692,4 +691,4 @@
\n
\nЦе <a href="https://github.com/mastodon/mastodon/issues/25398">помилка #25398 у Mastodon</a>.</string>
<string name="error_media_upload_sending_fmt">Не вдалося вивантажити: %s</string>
</resources>
</resources>

3
app/src/main/res/values-vi/strings.xml
View File

@ -439,7 +439,6 @@
<string name="action_add_to_list">Thêm người này vào danh sách</string>
<string name="action_remove_from_list">Xóa người này khỏi danh sách</string>
<string name="hint_search_people_list">Tìm người để theo dõi</string>
<string name="action_edit_list">Sửa danh sách</string>
<string name="action_delete_list">Xóa danh sách</string>
<string name="action_rename_list">Đổi tên danh sách</string>
<string name="action_create_list">Tạo danh sách</string>
@ -665,4 +664,4 @@
<string name="about_copy">Sao chép phiên bản và thông tin thiết bị</string>
<string name="about_copied">Đã sao chép phiên bản và thông tin thiết bị</string>
<string name="about_device_info_title">Thiết bị của bạn</string>
</resources>
</resources>

3
app/src/main/res/values-zh-rCN/strings.xml
View File

@ -276,7 +276,6 @@
<string name="action_create_list">新建列表</string>
<string name="action_rename_list">重命名列表</string>
<string name="action_delete_list">删除列表</string>
<string name="action_edit_list">编辑列表</string>
<string name="hint_search_people_list">搜索已关注的用户</string>
<string name="action_add_to_list">添加用户到列表</string>
<string name="action_remove_from_list">从列表中移除用户</string>
@ -679,4 +678,4 @@
\nAndroid 系统版本: %s
\nSDK 版本: %d</string>
<string name="about_copy">复制版本及设备信息</string>
</resources>
</resources>

1
app/src/main/res/values-zh-rHK/strings.xml
View File

@ -280,7 +280,6 @@
<string name="action_create_list">新建列表</string>
<string name="action_rename_list">重命名列表</string>
<string name="action_delete_list">刪除列表</string>
<string name="action_edit_list">編輯列表</string>
<string name="hint_search_people_list">搜索已關注的用戶</string>
<string name="action_add_to_list">添加用戶到列表</string>
<string name="action_remove_from_list">從列表中移除用戶</string>

1
app/src/main/res/values-zh-rMO/strings.xml
View File

@ -274,7 +274,6 @@
<string name="action_create_list">新建列表</string>
<string name="action_rename_list">重命名列表</string>
<string name="action_delete_list">刪除列表</string>
<string name="action_edit_list">編輯列表</string>
<string name="hint_search_people_list">搜索已關注的用戶</string>
<string name="action_add_to_list">添加用戶到列表</string>
<string name="action_remove_from_list">從列表中移除用戶</string>

1
app/src/main/res/values-zh-rSG/strings.xml
View File

@ -279,7 +279,6 @@
<string name="action_create_list">新建列表</string>
<string name="action_rename_list">重命名列表</string>
<string name="action_delete_list">删除列表</string>
<string name="action_edit_list">编辑列表</string>
<string name="hint_search_people_list">搜索已关注的用户</string>
<string name="action_add_to_list">添加用户到列表</string>
<string name="action_remove_from_list">从列表中移除用户</string>

1
app/src/main/res/values-zh-rTW/strings.xml
View File

@ -280,7 +280,6 @@
<string name="action_create_list">新建列表</string>
<string name="action_rename_list">重命名列表</string>
<string name="action_delete_list">刪除列表</string>
<string name="action_edit_list">編輯列表</string>
<string name="hint_search_people_list">搜索已關注的用戶</string>
<string name="action_add_to_list">添加用戶到列表</string>
<string name="action_remove_from_list">從列表中移除用戶</string>

6
app/src/main/res/values/strings.xml
View File

@ -460,12 +460,11 @@
<string name="action_lists">Lists</string>
<string name="title_lists">Lists</string>
<string name="error_create_list">Could not create list</string>
<string name="error_rename_list">Could not rename list</string>
<string name="error_rename_list">Could not update list</string>
<string name="error_delete_list">Could not delete list</string>
<string name="action_create_list">Create a list</string>
<string name="action_rename_list">Rename the list</string>
<string name="action_rename_list">Update the list</string>
<string name="action_delete_list">Delete the list</string>
<string name="action_edit_list">Edit the list</string>
<string name="hint_search_people_list">Search for people you follow</string>
<string name="action_add_to_list">Add account to the list</string>
<string name="action_remove_from_list">Remove account from the list</string>
@ -609,6 +608,7 @@
<string name="select_list_empty">You have no lists, yet</string>
<string name="select_list_manage">Manage lists</string>
<string name="error_list_load">Error loading lists</string>
<string name="list_exclusive_label">Hide from the home timeline</string>
<string name="list">List</string>
<string name="notifications_clear">Clear</string>
<string name="notifications_apply_filter">Filter</string>