From e224934eb4c1cf57c9e4d27384f95b1c5581efc8 Mon Sep 17 00:00:00 2001
From: tutel <john.g.zioupos@gmail.com>
Date: Mon, 20 May 2024 13:39:03 +0300
Subject: [PATCH] Fixed Conflicts

---
 app/src/main/res/values/strings.xml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index be5a57ee..be8aac31 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -995,5 +995,27 @@ Non quae tempore quo provident laudantium qui illo dolor vel quia dolor et exerc
     <string name="view_subscriptions_desc">View and edit all your subscriptions</string>
     <string name="subscriptions">Subscriptions</string>
     <string name="subscription_deleted">Subscription Deleted</string>
+    <string name="foreground_service_not_allowed">Cannot install when app is in background</string>
+    <string name="ping">Ping</string>
+    <string name="basic">Basic</string>
+    <string name="full">Full</string>
+    <string name="test_type">Test Type</string>
+    <string name="extension_type">Extension Type</string>
+    <string name="view_options">View Options</string>
+    <string name="extension_test">Extension Test</string>
+    <string name="extension_test_desc">Test if the extensions are working</string>
+    <string name="start_test">Start Test</string>
+    <string name="no_extensions_selected">No extensions selected</string>
+    <string name="ping_success">Ping successful: %1$s ms</string>
+    <string name="ping_error">Ping failed. Code: %1$s, Message: %2$s</string>
+    <string name="test_not_supported">Test not supported for this extension</string>
+    <string name="no_results_found">No results found. Extension may be broken</string>
+    <string name="results_found">%1$s results found</string>
+    <string name="title_search_test">Title Search Test: %1$s</string>
+    <string name="episode_search_test">Episode Search Test: %1$s</string>
+    <string name="chapter_search_test">Chapter Search Test: %1$s</string>
+    <string name="video_search_test">Video Search Test: %1$s</string>
+    <string name="image_search_test">Image Search Test: %1$s</string>
+    <string name="book_search_test">Book Search Test: %1$s</string>
     <string name="subtitle_langauge">Subtitle Langauge</string>
 </resources>