From c9d897edd155113ea22c9370288a5bbd4b7b85d4 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 28 Aug 2019 11:17:45 +0200
Subject: [PATCH] added window prefix "main.*" to localizable strings in main
 window

---
 .../src/main/resources/fxml/vault_detail.fxml | 20 +++++++-------
 .../src/main/resources/fxml/vault_list.fxml   |  2 +-
 .../main/resources/i18n/strings.properties    | 26 +++++++++++--------
 .../main/resources/i18n/strings_en.properties |  0
 4 files changed, 26 insertions(+), 22 deletions(-)
 delete mode 100644 main/ui/src/main/resources/i18n/strings_en.properties

diff --git a/main/ui/src/main/resources/fxml/vault_detail.fxml b/main/ui/src/main/resources/fxml/vault_detail.fxml
index 66e700475..9849bc07d 100644
--- a/main/ui/src/main/resources/fxml/vault_detail.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail.fxml
@@ -37,9 +37,9 @@
 							</tooltip>
 						</Label>
 						<Region HBox.hgrow="ALWAYS"/>
-						<Label styleClass="badge,badge-pill,badge-secondary" text="%vaultDetail.lockedStatus" minWidth="-Infinity" visible="${controller.vault.locked}" managed="${controller.vault.locked}"/>
+						<Label styleClass="badge,badge-pill,badge-secondary" text="%main.vaultDetail.lockedStatus" minWidth="-Infinity" visible="${controller.vault.locked}" managed="${controller.vault.locked}"/>
 						<Label styleClass="badge,badge-pill,badge-secondary" text="…" minWidth="-Infinity" visible="${controller.vault.processing}" managed="${controller.vault.processing}"/>
-						<Label styleClass="badge,badge-pill,badge-primary" text="%vaultDetail.unlockedStatus" minWidth="-Infinity" visible="${controller.vault.unlocked}" managed="${controller.vault.unlocked}"/>
+						<Label styleClass="badge,badge-pill,badge-primary" text="%main.vaultDetail.unlockedStatus" minWidth="-Infinity" visible="${controller.vault.unlocked}" managed="${controller.vault.unlocked}"/>
 					</HBox>
 					<Hyperlink styleClass="vault-path" text="${controller.vault.displayablePath}" textOverrun="CENTER_ELLIPSIS" onAction="#revealStorageLocation">
 						<graphic>
@@ -58,11 +58,11 @@
 				<graphic>
 					<HBox alignment="CENTER">
 						<VBox styleClass="button-group-labels">
-							<Label styleClass="button-group-heading" text="%vaultDetail.accessLocation"/>
+							<Label styleClass="button-group-heading" text="%main.vaultDetail.accessLocation"/>
 							<Label text="${controller.vault.accessPoint}"/>
 						</VBox>
 						<Region HBox.hgrow="ALWAYS"/>
-						<Label styleClass="button-group-action" text="%vaultDetail.revealAccessLocation" minWidth="-Infinity"/>
+						<Label styleClass="button-group-action" text="%main.vaultDetail.revealAccessLocation" minWidth="-Infinity"/>
 					</HBox>
 				</graphic>
 			</Button>
@@ -71,15 +71,15 @@
 				<graphic>
 					<HBox alignment="CENTER" spacing="24">
 						<VBox styleClass="button-group-labels" HBox.hgrow="ALWAYS">
-							<Label styleClass="button-group-heading" text="%vaultDetail.bytesPerSecondRead"/>
 							<Label text="${controller.vault.stats.bytesPerSecondRead}"/>
+							<Label styleClass="button-group-heading" text="%main.vaultDetail.bytesPerSecondRead"/>
 						</VBox>
 						<VBox styleClass="button-group-labels" HBox.hgrow="ALWAYS">
-							<Label styleClass="button-group-heading" text="%vaultDetail.bytesPerSecondWritten"/>
 							<Label text="${controller.vault.stats.bytesPerSecondWritten}"/>
+							<Label styleClass="button-group-heading" text="%main.vaultDetail.bytesPerSecondWritten"/>
 						</VBox>
 						<Region HBox.hgrow="ALWAYS"/>
-						<Label styleClass="button-group-action" text="%vaultDetail.showChart" minWidth="-Infinity"/>
+						<Label styleClass="button-group-action" text="%main.vaultDetail.showChart" minWidth="-Infinity"/>
 					</HBox>
 				</graphic>
 			</Button>
@@ -88,19 +88,19 @@
 		<Region prefHeight="12" VBox.vgrow="NEVER"/>
 
 		<VBox alignment="CENTER" spacing="12" visible="${controller.vault.locked}" managed="${controller.vault.locked}">
-			<Button styleClass="button-large" text="%vaultDetail.unlockBtn" minWidth="120" onAction="#unlock" defaultButton="${controller.vault.locked}">
+			<Button styleClass="button-large" text="%main.vaultDetail.unlockBtn" minWidth="120" onAction="#unlock" defaultButton="${controller.vault.locked}">
 				<graphic>
 					<FontAwesome5IconView glyph="LOCK_OPEN_ALT" glyphSize="15"/>
 				</graphic>
 			</Button>
-			<Hyperlink text="%vaultDetail.optionsBtn" onAction="#showVaultOptions">
+			<Hyperlink text="%main.vaultDetail.optionsBtn" onAction="#showVaultOptions">
 				<graphic>
 					<FontAwesome5IconView glyph="COG"/>
 				</graphic>
 			</Hyperlink>
 		</VBox>
 		<VBox alignment="CENTER" spacing="12" visible="${controller.vault.unlocked}" managed="${controller.vault.unlocked}">
-			<Button styleClass="button-large" text="%vaultDetail.lockBtn" minWidth="120" onAction="#lock">
+			<Button styleClass="button-large" text="%main.vaultDetail.lockBtn" minWidth="120" onAction="#lock">
 				<graphic>
 					<FontAwesome5IconView glyph="LOCK_ALT" glyphSize="15"/>
 				</graphic>
diff --git a/main/ui/src/main/resources/fxml/vault_list.fxml b/main/ui/src/main/resources/fxml/vault_list.fxml
index 56f52c8a5..f436edbb0 100644
--- a/main/ui/src/main/resources/fxml/vault_list.fxml
+++ b/main/ui/src/main/resources/fxml/vault_list.fxml
@@ -18,7 +18,7 @@
 		<ListView fx:id="vaultList" editable="true"/>
 		<AnchorPane fx:id="onboardingOverlay">
 			<HBox AnchorPane.leftAnchor="10.0" AnchorPane.rightAnchor="10.0" AnchorPane.bottomAnchor="100.0" alignment="BOTTOM_LEFT">
-				<Label textAlignment="CENTER" text="%vaultlist.emptyList.onboardingInstruction" wrapText="true"/>
+				<Label textAlignment="CENTER" text="%main.vaultlist.emptyList.onboardingInstruction" wrapText="true"/>
 			</HBox>
 			<Arc styleClass="onboarding-overlay-arc" AnchorPane.bottomAnchor="5.0" type="OPEN" centerX="-10.0" centerY="0.0" radiusY="100.0" radiusX="60.0" startAngle="0" length="-60.0" strokeWidth="1"/>
 		</AnchorPane>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 83d241800..a8b545d25 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -80,18 +80,21 @@ preferences.updates.checkNowBtn=Check Now
 # Main Window
 main.closeBtn.tooltip=Close
 main.preferencesBtn.tooltip=Preferences
-vaultlist.emptyList.onboardingInstruction=Click here to add a vault
+main.vaultlist.emptyList.onboardingInstruction=Click here to add a vault
 ## Vault Detail
-vaultDetail.lockedStatus=LOCKED
-vaultDetail.unlockedStatus=UNLOCKED
-vaultDetail.unlockBtn=Unlock
-vaultDetail.optionsBtn=Vault Options
-vaultDetail.lockBtn=Lock
-vaultDetail.accessLocation=access location
-vaultDetail.revealAccessLocation=REVEAL
-vaultDetail.bytesPerSecondRead=read
-vaultDetail.bytesPerSecondWritten=written
-vaultDetail.showChart=SHOW CHART
+main.vaultDetail.lockedStatus=LOCKED
+main.vaultDetail.unlockedStatus=UNLOCKED
+main.vaultDetail.unlockBtn=Unlock
+main.vaultDetail.optionsBtn=Vault Options
+main.vaultDetail.lockBtn=Lock
+main.vaultDetail.accessLocation=access location
+main.vaultDetail.revealAccessLocation=REVEAL
+main.vaultDetail.bytesPerSecondRead=read
+main.vaultDetail.bytesPerSecondWritten=written
+main.vaultDetail.showChart=SHOW CHART
+main.vaultDetail.throughput.idle=idle
+main.vaultDetail.throughput.kbps=%.1f kiB/s
+main.vaultDetail.throughput.mbps=%.1f MiB/s
 
 # Vault Options
 vaultOptions.general=General
@@ -107,3 +110,4 @@ passwordStrength.messageLabel.1=Weak
 passwordStrength.messageLabel.2=Fair
 passwordStrength.messageLabel.3=Strong
 passwordStrength.messageLabel.4=Very strong
+
diff --git a/main/ui/src/main/resources/i18n/strings_en.properties b/main/ui/src/main/resources/i18n/strings_en.properties
deleted file mode 100644
index e69de29bb..000000000