diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9213c9cf6d..45dcd12cbe 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,9 +5,20 @@ repos: rev: v3.2.0 hooks: - id: trailing-whitespace + exclude: > + (?x)^( + project/app/src/main/res/values-[a-z]{2}/strings.xml + )$ - id: end-of-file-fixer - exclude: project/app/objectbox-models/default.json + exclude: > + (?x)^( + project/app/objectbox-models/default.json| + project/app/src/main/res/values-[a-z]{2}/strings.xml + )$ + - id: check-merge-conflict - id: check-yaml + - id: check-xml + - id: check-toml - id: check-added-large-files - id: mixed-line-ending args: ["--fix=lf"] diff --git a/project/app/src/main/res/values-ca/strings.xml b/project/app/src/main/res/values-ca/strings.xml index 928633e506..7ed58e573a 100644 --- a/project/app/src/main/res/values-ca/strings.xml +++ b/project/app/src/main/res/values-ca/strings.xml @@ -271,4 +271,4 @@ Es mostrarà una notificació permanent per continuar executant-se en segon pla. Consulteu el registre per tenir més detalls." "Obriu la configuració de l'aplicació" "Error d'inicialització" - + \ No newline at end of file diff --git a/project/app/src/main/res/values-cs/strings.xml b/project/app/src/main/res/values-cs/strings.xml index 5e3078191b..7f6252bbec 100644 --- a/project/app/src/main/res/values-cs/strings.xml +++ b/project/app/src/main/res/values-cs/strings.xml @@ -273,4 +273,4 @@ Aby aplikace mohla běžet na pozadí, bude zobrazeno trvalé oznámení. Lze to Další podrobnosti naleznete v protokolech." "Otevřete Nastavení aplikace" "Chyba inicializace" - + \ No newline at end of file diff --git a/project/app/src/main/res/values-de/strings.xml b/project/app/src/main/res/values-de/strings.xml index 10c2713dec..fc9e9ce8a1 100644 --- a/project/app/src/main/res/values-de/strings.xml +++ b/project/app/src/main/res/values-de/strings.xml @@ -233,4 +233,4 @@ Um dies zu ermöglichen, aktivieren Sie bitte den Standort in den Geräteeinstel Bitte überprüfen Sie die Logs für mehr Details." "App Einstellungen öffnen" "Initialisationsfehler" - + \ No newline at end of file diff --git a/project/app/src/main/res/values-el/strings.xml b/project/app/src/main/res/values-el/strings.xml index dbb2df2129..0bb27e67c6 100644 --- a/project/app/src/main/res/values-el/strings.xml +++ b/project/app/src/main/res/values-el/strings.xml @@ -11,4 +11,4 @@ "%1$,.2f %2$s" "%d kph" "Tracker ID" - + \ No newline at end of file diff --git a/project/app/src/main/res/values-es/strings.xml b/project/app/src/main/res/values-es/strings.xml index fa5de2dfa1..12e3b645eb 100644 --- a/project/app/src/main/res/values-es/strings.xml +++ b/project/app/src/main/res/values-es/strings.xml @@ -199,4 +199,4 @@ Una notificación permanente se mostrará para mantener la aplicación funcionan "Aprender más" "Restricciones" "Fix" - + \ No newline at end of file diff --git a/project/app/src/main/res/values-fr/strings.xml b/project/app/src/main/res/values-fr/strings.xml index a4f70fff21..c101ba5e32 100644 --- a/project/app/src/main/res/values-fr/strings.xml +++ b/project/app/src/main/res/values-fr/strings.xml @@ -228,4 +228,4 @@ Une notification permanente sera affichée pour continuer à fonctionner en arri "Restrictions" "Autoriser" "Erreur d'initialisation" - + \ No newline at end of file diff --git a/project/app/src/main/res/values-ja/strings.xml b/project/app/src/main/res/values-ja/strings.xml index d5e435d739..da56a501c6 100644 --- a/project/app/src/main/res/values-ja/strings.xml +++ b/project/app/src/main/res/values-ja/strings.xml @@ -239,4 +239,4 @@ 詳しくはログを確認してください。" "アプリ設定を開く" "初期化エラー" - + \ No newline at end of file diff --git a/project/app/src/main/res/values-ko/strings.xml b/project/app/src/main/res/values-ko/strings.xml index 5b62570229..31fdb07040 100644 --- a/project/app/src/main/res/values-ko/strings.xml +++ b/project/app/src/main/res/values-ko/strings.xml @@ -45,7 +45,7 @@ "위치 정보가 존재하지 않음" "현재 위치" "설명" - "장치의 위치 서비스가 사용 중지되어 Owntracks가 내 위치를 추적할 수 없습니다. + "장치의 위치 서비스가 사용 중지되어 Owntracks가 내 위치를 추적할 수 없습니다. 기기 설정에서 위치 정보를 활성화합니다." "위치 설정" @@ -267,4 +267,4 @@ HTTPS 또는 MQTT 및 로그인 자격 증명을 통해 액세스할 수 있는 자세한 내용은 로그를 확인하십시오." "앱 설정 열기" "초기화 오류" - + \ No newline at end of file diff --git a/project/app/src/main/res/values-lb/strings.xml b/project/app/src/main/res/values-lb/strings.xml index dbb2df2129..0bb27e67c6 100644 --- a/project/app/src/main/res/values-lb/strings.xml +++ b/project/app/src/main/res/values-lb/strings.xml @@ -11,4 +11,4 @@ "%1$,.2f %2$s" "%d kph" "Tracker ID" - + \ No newline at end of file diff --git a/project/app/src/main/res/values-pl/strings.xml b/project/app/src/main/res/values-pl/strings.xml index 07b2d6289a..353d2ed82a 100644 --- a/project/app/src/main/res/values-pl/strings.xml +++ b/project/app/src/main/res/values-pl/strings.xml @@ -275,4 +275,4 @@ Aby utrzymać działanie aplikacji w tle, będzie wyświetlana permanentna notyf Sprawdź rejestr błędów, aby uzyskać więcej informacji." "Otwórz ustawienia" "Błąd inicjalizacji" - + \ No newline at end of file diff --git a/project/app/src/main/res/values-pt/strings.xml b/project/app/src/main/res/values-pt/strings.xml index 8caaeabe5f..31ccb6172c 100644 --- a/project/app/src/main/res/values-pt/strings.xml +++ b/project/app/src/main/res/values-pt/strings.xml @@ -116,4 +116,4 @@ "Google Play Services" "Saber mais" "Restrições" - + \ No newline at end of file diff --git a/project/app/src/main/res/values-ru/strings.xml b/project/app/src/main/res/values-ru/strings.xml index c67b29bea5..44f8e0e2a6 100644 --- a/project/app/src/main/res/values-ru/strings.xml +++ b/project/app/src/main/res/values-ru/strings.xml @@ -252,4 +252,4 @@ "Перейти к настройкам" "Ошибка инициализации" - + \ No newline at end of file diff --git a/project/app/src/main/res/values-zh/strings.xml b/project/app/src/main/res/values-zh/strings.xml index 3761addf3b..9661d884f9 100644 --- a/project/app/src/main/res/values-zh/strings.xml +++ b/project/app/src/main/res/values-zh/strings.xml @@ -163,4 +163,4 @@ 为使本程序能够在后台正常运行，通知栏中会一直显示一个通知。您可以在系统设置的通知相关设置中屏蔽掉这条通知。" "了解更多信息" "限制" - + \ No newline at end of file diff --git a/project/app/src/test/java/org/owntracks/android/ui/map/GoogleMapFragmentConversionTests.kt b/project/app/src/test/java/org/owntracks/android/ui/map/GoogleMapFragmentConversionTests.kt index e987cb80c4..ba1714bf81 100644 --- a/project/app/src/test/java/org/owntracks/android/ui/map/GoogleMapFragmentConversionTests.kt +++ b/project/app/src/test/java/org/owntracks/android/ui/map/GoogleMapFragmentConversionTests.kt @@ -45,4 +45,4 @@ class GoogleMapFragmentConversionTests( } } } -} \ No newline at end of file +}