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

9 files changed, 46 insertions, 46 deletions

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index cec03a3f9..51eae166a 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -1060,7 +1060,7 @@ Ara ja pots connectar-te al compte escrivint <b>%1$s</b> en el primer camp i fen
     <string name="pref_background_color_summary">Color subjacent del contingut de l\'aplicació.</string>
     <string name="pref_background_color_title">Color de fons</string>
     <string name="pref_accent_color_summary">Ressalta cromàticament parts de la IU.</string>
-    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_accent_color_title">Color d\'èmfasi</string>
     <string name="pref_primary_color_summary">Els mostrats amb més freqüència en la teva aplicació.</string>
     <string name="pref_primary_color_title">Color primari</string>
     <string name="export_bookmarks">Exporta els marcadors de la instància</string>
@@ -1079,8 +1079,8 @@ Ara ja pots connectar-te al compte escrivint <b>%1$s</b> en el primer camp i fen
     <string name="open_other_app">Obre amb una altra aplicació</string>
     <string name="check_redirect">Comprova la redirecció</string>
     <string name="no_redirect">El redireccionament de la URL no funciona</string>
-    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
-    <string name="set_user_agent">Change the user agent</string>
+    <string name="redirect_detected">%1$s \n\nredireccions a\n\n %2$s</string>
+    <string name="set_user_agent">Canvieu l\'agent d\'usuari</string>
     <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
     <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
     <string name="set_utm_parameters">Eliminar seguiments de màrketing (UTM)</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 3963de2e7..fd8d965ba 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -1100,6 +1100,6 @@
     <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
     <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
     <string name="identity_proofs">Identity proofs</string>
-    <string name="verified_user">Verified identity</string>
-    <string name="verified_by">Verified by %1$s (%2$s)</string>
+    <string name="verified_user">هویت تایید شده</string>
+    <string name="verified_by">تایید شده توسط %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 66b51ed87..ac86b48e8 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -127,16 +127,16 @@
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
     <plurals name="date_seconds_polls">
-        <item quantity="other">%d seconds</item>
+        <item quantity="other">%d detik</item>
     </plurals>
     <plurals name="date_minutes_polls">
-        <item quantity="other">%d minutes</item>
+        <item quantity="other">%d menit</item>
     </plurals>
     <plurals name="date_hours_polls">
-        <item quantity="other">%d hours</item>
+        <item quantity="other">%d jam</item>
     </plurals>
     <plurals name="date_day_polls">
-        <item quantity="other">%d days</item>
+        <item quantity="other">%d hari</item>
     </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Peringatan</string>
@@ -146,8 +146,8 @@
     <string name="cw">cw</string>
     <string name="toot_title">Tulis sebuah kutipan</string>
     <string name="toot_title_reply">Balas ke sebuah kutipan</string>
-    <string name="queet_title">Write a queet</string>
-    <string name="queet_title_reply">Reply to a queet</string>
+    <string name="queet_title">Tulis sebuah queet</string>
+    <string name="queet_title_reply">Balas sebuah queet</string>
     <string name="toot_select_image">Pilih media</string>
     <string name="toot_select_image_error">Terjadi kesalahan saat memilih media!</string>
     <string name="toot_delete_media">Hapus media ini?</string>
@@ -210,12 +210,12 @@
     <string name="notif_reblog">tingkatkan status Kamu</string>
     <string name="notif_favourite">status kesukaan Kamu</string>
     <string name="notif_follow">mengikutimu</string>
-    <string name="notif_follow_request">asked to follow you</string>
+    <string name="notif_follow_request">meminta untuk mengikuti anda</string>
     <plurals name="other_notifications">
         <item quantity="other">dan %d pemberitahuan lainnya</item>
     </plurals>
     <plurals name="likes">
-        <item quantity="other">%d likes</item>
+        <item quantity="other">%d like</item>
     </plurals>
     <string name="delete_notification_ask">Hapus pemberitahuan?</string>
     <string name="delete_notification_ask_all">Hapus semua pemberitahuan?</string>
@@ -227,7 +227,7 @@
     <string name="pinned_toots">Disematkan</string>
     <!-- TOAST -->
     <string name="client_error">Tidak menemukan id klien!</string>
-    <string name="connect_error">Unable to connect to instance domain!</string>
+    <string name="connect_error">Tidak dapat terhubung ke instance domain!</string>
     <string name="no_internet">Tidak ada koneksi internet!</string>
     <string name="toast_block">Akun diblokir!</string>
     <string name="toast_unblock">Akun tidak lagi diblokir!</string>
@@ -252,7 +252,7 @@
     <string name="nothing_to_do">Tidak dapat diambil tindakan</string>
     <string name="toast_saved">Media telah tersimpan!</string>
     <string name="toast_error_translate">Terjadi kesalahan saat menerjemahkan!</string>
-    <string name="toast_error_translations_disabled">Translations are disabled in settings</string>
+    <string name="toast_error_translations_disabled">Terjemahan dinonaktifkan di pengaturan</string>
     <string name="toast_toot_saved">Konsep tersimpan!</string>
     <string name="toast_error_char_limit">Apakah anda yakin contoh ini memungkinkan jumlah karakter ini? biasanya, nilai mendekati 500 karakter.</string>
     <string name="toast_visibility_changed">Visibilitas kutipan telah diubah untuk akun %1$s</string>
@@ -274,14 +274,14 @@
     <string name="set_notif_follow_share">Beritahu ketika seseorang meningkatkan status Anda</string>
     <string name="set_notif_follow_add">Beritahu ketika seseorang menyukai status Anda</string>
     <string name="set_notif_follow_mention">Beritahu ketika seseorang menyebut Anda</string>
-    <string name="set_notif_follow_poll">Notify when a poll ended</string>
+    <string name="set_notif_follow_poll">Beritahu ketika pemilihan berakhir</string>
     <string name="set_share_validation">Tampilkan dialog konfirmasi sebelum meningkatkan</string>
     <string name="set_share_validation_fav">Tampilkan dialog konfirmasi sebelum menambahkan ke favorit</string>
     <string name="set_wifi_only">Beritahu hanya di WIFI</string>
     <string name="set_notify">Memberitahu?</string>
     <string name="set_notif_silent">Diamkan pemberitahuan</string>
     <string name="set_nsfw_timeout">Lihat NSFW waktu habis (detik, 0 berarti mati)</string>
-    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
+    <string name="set_med_desc_timeout">Waktu Keterangan Media habis (detik, 0 berarti mati)</string>
     <string name="settings_title_profile">Ubah profil</string>
     <string name="settings_title_custom_sharing">Custom sharing</string>
     <string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
@@ -290,7 +290,7 @@
     <string name="set_save_changes">Simpan perubahan</string>
     <string name="set_header_picture_overlay">Pilih gambar header</string>
     <string name="set_fit_preview">Fit preview images</string>
-    <string name="set_automatically_split_toot">Automatically split toots in replies when chars are over:</string>
+    <string name="set_automatically_split_toot">Pisah toots secara otomatis di balasan ketika karakter lebih dari:</string>
     <string name="note_no_space">Kamu telah mencapai 160 karakter yang diizinkan!</string>
     <string name="username_no_space">Kamu telah mencapai 30 karakter yang diizinkan!</string>
     <string name="settings_time_from">Antara</string>
@@ -300,7 +300,7 @@
     <string name="settings_hour_init">Waktu mulai</string>
     <string name="settings_hour_end">Waktu akhir</string>
     <string name="embedded_browser">Gunakan browser built-in</string>
-    <string name="custom_tabs">Custom tabs</string>
+    <string name="custom_tabs">Tab kustom</string>
     <string name="use_javascript">Aktifkan Javascript</string>
     <string name="expand_cw">Automatically expand cw</string>
     <string name="use_cookies">Izinkan cookie pihak ketiga</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 99817c3ae..776db3f6c 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1075,7 +1075,7 @@
     <string name="import_theme">Импортировать тему</string>
     <string name="import_theme_title">Нажмите здесь чтобы импортировать тему из предыдущего экспорта</string>
     <string name="export_theme">Экспортировать тему</string>
-    <string name="export_theme_title">Нажмите здесь чтобы экспорта текущей темы</string>
+    <string name="export_theme_title">Нажмите здесь для экспорта текущей темы</string>
     <string name="theme_file_error">Произошла ошибка при выборе файла темы</string>
     <string name="label_theme_picker">Выбор темы</string>
     <string name="pref_theme_summary">Выбрать предустановленную тему</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index abe4f894a..7bf415ef6 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -872,13 +872,13 @@
     <string name="set_display_timeline_in_list_indication">Tüm etiketleri/örnekleri/listeleri listelemek için sağ üste bir üç nokta butonu ekle</string>
     <string name="live_notif_indication">Canlı bildirimler için streaming API\'si ile bir bağlantıyı açık tut.</string>
     <string name="set_enable_time_slot_indication">During the time slot, the app will send notifications. You can reverse (ie: silent) this time slot with the right spinner.</string>
-    <string name="set_display_fedilab_features_button_indication">Display a Fedilab button below profile picture. It is a shortcut for accessing in-app features.</string>
-    <string name="set_quick_reply_indication">Allow to reply directly in timelines below statuses</string>
-    <string name="set_fit_preview_indication">Previews will not be cropped in timelines</string>
-    <string name="set_display_video_preview_indication">Allow to play embedded videos directly in timelines</string>
-    <string name="set_display_content_after_fetch_more_indication">Allow to reverse the way to read statuses that are displayed once tapping the fetch more button</string>
-    <string name="set_security_provider_indication">This option allows to support recent cipher suites. It is useful for older Android devices or if you cannot connect to your instance.</string>
-    <string name="set_video_mode_indication">Exclusively for Peertube videos. Switch this mode if you cannot play them.</string>
+    <string name="set_display_fedilab_features_button_indication">Profil resminin altında bir Fedilab butonu göster. Bu, uygulama içi özelliklere erişmek için bir kısayoldur.</string>
+    <string name="set_quick_reply_indication">Doğrudan zaman çizelgelerinde, durumların altında yanıt vermeye izin ver</string>
+    <string name="set_fit_preview_indication">Önizlemeler, zaman çizelgelerinde kırpılmayacak</string>
+    <string name="set_display_video_preview_indication">Gömülü videoları doğrudan zaman çizelgelerinde oynatmaya izin ver</string>
+    <string name="set_display_content_after_fetch_more_indication">Daha fazla getir düğmesine dokunduktan sonra görüntülenen durumları okuma şeklini tersine çevirmeye izin ver</string>
+    <string name="set_security_provider_indication">Bu seçenek en son şifreleme paketlerini desteklemeye izin verir. Eski Android cihazlar için veya örneğinize bağlanamıyorsanız faydalıdır.</string>
+    <string name="set_video_mode_indication">Sadece Peertube videoları için. Eğer onları oynatamıyorsanız bu modu değiştirin.</string>
     <string name="featured_hashtags_indication">These tags will allow to filter statuses from profiles. You will have to use the context menu for seeing them.</string>
     <string name="set_capitalize_indication">Automatically insert a line break after the mention to capitalize the first letter</string>
     <string name="settings_title_custom_sharing_indication">Allow content creators to share statuses to their RSS feeds</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 80b0f8e52..1ad8a3cb8 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1092,6 +1092,6 @@
     <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
     <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
     <string name="identity_proofs">Identity proofs</string>
-    <string name="verified_user">Verified identity</string>
-    <string name="verified_by">Verified by %1$s (%2$s)</string>
+    <string name="verified_user">已验证身份</string>
+    <string name="verified_by">验证通过 %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index ce046cac0..0573be558 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -788,7 +788,7 @@ Yandex 有適當的隱私權政策，可以在這裡找到：https://yandex.ru/l
     <string name="toast_error_instance_reg">在檢查可用站台時發生了些問題！</string>
     <string name="join_mastodon">加入 Mastodon</string>
     <string name="pickup_instance_category">透過挑選分類，然後按下按鈕來選擇站台。</string>
-    <string name="pickup_instance_peertube">點擊勾選按鈕來選擇站臺。</string>
+    <string name="pickup_instance_peertube">按一下勾選按鈕以選擇站台。</string>
     <string name="users">%1$s 位使用者</string>
     <string name="password_confirm">確認密碼</string>
     <string name="agreement_check">我同意 %1$s 和 %2$s</string>
@@ -944,7 +944,7 @@ Yandex 有適當的隱私權政策，可以在這裡找到：https://yandex.ru/l
         <item quantity="other">%d 人投票</item>
     </plurals>
     <plurals name="number_of_voters">
-        <item quantity="other">%d 個投票者</item>
+        <item quantity="other">%d 位投票者</item>
     </plurals>
     <string-array name="poll_choice_type">
         <item>單種選擇</item>
@@ -990,7 +990,7 @@ Yandex 有適當的隱私權政策，可以在這裡找到：https://yandex.ru/l
     <string name="set_hide_status_bar">隱藏 Fedilab 通知列</string>
     <string name="set_hide_status_bar_indication">要隱藏狀態列中的其餘通知，點擊眼睛圖示的按鈕上然後取消勾選「在狀態列中顯示」</string>
     <string name="set_live_type_indication">通知將會每30秒被延遲一次。這將會降低電池的消耗。</string>
-    <string name="live_delayed">即時通知已延遲</string>
+    <string name="live_delayed">延遲即時通知</string>
     <string name="no_live_notif">沒有即時通知</string>
     <string name="no_live_indication">將會每15分鐘擷取一次通知。</string>
     <string name="action_add_notes">新增註記</string>
@@ -999,42 +999,42 @@ Yandex 有適當的隱私權政策，可以在這裡找到：https://yandex.ru/l
     <string name="set_resize_video_indication">允許在維持品質的同時壓縮影片。</string>
     <string name="please_wait_compression">應用程式正在壓縮媒體，可能會很久……</string>
     <string name="change_app_icon_experimental">變更應用程式圖示</string>
-    <string name="click_to_change_the_app_icon">點擊以變更應用程式圖示</string>
+    <string name="click_to_change_the_app_icon">按一下變更應用程式圖示</string>
     <string name="post">張貼</string>
     <string name="post_visibility_tilte">嘟文可見度</string>
-    <string name="add_photo_pixelfed">點選此處以新增照片</string>
+    <string name="add_photo_pixelfed">按一下這裡新增照片</string>
     <string name="add_photo_indication_pixelfed">可用格式：JPEG、PNG、GIF \n\n 最大檔案大小：15 MB \n\n 相簿可以包含最多 4 張照片或影片</string>
     <string name="upload_media">上傳媒體</string>
-    <string name="pixelfed_compose_placeholder">新增可選的選項</string>
+    <string name="pixelfed_compose_placeholder">新增可選標題</string>
     <string name="long_api_error">應用程式從 API %1$s 收到非常長的錯誤訊息</string>
     <string name="message_preview">訊息預覽</string>
     <string name="report_mention">在每個訊息中新增提及</string>
-    <string name="fetch_conversation">擷取對話</string>
-    <string name="order_by">排序由</string>
+    <string name="fetch_conversation">正在擷取對話</string>
+    <string name="order_by">排序依</string>
     <string name="title_video_peertube">影片標題</string>
     <string name="join_peertube">加入 Peertube</string>
-    <string name="agreement_check_peertube">我至少 16 歲並同意此站臺的 %1$s</string>
+    <string name="agreement_check_peertube">我至少 16 歲並同意此站台的 %1$s</string>
     <string name="link_color_title">連結</string>
     <string name="link_color">在訊息中變更連結的顏色（URL、提及、標籤等等）</string>
     <string name="boost_header_color_title">轉發標頭</string>
     <string name="displayname_title">更改訊息頂部的顯示名稱色彩</string>
     <string name="username_title">更改訊息頂部的使用者名稱色彩</string>
     <string name="boost_header_color">變更轉發標頭的顏色</string>
-    <string name="background_status_title">貼文</string>
-    <string name="background_status">時間軸中貼文的背景顏色</string>
+    <string name="background_status_title">嘟文</string>
+    <string name="background_status">時間軸中嘟文的背景顏色</string>
     <string name="reset_color">重設顏色</string>
-    <string name="clik_reset">在此點擊以重設您所有自訂的顏色</string>
+    <string name="clik_reset">按一下這裡重設所有自訂顏色</string>
     <string name="reset">重設</string>
     <string name="icons_color_title">圖示</string>
     <string name="icons_color">時間軸底部圖示的顏色</string>
     <string name="pin_tag">釘選此標籤</string>
-    <string name="logo_of_the_instance">站臺圖示</string>
+    <string name="logo_of_the_instance">站台圖示</string>
     <string name="edit_profile">編輯個人資料</string>
     <string name="make_an_action">做動作</string>
     <string name="translation">翻譯</string>
     <string name="image_preview">圖片預覽</string>
     <string name="text_color_title">文字色彩</string>
-    <string name="text_color">變更 pots 中的文字色彩</string>
+    <string name="text_color">變更嘟文／轉嘟／訊息等的文字色彩</string>
     <string name="apply_changes">套用變更</string>
     <string name="restart_message">您必須重新啟動應用程式以套用變更</string>
     <string name="restart">重新啟動</string>
diff --git a/fastlane/metadata/android/fa/full_description.txt b/fastlane/metadata/android/fa/full_description.txt
index 992daaa38..54bb6299a 100644
--- a/fastlane/metadata/android/fa/full_description.txt
+++ b/fastlane/metadata/android/fa/full_description.txt
@@ -1,7 +1,7 @@
 Fedilab is a multifunctional Android client to access the distributed Fediverse, consisting of micro blogging, photo sharing and video hosting.
 
-It supports:
-- Mastodon, Pleroma, Pixelfed, Peertube, GNU Social, Friendica.
+این‌ها پشتیبانی می‌شوند:
+ماستدون، پلرمو، پیکسل‌فد، پیرتیوب، گنوسوشال، فرندیکا.
 
 
 The app has advanced features (especially for Pleroma and Mastodon):
diff --git a/fastlane/metadata/android/fa/short_description.txt b/fastlane/metadata/android/fa/short_description.txt
index 13216e790..7dd721c9c 100644
--- a/fastlane/metadata/android/fa/short_description.txt
+++ b/fastlane/metadata/android/fa/short_description.txt
@@ -1 +1 @@
-Fedilab is a multifunctional Android client to access the distributed Fediverse
\ No newline at end of file
+فدیلب یک کارخواه اندرویدی چندکاربرده برای دسترسی به دنیای توزیع‌شدهٔ فدیورس است
\ No newline at end of file