From 369979a60e21276dcc21a09f097f65335da52fa9 Mon Sep 17 00:00:00 2001 From: Nik Clayton Date: Fri, 1 Sep 2023 19:37:01 +0200 Subject: [PATCH] feat: Allow the user to specify an arbitrary number of tabs - Remove the existing restriction on the number of tabs - Allow the tabs to scroll to display more - Update UI and text resources to remove obsolete content --- app/lint-baseline.xml | 610 +++++++----------- .../tusky/TabPreferenceActivity.kt | 8 - app/src/main/res/layout/activity_main.xml | 4 +- .../res/layout/activity_tab_preference.xml | 11 +- app/src/main/res/values-ar/strings.xml | 8 - app/src/main/res/values-be/strings.xml | 6 - app/src/main/res/values-bg/strings.xml | 3 - app/src/main/res/values-bn-rBD/strings.xml | 4 - app/src/main/res/values-bn-rIN/strings.xml | 3 - app/src/main/res/values-ca/strings.xml | 4 - app/src/main/res/values-ckb/strings.xml | 3 - app/src/main/res/values-cs/strings.xml | 5 - app/src/main/res/values-cy/strings.xml | 8 - app/src/main/res/values-de/strings.xml | 4 - app/src/main/res/values-eo/strings.xml | 4 - app/src/main/res/values-es/strings.xml | 5 - app/src/main/res/values-eu/strings.xml | 4 - app/src/main/res/values-fa/strings.xml | 4 - app/src/main/res/values-fr/strings.xml | 7 +- app/src/main/res/values-ga/strings.xml | 3 - app/src/main/res/values-gd/strings.xml | 6 - app/src/main/res/values-gl/strings.xml | 8 +- app/src/main/res/values-hi/strings.xml | 3 - app/src/main/res/values-hu/strings.xml | 4 - app/src/main/res/values-is/strings.xml | 4 - app/src/main/res/values-it/strings.xml | 5 - app/src/main/res/values-ja/strings.xml | 3 - app/src/main/res/values-ko/strings.xml | 5 +- app/src/main/res/values-lv/strings.xml | 5 - app/src/main/res/values-nb-rNO/strings.xml | 4 - app/src/main/res/values-nl/strings.xml | 4 - app/src/main/res/values-oc/strings.xml | 4 - app/src/main/res/values-pl/strings.xml | 6 - app/src/main/res/values-pt-rBR/strings.xml | 5 - app/src/main/res/values-pt-rPT/strings.xml | 5 - app/src/main/res/values-ru/strings.xml | 6 - app/src/main/res/values-sa/strings.xml | 3 - app/src/main/res/values-sl/strings.xml | 3 - app/src/main/res/values-sv/strings.xml | 4 - app/src/main/res/values-th/strings.xml | 3 - app/src/main/res/values-tr/strings.xml | 6 +- app/src/main/res/values-uk/strings.xml | 8 +- 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 | 3 - app/src/main/res/values-zh-rMO/strings.xml | 3 - app/src/main/res/values-zh-rSG/strings.xml | 3 - app/src/main/res/values-zh-rTW/strings.xml | 3 - app/src/main/res/values/strings.xml | 4 - 49 files changed, 226 insertions(+), 608 deletions(-) diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml index 8dd9f6cf7..bc21b2129 100644 --- a/app/lint-baseline.xml +++ b/app/lint-baseline.xml @@ -15,23 +15,23 @@ + errorLine1=" if (showPlaceholder) placeholder(R.drawable.avatar_default)" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + line="932" + column="42"/> + errorLine1=" if (showPlaceholder) placeholder(R.drawable.avatar_default)" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + line="959" + column="42"/> @@ -157,7 +157,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -179,7 +179,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -223,18 +223,7 @@ errorLine2=" ^"> - - - - @@ -245,7 +234,7 @@ errorLine2=" ^"> @@ -278,7 +267,7 @@ errorLine2=" ^"> @@ -337,17 +326,6 @@ column="5"/> - - - - @@ -392,28 +370,6 @@ column="5"/> - - - - - - - - @@ -447,28 +403,6 @@ column="5"/> - - - - - - - - @@ -487,7 +421,7 @@ errorLine2=" ^"> @@ -498,7 +432,7 @@ errorLine2=" ^"> @@ -509,7 +443,7 @@ errorLine2=" ^"> @@ -520,7 +454,7 @@ errorLine2=" ^"> @@ -531,7 +465,7 @@ errorLine2=" ^"> @@ -542,7 +476,7 @@ errorLine2=" ^"> @@ -553,7 +487,7 @@ errorLine2=" ^"> @@ -751,7 +685,7 @@ errorLine2=" ^"> @@ -762,7 +696,7 @@ errorLine2=" ^"> @@ -773,7 +707,7 @@ errorLine2=" ^"> @@ -784,7 +718,7 @@ errorLine2=" ^"> @@ -795,7 +729,7 @@ errorLine2=" ^"> @@ -828,7 +762,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -839,7 +773,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -850,7 +784,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -861,7 +795,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -872,7 +806,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1521,18 +1455,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - - - - @@ -1785,7 +1708,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1796,7 +1719,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1807,7 +1730,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1818,7 +1741,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -1829,7 +1752,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1840,7 +1763,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1851,7 +1774,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1862,7 +1785,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1873,7 +1796,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1884,7 +1807,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1895,7 +1818,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1906,7 +1829,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1917,7 +1840,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1928,7 +1851,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1939,7 +1862,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~"> @@ -1950,7 +1873,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1961,7 +1884,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1972,7 +1895,7 @@ errorLine2=" ~~~~~~~~~~~~"> @@ -1983,7 +1906,7 @@ errorLine2=" ~~~~~~~~~~~~~~"> @@ -1994,7 +1917,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2005,7 +1928,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2016,7 +1939,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~"> @@ -2027,7 +1950,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2038,7 +1961,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~"> @@ -2049,7 +1972,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2060,7 +1983,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2071,7 +1994,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -2082,7 +2005,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2093,7 +2016,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2104,7 +2027,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2115,7 +2038,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -2126,7 +2049,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2137,7 +2060,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2148,7 +2071,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2159,7 +2082,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2533,7 +2456,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~"> @@ -2544,7 +2467,7 @@ errorLine2=" ~~~~~~~~~"> @@ -2555,7 +2478,7 @@ errorLine2=" ~~~~~~~~~"> @@ -3127,7 +3050,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -3138,7 +3061,7 @@ errorLine2=" ~~~~~~~~~~~~~"> @@ -3149,7 +3072,7 @@ errorLine2=" ~~~~~~~"> @@ -3160,7 +3083,7 @@ errorLine2=" ~~~~~~~"> @@ -3171,7 +3094,7 @@ errorLine2=" ~~~~~~~"> @@ -3182,7 +3105,7 @@ errorLine2=" ~~~~~~~"> @@ -3193,7 +3116,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~"> @@ -3204,7 +3127,7 @@ errorLine2=" ~~~~~~~"> @@ -3215,7 +3138,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~"> @@ -3224,75 +3147,9 @@ message="Access to `private` method `setOnClick` of class `MainActivityKt` requires synthetic accessor" errorLine1=" onClick = {" errorLine2=" ~~~~~~~"> - - - - - - - - - - - - - - - - - - - - - - - - @@ -3303,7 +3160,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~"> @@ -3314,7 +3171,7 @@ errorLine2=" ~~~~~~~"> @@ -3325,7 +3182,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~"> @@ -3336,7 +3193,7 @@ errorLine2=" ~~~~~~~"> @@ -3347,7 +3204,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~"> @@ -3358,18 +3215,18 @@ errorLine2=" ~~~~~~~"> + message="Access to `private` method `primaryDrawerItem` of class `MainActivityKt` requires synthetic accessor" + errorLine1=" primaryDrawerItem {" + errorLine2=" ~~~~~~~~~~~~~~~~~"> @@ -3380,15 +3237,37 @@ errorLine2=" ~~~~~~~"> + message="Access to `private` method `primaryDrawerItem` of class `MainActivityKt` requires synthetic accessor" + errorLine1=" primaryDrawerItem {" + errorLine2=" ~~~~~~~~~~~~~~~~~"> + + + + + + + + @@ -3413,7 +3292,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -3424,7 +3303,7 @@ errorLine2=" ~~~~~~~"> @@ -3435,7 +3314,51 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> + + + + + + + + + + + + + + + + @@ -3446,7 +3369,7 @@ errorLine2=" ~~~~~~~"> @@ -3457,7 +3380,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~"> @@ -3468,40 +3391,18 @@ errorLine2=" ~~~~~~~"> + errorLine1=" primaryDrawerItem {" + errorLine2=" ~~~~~~~~~~~~~~~~~"> - - - - - - - - @@ -3512,7 +3413,29 @@ errorLine2=" ~~~~~~~"> + + + + + + + + @@ -3523,7 +3446,7 @@ errorLine2=" ~~~~~~~"> @@ -3534,7 +3457,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -3545,76 +3468,10 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~"> - - - - - - - - - - - - - - - - - - - - - - - - @@ -3853,7 +3710,7 @@ errorLine2=" ~~~~~~~"> @@ -3864,7 +3721,7 @@ errorLine2=" ~~~~~~~"> @@ -3989,28 +3846,6 @@ column="21"/> - - - - - - - - @@ -4150,7 +3985,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -4194,7 +4029,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -4238,7 +4073,7 @@ errorLine2=" ~~~~~~~~~~"> @@ -4381,17 +4216,6 @@ column="10"/> - - - - @@ -5917,7 +5741,7 @@ errorLine2=" ~~~~~~"> @@ -5928,7 +5752,7 @@ errorLine2=" ~~~~~~~~"> @@ -5939,7 +5763,7 @@ errorLine2=" ~~~~"> @@ -5950,7 +5774,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -5961,7 +5785,7 @@ errorLine2=" ~~~~~~~~~~~~"> @@ -5972,7 +5796,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -5983,7 +5807,7 @@ errorLine2=" ~~~~~~~~"> @@ -5994,7 +5818,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> diff --git a/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt b/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt index 92a1dc348..20304b89c 100644 --- a/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt @@ -164,18 +164,12 @@ class TabPreferenceActivity : BaseActivity(), Injectable, ItemInteractionListene toggleFab(false) } - binding.maxTabsInfo.text = resources.getQuantityString(R.plurals.max_tab_number_reached, MAX_TAB_COUNT, MAX_TAB_COUNT) - updateAvailableTabs() onBackPressedDispatcher.addCallback(onFabDismissedCallback) } override fun onTabAdded(tab: TabData) { - if (currentTabs.size >= MAX_TAB_COUNT) { - return - } - toggleFab(false) if (tab.id == HASHTAG) { @@ -399,7 +393,6 @@ class TabPreferenceActivity : BaseActivity(), Injectable, ItemInteractionListene addTabAdapter.updateData(addableTabs) - binding.maxTabsInfo.visible(addableTabs.size == 0 || currentTabs.size >= MAX_TAB_COUNT) currentTabsAdapter.setRemoveButtonVisible(currentTabs.size > MIN_TAB_COUNT) } @@ -432,6 +425,5 @@ class TabPreferenceActivity : BaseActivity(), Injectable, ItemInteractionListene companion object { private const val MIN_TAB_COUNT = 2 - private const val MAX_TAB_COUNT = 5 } } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8082e0ce6..baef5043d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -45,7 +45,7 @@ android:layout_height="wrap_content" app:tabGravity="fill" app:tabMaxWidth="0dp" - app:tabMode="fixed" /> + app:tabMode="scrollable" /> @@ -73,7 +73,7 @@ android:layout_height="?attr/actionBarSize" app:tabGravity="fill" app:tabIndicatorGravity="top" - app:tabMode="fixed" /> + app:tabMode="scrollable" /> diff --git a/app/src/main/res/layout/activity_tab_preference.xml b/app/src/main/res/layout/activity_tab_preference.xml index f1ebf9d8f..0da36a227 100644 --- a/app/src/main/res/layout/activity_tab_preference.xml +++ b/app/src/main/res/layout/activity_tab_preference.xml @@ -1,7 +1,6 @@ @@ -53,14 +52,6 @@ android:layout_height="wrap_content" android:overScrollMode="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 4386af2cd..88948268e 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -338,14 +338,6 @@ %1$s %1$s و %2$s %1$s و %2$s و %3$d آخَرون - - لقد بلغت الحد الأقصى مِن الألسنة %1$d - لقد بلغت الحد الأقصى مِن الألسنة %1$d - لقد بلغت الحد الأقصى مِن الألسنة %1$d - لقد بلغت الحد الأقصى مِن الألسنة %1$d - لقد بلغت الحد الأقصى مِن الألسنة %1$d - لقد بلغت الحد الأقصى مِن الألسنة %1$d - الوسائط: %s تحذير عن المحتوى: %s مِن دون وصف diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index cf658d252..50aef5235 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -468,12 +468,6 @@ Фільтр 365 дзён (Без змен) - - абмежаванне ў %1$d ўкладку дасягнута - абмежаванне ў %1$d ўкладкі дасягнута - абмежаванне ў %1$d ўкладак дасягнута - абмежаванне ў %1$d ўкладак дасягнута - Стварыць допіс Стварыць Вы ўпэўнены, што жадаеце выдаліць усе апавяшчэнні\? diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 677f0f796..0e06b9611 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -75,9 +75,6 @@ Без описание Предупреждение за съдържание: %s Мултимедия: %s - - достигнати са максималните %1$d раздела - %1$s, %2$s и %3$d други %1$s %1$s и %2$s diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml index 445291bcb..3b4977530 100644 --- a/app/src/main/res/values-bn-rBD/strings.xml +++ b/app/src/main/res/values-bn-rBD/strings.xml @@ -12,10 +12,6 @@ বর্ণনা নাই সতর্কবার্তা: %s মিডিয়া: %s - - সর্বোচ্চ %1$dটি ট্যাব পৌঁছেছে - সর্বোচ্চ %1$dটি ট্যাব পৌঁছেছে - দ্বারা পছন্দ দ্বারা সর্মথন পিন diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml index 2e51f7447..27dc271b0 100644 --- a/app/src/main/res/values-bn-rIN/strings.xml +++ b/app/src/main/res/values-bn-rIN/strings.xml @@ -343,9 +343,6 @@ %1$s %1$s এবং %2$s %1$s, %2$s এবং %3$d আরো অন্য জন - - সর্বাধিক %1$d টি ট্যাব পৌঁছেছে - মিডিয়া: %s সতর্কবার্তা: %s বর্ণনা নাই diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 04e6e49d0..c0297dfa2 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -343,10 +343,6 @@ %1$s %1$s i %2$s %1$s, %2$s i %3$d més - - S\'ha arribat al màxim de %1$d pestanya - S\'han arribat al màxim de %1$d pestanyes - Mèdia : %s Sense descripció Favorits diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml index 3877a552e..49ea1e9b7 100644 --- a/app/src/main/res/values-ckb/strings.xml +++ b/app/src/main/res/values-ckb/strings.xml @@ -323,9 +323,6 @@ هیچ وەسفێک ئاگاداری ناوەڕۆک: %s میدیا: %s - - بەرزترین رێژەی خشتەبەندەکانی %1$d گەیشت - %1$s, %2$s و %3$d زیاتر %1$s و %2$s %1$s diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index b98f4fa9b..3adf6bade 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -349,11 +349,6 @@ %1$s %1$s a %2$s %1$s, %2$s a %3$d další - - bylo dosaženo maxima %1$d panelu - bylo dosaženo maxima %1$d panelů - - Média %s Varování o obsahu: %s Žádný popis diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 647644737..57dc04104 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -519,14 +519,6 @@ %1$s Golygwyd - - uchafswm o %1$d tab wedi eu cyrraedd - uchafswm o %1$d tab wedi ei gyrraedd - uchafswm o %1$d dab wedi eu cyrraedd - uchafswm o %1$d tab wedi eu cyrraedd - uchafswm o %1$d tab wedi eu cyrraedd - uchafswm o %1$d tab wedi eu cyrraedd - Pan fydd cyfrifon lluosog wedi\'u mewngofnodi Wedi methu llwytho gwybodaeth Ateb Agor negeseuon wedi\'u marcio â rhybudd cynnwys bob tro diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 3f0594c22..3c681409c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -309,10 +309,6 @@ %1$s %1$s und %2$s %1$s, %2$s und %3$d mehr - - Maximum von %1$d Tab erreicht - Maximum von %1$d Tabs erreicht - Keine Beschreibung Favorisiert Öffentlich diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 79ddf5905..894e43fd9 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -339,10 +339,6 @@ %1$s %1$s kaj %2$s %1$s, %2$s kaj %3$d aliaj - - maksimumo da %1$d langeto atingita - maksimumo da %1$d langetoj atingita - Aŭdovidaĵo: %s Enhava averto: %s diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 3ee91f012..97bac7577 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -317,11 +317,6 @@ %1$s %1$s y %2$s %1$s, %2$s y %3$d más - - máximo de %1$d pestaña alcanzada - máximo de %1$d pestañas alcanzadas - máximo de %1$d pestañas alcanzadas - Menciones Mostrar favoritos Menciones diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 307c9508b..7bc15bafd 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -360,10 +360,6 @@ %1$s %1$s eta %2$s %1$s, %2$s eta %3$d gehiago - - gehienezko %1$d fitxa iritsita - gehienezko %1$d fitxa iritsita - Media: %s Edukiarekiko abisua: %s Deskribapenik ez diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 7d65376bd..7eae61279 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -349,10 +349,6 @@ %1$s %1$s و %2$s %1$s، %2$s و %3$d بیش‌تر - - رسیده به بیشینهٔ %1$d زبانه - رسیده به بیشینهٔ %1$d زبانه - رسانه: %s هشدار محتوا: %s بدون شرح diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 22eb4313c..82d790597 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -346,11 +346,6 @@ %1$s %1$s et %2$s %1$s, %2$s et %3$d autres - - maximum de %1$d onglet atteint - maximum de %1$d onglets atteint - maximum de %1$d onglets atteint - Média : %s Avertissement : %s @@ -682,4 +677,4 @@ Ajouter un mot-clé Modifier mot-clé %s : %s - \ No newline at end of file + diff --git a/app/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml index b5c65809c..fd1b1bd97 100644 --- a/app/src/main/res/values-ga/strings.xml +++ b/app/src/main/res/values-ga/strings.xml @@ -287,9 +287,6 @@ Sraith emoji reatha Google Tá cód agus sócmhainní ó na tionscadail foinse oscailte seo a leanas i Tusky: Féadfaidh an fhaisnéis thíos próifíl an úsáideora a léiriú go neamhiomlán. Brúigh chun próifíl iomlán a oscailt sa bhrabhsálaí. - - uasmhéid de chluaisíní %1$d sroichte - Vótaíocht le roghanna: %1$s, %2$s, %3$s, %4$s; %5$s Liosta Scríobh postáil diff --git a/app/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml index b423bb570..26c4b3aa6 100644 --- a/app/src/main/res/values-gd/strings.xml +++ b/app/src/main/res/values-gd/strings.xml @@ -182,12 +182,6 @@ Gun tuairisgeul Rabhadh susbainte: %s Meadhan: %s - - ràinig thu na tha ceadaichte dhe %1$d taba - ràinig thu na tha ceadaichte dhe %1$d thaba - ràinig thu na tha ceadaichte dhe %1$d tabaichean - ràinig thu na tha ceadaichte dhe %1$d taba - %1$s, %2$s ’s %3$d eile %1$s ’Na annsachd aig diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 2dc51827b..52fec7693 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -194,10 +194,6 @@ Sen descrición Aviso sobre o contido: %s Multimedia: %s - - acadouse o máximo de %1$d lapela - acadouse o máximo de %1$d lapelas - %1$s, %2$s e %3$d máis %1$s e %2$s Favorecido por @@ -304,7 +300,7 @@ Compartir ligazón ao toot Compartir contido do toot Perfil de Tusky - Informar de fallos e solicitar funcións: + Informar de fallos e solicitar funcións: \nhttps://github.com/tuskyapp/Tusky/issues Web do proxecto: https://tusky.app Tusky é software libre e de código aberto. Está baixo a licenza GNU General Public License Version 3. Podes ver a licenza aquí: https://www.gnu.org/licenses/gpl-3.0.en.html @@ -677,4 +673,4 @@ Eliminar Agochar na cronoloxía de inicio Eliminar o filtro \'%1$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 7440ec91a..870ffe097 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -275,9 +275,6 @@ असूचीबद्ध सार्वजनिक विषय वस्तु चेतावनी: %s - - अधिकतम %1$d टैब तक पहुंच गऐ - %1$s, %2$s तथा %3$d अन्य लोग %1$s तथा %2$s %1$s diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index a15e30225..a929d9a69 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -273,10 +273,6 @@ Megtolta Kedvencnek jelölte %1$s és %2$s - - elérted a fülek maximális számát (%1$d) - elérted a fülek maximális számát (%1$d) - Nincs leírás Nyilvános Követők diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index ba1f04cec..346481ff7 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -348,10 +348,6 @@ %1$s %1$s og %2$s %1$s, %2$s og %3$d til viðbótar - - hámarksfjölda %1$d flipa náð - hámarksfjölda %1$d flipa náð - Myndefni: %s Aðvörun vegna efnis: %s Engin lýsing diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 375a10d48..166a0242c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -343,11 +343,6 @@ %1$s %1$s e %2$s %1$s, %2$s ed altri %3$d - - limite massimo di %1$d scheda raggiunto - limite massimo di %1$d schede raggiunto - limite massimo di %1$d schede raggiunto - Media: %s Contenuto sensibile: %s Nessuna descrizione diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 55ccd8ebf..f684c9521 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -310,9 +310,6 @@ ブーストした人物 お気に入りした人物 - - タブは %1$d 個が上限です - 公開 未収載 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 187a2bf98..f562d8001 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -348,9 +348,6 @@ %1$s %1$s와 %2$s %1$s, %2$s 외 %3$d명 - - 최대 탭 수 %1$d에 도달했습니다 - 미디어: %s 열람주의: %s 설명 없음 @@ -422,4 +419,4 @@ 수정 해시태그 팔로우 요청 - \ No newline at end of file + diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 4845f82bf..e98352f85 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -489,11 +489,6 @@ %s pastiprinājums %s pastiprinājumi - - sasniegts maksimālais ciļņu skaits %1$d - sasniegts maksimālais ciļņu skaits %1$d - sasniegts maksimālais ciļņu skaits %1$d - Izlases %s pievienoja tavu ierakstu izlasei Pievienot izlasei diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index e4e476aad..bc2c5015c 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -318,10 +318,6 @@ %1$s %1$s og %2$s %1$s, %2$s og %3$d fler - - grensen på %1$d fane er nådd - grensen på %1$d faner er nådd - Media: %s Innholdsadvarsel: %s Ingen beskrivelse diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index bad61b2e9..607216a18 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -317,10 +317,6 @@ %1$s %1$s en %2$s %1$s, %2$s en %3$d meer - - maximum van %1$d tab bereikt - maximum van %1$d tabs bereikt - Media: %s Inhoudswaarschuwing: %s Geen omschrijving diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml index 135c3403b..c548cc6d3 100644 --- a/app/src/main/res/values-oc/strings.xml +++ b/app/src/main/res/values-oc/strings.xml @@ -337,10 +337,6 @@ %1$s %1$s e %2$s %1$s, %2$s e %3$d mai - - nombre maximum d’onglet %1$d atengut - nombre maximum d’onglets %1$d atengut - Mèdia : %s Avertiment : %s Cap de descripcion diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 0db98aee8..6d4b084bc 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -367,12 +367,6 @@ %1$s %1$s i %2$s %1$s, %2$s i %3$d innych - - maksymalna liczba zakładek (%1$d) osiągnięta - maksymalna liczba zakładek (%1$d) osiągnięta - maksymalna liczba zakładek (%1$d) osiągnięta - maksymalna liczba zakładek (%1$d) osiągnięta - Media: %s Ostrzeżenie o zawartości: %s Brak opisu diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 93d1d7e37..0c7c9515e 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -350,11 +350,6 @@ %1$s %1$s e %2$s %1$s, %2$s e %3$d outros - - excedeu o máximo de %1$d aba - excedeu o máximo de %1$d abas - excedeu o máximo de %1$d abas - Mídia: %s Aviso de Conteúdo: %s Sem descrição diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 09e151eec..a6d700ccf 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -390,11 +390,6 @@ Adicionado aos favoritos por %1$s %1$s, %2$s e %3$d mais - - atingiu o máximo de %1$d separador - atingiu o máximo de %1$d separadores - atingiu o máximo de %1$d separadores - Conteúdo multimédia: %s Aviso de Conteúdo: %s Sem descrição diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 16f9409de..a1192126e 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -366,12 +366,6 @@ %1$s %1$s и %2$s %1$s, %2$s и ещё %3$d - - достигнут лимит в %1$d вкладку - достигнут лимит в %1$d вкладок - достигнут лимит в %1$d вкладок - достигнут лимит в %1$d вкладок - Медиафайл: %s diff --git a/app/src/main/res/values-sa/strings.xml b/app/src/main/res/values-sa/strings.xml index 988c7dc8e..abea9ef08 100644 --- a/app/src/main/res/values-sa/strings.xml +++ b/app/src/main/res/values-sa/strings.xml @@ -444,9 +444,6 @@ विवरणं नास्ति विषयपूर्वसतर्कता: %s सामग्र्यः %s - - अधिकतमपीठिकासङ्ख्या %1$d भूता - %1$s, %2$s तथा %3$d अन्येऽपि %1$s तथैव %2$s निम्नमित्रस्य प्रीतिः diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 06019b9a8..39324f5c1 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -312,9 +312,6 @@ %1$s %1$s in %2$s %1$s, %2$s in %3$d več - - doseženih maksimalnih %1$d zavihkov - Mediji: %s Opozorila o vsebini: %s Brez opisa diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index fb4ca5673..86ed35c06 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -337,10 +337,6 @@ %1$s %1$s och %2$s %1$s, %2$s och %3$d mer - - max antal flikar %1$d uppnådd - max antal flikar %1$d uppnådda - Media: %s Innehållsvarning: %s Ingen beskrivning diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index a8eceb2f2..8301e902c 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -70,9 +70,6 @@ ไม่มีคำอธิบาย เตือนเนื้อหา : %s สื่อ: %s - - ถึงจำนวนแท็บสูงสุดคือ %1$d แล้ว - %1$s, %2$s และอีก %3$d %1$s และ %2$s %1$s diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 124557bdd..4be4c1ce1 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -214,7 +214,7 @@ * the url can be changed to link to the localized version of the license. --> Proje web sayfası: https://tusky.app - "Hata raporları ve özellik istekleri: + "Hata raporları ve özellik istekleri: \nhttps://github.com/tuskyapp/Tusky/issues" Tusky\'nin Profili Gönderinin içeriğini paylaş @@ -299,10 +299,6 @@ %1$s %1$s ve %2$s %1$s, %2$s ve %3$d dahası - - azami %1$d sekme sayısına ulaşıldı - azami %1$d sekmeler sayısına ulaşıldı - Gizli alan adları Yeniden paylaşmaktan vazgeç Gözdeyi kaldır diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 8c5977c19..cccb5f917 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -493,12 +493,6 @@ Безпосередньо Додано до закладок Поширено - - досягнено обмеження %1$d вкладку - досягнено обмеження %1$d вкладки - досягнено обмеження %1$d вкладок - досягнено обмеження %1$d вкладок - %s поширення %s поширення @@ -699,4 +693,4 @@ Скопіювати версію та відомості про пристрій Версію та відомості про пристрій скопійовано Сховати з домашньої стрічки - \ 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 aeeb84f93..8f22c3884 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -379,9 +379,6 @@ Đã đăng lại Không có mô tả Nội dung ẩn: %s - - tối đa %1$d tab - %1$s, %2$s và %3$d người nữa %1$s và %2$s %1$s diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3729e425f..3dfc1fe6e 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -337,9 +337,6 @@ %1$s %1$s 和 %2$s %1$s，%2$s 和 %3$d 等人 - - 标签页不能超过 %1$d 个 - 媒体：%s 内容警告：%s 没有描述信息 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index ccd2ba8bb..4b9547eb9 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -341,9 +341,6 @@ %1$s %1$s 和 %2$s %1$s, %2$s 和 %3$d 等人 - - 標籤頁不能超過 %1$d 個 - 媒體: %s diff --git a/app/src/main/res/values-zh-rMO/strings.xml b/app/src/main/res/values-zh-rMO/strings.xml index 7e22f0d65..cdaeca4ec 100644 --- a/app/src/main/res/values-zh-rMO/strings.xml +++ b/app/src/main/res/values-zh-rMO/strings.xml @@ -335,9 +335,6 @@ %1$s %1$s 和 %2$s %1$s, %2$s 和 %3$d 等人 - - 標籤頁不能超過 %1$d 個 - 媒體: %s diff --git a/app/src/main/res/values-zh-rSG/strings.xml b/app/src/main/res/values-zh-rSG/strings.xml index fc96f0629..4c43af3b0 100644 --- a/app/src/main/res/values-zh-rSG/strings.xml +++ b/app/src/main/res/values-zh-rSG/strings.xml @@ -340,9 +340,6 @@ %1$s %1$s 和 %2$s %1$s, %2$s 和 %3$d 等人 - - 标签页不能超过 %1$d 个 - 媒体: %s diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index f14221020..2e637da95 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -342,9 +342,6 @@ %1$s %1$s 和 %2$s %1$s, %2$s 和 %3$d 等人 - - 標籤頁不能超過 %1$d 個 - 媒體: %s diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d96dc5327..bc82cdac8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -561,10 +561,6 @@ %1$s %1$s and %2$s %1$s, %2$s and %3$d more - - maximum of %1$d tab reached - maximum of %1$d tabs reached - Media: %s