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

app/src/main/res/values-ar/strings.xml

@@ -303,7 +303,7 @@
     <string name="context_public">الخطوط الزمنية العمومية</string>
     <string name="context_notification">الإشعارات</string>
     <string name="context_conversation">المحادثات</string>
-    <string name="filter_keyword_explanations">سوف يتم العثور عليه بغض النظر عن حالة الأحرف في النص أو حتى و إن كان فيه تحذير عن المحتوى</string>
+    <string name="filter_keyword_explanations">سوف يتم العثور عليه بغض النظر عن حالة الأحرف في النص أو حتى و إن كان في الرسالة تحذير عن المحتوى</string>
     <string name="context_drop">حذف بدلًا مِن الإخفاء</string>
     <string name="context_drop_explanations">سوف تختفي الرسائل المُصفّاة إلى الأبد، حتى و إن تم حذف عامل التصفية لاحقًا</string>
     <string name="context_whole_word_explanations">إذا كانت الكلمة أو الجملة مكونة من الأرقام والحروف فقط سوف يتم تطبيقها فقط عند مطابقة الكلمة ككل</string>
@@ -591,4 +591,35 @@
     <string name="no_distributors_found">لم يتم العثور على موزعين!</string>
     <string name="no_distributors_explanation">تحتاج إلى موزع لتلقي إشعارات الدفع.\nستجد المزيد من التفاصيل في %1$s.\n\nيمكنك أيضا تعطيل الإشعارات في الإعدادات لتجاهل تلك الرسالة.</string>
     <string name="select_distributors">اختر موزعا</string>
+    <string name="set_notifications_page">عدد الإخطارات عند كل تحميل</string>
+    <string name="category_music">موسيقى</string>
+    <string name="replace_youtube">يوتيوب</string>
+    <string name="replace_twitter">تويتر</string>
+    <string name="replace_twitter_host">نطاق الواجهة الأمامية لتويتر</string>
+    <string name="replace_reddit_description">استخدم واجهة أمامية بديلة لـ Reddit</string>
+    <string name="replace_reddit_host">نطاق الواجهة الأمامية لـ Reddit</string>
+    <string name="toast_bookmark">تمت إضافة الرسالة إلى إشاراتك المرجعية!</string>
+    <string name="toast_unbookmark">تمت إزالة الرسالة من إشاراتك المرجعية!</string>
+    <string name="cannot_be_empty">هذا الحقل لا يمكن أن يكون فارغا!</string>
+    <string name="replace_youtube_description">استخدام واجهة بديلة لليوتيوب</string>
+    <string name="replace_instagram">انستغرام</string>
+    <string name="replace_twitter_description">استخدام واجهة أمامية بديلة لتويتر</string>
+    <string name="replace_instagram_description">استخدام واجهة أمامية بديلة لـ Instagram</string>
+    <string name="hide_content">إخفاء المحتوى &lt;</string>
+    <string name="set_accounts_page">عدد الحسابات لكل تحميل</string>
+    <string name="replace_youtube_host">نطاق الواجهة الأمامية لـ YouTube</string>
+    <string name="replace_reddit">ريديت</string>
+    <string name="keepon">استمر</string>
+    <string name="category_custom">مخصص</string>
+    <string name="boosted_by">شاركه</string>
+    <string name="instance_not_valid">لا يبدو أن مثيل الخادم صالح!</string>
+    <string name="eg_sensitive_content">على سبيل المثال: محتوى حساس</string>
+    <string name="post_message">جارٍ نشر الرسالة …</string>
+    <string name="data_export_settings">تم تصدير الإعدادات</string>
+    <string name="data_export_settings_success">تم تصدير الإعدادات بنجاح</string>
+    <string name="data_import_settings_success">تم استيراد الإعدادات بنجاح</string>
+    <string name="followers_only">المتابِعون فقط</string>
+    <string name="show_content">إظهار المحتوى&gt;</string>
+    <string name="stop_recording">إيقاف التسجيل</string>
+    <string name="replace_instagram_host">نطاق الواجهة الأمامية لـ Instagram</string>
 </resources>

app/src/main/res/values-ber/strings.xml

@@ -21,8 +21,6 @@
     <string name="instance_example">Instance: mastodon.social</string>
     <string name="toast_account_changed" formatted="false">Now works with the account %1$s</string>
     <string name="add_account">ⵔⵏⵓ ⴰⵎⵉⴹⴰⵏ</string>
-    <string name="clipboard">The content of the toot has been copied to the clipboard</string>
-    <string name="clipboard_url">The URL of the toot has been copied to the clipboard</string>
     <string name="camera">ⵜⴽⴰⵎⵕⴰ</string>
     <string name="delete_all">ⴽⴽⵙ ⵎⴰⵕⵕⴰ</string>
     <string name="next">Next</string>
@@ -52,17 +50,11 @@
     <string name="follow_request">Follow requests</string>
     <string name="settings">ⵜⵉⵙⵖⴰⵍ</string>
     <string name="send_email">ⴰⵣⵏ ⵉⵎⴰⵢⵍ</string>
-    <string name="scheduled_toots">Scheduled toots</string>
     <string name="disclaimer_full">Information below may reflect the user\'s profile incompletely.</string>
     <string name="insert_emoji">ⵔⵏⵓ ⵉⵎⵓⵊⵉ</string>
     <string name="no_emoji">The app did not collect custom emojis for the moment.</string>
     <string name="logout_account_confirmation">ⵉⵙ ⵏⵉⵜ ⵜⵅⵙⴼ ⴰⴷ ⵜⴼⴼⵖⴷ @%1$s@%2$s?</string>
     <!-- Status -->
-    <string name="no_status">No toot to display</string>
-    <string name="favourite_add">Add this toot to your favourites?</string>
-    <string name="favourite_remove">Remove this toot from your favourites?</string>
-    <string name="reblog_add">Boost this toot?</string>
-    <string name="reblog_remove">Unboost this toot?</string>
     <string name="more_action_1">ⵙⵙⵓⵙⵎ</string>
     <string name="more_action_2">ⴳⴷⵍ</string>
     <string name="more_action_3">ⵎⵍ</string>
@@ -117,8 +109,7 @@
     <!-- TOOT -->
     <string name="toot_select_image_error">An error occurred while selecting the media!</string>
     <string name="toot_delete_media">Remove this media?</string>
-    <string name="toot_error_no_content">Your toot is empty!</string>
+    <string name="toot_error_no_content">ⵉⵣⴻⵏ ⵊⴽ ⴸ ⵉⵍⴻⵎ !</string>
-    <string name="toot_sent">The toot has been sent!</string>
     <string name="toot_sensitive">Sensitive content?</string>
     <string name="no_draft">No drafts!</string>
     <string name="choose_accounts">ⴷⵖⵔ ⵢⴰⵏ ⵓⵎⵉⴹⴰⵏ</string>
@@ -138,14 +129,12 @@
     <!-- Accounts -->
     <string name="no_accounts">No account to display</string>
     <string name="no_follow_request">No follow request</string>
-    <string name="status_cnt">Toots \n %1$s</string>
+    <string name="status_cnt">ⵉⵣⵏⴰⵏ
+\n %1$s</string>
     <string name="following_cnt">Following \n %1$s</string>
     <string name="followers_cnt">ⵉⵎⴹⴼⴰⵕⵏ \n %1$s</string>
     <string name="reject">ⴰⴳⵢ</string>
     <!-- Scheduled toots -->
-    <string name="no_scheduled_toots">No scheduled toots to display!</string>
-    <string name="remove_scheduled">Delete scheduled toot?</string>
-    <string name="toot_scheduled">The toot has been scheduled!</string>
     <string name="toot_scheduled_date">The scheduled date must be greater than the current hour!</string>
     <!-- timed mute -->
     <string name="timed_mute_date_error">The time for muting should be greater than one minute.</string>
@@ -171,10 +160,6 @@
     <string name="toast_unmute">The account is no longer muted!</string>
     <string name="toast_follow">The account was followed!</string>
     <string name="toast_unfollow">The account is no longer followed!</string>
-    <string name="toast_reblog">The toot was boosted!</string>
-    <string name="toast_unreblog">The toot is no longer boosted!</string>
-    <string name="toast_favourite">The toot was added to your favourites!</string>
-    <string name="toast_unfavourite">The toot was removed from your favourites!</string>
     <string name="toast_error">Oops ! An error occurred!</string>
     <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
     <string name="toast_error_instance">The instance domain does not seem to be valid!</string>
@@ -183,7 +168,6 @@
     <string name="nothing_to_do">No action can be taken</string>
     <string name="toast_error_translate">An error occurred while translating!</string>
     <!-- Settings -->
-    <string name="set_toots_page">Number of toots per load</string>
     <string name="set_disable_gif">Disable GIF avatars</string>
     <string name="set_notif_follow">Notify when someone follows you</string>
     <string name="set_notif_follow_share">Notify when someone boosts your status</string>
@@ -262,7 +246,6 @@
     <string name="poxy_port">Port</string>
     <string name="poxy_login">Login</string>
     <string name="poxy_password">Password</string>
-    <string name="set_share_details">Add toot details when sharing</string>
     <string name="support_the_app_on_liberapay">Support the app on Liberapay</string>
     <string name="alert_regex">There is an error in the regular expression!</string>
     <string name="toast_instance_unavailable">No timelines was found on this instance!</string>
@@ -281,9 +264,7 @@
     <string name="context_public">Public timelines</string>
     <string name="context_notification">Notifications</string>
     <string name="context_conversation">Conversations</string>
-    <string name="filter_keyword_explanations">Will be matched regardless of casing in text or content warning of a toot</string>
     <string name="context_drop">Drop instead of hide</string>
-    <string name="context_drop_explanations">Filtered toots will disappear irreversibly, even if filter is later removed</string>
     <string name="context_whole_word_explanations">When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word</string>
     <string name="context_whole_word">Whole word</string>
     <string name="filter_context">Filter contexts</string>
@@ -298,7 +279,6 @@
     <string name="channel_notif_fav">New Favourite</string>
     <string name="channel_notif_mention">New Mention</string>
     <string name="channel_notif_poll">Poll Ended</string>
-    <string name="channel_notif_backup">Toots Backup</string>
     <string name="channel_notif_status">New posts</string>
     <string name="channel_notif_media">Media Download</string>
     <string name="select_sound">Select Tone</string>
@@ -310,11 +290,8 @@
     <string name="peertube_instance">Peertube instance</string>
     <string name="set_display_emoji">Use Emoji One</string>
     <string name="information">Information</string>
-    <string name="set_display_card">Display previews in all toots</string>
     <string name="account_id_clipbloard">The account id has been copied in the clipboard!</string>
     <string name="set_change_locale">Change the language</string>
-    <string name="truncate_long_toots">Truncate long toots</string>
-    <string name="set_truncate_toot">Truncate toots over \'x\' lines. Zero means disabled.</string>
     <string name="display_toot_truncate">Display more</string>
     <string name="hide_toot_truncate">Display less</string>
     <string name="tags_already_stored">The tag already exists!</string>
@@ -360,8 +337,6 @@
     <string name="category">Category</string>
     <string name="description">Description</string>
     <string name="share">ⴱⴹⵓ</string>
-    <string name="toots_server">Toots (Server)</string>
-    <string name="toots_client">Toots (Device)</string>
     <string name="settings_category_label_timelines">Timelines</string>
     <string name="settings_category_label_interface">Interface</string>
     <string name="contact">ⴰⵙⵙⴰⵖⵏ</string>
@@ -383,7 +358,6 @@
     <string name="poll_finish_at">end at %s</string>
     <string name="vote">Vote</string>
     <string name="notif_poll">A poll you have voted in has ended</string>
-    <string name="notif_poll_self">A poll you tooted has ended</string>
     <string name="settings_category_notif_categories">Categories</string>
     <string name="move_timeline">Move timeline</string>
     <string name="hide_timeline">Hide timeline</string>
@@ -498,7 +472,6 @@
     <string name="unfollow_confirm">Do you want to unfollow this account?</string>
     <string name="set_unfollow_validation">Show confirmation dialog before unfollowing</string>
     <string name="replace_medium">Replace Medium links</string>
-    <string name="replace_medium_description">Replace medium.com links with an open source alternative front-end focused on privacy.</string>
     <string name="replace_medium_host">Default: scribe.rip</string>
     <string name="set_push_notifications">Use a push notifications system for getting notifications in real time.</string>
     <string name="action_add_notes">Add notes</string>

app/src/main/res/values-tr/strings.xml

@@ -763,4 +763,5 @@
     <string name="set_display_counters">Sayaçları göster</string>
     <string name="set_display_counters_description">Yeni mesajlar için sekme zaman çizelgelerinde bir baloncuk sayacı görüntüler</string>
     <string name="fetch_notifications">Bildirimleri getir</string>
+    <string name="view_the_original_message">Mesajın aslını aç</string>
 </resources>