Merge remote-tracking branch 'origin/develop' into develop

5 files changed, 11 insertions, 1 deletions

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 6c1046d00..55400eba7 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1006,4 +1006,6 @@
     <string name="set_fetch_home">Automaticky načítat domácí zprávy</string>
     <string name="fetch_home_messages">Načíst domácí zprávy</string>
     <string name="auto_fetch_missing">Automaticky načítat chybějící zprávy</string>
+    <string name="set_mention_at_top">Zmínky nahoře</string>
+    <string name="set_mention_at_top_indication">Při odpovídání budou zmínky vždy přidány na začátek zprávy</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ba39f87cd..fc6369272 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -996,4 +996,6 @@
     <string name="otp_message">Zwei-Faktor-Authentifizierungstoken</string>
     <string name="home_cache">Cache der Startseite</string>
     <string name="fetch_home_messages">Beiträge auf der Startseite abrufen</string>
+    <string name="set_mention_at_top">Erwähnungen am Anfang</string>
+    <string name="set_mention_at_top_indication">Beim Antworten werden alle Erwähnungen dem Anfang des Beitrags hinzugefügt</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index a588fddd9..4b4158650 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -987,4 +987,6 @@
     <string name="home_cache">Memòria temporànea lìnia printzipale</string>
     <string name="type_of_home_delay_title">Tempus de recùperu de sa lìnia printzipale</string>
     <string name="set_fetch_home">Recùpera in automàticu is messàgios de sa lìnia printzipale</string>
+    <string name="set_mention_at_top">Mentovos in pitzos</string>
+    <string name="set_mention_at_top_indication">Rispondende, is mentovos s\'ant a annànghere a su cumintzu de su messàgiu</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index e554b2e35..cc724b6e3 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -994,4 +994,6 @@
     <string name="home_cache">Ana sayfa önbelleği</string>
     <string name="auto_fetch_missing">Eksik mesajları otomatik olarak al</string>
     <string name="fetch_home_messages">Ana sayfa mesajlarını al</string>
+    <string name="set_mention_at_top">Bahsedilenler üstte</string>
+    <string name="set_mention_at_top_indication">Yanıtlarken, bahsedenlerin tümü mesajın başına eklenecektir</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 602e87c66..d88317548 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -942,7 +942,7 @@
     <string name="type_of_notifications_delay_title">通知获取时间</string>
     <string name="set_dynamic_color_indication">与您个人壁纸的配色方案色调一致。</string>
     <string name="type_default_theme_light">默认浅色主题</string>
-    <string name="set_cardview">高架卡</string>
+    <string name="set_cardview">悬浮卡片</string>
     <string name="set_customize_light">自定义浅色主题</string>
     <string name="set_customize_light_indication">允许为浅色主题自定义消息中的一些元素。</string>
     <string name="set_customize_dark">自定义深色主题</string>
@@ -994,4 +994,6 @@
     <string name="type_of_home_delay_title">主页获取延迟</string>
     <string name="fetch_home_every">获取主页消息每隔</string>
     <string name="auto_fetch_missing">自动获取缺失的消息</string>
+    <string name="set_mention_at_top">置顶提及</string>
+    <string name="set_mention_at_top_indication">回复时提及将全部添加到消息的开头</string>
 </resources>
\ No newline at end of file