Bladeren bron

renamed translation keys

Sebastian Stenzel 3 jaren geleden
bovenliggende
commit
a8e73350a6

+ 3 - 3
src/main/java/org/cryptomator/common/settings/UiTheme.java

@@ -3,9 +3,9 @@ package org.cryptomator.common.settings;
 import org.apache.commons.lang3.SystemUtils;
 
 public enum UiTheme {
-	LIGHT("preferences.general.theme.light"), //
-	DARK("preferences.general.theme.dark"), //
-	AUTOMATIC("preferences.general.theme.automatic");
+	LIGHT("preferences.interface.theme.light"), //
+	DARK("preferences.interface.theme.dark"), //
+	AUTOMATIC("preferences.interface.theme.automatic");
 
 	public static UiTheme[] applicableValues() {
 		if (SystemUtils.IS_OS_MAC || SystemUtils.IS_OS_WINDOWS) {

+ 1 - 1
src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java

@@ -138,7 +138,7 @@ public class InterfacePreferencesController implements FxController {
 		@Override
 		public String toString(String tag) {
 			if (tag == null) {
-				return resourceBundle.getString("preferences.general.language.auto");
+				return resourceBundle.getString("preferences.interface.language.auto");
 			} else {
 				var locale = Locale.forLanguageTag(tag);
 				var lang = locale.getDisplayLanguage(locale);

+ 8 - 8
src/main/resources/fxml/preferences_interface.fxml

@@ -21,25 +21,25 @@
 	</padding>
 	<children>
 		<HBox spacing="6" alignment="CENTER_LEFT">
-			<Label text="%preferences.general.theme"/>
+			<Label text="%preferences.interface.theme"/>
 			<ChoiceBox fx:id="themeChoiceBox" disable="${!controller.licenseHolder.validLicense}"/>
-			<Hyperlink styleClass="hyperlink-underline,hyperlink-muted" text="%preferences.general.unlockThemes" onAction="#showContributeTab" visible="${!controller.licenseHolder.validLicense}" managed="${!controller.licenseHolder.validLicense}"/>
+			<Hyperlink styleClass="hyperlink-underline,hyperlink-muted" text="%preferences.interface.unlockThemes" onAction="#showContributeTab" visible="${!controller.licenseHolder.validLicense}" managed="${!controller.licenseHolder.validLicense}"/>
 		</HBox>
 
 		<HBox spacing="6" alignment="CENTER_LEFT">
-			<Label text="%preferences.general.language"/>
+			<Label text="%preferences.interface.language"/>
 			<ChoiceBox fx:id="preferredLanguageChoiceBox"/>
 		</HBox>
 
 		<HBox spacing="6" alignment="CENTER_LEFT">
-			<Label text="%preferences.general.interfaceOrientation" HBox.hgrow="NEVER"/>
-			<RadioButton fx:id="nodeOrientationLtr" text="%preferences.general.interfaceOrientation.ltr" alignment="CENTER_LEFT" toggleGroup="${nodeOrientation}"/>
-			<RadioButton fx:id="nodeOrientationRtl" text="%preferences.general.interfaceOrientation.rtl" alignment="CENTER_RIGHT" toggleGroup="${nodeOrientation}"/>
+			<Label text="%preferences.interface.interfaceOrientation" HBox.hgrow="NEVER"/>
+			<RadioButton fx:id="nodeOrientationLtr" text="%preferences.interface.interfaceOrientation.ltr" alignment="CENTER_LEFT" toggleGroup="${nodeOrientation}"/>
+			<RadioButton fx:id="nodeOrientationRtl" text="%preferences.interface.interfaceOrientation.rtl" alignment="CENTER_RIGHT" toggleGroup="${nodeOrientation}"/>
 		</HBox>
 
 
-		<CheckBox fx:id="showMinimizeButtonCheckbox" text="%preferences.general.showMinimizeButton" visible="${controller.trayMenuInitialized}" managed="${controller.trayMenuInitialized}"/>
+		<CheckBox fx:id="showMinimizeButtonCheckbox" text="%preferences.interface.showMinimizeButton" visible="${controller.trayMenuInitialized}" managed="${controller.trayMenuInitialized}"/>
 
-		<CheckBox fx:id="showTrayIconCheckbox" text="%preferences.general.showTrayIcon" visible="${controller.trayMenuSupported}" managed="${controller.trayMenuSupported}"/>
+		<CheckBox fx:id="showTrayIconCheckbox" text="%preferences.interface.showTrayIcon" visible="${controller.trayMenuSupported}" managed="${controller.trayMenuSupported}"/>
 	</children>
 </VBox>

+ 12 - 12
src/main/resources/i18n/strings.properties

@@ -191,25 +191,25 @@ health.fix.failTip=Fix failed, see log for details
 preferences.title=Preferences
 ## General
 preferences.general=General
-preferences.general.theme=Look & Feel
-preferences.general.theme.automatic=Automatic
-preferences.general.theme.light=Light
-preferences.general.theme.dark=Dark
-preferences.general.unlockThemes=Unlock dark mode
-preferences.general.showMinimizeButton=Show minimize button
-preferences.general.showTrayIcon=Show tray icon (requires restart)
 preferences.general.startHidden=Hide window when starting Cryptomator
-preferences.general.language=Language (requires restart)
-preferences.general.language.auto=System Default
 preferences.general.debugLogging=Enable debug logging
 preferences.general.debugDirectory=Reveal log files
 preferences.general.autoStart=Launch Cryptomator on system start
 preferences.general.keychainBackend=Store passwords with
-preferences.general.interfaceOrientation=Interface Orientation
-preferences.general.interfaceOrientation.ltr=Left to Right
-preferences.general.interfaceOrientation.rtl=Right to Left
 ## Interface
 preferences.interface=Interface
+preferences.interface.theme=Look & Feel
+preferences.interface.theme.automatic=Automatic
+preferences.interface.theme.dark=Dark
+preferences.interface.theme.light=Light
+preferences.interface.unlockThemes=Unlock dark mode
+preferences.interface.language=Language (requires restart)
+preferences.interface.language.auto=System Default
+preferences.interface.interfaceOrientation=Interface Orientation
+preferences.interface.interfaceOrientation.ltr=Left to Right
+preferences.interface.interfaceOrientation.rtl=Right to Left
+preferences.interface.showMinimizeButton=Show minimize button
+preferences.interface.showTrayIcon=Show tray icon (requires restart)
 ## Volume
 preferences.volume=Virtual Drive
 preferences.volume.type=Volume Type