From f39da46a218144c5258f0a2bffac21c514f94b2f Mon Sep 17 00:00:00 2001
From: Conny Duck <k.pozniak@gmx.at>
Date: Sun, 24 Mar 2019 19:37:00 +0100
Subject: [PATCH] fix string related warnings

---
 app/src/main/res/values-cs/strings.xml     | 2 +-
 app/src/main/res/values-eo/strings.xml     | 2 +-
 app/src/main/res/values-fr/strings.xml     | 2 +-
 app/src/main/res/values-it/strings.xml     | 2 +-
 app/src/main/res/values-nl/strings.xml     | 2 +-
 app/src/main/res/values-ru/strings.xml     | 3 +--
 app/src/main/res/values-sv/strings.xml     | 2 +-
 app/src/main/res/values-zh-rCN/strings.xml | 1 -
 app/src/main/res/values/strings.xml        | 2 +-
 9 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 885e2fb9..0eaf502f 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -386,7 +386,7 @@
     <string name="description_visiblity_direct">        Přímý
     </string>
     <string name="description_status">        <!-- Zobrazované jméno, varování?, obsah?, relativní datum, znovusdíleno kým?, znovusdíleno?, oblíbeno?, uživatelské jméno, média?; viditelnost, počet oblíbení?, počet boostů?-->
-        %s; %s; %s, %s, %s; %s, %s, %s, %s; %s, %s, %s
+        %1$s; %2$s; %3$s, %4$s, %5$s; %6$s, %7$s, %8$s, %9$s; %10$s, %11$s, %12$s
     </string>
     <string name="hint_list_name">Název seznamu</string>
     <string name="edit_hashtag_title">Upravit hashtag</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index f70849ab..dfae131c 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -376,7 +376,7 @@
     </string>
     <string name="description_visiblity_direct">        Rekta    </string>
     <string name="description_status">        <!-- Display name, cw?, content?, relative date, reposted by?, reposted?, favorited?, username, media?; visibility, fav number?, reblog number?-->
-        %s; %s; %s, %s, %s; %s, %s, %s, %s; %s, %s, %s
+        %1$s; %2$s; %3$s, %4$s, %5$s; %6$s, %7$s, %8$s, %9$s; %10$s, %11$s, %12$s
     </string>
     <string name="hint_list_name">Nomo de la listo</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 9698856a..4d5582b9 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -382,7 +382,7 @@
     <string name="description_visiblity_direct">        Direct
     </string>
     <string name="description_status">        <!-- Nom public, avertissement?, contenu?, date relative, reblogué par?, reblogué?, mis en favoris?, username, media?; visibilité, nombre de fav?, nombre de reblogs?-->
-        %s; %s; %s, %s, %s; %s, %s, %s, %s; %s, %s, %s
+        %1$s; %2$s; %3$s, %4$s, %5$s; %6$s, %7$s, %8$s, %9$s; %10$s, %11$s, %12$s
     </string>
     <string name="hint_list_name">Nom de la liste</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 1327d51d..a3f22826 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -377,7 +377,7 @@
     <string name="description_visiblity_direct">        Diretti
     </string>
     <string name="description_status">        <!-- Nome visualizzato, cw?, contenuto?, data relativa, ripostato da?, ripostato?, apprezzato?, nome utente, media?; visibilità, numero di mi piace?, numero di riblog?-->
-        %s; %s; %s, %s, %s; %s, %s, %s, %s; %s, %s, %s
+        %1$s; %2$s; %3$s, %4$s, %5$s; %6$s, %7$s, %8$s, %9$s; %10$s, %11$s, %12$s
     </string>
     <string name="hint_list_name">Nome della lista</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 56696272..fb4b2816 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -356,6 +356,6 @@
     <string name="description_visiblity_direct">        Direct
     </string>
     <string name="description_status">        <!-- Display name, cw?, content?, relative date, reposted by?, reposted?, favorited?, username, media?; visibility, fav number?, reblog number?-->
-        %s; %s; %s, %s, %s; %s, %s, %s, %s; %s, %s, %s
+        %1$s; %2$s; %3$s, %4$s, %5$s; %6$s, %7$s, %8$s, %9$s; %10$s, %11$s, %12$s
     </string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 591ede03..7dcc21d1 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -400,9 +400,8 @@
     <string name="description_visiblity_unlisted">Скрытый</string>
     <string name="description_visiblity_private">Для подписчиков</string>
     <string name="description_visiblity_direct">Для упомянутых</string>
-    <string name="description_status">%s; %s; %s, %s, %s; %s, %s, %s, %s; %s, %s, %s</string>
+    <string name="description_status">%1$s; %2$s; %3$s, %4$s, %5$s; %6$s, %7$s, %8$s, %9$s; %10$s, %11$s, %12$s</string>
     <string name="hint_list_name">Название списка</string>
-    <string name="text_content_warning_button">CW</string>
     <string name="description_status_favourited">Нравится</string>
     <string name="pref_title_timeline_filters">Фильтры</string>
 </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 089d103d..288fffbf 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -379,7 +379,7 @@
     <string name="description_visiblity_direct">        Direkt
     </string>
     <string name="description_status">        <!-- Display name, cw?, content?, relative date, reposted by?, reposted?, favorited?, username, media?; visibility, fav number?, reblog number?-->
-        %s; %s; %s, %s, %s; %s, %s, %s, %s; %s, %s, %s
+        %1$s; %2$s; %3$s, %4$s, %5$s; %6$s, %7$s, %8$s, %9$s; %10$s, %11$s, %12$s
     </string>
     <string name="hint_list_name">Listnamn</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 1aa6fc38..9021bcf8 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -274,7 +274,6 @@
     <string name="send_toot_notification_cancel_title">发送已被取消</string>
     <string name="send_toot_notification_saved_content">嘟文已保存为草稿</string>
     <string name="action_compose_shortcut">发表嘟文</string>
-    <string name="error_no_custom_emojis">此服务器没有自定义表情符号</string>
     <string name="copy_to_clipboard_success">已复制到剪贴板</string>
     <string name="emoji_style">表情符号风格</string>
     <string name="system_default">系统默认</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ade2bd7f..e77a9a08 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -452,7 +452,7 @@
     </string>
     <string name="description_status">
         <!-- Display name, cw?, content?, relative date, reposted by?, reposted?, favorited?, username, media?; visibility, fav number?, reblog number?-->
-        %s; %s; %s, %s, %s; %s, %s, %s, %s; %s, %s, %s
+        %1$s; %2$s; %3$s, %4$s, %5$s; %6$s, %7$s, %8$s, %9$s; %10$s, %11$s, %12$s
     </string>
 
     <string name="hint_list_name">List name</string>