# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
This commit is contained in:
NerdNumber9
2018-07-08 15:51:26 -04:00
35 changed files with 178 additions and 89 deletions

View File

@@ -241,7 +241,6 @@
<string name="manga_info_status_label">Статус</string>
<string name="manga_info_source_label">Източник</string>
<string name="manga_info_genres_label">Жанрове</string>
<string name="share_text">Проверете %1$s! в %2$s</string>
<string name="circular_icon">Кръгла икона</string>
<string name="rounded_icon">Заоблена икона</string>
<string name="square_icon">Квадратна икона</string>