diff --git a/org.envirocar.app/AndroidManifest.xml b/org.envirocar.app/AndroidManifest.xml
index 88528d057..9113429c2 100644
--- a/org.envirocar.app/AndroidManifest.xml
+++ b/org.envirocar.app/AndroidManifest.xml
@@ -4,7 +4,7 @@
     package="org.envirocar.app"
     android:installLocation="internalOnly"
     android:versionCode="28"
-    android:versionName="0.21.0-SNAPSHOT">
+    android:versionName="0.21.0">
 
     <uses-sdk
         android:minSdkVersion="16"
diff --git a/org.envirocar.app/res/values-de/strings.xml b/org.envirocar.app/res/values-de/strings.xml
index b8abf6507..5a73c09db 100644
--- a/org.envirocar.app/res/values-de/strings.xml
+++ b/org.envirocar.app/res/values-de/strings.xml
@@ -24,13 +24,13 @@
     <string name="yesterday">Gestern</string>
 
     <string name="cancel">Abbrechen</string>
-    <string name="app_name">enviroCar</string>
-    <string name="menu_settings">Einstellungen</string>
-    <string name="menu_help">Hilfe</string>
+    <!--<string name="app_name">enviroCar</string>-->
+    <!--<string name="menu_settings">Einstellungen</string>-->
+    <!--<string name="menu_help">Hilfe</string>-->
     <string name="menu_about">Über enviroCar</string>
-	<string name="menu_garage">Meine Garage</string>    
-    <string name="activity_checklist_title">Checkliste</string>
-    <string name="menu_logbook">Logbuch</string>
+	<!--<string name="menu_garage">Meine Garage</string>    -->
+    <!--<string name="activity_checklist_title">Checkliste</string>-->
+    <!--<string name="menu_logbook">Logbuch</string>-->
 
 
     <string name="checklist_item_bluetooth_enabled">Bluetooth aktiviert</string>
@@ -129,7 +129,6 @@
 	<string name="default_track_description">Fahrt mit Auto %s.</string>
 	<string name="creating_temp_car">Erzeuge temporäres Auto.</string>
     
-    <string name="menu_login">Einloggen/Registrieren</string>
     <string name="gasoline">Benzin</string>
     <string name="diesel">Diesel</string>
     <string name="register_car">Auto neu erstellen</string>
@@ -147,7 +146,6 @@
     <string name="menu_logout">Ausloggen</string>
     <string name="menu_register">Registrieren</string>
     
-    <string name="dashboard">Dashboard</string>
     <string name="track_statistics">Statistiken</string>
     <string name="track_statistics_distance">Distanz</string>
 	
@@ -178,8 +176,7 @@
     <string name="finish_track_long">Wollen Sie wirklich diesen Track abschließen?</string>
     
     <string name="menu_cancel">Abbrechen</string>
-    <string name="menu_send_log">Problem Melden</string>
-    
+
     <string name="send_log_0">Mit Hilfe dieses Features lassen sich Fehler und Missverhalten der App reproduzieren.
 	    Wenn Sie ein Problem-Bericht einsenden, helfen sie aktiv mit, die enviroCar app zu verbessern.</string>
 	<string name="send_log_1">Dieses Feature nutzt den \"Senden an\" Mechanismus.
diff --git a/org.envirocar.app/res/values-de/strings_track_list.xml b/org.envirocar.app/res/values-de/strings_track_list.xml
index 8d7fd4d7c..baafe2027 100644
--- a/org.envirocar.app/res/values-de/strings_track_list.xml
+++ b/org.envirocar.app/res/values-de/strings_track_list.xml
@@ -67,4 +67,9 @@
     <string name="track_list_details_emission">CO\u2082 Ausstoß*:</string>
     <string name="track_list_details_diesel_not_supported">DIESEL NICHT\nUNTERSTÜTZT</string>
 
+    <string name="track_list_upload_all_tracks_title">Upload All Local Tracks?</string>
+    <string name="track_list_upload_all_tracks_content">You are about to upload all tracks. This means that all tracks will be uploaded and assigned to your account.\n\nDo you want to continue?</string>
+    <string name="track_list_uploading_all_tracks_title">Uploading Tracks...</string>
+    <string name="track_list_uploading_all_tracks_content_tmp" formatted="false">Uploading Track %s of %s</string>
+
 </resources>
diff --git a/org.envirocar.app/res/values/strings.xml b/org.envirocar.app/res/values/strings.xml
index 80964b612..663390aec 100644
--- a/org.envirocar.app/res/values/strings.xml
+++ b/org.envirocar.app/res/values/strings.xml
@@ -24,16 +24,13 @@
     <string name="yesterday">Yesterday</string>
     <string name="cancel">Cancel</string>
 
-    <string name="app_name">enviroCar</string>
+    <string name="app_name" translatable="false">enviroCar</string>
 
     <string name="track_statistics">Track Statistics</string>
     <string name="track_statistics_distance">Distance</string>
 
     <string name="menu_about">About</string>
 
-    <string name="menu_garage">My Garage</string>
-
-    <string name="activity_checklist_title">Checklist</string>
     <string name="checklist_item_bluetooth_enabled">Bluetooth enabled</string>
     <string name="checklist_item_bluetooth_disabled">Bluetooth not enabled</string>
     <string name="checklist_item_obd_paired">OBD adapter paired</string>
diff --git a/org.envirocar.app/res/values/strings_car_selection.xml b/org.envirocar.app/res/values/strings_car_selection.xml
index 53a25e2c9..5fd78e88f 100644
--- a/org.envirocar.app/res/values/strings_car_selection.xml
+++ b/org.envirocar.app/res/values/strings_car_selection.xml
@@ -30,7 +30,7 @@
     <string name="car_selection_successfully_added_tmp" formatted="false">%s %s has been added to the list.</string>
     <string name="car_selection_already_in_list_tmp" formatted="false">%s %s is already in the list.</string>
 
-    <string name="car_selection_note">Please be as specific as possible with your details. This information is used for internal calculation of essential attributes. False information will ultimately lead to wrong calculated values.</string>
+    <!--<string name="car_selection_note">Please be as specific as possible with your details. This information is used for internal calculation of essential attributes. False information will ultimately lead to wrong calculated values.</string>-->
 
     <string name="car_selection_manufacturer">Manufacturer</string>
     <string name="car_selection_model">Model</string>