From 7d540dab57657a671535f6d84fbda1a0c9f694b9 Mon Sep 17 00:00:00 2001 From: Lars Schmertmann Date: Thu, 7 Nov 2024 14:16:23 +0100 Subject: [PATCH] Android: Avoid lint warning The usage in manifest was accidentally removed in 963a31c0f4b48c3734352706fbbdae69f19b59eb. To avoid this warning more explicitly we add "tools:ignore" to the XML files. This is a false positive because we use it in src/android/jar/src/org/qtproject/qt/android/QtActivityBase.java. Pick-to: 6.5 Change-Id: I2fe1d0930b81b3c33e7b6b1ad6f6e152dc3e0740 Reviewed-by: Edward Welbourne Reviewed-by: Assam Boudjelthia (cherry picked from commit 709eb77ff0f32792beb18d3edea9e0aa4436f481) Reviewed-by: Qt Cherry-pick Bot --- src/android/java/res/values-de/strings.xml | 4 ++-- src/android/java/res/values-el/strings.xml | 4 ++-- src/android/java/res/values-es/strings.xml | 4 ++-- src/android/java/res/values-et/strings.xml | 4 ++-- src/android/java/res/values-fa/strings.xml | 4 ++-- src/android/java/res/values-fr/strings.xml | 4 ++-- src/android/java/res/values-in/strings.xml | 4 ++-- src/android/java/res/values-it/strings.xml | 4 ++-- src/android/java/res/values-ja/strings.xml | 4 ++-- src/android/java/res/values-ms/strings.xml | 4 ++-- src/android/java/res/values-nb/strings.xml | 4 ++-- src/android/java/res/values-nl/strings.xml | 4 ++-- src/android/java/res/values-pl/strings.xml | 4 ++-- src/android/java/res/values-pt-rBR/strings.xml | 4 ++-- src/android/java/res/values-ro/strings.xml | 4 ++-- src/android/java/res/values-ru/strings.xml | 4 ++-- src/android/java/res/values-se/strings.xml | 4 ++-- src/android/java/res/values-zh-rCN/strings.xml | 4 ++-- src/android/java/res/values-zh-rTW/strings.xml | 4 ++-- src/android/java/res/values/strings.xml | 4 ++-- 20 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/android/java/res/values-de/strings.xml b/src/android/java/res/values-de/strings.xml index 3d4fa1f3546..d565156f4a8 100644 --- a/src/android/java/res/values-de/strings.xml +++ b/src/android/java/res/values-de/strings.xml @@ -1,4 +1,4 @@  - - In Ihrer Anwendung ist ein schwerwiegender Fehler aufgetreten, sie kann nicht fortgesetzt werden + + In Ihrer Anwendung ist ein schwerwiegender Fehler aufgetreten, sie kann nicht fortgesetzt werden diff --git a/src/android/java/res/values-el/strings.xml b/src/android/java/res/values-el/strings.xml index 20058ddeaa0..8ce98b99b2d 100644 --- a/src/android/java/res/values-el/strings.xml +++ b/src/android/java/res/values-el/strings.xml @@ -1,4 +1,4 @@ - - Παρουσιάστηκε ένα κρίσιμο σφάλμα και η εφαρμογή δεν μπορεί να συνεχίσει. + + Παρουσιάστηκε ένα κρίσιμο σφάλμα και η εφαρμογή δεν μπορεί να συνεχίσει. diff --git a/src/android/java/res/values-es/strings.xml b/src/android/java/res/values-es/strings.xml index 23e46c96fd5..cddfd6ce94f 100644 --- a/src/android/java/res/values-es/strings.xml +++ b/src/android/java/res/values-es/strings.xml @@ -1,4 +1,4 @@ - - La aplicación ha causado un error grave y no es posible continuar. + + La aplicación ha causado un error grave y no es posible continuar. diff --git a/src/android/java/res/values-et/strings.xml b/src/android/java/res/values-et/strings.xml index 54b46ee2cb8..aa076928fd5 100644 --- a/src/android/java/res/values-et/strings.xml +++ b/src/android/java/res/values-et/strings.xml @@ -1,4 +1,4 @@ - - Programmiga juhtus fataalne viga.\nKahjuks ei saa jätkata. + + Programmiga juhtus fataalne viga.\nKahjuks ei saa jätkata. diff --git a/src/android/java/res/values-fa/strings.xml b/src/android/java/res/values-fa/strings.xml index 2c599319dfd..8697a9b3f86 100644 --- a/src/android/java/res/values-fa/strings.xml +++ b/src/android/java/res/values-fa/strings.xml @@ -1,4 +1,4 @@  - - خطایی اساسی در برنامه‌تان رخ داد و اجرای برنامه نمی‌تواند ادامه یابد. + + خطایی اساسی در برنامه‌تان رخ داد و اجرای برنامه نمی‌تواند ادامه یابد. diff --git a/src/android/java/res/values-fr/strings.xml b/src/android/java/res/values-fr/strings.xml index 9e75c05333c..717ef91b622 100644 --- a/src/android/java/res/values-fr/strings.xml +++ b/src/android/java/res/values-fr/strings.xml @@ -1,4 +1,4 @@ - - Votre application a rencontré une erreur fatale et ne peut pas continuer. + + Votre application a rencontré une erreur fatale et ne peut pas continuer. diff --git a/src/android/java/res/values-in/strings.xml b/src/android/java/res/values-in/strings.xml index 6eea41d9069..05f94571574 100644 --- a/src/android/java/res/values-in/strings.xml +++ b/src/android/java/res/values-in/strings.xml @@ -1,4 +1,4 @@ - - Aplikasi Anda mengalami kesalahan fatal dan tidak dapat melanjutkan. + + Aplikasi Anda mengalami kesalahan fatal dan tidak dapat melanjutkan. diff --git a/src/android/java/res/values-it/strings.xml b/src/android/java/res/values-it/strings.xml index 27e5a909cea..d40630f0909 100644 --- a/src/android/java/res/values-it/strings.xml +++ b/src/android/java/res/values-it/strings.xml @@ -1,4 +1,4 @@ - - L\'applicazione ha provocato un errore grave e non puo\' continuare. + + L\'applicazione ha provocato un errore grave e non puo\' continuare. diff --git a/src/android/java/res/values-ja/strings.xml b/src/android/java/res/values-ja/strings.xml index 9ff7d464cb3..fb94c5bbb0f 100644 --- a/src/android/java/res/values-ja/strings.xml +++ b/src/android/java/res/values-ja/strings.xml @@ -1,4 +1,4 @@ - - アプリケーションで致命的なエラーが発生したため続行できません。 + + アプリケーションで致命的なエラーが発生したため続行できません。 diff --git a/src/android/java/res/values-ms/strings.xml b/src/android/java/res/values-ms/strings.xml index 45ba74372bf..f1dd2849be2 100644 --- a/src/android/java/res/values-ms/strings.xml +++ b/src/android/java/res/values-ms/strings.xml @@ -1,4 +1,4 @@ - - Aplikasi anda menemui ralat muat dan tidak boleh diteruskan. + + Aplikasi anda menemui ralat muat dan tidak boleh diteruskan. diff --git a/src/android/java/res/values-nb/strings.xml b/src/android/java/res/values-nb/strings.xml index de3c9e9f053..9c6cef03ff3 100644 --- a/src/android/java/res/values-nb/strings.xml +++ b/src/android/java/res/values-nb/strings.xml @@ -1,4 +1,4 @@ - - Applikasjonen fikk en kritisk feil og kan ikke fortsette + + Applikasjonen fikk en kritisk feil og kan ikke fortsette diff --git a/src/android/java/res/values-nl/strings.xml b/src/android/java/res/values-nl/strings.xml index 372fe8486d4..afe46e4f53e 100644 --- a/src/android/java/res/values-nl/strings.xml +++ b/src/android/java/res/values-nl/strings.xml @@ -1,4 +1,4 @@ - - Er is een fatale fout in de applicatie opgetreden. De applicatie kan niet verder gaan. + + Er is een fatale fout in de applicatie opgetreden. De applicatie kan niet verder gaan. diff --git a/src/android/java/res/values-pl/strings.xml b/src/android/java/res/values-pl/strings.xml index 2a9ce2d482e..2d641a50266 100644 --- a/src/android/java/res/values-pl/strings.xml +++ b/src/android/java/res/values-pl/strings.xml @@ -1,4 +1,4 @@ - - Wystąpił błąd krytyczny. Aplikacja zostanie zamknięta. + + Wystąpił błąd krytyczny. Aplikacja zostanie zamknięta. diff --git a/src/android/java/res/values-pt-rBR/strings.xml b/src/android/java/res/values-pt-rBR/strings.xml index f998bf39d10..5534b55745e 100644 --- a/src/android/java/res/values-pt-rBR/strings.xml +++ b/src/android/java/res/values-pt-rBR/strings.xml @@ -1,4 +1,4 @@ - - Sua aplicação encontrou um erro fatal e não pode continuar. + + Sua aplicação encontrou um erro fatal e não pode continuar. diff --git a/src/android/java/res/values-ro/strings.xml b/src/android/java/res/values-ro/strings.xml index ce03d0e1ab2..9751abb6151 100644 --- a/src/android/java/res/values-ro/strings.xml +++ b/src/android/java/res/values-ro/strings.xml @@ -1,4 +1,4 @@ - - Aplicaţia dumneavoastră a întâmpinat o eroare fatală şi nu poate continua. + + Aplicaţia dumneavoastră a întâmpinat o eroare fatală şi nu poate continua. diff --git a/src/android/java/res/values-ru/strings.xml b/src/android/java/res/values-ru/strings.xml index 495975c4062..574a8e29346 100644 --- a/src/android/java/res/values-ru/strings.xml +++ b/src/android/java/res/values-ru/strings.xml @@ -1,4 +1,4 @@ - - Ваше приложение столкнулось с фатальной ошибкой и не может более работать. + + Ваше приложение столкнулось с фатальной ошибкой и не может более работать. diff --git a/src/android/java/res/values-se/strings.xml b/src/android/java/res/values-se/strings.xml index 3550a93cf49..76100971dff 100644 --- a/src/android/java/res/values-se/strings.xml +++ b/src/android/java/res/values-se/strings.xml @@ -1,4 +1,4 @@ - - Vaša aplikacija je naišla na fatalnu grešku i ne može nastaviti sa radom. + + Vaša aplikacija je naišla na fatalnu grešku i ne može nastaviti sa radom. diff --git a/src/android/java/res/values-zh-rCN/strings.xml b/src/android/java/res/values-zh-rCN/strings.xml index 15fe92e36dd..03538f4e0e9 100644 --- a/src/android/java/res/values-zh-rCN/strings.xml +++ b/src/android/java/res/values-zh-rCN/strings.xml @@ -1,4 +1,4 @@ - - 您的应用程序遇到一个致命错误导致它无法继续。 + + 您的应用程序遇到一个致命错误导致它无法继续。 diff --git a/src/android/java/res/values-zh-rTW/strings.xml b/src/android/java/res/values-zh-rTW/strings.xml index 3d4c194373b..5930b71e014 100644 --- a/src/android/java/res/values-zh-rTW/strings.xml +++ b/src/android/java/res/values-zh-rTW/strings.xml @@ -1,4 +1,4 @@ - - 您的應用程序遇到一個致命錯誤導致它無法繼續。 + + 您的應用程序遇到一個致命錯誤導致它無法繼續。 diff --git a/src/android/java/res/values/strings.xml b/src/android/java/res/values/strings.xml index 53ac832c6a7..5007f7fa6fc 100644 --- a/src/android/java/res/values/strings.xml +++ b/src/android/java/res/values/strings.xml @@ -1,5 +1,5 @@ - + - Your application encountered a fatal error and cannot continue. + Your application encountered a fatal error and cannot continue.