Merge remote-tracking branch 'origin/develop' into develop3.16.2

3 files changed, 9 insertions, 0 deletions

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 68eab58da..842b6007b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -987,4 +987,6 @@
     <string name="proxy_protocol_http">HTTP</string>
     <string name="proxy_protocol_socks">SOCKS</string>
     <string name="about_peertube">\"PeerTube ist ein Tool zum Teilen von Online-Videos, das von Framasoft entwickelt wurde, einer französischen Non-Profit-Organisation....PeerTube ermöglicht es, Plattformen miteinander zu verbinden und so ein großes Netzwerk von Plattformen zu schaffen, die sowohl autonom als auch miteinander verbunden sind.\"</string>
+    <string name="compose_shortcut_short_label1">Entwerfen</string>
+    <string name="toast_error_peertube_not_supported">Ihr Peertube ist zu alt und wird von der App nicht unterstützt.</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 e83c2ad03..73c3422d1 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -985,4 +985,6 @@
     <string name="proxy_protocol_http">HTTP</string>
     <string name="proxy_protocol_socks">SOCKS</string>
     <string name="about_peertube">\"PeerTube kar amacı gütmeyen bir Fransız kuruluşu olan Framasoft tarafından geliştirilen bir çevrim içi video paylaşım aracıdır.…PeerTube platformların birbirine bağlanmasına olanak tanıyarak hem özerk hem de birbirine bağlı büyük bir platform ağı oluşturur.\"</string>
+    <string name="toast_error_peertube_not_supported">Peertube sürümünüz çok eski ve uygulama tarafından desteklenemiyor.</string>
+    <string name="compose_shortcut_short_label1">Oluştur</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 795a5c6a8..c29e962a9 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -569,4 +569,9 @@
     <string name="no_distributors_explanation">要接收推送通知你需要一个分发商。\n你将在%1$s找到更多详情。\n\n你也可以在设置中禁用推送通知，以忽略该消息。</string>
     <string name="select_distributors">选择一个分发商</string>
     <string name="show_anyway">仍要显示</string>
+    <string name="toast_bookmark">该消息已添加到您的书签！</string>
+    <string name="icon_size">图标大小</string>
+    <string name="toots_visibility_title">默认情况下消息的可见性：</string>
+    <string name="toast_unbookmark">该消息已从您的书签中删除！</string>
+    <string name="show_privates">显示私信</string>
 </resources>
\ No newline at end of file