Merge branch 'master' into devel

2024-08-12 18:35:22 +03:00
parent f3c19f9c02 809e7d8701
commit 9e53dc3d5f
8 changed files with 108 additions and 18 deletions
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -671,4 +671,5 @@
 	<string name="chapters_left">Chapters left</string>
 	<string name="external_source">External/plugin</string>
 	<string name="plugin_incompatible">Incompatible plugin or internal error. Make sure you are using the latest version of the plugin and Kotatsu</string>
+	<string name="connection_ok">Connection is OK</string>
 </resources>
--- a/app/src/main/res/xml/pref_proxy.xml
+++ b/app/src/main/res/xml/pref_proxy.xml
@@ -36,4 +36,10 @@

 	</PreferenceCategory>

+	<Preference
+		android:key="proxy_test"
+		android:persistent="false"
+		android:title="Test connection"
+		app:allowDividerAbove="true" />
+
 </PreferenceScreen>