defined color constants for password strength indicator, updated labels

main/ui/src/main/resources/css/dark_theme.css

@@ -51,6 +51,12 @@
 	INDICATOR_BG: #C74234;
 	PROGRESS_INDICATOR_BEGIN: #CFCFCF;
 	PROGRESS_INDICATOR_END: #9E9E9E;
+	PASSWORD_STRENGTH_INDICATOR_BG: #FFF;
+	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_0: #E74C3C;
+	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_1: #E67E22;
+	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_2: #F1C40F;
+	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_3: #40F47E;
+	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_4: #27AE60;
 
 	-fx-background-color: MAIN_BG;
     -fx-text-fill: TEXT_FILL;
@@ -144,16 +150,6 @@
 	-fx-translate-y: 1px;
 }
 
-/*******************************************************************************
- *                                                                             *
- * Preferences Window                                                          *
- *                                                                             *
- ******************************************************************************/
-
-.preferences-window {
-
-}
-
 /*******************************************************************************
  *                                                                             *
  * TabPane                                                                     *
@@ -349,7 +345,7 @@
  ******************************************************************************/
 
 .badge {
-	-fx-font-family: 'Open Sans SemiBold';
+	-fx-font-family: 'Open Sans Bold';
 	-fx-font-size: 0.8em;
 	-fx-background-radius: 4px;
 	-fx-padding: 0.2em 0.4em 0.2em 0.4em;
@@ -376,27 +372,27 @@
  ******************************************************************************/
 
 .password-strength-indicator .segment {
-	-fx-background-color: #ffffff;
+	-fx-background-color: PASSWORD_STRENGTH_INDICATOR_BG;
 }
 
 .password-strength-indicator.strength-0 .segment.active {
-	-fx-background-color: #e74c3c;
+	-fx-background-color: PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_0;
 }
 
 .password-strength-indicator.strength-1 .segment.active {
-	-fx-background-color: #e67e22;
+	-fx-background-color: PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_1;
 }
 
 .password-strength-indicator.strength-2 .segment.active {
-	-fx-background-color: #f1c40f;
+	-fx-background-color: PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_2;
 }
 
 .password-strength-indicator.strength-3 .segment.active {
-	-fx-background-color: #40d47e;
+	-fx-background-color: PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_3;
 }
 
 .password-strength-indicator.strength-4 .segment.active {
-	-fx-background-color: #27ae60;
+	-fx-background-color: PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_4;
 }
 
 /*******************************************************************************

main/ui/src/main/resources/css/light_theme.css

@@ -51,6 +51,12 @@
 	INDICATOR_BG: #E74C3C;
 	PROGRESS_INDICATOR_BEGIN: #515151;
 	PROGRESS_INDICATOR_END: #7E7E7E;
+	PASSWORD_STRENGTH_INDICATOR_BG: #FFF;
+	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_0: #E74C3C;
+	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_1: #E67E22;
+	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_2: #F1C40F;
+	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_3: #40F47E;
+	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_4: #27AE60;
 
 	-fx-background-color: MAIN_BG;
 	-fx-text-fill: TEXT_FILL;
@@ -144,16 +150,6 @@
 	-fx-translate-y: 1px;
 }
 
-/*******************************************************************************
- *                                                                             *
- * Preferences Window                                                          *
- *                                                                             *
- ******************************************************************************/
-
-.preferences-window {
-
-}
-
 /*******************************************************************************
  *                                                                             *
  * TabPane                                                                     *
@@ -376,27 +372,27 @@
  ******************************************************************************/
 
 .password-strength-indicator .segment {
-	-fx-background-color: #ffffff;
+	-fx-background-color: PASSWORD_STRENGTH_INDICATOR_BG;
 }
 
 .password-strength-indicator.strength-0 .segment.active {
-	-fx-background-color: #e74c3c;
+	-fx-background-color: PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_0;
 }
 
 .password-strength-indicator.strength-1 .segment.active {
-	-fx-background-color: #e67e22;
+	-fx-background-color: PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_1;
 }
 
 .password-strength-indicator.strength-2 .segment.active {
-	-fx-background-color: #f1c40f;
+	-fx-background-color: PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_2;
 }
 
 .password-strength-indicator.strength-3 .segment.active {
-	-fx-background-color: #40d47e;
+	-fx-background-color: PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_3;
 }
 
 .password-strength-indicator.strength-4 .segment.active {
-	-fx-background-color: #27ae60;
+	-fx-background-color: PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_4;
 }
 
 /*******************************************************************************

main/ui/src/main/resources/fxml/changepassword.fxml

@@ -26,7 +26,7 @@
 			<Text text="%changepassword.enterOldPassword"/>
 			<Text text=" &quot;"/>
 			<Text text="${controller.vault.displayableName}"/>
-			<Text text="&quot;:"/>
+			<Text text="&quot;"/>
 		</TextFlow>
 		<SecPasswordField fx:id="oldPasswordField"/>
 

main/ui/src/main/resources/i18n/strings.properties

@@ -14,38 +14,38 @@ addvaultwizard.title=Add Vault
 addvaultwizard.welcome.newButton=Create New Vault
 addvaultwizard.welcome.existingButton=Add Existing Vault
 ## New
-addvaultwizard.new.nameInstruction=Please enter a name for your vault:
+addvaultwizard.new.nameInstruction=Enter a name for your vault
 addvaultwizard.new.namePrompt=Vault Name
-addvaultwizard.new.locationInstruction=Please pick a directory where your vault will be stored:
-addvaultwizard.new.locationLabel=Chosen location for your vault:
+addvaultwizard.new.locationInstruction=Pick a directory where your vault will be stored
+addvaultwizard.new.locationLabel=Chosen location for your vault
 addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Custom Location
 addvaultwizard.new.directoryPickerButton=Choose…
 addvaultwizard.new.directoryPickerTitle=Select Directory
-addvaultwizard.new.enterPassword=Please enter a password for your vault:
+addvaultwizard.new.enterPassword=Enter a password for your vault
 addvaultwizard.new.fileAlreadyExists=Vault can not be created at this path because some object already exists.
-addvaultwizard.new.invalidName=Invalid vault name. Please consider a regular directory name
-addvaultwizard.new.reenterPassword=Please confirm the password:
+addvaultwizard.new.invalidName=Invalid vault name. Please consider a regular directory name.
+addvaultwizard.new.reenterPassword=Confirm the password
 addvaultwizard.new.passwordsMatch=Passwords match!
 addvaultwizard.new.passwordsDoNotMatch=Passwords do not match
 addvaultwizard.new.finalConfirmation=I understand that I will not be able to recover my data if I forget my password
 ## Existing
-addvaultwizard.existing.instruction=Please choose the "masterkey.cryptomator" file of your existing vault.
+addvaultwizard.existing.instruction=Choose the "masterkey.cryptomator" file of your existing vault.
 addvaultwizard.existing.chooseBtn=Choose…
 addvaultwizard.existing.filePickerTitle=Select Masterkey File
 
 # Change Password
 changepassword.title=Change Password
-changepassword.enterOldPassword=To change the password, please enter the current password for
-changepassword.enterNewPassword=Please enter a new password for your vault:
-changepassword.reenterNewPassword=Please confirm the new password:
+changepassword.enterOldPassword=Enter the current password for
+changepassword.enterNewPassword=Enter a new password for your vault
+changepassword.reenterNewPassword=Confirm the new password
 changepassword.passwordsMatch=Passwords match!
 changepassword.passwordsDoNotMatch=Passwords do not match
 changepassword.finalConfirmation=I understand that I will not be able to recover my data if I forget my password
 
 # Unlock
 unlock.title=Unlock Vault
-unlock.passwordPrompt=Enter Password for
+unlock.passwordPrompt=Enter password for
 unlock.savePassword=Save Password
 unlock.unlockBtn=Unlock
 ## Success