diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b0e32817e..77f357fc9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,7 +3,7 @@
 Contributions are very welcome and encouraged.
 This is a non-profit initiative that has been built exclusively by volunteers.
 
-Many different ways to contribute are already listed [on the Transportr homepage](https://transportr.grobox.de/#contribute).
+Many different ways to contribute are already listed [on the Transportr homepage](https://transportr.app/contribute).
 Here, we focus on contributions made via GitHub.
 
 ## Creating Issues
diff --git a/README.md b/README.md
index 7625c382a..05f4ef25a 100644
--- a/README.md
+++ b/README.md
@@ -4,12 +4,12 @@ Transportr
 The public transport companion that respects your privacy and your freedom.
 Transportr is a non-profit app developed by people around the world to make using public transport as easy as possible wherever you are. 
 
-[![Transportr Logo](/app/src/main/res/mipmap-xhdpi/ic_launcher.png)](http://transportr.grobox.de)
+[![Transportr Logo](/app/src/main/res/mipmap-xhdpi/ic_launcher.png)](https://transportr.app)
 [![Build Status](https://travis-ci.org/grote/Transportr.svg?branch=master)](https://travis-ci.org/grote/Transportr)
 
-Please **[visit the website](http://transportr.grobox.de)** for more information!
+Please **[visit the website](https://transportr.app)** for more information!
 
-If you find any issues with this app, please report them at [the issue tracker](https://github.com/grote/Transportr/issues). Contributions are both encouraged and appreciated. If you like to contribute please [check the website](http://transportr.grobox.de/#contribute) for more information.
+If you find any issues with this app, please report them at [the issue tracker](https://github.com/grote/Transportr/issues). Contributions are both encouraged and appreciated. If you like to contribute please [check the website](https://transportr.app/contribute) for more information.
 
 The upstream repository is at: https://github.com/grote/Transportr
 
diff --git a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt
index 15de637ec..50fe5d6f4 100644
--- a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt
+++ b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt
@@ -676,7 +676,7 @@ private val networks = arrayOf(
                         logo = R.drawable.network_brfloripa_logo,
                         status = ALPHA,
                         goodLineNames = true,
-                        factory = { BrFloripaProvider(HttpUrl.parse("https://transportr.grobox.de/api/v1/"), null) }
+                        factory = { BrFloripaProvider(HttpUrl.parse("https://api.transportr.app/floripa/v1/"), null) }
                     )
                 )
             )
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 98156c254..7af82a62a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -339,4 +339,5 @@ und weiß immer, wo man aussteigen muss.
   <string name="czech">Tschechisch</string>
   <string name="hungarian">Ungarisch</string>
   <string name="japanese">Japanisch</string>
+  <string name="russian">Russisch</string>
 </resources>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index a02408d64..a46ca89fa 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -320,4 +320,5 @@ Tiu ĉi aplikaĵo uzas datumojn de diversaj lokaj firmaoj de publika transporto
   <string name="czech">Ĉeĥa</string>
   <string name="hungarian">Hungara</string>
   <string name="japanese">Japana</string>
+  <string name="russian">Rusa</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b11bb1a4d..0f89a638f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -329,4 +329,5 @@ Elle n’utilise pas non plus des outils de suivi comme Google Analytics pour vo
   <string name="czech">Tchèque</string>
   <string name="hungarian">Hongrois</string>
   <string name="japanese">Japonais</string>
+  <string name="russian">Russe</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 6f8559bfa..e719d505d 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,40 +1,57 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="google_play_title" tools:keep="@string/google_play_title">Transportr - open-bron Openbaar Vervoer</string>
+  <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">Gratis openbaar vervoer-hulpmiddel zonder advertenties of tracking</string>
   <string name="drawer_settings">Instellingen</string>
-  <string name="drawer_changelog">Lijst van veranderingen</string>
+  <string name="drawer_changelog">Wijzigingslog</string>
   <string name="drawer_about">Over</string>
   <string name="drawer_contributors">Bijdragers</string>
-  <string name="action_fav_trip">Markeer reis als favoriet</string>
-  <string name="action_unfav_trip">Verwijder reis uit favorieten</string>
-  <string name="action_refresh">Vernieuw</string>
-  <string name="action_share">Deel</string>
-  <string name="action_trip_calendar">Voeg toe aan kalender</string>
+  <string name="drawer_report_issue">Probleem rapporteren</string>
+  <string name="action_fav_trip">Reis toevoegen aan favorieten</string>
+  <string name="action_unfav_trip">Reis verwijderen uit favorieten</string>
+  <string name="action_switch_locations">Begin- en eindpunt omwisselen</string>
+  <string name="action_time_type">De tijd is</string>
+  <string name="trip_dep">Vertrek</string>
+  <string name="trip_arr">Aankomst</string>
+  <string name="action_refresh">Verversen</string>
+  <string name="action_navigation_expand">\'Via\' tonen</string>
+  <string name="action_choose_products">Transportmiddel</string>
+  <string name="action_share">Delen</string>
+  <string name="action_trip_calendar">Toevoegen aan agenda</string>
   <string name="action_trip_delete">Reis verwijderen</string>
-  <string name="action_show_on_external_map">Laat op externe kaart zien</string>
-  <string name="action_copy">Kopieer</string>
+  <string name="action_show_on_external_map">Op externe kaart tonen</string>
+  <string name="action_copy">Kopiëren</string>
   <string name="drawer_departures">Vertrekken</string>
   <string name="tab_about">Over</string>
   <string name="tab_libraries">Bibliotheken</string>
-  <string name="about_visit_website">Bezoek website</string>
+  <string name="about_copyright">© 2013 – 2018 Torsten Grote\nVrije softwarelicentie: GPLv3+</string>
+  <string name="about_description">Transportr is een openbaar vervoer-hulpmiddel, ontwikkeld door mensen van over de hele wereld om het gebruik van openbaar vervoer zo makkelijk mogelijk te maken.</string>
+  <string name="about_warning_title">Waarschuwing</string>
+  <string name="about_warning_text">Wij geven geen garantie op de (extern aangeleverde) gegevens. Gebruik de app op eigen risico.</string>
+  <string name="about_visit_website">Website bezoeken</string>
+  <string name="open_navigation_drawer">Navigatiemenu openen</string>
   <string name="from">Van</string>
   <string name="to">Naar</string>
   <string name="via">Via</string>
+  <string name="search_hint">Hier zoeken</string>
   <string name="from_here">Vanaf hier</string>
   <string name="to_here">Naar hier</string>
+  <string name="clear_location">Locatie wissen</string>
   <string name="walk">Wandel</string>
   <string name="alpha">alfa</string>
   <string name="beta">bèta</string>
   <string name="network">Netwerk</string>
-  <string name="pick_network_activity">Kies vervoergebied</string>
-  <string name="pick_network_first_run">Welkom bij Transportr!\n\nKies hieronder een vervoersnetwerk uit je regio om door te gaan. Je kan dit later steeds veranderen.</string>
-  <string name="stations_searching_position">Je positie wordt bepaald …</string>
-  <string name="drawer_nearby_stations">Stations in de buurt</string>
-  <string name="find_nearby_stations">Zoek naar stations in de buurt</string>
-  <string name="find_departures">Vertrektijden</string>
-  <string name="share_trip_via">Deel verbinding via …</string>
+  <string name="pick_network_activity">Kies vervoersgebied</string>
+  <string name="pick_network_first_run">Welkom bij Transportr!\n\nKies hieronder een vervoersnetwerk uit je regio om door te gaan. Je kunt dit later altijd aanpassen.</string>
+  <string name="stations_searching_position">Bezig met zoeken naar huidige locatie...</string>
+  <string name="drawer_nearby_stations">Nabije stations</string>
+  <string name="find_nearby_stations">Zoeken naar nabije stations</string>
+  <string name="find_departures">Vertrekken zoeken</string>
+  <string name="share_trip_via">Reis delen via...</string>
   <string name="more">Meer</string>
   <!--Shows a short(!) representation of how long you need to walk, e.g. "for 5 min"-->
-  <string name="change_time">Verander tijdstip</string>
+  <string name="for_x_min">%d min</string>
+  <string name="change_time">Tijdstip wijzigen</string>
   <string name="now">Nu</string>
   <string name="now_small">nu</string>
   <string name="yesterday">Gisteren</string>
@@ -42,40 +59,82 @@
   <string name="tomorrow">Morgen</string>
   <string name="in_x_minutes">over %dmin</string>
   <string name="x_minutes_ago">%dmin geleden</string>
-  <string name="ok">OK</string>
-  <string name="cancel">Annuleer</string>
+  <string name="time_picker_previous_day">Vorige dag</string>
+  <string name="time_picker_next_day">Volgende dag</string>
+  <string name="ok">Oké</string>
+  <string name="cancel">Annuleren</string>
   <string name="pref_transport_network">Vervoernetwerk</string>
   <string name="pref_display">Weergave</string>
   <string name="pref_theme_title">Thema</string>
   <string name="pref_theme_light">Licht</string>
   <string name="pref_theme_dark">Donker</string>
   <string name="pref_language_title">Taal</string>
-  <string name="pref_directions_routing">Verbindingen en routeplanning</string>
-  <string name="pref_optimize">Kies route met</string>
+  <string name="pref_directions_routing">Navigatie en routeplanning</string>
+  <string name="pref_optimize">Optimaliseren voor</string>
   <string name="pref_optimize_least_duration">Kortste tijdsduur</string>
-  <string name="pref_optimize_least_changes">Kleinst aantal overstappen</string>
-  <string name="pref_optimize_least_walking">Kleinste afstand te voet</string>
+  <string name="pref_optimize_least_changes">Minste aantal overstappen</string>
+  <string name="pref_optimize_least_walking">Kortste loopafstand</string>
   <string name="pref_walk_speed">Loopsnelheid</string>
   <string name="pref_walk_speed_slow">Langzaam</string>
   <string name="pref_walk_speed_normal">Normaal</string>
   <string name="pref_walk_speed_fast">Snel</string>
-  <string name="error_trip_refresh_failed">Kon de data voor de reis niet herladen.</string>
+  <string name="pref_show_when_locked_title">Reis- en zoekresultaten tonen, zelfs als het scherm vergrendeld is</string>
+  <string name="pref_show_when_locked_summary">Op vergrendelscherm tonen</string>
+  <string name="error">Fout</string>
+  <string name="error_no_internet">Internetverbinding vereist. Zorg ervoor dat je verbonden bent met het internet.</string>
+  <string name="error_connection_failure">Verbinding mislukt; probeer het opnieuw.</string>
+  <string name="error_trip_refresh_failed">De gegevens voor de huidige reis kunnen niet worden ververst.</string>
+  <string name="error_geo_intent">Externe locatie kan niet worden geopend</string>
+  <string name="error_find_nearby_stations">Geen nabije stations gevonden</string>
+  <string name="error_departures">Geen vertrekken gevonden</string>
+  <string name="trip_error_ambiguous">De locatie kan niet worden gevonden. Probeer een andere locatie.</string>
+  <string name="trip_error_too_close">\'Van\' en \'Naar\' liggen te dicht bij elkaar.</string>
+  <string name="trip_error_unknown_from">De \'Van\'-locatie kan niet worden gevonden. Probeer een andere.</string>
+  <string name="trip_error_unknown_via">De \'Via\'-locatie kan niet worden gevonden. Probeer een andere.</string>
+  <string name="trip_error_unknown_to">De \'Naar\'-locatie kan niet worden gevonden. Probeer een andere.</string>
+  <string name="trip_error_unresolvable_address">Het opgegeven adres kan niet worden gevonden. Probeer een ander.</string>
+  <string name="trip_error_no_trips">Geen verbindingen gevonden :(</string>
+  <string name="trip_error_invalid_date">De zoekdatum wordt momenteel niet ondersteund door de leverancier. Probeer een andere datum.</string>
+  <string name="trip_error_service_down">De leveranciersdienst is momenteel uit de lucht :(\nProbeer het later opnieuw.</string>
+  <string name="trip_error_pte">Als je deze fout wilt rapporteren, doe dat dan naar public-transport-enabler en voeg een schermafbeelding toe.</string>
+  <string name="trip_issue">Er is wellicht een probleem met deze verbinding.</string>
+  <string name="try_again">Opnieuw proberen</string>
   <!--This string shows the number of meters one has to walk. Please keep the translation short.-->
+  <string name="meter">%d m</string>
+  <plurals name="stops">
+    <item quantity="one">%d halte</item>
+    <item quantity="other">%d haltes</item>
+  </plurals>
   <!--This is the platform or position where a train will depart or arrive. Please keep it short as it will be shown after the station name.-->
+  <string name="platform">(Perron %s)</string>
   <string name="system_default">Systeemstandaard</string>
+  <string name="trip_share_date">Datum: %s</string>
+  <string name="times_include_delays">(Let op: tijden kunnen gemelde vertragingen bevatten)</string>
+  <string name="created_by">Gecreëerd door %s</string>
   <string name="home">Thuis</string>
-  <string name="home_dialog_title">Stel thuislocatie in</string>
-  <string name="widget_name_quickhome">OV: naar huis</string>
+  <string name="home_dialog_title">Thuislocatie instellen</string>
+  <string name="widget_name_quickhome">Stuur me naar huis</string>
   <string name="work">Werk</string>
-  <string name="work_hint">Stel locatie van werkplaats in</string>
-  <string name="tap_to_set">Tap om in te stellen</string>
-  <string name="action_set_locations">Bewerk zoekopdracht</string>
-  <string name="action_swap_locations">Zoek naar terugreis</string>
-  <string name="location_gps">Gebruik huidige locatie</string>
-  <string name="permission_denied_gps">Je hebt geen toegang tot je locatie gegeven, dus deze functionaliteit zal niet werken. Geef toestemming in de applicatieinstellingen.</string>
+  <string name="work_hint">Werklocatie instellen</string>
+  <string name="widget_name_quickwork">Stuur me naar mijn werk</string>
+  <string name="tap_to_set">Druk om in te stellen</string>
+  <string name="widget_name_favorites">%1$s naar %2$s</string>
+  <string name="widget_name_favorites_via">%1$s naar %2$s (via %3$s)</string>
+  <string name="action_set_locations">Zoekopdracht bewerken</string>
+  <string name="action_swap_locations">Zoeken naar terugreis</string>
+  <string name="action_change">Wijzigen</string>
+  <string name="action_add_shortcut">Beginscherm-snelkoppeling toevoegen</string>
+  <string name="location_gps">Huidige locatie gebruiken</string>
+  <string name="warning_no_gps_fix">Je locatie kan niet worden bepaald.</string>
+  <string name="permission_denied_gps">Je hebt geen toegang gegeven tot je locatie; deze functionaliteit zal dus niet werken. Machtig deze app via de instellingen.</string>
+  <string name="warning_gps_off">Locatie is uitgeschakeld. Schakel deze in via de instellingen.</string>
+  <string name="onboarding_location_title">Omhoogtrekken</string>
+  <string name="onboarding_location_message">Hieronder verbergen zich functies</string>
+  <string name="onboarding_directions_title">Meer zoekopties</string>
+  <string name="onboarding_directions_message">Klik op dit pictogram om geavanceerde zoekinstellingen te tonen.</string>
   <string name="select_products">Kies transportmiddelen</string>
   <string name="product_high_speed_train">InterCity- of hogesnelheidstrein</string>
-  <string name="product_regional_train">Lokale trein</string>
+  <string name="product_regional_train">Regionale trein</string>
   <string name="product_suburban_train">Stadstrein</string>
   <string name="product_subway">Metro</string>
   <string name="product_tram">Tram</string>
@@ -84,11 +143,18 @@
   <string name="product_cablecar">Kabelbaan</string>
   <string name="product_on_demand">Op aanvraag</string>
   <!--ckChangeLog-->
-  <string name="changelog_full_title">Lijst van veranderingen</string>
-  <string name="changelog_title">Veranderingen</string>
-  <string name="changelog_show_full">Meer …</string>
+  <string name="changelog_full_title">Wijzigingslog</string>
+  <string name="changelog_title">Wijzigingen</string>
+  <string name="changelog_show_full">Meer...</string>
   <string name="np_continent_europe">Europa</string>
+  <string name="np_continent_africa">Afrika</string>
+  <string name="np_continent_north_america">Noord-Amerika</string>
+  <string name="np_continent_central_america">Midden-Amerika</string>
+  <string name="np_continent_south_america">Zuid-Amerika</string>
+  <string name="np_continent_asia">Azië</string>
+  <string name="np_continent_oceania">Oceanië</string>
   <string name="np_region_australia">Australië</string>
+  <string name="np_desc_australia">Melbourne, Sydney, Brisbane, Perth, Adelaide, Hobart, Launceston, Burnie</string>
   <string name="np_desc_sydney">Australië, Nieuw-Zuid-Wales, Sydney</string>
   <string name="np_region_austria">Oostenrijk</string>
   <string name="np_desc_ivb">Innsbruck</string>
@@ -107,8 +173,12 @@
   <string name="np_desc_br_floripa">Veel busroutes, geen Executivos</string>
   <string name="np_region_canada">Canada</string>
   <string name="np_name_ontario">Ontario</string>
+  <string name="np_desc_ontario">Ontario, Ottawa, Toronto, Mississauga, Waterloo-regio</string>
   <string name="np_name_quebec">Quebec</string>
   <string name="np_desc_quebec">Deux-Montagnes, Laval, L\'Assomption, Outaouais, Sud-Ouest, Quebec, Haut-Saint-Laurent, Lanaudière, La Presqu\'Île, Laurentides, Montreal, Les Moulins, Vallée du Richelieu, Chambly-Richelieu-Carignan, Roussillon, Sorel-Varennes, Le Richelain, Sherbrooke, Sainte-Julie</string>
+  <string name="np_name_britishcolumbia">Brits-Columbia</string>
+  <string name="np_desc_britishcolumbia">Openbaar vervoer in BC</string>
+  <string name="np_desc_britishcolumbia_networks">Translink (Metro Vancouver) en BC Transit (rest van BC)</string>
   <string name="np_region_denmark">Denemarken</string>
   <string name="np_desc_dsb">Denemarken, Kopenhagen</string>
   <string name="np_name_rt">Europa</string>
@@ -120,7 +190,7 @@
   <string name="np_name_francenortheast">Noordoosten van Frankrijk</string>
   <string name="np_desc_francenortheast">Straatsburg, Metz, Rijsel, Nancy</string>
   <string name="np_name_francenorthwest">Noordwesten van Frankrijk</string>
-  <string name="np_desc_francenorthwest">Bretagne, Pays de la Loire, Centre, Basse-Normandie, Haute-Normandie</string>
+  <string name="np_desc_francenorthwest">Bretagne, Pays de la Loire, Centre, Basse-Normandie, Haute-Normandië</string>
   <string name="np_name_frenchsoutheast">Zuidoosten van Frankrijk</string>
   <string name="np_desc_frenchsoutheast">Provence-Alpes-Côte d\'Azur, Rhône-Alpes, Languedoc-Roussillon, Auvergne, Corsica, Lyon</string>
   <string name="np_name_frenchsouthwest">Zuidwesten van Frankrijk</string>
@@ -128,7 +198,7 @@
   <string name="np_name_paris">Parijs</string>
   <string name="np_desc_paris">Île-de-France, Frankrijk, Parijs</string>
   <string name="np_region_gb">Groot-Brittannië</string>
-  <string name="np_desc_mersey">Regio rond stad Liverpool</string>
+  <string name="np_desc_mersey">Stadsregio Liverpool</string>
   <string name="np_desc_tlem">Groot-Londen, Birmingham, Derbyshire, Leicestershire, Rutland, Northamptonshire, Nottinghamshire, Lincolnshire, Berkshire, Buckinghamshire, East Sussex, Hampshire, Isle of Wight, Kent, Oxfordshire, Surrey, West Sussex, Essex, Hertfordshire, Bedfordshire, Cambridgeshire, Norfolk, Suffolk, Somerset, Gloucestershire, Wiltshire, Dorset, Devon, Cornwall, West Devon, Stowford, Eastleigh, Swindon, Gloucester, Plymouth, Torbay, Bournemouth, Poole</string>
   <string name="np_desc_tlwm" tools:keep="@string/np_desc_tlwm">Birmingham</string>
   <string name="np_region_germany">Duitsland</string>
@@ -137,6 +207,7 @@
   <string name="np_desc_bsvag">Braunschweig, Wolfsburg</string>
   <string name="np_desc_bvg">Berlijn</string>
   <string name="np_desc_db">Het grootste deel van Duitsland</string>
+  <string name="np_desc_db2">Langeafstandsverbindingen in Europa</string>
   <string name="np_desc_ding">Baden-Württemberg, Ulm, Neu-Ulm</string>
   <string name="np_desc_gvh">Nedersaksen, Hannover, Hamburg, Bremerhaven</string>
   <string name="np_desc_hvv" tools:keep="@string/np_desc_hvv">Hamburg</string>
@@ -167,7 +238,7 @@
   <string name="np_desc_tfi">Ierland, Dublin, Belfast</string>
   <string name="np_region_israel" tools:keep="@string/np_region_israel">Israël</string>
   <string name="np_desc_jet" tools:keep="@string/np_desc_jet">Israël, Jeruzalem</string>
-  <string name="np_name_it">Italie</string>
+  <string name="np_name_it">Italië</string>
   <string name="np_desc_it">Rome, Milaan, Turijn, Venetië, Palermo, Trente</string>
   <string name="np_region_liechtenstein">Liechtenstein</string>
   <string name="np_name_vmobil">VVV</string>
@@ -175,8 +246,8 @@
   <string name="np_region_luxembourg">Luxemburg</string>
   <string name="np_desc_lu">Luxemburg</string>
   <string name="np_region_netherlands">Nederland</string>
-  <string name="np_desc_ns">Nederlands, Amsterdam</string>
-  <string name="np_desc_negentwee">Alle OV in Nederland</string>
+  <string name="np_desc_ns">Nederland, Amsterdam</string>
+  <string name="np_desc_negentwee">Al het openbaar vervoer in Nederland</string>
   <string name="np_region_norway">Noorwegen</string>
   <string name="np_desc_nri">Noorwegen, Oslo, Bergen</string>
   <string name="np_name_nz">Nieuw-Zeeland</string>
@@ -184,6 +255,7 @@
   <string name="np_region_poland">Polen</string>
   <string name="np_desc_pl">Polen, spoorwegen in Polen</string>
   <string name="np_name_spain">Spanje</string>
+  <string name="np_desc_spain">Madrid, Barcelona, Baskenland, Valencia, Alicante, Mallorca, Menorca, Tenerife, La Palma, Navarra</string>
   <string name="np_region_sweden">Zweden</string>
   <string name="np_desc_se">Zweden, Stockholm</string>
   <string name="np_region_switzerland">Zwitserland</string>
@@ -197,9 +269,17 @@
   <string name="np_desc_dub">Verenigde Arabische Emiraten, Dubai</string>
   <string name="np_region_usa">Verenigde Staten</string>
   <string name="np_desc_rtachicago">Chicago</string>
-  <string name="np_name_usny">New York en New-Jersey staten</string>
+  <string name="np_name_usny">De staten New York en New Jersey</string>
+  <string name="np_name_california">Californië</string>
+  <string name="np_desc_california">Openbaar vervoer in Californië (VS)</string>
   <string name="np_name_oregon">Oregon</string>
-  <string name="np_desc_oregon">Alle OV in de staat Oregon (VS)</string>
+  <string name="np_desc_oregon">Al het openbaar vervoer in de staat Oregon (VS)</string>
+  <string name="np_name_costa_rica">Costa Rica</string>
+  <string name="np_name_ghana">Ghana</string>
+  <string name="np_desc_ghana">Accra</string>
+  <string name="np_region_central_america">Midden-Amerika</string>
+  <string name="np_name_nicaragua">Nicaragua</string>
+  <string name="np_desc_nicaragua">Stads-, streek- en binnenlandse bussen, verstrekt door MapaNica.net en OpenStreetMap-bijdragers</string>
   <string name="maintainer">Onderhouder</string>
   <string name="contributors">Bijdragers</string>
   <string name="translators">Vertalers</string>
@@ -207,8 +287,10 @@
   <string name="french">Frans</string>
   <string name="german">Duits</string>
   <string name="italian">Italiaans</string>
+  <string name="portuguese_br">Portugees (Brazilië)</string>
   <string name="spanish">Spaans</string>
   <string name="turkish">Turks</string>
+  <string name="norwegian_bokmal">Noors Bokmål</string>
   <string name="basque">Baskisch</string>
   <string name="english">Engels</string>
   <string name="catalan">Catalaans</string>
@@ -217,4 +299,6 @@
   <string name="esperanto">Esperanto</string>
   <string name="czech">Tsjechisch</string>
   <string name="hungarian">Hongaars</string>
+  <string name="japanese">Japans</string>
+  <string name="russian">Russisch</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 774b7cc0d..fa21e7f8d 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -322,4 +322,5 @@ Ta aplikacja korzysta z wielu dostawców danych transportu publicznego i dostarc
   <string name="czech">Czeski</string>
   <string name="hungarian">Węgierski</string>
   <string name="japanese">Japoński</string>
+  <string name="russian">Rosyjski</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 30fda0356..b473048f1 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -239,6 +239,7 @@
   <string name="portuguese_br">Portekizce (Brezilya)</string>
   <string name="spanish">İspanyolca</string>
   <string name="turkish">Türkçe</string>
+  <string name="norwegian_bokmal">Norveççe</string>
   <string name="basque">Baskça</string>
   <string name="english">İngilizce</string>
   <string name="catalan">Katalanca</string>
@@ -247,4 +248,5 @@
   <string name="czech">Çekçe</string>
   <string name="hungarian">Macarca</string>
   <string name="japanese">Japonca</string>
+  <string name="russian">Rusça</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fcd4b03b4..6a5388c91 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-	<string name="website" translatable="false">https://transportr.grobox.de/</string>
+	<string name="website" translatable="false">https://transportr.app/</string>
 	<string name="website_source_app" translatable="false">"?utm_source=app"</string>
 	<string name="website_source_shared" translatable="false">"?utm_source=shared_trip"</string>
 	<string name="bug_tracker" translatable="false">https://github.com/grote/Transportr/issues?q=is%3Aissue</string>
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 2ea688ba0..d46d93021 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
 
-	<release version="2.0.0-rc3" versioncode="107">
+	<release version="2.0.0" versioncode="108">
 		<change>New Design and complete code rewrite</change>
 		<change>Shiny new map given a more prominent place</change>
 		<change>Current location is used by default</change>
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index a2e8b640f..b95c1e672 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -3,6 +3,8 @@
 # All available actions: https://docs.fastlane.tools/actions
 # can also be listed using the `fastlane actions` command
 
+opt_out_usage
+
 # If you want to automatically update fastlane if a new version is available:
 # update_fastlane
 
@@ -34,10 +36,9 @@ platform :android do
 	system './rename_screenshots.py'
   end
 
-  desc "Deploy a new version to the Google Play"
+  desc "Deploy a new version to the Google Play (beta track)"
   lane :deploy do
-    gradle(task: "assembleRelease")
-    supply
+    upload_to_play_store(track: 'beta', apk: 'release/app-release.apk')
   end
 end
 
diff --git a/fastlane/Screengrabfile b/fastlane/Screengrabfile
index 6bc092488..d4d57d49e 100644
--- a/fastlane/Screengrabfile
+++ b/fastlane/Screengrabfile
@@ -1,5 +1,5 @@
 app_package_name "de.grobox.liberario.debug"
-locales ['cs-CZ','de-DE','en-US','es-ES','eu-ES','fr-FR','hu-HU','it-IT','nl-NL','pl-PL','pt-BR','ta-IN']
+locales ['cs-CZ','de-DE','en-US','es-ES','eu-ES','fr-FR','hu-HU','it-IT','nl-NL','pl-PL','pt-BR','ru-RU','ta-IN']
 app_apk_path "app/build/outputs/apk/debug/app-debug.apk"
 tests_apk_path "app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk"
 test_instrumentation_runner "de.grobox.transportr.MockTestRunner"
diff --git a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/1_FirstStart.png b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/1_FirstStart.png
new file mode 100644
index 000000000..555aa35a7
Binary files /dev/null and b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/1_FirstStart.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/2_SavedSearches.png b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/2_SavedSearches.png
new file mode 100644
index 000000000..a297829df
Binary files /dev/null and b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/2_SavedSearches.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/3_Trips.png b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/3_Trips.png
new file mode 100644
index 000000000..75d440c81
Binary files /dev/null and b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/3_Trips.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/4_TripDetails.png b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/4_TripDetails.png
new file mode 100644
index 000000000..85fff965d
Binary files /dev/null and b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/4_TripDetails.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/5_Station.png b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/5_Station.png
new file mode 100644
index 000000000..287d7dc86
Binary files /dev/null and b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/5_Station.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/6_Departures.png b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/6_Departures.png
new file mode 100644
index 000000000..7c92b400c
Binary files /dev/null and b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/6_Departures.png differ
diff --git a/fastlane/metadata/android/de-DE/full_description.txt b/fastlane/metadata/android/de-DE/full_description.txt
index 0d1dd2d11..d4c6c88af 100644
--- a/fastlane/metadata/android/de-DE/full_description.txt
+++ b/fastlane/metadata/android/de-DE/full_description.txt
@@ -1,14 +1,37 @@
-Transportr ist eine nicht-kommerzielle Anwendung, welche von Menschen überall auf der Welt entwickelt wird,
-um die Nutzung von öffentlichen Verkehrsmitteln zu erleichtern, egal wo du bist.
 
-Zur Zeit funktioniert dies am besten in Europa, aber es werden auch viele Orte weltweit unterstützt.
-Wenn du in einer nicht unterstützten Region lebst, kannst du sie zu Transportr hinzufügen.
-Eine Anleitung hierzu ist auf der Homepage verfügbar.
+Transportr ist eine nicht-kommerzielle App, die von Menschen auf der ganzen Welt in ihrer Freizeit entwickelt wurde.
+Sie wollen die Nutzung der öffentlichen Verkehrsmittel für alle so einfach wie möglich machen.
 
-Transportr findet Verbindungen von deinem zu Hause, deiner aktuellen Position oder einer bestimmten Haltestelle zu
-einem beliebigen Ziel. Du kannst auch komplette Routen als Favoriten speichern und findest
-somit die nächsten Verbindungen ganz einfach. Selbstverständlich kannst du deine Route auch auf einer Karte
-anzeigen und dem Verlauf über GPS folgen.
+Diese App nutzt die Daten verschiedener öffentlicher Verkehrsbetriebe
+und stellt dir eine einheitliche Benutzeroberfläche zur Verfügung.
+Sie kann die Richtigkeit der Daten nicht überprüfen
+und bietet daher <i>keine Gewähr</i> für die dargestellten Informationen.
+Die Benutzung erfolgt auf eigene Gefahr.
 
-Du kannst auch Haltestellen in der Nähe finden und bevorstehende Abfahrten einschliesslich der Verzögerungen (wenn
-es welche gibt) anzeigen lassen.
\ No newline at end of file
+<b>🛣️ Reiseroute</b>. Sage Transportr einfach, wohin du willst!
+Er findet die besten Verbindungen für dich, sagt dir, wo du umsteigen musst,
+und gibt dir sogar eine geschätzte Ankunftszeit an.
+
+<b>⏱️ Live Abfahrten</b>. Zeigt bevorstehende Abfahrten von allen Stationen an.
+In <i>unterstützten</i> Regionen werden auch Echtzeit-Verzögerungen angezeigt.
+
+<b>🗽 Freie Software</b>. Der Quellcode von Transportr ist zu 100% offen.
+Du kannst es frei benutzen, studieren, teilen und verbessern.
+Diese App ist nur so gut, wie <i>du</i> sie machst.
+Du kannst deine Stadt sogar selbst hinzufügen, wenn sie nicht bereits unterstützt wird.
+
+<b>🛰️ Findet deine Position.</b> Transportr nutzt GPS-Satellitennavigation,
+um den Überblick über deine aktuelle Position zu behalten - damit du dich nie verirrst.
+Du kannst nahegelegene Stationen finden, um eine neue Tour zu starten
+und dann sehen, wie weit du entfernt bist.
+
+<b>🌟 Erinnert sich an bevorzugte Orte.</b> Damit du schneller ans Ziel kommst,
+speichert Transportr häufig genutzte Orte und Fahrten.
+Auf diese Weise musst du sie nicht immer wieder neu eingeben.
+
+<b>🚫 Keine Werbung, kein Tracking</b>. Diese App zeigt keine Werbung
+oder lästige Benachrichtigungen an.
+Es verwendet auch keine Tracking-Tools wie Google Analytics, um dich auszuspionieren.
+
+<b>🗺️ Schöne Karten</b>. Zeigt die Stationen oder die gesamte Strecke auf einer Karte an
+und weiß immer, wo man aussteigen muss.
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/1_FirstStart.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/1_FirstStart.png
new file mode 100644
index 000000000..564419387
Binary files /dev/null and b/fastlane/metadata/android/de-DE/images/phoneScreenshots/1_FirstStart.png differ
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/2_SavedSearches.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/2_SavedSearches.png
new file mode 100644
index 000000000..c83d04f7e
Binary files /dev/null and b/fastlane/metadata/android/de-DE/images/phoneScreenshots/2_SavedSearches.png differ
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/3_Trips.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/3_Trips.png
new file mode 100644
index 000000000..2156fe403
Binary files /dev/null and b/fastlane/metadata/android/de-DE/images/phoneScreenshots/3_Trips.png differ
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/4_TripDetails.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/4_TripDetails.png
new file mode 100644
index 000000000..c4a0520ff
Binary files /dev/null and b/fastlane/metadata/android/de-DE/images/phoneScreenshots/4_TripDetails.png differ
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/5_Station.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/5_Station.png
new file mode 100644
index 000000000..caa6d9b39
Binary files /dev/null and b/fastlane/metadata/android/de-DE/images/phoneScreenshots/5_Station.png differ
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/6_Departures.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/6_Departures.png
new file mode 100644
index 000000000..5c825657c
Binary files /dev/null and b/fastlane/metadata/android/de-DE/images/phoneScreenshots/6_Departures.png differ
diff --git a/fastlane/metadata/android/de-DE/short_description.txt b/fastlane/metadata/android/de-DE/short_description.txt
index 37f90827b..aa52b8ca8 100644
--- a/fastlane/metadata/android/de-DE/short_description.txt
+++ b/fastlane/metadata/android/de-DE/short_description.txt
@@ -1 +1 @@
-Der Begleiter für öffentliche Verkehrsmittel, der deine Privatsphäre und deine F
\ No newline at end of file
+Freier Assistent für den öffentlichen Nahverkehr ohne Werbung und Tracking
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/108.txt b/fastlane/metadata/android/en-US/changelogs/108.txt
new file mode 100644
index 000000000..e173853e8
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/108.txt
@@ -0,0 +1,9 @@
+* New Design and complete code rewrite
+* Shiny new map given a more prominent place
+* Current location is used by default
+* Trip overview shows warning icon if there is a problem
+* Add your "Work" place
+* Addresses will be saved
+* Round icon for new Android versions
+* Added New York, California, Ghana and Costa Rica
+* New translation: Russian
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1_FirstStart.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1_FirstStart.png
index be5add26e..60027c358 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/1_FirstStart.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/1_FirstStart.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2_SavedSearches.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2_SavedSearches.png
index 43153839a..5ab0595d2 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/2_SavedSearches.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/2_SavedSearches.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3_Trips.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3_Trips.png
index b2c4e6538..60e22c58e 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/3_Trips.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/3_Trips.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4_TripDetails.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4_TripDetails.png
index 46d52d298..a40f1fc8d 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/4_TripDetails.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/4_TripDetails.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5_Station.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/5_Station.png
index a1ef7a4d1..8bd680a3e 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/5_Station.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/5_Station.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/6_Departures.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/6_Departures.png
index f25d8856d..e109c9555 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/6_Departures.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/6_Departures.png differ
diff --git a/fastlane/metadata/android/es-ES/images/phoneScreenshots/1_FirstStart.png b/fastlane/metadata/android/es-ES/images/phoneScreenshots/1_FirstStart.png
new file mode 100644
index 000000000..6b7758881
Binary files /dev/null and b/fastlane/metadata/android/es-ES/images/phoneScreenshots/1_FirstStart.png differ
diff --git a/fastlane/metadata/android/es-ES/images/phoneScreenshots/2_SavedSearches.png b/fastlane/metadata/android/es-ES/images/phoneScreenshots/2_SavedSearches.png
new file mode 100644
index 000000000..dffebc964
Binary files /dev/null and b/fastlane/metadata/android/es-ES/images/phoneScreenshots/2_SavedSearches.png differ
diff --git a/fastlane/metadata/android/es-ES/images/phoneScreenshots/3_Trips.png b/fastlane/metadata/android/es-ES/images/phoneScreenshots/3_Trips.png
new file mode 100644
index 000000000..b1adbd545
Binary files /dev/null and b/fastlane/metadata/android/es-ES/images/phoneScreenshots/3_Trips.png differ
diff --git a/fastlane/metadata/android/es-ES/images/phoneScreenshots/4_TripDetails.png b/fastlane/metadata/android/es-ES/images/phoneScreenshots/4_TripDetails.png
new file mode 100644
index 000000000..84462a94d
Binary files /dev/null and b/fastlane/metadata/android/es-ES/images/phoneScreenshots/4_TripDetails.png differ
diff --git a/fastlane/metadata/android/es-ES/images/phoneScreenshots/5_Station.png b/fastlane/metadata/android/es-ES/images/phoneScreenshots/5_Station.png
new file mode 100644
index 000000000..3068b2b13
Binary files /dev/null and b/fastlane/metadata/android/es-ES/images/phoneScreenshots/5_Station.png differ
diff --git a/fastlane/metadata/android/es-ES/images/phoneScreenshots/6_Departures.png b/fastlane/metadata/android/es-ES/images/phoneScreenshots/6_Departures.png
new file mode 100644
index 000000000..5c93f88ea
Binary files /dev/null and b/fastlane/metadata/android/es-ES/images/phoneScreenshots/6_Departures.png differ
diff --git a/fastlane/metadata/android/eu-ES/images/phoneScreenshots/1_FirstStart.png b/fastlane/metadata/android/eu-ES/images/phoneScreenshots/1_FirstStart.png
new file mode 100644
index 000000000..a0362104c
Binary files /dev/null and b/fastlane/metadata/android/eu-ES/images/phoneScreenshots/1_FirstStart.png differ
diff --git a/fastlane/metadata/android/eu-ES/images/phoneScreenshots/2_SavedSearches.png b/fastlane/metadata/android/eu-ES/images/phoneScreenshots/2_SavedSearches.png
new file mode 100644
index 000000000..a70457ef7
Binary files /dev/null and b/fastlane/metadata/android/eu-ES/images/phoneScreenshots/2_SavedSearches.png differ
diff --git a/fastlane/metadata/android/eu-ES/images/phoneScreenshots/3_Trips.png b/fastlane/metadata/android/eu-ES/images/phoneScreenshots/3_Trips.png
new file mode 100644
index 000000000..47b5acd84
Binary files /dev/null and b/fastlane/metadata/android/eu-ES/images/phoneScreenshots/3_Trips.png differ
diff --git a/fastlane/metadata/android/eu-ES/images/phoneScreenshots/4_TripDetails.png b/fastlane/metadata/android/eu-ES/images/phoneScreenshots/4_TripDetails.png
new file mode 100644
index 000000000..f36ddabf5
Binary files /dev/null and b/fastlane/metadata/android/eu-ES/images/phoneScreenshots/4_TripDetails.png differ
diff --git a/fastlane/metadata/android/eu-ES/images/phoneScreenshots/5_Station.png b/fastlane/metadata/android/eu-ES/images/phoneScreenshots/5_Station.png
new file mode 100644
index 000000000..7492155d5
Binary files /dev/null and b/fastlane/metadata/android/eu-ES/images/phoneScreenshots/5_Station.png differ
diff --git a/fastlane/metadata/android/eu-ES/images/phoneScreenshots/6_Departures.png b/fastlane/metadata/android/eu-ES/images/phoneScreenshots/6_Departures.png
new file mode 100644
index 000000000..cbb952b3a
Binary files /dev/null and b/fastlane/metadata/android/eu-ES/images/phoneScreenshots/6_Departures.png differ
diff --git a/fastlane/metadata/android/fr-FR/full_description.txt b/fastlane/metadata/android/fr-FR/full_description.txt
index 6a86c3dce..798d1c991 100644
--- a/fastlane/metadata/android/fr-FR/full_description.txt
+++ b/fastlane/metadata/android/fr-FR/full_description.txt
@@ -1,8 +1,27 @@
-Transportr est une appli sans but lucratif développée par des personnes du monde entier pour faciliter le plus possible l'utilisation des transports en commun, où que vous soyez.
 
-Actuellement, elle fonctionne de manière optimale en Europe, mais prend aussi en charge de nombreux endroits de par le monde. Si vous habitez dans une région qui n'est pas prise en charge, envisagez de l'ajouter à Transportr.
-Vous trouverez des instructions sur la page d'accueil.
+Transportr est une appli sans but lucratif développée par des personnes du monde entier pendant leur temps libre.
+Elles souhaitent faciliter autant que possible l’utilisation des transports en commun, pour tous.
 
-Transportr trouve des itinéraires de chez vous, de votre position actuelle ou d'un arrêt/station donné vers n'importe quel lieu. Vous pouvez aussi enregistrer des trajets entiers préférés et y accéder ultérieurement d'un seul glisser. Bien sûr, vous pouvez aussi faire apparaître votre trajet sur la carte et suivre votre déplacement par GPS.
+Cette appli utilise les données de divers organismes locaux de transport en commun tout en fournissant une interface unifiée pour ces données.
+Elle ne peut pas vérifier la justesse de ces données et par conséquent <i>n’offre aucune garantie</i> quant aux renseignements affichés.
+Veuillez l’utiliser à vos propres risques.
 
-Vous pouvez aussi découvrir les arrêts/stations alentour et afficher les prochains départs incluant les retards (s'il y en a). 
\ No newline at end of file
+<b>🛣️ Itinéraires</b>. Indiquez seulement à Transportr où vous souhaitez aller !
+Elle trouvera les meilleures correspondances pour vous, vous indiquera où changer de bus,
+et vous donnera même une heure d’arrivée prévue.
+
+<b>⏱️ Départs en direct</b>. Elle affiche les départs à venir pour tous les arrêts et stations.
+Pour les zones <i>prises en charge</i>, les retards sont aussi affichés en temps réel.
+
+<b>🗽 Liberté logicielle</b>. Transportr est à code source ouvert, à 100 %.
+Vous pouvez l’utiliser, l’examiner, la partager et l’améliorer librement.
+L’appli sera aussi bonne que <i>vous</i> la rendrez.
+Vous pouvez même ajouter votre propre ville, si elle n’est pas déjà prise en charge.
+<b>🛰️ Trouve votre position géographique</b>. Transportr utilise une navigation GPS par satellites pour suivre votre position actuelle afin que vous ne soyez jamais perdu.
+Vous pouvez trouver les arrêts et stations à proximité pour commencer un nouveau trajet et vous rendre ainsi compte de la progression de votre parcours.
+<b>🌟 Se souvient de vos endroits préférés</b>. Afin d’accélérer vos déplacements, Transportr enregistre les endroits et trajets utilisés fréquemment afin que vous n’ayez pas à les saisir tout le temps.
+
+<b>🚫 Pas de publicité, pas de suivi à la trace</b>. Cette appli n’affiche aucune publicité ni notification ennuyante.
+Elle n’utilise pas non plus des outils de suivi comme Google Analytics pour vous espionner.
+
+<b>🗺️De belles cartes</b>. Elle affiche les arrêts et stations de votre trajet entier sur une carte et sait toujours où vous vous trouvez afin que vous ne ratiez jamais votre arrêt.
diff --git a/fastlane/metadata/android/fr-FR/images/phoneScreenshots/1_FirstStart.png b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/1_FirstStart.png
new file mode 100644
index 000000000..028682b0c
Binary files /dev/null and b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/1_FirstStart.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/phoneScreenshots/2_SavedSearches.png b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/2_SavedSearches.png
new file mode 100644
index 000000000..68e36d6c7
Binary files /dev/null and b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/2_SavedSearches.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/phoneScreenshots/3_Trips.png b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/3_Trips.png
new file mode 100644
index 000000000..d826f4d88
Binary files /dev/null and b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/3_Trips.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/phoneScreenshots/4_TripDetails.png b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/4_TripDetails.png
new file mode 100644
index 000000000..6a28fb78f
Binary files /dev/null and b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/4_TripDetails.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/phoneScreenshots/5_Station.png b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/5_Station.png
new file mode 100644
index 000000000..e0a2cf49f
Binary files /dev/null and b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/5_Station.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/phoneScreenshots/6_Departures.png b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/6_Departures.png
new file mode 100644
index 000000000..2dcb5d3b8
Binary files /dev/null and b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/6_Departures.png differ
diff --git a/fastlane/metadata/android/fr-FR/short_description.txt b/fastlane/metadata/android/fr-FR/short_description.txt
index 4d5f3189c..845942bf0 100644
--- a/fastlane/metadata/android/fr-FR/short_description.txt
+++ b/fastlane/metadata/android/fr-FR/short_description.txt
@@ -1 +1 @@
-Le compagnon de transport en commun qui respecte vos données personnelles et vot
\ No newline at end of file
+Assistant gratuit de transport en commun sans publicité ni suivi à la trace
\ No newline at end of file
diff --git a/fastlane/metadata/android/hu-HU/full_description.txt b/fastlane/metadata/android/hu-HU/full_description.txt
index 04db0b4d6..e89028456 100644
--- a/fastlane/metadata/android/hu-HU/full_description.txt
+++ b/fastlane/metadata/android/hu-HU/full_description.txt
@@ -1,7 +1,41 @@
-A Transportr egy non-profit alkalmazás, amit világszerte azért feljesztenek, hogy egyszerűbbé tegyék a tömegközlekedés használatát, akárhol is legyél.
 
-Jelenleg a legjobban Európán belül működik, de sok más helyet is támogat világszerte. Ha egy olyan helyen élsz, amit még nem támogatott, segíts hozzáadni a Transportr-hez! Útmutatást ezzel kapcsolatban a honlapunkon találsz.
+A Transportr egy nonprofit alkalmazás, amelyet emberek a szabadidejükben fejlesztenek
+a világ minden tájáról. Azt szeretnék, hogy a tömegközlekedés olyan könnyű legyen
+mindenki számára, amennyire csak lehetséges.
+
+Ez az alkalmazás számos tömegközlekedési cég adatait használja, és
+egységes felületet biztosít hozzájuk.
+Az adatok helyességét viszont nem tudjuk ellenőrizni,
+és ezért <i>garanciát sem vállalunk</i> a megjelenített információkért.
+A saját felelősségére használja.
+
+<b>🛣️ Útvonaltervezés</b>. Csak mondja meg a Tansportrnek, hogy merre menne!
+Megkeresi Önnek a legjobb csatlakozást, és tanácsot ad hogy szálljon át,
+és még a becslt érkezési időt is megmondja.
+
+<b>⏱️ Élő indulások</b>. Megjeleníti a soron következő indulásokat minden megállóhoz.
+A <i>támogatott</i> területeken a valós idejű adatok is megjelennek.
+
+<b>🗽 Szoftverszabadság</b>. A Transportr forráskódja 100%-ban nyílt.
+Szabadon használhatja, tanulmányozhatja, megoszthatja és fejlesztheti.
+Ez az csak annyira jó, amennyire <i>Ön</i> azzá teszi.
+A saját városát is hozzáadhatja, ha meg az nem támogatott.
+
+<b>🛰️ Megtalálja a helyzetét.</b> A Transportr GPS műholdas navigáció használ
+a jelenlegi pozíciója követésére – agy sosem téved el.
+Megtalálhatja a közeli állomások egy új utazás elkezdéséhez,
+majd láthatja, hogy milyen messzire viszi az útja.
+
+<b>🌟 Megjegyzi a kedvenc helyeit.</b> Hogy gyorsabban megtalálja merre kell mennie,
+a Transportr elmenti a gyakran használt helyeit és útjait.
+Így nem kell őket újra és újra begépelnie.
+
+<b>🚫 Nincsenek reklámok, nincs követés</b>. Az app nem jelenít meg reklámokat
+vagy idegesítő értesítéseket. Emellett nem használ olyan követő eszközöket,
+mint a Google Analytics, amely kémkedik Ön után.
+
+<b>🗺️ Gyönyörű térképek</b>. Megjeleníti az állomásokat a teljes utazása
+alatt egy térképen, és mindig megmutatja hogy hol van, így nem téveszti el,
+hogy hol kell leszállnia a buszról…
 
-A Transportr irányt mutat az otthonodtól, jelenlegi helyzetedtől vagy egy adott megállótól oda, ahova menni szeretnél. Teljes utakat menthetsz el a kedvenceid közé, és a legközelebbi kapcsolódásokat is egyszerűen megtalálhatod. Az utakat természetesen megtekintheted térképen is, és követheted a haladásodat GPS segítségével.
 
-Állomásokat is kereshetsz vele a közelben, és a legközelebbi indulásokat is megtekintheted, az esetleges késésekkel együtt.
\ No newline at end of file
diff --git a/fastlane/metadata/android/hu-HU/images/phoneScreenshots/1_FirstStart.png b/fastlane/metadata/android/hu-HU/images/phoneScreenshots/1_FirstStart.png
new file mode 100644
index 000000000..763bebce8
Binary files /dev/null and b/fastlane/metadata/android/hu-HU/images/phoneScreenshots/1_FirstStart.png differ
diff --git a/fastlane/metadata/android/hu-HU/images/phoneScreenshots/2_SavedSearches.png b/fastlane/metadata/android/hu-HU/images/phoneScreenshots/2_SavedSearches.png
new file mode 100644
index 000000000..10044b4f9
Binary files /dev/null and b/fastlane/metadata/android/hu-HU/images/phoneScreenshots/2_SavedSearches.png differ
diff --git a/fastlane/metadata/android/hu-HU/images/phoneScreenshots/3_Trips.png b/fastlane/metadata/android/hu-HU/images/phoneScreenshots/3_Trips.png
new file mode 100644
index 000000000..ecc83c107
Binary files /dev/null and b/fastlane/metadata/android/hu-HU/images/phoneScreenshots/3_Trips.png differ
diff --git a/fastlane/metadata/android/hu-HU/images/phoneScreenshots/4_TripDetails.png b/fastlane/metadata/android/hu-HU/images/phoneScreenshots/4_TripDetails.png
new file mode 100644
index 000000000..2cfb97db3
Binary files /dev/null and b/fastlane/metadata/android/hu-HU/images/phoneScreenshots/4_TripDetails.png differ
diff --git a/fastlane/metadata/android/hu-HU/images/phoneScreenshots/5_Station.png b/fastlane/metadata/android/hu-HU/images/phoneScreenshots/5_Station.png
new file mode 100644
index 000000000..eb4d10b39
Binary files /dev/null and b/fastlane/metadata/android/hu-HU/images/phoneScreenshots/5_Station.png differ
diff --git a/fastlane/metadata/android/hu-HU/images/phoneScreenshots/6_Departures.png b/fastlane/metadata/android/hu-HU/images/phoneScreenshots/6_Departures.png
new file mode 100644
index 000000000..1033b3df2
Binary files /dev/null and b/fastlane/metadata/android/hu-HU/images/phoneScreenshots/6_Departures.png differ
diff --git a/fastlane/metadata/android/hu-HU/short_description.txt b/fastlane/metadata/android/hu-HU/short_description.txt
index 8cbb74d3a..ab3c359c5 100644
--- a/fastlane/metadata/android/hu-HU/short_description.txt
+++ b/fastlane/metadata/android/hu-HU/short_description.txt
@@ -1 +1 @@
-A tömegközlekedési alkalmazás, ami tiszteli a privátszférádat és a szabadságodat
\ No newline at end of file
+Szabad tömegközlekedési segéd reklámok és követés nélkül
\ No newline at end of file
diff --git a/fastlane/metadata/android/it-IT/images/phoneScreenshots/1_FirstStart.png b/fastlane/metadata/android/it-IT/images/phoneScreenshots/1_FirstStart.png
new file mode 100644
index 000000000..77de3bf17
Binary files /dev/null and b/fastlane/metadata/android/it-IT/images/phoneScreenshots/1_FirstStart.png differ
diff --git a/fastlane/metadata/android/it-IT/images/phoneScreenshots/2_SavedSearches.png b/fastlane/metadata/android/it-IT/images/phoneScreenshots/2_SavedSearches.png
new file mode 100644
index 000000000..706450745
Binary files /dev/null and b/fastlane/metadata/android/it-IT/images/phoneScreenshots/2_SavedSearches.png differ
diff --git a/fastlane/metadata/android/it-IT/images/phoneScreenshots/3_Trips.png b/fastlane/metadata/android/it-IT/images/phoneScreenshots/3_Trips.png
new file mode 100644
index 000000000..11da64802
Binary files /dev/null and b/fastlane/metadata/android/it-IT/images/phoneScreenshots/3_Trips.png differ
diff --git a/fastlane/metadata/android/it-IT/images/phoneScreenshots/4_TripDetails.png b/fastlane/metadata/android/it-IT/images/phoneScreenshots/4_TripDetails.png
new file mode 100644
index 000000000..031516912
Binary files /dev/null and b/fastlane/metadata/android/it-IT/images/phoneScreenshots/4_TripDetails.png differ
diff --git a/fastlane/metadata/android/it-IT/images/phoneScreenshots/5_Station.png b/fastlane/metadata/android/it-IT/images/phoneScreenshots/5_Station.png
new file mode 100644
index 000000000..8aef7be39
Binary files /dev/null and b/fastlane/metadata/android/it-IT/images/phoneScreenshots/5_Station.png differ
diff --git a/fastlane/metadata/android/it-IT/images/phoneScreenshots/6_Departures.png b/fastlane/metadata/android/it-IT/images/phoneScreenshots/6_Departures.png
new file mode 100644
index 000000000..9a792b501
Binary files /dev/null and b/fastlane/metadata/android/it-IT/images/phoneScreenshots/6_Departures.png differ
diff --git a/fastlane/metadata/android/nl-NL/images/phoneScreenshots/1_FirstStart.png b/fastlane/metadata/android/nl-NL/images/phoneScreenshots/1_FirstStart.png
new file mode 100644
index 000000000..bc05c83d2
Binary files /dev/null and b/fastlane/metadata/android/nl-NL/images/phoneScreenshots/1_FirstStart.png differ
diff --git a/fastlane/metadata/android/nl-NL/images/phoneScreenshots/2_SavedSearches.png b/fastlane/metadata/android/nl-NL/images/phoneScreenshots/2_SavedSearches.png
new file mode 100644
index 000000000..26b9a2c72
Binary files /dev/null and b/fastlane/metadata/android/nl-NL/images/phoneScreenshots/2_SavedSearches.png differ
diff --git a/fastlane/metadata/android/nl-NL/images/phoneScreenshots/3_Trips.png b/fastlane/metadata/android/nl-NL/images/phoneScreenshots/3_Trips.png
new file mode 100644
index 000000000..a187cd82c
Binary files /dev/null and b/fastlane/metadata/android/nl-NL/images/phoneScreenshots/3_Trips.png differ
diff --git a/fastlane/metadata/android/nl-NL/images/phoneScreenshots/4_TripDetails.png b/fastlane/metadata/android/nl-NL/images/phoneScreenshots/4_TripDetails.png
new file mode 100644
index 000000000..92696ba11
Binary files /dev/null and b/fastlane/metadata/android/nl-NL/images/phoneScreenshots/4_TripDetails.png differ
diff --git a/fastlane/metadata/android/nl-NL/images/phoneScreenshots/5_Station.png b/fastlane/metadata/android/nl-NL/images/phoneScreenshots/5_Station.png
new file mode 100644
index 000000000..53c80fbca
Binary files /dev/null and b/fastlane/metadata/android/nl-NL/images/phoneScreenshots/5_Station.png differ
diff --git a/fastlane/metadata/android/nl-NL/images/phoneScreenshots/6_Departures.png b/fastlane/metadata/android/nl-NL/images/phoneScreenshots/6_Departures.png
new file mode 100644
index 000000000..2f2f6daf8
Binary files /dev/null and b/fastlane/metadata/android/nl-NL/images/phoneScreenshots/6_Departures.png differ
diff --git a/fastlane/metadata/android/pl-PL/full_description.txt b/fastlane/metadata/android/pl-PL/full_description.txt
index b99434d86..cacd9a8d4 100644
--- a/fastlane/metadata/android/pl-PL/full_description.txt
+++ b/fastlane/metadata/android/pl-PL/full_description.txt
@@ -1,7 +1,18 @@
-Transportr jest darmową aplikacją stworzoną przez ludzi z całego świata po to, aby korzystanie z transportu publicznego było jak najłatwiejsze gdziekolwiek jesteś.
 
-Obecnie, działa najlepiej w Europie, ale także inne miejsca na świecie są wspierane. Jeżeli Twój obszar zamieszkania nie jest wspierany, rozważ dodanie go do programu Transportr. Instrukcje znajdziesz na stronie.
+Transportr jest aplikacją non-profit tworzoną hobbistycznie przez ludzi z całego świata. Celem jest jak najbardziej ułatwić wszystkim korzystanie z transportu publicznego.
 
-Transportr znajduje drogę z Twojego domu, z miejsca gdzie obecnie jesteś, lub z określonego przystanku do dowolnego miejsca gdzie chcesz się dostać. Możesz dodać całe trasy do ulubionych i szukać nowych tras jednym kliknięciem. Oczywiście, możesz zobaczyć swoją trasę na mapie i śledzić swój postęp za pomocą GPS.
+Ta aplikacja korzysta z wielu dostawców danych transportu publicznego i dostarcza dla nich wspólny interfejs. Nie jest możliwe sprawdzenie poprawności tych danych, więc <i>nie jest udzielana żadna gwarancja</i> na wyświetlane informacje i używasz jej na swoje własne ryzyko.
 
-Możesz także przeszukiwać pobliskie stacje i przyszłe odjazdy wraz z opóźnieniami (jeżeli takie wystąpią).
\ No newline at end of file
+<b>🛣️ Wyznaczanie trasy</b>: po prostu podaj aplikacji Transportr gdzie chcesz jechać! Znajdzie ona dla Ciebie najlepsze połączenia, podpowiedzi gdzie się przesiąść i nawet oczekiwany czas przybycia.
+
+<b>⏱️ Odjazdy na żywo</b>: wyświetlanie przyszłych odjazdów z wybranego lub wszystkich przystanków. Na <i>wspieranych</i> obszarach są wyświetlane opóźnienia w czasie rzeczywistym.
+
+<b>🗽 Wolne oprogramowanie</b>: kod źródłowy aplikacji Transportr jest otwarty w 100%. Możesz z aplikacji dowolnie korzystać, dzielić się, analizować i ulepszać. To <i>Ty</i> decydujesz jak dobra jest ta aplikacja. Możesz nawet dodać swoje miasto, jeżeli nie jest jeszcze wspierane. 
+
+<b>🛰️ Odnajdywanie pozycji</b>: Transportr korzysta z nawigacji satelitarnej GPS, aby śledzić Twoją pozycję - więc się nie zgubisz. Możesz wyszukać pobliskie przystanki, aby rozpocząć nową podróż i śledzić postęp swojej wyprawy.
+
+<b>🌟 Pamięć ulubionych miejsc</b>: aby szybciej dostać się do celu, Transportr zapamiętuje często używane miejsca i trasy. Dzięki temu nie będziesz musiał wielokrotnie wpisywać tego samego.
+
+<b>🚫 Brak reklam i śledzenia</b>: ta aplikacja nie wyświetla reklam i denerwujących okienek. Nie korzysta też z modułów śledzących takich jak Google Analytics.
+
+<b>🗺️ Ładne mapy</b>: wyświetlanie przystanków czy też całej trasy na mapie i aktualnej pozycji, po to aby nie przegapić, kiedy masz wysiąść.
diff --git a/fastlane/metadata/android/pl-PL/images/phoneScreenshots/1_FirstStart.png b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/1_FirstStart.png
new file mode 100644
index 000000000..606c158c5
Binary files /dev/null and b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/1_FirstStart.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/phoneScreenshots/2_SavedSearches.png b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/2_SavedSearches.png
new file mode 100644
index 000000000..4a6ab3913
Binary files /dev/null and b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/2_SavedSearches.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/phoneScreenshots/3_Trips.png b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/3_Trips.png
new file mode 100644
index 000000000..39105b48d
Binary files /dev/null and b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/3_Trips.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/phoneScreenshots/4_TripDetails.png b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/4_TripDetails.png
new file mode 100644
index 000000000..05df2cc85
Binary files /dev/null and b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/4_TripDetails.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/phoneScreenshots/5_Station.png b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/5_Station.png
new file mode 100644
index 000000000..d9bf09f84
Binary files /dev/null and b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/5_Station.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/phoneScreenshots/6_Departures.png b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/6_Departures.png
new file mode 100644
index 000000000..abd4d8b87
Binary files /dev/null and b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/6_Departures.png differ
diff --git a/fastlane/metadata/android/pl-PL/short_description.txt b/fastlane/metadata/android/pl-PL/short_description.txt
index b34cedf55..a67ab8fc1 100644
--- a/fastlane/metadata/android/pl-PL/short_description.txt
+++ b/fastlane/metadata/android/pl-PL/short_description.txt
@@ -1 +1 @@
-Asystent transportu publicznego który szanuje Twoją prywatność i wolność.
\ No newline at end of file
+Otwartoźródłowy asystent transportu publicznego bez reklam i śledzenia
\ No newline at end of file
diff --git a/fastlane/metadata/android/pt-BR/images/phoneScreenshots/1_FirstStart.png b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/1_FirstStart.png
new file mode 100644
index 000000000..ada5661f7
Binary files /dev/null and b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/1_FirstStart.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/phoneScreenshots/2_SavedSearches.png b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/2_SavedSearches.png
new file mode 100644
index 000000000..0135c51a5
Binary files /dev/null and b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/2_SavedSearches.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/phoneScreenshots/3_Trips.png b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/3_Trips.png
new file mode 100644
index 000000000..2483fb73b
Binary files /dev/null and b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/3_Trips.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/phoneScreenshots/4_TripDetails.png b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/4_TripDetails.png
new file mode 100644
index 000000000..929849e02
Binary files /dev/null and b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/4_TripDetails.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/phoneScreenshots/5_Station.png b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/5_Station.png
new file mode 100644
index 000000000..bce3d907f
Binary files /dev/null and b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/5_Station.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/phoneScreenshots/6_Departures.png b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/6_Departures.png
new file mode 100644
index 000000000..5e0ef6289
Binary files /dev/null and b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/6_Departures.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/phoneScreenshots/1_FirstStart.png b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/1_FirstStart.png
new file mode 100644
index 000000000..6e4d17e40
Binary files /dev/null and b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/1_FirstStart.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/phoneScreenshots/2_SavedSearches.png b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/2_SavedSearches.png
new file mode 100644
index 000000000..7989c695b
Binary files /dev/null and b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/2_SavedSearches.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/phoneScreenshots/3_Trips.png b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/3_Trips.png
new file mode 100644
index 000000000..7bc236ee0
Binary files /dev/null and b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/3_Trips.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/phoneScreenshots/4_TripDetails.png b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/4_TripDetails.png
new file mode 100644
index 000000000..03ecbee34
Binary files /dev/null and b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/4_TripDetails.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/phoneScreenshots/5_Station.png b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/5_Station.png
new file mode 100644
index 000000000..6fd6f6d61
Binary files /dev/null and b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/5_Station.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/phoneScreenshots/6_Departures.png b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/6_Departures.png
new file mode 100644
index 000000000..760792a08
Binary files /dev/null and b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/6_Departures.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/phoneScreenshots/1_FirstStart.png b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/1_FirstStart.png
new file mode 100644
index 000000000..7258dec19
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/1_FirstStart.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/phoneScreenshots/2_SavedSearches.png b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/2_SavedSearches.png
new file mode 100644
index 000000000..2e5b4a757
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/2_SavedSearches.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/phoneScreenshots/3_Trips.png b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/3_Trips.png
new file mode 100644
index 000000000..b37fa778e
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/3_Trips.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/phoneScreenshots/4_TripDetails.png b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/4_TripDetails.png
new file mode 100644
index 000000000..070fba828
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/4_TripDetails.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/phoneScreenshots/5_Station.png b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/5_Station.png
new file mode 100644
index 000000000..bd1af79fd
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/5_Station.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/phoneScreenshots/6_Departures.png b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/6_Departures.png
new file mode 100644
index 000000000..1ba89eadb
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/6_Departures.png differ