diff options
author | Thomas <tschneider.ac@gmail.com> | 2023-08-16 10:09:49 +0200 |
---|---|---|
committer | Thomas <tschneider.ac@gmail.com> | 2023-08-16 10:09:49 +0200 |
commit | 8cffef92a5966dd11e45700db85db1c51f23fa5b (patch) | |
tree | afc8e55a8668dfb9f27b2ece56b61c9b4928538e | |
parent | c1b256f150f2fd0c1e92025f77dd94ddffdd1f56 (diff) | |
parent | 2137604cec8ad66c603ffe63ab916f20734095dd (diff) |
Merge remote-tracking branch 'origin/develop' into develop
-rw-r--r-- | app/src/main/res/values-ar/strings.xml | 16 | ||||
-rw-r--r-- | app/src/main/res/values-pt/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-zh-rCN/strings.xml | 4 |
3 files changed, 20 insertions, 2 deletions
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index e42adef78..723fa74ed 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -227,7 +227,7 @@ <string name="settings_time_from">بين</string> <string name="settings_time_to">و</string> <string name="embedded_browser">استخدم المتصفح المُدمَج في التطبيق</string> - <string name="custom_tabs">الألسنة الخاصة</string> + <string name="custom_tabs">المتصفح المدمج</string> <string name="expand_cw">توسيع نافذة التحذير عن المحتوى تلقائيًا</string> <string name="set_led_colour">اختيار لون الإشعار الضوئي:</string> <string-array name="led_colours"> @@ -429,7 +429,7 @@ <string name="saving">جاري الحفظ…</string> <string name="image_saved">تم حفظ الصورة بنجاح!</string> <string name="save_image_failed">فشل في حفظ الصورة</string> - <string name="add_poll_item">إضافة خيار إلى الاستطلاع</string> + <string name="add_poll_item">إضافة خيار</string> <string name="mute_conversation">كتم المحادثة</string> <string name="unmute_conversation">ألغِ كتم المحادثة</string> <string name="toast_unmute_conversation">لقد تم إلغاء الكتم عن هذه المحادثة!</string> @@ -811,4 +811,16 @@ <string name="import_settings">استيراد الإعدادت</string> <string name="media_cannot_be_uploaded">لا يمكن تحميل الوسائط!</string> <string name="origin_report">أصل الحساب المبلغ عنه</string> + <string name="notif_display_updates_from_people">آخر المستجدات من الناس</string> + <string name="follows_you">يتابعك</string> + <string name="_new">جديد</string> + <string name="auto">تلقائي</string> + <string name="requested_by">طلب متابعتك</string> + <string name="exit">خروج</string> + <string name="add_description">إضافة وصف</string> + <string name="show_privates">إظهار الرسائل المباشرة</string> + <string name="proxy_protocol">البروتوكول</string> + <string name="proxy_protocol_http">HTTP</string> + <string name="proxy_protocol_socks">SOCKS</string> + <string name="lemmy_instance">مثيل خادم Lemmy</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 3895ee8c8..57bbd60e7 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -910,4 +910,6 @@ <string name="otp_message">Token de autenticação de dois fatores</string> <string name="compose_shortcut_short_label1">Compor</string> <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> </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 6608f33dd..3760ededc 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1053,4 +1053,8 @@ <string name="auto">自动</string> <string name="set_custom_accent_value_light_description">将应用于浅色主题的颜色</string> <string name="set_custom_accent_dark_value">深色强调色</string> + <string name="set_remote_conversation_title">远程对话</string> + <string name="set_remote_conversation">应用将公开显示对话,以获取所有消息。互动需要额外的步骤来联合消息。</string> + <string name="markdown_support">Markdown 支持</string> + <string name="lemmy_instance">Lemmy 实例</string> </resources>
\ No newline at end of file |