From 903c1e142edd04f0cad437405dcf93dcfb668dee Mon Sep 17 00:00:00 2001 From: MohitMaliFtechiz Date: Tue, 12 Nov 2024 12:22:53 +0530 Subject: [PATCH] Corrected all the messages related to ZIM, and improved the message of copy/move ZIM file dialog --- CHANGELOG | 44 +++++++++---------- CONTRIBUTING.md | 2 +- README.md | 2 +- .../library/CopyMoveFileHandler.kt | 4 +- .../res/layout/copy_move_progress_bar.xml | 2 +- app/src/main/res/values/strings.xml | 4 +- core/src/main/res/values-dag/strings.xml | 2 - core/src/main/res/values-fr/strings.xml | 2 - core/src/main/res/values-ia/strings.xml | 2 - core/src/main/res/values-it/strings.xml | 2 - core/src/main/res/values-iw/strings.xml | 2 - core/src/main/res/values-ko/strings.xml | 2 - core/src/main/res/values-mk/strings.xml | 2 - core/src/main/res/values-pt-rBR/strings.xml | 2 - core/src/main/res/values-ru/strings.xml | 2 - core/src/main/res/values-zh-rTW/strings.xml | 2 - core/src/main/res/values-zh/strings.xml | 2 - core/src/main/res/values/strings.xml | 26 +++++------ custom/src/main/res/values-qq/strings.xml | 2 +- custom/src/main/res/values/strings.xml | 2 +- 20 files changed, 44 insertions(+), 66 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8b4a957e2c..df100cd9d9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,7 +4,7 @@ Bug Fixed: * Zimit2 Youtube video does not play in Android reader. (https://github.com/kiwix/kiwix-android/pull/3879) * Xapian crash scenarios(When searching for an article). (https://github.com/kiwix/kiwix-android/pull/3885) * ServiceWorker management seems unstable. (https://github.com/kiwix/kiwix-android/pull/3880) -* Outdated text showing when a zim file could not open. (https://github.com/kiwix/kiwix-android/pull/3887) +* Outdated text showing when a ZIM file could not open. (https://github.com/kiwix/kiwix-android/pull/3887) * Sometimes not all bookmarks are showing. (https://github.com/kiwix/kiwix-android/pull/3893) * Application crashes when loading the media in webView. (https://github.com/kiwix/kiwix-android/pull/3898) * Application crashes while migrating the history/notes. (https://github.com/kiwix/kiwix-android/pull/3900) @@ -23,7 +23,7 @@ Bug Fixed: * Unable to restart download after pausing if application language is other than English. (https://github.com/kiwix/kiwix-android/pull/3847) * Can't open EPUB from Project Gutenberg in external app. (https://github.com/kiwix/kiwix-android/pull/3738) * Some EPUB files are not downloading. (https://github.com/kiwix/kiwix-android/pull/3738) -* Saving bookmarks in the zim-split splitted ZIM files are crashing the application, when there is a 0 size extra zim chunk. (https://github.com/kiwix/kiwix-android/pull/3862) +* Saving bookmarks in the zim-split splitted ZIM files are crashing the application, when there is a 0 size extra ZIM chunk. (https://github.com/kiwix/kiwix-android/pull/3862) * Suspended the application from F-droid store. (https://github.com/kiwix/kiwix-android/issues/3672) * New nightly APK signatures prevent easy update. (https://github.com/kiwix/kiwix-android/pull/3844) * Improved the article search. (https://github.com/kiwix/kiwix-android/pull/3849) @@ -39,10 +39,10 @@ Compilation/CI/CD: 3.10.1 Bug Fixed: -* Error on opening a split zim file. (https://github.com/kiwix/kiwix-android/pull/3803) +* Error on opening a split ZIM file. (https://github.com/kiwix/kiwix-android/pull/3803) * Sometimes setting the org.kiwix.libzim.Archive.setNativeArchive crashes the application. (https://github.com/kiwix/kiwix-android/pull/3807) -* Zim files are not opening with Kiwix when clicking on zim files in the storage. (https://github.com/kiwix/kiwix-android/pull/3834) -* Main page is not loading for zim files. (https://github.com/kiwix/kiwix-android/pull/3817) +* ZIM files are not opening with Kiwix when clicking on ZIM files in the storage. (https://github.com/kiwix/kiwix-android/pull/3834) +* Main page is not loading for ZIM files. (https://github.com/kiwix/kiwix-android/pull/3817) * Fixed some issues reported by the playStore. (https://github.com/kiwix/kiwix-android/pull/3815, https://github.com/kiwix/kiwix-android/pull/3818, https://github.com/kiwix/kiwix-android/pull/3814, https://github.com/kiwix/kiwix-android/pull/3823, https://github.com/kiwix/kiwix-android/pull/3824) * The Delete icon is showing wrong content description on the notes and history screen. (https://github.com/kiwix/kiwix-android/pull/3826) @@ -215,15 +215,15 @@ Compilation/CI/CD: 3.5.0 -* FIX: Storing Zim/Book files inside the public Kiwix Directory on internal storage. -* FIX: Storing Zim/Book files inside the public Kiwix Directory on external storage in android 11 and above. +* FIX: Storing ZIM/Book files inside the public Kiwix Directory on internal storage. +* FIX: Storing ZIM/Book files inside the public Kiwix Directory on external storage in android 11 and above. * FIX: Ability to save Notes in android 10 and above. -* FIX: Ability to open externally downloaded Zim Files. +* FIX: Ability to open externally downloaded ZIM Files. * FIX: MIME type fix for "*.js" titles. * FIX: CI/CD Pipeline fixed for android 21 & android 30. * FIX: Partial library migration from jcenter to jitpack & maven repo. * FIX: Add network permission dialog on download navigation. -* NEW: File Selector for selecting any zim files from storage. +* NEW: File Selector for selecting any ZIM files from storage. 3.4.6 * FIX: Added MANAGE_EXTERNAL_STORAGE permission for Android 11 and later @@ -236,13 +236,13 @@ Compilation/CI/CD: 3.4.5 NEW: Supports Android 11 NEW: Hotspot socket address better visible, clickable and shareable -BUGFIX: Some zim-it files doesn't read anymore +BUGFIX: Some zimit files doesn't read anymore BUGFIX: "Search in Kiwix" is just redirecting to Kiwix BUGFIX: Laggy input in search box + More 3.4.4 -NEW: The Download of Zim in now more stable +NEW: The Download of ZIM in now more stable NEW: Updated translations BUGFIX: In Search menu item recreates multiple times BUGFIX: Clicking the search result doesn't go anywhere @@ -259,7 +259,7 @@ BUGFIX: Creating multiple tabs was causing `loading` in previously opened tabs BUGFIX: Messages displayed when no books are present were inconsistent typographically 3.4.2 -NEW: Service worker support for war2c zim files +NEW: Service worker support for war2c ZIM files NEW: Updated translations NEW: Online Library won't be downloaded on mobile data when wifi only preference is set BUGFIX: Text to Speech continues in background @@ -299,19 +299,19 @@ BUGFIX: Crash on older devices due to OKHTTP 3.3.2 NEW: Better flow for hosting books -NEW: Control text zoom for zim files +NEW: Control text zoom for ZIM files NEW: Bookmarks/History internals rewrite NEW: Updated translations BUGFIX: Search results were inaccurate when typing too quickly -BUGFIX: new zim scheme for addressing content +BUGFIX: new ZIM scheme for addressing content BUGFIX: Native memory leaks fixed BUGFIX: fix crash on returning to webview from search result -BUGFIX: some zim files could not be found after downloading +BUGFIX: some ZIM files could not be found after downloading + Lots More 3.3.1 NEW: Send Diagnostic Reports -BUGFIX: Loading older zim files could fail +BUGFIX: Loading older ZIM files could fail BUGFIX: Some svgs were not loading + Lots More @@ -357,12 +357,12 @@ NEW: Tags for books 3.0.5 -BUGFIX: Some zim files could not be downloaded due to missing metadata +BUGFIX: Some ZIM files could not be downloaded due to missing metadata BUGFIX: Some mirrors were not allowed to download via http 3.0.4 BUGFIX: Some users language was causing a crash due to unstable ISO codes -BUGFIX: Some unstable zim files were crashing when opened +BUGFIX: Some unstable ZIM files were crashing when opened BUGFIX: Long titles were rendering off screen on home page BUGFIX: Issues when opening a file externally @@ -372,20 +372,20 @@ NEW: In app error reporting NEW: Improved bookmarks NEW: Help screen NEW: Home page -NEW: Zim history +NEW: ZIM history NEW: Introductory screen NEW: Improved language selection NEW: Add note to articles NEW: Tabs -NEW: Share zim files to other Kiwix users -NEW: Host zim files on your phone +NEW: Share ZIM files to other Kiwix users +NEW: Host ZIM files on your phone + Bugfixes & Lots More 2.5.3 BUGFIX: Fix IndexOutOfBounds in KiwixMobileActivity onResume 2.5.2 -BUGFIX: Some zim files were not displaying +BUGFIX: Some ZIM files were not displaying 2.5.1 NEW: Downloads are done over http diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3c69ef1381..0fce3093ce 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -68,7 +68,7 @@ For an overview of how to make design changes to Kiwix Android, check out [DESIG The Kiwix app is split into 3 modules 1. `core` - the "core" functionality of the app shared between different clients 1. `app` - the main app Kiwix, Wikipedia Offline -1. `custom` - this is for building custom applications that supply only 1 zim file and a custom skin +1. `custom` - this is for building custom applications that supply only 1 ZIM file and a custom skin The default build is `debug`, with this variant you can use a debugger while developing. To install the application click the `run` button in Android Studio with the `app` configuration selected while you have a device connected. The `release` build is what gets uploaded to the Google Play store and can be built locally with the dummy credentials/keystore provided. diff --git a/README.md b/README.md index c31e499f83..f06b2ea86f 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ with the Play Store policies and ensure a smooth user experience. We recommend using the official version of the app available on our website to access the complete set of features. -Possible paths for play store version which supports for the scanning/reading zim files. +Possible paths for play store version which supports for the scanning/reading ZIM files. | Storage path | Viewable outside kiwix(in File manager) | Could be scanned by Kiwix | |---------------------------------------------------------|-----------------------------------------|---------------------------| diff --git a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/CopyMoveFileHandler.kt b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/CopyMoveFileHandler.kt index 2ee4448710..765bfd03db 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/CopyMoveFileHandler.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/CopyMoveFileHandler.kt @@ -77,9 +77,9 @@ class CopyMoveFileHandler @Inject constructor( private val copyMoveTitle: String by lazy { if (isMoveOperation) { - activity.getString(R.string.file_moving_in_progress) + activity.getString(R.string.moving_zim_file) } else { - activity.getString(R.string.file_copying_in_progress) + activity.getString(R.string.copying_zim_file) } } diff --git a/app/src/main/res/layout/copy_move_progress_bar.xml b/app/src/main/res/layout/copy_move_progress_bar.xml index 2450afdce0..295027e050 100644 --- a/app/src/main/res/layout/copy_move_progress_bar.xml +++ b/app/src/main/res/layout/copy_move_progress_bar.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/activity_horizontal_margin" android:paddingBottom="@dimen/activity_horizontal_margin" - android:text="@string/file_copying_in_progress" + android:text="@string/copying_zim_file" android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/progressBar" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2e3fff33d7..b5c7400df7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,6 +6,6 @@ Failed to open file\nPlease try looking for this file in your Library Send Files Receive Files - No app found to select zim file! - Select zim file to read + No app found to select ZIM file! + Select ZIM file to read diff --git a/core/src/main/res/values-dag/strings.xml b/core/src/main/res/values-dag/strings.xml index 5ca657a96f..027d368542 100644 --- a/core/src/main/res/values-dag/strings.xml +++ b/core/src/main/res/values-dag/strings.xml @@ -305,8 +305,6 @@ Shili malibu zaŋ n-ti yaabu/kpɛhibu yaai Kpɛhi - Zim mazagali na yaarimi - Zim mazagali na kpɛrimi A borimi ni a yaai bee a zaŋ kpɛhi mazagali ŋɔ ni? Chiriŋ niŋya a zim mazagali yaabu ni: %s. Kpɛhimi/yaami mazagaya niŋ app salo wuhibu ni? diff --git a/core/src/main/res/values-fr/strings.xml b/core/src/main/res/values-fr/strings.xml index e3ffd29b5c..44ca46f8b0 100644 --- a/core/src/main/res/values-fr/strings.xml +++ b/core/src/main/res/values-fr/strings.xml @@ -341,8 +341,6 @@ Préparation de la copie/du déplacement Copier Déplacer - Copie du fichier Zim en cours - Déplacement du fichier ZIM en cours Voulez-vous copier ou déplacer le fichier ? Erreur lors de la copie du fichier ZIM : %s. Déplacer/copier les fichiers vers le répertoire public de l’application ? diff --git a/core/src/main/res/values-ia/strings.xml b/core/src/main/res/values-ia/strings.xml index 34239fa17c..36eb18adef 100644 --- a/core/src/main/res/values-ia/strings.xml +++ b/core/src/main/res/values-ia/strings.xml @@ -317,8 +317,6 @@ Preparation pro copiar/displaciar Copiar Displaciar - Copia del file ZIM in curso - Displaciamento del file ZIM in curso Vole tu copiar o displaciar le file? Error durante le copia del file ZIM: %s. Displaciar/copiar files al directorio public del app? diff --git a/core/src/main/res/values-it/strings.xml b/core/src/main/res/values-it/strings.xml index 8db1512fc7..7f1e4c37f9 100644 --- a/core/src/main/res/values-it/strings.xml +++ b/core/src/main/res/values-it/strings.xml @@ -304,8 +304,6 @@ Preparazione per la copia/spostamento Copia Sposta - Copia del file Zim in corso - Spostamento del file Zim in corso Vuoi copiare o spostare il file? Errore nella copia del file zim: %s. Spostare/copiare i file nella directory pubblica dell’app? diff --git a/core/src/main/res/values-iw/strings.xml b/core/src/main/res/values-iw/strings.xml index d42b0a9c51..ddb2b84c6b 100644 --- a/core/src/main/res/values-iw/strings.xml +++ b/core/src/main/res/values-iw/strings.xml @@ -322,8 +322,6 @@ הכנה להעתקה או העברה העתקה העברה - העתקת קובץ ZIM מתבצעת - העברת קובץ ZIM מתבצעת האם ברצונך להעתיק או להעביר את הקובץ? שגיאה בהעתקת קובץ zim‏: %s. להעביר או להעתיק קבצים לספרייה ציבורית של היישום? diff --git a/core/src/main/res/values-ko/strings.xml b/core/src/main/res/values-ko/strings.xml index 5d3fd756ce..fac7d66eb0 100644 --- a/core/src/main/res/values-ko/strings.xml +++ b/core/src/main/res/values-ko/strings.xml @@ -328,8 +328,6 @@ 복사/이동 준비 중 복사 이동 - Zim 파일 복사 진행 중 - Zim 파일 이동 진행 중 파일을 복사하거나 이동하시겠습니까? zim 파일 복사 오류: %s. 앱 공개 디렉토리로 파일을 이동/복사하시겠습니까? diff --git a/core/src/main/res/values-mk/strings.xml b/core/src/main/res/values-mk/strings.xml index 924c21d8f6..b1a5e7933a 100644 --- a/core/src/main/res/values-mk/strings.xml +++ b/core/src/main/res/values-mk/strings.xml @@ -314,8 +314,6 @@ Подготовка за копирање/преместување Копирај Премести - Копирањето на ZIM-податотеката е во тек - Преместувањето на ZIM-податотеката е во тек Дали сакате да ја ископирате или преместите податотеката? Грешка при копирање на ZIM-податотеката: %s. Да се преместат/прекопираат податотеките во јавниот директориум на прилогот? diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml index 4a0aed2a12..5f224582ea 100644 --- a/core/src/main/res/values-pt-rBR/strings.xml +++ b/core/src/main/res/values-pt-rBR/strings.xml @@ -332,8 +332,6 @@ Preparando-se para copiar/mover Copiar Mover - Copiando arquivo zim - Movendo arquivo zim Você quer copiar ou mover o arquivo? Erro ao copiar o arquivo zim: %s. Mover/Copiar arquivos para o diretório público do app? diff --git a/core/src/main/res/values-ru/strings.xml b/core/src/main/res/values-ru/strings.xml index 36f5c331df..30e817b2ab 100644 --- a/core/src/main/res/values-ru/strings.xml +++ b/core/src/main/res/values-ru/strings.xml @@ -343,8 +343,6 @@ Подготовка к копированию/перемещению Копировать Переместить - Копируем ZIM-файл - Перемещаем ZIM-файл Вы хотите скопировать или переместить файл? Ошибка при копировании ZIM-файла: %s. Перемещение/копирование файлов в публичный каталог приложения? diff --git a/core/src/main/res/values-zh-rTW/strings.xml b/core/src/main/res/values-zh-rTW/strings.xml index 0ca7385b7a..55f7fe1ebe 100644 --- a/core/src/main/res/values-zh-rTW/strings.xml +++ b/core/src/main/res/values-zh-rTW/strings.xml @@ -325,8 +325,6 @@ 準備拷貝/移動 拷貝 移動 - 正在進行 zim 檔案拷貝 - 正在進行 zim 檔案移動 您要拷貝或移動檔案嗎？ 拷貝 zim 檔案時發生錯誤：%s。 將檔案移動/拷貝到應用程式公共目錄？ diff --git a/core/src/main/res/values-zh/strings.xml b/core/src/main/res/values-zh/strings.xml index f39b1de5f4..a0ddd725f6 100644 --- a/core/src/main/res/values-zh/strings.xml +++ b/core/src/main/res/values-zh/strings.xml @@ -342,8 +342,6 @@ 准备复制/移动 复制 移动 - 正在进行zim文件复制 - 正在进行zim文件移动 您要复制或移动文件吗？ 复制zim文件时出错：%s。 将文件移动/复制到应用程序公共目录？ diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index de57dd4523..fb7f7c8c73 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -51,8 +51,8 @@ Rendered QR Code Share URL via other applications Error: The selected ZIM file could not be found. - Unable to read this zim file! - Unable to open zim file + Unable to read this ZIM file! + Unable to open ZIM file Error: The selected file is not a valid ZIM file. Error: Loading article (Url: %1$s) failed. Display @@ -72,7 +72,7 @@ No app found to select a bookmark file No Content Headers Found To access offline content we need access to your storage - To download zim files we need write access to your storage + To download ZIM files we need write access to your storage Are you sure you want to delete your search history and reset all active tabs? Delete this item? Clear history @@ -116,7 +116,7 @@ Device Online Library - The following zim file(s) will be deleted:\n\n%s + The following ZIM file(s) will be deleted:\n\n%s Files deleted successfully No files here Insufficient space to download. @@ -181,7 +181,7 @@ Well… This is Embarrassing It looks like we crashed.\n\nWould you mind helping us fix this problem by sending the following information? Your Language Settings - A List of Your Zim Files + A List of Your ZIM Files Details of The Crash Application Logs Device Details @@ -231,7 +231,7 @@ Complete Paused Failed: %s - The zim file could not be downloaded. Please try reinstalling the application from the Play store. + The ZIM file could not be downloaded. Please try reinstalling the application from the Play store. Save Note Wiki Article Title @@ -260,7 +260,7 @@ Location permission is required by Android to allow the app to detect peer devices Nearby devices permission is required by Android to allow the app to detect peer devices Cannot locate peer devices without location permissions - Cannot access zim files without storage permission + Cannot access ZIM files without storage permission Enable location to allow detection of peers Cannot discover peers without location services Enable WiFi P2P from system settings @@ -325,17 +325,17 @@ Preparing for copy/move Copy Move - Zim file copying in progress - Zim file moving in progress + Copying ZIM file… + Moving ZIM file… Kiwix requires the ZIM file to be in its own data directory. Do you want to copy or move it there? - Error in copying the zim file: %s. + Error in copying the ZIM file: %s. Move/Copy files to app public directory? Due to Google Play policies on Android 11 and above, our app can no longer directly access files stored elsewhere on your device. To let you view your selected files, we need to move or copy them into a special folder within our application directory. This allows us to access and open the files. Do you agree to this? - Error in moving the zim file: %s. + Error in moving the ZIM file: %s. How to update content? - To update content (a zim file) you need to download the full latest version of this very same content. You can do that via the download section. + To update content (a ZIM file) you need to download the full latest version of this very same content. You can do that via the download section. All Files Permission Needed - In order to access all the zim files across device we need to have All Files Permission + In order to access all the ZIM files across device we need to have All Files Permission Allowed Not allowed Please enable wifi to download content diff --git a/custom/src/main/res/values-qq/strings.xml b/custom/src/main/res/values-qq/strings.xml index 1e1598174a..c53121d840 100644 --- a/custom/src/main/res/values-qq/strings.xml +++ b/custom/src/main/res/values-qq/strings.xml @@ -4,5 +4,5 @@ --> {{Identical|Retry}} - * It is shown on the custom app’s download screen when there is no zim file available to read.\n* It is telling the user that the installation is invalid and user must download zim file.\n* It is also telling user to ensure that Wifi is on and user has enough storage. + * It is shown on the custom app’s download screen when there is no ZIM file available to read.\n* It is telling the user that the installation is invalid and user must download ZIM file.\n* It is also telling user to ensure that Wifi is on and user has enough storage. diff --git a/custom/src/main/res/values/strings.xml b/custom/src/main/res/values/strings.xml index c80d791bc9..d2037370d0 100644 --- a/custom/src/main/res/values/strings.xml +++ b/custom/src/main/res/values/strings.xml @@ -2,5 +2,5 @@ Retry - Invalid Install. Please Download Zim.\n Ensure WiFi is on and you have enough storage + Invalid Install. Please Download ZIM.\n Ensure WiFi is on and you have enough storage