diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e79666cf..2c7f039d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,23 @@
 Change Log
 ---
 
+### 6.5.4 (2019-03-11)
+
+* Fix black screen issue
+* Fix crash when task not found
+* Update translations
+  * Brazilian Portuguese - douglaslmr
+  * Dutch - revdbrink
+  * French - Florian_Dubois
+  * German - @MPK44
+  * Hebrew - elazar
+  * Hungarian - kaciokos
+  * Italian - passero
+  * Japanese - naofumi
+  * Lithuanian - gacuxz
+  * Spanish - i2nm7s
+  * Turkish - etc
+
 ### 6.5.3 (2019-02-19)
 
 * Fix crash when upgrading from Android 7 to 8+
diff --git a/app/build.gradle b/app/build.gradle
index 374e8c426..e74895100 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,8 +20,8 @@ android {
     defaultConfig {
         testApplicationId "org.tasks.test"
         applicationId "org.tasks"
-        versionCode 565
-        versionName "6.5.3"
+        versionCode 570
+        versionName "6.5.4"
         targetSdkVersion 28
         minSdkVersion 16
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 50d1b25b2..b1be4dd2b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -511,4 +511,5 @@
 	<string name="location_arrived">Angekommen um %s</string>
 	<string name="location_departed">Abgereist um %s</string>
 	<string name="building_notifications">Benachrichtigungen generieren</string>
+	<string name="error_task_not_found">Aufgabe nicht gefunden</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index c6f6652a2..005b5d4db 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -517,4 +517,5 @@
 	<string name="location_arrived">Llegada a %s</string>
 	<string name="location_departed">Salida de %s</string>
 	<string name="building_notifications">Generando notificaciones</string>
+	<string name="error_task_not_found">Tarea no encontrada</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b5079d9bd..53a0a8b63 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -503,4 +503,5 @@ est configuré correctement</string>
 	<string name="location_arrived">Arrivé à %s</string>
 	<string name="location_departed">Départ %s</string>
 	<string name="building_notifications">Générer des notifications</string>
+	<string name="error_task_not_found">Tâche non trouvée</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 1808ef804..abc3c70bf 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -523,4 +523,5 @@
 	<string name="location_arrived">Megérkezett ekkor: %s</string>
 	<string name="location_departed">Elindult ekkor: %s</string>
 	<string name="building_notifications">Értesítések létrehozása</string>
+	<string name="error_task_not_found">Feladat nem található</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0e9397017..bcb9cc357 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -487,6 +487,7 @@
 	<string name="background_sync_unmetered_only">Solo su connessioni non a consumo</string>
 	<string name="upgrade">Aggiorna</string>
 	<string name="upgrade_to_pro">Aggiorna a pro</string>
+	<string name="manage_subscription">Gestisci abbonamento</string>
 	<string name="refresh_purchases">Aggiorna acquisti</string>
 	<string name="button_subscribed">Abbonato</string>
 	<string name="button_subscribe">Sottoscrivi</string>
@@ -519,4 +520,6 @@ Google Play app sia impostata correttamente</string>
 	<string name="open_url">Apri %s</string>
 	<string name="location_arrived">Arrivato alle %s</string>
 	<string name="location_departed">Partito alle %s</string>
+	<string name="building_notifications">Gestione notifiche</string>
+	<string name="error_task_not_found">Attività non trovata</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 0bb251d11..5355f4b4b 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -524,4 +524,5 @@
 	<string name="location_arrived">הגיע ב-%s</string>
 	<string name="location_departed">עזב ב-%s</string>
 	<string name="building_notifications">מייצר התראות</string>
+	<string name="error_task_not_found">משימה לא נמצאת</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 1396af20c..96273ce29 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -522,4 +522,5 @@
 	<string name="location_arrived">%s に到着</string>
 	<string name="location_departed">%s に出発</string>
 	<string name="building_notifications">通知を生成しています</string>
+	<string name="error_task_not_found">タスクが見つかりません</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index b5c71cb38..e3ae7d428 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -520,4 +520,5 @@ sukonfigūruota tinkamai.</string>
 	<string name="location_arrived">Atvykta į %s</string>
 	<string name="location_departed">Išvykta iš %s</string>
 	<string name="building_notifications">Generuojami pranešimai</string>
+	<string name="error_task_not_found">Užduotis nerasta</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 8c5a8ae0c..6f7d373c6 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -509,4 +509,5 @@
 	<string name="location_arrived">Aangekomen on %s</string>
 	<string name="location_departed">Vetrokken om %s</string>
 	<string name="building_notifications">Notificaties genereren</string>
+	<string name="error_task_not_found">Taak niet gevonden</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 74230f5f4..ab9778708 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -522,4 +522,5 @@ aplicativo Google Play está configurado corretamente</string>
 	<string name="location_arrived">Chegou às %s</string>
 	<string name="location_departed">Saiu às %s</string>
 	<string name="building_notifications">Gerando notificações</string>
+	<string name="error_task_not_found">Tarefa não encontrada</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index f1fe8cd15..4153b5d4c 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -526,4 +526,5 @@ uygulamanızın doğru kurulduğundan emin olun.</string>
 	<string name="location_arrived">Varıldı: %s</string>
 	<string name="location_departed">Kalkıldı: %s</string>
 	<string name="building_notifications">Bildirimler oluşturuluyor</string>
+	<string name="error_task_not_found">Görev bulunamadı</string>
 </resources>
\ No newline at end of file