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

4 files changed, 28 insertions, 1 deletions

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 723fa74ed..b062546ed 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -823,4 +823,23 @@
     <string name="proxy_protocol_http">HTTP</string>
     <string name="proxy_protocol_socks">SOCKS</string>
     <string name="lemmy_instance">مثيل خادم Lemmy</string>
+    <string name="send_anyway">إرسال على أي حال</string>
+    <string name="last_24_h">آخر 24 ساعة</string>
+    <string name="set_unlisted_replies">الردود غير المُدرَجة</string>
+    <string name="pinned">مُثبَّت</string>
+    <string name="new_messages">الرسائل الجديدة</string>
+    <string name="notif_report">قام مستخدم بإرسال شكوى</string>
+    <string name="poll_type_single">خيار واحد</string>
+    <string name="list_reported_statuses">المنشورات المبلّغ عنها</string>
+    <string name="set_remove_battery">تجاهل تحسينات البطارية</string>
+    <string name="reblog_missing_description">يَفتقِد هذا المنشور على وصف للوسائط. أمتأكد من أنّك تريد إعادة نشره؟</string>
+    <string name="show_my_messages">أظهر منشوراتي</string>
+    <string name="muted_menu_home">المستخدمون المكتومون على الخيط الرئيسي</string>
+    <string name="resolved">مُعالَج</string>
+    <string name="assign_to_me">أسنده لي</string>
+    <string name="display_timelines">اعرض الخيوط الزمنية</string>
+    <string name="unassign">ألغِ الإسناد</string>
+    <string name="allow">سماح</string>
+    <string name="poll_type_multiple">خيارات متعددة</string>
+    <string name="load_media_remotely">حمِّل الوسائط البعيدة</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 9f5937702..dd885866f 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -395,7 +395,7 @@
     <string name="poll_choice_s">Volba %d</string>
     <string name="poll_invalid_choices">Pro anketu potřebujete alespoň dvě volby!</string>
     <string name="done">Hotovo</string>
-    <string name="poll_finish_at">skončit po %s</string>
+    <string name="poll_finish_at">konec: %s</string>
     <string name="vote">Hlasovat</string>
     <string name="notif_poll">Anketa, ve které jste hlasoval(a), skončila</string>
     <string name="notif_poll_self">Vaše anketa skončila</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b71a2d64a..cc58ad2dc 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1061,4 +1061,5 @@
     <string name="show_self_replies">Afficher les réponses aux message du même auteur⋅ice</string>
     <string name="set_remote_conversation">L\'application affichera publiquement les conversations pour obtenir tous les messages. Les interactions auront besoin d\'une étape supplémentaire pour fédérer les messages.</string>
     <string name="show_my_messages">Afficher mes messages</string>
+    <string name="frequency_count_minutes">%d fréquence (minutes)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 57bbd60e7..89185d2bb 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -912,4 +912,11 @@
     <string name="maths_format">Formato matemático</string>
     <string name="report_indication_title_status_more">Escolha a melhor correspondência</string>
     <string name="lemmy_instance">Instância Lemmy</string>
+    <string name="track_selection_title">Selecionar faixas</string>
+    <string name="set_custom_accent_value_dark_description">Cor que será aplicada ao tema escuro</string>
+    <string name="set_custom_accent_value_light_description">Cor que será aplicada ao tema claro</string>
+    <string name="add_description">Adicionar uma descrição</string>
+    <string name="retrieve_remote_account">Recuperar conta remota!</string>
+    <string name="set_custom_accent_light_value">Cor de destaque clara</string>
+    <string name="set_custom_accent_dark_value">Cor de destaque escura</string>
 </resources>
\ No newline at end of file