From 9f6e14a1810528107b847adf46e198702b689de2 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Wed, 20 Nov 2024 11:26:30 +0530
Subject: [PATCH 1/3] camera: Fix crash due to translations

---
 app/src/main/res/values-es/strings.xml | 2 +-
 app/src/main/res/values-fr/strings.xml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 6c9a07cc1..41306d5a2 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -812,7 +812,7 @@
     <string name="preference_panorama_save_summary">Si se guardan las imágenes originales en modo panorámico. Ten en cuenta que guardar las fotos panorámicas es más lento. También permite la opción de guardar un archivo XML que puede ser útil para reportar problemas con el modo panorama.
 \n%s</string>
     <string name="camera_id">ID</string>
-    <string name="preference_image_format_summary">Selecciona el formato utilizado para guardar las fotos. Esto afecta las fotos \"estándar\" (no RAW). Sólo JPEG permite guardar metadatos Exif. Ten en cuenta que el formato PNG no es realmente sin pérdidas, sino que se convierte a partir de un JPEG con una calidad del 100%.
+    <string name="preference_image_format_summary">Selecciona el formato utilizado para guardar las fotos. Esto afecta las fotos \"estándar\" (no RAW). Sólo JPEG permite guardar metadatos Exif. Ten en cuenta que el formato PNG no es realmente sin pérdidas, sino que se convierte a partir de un JPEG con una calidad del 100%%.
 \n%s</string>
     <string name="preference_panorama_save_no">No guardar imágenes originales</string>
     <string name="failed_to_process_panorama">Error al crear imágen panorama</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 33b2f513f..5092d0e87 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -454,8 +454,7 @@
 \n%s</string>
     <string name="preference_camera_api_summary">Sélectionner l\'API Camera2 pour activer des fonctions supplémentaires telles que les modes manuels d\'exposition, de mise au point, de balance des blancs, ainsi que le mode RAW (s\'il est pris en charge par l\'appareil). La modification de l\'API entraînera un redémarrage.
 \n%s</string>
-    <string name="preference_image_format_summary">Sélectionnez le format de fichier utilisé pour l\'enregistrement des photos. Cela concerne les photos \"standard\" (pas RAW). Seul le format JPEG permet de sauvegarder les métadonnées Exif. N.B : le format PNG ne permet pas d\'éviter véritablement les pertes, en effet il est converti à partir d\'un JPEG de qualité 100 %.
-\n%s</string>
+    <string name="preference_image_format_summary">Sélectionnez le format de fichier utilisé pour l\'enregistrement des photos. Cela concerne les photos \"standard\" (pas RAW). Seul le format JPEG permet de sauvegarder les métadonnées Exif. N.B : le format PNG ne permet pas d\'éviter véritablement les pertes, en effet il est converti à partir d\'un JPEG de qualité 100%%.\n%s</string>
     <string name="preference_panorama_save_all_plus_debug">Enregistrer les images d\'origine ainsi que le rapport XML</string>
     <string name="preference_panorama_save_summary">Enregistrer ou non les images originales en mode panoramique. Notez que cela ralentira l\'enregistrement des photos panoramiques. Permet aussi la possibilité d\'enregistrer un fichier XML qui peut être utile pour signaler des problèmes de panorama.
 \n%s</string>
-- 
GitLab


From 384c2e13137ec923f821ff1b3a283bea2e3664c6 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Wed, 20 Nov 2024 11:50:07 +0530
Subject: [PATCH 2/3] camera: Fix lint warnings

---
 app/src/main/res/values-az/strings.xml     | 1 -
 app/src/main/res/values-be/strings.xml     | 1 -
 app/src/main/res/values-cs/strings.xml     | 1 -
 app/src/main/res/values-el/strings.xml     | 1 -
 app/src/main/res/values-es/strings.xml     | 1 -
 app/src/main/res/values-fr/strings.xml     | 3 ---
 app/src/main/res/values-hu/strings.xml     | 1 -
 app/src/main/res/values-ko/strings.xml     | 1 -
 app/src/main/res/values-pt-rBR/strings.xml | 1 -
 app/src/main/res/values-pt-rPT/strings.xml | 1 -
 app/src/main/res/values-sl/strings.xml     | 1 -
 app/src/main/res/values-tr/strings.xml     | 1 -
 app/src/main/res/values-uk/strings.xml     | 1 -
 app/src/main/res/values-vi/strings.xml     | 1 -
 app/src/main/res/values-zh-rCN/strings.xml | 1 -
 15 files changed, 17 deletions(-)

diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 8aa42b6e5..ea70857d5 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -317,7 +317,6 @@
 
     <string name="preference_ui_placement_left">Sol əllə işləyənlər üçün</string>
     <string name="preference_ui_placement_right">Sağ əllə işləyənlər üçün</string>
-    <string name="preferences_about_title">About</string>
     <string name="preferences_build_version">Quraşdırma versiyası</string>
     <string name="preferences_about_app">Kamera Camera-dan çəngəldir</string>
     <string name="preferences_authors">Müəlliflər</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index d2cccf7a5..33a91d40f 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -362,7 +362,6 @@
 
     <string name="preference_stamp_style_shadowed">Тэкст з ценем</string>
     <string name="preference_stamp_style_plain">Звычайны тэкст</string>
-    <string name="preferences_about_title">About</string>
     <string name="preferences_build_version">Зборка версіі</string>
     <string name="preferences_about_app">Камера раздвоеная ад Camera</string>
     <string name="preferences_authors">Аўтары</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 4442ce29f..6d6625c74 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -366,7 +366,6 @@
 
     <string name="preference_stamp_style_shadowed">Vystínovaný text</string>
     <string name="preference_stamp_style_plain">Prostý text</string>
-    <string name="preferences_about_title">About</string>
     <string name="preferences_build_version">Sestavte verzi</string>
     <string name="preferences_about_app">Kamera je vidlice z Camera</string>
     <string name="preferences_authors">Autor</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index ff17f8227..c15c45cc4 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -445,7 +445,6 @@
     <string name="high_speed">Υψηλή Ταχύτητα</string> <!-- in the sense of high speed video frame rates -->
 
     <string name="preference_video_fps_default">Προεπιλογή</string>
-    <string name="preferences_about_title">About</string>
     <string name="preferences_build_version">Δημιουργία έκδοσης</string>
     <string name="preferences_about_app">Η κάμερα είναι διχαλωτή από το Camera</string>
     <string name="preferences_authors">Συγγραφέας</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 41306d5a2..5ad3e8ec5 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -555,7 +555,6 @@
     <string name="preference_ui_placement_right">Interfaz de usuario para diestros</string>
     <string name="preference_stamp_style_shadowed">Texto sombreado</string>
     <string name="preference_stamp_style_plain">Texto plano</string>
-    <string name="preferences_about_title">About</string>
     <string name="preferences_build_version">Versión de compilación</string>
     <string name="preferences_about_app">Camera es una bifurcación de Camera</string>
     <string name="preferences_authors">Autores</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5092d0e87..9cf26ea7b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -430,9 +430,6 @@
     <string name="preferences_licence">Licence</string>
     <string name="preferences_app_info_title">Informations sur Caméra</string>
     <string name="preferences_service_terms">Conditions d\'utilisation</string>
-    <string name="speech_recognizer_extra_info">(Votre voix peut être envoyée à des serveurs
-\ndistants par Android pour effectuer
-\nune reconnaissance vocale.)</string>
     <string name="exposure_compensation_seekbar">Barre de réglage de la compensation de l\'exposition</string>
     <string name="cycle_raw">Faire défiler les modes RAW</string>
     <string name="cycle_flash">Modes du flash</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index c63ba8ebd..0d44d3dd5 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -466,7 +466,6 @@
     <string name="preference_ui_placement_right">Jobbkezes felhasználói felület</string>
     <string name="preference_stamp_style_shadowed">Árnyékos szöveg</string>
     <string name="preference_stamp_style_plain">Sima szöveg</string>
-    <string name="preferences_about_title">About</string>
     <string name="preferences_build_version">Összeállított verzió</string>
     <string name="preferences_about_app">A fényképezőgép villás az Camera-tól</string>
     <string name="preferences_authors">Szerzők</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index c1ed9df5f..c4af2303a 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -329,7 +329,6 @@
 
     <string name="preference_ui_placement_left">왼손잡이 사용자 인터페이스</string>
     <string name="preference_ui_placement_right">오른손잡이 사용자 인터페이스</string>
-    <string name="preferences_about_title">About</string>
     <string name="preferences_build_version">빌드 버전</string>
     <string name="preferences_about_app">Camera에서 카메라 포크</string>
     <string name="preferences_authors">저자</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index e19e83293..2e35a5acd 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -329,7 +329,6 @@
 
     <string name="preference_ui_placement_left">Interface para canhoto</string>
     <string name="preference_ui_placement_right">Interface para destro</string>
-    <string name="preferences_about_title">About</string>
     <string name="preferences_build_version">Versão de compilação</string>
     <string name="preferences_about_app">A câmera é bifurcada no Camera</string>
     <string name="preferences_authors">Autor</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 98b5753d0..6a6f79645 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -418,7 +418,6 @@
 
     <string name="preference_stamp_style_shadowed">Texto sombreado</string>
     <string name="preference_stamp_style_plain">Texto simples</string>
-    <string name="preferences_about_title">About</string>
     <string name="preferences_build_version">Versão de compilação</string>
     <string name="preferences_about_app">A câmera é bifurcada no Camera</string>
     <string name="preferences_authors">Autor</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 408f8503d..07a3f828d 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -862,7 +862,6 @@
 
     <string name="preference_stamp_style_shadowed">Osenčeno besedilo</string>
     <string name="preference_stamp_style_plain">Golo besedilo</string>
-    <string name="preferences_about_title">About</string>
     <string name="preferences_build_version">Različica za izdelavo</string>
     <string name="preferences_about_app">Kamera je vilica Camera</string>
     <string name="preferences_authors">Avtor</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index a5be97c78..fc8080b40 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -347,7 +347,6 @@
     <string name="preference_ui_placement_right">Sağ el kullanıcı arayüzü</string>
     <string name="preference_stamp_style_shadowed">Gölgeli yazı</string>
     <string name="preference_stamp_style_plain">Düz yazı</string>
-    <string name="preferences_about_title">About</string>
     <string name="preferences_build_version">Derleme sürümü</string>
     <string name="preferences_about_app">Kamera Camera\'dan çatallandı</string>
     <string name="preferences_authors">Yapımcılar</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 8f353b0fb..78aa076c5 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -425,7 +425,6 @@
     <string name="preference_ui_placement_right">Інтерфейс для правші</string>
     <string name="preference_stamp_style_shadowed">Текст с тінью</string>
     <string name="preference_stamp_style_plain">Звичайний текст</string>
-    <string name="preferences_about_title">About</string>
     <string name="preferences_build_version">Збірка версії</string>
     <string name="preferences_about_app">Камера роздвоєна від Camera</string>
     <string name="preferences_authors">Автори</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 28ac6ecdd..62185ffb6 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -779,7 +779,6 @@
 
     <string name="preference_stamp_style_shadowed">Đổ bóng</string>
     <string name="preference_stamp_style_plain">Thuần túy</string>
-    <string name="preferences_about_title">About</string>
     <string name="preferences_build_version">Phiên bản xây dựng</string>
     <string name="preferences_about_app">Máy ảnh được rẽ nhánh từ Camera</string>
     <string name="preferences_authors">Tác giả</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index da570207e..15c16f6df 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -831,7 +831,6 @@
     <string name="preference_panorama_save_all_plus_debug">保存原图和debug XML</string>
 
     <string name="camera_id">ID</string>
-    <string name="preferences_about_title">About</string>
     <string name="preferences_build_version">内部版本</string>
     <string name="preferences_about_app">相机是从Camera分叉的</string>
     <string name="preferences_authors">作者</string>
-- 
GitLab


From e59cd33555bf888ac2ea48a09c31f738a4cb0ee6 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Wed, 20 Nov 2024 12:40:13 +0530
Subject: [PATCH 3/3] camera: Add link check for translations

---
 .gitignore     |  1 +
 .gitlab-ci.yml |  7 +++++++
 check_lint.sh  | 16 ++++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100755 check_lint.sh

diff --git a/.gitignore b/.gitignore
index 775172ba3..32c05826d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ testdata/
 
 local.properties
 uninstall.bat
+lint-results.txt
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8957a8239..56486fe59 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@ image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest"
 
 stages:
   - update-from-upstream
+  - lint
   - build
 
 before_script:
@@ -9,6 +10,12 @@ before_script:
   - export GRADLE_USER_HOME=$(pwd)/.gradle
   - chmod +x ./gradlew
 
+lint:
+  stage: lint
+  script:
+    - chmod +x check_lint.sh
+    - ./check_lint.sh
+
 cache:
   key: ${CI_PROJECT_ID}
   paths:
diff --git a/check_lint.sh b/check_lint.sh
new file mode 100755
index 000000000..e2b3df971
--- /dev/null
+++ b/check_lint.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+./gradlew lint > lint-results.txt
+
+# Check if "Multiple substitutions specified" or "StringFormatMatches" exist in the lint results
+grep -qE "Multiple substitutions specified|StringFormatMatches" lint-results.txt
+
+GREP_STATUS=$?
+
+if [ $GREP_STATUS -eq 0 ]; then
+  echo "Test Failed: Lint issues found (Multiple substitutions or String format match)"
+  exit 1
+else
+  echo "Test Passed: No lint issues found"
+  exit 0
+fi
-- 
GitLab