# 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

@@ -235,7 +235,6 @@
<string name="manga_info_status_label">Stato</string>
<string name="manga_info_source_label">Fonte</string>
<string name="manga_info_genres_label">Generi</string>
<string name="share_text">Dai un\'occhiata a %1$s! %2$s</string>
<string name="circular_icon">Icona circolare</string>
<string name="rounded_icon">Icona arrotondata</string>
<string name="square_icon">Icona quadrata</string>