~exprez135/cryptomator-libre

006d20140002f408fb28e0fbf9ec91ecbd5aded5 — Sebastian Stenzel 1 year, 8 months ago cceea1c + 2a964ae
Merge branch 'develop' into release/1.5.0
M main/ui/src/main/resources/css/dark_theme.css => main/ui/src/main/resources/css/dark_theme.css +5 -4
@@ 51,6 51,7 @@
	YELLOW_5: #F1C40F;

	MAIN_BG: GRAY_1;
	MUTED_BG: GRAY_3;
	TEXT_FILL: GRAY_9;
	TEXT_FILL_HIGHLIGHTED: PRIMARY;
	TEXT_FILL_MUTED: GRAY_5;


@@ 95,7 96,7 @@
	-fx-text-fill: TEXT_FILL;
}

.label-secondary {
.label-muted {
	-fx-text-fill: TEXT_FILL_MUTED;
}



@@ 380,9 381,9 @@
	-fx-background-color: PRIMARY;
}

.badge-secondary {
.badge-muted {
	-fx-text-fill: white;
	-fx-background-color: SECONDARY;
	-fx-background-color: MUTED_BG;
}

/*******************************************************************************


@@ 577,7 578,7 @@
	-fx-underline: true;
}

.hyperlink.hyperlink-secondary {
.hyperlink.hyperlink-muted {
	-fx-text-fill: TEXT_FILL_MUTED;
}


M main/ui/src/main/resources/css/light_theme.css => main/ui/src/main/resources/css/light_theme.css +5 -4
@@ 51,6 51,7 @@
	YELLOW_5: #F1C40F;

	MAIN_BG: GRAY_9;
	MUTED_BG: GRAY_5;
	TEXT_FILL: GRAY_0;
	TEXT_FILL_HIGHLIGHTED: PRIMARY;
	TEXT_FILL_MUTED: GRAY_5;


@@ 95,7 96,7 @@
	-fx-text-fill: TEXT_FILL;
}

.label-secondary {
.label-muted {
	-fx-text-fill: TEXT_FILL_MUTED;
}



@@ 379,9 380,9 @@
	-fx-background-color: PRIMARY;
}

.badge-secondary {
.badge-muted {
	-fx-text-fill: white;
	-fx-background-color: SECONDARY;
	-fx-background-color: MUTED_BG;
}

/*******************************************************************************


@@ 576,7 577,7 @@
	-fx-underline: true;
}

.hyperlink.hyperlink-secondary {
.hyperlink.hyperlink-muted {
	-fx-text-fill: TEXT_FILL_MUTED;
}


M main/ui/src/main/resources/fxml/new_password.fxml => main/ui/src/main/resources/fxml/new_password.fxml +2 -2
@@ 19,12 19,12 @@
		<Label text="%newPassword.promptText" labelFor="$passwordField"/>
		<NiceSecurePasswordField fx:id="passwordField"/>
		<PasswordStrengthIndicator spacing="6" prefHeight="6" strength="${controller.passwordStrength}"/>
		<Label fx:id="passwordStrengthLabel" styleClass="label-secondary" alignment="CENTER_RIGHT" maxWidth="Infinity"/>
		<Label fx:id="passwordStrengthLabel" styleClass="label-muted" alignment="CENTER_RIGHT" maxWidth="Infinity"/>
	
		<Region/>

		<Label text="%newPassword.reenterPassword" labelFor="$reenterField"/>
		<NiceSecurePasswordField fx:id="reenterField"/>
		<Label fx:id="passwordMatchLabel" styleClass="label-secondary" alignment="CENTER_RIGHT" maxWidth="Infinity" graphicTextGap="6" contentDisplay="LEFT" />
		<Label fx:id="passwordMatchLabel" styleClass="label-muted" alignment="CENTER_RIGHT" maxWidth="Infinity" graphicTextGap="6" contentDisplay="LEFT" />
	</children>
</VBox>

M main/ui/src/main/resources/fxml/preferences_general.fxml => main/ui/src/main/resources/fxml/preferences_general.fxml +1 -1
@@ 23,7 23,7 @@
		<HBox spacing="6" alignment="CENTER_LEFT">
			<Label text="%preferences.general.theme"/>
			<ChoiceBox fx:id="themeChoiceBox" disable="${!controller.licenseHolder.validLicense}"/>
			<Hyperlink styleClass="hyperlink-underline,hyperlink-secondary" text="%preferences.general.unlockThemes" onAction="#showDonationTab" visible="${!controller.licenseHolder.validLicense}" managed="${!controller.licenseHolder.validLicense}"/>
			<Hyperlink styleClass="hyperlink-underline,hyperlink-muted" text="%preferences.general.unlockThemes" onAction="#showDonationTab" visible="${!controller.licenseHolder.validLicense}" managed="${!controller.licenseHolder.validLicense}"/>
		</HBox>

		<HBox spacing="6" alignment="CENTER_LEFT">

M main/ui/src/main/resources/fxml/vault_detail.fxml => main/ui/src/main/resources/fxml/vault_detail.fxml +3 -3
@@ 32,11 32,11 @@
						</tooltip>
					</Label>
					<Region HBox.hgrow="ALWAYS"/>
					<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-muted" text="%main.vaultDetail.lockedStatus" minWidth="-Infinity" visible="${controller.vault.locked}" managed="${controller.vault.locked}"/>
					<Label styleClass="badge,badge-pill,badge-muted" text="…" minWidth="-Infinity" visible="${controller.vault.processing}" managed="${controller.vault.processing}"/>
					<Label styleClass="badge,badge-pill,badge-primary" text="%main.vaultDetail.unlockedStatus" minWidth="-Infinity" visible="${controller.vault.unlocked}" managed="${controller.vault.unlocked}"/>
				</HBox>
				<Hyperlink styleClass="hyperlink-secondary,hyperlink-hover-icon" text="${controller.vault.displayablePath}" textOverrun="CENTER_ELLIPSIS" onAction="#revealStorageLocation">
				<Hyperlink styleClass="hyperlink-muted,hyperlink-hover-icon" text="${controller.vault.displayablePath}" textOverrun="CENTER_ELLIPSIS" onAction="#revealStorageLocation">
					<graphic>
						<FontAwesome5IconView styleClass="glyph-icon-muted" glyph="EYE"/>
					</graphic>

M main/ui/src/main/resources/i18n/strings_it.properties => main/ui/src/main/resources/i18n/strings_it.properties +11 -0
@@ 50,6 50,7 @@ addvaultwizard.new.generateRecoveryKeyChoice.yes=Si, per favore, è meglio esser
addvaultwizard.new.generateRecoveryKeyChoice.no=No grazie, non perderò la mia password
### Information
addvault.new.readme.storageLocation.fileName=IMPORTANTE.rtf
addvault.new.readme.storageLocation.1=⚠ FILE CASSAFORTE ⚠
addvault.new.readme.storageLocation.2=Questa è la posizione di archiviazione della tua cassaforte.
addvault.new.readme.storageLocation.3=NON
addvault.new.readme.storageLocation.4=• modificare qualsiasi file in questa cartella o


@@ 58,6 59,7 @@ addvault.new.readme.storageLocation.6=Se si desidera crittografare i file e visu
addvault.new.readme.storageLocation.7=1. Aggiungi questa cassaforte a Cryptomator.
addvault.new.readme.storageLocation.8=2. Sblocca la cassaforte in Criptomator.
addvault.new.readme.storageLocation.9=3. Apri la posizione di accesso cliccando sul pulsante "Rivela".
addvault.new.readme.storageLocation.10=Se hai bisogno di aiuto, leggi la documentazione: %s
addvault.new.readme.accessLocation.fileName=BENVENUTO.rtf
addvault.new.readme.accessLocation.1=🔐 VOLUME CRIPTATO 🔐
addvault.new.readme.accessLocation.2=Questa è la posizione di accesso della tua cassaforte.


@@ 119,6 121,7 @@ preferences.title=Impostazioni
## General
preferences.general=Generali
preferences.general.theme=Aspetto
preferences.general.unlockThemes=Sblocca modalità scura
preferences.general.startHidden=Nascondi la finestra all'avvio di Cryptomator
preferences.general.debugLogging=Abilita i registri di debug
preferences.general.autoStart=Avvia Cryptomator all'avvio del sistema


@@ 142,6 145,7 @@ preferences.donationKey.registeredFor=Registrato per %s
preferences.donationKey.noDonationKey=Nessuna chiave di donazione valida. È come una chiave di licenza ma per persone fantastiche che usano software gratuito. ;-)
preferences.donationKey.getDonationKey=Ottieni una chiave di donazione
## About
preferences.about=Informazioni

# Main Window
main.closeBtn.tooltip=Chiudi


@@ 180,6 184,13 @@ main.vaultDetail.migratePrompt=Prima di potervi accedere la tua cassaforte deve 

# Wrong File Alert
wrongFileAlert.title=Come Criptare i File
wrongFileAlert.header.title=Hai provato a cifrare questi file?
wrongFileAlert.header.lead=A questo scopo, Cryptomator fornisce un volume nel file manager di sistema.
wrongFileAlert.instruction.0=Per cifrare file, segui questi passi:
wrongFileAlert.instruction.1=1. Sblocca la tua cassaforte.
wrongFileAlert.instruction.2=2. Clicca su "Rivela" per aprire il volume nel tuo file manager.
wrongFileAlert.instruction.3=3. Aggiungi i tuoi file a questo volume.
wrongFileAlert.link=Per ulteriore assistenza, visita

# Vault Options
## General

A main/ui/src/main/resources/i18n/strings_ro.properties => main/ui/src/main/resources/i18n/strings_ro.properties +63 -0
@@ 0,0 1,63 @@
# Locale Specific CSS files such as CJK, RTL,...

# Generics
## Button
## Error

# Tray Menu

# Add Vault Wizard
## Welcome
## New
### Name
### Location
### Password
### Information
## Existing
## Success

# Remove Vault

# Change Password

# Forget Password

# Unlock
## Success
## Invalid Mount Point

# Migration
## Start
## Run
## Sucess
## Missing file system capabilities

# Preferences
## General
## Volume
## Updates
## Donation Key
## About

# Main Window
## Drag 'n' Drop
## Vault List
## Vault Detail
### Welcome
### Locked
### Unlocked
### Missing
### Needs Migration

# Wrong File Alert

# Vault Options
## General
## Mount
## Master Key

# Recovery Key

# New Password

# Quit

M main/ui/src/main/resources/i18n/strings_zh_TW.properties => main/ui/src/main/resources/i18n/strings_zh_TW.properties +1 -0
@@ 81,6 81,7 @@ removeVault.confirmBtn=移除加密檔案庫
# Change Password
changepassword.title=變更密碼
changepassword.enterOldPassword=輸入 "%s" 目前的密碼
changepassword.finalConfirmation=我明白如果忘記密碼將無法存取資料

# Forget Password
forgetPassword.title=忘記密碼