diff --git a/app/build.gradle b/app/build.gradle
index 958693547..4c0d2c04d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -188,7 +188,7 @@ dependencies {
     testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
 
     androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0"
-    androidTestImplementation "android.arch.persistence.room:testing:1.1.1"
+    androidTestImplementation "androidx.room:room-testing:$roomVersion"
     androidTestImplementation "androidx.test.ext:junit:1.1.1"
 
     debugImplementation "im.dino:dbinspector:4.0.0@aar"
diff --git a/app/src/androidTest/java/com/keylesspalace/tusky/TimelineDAOTest.kt b/app/src/androidTest/java/com/keylesspalace/tusky/TimelineDAOTest.kt
index 241781b6d..da55b08b7 100644
--- a/app/src/androidTest/java/com/keylesspalace/tusky/TimelineDAOTest.kt
+++ b/app/src/androidTest/java/com/keylesspalace/tusky/TimelineDAOTest.kt
@@ -78,46 +78,39 @@ class TimelineDAOTest {
     fun cleanup() {
         val now = System.currentTimeMillis()
         val oldDate = now - TimelineRepository.CLEANUP_INTERVAL - 20_000
-        val oldByThisAccount = makeStatus(
+        val oldThisAccount = makeStatus(
                 statusId = 5,
                 createdAt = oldDate
         )
-        val oldByAnotherAccount = makeStatus(
+        val oldAnotherAccount = makeStatus(
                 statusId = 10,
                 createdAt = oldDate,
-                authorServerId = "100"
+                accountId = 2
         )
-        val oldForAnotherAccount = makeStatus(
-                accountId = 2,
-                statusId = 20,
-                authorServerId = "200",
-                createdAt = oldDate
-        )
-        val recentByThisAccount = makeStatus(
+        val recentThisAccount = makeStatus(
                 statusId = 30,
                 createdAt = System.currentTimeMillis()
         )
-        val recentByAnotherAccount = makeStatus(
+        val recentAnotherAccount = makeStatus(
                 statusId = 60,
                 createdAt = System.currentTimeMillis(),
-                authorServerId = "200"
-                )
+                accountId = 2
+        )
 
-        for ((status, author, reblogAuthor) in listOf(oldByThisAccount, oldByAnotherAccount,
-                oldForAnotherAccount, recentByThisAccount, recentByAnotherAccount)) {
+        for ((status, author, reblogAuthor) in listOf(oldThisAccount, oldAnotherAccount, recentThisAccount, recentAnotherAccount)) {
             timelineDao.insertInTransaction(status, author, reblogAuthor)
         }
 
-        timelineDao.cleanup(1, "20",  now - TimelineRepository.CLEANUP_INTERVAL)
+        timelineDao.cleanup(now - TimelineRepository.CLEANUP_INTERVAL)
 
         assertEquals(
-                listOf(recentByAnotherAccount, recentByThisAccount, oldByThisAccount),
+                listOf(recentThisAccount),
                 timelineDao.getStatusesForAccount(1, null, null, 100).blockingGet()
                         .map { it.toTriple() }
         )
 
         assertEquals(
-                listOf(oldForAnotherAccount),
+                listOf(recentAnotherAccount),
                 timelineDao.getStatusesForAccount(2, null, null, 100).blockingGet()
                         .map { it.toTriple() }
         )
@@ -217,7 +210,8 @@ class TimelineDAOTest {
                 application = "application$accountId",
                 reblogServerId = if (reblog) (statusId * 100).toString() else null,
                 reblogAccountId = reblogAuthor?.serverId,
-                poll = null
+                poll = null,
+                muted = false
         )
         return Triple(status, author, reblogAuthor)
     }
@@ -246,7 +240,8 @@ class TimelineDAOTest {
                 application = null,
                 reblogServerId = null,
                 reblogAccountId = null,
-                poll = null
+                poll = null,
+                muted = false
         )
     }
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt b/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt
index 22d25f098..a1e68ddfe 100644
--- a/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt
@@ -30,6 +30,7 @@ import android.widget.ImageView
 import androidx.activity.viewModels
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -112,7 +113,7 @@ class EditProfileActivity : BaseActivity(), Injectable {
         addFieldButton.setOnClickListener {
             accountFieldEditAdapter.addField()
             if(accountFieldEditAdapter.itemCount >= MAX_ACCOUNT_FIELDS) {
-                it.isEnabled = false
+                it.isVisible = false
             }
 
             scrollView.post{
diff --git a/app/src/main/java/com/keylesspalace/tusky/db/TimelineDao.kt b/app/src/main/java/com/keylesspalace/tusky/db/TimelineDao.kt
index 35ca6fc9c..9c50ad03b 100644
--- a/app/src/main/java/com/keylesspalace/tusky/db/TimelineDao.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/db/TimelineDao.kt
@@ -99,9 +99,8 @@ WHERE timelineUserId = :accountId AND (serverId = :statusId OR reblogServerId =
 AND serverId = :statusId""")
     abstract fun delete(accountId: Long, statusId: String)
 
-    @Query("""DELETE FROM TimelineStatusEntity WHERE timelineUserId = :accountId
-AND authorServerId != :accountServerId AND createdAt < :olderThan""")
-    abstract fun cleanup(accountId: Long, accountServerId: String, olderThan: Long)
+    @Query("""DELETE FROM TimelineStatusEntity WHERE createdAt < :olderThan""")
+    abstract fun cleanup(olderThan: Long)
 
     @Query("""UPDATE TimelineStatusEntity SET poll = :poll
 WHERE timelineUserId = :accountId AND (serverId = :statusId OR reblogServerId = :statusId)""")
diff --git a/app/src/main/java/com/keylesspalace/tusky/repository/TimelineRepository.kt b/app/src/main/java/com/keylesspalace/tusky/repository/TimelineRepository.kt
index 55cd36bd5..e33c627f0 100644
--- a/app/src/main/java/com/keylesspalace/tusky/repository/TimelineRepository.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/repository/TimelineRepository.kt
@@ -1,6 +1,5 @@
 package com.keylesspalace.tusky.repository
 
-import android.text.Spanned
 import android.text.SpannedString
 import androidx.core.text.parseAsHtml
 import androidx.core.text.toHtml
@@ -196,14 +195,10 @@ class TimelineRepositoryImpl(
     }
 
     private fun cleanup() {
-        Single.fromCallable {
+        Schedulers.io().scheduleDirect {
             val olderThan = System.currentTimeMillis() - TimelineRepository.CLEANUP_INTERVAL
-            for (account in accountManager.getAllAccountsOrderedByActive()) {
-                timelineDao.cleanup(account.id, account.accountId, olderThan)
-            }
+            timelineDao.cleanup(olderThan)
         }
-                .subscribeOn(Schedulers.io())
-                .subscribe()
     }
 
     private fun TimelineStatusWithAccount.toStatus(): TimelineStatus {
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2e36c2efa..ec4ac242c 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -116,7 +116,7 @@
     <string name="confirmation_unmuted">El usuario ya no está silenciado</string>
     <string name="status_sent">¡Enviado!</string>
     <string name="status_sent_long">Respuesta enviada correctamente.</string>
-    <string name="hint_domain">Indique la instancia</string>
+    <string name="hint_domain">¿Qué instancia\?</string>
     <string name="hint_compose">¿En qué estás pensando?</string>
     <string name="hint_content_warning">Aviso de contenido</string>
     <string name="hint_display_name">Nombre</string>
@@ -300,8 +300,8 @@
         <item quantity="other">&lt;b&gt;%1$s&lt;/b&gt; Favoritos</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> impulso</item>
+        <item quantity="other"><b>%s</b> impulsos</item>
     </plurals>
     <string name="title_reblogged_by">Impulsado por</string>
     <string name="title_favourited_by">Marcado como favorito por</string>
@@ -334,8 +334,8 @@
         <item quantity="other">%d días</item>
     </plurals>
     <plurals name="poll_timespan_hours">
-        <item quantity="one"/>
-        <item quantity="other"/>
+        <item quantity="one">%d hora</item>
+        <item quantity="other">%d horas</item>
     </plurals>
     <plurals name="poll_timespan_minutes">
         <item quantity="one">%d minuto</item>
@@ -475,4 +475,5 @@
     <string name="dialog_mute_hide_notifications">Ocultar notificaciones</string>
     <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>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 0c3c16605..5706b8394 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -180,7 +180,7 @@
     <string name="pref_title_http_proxy_port">Porta do proxy HTTP</string>
     <string name="pref_default_post_privacy">Privacidade padrão dos toots</string>
     <string name="pref_default_media_sensitivity">Sempre marcar mídia como sensível</string>
-    <string name="pref_publishing">Publicação (sincronizada com o servidor)</string>
+    <string name="pref_publishing">Toots (sincronizado com instância)</string>
     <string name="pref_failed_to_sync">Erro ao sincronizar configurações</string>
     <string name="post_privacy_public">Público</string>
     <string name="post_privacy_unlisted">Não-listado</string>
diff --git a/app/src/main/res/values-sa/strings.xml b/app/src/main/res/values-sa/strings.xml
index 2ed165c1b..46beec06e 100644
--- a/app/src/main/res/values-sa/strings.xml
+++ b/app/src/main/res/values-sa/strings.xml
@@ -18,12 +18,12 @@
     <string name="error_authorization_denied">प्रमाणीकरणं निषिद्धम् ।</string>
     <string name="error_authorization_unknown">अज्ञातः प्रमाणीकरणदोषो जातः ।</string>
     <string name="error_no_web_browser_found">प्रयोजनार्थं जालसञ्चारकं न लब्धम् ।</string>
-    <string name="error_failed_app_registration">तया व्यक्त्या प्रमाणीकरणं विफलं जातम् ।</string>
+    <string name="error_failed_app_registration">तेन विशिष्टस्थलेन प्रमाणीकरणं विफलं जातम् ।</string>
     <string name="error_invalid_domain">अवैधानिकप्रदेशः प्रविष्टः</string>
     <string name="error_empty">नैतद्रिक्तं भवितुमर्हति ।</string>
-    <string name="error_network">दोषो जातः । कृपया भवतोऽन्तर्जालीयसम्पर्कं परीक्ष्य पुनश्च यतताम् !</string>
+    <string name="error_network">दोषो जातः । कृपया भवतोऽन्तर्जालीयसम्पर्कं परीक्ष्य पुनश्च यत्यताम् !</string>
     <string name="error_generic">दोषो जातः ।</string>
-    <string name="footer_empty">न किमप्यत्र । नवीकरणार्थमाकृष्यताम् !</string>
+    <string name="footer_empty">न किमप्यत्र । नवीकरणार्थमाकृष्यतामधः !</string>
     <string name="message_empty">न किमप्यत्र ।</string>
     <string name="status_content_show_less">संनिपत्यताम्</string>
     <string name="status_content_show_more">विस्तार्यताम्</string>
@@ -38,7 +38,7 @@
     <string name="title_scheduled_toot">कालबद्धदौत्यानि</string>
     <string name="title_saved_toot">लेखविकर्षाः</string>
     <string name="title_edit_profile">स्वीयव्यक्तिविवरणं सम्पाद्यताम्</string>
-    <string name="title_follow_requests">अनुसरणार्थमनुरोधः</string>
+    <string name="title_follow_requests">अनुसरणार्थमनुरोधाः</string>
     <string name="title_domain_mutes">प्रच्छन्नप्रदेशाः</string>
     <string name="title_blocks">निषिद्धोपभोक्तारः</string>
     <string name="title_mutes">मूकोपभोक्तारः</string>
@@ -50,7 +50,7 @@
     <string name="title_statuses_with_replies">सप्रत्युत्तरम्</string>
     <string name="title_statuses">प्रकटनानि</string>
     <string name="title_view_thread">दौत्यम्</string>
-    <string name="title_tab_preferences">सारण्यः</string>
+    <string name="title_tab_preferences">पीठिकाः</string>
     <string name="title_direct_messages">प्रत्यक्षसन्देशाः</string>
     <string name="title_public_federated">सङ्घीयाः</string>
     <string name="notification_follow_format">%s त्वामन्वसरत्</string>
@@ -112,7 +112,7 @@
     <string name="download_media">सामग्री अवारोप्यताम्</string>
     <string name="action_share_as">एवं विभाज्यताम् …</string>
     <string name="action_open_as">%s एवमुद्घाट्यताम्</string>
-    <string name="action_copy_link">जालस्थलमनुक्रियताम्</string>
+    <string name="action_copy_link">जालस्थलं प्रतिलिख्यताम्</string>
     <string name="download_image">अवारोप्यमाणम् %1$s</string>
     <string name="action_open_media_n">उद्घाट्यताम् #%d</string>
     <string name="title_links_dialog">जालस्थलानि</string>
@@ -120,7 +120,7 @@
     <string name="title_hashtags_dialog">प्रचलितवस्तूनि</string>
     <string name="action_open_faved_by">प्रियाणि दृश्यन्ताम्</string>
     <string name="action_open_reblogged_by">प्रकाशनानि दृश्यन्ताम्</string>
-    <string name="action_open_reblogger">प्रकाशनलेखकः उद्घट्यताम्</string>
+    <string name="action_open_reblogger">प्रकाशनलेखकः उद्घाट्यताम्</string>
     <string name="action_hashtags">प्रचलितवस्तूनि</string>
     <string name="action_mentions">उल्लेखाः</string>
     <string name="action_links">जालस्थलानि</string>
@@ -131,8 +131,8 @@
     <string name="action_content_warning">विषयप्रत्यादेशः</string>
     <string name="action_toggle_visibility">दौत्यसुदर्शता</string>
     <string name="action_access_scheduled_toot">कालबद्धदौत्यानि</string>
-    <string name="action_access_saved_toot">पाण्डुलेखविकर्षाः</string>
-    <string name="action_search">अन्वेष्यताम्</string>
+    <string name="action_access_saved_toot">लेखविकर्षाः</string>
+    <string name="action_search">अन्विष्यताम्</string>
     <string name="action_reject">अस्वीक्रियताम्</string>
     <string name="action_accept">स्वीक्रियताम्</string>
     <string name="action_undo">अपाक्रियताम्</string>
@@ -142,44 +142,44 @@
     <string name="action_open_drawer">पेटिकोद्घट्यताम्</string>
     <string name="action_hide_media">सामग्र्यः वार्यन्ताम्</string>
     <string name="action_mention">उल्लिख्यताम्</string>
-    <string name="action_unmute_conversation">सशब्द आलापः क्रीयताम्</string>
-    <string name="action_mute_conversation">तूष्णीमालापः क्रीयताम्</string>
+    <string name="action_unmute_conversation">सशब्द आलापः क्रियताम्</string>
+    <string name="action_mute_conversation">तूष्णीमालापः क्रियताम्</string>
     <string name="action_unmute_domain">%s सशब्दं क्रियताम्</string>
     <string name="action_mute_domain">%s निःशब्दं क्रियताम्</string>
     <string name="confirmation_unmuted">भोक्ता सशब्दः कृतः</string>
-    <string name="confirmation_unblocked">निषिद्धभोक्तोपकृतः</string>
+    <string name="confirmation_unblocked">निरवरोधः कृतः</string>
     <string name="confirmation_reported">प्रेषितम्!</string>
     <string name="login_connection">सम्पर्कः क्रियते…</string>
-    <string name="link_whats_an_instance">किं नाम विशिष्टवस्तु \?</string>
+    <string name="link_whats_an_instance">किं नाम विशिष्टस्थलम्\?</string>
     <string name="label_header">शीर्षः</string>
     <string name="label_avatar">अवतारः</string>
     <string name="label_quick_reply">प्रत्युत्तरम् …</string>
     <string name="search_no_results">न परिणामाः</string>
-    <string name="hint_search">अन्वेष्यताम्…</string>
+    <string name="hint_search">अन्विष्यताम्…</string>
     <string name="hint_note">विवरणम्</string>
     <string name="hint_display_name">नाम</string>
     <string name="hint_content_warning">विषयप्रत्यादेशः</string>
     <string name="hint_compose">किं वर्तमानमस्ति \?</string>
-    <string name="hint_domain">किं विशिष्टवस्तु \?</string>
+    <string name="hint_domain">किं विशिष्टस्थलम् \?</string>
     <string name="status_sent_long">सफलं प्रत्युत्तरप्रेषणम् ।</string>
     <string name="status_sent">प्रेषितम्!</string>
-    <string name="confirmation_domain_unmuted">%s विवृतः</string>
-    <string name="pref_title_notification_filters">सूच्यता मे यदा</string>
+    <string name="confirmation_domain_unmuted">%s अनावृतः</string>
+    <string name="pref_title_notification_filters">सूच्यतां मे यदा</string>
     <string name="pref_title_notification_alert_light">ज्योत्या सूच्यताम्</string>
     <string name="pref_title_notification_alert_vibrate">कम्पनेन सूच्यताम्</string>
     <string name="pref_title_notification_alert_sound">ध्वनिना सूच्यताम्</string>
     <string name="pref_title_notification_alerts">सतर्कताः</string>
     <string name="pref_title_notifications_enabled">सूचनाः</string>
     <string name="pref_title_edit_notification_settings">सूचनाः</string>
-    <string name="visibility_direct">प्रत्यक्षम् - केवलमुल्लेखितयोक्तृृभ्यः प्रकट्यताम्</string>
+    <string name="visibility_direct">प्रत्यक्षम् - केवलमुल्लिखितयोक्तृभ्यः प्रकट्यताम्</string>
     <string name="visibility_private">केवलमनुसर्तृृणाम् :- कृते प्रकट्यताम्</string>
-    <string name="visibility_unlisted">अनिर्दिष्टः- सार्वजनिकसमयतालिकायां मा प्रकट्यताम्</string>
-    <string name="visibility_public">सार्वजनिकः प्रकट्यतां सार्वजनिकसमयतालिकासु</string>
+    <string name="visibility_unlisted">अनिर्दिष्टः = सार्वजनिकसमयतालिकायां मा प्रकट्यताम्</string>
+    <string name="visibility_public">सार्वजनिकः‍‍‍‍= प्रकट्यतां सार्वजनिकसमयतालिकासु</string>
     <string name="dialog_mute_hide_notifications">सूचनाः छाद्यन्ताम्</string>
     <string name="dialog_mute_warning">निःशब्दं क्रियताम् @%s\?</string>
     <string name="dialog_block_warning">किल अवरुध्यताम् @%s\?</string>
     <string name="mute_domain_warning_dialog_ok">प्रदेशः छाद्यताम्</string>
-    <string name="mute_domain_warning">निश्चियेन सर्वमेव निषिद्धं भवेदेतस्य जनस्य %s \? कोऽपि विषयो न द्रष्टुं शक्यते तत्प्रदेशात् कस्यामपि समयतालिकायामुत वा ते सूचनापेटिकायाम् । भवदनुसर्तारः तस्मात्प्रदेशान्निष्क्रियनते ।</string>
+    <string name="mute_domain_warning">निश्चियेन सर्वमेव निषिद्धं भवेदेतस्य जनस्य %s \? कोऽपि विषयो न द्रष्टुं शक्यते तत्प्रदेशात् कस्यामपि समयतालिकायामुत वा ते सूचनापेटिकायाम् । भवदनुसर्तारः तस्मात्प्रदेशान्निष्क्रियन्ते ।</string>
     <string name="dialog_redraft_toot_warning">विनश्य पुनः लिख्यताम् \?</string>
     <string name="dialog_delete_toot_warning">दौत्यमेतन्नश्यताम्\?</string>
     <string name="dialog_unfollow_warning">अनुसरणं नश्यताम् \?</string>
@@ -193,7 +193,7 @@
 \nविशिष्टस्थलमित्युक्ते स्थलमेकं यत्र युष्माकं लेखाः आश्रिताः, किन्तु साफल्येनैवाऽन्यविशिष्टस्थलीयैः सह सम्पर्कयितुं शक्यते । 
 \n
 \nअधिकमत्र प्राप्यते <a href="https://joinmastodon.org">joinmastodon.org</a>. </string>
-    <string name="hint_search_people_list">येषामुसरणं करोषि तेष्वन्वेष्यताम्</string>
+    <string name="hint_search_people_list">येषामुसरणं करोषि तेष्वन्विष्यताम्</string>
     <string name="action_edit_list">सूचिः सम्पाद्यताम्</string>
     <string name="action_delete_list">सूचिर्नश्यताम्</string>
     <string name="action_rename_list">पुनः सूचिनामकरणं क्रियताम्</string>
@@ -203,12 +203,12 @@
     <string name="error_create_list">सूचिनिर्माणं कर्तुमशक्यम्</string>
     <string name="dialog_message_cancel_follow_request">अनुसरणानुरोधो नश्यताम् \?</string>
     <string name="title_list_timeline">सूचेः समयतालिका</string>
-    <string name="title_lists">आवल्यः</string>
-    <string name="action_lists">आवल्यः</string>
+    <string name="title_lists">सूचयः</string>
+    <string name="action_lists">सूचयः</string>
     <string name="add_account_description">नवमास्टोडोनलेखा युज्यताम्</string>
     <string name="add_account_name">नवलेखा युज्यताम्</string>
     <string name="filter_add_description">शोधनार्थं वाक्यांशः</string>
-    <string name="filter_dialog_whole_word_description">यदा शब्दो वा वाक्यांशश्चिह्नरहितो भवति, तर्हि तत्स्थाप्यते केवलं यदा पूर्णत्वेन शब्दसमानता वर्तते</string>
+    <string name="filter_dialog_whole_word_description">यदा शब्दो वा वाक्यांशश्चिह्नरहितो भवति, तर्हि विन्यासोऽयं स्थाप्यते केवलं यदा पूर्णत्वेन शब्दसमानता वर्तते</string>
     <string name="filter_dialog_whole_word">सर्वः शब्दः</string>
     <string name="filter_dialog_update_button">नवीक्रियताम्</string>
     <string name="filter_dialog_remove_button">नश्यताम्</string>
@@ -216,7 +216,7 @@
     <string name="filter_addition_dialog_title">शोधकं युज्यताम्</string>
     <string name="pref_title_thread_filter_keywords">आलापाः</string>
     <string name="pref_title_public_filter_keywords">सार्वजनिकतालिकाः</string>
-    <string name="load_more_placeholder_text">अधिमारोप्यताम्</string>
+    <string name="load_more_placeholder_text">अधिकमारोप्यताम्</string>
     <string name="replying_to">\@%s मित्रायोत्तरम्</string>
     <string name="title_media">सामग्र्यः</string>
     <string name="pref_title_alway_open_spoiler">सर्वदा विषयसतर्कतयाऽङ्कितं दौत्यं विस्तार्यताम्</string>
@@ -227,11 +227,11 @@
     <string name="abbreviated_hours_ago">%dh घ</string>
     <string name="abbreviated_years_ago">%dy वर्ष</string>
     <string name="abbreviated_days_ago">%dd दि</string>
-    <string name="abbreviated_in_seconds">%ds क्षणेभ्यः</string>
-    <string name="abbreviated_in_minutes">%dm निमेषेभ्यः</string>
-    <string name="abbreviated_in_hours">%dh घण्टाभ्यः</string>
-    <string name="abbreviated_in_days">%dd दिनेभ्यः</string>
-    <string name="abbreviated_in_years">%dy वर्षेभ्यः</string>
+    <string name="abbreviated_in_seconds">%ds क्ष</string>
+    <string name="abbreviated_in_minutes">%dm नि</string>
+    <string name="abbreviated_in_hours">%dh घ</string>
+    <string name="abbreviated_in_days">%dd दि</string>
+    <string name="abbreviated_in_years">%dy वर्ष</string>
     <string name="state_follow_requested">अनुसरणं निवेदितम्</string>
     <string name="status_media_video">चलचित्राणि</string>
     <string name="status_media_images">चित्राणि</string>
@@ -242,12 +242,11 @@
 \n https://github.com/tuskyapp/Tusky/issues</string>
     <string name="about_project_site">प्रकल्पस्य जालसूत्रम् :
 \n https://tusky.app</string>
-    <string name="about_tusky_license">"टस्कीत्यनावृतस्रोतो निःशुल्कतन्त्रांशः । GNU General Public License Version 3 इत्यनेनाऽनुज्ञापितः । अत्राऽनुज्ञापत्रं द्रष्टुं शक्यते :-  
-\nhttps://www.gnu.org/licenses/gpl-3.0.en.html"</string>
+    <string name="about_tusky_license">टस्कीत्यनावृतस्रोतो निःशुल्कतन्त्रांशः। GNU General Public License Version 3 इत्यनेनाऽनुज्ञापितः। अत्राऽनुज्ञापत्रं द्रष्टुं शक्यते:-https://www.gnu.org/licenses/gpl-3.0.en.html</string>
     <string name="about_powered_by_tusky">टस्कीत्यनेनाऽऽश्रितः</string>
     <string name="about_tusky_version">टस्की %s</string>
     <string name="about_title_activity">विज्ञप्तिः</string>
-    <string name="description_account_locked">कपाटितव्यक्तिगतलेखाः</string>
+    <string name="description_account_locked">कपाटितव्यक्तिविवरणलेखः</string>
     <string name="notification_title_summary">%d नवपरस्परक्रियाः</string>
     <string name="notification_summary_small">%1$s च %2$s च</string>
     <string name="notification_summary_medium">%1$s, %2$s, तथैव %3$s</string>
@@ -271,7 +270,7 @@
     <string name="status_text_size_small">सूक्ष्मः</string>
     <string name="status_text_size_smallest">सूक्ष्मतमः</string>
     <string name="pref_status_text_size">दौत्यस्य / स्थितेरक्षराकारः</string>
-    <string name="post_privacy_followers_only">केवलमुसर्तृृभ्यः</string>
+    <string name="post_privacy_followers_only">केवलमनुसर्तृभ्यः</string>
     <string name="post_privacy_unlisted">अनिर्दिष्टम्</string>
     <string name="post_privacy_public">सार्वजनिकम्</string>
     <string name="pref_main_nav_position_option_bottom">नितलम्</string>
@@ -286,31 +285,183 @@
     <string name="pref_title_http_proxy_enable">HTTP प्रतिनिधिसंयुतनं क्रियताम्</string>
     <string name="pref_title_http_proxy_settings">HTTP प्रतिनिधिः</string>
     <string name="pref_title_proxy_settings">प्रतिनिधिः</string>
-    <string name="pref_title_show_media_preview">सामग्रीणं पूर्वोद्घाटनमवारोप्यताम्</string>
+    <string name="pref_title_show_media_preview">सामग्रीणां पूर्वोद्घाटनमवारोप्यताम्</string>
     <string name="pref_title_show_replies">प्रत्युत्तराणि दृश्यन्ताम्</string>
     <string name="pref_title_show_boosts">प्रकाशनानि दृश्यन्ताम्</string>
     <string name="pref_title_status_tabs">पीठिकाः</string>
     <string name="pref_title_status_filter">समयतालिका-शोधनम्</string>
-    <string name="pref_title_gradient_for_media">छादितसामग्रीभ्यो बहुवर्णयुतचित्रं दृशयतु</string>
+    <string name="pref_title_gradient_for_media">छादितसामग्रीभ्यो बहुवर्णयुतचित्रं दर्शयतु</string>
     <string name="pref_title_animate_gif_avatars">सञ्जीवितावतारः क्रियताम्</string>
     <string name="pref_title_bot_overlay">स्वचालितयन्त्रेभ्यः सूचको दृश्यताम्</string>
     <string name="pref_title_language">भाषा</string>
-    <string name="pref_title_hide_follow_button">सारणक्रमे संस्कारगण्डः छाद्यताम्</string>
-    <string name="pref_title_custom_tabs">क्रोमस्वीयानुकूलपीठिका प्रयुज्यताम्</string>
+    <string name="pref_title_hide_follow_button">सारणक्रमे लेखनगण्डः छाद्यताम्</string>
+    <string name="pref_title_custom_tabs">क्रोमस्वीयानुकूलपीठिकाः प्रयुज्यन्ताम्</string>
     <string name="pref_title_browser_settings">जालसञ्चारकम्</string>
     <string name="app_theme_system">प्रणाल्याः परिकल्पना प्रयुज्यताम्</string>
-    <string name="app_theme_auto">सूर्यास्ते स्वचालितम्</string>
+    <string name="app_theme_auto">सूर्यास्तसमये स्वचालितम्</string>
     <string name="app_theme_black">कृष्णः</string>
     <string name="app_theme_light">ज्योतिपूर्णः</string>
     <string name="app_them_dark">अन्धकारः</string>
     <string name="pref_title_timeline_filters">शोधकम्</string>
-    <string name="pref_title_timelines">समयतालिका</string>
+    <string name="pref_title_timelines">समयतालिकाः</string>
     <string name="pref_title_app_theme">अनुप्रयोगप्रबन्धाः</string>
-    <string name="pref_title_appearance_settings">रूपम्</string>
+    <string name="pref_title_appearance_settings">स्वरूपम्</string>
     <string name="pref_title_notification_filter_poll">मतदानं समाप्तम्</string>
     <string name="pref_title_notification_filter_favourites">मम प्रकटनानि प्रियाणि</string>
     <string name="pref_title_notification_filter_reblogs">मम प्रकटनानि प्रकाशितानि</string>
     <string name="pref_title_notification_filter_follow_requests">अनुसरणार्थं निवेदितम्</string>
     <string name="pref_title_notification_filter_follows">अनुसृतम्</string>
     <string name="pref_title_notification_filter_mentions">उल्लिखिताः</string>
+    <string name="download_fonts">प्राक्तु भावचिह्नसमूहोऽयमवारोप्यः</string>
+    <string name="system_default">प्रणाल्यां पूर्वनिविष्टम्</string>
+    <string name="emoji_style">भावचिह्नशैली</string>
+    <string name="copy_to_clipboard_success">अंशफलकेऽनुसृतम्</string>
+    <string name="error_no_custom_emojis">भवदीयं विशिष्टस्थलं %s स्वीयानुकूलभावचिह्नरहितं वर्तते</string>
+    <string name="action_compose_shortcut">लिख्यताम्</string>
+    <string name="send_toot_notification_saved_content">दौत्यप्रतिलिपिस्तत्र विकर्षेसु रक्षिता</string>
+    <string name="send_toot_notification_cancel_title">प्रेषणं निराकृतम्</string>
+    <string name="send_toot_notification_channel_name">प्रेष्यमाणानि</string>
+    <string name="send_toot_notification_error_title">दौत्यप्रेषणे दोषः</string>
+    <string name="send_toot_notification_title">दौत्यं प्रेष्यमाणम्…</string>
+    <string name="compose_save_draft">रक्षणीयम् \?</string>
+    <string name="lock_account_label_description">स्वयमेवाऽनुसर्तॄणां कृतेऽनुमतिर्दातव्या</string>
+    <string name="lock_account_label">लेखा अवरुध्यताम्</string>
+    <string name="action_remove">नश्यताम्</string>
+    <string name="action_set_caption">शीर्षकवाक्यं लिख्यताम्</string>
+    <string name="hint_describe_for_visually_impaired">दृष्ट्यां येषां समस्याऽस्ति तेषांं कृते विवरणम्
+\n(%d परिमिता न्यूनाक्षरसङ्ख्या)</string>
+    <string name="error_failed_set_caption">शीर्षकवाक्यं लेखितुमशक्यम्</string>
+    <string name="compose_active_account_description">%1$s लेखया प्रकटनं क्रियते</string>
+    <string name="action_remove_from_list">सूच्याः लेखा नश्यताम्</string>
+    <string name="action_add_to_list">सूच्यां लेखा स्थाप्यताम्</string>
+    <string name="profile_badge_bot_text">यन्त्रम्</string>
+    <string name="download_failed">अवारोपणे दोषः</string>
+    <string name="caption_notoemoji">गुगलस्य वर्तमानभावचिह्नसमूहः</string>
+    <string name="caption_twemoji">मास्टोडोनस्य पूर्वनिविष्टभावचिह्नसमूहः</string>
+    <string name="caption_blobmoji">ब्लाबभावचिह्नानि एन्ड्रोइड४.४तः ७.१पर्यन्तं प्रसिद्धानि</string>
+    <string name="caption_systememoji">तव यन्त्रस्य पूर्वस्थापितभावचिह्नसमूहः</string>
+    <string name="restart">पुनः प्रारभ्यताम्</string>
+    <string name="later">पश्चात्</string>
+    <string name="restart_emoji">पुनश्च टस्कीप्रारम्भोऽपेक्षितो वर्तते परिवर्तनानुसरेण चलितुम्</string>
+    <string name="restart_required">अनुप्रयोगप्रारम्भः आवश्यकः</string>
+    <string name="action_open_toot">दौत्यमुद्घाट्यताम्</string>
+    <string name="expand_collapse_all_statuses">विस्तार्यन्तां नश्यन्तां वा स्थतयः</string>
+    <string name="performing_lookup_title">अन्वेषणं भवद्वर्तते…</string>
+    <string name="pin_action">कीलयतु</string>
+    <string name="unpin_action">कीलनं नश्यताम्</string>
+    <string name="label_remote_account">अधो लिखितवार्तोपभोक्तुः व्यक्तित्वविवरणमांशिकरूपेण प्रतिबिम्बयेत् । व्यक्तित्वविवरणमुद्घाट्यतां कश्मिंश्चिदपि जालसञ्चारके ।</string>
+    <string name="pref_title_absolute_time">मूलसमयो युज्यताम्</string>
+    <string name="profile_metadata_content_label">विषयः</string>
+    <string name="profile_metadata_label_label">लक्षः</string>
+    <string name="profile_metadata_add">दत्तं युज्यताम्</string>
+    <string name="profile_metadata_label">व्यक्तिगतविवरणदत्तांशः</string>
+    <string name="license_cc_by_sa_4">CC-BY-SA ४.०</string>
+    <string name="license_cc_by_4">CC-BY ४.०</string>
+    <string name="license_apache_2">Apache Licence (अनुलिख्यताम्) इत्यनुज्ञप्तिपत्रेणाऽनुज्ञापितः</string>
+    <string name="license_description">टस्कीत्यस्मिन्निम्नलिखितेभ्योऽनावृतस्रोतःप्रकल्पेभ्यो विध्यादेशाः सन्ति:</string>
+    <string name="unreblog_private">प्रकाशनंं नश्यताम्</string>
+    <string name="reblog_private">मूलदर्शकेभ्यः प्रकाश्यताम्</string>
+    <string name="account_moved_description">%1$s मित्रमत्र प्रस्थितम्:</string>
+    <string name="no_saved_status">न लेखविकर्षास्ते सन्ति ।</string>
+    <string name="conversation_1_recipients">%1$s</string>
+    <string name="pref_title_hide_top_toolbar">उच्चैःस्थितायाः साधनशालकायाः शीर्षकं छाद्यताम्</string>
+    <string name="pref_title_confirm_reblogs">प्रकाशनात् प्राक् पुष्टिसंवादमञ्जूषा दर्शनीया</string>
+    <string name="pref_title_show_cards_in_timelines">जालस्थानप्रदर्शनं समयतालिकायां दर्शयतु</string>
+    <string name="warning_scheduling_interval">मास्टोडोने पञ्चनिमेषपरिमितो न्यूनतमः कालबद्धसमयः ।</string>
+    <string name="no_scheduled_status">न ते कालबद्धदौत्यानि सन्ति ।</string>
+    <string name="post_lookup_error_format">प्रकटनान्वेषणे विफलता</string>
+    <string name="edit_poll">सम्पाद्यताम्</string>
+    <string name="poll_new_choice_hint">मतम् %d</string>
+    <string name="poll_allow_multiple_choices">बहूनि मतानि</string>
+    <string name="add_poll_choice">अपरं मतं युज्यताम्</string>
+    <string name="poll_duration_7_days">७ दिनानि</string>
+    <string name="poll_duration_3_days">३ दिनानि</string>
+    <string name="poll_duration_1_day">१ दिनम्</string>
+    <string name="poll_duration_6_hours">६ घण्टाः</string>
+    <string name="poll_duration_1_hour">१ घण्टा</string>
+    <string name="poll_duration_30_min">३० निमेषाः</string>
+    <string name="poll_duration_5_min">५ निमेषाः</string>
+    <string name="create_poll_title">मतपेटिका</string>
+    <string name="pref_title_enable_swipe_for_tabs">सारणहावभावस्य संयुतनं पीठिकापरिवर्तनार्थं कार्यम्</string>
+    <string name="pref_title_show_notifications_filter">सूचनाशोधकं दृश्यताम्</string>
+    <string name="failed_search">अन्वेषणे विफलता जाता</string>
+    <string name="title_accounts">व्यक्तित्वविवरणलेखाः</string>
+    <string name="report_description_remote_instance">अन्यजालवितारकादियं व्यक्तित्वविवरणलेखा । आवेदनस्य रक्षितप्रतिलिपिरपि प्रेष्यतां वा \?</string>
+    <string name="report_description_1">आवेदनमिदं जालवितारकाय प्रेष्यते । स्वीयविवरणमस्मिन् विषयेऽधो लेखितुं शक्नोषि-:</string>
+    <string name="failed_fetch_statuses">दौत्यानि गृहीतुं विफलता</string>
+    <string name="failed_report">आवेदनप्रेषणे विफलता</string>
+    <string name="report_remote_instance">अस्मै पुरस्क्रियताम् %s</string>
+    <string name="hint_additional_info">अन्याः टिप्पण्यः</string>
+    <string name="report_sent_success">साफल्येनाऽऽवेदनं दत्तमस्य @%s</string>
+    <string name="button_done">कृतम्</string>
+    <string name="button_back">पूर्वम्</string>
+    <string name="button_continue">निरन्तरम्</string>
+    <plurals name="poll_timespan_seconds">
+        <item quantity="one">%d क्षणः</item>
+        <item quantity="other">%d क्षणौ</item>
+    </plurals>
+    <plurals name="poll_timespan_minutes">
+        <item quantity="one">%d निमेषः</item>
+        <item quantity="other">%d निमेषौ</item>
+    </plurals>
+    <plurals name="poll_timespan_hours">
+        <item quantity="one">%d घण्टा</item>
+        <item quantity="other">%d घण्टे</item>
+    </plurals>
+    <plurals name="poll_timespan_days">
+        <item quantity="one">%d दिनम्</item>
+        <item quantity="other">%d दिने</item>
+    </plurals>
+    <string name="poll_ended_created">त्वया रचितमेकं मतदानं समाप्तम्</string>
+    <string name="poll_ended_voted">मतदानमेकं समाप्तं यस्मिन् त्वयाऽपि स्वीयमतं दत्तम्</string>
+    <string name="poll_vote">मतम्</string>
+    <string name="poll_info_closed">पिहितम्</string>
+    <string name="poll_info_time_absolute">समापनं यावत् %s</string>
+    <string name="poll_info_time_relative">%s शेषम्</string>
+    <plurals name="poll_info_people">
+        <item quantity="one">%s जनः</item>
+        <item quantity="other">%s जनौ</item>
+    </plurals>
+    <plurals name="poll_info_votes">
+        <item quantity="one">%s मतम्</item>
+        <item quantity="other">%s मते</item>
+    </plurals>
+    <string name="poll_info_format"> <!-- 15 मतानि • 1 शेषघटिकाः --> %1$s • %2$s</string>
+    <string name="compose_preview_image_description">चित्राणां कृते प्रवृत्तिः %s</string>
+    <string name="notification_clear_text">किं नूनमेव सर्वाः सूचनाः स्थायित्वेन मार्जनीयाः \?</string>
+    <string name="compose_shortcut_short_label">लिख्यताम्</string>
+    <string name="compose_shortcut_long_label">दौत्यं लिख्यताम्</string>
+    <string name="filter_apply">स्थाप्यताम्</string>
+    <string name="notifications_apply_filter">शुध्यताम्</string>
+    <string name="notifications_clear">मार्ज्यन्ताम्</string>
+    <string name="list">सूचिः</string>
+    <string name="select_list_title">सूचिरवचीयताम्</string>
+    <string name="hashtags">प्रचलितानि</string>
+    <string name="edit_hashtag_hint"># चिह्नं विना प्रचलितम्</string>
+    <string name="add_hashtag_title">प्रचलितं युज्यताम्</string>
+    <string name="hint_list_name">सूचिनाम</string>
+    <string name="description_poll">मतदाने मतानि- %1$s, %2$s, %3$s, %4$s; %5$s</string>
+    <string name="description_visiblity_direct">प्रत्यक्षम्</string>
+    <string name="description_visiblity_private">अनुसर्तारः</string>
+    <string name="description_visiblity_unlisted">अनिर्दिष्टम्</string>
+    <string name="description_visiblity_public">सार्वजनिकम्</string>
+    <string name="description_status_bookmarked">पुटचिह्नं कृतम्</string>
+    <string name="description_status_favourited">प्रीतिर्दत्ता</string>
+    <string name="description_status_reblogged">पुनर्लिखितम्</string>
+    <string name="description_status_media_no_description_placeholder">विवरणं नास्ति</string>
+    <string name="description_status_cw">विषयपूर्वसतर्कता: %s</string>
+    <string name="description_status_media">सामग्र्यः %s</string>
+    <string name="max_tab_number_reached">अधिकतमपीठिकासङ्ख्या %1$d भूता</string>
+    <string name="conversation_more_recipients">%1$s, %2$s तथा %3$d अन्येऽपि</string>
+    <string name="conversation_2_recipients">%1$s तथैव %2$s</string>
+    <string name="title_favourited_by">निम्नमित्रस्य प्रीतिः</string>
+    <string name="title_reblogged_by">निम्नमित्रेण प्रकाशितम्</string>
+    <plurals name="reblogs">
+        <item quantity="one"><b>%s</b> प्रकाशनम्</item>
+        <item quantity="other"><b>%s</b> प्रकाशने</item>
+    </plurals>
+    <plurals name="favs">
+        <item quantity="one"><b>%1$s</b> प्रियम्</item>
+        <item quantity="other"><b>%1$s</b> प्रिये</item>
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/app/src/test/java/com/keylesspalace/tusky/fragment/TimelineRepositoryTest.kt b/app/src/test/java/com/keylesspalace/tusky/fragment/TimelineRepositoryTest.kt
index 1200c1eb2..1de9820a1 100644
--- a/app/src/test/java/com/keylesspalace/tusky/fragment/TimelineRepositoryTest.kt
+++ b/app/src/test/java/com/keylesspalace/tusky/fragment/TimelineRepositoryTest.kt
@@ -1,10 +1,8 @@
 package com.keylesspalace.tusky.fragment
 
 import android.text.SpannableString
-import android.text.SpannedString
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.gson.Gson
-import com.keylesspalace.tusky.SpanUtilsTest
 import com.keylesspalace.tusky.db.AccountEntity
 import com.keylesspalace.tusky.db.AccountManager
 import com.keylesspalace.tusky.db.TimelineDao
@@ -26,8 +24,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.ArgumentMatchers.any
-import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.ArgumentMatchers.*
 import org.mockito.Mock
 import org.mockito.MockitoAnnotations
 import org.robolectric.annotation.Config
@@ -97,6 +94,7 @@ class TimelineRepositoryTest {
                     null
             )
         }
+        verify(timelineDao).cleanup(anyLong())
         verifyNoMoreInteractions(timelineDao)
     }
 
@@ -131,6 +129,7 @@ class TimelineRepositoryTest {
         }
         verify(timelineDao).removeAllPlaceholdersBetween(account.id, response.first().id,
                 response.last().id)
+        verify(timelineDao).cleanup(anyLong())
         verifyNoMoreInteractions(timelineDao)
     }
 
@@ -160,6 +159,7 @@ class TimelineRepositoryTest {
             )
         }
         verify(timelineDao).insertStatusIfNotThere(placeholder.toEntity(account.id))
+        verify(timelineDao).cleanup(anyLong())
         verifyNoMoreInteractions(timelineDao)
     }
 
@@ -203,6 +203,7 @@ class TimelineRepositoryTest {
         }
         verify(timelineDao).removeAllPlaceholdersBetween(account.id, response.first().id,
                 response.last().id)
+        verify(timelineDao).cleanup(anyLong())
         verifyNoMoreInteractions(timelineDao)
     }
 
@@ -249,6 +250,7 @@ class TimelineRepositoryTest {
         verify(timelineDao).removeAllPlaceholdersBetween(account.id, response.first().id,
                 response.last().id)
         verify(timelineDao).insertStatusIfNotThere(placeholder.toEntity(account.id))
+        verify(timelineDao).cleanup(anyLong())
         verifyNoMoreInteractions(timelineDao)
     }
 
diff --git a/fastlane/metadata/android/sa/changelogs/72.txt b/fastlane/metadata/android/sa/changelogs/72.txt
new file mode 100644
index 000000000..852fb2e2f
--- /dev/null
+++ b/fastlane/metadata/android/sa/changelogs/72.txt
@@ -0,0 +1 @@
+टस्की v११।०