Merge branch 'releases/5.0.5' into translations/ooni/03c6e946f2

Author: sdsantos

composeApp/build.gradle.kts

@@ -154,8 +154,8 @@ android {
         applicationId = config.appId
         minSdk = libs.versions.android.minSdk.get().toInt()
         targetSdk = libs.versions.android.targetSdk.get().toInt()
-        versionCode = 170 // Always increment by 10. See fdroid flavor below
-        versionName = "5.0.4"
+        versionCode = 190 // Always increment by 10. See fdroid flavor below
+        versionName = "5.0.5"
         resValue("string", "app_name", config.appName)
         resValue("string", "ooni_run_enabled", config.supportsOoniRun.toString())
         resValue(

composeApp/src/commonMain/composeResources/values-es/strings-common.xml

@@ -29,7 +29,9 @@
     <string name="Dashboard_Runv2_Overview_SeeMore">Ver más</string>
     <string name="Dashboard_RunV2_ExpiredTag">EXPIRED</string>
     <string name="Dashboard_RunV2_UpdatedTag">UPDATED</string>
+    <string name="Dashboard_RunV2_UpdateTag">ACTUALIZACIÓN</string>
     <string name="Dashboard_Runv2_Overview_LastUpdated">Last updated %1$s</string>
+    <string name="Dashboard_Runv2_Overview_RejectedUpdate">Actualización rechazada</string>
     <string name="Dashboard_Runv2_Overview_UndoRejectedUpdate">Deshacer</string>
     <string name="Dashboard_Runv2_Overview_ReviewUpdates">Revisar Actualizaciones</string>
 
@@ -40,6 +42,8 @@
     <string name="Dashboard_ReviewDescriptor_Label">Link Update (%1$s of %2$s)</string>
     <string name="Dashboard_ReviewDescriptor_Button_Last">UPDATE AND FINISH (%1$s of %2$s)</string>
     <string name="Dashboard_ReviewDescriptor_Button_Default">UPDATE (%1$s of %2$s)</string>
+    <string name="Dashboard_ReviewDescriptor_Reject">Rechazar Actualización</string>
+
     <string name="Dashboard_Update_Restart">Reiniciar</string>
 
     <!-- Test -->
@@ -315,6 +319,7 @@
     <string name="OONIRun_Run">Ejecutar</string>
 
     <string name="Notification_ChannelName">Probando</string>
+    <string name="Notification_UpdateChannelName">Actualizaciones de Enlaces</string>
     <string name="Notification_StopTest">Detener la prueba</string>
 
     <string name="Common_Back">Volver</string>

composeApp/src/commonMain/composeResources/values-fr/strings-common.xml

@@ -317,6 +317,8 @@
     <string name="Modal_Error_CantDownloadURLs">Impossible de télécharger la liste des URL. Réessayez.</string>
     <string name="Modal_CustomURL_Title_NotSaved">Confirmez-vous?</string>
     <string name="Modal_CustomURL_NotSaved">Vos URL ne seront pas enregistrées si vous quittez cet écran. Voulez-vous vraiment le quitter?</string>
+    <string name="Modal_Autorun_BatteryOptimization_Onboarding">L’application ne peut pas effectuer des tests automatiquement sans l’autorisation de fonctionner en arrière-plan. Voulez-vous réessayer \?</string>
+    <string name="Modal_Autorun_BatteryOptimization_Reminder">L’application doit être autorisée à effectuer des tests automatiquement en arrière-plan.</string>
     <string name="Modal_EnableNotifications_Title">Obtenez des mises à jour sur la censure d’Internet</string>
 
     <!-- Common / Others -->

composeApp/src/commonMain/composeResources/values-zh-rCN/strings-common.xml

@@ -317,13 +317,16 @@
     <string name="Modal_Error_CantDownloadURLs">无法下载 URL 列表。请重试。</string>
     <string name="Modal_CustomURL_Title_NotSaved">是否确定？</string>
     <string name="Modal_CustomURL_NotSaved">离开此屏幕将不会保存您的 URL。确定离开吗？</string>
+    <string name="Modal_Autorun_BatteryOptimization_Onboarding">没有后台权限，本应用无法自动运行测试。你要再次尝试吗？</string>
+    <string name="Modal_Autorun_BatteryOptimization_Reminder">应用需要权限以在后台自动运行测试</string>
     <string name="Modal_EnableNotifications_Title">获取网络审查的动态</string>
 
     <!-- Common / Others -->
 
     <string name="OONIRun_Run">运行</string>
 
     <string name="Notification_ChannelName">测试中</string>
+    <string name="Notification_UpdateChannelName">链接更新</string>
     <string name="Notification_StopTest">停止测试</string>
 
     <string name="Common_Back">返回</string>

composeApp/src/commonMain/kotlin/org/ooni/probe/ui/run/RunScreen.kt

@@ -165,7 +165,7 @@ fun RunScreen(
                                 regularTestItems(descriptor, testItems, onEvent)
 
                             TestDisplayMode.WebsitesOnly ->
-                                websiteItems(descriptor, testItems)
+                                websiteItems(testItems)
                         }
                     }
                 }
@@ -341,12 +341,9 @@ fun TestItem(
     }
 }
 
-private fun LazyListScope.websiteItems(
-    descriptor: Descriptor,
-    testItems: List<SelectableItem<NetTest>>,
-) {
+private fun LazyListScope.websiteItems(testItems: List<SelectableItem<NetTest>>) {
     val websites = testItems.flatMap { it.item.inputs.orEmpty() }
-    items(websites, key = { "${descriptor.key}_$it" }) { website ->
+    items(websites) { website ->
         Text(
             website,
             modifier = Modifier

composeApp/src/commonMain/res/drawable/.gitignore

@@ -1,4 +1,4 @@
 
+ic_launcher_monochrome.xml
 ic_launcher_foreground.xml
-notification_icon.xml
-ic_launcher_monochrome.xml
+notification_icon.xml

composeApp/src/dwMain/resources/assets/descriptors.json

@@ -143,7 +143,6 @@
                     "https://www.dw.com/",
                     "https://www.bbc.com/",
                     "http://www.lemonde.fr/",
-                    "https://www.rferl.org/",
                     "http://www.rfi.fr/",
                     "http://www.voanews.com/",
                     "https://ici.radio-canada.ca/rci/en",
@@ -323,7 +322,6 @@
                     "https://www.dw.com/",
                     "https://www.bbc.com/",
                     "http://www.lemonde.fr/",
-                    "https://www.rferl.org/",
                     "http://www.rfi.fr/",
                     "http://www.voanews.com/",
                     "https://ici.radio-canada.ca/rci/en",

composeApp/src/ooniMain/composeResources/values-de/strings-organization.xml

@@ -25,7 +25,7 @@
     <string name="Dashboard_InstantMessaging_Card_Description">Teste die Blockierung von Instant Messaging-Apps</string>
     <string name="Dashboard_InstantMessaging_Overview_Paragraph">Prüfe, ob [WhatsApp](https://ooni.org/nettest/whatsapp/), [Facebook Messenger](https://ooni.org/nettest/facebook-messenger/), [Telegram](https://ooni.org/nettest/telegram/) und [Signal](https://ooni.org/nettest/signal) blockiert sind.\n\nDeine Ergebnisse werden auf dem [OONI Explorer](https://explorer.ooni.org/world/) und [OONI API](https://api.ooni.io/) veröffentlicht.</string>
     <string name="Dashboard_Circumvention_Card_Description">Test auf Blockierung der Instrumente zur Zensurumgehung </string>
-    <string name="Dashboard_Circumvention_Overview_Paragraph">Prüfe, ob [Psiphon](https://ooni.org/nettest/psiphon/), [Tor](https://ooni.org/nettest/tor/) oder [RiseupVPN](https://ooni.org/nettest/riseupvpn/) blockiert sind.\n\nDeine Ergebnisse werden auf dem [OONI Explorer](https://explorer.ooni.org/) und [OONI API](https://api.ooni.io/) veröffentlicht.</string>
+    <string name="Dashboard_Circumvention_Overview_Paragraph">Prüfe, ob [Psiphon](https://ooni.org/nettest/psiphon/) oder [Tor](https://ooni.org/nettest/tor/) blockiert sind.\n\nDeine Ergebnisse werden auf dem [OONI Explorer](https://explorer.ooni.org/) und [OONI API](https://api.ooni.io/) veröffentlicht.</string>
     <string name="Dashboard_Experimental_Card_Description">Neue experimentelle Tests durchführen</string>
     <string name="Dashboard_Experimental_Overview_Paragraph">Führe die folgenden neuen, vom OONI-Team entwickelten experimentellen Tests durch:\n%1$s\n\nDeine Ergebnisse werden im [OONI Explorer] veröffentlicht.(https://explorer.ooni.org/) und [OONI API](https://api.ooni.io/).</string>
 

composeApp/src/ooniMain/composeResources/values-el/strings-organization.xml

@@ -25,7 +25,6 @@
     <string name="Dashboard_InstantMessaging_Card_Description">Έλεγξε το μπλοκάρισμα εφαρμογών συνομιλιών</string>
     <string name="Dashboard_InstantMessaging_Overview_Paragraph">Δες αν το [WhatsApp](https://ooni.org/nettest/whatsapp/), το [Facebook Messenger](https://ooni.org/nettest/facebook-messenger/), το [Telegram](https://ooni.org/nettest/telegram/) και το [Signal](https://ooni.org/nettest/signal) έχουν μπλοκαριστεί.\n\nΤα αποτελέσματα των δοκιμών σου θα δημοσιευτούν στο [OONI Explorer](https://explorer.ooni.org/world/) και στο [OONI API](https://api.ooni.io/).</string>
     <string name="Dashboard_Circumvention_Card_Description">Έλεγξε το μπλοκάρισμα εργαλείων παράκαμψης λογοκρισίας</string>
-    <string name="Dashboard_Circumvention_Overview_Paragraph">Δες αν το [Psiphon](https://ooni.org/nettest/psiphon/), το [Tor](https://ooni.org/nettest/tor/) ή το [RiseupVPN](https://ooni.org/nettest/riseupvpn/) έχουν μπλοκαριστεί.\n\nΤα αποτελέσματα θα δημοσιευτούν στο [OONI Explorer] (https://explorer.ooni.org/) και στο [OONI API] (https://api.ooni.io/).</string>
     <string name="Dashboard_Experimental_Card_Description">Εκτέλεση νέων πειραματικών δοκιμών</string>
     <string name="Dashboard_Experimental_Overview_Paragraph">Εκτέλεσε τις παρακάτω νέες πειραματικές δοκιμές που αναπτύχθηκαν από την ομάδα του OONI:\n%1$s\n\nΤα αποτελέσματά σου θα δημοσιευθούν στο [OONI Explorer](https://explorer.ooni.org/) και στο [OONI API](https://api.ooni.io/).</string>
 

composeApp/src/ooniMain/composeResources/values-es/strings-organization.xml

@@ -25,7 +25,7 @@
     <string name="Dashboard_InstantMessaging_Card_Description">Prueba el bloqueo de aplicaciones de mensajería instantánea.</string>
     <string name="Dashboard_InstantMessaging_Overview_Paragraph">Comprueba si [WhatsApp](https://ooni.org/nettest/whatsapp/), [Facebook Messenger](https://ooni.org/nettest/facebook-messenger/), [Telegram](https://ooni.org/nettest/telegram/) y [Signal](https://ooni.org/nettest/signal) están bloqueados.\n\nTus resultados serán publicados en el [Explorador OONI](https://explorer.ooni.org/world/) y la [API OONI](https://api.ooni.io/).</string>
     <string name="Dashboard_Circumvention_Card_Description">Probar el bloqueo de herramientas de elusión de censura</string>
-    <string name="Dashboard_Circumvention_Overview_Paragraph">Comprueba si [Psiphon](https://ooni.org/nettest/psiphon/), [Tor](https://ooni.org/nettest/tor/) o [RiseupVPN](https://ooni.org/nettest/riseupvpn/) están bloqueados.\n\nTus resultados serán publicados en [Explorador OONI] (https://explorer.ooni.org/) y [OONI API](https://api.ooni.io/).</string>
+    <string name="Dashboard_Circumvention_Overview_Paragraph">Comprueba si [Psiphon](https://ooni.io/nettest/psiphon/) y [Tor](https://ooni.io/nettest/tor/) están bloqueados.\n\nTus resultados se publicarán en [OONI Explorer](https://explorer.ooni.org/) y [OONI API](https://api.ooni.io/).</string>
     <string name="Dashboard_Experimental_Card_Description">Ejecutar nuevas pruebas experimentales</string>
     <string name="Dashboard_Experimental_Overview_Paragraph">Ejecutar las siguientes nuevas pruebas experimentales desarrolladas por el equipo OONI:\n%1$s\n\nTus resultados serán publicados en el [Explorador OONI](https://explorer.ooni.org/) y el [API OONI](https://api.ooni.io/).</string>