From 3e5eb47dcf2e39369cbefc3e6603e158334bc302 Mon Sep 17 00:00:00 2001
From: ButterflyOfFire <ButterflyOfFire@protonmail.com>
Date: Sat, 15 Apr 2017 11:01:18 +0100
Subject: [PATCH 1/2] Create strings.xml

Preparing file to arabic translation from "en" source file.
---
 app/src/main/res/values-ar/strings.xml | 144 +++++++++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 app/src/main/res/values-ar/strings.xml

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
new file mode 100644
index 00000000..7d053474
--- /dev/null
+++ b/app/src/main/res/values-ar/strings.xml
@@ -0,0 +1,144 @@
+<resources>
+
+    <string name="error_generic">An error occurred.</string>
+    <string name="error_invalid_domain">Invalid domain entered</string>
+    <string name="error_failed_app_registration">Failed authenticating with that instance.</string>
+    <string name="error_no_web_browser_found">Couldn\'t find a web browser to use.</string>
+    <string name="error_authorization_unknown">An unidentified authorization error occurred.</string>
+    <string name="error_authorization_denied">Authorization was denied.</string>
+    <string name="error_retrieving_oauth_token">Failed getting a login token.</string>
+    <string name="error_compose_character_limit">The status is too long!</string>
+    <string name="error_media_upload_size">The file must be less than 4MB.</string>
+    <string name="error_media_upload_type">That type of file cannot be uploaded.</string>
+    <string name="error_media_upload_opening">That file could not be opened.</string>
+    <string name="error_media_upload_permission">Permission to read media is required.</string>
+    <string name="error_media_upload_image_or_video">Images and videos cannot both be attached to the same status.</string>
+    <string name="error_media_upload_sending">The upload failed.</string>
+    <string name="error_report_too_few_statuses">At least one status must be reported.</string>
+
+    <string name="title_home">Home</string>
+    <string name="title_notifications">Notifications</string>
+    <string name="title_public_local">Local</string>
+    <string name="title_public_federated">Federated</string>
+    <string name="title_thread">Thread</string>
+    <string name="title_tag">#%s</string>
+    <string name="title_statuses">Posts</string>
+    <string name="title_follows">Follows</string>
+    <string name="title_followers">Followers</string>
+    <string name="title_favourites">Favourites</string>
+    <string name="title_blocks">Blocked users</string>
+
+    <string name="status_username_format">\@%s</string>
+    <string name="status_boosted_format">%s boosted</string>
+    <string name="status_sensitive_media_title">Sensitive Media</string>
+    <string name="status_sensitive_media_directions">Click to view</string>
+    <string name="status_content_warning_show_more">Show More</string>
+    <string name="status_content_warning_show_less">Show Less</string>
+
+    <string name="footer_end_of_statuses">end of the statuses</string>
+    <string name="footer_end_of_notifications">end of the notifications</string>
+    <string name="footer_end_of_accounts">end of the accounts</string>
+
+    <string name="notification_reblog_format">%s boosted your toot</string>
+    <string name="notification_favourite_format">%s favourited your toot</string>
+    <string name="notification_follow_format">%s followed you</string>
+
+    <string name="report_username_format">Report @%s</string>
+    <string name="report_comment_hint">Additional comments?</string>
+
+    <string name="action_reply">Reply</string>
+    <string name="action_reblog">Boost</string>
+    <string name="action_favourite">Favourite</string>
+    <string name="action_more">More</string>
+    <string name="action_compose">Compose</string>
+    <string name="action_login">Login with Mastodon</string>
+    <string name="action_logout">Log Out</string>
+    <string name="action_follow">Follow</string>
+    <string name="action_unfollow">Unfollow</string>
+    <string name="action_block">Block</string>
+    <string name="action_unblock">Unblock</string>
+    <string name="action_report">Report</string>
+    <string name="action_delete">Delete</string>
+    <string name="action_send">TOOT</string>
+    <string name="action_send_public">TOOT!</string>
+    <string name="action_retry">Retry</string>
+    <string name="action_mark_sensitive">Mark media sensitive</string>
+    <string name="action_hide_text">Hide text behind warning</string>
+    <string name="action_ok">Ok</string>
+    <string name="action_cancel">Cancel</string>
+    <string name="action_close">Close</string>
+    <string name="action_back">Back</string>
+    <string name="action_view_profile">Profile</string>
+    <string name="action_view_preferences">Preferences</string>
+    <string name="action_view_favourites">Favourites</string>
+    <string name="action_view_blocks">Blocked users</string>
+    <string name="action_view_thread">Thread</string>
+    <string name="action_view_media">Media</string>
+    <string name="action_open_in_web">Open in browser</string>
+    <string name="action_submit">Submit</string>
+    <string name="action_photo_pick">Add media</string>
+    <string name="action_share">Share</string>
+    <string name="action_mute">Mute</string>
+    <string name="action_unmute">Unmute</string>
+    <string name="action_mention">Mention</string>
+    <string name="toggle_nsfw">NSFW</string>
+    <string name="action_compose_options">Options</string>
+    <string name="action_open_drawer">Open drawer</string>
+    <string name="action_clear">Clear</string>
+
+    <string name="send_status_to">Share toot URL to…</string>
+
+    <string name="search">Search accounts…</string>
+
+    <string name="confirmation_send">Toot!</string>
+    <string name="confirmation_reported">Sent!</string>
+
+    <string name="hint_domain">Which instance?</string>
+    <string name="hint_compose">What\'s happening?</string>
+    <string name="hint_content_warning">Content warning</string>
+
+    <string name="link_whats_an_instance">What\'s an instance?</string>
+
+    <string name="dialog_whats_an_instance">The address or domain of any instance can be entered
+        here, such as mastodon.social, icosahedron.website, social.tchncs.de, and
+        <a href="https://github.com/tootsuite/mastodon/blob/master/docs/Using-Mastodon/List-of-Mastodon-instances.md">more!</a>
+        \n\nIf you don\'t yet have an account, you can enter the name of the instance you\'d like to
+        join and create an account there.\n\nAn instance is a single place where your account is
+        hosted, but you can easily communicate with and follow folks on other instances as though
+        you were on the same site.
+        \n\nMore info can be found at <a href="https://mastodon.social/about">mastodon.social</a>.
+    </string>
+    <string name="dialog_title_finishing_media_upload">Finishing Media Upload</string>
+    <string name="dialog_message_uploading_media">Uploading…</string>
+
+    <string name="visibility_public">Everyone can view</string>
+    <string name="visibility_unlisted">Everyone can view, but not on public timelines</string>
+    <string name="visibility_private">Only followers and mentions can view</string>
+
+    <string name="pref_title_notification_settings">Notifications</string>
+    <string name="pref_title_edit_notification_settings">Edit Notifications</string>
+    <string name="pref_title_notifications_enabled">Push notifications</string>
+    <string name="pref_title_notification_alerts">Alerts</string>
+    <string name="pref_title_notification_alert_sound">Notify with a sound</string>
+    <string name="pref_title_notification_alert_vibrate">Notify with vibration</string>
+    <string name="pref_title_notification_alert_light">Notify with light</string>
+    <string name="pref_title_notification_filters">Notify me when</string>
+    <string name="pref_title_notification_filter_mentions">mentioned</string>
+    <string name="pref_title_notification_filter_follows">followed</string>
+    <string name="pref_title_notification_filter_reblogs">my posts are boosted</string>
+    <string name="pref_title_notification_filter_favourites">my posts are favourited</string>
+    <string name="pref_title_appearance_settings">Appearance</string>
+    <string name="pref_title_light_theme">Use the Light Theme</string>
+    <string name="pref_title_browser_settings">Browser</string>
+    <string name="pref_title_custom_tabs">Use Chrome Custom Tabs</string>
+    <string name="pref_title_hide_follow_button">Hide follow button while scrolling</string>
+
+    <string name="notification_mention_format">%s mentioned you</string>
+    <string name="notification_summary_large">%1$s, %2$s, %3$s and %4$d others</string>
+    <string name="notification_summary_medium">%1$s, %2$s, and %3$s</string>
+    <string name="notification_summary_small">%1$s and %2$s</string>
+    <string name="notification_title_summary">%d new interactions</string>
+
+    <string name="description_account_locked">Locked Account</string>
+
+</resources>

From 13c1136e1fa406ce15467a5e0f12da2a22fe2d13 Mon Sep 17 00:00:00 2001
From: ButterflyOfFire <ButterflyOfFire@protonmail.com>
Date: Sat, 15 Apr 2017 16:40:37 +0100
Subject: [PATCH 2/2] Update strings.xml

Localisation was made here : https://www.transifex.com/opendz/tusky-in-arabic/
---
 app/src/main/res/values-ar/strings.xml | 249 +++++++++++--------------
 1 file changed, 113 insertions(+), 136 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 7d053474..c06ceaf0 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,144 +1,121 @@
 <resources>
 
-    <string name="error_generic">An error occurred.</string>
-    <string name="error_invalid_domain">Invalid domain entered</string>
-    <string name="error_failed_app_registration">Failed authenticating with that instance.</string>
-    <string name="error_no_web_browser_found">Couldn\'t find a web browser to use.</string>
-    <string name="error_authorization_unknown">An unidentified authorization error occurred.</string>
-    <string name="error_authorization_denied">Authorization was denied.</string>
-    <string name="error_retrieving_oauth_token">Failed getting a login token.</string>
-    <string name="error_compose_character_limit">The status is too long!</string>
-    <string name="error_media_upload_size">The file must be less than 4MB.</string>
-    <string name="error_media_upload_type">That type of file cannot be uploaded.</string>
-    <string name="error_media_upload_opening">That file could not be opened.</string>
-    <string name="error_media_upload_permission">Permission to read media is required.</string>
-    <string name="error_media_upload_image_or_video">Images and videos cannot both be attached to the same status.</string>
-    <string name="error_media_upload_sending">The upload failed.</string>
-    <string name="error_report_too_few_statuses">At least one status must be reported.</string>
-
-    <string name="title_home">Home</string>
-    <string name="title_notifications">Notifications</string>
-    <string name="title_public_local">Local</string>
-    <string name="title_public_federated">Federated</string>
-    <string name="title_thread">Thread</string>
+    <string name="error_generic">وقع هناك خطأ.</string>
+    <string name="error_invalid_domain">اسم النطاق غير صالح</string>
+    <string name="error_failed_app_registration">اخفقت المصادقة مع مثيل الخادم هذا.</string>
+    <string name="error_no_web_browser_found">لم يتم العثور على متصفح قابل للإستعمال.</string>
+    <string name="error_authorization_denied">تم رفض التصريح.</string>
+    <string name="error_media_upload_size">يجب أن يكون حجم الملف أقل من 4 ميغابايت.</string>
+    <string name="error_media_upload_type">لا يمكن رفع هذا النوع من الملفات.</string>
+    <string name="error_media_upload_opening">تعذر فتح ذاك الملف.</string>
+    <string name="error_media_upload_sending">اخفقت عملية الرفع.</string>
+    <string name="title_home">الرئيسية</string>
+    <string name="title_notifications">الاشعارات</string>
+    <string name="title_public_local">المحلية</string>
+    <string name="title_public_federated">الفدرالية</string>
+    <string name="title_thread">الخيط</string>
     <string name="title_tag">#%s</string>
-    <string name="title_statuses">Posts</string>
-    <string name="title_follows">Follows</string>
-    <string name="title_followers">Followers</string>
-    <string name="title_favourites">Favourites</string>
-    <string name="title_blocks">Blocked users</string>
+    <string name="title_statuses">المشاركات</string>
+    <string name="title_follows">يتبع</string>
+    <string name="title_followers">المتابعون</string>
+    <string name="title_favourites">المفضلة</string>
+    <string name="title_blocks">المستخدمون المحظورون</string>
 
     <string name="status_username_format">\@%s</string>
-    <string name="status_boosted_format">%s boosted</string>
-    <string name="status_sensitive_media_title">Sensitive Media</string>
-    <string name="status_sensitive_media_directions">Click to view</string>
-    <string name="status_content_warning_show_more">Show More</string>
-    <string name="status_content_warning_show_less">Show Less</string>
-
-    <string name="footer_end_of_statuses">end of the statuses</string>
-    <string name="footer_end_of_notifications">end of the notifications</string>
-    <string name="footer_end_of_accounts">end of the accounts</string>
-
-    <string name="notification_reblog_format">%s boosted your toot</string>
-    <string name="notification_favourite_format">%s favourited your toot</string>
-    <string name="notification_follow_format">%s followed you</string>
-
-    <string name="report_username_format">Report @%s</string>
-    <string name="report_comment_hint">Additional comments?</string>
-
-    <string name="action_reply">Reply</string>
-    <string name="action_reblog">Boost</string>
-    <string name="action_favourite">Favourite</string>
-    <string name="action_more">More</string>
-    <string name="action_compose">Compose</string>
-    <string name="action_login">Login with Mastodon</string>
-    <string name="action_logout">Log Out</string>
-    <string name="action_follow">Follow</string>
-    <string name="action_unfollow">Unfollow</string>
-    <string name="action_block">Block</string>
-    <string name="action_unblock">Unblock</string>
-    <string name="action_report">Report</string>
-    <string name="action_delete">Delete</string>
-    <string name="action_send">TOOT</string>
-    <string name="action_send_public">TOOT!</string>
-    <string name="action_retry">Retry</string>
-    <string name="action_mark_sensitive">Mark media sensitive</string>
-    <string name="action_hide_text">Hide text behind warning</string>
-    <string name="action_ok">Ok</string>
-    <string name="action_cancel">Cancel</string>
-    <string name="action_close">Close</string>
-    <string name="action_back">Back</string>
-    <string name="action_view_profile">Profile</string>
-    <string name="action_view_preferences">Preferences</string>
-    <string name="action_view_favourites">Favourites</string>
-    <string name="action_view_blocks">Blocked users</string>
-    <string name="action_view_thread">Thread</string>
-    <string name="action_view_media">Media</string>
-    <string name="action_open_in_web">Open in browser</string>
-    <string name="action_submit">Submit</string>
-    <string name="action_photo_pick">Add media</string>
-    <string name="action_share">Share</string>
-    <string name="action_mute">Mute</string>
-    <string name="action_unmute">Unmute</string>
-    <string name="action_mention">Mention</string>
+    <string name="status_boosted_format">%s عزز</string>
+    <string name="status_sensitive_media_title">محتوى حساس</string>
+    <string name="status_sensitive_media_directions">اضغط للعرض</string>
+    <string name="status_content_warning_show_more">اعرض أكثر</string>
+    <string name="status_content_warning_show_less">اعرض أقل</string>
+
+    <string name="footer_end_of_statuses">نهاية الحالات</string>
+    <string name="footer_end_of_notifications">نهاية الاشعارات</string>
+    <string name="footer_end_of_accounts">نهاية الحسابات</string>
+
+    <string name="notification_reblog_format">%s عزز تبويقك</string>
+    <string name="notification_favourite_format">%s أعجب بتبويقك</string>
+    <string name="notification_follow_format">%s يتبعك</string>
+
+    <string name="report_username_format">أبلغ عن @%s</string>
+    <string name="report_comment_hint">تعليقات إضافية ؟</string>
+
+    <string name="action_reply">أجب</string>
+    <string name="action_reblog">عزز</string>
+    <string name="action_favourite">تفضيل</string>
+    <string name="action_more">المزيد</string>
+    <string name="action_compose">حرر</string>
+    <string name="action_login">التسجيل بواسطة ماستدون</string>
+    <string name="action_logout">خروج</string>
+    <string name="action_follow">إتبع</string>
+    <string name="action_unfollow">إلغاء التتبع</string>
+    <string name="action_block">حضر</string>
+    <string name="action_unblock">إلغاء الحظر</string>
+    <string name="action_report">أبلغ</string>
+    <string name="action_delete">إحذف</string>
+    <string name="action_send">تبويق</string>
+    <string name="action_send_public">بَوِّق</string>
+    <string name="action_retry">إعادة المحاولة</string>
+    <string name="action_hide_text">اخفي النص وراء تحذير</string>
+    <string name="action_ok">موافق</string>
+    <string name="action_cancel">إلغاء</string>
+    <string name="action_close">إغلاق</string>
+    <string name="action_back">عودة</string>
+    <string name="action_view_profile">الملف الشخصي</string>
+    <string name="action_view_preferences">التفضيلات</string>
+    <string name="action_view_favourites">المفضلة</string>
+    <string name="action_view_blocks">المستخدمون المحظورون</string>
+    <string name="action_view_thread">الخيط</string>
+    <string name="action_view_media">وسائط</string>
+    <string name="action_open_in_web">إفتح في متصفح</string>
+    <string name="action_submit">ارسل</string>
+    <string name="action_photo_pick">إضافة وسائط</string>
+    <string name="action_share">شارك</string>
+    <string name="action_mute">أكتم</string>
+    <string name="action_unmute">إلغاء الكتم</string>
+    <string name="action_mention">أذكر</string>
     <string name="toggle_nsfw">NSFW</string>
-    <string name="action_compose_options">Options</string>
-    <string name="action_open_drawer">Open drawer</string>
-    <string name="action_clear">Clear</string>
-
-    <string name="send_status_to">Share toot URL to…</string>
-
-    <string name="search">Search accounts…</string>
-
-    <string name="confirmation_send">Toot!</string>
-    <string name="confirmation_reported">Sent!</string>
-
-    <string name="hint_domain">Which instance?</string>
-    <string name="hint_compose">What\'s happening?</string>
-    <string name="hint_content_warning">Content warning</string>
-
-    <string name="link_whats_an_instance">What\'s an instance?</string>
-
-    <string name="dialog_whats_an_instance">The address or domain of any instance can be entered
-        here, such as mastodon.social, icosahedron.website, social.tchncs.de, and
-        <a href="https://github.com/tootsuite/mastodon/blob/master/docs/Using-Mastodon/List-of-Mastodon-instances.md">more!</a>
-        \n\nIf you don\'t yet have an account, you can enter the name of the instance you\'d like to
-        join and create an account there.\n\nAn instance is a single place where your account is
-        hosted, but you can easily communicate with and follow folks on other instances as though
-        you were on the same site.
-        \n\nMore info can be found at <a href="https://mastodon.social/about">mastodon.social</a>.
-    </string>
-    <string name="dialog_title_finishing_media_upload">Finishing Media Upload</string>
-    <string name="dialog_message_uploading_media">Uploading…</string>
-
-    <string name="visibility_public">Everyone can view</string>
-    <string name="visibility_unlisted">Everyone can view, but not on public timelines</string>
-    <string name="visibility_private">Only followers and mentions can view</string>
-
-    <string name="pref_title_notification_settings">Notifications</string>
-    <string name="pref_title_edit_notification_settings">Edit Notifications</string>
-    <string name="pref_title_notifications_enabled">Push notifications</string>
-    <string name="pref_title_notification_alerts">Alerts</string>
-    <string name="pref_title_notification_alert_sound">Notify with a sound</string>
-    <string name="pref_title_notification_alert_vibrate">Notify with vibration</string>
-    <string name="pref_title_notification_alert_light">Notify with light</string>
-    <string name="pref_title_notification_filters">Notify me when</string>
-    <string name="pref_title_notification_filter_mentions">mentioned</string>
-    <string name="pref_title_notification_filter_follows">followed</string>
-    <string name="pref_title_notification_filter_reblogs">my posts are boosted</string>
-    <string name="pref_title_notification_filter_favourites">my posts are favourited</string>
-    <string name="pref_title_appearance_settings">Appearance</string>
-    <string name="pref_title_light_theme">Use the Light Theme</string>
-    <string name="pref_title_browser_settings">Browser</string>
-    <string name="pref_title_custom_tabs">Use Chrome Custom Tabs</string>
-    <string name="pref_title_hide_follow_button">Hide follow button while scrolling</string>
-
-    <string name="notification_mention_format">%s mentioned you</string>
-    <string name="notification_summary_large">%1$s, %2$s, %3$s and %4$d others</string>
-    <string name="notification_summary_medium">%1$s, %2$s, and %3$s</string>
-    <string name="notification_summary_small">%1$s and %2$s</string>
-    <string name="notification_title_summary">%d new interactions</string>
-
-    <string name="description_account_locked">Locked Account</string>
+    <string name="action_compose_options">خيارات</string>
+    <string name="action_open_drawer">إفتح الدرج</string>
+    <string name="action_clear">إمسح</string>
+
+    <string name="send_status_to">شارك رابط التبويق إلى ...</string>
+
+    <string name="search">ابحث عن حسابات ...</string>
+
+    <string name="confirmation_send">بَوِّق</string>
+    <string name="confirmation_reported">تم الإرسال !</string>
+
+    <string name="hint_domain">أي سيرفر ؟</string>
+    <string name="hint_compose">ما الجديد ؟</string>
+    <string name="hint_content_warning">تحذير عن المحتوى</string>
+
+    <string name="link_whats_an_instance">ماذا نعني بمثيل الخادم ؟</string>
+
+    <string name="dialog_title_finishing_media_upload">تتمة رفع الوسائط</string>
+    <string name="dialog_message_uploading_media">جاري الرفع ...</string>
+
+    <string name="pref_title_notification_settings">الاشعارات</string>
+    <string name="pref_title_edit_notification_settings">تعديل الاشعارات</string>
+    <string name="pref_title_notifications_enabled">دفع الإخطارات</string>
+    <string name="pref_title_notification_alerts">التنبيهات</string>
+    <string name="pref_title_notification_alert_sound">إعلام بالصوت</string>
+    <string name="pref_title_notification_alert_vibrate">إعلام بالاهتزار</string>
+    <string name="pref_title_notification_alert_light">إعلام بالضوء</string>
+    <string name="pref_title_notification_filters">أخطرني عندما</string>
+    <string name="pref_title_notification_filter_mentions">يشار إلي</string>
+    <string name="pref_title_notification_filter_follows">يتبعني أحد</string>
+    <string name="pref_title_notification_filter_reblogs">تعزز وتدفع منشوراتي</string>
+    <string name="pref_title_notification_filter_favourites">يعجب أحد ما بمنشوراتي</string>
+    <string name="pref_title_appearance_settings">المظهر</string>
+    <string name="pref_title_light_theme">إستخدم سمةً فاتحة اللون</string>
+    <string name="pref_title_browser_settings">المتصفح</string>
+    <string name="pref_title_custom_tabs">إخفاء زر المتابعة أثناء تمرير الصفحة</string>
+    <string name="notification_mention_format">%s أشار إليك</string>
+    <string name="notification_summary_large">%1$s, %2$s, %3$s و %4$d أخرى</string>
+    <string name="notification_summary_medium">%1$s, %2$s, و %3$s</string>
+    <string name="notification_summary_small">%1$s و %2$s</string>
+    <string name="notification_title_summary">%d تفاعلات جديدة</string>
+
+    <string name="description_account_locked">حساب مقفل</string>
 
 </resources>