diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt index e2aa4ce6a..3ad05edac 100644 --- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt @@ -43,6 +43,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton import com.google.android.material.snackbar.Snackbar import com.google.android.material.tabs.TabLayout import com.keylesspalace.tusky.adapter.AccountFieldAdapter +import com.keylesspalace.tusky.components.report.ReportActivity import com.keylesspalace.tusky.di.ViewModelFactory import com.keylesspalace.tusky.entity.Account import com.keylesspalace.tusky.entity.Relationship @@ -628,12 +629,13 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI } } else { - // It shouldn't be possible to block or follow yourself. + // It shouldn't be possible to block, follow, mute or report yourself. menu.removeItem(R.id.action_follow) menu.removeItem(R.id.action_block) menu.removeItem(R.id.action_mute) menu.removeItem(R.id.action_mute_domain) menu.removeItem(R.id.action_show_reblogs) + menu.removeItem(R.id.action_report) } return super.onCreateOptionsMenu(menu) @@ -725,6 +727,12 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI viewModel.changeShowReblogsState() return true } + R.id.action_report -> { + if(loadedAccount != null) { + startActivity(ReportActivity.getIntent(this, viewModel.accountId, loadedAccount!!.username)) + } + return true + } } return super.onOptionsItemSelected(item) } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt index 762a805fc..ff1375d94 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt @@ -18,7 +18,6 @@ package com.keylesspalace.tusky.components.report import android.content.Context import android.content.Intent import android.os.Bundle -import android.text.Spanned import android.view.MenuItem import androidx.appcompat.content.res.AppCompatResources import androidx.lifecycle.Observer @@ -27,7 +26,6 @@ import com.keylesspalace.tusky.BottomSheetActivity import com.keylesspalace.tusky.R import com.keylesspalace.tusky.components.report.adapter.ReportPagerAdapter import com.keylesspalace.tusky.di.ViewModelFactory -import com.keylesspalace.tusky.util.HtmlUtils import com.keylesspalace.tusky.util.ThemeUtils import dagger.android.DispatchingAndroidInjector import dagger.android.HasAndroidInjector @@ -55,8 +53,7 @@ class ReportActivity : BottomSheetActivity(), HasAndroidInjector { throw IllegalStateException("accountId ($accountId) or accountUserName ($accountUserName) is null") } - viewModel.init(accountId, accountUserName, - intent?.getStringExtra(STATUS_ID), intent?.getStringExtra(STATUS_CONTENT)) + viewModel.init(accountId, accountUserName, intent?.getStringExtra(STATUS_ID)) setContentView(R.layout.activity_report) @@ -143,16 +140,14 @@ class ReportActivity : BottomSheetActivity(), HasAndroidInjector { private const val ACCOUNT_ID = "account_id" private const val ACCOUNT_USERNAME = "account_username" private const val STATUS_ID = "status_id" - private const val STATUS_CONTENT = "status_content" @JvmStatic - fun getIntent(context: Context, accountId: String, userName: String, statusId: String, statusContent: Spanned) = + fun getIntent(context: Context, accountId: String, userName: String, statusId: String? = null) = Intent(context, ReportActivity::class.java) .apply { putExtra(ACCOUNT_ID, accountId) putExtra(ACCOUNT_USERNAME, userName) putExtra(STATUS_ID, statusId) - putExtra(STATUS_CONTENT, HtmlUtils.toHtml(statusContent)) } } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/report/ReportViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/report/ReportViewModel.kt index c772ff9b1..d50505a92 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/report/ReportViewModel.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/report/ReportViewModel.kt @@ -64,21 +64,20 @@ class ReportViewModel @Inject constructor( var reportNote: String? = null var isRemoteNotify = false - private var statusContent: String? = null private var statusId: String? = null lateinit var accountUserName: String lateinit var accountId: String var isRemoteAccount: Boolean = false var remoteServer: String? = null - fun init(accountId: String, userName: String, statusId: String?, statusContent: String?) { + fun init(accountId: String, userName: String, statusId: String?) { this.accountId = accountId this.accountUserName = userName this.statusId = statusId statusId?.let { selectedIds.add(it) } - this.statusContent = statusContent + isRemoteAccount = userName.contains('@') if (isRemoteAccount) { remoteServer = userName.substring(userName.indexOf('@') + 1) @@ -208,17 +207,15 @@ class ReportViewModel @Inject constructor( } fun setStatusChecked(status: Status, checked: Boolean) { - if (checked) + if (checked) { selectedIds.add(status.id) - else + } else { selectedIds.remove(status.id) + } } fun isStatusChecked(id: String): Boolean { return selectedIds.contains(id) } - fun isStatusesSelected(): Boolean { - return selectedIds.isNotEmpty() - } } \ No newline at end of file diff --git a/app/src/main/java/com/keylesspalace/tusky/components/report/adapter/StatusesDataSource.kt b/app/src/main/java/com/keylesspalace/tusky/components/report/adapter/StatusesDataSource.kt index 8ecfbff21..23ecc8f1a 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/report/adapter/StatusesDataSource.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/report/adapter/StatusesDataSource.kt @@ -72,14 +72,18 @@ class StatusesDataSource(private val accountId: String, retryBefore = null retryInitial = null initialLoad.postValue(NetworkState.LOADING) - mastodonApi.statusObservable(params.requestedInitialKey).zipWith( - mastodonApi.accountStatusesObservable(accountId, params.requestedInitialKey, null, params.requestedLoadSize - 1, true), - BiFunction { status: Status, list: List -> - val ret = ArrayList() - ret.add(status) - ret.addAll(list) - return@BiFunction ret - }) + if (params.requestedInitialKey == null) { + mastodonApi.accountStatusesObservable(accountId, null, null, params.requestedLoadSize, true) + } else { + mastodonApi.statusObservable(params.requestedInitialKey).zipWith( + mastodonApi.accountStatusesObservable(accountId, params.requestedInitialKey, null, params.requestedLoadSize - 1, true), + BiFunction { status: Status, list: List -> + val ret = ArrayList() + ret.add(status) + ret.addAll(list) + return@BiFunction ret + }) + } .doOnSubscribe { disposables.add(it) } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt index 13edcb44c..50d4861f1 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt @@ -188,11 +188,7 @@ class ReportStatusesFragment : Fragment(), Injectable, AdapterHandler { } buttonContinue.setOnClickListener { - if (viewModel.isStatusesSelected()) { - viewModel.navigateTo(Screen.Note) - } else { - Snackbar.make(swipeRefreshLayout, R.string.error_report_too_few_statuses, Snackbar.LENGTH_LONG).show() - } + viewModel.navigateTo(Screen.Note) } } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt index ce0d557f8..a39d7cdef 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt @@ -202,7 +202,6 @@ class SearchStatusesFragment : SearchFragment { - openReportPage(accountId, accountUsername, id, content) + openReportPage(accountId, accountUsername, id) return@setOnMenuItemClickListener true } R.id.status_unreblog_private -> { @@ -367,9 +366,8 @@ class SearchStatusesFragment : SearchFragment accounts = accountManager.getAllAccountsOrderedByActive(); String openAsTitle = null; @@ -273,7 +272,7 @@ public abstract class SFragment extends BaseFragment implements Injectable { return true; } case R.id.status_report: { - openReportPage(accountId, accountUsername, id, content); + openReportPage(accountId, accountUsername, id); return true; } case R.id.status_unreblog_private: { @@ -340,9 +339,8 @@ public abstract class SFragment extends BaseFragment implements Injectable { startActivity(intent); } - protected void openReportPage(String accountId, String accountUsername, String statusId, - Spanned statusContent) { - startActivity(ReportActivity.getIntent(requireContext(),accountId,accountUsername,statusId,statusContent)); + protected void openReportPage(String accountId, String accountUsername, String statusId) { + startActivity(ReportActivity.getIntent(requireContext(), accountId, accountUsername, statusId)); } protected void showConfirmDeleteDialog(final String id, final int position) { diff --git a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.java b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.java index cb30099ad..043367c6b 100644 --- a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.java +++ b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.java @@ -19,7 +19,6 @@ import com.keylesspalace.tusky.entity.AccessToken; import com.keylesspalace.tusky.entity.Account; import com.keylesspalace.tusky.entity.AppCredentials; import com.keylesspalace.tusky.entity.Attachment; -import com.keylesspalace.tusky.entity.Card; import com.keylesspalace.tusky.entity.Conversation; import com.keylesspalace.tusky.entity.Emoji; import com.keylesspalace.tusky.entity.Filter; @@ -299,13 +298,6 @@ public interface MastodonApi { @POST("api/v1/follow_requests/{id}/reject") Call rejectFollowRequest(@Path("id") String accountId); - @FormUrlEncoded - @POST("api/v1/reports") - Call report( - @Field("account_id") String accountId, - @Field("status_ids[]") List statusIds, - @Field("comment") String comment); - @GET("api/v1/search") Call search(@Query("q") String q, @Query("resolve") Boolean resolve); diff --git a/app/src/main/res/menu/account_toolbar.xml b/app/src/main/res/menu/account_toolbar.xml index 9e84f8751..ee8811228 100644 --- a/app/src/main/res/menu/account_toolbar.xml +++ b/app/src/main/res/menu/account_toolbar.xml @@ -30,5 +30,7 @@ android:title="@string/action_hide_reblogs" app:showAsAction="never" /> - + \ No newline at end of file diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 16af83b02..d32c89323 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -18,7 +18,6 @@ التصريح لازم للإحتفاظ بالوسائط. لا يمكنك إرفاق كلا من الصور و الفيديوهات في نفس المنشور. اخفقت عملية الرفع. - يجب على الأقل اختيار منشور واحد للإبلاغ عنه. خطأ عند إرسال التبويق. الرئيسية الاشعارات diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml index c900544ea..e178faf56 100644 --- a/app/src/main/res/values-bn-rIN/strings.xml +++ b/app/src/main/res/values-bn-rIN/strings.xml @@ -19,7 +19,6 @@ মিডিয়া সংরক্ষণ করার অনুমতি প্রয়োজন। ছবি এবং ভিডিও উভয় একই স্টেটাস থেকে সংযুক্ত করা যাবে না। আপলোড করতে ব্যর্থ হয়েছে। - অন্তত এক স্টেটাস রিপোর্ট করা আবশ্যক। টুট পাঠাতে গিয়ে একটি ত্রুটি ঘটেছে। ঘর diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index a70b2f7c8..1b68801b5 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -17,7 +17,6 @@ Cal pemís d\'escriptura en el mitjà. No es poden adjuntar imatges i vídeos en el mateix estat. La pujada ha fallat. - Com a mínim has de denunciar un estat. Inici Notificacions diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index a8ab9a133..4337a151e 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -18,7 +18,6 @@ Je vyžadováno povolení ukládat média. K jednomu tootu nemohou být přiloženy obrázky i videa. Nahrání selhalo. - Musí být nahlášen alespoň jeden toot. Chyba při odesílání tootu. Domů Oznámení diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index ee5e50d3d..2079097d7 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -17,7 +17,6 @@ Rhaid cael caniatâd i gadw hwn. Ni allwch atodi delweddau a fideos i\'r un statws. Methu uwchlwytho. - Rhaid rhoi gwybod am o leiaf un statws. Methu tŵtio. Hafan Hysbysiadau diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8606aac81..5a6a24446 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -18,7 +18,6 @@ Eine Berechtigung wird zum Speichern des Mediums benötigt. Bilder und Videos können beide nicht an den Beitrag angehängt werden. Die Mediendatei konnte nicht hochgeladen werden. - Mindestens ein Beitrag muss gemeldet werden. Fehler beim Senden des Status. Start Benachrichtigungen diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 74ce37522..4f36e60f2 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -18,7 +18,6 @@ Permeso konservi aŭdovidaĵojn necesas. Bildoj kaj videoj ne povas ambaŭ estas alligita al la sama mesaĝo. La alŝuto malsukcesis. - Almenaŭ unu mesaĝo devas esti signalita. Eraro dum sendo de la mesaĝo. Hejmo Sciigoj diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 14f485964..c24d1bf71 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -18,7 +18,6 @@ Se requiere permiso para descargar al almacenamiento. No se pueden adjuntar imágenes y vídeos en el mismo estado. La subida falló. - Debe seleccionar al menos un estado. Error al publicar. Inicio Notificaciones diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 79093b70c..0adea8b86 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -17,7 +17,6 @@ Memoriara deskargatzeko baimena behar da. Ezin dira bideoak eta irudiak tut berean gehitu. Akatsa igotzerakoan. - Gutxienez tut bat hautatu behar da. Akatsa tuta bidaltzerakoan. Hasiera Jakinarazpenak diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 2f9fce1a5..fc8d40346 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -17,7 +17,6 @@ اجازه ذخیره رسانه نیاز است تصاویر و فیلم‌ها هر دو نمی‌توانند به یک وضعیت ضمیمه شوند. بارگذاری ناموفق بود - حداقل یک وضعیت باید گزارش شود خطا در ارسال بوق خانه اعلان‌ها diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 4356fc495..0f88dbe12 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -18,7 +18,6 @@ Permission requise pour enregistrer le média. Un même pouet ne peut contenir à la fois une vidéo et une image. Échec d’envoi du média. - Au moins un pouet doit été signalé. Erreur lors de l’envoi du pouet. Accueil Notifications diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index b9682f4a1..0ac8a47a6 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -18,7 +18,6 @@ Média tárolási engedély szükséges. Képek és videók egyszerre nem csatolhatók ugyanazon tülköléshez. Feltöltés sikertelen. - Legalább egy tülkölést jelenti kell. Nem sikerült elküldeni a tülköt. Kezdőlap Értesítések diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 595a2626c..a706f9f11 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -18,7 +18,6 @@ È richiesta l\'autorizzazione di archiviazione. Immagini e video non possono essere allegati allo stesso stato. Il caricamento non è riuscito. - Almeno uno stato deve essere segnalato. Errore nell\'invio del toot. Home Notifiche diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ab5cf9e56..dcf5fbe71 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -17,7 +17,6 @@ メディアの書き込み許可が必要です。 画像と動画を同時に投稿することはできません。 アップロードに失敗しました。 - 少なくとも1つの投稿を報告してください。 トゥート送信時のエラーです。 ホーム 通知 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 73873261d..e7f36b748 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -19,7 +19,6 @@ 미디어를 저장하기 위한 권한이 필요합니다. 이미지와 비디오는 동시에 첨부할 수 없습니다. 파일을 업로드하지 못했습니다. - 신고할 게시물을 최소 1개 이상 선택해야 합니다. 툿을 전송하지 못했습니다. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index fa6544b1c..1fd0103bb 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -18,7 +18,6 @@ Er is toestemming nodig om media op te slaan. Afbeeldingen en video\'s kunnen niet allebei aan dezelfde toot worden toegevoegd. Uploaden mislukt. - Minstens een status moet gerapporteerd worden. Fout tijdens verzenden toot. Start Meldingen diff --git a/app/src/main/res/values-no-rNB/strings.xml b/app/src/main/res/values-no-rNB/strings.xml index 254e3b83c..1fd9e6a43 100644 --- a/app/src/main/res/values-no-rNB/strings.xml +++ b/app/src/main/res/values-no-rNB/strings.xml @@ -19,7 +19,6 @@ Trenger tillatelse for å lagre media. Bilder og videoer kan ikke kobles til samme status. Opplastingen feilet. - Minst en status må rapporteres. En feil oppsto under sending av tootet. Hjem diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml index b7bc51284..f6b2a9adb 100644 --- a/app/src/main/res/values-oc/strings.xml +++ b/app/src/main/res/values-oc/strings.xml @@ -17,7 +17,6 @@ Cal pemís d\'escritura dins lo mèdia. Se pòt pas ajustar imatges e una vidèo dins lo meteis estatut. Fracàs en mandar. - Cal almens denonciar un estatut. Error en enviar lo tut. Acuèlh Notificacions diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 19a49e7b0..cc473c9e3 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -16,7 +16,6 @@ Wymagane jest pozwolenie na przechowywanie plików na urządzeniu. Do wpisu nie mogą być dołączone jednocześnie obrazy i pliki wideo. Wysyłanie nie powiodło się. - Musisz zgłosić przynajmniej jeden wpis. Wysyłanie wpisu nie powiodło się. Strona główna Powiadomienia diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 515f77d1e..fe08482cc 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -17,7 +17,6 @@ Permissão para armazenar mídia é necessária. Imagens e vídeos não podem ser anexados no mesmo toot. Falha no envio. - Pelo menos um toot deve ser denunciado. Erro ao enviar toot. Página inicial Notificações diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index da93a87bc..4a5b51375 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -19,7 +19,6 @@ Необходимо разрешение для хранения медиаконтента. Изображения и видео не могут быть прикрекплены к статусу одновременно. Загрузка не удалась. - Должен быть выбран хотя бы один статус. Ошибка при отправке поста. Главная diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 595b8f5e0..7efac0503 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -18,7 +18,6 @@ Potrebno je dovoljenje za shranjevanje medijev. Slike in videoposnetki ne morejo biti dodani istemu statusu. Prenos ni uspel. - Prijaviti je treba vsaj en status. Napaka pri pošiljanju tuta. Domov diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 6cffe301d..2864df5eb 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -18,7 +18,6 @@ Tillstånd att lagra media krävs. Bilder och videoklipp kan inte båda bifogas i samma status. Uppladdningen misslyckades. - Minst en status måste rapporteras. Misslyckades med att få ett inloggningsnamn. Hem Notifikationer diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index c76ead3ad..7cdfc439c 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -16,7 +16,6 @@ ஊடகத்தை சேமிக்க அனுமதி தேவை. படங்களும், வீடியோக்களும் ஒரே நிலைக்கு இணைக்க இயலாது. பதிவேற்றம் தோல்வியுற்றது. - குறைந்தபட்சம் ஒரு நிலையை அறிவிக்க வேண்டும். முகப்பு அறிவிப்புகள் அருகாமயில் diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 8f7644e36..6f79c632b 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -18,7 +18,6 @@ Medya yazma izni gerekiyor. Aynı iletiye hem video hem resim eklenemez. Yükleme başarsız. - En az bir durum bildirilmelidir. İleti gönderilirken hata oluştu. Ana sayfa Bildirimler diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 37cb37c6e..a274d96f7 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -18,7 +18,6 @@ 需要授予 Tusky 写入存储空间的权限 无法在嘟文中同时插入视频和图片 媒体文件上传失败 - 至少要报告 1 则嘟文 嘟文发送时出错 主页 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 7d6a90ae4..e8d126a4f 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -18,7 +18,6 @@ 需要授予 Tusky 寫入儲存空間的權限 無法在嘟文中同時插入影片和圖片 媒體檔案上傳失敗 - 至少要檢舉 1 則嘟文 嘟文發送時出錯 主頁 diff --git a/app/src/main/res/values-zh-rMO/strings.xml b/app/src/main/res/values-zh-rMO/strings.xml index 7d6a90ae4..e8d126a4f 100644 --- a/app/src/main/res/values-zh-rMO/strings.xml +++ b/app/src/main/res/values-zh-rMO/strings.xml @@ -18,7 +18,6 @@ 需要授予 Tusky 寫入儲存空間的權限 無法在嘟文中同時插入影片和圖片 媒體檔案上傳失敗 - 至少要檢舉 1 則嘟文 嘟文發送時出錯 主頁 diff --git a/app/src/main/res/values-zh-rSG/strings.xml b/app/src/main/res/values-zh-rSG/strings.xml index 2e7f5fe8c..aef57a0c7 100644 --- a/app/src/main/res/values-zh-rSG/strings.xml +++ b/app/src/main/res/values-zh-rSG/strings.xml @@ -18,7 +18,6 @@ 需要授予 Tusky 写入存储空间的权限 无法在嘟文中同时插入视频和图片 媒体文件上传失败 - 至少要报告 1 则嘟文 嘟文发送时出错 主页 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 6454ac1bb..c429a91fe 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -18,7 +18,6 @@ 需要授予 Tusky 寫入儲存空間的權限 無法在嘟文中同時插入影片和圖片 媒體檔案上傳失敗 - 至少要檢舉 1 則嘟文 嘟文發送時出錯 主頁 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2dc0ad4d1..b389c0eb8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,7 +18,6 @@ Permission to store media is required. Images and videos cannot both be attached to the same status. The upload failed. - At least one status must be reported. Error sending toot. Home