From 3558d441a467e4aa4ad47bbe71b5d7c47ee8ccca Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Sat, 28 Nov 2020 17:34:21 +0100
Subject: [PATCH 01/20] better distinction between green and blue build flavors
 (#1997)

---
 app/build.gradle                                                | 1 +
 .../tusky/components/notifications/NotificationHelper.java      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 19497d5d..722cde87 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,6 +51,7 @@ android {
     productFlavors {
         blue {}
         green {
+            resValue "string", "app_name", APP_NAME + " Test"
             applicationIdSuffix ".test"
             versionNameSuffix "-" + getGitSha()
         }
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationHelper.java b/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationHelper.java
index 3020f207..14c9e480 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationHelper.java
+++ b/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationHelper.java
@@ -295,7 +295,7 @@ public class NotificationHelper {
                 .setSmallIcon(R.drawable.ic_notify)
                 .setContentIntent(summary ? summaryResultPendingIntent : eventResultPendingIntent)
                 .setDeleteIntent(deletePendingIntent)
-                .setColor(BuildConfig.DEBUG ? Color.parseColor("#19A341") : ContextCompat.getColor(context, R.color.tusky_blue))
+                .setColor(BuildConfig.FLAVOR == "green" ? Color.parseColor("#19A341") : ContextCompat.getColor(context, R.color.tusky_blue))
                 .setGroup(account.getAccountId())
                 .setAutoCancel(true)
                 .setShortcutId(Long.toString(account.getId()))

From 9793035a3d2b4e8e6d9ccb719706c8efb0f48a5b Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Tue, 1 Dec 2020 07:39:15 +0100
Subject: [PATCH 02/20] fix crash when opening some audio attachments (#2002)

---
 app/src/main/java/com/keylesspalace/tusky/entity/Attachment.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Attachment.kt b/app/src/main/java/com/keylesspalace/tusky/entity/Attachment.kt
index 3517ff09..1de7bd78 100644
--- a/app/src/main/java/com/keylesspalace/tusky/entity/Attachment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/entity/Attachment.kt
@@ -28,7 +28,7 @@ import kotlinx.android.parcel.Parcelize
 data class Attachment(
         val id: String,
         val url: String,
-        @SerializedName("preview_url") val previewUrl: String,
+        @SerializedName("preview_url") val previewUrl: String?, // can be null for e.g. audio attachments
         val meta: MetaData?,
         val type: Type,
         val description: String?,

From a9337bcb784cacef445931f6da64db732c35de65 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Tue, 1 Dec 2020 07:39:30 +0100
Subject: [PATCH 03/20] fix workmanager crashing because of async
 initialization (#2003)

---
 .../keylesspalace/tusky/TuskyApplication.kt   | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/TuskyApplication.kt b/app/src/main/java/com/keylesspalace/tusky/TuskyApplication.kt
index 850c4b0d..562f644e 100644
--- a/app/src/main/java/com/keylesspalace/tusky/TuskyApplication.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/TuskyApplication.kt
@@ -29,11 +29,9 @@ import com.keylesspalace.tusky.util.EmojiCompatFont
 import com.keylesspalace.tusky.util.LocaleManager
 import com.keylesspalace.tusky.util.ThemeUtils
 import com.uber.autodispose.AutoDisposePlugins
-import dagger.Lazy
 import dagger.android.DispatchingAndroidInjector
 import dagger.android.HasAndroidInjector
 import io.reactivex.plugins.RxJavaPlugins
-import io.reactivex.schedulers.Schedulers
 import org.conscrypt.Conscrypt
 import java.security.Security
 import javax.inject.Inject
@@ -44,7 +42,7 @@ class TuskyApplication : Application(), HasAndroidInjector {
     lateinit var androidInjector: DispatchingAndroidInjector<Any>
 
     @Inject
-    lateinit var notificationWorkerFactory: Lazy<NotificationWorkerFactory>
+    lateinit var notificationWorkerFactory: NotificationWorkerFactory
 
     override fun onCreate() {
         // Uncomment me to get StrictMode violation logs
@@ -82,15 +80,12 @@ class TuskyApplication : Application(), HasAndroidInjector {
             Log.w("RxJava", "undeliverable exception", it)
         }
 
-        // This will initialize the whole network stack and cache so we don't wan to wait for it
-        Schedulers.computation().scheduleDirect {
-            WorkManager.initialize(
-                    this,
-                    androidx.work.Configuration.Builder()
-                            .setWorkerFactory(notificationWorkerFactory.get())
-                            .build()
-            )
-        }
+        WorkManager.initialize(
+                this,
+                androidx.work.Configuration.Builder()
+                        .setWorkerFactory(notificationWorkerFactory)
+                        .build()
+        )
     }
 
     override fun attachBaseContext(base: Context) {

From 3c938047511b47bb496a7469f7726398df68e8e1 Mon Sep 17 00:00:00 2001
From: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
Date: Fri, 4 Dec 2020 17:35:51 +0100
Subject: [PATCH 04/20] Fix links in announcements. (#2011)

Fixes #2008
---
 .../announcements/AnnouncementAdapter.kt      |  7 +++---
 .../announcements/AnnouncementsActivity.kt    | 24 +++++++++++++++----
 .../res/layout/activity_announcements.xml     |  2 ++
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementAdapter.kt
index c4fa93f2..29b57a2e 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementAdapter.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementAdapter.kt
@@ -27,10 +27,12 @@ import com.google.android.material.chip.ChipGroup
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.entity.Announcement
 import com.keylesspalace.tusky.entity.Emoji
+import com.keylesspalace.tusky.interfaces.LinkListener
+import com.keylesspalace.tusky.util.LinkHelper
 import com.keylesspalace.tusky.util.emojify
 import kotlinx.android.synthetic.main.item_announcement.view.*
 
-interface AnnouncementActionListener {
+interface AnnouncementActionListener: LinkListener {
     fun openReactionPicker(announcementId: String, target: View)
     fun addReaction(announcementId: String, name: String)
     fun removeReaction(announcementId: String, name: String)
@@ -59,13 +61,12 @@ class AnnouncementAdapter(
     }
 
     inner class AnnouncementViewHolder(private val view: View) : RecyclerView.ViewHolder(view) {
-
         private val text: TextView = view.text
         private val chips: ChipGroup = view.chipGroup
         private val addReactionChip: Chip = view.addReactionChip
 
         fun bind(item: Announcement) {
-            text.text = item.content
+            LinkHelper.setClickableText(text, item.content, null, listener)
 
             item.reactions.forEachIndexed { i, reaction ->
                 (chips.getChildAt(i)?.takeUnless { it.id == R.id.addReactionChip } as Chip?
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt
index 5bfd17bc..1f86a0ab 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt
@@ -22,11 +22,9 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.PopupWindow
 import androidx.activity.viewModels
-import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.keylesspalace.tusky.BaseActivity
-import com.keylesspalace.tusky.R
+import com.keylesspalace.tusky.*
 import com.keylesspalace.tusky.adapter.EmojiAdapter
 import com.keylesspalace.tusky.adapter.OnEmojiSelectedListener
 import com.keylesspalace.tusky.di.Injectable
@@ -37,7 +35,7 @@ import kotlinx.android.synthetic.main.activity_announcements.*
 import kotlinx.android.synthetic.main.toolbar_basic.*
 import javax.inject.Inject
 
-class AnnouncementsActivity : BaseActivity(), AnnouncementActionListener, OnEmojiSelectedListener, Injectable {
+class AnnouncementsActivity : BottomSheetActivity(), AnnouncementActionListener, OnEmojiSelectedListener, Injectable {
 
     @Inject
     lateinit var viewModelFactory: ViewModelFactory
@@ -147,6 +145,24 @@ class AnnouncementsActivity : BaseActivity(), AnnouncementActionListener, OnEmoj
         viewModel.removeReaction(announcementId, name)
     }
 
+    override fun onViewTag(tag: String?) {
+        val intent = Intent(this, ViewTagActivity::class.java)
+        intent.putExtra("hashtag", tag)
+        startActivityWithSlideInAnimation(intent)
+    }
+
+    override fun onViewAccount(id: String?) {
+        if (id != null) {
+            viewAccount(id)
+        }
+    }
+
+    override fun onViewUrl(url: String?) {
+        if (url != null) {
+            viewUrl(url)
+        }
+    }
+
     companion object {
         fun newIntent(context: Context) = Intent(context, AnnouncementsActivity::class.java)
     }
diff --git a/app/src/main/res/layout/activity_announcements.xml b/app/src/main/res/layout/activity_announcements.xml
index c0504b83..9e40e9df 100644
--- a/app/src/main/res/layout/activity_announcements.xml
+++ b/app/src/main/res/layout/activity_announcements.xml
@@ -36,4 +36,6 @@
         tools:src="@drawable/elephant_error"
         tools:visibility="visible" />
 
+    <include layout="@layout/item_status_bottom_sheet" />
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

From 9349217fd6ea6f6ca88aac9d6eada75ec75595cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isak=20Holmstr=C3=B6m?= <iah@ghostly.solutions>
Date: Tue, 1 Dec 2020 03:25:53 +0000
Subject: [PATCH 05/20] Translated using Weblate (Swedish)

Currently translated at 100.0% (10 of 10 strings)

Translation: Tusky/Tusky description
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/sv/
---
 fastlane/metadata/android/sv/changelogs/74.txt | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 fastlane/metadata/android/sv/changelogs/74.txt

diff --git a/fastlane/metadata/android/sv/changelogs/74.txt b/fastlane/metadata/android/sv/changelogs/74.txt
new file mode 100644
index 00000000..2999b8bb
--- /dev/null
+++ b/fastlane/metadata/android/sv/changelogs/74.txt
@@ -0,0 +1,8 @@
+Tusky v12.0
+
+- Improved main interface - you can now move the tabs to the bottom
+- When muting a user, you can now also decide whether to mute their notifications
+- You can now follow as many hashtags as you want in one single hashtag tab
+- Improved the way media descriptions are displayed so it works even for super long descriptions
+    
+Full changelog: https://github.com/tuskyapp/Tusky/releases

From ccd58621e57172ddda473f3d79073cbd1d52a0c6 Mon Sep 17 00:00:00 2001
From: "mark_tw_no.1" <ku4qbc0ox@relay.firefox.com>
Date: Tue, 1 Dec 2020 03:25:53 +0000
Subject: [PATCH 06/20] Translated using Weblate (Chinese (Traditional))

Currently translated at 10.0% (1 of 10 strings)

Translation: Tusky/Tusky description
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/zh_Hant/
---
 fastlane/metadata/android/zh_Hant/title.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/zh_Hant/title.txt

diff --git a/fastlane/metadata/android/zh_Hant/title.txt b/fastlane/metadata/android/zh_Hant/title.txt
new file mode 100644
index 00000000..0238ffc0
--- /dev/null
+++ b/fastlane/metadata/android/zh_Hant/title.txt
@@ -0,0 +1 @@
+Tusky

From 967e19d38fc75ae8d2e629ab9f604d8251e87f63 Mon Sep 17 00:00:00 2001
From: Vegard Skjefstad <vegard@vegard.net>
Date: Tue, 1 Dec 2020 03:25:53 +0000
Subject: [PATCH 07/20] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?=
 =?UTF-8?q?=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (11 of 11 strings)

Translation: Tusky/Tusky description
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/nb_NO/
---
 fastlane/metadata/android/nb_NO/changelogs/77.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 fastlane/metadata/android/nb_NO/changelogs/77.txt

diff --git a/fastlane/metadata/android/nb_NO/changelogs/77.txt b/fastlane/metadata/android/nb_NO/changelogs/77.txt
new file mode 100644
index 00000000..7f72db62
--- /dev/null
+++ b/fastlane/metadata/android/nb_NO/changelogs/77.txt
@@ -0,0 +1,10 @@
+Tusky v13.0
+
+- støtte for profilnotater (Mastodon 3.2.0-funksjonalitet)
+- støtte for administratorkunngjøringer (Mastodon 3.1.0-funksjonalitet)
+
+- avataren som tilhører valgt konto vil nå vises på hovedverktøylinjen
+- trykk på en brukers visningsnavn i tidslinjen vil åpne profilen til brukeren
+
+- mange feilrettinger og mindre forbedringer
+- forbedrede oversettelser

From dbcb443c2d0184c78458604f490fa0656446c758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Gera?= <gerazo@caesar.elte.hu>
Date: Tue, 1 Dec 2020 03:25:53 +0000
Subject: [PATCH 08/20] Translated using Weblate (Hungarian)

Currently translated at 100.0% (11 of 11 strings)

Translation: Tusky/Tusky description
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/hu/
---
 fastlane/metadata/android/hu/changelogs/77.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 fastlane/metadata/android/hu/changelogs/77.txt

diff --git a/fastlane/metadata/android/hu/changelogs/77.txt b/fastlane/metadata/android/hu/changelogs/77.txt
new file mode 100644
index 00000000..43b92b6b
--- /dev/null
+++ b/fastlane/metadata/android/hu/changelogs/77.txt
@@ -0,0 +1,10 @@
+Tusky v13.0
+
+- privát profilmegjegyzések támogatása (Mastodon 3.2.0 funkció)
+- adminisztrátori közlemények támogatása (Mastodon 3.1.0 funkció)
+
+- az éppen használt fiókod avatarja mostantól látszik az eszköztáron
+- az idővonalon egy profilra kattintva előjön a felhasználó profiloldala
+
+- rengeteg hibajavítás és apró fejlesztés
+- javított fordítások

From 577aa0c95ccd8119e77b06220172bf5e02527792 Mon Sep 17 00:00:00 2001
From: Ho Nhat Duy <kantcer@gmail.com>
Date: Tue, 1 Dec 2020 03:25:54 +0000
Subject: [PATCH 09/20] Translated using Weblate (Vietnamese)

Currently translated at 100.0% (11 of 11 strings)

Translation: Tusky/Tusky description
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/vi/
---
 fastlane/metadata/android/vi/changelogs/77.txt | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 fastlane/metadata/android/vi/changelogs/77.txt

diff --git a/fastlane/metadata/android/vi/changelogs/77.txt b/fastlane/metadata/android/vi/changelogs/77.txt
new file mode 100644
index 00000000..11a1d6fd
--- /dev/null
+++ b/fastlane/metadata/android/vi/changelogs/77.txt
@@ -0,0 +1,8 @@
+Tusky v13.0
+
+- Hỗ trợ ghi chú về một ai đó (tính năng Mastodon 3.2.0)
+- Hỗ trợ hiện thông báo máy chủ (tính năng Mastodon 3.1.0)
+- Ảnh đại diện của tài khoản từ giờ sẽ hiện trên thanh menu chính
+- Nhấn vào tên ai đó trên bảng tin sẽ chuyển tới trang cá nhân của họ
+- Sửa lỗi linh tinh và cải thiện hiệu năng
+- Trau dồi bản dịch

From c1dd07d85c010c5582e6faa036bac15d965b7e2d Mon Sep 17 00:00:00 2001
From: x <hardwired1.0@protonmail.com>
Date: Tue, 1 Dec 2020 03:25:54 +0000
Subject: [PATCH 10/20] Translated using Weblate (Italian)

Currently translated at 63.6% (7 of 11 strings)

Translation: Tusky/Tusky description
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/it/
---
 fastlane/metadata/android/it/changelogs/70.txt     |  8 ++++++++
 fastlane/metadata/android/it/changelogs/74.txt     |  8 ++++++++
 fastlane/metadata/android/it/changelogs/77.txt     | 10 ++++++++++
 fastlane/metadata/android/it/short_description.txt |  2 +-
 4 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 fastlane/metadata/android/it/changelogs/70.txt
 create mode 100644 fastlane/metadata/android/it/changelogs/74.txt
 create mode 100644 fastlane/metadata/android/it/changelogs/77.txt

diff --git a/fastlane/metadata/android/it/changelogs/70.txt b/fastlane/metadata/android/it/changelogs/70.txt
new file mode 100644
index 00000000..e77f479f
--- /dev/null
+++ b/fastlane/metadata/android/it/changelogs/70.txt
@@ -0,0 +1,8 @@
+Tusky v10.0
+
+- Ora puoi contrassegnare gli stati ed elencare i tuoi segnalibri in Tusky.
+- Ora puoi programmare i tuoi toot con Tusky. Tieni presente che il tempo selezionato deve essere di almeno 5 minuti in futuro.
+- Ora puoi aggiungere elenchi alla schermata principale.
+- Ora puoi pubblicare allegati audio con Tusky.
+
+E molti altri piccoli miglioramenti e correzioni di bug!
diff --git a/fastlane/metadata/android/it/changelogs/74.txt b/fastlane/metadata/android/it/changelogs/74.txt
new file mode 100644
index 00000000..c04ab9cb
--- /dev/null
+++ b/fastlane/metadata/android/it/changelogs/74.txt
@@ -0,0 +1,8 @@
+Tusky v12.0
+
+- Interfaccia principale migliorata - ora puoi spostare le schede in basso
+- Quando si disattiva l'audio di un utente, ora è possibile anche decidere se disattivare l'audio delle sue notifiche
+- Ora puoi seguire tutti gli hashtag che desideri in una singola scheda hashtag
+- Migliorata la modalità di visualizzazione delle descrizioni dei media in modo che funzioni anche per descrizioni molto lunghe
+
+Log delle modifiche completo: https://github.com/tuskyapp/Tusky/releases
diff --git a/fastlane/metadata/android/it/changelogs/77.txt b/fastlane/metadata/android/it/changelogs/77.txt
new file mode 100644
index 00000000..6aea3a17
--- /dev/null
+++ b/fastlane/metadata/android/it/changelogs/77.txt
@@ -0,0 +1,10 @@
+Tusky v13.0
+
+- supporto per le note del profilo (funzionalità di Mastodon 3.2.0)
+- supporto per gli annunci dell'amministratore (funzionalità di Mastodon 3.1.0)
+
+- l'avatar del tuo account selezionato verrà ora mostrato nella barra degli strumenti principale
+- facendo clic sul nome visualizzato in una sequenza temporale si aprirà ora la pagina del profilo di quell'utente
+
+- molte correzioni di bug e piccoli miglioramenti
+- traduzioni migliorate
diff --git a/fastlane/metadata/android/it/short_description.txt b/fastlane/metadata/android/it/short_description.txt
index 06089da0..d5566155 100644
--- a/fastlane/metadata/android/it/short_description.txt
+++ b/fastlane/metadata/android/it/short_description.txt
@@ -1 +1 @@
-Un client multi-utente per il social network Mastodon
+Un client multi account per il social network Mastodon

From b8268538fdcb7403200cc57749f9aac76d0bfb63 Mon Sep 17 00:00:00 2001
From: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
Date: Fri, 4 Dec 2020 17:37:52 +0100
Subject: [PATCH 11/20] Fix negative count on the unread announcements badge.
 (#2010)

Fixes #1994
---
 app/src/main/java/com/keylesspalace/tusky/MainActivity.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
index dc66945d..58cd3a02 100644
--- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
@@ -713,7 +713,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
     }
 
     private fun updateAnnouncementsBadge() {
-        mainDrawer.updateBadge(DRAWER_ITEM_ANNOUNCEMENTS, StringHolder(if (unreadAnnouncementsCount == 0) null else unreadAnnouncementsCount.toString()))
+        mainDrawer.updateBadge(DRAWER_ITEM_ANNOUNCEMENTS, StringHolder(if (unreadAnnouncementsCount <= 0) null else unreadAnnouncementsCount.toString()))
     }
 
     private fun updateProfiles() {

From b09e73c6cb841f6b6b9b9aaace0d7912d1581979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Gera?= <gerazo@caesar.elte.hu>
Date: Thu, 3 Dec 2020 20:17:08 +0000
Subject: [PATCH 12/20] Translated using Weblate (Hungarian)

Currently translated at 100.0% (434 of 434 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/hu/
---
 app/src/main/res/values-hu/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 8384ed34..56081443 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -472,4 +472,8 @@
     <string name="action_unmute_notifications_desc">Értesítések némításának feloldása tőle %s</string>
     <string name="notification_follow_request_format">%s kéri, hogy követhessen</string>
     <string name="pref_title_hide_top_toolbar">Felső eszköztár címének elrejtése</string>
+    <string name="account_note_saved">Elmentve!</string>
+    <string name="account_note_hint">Saját, mások számára nem látható megjegyzés erről a fiókról</string>
+    <string name="no_announcements">Nincsenek közlemények.</string>
+    <string name="title_announcements">Közlemények</string>
 </resources>
\ No newline at end of file

From 86aafc803f5a4a9cc18a19e4a038e5c8493d8be0 Mon Sep 17 00:00:00 2001
From: Juanjo Salvador <juanjosalvador@netc.eu>
Date: Thu, 3 Dec 2020 20:17:08 +0000
Subject: [PATCH 13/20] Translated using Weblate (Spanish)

Currently translated at 100.0% (434 of 434 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/es/
---
 app/src/main/res/values-es/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5ba0200d..e81f543e 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -475,4 +475,8 @@
     <string name="action_mute_notifications_desc">Silenciar notificaciones desde %s</string>
     <string name="action_unmute_notifications_desc">Dejar de silenciar notificaciones desde %s</string>
     <string name="pref_title_hide_top_toolbar">Ocultar el título de la barra de herramientas superior</string>
+    <string name="account_note_saved">¡Guardado!</string>
+    <string name="account_note_hint">Tu nota privada acerca de esta cuenta</string>
+    <string name="no_announcements">No hay anuncios.</string>
+    <string name="title_announcements">Anuncios</string>
 </resources>
\ No newline at end of file

From de8f967dd8a12ef72edc7a402eb95032615cb560 Mon Sep 17 00:00:00 2001
From: Ho Nhat Duy <kantcer@gmail.com>
Date: Thu, 3 Dec 2020 20:17:08 +0000
Subject: [PATCH 14/20] Translated using Weblate (Vietnamese)

Currently translated at 100.0% (434 of 434 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/vi/

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (434 of 434 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/vi/
---
 app/src/main/res/values-vi/strings.xml | 32 +++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 7e97c1f4..1730919e 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -39,7 +39,7 @@
     <string name="error_no_web_browser_found">Không tìm thấy trình duyệt web.</string>
     <string name="error_invalid_domain">Tài khoản không đúng</string>
     <string name="error_empty">Không được để trống.</string>
-    <string name="error_network">Không có Internet! Xin kiểm tra kết nối và thử lại!</string>
+    <string name="error_network">Rớt mạng! Xin kiểm tra kết nối và thử lại!</string>
     <string name="error_generic">Đã có lỗi xảy ra.</string>
     <string name="error_failed_app_registration">Máy chủ này không cấp quyền truy cập.</string>
     <string name="title_lists">Danh sách</string>
@@ -131,7 +131,7 @@
     <string name="action_mute">Ẩn</string>
     <string name="action_share">Chia sẻ</string>
     <string name="action_photo_take">Chụp hình</string>
-    <string name="action_add_poll">Tạo bình chọn</string>
+    <string name="action_add_poll">Tạo vău</string>
     <string name="action_add_media">Thêm tệp</string>
     <string name="action_open_in_web">Mở trong trình duyệt</string>
     <string name="action_view_media">Bộ sưu tập</string>
@@ -174,7 +174,7 @@
     <string name="status_content_warning_show_more">Mở rộng</string>
     <string name="status_sensitive_media_directions">Hiển thị</string>
     <string name="status_media_hidden_title">Nội dung bị ẩn</string>
-    <string name="status_sensitive_media_title">Nội dung nhạy cảm</string>
+    <string name="status_sensitive_media_title">Nhạy cảm</string>
     <string name="status_boosted_format">%s chia sẻ</string>
     <string name="status_username_format">\@%s</string>
     <string name="title_licenses">Giấy phép</string>
@@ -221,7 +221,7 @@
     <string name="pref_title_timelines">Bảng tin</string>
     <string name="pref_title_app_theme">Chủ đề</string>
     <string name="pref_title_appearance_settings">Giao diện</string>
-    <string name="pref_title_notification_filter_poll">cuộc bình chọn kết thúc</string>
+    <string name="pref_title_notification_filter_poll">vău đã kết thúc</string>
     <string name="pref_title_notification_filter_favourites">tút được thích</string>
     <string name="pref_title_notification_filter_reblogs">tút được chia sẻ</string>
     <string name="pref_title_notification_filter_follow_requests">yêu cầu theo dõi</string>
@@ -278,8 +278,8 @@
     <string name="about_powered_by_tusky">Powered by Tusky</string>
     <string name="about_tusky_version">Tusky %s</string>
     <string name="description_account_locked">Tài khoản bị khóa</string>
-    <string name="notification_poll_description">Thông báo khi những cuộc bình chọn kết thúc</string>
-    <string name="notification_poll_name">Bình chọn</string>
+    <string name="notification_poll_description">Thông báo khi những vău kết thúc</string>
+    <string name="notification_poll_name">Vău</string>
     <string name="notification_favourite_description">Thông báo khi ai đó thích tút của bạn</string>
     <string name="notification_favourite_name">Lượt thích</string>
     <string name="filter_dialog_whole_word">Toàn bộ câu</string>
@@ -315,9 +315,9 @@
     <string name="no_scheduled_status">Bạn không có tút đã lên lịch.</string>
     <string name="no_saved_status">Bạn không có bản nháp nào.</string>
     <string name="edit_poll">Sửa</string>
-    <string name="poll_new_choice_hint">Lựa chọn %d</string>
-    <string name="poll_allow_multiple_choices">Cho phép chọn nhiều lựa chọn</string>
-    <string name="add_poll_choice">Thêm lựa chọn</string>
+    <string name="poll_new_choice_hint">Bình chọn %d</string>
+    <string name="poll_allow_multiple_choices">Cho phép vău nhiều bình chọn</string>
+    <string name="add_poll_choice">Thêm bình chọn</string>
     <string name="poll_duration_7_days">7 ngày</string>
     <string name="poll_duration_3_days">3 ngày</string>
     <string name="poll_duration_1_day">1 ngày</string>
@@ -325,7 +325,7 @@
     <string name="poll_duration_1_hour">1 giờ</string>
     <string name="poll_duration_30_min">30 phút</string>
     <string name="poll_duration_5_min">5 phút</string>
-    <string name="create_poll_title">Bình chọn</string>
+    <string name="create_poll_title">Vău</string>
     <string name="pref_title_enable_swipe_for_tabs">Vuốt để chuyển qua lại giữa các tab</string>
     <string name="pref_title_show_notifications_filter">Hiện bộ lọc thông báo</string>
     <string name="failed_search">Không thể tìm thấy</string>
@@ -349,18 +349,18 @@
     <plurals name="poll_timespan_days">
         <item quantity="other">%d ngày nữa kết thúc</item>
     </plurals>
-    <string name="poll_ended_created">Cuộc bình chọn bạn tạo đã kết thúc</string>
-    <string name="poll_ended_voted">Cuộc bình chọn bạn tham gia đã kết thúc</string>
-    <string name="poll_vote">Bình chọn</string>
+    <string name="poll_ended_created">Vău bạn tạo đã kết thúc</string>
+    <string name="poll_ended_voted">Vău mà bạn tham gia đã kết thúc</string>
+    <string name="poll_vote">Vău</string>
     <string name="poll_info_closed">Kết thúc</string>
     <string name="poll_info_time_absolute">kết thúc lúc %s</string>
     <plurals name="poll_info_people">
         <item quantity="other">%s người</item>
     </plurals>
     <plurals name="poll_info_votes">
-        <item quantity="other">%s phiếu</item>
+        <item quantity="other">%s vău</item>
     </plurals>
-    <string name="poll_info_format"> <!-- 15 phiếu • 1 tiếng nữa kết thúc --> %1$s • %2$s</string>
+    <string name="poll_info_format"> <!-- 15 vău • 1 tiếng nữa kết thúc --> %1$s • %2$s</string>
     <string name="compose_preview_image_description">Mô tả cho hình %s</string>
     <string name="compose_shortcut_short_label">Viết</string>
     <string name="compose_shortcut_long_label">Viết tút</string>
@@ -373,7 +373,7 @@
     <string name="edit_hashtag_hint">Không cần dấu #</string>
     <string name="add_hashtag_title">Thêm hashtag</string>
     <string name="hint_list_name">Tên danh sách</string>
-    <string name="description_poll">Những lựa chọn: %1$s, %2$s, %3$s, %4$s; %5$s</string>
+    <string name="description_poll">Lượt bình chọn: %1$s, %2$s, %3$s, %4$s; %5$s</string>
     <string name="description_visiblity_direct">Tin nhắn</string>
     <string name="description_visiblity_private">Người theo dõi</string>
     <string name="description_visiblity_unlisted">Mở</string>

From 06c9dc01589948867c4de22dfbe265a77cd9fb6b Mon Sep 17 00:00:00 2001
From: Danial Behzadi <dani.behzi@ubuntu.com>
Date: Thu, 3 Dec 2020 20:17:08 +0000
Subject: [PATCH 15/20] Translated using Weblate (Persian)

Currently translated at 100.0% (434 of 434 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fa/
---
 app/src/main/res/values-fa/strings.xml | 34 +++++++++++++-------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 55eec785..4d54af2e 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -93,7 +93,7 @@
     <string name="action_accept">پذیرش</string>
     <string name="action_reject">رد</string>
     <string name="action_search">جست‌وجو</string>
-    <string name="action_access_saved_toot">پیش‌نویس</string>
+    <string name="action_access_saved_toot">پیش‌نویس‌ها</string>
     <string name="action_toggle_visibility">نمایانی بوق</string>
     <string name="action_content_warning">هشدار محتوا</string>
     <string name="action_emoji_keyboard">صفحه‌کلید اموجی</string>
@@ -148,7 +148,7 @@
     <string name="pref_title_notification_filter_reblogs">فرسته‌هایم تقویت شدند</string>
     <string name="pref_title_notification_filter_favourites">فرسته‌هایم برگزیده شدند</string>
     <string name="pref_title_appearance_settings">ظاهر</string>
-    <string name="pref_title_app_theme">تم برنامه</string>
+    <string name="pref_title_app_theme">زمینهٔ کاره</string>
     <string name="pref_title_timelines">خط‌ زمانی‌ها</string>
     <string name="app_them_dark">روشن</string>
     <string name="app_theme_light">سیاه</string>
@@ -156,19 +156,19 @@
     <string name="app_theme_auto">خودکار در غروب</string>
     <string name="pref_title_browser_settings">مرورگر</string>
     <string name="pref_title_custom_tabs">استفاده از زبانه‌های سفارشی کروم</string>
-    <string name="pref_title_hide_follow_button">پنهان کردن دکمه ایجاد هنگام پیمایش</string>
+    <string name="pref_title_hide_follow_button">نهفتن دکمهٔ ایجاد، هنگام پیمایش</string>
     <string name="pref_title_status_filter">فیلتر کردن خط زمانی</string>
     <string name="pref_title_status_tabs">زبانه‌ها</string>
     <string name="pref_title_show_boosts">نمایش تقویت‌ها</string>
     <string name="pref_title_show_replies">نمایش پاسخ‌ها</string>
     <string name="pref_title_show_media_preview">بارگیری پیش‌نمایش رسانه</string>
-    <string name="pref_title_proxy_settings">پراکسی</string>
-    <string name="pref_title_http_proxy_settings">پراکسی HTTP</string>
-    <string name="pref_title_http_proxy_enable">فعال‌سازی پراکسی HTTP</string>
+    <string name="pref_title_proxy_settings">پیشکار</string>
+    <string name="pref_title_http_proxy_settings">پیشکار HTTP</string>
+    <string name="pref_title_http_proxy_enable">به کار انداختن پیشکار HTTP</string>
     <string name="pref_title_http_proxy_server">کارساز پیشکار HTTP</string>
     <string name="pref_title_http_proxy_port">درگاه پیشکار HTTP</string>
     <string name="pref_default_post_privacy">محرمانگی پیش‌گزیدهٔ فرسته</string>
-    <string name="pref_default_media_sensitivity">همواره رسانه را به عنوان حساس نشانه‌گذاری کن</string>
+    <string name="pref_default_media_sensitivity">علامت‌گذاری همیشگی رسانه به عنوان حساس</string>
     <string name="pref_publishing">در حال انتشار (همگام با کارساز)</string>
     <string name="pref_failed_to_sync">ناتوانی در هم‌گام‌سازی تنظیمات</string>
     <string name="post_privacy_public">عمومی</string>
@@ -279,7 +279,7 @@
     <string name="title_statuses_pinned">سنجاق‌شده</string>
     <string name="title_domain_mutes">دامنه‌های نهفته</string>
     <string name="status_username_format">\@%s</string>
-    <string name="message_empty">این‌حا هیچ‌چیزی نیست.</string>
+    <string name="message_empty">این‌جا هیچ‌چیزی نیست.</string>
     <string name="action_unreblog">برداشتن تقویت</string>
     <string name="action_unfavourite">برداشتن برگزیدگی</string>
     <string name="action_delete_and_redraft">حذف و بازنویسی</string>
@@ -289,11 +289,11 @@
     <string name="action_add_tab">افزودن زبانه</string>
     <string name="action_links">پیوندها</string>
     <string name="action_mentions">اشاره‌ها</string>
-    <string name="action_hashtags">هشتگ‌ها</string>
+    <string name="action_hashtags">برچسب‌ها</string>
     <string name="action_open_reblogger">گشودن تقویت‌کنندهٔ بوق</string>
     <string name="action_open_reblogged_by">نمایش تقویت‌ها</string>
     <string name="action_open_faved_by">نمایش برگزیده‌ها</string>
-    <string name="title_hashtags_dialog">هشتگ‌ها</string>
+    <string name="title_hashtags_dialog">برچسب‌ها</string>
     <string name="title_mentions_dialog">اشاره‌ها</string>
     <string name="title_links_dialog">پیوندها</string>
     <string name="action_open_media_n">گشودن رسانه #%d</string>
@@ -305,11 +305,11 @@
     <string name="dialog_redraft_toot_warning">می‌خواهید این بوق را پاک و بازنویسی کنید؟</string>
     <string name="mute_domain_warning_dialog_ok">نهفتن تمام دامنه</string>
     <string name="pref_title_notification_filter_poll">پایان نظرسنجی‌ها</string>
-    <string name="pref_title_timeline_filters">صافی‌ها</string>
-    <string name="app_theme_system">استفاده از طرح سیستم</string>
+    <string name="pref_title_timeline_filters">پالایه‌ها</string>
+    <string name="app_theme_system">استفاده از طراحی سامانه</string>
     <string name="pref_title_language">زبان</string>
     <string name="pref_title_bot_overlay">نمایش نشانگر برای بات‌ها</string>
-    <string name="pref_title_animate_gif_avatars">پویانمایی آواتار gif</string>
+    <string name="pref_title_animate_gif_avatars">پویانمایی آواتارهای جیف</string>
     <string name="notification_poll_name">نظرسنجی‌ها</string>
     <string name="notification_poll_description">آگاهی‌ها دربارهٔ نظرسنجی‌های پایان‌یافته</string>
     <string name="about_tusky_version">تاسکی %s</string>
@@ -364,7 +364,7 @@
     <string name="description_visiblity_direct">مستقیم</string>
     <string name="description_poll">نظرسنجی با گزینه‌ها: %1$s، %2$s، %3$s، %4$s؛ %5$s</string>
     <string name="hint_list_name">نام فهرست</string>
-    <string name="edit_hashtag_hint">هشتگ بدون #</string>
+    <string name="edit_hashtag_hint">برچسب بدون #</string>
     <string name="notifications_clear">پاک‌سازی</string>
     <string name="notifications_apply_filter">پالایش</string>
     <string name="filter_apply">اعمال</string>
@@ -434,15 +434,15 @@
     <string name="no_saved_status">هیچ پیش‌نویسی ندارید.</string>
     <string name="no_scheduled_status">هیچ وضعیت زمان‌بسته‌ای ندارید.</string>
     <string name="warning_scheduling_interval">ماستودون، بازهٔ زمان‌بندی‌ای با کمینهٔ ۵ دقیقه دارد.</string>
-    <string name="pref_title_confirm_reblogs">نمایش گفت‌وگوی تأیید پیش از تقویت</string>
+    <string name="pref_title_confirm_reblogs">نمایش گفت‌وگوی تأیید، پیش از تقویت</string>
     <string name="pref_title_show_cards_in_timelines">پیش‌نمایش پیوندها در خط‌زمانی‌ها</string>
     <string name="pref_title_enable_swipe_for_tabs">به کار انداختن اشارهٔ کشیدنی برای تعویض بین زبانه‌ها</string>
     <plurals name="poll_info_people">
         <item quantity="one">%s نفر</item>
         <item quantity="other">%s نفر</item>
     </plurals>
-    <string name="hashtags">هشتگ‌ها</string>
-    <string name="add_hashtag_title">افزودن هشتگ</string>
+    <string name="hashtags">برچسب‌ها</string>
+    <string name="add_hashtag_title">افزودن برچسب</string>
     <string name="notification_follow_request_description">آگاهی‌ها دربارهٔ درخواست‌های پی‌گیری</string>
     <string name="notification_follow_request_name">درخواست‌های پی‌گیری</string>
     <string name="pref_title_notification_filter_follow_requests">درخواست پی‌گیری</string>

From 2943b5ede18efa58c977ce2a40a31bf52dd60ec8 Mon Sep 17 00:00:00 2001
From: tolstoevsky <tolstoevsky@riseup.net>
Date: Thu, 3 Dec 2020 20:17:09 +0000
Subject: [PATCH 16/20] Translated using Weblate (Russian)

Currently translated at 100.0% (434 of 434 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/ru/
---
 app/src/main/res/values-ru/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d46030c5..a13d58ac 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -500,4 +500,9 @@
     <string name="action_mute_notifications_desc">Заблокировать уведомления от %s</string>
     <string name="action_unmute_notifications_desc">Получать уведомления от %s</string>
     <string name="action_unmute_desc">Разблокировать %s</string>
+    <string name="account_note_saved">Сохранено!</string>
+    <string name="account_note_hint">Ваша личная заметка об этой учётной записи</string>
+    <string name="pref_title_hide_top_toolbar">Скрыть заголовок в верхней панели</string>
+    <string name="no_announcements">Объявлений нет.</string>
+    <string name="title_announcements">Объявления</string>
 </resources>
\ No newline at end of file

From 81d816eecd4930da98bcd3307c9bbbfbd4b3fedc Mon Sep 17 00:00:00 2001
From: x <hardwired1.0@protonmail.com>
Date: Thu, 3 Dec 2020 20:17:09 +0000
Subject: [PATCH 17/20] Translated using Weblate (Italian)

Currently translated at 99.7% (433 of 434 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/it/
---
 app/src/main/res/values-it/strings.xml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0c74ad9d..2cc0cfb2 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -414,8 +414,8 @@
         <item quantity="other">%d minuti rimasti</item>
     </plurals>
     <plurals name="poll_timespan_seconds">
-        <item quantity="one">%d secondo</item>
-        <item quantity="other">%d secondi</item>
+        <item quantity="one">%d secondo rimasto</item>
+        <item quantity="other">%d secondi rimasti</item>
     </plurals>
     <string name="button_continue">Continua</string>
     <string name="button_back">Indietro</string>
@@ -464,4 +464,22 @@
     <string name="error_audio_upload_size">La dimensione dei file audio deve essere inferiore a 40 MB.</string>
     <string name="action_unmute_desc">Smetti di silenziare %s</string>
     <string name="notification_follow_request_name">Richieste di seguirti</string>
+    <string name="account_note_saved">Salvato!</string>
+    <string name="account_note_hint">La tua nota privata su questo account</string>
+    <string name="pref_title_hide_top_toolbar">Nascondi il titolo della barra degli strumenti in alto</string>
+    <string name="pref_title_confirm_reblogs">Mostra la finestra di dialogo di conferma prima del boosting</string>
+    <string name="pref_title_show_cards_in_timelines">Mostra le anteprime dei collegamenti nelle sequenze temporali</string>
+    <string name="warning_scheduling_interval">Mastodon ha un intervallo minimo di programmazione di 5 minuti.</string>
+    <string name="no_announcements">Non ci sono annunci.</string>
+    <string name="no_scheduled_status">Non hai stati pianificati.</string>
+    <string name="pref_title_enable_swipe_for_tabs">Abilita il gesto di scorrimento per passare da una scheda all\'altra</string>
+    <string name="notification_follow_request_description">Notifiche sulle richieste di essere seguiti</string>
+    <string name="pref_main_nav_position_option_bottom">Parte inferiore</string>
+    <string name="pref_main_nav_position_option_top">In cima</string>
+    <string name="pref_main_nav_position">Posizione di navigazione principale</string>
+    <string name="pref_title_gradient_for_media">Mostra sfumature colorate per i media nascosti</string>
+    <string name="dialog_mute_hide_notifications">Nascondi notifiche</string>
+    <string name="action_mute_notifications_desc">Disattiva le notifiche da %s</string>
+    <string name="action_unmute_notifications_desc">Riattiva le notifiche da %s</string>
+    <string name="title_announcements">Annunci</string>
 </resources>
\ No newline at end of file

From 6ada6624b4163c76671130f6566a592901ae1b6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lanie=20Chauvel?= <perso@hack-libre.org>
Date: Thu, 3 Dec 2020 20:17:09 +0000
Subject: [PATCH 18/20] Translated using Weblate (French)

Currently translated at 100.0% (434 of 434 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fr/

Translated using Weblate (Esperanto)

Currently translated at 98.1% (426 of 434 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/eo/

Translated using Weblate (French)

Currently translated at 100.0% (434 of 434 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fr/

Translated using Weblate (Esperanto)

Currently translated at 97.6% (424 of 434 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/eo/

Translated using Weblate (French)

Currently translated at 100.0% (434 of 434 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fr/

Translated using Weblate (Esperanto)

Currently translated at 97.2% (422 of 434 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/eo/
---
 app/src/main/res/values-eo/strings.xml | 51 +++++++++++++++++++----
 app/src/main/res/values-fr/strings.xml | 56 ++++++++++++++------------
 2 files changed, 74 insertions(+), 33 deletions(-)

diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 964c1c89..13a06597 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -164,9 +164,9 @@
     <string name="pref_title_notification_alert_vibrate">Sciigi per vibro</string>
     <string name="pref_title_notification_alert_light">Sciigi per lumo</string>
     <string name="pref_title_notification_filters">Sciigi al mi kiam</string>
-    <string name="pref_title_notification_filter_mentions">menciita</string>
-    <string name="pref_title_notification_filter_follows">sekvita</string>
-    <string name="pref_title_notification_filter_reblogs">viaj mesaĝoj estas diskonigitaj</string>
+    <string name="pref_title_notification_filter_mentions">iu mencias min</string>
+    <string name="pref_title_notification_filter_follows">iu sekvas min</string>
+    <string name="pref_title_notification_filter_reblogs">miaj mesaĝoj estas diskonigitaj</string>
     <string name="pref_title_notification_filter_favourites">miaj mesaĝoj estas stelumitaj</string>
     <string name="pref_title_appearance_settings">Aspekto</string>
     <string name="pref_title_app_theme">Temo de la apo</string>
@@ -363,7 +363,7 @@
     <string name="pref_title_animate_gif_avatars">Moviĝi GIF profilbildojn</string>
     <string name="notification_poll_name">Enketoj</string>
     <string name="notification_poll_description">Sciigoj pri enketoj kiuj finiĝis</string>
-    <string name="edit_hashtag_hint">Kradvortoj sen #</string>
+    <string name="edit_hashtag_hint">Kradvorto sen #</string>
     <string name="notifications_clear">Viŝi</string>
     <string name="notifications_apply_filter">Filtri</string>
     <string name="filter_apply">Apliki</string>
@@ -373,15 +373,14 @@
     <string name="compose_preview_image_description">Agoj por bildo %s</string>
     <string name="poll_info_format"> <!-- 15 votes • 1 hour left --> %1$s • %2$s</string>
     <plurals name="poll_info_votes">
-        <item quantity="one"/>
-        <item quantity="other"/>
+        <item quantity="one">%s voĉdono</item>
+        <item quantity="other">%s voĉdonoj</item>
     </plurals>
     <string name="poll_info_time_absolute">finiĝos je %s</string>
     <string name="poll_info_closed">finiĝita</string>
     <string name="poll_vote">Voĉdoni</string>
     <string name="poll_ended_voted">Enketo al kiu vi voĉdonis finiĝis</string>
     <string name="poll_ended_created">Enketo kiu vi kreis finiĝis</string>
-
     <string name="title_domain_mutes">Kaŝitaj domajnoj</string>
     <string name="action_view_domain_mutes">Kaŝitaj domajnoj</string>
     <string name="action_mute_domain">Silentigi %s</string>
@@ -437,4 +436,42 @@
     <string name="no_scheduled_status">Vi ne havas iun ajn planitan mesaĝon.</string>
     <string name="notification_follow_request_name">Petoj de sekvado</string>
     <string name="hashtags">Kradvortoj</string>
+    <plurals name="poll_info_people">
+        <item quantity="one">%s homo</item>
+        <item quantity="other">%s homoj</item>
+    </plurals>
+    <string name="add_hashtag_title">Aldoni kradvorton</string>
+    <string name="notification_follow_request_description">Sciigoj pri petoj de sekvado</string>
+    <string name="pref_title_gradient_for_media">Montri buntajn transirojn por kaŝitaj aŭdovidaĵoj</string>
+    <string name="dialog_mute_hide_notifications">Kaŝi la sciigojn</string>
+    <string name="dialog_mute_warning">Silentigi @%s\?</string>
+    <string name="dialog_block_warning">Bloki @%s\?</string>
+    <string name="action_unmute_conversation">Malsilentigi la konversacion</string>
+    <string name="action_mute_conversation">Silentigi la konversacion</string>
+    <string name="action_unmute_domain">Malsilentigi %s</string>
+    <string name="action_mute_notifications_desc">Silentigi sciigojn de %s</string>
+    <string name="action_unmute_notifications_desc">Malsilentigi sciigojn de %s</string>
+    <string name="action_unmute_desc">Malsilentigi %s</string>
+    <string name="notification_follow_request_format">%s petis sekvi vin</string>
+    <string name="title_announcements">Anoncoj</string>
+    <plurals name="poll_timespan_minutes">
+        <item quantity="one">%d minuto restas</item>
+        <item quantity="other">%d minutoj restas</item>
+    </plurals>
+    <plurals name="poll_timespan_seconds">
+        <item quantity="one">%d sekundo restas</item>
+        <item quantity="other">%d sekundoj restas</item>
+    </plurals>
+    <plurals name="poll_timespan_hours">
+        <item quantity="one">%d horo restas</item>
+        <item quantity="other">%d horoj restas</item>
+    </plurals>
+    <plurals name="poll_timespan_days">
+        <item quantity="one">%d tago restas</item>
+        <item quantity="other">%d tagoj restas</item>
+    </plurals>
+    <string name="pref_main_nav_position">Pozicio de la ĉefa naviga breto</string>
+    <string name="pref_title_notification_filter_follow_requests">iu petas sekvi min</string>
+    <string name="pref_main_nav_position_option_bottom">Malsupro</string>
+    <string name="pref_main_nav_position_option_top">Supro</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 48f68f0c..f2554340 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -39,7 +39,7 @@
     <string name="title_saved_toot">Brouillons</string>
     <string name="title_licenses">Licences</string>
     <string name="status_username_format">\@%s</string>
-    <string name="status_boosted_format">%s a boosté</string>
+    <string name="status_boosted_format">%s a partagé</string>
     <string name="status_sensitive_media_title">Contenu sensible</string>
     <string name="status_media_hidden_title">Média caché</string>
     <string name="status_sensitive_media_directions">Cliquer pour voir</string>
@@ -49,7 +49,7 @@
     <string name="status_content_show_less">Replier</string>
     <string name="message_empty">Rien ici.</string>
     <string name="footer_empty">Il n’y a aucun pouet ici pour l’instant. Glissez vers le bas pour actualiser !</string>
-    <string name="notification_reblog_format">%s a boosté votre pouet</string>
+    <string name="notification_reblog_format">%s a partagé votre pouet</string>
     <string name="notification_favourite_format">%s a ajouté votre pouet à ses favoris</string>
     <string name="notification_follow_format">%s vous suit</string>
     <string name="report_username_format">Signaler @%s</string>
@@ -69,8 +69,8 @@
     <string name="action_unfollow">Ne plus suivre</string>
     <string name="action_block">Bloquer</string>
     <string name="action_unblock">Débloquer</string>
-    <string name="action_hide_reblogs">Cacher les boosts</string>
-    <string name="action_show_reblogs">Afficher les boosts</string>
+    <string name="action_hide_reblogs">Cacher les partages</string>
+    <string name="action_show_reblogs">Afficher les partages</string>
     <string name="action_report">Signaler</string>
     <string name="action_delete">Supprimer</string>
     <string name="action_send">POUET</string>
@@ -109,8 +109,8 @@
     <string name="action_links">Liens</string>
     <string name="action_mentions">Mentions</string>
     <string name="action_hashtags">Hashtags</string>
-    <string name="action_open_reblogger">Afficher l’auteur·rice du boost</string>
-    <string name="action_open_reblogged_by">Afficher les boosts</string>
+    <string name="action_open_reblogger">Afficher l’auteur·rice du partage</string>
+    <string name="action_open_reblogged_by">Afficher les partages</string>
     <string name="action_open_faved_by">Montrer les favoris</string>
     <string name="title_hashtags_dialog">Hashtags</string>
     <string name="title_mentions_dialog">Mentions</string>
@@ -167,10 +167,10 @@
     <string name="pref_title_notification_alert_sound">Notifier avec un son</string>
     <string name="pref_title_notification_alert_vibrate">Notifier avec une vibration</string>
     <string name="pref_title_notification_alert_light">Notifier avec une lumière</string>
-    <string name="pref_title_notification_filters">Me notifier lorsque</string>
+    <string name="pref_title_notification_filters">Me notifier quand</string>
     <string name="pref_title_notification_filter_mentions">on me mentionne</string>
-    <string name="pref_title_notification_filter_follows">On me suit</string>
-    <string name="pref_title_notification_filter_reblogs">Mes pouets sont boostés</string>
+    <string name="pref_title_notification_filter_follows">on vient de me suivre</string>
+    <string name="pref_title_notification_filter_reblogs">mes pouets sont partagés</string>
     <string name="pref_title_notification_filter_favourites">mes pouets sont mis en favoris</string>
     <string name="pref_title_appearance_settings">Apparence</string>
     <string name="pref_title_app_theme">Thème de l’application</string>
@@ -187,7 +187,7 @@
     <string name="pref_title_language">Langue</string>
     <string name="pref_title_status_filter">Filtrage des fils</string>
     <string name="pref_title_status_tabs">Onglets</string>
-    <string name="pref_title_show_boosts">Afficher les boosts</string>
+    <string name="pref_title_show_boosts">Afficher les partages</string>
     <string name="pref_title_show_replies">Afficher les réponses</string>
     <string name="pref_title_show_media_preview">Montrer les miniatures des médias</string>
     <string name="pref_title_proxy_settings">Proxy</string>
@@ -212,8 +212,8 @@
     <string name="notification_mention_descriptions">Notifications pour les nouvelles mentions</string>
     <string name="notification_follow_name">Nouveaux abonnés</string>
     <string name="notification_follow_description">Notifications pour les nouveaux abonnés</string>
-    <string name="notification_boost_name">Boosts</string>
-    <string name="notification_boost_description">Notifications quand vos pouets sont boostés</string>
+    <string name="notification_boost_name">Partages</string>
+    <string name="notification_boost_description">Notifications quand vos pouets sont partagés</string>
     <string name="notification_favourite_name">Favoris</string>
     <string name="notification_favourite_description">Notifications quand vos pouets sont mis en favoris</string>
     <string name="notification_mention_format">%s vous a mentionné</string>
@@ -316,8 +316,8 @@
     <string name="download_failed">Échec du téléchargement</string>
     <string name="profile_badge_bot_text">Robot</string>
     <string name="account_moved_description">%1$s a déménagé vers :</string>
-    <string name="reblog_private">Booster vers l’audience originale</string>
-    <string name="unreblog_private">Annuler le boost</string>
+    <string name="reblog_private">Partager à l’audience originale</string>
+    <string name="unreblog_private">Annuler le partage</string>
     <string name="license_description">Tusky contient du code et des ressources issus des projets open source suivants :</string>
     <string name="license_apache_2">Sous licence Apache (copie ci-dessous)</string>
     <string name="license_cc_by_4">CC-BY 4.0</string>
@@ -335,10 +335,10 @@
         <item quantity="other"><b>%1$s</b> Favoris</item>
     </plurals>
     <plurals name="reblogs">
-        <item quantity="one"><b>%s</b> Boost</item>
-        <item quantity="other"><b>%s</b> Boosts</item>
+        <item quantity="one"><b>%s</b> Partage</item>
+        <item quantity="other"><b>%s</b> Partages</item>
     </plurals>
-    <string name="title_reblogged_by">Boosté par</string>
+    <string name="title_reblogged_by">Partagé par</string>
     <string name="title_favourited_by">Mis en favoris par</string>
     <string name="conversation_1_recipients">%1$s</string>
     <string name="conversation_2_recipients">%1$s et %2$s</string>
@@ -362,7 +362,7 @@
     <string name="description_visiblity_direct">        Direct
     </string>
     <string name="hint_list_name">Nom de la liste</string>
-    <string name="edit_hashtag_hint">Hastags sans #</string>
+    <string name="edit_hashtag_hint">Hashtag sans #</string>
     <string name="notifications_clear">Nettoyer</string>
     <string name="notifications_apply_filter">Filtrer</string>
     <string name="filter_apply">Appliquer</string>
@@ -376,7 +376,7 @@
     <string name="poll_info_closed">Terminé</string>
     <string name="poll_vote">Voter</string>
     <string name="notification_poll_name">Sondages</string>
-    <string name="pref_title_notification_filter_poll">Les sondages sont clos</string>
+    <string name="pref_title_notification_filter_poll">les sondages se terminent</string>
     <string name="notification_poll_description">Notifications pour les sondages terminés</string>
     <string name="poll_ended_created">Un sondage que vous avez créé est terminé</string>
     <plurals name="poll_timespan_days">
@@ -403,7 +403,7 @@
     <string name="title_domain_mutes">Domaines cachés</string>
     <string name="action_view_domain_mutes">Domaines cachés</string>
     <string name="action_mute_domain">Masquer %s</string>
-    <string name="confirmation_domain_unmuted">%s n’est plus masqué</string>
+    <string name="confirmation_domain_unmuted">%s n’est plus masqué·e</string>
     <string name="mute_domain_warning_dialog_ok">Masquer le domaine entier</string>
     <string name="caption_notoemoji">L’ensemble d’émojis actuel de Google</string>
     <string name="button_continue">Continuer</string>
@@ -455,25 +455,25 @@
     <string name="warning_scheduling_interval">L’intervalle minimum de planification sur Mastodon est de5 minutes.</string>
     <string name="notification_follow_request_name">Demandes d\'abonnement</string>
     <string name="dialog_block_warning">Bloquer @%s \?</string>
-    <string name="pref_title_confirm_reblogs">Afficher une boite de confirmation avant de booster</string>
+    <string name="pref_title_confirm_reblogs">Afficher une fenêtre de confirmation avant de partager</string>
     <string name="pref_title_show_cards_in_timelines">Afficher des aperçus des liens dans les fils</string>
     <string name="notification_follow_request_format">%s a demandé à vous suivre</string>
     <string name="notification_follow_request_description">Notifications à propos des demandes d’abonnement</string>
-    <string name="pref_title_notification_filter_follow_requests">Demande d’abonnement</string>
+    <string name="pref_title_notification_filter_follow_requests">on demande à me suivre</string>
     <string name="dialog_mute_warning">Mettre en sourdine @%s \?</string>
     <string name="action_unmute_conversation">Enlever la sourdine à la conversation</string>
-    <string name="action_mute_conversation">Silencer la conversation</string>
+    <string name="action_mute_conversation">Masquer la conversation</string>
     <string name="pref_title_enable_swipe_for_tabs">Activer les gestes de glissement pour passer d’un onglet à l’autre</string>
     <string name="hashtags">Hashtags</string>
-    <string name="add_hashtag_title">Ajouter hashtag</string>
+    <string name="add_hashtag_title">Ajouter un hashtag</string>
     <string name="pref_title_gradient_for_media">Afficher des dégradés en couleur pour les médias cachés</string>
     <string name="pref_main_nav_position_option_bottom">Bas</string>
     <string name="pref_main_nav_position_option_top">Haut</string>
     <string name="pref_main_nav_position">Position de navigation principale</string>
     <string name="action_unmute_domain">Ne plus masquer %s</string>
     <string name="dialog_mute_hide_notifications">Cacher les notifications</string>
-    <string name="action_mute_notifications_desc">Silencier les notifications de %s</string>
-    <string name="action_unmute_notifications_desc">Ne plus silencier les notifications de %s</string>
+    <string name="action_mute_notifications_desc">Masquer les notifications de %s</string>
+    <string name="action_unmute_notifications_desc">Ne plus masquer les notifications de %s</string>
     <string name="action_unmute_desc">Ne plus masquer %s</string>
     <plurals name="poll_info_people">
         <item quantity="one">%s personne</item>
@@ -484,4 +484,8 @@
         <item quantity="one">%s voix</item>
         <item quantity="other">%s voix</item>
     </plurals>
+    <string name="account_note_saved">Sauvegardé !</string>
+    <string name="account_note_hint">Votre note privée sur ce compte</string>
+    <string name="no_announcements">Il n’y a pas d’annonces.</string>
+    <string name="title_announcements">Annonces</string>
 </resources>
\ No newline at end of file

From b1a1a69988f42215f40078bc9fdd5f38ef8e550a Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Fri, 4 Dec 2020 18:55:13 +0100
Subject: [PATCH 19/20] fix the notification buttons on the Muted users page
 (#2009)

---
 .../java/com/keylesspalace/tusky/fragment/AccountListFragment.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.kt
index d15835e3..da9893a2 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.kt
@@ -330,6 +330,7 @@ class AccountListFragment : BaseFragment(), AccountActionListener, Injectable {
 
     private fun fetchRelationships(ids: List<String>) {
         api.relationships(ids)
+                .observeOn(AndroidSchedulers.mainThread())
                 .autoDispose(from(this))
                 .subscribe(::onFetchRelationshipsSuccess) {
                     onFetchRelationshipsFailure(ids)

From dd7804f4580c50e097147363fc4ed944220f3f91 Mon Sep 17 00:00:00 2001
From: Conny Duck <k.pozniak@gmx.at>
Date: Fri, 4 Dec 2020 19:27:37 +0100
Subject: [PATCH 20/20] Release 77

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 722cde87..21883df4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,8 +20,8 @@ android {
         applicationId APP_ID
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 76
-        versionName "13.0 beta 1"
+        versionCode 77
+        versionName "13.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true