Merge branch 'master' of github.com:ooni/probe-android into dw-media-…

…probe
ooni · Apr 10, 2024 · 2f1406f · 2f1406f
2 parents ca23927 + 4bc7e61
commit 2f1406f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId 'org.openobservatory.ooniprobe'
         minSdk libs.versions.minSdk.get().toInteger()
         targetSdk libs.versions.targetSdk.get().toInteger()
-        versionName '3.8.6'
-        versionCode 110
+        versionName '3.8.7'
+        versionCode 111
 		testInstrumentationRunner "org.openobservatory.ooniprobe.TestAndroidJUnitRunner"
 		buildConfigField 'String', 'OONI_API_BASE_URL', '"https://api.ooni.io/"'
 		buildConfigField 'String', 'NOTIFICATION_SERVER', '"https://countly.ooni.io"'

diff --git a/app/src/ooni/res/values-ar/strings.xml b/app/src/ooni/res/values-ar/strings.xml
@@ -164,7 +164,7 @@
   <string name="TestResults_Details_Failed_Title">فشل</string>
   <string name="TestResults_Details_Failed_Paragraph">باستطاعتك إجراء هذا الاختبار من جديد </string>
   <string name="TestResults_Details_Failed_TryAgain">الرجاء المحاولة مجددًا</string>
-  <string name="TestResults_Details_Methodology_Paragraph">التعرف على كيفية عمل هذا الاختبار [هنا]([رابط]).</string>
+  <string name="TestResults_Details_Methodology_Paragraph">التعرف على كيفية عمل هذا الاختبار [هنا](%1$s).</string>
   <string name="TestResults_Details_Websites_Reachable_Hero_Title">مُتاح</string>
   <string name="TestResults_Details_Websites_Reachable_Content_Paragraph">%1$s مُتاح.</string>
   <string name="TestResults_Details_Websites_LikelyBlocked_Hero_Title">محجوب على الأرجح</string>

diff --git a/app/src/ooni/res/values-pt-rBR/strings.xml b/app/src/ooni/res/values-pt-rBR/strings.xml
@@ -365,7 +365,7 @@
   <string name="Settings_AutomatedTesting_RunAutomatically_DateLast">Último teste automatizado: %1$s.</string>
   <string name="Settings_AutomatedTesting_RunAutomatically_WiFiOnly">Somente com Wi-Fi</string>
   <string name="Settings_AutomatedTesting_RunAutomatically_ChargingOnly">Somente durante o carregamento</string>
-  <string name="Settings_AutomatedTesting_RunAutomatically_Footer">Ao permitir testes automáticos, os testes OONI Probe serão executados automaticamente várias vezes por dia. Os resultados de seus testes serão publicados automaticamente no OONI Explorer: https://explorer.ooni.org/ \n\nIImportante: Se você tiver uma VPN habilitada, a OONI Probe não executará testes automaticamente. Por favor, desligue sua VPN para testes automatizados da OONI Probe. Saiba mais: https://ooni.org/support/faq/#can-i-run-ooni-probe-over-a-vpn</string>
+  <string name="Settings_AutomatedTesting_RunAutomatically_Footer">Ao permitir testes automáticos, os testes OONI Probe serão executados automaticamente várias vezes por dia. Os resultados de seus testes serão publicados automaticamente no OONI Explorer: https://explorer.ooni.org/ \n\nImportante: Se você tiver uma VPN habilitada, a OONI Probe não executará testes automaticamente. Por favor, desligue sua VPN para testes automatizados da OONI Probe. Saiba mais: https://ooni.org/support/faq/#can-i-run-ooni-probe-over-a-vpn</string>
   <string name="Settings_Sharing_Label">Compartilhando</string>
   <string name="Settings_Sharing_UploadResults">Publicar os resultados automaticamente</string>
   <string name="Settings_Sharing_UploadResultsManually">Carregamento manual dos resultados</string>

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -40,7 +40,7 @@ markwon = "4.6.2"
 shapeofview = "1.4.7"
 targetSdk = "33"
 minSdk = "21"
-oonimkall = "2023.12.13-200325"
+oonimkall = "2024.03.27-124004"
 
 junit = "4.13.2"
 dbflow = "4.2.4"