Merge branch 'devel' into release/5

app/build.gradle

@@ -58,6 +58,7 @@ android {
 		]
 	}
 	lint {
+		abortOnError true
 		disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged'
 	}
 	testOptions {
@@ -77,7 +78,7 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:cc418570d5') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:a3ffecc00f') {
 		exclude group: 'org.json', module: 'json'
 	}
 

app/src/main/res/values-w600dp/dimens.xml

@@ -4,5 +4,4 @@
 	<dimen name="grid_spacing_outer">2dp</dimen>
 	<dimen name="preferred_grid_width">140dp</dimen>
 	<dimen name="bottom_sheet_width">420dp</dimen>
-	<dimen name="fragment_horizontal_margin">48dp</dimen>
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -405,8 +405,6 @@
 	<string name="show_suspicious_content">显示可疑内容</string>
 	<string name="theme_name_dynamic">动态</string>
 	<string name="color_theme">颜色方案</string>
-	<string name="theme_name_mint">薄荷绿</string>
-	<string name="theme_name_october">October</string>
 	<string name="show_in_grid_view">用网格视图显示</string>
 	<string name="theme_name_miku">Miku</string>
 	<string name="theme_name_asuka">Asuka</string>