Bimba.git

commit 93a6775f0368bca54e65214a198aad04e8cff92a

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

cleanup translations

%!v(PANIC=String method: strings: negative Repeat count)


diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/dashboard/ui/home/Favourites.kt b/app/src/main/java/xyz/apiote/bimba/czwek/dashboard/ui/home/Favourites.kt
index b3cb8722547c815be4076bc24615a101aba0a8f6..711016241320500c160eac7dd14196cd1b974411 100644
--- a/app/src/main/java/xyz/apiote/bimba/czwek/dashboard/ui/home/Favourites.kt
+++ b/app/src/main/java/xyz/apiote/bimba/czwek/dashboard/ui/home/Favourites.kt
@@ -177,7 +177,7 @@ 			} else if (departure.isEmpty) {
 				holder.feedName.text = favourite.feedName
 				holder.stopHeadline.text = favourite.stopName
 				holder.lineIcon.setImageDrawable(null)
-				holder.lineName.text = context.getString(R.string.no_next_departures)
+				holder.lineName.text = context.getString(R.string.no_departures).lowercase()
 				holder.departureTime.text = ""
 				holder.departureTimeFull.text = ""
 				holder.headsign.text = ""




diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/departures/DeparturesActivity.kt b/app/src/main/java/xyz/apiote/bimba/czwek/departures/DeparturesActivity.kt
index 452b6c5c267baf59e3805b88673d0d2aa62e1a0c..1164836fb36f512ff578e26a75e9c1ac04013cac 100644
--- a/app/src/main/java/xyz/apiote/bimba/czwek/departures/DeparturesActivity.kt
+++ b/app/src/main/java/xyz/apiote/bimba/czwek/departures/DeparturesActivity.kt
@@ -404,7 +404,7 @@ 		val lastUpdateAgo = ZonedDateTime.now().toEpochSecond() - adapter.lastUpdate.toEpochSecond()
 		if (lastUpdateAgo > 59 && adapter.lastUpdate.year != 0) {
 			snackbar.setText(
 				getString(
-					R.string.departures_snackbar,
+					R.string.last_update,
 					DateUtils.getRelativeTimeSpanString(
 						adapter.lastUpdate.toEpochSecond() * 1000,
 						ZonedDateTime.now().toEpochSecond() * 1000,




diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/units/TGM.kt b/app/src/main/java/xyz/apiote/bimba/czwek/units/TGM.kt
index 01f12e34c0563df7314db784694ddec0110c9c0e..d99b72fac627db1e05c134ee36112e0a1d2ac798 100644
--- a/app/src/main/java/xyz/apiote/bimba/czwek/units/TGM.kt
+++ b/app/src/main/java/xyz/apiote/bimba/czwek/units/TGM.kt
@@ -63,14 +63,14 @@ 		} else {
 			if (tims > base.toDouble().pow(4)) {
 				val t = tims / base.toDouble().pow(4)
 				context.resources.getQuantityString(
-					R.plurals.time_in_4gf_12_cd,
+					R.plurals.time_in_4tm_12_cd,
 					t.toInt(),
 					t.toInt().toDozenalString(context)
 				)
 			} else {
 				val t = tims / base.toDouble().pow(2)
 				context.resources.getQuantityString(
-					R.plurals.time_in_2gf_12_cd,
+					R.plurals.time_in_2tm_12_cd,
 					t.toInt(),
 					t.toInt().toDozenalString(context)
 				)




diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1a6d862be16f5f4061c29aa7f4517ac497e347c7..8e5ca43fe47402d84cefdf881ac378ccd664757d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -23,7 +23,8 @@ 	Not found
 	<string name="error_429">Rate limit exceeded. Try again later</string>
 	<string name="error_50x">There was an error on the sever. Try again later</string>
 	<string name="error_unknown">Unknown error happened</string>
-	<string name="error_connecting">Error connecting to the server. Try again later</string> <!-- send a bug report to bimba@git.apiote.xyz, details are: url=$URL, response=$response -->
+	<!-- send a bug report to bimba@git.apiote.xyz, details are: url=$URL, response=$response -->
+	<string name="error_connecting">Error connecting to the server. Try again later</string>
 	<string name="error_offline">You are offline. Connect to the Internet</string>
 	<string name="error_gps">Cannot obtain current location</string>
 	<string name="no_departures">No departures</string>
@@ -79,11 +80,11 @@ 	
 		<item quantity="one">%1$d tim</item>
 		<item quantity="other">%1$d tims</item>
 	</plurals>
-	<plurals name="time_in_4gf_12_cd">
+	<plurals name="time_in_4tm_12_cd">
 		<item quantity="one">%1$s quedratim</item>
 		<item quantity="other">%1$s quedratims</item>
 	</plurals>
-	<plurals name="time_in_2gf_12_cd">
+	<plurals name="time_in_2tm_12_cd">
 		<item quantity="one">%1$s dunatim</item>
 		<item quantity="other">%1$s dunatims</item>
 	</plurals>
@@ -154,7 +155,8 @@ 	USB charging
 	<string name="show_departures">Show departures</string>
 	<string name="open_in_maps_app">Open in maps app</string>
 	<string name="stop_content_description">stop</string>
-	<string name="seatbelts_everyone">Seatbelts, everyone!</string> <!-- taken from ‘Magic School Bus’. Should be translated like in the series. It’s the first words of the intro song -->
+	<!-- taken from ‘Magic School Bus’. Should be translated like in the series. It’s the first words of the intro song -->
+	<string name="seatbelts_everyone">Seatbelts, everyone!</string>
 	<string name="onboarding_question">How would you like to start?</string>
 	<string name="onboarding_simple">Simple</string>
 	<string name="onboarding_simple_action">choose localities</string>
@@ -172,7 +174,6 @@ 	Localities
 	<string name="error_url">Malformed URL provided</string>
 	<string name="error_traffic_spec">Cannot verify server</string>
 	<string name="stops_near_code">Stops near %1$s</string>
-	<string name="code_is_not_full">Code is not full</string>
 	<string name="choose_server">Choose server flavour</string>
 	<string name="ok">OK</string>
 	<string name="no_location_access">Location access not given</string>
@@ -196,7 +197,6 @@ 	App version is not compatible with the server
 	<string name="filter_localities">filter localities</string>
 	<string name="error_41">This locality is not supported by the server</string>
 	<string name="stop_from_qr_code">QR code stop</string>
-	<string name="departures_snackbar">Last update: %1$s</string>
 	<string name="title_select_date">Select day of departures</string>
 	<string name="title_select_line">Select line</string>
 	<string name="clear_date_selection">Clear</string>
@@ -213,7 +213,6 @@ 	Favourite
 	<string name="filtered">Filtered</string>
 	<string name="unfiltered">Unfiltered</string>
 	<string name="cannot_save_favourite">Couldn’t save the favourite</string>
-	<string name="no_next_departures">no more departures</string>
 	<string name="error_44">No more departures</string>
 	<string name="loading">loading…</string>
 	<string name="favourite_deleted">Favourite deleted</string>




diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index acf013e56035b7f970fe647d492f41e354655fa2..0cd1a0dacf54562ef83c5f01f304f305c18a6ec6 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -79,11 +79,11 @@     
         <item quantity="one">%1$d tim</item>
         <item quantity="other">%1$d tims</item>
     </plurals>
-    <plurals name="time_in_4gf_12_cd">
+    <plurals name="time_in_4tm_12_cd">
         <item quantity="one">%1$s quedratim</item>
         <item quantity="other">%1$s quedratims</item>
     </plurals>
-    <plurals name="time_in_2gf_12_cd">
+    <plurals name="time_in_2tm_12_cd">
         <item quantity="one">%1$s dunatim</item>
         <item quantity="other">%1$s dunatims</item>
     </plurals>
@@ -144,7 +144,6 @@         %1$d meilen
     </plurals>
     <string name="distance_in_gf">%1$s %2$sGf</string>
     <string name="app_description">Fahrgastbegleiter FLOSS für öffentlichen Verkehr: ein Fahrplan in deine Tasche.</string>
-    <string name="no_next_departures">keine Abfahrten</string>
     <string name="error_44">keine Abfahrten</string>
     <string name="loading">wird geladen…</string>
     <string name="units_metric">Metrisches (SI)</string>




diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
deleted file mode 100644
index a6b3daec9354f9ae75cdf8d94a67446c6227dd96..0000000000000000000000000000000000000000
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file




diff --git a/app/src/main/res/values-en-rUS/strings.xml b/app/src/main/res/values-en-rUS/strings.xml
index 24c47afe4b1860bdcfa1eee49b9659e067761eca..8afbdd1697a0c2c92063444971b7bb220891b8e1 100644
--- a/app/src/main/res/values-en-rUS/strings.xml
+++ b/app/src/main/res/values-en-rUS/strings.xml
@@ -130,7 +130,6 @@     Localities
     <string name="error_url">Malformed URL provided</string>
     <string name="error_traffic_spec">Cannot verify server</string>
     <string name="stops_near_code">Stops near %1$s</string>
-    <string name="code_is_not_full">Code is not full</string>
     <string name="choose_server">Choose server flavour</string>
     <string name="ok">OK</string>
     <string name="no_location_access">Location access not given</string>
@@ -164,7 +163,6 @@     App version is not compatible with the server
     <string name="filter_localities">filter localities</string>
     <string name="error_41">This locality is not supported by the server</string>
     <string name="stop_from_qr_code">QR code stop</string>
-    <string name="departures_snackbar">Last update: %1$s</string>
     <string name="title_select_date">Select day of departures</string>
     <string name="title_select_line">Select line</string>
     <string name="clear_date_selection">Clear</string>
@@ -181,7 +179,6 @@     Favorite
     <string name="filtered">Filtered</string>
     <string name="unfiltered">Unfiltered</string>
     <string name="cannot_save_favourite">Couldn’t save the favorite</string>
-    <string name="no_next_departures">no more departures</string>
     <string name="error_44">No more departures</string>
     <string name="loading">loading…</string>
     <string name="favourite_deleted">Favorite deleted</string>
@@ -257,11 +254,11 @@     
         <item quantity="one">%1$s grafut</item>
         <item quantity="other">%1$s grafuts</item>
     </plurals>
-    <plurals name="time_in_4gf_12_cd">
+    <plurals name="time_in_4tm_12_cd">
         <item quantity="one">%1$s quedratim</item>
         <item quantity="other">%1$s quedratims</item>
     </plurals>
-    <plurals name="time_in_2gf_12_cd">
+    <plurals name="time_in_2tm_12_cd">
         <item quantity="one">%1$s dunatim</item>
         <item quantity="other">%1$s dunatims</item>
     </plurals>




diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6520802367942bfe5e7d2f8e4b89fd6df00aa32b..681fc303bc0dd98da77ad08144d901815fb93f97 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -49,7 +49,6 @@     A propos
     <string name="website_button_description">Lien vers le site</string>
     <string name="use_online_feed">Utiliser le flux en ligne</string>
     <string name="error_406">La version de l\'application est incompatible avec le serveur</string>
-    <string name="departures_snackbar">Dernière mise à jour : %1$s</string>
     <string name="title_filter">Filtrer</string>
     <string name="cancel">Annuler</string>
     <string name="more">Plus</string>




diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 03401967a4447d787a301e1992cfead4b4ab5900..69ecbb6d8a8a72b7e4f4af3003ecdcb28aebaf0a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -90,7 +90,6 @@     Località
     <string name="error_url">URL malformato fornito</string>
     <string name="error_traffic_spec">Impossibile verificare il server</string>
     <string name="stops_near_code">Fermate vicino a %1$s</string>
-    <string name="code_is_not_full">Il codice non è pieno</string>
     <string name="choose_server">Scegli la varietà del server</string>
     <string name="ok">OK</string>
     <string name="no_location_access">Accesso alla posizione non fornito</string>
@@ -122,7 +121,6 @@ \n Dati della carta © collaboratori OpenStreetMap (https://www.openstreetmap.org/copyright), ODbL-1.0
 \n
 \nElenco delle città utilizzato per la geocodificazione dei brevi codici OLC © Geonames (https://geonames.org), CC BY</string>
     <string name="stop_from_qr_code">Stop del codice QR</string>
-    <string name="departures_snackbar">L’ultimo aggiornamento: %1$s</string>
     <string name="title_select_date">Scegli il giorno della partenza</string>
     <string name="title_select_line">Scegli la linea</string>
     <string name="clear_date_selection">Azzera</string>
@@ -204,12 +202,12 @@         %1$d timo
         <item quantity="many">%1$d di timi</item>
         <item quantity="other">%1$d timi</item>
     </plurals>
-    <plurals name="time_in_4gf_12_cd">
+    <plurals name="time_in_4tm_12_cd">
         <item quantity="one">%1$s quedratimo</item>
         <item quantity="many">%1$s di quedratimi</item>
         <item quantity="other">%1$s quedratimi</item>
     </plurals>
-    <plurals name="time_in_2gf_12_cd">
+    <plurals name="time_in_2tm_12_cd">
         <item quantity="one">%1$s dunatimo</item>
         <item quantity="many">%1$s di dunatimi</item>
         <item quantity="other">%1$s dunatimi</item>
@@ -271,7 +269,6 @@     %1$s %2$sGf
     <string name="time_in_s">%1$s s</string>
     <string name="favourite_content_description">Salva nei preferiti</string>
     <string name="cannot_save_favourite">Impossibile salvare nei preferiti</string>
-    <string name="no_next_departures">nessune più partenze</string>
     <string name="error_44">nessune più partenze</string>
     <string name="loading">in caricamento…</string>
     <string name="favourite_deleted">Il preferito cancellato</string>




diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index e980a3783f7bccfae39ba99d1799fd0bdb661be2..c91cb8c9b197de575f215cf9b77488998cebbdc7 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -90,7 +90,6 @@     Lokalizacje
     <string name="error_url">Podano błędny URL</string>
     <string name="error_traffic_spec">Nie można zweryfikować serwera</string>
     <string name="stops_near_code">Przystanki w pobliżu %1$s</string>
-    <string name="code_is_not_full">Kod nie jest pełen</string>
     <string name="choose_server">Wybierz rodzaj serwera</string>
     <string name="ok">OK</string>
     <string name="no_location_access">Brak uprawnień do lokalizacji</string>
@@ -122,7 +121,6 @@     Wersja aplikacji jest niekompatybilna z serwerem
     <string name="filter_localities">filtruj lokalizacje</string>
     <string name="error_41">Ta lokalizacja nie jest obsługiwana przez serwer</string>
     <string name="stop_from_qr_code">Przystanek z kodem QR</string>
-    <string name="departures_snackbar">Ostatnia aktualizacja: %1$s</string>
     <string name="title_select_date">Wybierz dzień odjazdów</string>
     <string name="title_select_line">Wybierz linię</string>
     <string name="clear_date_selection">Wyczyść</string>
@@ -152,7 +150,6 @@     Ulubiony
     <string name="filtered">Filtrowany</string>
     <string name="unfiltered">Niefiltrowany</string>
     <string name="cannot_save_favourite">Nie udało się zapisać do ulubionych</string>
-    <string name="no_next_departures">brak odjazdów</string>
     <string name="error_44">Brak odjazdów</string>
     <string name="loading">ładowanie…</string>
     <string name="favourite_deleted">Usunięto z ulubionych</string>
@@ -251,13 +248,13 @@         %1$d tim
         <item quantity="few">%1$d timy</item>
         <item quantity="many">%1$d timów</item>
     </plurals>
-    <plurals name="time_in_4gf_12_cd">
+    <plurals name="time_in_4tm_12_cd">
         <item quantity="one">%1$s kwedratim</item>
         <item quantity="few">%1$s quedratimy</item>
         <item quantity="many">%1$s kwedratimów</item>
         <item quantity="other">%1$s kwedratimów</item>
     </plurals>
-    <plurals name="time_in_2gf_12_cd">
+    <plurals name="time_in_2tm_12_cd">
         <item quantity="one">%1$s dunatim</item>
         <item quantity="few">%1$s dunatimy</item>
         <item quantity="many">%1$s dunatimów</item>




diff --git a/metadata/en/changelogs/20.txt b/metadata/en/changelogs/20.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2c0537ce83578857e2b4b3254db15889c4a04654
--- /dev/null
+++ b/metadata/en/changelogs/20.txt
@@ -0,0 +1,5 @@
+Version 3.0 is completely rewritten from scratch and features totally new architecture.
+
+* Favourites are removed
+* Stops and vehicles are on map
+* UI is now Material3




diff --git a/metadata/en/changelogs/21.txt b/metadata/en/changelogs/21.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2c0537ce83578857e2b4b3254db15889c4a04654
--- /dev/null
+++ b/metadata/en/changelogs/21.txt
@@ -0,0 +1,5 @@
+Version 3.0 is completely rewritten from scratch and features totally new architecture.
+
+* Favourites are removed
+* Stops and vehicles are on map
+* UI is now Material3




diff --git a/metadata/en/changelogs/22.txt b/metadata/en/changelogs/22.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9a3dfaf104f264406ce5bf6e8a286c22cebe53dd
--- /dev/null
+++ b/metadata/en/changelogs/22.txt
@@ -0,0 +1,11 @@
+Version 3.1 features:
+* monochrome launcher icon and predictive back gesture for Android 12,
+* Material You theme with system colours,
+* new search bar,
+* searching by Open Location Code,
+* gliding instead of jumping in minimap,
+* Polish and Italian translations,
+* multiple feeds handling,
+* QR codes in Metropolis GZM,
+* searching by line (and picking stops on graphs),
+* dependency updates, bug fixes, and some code refactor.
\ No newline at end of file




diff --git a/metadata/en/changelogs/23.txt b/metadata/en/changelogs/23.txt
new file mode 100644
index 0000000000000000000000000000000000000000..93d0379b04a2b1fe568419bb1a2afe16eb4aa67a
--- /dev/null
+++ b/metadata/en/changelogs/23.txt
@@ -0,0 +1 @@
+Version 3.1.1 fixes continue button in server selection




diff --git a/metadata/en/changelogs/24.txt b/metadata/en/changelogs/24.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9e019e686c44c43e4cb4f193feb22ba0c1e65fd5
--- /dev/null
+++ b/metadata/en/changelogs/24.txt
@@ -0,0 +1,13 @@
+Changes in version 3.2:
+* Added ‘about’ screen
+* Scroll to bottom loads more departures
+* Localities info and settings are cached offline
+* Lists update only changed items
+* Search results include locality name
+* Locality list can be filtered (over 12 items)
+* Changed stop icons
+* Icons on map are scaled
+* TRAFFIC version clockworkOrange compatibility
+* Last update of departures is shown if over a minute
+* New German translations
+* Bimba is REUSE compliant




diff --git a/metadata/en/changelogs/25.txt b/metadata/en/changelogs/25.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c8c2609f0a17d73980acfcf8d11fa13d9411c4ee
--- /dev/null
+++ b/metadata/en/changelogs/25.txt
@@ -0,0 +1,11 @@
+Changes in version 3.3
+* Added selecting date and filtering by time
+* Added filtering departures by line
+* Added alerts shown in stop and departures
+* Fixed landscape version of ‘about’ screen
+* Fixed capabilities for vehicles on map
+* Changed cached localities to lower contrast
+* Fixed showing line directions for other than 2
+* Fixed saving localities cache
+* Updated dependencies
+* Updated deprecated methods in code




diff --git a/metadata/en/changelogs/26.txt b/metadata/en/changelogs/26.txt
new file mode 100644
index 0000000000000000000000000000000000000000..50f483aa5ad8b7f0adfb9b83f258b1ed10982b0c
--- /dev/null
+++ b/metadata/en/changelogs/26.txt
@@ -0,0 +1,14 @@
+Changes in version 3.3.1
+* Fixed crash when zooming map too close
+Changes in version 3.3
+* Added selecting date and filtering by time
+* Added filtering departures by line
+* Added alerts shown in stop and departures
+* Fixed landscape version of “about” screen
+* Fixed capabilities for vehicles on map
+* Changed cached localities to lower contrast
+* Fixed showing line directions for other than 2
+* Fixed saving localities cache
+* Updated dependencies
+* Updated deprecated methods in code
+




diff --git a/metadata/en/changelogs/27.txt b/metadata/en/changelogs/27.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5a72f7f4c031635612e8f8c366b99a9d35a88090
--- /dev/null
+++ b/metadata/en/changelogs/27.txt
@@ -0,0 +1,16 @@
+Changes in version 3.3.2
+* Add proper openstreetmap attribution
+* Change minimal map zoom
+Changes in version 3.3.1
+* Fixed crash when zooming map too close
+Changes in version 3.3
+* Added selecting date and filtering by time
+* Added filtering departures by line
+* Added alerts shown in stop and departures
+* Fixed landscape version of “about” screen
+* Fixed capabilities for vehicles on map
+* Changed cached localities to lower contrast
+* Fixed showing line directions for other than 2
+* Fixed saving localities cache
+* Updated dependencies
+* Updated deprecated methods in code




diff --git a/metadata/en/changelogs/28.txt b/metadata/en/changelogs/28.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d809d57cf88dd3aea767adf91b0362ca0174683a
--- /dev/null
+++ b/metadata/en/changelogs/28.txt
@@ -0,0 +1,9 @@
+Changes in version 3.4
+* Added countdown to show next update of departures
+* Fixed persisting filters and bottom sheets across screen changes
+* Changed layout of alerts above departures
+* Fixed phantom search results
+* Fixed edge-to-edge and landscape layouts
+* Added simple favourites
+* Added French translation (by ArnaudDvs)
+




diff --git a/metadata/en/full_description.txt b/metadata/en/full_description.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fd34f29ca413ad92a0516378ac4239a19a6d98a5
--- /dev/null
+++ b/metadata/en/full_description.txt
@@ -0,0 +1,9 @@
+Bimba lets you check public transport timetable with realtime departures in multiple cities.
+
+Current features:
+* checking departures by stop,
+* searching nearby stops,
+* searching stops by QR code (in selected timetables),
+* searching stops on line,
+* vehicle attributes for departures (depending on available information),
+* vehicles and stops on map in real time




diff --git a/metadata/en/images/featureGraphic.png b/metadata/en/images/featureGraphic.png
new file mode 100644
index 0000000000000000000000000000000000000000..844a16c96d6c022afb07cdf727fa3230714650f9
Binary files /dev/null and b/metadata/en/images/featureGraphic.png differ




diff --git a/metadata/en/images/icon.png b/metadata/en/images/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..51de732e44c246bac252b581c3bb1b3c9aa345c6
Binary files /dev/null and b/metadata/en/images/icon.png differ




diff --git a/metadata/en/images/phoneScreenshots/Dash.png b/metadata/en/images/phoneScreenshots/Dash.png
new file mode 100644
index 0000000000000000000000000000000000000000..9445ed1cb2eb13c0e172db5b174826bbdc7f4fa9
Binary files /dev/null and b/metadata/en/images/phoneScreenshots/Dash.png differ




diff --git a/metadata/en/images/phoneScreenshots/StopActivity.png b/metadata/en/images/phoneScreenshots/StopActivity.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd897ae7354d2365a5a52525791453ca9eaee838
Binary files /dev/null and b/metadata/en/images/phoneScreenshots/StopActivity.png differ




diff --git a/metadata/en/images/phoneScreenshots/StopActivity_dark.png b/metadata/en/images/phoneScreenshots/StopActivity_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..22850c6f8edef6e8ee821e5a4cd2480b0bf7425d
Binary files /dev/null and b/metadata/en/images/phoneScreenshots/StopActivity_dark.png differ




diff --git a/metadata/en/images/phoneScreenshots/dash_w_fav.png b/metadata/en/images/phoneScreenshots/dash_w_fav.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb5c6df2d6613b95031e864a2e691de790eb9e84
Binary files /dev/null and b/metadata/en/images/phoneScreenshots/dash_w_fav.png differ




diff --git a/metadata/en/images/phoneScreenshots/graph.png b/metadata/en/images/phoneScreenshots/graph.png
new file mode 100644
index 0000000000000000000000000000000000000000..59f7cac29284a5be630044652e05573f82e34e3e
Binary files /dev/null and b/metadata/en/images/phoneScreenshots/graph.png differ




diff --git a/metadata/en/images/phoneScreenshots/map.png b/metadata/en/images/phoneScreenshots/map.png
new file mode 100644
index 0000000000000000000000000000000000000000..c525ad053295cb1548cbaa1b47e3e9678bfc266d
Binary files /dev/null and b/metadata/en/images/phoneScreenshots/map.png differ




diff --git a/metadata/en/images/phoneScreenshots/mapBS.png b/metadata/en/images/phoneScreenshots/mapBS.png
new file mode 100644
index 0000000000000000000000000000000000000000..392462f7634fbdb46945f2e282cc2c97005a9be9
Binary files /dev/null and b/metadata/en/images/phoneScreenshots/mapBS.png differ




diff --git a/metadata/en/images/phoneScreenshots/modification.png b/metadata/en/images/phoneScreenshots/modification.png
new file mode 100644
index 0000000000000000000000000000000000000000..81b5f5dd16469e37a353d101f16a7a2591a2375e
Binary files /dev/null and b/metadata/en/images/phoneScreenshots/modification.png differ




diff --git a/metadata/en/images/phoneScreenshots/modification_more.png b/metadata/en/images/phoneScreenshots/modification_more.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b0b78a716cd431b874511659af1aef21bbd2d72
Binary files /dev/null and b/metadata/en/images/phoneScreenshots/modification_more.png differ




diff --git a/metadata/en/images/phoneScreenshots/searchStop.png b/metadata/en/images/phoneScreenshots/searchStop.png
new file mode 100644
index 0000000000000000000000000000000000000000..135799f625a8a25307ea2cf412f0e0009fdc77c9
Binary files /dev/null and b/metadata/en/images/phoneScreenshots/searchStop.png differ




diff --git a/metadata/en/images/phoneScreenshots/searchStop_multipleFeeds.png b/metadata/en/images/phoneScreenshots/searchStop_multipleFeeds.png
new file mode 100644
index 0000000000000000000000000000000000000000..3268461714be41d1740cb129d65e7931bd9c128e
Binary files /dev/null and b/metadata/en/images/phoneScreenshots/searchStop_multipleFeeds.png differ




diff --git a/metadata/en/images/phoneScreenshots/stopSpecify.png b/metadata/en/images/phoneScreenshots/stopSpecify.png
new file mode 100644
index 0000000000000000000000000000000000000000..307d4f8dba839ab4d6837afd49ba91e2c5cfe848
Binary files /dev/null and b/metadata/en/images/phoneScreenshots/stopSpecify.png differ




diff --git a/metadata/en/short_description.txt b/metadata/en/short_description.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f9a5d1ebda7eb2bd14aeea0f93880337150b5563
--- /dev/null
+++ b/metadata/en/short_description.txt
@@ -0,0 +1 @@
+FLOSS public transport passenger companion; a timetable in your pocket.




diff --git a/metadata/en/title.txt b/metadata/en/title.txt
new file mode 100644
index 0000000000000000000000000000000000000000..038d5e6047bc863c8fd2210be761c396b834e447
--- /dev/null
+++ b/metadata/en/title.txt
@@ -0,0 +1 @@
+Bimba




diff --git a/metadata/en-GB/changelogs/20.txt b/metadata/en-GB/changelogs/20.txt
deleted file mode 100644
index 2c0537ce83578857e2b4b3254db15889c4a04654..0000000000000000000000000000000000000000
--- a/metadata/en-GB/changelogs/20.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Version 3.0 is completely rewritten from scratch and features totally new architecture.
-
-* Favourites are removed
-* Stops and vehicles are on map
-* UI is now Material3




diff --git a/metadata/en-GB/changelogs/21.txt b/metadata/en-GB/changelogs/21.txt
deleted file mode 100644
index 2c0537ce83578857e2b4b3254db15889c4a04654..0000000000000000000000000000000000000000
--- a/metadata/en-GB/changelogs/21.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Version 3.0 is completely rewritten from scratch and features totally new architecture.
-
-* Favourites are removed
-* Stops and vehicles are on map
-* UI is now Material3




diff --git a/metadata/en-GB/changelogs/22.txt b/metadata/en-GB/changelogs/22.txt
deleted file mode 100644
index 9a3dfaf104f264406ce5bf6e8a286c22cebe53dd..0000000000000000000000000000000000000000
--- a/metadata/en-GB/changelogs/22.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Version 3.1 features:
-* monochrome launcher icon and predictive back gesture for Android 12,
-* Material You theme with system colours,
-* new search bar,
-* searching by Open Location Code,
-* gliding instead of jumping in minimap,
-* Polish and Italian translations,
-* multiple feeds handling,
-* QR codes in Metropolis GZM,
-* searching by line (and picking stops on graphs),
-* dependency updates, bug fixes, and some code refactor.
\ No newline at end of file




diff --git a/metadata/en-GB/changelogs/23.txt b/metadata/en-GB/changelogs/23.txt
deleted file mode 100644
index 93d0379b04a2b1fe568419bb1a2afe16eb4aa67a..0000000000000000000000000000000000000000
--- a/metadata/en-GB/changelogs/23.txt
+++ /dev/null
@@ -1 +0,0 @@
-Version 3.1.1 fixes continue button in server selection




diff --git a/metadata/en-GB/changelogs/24.txt b/metadata/en-GB/changelogs/24.txt
deleted file mode 100644
index 9e019e686c44c43e4cb4f193feb22ba0c1e65fd5..0000000000000000000000000000000000000000
--- a/metadata/en-GB/changelogs/24.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Changes in version 3.2:
-* Added ‘about’ screen
-* Scroll to bottom loads more departures
-* Localities info and settings are cached offline
-* Lists update only changed items
-* Search results include locality name
-* Locality list can be filtered (over 12 items)
-* Changed stop icons
-* Icons on map are scaled
-* TRAFFIC version clockworkOrange compatibility
-* Last update of departures is shown if over a minute
-* New German translations
-* Bimba is REUSE compliant




diff --git a/metadata/en-GB/changelogs/25.txt b/metadata/en-GB/changelogs/25.txt
deleted file mode 100644
index c8c2609f0a17d73980acfcf8d11fa13d9411c4ee..0000000000000000000000000000000000000000
--- a/metadata/en-GB/changelogs/25.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Changes in version 3.3
-* Added selecting date and filtering by time
-* Added filtering departures by line
-* Added alerts shown in stop and departures
-* Fixed landscape version of ‘about’ screen
-* Fixed capabilities for vehicles on map
-* Changed cached localities to lower contrast
-* Fixed showing line directions for other than 2
-* Fixed saving localities cache
-* Updated dependencies
-* Updated deprecated methods in code




diff --git a/metadata/en-GB/changelogs/26.txt b/metadata/en-GB/changelogs/26.txt
deleted file mode 100644
index 50f483aa5ad8b7f0adfb9b83f258b1ed10982b0c..0000000000000000000000000000000000000000
--- a/metadata/en-GB/changelogs/26.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Changes in version 3.3.1
-* Fixed crash when zooming map too close
-Changes in version 3.3
-* Added selecting date and filtering by time
-* Added filtering departures by line
-* Added alerts shown in stop and departures
-* Fixed landscape version of “about” screen
-* Fixed capabilities for vehicles on map
-* Changed cached localities to lower contrast
-* Fixed showing line directions for other than 2
-* Fixed saving localities cache
-* Updated dependencies
-* Updated deprecated methods in code
-




diff --git a/metadata/en-GB/changelogs/27.txt b/metadata/en-GB/changelogs/27.txt
deleted file mode 100644
index 5a72f7f4c031635612e8f8c366b99a9d35a88090..0000000000000000000000000000000000000000
--- a/metadata/en-GB/changelogs/27.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Changes in version 3.3.2
-* Add proper openstreetmap attribution
-* Change minimal map zoom
-Changes in version 3.3.1
-* Fixed crash when zooming map too close
-Changes in version 3.3
-* Added selecting date and filtering by time
-* Added filtering departures by line
-* Added alerts shown in stop and departures
-* Fixed landscape version of “about” screen
-* Fixed capabilities for vehicles on map
-* Changed cached localities to lower contrast
-* Fixed showing line directions for other than 2
-* Fixed saving localities cache
-* Updated dependencies
-* Updated deprecated methods in code




diff --git a/metadata/en-GB/changelogs/28.txt b/metadata/en-GB/changelogs/28.txt
deleted file mode 100644
index d809d57cf88dd3aea767adf91b0362ca0174683a..0000000000000000000000000000000000000000
--- a/metadata/en-GB/changelogs/28.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Changes in version 3.4
-* Added countdown to show next update of departures
-* Fixed persisting filters and bottom sheets across screen changes
-* Changed layout of alerts above departures
-* Fixed phantom search results
-* Fixed edge-to-edge and landscape layouts
-* Added simple favourites
-* Added French translation (by ArnaudDvs)
-




diff --git a/metadata/en-GB/full_description.txt b/metadata/en-GB/full_description.txt
deleted file mode 100644
index fd34f29ca413ad92a0516378ac4239a19a6d98a5..0000000000000000000000000000000000000000
--- a/metadata/en-GB/full_description.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Bimba lets you check public transport timetable with realtime departures in multiple cities.
-
-Current features:
-* checking departures by stop,
-* searching nearby stops,
-* searching stops by QR code (in selected timetables),
-* searching stops on line,
-* vehicle attributes for departures (depending on available information),
-* vehicles and stops on map in real time




diff --git a/metadata/en-GB/images/featureGraphic.png b/metadata/en-GB/images/featureGraphic.png
deleted file mode 100644
index 844a16c96d6c022afb07cdf727fa3230714650f9..0000000000000000000000000000000000000000
Binary files a/metadata/en-GB/images/featureGraphic.png and /dev/null differ




diff --git a/metadata/en-GB/images/icon.png b/metadata/en-GB/images/icon.png
deleted file mode 100644
index 51de732e44c246bac252b581c3bb1b3c9aa345c6..0000000000000000000000000000000000000000
Binary files a/metadata/en-GB/images/icon.png and /dev/null differ




diff --git a/metadata/en-GB/images/phoneScreenshots/Dash.png b/metadata/en-GB/images/phoneScreenshots/Dash.png
deleted file mode 100644
index 9445ed1cb2eb13c0e172db5b174826bbdc7f4fa9..0000000000000000000000000000000000000000
Binary files a/metadata/en-GB/images/phoneScreenshots/Dash.png and /dev/null differ




diff --git a/metadata/en-GB/images/phoneScreenshots/StopActivity.png b/metadata/en-GB/images/phoneScreenshots/StopActivity.png
deleted file mode 100644
index fd897ae7354d2365a5a52525791453ca9eaee838..0000000000000000000000000000000000000000
Binary files a/metadata/en-GB/images/phoneScreenshots/StopActivity.png and /dev/null differ




diff --git a/metadata/en-GB/images/phoneScreenshots/StopActivity_dark.png b/metadata/en-GB/images/phoneScreenshots/StopActivity_dark.png
deleted file mode 100644
index 22850c6f8edef6e8ee821e5a4cd2480b0bf7425d..0000000000000000000000000000000000000000
Binary files a/metadata/en-GB/images/phoneScreenshots/StopActivity_dark.png and /dev/null differ




diff --git a/metadata/en-GB/images/phoneScreenshots/dash_w_fav.png b/metadata/en-GB/images/phoneScreenshots/dash_w_fav.png
deleted file mode 100644
index cb5c6df2d6613b95031e864a2e691de790eb9e84..0000000000000000000000000000000000000000
Binary files a/metadata/en-GB/images/phoneScreenshots/dash_w_fav.png and /dev/null differ




diff --git a/metadata/en-GB/images/phoneScreenshots/graph.png b/metadata/en-GB/images/phoneScreenshots/graph.png
deleted file mode 100644
index 59f7cac29284a5be630044652e05573f82e34e3e..0000000000000000000000000000000000000000
Binary files a/metadata/en-GB/images/phoneScreenshots/graph.png and /dev/null differ




diff --git a/metadata/en-GB/images/phoneScreenshots/map.png b/metadata/en-GB/images/phoneScreenshots/map.png
deleted file mode 100644
index c525ad053295cb1548cbaa1b47e3e9678bfc266d..0000000000000000000000000000000000000000
Binary files a/metadata/en-GB/images/phoneScreenshots/map.png and /dev/null differ




diff --git a/metadata/en-GB/images/phoneScreenshots/mapBS.png b/metadata/en-GB/images/phoneScreenshots/mapBS.png
deleted file mode 100644
index 392462f7634fbdb46945f2e282cc2c97005a9be9..0000000000000000000000000000000000000000
Binary files a/metadata/en-GB/images/phoneScreenshots/mapBS.png and /dev/null differ




diff --git a/metadata/en-GB/images/phoneScreenshots/modification.png b/metadata/en-GB/images/phoneScreenshots/modification.png
deleted file mode 100644
index 81b5f5dd16469e37a353d101f16a7a2591a2375e..0000000000000000000000000000000000000000
Binary files a/metadata/en-GB/images/phoneScreenshots/modification.png and /dev/null differ




diff --git a/metadata/en-GB/images/phoneScreenshots/modification_more.png b/metadata/en-GB/images/phoneScreenshots/modification_more.png
deleted file mode 100644
index 5b0b78a716cd431b874511659af1aef21bbd2d72..0000000000000000000000000000000000000000
Binary files a/metadata/en-GB/images/phoneScreenshots/modification_more.png and /dev/null differ




diff --git a/metadata/en-GB/images/phoneScreenshots/searchStop.png b/metadata/en-GB/images/phoneScreenshots/searchStop.png
deleted file mode 100644
index 135799f625a8a25307ea2cf412f0e0009fdc77c9..0000000000000000000000000000000000000000
Binary files a/metadata/en-GB/images/phoneScreenshots/searchStop.png and /dev/null differ




diff --git a/metadata/en-GB/images/phoneScreenshots/searchStop_multipleFeeds.png b/metadata/en-GB/images/phoneScreenshots/searchStop_multipleFeeds.png
deleted file mode 100644
index 3268461714be41d1740cb129d65e7931bd9c128e..0000000000000000000000000000000000000000
Binary files a/metadata/en-GB/images/phoneScreenshots/searchStop_multipleFeeds.png and /dev/null differ




diff --git a/metadata/en-GB/images/phoneScreenshots/stopSpecify.png b/metadata/en-GB/images/phoneScreenshots/stopSpecify.png
deleted file mode 100644
index 307d4f8dba839ab4d6837afd49ba91e2c5cfe848..0000000000000000000000000000000000000000
Binary files a/metadata/en-GB/images/phoneScreenshots/stopSpecify.png and /dev/null differ




diff --git a/metadata/en-GB/short_description.txt b/metadata/en-GB/short_description.txt
deleted file mode 100644
index f9a5d1ebda7eb2bd14aeea0f93880337150b5563..0000000000000000000000000000000000000000
--- a/metadata/en-GB/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-FLOSS public transport passenger companion; a timetable in your pocket.




diff --git a/metadata/en-GB/title.txt b/metadata/en-GB/title.txt
deleted file mode 100644
index 038d5e6047bc863c8fd2210be761c396b834e447..0000000000000000000000000000000000000000
--- a/metadata/en-GB/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Bimba