Minor formatting

cmaciasochoa · Aug 3, 2022 · 036ca6d · 036ca6d
1 parent f4dc488
commit 036ca6d
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 16 deletions.
diff --git 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
@@ -271,4 +271,4 @@ Es mostrarà una notificació permanent per continuar executant-se en segon pla.
 Consulteu el registre per tenir més detalls."</string>
     <string name="workmanagerInitializationErrorDialogOpenSettingsLabel">"Obriu la configuració de l'aplicació"</string>
     <string name="workmanagerInitializationErrorDialogTitle">"Error d'inicialització"</string>
-</resources>
+</resources>
diff --git 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."</string>
     <string name="workmanagerInitializationErrorDialogOpenSettingsLabel">"Otevřete Nastavení aplikace"</string>
     <string name="workmanagerInitializationErrorDialogTitle">"Chyba inicializace"</string>
-</resources>
+</resources>
diff --git 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."</string>
     <string name="workmanagerInitializationErrorDialogOpenSettingsLabel">"App Einstellungen öffnen"</string>
     <string name="workmanagerInitializationErrorDialogTitle">"Initialisationsfehler"</string>
-</resources>
+</resources>
diff --git a/project/app/src/main/res/values-el/strings.xml b/project/app/src/main/res/values-el/strings.xml
@@ -11,4 +11,4 @@
     <string name="contactDetailsDistanceValue">"%1$,.2f %2$s"</string>
     <string name="contactDetailsSpeedValue">"%d kph"</string>
     <string name="contactDetailsTrackerId">"Tracker ID"</string>
-</resources>
+</resources>
diff --git 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
     <string name="welcome_version_learn_more">"Aprender más"</string>
     <string name="welcome_version_title">"Restricciones"</string>
     <string name="welcomeFixIssue">"Fix"</string>
-</resources>
+</resources>
diff --git 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
     <string name="welcome_version_title">"Restrictions"</string>
     <string name="welcomeFixIssue">"Autoriser"</string>
     <string name="workmanagerInitializationErrorDialogTitle">"Erreur d'initialisation"</string>
-</resources>
+</resources>
diff --git a/project/app/src/main/res/values-ja/strings.xml b/project/app/src/main/res/values-ja/strings.xml
@@ -239,4 +239,4 @@
 詳しくはログを確認してください。"</string>
     <string name="workmanagerInitializationErrorDialogOpenSettingsLabel">"アプリ設定を開く"</string>
     <string name="workmanagerInitializationErrorDialogTitle">"初期化エラー"</string>
-</resources>
+</resources>
diff --git a/project/app/src/main/res/values-ko/strings.xml b/project/app/src/main/res/values-ko/strings.xml
@@ -45,7 +45,7 @@
     <string name="contactLocationUnknown">"위치 정보가 존재하지 않음"</string>
     <string name="currentLocationButtonLabel">"현재 위치"</string>
     <string name="description">"설명"</string>
-    <string name="deviceLocationDisabledDialogMessage">"장치의 위치 서비스가 사용 중지되어 Owntracks가 내 위치를 추적할 수 없습니다.
+    <string name="deviceLocationDisabledDialogMessage">"장치의 위치 서비스가 사용 중지되어 Owntracks가 내 위치를 추적할 수 없습니다. 
 
 기기 설정에서 위치 정보를 활성화합니다."</string>
     <string name="deviceLocationDisabledDialogPositiveButtonLabel">"위치 설정"</string>
@@ -267,4 +267,4 @@ HTTPS 또는 MQTT 및 로그인 자격 증명을 통해 액세스할 수 있는
 자세한 내용은 로그를 확인하십시오."</string>
     <string name="workmanagerInitializationErrorDialogOpenSettingsLabel">"앱 설정 열기"</string>
     <string name="workmanagerInitializationErrorDialogTitle">"초기화 오류"</string>
-</resources>
+</resources>
diff --git a/project/app/src/main/res/values-lb/strings.xml b/project/app/src/main/res/values-lb/strings.xml
@@ -11,4 +11,4 @@
     <string name="contactDetailsDistanceValue">"%1$,.2f %2$s"</string>
     <string name="contactDetailsSpeedValue">"%d kph"</string>
     <string name="contactDetailsTrackerId">"Tracker ID"</string>
-</resources>
+</resources>
diff --git 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."</string>
     <string name="workmanagerInitializationErrorDialogOpenSettingsLabel">"Otwórz ustawienia"</string>
     <string name="workmanagerInitializationErrorDialogTitle">"Błąd inicjalizacji"</string>
-</resources>
+</resources>
diff --git a/project/app/src/main/res/values-pt/strings.xml b/project/app/src/main/res/values-pt/strings.xml
@@ -116,4 +116,4 @@
     <string name="welcome_play_heading">"Google Play Services"</string>
     <string name="welcome_version_learn_more">"Saber mais"</string>
     <string name="welcome_version_title">"Restrições"</string>
-</resources>
+</resources>
diff --git a/project/app/src/main/res/values-ru/strings.xml b/project/app/src/main/res/values-ru/strings.xml
@@ -252,4 +252,4 @@
     <!-- Where is it? -->
     <string name="workmanagerInitializationErrorDialogOpenSettingsLabel">"Перейти к настройкам"</string>
     <string name="workmanagerInitializationErrorDialogTitle">"Ошибка инициализации"</string>
-</resources>
+</resources>
diff --git a/project/app/src/main/res/values-zh/strings.xml b/project/app/src/main/res/values-zh/strings.xml
@@ -163,4 +163,4 @@
 为使本程序能够在后台正常运行，通知栏中会一直显示一个通知。您可以在系统设置的通知相关设置中屏蔽掉这条通知。"</string>
     <string name="welcome_version_learn_more">"了解更多信息"</string>
     <string name="welcome_version_title">"限制"</string>
-</resources>
+</resources>
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
@@ -45,4 +45,4 @@ class GoogleMapFragmentConversionTests(
             }
         }
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,4 +45,4 @@ class GoogleMapFragmentConversionTests( @@
                 }
             }
         }
-    }
+    }