From 52de106ddf107140a4d044dd0cc0ae2c4201fc09 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <k.pozniak@gmx.at>
Date: Sat, 22 Aug 2020 17:11:03 +0200
Subject: [PATCH] fix strings

---
 app/src/main/res/values-de/strings.xml     | 10 ----------
 app/src/main/res/values-fa/strings.xml     |  5 -----
 app/src/main/res/values-fr/strings.xml     | 10 +---------
 app/src/main/res/values-gd/strings.xml     |  1 -
 app/src/main/res/values-hi/strings.xml     | 12 ------------
 app/src/main/res/values-is/strings.xml     | 16 ----------------
 app/src/main/res/values-sl/strings.xml     |  8 +-------
 app/src/main/res/values-zh-rCN/strings.xml |  4 ----
 8 files changed, 2 insertions(+), 64 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4089804b..2b771bce 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -450,16 +450,6 @@
         <item quantity="other">%s Personen</item>
     </plurals>
     <string name="pref_title_gradient_for_media">Farbverlauf für versteckte Medien anzeigen</string>
-    <string name="abbreviated_seconds_ago">%dS</string>
-    <string name="abbreviated_hours_ago">%dS</string>
-    <string name="abbreviated_years_ago">%dJ</string>
-    <string name="abbreviated_in_days">in %d T.</string>
-    <string name="abbreviated_in_years">in %d J.</string>
-    <string name="abbreviated_minutes_ago">%d Min.</string>
-    <string name="abbreviated_days_ago">%d T.</string>
-    <string name="abbreviated_in_seconds">in %d Sek.</string>
-    <string name="abbreviated_in_minutes">in %d Min.</string>
-    <string name="abbreviated_in_hours">in %d St.</string>
     <string name="pref_main_nav_position_option_bottom">Unten</string>
     <string name="pref_main_nav_position_option_top">Oben</string>
     <string name="action_unmute_domain">Ton einschalten %s</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 0089cf98..80707e70 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -370,11 +370,6 @@
     <string name="compose_shortcut_long_label">ایجاد بوق</string>
     <string name="compose_shortcut_short_label">ایجاد</string>
     <string name="notification_clear_text">مطمئنید می‌خواهید تمام آگاهی‌هایتان را برای همیشه پاک کنید؟</string>
-    <string name="compose_preview_image_description">کنش‌ها برای تصاویر</string>
-    <plurals name="poll_info_votes">
-        <item quantity="one">%s رای</item>
-        <item quantity="other"></item>
-    </plurals>
     <string name="poll_info_time_relative">%s باقی مانده</string>
     <string name="poll_info_time_absolute">پایان یافته در %s</string>
     <string name="poll_info_closed">بسته شده</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index fd0d6f6d..09f96374 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -372,10 +372,6 @@
     <string name="notification_clear_text">Désirez-vous nettoyer toutes vos notifications de façon permanente \?</string>
     <string name="action_delete_and_redraft">Effacer et ré-écrire</string>
     <string name="dialog_redraft_toot_warning">Effacer et ré-écrire ce pouet \?</string>
-    <plurals name="poll_info_votes">
-        <item quantity="one"/>
-        <item quantity="other"/>
-    </plurals>
     <string name="poll_info_time_relative">%s restant</string>
     <string name="poll_info_time_absolute">Termina à %s</string>
     <string name="poll_info_closed">Terminé</string>
@@ -419,7 +415,7 @@
     <string name="failed_report">Échec du signalement</string>
     <string name="failed_fetch_statuses">Échec de récupération des statuts</string>
     <string name="report_description_1">Le rapport sera envoyé aux modérateur·rice·s de votre instance. Vous pouvez expliquer pourquoi vous signalez le compte ci-dessous :</string>
-    <string name="mute_domain_warning">Êtes-vous sûr⋅e de vouloir bloquer {domain} en entier \? Vous ne verrez plus de contenu provenant de ce domaine, ni dans fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.</string>
+    <string name="mute_domain_warning">Êtes-vous sûr⋅e de vouloir bloquer %s en entier? Vous ne verrez plus de contenu provenant de ce domaine, ni dans fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.</string>
     <string name="button_done">Terminé</string>
     <string name="report_description_remote_instance">Le compte provient d’un autre serveur. Envoyez également une copie anonyme du rapport \?</string>
     <string name="pref_title_show_notifications_filter">Montrer le filtre des notifications</string>
@@ -463,10 +459,6 @@
     <string name="pref_title_confirm_reblogs">Afficher une boite de confirmation avant de booster</string>
     <string name="pref_title_show_cards_in_timelines">Afficher des aperçus des liens dans les fils</string>
     <string name="notification_follow_request_format">%s a demandé à vous suivre</string>
-    <plurals name="poll_info_people">
-        <item quantity="one"/>
-        <item quantity="other"/>
-    </plurals>
     <string name="notification_follow_request_description">Notifications à propos des demandes d’abonnement</string>
     <string name="pref_title_notification_filter_follow_requests">Demande d’abonnement</string>
     <string name="dialog_mute_warning">Mettre en sourdine @%s \?</string>
diff --git a/app/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml
index 4f38430e..be0a5b0a 100644
--- a/app/src/main/res/values-gd/strings.xml
+++ b/app/src/main/res/values-gd/strings.xml
@@ -42,7 +42,6 @@
     <string name="action_show_reblogs">Seall boosts</string>
     <string name="action_block">Caisg</string>
     <string name="action_compose">Dèan-sgrìobhaiche</string>
-    <string name="action_logout_confirm">Tuilleadh</string>
     <string name="action_content_warning">Rabhadh susbaint</string>
     <string name="action_compose_shortcut">Dèan-sgrìobhaiche</string>
     <string name="compose_shortcut_short_label">Dèan-sgrìobhaiche</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 05f7a612..ec584ff7 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -207,14 +207,6 @@
     <string name="poll_duration_1_hour">1 घंटा</string>
     <string name="poll_duration_30_min">30 मिनिट</string>
     <string name="poll_duration_5_min">5 मिनट</string>
-    <plurals name="poll_timespan_seconds">
-        <item quantity="one"/>
-        <item quantity="other"/>
-    </plurals>
-    <plurals name="poll_timespan_minutes">
-        <item quantity="one"/>
-        <item quantity="other"/>
-    </plurals>
     <plurals name="poll_timespan_hours">
         <item quantity="one">%d घंटा</item>
         <item quantity="other">%d घंटे</item>
@@ -297,10 +289,6 @@
         <item quantity="one"><b>%s</b> ने बढ़ावा दिया</item>
         <item quantity="other"><b>%s</b> ने बढ़ावा दिया</item>
     </plurals>
-    <plurals name="favs">
-        <item quantity="one"/>
-        <item quantity="other"/>
-    </plurals>
     <string name="pin_action">पिन</string>
     <string name="unpin_action">अनपिन</string>
     <string name="label_remote_account">नीचे दी गई जानकारी उपयोगकर्ता की प्रोफ़ाइल को अपूर्ण रूप से दर्शा सकती है। ब्राउज़र में पूर्ण प्रोफ़ाइल खोलने के लिए यहां दबाएं।</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 20536a03..7d1088b9 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -383,22 +383,6 @@
     <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"/>
-        <item quantity="other"/>
-    </plurals>
-    <plurals name="poll_timespan_hours">
-        <item quantity="one"/>
-        <item quantity="other"/>
-    </plurals>
-    <plurals name="poll_timespan_minutes">
-        <item quantity="one"/>
-        <item quantity="other"/>
-    </plurals>
-    <plurals name="poll_timespan_seconds">
-        <item quantity="one"/>
-        <item quantity="other"/>
-    </plurals>
     <string name="button_continue">Halda áfram</string>
     <string name="button_back">Til baka</string>
     <string name="button_done">Lokið</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 7676f18c..9a60f25d 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -49,7 +49,7 @@
     <string name="notification_reblog_format">% je spodbudil tvoj tut</string>
     <string name="notification_favourite_format">% je vzljubil vaš tut</string>
     <string name="notification_follow_format">% vam sledi</string>
-    <string name="report_username_format">Prijavi @%</string>
+    <string name="report_username_format">Prijavi @%s</string>
     <string name="report_comment_hint">Dodatni komentarji\?</string>
     <string name="action_quick_reply">Hiter odgovor</string>
     <string name="action_reply">Odgovori</string>
@@ -435,12 +435,6 @@
     <string name="post_lookup_error_format">Napaka pri iskanju objave %s</string>
     <string name="about_powered_by_tusky">Poganja ga Tusky</string>
     <string name="status_boosted_format">%s spodbudil</string>
-    <plurals name="favs">
-        <item quantity="one"/>
-        <item quantity="two"/>
-        <item quantity="few"/>
-        <item quantity="other"/>
-    </plurals>
     <string name="hashtags">Ključniki</string>
     <string name="notification_follow_request_name">Zahteve za Sledenje</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index debf3f22..7698d7d9 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -462,10 +462,6 @@
     <string name="pref_title_confirm_reblogs">转嘟前提示确认</string>
     <string name="pref_title_show_cards_in_timelines">在时间轴上显示链接预览</string>
     <string name="pref_title_enable_swipe_for_tabs">滑动切换标签页</string>
-    <plurals name="poll_info_people">
-        <item quantity="one">%s 个人</item>
-        <item quantity="other"/>
-    </plurals>
     <string name="compose_preview_image_description">处理图片 %s</string>
     <string name="add_hashtag_title">添加话题名</string>
     <string name="notification_follow_request_description">关注请求的通知</string>