diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
new file mode 100644
index 000000000..a71be3cba
--- /dev/null
+++ b/app/src/main/res/values-in/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Authors:
+* Esiahaan
+-->
+<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>
+</resources>
diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt
index c6d512518..a2a846900 100644
--- a/buildSrc/src/main/kotlin/Libs.kt
+++ b/buildSrc/src/main/kotlin/Libs.kt
@@ -59,6 +59,23 @@ object Libs {
    */
   const val retrofit: String = "com.squareup.retrofit2:retrofit:" + Versions.com_squareup_retrofit2
 
+  /**
+   * https://square.github.io/okhttp/
+   */
+  const val logging_interceptor: String = "com.squareup.okhttp3:logging-interceptor:" +
+    Versions.com_squareup_okhttp3
+
+  /**
+   * https://square.github.io/okhttp/
+   */
+  const val mockwebserver: String = "com.squareup.okhttp3:mockwebserver:" +
+    Versions.com_squareup_okhttp3
+
+  /**
+   * https://square.github.io/okhttp/
+   */
+  const val okhttp: String = "com.squareup.okhttp3:okhttp:" + Versions.com_squareup_okhttp3
+
   /**
    * https://kotlinlang.org/
    */
@@ -177,6 +194,11 @@ object Libs {
   const val objectbox_gradle_plugin: String = "io.objectbox:objectbox-gradle-plugin:" +
     Versions.io_objectbox
 
+  /**
+   * https://objectbox.io
+   */
+  const val objectbox_java: String = "io.objectbox:objectbox-java:" + Versions.io_objectbox
+
   /**
    * https://objectbox.io
    */
@@ -247,12 +269,6 @@ object Libs {
   const val javax_annotation_api: String = "javax.annotation:javax.annotation-api:" +
     Versions.javax_annotation_api
 
-  /**
-   * https://square.github.io/okhttp/
-   */
-  const val logging_interceptor: String = "com.squareup.okhttp3:logging-interceptor:" +
-    Versions.logging_interceptor
-
   const val ink_page_indicator: String = "com.pacioianu.david:ink-page-indicator:" +
     Versions.ink_page_indicator
 
@@ -283,11 +299,6 @@ object Libs {
    */
   const val junit_jupiter: String = "org.junit.jupiter:junit-jupiter:" + Versions.junit_jupiter
 
-  /**
-   * https://square.github.io/okhttp/
-   */
-  const val mockwebserver: String = "com.squareup.okhttp3:mockwebserver:" + Versions.mockwebserver
-
   const val xfetch2okhttp: String = "androidx.tonyodev.fetch2okhttp:xfetch2okhttp:" +
     Versions.xfetch2okhttp
 
@@ -357,7 +368,7 @@ object Libs {
   const val kiwixlib: String = "org.kiwix.kiwixlib:kiwixlib:" + Versions.kiwixlib
 
   /**
-   * http://developer.android.com/tools/extras/support-library.html
+   * https://github.com/material-components/material-components-android
    */
   const val material: String = "com.google.android.material:material:" + Versions.material
 
@@ -377,16 +388,16 @@ object Libs {
    */
   const val ktlint: String = "com.pinterest:ktlint:" + Versions.ktlint
 
-  /**
-   * https://square.github.io/okhttp/
-   */
-  const val okhttp: String = "com.squareup.okhttp3:okhttp:" + Versions.okhttp
-
   /**
    * https://github.com/ReactiveX/RxJava
    */
   const val rxjava: String = "io.reactivex.rxjava2:rxjava:" + Versions.rxjava
 
+  /**
+   * https://developer.android.com/jetpack/androidx
+   */
+  const val webkit: String = "androidx.webkit:webkit:" + Versions.webkit
+
   /**
    * https://developer.android.com/studio
    */
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 99c6cc916..b2e4bc6ea 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -15,17 +15,19 @@ object Versions {
 
   const val com_squareup_retrofit2: String = "2.5.0" // available: "2.9.0"
 
+  const val com_squareup_okhttp3: String = "3.6.0" // available: "4.8.0"
+
   const val org_jetbrains_kotlin: String = "1.3.72"
 
-  const val com_google_dagger: String = "2.26" // available: "2.28.1"
+  const val com_google_dagger: String = "2.26" // available: "2.28.3"
 
   const val com_yahoo_squidb: String = "2.0.0" // available: "3.2.3"
 
-  const val com_jakewharton: String = "10.2.1"
+  const val com_jakewharton: String = "10.2.1" // available: "10.2.2"
 
   const val androidx_test: String = "1.2.0"
 
-  const val io_objectbox: String = "2.6.0"
+  const val io_objectbox: String = "2.6.0" // available: "2.7.0"
 
   const val org_jacoco: String = "0.7.9"
 
@@ -43,8 +45,6 @@ object Versions {
 
   const val javax_annotation_api: String = "1.3.2"
 
-  const val logging_interceptor: String = "3.6.0" // available: "4.7.2"
-
   const val ink_page_indicator: String = "1.3.0"
 
   const val leakcanary_android: String = "2.4"
@@ -57,8 +57,6 @@ object Versions {
 
   const val junit_jupiter: String = "5.6.2"
 
-  const val mockwebserver: String = "3.6.0" // available: "4.7.2"
-
   const val xfetch2okhttp: String = "3.1.4"
 
   const val assertj_core: String = "3.16.1"
@@ -67,7 +65,7 @@ object Versions {
 
   const val fragment_ktx: String = "1.2.5"
 
-  const val lint_gradle: String = "27.0.0"
+  const val lint_gradle: String = "27.0.1"
 
   const val testing_ktx: String = "1.1.2"
 
@@ -83,11 +81,11 @@ object Versions {
 
   const val rxandroid: String = "2.1.1"
 
-  const val core_ktx: String = "1.3.0"
+  const val core_ktx: String = "1.3.0" // available: "1.3.1"
 
-  const val kiwixlib: String = "9.2.3"
+  const val kiwixlib: String = "9.2.3" // available: "9.3.1"
 
-  const val material: String = "1.1.0"
+  const val material: String = "1.1.0" // available: "1.2.0"
 
   const val multidex: String = "2.0.1"
 
@@ -99,18 +97,18 @@ object Versions {
 
   const val ktlint: String = "0.36.0" // available: "0.37.2"
 
-  const val okhttp: String = "3.6.0" // available: "4.7.2"
-
   const val rxjava: String = "2.2.19"
 
-  const val aapt2: String = "4.0.0-6051327"
+  const val webkit: String = "1.2.0"
+
+  const val aapt2: String = "4.0.1-6197926"
 
   const val junit: String = "1.1.1"
 
   const val navigation: String = "2.3.0"
 
   /**
-   * Current version: "6.1.1"
+   * Current version: "6.2"
    * See issue 19: How to update Gradle itself?
    * https://github.com/jmfayard/buildSrcVersions/issues/19
    */
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 8a4538b1c..11d59e9bb 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -60,4 +60,5 @@ dependencies {
   implementation(Libs.android_arch_lifecycle_extensions)
   implementation(Libs.objectbox_kotlin)
   implementation(Libs.objectbox_rxjava)
+  implementation(Libs.webkit)
 }
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/CoreApp.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/CoreApp.kt
index 39ab9b048..0d52aab3e 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/CoreApp.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/CoreApp.kt
@@ -66,6 +66,13 @@ abstract class CoreApp : Application() {
   @Inject
   lateinit var fileLogger: FileLogger
 
+  /**
+   * The init of this class does the work of initializing,
+   * simply injecting it is all that there is to be done
+   */
+  @Inject
+  lateinit var serviceWorkerInitialiser: ServiceWorkerInitialiser
+
   override fun attachBaseContext(base: Context) {
     super.attachBaseContext(base)
     if (BuildConfig.DEBUG) {
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/ServiceWorkerInitialiser.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/ServiceWorkerInitialiser.kt
new file mode 100644
index 000000000..702c8ec43
--- /dev/null
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/ServiceWorkerInitialiser.kt
@@ -0,0 +1,49 @@
+/*
+ * Kiwix Android
+ * Copyright (c) 2020 Kiwix <android.kiwix.org>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package org.kiwix.kiwixmobile.core
+
+import android.content.Context
+import android.os.Build
+import android.webkit.WebResourceRequest
+import android.webkit.WebResourceResponse
+import androidx.webkit.ServiceWorkerClientCompat
+import androidx.webkit.ServiceWorkerControllerCompat
+import androidx.webkit.WebViewFeature
+import org.kiwix.kiwixmobile.core.reader.ZimReaderContainer
+import javax.inject.Inject
+
+class ServiceWorkerInitialiser @Inject constructor(
+  context: Context,
+  zimReaderContainer: ZimReaderContainer
+) {
+  init {
+    if (WebViewFeature.isFeatureSupported(WebViewFeature.SERVICE_WORKER_BASIC_USAGE)) {
+      ServiceWorkerControllerCompat.getInstance()
+        .setServiceWorkerClient(object : ServiceWorkerClientCompat() {
+          override fun shouldInterceptRequest(request: WebResourceRequest): WebResourceResponse? {
+            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+              zimReaderContainer.load(request.url.toString())
+            } else {
+              null
+            }
+          }
+        })
+    }
+  }
+}
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreWebViewClient.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreWebViewClient.java
index 4fed33f59..9e294ff54 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreWebViewClient.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreWebViewClient.java
@@ -41,8 +41,10 @@ public class CoreWebViewClient extends WebViewClient {
   }};
   protected final WebViewCallback callback;
   protected final ZimReaderContainer zimReaderContainer;
-  private static String LEGACY_CONTENT_PREFIX =
-    Uri.parse("content://" + CoreApp.getInstance().getPackageName() + ".zim.base/").toString();
+  private static String[] LEGACY_CONTENT_PREFIXES = new String[] {
+    "zim://content/",
+    Uri.parse("content://" + CoreApp.getInstance().getPackageName() + ".zim.base/").toString()
+  };
   private String urlWithAnchor;
 
   public CoreWebViewClient(
@@ -87,9 +89,12 @@ public class CoreWebViewClient extends WebViewClient {
   }
 
   private String convertLegacyUrl(String url) {
-    return url.startsWith(LEGACY_CONTENT_PREFIX)
-      ? url.replace(LEGACY_CONTENT_PREFIX, CONTENT_PREFIX)
-      : url;
+    for (String legacyContentPrefix : LEGACY_CONTENT_PREFIXES) {
+      if (url.startsWith(legacyContentPrefix)) {
+        return url.replace(legacyContentPrefix, CONTENT_PREFIX);
+      }
+    }
+    return url;
   }
 
   private boolean handleEpubAndPdf(String url) {
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt
index 9471cfaec..58bab6d6b 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt
@@ -236,7 +236,7 @@ class ZimFileReader constructor(
     @JvmField
     val UI_URI: Uri? = Uri.parse("content://org.kiwix.ui/")
 
-    const val CONTENT_PREFIX = "zim://content/"
+    const val CONTENT_PREFIX = "https://kiwix.app/"
 
     private val INVERT_IMAGES_VIDEO =
       """
@@ -253,7 +253,8 @@ class ZimFileReader constructor(
           filter: invert(0); 
         }
       """.trimIndent()
-    private val assetExtensions = listOf("3gp", "mp4", "m4a", "webm", "mkv", "ogg", "ogv", "svg")
+    private val assetExtensions =
+      listOf("3gp", "mp4", "m4a", "webm", "mkv", "ogg", "ogv", "svg", "warc")
     private const val DEFAULT_MIME_TYPE = "application/octet-stream"
   }
 }
diff --git a/core/src/main/res/values-ca/strings.xml b/core/src/main/res/values-ca/strings.xml
index 7ef0bdc20..a311dae9f 100644
--- a/core/src/main/res/values-ca/strings.xml
+++ b/core/src/main/res/values-ca/strings.xml
@@ -5,6 +5,7 @@
 * Grondin
 * Joan manel
 * Macondo
+* Mguix
 -->
 <resources>
   <string name="menu_help">Ajuda</string>
@@ -18,8 +19,8 @@
   <string name="menu_read_aloud">Llegir en veu alta</string>
   <string name="menu_read_aloud_stop">Deixar de llegir en veu alta</string>
   <string name="save_media">Anomena i desa el fitxer…</string>
-  <string name="save_media_error" fuzzy="true">S\'ha produït un error en mirar de desar el fitxer!</string>
-  <string name="save_media_saved" fuzzy="true">El fitxer s\'ha desat amb el nom %1$s a la vostra carpeta d\'imatges</string>
+  <string name="save_media_error">S\'ha produït un error en mirar de desar el fitxer!</string>
+  <string name="save_media_saved">Multimèdia desat com %s en Android/media/org.kiwix…/</string>
   <string name="search_label">Cercar</string>
   <string name="choose_file">Seleccioneu un fitxer de contingut ZIM (*.zim)</string>
   <string name="open_in_new_tab">Obrir l\'enllaç en una pestanya nova?</string>
@@ -60,22 +61,22 @@
   <string name="new_tab_snack_bar">Article obert en una pestanya nova</string>
   <string name="local_zims">Dispositiu</string>
   <string name="library">Biblioteca</string>
-  <string name="delete_zim_body" fuzzy="true">Voleu suprimir %s?</string>
+  <string name="delete_zim_body">Els següents arxius ZIM seran eliminats:\n\n%s</string>
   <string name="delete_zims_toast">Fitxer esborrat</string>
   <string name="no_files_here">Cap fitxer aquí</string>
   <string name="download_no_space">L’espai és insuficient per a la baixada.</string>
   <string name="no_network_connection">Cap connexió de xarxa</string>
   <string name="help_2">Què fa Kiwix?</string>
   <string name="help_3">Kiwix és un lector de contingut sense connexió. Actua molt semblant a un navegador però en comptes d\'accedir a pàgines web en línia, llegeix el contingut d\'un fitxer en format ZIM.</string>
-  <string name="help_4" fuzzy="true">Si bé Kiwix es va dissenyar originalment per a proporcionar una Wikipedia sense connexió, també pot llegir altres continguts.</string>
+  <string name="help_4">Si bé Kiwix es va dissenyar originalment per a proporcionar una Wikipedia sense connexió, també pot llegir altres continguts.</string>
   <string name="help_5">On està el contingut?</string>
   <string name="help_6">El nostre contingut està allotjat en el lloc web de Kiwix</string>
   <string name="help_7">Estan disponibles com a fitxers ZIM. Hi ha molts d\'ells:</string>
   <string name="help_8">• La Viquipèdia està disponible per separat per a cada idioma</string>
   <string name="help_9">• Altres continguts com Wikileaks o Wikisource també estan disponibles</string>
-  <string name="help_10" fuzzy="true">Pots descarregar els arxius ZIM triats a l\'aplicació, o bé seleccionar acuradament els que vulguis, descarregar-los des d\'un ordinador i transferir-los a la targeta SD.</string>
+  <string name="help_10">Podeu descarregar els arxius ZIM triats a l\'aplicació, o bé seleccionar acuradament els que vulgueu, descarregar-los des d\'un ordinador i transferir-los a la vostra targeta SD.</string>
   <string name="help_11">Els fitxers ZIM descarregats en l\'aplicació es troben al directori d\'emmagatzematge extern, en una carpeta anomenada Kiwix.</string>
-  <string name="delete_zim_failed" fuzzy="true">No podem eliminar aquest fitxer. Hauries de provar amb un administrador de fitxers.</string>
+  <string name="delete_zim_failed">No podem eliminar alguns arxius. Hauries de provar amb un administrador d\'arxius</string>
   <string name="internal_storage">Intern</string>
   <string name="external_storage">Extern</string>
   <string name="yes">Sí</string>
@@ -84,7 +85,7 @@
   <string name="confirm_stop_download_msg">Segur que vols aturar aquesta descàrrega?</string>
   <string name="download_change_storage">Selector de dispositiu d\'emmagatzematge</string>
   <string name="next">Següent</string>
-  <string name="external_link_popup_dialog_title" fuzzy="true">Accés a enllaç extern</string>
+  <string name="external_link_popup_dialog_title">Accés a enllaç extern!</string>
   <string name="external_link_popup_dialog_message">Estàs entrant a un enllaç extern. Això podria ocasionar-te costos addicionals per transferència de dades o, senzillament, no funcionarà si no tens connexió. Vols continuar?</string>
   <string name="do_not_ask_anymore">No tornar a preguntar</string>
   <string name="your_languages">Idiomes seleccionats:</string>
diff --git a/core/src/main/res/values-fi/strings.xml b/core/src/main/res/values-fi/strings.xml
index d01580f66..383fb748d 100644
--- a/core/src/main/res/values-fi/strings.xml
+++ b/core/src/main/res/values-fi/strings.xml
@@ -19,6 +19,7 @@
   <string name="menu_read_aloud">Lue ääneen</string>
   <string name="menu_read_aloud_stop">Lopeta ääneen lukeminen</string>
   <string name="menu_support_kiwix">Tue Kiwixiä</string>
+  <string name="menu_host_books">Hostaa kirjoja</string>
   <string name="save_media">Tallenna media</string>
   <string name="save_media_error">Virhe mediaa tallennettaessa!</string>
   <string name="save_media_saved">Tallennettu media %s muodossa hakemistoon Android/media/org.kiwix…/</string>
@@ -29,10 +30,13 @@
   <string name="go_to_wifi_settings_label">Siirry WiFi-asetuksiin</string>
   <string name="no_books_selected_toast_message">Valitse ensin kirjat</string>
   <string name="server_failed_toast_message">Ei voitu käynnistää palvelinta.</string>
+  <string name="server_started_successfully_toast_message">Palvelin käynnistetty onnistuneesti.</string>
+  <string name="server_stopped_successfully_toast_message">Palvelin pysäytetty onnistuneesti.</string>
   <string name="hotspot_turned_on">Hotspot kytketty päälle</string>
   <string name="progress_dialog_starting_server">Käynnistetään palvelinta</string>
-  <string name="hotspot_dialog_title" fuzzy="true">Kytke WiFi-hotspottisi päälle</string>
-  <string name="hotspot_dialog_neutral_button" fuzzy="true">KYLLÄ, OLEN KYTKENYT SEN PÄÄLLE</string>
+  <string name="hotspot_dialog_title">Ohjeet kirjojen hostaamiseen</string>
+  <string name="wifi_dialog_title">WiFi-yhteys tunnistettu</string>
+  <string name="hotspot_dialog_neutral_button">ETENE</string>
   <string name="hotspot_notification_content_title">Kiwix-hotspot</string>
   <string name="start_server_label">Käynnistä palvelin</string>
   <string name="stop_server_label">Pysäytä palvelin</string>
@@ -58,9 +62,11 @@
   <string name="delete_recent_search_item">Poista tämä kohde?</string>
   <string name="pref_clear_all_history_title">Tyhjennä historia</string>
   <string name="all_history_cleared">Kaikki historia tyhjennetty</string>
-  <string name="clear_all_history_dialog_title" fuzzy="true">Tyhjennä kaikki historia</string>
+  <string name="pref_clear_all_bookmarks_title">Tyhjennä kirjanmerkit</string>
+  <string name="clear_all_history_dialog_title">Tyhjennä kaikki historia?</string>
   <string name="share">Jaa</string>
   <string name="delete">Poista</string>
+  <string name="cancel">Peruuta</string>
   <string name="hint_contents_drawer_message">Voit tarkastella tämän artikkelin sisältöä pyyhkäisemällä vasemmalle</string>
   <string name="got_it">Selvä</string>
   <string name="did_you_know">Tiesitkö?</string>
@@ -85,7 +91,7 @@
   <string name="local_zims">Laite</string>
   <string name="remote_zims">Online</string>
   <string name="library">Kirjasto</string>
-  <string name="delete_zim_body" fuzzy="true">Poista %s?</string>
+  <string name="delete_zim_body">Seuraava(t) zim-tiedosto(t) tullaan poistamaan:\n\n%s</string>
   <string name="delete_zims_toast">Tiedosto poistettu</string>
   <string name="no_files_here">Ei tiedostoja täällä</string>
   <string name="space_available">Tilaa käytettävissä:</string>
@@ -100,7 +106,7 @@
   <string name="help_9">• Muut sisällöt kuten Wikileaks tai Wikiaineisto ovat myös käytettävissä</string>
   <string name="pref_storage">Tallennuslaite</string>
   <string name="pref_current_folder">Nykyinen kansio</string>
-  <string name="delete_zim_failed" fuzzy="true">Emme pystyneet poistamaan tätä tiedostoa. Sinun pitäisi kokeilla käyttää tiedostonhallintaa sen sijaan.</string>
+  <string name="delete_zim_failed">Emme pystyneet poistamaan joitakin tiedostoja. Sinun tulisi kokeilla käyttää tiedostonhallintaa sen sijaan.</string>
   <string name="tts_pause">keskeytä</string>
   <string name="tts_resume">jatka</string>
   <string name="stop">pysäytä</string>
@@ -123,7 +129,7 @@
   <string name="time_left">jäljellä</string>
   <string name="time_today">Tänään</string>
   <string name="time_yesterday">Eilen</string>
-  <string name="external_link_popup_dialog_title" fuzzy="true">Ulkoisen linkin syöttäminen</string>
+  <string name="external_link_popup_dialog_title">Ulkoisen linkin syöttäminen!</string>
   <string name="do_not_ask_anymore">Älä kysy enää</string>
   <string name="your_languages">Valitut kielet:</string>
   <string name="other_languages">Muut kielet:</string>
@@ -161,8 +167,25 @@
   <string name="wiki_article_title">Wikiartikkelin otsikko</string>
   <string name="confirmation_alert_dialog_message">Hylkää tallentamattomat muutokset?</string>
   <string name="notes_deletion_unsuccessful">Joitakin tiedostoja ei poistettu</string>
+  <string name="books_count">%d kirja(a)</string>
   <string name="your_device">Laitteesi:</string>
   <string name="nearby_devices">LÄHELLÄ OLEVAT LAITTEET</string>
   <string name="status">Tila</string>
+  <string name="tag_pic">Kuva</string>
+  <string name="tag_vid">Video</string>
+  <string name="tag_text_only">Vain teksti</string>
+  <string name="tag_short_text">Lyhyt teksti</string>
+  <string name="no_results">Ei tuloksia</string>
   <string name="no_bookmarks">Ei kirjanmerkkejä</string>
+  <string name="no_history">Ei historiaa</string>
+  <string name="device_default">Laitteen oletus</string>
+  <string name="delete_history">Poista kaikki historia?</string>
+  <string name="delete_selected_history">Poista valittu historia?</string>
+  <string name="delete_bookmarks">Poista kaikki kirjanmerkit?</string>
+  <string name="delete_selected_bookmarks">Poista valitut kirjanmerkit?</string>
+  <string name="on">Päälle</string>
+  <string name="off">Pois</string>
+  <string name="auto">Auto</string>
+  <string name="percentage">%d%%</string>
+  <string name="search_open_in_new_tab">Avaa uudessa välilehdessä</string>
 </resources>
diff --git a/core/src/main/res/values-in/strings.xml b/core/src/main/res/values-in/strings.xml
index 890a2f26f..e6285a378 100644
--- a/core/src/main/res/values-in/strings.xml
+++ b/core/src/main/res/values-in/strings.xml
@@ -38,6 +38,8 @@
   <string name="hotspot_turned_on">Hotspot sudah menyala.</string>
   <string name="hotspot_details_message">Berikut adalah detil hotspot lokal Anda.\nSSID : %1$s\nPass : %2$s</string>
   <string name="progress_dialog_starting_server">Menyalakan server</string>
+  <string name="wifi_dialog_title">Koneksi Wifi telah terdeteksi</string>
+  <string name="wifi_dialog_body">Untuk dapat melihat buku dengan alat elektronik lainnya, pastikan semua alat elektronik Anda terhubung ke jaringan Wifi yang sama.</string>
   <string name="hotspot_dialog_neutral_button">LANJUT</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>
@@ -64,7 +66,7 @@
   <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="all_history_cleared">Semua Markah Telah Dibersihkan</string>
-  <string name="clear_all_history_dialog_title" fuzzy="true">Bersihkan Semua Markah</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>
   <string name="delete">Hapus</string>
@@ -111,7 +113,7 @@
   <string name="help_7">Mereka tersedia sebagai berkas ZIM. Ada banyak dari mereka:</string>
   <string name="help_8">• Wikipedia tersedia terpisah untuk setiap bahasa</string>
   <string name="help_9">• Konten lain seperti Wikileaks atau Wikisource juga tersedia</string>
-  <string name="help_10" fuzzy="true">Anda dapat mengunduh berkas ZIM yang diinginkan dari dalam apl atau mengunduhnya dari komputer Desktop sebelum mentransfernya ke kartu SD Anda.</string>
+  <string name="help_10">Anda dapat mengunduh berkas ZIM yang diinginkan dari dalam aplikasi atau mengunduh berkas yang Anda inginkan dari komputer Desktop sebelum memindahkannya ke kartu SD Anda.</string>
   <string name="help_11">Berkas ZIM yang diunduh dari dalam apl terletak di direktori penyimpanan eksternal didalam folder Kiwix.</string>
   <string name="pref_storage">Penyimpanan</string>
   <string name="pref_current_folder">Folder Saat Ini</string>
@@ -137,6 +139,8 @@
   <string name="time_minute">mnt</string>
   <string name="time_second">dtk</string>
   <string name="time_left">kiri</string>
+  <string name="time_today">Hari ini</string>
+  <string name="time_yesterday">Kemarin</string>
   <string name="pref_external_link_popup_title">Peringatkan saat mengunjungi pranala luar</string>
   <string name="pref_external_link_popup_summary">Tampilkan popup untuk memperingatkan tentang biaya tambahan atau tidak bekerja dalam pranala luring.</string>
   <string name="external_link_popup_dialog_title" fuzzy="true">Mengunjungi Pranala Luar</string>
@@ -144,15 +148,67 @@
   <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_checkbox_zimfiles">Daftar file Zim Anda</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>
+  <string name="articleCount">%s artikel</string>
+  <string name="get_started">Mulai</string>
+  <string name="download_books">Unduh buku-buku</string>
   <string name="humankind_knowledge">Humankind\'s knowledge, on your phone.</string>
+  <string name="welcome_to_the_family">Selamat datang di keluarga</string>
+  <string name="save_books_offline">Simpan buku-buku offline</string>
+  <string name="download_books_message">Unduh buku dan baca di mana pun Anda berada.</string>
   <string name="go_to_previous_page">Ke halaman sebelumnya</string>
   <string name="go_to_next_page">Ke halaman berikutnya</string>
+  <string name="table_of_contents">Daftar isi</string>
   <string name="select_languages">Pilih bahasa</string>
   <string name="save_languages">Simpan bahasa</string>
   <string name="send_feedback">Kirim masukan</string>
+  <string name="history">Riwayat</string>
+  <string name="history_from_current_book">Lihat riwayat semua buku</string>
+  <string name="search_history">Riwayat pencarian</string>
+  <string name="selected_items">%1$d dipilih</string>
   <string name="close_all_tabs">Tutup semua tab</string>
+  <string name="running_state">Dalam proses</string>
   <string name="complete">Selesai</string>
+  <string name="failed_state">Gagal: %s</string>
+  <string name="save">Simpan</string>
+  <string name="note">Catatan</string>
+  <string name="wiki_article_title">Judul Artikel Wiki</string>
+  <string name="ext_storage_permission_rationale_add_note">Akses tempat penyimpanan data dibutuhkan untuk Catatan</string>
   <string name="ext_storage_write_permission_denied_add_note">Notes can\'t be used without access to storage</string>
+  <string name="note_save_unsuccessful">Penyimpanan Catatan tidak berhasil</string>
+  <string name="note_delete_successful">Catatan telah berhasil dihapus</string>
+  <string name="note_delete_unsuccessful">Catatan tidak terhapus</string>
+  <string name="note_save_successful">Catatan telah tersimpan</string>
+  <string name="note_save_error_storage_not_writable">Gagal menyimpan Catatan: tempat penyimpanan data tidak dapat ditulisi</string>
   <string name="note_share_error_file_missing">Note file doesn\'t exist</string>
+  <string name="note_share_app_chooser_title">Bagi file catatan dengan:</string>
+  <string name="delete_notes_confirmation_msg">Hapus semua catatan?</string>
+  <string name="ext_storage_permission_not_granted">Gagal: Akses ke tempat penyimpanan data tidak ada</string>
+  <string name="notes_deletion_successful">Seluruh direktori Catatan telah dihapus</string>
+  <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="files_for_transfer">FILE UNTUK DIPINDAHKAN</string>
+  <string name="preparing_files">Mempersiapkan file untuk dipindahkan....</string>
+  <string name="performing_handshake">Melakukan jabat tangan....</string>
+  <string name="status">Status</string>
+  <string name="pref_clear_all_notes_summary">Bersihkan semua catatan dari semua artikel</string>
+  <string name="pref_clear_all_notes_title">Bersihkan semua catatan</string>
+  <string name="pref_text_zoom_summary">Ubah ukuran teks dengan penambahan 25%</string>
+  <string name="tag_pic">Gambar</string>
+  <string name="tag_vid">Video</string>
+  <string name="tag_text_only">Teks Saja</string>
+  <string name="tag_short_text">Teks Singkat</string>
+  <string name="storage_permission_denied">Akses ke tempat penyimpanan data ditolak</string>
+  <string name="grant_read_storage_permission">Aplikasi ini membutuhkan kemampuan membaca tempat penyimpanan data untuk berfungsi dengan baik. Berikan izin mengakses tempat penyimpanan data lewat menu pengaturan Anda</string>
+  <string name="go_to_settings">Ke menu Pengaturan Hotspot</string>
+  <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="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>
 </resources>
diff --git a/custom/src/main/res/values-in/strings.xml b/custom/src/main/res/values-in/strings.xml
new file mode 100644
index 000000000..d76a0ae9f
--- /dev/null
+++ b/custom/src/main/res/values-in/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Authors:
+* Esiahaan
+-->
+<resources>
+  <string name="retry">Coba lagi</string>
+  <string name="download">Unduh</string>
+  <string name="invalid_installation">Instalasi tidak berlaku. Silakan unduh Zim.\nPastikan Wifi menyala dan Anda memiliki cukup tempat penyimpanan data</string>
+</resources>