From be60155de5f17fd5078df1cc95bf8fa06e4b9a37 Mon Sep 17 00:00:00 2001
From: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
Date: Fri, 15 Jan 2021 21:05:36 +0100
Subject: [PATCH] Implement timed mutes. (#2035)

Fixes #2033
---
 .../keylesspalace/tusky/AccountActivity.kt    |  4 +--
 .../components/search/SearchViewModel.kt      |  4 +--
 .../fragments/SearchStatusesFragment.kt       |  4 +--
 .../tusky/fragment/SFragment.java             |  4 +--
 .../tusky/network/MastodonApi.kt              |  3 +-
 .../tusky/network/TimelineCases.kt            |  6 ++--
 .../tusky/view/MuteAccountDialog.kt           |  9 +++--
 .../tusky/viewmodel/AccountViewModel.kt       |  8 ++---
 .../main/res/layout/dialog_mute_account.xml   | 15 +++++++-
 app/src/main/res/values-ar/strings.xml        | 14 ++++----
 app/src/main/res/values-bn-rBD/strings.xml    | 14 ++++----
 app/src/main/res/values-bn-rIN/strings.xml    | 14 ++++----
 app/src/main/res/values-ca/strings.xml        | 14 ++++----
 app/src/main/res/values-cs/strings.xml        | 14 ++++----
 app/src/main/res/values-de/strings.xml        | 14 ++++----
 app/src/main/res/values-eo/strings.xml        | 14 ++++----
 app/src/main/res/values-es/strings.xml        | 14 ++++----
 app/src/main/res/values-eu/strings.xml        | 14 ++++----
 app/src/main/res/values-fa/strings.xml        | 14 ++++----
 app/src/main/res/values-fr/strings.xml        | 14 ++++----
 app/src/main/res/values-ga/strings.xml        | 14 ++++----
 app/src/main/res/values-hi/strings.xml        | 14 ++++----
 app/src/main/res/values-hu/strings.xml        | 14 ++++----
 app/src/main/res/values-is/strings.xml        | 14 ++++----
 app/src/main/res/values-it/strings.xml        | 14 ++++----
 app/src/main/res/values-ja/strings.xml        | 14 ++++----
 app/src/main/res/values-kab/strings.xml       | 14 ++++----
 app/src/main/res/values-ko/strings.xml        | 14 ++++----
 app/src/main/res/values-nl/strings.xml        | 14 ++++----
 app/src/main/res/values-no-rNB/strings.xml    | 14 ++++----
 app/src/main/res/values-oc/strings.xml        | 14 ++++----
 app/src/main/res/values-pl/strings.xml        | 14 ++++----
 app/src/main/res/values-pt-rBR/strings.xml    | 14 ++++----
 app/src/main/res/values-ru/strings.xml        | 14 ++++----
 app/src/main/res/values-sa/strings.xml        | 14 ++++----
 app/src/main/res/values-sl/strings.xml        | 14 ++++----
 app/src/main/res/values-sv/strings.xml        | 14 ++++----
 app/src/main/res/values-ta/strings.xml        |  6 ++--
 app/src/main/res/values-th/strings.xml        | 14 ++++----
 app/src/main/res/values-tr/strings.xml        | 14 ++++----
 app/src/main/res/values-vi/strings.xml        | 14 ++++----
 app/src/main/res/values-zh-rCN/strings.xml    | 14 ++++----
 app/src/main/res/values/donottranslate.xml    | 36 +++++++++++++++----
 app/src/main/res/values/strings.xml           | 16 +++++----
 44 files changed, 303 insertions(+), 260 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
index c16584eb..c89623d7 100644
--- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
@@ -766,8 +766,8 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
                 showMuteAccountDialog(
                         this,
                         it.username
-                ) { notifications ->
-                    viewModel.muteAccount(notifications)
+                ) { notifications, duration ->
+                    viewModel.muteAccount(notifications, duration)
                 }
             }
         } else {
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt
index da2c3fb1..08afe44d 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt
@@ -193,8 +193,8 @@ class SearchViewModel @Inject constructor(
         return accountManager.getAllAccountsOrderedByActive()
     }
 
-    fun muteAccount(accountId: String, notifications: Boolean) {
-        timelineCases.mute(accountId, notifications)
+    fun muteAccount(accountId: String, notifications: Boolean, duration: Int) {
+        timelineCases.mute(accountId, notifications, duration)
     }
 
     fun pinAccount(status: Status, isPin: Boolean) {
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
index ffd69899..5fbbc715 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
@@ -377,8 +377,8 @@ class SearchStatusesFragment : SearchFragment<Pair<Status, StatusViewData.Concre
         showMuteAccountDialog(
             this.requireActivity(),
             accountUsername
-        ) { notifications ->
-            viewModel.muteAccount(accountId, notifications)
+        ) { notifications, duration ->
+            viewModel.muteAccount(accountId, notifications, duration)
         }
     }
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
index 8fe141c6..e1d50437 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
@@ -340,8 +340,8 @@ public abstract class SFragment extends BaseFragment implements Injectable {
         MuteAccountDialog.showMuteAccountDialog(
             this.getActivity(),
             accountUsername,
-            (notifications) -> {
-                timelineCases.mute(accountId, notifications);
+            (notifications, duration) -> {
+                timelineCases.mute(accountId, notifications, duration);
                 return Unit.INSTANCE;
             }
         );
diff --git a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
index 08a5483d..7b79e1b5 100644
--- a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
@@ -330,7 +330,8 @@ interface MastodonApi {
     @POST("api/v1/accounts/{id}/mute")
     fun muteAccount(
             @Path("id") accountId: String,
-            @Field("notifications") notifications: Boolean? = null
+            @Field("notifications") notifications: Boolean? = null,
+            @Field("duration") duration: Int? = null
     ): Single<Relationship>
 
     @POST("api/v1/accounts/{id}/unmute")
diff --git a/app/src/main/java/com/keylesspalace/tusky/network/TimelineCases.kt b/app/src/main/java/com/keylesspalace/tusky/network/TimelineCases.kt
index efdb410b..8cf2b688 100644
--- a/app/src/main/java/com/keylesspalace/tusky/network/TimelineCases.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/network/TimelineCases.kt
@@ -33,7 +33,7 @@ interface TimelineCases {
     fun reblog(status: Status, reblog: Boolean): Single<Status>
     fun favourite(status: Status, favourite: Boolean): Single<Status>
     fun bookmark(status: Status, bookmark: Boolean): Single<Status>
-    fun mute(id: String, notifications: Boolean)
+    fun mute(id: String, notifications: Boolean, duration: Int)
     fun block(id: String)
     fun delete(id: String): Single<DeletedStatus>
     fun pin(status: Status, pin: Boolean)
@@ -104,8 +104,8 @@ class TimelineCasesImpl(
         }
     }
 
-    override fun mute(id: String, notifications: Boolean) {
-        mastodonApi.muteAccount(id, notifications)
+    override fun mute(id: String, notifications: Boolean, duration: Int) {
+        mastodonApi.muteAccount(id, notifications, duration)
                 .subscribe({
                     eventHub.dispatch(MuteEvent(id))
                 }, { t ->
diff --git a/app/src/main/java/com/keylesspalace/tusky/view/MuteAccountDialog.kt b/app/src/main/java/com/keylesspalace/tusky/view/MuteAccountDialog.kt
index 44a70267..435e2450 100644
--- a/app/src/main/java/com/keylesspalace/tusky/view/MuteAccountDialog.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/view/MuteAccountDialog.kt
@@ -4,6 +4,7 @@ package com.keylesspalace.tusky.view
 
 import android.app.Activity
 import android.widget.CheckBox
+import android.widget.Spinner
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import com.keylesspalace.tusky.R
@@ -11,7 +12,7 @@ import com.keylesspalace.tusky.R
 fun showMuteAccountDialog(
     activity: Activity,
     accountUsername: String,
-    onOk: (notifications: Boolean) -> Unit
+    onOk: (notifications: Boolean, duration: Int) -> Unit
 ) {
     val view = activity.layoutInflater.inflate(R.layout.dialog_mute_account, null)
     (view.findViewById(R.id.warning) as TextView).text =
@@ -21,7 +22,11 @@ fun showMuteAccountDialog(
 
     AlertDialog.Builder(activity)
             .setView(view)
-            .setPositiveButton(android.R.string.ok) { _, _ -> onOk(checkbox.isChecked) }
+            .setPositiveButton(android.R.string.ok) { _, _ ->
+                val spinner: Spinner = view.findViewById(R.id.duration)
+                val durationValues = activity.resources.getIntArray(R.array.mute_duration_values)
+                onOk(checkbox.isChecked, durationValues[spinner.selectedItemPosition])
+            }
             .setNegativeButton(android.R.string.cancel, null)
             .show()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/keylesspalace/tusky/viewmodel/AccountViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/viewmodel/AccountViewModel.kt
index b2568f34..a0f0ed68 100644
--- a/app/src/main/java/com/keylesspalace/tusky/viewmodel/AccountViewModel.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/viewmodel/AccountViewModel.kt
@@ -119,8 +119,8 @@ class AccountViewModel @Inject constructor(
         }
     }
 
-    fun muteAccount(notifications: Boolean) {
-        changeRelationship(RelationShipAction.MUTE, notifications)
+    fun muteAccount(notifications: Boolean, duration: Int) {
+        changeRelationship(RelationShipAction.MUTE, notifications, duration)
     }
 
     fun unmuteAccount() {
@@ -187,7 +187,7 @@ class AccountViewModel @Inject constructor(
     /**
      * @param parameter showReblogs if RelationShipAction.FOLLOW, notifications if MUTE
      */
-    private fun changeRelationship(relationshipAction: RelationShipAction, parameter: Boolean? = null) {
+    private fun changeRelationship(relationshipAction: RelationShipAction, parameter: Boolean? = null, duration: Int? = null) {
         val relation = relationshipData.value?.data
         val account = accountData.value?.data
         val isMastodon = relationshipData.value?.data?.notifying != null
@@ -227,7 +227,7 @@ class AccountViewModel @Inject constructor(
             RelationShipAction.UNFOLLOW -> mastodonApi.unfollowAccount(accountId)
             RelationShipAction.BLOCK -> mastodonApi.blockAccount(accountId)
             RelationShipAction.UNBLOCK -> mastodonApi.unblockAccount(accountId)
-            RelationShipAction.MUTE -> mastodonApi.muteAccount(accountId, parameter ?: true)
+            RelationShipAction.MUTE -> mastodonApi.muteAccount(accountId, parameter ?: true, duration)
             RelationShipAction.UNMUTE -> mastodonApi.unmuteAccount(accountId)
             RelationShipAction.SUBSCRIBE -> {
                 if(isMastodon)
diff --git a/app/src/main/res/layout/dialog_mute_account.xml b/app/src/main/res/layout/dialog_mute_account.xml
index 673fc9e4..b58a277c 100644
--- a/app/src/main/res/layout/dialog_mute_account.xml
+++ b/app/src/main/res/layout/dialog_mute_account.xml
@@ -22,4 +22,17 @@
               app:buttonTint="@color/compound_button_color"
               android:text="@string/dialog_mute_hide_notifications"/>
 
-</LinearLayout>
\ No newline at end of file
+    <TextView
+        android:id="@+id/duration_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="20dp"
+        android:text="@string/label_duration" />
+
+    <Spinner
+        android:id="@+id/duration"
+        android:entries="@array/mute_duration_names"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 52d36870..835a32f8 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -441,13 +441,13 @@
     <string name="action_add_poll">إضافة استطلاع رأي</string>
     <string name="pref_title_alway_open_spoiler">افتح دائما التبويقات التي تحتوي على محتوى حساس</string>
     <string name="create_poll_title">استطلاع رأي</string>
-    <string name="poll_duration_5_min">5 دقائق</string>
-    <string name="poll_duration_30_min">30 دقيقة</string>
-    <string name="poll_duration_1_hour">ساعة واحدة</string>
-    <string name="poll_duration_6_hours">6 ساعات</string>
-    <string name="poll_duration_1_day">يوم واحد</string>
-    <string name="poll_duration_3_days">3 أيام</string>
-    <string name="poll_duration_7_days">7 أيام</string>
+    <string name="duration_5_min">5 دقائق</string>
+    <string name="duration_30_min">30 دقيقة</string>
+    <string name="duration_1_hour">ساعة واحدة</string>
+    <string name="duration_6_hours">6 ساعات</string>
+    <string name="duration_1_day">يوم واحد</string>
+    <string name="duration_3_days">3 أيام</string>
+    <string name="duration_7_days">7 أيام</string>
     <string name="add_poll_choice">ضف خيارا</string>
     <string name="poll_allow_multiple_choices">خيارات متعددة</string>
     <string name="poll_new_choice_hint">الخيار %d</string>
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index 2fb78dd8..2413319b 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -345,13 +345,13 @@
     <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="duration_7_days">৭ দিন</string>
+    <string name="duration_3_days">৩ দিন</string>
+    <string name="duration_1_day">১ দিন</string>
+    <string name="duration_6_hours">৬ ঘন্টা</string>
+    <string name="duration_1_hour">১ ঘন্টা</string>
+    <string name="duration_30_min">৩০ মিনিট</string>
+    <string name="duration_5_min">৫ মিনিট</string>
     <string name="create_poll_title">ভোটগ্রহণ</string>
     <string name="action_remove">সরান</string>
     <string name="action_add_poll">পোল যুক্ত করুন</string>
diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml
index d2e7a0aa..e578655a 100644
--- a/app/src/main/res/values-bn-rIN/strings.xml
+++ b/app/src/main/res/values-bn-rIN/strings.xml
@@ -395,13 +395,13 @@
     <string name="failed_search">অনুসন্ধান করতে ব্যর্থ</string>
     <string name="action_add_poll">পোল যুক্ত করুন</string>
     <string name="create_poll_title">ভোটগ্রহণ</string>
-    <string name="poll_duration_5_min">৫ মিনিট</string>
-    <string name="poll_duration_30_min">৩০ মিনিট</string>
-    <string name="poll_duration_1_hour">১ ঘন্টা</string>
-    <string name="poll_duration_6_hours">৬ ঘন্টা</string>
-    <string name="poll_duration_1_day">১ দিন</string>
-    <string name="poll_duration_3_days">৩ দিন</string>
-    <string name="poll_duration_7_days">৭ দিন</string>
+    <string name="duration_5_min">৫ মিনিট</string>
+    <string name="duration_30_min">৩০ মিনিট</string>
+    <string name="duration_1_hour">১ ঘন্টা</string>
+    <string name="duration_6_hours">৬ ঘন্টা</string>
+    <string name="duration_1_day">১ দিন</string>
+    <string name="duration_3_days">৩ দিন</string>
+    <string name="duration_7_days">৭ দিন</string>
     <string name="add_poll_choice">পছন্দ যুক্ত করুন</string>
     <string name="poll_allow_multiple_choices">একাধিক পছন্দ</string>
     <string name="poll_new_choice_hint">পছন্দ %d</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 882a3f38..a769dbe8 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -399,16 +399,16 @@
     <string name="report_sent_success">\@%s reportat satisfactoriament</string>
     <string name="report_description_remote_instance">El compte és d\'un altre servidor. Enviar, igualment, una copia anònima del report\?</string>
     <string name="failed_search">Cerca fallida</string>
-    <string name="poll_duration_1_hour">1 hora</string>
-    <string name="poll_duration_6_hours">6 hores</string>
+    <string name="duration_1_hour">1 hora</string>
+    <string name="duration_6_hours">6 hores</string>
     <string name="edit_poll">Edita</string>
     <string name="action_add_poll">Afegeix una enquesta</string>
     <string name="create_poll_title">Enquesta</string>
-    <string name="poll_duration_5_min">5 minuts</string>
-    <string name="poll_duration_30_min">30 minuts</string>
-    <string name="poll_duration_1_day">1 dia</string>
-    <string name="poll_duration_3_days">3 dies</string>
-    <string name="poll_duration_7_days">7 dies</string>
+    <string name="duration_5_min">5 minuts</string>
+    <string name="duration_30_min">30 minuts</string>
+    <string name="duration_1_day">1 dia</string>
+    <string name="duration_3_days">3 dies</string>
+    <string name="duration_7_days">7 dies</string>
     <string name="add_poll_choice">Afegeix una tria</string>
     <string name="poll_allow_multiple_choices">Múltiples tries</string>
     <string name="poll_new_choice_hint">Tria %d</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 42c5ce26..867b3ec2 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -422,13 +422,13 @@
     <string name="report_description_remote_instance">Tento účet je z jiného serveru. Chcete na něj také poslat anonymizovanou kopii\?</string>
     <string name="pref_title_show_notifications_filter">Zobrazit filtr oznámení</string>
     <string name="create_poll_title">Anketa</string>
-    <string name="poll_duration_5_min">5 minut</string>
-    <string name="poll_duration_30_min">30 minut</string>
-    <string name="poll_duration_1_hour">1 hodinu</string>
-    <string name="poll_duration_6_hours">6 hodin</string>
-    <string name="poll_duration_1_day">1 den</string>
-    <string name="poll_duration_3_days">3 dny</string>
-    <string name="poll_duration_7_days">7 dní</string>
+    <string name="duration_5_min">5 minut</string>
+    <string name="duration_30_min">30 minut</string>
+    <string name="duration_1_hour">1 hodinu</string>
+    <string name="duration_6_hours">6 hodin</string>
+    <string name="duration_1_day">1 den</string>
+    <string name="duration_3_days">3 dny</string>
+    <string name="duration_7_days">7 dní</string>
     <string name="add_poll_choice">Přidat možnost</string>
     <string name="poll_allow_multiple_choices">Lze zvolit více možností</string>
     <string name="poll_new_choice_hint">Možnost %d</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index edf0e7f6..6218bbbf 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -395,13 +395,13 @@
     <string name="report_description_remote_instance">Dieses Konto ist von einem anderen Server. Soll eine anonymisierte Kopie des Berichts auch dorthin geschickt werden\?</string>
     <string name="pref_title_show_notifications_filter">Benachrichtigungsfilter anzeigen</string>
     <string name="create_poll_title">Umfrage</string>
-    <string name="poll_duration_5_min">5 Minuten</string>
-    <string name="poll_duration_30_min">30 Minuten</string>
-    <string name="poll_duration_1_hour">1 Stunde</string>
-    <string name="poll_duration_6_hours">6 Stunden</string>
-    <string name="poll_duration_1_day">1 Tag</string>
-    <string name="poll_duration_3_days">3 Tage</string>
-    <string name="poll_duration_7_days">7 Tage</string>
+    <string name="duration_5_min">5 Minuten</string>
+    <string name="duration_30_min">30 Minuten</string>
+    <string name="duration_1_hour">1 Stunde</string>
+    <string name="duration_6_hours">6 Stunden</string>
+    <string name="duration_1_day">1 Tag</string>
+    <string name="duration_3_days">3 Tage</string>
+    <string name="duration_7_days">7 Tage</string>
     <string name="edit_poll">Editieren</string>
     <string name="about_tusky_version">test %s</string>
     <string name="action_add_poll">Umfrage hinzufügen</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 82988898..e2e01108 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -407,13 +407,13 @@
     <string name="action_add_poll">Aldoni baloton</string>
     <string name="pref_title_alway_open_spoiler">Ĉiam pligrandigi tootoj markiĝita per enhavaj avertoj</string>
     <string name="create_poll_title">Baloto</string>
-    <string name="poll_duration_5_min">5 minutoj</string>
-    <string name="poll_duration_30_min">30 minutoj</string>
-    <string name="poll_duration_1_hour">1 horo</string>
-    <string name="poll_duration_6_hours">6 horoj</string>
-    <string name="poll_duration_1_day">1 tago</string>
-    <string name="poll_duration_3_days">3 tagoj</string>
-    <string name="poll_duration_7_days">7 tagoj</string>
+    <string name="duration_5_min">5 minutoj</string>
+    <string name="duration_30_min">30 minutoj</string>
+    <string name="duration_1_hour">1 horo</string>
+    <string name="duration_6_hours">6 horoj</string>
+    <string name="duration_1_day">1 tago</string>
+    <string name="duration_3_days">3 tagoj</string>
+    <string name="duration_7_days">7 tagoj</string>
     <string name="add_poll_choice">Aldoni elekton</string>
     <string name="poll_allow_multiple_choices">Multaj elektoj</string>
     <string name="poll_new_choice_hint">Elekton %d</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 4072ae0c..08955280 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -420,13 +420,13 @@
     <string name="failed_search">Error al buscar</string>
     <string name="action_add_poll">Añadir encuesta</string>
     <string name="create_poll_title">Encuesta</string>
-    <string name="poll_duration_5_min">5 minutos</string>
-    <string name="poll_duration_30_min">30 minutos</string>
-    <string name="poll_duration_1_hour">1 hora</string>
-    <string name="poll_duration_6_hours">6 horas</string>
-    <string name="poll_duration_1_day">1 día</string>
-    <string name="poll_duration_3_days">3 días</string>
-    <string name="poll_duration_7_days">7 días</string>
+    <string name="duration_5_min">5 minutos</string>
+    <string name="duration_30_min">30 minutos</string>
+    <string name="duration_1_hour">1 hora</string>
+    <string name="duration_6_hours">6 horas</string>
+    <string name="duration_1_day">1 día</string>
+    <string name="duration_3_days">3 días</string>
+    <string name="duration_7_days">7 días</string>
     <string name="add_poll_choice">Añadir opción</string>
     <string name="poll_allow_multiple_choices">Opciones múltiples</string>
     <string name="poll_new_choice_hint">Opción %d</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 6dabede9..f4eb9e71 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -417,13 +417,13 @@
     <string name="failed_search">Bilaketa huts egin du</string>
     <string name="pref_title_show_notifications_filter">Erakutsi jakinarazpenen iragazkia</string>
     <string name="create_poll_title">Inkesta</string>
-    <string name="poll_duration_5_min">5 minutu</string>
-    <string name="poll_duration_30_min">30 minutu</string>
-    <string name="poll_duration_1_hour">Ordu 1</string>
-    <string name="poll_duration_6_hours">6 ordu</string>
-    <string name="poll_duration_1_day">Egun 1</string>
-    <string name="poll_duration_3_days">3 egun</string>
-    <string name="poll_duration_7_days">7 egun</string>
+    <string name="duration_5_min">5 minutu</string>
+    <string name="duration_30_min">30 minutu</string>
+    <string name="duration_1_hour">Ordu 1</string>
+    <string name="duration_6_hours">6 ordu</string>
+    <string name="duration_1_day">Egun 1</string>
+    <string name="duration_3_days">3 egun</string>
+    <string name="duration_7_days">7 egun</string>
     <string name="add_poll_choice">Gehitu aukera</string>
     <string name="poll_allow_multiple_choices">Aukera anitzak</string>
     <string name="poll_new_choice_hint">%d. aukera</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index a4284406..2f20b210 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -400,13 +400,13 @@
     <string name="failed_search">شکست در جست‌وجو</string>
     <string name="pref_title_show_notifications_filter">نمایش پالایهٔ آگاهی‌ها</string>
     <string name="create_poll_title">نظرسنجی</string>
-    <string name="poll_duration_5_min">۵ دقیقه</string>
-    <string name="poll_duration_30_min">۳۰ دقیقه</string>
-    <string name="poll_duration_1_hour">۱ ساعت</string>
-    <string name="poll_duration_6_hours">۶ ساعت</string>
-    <string name="poll_duration_1_day">۱ روز</string>
-    <string name="poll_duration_3_days">۳ روز</string>
-    <string name="poll_duration_7_days">۷ روز</string>
+    <string name="duration_5_min">۵ دقیقه</string>
+    <string name="duration_30_min">۳۰ دقیقه</string>
+    <string name="duration_1_hour">۱ ساعت</string>
+    <string name="duration_6_hours">۶ ساعت</string>
+    <string name="duration_1_day">۱ روز</string>
+    <string name="duration_3_days">۳ روز</string>
+    <string name="duration_7_days">۷ روز</string>
     <string name="add_poll_choice">افزودن گزینه</string>
     <string name="poll_allow_multiple_choices">گزینه‌های چندگانه</string>
     <string name="poll_new_choice_hint">گزینهٔ %d</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c0ad6bfd..6240d813 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -425,13 +425,13 @@
     <string name="pref_title_alway_open_spoiler">Toujours ouvrir les pouets avec un contenu sensible</string>
     <string name="action_add_poll">Ajouter un sondage</string>
     <string name="create_poll_title">Sondage</string>
-    <string name="poll_duration_5_min">5 minutes</string>
-    <string name="poll_duration_30_min">30 minutes</string>
-    <string name="poll_duration_1_hour">1 heure</string>
-    <string name="poll_duration_6_hours">6 heures</string>
-    <string name="poll_duration_1_day">1 jour</string>
-    <string name="poll_duration_3_days">3 jours</string>
-    <string name="poll_duration_7_days">7 jours</string>
+    <string name="duration_5_min">5 minutes</string>
+    <string name="duration_30_min">30 minutes</string>
+    <string name="duration_1_hour">1 heure</string>
+    <string name="duration_6_hours">6 heures</string>
+    <string name="duration_1_day">1 jour</string>
+    <string name="duration_3_days">3 jours</string>
+    <string name="duration_7_days">7 jours</string>
     <string name="add_poll_choice">Ajouter un choix</string>
     <string name="poll_allow_multiple_choices">Choix multiples</string>
     <string name="poll_new_choice_hint">Choix %d</string>
diff --git a/app/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml
index fa8b8562..aad2a612 100644
--- a/app/src/main/res/values-ga/strings.xml
+++ b/app/src/main/res/values-ga/strings.xml
@@ -445,13 +445,13 @@
     <string name="pref_title_show_notifications_filter">Taispeáin scagaire Fógraí</string>
     <string name="pref_title_enable_swipe_for_tabs">Cumasaigh gotha swipe aistriú idir cluaisíní</string>
     <string name="create_poll_title">Vótaíocht</string>
-    <string name="poll_duration_5_min">5 nóiméad</string>
-    <string name="poll_duration_30_min">30 nóiméad</string>
-    <string name="poll_duration_1_hour">1 uair an chloig</string>
-    <string name="poll_duration_6_hours">6 uair an chloig</string>
-    <string name="poll_duration_1_day">1 lá</string>
-    <string name="poll_duration_3_days">3 lá</string>
-    <string name="poll_duration_7_days">7 lá</string>
+    <string name="duration_5_min">5 nóiméad</string>
+    <string name="duration_30_min">30 nóiméad</string>
+    <string name="duration_1_hour">1 uair an chloig</string>
+    <string name="duration_6_hours">6 uair an chloig</string>
+    <string name="duration_1_day">1 lá</string>
+    <string name="duration_3_days">3 lá</string>
+    <string name="duration_7_days">7 lá</string>
     <string name="add_poll_choice">Cuir rogha leis</string>
     <string name="poll_allow_multiple_choices">Ilroghanna</string>
     <string name="poll_new_choice_hint">Rogha %d</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 466019f6..a4c1b373 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -200,13 +200,13 @@
     <string name="add_poll_choice">विकल्प जोड़ें</string>
     <string name="poll_new_choice_hint">विकल्प %d</string>
     <string name="poll_allow_multiple_choices">कई विकल्प</string>
-    <string name="poll_duration_7_days">7 दिन</string>
-    <string name="poll_duration_3_days">3 दिन</string>
-    <string name="poll_duration_1_day">1 दिन</string>
-    <string name="poll_duration_6_hours">6 घंटे</string>
-    <string name="poll_duration_1_hour">1 घंटा</string>
-    <string name="poll_duration_30_min">30 मिनिट</string>
-    <string name="poll_duration_5_min">5 मिनट</string>
+    <string name="duration_7_days">7 दिन</string>
+    <string name="duration_3_days">3 दिन</string>
+    <string name="duration_1_day">1 दिन</string>
+    <string name="duration_6_hours">6 घंटे</string>
+    <string name="duration_1_hour">1 घंटा</string>
+    <string name="duration_30_min">30 मिनिट</string>
+    <string name="duration_5_min">5 मिनट</string>
     <plurals name="poll_timespan_hours">
         <item quantity="one">%d घंटा शेष</item>
         <item quantity="other">%d घंटे शेष</item>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 4c1f5cd7..9215ed09 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -417,13 +417,13 @@
     <string name="failed_search">Sikertelen keresés</string>
     <string name="action_add_poll">Szavazás hozzáadása</string>
     <string name="create_poll_title">Szavazás</string>
-    <string name="poll_duration_5_min">5 perc</string>
-    <string name="poll_duration_30_min">30 perc</string>
-    <string name="poll_duration_1_hour">1 óra</string>
-    <string name="poll_duration_6_hours">6 óra</string>
-    <string name="poll_duration_1_day">1 nap</string>
-    <string name="poll_duration_3_days">3 nap</string>
-    <string name="poll_duration_7_days">7 nap</string>
+    <string name="duration_5_min">5 perc</string>
+    <string name="duration_30_min">30 perc</string>
+    <string name="duration_1_hour">1 óra</string>
+    <string name="duration_6_hours">6 óra</string>
+    <string name="duration_1_day">1 nap</string>
+    <string name="duration_3_days">3 nap</string>
+    <string name="duration_7_days">7 nap</string>
     <string name="add_poll_choice">Válasz hozzáadása</string>
     <string name="poll_allow_multiple_choices">Több lehetőség</string>
     <string name="poll_new_choice_hint">Válasz %d</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 4e27ac52..e52cda27 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -396,13 +396,13 @@
     <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="duration_5_min">5 mínútur</string>
+    <string name="duration_30_min">30 mínútur</string>
+    <string name="duration_1_hour">1 klukkustund</string>
+    <string name="duration_6_hours">6 klukkustundir</string>
+    <string name="duration_1_day">1 dagur</string>
+    <string name="duration_3_days">3 dagar</string>
+    <string name="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>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 01dbcb69..3b716a1f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -431,13 +431,13 @@
     <string name="failed_search">Errore durante la ricerca</string>
     <string name="pref_title_show_notifications_filter">Mostra il filtro delle notifiche</string>
     <string name="create_poll_title">Sondaggio</string>
-    <string name="poll_duration_5_min">5 minuti</string>
-    <string name="poll_duration_30_min">30 minuti</string>
-    <string name="poll_duration_1_hour">1 ora</string>
-    <string name="poll_duration_6_hours">6 ore</string>
-    <string name="poll_duration_1_day">1 giorno</string>
-    <string name="poll_duration_3_days">3 giorni</string>
-    <string name="poll_duration_7_days">7 giorni</string>
+    <string name="duration_5_min">5 minuti</string>
+    <string name="duration_30_min">30 minuti</string>
+    <string name="duration_1_hour">1 ora</string>
+    <string name="duration_6_hours">6 ore</string>
+    <string name="duration_1_day">1 giorno</string>
+    <string name="duration_3_days">3 giorni</string>
+    <string name="duration_7_days">7 giorni</string>
     <string name="add_poll_choice">Aggiungi scelta</string>
     <string name="poll_allow_multiple_choices">Scelte multiple</string>
     <string name="poll_new_choice_hint">Scelta %d</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 37ecd192..df4ec931 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -370,13 +370,13 @@
     <string name="poll_ended_voted">参加した投票の結果がでました</string>
     <string name="poll_ended_created">作成した投票の結果がでました</string>
     <string name="create_poll_title">投票</string>
-    <string name="poll_duration_5_min">5分</string>
-    <string name="poll_duration_30_min">30分</string>
-    <string name="poll_duration_1_hour">1時間</string>
-    <string name="poll_duration_6_hours">6時間</string>
-    <string name="poll_duration_1_day">1日</string>
-    <string name="poll_duration_3_days">3日</string>
-    <string name="poll_duration_7_days">7日</string>
+    <string name="duration_5_min">5分</string>
+    <string name="duration_30_min">30分</string>
+    <string name="duration_1_hour">1時間</string>
+    <string name="duration_6_hours">6時間</string>
+    <string name="duration_1_day">1日</string>
+    <string name="duration_3_days">3日</string>
+    <string name="duration_7_days">7日</string>
     <string name="add_poll_choice">選択肢を追加</string>
     <string name="poll_allow_multiple_choices">複数選択可</string>
     <string name="edit_poll">編集</string>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 3c10f80b..8f51de5e 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -196,13 +196,13 @@
     <string name="failed_report">Tella-d tuccḍa deg cetki</string>
     <string name="failed_search">Tucḍa n unadi</string>
     <string name="create_poll_title">Assenqed</string>
-    <string name="poll_duration_5_min">5 n tisdidin</string>
-    <string name="poll_duration_30_min">30 n tisdidin</string>
-    <string name="poll_duration_1_hour">1 n usrag</string>
-    <string name="poll_duration_6_hours">6 n isragen</string>
-    <string name="poll_duration_1_day">1 n wass</string>
-    <string name="poll_duration_3_days">3 n wussan</string>
-    <string name="poll_duration_7_days">7 n wussan</string>
+    <string name="duration_5_min">5 n tisdidin</string>
+    <string name="duration_30_min">30 n tisdidin</string>
+    <string name="duration_1_hour">1 n usrag</string>
+    <string name="duration_6_hours">6 n isragen</string>
+    <string name="duration_1_day">1 n wass</string>
+    <string name="duration_3_days">3 n wussan</string>
+    <string name="duration_7_days">7 n wussan</string>
     <string name="poll_new_choice_hint">Tafrant %d</string>
     <string name="title_follows">Ig ṭṭafar</string>
     <string name="title_followers">Imeḍfaṛen</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 4689c5af..cf11c797 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -409,13 +409,13 @@
     <string name="pref_title_alway_open_spoiler">열람주의로 설정된 툿을 항상 펼치기</string>
     <string name="action_add_poll">투표 추가</string>
     <string name="create_poll_title">투표</string>
-    <string name="poll_duration_5_min">5분</string>
-    <string name="poll_duration_30_min">30분</string>
-    <string name="poll_duration_1_hour">1시간</string>
-    <string name="poll_duration_6_hours">6시간</string>
-    <string name="poll_duration_1_day">1일</string>
-    <string name="poll_duration_3_days">3일</string>
-    <string name="poll_duration_7_days">7일</string>
+    <string name="duration_5_min">5분</string>
+    <string name="duration_30_min">30분</string>
+    <string name="duration_1_hour">1시간</string>
+    <string name="duration_6_hours">6시간</string>
+    <string name="duration_1_day">1일</string>
+    <string name="duration_3_days">3일</string>
+    <string name="duration_7_days">7일</string>
     <string name="add_poll_choice">항목 추가</string>
     <string name="poll_allow_multiple_choices">여러 항목 선택 가능</string>
     <string name="poll_new_choice_hint">%d번 항목</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index d24e48c5..b8d2d09d 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -418,13 +418,13 @@
     <string name="pref_title_show_notifications_filter">Meldingenfilter tonen</string>
     <string name="filter_dialog_whole_word">Heel woord</string>
     <string name="filter_dialog_whole_word_description">Wanneer het trefwoord of zinsdeel alfanumeriek is, wordt het alleen gefilterd wanneer het hele woord overeenkomt</string>
-    <string name="poll_duration_5_min">5 minuten</string>
-    <string name="poll_duration_30_min">30 minuten</string>
-    <string name="poll_duration_1_hour">1 uur</string>
-    <string name="poll_duration_6_hours">6 uur</string>
-    <string name="poll_duration_1_day">1 dag</string>
-    <string name="poll_duration_3_days">3 dagen</string>
-    <string name="poll_duration_7_days">7 dagen</string>
+    <string name="duration_5_min">5 minuten</string>
+    <string name="duration_30_min">30 minuten</string>
+    <string name="duration_1_hour">1 uur</string>
+    <string name="duration_6_hours">6 uur</string>
+    <string name="duration_1_day">1 dag</string>
+    <string name="duration_3_days">3 dagen</string>
+    <string name="duration_7_days">7 dagen</string>
     <string name="add_poll_choice">Voeg keuze toe</string>
     <string name="poll_allow_multiple_choices">Meerdere keuzes</string>
     <string name="poll_new_choice_hint">Keuze %d</string>
diff --git a/app/src/main/res/values-no-rNB/strings.xml b/app/src/main/res/values-no-rNB/strings.xml
index 9201edb7..cd633dd0 100644
--- a/app/src/main/res/values-no-rNB/strings.xml
+++ b/app/src/main/res/values-no-rNB/strings.xml
@@ -408,13 +408,13 @@
     <string name="pref_title_alway_open_spoiler">Ekspander alltid toots markert med innholdsadvarsel</string>
     <string name="action_add_poll">Legg til avstemming</string>
     <string name="create_poll_title">Avstemming</string>
-    <string name="poll_duration_5_min">5 minutter</string>
-    <string name="poll_duration_30_min">30 minutter</string>
-    <string name="poll_duration_1_hour">1 time</string>
-    <string name="poll_duration_6_hours">6 timer</string>
-    <string name="poll_duration_1_day">1 dag</string>
-    <string name="poll_duration_3_days">3 dager</string>
-    <string name="poll_duration_7_days">7 dager</string>
+    <string name="duration_5_min">5 minutter</string>
+    <string name="duration_30_min">30 minutter</string>
+    <string name="duration_1_hour">1 time</string>
+    <string name="duration_6_hours">6 timer</string>
+    <string name="duration_1_day">1 dag</string>
+    <string name="duration_3_days">3 dager</string>
+    <string name="duration_7_days">7 dager</string>
     <string name="add_poll_choice">Legg til valg</string>
     <string name="poll_allow_multiple_choices">Flere valg</string>
     <string name="poll_new_choice_hint">Valg %d</string>
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index 2ffd91ed..c22afc29 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -419,13 +419,13 @@
     <string name="failed_search">Fracàs de la recèrca</string>
     <string name="action_add_poll">Ajustar un sondatge</string>
     <string name="create_poll_title">Sondatge</string>
-    <string name="poll_duration_5_min">5 minutas</string>
-    <string name="poll_duration_30_min">30 minutas</string>
-    <string name="poll_duration_1_hour">1 ora</string>
-    <string name="poll_duration_6_hours">6 oras</string>
-    <string name="poll_duration_1_day">1 jorn</string>
-    <string name="poll_duration_3_days">3 jorns</string>
-    <string name="poll_duration_7_days">7 jorns</string>
+    <string name="duration_5_min">5 minutas</string>
+    <string name="duration_30_min">30 minutas</string>
+    <string name="duration_1_hour">1 ora</string>
+    <string name="duration_6_hours">6 oras</string>
+    <string name="duration_1_day">1 jorn</string>
+    <string name="duration_3_days">3 jorns</string>
+    <string name="duration_7_days">7 jorns</string>
     <string name="add_poll_choice">Ajustar d’opcions</string>
     <string name="poll_allow_multiple_choices">Opcions multiplas</string>
     <string name="poll_new_choice_hint">Opcion %d</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 5a6ec295..9082f634 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -430,13 +430,13 @@
     <string name="failed_search">Wyszukiwanie nie powidło się</string>
     <string name="pref_title_show_notifications_filter">Pokaż filtr powiadomień</string>
     <string name="create_poll_title">Głosowanie</string>
-    <string name="poll_duration_5_min">5 minut</string>
-    <string name="poll_duration_30_min">30 minut</string>
-    <string name="poll_duration_1_hour">1 godzina</string>
-    <string name="poll_duration_6_hours">6 godzin</string>
-    <string name="poll_duration_1_day">1 dzień</string>
-    <string name="poll_duration_3_days">3 dni</string>
-    <string name="poll_duration_7_days">7 dni</string>
+    <string name="duration_5_min">5 minut</string>
+    <string name="duration_30_min">30 minut</string>
+    <string name="duration_1_hour">1 godzina</string>
+    <string name="duration_6_hours">6 godzin</string>
+    <string name="duration_1_day">1 dzień</string>
+    <string name="duration_3_days">3 dni</string>
+    <string name="duration_7_days">7 dni</string>
     <string name="add_poll_choice">Dodaj wybór</string>
     <string name="poll_allow_multiple_choices">Kilka wyborów</string>
     <string name="poll_new_choice_hint">Opcja %d</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index c5e9a7aa..95bf8a29 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -417,13 +417,13 @@
     <string name="title_accounts">Contas</string>
     <string name="failed_search">Erro ao pesquisar</string>
     <string name="create_poll_title">Enquete</string>
-    <string name="poll_duration_5_min">5 minutos</string>
-    <string name="poll_duration_30_min">30 minutos</string>
-    <string name="poll_duration_1_hour">1 hora</string>
-    <string name="poll_duration_6_hours">6 horas</string>
-    <string name="poll_duration_1_day">1 dia</string>
-    <string name="poll_duration_3_days">3 dias</string>
-    <string name="poll_duration_7_days">7 dias</string>
+    <string name="duration_5_min">5 minutos</string>
+    <string name="duration_30_min">30 minutos</string>
+    <string name="duration_1_hour">1 hora</string>
+    <string name="duration_6_hours">6 horas</string>
+    <string name="duration_1_day">1 dia</string>
+    <string name="duration_3_days">3 dias</string>
+    <string name="duration_7_days">7 dias</string>
     <string name="add_poll_choice">Adicionar opção</string>
     <string name="poll_allow_multiple_choices">Múltiplas opções</string>
     <string name="poll_new_choice_hint">Opção %d</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index a13d58ac..6adb5768 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -444,13 +444,13 @@
     <string name="title_accounts">Аккаунты</string>
     <string name="failed_search">Поиск завершился ошибкой</string>
     <string name="create_poll_title">Опрос</string>
-    <string name="poll_duration_5_min">5 минут</string>
-    <string name="poll_duration_30_min">30 минут</string>
-    <string name="poll_duration_1_hour">1 час</string>
-    <string name="poll_duration_6_hours">6 часов</string>
-    <string name="poll_duration_1_day">1 день</string>
-    <string name="poll_duration_3_days">3 дня</string>
-    <string name="poll_duration_7_days">7 дней</string>
+    <string name="duration_5_min">5 минут</string>
+    <string name="duration_30_min">30 минут</string>
+    <string name="duration_1_hour">1 час</string>
+    <string name="duration_6_hours">6 часов</string>
+    <string name="duration_1_day">1 день</string>
+    <string name="duration_3_days">3 дня</string>
+    <string name="duration_7_days">7 дней</string>
     <string name="add_poll_choice">Добавить</string>
     <string name="poll_allow_multiple_choices">Множественный выбор</string>
     <string name="poll_new_choice_hint">Вариант %d</string>
diff --git a/app/src/main/res/values-sa/strings.xml b/app/src/main/res/values-sa/strings.xml
index a322838e..2fb217ad 100644
--- a/app/src/main/res/values-sa/strings.xml
+++ b/app/src/main/res/values-sa/strings.xml
@@ -373,13 +373,13 @@
     <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="duration_7_days">७ दिनानि</string>
+    <string name="duration_3_days">३ दिनानि</string>
+    <string name="duration_1_day">१ दिनम्</string>
+    <string name="duration_6_hours">६ घण्टाः</string>
+    <string name="duration_1_hour">१ घण्टा</string>
+    <string name="duration_30_min">३० निमेषाः</string>
+    <string name="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>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 5f4ca650..70bb80be 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -415,13 +415,13 @@
     <string name="pref_title_alway_open_spoiler">Vedno razširite tute, označene z opozorilom o vsebini</string>
     <string name="action_add_poll">Dodaj anketo</string>
     <string name="create_poll_title">Anketa</string>
-    <string name="poll_duration_5_min">5 minut</string>
-    <string name="poll_duration_30_min">30 minut</string>
-    <string name="poll_duration_1_hour">1 ura</string>
-    <string name="poll_duration_6_hours">6 ur</string>
-    <string name="poll_duration_1_day">1 dan</string>
-    <string name="poll_duration_3_days">3 dni</string>
-    <string name="poll_duration_7_days">7 dni</string>
+    <string name="duration_5_min">5 minut</string>
+    <string name="duration_30_min">30 minut</string>
+    <string name="duration_1_hour">1 ura</string>
+    <string name="duration_6_hours">6 ur</string>
+    <string name="duration_1_day">1 dan</string>
+    <string name="duration_3_days">3 dni</string>
+    <string name="duration_7_days">7 dni</string>
     <string name="add_poll_choice">Dodaj izbiro</string>
     <string name="poll_allow_multiple_choices">Več izbir</string>
     <string name="poll_new_choice_hint">Izbira %d</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 6b5296a3..ff8a5a13 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -425,13 +425,13 @@
     <string name="failed_search">Sökning misslyckades</string>
     <string name="action_add_poll">Skapa en omröstning</string>
     <string name="create_poll_title">Omröstning</string>
-    <string name="poll_duration_5_min">5 minuter</string>
-    <string name="poll_duration_30_min">30 minuter</string>
-    <string name="poll_duration_1_hour">1 timme</string>
-    <string name="poll_duration_6_hours">6 timmar</string>
-    <string name="poll_duration_1_day">1 dag</string>
-    <string name="poll_duration_3_days">3 dagar</string>
-    <string name="poll_duration_7_days">7 dagar</string>
+    <string name="duration_5_min">5 minuter</string>
+    <string name="duration_30_min">30 minuter</string>
+    <string name="duration_1_hour">1 timme</string>
+    <string name="duration_6_hours">6 timmar</string>
+    <string name="duration_1_day">1 dag</string>
+    <string name="duration_3_days">3 dagar</string>
+    <string name="duration_7_days">7 dagar</string>
     <string name="add_poll_choice">Lägg till alternativ</string>
     <string name="poll_allow_multiple_choices">Flerval</string>
     <string name="poll_new_choice_hint">Val %d</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 2a5a035e..2affaa29 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -265,9 +265,9 @@
     <string name="title_direct_messages">நேரடி தகவல்</string>
     <string name="title_tab_preferences">பட்டைகள்</string>
     <string name="title_statuses_pinned">பொருத்தப்பட்டது</string>
-    <string name="poll_duration_1_day">1 நாள்</string>
-    <string name="poll_duration_3_days">3 நாட்கள்</string>
-    <string name="poll_duration_7_days">7 நாட்கள்</string>
+    <string name="duration_1_day">1 நாள்</string>
+    <string name="duration_3_days">3 நாட்கள்</string>
+    <string name="duration_7_days">7 நாட்கள்</string>
     <string name="add_poll_choice">விருப்பத்தைச் சேர்</string>
     <string name="notification_follow_request_name">பின்பற்ற கோரிக்கை</string>
     <string name="filter_dialog_remove_button">நீக்கு</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index ea831d51..5c994db6 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="add_poll_choice">เพิ่มตัวเลือก</string>
-    <string name="poll_duration_7_days">7 วัน</string>
-    <string name="poll_duration_3_days">3 วัน</string>
-    <string name="poll_duration_1_day">1 วัน</string>
-    <string name="poll_duration_6_hours">6 ชั่วโมง</string>
-    <string name="poll_duration_1_hour">1 ชั่วโมง</string>
-    <string name="poll_duration_30_min">30 นาที</string>
-    <string name="poll_duration_5_min">5 นาที</string>
+    <string name="duration_7_days">7 วัน</string>
+    <string name="duration_3_days">3 วัน</string>
+    <string name="duration_1_day">1 วัน</string>
+    <string name="duration_6_hours">6 ชั่วโมง</string>
+    <string name="duration_1_hour">1 ชั่วโมง</string>
+    <string name="duration_30_min">30 นาที</string>
+    <string name="duration_5_min">5 นาที</string>
     <string name="create_poll_title">โพล</string>
     <string name="pref_title_enable_swipe_for_tabs">เปิดใช้งานการเลื่อนนิ้วเพื่อสลับระหว่างแท็บ</string>
     <string name="pref_title_show_notifications_filter">แสดงตัวกรองการแจ้งเตือน</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index fdf123a1..596bafa4 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -418,13 +418,13 @@
     <string name="title_accounts">Hesaplar</string>
     <string name="failed_search">Arama başarısız</string>
     <string name="create_poll_title">Anket</string>
-    <string name="poll_duration_5_min">5 dakika</string>
-    <string name="poll_duration_30_min">30 dakika</string>
-    <string name="poll_duration_1_hour">1 saat</string>
-    <string name="poll_duration_6_hours">6 saat</string>
-    <string name="poll_duration_1_day">1 gün</string>
-    <string name="poll_duration_3_days">3 gün</string>
-    <string name="poll_duration_7_days">7 gün</string>
+    <string name="duration_5_min">5 dakika</string>
+    <string name="duration_30_min">30 dakika</string>
+    <string name="duration_1_hour">1 saat</string>
+    <string name="duration_6_hours">6 saat</string>
+    <string name="duration_1_day">1 gün</string>
+    <string name="duration_3_days">3 gün</string>
+    <string name="duration_7_days">7 gün</string>
     <string name="add_poll_choice">Seçenek ekle</string>
     <string name="poll_allow_multiple_choices">Çoklu seçim</string>
     <string name="edit_poll">Düzenle</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 295c438b..460ebb2d 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -318,13 +318,13 @@
     <string name="poll_new_choice_hint">Lựa chọn %d</string>
     <string name="poll_allow_multiple_choices">Cho phép chọn nhiều lựa chọn</string>
     <string name="add_poll_choice">Thêm lựa chọn</string>
-    <string name="poll_duration_7_days">7 ngày</string>
-    <string name="poll_duration_3_days">3 ngày</string>
-    <string name="poll_duration_1_day">1 ngày</string>
-    <string name="poll_duration_6_hours">6 giờ</string>
-    <string name="poll_duration_1_hour">1 giờ</string>
-    <string name="poll_duration_30_min">30 phút</string>
-    <string name="poll_duration_5_min">5 phút</string>
+    <string name="duration_7_days">7 ngày</string>
+    <string name="duration_3_days">3 ngày</string>
+    <string name="duration_1_day">1 ngày</string>
+    <string name="duration_6_hours">6 giờ</string>
+    <string name="duration_1_hour">1 giờ</string>
+    <string name="duration_30_min">30 phút</string>
+    <string name="duration_5_min">5 phút</string>
     <string name="create_poll_title">Bình chọn</string>
     <string name="pref_title_enable_swipe_for_tabs">Vuốt qua lại giữa các tab</string>
     <string name="pref_title_show_notifications_filter">Hiện bộ lọc thông báo</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index ccd20b0b..03c70771 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -436,13 +436,13 @@
     <string name="failed_search">搜索失败</string>
     <string name="pref_title_show_notifications_filter">显示通知过滤器</string>
     <string name="create_poll_title">投票</string>
-    <string name="poll_duration_5_min">5 分钟</string>
-    <string name="poll_duration_30_min">30 分钟</string>
-    <string name="poll_duration_1_hour">1 小时</string>
-    <string name="poll_duration_6_hours">6 小时</string>
-    <string name="poll_duration_1_day">1 天</string>
-    <string name="poll_duration_3_days">3 天</string>
-    <string name="poll_duration_7_days">7 天</string>
+    <string name="duration_5_min">5 分钟</string>
+    <string name="duration_30_min">30 分钟</string>
+    <string name="duration_1_hour">1 小时</string>
+    <string name="duration_6_hours">6 小时</string>
+    <string name="duration_1_day">1 天</string>
+    <string name="duration_3_days">3 天</string>
+    <string name="duration_7_days">7 天</string>
     <string name="add_poll_choice">添加选择</string>
     <string name="poll_allow_multiple_choices">多项选择</string>
     <string name="poll_new_choice_hint">选择 %d</string>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 027247a0..794682c6 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -145,13 +145,13 @@
 
 
     <string-array name="poll_duration_names">
-        <item>@string/poll_duration_5_min</item>
-        <item>@string/poll_duration_30_min</item>
-        <item>@string/poll_duration_1_hour</item>
-        <item>@string/poll_duration_6_hours</item>
-        <item>@string/poll_duration_1_day</item>
-        <item>@string/poll_duration_3_days</item>
-        <item>@string/poll_duration_7_days</item>
+        <item>@string/duration_5_min</item>
+        <item>@string/duration_30_min</item>
+        <item>@string/duration_1_hour</item>
+        <item>@string/duration_6_hours</item>
+        <item>@string/duration_1_day</item>
+        <item>@string/duration_3_days</item>
+        <item>@string/duration_7_days</item>
     </string-array>
 
     <integer-array name="poll_duration_values"> <!-- values in seconds, corresponding to poll_duration_names -->
@@ -164,5 +164,27 @@
         <item>604800</item>
     </integer-array>
 
+    <string-array name="mute_duration_names">
+        <item>@string/duration_indefinite</item>
+        <item>@string/duration_5_min</item>
+        <item>@string/duration_30_min</item>
+        <item>@string/duration_1_hour</item>
+        <item>@string/duration_6_hours</item>
+        <item>@string/duration_1_day</item>
+        <item>@string/duration_3_days</item>
+        <item>@string/duration_7_days</item>
+    </string-array>
+
+    <integer-array name="mute_duration_values"> <!-- values in seconds, corresponding to mute_duration_names -->
+        <item>0</item>
+        <item>300</item>
+        <item>1800</item>
+        <item>3600</item>
+        <item>21600</item>
+        <item>86400</item>
+        <item>259200</item>
+        <item>604800</item>
+    </integer-array>
+
     <string name="poll_percent_format"><!-- 15% --> &lt;b>%1$d%%&lt;/b></string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 87d63df5..d0bc048d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -558,13 +558,15 @@
 
 
     <string name="create_poll_title">Poll</string>
-    <string name="poll_duration_5_min">5 minutes</string>
-    <string name="poll_duration_30_min">30 minutes</string>
-    <string name="poll_duration_1_hour">1 hour</string>
-    <string name="poll_duration_6_hours">6 hours</string>
-    <string name="poll_duration_1_day">1 day</string>
-    <string name="poll_duration_3_days">3 days</string>
-    <string name="poll_duration_7_days">7 days</string>
+    <string name="label_duration">Duration</string>
+    <string name="duration_indefinite">Indefinite</string>
+    <string name="duration_5_min">5 minutes</string>
+    <string name="duration_30_min">30 minutes</string>
+    <string name="duration_1_hour">1 hour</string>
+    <string name="duration_6_hours">6 hours</string>
+    <string name="duration_1_day">1 day</string>
+    <string name="duration_3_days">3 days</string>
+    <string name="duration_7_days">7 days</string>
     <string name="add_poll_choice">Add choice</string>
     <string name="poll_allow_multiple_choices">Multiple choices</string>
     <string name="poll_new_choice_hint">Choice %d</string>