diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 80b0c75..d1103d1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,376 +1,376 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="app_name" translatable="false">BusTO</string>
     <string name="app_name_full" translatable="false">Libre BusTO</string>
     <string name="app_name_debug" translatable="false">BusTO dev</string>
     <string name="app_name_gitpull" translatable="false">BusTO git</string>
     <string name="app_description">You\'re using the latest in technology when it comes to respecting your privacy.
     </string>
     <string name="search">Search</string>
     <string name="qrcode">Scan QR Code</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="next">Next</string>
     <string name="previous">Previous</string>
 
     <string name="title_barcode_scanner_install">Install Barcode Scanner?</string>
     <string name="message_install_barcode_scanner">This application requires an app to scan the QR codes. Would you like
         to install Barcode Scanner now?
     </string>
 
     <string name="insert_bus_stop_number">Bus stop number</string>
     <string name="insert_bus_stop_name">Bus stop name</string>
     <string name="insert_bus_stop_number_error">Insert bus stop number</string>
     <string name="insert_bus_stop_name_error">Insert bus stop name</string>
     <string name="route_towards_destination">%1$s towards %2$s</string>
     <string name="route_towards_unknown">%s (unknown destination)</string>
     <string name="network_error">Verify your Internet connection!</string>
     <string name="no_bus_stop_have_this_name">Seems that no bus stop has this name</string>
     <string name="no_arrivals_stop">No arrivals found for this stop</string>
     <string name="parsing_error">Error parsing the 5T/GTT website (damn site!)</string>
     <string name="query_too_short">Name too short, type more characters and retry
     </string> <!-- TODO: carry out experiments to determine the best wording for this message and publish a paper with the findings -->
     <string name="passages">Arrivals at: %1$s</string>
     <string name="results">Choose the bus stop…</string>
     <string name="line">Line</string>
     <string name="lines">Lines</string>
     <string name="urban_lines">Urban lines</string>
     <string name="extraurban_lines">Extra urban lines</string>
     <string name="turist_lines">Tourist lines</string>
     <string name="no_lines_found">No lines found in this category</string>
     <string name="no_lines_found_query">No lines match the searched name</string>
 
 
     <string name="direction_duep">Destination:</string>
     <string name="lines_fill">Lines: %1$s</string>
     <string name="line_fill">Line %1$s</string>
     <string name="line_fill_towards">Line %1$s towards:</string>
     <string name="stop_fill">Stop %1$s</string>
     <string name="vehicle_fill">Vehicle %1$s</string>
     <string name="no_passages">No timetable found</string>
     <string name="no_qrcode">No QR code found, try using another app to scan</string>
     <string name="internal_error">Unexpected internal error, cannot extract data from GTT/5T website</string>
     <string name="action_help">Help</string>
     <string name="action_about">About the app</string>
     <string name="action_about_more">More about</string>
     <string name="action_wiki">Contribute</string>
     <string name="hack_url">https://gitpull.it/w/librebusto/en/</string>
     <string name="action_source">Source code</string>
     <string name="action_licence">Licence</string>11
     <string name="action_author">Meet the author</string>
     <string name="added_in_favorites">Bus stop is now in your favorites</string>
     <string name="removed_from_favorites">Bus stop removed from your favorites</string>
     <string name="favorites_line_add">Added line to favorites</string>
     <string name="favorites_line_remove">Remove line from favorites</string>
     <string name="favorites_lines">Favorites</string>
     <string name="action_favorites">Favorites</string>
     <string name="title_activity_favorites">Favorites</string>
     <string name="title_activity_map">Map</string>
     <string name="tip_add_favorite">No favorites? Arghh! Press on a bus stop star to populate this list!</string>
     <string name="action_remove_from_favourites">Delete</string>
     <string name="action_rename_bus_stop_username">Rename</string>
     <string name="dialog_rename_bus_stop_username_title">Rename the bus stop</string>
     <string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
     <string name="about_activity">About the app</string>
     <string name="howDoesItWork">
         <b>Tap the star</b>
         to add the bus stop to the favourites\n\n<b>How to read timelines:</b>\n<b>&#160;&#160;&#160;12:56*</b> Real-time
         arrivals\n<b>&#160;&#160;&#160;12:56</b> &#160; Scheduled arrivals\n\n<b>Pull down to refresh</b> the timetable
         \n <b>Long press on Arrivals source</b> to change the source of the arrival times
     </string>
     <string name="hint_button">GOT IT!</string>
     <string name="arrival_times">Arrival times</string>
     <string name="no_passages_title">No arrivals found for lines:</string>
     <string name="about_history_top">
         <![CDATA[
         <h1>Welcome!</h1>
 
         <p>Thanks for using BusTO, an <b>open source</b> and <b>independent</b> app useful to move around Torino using a <b>Free/Libre software</b>.</p>
         <br>
         <p>Why use this app?</p>
 		<p>
         - You\'ll never be <b>tracked</b><br>
         - You\'ll never see boring <b>ads</b><br>
         - We\'ll always respect your <b>privacy</b><br>
         - Moreover, it\'s lightweight!<br>
         </p>
         <br>
         <h2>Introductory tutorial</h2>
         <p>If you want to see the introduction again, use the button below:</p>
         ]]></string>
     <string name="about_channel">
         <![CDATA[
     <h2>News and Updates</h2>
     <p>On the Telegram channel, you can find information about the latest app updates</p>
     ]]></string>
     <string name="about_how">
         <![CDATA[
     <h2>How does it work?</h2>
         <p>This app is able to do all the amazing things it does by pulling data from <b>www.gtt.to.it</b>, <b>www.5t.torino.it</b> or <b>muoversiatorino.it</b> "for personal use", along with open data from the AperTO (aperto.comune.torino.it) website.</p>
         <br>
 		<p>The work of several people is behind this app, in particular:<br>
 		- <b>Fabio Mazza</b>, current senior rockstar developer.<br>
         - <b>Andrea Ugo</b>, current junior rockstar developer.<br>
 		- <b>Silviu Chiriac</b>, designer of the 2021 logo.<br>
 		- <b>Marco M</b>, rockstar tester and bug hunter.<br>
 		- <b>Ludovico Pavesi</b>, previous senior rockstar developer (asd).<br>
 		- <b>Valerio Bozzolan</b>, maintainer and infrastructure (sponsor).<br>
 		- <b>Marco Gagino</b>, contributor and first icon creator.<br>
 		- <b>JSoup</b> web scraper library.<br>
 		- <b>makovkastar</b> floating buttons.<br>
         - <b>Google</b> for icons and support and design libraries.<br>
         - Other icons from <b>Bootstrap</b>, <b>Feather</b>, and <b>Hero Icons</b>.<br>
 		- All the contributors, and the beta testers, too!
 		</p>
 		<br>
 		 If you want more technical information or to contribute to development, use the buttons below!</b>
     ]]></string>
     <string name="about_history_bottom">
         <![CDATA[
 		<h2>Licenses</h2>
 		<p>The app and the related source code are released by Valerio Bozzolan and the other authors under the terms of the <i>GNU General Public License v3+</i>).
 		So everyone is allowed to use, to study, to improve and to share this app by <b>any kind of means</b> and for <b>any purpose</b>: under the conditions of maintaining this rights and of attributing the original work to Valerio Bozzolan.</p>
         <br>
 		<h2>Notes</h2>
 		<p>This app has been developed with the <b>hope to be useful to everyone</b>, but comes without ANY warranty of any kind.</p>
 		<p>The data used by the app comes <b>directly</b> from GTT and other public agencies: if you find any errors, please take it up to them, not to us.</p>
 		<p>This translation is kindly provided by Riccardo Caniato, Marco Gagino and Fabio Mazza.</p>
 		<p>Now you can hack public transport, too! :)</p>
     ]]>
     </string>
 
     <string name="cant_add_to_favorites">Cannot add to favorites (storage full or corrupted database?)!</string>
     <string name="action_view_on_map">View on a map</string>
     <string name="cannot_show_on_map_no_activity">Cannot find any application to show it in</string>
     <string name="cannot_show_on_map_no_position">Cannot find the position of the stop</string>
 
     <string name="list_fragment_debug" translatable="false">ListFragment - BusTO</string>
     <string name="mainSharedPreferences" translatable="false">it.reyboz.bustorino.preferences</string>
     <string name="databaseUpdatingPref" translatable="false">db_is_updating</string>
     <!-- Settings -->
     <string name="nearby_stops_message">Nearby stops</string>
     <string name="nearby_arrivals_message">Nearby connections</string>
     <string name="app_version">App version</string>
     <string name="num_stops_nearby_not_number">The number of stops to show in the recent stops is invalid</string>
     <string name="invalid_number">Invalid value, put a valid number</string>
 
     <string name="position_searching_message">Finding location</string>
     <string name="no_stops_nearby">No stops nearby</string>
     <string name="pref_num_elements">Minimum number of stops</string>
     <string name="main_menu_pref">Preferences</string>
     <string name="title_activity_settings">Settings</string>
     <string name="action_settings">Settings</string>
     <string name="general_settings">General</string>
     <string name="settings_experimental">Experimental features</string>
     <string name="settings_search_radius">Maximum distance (meters)</string>
     <string name="pref_recents_group_title">Recent stops</string>
     <string name="settings_group_general">General settings</string>
     <string name="settings_group_database">Database management</string>
     <string name="settings_reset_database">Launch manual database update</string>
 
     <string name="enable_position_message_map">Allow access to location to show it on the map</string>
     <string name="enable_position_message_nearby">Allow access to location to show stops nearby</string>
     <string name="enableGpsText">Please enable location on the device</string>
     <string name="database_update_msg_inapp">Database update in progress&#8230;</string>
     <string name="database_update_msg_notif">Updating the database</string>
     <string name="database_update_req">Force database update</string>
     <string name="database_update_req_descr">Touch to update the app database now</string>
     <string name="bus_arriving_at">is arriving at</string>
     <string name="arrivals_card_at_the_stop">at the stop</string>
     <string name="two_strings_format" translatable="false">%1$s - %2$s</string>
     <string name="show_arrivals">Show arrivals</string>
     <string name="show_stops">Show stops</string>
     <!--
     Mixed button strings
     !-->
     <string name="open_telegram">Join Telegram channel</string>
     <string name="show_introduction">Show introduction</string>
     <!--
    Map view buttons strings
    !-->
     <string name="bt_center_map_description">Center on my location</string>
     <string name="bt_follow_me_description">Follow me</string>
     <string name="enable_position">Enable or disable location</string>
     <string name="location_enabled">Location enabled</string>
     <string name="location_disabled">Location disabled</string>
     <string name="map_location_disabled_device">Location is disabled on device</string>
 
     <!--
     Arrival times sources
     !-->
     <string name="times_source_fmt">Arrivals source: %1$s</string>
     <string name="searching_arrivals_fmt">Loading arrivals from %1$s</string>
     <string name="fivetapifetcher">GTT App</string>
     <string name="gttjsonfetcher">GTT Website</string>
     <string name="fivetscraper">5T Torino website</string>
     <string name="source_mato">Muoversi a Torino app</string>
     <string name="undetermined_source">Undetermined</string>
     <string name="arrival_source_changing">Changing arrival times source…</string>
     <string name="change_arrivals_source_message">Long press to change the source of arrivals</string>
     <string-array name="arrival_times_source_list">
         <item>@string/source_mato</item>
         <item>@string/fivetapifetcher</item>
         <item>@string/gttjsonfetcher</item>
         <item>@string/fivetscraper</item>
     </string-array>
     <string name="arrival_times_choice_title">Sources of arrival times</string>
     <string name="arrival_times_choice_explanation">Select which sources of arrival times to use</string>
 
 
     <!--
     Notifications
     -->
     <string name="default_notification_channel" translatable="false">Default</string>
     <string name="default_notification_channel_description">Default channel for notifications</string>
     <string name="database_notification_channel">Database operations</string>
     <string name="database_notification_channel_desc">Updates of the app database</string>
     <string name="live_position_service_name">BusTO - live position service</string>
     <string name="live_positions_notification_channel">Live positions</string>
     <string name="live_positions_notification_channel_desc">Showing activity related to the live positions service</string>
     <string name="mqtt_notification_text">MaTO live bus positions service is running</string>
 
     <string name="db_trips_download_message">Downloading trips from MaTO server</string>
 
     <string name="too_many_permission_asks">Asked for %1$s permission too many times</string>
     <string name="permission_storage_maps_msg">Cannot use the map with the storage permission!</string>
     <string name="storage_permission">storage</string>
     <string name="message_crash">The application has crashed because you encountered a bug.
         \nIf you want, you can help the developers by sending the crash report via email.
         \nNote that no sensitive data is contained in the report, just small bits of info on your phone and app
         configuration/state.
     </string>
     <string name="acra_email_message">The application crashed and the crash report is in the attachments. Please
         describe what you were doing before the crash: \n
     </string>
     <string name="nav_arrivals_text">Arrivals</string>
     <string name="nav_map_text">Map</string>
     <string name="nav_favorites_text">Favorites</string>
     <string name="drawer_open">Open navigation drawer</string>
     <string name="drawer_close">Close navigation drawer</string>
     <string name="experiments">Experiments</string>
     <string name="donate_now">Buy us a coffee</string>
     <string name="map">Map</string>
     <string name="stop_search_view_title">Search by stop</string>
     <string name="search_box_lines_suggestion_filter">Filter by name</string>
     <string name="requesting_db_update">Launching database update</string>
     <string name="downloading_data_mato">Downloading data from MaTO server</string>
 
     <!-- preferences -->
     <string name="pref_directions_capitalize">Capitalize directions</string>
     <string-array name="directions_capitalize">
         <item>@string/directions_capitalize_no_change</item>
         <item>@string/directions_capitalize_everything</item>
         <item>@string/directions_capitalize_first_letter</item>
     </string-array>
     <string name="directions_capitalize_no_change">Do not change arrivals directions</string>
     <string name="directions_capitalize_everything">Capitalize everything</string>
     <string name="directions_capitalize_first_letter">Capitalize only first letter</string>
     <array name="directions_capitalize_keys">
         <item>KEEP</item>
         <item>CAPITALIZE_ALL</item>
         <item>CAPITALIZE_FIRST</item>
 
     </array>
     <string name="pref_shown_startup">Section to show on startup</string>
     <string name="pref_shown_startup_def_desc">Touch to change it</string>
     <string name="pref_lines_click_msg">Show arrivals touching on stop</string>
     <string name="pref_experimental_msg">Enable experiments</string>
 
 
     <!-- lines -->
     <string name="long_press_stop_4_options">Long press the stop for options</string>
 
     <array name="first_screen_shown">
         <item>@string/nav_arrivals_text</item>
         <item>@string/nav_favorites_text</item>
         <item>@string/nav_map_text</item>
         <item>@string/lines</item>
     </array>
 
     <string name="positions_source_pref_title">Source of real time positions for buses and trams</string>
     <string name="positions_source_mato_descr">MaTO (updated more frequently, might have errors)</string>
     <string name="positions_source_gtfsrt_descr">GTFS RT (less frequently updated, more accurate)</string>
     <array name="positions_source_sel">
         <item>@string/positions_source_mato_descr</item>
         <item>@string/positions_source_gtfsrt_descr</item>
     </array>
     <string name="too_far_not_showing_location">"You are too far, not showing your position</string>
     <string name="map_style_pref_title">Style of the map</string>
     <string name="map_style_versatiles">Versatiles (vector)</string>
     <string name="map_style_legacy_raster">OSM legacy (raster, lighter)</string>
     <array name="map_style_pref_categories">
         <item>@string/map_style_versatiles</item>
         <item>@string/map_style_legacy_raster</item>
     </array>
 
     <string name="remove_all_trips">Remove trips data (free up space)</string>
     <string name="all_trips_removed">All GTFS trips have been removed from the database</string>
 
     <!-- Tutorial strings -->
     <string name="tutorial_action">Show tutorial</string>
     <string name="tutorial_first">
         <![CDATA[Thank you for installing BusTO, the free and <b>open source</b> app for Turin public transport. This is an <b>independent</b> app, with no ads and no tracking whatsoever.]]> </string>
     <string name="tutorial_search"> <![CDATA[You can search for the arrival times at a bus stop by inserting the number in the top, or scanning a QR code when you are at the stop
         touching the icon on the left ]]>
     </string>
     <string name="tutorial_arrivals">
         <![CDATA[Once you have found a bus stop, you can save it in the <b>favorites</b> by touching the star next to its name]]>
     </string>
     <string name="tutorial_stops">
         <![CDATA[You can see the stops near your position directly in the main screen...]]>
     </string>
 
     <string name="tutorial_map">
         <![CDATA[...or you can find them in the map, along with the real-time positions of the buses running in the city (in <font color="#2F59CC">blue</font>)]]>
     </string>
     <string name="tutorial_line">
         <![CDATA[You can also look at the line you want and see where the stops are, together with the vehicles serving the line at the moment. Remember to choose the direction you\'re interested in!]]>
     </string>
     <string name="tutorial_menu">
         <![CDATA[You can find all of this from the lateral menu.
 Look in the <b>Settings</b> to customize the app behaviour, and in the <b>About the app</b> section if you want to know more about the app and the developers.]]>
     </string>
     <string name="tutorial_permissions">
         <![CDATA[The app needs the <b>Notifications</b> permission to show the information about background processing.
          Press the button below to grant it]]>
     </string>
     <string name="grant_location_permission">Grant location permission</string>
     <string name="location_permission_granted">Location permission granted</string>
     <string name="location_permission_not_granted">Location permission has not been granted</string>
 
     <string name="close_tutorial">OK, close the tutorial</string>
     <string name="close_tutorial_short">Close the tutorial</string>
     <string name="grant_notification_permission">Enable notifications</string>
     <string name="notification_permission_granted">Notifications enabled</string>
     <!-- BACKUP -->
     <string name="backup_restore">Backup and restore</string>
     <string name="backup_activity">Import/export preferences</string>
     <string name="saved_data">Data saved</string>
     <string name="btn_backup_message">Backup to file</string>
     <string name="btn_load_backup_message">Import data from backup</string>
     <string name="data_imported_backup">Backup has been imported</string>
     <string name="message_check_at_least_one">Check at least one item to import!</string>
     <string name="load_file_favorites">Import favorites from backup</string>
     <string name="load_preferences">Import preferences from backup</string>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
 
     <string name="no_map_app_to_show_stop">No map app present to show the stop!</string>
     <string name="showing_same_direction">Direction is already shown</string>
     <string name="destination_loading">Loading destination…</string>
     <string name="destination_unknown">Destination unknown</string>
     <!-- LIVE POSITIONS DIALOG -->
     <string name="live_positions_msg_ok">Service for positions working normally</string>
     <string name="live_positions_msg_no_positions">No positions received</string>
     <string name="live_positions_msg_connection_error">Error connecting to the server</string>
     <string name="live_positions_msg_parsing_error">Error parsing the server response</string>
     <string name="live_positions_msg_network_error">Error: network response is not as expected</string>
     <string name="live_positions_msg_connecting">Connecting...</string>
-    <string name="positions_source_mato_short">MaTO</string>
-    <string name="positions_source_gtfsrt_short">GTFS RT</string>
+    <string name="positions_source_mato_short" translatable="false">MaTO</string>
+    <string name="positions_source_gtfsrt_short" translatable="false">GTFS RT</string>
     <string name="live_positions_dialog_provider_text">Live positions source:</string>
     <string name="live_positions_switch_provider">Switch source</string>
     <string name="live_positions_preference_switch_clear_title">Clear bus positions when switching live positions source</string>
 
 </resources>