Bimba.git

commit c088d5f8feb5932e4efd0b638394611393a9216d

Author: Adam Evyčędo <git@apiote.xyz>

prepare languages for v3.7.1

 app/build.gradle.kts | 8 ++++----
 app/src/main/res/values-et/strings.xml | 10 ++++------
 app/src/main/res/values-fr/strings.xml | 2 --
 app/src/main/res/values-pl/strings.xml | 2 +-
 app/src/main/res/xml/locales_config.xml | 8 +++++---


diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f0481fe773315686516130d05f5de05037e64df6..960248ae9669045338ed054d76b314cca6769855 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,7 +11,7 @@ }
 
 android {
 	namespace = "xyz.apiote.bimba.czwek"
-	// TODO apksigner with `--alignment-preserved` https://gitlab.com/fdroid/fdroiddata/-/issues/3299#note_1989808414
+	// NOTE apksigner with `--alignment-preserved` https://gitlab.com/fdroid/fdroiddata/-/issues/3299#note_1989808414
 	compileSdk = 35
 	buildToolsVersion = "35.0.0"
 
@@ -23,7 +23,7 @@ 		versionCode = 32
 		versionName = "3.7.0"
 
 		testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-		resourceConfigurations += listOf("en", "pl", "it", "de", "fr", "en-rUS")
+		resourceConfigurations += listOf("en", "de", "en-rGB", "en-rUS", "et", "fr", "it", "pl")
 	}
 
 	buildTypes {
@@ -56,8 +56,8 @@ 	implementation("com.google.android.material:material:1.12.0")
 	implementation("androidx.constraintlayout:constraintlayout:2.2.0")
 	implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.8.7")
 	implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7")
-	implementation("androidx.navigation:navigation-fragment-ktx:2.8.3")
-	implementation("androidx.navigation:navigation-ui-ktx:2.8.3")
+	implementation("androidx.navigation:navigation-fragment-ktx:2.8.4")
+	implementation("androidx.navigation:navigation-ui-ktx:2.8.4")
 	implementation("androidx.legacy:legacy-support-v4:1.0.0")
 	implementation("androidx.core:core-splashscreen:1.0.1")
 	implementation("com.google.openlocationcode:openlocationcode:1.0.4")




diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index ea505321830dc85be8e4569db6f02aed29708d58..0480a5fed0a434e65ffaebf0d90a926db77025fe 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -31,7 +31,7 @@         %1$s dunatim
         <item quantity="other">%1$s dunatimmi</item>
     </plurals>
     <string name="speed_in_m_per_s">%1$s m/s</string>
-    <string name="time_in_tm">%1$s %2$s tm</string>
+    <string name="time_in_tm">%1$s %2$sTm</string>
     <string name="speed_in_km_per_h">%1$s km/h</string>
     <plurals name="speed_in_vl_cd">
         <item quantity="one">%1$d vlos</item>
@@ -70,10 +70,8 @@     %1$s «» %2$s
     <string name="results_for">Otsingutulemused: „%1$s“</string>
     <string name="bimba_server_address_hint">Server</string>
     <string name="server_rate_limited_question">See server kasutab päringumahu piiranguid ning ligipääsutunnus on sisestamata. Kas sa soovid jätkata?</string>
-    <string name="inexact_content_description">umbkaudne väljumise aeg sõiduplaani järgi</string>
-    <string name="server_private_question">See on privaatne server ning ligipääsutunnus on sisestamata</string>
+	<string name="server_private_question">See on privaatne server ning ligipääsutunnus on sisestamata</string>
     <string name="realtime_content_description">väljumine on reaalajas</string>
-    <string name="exact_content_description">väljumise aeg on sõiduplaani järgi</string>
     <string name="voice_announcements_content_description">kasutusel on häälteated</string>
     <string name="tickets_sold_content_description">transpordivahendis müüakse sõidupileteid</string>
     <string name="usb_charging_content_description">USB-põhised laadimispordid on olemas</string>
@@ -109,7 +107,7 @@     
         <item quantity="one">%1$d miil</item>
         <item quantity="other">%1$d miili</item>
     </plurals>
-    <string name="distance_in_gf">%1$s %2$s gf</string>
+    <string name="distance_in_gf">%1$s %2$sGf</string>
     <plurals name="distance_in_gf_cd">
         <item quantity="one">%1$d grafut</item>
         <item quantity="other">%1$d grafutit</item>
@@ -123,7 +121,7 @@         %1$s grafut
         <item quantity="other">%1$s grafutit</item>
     </plurals>
     <string name="time_in_s">%1$s sek</string>
-    <string name="time_in_tm_past">%1$s %2$s tm tagasi</string>
+    <string name="time_in_tm_past">%1$s %2$sTm tagasi</string>
     <plurals name="time_in_tm_cd">
         <item quantity="one">%1$d tim</item>
         <item quantity="other">%1$d timmi</item>




diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c5b2a84341eb957a72bc39334495cb9b20b9f07f..fb6f37dfc1273727b87f2835f72e5ae9fa97ad8b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -203,8 +203,6 @@     %1$s et %2$s
     <string name="time_in_s">%1$s s</string>
     <string name="map_attribution">© contributeurs d’&lt;a href=https://www.openstreetmap.org/copyright&gt;OpenStreetMap&lt;/a&gt;</string>
     <string name="no_email_app">Aucune application d’e-mail installée</string>
-    <string name="exact_content_description">à l’heure</string>
-    <string name="inexact_content_description">presque à l’heure</string>
     <string name="favourite_content_description">Enregistrer comme favori</string>
     <string name="unfiltered">Non filtré</string>
     <string name="cannot_save_favourite">Impossible d’enregistrer le favori</string>




diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 82d2b666d4b793fcfaeb67e809cf06a780541e13..9e162712580cf6ac01c38c1dec5c8a8337d52f9f 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -48,7 +48,7 @@     za moment
     <string name="departure_departed">odjechał</string>
     <string name="departure_now">teraz</string>
     <string name="at_time">o %1$02d:%2$02d</string>
-    <string name="about_time">about %1$02d:%2$02d</string>
+    <string name="about_time">około %1$02d:%2$02d</string>
     <string name="at_time_realtime">o %1$02d:%2$02d:%3$02d</string>
     <string name="on_demand">na żądanie</string>
     <string name="no_boarding">brak</string>




diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml
index 52ded369d35deb8e357f2bba5c042a0adc2de048..c590b8026cb06e551b4fc892f4f8c1065b4166e6 100644
--- a/app/src/main/res/xml/locales_config.xml
+++ b/app/src/main/res/xml/locales_config.xml
@@ -8,9 +8,11 @@ -->
 
 <locale-config xmlns:android="http://schemas.android.com/apk/res/android">
     <locale android:name="en"/>
-    <locale android:name="pl"/>
-    <locale android:name="it"/>
     <locale android:name="de"/>
-    <locale android:name="fr"/>
+    <locale android:name="en-rGB"/>
     <locale android:name="en-rUS"/>
+    <locale android:name="et"/>
+    <locale android:name="fr"/>
+    <locale android:name="it"/>
+    <locale android:name="pl"/>
 </locale-config>
\ No newline at end of file