diff --git a/main/ui/src/main/resources/fxml/quit.fxml b/main/ui/src/main/resources/fxml/quit.fxml
index 4806f82bc..2631409f3 100644
--- a/main/ui/src/main/resources/fxml/quit.fxml
+++ b/main/ui/src/main/resources/fxml/quit.fxml
@@ -18,12 +18,12 @@
 	</padding>
 	<children>
 		<TextFlow styleClass="text-flow">
-			<Text text="TODO Quit application? There are unlocked vaults "/>
+			<Text text="%quit.prompt"/>
 		</TextFlow>
 		<HBox>
-			<Button text="TODO cancel" cancelButton="true" onAction="#cancel"/>
+			<Button text="%generic.button.cancel" cancelButton="true" onAction="#cancel"/>
 			<Region HBox.hgrow="ALWAYS"/>
-			<Button text="TODO lock and quit" defaultButton="true" onAction="#lockAndQuit" fx:id="lockAndQuitButton" contentDisplay="TEXT_ONLY">
+			<Button text="%quit.lockAndQuit" defaultButton="true" onAction="#lockAndQuit" fx:id="lockAndQuitButton" contentDisplay="TEXT_ONLY">
 				<graphic>
 					<ProgressIndicator progress="-1" prefWidth="12" prefHeight="12"/>
 				</graphic>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 077411918..b49966487 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -113,3 +113,7 @@ passwordStrength.messageLabel.3=Strong
 passwordStrength.messageLabel.4=Very strong
 unlock.success.message=Unlocked "%s" successfully! successfully! Your vault is now accessible.
 
+# Quit
+quit.prompt=Quit application? There are unlocked vaults.
+quit.lockAndQuit=Lock and Quit
+