owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'megalodon_main/main'

Browse Source 
# Conflicts:
#	README.md
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/Status.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
#	mastodon/src/main/res/values-it-rIT/strings_sk.xml
#	metadata/de-DE/changelogs/83.txt
#	metadata/de-DE/changelogs/94.txt
#	metadata/en-US/changelogs/94.txt
#	metadata/es/changelogs/94.txt
#	metadata/fr/title.txt
#	metadata/my-MM/title.txt
#	metadata/my/short_description.txt
#	metadata/pt-PT/changelogs/59.txt
#	metadata/pt-PT/changelogs/61.txt
#	metadata/pt-PT/full_description.txt
#	metadata/pt-PT/short_description.txt
#	metadata/pt-PT/title.txt
This commit is contained in:
LucasGGamerM
2023-06-13 14:03:50 -03:00
parent e1f5c9cb63 3af7518cf4
commit e1a262ec5f
62 changed files with 944 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mastodon/src/main/res/values-ar/strings_sk.xml
View File

@@ -2,7 +2,16 @@
<resources>
<string name="sk_confirm_delete_and_redraft">هل أنت متأكد أنك تريد حذف وإعادة صياغة هذا المنشور؟</string>
<string name="sk_pin_post">تثبيت في الملف الشخصي</string>
<string name="sk_pinned_posts">مثبت</string>
<string name="sk_pinned_posts">المُثَبَّتَة</string>
<string name="sk_delete_and_redraft">حذف وإعادة صياغة</string>
<string name="sk_confirm_delete_and_redraft_title">حذف وإعادة صياغة المنشور</string>
<string name="sk_visibility_unlisted">غير مدرج</string>
<string name="sk_list_timelines">القوائم</string>
<string name="sk_follow_requests">طلبات المتابعة</string>
<string name="sk_confirm_pin_post_title">تدبيس الرسالة على الصفحة الشخصية</string>
<string name="sk_settings_show_federated_timeline">إظهار الخيط الفديرالي</string>
<string name="sk_settings_contribute">المساهمة في Megalodon</string>
<string name="sk_accept_follow_request">قبول طلب المتابعة</string>
<string name="sk_reject_follow_request">رفض طلب المتابعة</string>
<string name="sk_lists_with_user">قوائم بها %s</string>
</resources>