From 8104c35d76ea6a4adb59b01ac25de2c9568dcbce Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Tue, 23 Jan 2024 19:09:49 +0100
Subject: [PATCH] more specific translation keys and consistent spacing

---
 src/main/resources/fxml/share_vault.fxml   | 20 ++++++++++----------
 src/main/resources/i18n/strings.properties | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/fxml/share_vault.fxml b/src/main/resources/fxml/share_vault.fxml
index fd8f80583..cbf8e8242 100644
--- a/src/main/resources/fxml/share_vault.fxml
+++ b/src/main/resources/fxml/share_vault.fxml
@@ -38,7 +38,7 @@
 	<VBox>
 		<VBox HBox.hgrow="ALWAYS" visible="${controller.hubVault}" managed="${controller.hubVault}">
 			<Label text="%shareVault.hub.message" styleClass="label-extra-large" wrapText="true"/>
-			<Region minHeight="15"/>
+			<Region minHeight="12"/>
 			<Label text="%shareVault.hub.description" wrapText="true"/>
 			<GridPane alignment="CENTER_LEFT">
 				<padding>
@@ -52,9 +52,9 @@
 					<RowConstraints valignment="TOP"/>
 				</rowConstraints>
 				<Label text="1." GridPane.rowIndex="0" GridPane.columnIndex="0"/>
-				<Label text="%shareVault.hub.instruction.0" wrapText="true" GridPane.rowIndex="0" GridPane.columnIndex="1"/>
+				<Label text="%shareVault.hub.instruction.1" wrapText="true" GridPane.rowIndex="0" GridPane.columnIndex="1"/>
 				<Label text="2." GridPane.rowIndex="1" GridPane.columnIndex="0"/>
-				<Label text="%shareVault.hub.instruction.1" wrapText="true" GridPane.rowIndex="1" GridPane.columnIndex="1"/>
+				<Label text="%shareVault.hub.instruction.2" wrapText="true" GridPane.rowIndex="1" GridPane.columnIndex="1"/>
 			</GridPane>
 		</VBox>
 		<VBox HBox.hgrow="ALWAYS" visible="${!controller.hubVault}" managed="${!controller.hubVault}">
@@ -73,13 +73,13 @@
 					<RowConstraints valignment="TOP"/>
 				</rowConstraints>
 				<Label text="1." GridPane.rowIndex="0" GridPane.columnIndex="0"/>
-				<Label text="%shareVault.instruction.0" wrapText="true" GridPane.rowIndex="0" GridPane.columnIndex="1"/>
+				<Label text="%shareVault.instruction.1" wrapText="true" GridPane.rowIndex="0" GridPane.columnIndex="1"/>
 				<Label text="2." GridPane.rowIndex="1" GridPane.columnIndex="0"/>
-				<Label text="%shareVault.instruction.1" wrapText="true" GridPane.rowIndex="1" GridPane.columnIndex="1"/>
+				<Label text="%shareVault.instruction.2" wrapText="true" GridPane.rowIndex="1" GridPane.columnIndex="1"/>
 			</GridPane>
 			<Region minHeight="12"/>
 			<HBox HBox.hgrow="ALWAYS" spacing="6">
-				<Label text="%shareVault.more" wrapText="true" VBox.vgrow="ALWAYS"/>
+				<Label text="%shareVault.remarkBestPractices" wrapText="true" VBox.vgrow="ALWAYS"/>
 				<Hyperlink contentDisplay="GRAPHIC_ONLY" onAction="#visitBestPractices">
 					<graphic>
 						<FontAwesome5IconView glyph="QUESTION_CIRCLE" styleClass="glyph-icon-muted"/>
@@ -95,14 +95,14 @@
 					<ImageView HBox.hgrow="ALWAYS" fitWidth="180" preserveRatio="true" cache="true">
 						<Image url="@../img/hub_logo.png"/>
 					</ImageView>
-					<Label text="%shareVault.info.1" style="-fx-font-weight: bold;" wrapText="true"/>
+					<Label text="%shareVault.hubAd.description" style="-fx-font-weight: bold;" wrapText="true"/>
 					<VBox spacing="6" alignment="CENTER_LEFT">
 						<padding>
 							<Insets left="6"/>
 						</padding>
-						<Label text="%shareVault.info.2" wrapText="true"/>
-						<Label text="%shareVault.info.3" wrapText="true"/>
-						<Label text="%shareVault.info.4" wrapText="true"/>
+						<Label text="%shareVault.hubAd.keyManagement" wrapText="true"/>
+						<Label text="%shareVault.hubAd.authentication" wrapText="true"/>
+						<Label text="%shareVault.hubAd.encryption" wrapText="true"/>
 					</VBox>
 				</VBox>
 				<Region HBox.hgrow="ALWAYS"/>
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index 0008b7c86..a45b13217 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -390,7 +390,7 @@ main.vaultDetail.unlockBtn=Unlock…
 main.vaultDetail.unlockNowBtn=Unlock Now
 main.vaultDetail.optionsBtn=Vault Options
 main.vaultDetail.passwordSavedInKeychain=Password saved
-main.vaultDetail.share=Share...
+main.vaultDetail.share=Share…
 ### Unlocked
 main.vaultDetail.unlockedStatus=UNLOCKED
 main.vaultDetail.accessLocation=Your vault's contents are accessible here:
@@ -534,18 +534,18 @@ updateReminder.yesAutomatically=Yes, Automatically
 shareVault.title=Share Vault
 shareVault.message=Would you like to share your vault with others?
 shareVault.description=Always be careful when sharing your vault with other people. In short, follow these steps:
-shareVault.instruction.0=Share access of the encrypted vault folder via cloud storage.
-shareVault.instruction.1=Share vault password in a secure way.
-shareVault.more=For more information, check out the best practices suggestions in our docs.
+shareVault.instruction.1=Share access of the encrypted vault folder via cloud storage.
+shareVault.instruction.2=Share the vault password in a secure way.
+shareVault.remarkBestPractices=For more information, check out the best practices suggestions in our docs.
 shareVault.docsTooltip=Open the documentation to learn more about sharing of vaults.
-shareVault.info.1=The secure way to work in teams
-shareVault.info.2=• Zero-knowledge key management
-shareVault.info.3=• Strong authentication
-shareVault.info.4=• End-to-End Encryption
+shareVault.hubAd.description=The secure way to work in teams
+shareVault.hubAd.keyManagement=• Zero-knowledge key management
+shareVault.hubAd.authentication=• Strong authentication
+shareVault.hubAd.encryption=• End-to-end encryption
 shareVault.visitHub=Visit Cryptomator Hub
 
 shareVault.hub.message=How to share a Hub vault
 shareVault.hub.description=In order to share the vault content with another team member, you have to perform two steps:
-shareVault.hub.instruction.0=Share access of the encrypted vault folder via cloud storage.
-shareVault.hub.instruction.1=Grant access to team member in Cryptomator Hub.
+shareVault.hub.instruction.1=Share access of the encrypted vault folder via cloud storage.
+shareVault.hub.instruction.2=Grant access to team member in Cryptomator Hub.
 shareVault.hub.openHub=Open Cryptomator Hub
\ No newline at end of file