Skip to content

Commit feccf46

Browse files
Jays2KingsJays2Kings
committed
Merge branch 'master' into work-manager-2.8.0-update
2 parents 5418dba + 21a2705 commit feccf46

File tree

34 files changed

+192
-56
lines changed

34 files changed

+192
-56
lines changed

‎.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ I acknowledge that:
44

55
- If this is a bug or a feature, I will not use this issue template and instead use one of the options on the previous page
66
- I have tried the troubleshooting guide: https://tachiyomi.org/help/guides/troubleshooting-problems/
7-
- I have updated to the latest version of the app (latest J2K is v1.6.5)
7+
- I have updated to the latest version of the app (latest J2K is v1.6.6)
88
- I will not repeat an issue already requested
99
- If this is an request for an extension/source, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi-extensions
1010

‎.github/ISSUE_TEMPLATE/beta_issue_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ body:
100100
required: true
101101
- label: I have tried the [troubleshooting guide](https://tachiyomi.org/help/guides/troubleshooting/).
102102
required: true
103-
- label: I have updated the app to beta version **[1.7.0-b01](https://github.com/Jays2Kings/tachiyomiJ2K/releases/latest)**.
103+
- label: I have updated the app to beta version **[1.7.0-b02](https://github.com/Jays2Kings/tachiyomiJ2K/releases)**.
104104
required: true
105105
- label: I have updated all installed extensions.
106106
required: true

‎.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ body:
3535
required: true
3636
- label: If this is an issue with an extension, or a request for an extension, I should be opening an issue in the [extensions repository](https://github.com/tachiyomiorg/tachiyomi-extensions/issues/new/choose).
3737
required: true
38-
- label: I have updated the app to version **[1.6.5](https://github.com/Jays2Kings/tachiyomiJ2K/releases/latest)**.
38+
- label: I have updated the app to version **[1.6.6](https://github.com/Jays2Kings/tachiyomiJ2K/releases/latest)**.
3939
required: true
4040
- label: I have checked through the app settings for my feature.
4141
required: true

‎.github/ISSUE_TEMPLATE/issue_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ body:
100100
required: true
101101
- label: I have tried the [troubleshooting guide](https://tachiyomi.org/help/guides/troubleshooting/).
102102
required: true
103-
- label: I have updated the app to version **[1.6.5](https://github.com/Jays2Kings/tachiyomiJ2K/releases/latest)**.
103+
- label: I have updated the app to version **[1.6.6](https://github.com/Jays2Kings/tachiyomiJ2K/releases/latest)**.
104104
required: true
105105
- label: I have updated all installed extensions.
106106
required: true

‎app/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,15 +150,15 @@ dependencies {
150150
implementation("androidx.appcompat:appcompat:1.6.1")
151151
implementation("androidx.cardview:cardview:1.0.0")
152152
implementation("com.google.android.material:material:1.8.0")
153-
implementation("androidx.webkit:webkit:1.6.0")
153+
implementation("androidx.webkit:webkit:1.6.1")
154154
implementation("androidx.recyclerview:recyclerview:1.3.0")
155155
implementation("androidx.preference:preference:1.2.0")
156156
implementation("androidx.annotation:annotation:1.6.0")
157157
implementation("androidx.browser:browser:1.5.0")
158158
implementation("androidx.biometric:biometric:1.1.0")
159159
implementation("androidx.palette:palette:1.0.0")
160-
implementation("androidx.activity:activity-ktx:1.7.0-rc01")
161-
implementation("androidx.core:core-ktx:1.10.0-rc01")
160+
implementation("androidx.activity:activity-ktx:1.7.0")
161+
implementation("androidx.core:core-ktx:1.10.0")
162162
implementation("com.google.android.flexbox:flexbox:3.0.0")
163163
implementation("androidx.window:window:1.0.0")
164164
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
@@ -172,7 +172,7 @@ dependencies {
172172
implementation("com.google.firebase:firebase-analytics-ktx")
173173
implementation("com.google.firebase:firebase-crashlytics-ktx")
174174

175-
val lifecycleVersion = "2.6.0"
175+
val lifecycleVersion = "2.6.1"
176176
kapt("androidx.lifecycle:lifecycle-compiler:$lifecycleVersion")
177177
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
178178
implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,4 +1167,7 @@
11671167
<string name="by_series">حسب السلسلة</string>
11681168
<string name="by_week">حسب الأسبوع</string>
11691169
<string name="by_day">حسب اليوم</string>
1170+
<string name="gray_background">رمادي</string>
1171+
<string name="app_updates">تحديثات التطبيق</string>
1172+
<string name="open">افتح</string>
11701173
</resources>

‎app/src/main/res/values-az/strings.xml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,74 @@
22
<resources>
33
<string name="name">Ad</string>
44
<string name="more">Daha çox</string>
5+
<plurals name="remove_n_chapters">
6+
<item quantity="one">Endirilmiş %1$d bölüm silinsin\?</item>
7+
<item quantity="other">Endirilmiş %1$d bölüm silinsin\?</item>
8+
</plurals>
9+
<plurals name="chapters_plural">
10+
<item quantity="one">%1$s bölüm</item>
11+
<item quantity="other">%1$s bölüm</item>
12+
</plurals>
13+
<string name="external_storage_download_notice">TachiyomiJ2K bölümləri yükləmək üçün bütün fayllara giriş tələb edir. Bura klikləyin, sonra \"Bütün faylları idarə etmək üçün girişə icazə verin\" funksiyasını aktivləşdirin.</string>
14+
<string name="manga">Manga</string>
15+
<string name="comic">Komiks</string>
16+
<string name="webtoon">Webtoon</string>
17+
<string name="in_progress">Davam edir</string>
18+
<string name="not_started">Başlamadı</string>
19+
<string name="read">Oxunub</string>
20+
<string name="title">Başlıq</string>
21+
<string name="author">Müəllif</string>
22+
<string name="artist">Rəssam</string>
23+
<string name="description">Açıqlama</string>
24+
<string name="move_x_to">%1$s daşı…</string>
25+
<string name="add_x_to">%1$s əlavə et…</string>
26+
<string name="ongoing">Davam edir</string>
27+
<string name="unknown">Bilinmir</string>
28+
<string name="unknown_status">Bilinməyən Vəziyyət</string>
29+
<string name="licensed">Lisenziyalı</string>
30+
<string name="completed">Tamamlandı</string>
31+
<string name="publishing_finished">Nəşri başa çatıb</string>
32+
<string name="cancelled">Ləğv edildi</string>
33+
<string name="on_hiatus">Fasilədə</string>
34+
<string name="unlock_library">Kitabxanaya daxil olmaq üçün kilidi açın</string>
35+
<string name="unlock">Kilidi açın</string>
36+
<string name="lock_with_biometrics">Kilidin açılmasını tələb edir</string>
37+
<string name="new_chapters">Yeni bölümlər</string>
38+
<string name="unread">Oxunmamış</string>
39+
<string name="last_read_chapter_">Son oxunan bölüm %1$s</string>
40+
<string name="chapter_">Bölüm %1$s</string>
41+
<string name="chapter_x_of_y">Bölüm %1$d / %2$d</string>
42+
<string name="all_chapters_read">Bütün bölümlər oxundu</string>
43+
<string name="bookmarked">İşarələnmişdir</string>
44+
<string name="not_bookmarked">İşarələnməyib</string>
45+
<string name="marked_as_unread">Oxunmamış olaraq işarələndi</string>
46+
<string name="removed_bookmark">İşarə silindi</string>
47+
<string name="chapter_not_found">Bölüm tapılmadı</string>
48+
<string name="local_invalid_format">Səhv bölüm formatı</string>
49+
<string name="order_by">Sırala</string>
50+
<string name="no_chapters_error">Bölümlər tapılmadı</string>
51+
<string name="no_pages_found">Səhifələr tapılmadı</string>
52+
<plurals name="pages_left">
53+
<item quantity="one">%1$d səhifə qaldı</item>
54+
<item quantity="other">%1$d səhifə qaldı</item>
55+
</plurals>
56+
<string name="all_files_permission_required">Fayl icazələri tələb olunur</string>
57+
<string name="external_storage_permission_notice">TachiyomiJ2K bölümləri yükləmək, avtomatik ehtiyat nüsxələri yaratmaq və lokal manqa oxumaq üçün Android 11-də bütün fayllara giriş icazəsi olmalıdır.
58+
\n
59+
\nNövbəti ekranda \"Bütün faylları idarə etmək üçün girişə icazə verin\" seçimini aktivləşdirin.</string>
60+
<string name="manhwa">Manhwa</string>
61+
<string name="manhua">Manhua</string>
62+
<string name="lock_when_idle">Boş olduqda kilidlə</string>
63+
<string name="chapters">Bölümlər</string>
64+
<string name="marked_as_read">Oxundu olaraq işarələndi</string>
65+
<string name="chapters_removed">Bölümlər silindi.</string>
66+
<string name="loader_rar5_error">RARv5 formatı dəstəklənmir</string>
67+
<string name="remove_all_downloads">Bütün endirilənlər silinsin\?</string>
68+
<string name="no_chapters_to_delete">Silmək üçün bölüm yoxdur</string>
69+
<string name="by_source_order">Mənbə sırasıyla</string>
70+
<string name="by_chapter_number">Bölüm nömrəsi ilə</string>
71+
<string name="by_update_date">Yüklənmə tarixinə görə</string>
72+
<string name="scanlators">Skanlyatorlar</string>
73+
<string name="category">Kateqoriya</string>
74+
<string name="categories">Kateqoriyalar</string>
575
</resources>

‎app/src/main/res/values-cs/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,4 +1092,6 @@
10921092
<string name="by_series">Podle série</string>
10931093
<string name="updates_last_update_info">Poslední aktualizace knihovny: %s</string>
10941094
<string name="gray_background">Šedá</string>
1095+
<string name="app_updates">Aktualizace aplikace</string>
1096+
<string name="open">Otevřít</string>
10951097
</resources>

‎app/src/main/res/values-cv/strings.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -275,15 +275,15 @@
275275
<string name="vertical_viewer">Урлӑ</string>
276276
<string name="right_to_left_viewer">Сылтӑмран сулахаялла</string>
277277
<string name="left_to_right_viewer">Сулахайран сылтӑмалла</string>
278-
<string name="decode_image_error"/>
278+
<string name="decode_image_error">Сӑн тийенмерӗ</string>
279279
<string name="cover_updated">Хуплашкана ҫӗнетнӗ</string>
280280
<string name="set_as_cover">Хуплашка пек ларт</string>
281281
<string name="obsolete_extension_message">Ҫак хушмана урӑх кӗме май ҫук.</string>
282-
<string name="untrusted_extension_message">Ку хушмана шанчӑклӑ мар сертификатпа алӑ пуснӑ тата ӑна активламан.
282+
<string name="untrusted_extension_message">Ку хушмана шанчӑклӑ мар ӗнентерӳ хучӗпе алӑ пуснӑ тата ӑна пуҫарман.
283283
\n
284-
\nСиенлӗ хушма Tachiyomi-ри упранакан кирек мӗнле шут пӗлӗмсене шута илме е хӑй ирӗклӗ юма пурнӑҫлама пултарать.
284+
\nСийенлӗ хушма Tachiyomi-ри упранакан кирек мӗнле шут пӗлӗмӗсене шута илме йе хӑй ирӗклӗ йума пурнӑҫлама пултарать.
285285
\n
286-
\nҪак сертификата шаннипе эсӗ ҫав теветкеле йышӑнатӑн.</string>
286+
\nҪак ӗнентерӳ хутне шаннипе есӗ ҫав теветкеле йышӑнатӑн.</string>
287287
<string name="untrusted_extension">Шанчӑклӑ мар хушма</string>
288288
<string name="local_source_help_guide">Вырӑнти ҫӑл куҫ ертӳлӗхӗ</string>
289289
<string name="in_library">Вулавăшра</string>
@@ -361,7 +361,7 @@
361361
<string name="unlock_library">Вулавӑша уҫма ҫаклату салт</string>
362362
<string name="tracked">Сӑнавланакан</string>
363363
<string name="last_used">Юлашки усӑ курни</string>
364-
<string name="unofficial_extension_message">Ҫак хушма Tachiyomi-н официаллӑ хушмасен ят-йыша кӗмест.</string>
364+
<string name="unofficial_extension_message">Ҫак хушма Tachiyomi-н ӗҫ йӗркиллӗ хушмасен йат-йышне кӗмест.</string>
365365
<string name="nsfw_short">18+</string>
366366
<string name="unofficial">Официаллӑ мар</string>
367367
<string name="may_contain_nsfw">NSFW (18+) шалаш пулма пултарать</string>
@@ -496,4 +496,6 @@
496496
<string name="pure_black_dark_mode">Хуп-хура темӑ</string>
497497
<string name="pref_update_only_completely_read">Вуламан сыпӑк(сем) пур</string>
498498
<string name="pref_update_only_started">Серилӗхе пуҫламан</string>
499+
<string name="split_tall_images">Вӑрӑм сӑнсене пайлани</string>
500+
<string name="split_tall_images_summary">Вулӑшӑн тухӑҫа лайӑхлатать</string>
499501
</resources>

‎app/src/main/res/values-de/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,4 +1099,7 @@
10991099
<string name="show_more_chapters">Weitere Kapitel anzeigen</string>
11001100
<string name="collapse_grouped_chapters">Gruppierte Kapitel einklappen</string>
11011101
<string name="updates_last_update_info">Bibliothek zuletzt aktualisiert: %s</string>
1102+
<string name="gray_background">Grau</string>
1103+
<string name="app_updates">Anwendungsaktualisierungen</string>
1104+
<string name="open">Öffnen</string>
11021105
</resources>

‎app/src/main/res/values-el/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,4 +1065,5 @@
10651065
<string name="by_day">Κατά ημέρα</string>
10661066
<string name="updates_last_update_info">Τελευταία ενημέρωση βιβλιοθήκης: %s</string>
10671067
<string name="gray_background">Γκρι</string>
1068+
<string name="app_updates">Ενημερώσεις εφαρμογής</string>
10681069
</resources>

‎app/src/main/res/values-es/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,4 +1122,5 @@
11221122
<string name="by_week">Por semanas</string>
11231123
<string name="by_day">Por días</string>
11241124
<string name="updates_last_update_info">La biblioteca se actualizó: %s</string>
1125+
<string name="gray_background">Gris</string>
11251126
</resources>

‎app/src/main/res/values-fa/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,4 +577,5 @@
577577
<item quantity="other">%d قسمت جا افتاده است</item>
578578
</plurals>
579579
<string name="gray_background">خاکستری</string>
580+
<string name="app_updates">بروزرسانی برنامه</string>
580581
</resources>

‎app/src/main/res/values-fil/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,4 +1065,5 @@
10651065
<string name="by_day">Sa pamamagitan ng araw</string>
10661066
<string name="by_week">Sa pamamagitan ng linggo</string>
10671067
<string name="gray_background">Abo</string>
1068+
<string name="app_updates">Mga update sa app</string>
10681069
</resources>

‎app/src/main/res/values-fr/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,4 +1125,7 @@
11251125
<string name="by_week">Par semaine</string>
11261126
<string name="by_day">Par jour</string>
11271127
<string name="updates_last_update_info">Dernière mise à jour de la bibliothèque le : %s</string>
1128+
<string name="gray_background">Gris</string>
1129+
<string name="app_updates">Mises à jour de l\'application</string>
1130+
<string name="open">Ouvrir</string>
11281131
</resources>

0 commit comments

Comments
 (0)