From 04868ecfddf7e8d0467eed74d1cfe29076d0e7e1 Mon Sep 17 00:00:00 2001
From: MohitMaliFtechiz <futuretechoworld.mohitmali@gmail.com>
Date: Thu, 23 Nov 2023 15:08:41 +0530
Subject: [PATCH 1/8] Fixed: Numerous issues with links were reported by the
 Play Store.

* The Play Store highlighted the need to add "/" to the beginning of the `android:pathPattern`. As a result, we have now included "/" at the beginning of all `android:pathPattern` instances to ensure compatibility with the Play Store.
* Additionally, the `android:autoVerify="true"` attribute has been added to intent filters to verify domain ownership. This was identified as an issue by both the Play Store and the App Links Assistant tool in Android Studio.
---
 app/src/main/AndroidManifest.xml | 45 ++++++++++++++++----------------
 lintConfig.xml                   |  1 +
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d85b34bdab..174f160bf3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -39,6 +39,7 @@
         <action android:name="android.intent.action.VIEW" />
 
         <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
 
         <data android:scheme="content" />
         <data android:mimeType="application/octet-stream" />
@@ -52,10 +53,10 @@
 
         <data android:scheme="file" />
         <data android:mimeType="*/*" />
-        <data android:pathPattern=".*\\.zim" />
-        <data android:pathPattern=".*\\..*\\.zim" />
-        <data android:pathPattern=".*\\..*\\..*\\.zim" />
-        <data android:pathPattern=".*\\..*\\..*\\..*\\.zim" />
+        <data android:pathPattern="/.*\\.zim" />
+        <data android:pathPattern="/.*\\..*\\.zim" />
+        <data android:pathPattern="/.*\\..*\\..*\\.zim" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\.zim" />
         <data android:host="*" />
       </intent-filter>
       <intent-filter>
@@ -66,13 +67,13 @@
 
         <data android:scheme="file" />
         <data android:mimeType="*/*" />
-        <data android:pathPattern=".*\\.zimaa" />
-        <data android:pathPattern=".*\\..*\\.zimaa" />
-        <data android:pathPattern=".*\\..*\\..*\\.zimaa" />
-        <data android:pathPattern=".*\\..*\\..*\\..*\\.zimaa" />
+        <data android:pathPattern="/.*\\.zimaa" />
+        <data android:pathPattern="/.*\\..*\\.zimaa" />
+        <data android:pathPattern="/.*\\..*\\..*\\.zimaa" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\.zimaa" />
         <data android:host="*" />
       </intent-filter>
-      <intent-filter>
+      <intent-filter android:autoVerify="true">
         <action android:name="android.intent.action.VIEW" />
 
         <category android:name="android.intent.category.DEFAULT" />
@@ -80,12 +81,12 @@
 
         <data android:scheme="http" />
         <data android:host="*" />
-        <data android:pathPattern=".*\\.zim(aa|)" />
-        <data android:pathPattern=".*\\..*\\.zim(aa|)" />
-        <data android:pathPattern=".*\\..*\\..*\\.zim(aa|)" />
-        <data android:pathPattern=".*\\..*\\..*\\..*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\..*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\..*\\..*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\.zim(aa|)" />
       </intent-filter>
-      <intent-filter>
+      <intent-filter android:autoVerify="true">
         <action android:name="android.intent.action.VIEW" />
 
         <category android:name="android.intent.category.DEFAULT" />
@@ -93,10 +94,10 @@
 
         <data android:scheme="https" />
         <data android:host="*" />
-        <data android:pathPattern=".*\\.zim(aa|)" />
-        <data android:pathPattern=".*\\..*\\.zim(aa|)" />
-        <data android:pathPattern=".*\\..*\\..*\\.zim(aa|)" />
-        <data android:pathPattern=".*\\..*\\..*\\..*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\..*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\..*\\..*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\.zim(aa|)" />
       </intent-filter>
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
@@ -106,10 +107,10 @@
 
         <data android:scheme="content" />
         <data android:host="*" />
-        <data android:pathPattern=".*\\.zim(aa|)" />
-        <data android:pathPattern=".*\\..*\\.zim(aa|)" />
-        <data android:pathPattern=".*\\..*\\..*\\.zim(aa|)" />
-        <data android:pathPattern=".*\\..*\\..*\\..*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\..*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\..*\\..*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\.zim(aa|)" />
       </intent-filter>
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
diff --git a/lintConfig.xml b/lintConfig.xml
index 3266191e3e..62aaad8d0b 100644
--- a/lintConfig.xml
+++ b/lintConfig.xml
@@ -47,4 +47,5 @@
   <issue id="UnusedIds" severity="warning" />
   <issue id="DataExtractionRules" severity="warning" />
   <issue id="ObsoleteSdkInt" severity="warning" />
+  <issue id="AppLinksAutoVerify" severity="warning" />
 </lint>

From 88f020ea80d1ed0bae57a571f282c6b17fbc0dd8 Mon Sep 17 00:00:00 2001
From: Emmanuel Engelhart <kelson@kiwix.org>
Date: Sat, 25 Nov 2023 10:26:18 +0100
Subject: [PATCH 2/8] Use GitHub 'release' event to trigger release

---
 .github/workflows/release.yml | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 060cdf5961..d770d82476 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,13 +1,8 @@
 name: Publish App
 
 on:
-  push:
-    branches-ignore:
-      - '*'
-      - '*/**'
-    tags:
-      - '*'
-      - '*/**'
+  release:
+    types: [published]
 
 jobs:
   publish:
@@ -32,19 +27,17 @@ jobs:
           echo "$SSH_KEY" | base64 -d > ssh_key
           chmod 600 ssh_key
 
-      - name: Set tag variable
-        run: echo "TAG=$(echo ${GITHUB_REF:10})" >> $GITHUB_ENV
-
       - name: Publish APK to download.kiwix.org
         env:
           KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
           KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
           KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
           UNIVERSAL_RELEASE_APK: app/build/outputs/apk/release/*universal*.apk
+          ARCHIVE_NAME: kiwix-${{ github.event.release.tag_name }}.apk
         run: |
           ./gradlew assembleRelease
-          cp $UNIVERSAL_RELEASE_APK kiwix-${TAG}.apk
-          scp -P 30022 -vrp -i ssh_key -o StrictHostKeyChecking=no kiwix-${TAG}.apk ci@master.download.kiwix.org:/data/download/release/kiwix-android/
+          cp "$UNIVERSAL_RELEASE_APK" "$ARCHIVE_NAME"
+          scp -P 30022 -vrp -i ssh_key -o StrictHostKeyChecking=no "$ARCHIVE_NAME" ci@master.download.kiwix.org:/data/download/release/kiwix-android/
 
 #      This is temporary, once we will publish 3.7.0 then we will uncommented this code.
 #      # This is necessary for F-Droid

From a1df0fedfeb19116c91f294975cdc5f07bc1d187 Mon Sep 17 00:00:00 2001
From: MohitMaliFtechiz <futuretechoworld.mohitmali@gmail.com>
Date: Wed, 29 Nov 2023 14:56:55 +0530
Subject: [PATCH 3/8] Implemented debouncing mechanism for the search
 functionality.

* Implemented a debouncing mechanism to enhance the handling of search functionalities. This approach is employed to prevent unnecessary data loads from libkiwix, addressing the issue of crashes when users rapidly type and search for results.
---
 .../kiwixmobile/core/search/SearchFragment.kt |  3 +--
 .../core/search/viewmodel/SearchViewModel.kt  | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchFragment.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchFragment.kt
index 55dbecc41f..d0fa06af50 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchFragment.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchFragment.kt
@@ -61,7 +61,6 @@ import org.kiwix.kiwixmobile.core.search.viewmodel.Action
 import org.kiwix.kiwixmobile.core.search.viewmodel.Action.ActivityResultReceived
 import org.kiwix.kiwixmobile.core.search.viewmodel.Action.ClickedSearchInText
 import org.kiwix.kiwixmobile.core.search.viewmodel.Action.ExitedSearch
-import org.kiwix.kiwixmobile.core.search.viewmodel.Action.Filter
 import org.kiwix.kiwixmobile.core.search.viewmodel.Action.OnItemClick
 import org.kiwix.kiwixmobile.core.search.viewmodel.Action.OnItemLongClick
 import org.kiwix.kiwixmobile.core.search.viewmodel.Action.OnOpenInNewTabClick
@@ -219,7 +218,7 @@ class SearchFragment : BaseFragment() {
           searchView?.setOnQueryTextListener(
             SimpleTextListener {
               if (it.isNotEmpty()) {
-                searchViewModel.actions.trySend(Filter(it)).isSuccess
+                searchViewModel.searchResults(it)
               }
             }
           )
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModel.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModel.kt
index f284a0422f..e835ee27fa 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModel.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModel.kt
@@ -31,6 +31,8 @@ import kotlinx.coroutines.channels.trySendBlocking
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
@@ -65,6 +67,8 @@ import org.kiwix.kiwixmobile.core.search.viewmodel.effects.StartSpeechInput
 import org.kiwix.libzim.SuggestionSearch
 import javax.inject.Inject
 
+const val DEBOUNCE_DELAY = 500L
+
 @OptIn(ExperimentalCoroutinesApi::class)
 class SearchViewModel @Inject constructor(
   private val recentSearchDao: NewRecentSearchDao,
@@ -88,10 +92,24 @@ class SearchViewModel @Inject constructor(
   val actions = Channel<Action>(Channel.UNLIMITED)
   private val filter = ConflatedBroadcastChannel("")
   private val searchOrigin = ConflatedBroadcastChannel(FromWebView)
+  private val debouncedSearchQuery = MutableStateFlow("")
 
   init {
     viewModelScope.launch { reducer() }
     viewModelScope.launch { actionMapper() }
+    viewModelScope.launch { debouncedSearchQuery() }
+  }
+
+  private suspend fun debouncedSearchQuery() {
+    // Observe and collect the debounced search query
+    debouncedSearchQuery
+      // Applying debouncing to delay the emission of consecutive search queries
+      .debounce(DEBOUNCE_DELAY)
+      // Ensuring that only distinct search queries are processed
+      .distinctUntilChanged()
+      .collect { query ->
+        actions.trySend(Filter(query)).isSuccess
+      }
   }
 
   @Suppress("DEPRECATION")
@@ -201,6 +219,10 @@ class SearchViewModel @Inject constructor(
     }, LATEST)
       .subscribeOn(Schedulers.io())
   }
+
+  fun searchResults(query: String) {
+    debouncedSearchQuery.value = query
+  }
 }
 
 data class SearchResultsWithTerm(val searchTerm: String, val suggestionSearch: SuggestionSearch?)

From c3da77b5966098ff27aa5978cb391ecd1ae44cf5 Mon Sep 17 00:00:00 2001
From: MohitMaliFtechiz <futuretechoworld.mohitmali@gmail.com>
Date: Wed, 29 Nov 2023 18:48:40 +0530
Subject: [PATCH 4/8] Added unit test cases to properly test the search
 functionalities scenario.

---
 .../search/viewmodel/SearchViewModelTest.kt   | 89 +++++++++++++++++++
 1 file changed, 89 insertions(+)

diff --git a/core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt
index 7fbf391906..36eb2c6857 100644
--- a/core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt
+++ b/core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt
@@ -29,10 +29,12 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.consumeAsFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.TestCoroutineDispatcher
+import kotlinx.coroutines.test.TestCoroutineScheduler
 import kotlinx.coroutines.test.TestCoroutineScope
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.resetMain
@@ -109,6 +111,93 @@ internal class SearchViewModelTest {
     viewModel = SearchViewModel(recentSearchDao, zimReaderContainer, searchResultGenerator)
   }
 
+  @Nested
+  inner class DebouncedTest {
+    @Test
+    fun `Search action is debounced`() = runTest {
+      val searchTerm1 = "query1"
+      val searchTerm2 = "query2"
+      val searchTerm3 = "query3"
+      val searchOrigin = FromWebView
+      val suggestionSearch: SuggestionSearch = mockk()
+
+      viewModel.state
+        .test(this)
+        .also {
+          searchResult(searchTerm1, suggestionSearch, testScheduler)
+          delay(100)
+          searchResult(searchTerm2, suggestionSearch, testScheduler)
+          delay(100)
+          searchResult(searchTerm3, suggestionSearch, testScheduler)
+          it.assertValue(
+            SearchState(
+              searchTerm3,
+              SearchResultsWithTerm(searchTerm3, suggestionSearch),
+              emptyList(),
+              searchOrigin
+            )
+          )
+        }
+        .finish()
+    }
+
+    @Test
+    fun `Search action is not debounced if time hasn't passed`() = runTest {
+      val searchTerm1 = "query1"
+      val searchTerm2 = "query2"
+      val searchTerm3 = "query3"
+      val searchOrigin = FromWebView
+      val suggestionSearch: SuggestionSearch = mockk()
+
+      viewModel.state
+        .test(this)
+        .also {
+          searchResult(searchTerm1, suggestionSearch, testScheduler)
+          delay(50) // assume user rapidly typing
+          searchResult(searchTerm2, suggestionSearch, testScheduler)
+          delay(50)
+          // test value is not passed to searchResult as time has not passed and user still typing
+          // Match if it is initial `SearchState`
+          it.assertValue(
+            SearchState(
+              "",
+              SearchResultsWithTerm("", null),
+              emptyList(),
+              searchOrigin
+            )
+          )
+          searchResult(searchTerm3, suggestionSearch, testScheduler)
+          delay(DEBOUNCE_DELAY)
+          it.assertValue(
+            SearchState(
+              searchTerm3,
+              SearchResultsWithTerm(searchTerm3, suggestionSearch),
+              emptyList(),
+              searchOrigin
+            )
+          )
+        }
+        .finish()
+    }
+
+    private fun searchResult(
+      searchTerm: String,
+      suggestionSearch: SuggestionSearch,
+      testScheduler: TestCoroutineScheduler
+    ) {
+      coEvery {
+        searchResultGenerator.generateSearchResults(searchTerm, zimFileReader)
+      } returns suggestionSearch
+      viewModel.searchResults(searchTerm)
+      recentsFromDb.trySend(emptyList()).isSuccess
+      viewModel.actions.trySend(ScreenWasStartedFrom(FromWebView)).isSuccess
+      testScheduler.apply {
+        advanceTimeBy(400)
+        runCurrent()
+      }
+    }
+  }
+
   @Nested
   inner class StateTests {
     @Test

From c90c6312f4421cf1b8c6484ac52c39f51bce6093 Mon Sep 17 00:00:00 2001
From: MohitMaliFtechiz <futuretechoworld.mohitmali@gmail.com>
Date: Wed, 29 Nov 2023 19:29:20 +0530
Subject: [PATCH 5/8] Fixed unit test cases.

* Fixed: `Search action is debounced` test.
* Fixed: `SearchState combines sources from inputs` test.
---
 .../kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt
index 36eb2c6857..6d19e066d2 100644
--- a/core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt
+++ b/core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt
@@ -59,7 +59,6 @@ import org.kiwix.kiwixmobile.core.search.viewmodel.Action.ClickedSearchInText
 import org.kiwix.kiwixmobile.core.search.viewmodel.Action.ConfirmedDelete
 import org.kiwix.kiwixmobile.core.search.viewmodel.Action.CreatedWithArguments
 import org.kiwix.kiwixmobile.core.search.viewmodel.Action.ExitedSearch
-import org.kiwix.kiwixmobile.core.search.viewmodel.Action.Filter
 import org.kiwix.kiwixmobile.core.search.viewmodel.Action.OnItemClick
 import org.kiwix.kiwixmobile.core.search.viewmodel.Action.OnItemLongClick
 import org.kiwix.kiwixmobile.core.search.viewmodel.Action.OnOpenInNewTabClick
@@ -129,6 +128,7 @@ internal class SearchViewModelTest {
           searchResult(searchTerm2, suggestionSearch, testScheduler)
           delay(100)
           searchResult(searchTerm3, suggestionSearch, testScheduler)
+          delay(DEBOUNCE_DELAY)
           it.assertValue(
             SearchState(
               searchTerm3,
@@ -341,7 +341,7 @@ internal class SearchViewModelTest {
     coEvery {
       searchResultGenerator.generateSearchResults(searchTerm, zimFileReader)
     } returns suggestionSearch
-    viewModel.actions.trySend(Filter(searchTerm)).isSuccess
+    viewModel.searchResults(searchTerm)
     recentsFromDb.trySend(databaseResults).isSuccess
     viewModel.actions.trySend(ScreenWasStartedFrom(searchOrigin)).isSuccess
     testScheduler.apply {

From 9d129d5a9570881d50969e3b778dd54a62492fd7 Mon Sep 17 00:00:00 2001
From: MohitMaliFtechiz <futuretechnoworl.mohit@gmail.com>
Date: Wed, 29 Nov 2023 21:19:48 +0530
Subject: [PATCH 6/8] Updated kiwi version to 3.8.1

---
 buildSrc/src/main/kotlin/Config.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 7caea9131c..208906c98b 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -31,5 +31,5 @@ object Config {
   // Version Information
   const val versionMajor = 3 // Major version component of the app's version name and version code.
   const val versionMinor = 8 // Minor version component of the app's version name and version code.
-  const val versionPatch = 0 // Patch version component of the app's version name and version code.
+  const val versionPatch = 1 // Patch version component of the app's version name and version code.
 }

From dff852ca4eb49199e579e8cac5efe7cec5232a6e Mon Sep 17 00:00:00 2001
From: MohitMaliFtechiz <futuretechnoworl.mohit@gmail.com>
Date: Wed, 29 Nov 2023 21:31:28 +0530
Subject: [PATCH 7/8] Updated the CHANGELOG for milestone 3.8.1

---
 CHANGELOG | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index ce2e67b1ea..dc344bea9f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+3.8.1
+Bug Fixes:
+* Application crash occurring when users rapidly typed during a search for an entry. (https://github.com/kiwix/kiwix-android/pull/3558)
+* Play Store deep linking issue on Android 12 and above. (https://github.com/kiwix/kiwix-android/pull/3550)
+
 3.8.0
 New Features:
 * Download pause/resume feature. (https://github.com/kiwix/kiwix-android/pull/3459)

From e2585529d2e5a70859e37828eeddbe3744d78c20 Mon Sep 17 00:00:00 2001
From: "translatewiki.net" <l10n-bot@translatewiki.net>
Date: Mon, 27 Nov 2023 13:08:23 +0100
Subject: [PATCH 8/8] Localisation updates from https://translatewiki.net.

---
 app/src/main/res/values-in/strings.xml    |  2 ++
 core/src/main/res/values-de/strings.xml   |  3 ++-
 core/src/main/res/values-in/strings.xml   | 23 +++++++++++++++++++++++
 core/src/main/res/values-sc/strings.xml   |  8 +++++++-
 core/src/main/res/values-xal/strings.xml  |  4 ++--
 custom/src/main/res/values-fr/strings.xml |  3 ++-
 6 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index a71be3cbaf..3512589a08 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Authors:
 * Esiahaan
+* Veracious
 -->
 <resources>
   <string name="file_system_does_not_support_4gb">Sistem file Anda tidak mendukung file berukuran lebih dari 4GB</string>
   <string name="detecting_file_system">Mendeteksi apakah sistem file dapat membuat file berukuran 4GB</string>
+  <string name="receive_files_title">Terima Berkas</string>
 </resources>
diff --git a/core/src/main/res/values-de/strings.xml b/core/src/main/res/values-de/strings.xml
index 79dd948122..d51482380e 100644
--- a/core/src/main/res/values-de/strings.xml
+++ b/core/src/main/res/values-de/strings.xml
@@ -8,6 +8,7 @@
 * FF-11
 * FF11
 * Falwye
+* Fw
 * IMayBeABitShy
 * Justman10000
 * Killarnee
@@ -164,7 +165,7 @@
   <string name="confirm_stop_download_msg">Sind Sie sicher, dass Sie diesen Download abbrechen möchten?</string>
   <string name="download_change_storage">Speichergeräteauswahl</string>
   <string name="tts_not_enabled">Die Vorlesefunktion ist für diese ZIM-Datei nicht aktiviert</string>
-  <string name="texttospeech_initialization_failed">Die Initialisierung er Vorlesefunktion ist fehlgeschlagen. Bitte versuchen Sie es noch einmal</string>
+  <string name="texttospeech_initialization_failed">Die Initialisierung der Vorlesefunktion ist fehlgeschlagen. Bitte versuchen Sie es noch einmal</string>
   <string name="texttospeech_error">Unerwarteter Fehler in der Vorlesefunktion. Bitte versuchen Sie es noch einmal</string>
   <string name="next">Nächste</string>
   <string name="previous">Vorherige</string>
diff --git a/core/src/main/res/values-in/strings.xml b/core/src/main/res/values-in/strings.xml
index 6d700568ac..b0a4e7d714 100644
--- a/core/src/main/res/values-in/strings.xml
+++ b/core/src/main/res/values-in/strings.xml
@@ -46,6 +46,7 @@
   <string name="hotspot_dialog_neutral_button">LANJUT</string>
   <string name="start_server_label">Nyalakan server</string>
   <string name="stop_server_label">Matikan server</string>
+  <string name="error_ip_address_not_found">Tak dapat menemukan alamat IP.</string>
   <string name="server_started_message">Masukkan alamat IP ini ke browser Anda untuk mengakses server %s</string>
   <string name="error_file_not_found">Galat: Berkas ZIM yang dipilih tidak ditemukan.</string>
   <string name="zim_not_opened">Zim file tidak dapat dibuka</string>
@@ -70,7 +71,9 @@
   <string name="delete_recent_search_item">Hapus item ini?</string>
   <string name="pref_clear_all_history_title">Hapus riwayat</string>
   <string name="pref_clear_all_history_summary">Hapus riwayat penelusuran dan tab terakhir</string>
+  <string name="pref_permission">Izin</string>
   <string name="all_history_cleared">Semua Markah Telah Dibersihkan</string>
+  <string name="pref_clear_all_bookmarks_title">Hapus markah buku</string>
   <string name="clear_all_history_dialog_title">Bersihkan Semua Riwayat?</string>
   <string name="share">Bagikan</string>
   <string name="selected_file_cab_app_chooser_title">Bagikan ZIM file dengan:</string>
@@ -82,6 +85,7 @@
   <string name="did_you_know">Tahukah Anda?</string>
   <string name="undo">Urungkan</string>
   <string name="tab_closed">Tab ditutup</string>
+  <string name="tabs_closed">Tab ditutup</string>
   <string name="bookmark_added">Markah ditambahkan</string>
   <string name="rate_dialog_title">Silakan Nilai Kami</string>
   <string name="rate_dialog_positive">Nilai!</string>
@@ -154,7 +158,11 @@
   <string name="do_not_ask_anymore">Jangan tanya lagi</string>
   <string name="your_languages">Bahasa terpilih:</string>
   <string name="other_languages">Bahasa lain:</string>
+  <string name="crash_title">Yah… Ini memalukan</string>
   <string name="crash_checkbox_zimfiles">Daftar file Zim Anda</string>
+  <string name="crash_checkbox_logs">Log Aplikasi</string>
+  <string name="crash_checkbox_device">Rincian Perangkat</string>
+  <string name="crash_button_confirm">KIRIM RINCIAN</string>
   <string name="new_tab_shortcut_label">Tab baru</string>
   <string name="get_content_shortcut_label">Ambil konten</string>
   <string name="fav_icon">Favicon</string>
@@ -175,6 +183,7 @@
   <string name="history_from_current_book">Lihat riwayat semua buku</string>
   <string name="search_history" fuzzy="true">Riwayat pencarian</string>
   <string name="selected_items">%1$d dipilih</string>
+  <string name="switch_tabs">Beralih tab</string>
   <string name="close_all_tabs">Tutup semua tab</string>
   <string name="running_state">Dalam proses</string>
   <string name="complete">Selesai</string>
@@ -197,6 +206,8 @@
   <string name="notes_deletion_unsuccessful">Beberapa file tidak terhapus</string>
   <string name="books_count">%d buku</string>
   <string name="connection_failed">Koneksi gagal</string>
+  <string name="your_device">Perangkat Anda:</string>
+  <string name="nearby_devices">PERANGKAT SEKITAR</string>
   <string name="files_for_transfer">FILE UNTUK DIPINDAHKAN</string>
   <string name="preparing_files" fuzzy="true">Mempersiapkan file untuk dipindahkan....</string>
   <string name="performing_handshake" fuzzy="true">Melakukan jabat tangan....</string>
@@ -214,7 +225,19 @@
   <string name="no_results">Tidak ada Hasil</string>
   <string name="no_bookmarks">Tidak Ada Markah</string>
   <string name="no_history">Tidak ada Riwayat</string>
+  <string name="delete_history">Hapus Semua Riwayat?</string>
+  <string name="delete_selected_history">Hapus Riwayat Terpilih?</string>
+  <string name="delete_bookmarks">Hapus Semua Markah Buku?</string>
+  <string name="delete_selected_bookmarks">Hapus Markah Buku Terpilih?</string>
+  <string name="on">Nyala</string>
+  <string name="off">Mati</string>
+  <string name="auto">Otomatis</string>
   <string name="diagnostic_report_message">Kirimkan semua detil berikut agar kami dapat menelaah masalahnya</string>
   <string name="percentage">%d%%</string>
   <string name="search_open_in_new_tab">Buka di tab baru</string>
+  <string name="tab_restored">Tab dipulihkan</string>
+  <string name="tabs_restored">Tab-tab dipulihkan</string>
+  <string name="allowed">Izinkan</string>
+  <string name="not_allowed">Jangan izinkan</string>
+  <string name="go_to_settings_label">Pergi ke Pengaturan</string>
 </resources>
diff --git a/core/src/main/res/values-sc/strings.xml b/core/src/main/res/values-sc/strings.xml
index b56b84c9e0..aaf7e3062e 100644
--- a/core/src/main/res/values-sc/strings.xml
+++ b/core/src/main/res/values-sc/strings.xml
@@ -46,6 +46,8 @@
   <string name="hotspot_notification_content_title">Hotspot Kiwix</string>
   <string name="start_server_label">Avia su servidore</string>
   <string name="stop_server_label">Firma su servidore</string>
+  <string name="error_server_already_running">Custu serbidore est giai in esecutzione. Pro praghere istuda·lu e torra·lu a allùghere.</string>
+  <string name="error_ip_address_not_found">Non potzo agatare s\'indiritzu IP.</string>
   <string name="server_started_message">Inserta custu indiritzu ip in su navigadore tuo pro intrare in su servidore %s</string>
   <string name="share_host_address">Cumpartzi s\'URL cun àteras aplicatziones</string>
   <string name="error_file_not_found">Errore: su documentu ZIM ischertadu no est istadu agatadu.</string>
@@ -206,7 +208,7 @@
   <string name="complete">Acabadu</string>
   <string name="paused_state">In pàusa</string>
   <string name="failed_state">Fallidu: %s</string>
-  <string name="custom_download_error_message_for_authentication_failed" fuzzy="true">Su documentu zim non s\'est pòdidu iscarrigare, proa a torrare a installare s\'aplicatzione dae sa butega de aplicatziones</string>
+  <string name="custom_download_error_message_for_authentication_failed">Su documentu zim non s\'est pòdidu iscarrigare. Proa a torrare a installare s\'aplicatzione dae sa butega de aplicatziones</string>
   <string name="save">Sarva</string>
   <string name="note">Nota</string>
   <string name="wiki_article_title">Tìtulu de s\'artìculu de sa Wiki</string>
@@ -319,4 +321,8 @@
   <string name="navigation_history_cleared">Cronologia de navigatzione isboidada</string>
   <string name="go_to_settings_label">Bae a sas impostatziones</string>
   <string name="request_notification_permission_message">Pro fàghere custa atzione fruni s\'atzessu a sas notìficas</string>
+  <string name="click_nearby_devices_message">Incarca inoghe pro chircare dispositivos a curtzu.</string>
+  <string name="your_device_name_message">Su nùmene de su dispositivu tuo at a apàrrere inoghe.</string>
+  <string name="nearby_devices_list_message">Inoghe, as a atzapare una lista de dispositivos a curtzu. Toca subra de su nùmene de unu dispositivu pro incumintzare cun sa tràmuda de archìvios.</string>
+  <string name="transfer_zim_files_list_message">Inoghe as a atzapare sa lista de archìvios ZIM a disponimentu pro sa tràmuda.</string>
 </resources>
diff --git a/core/src/main/res/values-xal/strings.xml b/core/src/main/res/values-xal/strings.xml
index b0dfc65189..44210e16a0 100644
--- a/core/src/main/res/values-xal/strings.xml
+++ b/core/src/main/res/values-xal/strings.xml
@@ -23,7 +23,7 @@
   <string name="open_in_new_tab">Холвасыг оңгдан хавчурһд неетн</string>
   <string name="hotspot_service_channel_name">Цацх цегин үүлчллһнә цувг</string>
   <string name="hotspot_failed_title">Цацх цегиг асаҗ чадсн уга.</string>
-  <string name="hotspot_failed_message">Цацх цегтн асаһата кевтә. Үрглҗлүлхин төләд цацх цегән унтрахнтн.</string>
+  <string name="hotspot_failed_message">Цацх цегтн асалһата кевтә. Үрглҗлүлхин төләд цацх цегән унтрахнтн.</string>
   <string name="server_failed_message">Сервериг аҗллулх болмҗ уга</string>
   <string name="server_failed_toast_message">Сервериг аҗллулх болмҗ уга.</string>
   <string name="server_started_successfully_toast_message">Сервериг амҗлтта аҗллулв.</string>
@@ -59,7 +59,7 @@
   <string name="no_thanks">Уга, байрлҗанав.</string>
   <string name="rate_dialog_neutral">Хөөннь</string>
   <string name="open">Неех</string>
-  <string name="local_zims">Токармҗ</string>
+  <string name="local_zims">Төкәрмҗ</string>
   <string name="library">Саң</string>
   <string name="delete_zims_toast">Файлнь амҗлтта уга кегдв</string>
   <string name="zim_simple">Эңгин</string>
diff --git a/custom/src/main/res/values-fr/strings.xml b/custom/src/main/res/values-fr/strings.xml
index fc32942e0e..48c0230daa 100644
--- a/custom/src/main/res/values-fr/strings.xml
+++ b/custom/src/main/res/values-fr/strings.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Authors:
 * Gomoko
+* MohitMali
 * Verdy p
 -->
 <resources>
   <string name="retry">Réessayer</string>
-  <string name="invalid_installation">Installation non valide. Veuillez télécharger Zim.\n Assurez-vous que le Wi-Fi est actif et que vous disposez d’assez d\'espace de stockage.</string>
+  <string name="invalid_installation">Installation non valide. Veuillez télécharger Zim.\\n Assurez-vous que le Wi-Fi est actif et que vous disposez d’assez d\\’espace de stockage.</string>
 </resources>