From a5b2d8b8135926b902599975a1b52fc32a133258 Mon Sep 17 00:00:00 2001
From: Conny Duck <k.pozniak@gmx.at>
Date: Sun, 5 May 2019 21:25:11 +0200
Subject: [PATCH] fix strings

---
 app/src/main/res/values-ca/strings.xml     |  3 ---
 app/src/main/res/values-nl/strings.xml     |  4 ----
 app/src/main/res/values-zh-rCN/strings.xml | 20 ++++++++------------
 app/src/main/res/values-zh-rHK/strings.xml | 20 ++++++++------------
 app/src/main/res/values-zh-rMO/strings.xml | 20 ++++++++------------
 app/src/main/res/values-zh-rSG/strings.xml | 20 ++++++++------------
 app/src/main/res/values-zh-rTW/strings.xml | 20 ++++++++------------
 7 files changed, 40 insertions(+), 67 deletions(-)

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 0ea20aba..3add9efc 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -83,7 +83,6 @@
     <string name="action_unmute">Deixa de silenciar</string>
     <string name="action_mention">Menciona</string>
     <string name="action_hide_media">Amaga el multimèdia</string>
-    <string name="action_open_drawer"></string>
     <string name="action_save">Desa</string>
     <string name="action_edit_profile">Edita el perfil</string>
     <string name="action_undo">Desfés</string>
@@ -207,8 +206,6 @@
     <string name="status_media_images">Imatges</string>
     <string name="status_media_video">Vídeo</string>
 
-    <string name="state_follow_requested"></string>
-
     <string name="no_content">no hi ha cap contingut</string>
 
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 7a1bca33..033dfd7c 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -390,10 +390,6 @@
 
     <string name="notifications_clear">Leegmaken</string>
     <string name="notifications_apply_filter">Filter</string>
-    <string name="filter_favorites">\@string/notification_channel_favourite_name</string>
-    <string name="filter_boosts">\@string/notification_channel_boost_name</string>
-    <string name="filter_follows">\@string/notification_channel_follow_name</string>
-    <string name="filter_mentions">\@string/notification_channel_mention_name</string>
     <string name="filter_apply">Toepassen</string>
 
     <string name="compose_shortcut_long_label">Toot schrijven</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 44452765..f1eecd7c 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -249,14 +249,14 @@
     <string name="media_hide_none">总是显示敏感媒体</string>
     <string name="media_hide_all">总是隐藏所有媒体</string>
 
-    <string name="notification_channel_mention_name">被提及</string>
-    <string name="notification_channel_mention_descriptions">当有用户在嘟文中提及我时</string>
-    <string name="notification_channel_follow_name">关注者</string>
-    <string name="notification_channel_follow_description">当有用户关注我时</string>
-    <string name="notification_channel_boost_name">转嘟</string>
-    <string name="notification_channel_boost_description">当有用户转嘟了我的嘟文时</string>
-    <string name="notification_channel_favourite_name">收藏</string>
-    <string name="notification_channel_favourite_description">当有用户收藏了我的嘟文时</string>
+    <string name="notification_mention_name">被提及</string>
+    <string name="notification_mention_descriptions">当有用户在嘟文中提及我时</string>
+    <string name="notification_follow_name">关注者</string>
+    <string name="notification_follow_description">当有用户关注我时</string>
+    <string name="notification_boost_name">转嘟</string>
+    <string name="notification_boost_description">当有用户转嘟了我的嘟文时</string>
+    <string name="notification_favourite_name">收藏</string>
+    <string name="notification_favourite_description">当有用户收藏了我的嘟文时</string>
 
 
     <string name="notification_mention_format">%s 提及了你</string>
@@ -462,10 +462,6 @@
     <string name="hashtag">话题</string>
     <string name="notifications_clear">清除</string>
     <string name="notifications_apply_filter">过滤</string>
-    <string name="filter_favorites">@string/notification_channel_favourite_name</string>
-    <string name="filter_boosts">@string/notification_channel_boost_name</string>
-    <string name="filter_follows">@string/notification_channel_follow_name</string>
-    <string name="filter_mentions">@string/notification_channel_mention_name</string>
     <string name="filter_apply">应用</string>
 
     <string name="compose_shortcut_long_label">发表新嘟文</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 4580bbb5..2ad0aaeb 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -249,14 +249,14 @@
     <string name="media_hide_none">總是顯示敏感媒體</string>
     <string name="media_hide_all">總是隱藏所有媒體</string>
 
-    <string name="notification_channel_mention_name">被提及</string>
-    <string name="notification_channel_mention_descriptions">當有使用者在嘟文中提及我時</string>
-    <string name="notification_channel_follow_name">關注者</string>
-    <string name="notification_channel_follow_description">當有使用者關注我時</string>
-    <string name="notification_channel_boost_name">轉嘟</string>
-    <string name="notification_channel_boost_description">當有使用者轉嘟了我的嘟文時</string>
-    <string name="notification_channel_favourite_name">收藏</string>
-    <string name="notification_channel_favourite_description">當有使用者收藏了我的嘟文時</string>
+    <string name="notification_mention_name">被提及</string>
+    <string name="notification_mention_descriptions">當有使用者在嘟文中提及我時</string>
+    <string name="notification_follow_name">關注者</string>
+    <string name="notification_follow_description">當有使用者關注我時</string>
+    <string name="notification_boost_name">轉嘟</string>
+    <string name="notification_boost_description">當有使用者轉嘟了我的嘟文時</string>
+    <string name="notification_favourite_name">收藏</string>
+    <string name="notification_favourite_description">當有使用者收藏了我的嘟文時</string>
 
 
     <string name="notification_mention_format">%s 提及了你</string>
@@ -462,10 +462,6 @@
     <string name="hashtag">話題</string>
     <string name="notifications_clear">清除</string>
     <string name="notifications_apply_filter">過濾</string>
-    <string name="filter_favorites">@string/notification_channel_favourite_name</string>
-    <string name="filter_boosts">@string/notification_channel_boost_name</string>
-    <string name="filter_follows">@string/notification_channel_follow_name</string>
-    <string name="filter_mentions">@string/notification_channel_mention_name</string>
     <string name="filter_apply">應用</string>
     
     <string name="compose_shortcut_long_label">發表新嘟文</string>
diff --git a/app/src/main/res/values-zh-rMO/strings.xml b/app/src/main/res/values-zh-rMO/strings.xml
index 4580bbb5..2ad0aaeb 100644
--- a/app/src/main/res/values-zh-rMO/strings.xml
+++ b/app/src/main/res/values-zh-rMO/strings.xml
@@ -249,14 +249,14 @@
     <string name="media_hide_none">總是顯示敏感媒體</string>
     <string name="media_hide_all">總是隱藏所有媒體</string>
 
-    <string name="notification_channel_mention_name">被提及</string>
-    <string name="notification_channel_mention_descriptions">當有使用者在嘟文中提及我時</string>
-    <string name="notification_channel_follow_name">關注者</string>
-    <string name="notification_channel_follow_description">當有使用者關注我時</string>
-    <string name="notification_channel_boost_name">轉嘟</string>
-    <string name="notification_channel_boost_description">當有使用者轉嘟了我的嘟文時</string>
-    <string name="notification_channel_favourite_name">收藏</string>
-    <string name="notification_channel_favourite_description">當有使用者收藏了我的嘟文時</string>
+    <string name="notification_mention_name">被提及</string>
+    <string name="notification_mention_descriptions">當有使用者在嘟文中提及我時</string>
+    <string name="notification_follow_name">關注者</string>
+    <string name="notification_follow_description">當有使用者關注我時</string>
+    <string name="notification_boost_name">轉嘟</string>
+    <string name="notification_boost_description">當有使用者轉嘟了我的嘟文時</string>
+    <string name="notification_favourite_name">收藏</string>
+    <string name="notification_favourite_description">當有使用者收藏了我的嘟文時</string>
 
 
     <string name="notification_mention_format">%s 提及了你</string>
@@ -462,10 +462,6 @@
     <string name="hashtag">話題</string>
     <string name="notifications_clear">清除</string>
     <string name="notifications_apply_filter">過濾</string>
-    <string name="filter_favorites">@string/notification_channel_favourite_name</string>
-    <string name="filter_boosts">@string/notification_channel_boost_name</string>
-    <string name="filter_follows">@string/notification_channel_follow_name</string>
-    <string name="filter_mentions">@string/notification_channel_mention_name</string>
     <string name="filter_apply">應用</string>
     
     <string name="compose_shortcut_long_label">發表新嘟文</string>
diff --git a/app/src/main/res/values-zh-rSG/strings.xml b/app/src/main/res/values-zh-rSG/strings.xml
index 44452765..f1eecd7c 100644
--- a/app/src/main/res/values-zh-rSG/strings.xml
+++ b/app/src/main/res/values-zh-rSG/strings.xml
@@ -249,14 +249,14 @@
     <string name="media_hide_none">总是显示敏感媒体</string>
     <string name="media_hide_all">总是隐藏所有媒体</string>
 
-    <string name="notification_channel_mention_name">被提及</string>
-    <string name="notification_channel_mention_descriptions">当有用户在嘟文中提及我时</string>
-    <string name="notification_channel_follow_name">关注者</string>
-    <string name="notification_channel_follow_description">当有用户关注我时</string>
-    <string name="notification_channel_boost_name">转嘟</string>
-    <string name="notification_channel_boost_description">当有用户转嘟了我的嘟文时</string>
-    <string name="notification_channel_favourite_name">收藏</string>
-    <string name="notification_channel_favourite_description">当有用户收藏了我的嘟文时</string>
+    <string name="notification_mention_name">被提及</string>
+    <string name="notification_mention_descriptions">当有用户在嘟文中提及我时</string>
+    <string name="notification_follow_name">关注者</string>
+    <string name="notification_follow_description">当有用户关注我时</string>
+    <string name="notification_boost_name">转嘟</string>
+    <string name="notification_boost_description">当有用户转嘟了我的嘟文时</string>
+    <string name="notification_favourite_name">收藏</string>
+    <string name="notification_favourite_description">当有用户收藏了我的嘟文时</string>
 
 
     <string name="notification_mention_format">%s 提及了你</string>
@@ -462,10 +462,6 @@
     <string name="hashtag">话题</string>
     <string name="notifications_clear">清除</string>
     <string name="notifications_apply_filter">过滤</string>
-    <string name="filter_favorites">@string/notification_channel_favourite_name</string>
-    <string name="filter_boosts">@string/notification_channel_boost_name</string>
-    <string name="filter_follows">@string/notification_channel_follow_name</string>
-    <string name="filter_mentions">@string/notification_channel_mention_name</string>
     <string name="filter_apply">应用</string>
 
     <string name="compose_shortcut_long_label">发表新嘟文</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 4580bbb5..2ad0aaeb 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -249,14 +249,14 @@
     <string name="media_hide_none">總是顯示敏感媒體</string>
     <string name="media_hide_all">總是隱藏所有媒體</string>
 
-    <string name="notification_channel_mention_name">被提及</string>
-    <string name="notification_channel_mention_descriptions">當有使用者在嘟文中提及我時</string>
-    <string name="notification_channel_follow_name">關注者</string>
-    <string name="notification_channel_follow_description">當有使用者關注我時</string>
-    <string name="notification_channel_boost_name">轉嘟</string>
-    <string name="notification_channel_boost_description">當有使用者轉嘟了我的嘟文時</string>
-    <string name="notification_channel_favourite_name">收藏</string>
-    <string name="notification_channel_favourite_description">當有使用者收藏了我的嘟文時</string>
+    <string name="notification_mention_name">被提及</string>
+    <string name="notification_mention_descriptions">當有使用者在嘟文中提及我時</string>
+    <string name="notification_follow_name">關注者</string>
+    <string name="notification_follow_description">當有使用者關注我時</string>
+    <string name="notification_boost_name">轉嘟</string>
+    <string name="notification_boost_description">當有使用者轉嘟了我的嘟文時</string>
+    <string name="notification_favourite_name">收藏</string>
+    <string name="notification_favourite_description">當有使用者收藏了我的嘟文時</string>
 
 
     <string name="notification_mention_format">%s 提及了你</string>
@@ -462,10 +462,6 @@
     <string name="hashtag">話題</string>
     <string name="notifications_clear">清除</string>
     <string name="notifications_apply_filter">過濾</string>
-    <string name="filter_favorites">@string/notification_channel_favourite_name</string>
-    <string name="filter_boosts">@string/notification_channel_boost_name</string>
-    <string name="filter_follows">@string/notification_channel_follow_name</string>
-    <string name="filter_mentions">@string/notification_channel_mention_name</string>
     <string name="filter_apply">應用</string>
     
     <string name="compose_shortcut_long_label">發表新嘟文</string>