From 523349e10873e3bdea031eeb7598cb35bed45dc3 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Wed, 29 Jan 2020 19:15:53 +0100
Subject: [PATCH 01/12] fix crash when closing ComposeActivity (#1651)

---
 .../tusky/components/compose/ComposeViewModel.kt            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
index 0e71596f..f95042a7 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
@@ -58,7 +58,7 @@ class ComposeViewModel
     private var replyingStatusContent: String? = null
     internal var startingText: String? = null
     private var savedTootUid: Int = 0
-    private var startingContentWarning: String? = null
+    private var startingContentWarning: String = ""
     private var inReplyToId: String? = null
     private var startingVisibility: Status.Visibility = Status.Visibility.UNKNOWN
 
@@ -191,8 +191,8 @@ class ComposeViewModel
 
         val contentWarningChanged = showContentWarning.value!!
                 && !contentWarning.isNullOrEmpty()
-                && !startingContentWarning!!.startsWith(contentWarning.toString())
-        val mediaChanged = media.value!!.isNotEmpty()
+                && !startingContentWarning.startsWith(contentWarning.toString())
+        val mediaChanged = !media.value.isNullOrEmpty()
         val pollChanged = poll.value != null
 
         return textChanged || contentWarningChanged || mediaChanged || pollChanged

From 08c979ca23f49f5ad14ef7d33bc480fe64b7d96c Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Wed, 29 Jan 2020 19:16:12 +0100
Subject: [PATCH 02/12] fix reveal button not updating in ViewThreadActivity
 (#1652)

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

diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
index 9dd9c86f..08139167 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
@@ -208,6 +208,7 @@ public final class ViewThreadFragment extends SFragment implements
             statuses.setPairedItem(i, newViewData);
         }
         adapter.setStatuses(statuses.getPairedCopy());
+        updateRevealIcon();
     }
 
     private boolean allExpanded() {

From 16fab51c92defb2bcfa58a3a30ff4d67f7a98105 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Wed, 29 Jan 2020 19:17:11 +0100
Subject: [PATCH 03/12] fix FragmentAdapter returning null fragments when
 activity was recreated (#1647)

* fix FragmentAdapter returning null fragments when activity was recreated

* remove unused import

* make activity in CustomFragmentStateAdapter private
---
 .../tusky/pager/AccountPagerAdapter.kt        | 16 ++---------
 .../tusky/pager/MainPagerAdapter.kt           | 11 ++------
 .../tusky/util/CustomFragmentStateAdapter.kt  | 28 +++++++++++++++++++
 3 files changed, 34 insertions(+), 21 deletions(-)
 create mode 100644 app/src/main/java/com/keylesspalace/tusky/util/CustomFragmentStateAdapter.kt

diff --git a/app/src/main/java/com/keylesspalace/tusky/pager/AccountPagerAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/pager/AccountPagerAdapter.kt
index b1e42354..f8c026e0 100644
--- a/app/src/main/java/com/keylesspalace/tusky/pager/AccountPagerAdapter.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/pager/AccountPagerAdapter.kt
@@ -21,33 +21,23 @@ import com.keylesspalace.tusky.fragment.AccountMediaFragment
 import com.keylesspalace.tusky.fragment.TimelineFragment
 import com.keylesspalace.tusky.interfaces.RefreshableFragment
 
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import java.lang.ref.WeakReference
+import com.keylesspalace.tusky.util.CustomFragmentStateAdapter
 
 class AccountPagerAdapter(
         activity: FragmentActivity,
         private val accountId: String
-) : FragmentStateAdapter(activity) {
-
-    private val fragments = MutableList<WeakReference<Fragment>?>(TAB_COUNT) { null }
+) : CustomFragmentStateAdapter(activity) {
 
     override fun getItemCount() = TAB_COUNT
 
     override fun createFragment(position: Int): Fragment {
-        val fragment: Fragment = when (position) {
+        return when (position) {
             0 -> TimelineFragment.newInstance(TimelineFragment.Kind.USER, accountId, false)
             1 -> TimelineFragment.newInstance(TimelineFragment.Kind.USER_WITH_REPLIES, accountId, false)
             2 -> TimelineFragment.newInstance(TimelineFragment.Kind.USER_PINNED, accountId, false)
             3 -> AccountMediaFragment.newInstance(accountId, false)
             else -> throw AssertionError("Page $position is out of AccountPagerAdapter bounds")
         }
-
-        fragments[position] = WeakReference(fragment)
-        return fragment
-    }
-
-    fun getFragment(position: Int): Fragment? {
-        return fragments[position]?.get()
     }
 
     fun refreshContent() {
diff --git a/app/src/main/java/com/keylesspalace/tusky/pager/MainPagerAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/pager/MainPagerAdapter.kt
index 58728340..1e102941 100644
--- a/app/src/main/java/com/keylesspalace/tusky/pager/MainPagerAdapter.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/pager/MainPagerAdapter.kt
@@ -17,21 +17,16 @@ package com.keylesspalace.tusky.pager
 
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
-import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.keylesspalace.tusky.TabData
-import java.lang.ref.WeakReference
+import com.keylesspalace.tusky.util.CustomFragmentStateAdapter
 
-class MainPagerAdapter(val tabs: List<TabData>, activity: FragmentActivity) : FragmentStateAdapter(activity) {
-    private val fragments = MutableList<WeakReference<Fragment>?>(tabs.size) { null }
+class MainPagerAdapter(val tabs: List<TabData>, activity: FragmentActivity) : CustomFragmentStateAdapter(activity) {
 
     override fun createFragment(position: Int): Fragment {
         val tab = tabs[position]
-        val fragment = tab.fragment(tab.arguments)
-        fragments[position] = WeakReference(fragment)
-        return fragment
+        return tab.fragment(tab.arguments)
     }
 
     override fun getItemCount() = tabs.size
 
-    fun getFragment(position: Int): Fragment? = fragments[position]?.get()
 }
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/CustomFragmentStateAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/util/CustomFragmentStateAdapter.kt
new file mode 100644
index 00000000..bda20614
--- /dev/null
+++ b/app/src/main/java/com/keylesspalace/tusky/util/CustomFragmentStateAdapter.kt
@@ -0,0 +1,28 @@
+/* Copyright 2019 Tusky Contributors
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.util
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.viewpager2.adapter.FragmentStateAdapter
+
+abstract class CustomFragmentStateAdapter(
+        private val activity: FragmentActivity
+): FragmentStateAdapter(activity) {
+
+    fun getFragment(position: Int): Fragment?
+            = activity.supportFragmentManager.findFragmentByTag("f"  + getItemId(position))
+}

From 3ea314ea934789a5ee99d885772b27957dd922c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= <sv1@fellsnet.is>
Date: Wed, 29 Jan 2020 18:15:58 +0000
Subject: [PATCH 04/12] Translated using Weblate (Icelandic)

Currently translated at 100.0% (408 of 408 strings)

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

Added translation using Weblate (Icelandic)
---
 app/src/main/res/values-is/strings.xml | 510 +++++++++++++++++++++++++
 1 file changed, 510 insertions(+)
 create mode 100644 app/src/main/res/values-is/strings.xml

diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
new file mode 100644
index 00000000..b4b7a95b
--- /dev/null
+++ b/app/src/main/res/values-is/strings.xml
@@ -0,0 +1,510 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="action_login">Skrá inn með Mastodon</string>
+    <string name="link_whats_an_instance">Hvað er tilvik\?</string>
+
+    <string name="title_favourites">Eftirlæti</string>
+    <string name="title_saved_toot">Drög</string>
+    <string name="action_logout">Skrá út</string>
+    <string name="action_view_preferences">Kjörstillingar</string>
+    <string name="action_view_account_preferences">Eiginleikar tengingar</string>
+    <string name="action_edit_profile">Breyta notandasniði</string>
+    <string name="action_search">Leita</string>
+    <string name="about_title_activity">Um hugbúnaðinn</string>
+    <string name="action_lists">Listar</string>
+    <string name="title_lists">Listar</string>
+    <string name="error_generic">Villa kom upp.</string>
+    <string name="error_network">Villa í netkerfi: Athugaðu nettenginguna þína og prófaðu svo aftur!</string>
+    <string name="error_empty">Þetta má ekki vera tómt.</string>
+    <string name="error_invalid_domain">Ógilt lén sett inn</string>
+    <string name="error_failed_app_registration">Mistókst að auðkenna gagnvart þessu tilviki.</string>
+    <string name="error_no_web_browser_found">Gat ekki fundið neinn vafra til að nota.</string>
+    <string name="error_authorization_unknown">Óskilgreind auðkenningarvilla kom upp.</string>
+    <string name="error_authorization_denied">Heimild var hafnað.</string>
+    <string name="error_retrieving_oauth_token">Mistókst að fá innskráningarteikn.</string>
+    <string name="error_compose_character_limit">Stöðufærslan er of löng!</string>
+    <string name="error_image_upload_size">Skráin verður að vera minni en 8MB.</string>
+    <string name="error_video_upload_size">Myndskeiðasskrár verða að vera minni en 40MB.</string>
+    <string name="error_media_upload_type">Þessa tegund skrár er ekki hægt að senda inn.</string>
+    <string name="error_media_upload_opening">Ekki var hægt að opna skrána.</string>
+    <string name="error_media_upload_permission">Krafist er heimilda til að lesa gögn.</string>
+    <string name="error_media_download_permission">Krafist er heimilda til að geyma gögn.</string>
+    <string name="error_media_upload_image_or_video">Ekki er hægt að hengja bæði myndir og myndskeið við sömu stöðufærslu.</string>
+    <string name="error_media_upload_sending">Sendingin mistókst.</string>
+    <string name="error_sender_account_gone">Villa við að senda tíst.</string>
+
+    <string name="title_home">Heim</string>
+    <string name="title_notifications">Tilkynningar</string>
+    <string name="title_public_local">Staðvært</string>
+    <string name="title_public_federated">Sameiginlegt</string>
+    <string name="title_direct_messages">Bein skilaboð</string>
+    <string name="title_tab_preferences">Flipar</string>
+    <string name="title_view_thread">Tíst</string>
+    <string name="title_statuses">Færslur</string>
+    <string name="title_statuses_with_replies">Með svörum</string>
+    <string name="title_statuses_pinned">Fest</string>
+    <string name="title_follows">Fylgist með</string>
+    <string name="title_followers">Fylgjendur</string>
+    <string name="title_bookmarks">Bókamerki</string>
+    <string name="title_mutes">Þaggaðir notendur</string>
+    <string name="title_blocks">Útilokaðir notendur</string>
+    <string name="title_domain_mutes">Falin lén</string>
+    <string name="title_follow_requests">Fylgjendabeiðnir</string>
+    <string name="title_edit_profile">Breyta notandasniðinu þínu</string>
+    <string name="title_scheduled_toot">Áætluð tíst</string>
+    <string name="title_licenses">Notkunarleyfi</string>
+
+    <string name="status_username_format">\@%s</string>
+    <string name="status_boosted_format">%s endurbirti</string>
+    <string name="status_sensitive_media_title">Viðkvæmt efni</string>
+    <string name="status_media_hidden_title">Myndefni er falið</string>
+    <string name="status_sensitive_media_directions">Ýttu til að skoða</string>
+    <string name="status_content_warning_show_more">Sýna meira</string>
+    <string name="status_content_warning_show_less">Sýna minna</string>
+    <string name="status_content_show_more">Fletta út</string>
+    <string name="status_content_show_less">Fella saman</string>
+
+    <string name="message_empty">Ekkert hér.</string>
+    <string name="footer_empty">Ekkert hér. Togaðu niður til að endurhlaða!</string>
+
+    <string name="notification_reblog_format">%s endurbirti tístið þitt</string>
+    <string name="notification_favourite_format">%s setti tíst frá þér í eftirlæti</string>
+    <string name="notification_follow_format">%s fylgist núna með þér</string>
+
+    <string name="report_username_format">Kæra @%s</string>
+    <string name="report_comment_hint">Aðrar athugasemdir\?</string>
+
+    <string name="action_quick_reply">Snöggt svar</string>
+    <string name="action_reply">Svara</string>
+    <string name="action_reblog">Endurbirta</string>
+    <string name="action_unreblog">Fjarlægja endurbirtingu</string>
+    <string name="action_favourite">Eftirlæti</string>
+    <string name="action_bookmark">Bókamerki</string>
+    <string name="action_unfavourite">Fjarlægja eftirlæti</string>
+    <string name="action_more">Meira</string>
+    <string name="action_compose">Semja skilaboð</string>
+    <string name="action_logout_confirm">Ertu viss um að þú viljir skrá þig út af notandaaðgangnum %1$s\?</string>
+    <string name="action_follow">Fylgja</string>
+    <string name="action_unfollow">Hætta að fylgjast með</string>
+    <string name="action_block">Útiloka</string>
+    <string name="action_unblock">Aflétta útilokun</string>
+    <string name="action_hide_reblogs">Fela endurbirtingar</string>
+    <string name="action_show_reblogs">Sýna endurbirtingar</string>
+    <string name="action_report">Tilkynna</string>
+    <string name="action_edit">Breyta</string>
+    <string name="action_delete">Eyða</string>
+    <string name="action_delete_and_redraft">Eyða og endurvinna drög</string>
+    <string name="action_send">TÍST</string>
+    <string name="action_send_public">TÍST!</string>
+    <string name="action_retry">Reyna aftur</string>
+    <string name="action_close">Loka</string>
+    <string name="action_view_profile">Notandasnið</string>
+    <string name="action_view_favourites">Eftirlæti</string>
+    <string name="action_view_bookmarks">Bókamerki</string>
+    <string name="action_view_mutes">Þaggaðir notendur</string>
+    <string name="action_view_blocks">Útilokaðir notendur</string>
+    <string name="action_view_domain_mutes">Falin lén</string>
+    <string name="action_view_follow_requests">Fylgjendabeiðnir</string>
+    <string name="action_view_media">Myndefni</string>
+    <string name="action_open_in_web">Opna í vafra</string>
+    <string name="action_add_media">Bæta við myndefni</string>
+    <string name="action_add_poll">Bæta við könnun</string>
+    <string name="action_photo_take">Taka ljósmynd</string>
+    <string name="action_share">Deila</string>
+    <string name="action_mute">Þagga niður</string>
+    <string name="action_unmute">Ekki þagga</string>
+    <string name="action_mute_domain">Þagga niður í %s</string>
+    <string name="action_mention">Tilvísun</string>
+    <string name="action_hide_media">Fela myndefni</string>
+    <string name="action_open_drawer">Opna sleða</string>
+    <string name="action_save">Vista</string>
+    <string name="action_edit_own_profile">Breyta</string>
+    <string name="action_undo">Afturkalla</string>
+    <string name="action_accept">Samþykkja</string>
+    <string name="action_reject">Hafna</string>
+    <string name="action_access_saved_toot">Drög</string>
+    <string name="action_access_scheduled_toot">Áætluð tíst</string>
+    <string name="action_toggle_visibility">Sýnileiki tísts</string>
+    <string name="action_content_warning">Aðvörun vegna efnis</string>
+    <string name="action_emoji_keyboard">Lyklaborð með tjáningartáknum</string>
+    <string name="action_schedule_toot">Tímasetja tíst</string>
+    <string name="action_reset_schedule">Frumstilla</string>
+    <string name="action_add_tab">Bæta við flipa</string>
+    <string name="action_links">Tenglar</string>
+    <string name="action_mentions">Tilvísanir</string>
+    <string name="action_hashtags">Myllumerki</string>
+    <string name="action_open_reblogger">Opna höfund endurbirtingar</string>
+    <string name="action_open_reblogged_by">Sýna endurbirtingar</string>
+    <string name="action_open_faved_by">Birta eftirlæti</string>
+
+    <string name="title_hashtags_dialog">Myllumerki</string>
+    <string name="title_mentions_dialog">Tilvísanir</string>
+    <string name="title_links_dialog">Tenglar</string>
+    <string name="action_open_media_n">Opna myndefni #%d</string>
+
+    <string name="download_image">Sæki %1$s</string>
+
+    <string name="action_copy_link">Afrita tengilinn</string>
+    <string name="action_open_as">Opna sem %s</string>
+    <string name="action_share_as">Deila sem …</string>
+    <string name="download_media">Sækja myndefni</string>
+    <string name="downloading_media">Næ í myndefni</string>
+
+    <string name="send_status_link_to">Deila slóð á tíst til…</string>
+    <string name="send_status_content_to">Deila tísti með…</string>
+    <string name="send_media_to">Deila myndefni með…</string>
+
+    <string name="confirmation_reported">Sent!</string>
+    <string name="confirmation_unblocked">Hætt að útiloka notanda</string>
+    <string name="confirmation_unmuted">Hætt að þagga niður í notanda</string>
+    <string name="confirmation_domain_unmuted">Hætt að fela %s</string>
+
+    <string name="status_sent">Sent!</string>
+    <string name="status_sent_long">Það tókst að senda svarið.</string>
+
+    <string name="hint_domain">Hvaða tilvik\?</string>
+    <string name="hint_compose">Hvað er í gangi hérna\?</string>
+    <string name="hint_content_warning">Aðvörun vegna efnis</string>
+    <string name="hint_display_name">Birtingarnafn</string>
+    <string name="hint_note">Æviágrip</string>
+    <string name="hint_search">Leita…</string>
+
+    <string name="search_no_results">Engar niðurstöður</string>
+
+    <string name="label_quick_reply">Svara…</string>
+    <string name="label_avatar">Auðkennismynd</string>
+    <string name="label_header">Haus</string>
+
+    <string name="login_connection">Tengist…</string>
+
+    <string name="dialog_whats_an_instance">Hægt er að setja hér inn vistfang eða lén á hvaða tilviki sem er, svo sem mastodon.social, icosahedron.website, social.tchncs.de og <a href="https://instances.social">fleiri!</a> 
+\n
+\nEf þú ert ekki ennþá með notandaaðgang, geturðu sett inn nafnið á því tilviki sem þú vilt tilheyra og búið til aðgang þar.
+\n
+\nTilvik er ákveðinn einn vefþjónn þar sem notandaaðgangurinn þinn er hýstur, en eftir sem áður er auðvelt fyrir þig að eiga í samskiptum við fólk og fylgjast með einstaklingum á öðrum tilvikum, rétt eins og þið væruð á sama vefsvæðinu. 
+\n
+\nNánari upplýsingar má finna á <a href="https://joinmastodon.org">joinmastodon.org</a>. </string>
+    <string name="dialog_title_finishing_media_upload">Klára innsendingu myndefnis</string>
+    <string name="dialog_message_uploading_media">Sendi inn…</string>
+    <string name="dialog_download_image">Sækja</string>
+    <string name="dialog_message_cancel_follow_request">Afturkalla beiðni um að fylgjast með\?</string>
+    <string name="dialog_unfollow_warning">Hætta að fylgjast með þessum aðgangi\?</string>
+    <string name="dialog_delete_toot_warning">Eyða þessu tísti\?</string>
+    <string name="dialog_redraft_toot_warning">Eyða og endurvinna þetta tíst\?</string>
+    <string name="mute_domain_warning">Ertu alveg algjörlega viss um að þú viljir loka á allt %s\? Þú munt ekki sjá efni frá þessu léni í neinum opinberum tímalínum eða í tilkynningunum þínum. Fylgjendur þínir frá þessu léni verða fjarlægðir.</string>
+    <string name="mute_domain_warning_dialog_ok">Fela allt lénið</string>
+
+    <string name="visibility_public">Opinbert: Senda á opinberar tímalínur</string>
+    <string name="visibility_unlisted">Óskráð: Ekki birt á opinberum tímalínum</string>
+    <string name="visibility_private">Einungis fylgjendur: Senda einungis á fylgjendur</string>
+    <string name="visibility_direct">Beint: Senda einungis á notendur sem minnst er á</string>
+
+    <string name="pref_title_edit_notification_settings">Tilkynningar</string>
+    <string name="pref_title_notifications_enabled">Tilkynningar</string>
+    <string name="pref_title_notification_alerts">Aðvaranir</string>
+    <string name="pref_title_notification_alert_sound">Aðvara með hljóði</string>
+    <string name="pref_title_notification_alert_vibrate">Aðvara með titringi</string>
+    <string name="pref_title_notification_alert_light">Aðvara með ljósi</string>
+    <string name="pref_title_notification_filters">Láta mig vita þegar</string>
+    <string name="pref_title_notification_filter_mentions">minnst er á</string>
+    <string name="pref_title_notification_filter_follows">fylgst er með</string>
+    <string name="pref_title_notification_filter_reblogs">færslurnar mínar eru endurbirtar</string>
+    <string name="pref_title_notification_filter_favourites">færslurnar mínar eru settar í eftirlæti</string>
+    <string name="pref_title_notification_filter_poll">könnunum er lokið</string>
+    <string name="pref_title_appearance_settings">Útlit</string>
+    <string name="pref_title_app_theme">Þema forrits</string>
+    <string name="pref_title_timelines">Tímalínur</string>
+    <string name="pref_title_timeline_filters">Síur</string>
+
+    <string name="app_them_dark">Dökkt</string>
+    <string name="app_theme_light">Ljóst</string>
+    <string name="app_theme_black">Svart</string>
+    <string name="app_theme_auto">Sjálfvirkt við sólarlag</string>
+    <string name="app_theme_system">Nota kerfishönnun</string>
+
+    <string name="pref_title_browser_settings">Vafri</string>
+    <string name="pref_title_custom_tabs">Nota sérsniðna flipa Chrome</string>
+    <string name="pref_title_hide_follow_button">Fela \'Semja skilaboð\" hnapp sjálfvirkt við skrun</string>
+    <string name="pref_title_language">Tungumál</string>
+    <string name="pref_title_bot_overlay">Birta merki á róbótum</string>
+    <string name="pref_title_animate_gif_avatars">Sýna hreyfingar GIF-auðkennismynda</string>
+    <string name="gradient_for_media">Sýna skæra litstigla í stað falins myndefnis</string>
+
+    <string name="pref_title_status_filter">Síun tímalínu</string>
+    <string name="pref_title_status_tabs">Flipar</string>
+    <string name="pref_title_show_boosts">Sýna endurbirtingar</string>
+    <string name="pref_title_show_replies">Sýna svör</string>
+    <string name="pref_title_show_media_preview">Sækja forskoðanir á myndefni</string>
+    <string name="pref_title_proxy_settings">Milliþjónn</string>
+    <string name="pref_title_http_proxy_settings">HTTP-milliþjónn</string>
+    <string name="pref_title_http_proxy_enable">Virkja HTTP-milliþjón</string>
+    <string name="pref_title_http_proxy_server">HTTP-milliþjónn (proxy)</string>
+    <string name="pref_title_http_proxy_port">Gátt HTTP milliþjóns (vefsels)</string>
+
+    <string name="pref_default_post_privacy">Sjálfgefin gagnaleynd færslna</string>
+    <string name="pref_default_media_sensitivity">Alltaf merkja myndefni sem viðkvæmt</string>
+    <string name="pref_publishing">Gefið út (samstillt við vefþjón)</string>
+    <string name="pref_failed_to_sync">Mistókst að samstilla stillingar</string>
+
+    <string name="post_privacy_public">Opinbert</string>
+    <string name="post_privacy_unlisted">Óskráð</string>
+    <string name="post_privacy_followers_only">Einungis fylgjendur</string>
+
+    <string name="pref_status_text_size">Textastærð stöðufærslu</string>
+
+    <string name="status_text_size_smallest">Minnstu</string>
+    <string name="status_text_size_small">Lítið</string>
+    <string name="status_text_size_medium">Miðlungs</string>
+    <string name="status_text_size_large">Stórt</string>
+    <string name="status_text_size_largest">Stærst</string>
+
+    <string name="notification_mention_name">Nýjar tilvísanir</string>
+    <string name="notification_mention_descriptions">Tilkynningar um nýjar tilvísanir</string>
+    <string name="notification_follow_name">Nýir fylgjendur</string>
+    <string name="notification_follow_description">Tilkynningar um nýja fylgjendur</string>
+    <string name="notification_boost_name">Endurbirtingar</string>
+    <string name="notification_boost_description">Tilkynningar þegar tístin þín eru endurbirt</string>
+    <string name="notification_favourite_name">Eftirlæti</string>
+    <string name="notification_favourite_description">Tilkynningar þegar tístin þín eru sett í eftirlæti</string>
+    <string name="notification_poll_name">Kannanir</string>
+    <string name="notification_poll_description">Tilkynningar um kannanir sem er lokið</string>
+
+
+    <string name="notification_mention_format">%s minntist á þig</string>
+    <string name="notification_summary_large">%1$s, %2$s, %3$s og %4$d til viðbótar</string>
+    <string name="notification_summary_medium">%1$s, %2$s og %3$s</string>
+    <string name="notification_summary_small">%1$s og %2$s</string>
+    <string name="notification_title_summary">%d nýjar aðgerðir</string>
+
+    <string name="description_account_locked">Læstur notandaaðgangur</string>
+
+    <string name="about_tusky_version">Tusky %s</string>
+    <string name="about_powered_by_tusky">Keyrir á Tusky</string>
+    <string name="about_tusky_license">Tusky er frjáls hugbúnaður með opinn grunnkóða. Hann er gefinn út með GNU General Public notkunarleyfi, útgáfu 3. Þú getur skoðað notkunarleyfið hér: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
+    <string name="about_project_site">Vefsvæði verkefnisins:
+\n https://tusky.app</string>
+    <string name="about_bug_feature_request_site">Villutilkynningar og beiðnir um nýja eiginleika:
+\n https://github.com/tuskyapp/Tusky/issues</string>
+    <string name="about_tusky_account">Notandasnið Tusky</string>
+
+    <string name="status_share_content">Deila efni úr tísti</string>
+    <string name="status_share_link">Deila tengli á tíst</string>
+    <string name="status_media_images">Myndir</string>
+    <string name="status_media_video">Myndskeið</string>
+
+    <string name="state_follow_requested">Beðið um að fylgja</string>
+
+    <string name="abbreviated_in_years">eftir %dár</string>
+    <string name="abbreviated_in_days">eftir %dd</string>
+    <string name="abbreviated_in_hours">eftir %dklst</string>
+    <string name="abbreviated_in_minutes">eftir %dm</string>
+    <string name="abbreviated_in_seconds">eftir %ds</string>
+    <string name="abbreviated_years_ago">%dár</string>
+    <string name="abbreviated_days_ago">%dd</string>
+    <string name="abbreviated_hours_ago">%dklst</string>
+    <string name="abbreviated_minutes_ago">%dm</string>
+    <string name="abbreviated_seconds_ago">%ds</string>
+
+    <string name="follows_you">Fylgir þér</string>
+    <string name="pref_title_alway_show_sensitive_media">Alltaf birta myndefni sem merkt er viðkvæmt</string>
+    <string name="pref_title_alway_open_spoiler">Alltaf fletta út tístum sem eru með aðvörun vegna efnis</string>
+    <string name="title_media">Gagnaskrár</string>
+    <string name="replying_to">Svar til @%s</string>
+    <string name="load_more_placeholder_text">hlaða inn fleiru</string>
+
+    <string name="pref_title_public_filter_keywords">Opinberar tímalínur</string>
+    <string name="pref_title_thread_filter_keywords">Samtöl</string>
+    <string name="filter_addition_dialog_title">Bæta við síu</string>
+    <string name="filter_edit_dialog_title">Breyta síu</string>
+    <string name="filter_dialog_remove_button">Fjarlægja</string>
+    <string name="filter_dialog_update_button">Uppfæra</string>
+    <string name="filter_dialog_whole_word">Heil orð</string>
+    <string name="filter_dialog_whole_word_description">Þegar stikkorð eða frasi er einungis tölur og bókstafir, verður það aðeins notað ef það samsvarar heilu orði</string>
+    <string name="filter_add_description">Frasi sem á að sía</string>
+
+    <string name="add_account_name">Bæta við aðgang</string>
+    <string name="add_account_description">Bæta við nýjum Mastodon-aðgangi</string>
+
+    <string name="title_list_timeline">Lista upp tímalínu</string>
+    <string name="error_create_list">Ekki tókst að búa til lista</string>
+    <string name="error_rename_list">Ekki tókst að endurnefna lista</string>
+    <string name="error_delete_list">Ekki tókst að eyða lista</string>
+    <string name="action_create_list">Búa til lista</string>
+    <string name="action_rename_list">Endurnefna listann</string>
+    <string name="action_delete_list">Eyða listanum</string>
+    <string name="action_edit_list">Sýsla með listann</string>
+    <string name="hint_search_people_list">Leita að fólki sem þú fylgist með</string>
+    <string name="action_add_to_list">Bæta notandaaðgangi á listann</string>
+    <string name="action_remove_from_list">Fjarlægja notandaaðganginn af listanum</string>
+
+    <string name="compose_active_account_description">Sendi með notandaaðgangnum %1$s</string>
+
+    <string name="error_failed_set_caption">Ekki tókst að setja skýringatexta</string>
+    <string name="hint_describe_for_visually_impaired">Lýstu þessu fyrir sjónskerta
+\n(hámark %d stafir)</string>
+    <string name="action_set_caption">Setja skýringatexta</string>
+    <string name="action_remove">Fjarlægja</string>
+    <string name="lock_account_label">Læsa notandaaðgangi</string>
+    <string name="lock_account_label_description">Krefst þess að þú samþykkir fylgjendur handvirkt</string>
+    <string name="compose_save_draft">Vista drög\?</string>
+    <string name="send_toot_notification_title">Sendi tíst…</string>
+    <string name="send_toot_notification_error_title">Villa við að senda tíst</string>
+    <string name="send_toot_notification_channel_name">Sendi tíst</string>
+    <string name="send_toot_notification_cancel_title">Aflýsti sendingu</string>
+    <string name="send_toot_notification_saved_content">Afrit af tístinu þínu hefur verið vistað drögunum þínum</string>
+    <string name="action_compose_shortcut">Semja skilaboð</string>
+
+    <string name="error_no_custom_emojis">Tilvikið þitt %s er ekki með nein sérsniðin tjáningartákn</string>
+    <string name="copy_to_clipboard_success">Afritað á klippispjald</string>
+    <string name="emoji_style">Stíll tjáningartákna</string>
+    <string name="system_default">Sjálfgefið í kerfinu</string>
+    <string name="download_fonts">Þú þarft fyrst að ná í þessi táknmyndasett</string>
+    <string name="performing_lookup_title">Framkvæmi uppflettingu…</string>
+    <string name="expand_collapse_all_statuses">Þenja út / Fella saman allar stöðufærslur</string>
+    <string name="action_open_toot">Opna tíst</string>
+    <string name="restart_required">Endurræsing forrits er nauðsynleg</string>
+    <string name="restart_emoji">Það þarf að endurræsa Tusky til að breytingarnar taki gildi</string>
+    <string name="later">Seinna</string>
+    <string name="restart">Endurræsa</string>
+    <string name="caption_systememoji">Sjálfgefið táknmyndasett á tækinu þnu</string>
+    <string name="caption_blobmoji">Blob-táknmyndasettið sem þekkt var í Android 4.4–7.1</string>
+    <string name="caption_twemoji">Staðlaða Mastodon táknmyndasettið</string>
+    <string name="caption_notoemoji">Núverandi táknmyndasett Google</string>
+
+    <string name="download_failed">Niðurhal mistókst</string>
+
+    <string name="profile_badge_bot_text">Róbót</string>
+    <string name="account_moved_description">%1$s hefur verið flutt á:</string>
+
+    <string name="reblog_private">Endurbirta til upphaflegra lesenda</string>
+    <string name="unreblog_private">Taka úr endurbirtingu</string>
+
+    <string name="license_description">Tusky inniheldur kóða og gögn frá eftirfarandi verkefnum með opinn grunnkóða:</string>
+    <string name="license_apache_2">Notkunarleyfi er samkvæmt Apache hugbúnaðarleyfinu (afrit fyrir neðan)</string>
+    <string name="license_cc_by_4">CC-BY 4.0</string>
+    <string name="license_cc_by_sa_4">CC-BY-SA 4.0</string>
+
+    <string name="profile_metadata_label">Lýsigögn notandasniðs</string>
+    <string name="profile_metadata_add">bæta við gögnum</string>
+    <string name="profile_metadata_label_label">Merking</string>
+    <string name="profile_metadata_content_label">Efni</string>
+
+    <string name="pref_title_absolute_time">Nota algildan tíma</string>
+
+    <string name="label_remote_account">Ekki er víst að upplýsingarnar hér að neðan endurspegli notandasniðið að fullu. Opnaðu fullt notandasnið í vafra.</string>
+
+    <string name="unpin_action">Losa</string>
+    <string name="pin_action">Festa</string>
+
+    <plurals name="favs">
+	<item quantity="one"><b>%1$s</b> Eftirlæti</item>
+	<item quantity="other"><b>%1$s</b> Eftirlæti</item>
+</plurals>
+
+    <plurals name="reblogs">
+	<item quantity="one"><b>%s</b> Endurbirting</item>
+	<item quantity="other"><b>%s</b> Endurbirtingar</item>
+</plurals>
+
+    <string name="title_reblogged_by">Endurbirt af</string>
+    <string name="title_favourited_by">Sett í eftirlæti af</string>
+
+    <string name="conversation_1_recipients">%1$s</string>
+    <string name="conversation_2_recipients">%1$s og %2$s</string>
+    <string name="conversation_more_recipients">%1$s, %2$s og %3$d til viðbótar</string>
+    <string name="max_tab_number_reached">hámarksfjölda %1$d flipa náð</string>
+
+
+    <string name="description_status_media">Myndefni: %s</string>
+    <string name="description_status_cw">Aðvörun vegna efnis: %s</string>
+    <string name="description_status_media_no_description_placeholder">Engin lýsing</string>
+    <string name="description_status_reblogged">Endurbloggað</string>
+    <string name="description_status_favourited">Í eftirlætum</string>
+    <string name="description_status_bookmarked">Bókamerkt</string>
+    <string name="description_visiblity_public">Opinbert</string>
+    <string name="description_visiblity_unlisted">Óskráð</string>
+    <string name="description_visiblity_private">Fylgjendur</string>
+    <string name="description_visiblity_direct">Beint</string>
+    <string name="description_poll">Könnun með valkostunum: %1$s, %2$s, %3$s, %4$s; %5$s</string>
+
+    <string name="hint_list_name">Heiti á lista</string>
+
+    <string name="edit_hashtag_title">Breyta myllumerki</string>
+    <string name="edit_hashtag_hint">Myllumerki án #</string>
+    <string name="hashtag">Myllumerki</string>
+    <string name="select_list_title">Veldu lista</string>
+    <string name="list">Listi</string>
+    <string name="notifications_clear">Hreinsa</string>
+    <string name="notifications_apply_filter">Sía</string>
+    <string name="filter_apply">Virkja</string>
+
+    <string name="compose_shortcut_long_label">Semja tíst</string>
+    <string name="compose_shortcut_short_label">Semja skilaboð</string>
+
+    <string name="notification_clear_text">Ertu viss um að þú viljir endanlega eyða öllum tilkynningunum þínum\?</string>
+    <string name="compose_preview_image_description">Aðgerðir fyrir mynd %s</string>
+
+    <string name="poll_info_format"> <!-- 15 atkvæði • 1 klukkustund eftir --> %1$s • %2$s</string>
+    <plurals name="poll_info_votes">
+	<item quantity="one">%s atkvæði</item>
+	<item quantity="other">%s atkvæði</item>
+</plurals>
+    <string name="poll_info_time_relative">%s eftir</string>
+    <string name="poll_info_time_absolute">lýkur %s</string>
+    <string name="poll_info_closed">lokað</string>
+
+    <string name="poll_vote">Greiða atkvæði</string>
+
+    <string name="poll_ended_voted">Könnun sem þú tókst þátt í er lokið</string>
+    <string name="poll_ended_created">Könnuninni þinni er lokið</string>
+
+    <plurals name="poll_timespan_days">
+	<item quantity="one">%d dagur</item>
+	<item quantity="other">%d dagar</item>
+</plurals>
+    <plurals name="poll_timespan_hours">
+	<item quantity="one">%d klukkustund</item>
+	<item quantity="other">%d klukkustundir</item>
+</plurals>
+    <plurals name="poll_timespan_minutes">
+	<item quantity="one">%d mínúta</item>
+	<item quantity="other">%d mínútur</item>
+</plurals>
+    <plurals name="poll_timespan_seconds">
+	<item quantity="one">%d sekúnda</item>
+	<item quantity="other">%d sekúndur</item>
+</plurals>
+
+    <string name="button_continue">Halda áfram</string>
+    <string name="button_back">Til baka</string>
+    <string name="button_done">Lokið</string>
+    <string name="report_sent_success">Tókst að kæra @%s</string>
+    <string name="hint_additional_info">Aðrar athugasemdir</string>
+    <string name="report_remote_instance">Áframsenda til %s</string>
+    <string name="failed_report">Mistókst að kæra</string>
+    <string name="failed_fetch_statuses">Mistókst að sækja stöðufærslur</string>
+    <string name="report_description_1">Kæran verður send á umsjónarmenn vefþjónsins þíns. Þú getur gefið skýringu hér fyrir neðan á því af hverju þú ert að kæra þennan notandaaðgang:</string>
+    <string name="report_description_remote_instance">Notandaaðgangurinn er af öðrum vefþjóni. Á einnig að senda nafnlaust afrit af kærunni þangað\?</string>
+    <string name="title_accounts">Notandaaðgangar</string>
+    <string name="failed_search">Tókst ekki að leita</string>
+
+    <string name="pref_title_show_notifications_filter">Birta tilkynningasíu</string>
+
+
+    <string name="create_poll_title">Athuga</string>
+    <string name="poll_duration_5_min">5 mínútur</string>
+    <string name="poll_duration_30_min">30 mínútur</string>
+    <string name="poll_duration_1_hour">1 klukkustund</string>
+    <string name="poll_duration_6_hours">6 klukkustundir</string>
+    <string name="poll_duration_1_day">1 dagur</string>
+    <string name="poll_duration_3_days">3 dagar</string>
+    <string name="poll_duration_7_days">7 dagar</string>
+    <string name="add_poll_choice">Bæta við valkosti</string>
+    <string name="poll_allow_multiple_choices">Margir valkostir</string>
+    <string name="poll_new_choice_hint">Valkostur %d</string>
+    <string name="edit_poll">Breyta</string>
+    <string name="post_lookup_error_format">Villa við að fletta upp færslunni %s</string>
+
+    <string name="no_saved_status">Þú ert ekki með nein drög.</string>
+    <string name="no_scheduled_status">Þú ert ekki með neinar áætlaðar stöðufærslur.</string>
+
+</resources>

From cafac01578eb3b2c3f226ca3864bd2896873bb94 Mon Sep 17 00:00:00 2001
From: dani <daniel-other+tuskyweblate@dadosch.de>
Date: Wed, 29 Jan 2020 18:15:59 +0000
Subject: [PATCH 05/12] Translated using Weblate (German)

Currently translated at 97.8% (400 of 409 strings)

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

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 66740c08..f5825f7f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="error_generic">Ein Fehler ist aufgetreten.</string>
-    <string name="error_network">Ein Netzwerkfehler ist aufgetreten! Bitte überprüfen Sie Ihre Internetverbindung und versuchen Sie es erneut!</string>
+    <string name="error_network">Ein Netzwerkfehler ist aufgetreten! Bitte überprüfen deine Internetverbindung und versuche es erneut!</string>
     <string name="error_empty">Dies darf nicht leer sein.</string>
     <string name="error_invalid_domain">Ungültige Domain angegeben</string>
-    <string name="error_failed_app_registration">Diese App konnte sich auf dem Server nicht authentifizieren.</string>
+    <string name="error_failed_app_registration">Authentifizieren mit dieser Instanz fehlgeschlagen.</string>
     <string name="error_no_web_browser_found">Kein Webbrowser gefunden.</string>
     <string name="error_authorization_unknown">Ein undefinierbarer Autorisierungsfehler ist aufgetreten.</string>
     <string name="error_authorization_denied">Autorisierung fehlgeschlagen.</string>
@@ -14,18 +14,18 @@
     <string name="error_video_upload_size">Videodateien müssen kleiner als 40MB sein.</string>
     <string name="error_media_upload_type">Dieser Dateityp darf nicht hochgeladen werden.</string>
     <string name="error_media_upload_opening">Die Datei konnte nicht geöffnet werden.</string>
-    <string name="error_media_upload_permission">Eine Leseberechtigung wird für das Hochladen der Mediendatei benötigt.</string>
-    <string name="error_media_download_permission">Eine Berechtigung wird zum Speichern des Mediums benötigt.</string>
-    <string name="error_media_upload_image_or_video">Bilder und Videos können beide nicht an den Beitrag angehängt werden.</string>
+    <string name="error_media_upload_permission">Leseberechtigung für die Mediendatei wird benötigt.</string>
+    <string name="error_media_download_permission">Schreibberechtigung für Mediendateien wird benötigt.</string>
+    <string name="error_media_upload_image_or_video">Bilder und Videos können nicht beide gleichzeitig an einen Beitrag angehängt werden.</string>
     <string name="error_media_upload_sending">Die Mediendatei konnte nicht hochgeladen werden.</string>
-    <string name="error_sender_account_gone">Fehler beim Senden des Status.</string>
+    <string name="error_sender_account_gone">Fehler beim Senden des Beitrags.</string>
     <string name="title_home">Start</string>
     <string name="title_notifications">Benachrichtigungen</string>
     <string name="title_public_local">Lokal</string>
     <string name="title_public_federated">Föderiert</string>
     <string name="title_direct_messages">Direktnachrichten</string>
     <string name="title_tab_preferences">Tabs</string>
-    <string name="title_view_thread">Unterhaltung</string>
+    <string name="title_view_thread">Beitrag</string>
     <string name="title_statuses">Beiträge</string>
     <string name="title_statuses_with_replies">mit Antworten</string>
     <string name="title_statuses_pinned">Angeheftet</string>
@@ -34,9 +34,9 @@
     <string name="title_favourites">Favoriten</string>
     <string name="title_mutes">Stummgeschaltete Profile</string>
     <string name="title_blocks">Blockierte Profile</string>
-    <string name="title_follow_requests">Folgeanfrage</string>
+    <string name="title_follow_requests">Folgeanfragen</string>
     <string name="title_edit_profile">Dein Profil bearbeiten</string>
-    <string name="title_saved_toot">Gespeicherte Beiträge</string>
+    <string name="title_saved_toot">Entwürfe</string>
     <string name="title_licenses">Lizenzen</string>
     <string name="status_username_format">\@%s</string>
     <string name="status_boosted_format">%s teilte</string>
@@ -59,7 +59,7 @@
     <string name="action_reblog">Teilen</string>
     <string name="action_unreblog">Boost entfernen</string>
     <string name="action_favourite">Favorisieren</string>
-    <string name="action_unfavourite">Favoriten entfernen</string>
+    <string name="action_unfavourite">Favorisierung entfernen</string>
     <string name="action_more">Mehr</string>
     <string name="action_compose">Schreiben</string>
     <string name="action_login">Anmelden mit Mastodon</string>
@@ -97,7 +97,7 @@
     <string name="action_save">Speichern</string>
     <string name="action_edit_profile">Profil bearbeiten</string>
     <string name="action_edit_own_profile">Bearbeiten</string>
-    <string name="action_undo">rückgängig machen</string>
+    <string name="action_undo">Rückgängig machen</string>
     <string name="action_accept">Akzeptieren</string>
     <string name="action_reject">Ablehnen</string>
     <string name="action_search">Suche</string>
@@ -108,7 +108,7 @@
     <string name="action_add_tab">Tab hinzufügen</string>
     <string name="action_links">Verlinkungen</string>
     <string name="action_mentions">Erwähnungen</string>
-    <string name="action_hashtags">Hastags</string>
+    <string name="action_hashtags">Hashtags</string>
     <string name="action_open_reblogged_by">Boosts anzeigen</string>
     <string name="action_open_faved_by">Favoriten anzeigen</string>
     <string name="title_hashtags_dialog">Hashtags</string>
@@ -123,7 +123,7 @@
     <string name="send_status_content_to">Beitragsinhalt teilen</string>
     <string name="send_media_to">Mediendatei teilen…</string>
     <string name="confirmation_reported">Gesendet!</string>
-    <string name="confirmation_unblocked">entblockt</string>
+    <string name="confirmation_unblocked">Entblockt</string>
     <string name="confirmation_unmuted">Stummschaltung aufgehoben</string>
     <string name="status_sent">Gesendet!</string>
     <string name="status_sent_long">Antwort erfolgreich gesendet.</string>
@@ -208,10 +208,10 @@
     <string name="notification_mention_name">Neue Erwähnungen</string>
     <string name="notification_mention_descriptions">Benachrichtigungen über neue Erwähnungen</string>
     <string name="notification_follow_name">Neue Folgende</string>
-    <string name="notification_follow_description">Benachrichtigunen über neue Folgende</string>
+    <string name="notification_follow_description">Benachrichtigungen über neue Folgende</string>
     <string name="notification_boost_name">Geteilte Beiträge</string>
     <string name="notification_boost_description">Benachrichtigungen wenn deine Beiträge geteilt werden</string>
-    <string name="notification_favourite_name">Favorisierte Beiträge</string>
+    <string name="notification_favourite_name">Favoriten</string>
     <string name="notification_favourite_description">Benachrichtigungen wenn deine Beiträge favorisiert werden</string>
     <string name="notification_mention_format">%s hat dich erwähnt</string>
     <string name="notification_summary_large">%1$s, %2$s, %3$s und %4$d andere</string>
@@ -271,10 +271,10 @@
     <string name="lock_account_label_description">Wer dir folgen möchte, muss um deine Erlaubnis bitten</string>
     <string name="compose_save_draft">Entwurf speichern?</string>
     <string name="send_toot_notification_title">Beitrag senden…</string>
-    <string name="send_toot_notification_error_title">Fehler beim senden</string>
+    <string name="send_toot_notification_error_title">Fehler beim Senden</string>
     <string name="send_toot_notification_channel_name">Beiträge senden</string>
     <string name="send_toot_notification_cancel_title">Senden abgebrochen</string>
-    <string name="send_toot_notification_saved_content">Eine Kopie des Beitrags wurde in deine Entwürfe gespeichert</string>
+    <string name="send_toot_notification_saved_content">Eine Kopie des Beitrags wurde in deinen Entwürfen gespeichert</string>
     <string name="action_compose_shortcut">Antworten</string>
     <string name="error_no_custom_emojis">Deine Instanz %s hat keine Emojis definiert</string>
     <string name="copy_to_clipboard_success">In die Zwischenablage kopiert</string>
@@ -282,17 +282,17 @@
     <string name="system_default">System-Standard</string>
     <string name="download_fonts">Du musst diese Emoji-Sets zunächst herunterladen</string>
     <string name="performing_lookup_title">Nachschlagen…</string>
-    <string name="expand_collapse_all_statuses">Alle Beiträge aus/einklappen</string>
+    <string name="expand_collapse_all_statuses">Alle Beiträge aus-/einklappen</string>
     <string name="action_open_toot">Beitrag öffnen</string>
     <string name="restart_required">App-Neustart erforderlich</string>
     <string name="restart_emoji">Du musst Tusky neustarten um die Änderungen anzuwenden</string>
     <string name="later">Später</string>
     <string name="restart">Neustarten</string>
     <string name="caption_systememoji">Die Standard-Emojis deines Geräts</string>
-    <string name="caption_blobmoji">Die Blob–Emojis aus Android 4.4–7.1</string>
+    <string name="caption_blobmoji">Die Blob-Emojis aus Android 4.4-7.1</string>
     <string name="caption_twemoji">Die Standard-Emojis von Mastodon</string>
     <string name="caption_notoemoji">Die aktuellen Emojis von Google</string>
-    <string name="download_failed">Download fehlgeschlagen.</string>
+    <string name="download_failed">Download fehlgeschlagen</string>
     <string name="profile_badge_bot_text">Bot</string>
     <string name="account_moved_description">%1$s ist umgezogen auf:</string>
     <string name="reblog_private">An ursprüngliches Publikum teilen</string>
@@ -306,7 +306,7 @@
     <string name="profile_metadata_label_label">Bezeichnung</string>
     <string name="profile_metadata_content_label">Inhalt</string>
     <string name="pref_title_absolute_time">Absolute Zeitstempel verwenden</string>
-    <string name="label_remote_account">Das Profil wird möglicherweise unvollständig wiedergegeben. Klick um vollständiges Profil anzuzeigen.</string>
+    <string name="label_remote_account">Das Profil wird möglicherweise unvollständig wiedergegeben. Tippe hier, um vollständiges Profil anzuzeigen.</string>
     <string name="unpin_action">Vom Profil lösen</string>
     <string name="pin_action">Im Profil anheften</string>
     <string name="title_favourited_by">Favorisiert von</string>
@@ -349,7 +349,7 @@
     <string name="description_status_reblogged">Geteilt</string>
     <string name="description_visiblity_unlisted">Ungelistet</string>
     <string name="action_delete_and_redraft">Löschen und neu erstellen</string>
-    <string name="dialog_redraft_toot_warning">Bist du dir sicher, dass du diesen Beitrag löschen und neu machen möchtest\?</string>
+    <string name="dialog_redraft_toot_warning">Bist du dir sicher, dass du diesen Beitrag löschen und neu erstellen möchtest\?</string>
 
     <string name="pref_title_notification_filter_poll">Umfragen vorbei sind</string>
     <string name="notification_poll_name">Umfragen</string>
@@ -377,8 +377,8 @@
 
     <string name="poll_vote">Abstimmen</string>
 
-    <string name="poll_ended_voted">Eine Umfrage in der du abgestimmt hast ist vorbei</string>
-    <string name="poll_ended_created">Eine Umfrage die du erstellt hast ist vorbei</string>
+    <string name="poll_ended_voted">Eine Umfrage, in der du abgestimmt hast, ist vorbei</string>
+    <string name="poll_ended_created">Eine Umfrage, die du erstellt hast, ist vorbei</string>
 
     <plurals name="poll_timespan_days">
 	<item quantity="one">%d Tag</item>
@@ -403,7 +403,7 @@
     <string name="confirmation_domain_unmuted">%s nicht mehr versteckt</string>
 
     <string name="mute_domain_warning">Bist du dir sicher, dass du die Domain %s blockieren willst\? Nach der Blockierung wirst du nichts mehr von dieser Domain in öffentlichen Zeitleisten oder Benachrichtigungen sehen. Deine Follower von dieser Domain werden entfernt.</string>
-    <string name="mute_domain_warning_dialog_ok">ganze Domain verbergen</string>
+    <string name="mute_domain_warning_dialog_ok">Ganze Domain verbergen</string>
 
     <string name="pref_title_animate_gif_avatars">GIF-Avatare animieren</string>
 
@@ -451,4 +451,24 @@
     <string name="action_schedule_toot">Plane Beitrag</string>
     <string name="action_reset_schedule">Zurücksetzen</string>
     <string name="abbreviated_in_years">Dies sind Zeitstempel für Status. Beispiele: \"16s\" oder \"2t\".</string>
-    </resources>
+    <string name="error_audio_upload_size">Audiodateien müssen kleiner als 40MB sein.</string>
+    <string name="title_bookmarks">Lesezeichen</string>
+    <string name="action_bookmark">Lesezeichen</string>
+    <string name="action_view_bookmarks">Lesezeichen</string>
+    <string name="gradient_for_media">Bunten Farbverlauf für versteckte Medien anzeigen</string>
+
+    <string name="about_powered_by_tusky">Angetrieben durch Tusky</string>
+    <plurals name="reblogs">
+	<item quantity="one"><b>%s</b> Boost</item>
+	<item quantity="other"><b>%s</b> Boosts</item>
+</plurals>
+
+    <string name="description_status_bookmarked">Als Lesezeichen gespeichert</string>
+    <string name="select_list_title">Liste auswählen</string>
+    <string name="list">Liste</string>
+    <string name="post_lookup_error_format">Fehler beim Nachschlagen von Post %s</string>
+
+    <string name="no_saved_status">Du hast keine Entwürfe.</string>
+    <string name="no_scheduled_status">Du hast keine geplanten Beiträge.</string>
+
+</resources>

From 230d0de0f00865eea33199d958e9580381cc1bbf Mon Sep 17 00:00:00 2001
From: Vegard Skjefstad <vegard@vegard.net>
Date: Wed, 29 Jan 2020 18:15:59 +0000
Subject: [PATCH 06/12] =?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% (409 of 409 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/nb_NO/
---
 app/src/main/res/values-no-rNB/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-no-rNB/strings.xml b/app/src/main/res/values-no-rNB/strings.xml
index 5d18ba3f..aeb6c51f 100644
--- a/app/src/main/res/values-no-rNB/strings.xml
+++ b/app/src/main/res/values-no-rNB/strings.xml
@@ -519,4 +519,5 @@
     <string name="no_scheduled_status">Du har ingen planlagte statuser.</string>
 
 <string name="no_saved_status">Du har ikke lagret noen kladder.</string>
+    <string name="error_audio_upload_size">Lydfiler må være mindre enn 40MB.</string>
     </resources>

From cfc3a8065ba384db663a33f18079c70f855b5cde Mon Sep 17 00:00:00 2001
From: ButterflyOfFire <butterflyoffire@protonmail.com>
Date: Wed, 29 Jan 2020 18:15:59 +0000
Subject: [PATCH 07/12] Translated using Weblate (Kabyle)

Currently translated at 11.0% (45 of 409 strings)

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

Added translation using Weblate (Kabyle)

Translated using Weblate (French)

Currently translated at 100.0% (409 of 409 strings)

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

Translated using Weblate (Arabic)

Currently translated at 100.0% (409 of 409 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/ar/
---
 app/src/main/res/values-ar/strings.xml  |  3 +-
 app/src/main/res/values-fr/strings.xml  |  8 +++-
 app/src/main/res/values-kab/strings.xml | 53 +++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/values-kab/strings.xml

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 97ffb040..9089cb5f 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -500,4 +500,5 @@
     <string name="no_saved_status">ليس لديك أية مسودات.</string>
     <string name="no_scheduled_status">ليس لديك أية منشورات مُبرمَجة للنشر.</string>
 
-</resources>
+<string name="error_audio_upload_size">يجب أن يكون حجم الملفات الصوتية أقل مِن 40 ميغابايت.</string>
+    </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6befdd34..d9426a3d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -480,4 +480,10 @@
     <string name="description_status_bookmarked">Ajouté aux marque-pages</string>
     <string name="select_list_title">Sélectionner la liste</string>
     <string name="list">Liste</string>
-    </resources>
+    <string name="error_audio_upload_size">Les fichiers audio doivent être inférieurs à 40 Mo.</string>
+    <string name="gradient_for_media">Afficher des dégradés en couleur pour les médias cachés</string>
+
+    <string name="no_saved_status">Vous n’avez aucun brouillon.</string>
+    <string name="no_scheduled_status">Vous n’avez aucun pouet planifié.</string>
+
+</resources>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
new file mode 100644
index 00000000..18771c32
--- /dev/null
+++ b/app/src/main/res/values-kab/strings.xml
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="action_login">Qqen γer Maṣṭudun</string>
+    <string name="title_favourites">Ismenyifen</string>
+    <string name="title_saved_toot">Irewwayen</string>
+    <string name="action_logout">Ffeγ</string>
+    <string name="action_view_preferences">Iγewwaṛen</string>
+    <string name="action_view_account_preferences">Iγewwaṛen n umiḍan</string>
+    <string name="action_edit_profile">Ẓreg amaγnu</string>
+    <string name="action_search">Nadi</string>
+    <string name="about_title_activity">Γef</string>
+    <string name="action_lists">Tibdarin</string>
+    <string name="title_lists">Tibdarin</string>
+    <string name="error_compose_character_limit">Tijewwiqt-ik aṭas i γuzzifet!</string>
+    <string name="title_home">Agejdan</string>
+    <string name="title_tab_preferences">Iccaren</string>
+    <string name="title_view_thread">Tijewwiqt</string>
+    <string name="title_statuses">Iznan</string>
+    <string name="title_statuses_with_replies">S tririyin</string>
+    <string name="title_edit_profile">Ẓreg amaγnu-ik</string>
+    <string name="status_username_format">\@%s</string>
+    <string name="status_content_warning_show_more">Zeṛ ugar</string>
+    <string name="status_content_warning_show_less">Zeṛ kra kan</string>
+    <string name="message_empty">Ulac walu da.</string>
+    <string name="notification_follow_format">Yeṭafar-ik-id %s</string>
+
+    <string name="action_reply">Err</string>
+    <string name="action_more">Ugar</string>
+    <string name="action_compose">Azen</string>
+    <string name="action_follow">Ḍfeṛ</string>
+    <string name="action_unfollow">Ur ṭafaṛ ara</string>
+    <string name="action_edit">Ẓreg</string>
+    <string name="action_delete">Kkes</string>
+    <string name="action_delete_and_redraft">Kkes tɛiwdeḍ tira</string>
+    <string name="action_send">Jewweq</string>
+    <string name="action_send_public">JEWWEQ!</string>
+    <string name="action_retry">Ɛreḍ tikkelt-nniḍen</string>
+    <string name="action_close">Derreɛ</string>
+    <string name="action_view_profile">Amaγnu</string>
+    <string name="action_view_favourites">Ismenyifen</string>
+    <string name="action_open_in_web">Ldi deg uminig</string>
+    <string name="action_share">Bḍu</string>
+    <string name="action_mute">Sgugem</string>
+    <string name="action_access_saved_toot">Irewwayen</string>
+    <string name="action_open_faved_by">Sken-ed ismenyifen</string>
+
+    <string name="notification_favourite_name">Ismenyifen</string>
+    <plurals name="favs">
+	<item quantity="one"><b>%1$s</b> n usmenyaf</item>
+	<item quantity="other"><b>%1$s</b> n ismenyifen</item>
+</plurals>
+
+    <string name="no_saved_status">Ur teɛiḍ ara irewwayen.</string>
+    </resources>

From b43cf1a8025c79806ea8e6a709c493af676f634b Mon Sep 17 00:00:00 2001
From: ati3 <ati@tutamail.com>
Date: Wed, 29 Jan 2020 18:15:59 +0000
Subject: [PATCH 08/12] Translated using Weblate (Slovak)

Currently translated at 6.6% (27 of 409 strings)

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

Translated using Weblate (Czech)

Currently translated at 97.3% (398 of 409 strings)

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

Added translation using Weblate (Slovak)
---
 app/src/main/res/values-cs/strings.xml |  2 +-
 app/src/main/res/values-sk/strings.xml | 31 ++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/values-sk/strings.xml

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 7c0acf1b..984bbd0d 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -12,7 +12,7 @@
     <string name="error_compose_character_limit">Toot je příliš dlouhý!</string>
     <string name="error_image_upload_size">Soubor musí být menší než 8 MB.</string>
     <string name="error_video_upload_size">Videosoubory musejí být menší než 40 MB.</string>
-    <string name="error_media_upload_type">Tento typ spuboru namůže být nahrán.</string>
+    <string name="error_media_upload_type">Tento typ souboru nemůže být nahrán.</string>
     <string name="error_media_upload_opening">Tento soubor nemohl být otevřen.</string>
     <string name="error_media_upload_permission">Je vyžadováno povolení číst média.</string>
     <string name="error_media_download_permission">Je vyžadováno povolení ukládat média.</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
new file mode 100644
index 00000000..75f1c473
--- /dev/null
+++ b/app/src/main/res/values-sk/strings.xml
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="action_login">Prihlásiť sa účtom Mastodon</string>
+    <string name="title_saved_toot">Koncepty</string>
+    <string name="action_logout">Odhlásiť sa</string>
+    <string name="action_view_preferences">Nastavenia</string>
+    <string name="action_view_account_preferences">Nastavenia účtu</string>
+    <string name="action_edit_profile">Upraviť profil</string>
+    <string name="action_search">Hľadať</string>
+    <string name="action_lists">Zoznamy</string>
+    <string name="title_lists">Zoznamy</string>
+    <string name="error_generic">Vyskytla sa chyba.</string>
+    <string name="title_notifications">Oznámenia</string>
+    <string name="title_direct_messages">Priame správy</string>
+    <string name="title_statuses_with_replies">S odpoveďmi</string>
+    <string name="title_statuses_pinned">Pripnuté</string>
+    <string name="title_followers">Sledujúci</string>
+    <string name="title_bookmarks">Záložky</string>
+    <string name="title_licenses">Licencie</string>
+
+    <string name="status_username_format">\@%s</string>
+    <string name="status_sensitive_media_title">Citlivý obsah</string>
+    <string name="status_sensitive_media_directions">Kliknite pre zobrazenie</string>
+    <string name="status_content_warning_show_more">Zobraziť viac</string>
+    <string name="status_content_warning_show_less">Zobraziť menej</string>
+    <string name="status_content_show_more">Rozbaliť</string>
+    <string name="status_content_show_less">Zabaliť</string>
+
+    <string name="report_username_format">Nahlásiť používateľa @%s</string>
+    <string name="action_quick_reply">Rýchla odpoveď</string>
+    <string name="action_reply">Odpovedať</string>
+    </resources>

From 9733adb710562314bf3dd5686547e3bd8362d6b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Quent=C3=AD?= <quentinantonin@free.fr>
Date: Wed, 29 Jan 2020 18:15:59 +0000
Subject: [PATCH 09/12] Translated using Weblate (Occitan)

Currently translated at 100.0% (409 of 409 strings)

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

diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index de4bdd1c..3fe616ec 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -485,4 +485,10 @@
     <string name="description_status_bookmarked">Ajustat als marcapaginas</string>
     <string name="select_list_title">Seleccionar la list</string>
     <string name="list">Lista</string>
-    </resources>
+    <string name="error_audio_upload_size">Los fichièrs àudio devon èsser inferiors a 40 Mo.</string>
+    <string name="gradient_for_media">Mostrar los degradats de colors pels contenguts resconduts</string>
+
+    <string name="no_saved_status">Avètz pas cap de borrolhon.</string>
+    <string name="no_scheduled_status">Avètz pas cap de tut planificat.</string>
+
+</resources>

From 59163321a2b30070948ae121e99e3f45d4cce74d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= <sv1@fellsnet.is>
Date: Tue, 14 Jan 2020 09:54:35 +0000
Subject: [PATCH 10/12] Translated using Weblate (Icelandic)

Currently translated at 100.0% (7 of 7 strings)

Translation: Tusky/Tusky-app
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/is/
---
 fastlane/metadata/android/is/changelogs/58.txt     | 10 ++++++++++
 fastlane/metadata/android/is/changelogs/61.txt     |  7 +++++++
 fastlane/metadata/android/is/changelogs/67.txt     |  9 +++++++++
 fastlane/metadata/android/is/changelogs/68.txt     |  3 +++
 fastlane/metadata/android/is/full_description.txt  | 12 ++++++++++++
 fastlane/metadata/android/is/short_description.txt |  1 +
 fastlane/metadata/android/is/title.txt             |  1 +
 7 files changed, 43 insertions(+)
 create mode 100644 fastlane/metadata/android/is/changelogs/58.txt
 create mode 100644 fastlane/metadata/android/is/changelogs/61.txt
 create mode 100644 fastlane/metadata/android/is/changelogs/67.txt
 create mode 100644 fastlane/metadata/android/is/changelogs/68.txt
 create mode 100644 fastlane/metadata/android/is/full_description.txt
 create mode 100644 fastlane/metadata/android/is/short_description.txt
 create mode 100644 fastlane/metadata/android/is/title.txt

diff --git a/fastlane/metadata/android/is/changelogs/58.txt b/fastlane/metadata/android/is/changelogs/58.txt
new file mode 100644
index 00000000..b981890a
--- /dev/null
+++ b/fastlane/metadata/android/is/changelogs/58.txt
@@ -0,0 +1,10 @@
+Tusky útg6.0
+
+- Tímalínusíur hafa verið færðar í kjörstillingar notandaaðgangs og munu samstillast við vefþjón
+- YNú geturðu haft sérsniðið myllumerki sem flipa í aðalviðmóti
+- Hægt er að breyta listumk
+- Öryggi: fjarlægður stuðningur við TLS 1.0 og TLS 1.1, bætt við stuðningi við TLS 1.3 á Android 6+
+- Semja-sýnin stingur núna upp á sérsniðnum tjáningartáknum þegar byrjað er að skrifa
+- Ný stilling á þema "nota þema kerfis"
+- Bætt aðgengi að tímalínu
+- Tusky mun núna hunsa óþekktar tilkynningar
diff --git a/fastlane/metadata/android/is/changelogs/61.txt b/fastlane/metadata/android/is/changelogs/61.txt
new file mode 100644
index 00000000..214189f2
--- /dev/null
+++ b/fastlane/metadata/android/is/changelogs/61.txt
@@ -0,0 +1,7 @@
+Tusky útg7.0
+
+- Stuðningur við birtingu kannana, atkvæðagreiðslu og tilkynningar vegna kannana
+- Nýjir hnappar til að sía tilkynningaflipa og til að eyða öllum tilkynningunum
+- Eyða og endurvinna eigin tíst
+- Nýtt merki á auðkennismynd sýnir hvort aðgangur sé róbót (hægt að slökkva á þessu í kjörstillingum)
+- Nýjar þýðingar: Norskt bókmál og Slóvenska.
diff --git a/fastlane/metadata/android/is/changelogs/67.txt b/fastlane/metadata/android/is/changelogs/67.txt
new file mode 100644
index 00000000..d355b7b6
--- /dev/null
+++ b/fastlane/metadata/android/is/changelogs/67.txt
@@ -0,0 +1,9 @@
+Tusky útg9.0
+
+- Nú geturðu útbúið kannanir í Tusky
+- Bætt leit
+- Nýr valkostur í kjörstillingum að fletta alltaf út aðvaranir vegna efnis
+- Auðkennismyndir í leiðsagnarsleða eru núna ferningslaga og rúnnaðar
+- Núna er hægt að kæra notendur án þess að þeir hafi sent inn stöðufærslu
+- Tusky mun núna neita að tengjast með ódulrituðum (cleartext) tengingum á Android 6+
+- Margar smærri endurbætur og lagfæringar á villum
diff --git a/fastlane/metadata/android/is/changelogs/68.txt b/fastlane/metadata/android/is/changelogs/68.txt
new file mode 100644
index 00000000..abadc94a
--- /dev/null
+++ b/fastlane/metadata/android/is/changelogs/68.txt
@@ -0,0 +1,3 @@
+Tusky útg9.1
+
+Þessi útgáfa tryggir samhæfni við Mastodon 3 og bætir afköst og stöðugleika.
diff --git a/fastlane/metadata/android/is/full_description.txt b/fastlane/metadata/android/is/full_description.txt
new file mode 100644
index 00000000..170b2e30
--- /dev/null
+++ b/fastlane/metadata/android/is/full_description.txt
@@ -0,0 +1,12 @@
+Tusky er léttkeyrandi forrit fyrir Mastodon, frjálsa og opna samfélagsnetsþjóninn.
+
+• Material Design hönnun
+• Flestar Mastodon API-skipanir
+• Margir notendaaðgangar
+• Dökk og ljós þemu með möguleika á sjálfvirkti skiptingu eftir tíma sólarhrings
+• Drög - semja tíst og senda síðar
+• Val milli mismunandi stíla emoji-tákna 
+• Bestað fyrir allar skjástærðir
+• Algerlega frjáls hugbúnaður - ekki háð ófrjálsum tilföngum eins og t.d. Google-þjónustum
+
+Til að vita meira um Mastodon, kíktu á https://joinmastodon.org/
diff --git a/fastlane/metadata/android/is/short_description.txt b/fastlane/metadata/android/is/short_description.txt
new file mode 100644
index 00000000..9cf0ad7a
--- /dev/null
+++ b/fastlane/metadata/android/is/short_description.txt
@@ -0,0 +1 @@
+Margnotenda forrit fyrir Mastodon samfélagsnetið
diff --git a/fastlane/metadata/android/is/title.txt b/fastlane/metadata/android/is/title.txt
new file mode 100644
index 00000000..0238ffc0
--- /dev/null
+++ b/fastlane/metadata/android/is/title.txt
@@ -0,0 +1 @@
+Tusky

From 889b92dfb236beb7b33f47897f1c9735c5615d8c Mon Sep 17 00:00:00 2001
From: ati3 <ati@tutamail.com>
Date: Fri, 24 Jan 2020 20:49:41 +0000
Subject: [PATCH 11/12] Translated using Weblate (Slovak)

Currently translated at 14.3% (1 of 7 strings)

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

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

From 4907a051abaf72f44ea2e512c1c5a3e9460014fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lanie=20Chauvel=20=28ariasuni=29?=
 <perso@hack-libre.org>
Date: Wed, 29 Jan 2020 19:25:55 +0100
Subject: [PATCH 12/12] Refresh DM column when removing toot there instead of
 removing conversation (#1654)

---
 .../conversation/ConversationsViewModel.kt           | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsViewModel.kt
index 3c61de80..0205ddec 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsViewModel.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsViewModel.kt
@@ -128,15 +128,7 @@ class ConversationsViewModel @Inject constructor(
 
     fun remove(position: Int) {
         conversations.value?.getOrNull(position)?.let { conversation ->
-            /* this is not ideal since deleting last toot from an conversation
-               should not delete the conversation but show another toot of the conversation */
-            timelineCases.delete(conversation.lastStatus.id)
-                    .subscribeOn(Schedulers.io())
-                    .doOnError { t -> Log.w("ConversationViewModel", "Failed to delete conversation", t) }
-                    .subscribe()
-            database.conversationDao().delete(conversation)
-                    .subscribeOn(Schedulers.io())
-                    .subscribe()
+            refresh()
         }
     }
 
@@ -146,4 +138,4 @@ class ConversationsViewModel @Inject constructor(
                 .subscribe()
     }
 
-}
\ No newline at end of file
+}