Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream #1216

Closed
wants to merge 109 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
c188307
Add files via upload
LuftVerbot Jul 24, 2023
c1b7b89
Update README.md
LuftVerbot Jul 24, 2023
a883c90
Delete ic_launcher.png
LuftVerbot Jul 24, 2023
928a62c
Update README.md
LuftVerbot Jul 24, 2023
c3062d2
merge1
LuftVerbot Oct 4, 2023
5a2a3fd
fuck lint
LuftVerbot Oct 4, 2023
5ceae31
merge2
LuftVerbot Oct 4, 2023
14a8aeb
merge3
LuftVerbot Oct 4, 2023
2ebf477
merge4
LuftVerbot Oct 4, 2023
f705e19
merge5
LuftVerbot Oct 5, 2023
b3c911e
merge6
LuftVerbot Oct 6, 2023
e99e4c2
merge7
LuftVerbot Oct 6, 2023
c62f86f
merge8
LuftVerbot Oct 21, 2023
67d3043
Merge branch 'aniyomiorg:master' into MR
LuftVerbot Oct 21, 2023
c85576e
merge9
LuftVerbot Oct 22, 2023
da3265f
merge10
LuftVerbot Oct 22, 2023
febf046
fuck lint
LuftVerbot Oct 22, 2023
c19b4b5
fuck lint (again)
LuftVerbot Oct 22, 2023
dfb5ca4
Merge remote-tracking branch 'upstream/master' into MR
LuftVerbot Oct 23, 2023
d78159b
Translations update from Hosted Weblate (#9531)
weblate Jun 3, 2023
974d3b5
Revert "Translations update from Hosted Weblate (#9531)"
LuftVerbot Oct 23, 2023
3a8e7d0
Translations update from Hosted Weblate (#9531)
weblate Jun 3, 2023
e282528
Revert "Translations update from Hosted Weblate (#9531)"
LuftVerbot Oct 23, 2023
5d575f1
Merge remote-tracking branch 'upstream/master' into MR
LuftVerbot Oct 26, 2023
b9333be
fix download button not shown
LuftVerbot Oct 26, 2023
564a959
Merge remote-tracking branch 'origin/master' into MR
LuftVerbot Oct 27, 2023
f51b36a
merge11
LuftVerbot Oct 27, 2023
7e14b6d
Merge remote-tracking branch 'upstream/master' into MR
LuftVerbot Oct 27, 2023
5b1099d
Update AdaptiveSheet.kt
LuftVerbot Oct 27, 2023
692b566
revert subs commit
LuftVerbot Oct 27, 2023
c6317e9
Update AdaptiveSheet.kt
LuftVerbot Oct 27, 2023
2431d8a
merge12
LuftVerbot Oct 27, 2023
f0783f5
feat(player): Subtitle settings + refactor + crash fixes (#1152)
quickdesh Oct 27, 2023
6dd16ca
Merge branch 'master' into MR
LuftVerbot Oct 28, 2023
03ee4bc
merge13
LuftVerbot Oct 28, 2023
9bb1a5d
Merge branch 'master' into MR
LuftVerbot Oct 29, 2023
fd1c643
merge14
LuftVerbot Oct 29, 2023
f3ec9da
Merge branch 'master' into MR
LuftVerbot Oct 31, 2023
f0180e0
rework anime downloader
LuftVerbot Nov 1, 2023
5415cbb
Update AnimeDownloader.kt
LuftVerbot Nov 1, 2023
9509d09
Update AnimeDownloader.kt
LuftVerbot Nov 1, 2023
8f08a24
Merge branch 'master' into MR
LuftVerbot Nov 2, 2023
d2ccb75
Merge branch 'master' into MR
LuftVerbot Nov 2, 2023
dd69ce5
Merge branch 'master' into MR
LuftVerbot Nov 3, 2023
264b0e6
merge15
LuftVerbot Nov 3, 2023
6bab100
Update ReaderActivity.kt
LuftVerbot Nov 3, 2023
184804f
merge15.5
LuftVerbot Nov 3, 2023
59b4404
merge16
LuftVerbot Nov 4, 2023
bb96174
Merge branch 'master' into MR
LuftVerbot Nov 7, 2023
872fc74
fix downloader pause
LuftVerbot Nov 9, 2023
748d610
small changes
LuftVerbot Nov 9, 2023
338b54a
Merge branch 'master' into MR
LuftVerbot Nov 9, 2023
83dcd5e
merge17
LuftVerbot Nov 11, 2023
4732c38
repositioning
LuftVerbot Nov 11, 2023
b9d42c9
Merge branch 'master' into MR
LuftVerbot Nov 11, 2023
61256a2
again repositioning
LuftVerbot Nov 11, 2023
e7b1066
merge18
LuftVerbot Nov 11, 2023
0271706
merge19
LuftVerbot Nov 11, 2023
82eb36b
fuck lint
LuftVerbot Nov 11, 2023
096276c
merge19.5
LuftVerbot Nov 11, 2023
4709cbe
merge20
LuftVerbot Nov 12, 2023
645746a
merge21
LuftVerbot Nov 12, 2023
563efef
Merge branch 'master' into MR
LuftVerbot Nov 15, 2023
7174799
Update StreamsCatalogSheet.kt
LuftVerbot Nov 15, 2023
370212c
merge22
LuftVerbot Nov 17, 2023
a439045
merge23
LuftVerbot Nov 17, 2023
72a54cb
Merge branch 'master' into MR
LuftVerbot Nov 17, 2023
4cbf9a8
merge23.5
LuftVerbot Nov 17, 2023
1b6301c
merge24
LuftVerbot Nov 17, 2023
a2a445f
merge25
LuftVerbot Nov 18, 2023
eeddf17
merge26
LuftVerbot Nov 18, 2023
85d0e49
little fix
LuftVerbot Nov 18, 2023
e29dc62
lint cleanup
LuftVerbot Nov 18, 2023
fa7b842
merge27
LuftVerbot Nov 18, 2023
2c42303
merge28
LuftVerbot Nov 19, 2023
f1cd8f6
merge29
LuftVerbot Nov 19, 2023
a34bc76
renaming & ktlintCheck
LuftVerbot Nov 19, 2023
b1f728e
fix ConcurrentHashMap crash
LuftVerbot Nov 19, 2023
6215528
ktlint format
LuftVerbot Nov 19, 2023
05f9124
klint format again
LuftVerbot Nov 19, 2023
ea2b7fe
ktlint format again
LuftVerbot Nov 19, 2023
3a31153
ktlint formt
LuftVerbot Nov 19, 2023
18e04b7
merge30
LuftVerbot Nov 19, 2023
99eea59
crash fix & add forgotten commit
LuftVerbot Nov 20, 2023
f6d430d
fuck lint
LuftVerbot Nov 20, 2023
b8cdb9d
small Episode Tracker change
LuftVerbot Nov 20, 2023
325e625
merge31
LuftVerbot Nov 23, 2023
a654a54
Update build_push.yml
LuftVerbot Nov 23, 2023
c07cc8d
merge32
LuftVerbot Nov 24, 2023
76df725
merge33
LuftVerbot Nov 24, 2023
150d43e
merge34
LuftVerbot Nov 24, 2023
e4d3105
cleanup
LuftVerbot Nov 24, 2023
e4283fe
Merge branch 'master' into merge_upstream
LuftVerbot Nov 24, 2023
5f78244
merge34.5
LuftVerbot Nov 24, 2023
c6f81b7
merge35
LuftVerbot Nov 25, 2023
a60268e
lint cleanup
LuftVerbot Nov 25, 2023
3fba4cb
merge36
LuftVerbot Nov 25, 2023
89777e9
merge37
LuftVerbot Nov 25, 2023
d7aee03
merge38
LuftVerbot Nov 25, 2023
375a252
merge39
LuftVerbot Nov 25, 2023
91de0ed
merge40
LuftVerbot Nov 26, 2023
df6a85a
fix AnimeScreen crash
LuftVerbot Nov 26, 2023
4baf786
use formatTime function
LuftVerbot Nov 26, 2023
eef4ef7
fix weird "explore tabs" behaviour
LuftVerbot Nov 26, 2023
eafc64a
fuck lint
LuftVerbot Nov 26, 2023
2b9fe5c
fix anime tracker & airing sort
LuftVerbot Nov 26, 2023
807ea3d
merge41
LuftVerbot Nov 26, 2023
06f3f7e
cleanup
LuftVerbot Nov 26, 2023
49c30b3
fuck lint
LuftVerbot Nov 26, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Translations update from Hosted Weblate (#9531)
Weblate translations

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ar/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ca/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cs/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/de/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/el/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fil/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/id/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/it/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ja/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/jv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ko/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ne/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pl/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ru/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/th/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/uk/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/vi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
Translation: Tachiyomi/Tachiyomi 0.x

Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: Ali Aljishi <ahj696@hotmail.com>
Co-authored-by: AntonP <tony.pug.stark@gmail.com>
Co-authored-by: Christian Elbrianno <crse@protonmail.ch>
Co-authored-by: Clxff H3r4ld0 <123844876+clxf12@users.noreply.github.com>
Co-authored-by: Dan <denqwerta@gmail.com>
Co-authored-by: Danel Dave Barbuco <barbucodanel@gmail.com>
Co-authored-by: DatTran MLL <tranthanhdat1142003@gmail.com>
Co-authored-by: Dexroneum <Rozhenkov69@gmail.com>
Co-authored-by: Eduard Ereza Martínez <eduard@ereza.cat>
Co-authored-by: FateXBlood <zecrofelix@gmail.com>
Co-authored-by: Ferran <ferrancette@gmail.com>
Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com>
Co-authored-by: ID-86 <id86dev@gmail.com>
Co-authored-by: Igor <zerrxs@gmail.com>
Co-authored-by: Izxmi <heltherrivas05@gmail.com>
Co-authored-by: Leonardo Falcoski <leonardo.falcoski@gmail.com>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Rostyslav Haitkulov <info@ubilling.net.ua>
Co-authored-by: Swyter <swyterzone@gmail.com>
Co-authored-by: TheKingTermux <achmadmaulana0233@gmail.com>
Co-authored-by: Uzuki Shimamura <hzy980512@126.com>
Co-authored-by: altinat <altinat@duck.com>
Co-authored-by: stevenlele <stevenlele@outlook.com>
commit d78159bda875adf20168506ee7fc12d112a1b0d3
2 changes: 0 additions & 2 deletions i18n/src/main/res/values-am/strings.xml
Original file line number Diff line number Diff line change
@@ -52,7 +52,6 @@
<string name="lock_with_biometrics">በባዮሜትሪክስ ቆልፍ</string>
<string name="pref_category_security">ደህንነት</string>
<string name="pref_manage_notifications">ማሳወቂያዎችን ያቀናብሩ</string>
<string name="pref_confirm_exit">መውጫውን ያረጋግጡ</string>
<string name="pref_date_format">የቀን ቅርጸት</string>
<string name="theme_dark">በርቷል</string>
<string name="theme_light">ጠፍቷል</string>
@@ -82,7 +81,6 @@
<string name="action_move_to_top">ወደ ላይ ውሰድ</string>
<string name="action_oldest">በጣም ጥንታዊ</string>
<string name="action_newest">በጣም አዲስ</string>
<string name="action_reorganize_by">እንደገና አስተካክል</string>
<string name="action_sort">ደርድር</string>
<string name="action_cancel_all">ሁሉንም ሰርዝ</string>
<string name="action_cancel">ሰርዝ</string>
44 changes: 41 additions & 3 deletions i18n/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
@@ -285,7 +285,6 @@
<string name="action_move_to_top">نقل إلى الأعلى</string>
<string name="action_oldest">الأقدم</string>
<string name="action_newest">الأَحدثْ</string>
<string name="action_reorganize_by">إعادة ترتيب</string>
<string name="action_cancel_all">إلغاء الكل</string>
<string name="action_view_chapters">عرض الفصول</string>
<string name="action_sort_latest_chapter">أحدث فصل</string>
@@ -333,7 +332,6 @@
<string name="webtoon_side_padding_15">١٥٪</string>
<string name="webtoon_side_padding_10">١٠٪</string>
<string name="webtoon_side_padding_0">بلا</string>
<string name="pref_confirm_exit">تأكيد الخروج</string>
<string name="action_unpin">إلغاء التثبيت</string>
<string name="action_pin">تثبيت</string>
<string name="action_select_inverse">عكس التحديد</string>
@@ -798,4 +796,44 @@
<string name="pref_chapter_swipe_end">إجراء التمرير الأيسر</string>
<string name="pref_chapter_swipe_start">إجراء التمرير الأيمن</string>
<string name="pref_library_columns_per_row">%d كلَّ صفٍّ</string>
</resources>
<string name="action_set_interval">عيِّد المدة</string>
<string name="action_filter_interval_custom">مدة جلب مخصَّصة</string>
<string name="action_filter_interval_long">اجلب كلَّ شهر (٢٨ يومًا)</string>
<string name="action_filter_interval_passed">مرت مدة الالتماس</string>
<string name="action_filter_interval_late">١٠+ التماسات متأخرة</string>
<string name="action_filter_interval_dropped">ربما أُلغيت؟ ٢٠ التماسًا متأخرًا وشهران</string>
<string name="manga_display_interval_title">قدِّر كلَّ</string>
<string name="pref_update_only_in_release_period">ليس ضمن مدة الإصدار المتوقعة</string>
<string name="pref_update_release_grace_period">مدة سماح الإصدار المتوقعة</string>
<string name="pref_update_release_grace_period_info">مدة سماح قصيرة خير من مدة سماح طويلة، وذلك لتخفف الضغط على المصادر. وكلما تُلتمس مدخلة وليس لهذا تحديث تصير مدة الالتماس أطول، وأقصاها ٢٨ يومًا.</string>
<string name="manga_modify_calculated_interval_title">خصِّص المدة</string>
<plurals name="pref_update_release_following_days">
<item quantity="zero">لا يوم بعد</item>
<item quantity="one">بعد يوم واحد</item>
<item quantity="two">بعد يومين</item>
<item quantity="few">بعد %d أيام</item>
<item quantity="many">بعد %d يومًا</item>
<item quantity="other">بعد %d يوم</item>
</plurals>
<string name="skipped_reason_not_in_release_period">تُخُطِّيت بسبب عدم توقع صدور اليوم</string>
<string name="manga_modify_interval_title">عدِّل المدة</string>
<string name="manga_display_modified_interval_title">عيِّن التحديث كلَّ</string>
<plurals name="day">
<item quantity="zero">لا يوم</item>
<item quantity="one">يوم واحد</item>
<item quantity="two">يومان</item>
<item quantity="few">%d أيام</item>
<item quantity="many">%d يومًا</item>
<item quantity="other">%d يوم</item>
</plurals>
<plurals name="pref_update_release_leading_days">
<item quantity="zero">لا يوم قبل</item>
<item quantity="one">قبل يوم واحد</item>
<item quantity="two">قبل يومين</item>
<item quantity="few">قبل %d أيام</item>
<item quantity="many">قبل %d يومًا</item>
<item quantity="other">قبل %d يوم</item>
</plurals>
<string name="intervals_header">المدة</string>
<string name="action_sort_next_updated">التحديث المتوقع القادم</string>
</resources>
2 changes: 0 additions & 2 deletions i18n/src/main/res/values-b+es+419/strings.xml
Original file line number Diff line number Diff line change
@@ -68,7 +68,6 @@
<string name="action_move_to_bottom">Mover al fondo</string>
<string name="action_move_to_top">Mover hacia arriba</string>
<string name="action_oldest">Antigüo</string>
<string name="action_reorganize_by">Reordenar</string>
<string name="action_cancel_all">Cancelar todo</string>
<string name="action_disable">Desactivar</string>
<string name="action_display_show_tabs">Mostrar pestaña de categorías</string>
@@ -238,7 +237,6 @@
<string name="lock_with_biometrics">Desbloqueo requerido</string>
<string name="pref_category_security">Seguridad y privacidad</string>
<string name="pref_manage_notifications">Gestionar notificaciones</string>
<string name="pref_confirm_exit">Confirmar salir</string>
<string name="pref_date_format">Formato de fecha</string>
<string name="theme_dark">Encendido</string>
<string name="theme_light">Apagado</string>
2 changes: 0 additions & 2 deletions i18n/src/main/res/values-be/strings.xml
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@
<string name="action_newest">Найноўшы</string>
<string name="action_order_by_chapter_number">Па нумару часткi</string>
<string name="action_order_by_upload_date">Па даце загрузкі</string>
<string name="action_reorganize_by">Пераупарадкаваць</string>
<string name="action_sort">Сартаваць</string>
<string name="cancel_all_for_series">Адмяніце ўсе для гэтай серыі</string>
<string name="action_cancel_all">Адмяніць усе</string>
@@ -149,7 +148,6 @@
<string name="lock_with_biometrics">Патрабаваць разблакоўку</string>
<string name="pref_category_security">Бяспека</string>
<string name="pref_manage_notifications">Кіраванне апавяшчэннямі</string>
<string name="pref_confirm_exit">Пацвярджаць выхад</string>
<string name="pref_date_format">Фармат даты</string>
<string name="pref_dark_theme_pure_black">Чысты чорны цёмны рэжым</string>
<string name="theme_yotsuba">Ёцуба</string>
2 changes: 0 additions & 2 deletions i18n/src/main/res/values-bg/strings.xml
Original file line number Diff line number Diff line change
@@ -403,7 +403,6 @@
<string name="lock_with_biometrics">Изисквай отключване</string>
<string name="pref_category_security">Сигурност</string>
<string name="pref_manage_notifications">Уведомления</string>
<string name="pref_confirm_exit">Потвърждение при излизане</string>
<string name="theme_system">Система на абонаментите</string>
<string name="theme_dark">Включено</string>
<string name="theme_light">Изключено</string>
@@ -412,7 +411,6 @@
<string name="action_move_to_bottom">Премести най-долу</string>
<string name="action_oldest">Най-стари</string>
<string name="action_newest">Най-нови</string>
<string name="action_reorganize_by">Пренареди</string>
<string name="action_cancel_all">Отмени всичко</string>
<string name="action_unpin">Откачи</string>
<string name="action_pin">Закачи</string>
2 changes: 0 additions & 2 deletions i18n/src/main/res/values-bn/strings.xml
Original file line number Diff line number Diff line change
@@ -302,7 +302,6 @@
<string name="lock_with_biometrics">আনলক প্রয়োজন</string>
<string name="pref_category_security">নিরাপত্তা</string>
<string name="pref_manage_notifications">বিজ্ঞপ্তিগুলি নিয়ন্ত্রণ করুন</string>
<string name="pref_confirm_exit">বের হতে নিশ্চিত করুন</string>
<string name="pref_date_format">তারিখের রীতি</string>
<string name="theme_dark">চালু করুন</string>
<string name="theme_light">বন্ধ করুন</string>
@@ -313,7 +312,6 @@
<string name="action_move_to_top">শীর্ষে সরান</string>
<string name="action_oldest">প্রবীণতম</string>
<string name="action_newest">নবীনতম</string>
<string name="action_reorganize_by">পুনরায় সাজান</string>
<string name="action_cancel_all">সব বাতিল করুন</string>
<string name="action_unpin">আলগা করুন</string>
<string name="action_pin">আটকান</string>
Loading