Skip to content

A modern terminal with a built-in multiplexer: close it and your sessions keep running. Run shells and tons of AI agents across your machines, then pick them up from desktop, browser, TUI and more. Written in Rust with no UI framework: interface drawn straight on the GPU. No Electron, GPUI or webview.

Localize settings import UI and handle glyph errors

RoversX91504c1513da
diff --git a/wezterm-gui/i18n/en-US.ftl b/wezterm-gui/i18n/en-US.ftl
index f6247350..472630b3 100644
--- a/wezterm-gui/i18n/en-US.ftl
+++ b/wezterm-gui/i18n/en-US.ftl
@@ -30,7 +30,7 @@ settings-section-appearance = Appearance
settings-section-terminal = Terminal
settings-section-workspaces = Workspaces
settings-section-keymap = Keymap
-settings-section-compatibility = Compatibility
+settings-section-compatibility = Import from WezTerm
settings-section-developer = Developer
settings-section-about = About
settings-search-placeholder = Search settings…
@@ -39,11 +39,11 @@ settings-keymap-description = Keyboard shortcuts and command palette actions.
settings-about-description = ThinkTerm version, project information, and app metadata.
settings-general-heading = Configuration
settings-config-source = Config Source
-settings-native-settings = ThinkTerm Native Settings
-settings-native-settings-default = Defaults; optional file at { $path }
-settings-native-settings-description = Small ThinkTerm-native state; terminal config stays in ThinkTerm's own thinkterm.lua.
+settings-native-settings = ThinkTerm Settings
+settings-native-settings-default = Built-in defaults; optional settings file: { $path }
+settings-native-settings-description = Stores ThinkTerm app preferences. Terminal behavior remains configured in thinkterm.lua.
settings-theme-mode = Theme Mode
-settings-theme-description = ThinkTerm-native window appearance preference.
+settings-theme-description = Choose whether ThinkTerm windows follow the system appearance or use a light or dark theme.
settings-theme-system = System
settings-theme-light = Light
settings-theme-dark = Dark
@@ -53,12 +53,12 @@ settings-main-renderer = Main Window Renderer
settings-main-renderer-description = Applies to the main terminal window after restart.
settings-restore-window-frame = Restore Main Window Frame
settings-restore-window-frame-description = macOS restores the last main terminal window size and position.
-settings-restart = Restart
-settings-restart-app = Restart ThinkTerm
-settings-restart-status = Renderer change status: { $status }.
-settings-quit = Quit
-settings-quit-description = Close all ThinkTerm windows and exit the app.
-settings-quit-app = Quit ThinkTerm
+settings-restart = Restart ThinkTerm
+settings-restart-app = Restart
+settings-restart-status = Renderer changes: { $status }.
+settings-quit = Quit ThinkTerm
+settings-quit-description = Close every ThinkTerm window and exit the app.
+settings-quit-app = Quit
settings-appearance-theme-heading = Theme
settings-app-icon = App Icon
settings-app-icon-description = Switch the running Dock and app switcher icon.
@@ -66,12 +66,12 @@ settings-app-icon-note = Currently only works on macOS.
settings-app-icon-simple = Simple
settings-app-icon-classic = Classic
settings-effective-color-scheme = Effective Color Scheme
-settings-effective-color-scheme-description = Resolved through the WezTerm-compatible config path.
+settings-effective-color-scheme-description = The color scheme currently selected by thinkterm.lua.
settings-typography-heading = Typography
settings-font-size-settings = Settings UI Font Size
-settings-font-size-settings-description = Controls the Settings window chrome and content text.
+settings-font-size-settings-description = Changes the text size throughout the Settings window.
settings-font-size-home = Home Font Size
-settings-font-size-home-description = Controls the main home/content view text.
+settings-font-size-home-description = Changes text in Home and the main content area.
settings-font-size-right-sidebar = Right Sidebar Font Size
settings-font-size-right-sidebar-description = Follows Home Font Size until set — files, notes and snippets panel.
settings-font-size-workspace-sidebar = Workspace Sidebar Font Size
@@ -87,56 +87,96 @@ settings-sftp-idle = Remote Files Connection Idle Timeout
settings-sftp-idle-description = Disconnects an unused SFTP session; directory and preview data are released immediately.
settings-download-folder = Download Folder
settings-system-download-folder = Use the System Downloads Folder
-settings-system-download-folder-description = Clears the chosen folder so downloads follow this computer's own setting.
+settings-system-download-folder-description = Removes the custom path and uses this computer's system Downloads folder.
settings-remote-drop-destination = Remote Drop Destination
settings-remote-drop-destination-description = Where files dropped onto a remote terminal are uploaded. Use cwd for the shell's current directory.
settings-notifications-heading = Notifications
settings-notification-sounds = Notification Sounds
settings-notification-sounds-description = Play a short sound when a thread finishes or starts waiting on you.
-settings-terminal-heading = Effective terminal config
+settings-terminal-heading = Terminal configuration
settings-terminal-font-size = Font Size
-settings-terminal-font-size-description = Current effective value from the WezTerm-compatible config.
+settings-terminal-font-size-description = Current value loaded from thinkterm.lua.
settings-terminal-font-family = Font Family
-settings-terminal-font-family-description = Current primary terminal font family.
+settings-terminal-font-family-description = Current primary terminal font loaded from thinkterm.lua.
settings-terminal-native-font-size = ThinkTerm Font Size
settings-terminal-native-font-size-description = Saved locally and applied immediately to open terminal windows.
settings-terminal-native-font-family = Native Font Family
settings-terminal-native-font-family-description = Local quick-setting draft. Persistence and terminal application are pending.
settings-remote-pane-resize-mode = Remote Split Resize
-settings-remote-pane-resize-mode-description = Auto follows live when the mux is fast and sends once on release when the connection is slow.
+settings-remote-pane-resize-mode-description = Auto updates continuously on fast connections and sends only the final size on slower connections.
settings-remote-pane-resize-mode-auto = Auto
settings-remote-pane-resize-mode-live = Live
settings-remote-pane-resize-mode-on-release = On release
settings-bottom-quote = Bottom Quote
-settings-bottom-quote-description = Shows a small quote in the existing bottom gutter.
+settings-bottom-quote-description = Show a short quote at the bottom of the terminal window.
settings-quote-font-size = Quote Font Size
-settings-quote-font-size-description = Changes only the painted quote text; gutter height stays unchanged.
+settings-quote-font-size-description = Change the quote text size without changing the terminal layout.
settings-quote-rotation = Quote Rotation
-settings-quote-rotation-description = Timed rotates in order; pseudo-random picks a stable quote per interval.
-settings-quote-mode-timed = Timed
-settings-quote-mode-random = Pseudo-random
+settings-quote-rotation-description = Sequential shows quotes in order; random chooses a different quote each interval.
+settings-quote-mode-timed = Sequential
+settings-quote-mode-random = Random
settings-quote-interval = Quote Interval
settings-quote-interval-description = Controls how often the bottom quote rotates.
settings-open-quotes-json = Open Quotes JSON
settings-reset-quotes-json = Reset Quotes JSON
-settings-compatibility-description = ThinkTerm uses its own WezTerm-compatible config. Existing WezTerm files are optional import sources, not shared live state.
-settings-thinkterm-config = ThinkTerm Config
-settings-thinkterm-config-missing = Not created yet; target is { $path }
-settings-wezterm-source = WezTerm Source
-settings-wezterm-source-missing = No existing WezTerm config found
+settings-compatibility-description = Copy selected settings from an existing WezTerm configuration. Imported values do not stay synchronized with the original file.
+settings-thinkterm-config = ThinkTerm configuration
+settings-thinkterm-config-missing = Will be created at { $path }
+settings-wezterm-source = Detected WezTerm configuration
+settings-wezterm-source-missing = No WezTerm configuration found
settings-loaded-source = Loaded Source
settings-not-loaded = Not loaded yet
settings-loaded-source-warnings = { $source } ({ $count } warnings)
-settings-importable-fields = Importable Fields
-settings-importable-fields-description = Choose exactly which source config values ThinkTerm should copy.
+settings-importable-fields = Settings to import
+settings-importable-fields-description = Choose which settings ThinkTerm should copy.
settings-no-fields-loaded = No fields loaded
settings-fields-selected = { $selected } of { $total } selected
settings-detected-fields = Detected Fields
-settings-load-source-description = Load a WezTerm source config to inspect importable fields.
-settings-load-wezterm-source = Load WezTerm Source
+settings-load-source-description = Read the detected WezTerm configuration to review supported settings.
+settings-load-wezterm-source = Review Detected Settings
settings-import-selected = Import Selected
-settings-open-wezterm-source = Open WezTerm Source
-settings-open-thinkterm-config = Open ThinkTerm Config
+settings-open-wezterm-source = Open WezTerm Configuration
+settings-open-thinkterm-config = Open ThinkTerm Configuration
+settings-import-config-ready = Ready
+settings-import-config-will-create = Will create
+settings-import-selection = Import selection
+settings-import-selection-description = Review the detected settings, select what you want, then import once.
+settings-import-category-appearance = Appearance
+settings-import-category-terminal = Terminal
+settings-import-category-window = Window
+settings-import-category-keymap = Keymap
+settings-import-field-color-scheme = Color scheme
+settings-import-field-window-opacity = Window background opacity
+settings-import-field-macos-blur = macOS background blur
+settings-import-field-inactive-pane = Inactive pane colors
+settings-import-field-font-size = Font size
+settings-import-field-font = Font
+settings-import-field-line-height = Line height
+settings-import-field-cell-width = Cell width
+settings-import-field-default-program = Default program
+settings-import-field-default-directory = Default directory
+settings-import-field-renderer = Renderer
+settings-import-field-window-decorations = Window decorations
+settings-import-field-disable-default-keys = Disable default shortcuts
+settings-import-field-key-bindings = Key bindings
+settings-import-field-key-tables = Key tables
+settings-import-description-color-scheme = Color scheme selected by the source configuration.
+settings-import-description-window-opacity = Background opacity of terminal windows.
+settings-import-description-macos-blur = Blur behind transparent windows on macOS.
+settings-import-description-inactive-pane = Color adjustment applied to inactive split panes.
+settings-import-description-font-size = Terminal text size.
+settings-import-description-font = Terminal font stack.
+settings-import-description-line-height = Vertical spacing between terminal rows.
+settings-import-description-cell-width = Horizontal spacing of terminal cells.
+settings-import-description-default-program = Shell or command opened in new panes.
+settings-import-description-default-directory = Working directory used for new panes.
+settings-import-description-renderer = OpenGL or WebGPU rendering backend.
+settings-import-description-window-decorations = Native or custom title bar and window controls.
+settings-import-description-disable-default-keys = Whether ThinkTerm's built-in shortcuts are disabled.
+settings-import-description-key-bindings = { $count } custom key bindings.
+settings-import-description-key-tables = { $count } custom key tables.
+settings-import-preview-custom-colors = Custom colors
+settings-import-preview-font-table = Font configuration
sidebar-default-space = Default
sidebar-connecting = Connecting…
sidebar-reconnect = Reconnect
@@ -381,3 +421,18 @@ settings-status-reset-quotes = Reset bottom quotes JSON { $path }
settings-status-reset-quotes-error = Unable to reset bottom quotes JSON: { $error }
settings-status-app-icon = App icon is now { $icon }.
settings-status-app-icon-error = Unable to save app icon: { $error }
+settings-status-opening-thinkterm-config = Opening ThinkTerm configuration: { $path }
+settings-status-no-thinkterm-config = No ThinkTerm configuration exists yet. Import settings or create { $path } first.
+settings-status-opening-wezterm-config = Opening WezTerm configuration: { $path }
+settings-status-no-wezterm-config = No WezTerm configuration was found.
+settings-status-load-wezterm-error = Unable to read the WezTerm configuration: { $error }
+settings-status-import-complete = Imported { $count } settings into ThinkTerm.
+settings-status-import-complete-created = Imported { $count } settings and created the ThinkTerm configuration.
+settings-status-import-error = Unable to import the selected settings: { $error }
+settings-status-wezterm-config-loaded = Read { $path } and found { $count } supported settings.
+settings-status-wezterm-config-loaded-warnings = Read { $path } and found { $count } supported settings with { $warnings } warnings.
+settings-status-import-field-enabled = { $field } selected for import.
+settings-status-import-field-disabled = { $field } removed from the import selection.
+settings-status-import-selection-error = Unable to save the import selection: { $error }
+settings-status-import-all-selected = Selected all { $count } supported settings.
+settings-status-import-all-cleared = Cleared the import selection.
diff --git a/wezterm-gui/i18n/fr-FR.ftl b/wezterm-gui/i18n/fr-FR.ftl
index f086f3b8..4db25c52 100644
--- a/wezterm-gui/i18n/fr-FR.ftl
+++ b/wezterm-gui/i18n/fr-FR.ftl
@@ -30,7 +30,7 @@ settings-section-appearance = Apparence
settings-section-terminal = Terminal
settings-section-workspaces = Espaces de travail
settings-section-keymap = Raccourcis clavier
-settings-section-compatibility = Compatibilité
+settings-section-compatibility = Importer depuis WezTerm
settings-section-developer = Développeur
settings-section-about = À propos
settings-search-placeholder = Rechercher dans les réglages…
@@ -39,11 +39,11 @@ settings-keymap-description = Raccourcis clavier et actions de la palette de com
settings-about-description = Version de ThinkTerm, informations du projet et métadonnées de l’application.
settings-general-heading = Configuration
settings-config-source = Source de configuration
-settings-native-settings = Réglages natifs de ThinkTerm
-settings-native-settings-default = Valeurs par défaut ; fichier facultatif à l’emplacement { $path }
-settings-native-settings-description = Petit état natif de ThinkTerm ; la configuration du terminal reste dans le fichier thinkterm.lua propre à ThinkTerm.
+settings-native-settings = Réglages ThinkTerm
+settings-native-settings-default = Valeurs intégrées par défaut ; fichier facultatif : { $path }
+settings-native-settings-description = Enregistre les préférences de l’application ThinkTerm. Le comportement du terminal reste configuré dans thinkterm.lua.
settings-theme-mode = Mode du thème
-settings-theme-description = Préférence d’apparence native des fenêtres ThinkTerm.
+settings-theme-description = Choisissez de suivre l’apparence du système ou d’utiliser un thème clair ou sombre.
settings-theme-system = Système
settings-theme-light = Clair
settings-theme-dark = Sombre
@@ -53,12 +53,12 @@ settings-main-renderer = Moteur de rendu de la fenêtre principale
settings-main-renderer-description = S’applique à la fenêtre principale du terminal après redémarrage.
settings-restore-window-frame = Restaurer la taille et la position de la fenêtre principale
settings-restore-window-frame-description = macOS restaure la dernière taille et position de la fenêtre principale du terminal.
-settings-restart = Redémarrer
-settings-restart-app = Redémarrer ThinkTerm
-settings-restart-status = État du changement de moteur de rendu : { $status }.
-settings-quit = Quitter
-settings-quit-description = Fermer toutes les fenêtres ThinkTerm et quitter l’application.
-settings-quit-app = Quitter ThinkTerm
+settings-restart = Redémarrer ThinkTerm
+settings-restart-app = Redémarrer
+settings-restart-status = Modifications du moteur de rendu : { $status }.
+settings-quit = Quitter ThinkTerm
+settings-quit-description = Fermer toutes les fenêtres et quitter l’application.
+settings-quit-app = Quitter
settings-appearance-theme-heading = Thème
settings-app-icon = Icône de l’application
settings-app-icon-description = Changer l’icône affichée dans le Dock et le sélecteur d’applications.
@@ -66,12 +66,12 @@ settings-app-icon-note = Fonctionne actuellement uniquement sur macOS.
settings-app-icon-simple = Simple
settings-app-icon-classic = Classique
settings-effective-color-scheme = Jeu de couleurs actif
-settings-effective-color-scheme-description = Déterminé par le chemin de configuration compatible WezTerm.
+settings-effective-color-scheme-description = Jeu de couleurs actuellement sélectionné par thinkterm.lua.
settings-typography-heading = Typographie
settings-font-size-settings = Taille de police des réglages
-settings-font-size-settings-description = Contrôle l’habillage et le texte de la fenêtre Réglages.
+settings-font-size-settings-description = Modifie la taille du texte dans toute la fenêtre Réglages.
settings-font-size-home = Taille de police de l’accueil
-settings-font-size-home-description = Contrôle le texte de l’accueil et de la vue principale.
+settings-font-size-home-description = Modifie le texte de l’accueil et de la zone de contenu principale.
settings-font-size-right-sidebar = Taille de police de la barre latérale droite
settings-font-size-right-sidebar-description = Suit la taille de l’accueil tant qu’elle n’est pas définie — panneau des fichiers, notes et extraits.
settings-font-size-workspace-sidebar = Taille de police de la barre des espaces de travail
@@ -87,56 +87,96 @@ settings-sftp-idle = Délai d’inactivité de la connexion aux fichiers distant
settings-sftp-idle-description = Déconnecte une session SFTP inutilisée et libère immédiatement les données de répertoire et d’aperçu.
settings-download-folder = Dossier de téléchargement
settings-system-download-folder = Utiliser le dossier Téléchargements du système
-settings-system-download-folder-description = Efface le dossier choisi afin que les téléchargements suivent le réglage de cet ordinateur.
+settings-system-download-folder-description = Supprime le chemin personnalisé et utilise le dossier Téléchargements du système.
settings-remote-drop-destination = Destination du dépôt distant
settings-remote-drop-destination-description = Emplacement d’envoi des fichiers déposés sur un terminal distant. Utilisez cwd pour le dossier courant du shell.
settings-notifications-heading = Notifications
settings-notification-sounds = Sons de notification
-settings-notification-sounds-description = Émettre un son bref lorsqu’un fil se termine ou attend une réponse.
-settings-terminal-heading = Configuration effective du terminal
+settings-notification-sounds-description = Émettre un son bref lorsqu’une session se termine ou attend une réponse.
+settings-terminal-heading = Configuration du terminal
settings-terminal-font-size = Taille de police
-settings-terminal-font-size-description = Valeur effective actuelle issue de la configuration compatible WezTerm.
+settings-terminal-font-size-description = Valeur actuelle chargée depuis thinkterm.lua.
settings-terminal-font-family = Famille de police
-settings-terminal-font-family-description = Police principale actuelle du terminal.
+settings-terminal-font-family-description = Police principale actuelle chargée depuis thinkterm.lua.
settings-terminal-native-font-size = Taille de police ThinkTerm
settings-terminal-native-font-size-description = Enregistrée localement et appliquée immédiatement aux fenêtres de terminal ouvertes.
settings-terminal-native-font-family = Famille de police native
settings-terminal-native-font-family-description = Brouillon de réglage rapide local. L’enregistrement et l’application au terminal sont à venir.
settings-remote-pane-resize-mode = Redimensionnement des divisions distantes
-settings-remote-pane-resize-mode-description = Auto synchronise en direct lorsque le mux est rapide et une seule fois au relâchement sur une connexion lente.
+settings-remote-pane-resize-mode-description = En mode Auto, la taille est mise à jour en continu sur une connexion rapide et seulement à la fin sur une connexion lente.
settings-remote-pane-resize-mode-auto = Auto
settings-remote-pane-resize-mode-live = Direct
settings-remote-pane-resize-mode-on-release = Au relâchement
settings-bottom-quote = Citation inférieure
-settings-bottom-quote-description = Affiche une courte citation dans la marge inférieure existante.
+settings-bottom-quote-description = Affiche une courte citation en bas de la fenêtre du terminal.
settings-quote-font-size = Taille de la citation
-settings-quote-font-size-description = Modifie uniquement le texte de la citation ; la hauteur de la marge reste inchangée.
+settings-quote-font-size-description = Modifie la taille de la citation sans changer la disposition du terminal.
settings-quote-rotation = Rotation des citations
-settings-quote-rotation-description = Le mode chronologique suit l’ordre ; le pseudo-aléatoire choisit une citation stable par intervalle.
-settings-quote-mode-timed = Chronologique
-settings-quote-mode-random = Pseudo-aléatoire
+settings-quote-rotation-description = Séquentiel affiche les citations dans l’ordre ; aléatoire en choisit une différente à chaque intervalle.
+settings-quote-mode-timed = Séquentiel
+settings-quote-mode-random = Aléatoire
settings-quote-interval = Intervalle des citations
settings-quote-interval-description = Contrôle la fréquence de rotation de la citation inférieure.
settings-open-quotes-json = Ouvrir le JSON des citations
settings-reset-quotes-json = Réinitialiser le JSON des citations
-settings-compatibility-description = ThinkTerm utilise sa propre configuration compatible WezTerm. Les fichiers WezTerm existants sont des sources d’import facultatives, pas un état partagé en direct.
+settings-compatibility-description = Copiez les réglages sélectionnés depuis une configuration WezTerm existante. Les valeurs importées ne restent pas synchronisées avec le fichier d’origine.
settings-thinkterm-config = Configuration ThinkTerm
-settings-thinkterm-config-missing = Pas encore créée ; cible : { $path }
-settings-wezterm-source = Source WezTerm
-settings-wezterm-source-missing = Aucune configuration WezTerm existante trouvée
+settings-thinkterm-config-missing = Sera créée dans { $path }
+settings-wezterm-source = Configuration WezTerm détectée
+settings-wezterm-source-missing = Aucune configuration WezTerm trouvée
settings-loaded-source = Source chargée
settings-not-loaded = Pas encore chargée
settings-loaded-source-warnings = { $source } ({ $count } avertissements)
-settings-importable-fields = Champs importables
-settings-importable-fields-description = Choisissez précisément les valeurs de la configuration source que ThinkTerm doit copier.
+settings-importable-fields = Réglages à importer
+settings-importable-fields-description = Choisissez les réglages à copier dans ThinkTerm.
settings-no-fields-loaded = Aucun champ chargé
settings-fields-selected = { $selected } sur { $total } sélectionnés
settings-detected-fields = Champs détectés
-settings-load-source-description = Chargez une configuration source WezTerm pour examiner les champs importables.
-settings-load-wezterm-source = Charger la source WezTerm
+settings-load-source-description = Lit la configuration WezTerm détectée pour afficher les réglages pris en charge.
+settings-load-wezterm-source = Examiner les réglages détectés
settings-import-selected = Importer la sélection
-settings-open-wezterm-source = Ouvrir la source WezTerm
+settings-open-wezterm-source = Ouvrir la configuration WezTerm
settings-open-thinkterm-config = Ouvrir la configuration ThinkTerm
+settings-import-config-ready = Prête
+settings-import-config-will-create = À créer
+settings-import-selection = Sélection à importer
+settings-import-selection-description = Examinez les réglages détectés, sélectionnez ceux à conserver, puis importez-les une fois.
+settings-import-category-appearance = Apparence
+settings-import-category-terminal = Terminal
+settings-import-category-window = Fenêtre
+settings-import-category-keymap = Raccourcis
+settings-import-field-color-scheme = Jeu de couleurs
+settings-import-field-window-opacity = Opacité de l’arrière-plan
+settings-import-field-macos-blur = Flou d’arrière-plan macOS
+settings-import-field-inactive-pane = Couleurs des volets inactifs
+settings-import-field-font-size = Taille de police
+settings-import-field-font = Police
+settings-import-field-line-height = Hauteur de ligne
+settings-import-field-cell-width = Largeur des cellules
+settings-import-field-default-program = Programme par défaut
+settings-import-field-default-directory = Dossier par défaut
+settings-import-field-renderer = Moteur de rendu
+settings-import-field-window-decorations = Décorations de fenêtre
+settings-import-field-disable-default-keys = Désactiver les raccourcis par défaut
+settings-import-field-key-bindings = Raccourcis clavier
+settings-import-field-key-tables = Tables de raccourcis
+settings-import-description-color-scheme = Jeu de couleurs sélectionné dans la configuration source.
+settings-import-description-window-opacity = Opacité de l’arrière-plan des fenêtres du terminal.
+settings-import-description-macos-blur = Flou derrière les fenêtres transparentes sur macOS.
+settings-import-description-inactive-pane = Ajustement des couleurs appliqué aux volets inactifs.
+settings-import-description-font-size = Taille du texte du terminal.
+settings-import-description-font = Liste des polices du terminal.
+settings-import-description-line-height = Espacement vertical entre les lignes du terminal.
+settings-import-description-cell-width = Espacement horizontal des cellules du terminal.
+settings-import-description-default-program = Shell ou commande ouvert dans les nouveaux volets.
+settings-import-description-default-directory = Dossier de travail des nouveaux volets.
+settings-import-description-renderer = Moteur de rendu OpenGL ou WebGPU.
+settings-import-description-window-decorations = Barre de titre et boutons natifs ou personnalisés.
+settings-import-description-disable-default-keys = Indique si les raccourcis intégrés de ThinkTerm sont désactivés.
+settings-import-description-key-bindings = { $count } raccourcis personnalisés.
+settings-import-description-key-tables = { $count } tables de raccourcis personnalisées.
+settings-import-preview-custom-colors = Couleurs personnalisées
+settings-import-preview-font-table = Configuration des polices
sidebar-default-space = Par défaut
sidebar-connecting = Connexion…
sidebar-reconnect = Reconnecter
@@ -381,3 +421,18 @@ settings-status-reset-quotes = JSON des citations réinitialisé : { $path }
settings-status-reset-quotes-error = Impossible de réinitialiser le JSON des citations : { $error }
settings-status-app-icon = L’icône de l’application est maintenant { $icon }.
settings-status-app-icon-error = Impossible d’enregistrer l’icône : { $error }
+settings-status-opening-thinkterm-config = Ouverture de la configuration ThinkTerm : { $path }
+settings-status-no-thinkterm-config = Aucune configuration ThinkTerm n’existe encore. Importez des réglages ou créez d’abord { $path }.
+settings-status-opening-wezterm-config = Ouverture de la configuration WezTerm : { $path }
+settings-status-no-wezterm-config = Aucune configuration WezTerm trouvée.
+settings-status-load-wezterm-error = Impossible de lire la configuration WezTerm : { $error }
+settings-status-import-complete = { $count } réglages importés dans ThinkTerm.
+settings-status-import-complete-created = { $count } réglages importés et configuration ThinkTerm créée.
+settings-status-import-error = Impossible d’importer les réglages sélectionnés : { $error }
+settings-status-wezterm-config-loaded = { $path } lu ; { $count } réglages pris en charge trouvés.
+settings-status-wezterm-config-loaded-warnings = { $path } lu ; { $count } réglages pris en charge et { $warnings } avertissements trouvés.
+settings-status-import-field-enabled = « { $field } » sélectionné pour l’import.
+settings-status-import-field-disabled = « { $field } » retiré de la sélection.
+settings-status-import-selection-error = Impossible d’enregistrer la sélection : { $error }
+settings-status-import-all-selected = Les { $count } réglages pris en charge sont sélectionnés.
+settings-status-import-all-cleared = Sélection d’import effacée.
diff --git a/wezterm-gui/i18n/ja-JP.ftl b/wezterm-gui/i18n/ja-JP.ftl
index 021a31cf..14480985 100644
--- a/wezterm-gui/i18n/ja-JP.ftl
+++ b/wezterm-gui/i18n/ja-JP.ftl
@@ -30,7 +30,7 @@ settings-section-appearance = 外観
settings-section-terminal = ターミナル
settings-section-workspaces = ワークスペース
settings-section-keymap = キーマップ
-settings-section-compatibility = 互換性
+settings-section-compatibility = WezTerm からインポート
settings-section-developer = 開発者
settings-section-about = 情報
settings-search-placeholder = 設定を検索…
@@ -39,11 +39,11 @@ settings-keymap-description = キーボードショートカットとコマン
settings-about-description = ThinkTerm のバージョン、プロジェクト情報、アプリのメタデータです。
settings-general-heading = 構成
settings-config-source = 構成元
-settings-native-settings = ThinkTerm ネイティブ設定
-settings-native-settings-default = デフォルトを使用中。任意のファイル:{ $path }
-settings-native-settings-description = ThinkTerm 固有の小さな状態です。ターミナル設定は ThinkTerm 独自の thinkterm.lua に保存されます。
+settings-native-settings = ThinkTerm 設定
+settings-native-settings-default = 組み込みのデフォルトを使用中。任意の設定ファイル:{ $path }
+settings-native-settings-description = ThinkTerm のアプリ設定を保存します。ターミナルの動作は引き続き thinkterm.lua で設定します。
settings-theme-mode = テーマモード
-settings-theme-description = ThinkTerm ネイティブウィンドウの外観設定です。
+settings-theme-description = システムの外観に合わせるか、ライトまたはダークテーマを固定して使用します。
settings-theme-system = システム
settings-theme-light = ライト
settings-theme-dark = ダーク
@@ -53,12 +53,12 @@ settings-main-renderer = メインウィンドウのレンダラー
settings-main-renderer-description = 再起動後にメインターミナルウィンドウへ適用します。
settings-restore-window-frame = メインウィンドウの位置とサイズを復元
settings-restore-window-frame-description = macOS で前回のメインターミナルウィンドウのサイズと位置を復元します。
-settings-restart = 再起動
-settings-restart-app = ThinkTerm を再起動
-settings-restart-status = レンダラー変更の状態:{ $status }。
-settings-quit = 終了
-settings-quit-description = すべての ThinkTerm ウィンドウを閉じてアプリを終了します。
-settings-quit-app = ThinkTerm を終了
+settings-restart = ThinkTerm を再起動
+settings-restart-app = 再起動
+settings-restart-status = レンダラーの変更:{ $status }。
+settings-quit = ThinkTerm を終了
+settings-quit-description = すべてのウィンドウを閉じてアプリを終了します。
+settings-quit-app = 終了
settings-appearance-theme-heading = テーマ
settings-app-icon = アプリアイコン
settings-app-icon-description = 実行中の Dock とアプリスイッチャーのアイコンを変更します。
@@ -66,12 +66,12 @@ settings-app-icon-note = 現在は macOS のみ対応しています。
settings-app-icon-simple = シンプル
settings-app-icon-classic = クラシック
settings-effective-color-scheme = 有効なカラースキーム
-settings-effective-color-scheme-description = WezTerm 互換の構成経路を通じて決定されます。
+settings-effective-color-scheme-description = thinkterm.lua で現在選択されているカラースキームです。
settings-typography-heading = タイポグラフィ
settings-font-size-settings = 設定 UI のフォントサイズ
-settings-font-size-settings-description = 設定ウィンドウの外枠と本文を調整します。
+settings-font-size-settings-description = 設定ウィンドウ全体の文字サイズを変更します。
settings-font-size-home = ホームのフォントサイズ
-settings-font-size-home-description = メインのホーム/コンテンツビューを調整します。
+settings-font-size-home-description = ホームとメインコンテンツ領域の文字サイズを変更します。
settings-font-size-right-sidebar = 右サイドバーのフォントサイズ
settings-font-size-right-sidebar-description = 未設定時はホームに従います。ファイル、ノート、スニペットのパネル用です。
settings-font-size-workspace-sidebar = ワークスペースサイドバーのフォントサイズ
@@ -87,56 +87,96 @@ settings-sftp-idle = リモートファイル接続のアイドルタイムア
settings-sftp-idle-description = 未使用の SFTP セッションを切断し、ディレクトリとプレビューのデータをすぐ解放します。
settings-download-folder = ダウンロードフォルダー
settings-system-download-folder = システムのダウンロードフォルダーを使用
-settings-system-download-folder-description = 選択したフォルダーを解除し、このコンピューターの設定に従います。
+settings-system-download-folder-description = カスタムパスを解除し、このコンピューターのシステムダウンロードフォルダーを使用します。
settings-remote-drop-destination = リモートへのドロップ先
settings-remote-drop-destination-description = リモートターミナルへドロップしたファイルのアップロード先です。cwd でシェルの現在のディレクトリを指定できます。
settings-notifications-heading = 通知
settings-notification-sounds = 通知音
settings-notification-sounds-description = スレッドが完了したとき、または入力待ちになったときに短い音を鳴らします。
-settings-terminal-heading = 有効なターミナル設定
+settings-terminal-heading = ターミナル設定
settings-terminal-font-size = フォントサイズ
-settings-terminal-font-size-description = WezTerm 互換設定から得た現在の有効値です。
+settings-terminal-font-size-description = thinkterm.lua から読み込まれた現在の値です。
settings-terminal-font-family = フォントファミリー
-settings-terminal-font-family-description = 現在の主要なターミナルフォントです。
+settings-terminal-font-family-description = thinkterm.lua から読み込まれた現在の主要なターミナルフォントです。
settings-terminal-native-font-size = ThinkTerm のフォントサイズ
settings-terminal-native-font-size-description = ローカルに保存し、開いているターミナルウィンドウへすぐ適用します。
settings-terminal-native-font-family = ネイティブフォントファミリー
settings-terminal-native-font-family-description = ローカルのクイック設定案です。保存とターミナルへの適用は未対応です。
settings-remote-pane-resize-mode = リモート分割のサイズ変更
-settings-remote-pane-resize-mode-description = 自動では mux が速いときはライブ同期し、遅い接続では離したときに一度だけ同期します。
+settings-remote-pane-resize-mode-description = 自動では高速な接続で継続的に更新し、低速な接続では操作終了時の最終サイズだけを送信します。
settings-remote-pane-resize-mode-auto = 自動
settings-remote-pane-resize-mode-live = ライブ
settings-remote-pane-resize-mode-on-release = 離したとき
settings-bottom-quote = 下部の引用文
-settings-bottom-quote-description = 既存の下部余白に短い引用文を表示します。
+settings-bottom-quote-description = ターミナルウィンドウの下部に短い引用文を表示します。
settings-quote-font-size = 引用文のフォントサイズ
-settings-quote-font-size-description = 引用文の文字だけを変更し、余白の高さは変えません。
+settings-quote-font-size-description = ターミナルのレイアウトを変えずに引用文の文字サイズを変更します。
settings-quote-rotation = 引用文の切り替え
-settings-quote-rotation-description = 時間指定は順番に、疑似ランダムは間隔ごとに安定した引用文を選びます。
-settings-quote-mode-timed = 時間指定
-settings-quote-mode-random = 疑似ランダム
+settings-quote-rotation-description = 順番では引用文を順に表示し、ランダムでは間隔ごとに別の引用文を選びます。
+settings-quote-mode-timed = 順番
+settings-quote-mode-random = ランダム
settings-quote-interval = 引用文の間隔
settings-quote-interval-description = 下部の引用文を切り替える頻度を調整します。
settings-open-quotes-json = 引用文 JSON を開く
settings-reset-quotes-json = 引用文 JSON をリセット
-settings-compatibility-description = ThinkTerm は独自の WezTerm 互換設定を使用します。既存の WezTerm ファイルは任意のインポート元であり、状態をリアルタイム共有しません。
-settings-thinkterm-config = ThinkTerm 設定
-settings-thinkterm-config-missing = 未作成です。作成先:{ $path }
-settings-wezterm-source = WezTerm ソース
-settings-wezterm-source-missing = 既存の WezTerm 設定が見つかりません
+settings-compatibility-description = 既存の WezTerm 設定から選択した項目をコピーします。インポート後も元のファイルとは同期されません。
+settings-thinkterm-config = ThinkTerm 設定ファイル
+settings-thinkterm-config-missing = { $path } に作成されます
+settings-wezterm-source = 検出された WezTerm 設定
+settings-wezterm-source-missing = WezTerm 設定が見つかりません
settings-loaded-source = 読み込んだソース
settings-not-loaded = 未読み込み
settings-loaded-source-warnings = { $source }(警告 { $count } 件)
-settings-importable-fields = インポート可能な項目
-settings-importable-fields-description = ThinkTerm にコピーする元設定の値を正確に選択します。
+settings-importable-fields = インポートする設定
+settings-importable-fields-description = ThinkTerm にコピーする設定を選択します。
settings-no-fields-loaded = 項目が読み込まれていません
settings-fields-selected = { $total } 件中 { $selected } 件を選択
settings-detected-fields = 検出した項目
-settings-load-source-description = WezTerm の元設定を読み込み、インポート可能な項目を確認します。
-settings-load-wezterm-source = WezTerm ソースを読み込む
+settings-load-source-description = 検出された WezTerm 設定を読み取り、対応している項目を確認します。
+settings-load-wezterm-source = 検出された設定を確認
settings-import-selected = 選択項目をインポート
-settings-open-wezterm-source = WezTerm ソースを開く
+settings-open-wezterm-source = WezTerm 設定を開く
settings-open-thinkterm-config = ThinkTerm 設定を開く
+settings-import-config-ready = 準備完了
+settings-import-config-will-create = 作成予定
+settings-import-selection = インポートする項目
+settings-import-selection-description = 検出された設定を確認し、必要な項目を選択して一度だけインポートします。
+settings-import-category-appearance = 外観
+settings-import-category-terminal = ターミナル
+settings-import-category-window = ウィンドウ
+settings-import-category-keymap = キー設定
+settings-import-field-color-scheme = カラースキーム
+settings-import-field-window-opacity = ウィンドウ背景の不透明度
+settings-import-field-macos-blur = macOS の背景ぼかし
+settings-import-field-inactive-pane = 非アクティブペインの色
+settings-import-field-font-size = フォントサイズ
+settings-import-field-font = フォント
+settings-import-field-line-height = 行の高さ
+settings-import-field-cell-width = セルの幅
+settings-import-field-default-program = デフォルトプログラム
+settings-import-field-default-directory = デフォルトディレクトリ
+settings-import-field-renderer = レンダラー
+settings-import-field-window-decorations = ウィンドウ装飾
+settings-import-field-disable-default-keys = デフォルトショートカットを無効化
+settings-import-field-key-bindings = キーバインド
+settings-import-field-key-tables = キーテーブル
+settings-import-description-color-scheme = 元の設定で選択されているカラースキームです。
+settings-import-description-window-opacity = ターミナルウィンドウ背景の不透明度です。
+settings-import-description-macos-blur = macOS の透明ウィンドウ背後に適用するぼかしです。
+settings-import-description-inactive-pane = 非アクティブな分割ペインに適用する色調整です。
+settings-import-description-font-size = ターミナル文字のサイズです。
+settings-import-description-font = ターミナルで使用するフォント一覧です。
+settings-import-description-line-height = ターミナルの行間です。
+settings-import-description-cell-width = ターミナルセルの横幅です。
+settings-import-description-default-program = 新しいペインで開くシェルまたはコマンドです。
+settings-import-description-default-directory = 新しいペインで使用する作業ディレクトリです。
+settings-import-description-renderer = OpenGL または WebGPU の描画バックエンドです。
+settings-import-description-window-decorations = システムまたはカスタムのタイトルバーとウィンドウボタンです。
+settings-import-description-disable-default-keys = ThinkTerm の組み込みショートカットを無効にするかどうかです。
+settings-import-description-key-bindings = カスタムキーバインド { $count } 件。
+settings-import-description-key-tables = カスタムキーテーブル { $count } 件。
+settings-import-preview-custom-colors = カスタムカラー
+settings-import-preview-font-table = フォント設定
sidebar-default-space = デフォルト
sidebar-connecting = 接続中…
sidebar-reconnect = 再接続
@@ -381,3 +421,18 @@ settings-status-reset-quotes = 下部の引用文 JSON をリセットしまし
settings-status-reset-quotes-error = 下部の引用文 JSON をリセットできません:{ $error }
settings-status-app-icon = アプリアイコンを{ $icon }に変更しました。
settings-status-app-icon-error = アプリアイコンを保存できません:{ $error }
+settings-status-opening-thinkterm-config = ThinkTerm 設定を開いています:{ $path }
+settings-status-no-thinkterm-config = ThinkTerm 設定はまだありません。先に設定をインポートするか、{ $path } を作成してください。
+settings-status-opening-wezterm-config = WezTerm 設定を開いています:{ $path }
+settings-status-no-wezterm-config = WezTerm 設定が見つかりません。
+settings-status-load-wezterm-error = WezTerm 設定を読み込めません:{ $error }
+settings-status-import-complete = { $count } 件の設定を ThinkTerm にインポートしました。
+settings-status-import-complete-created = { $count } 件の設定をインポートし、ThinkTerm 設定を作成しました。
+settings-status-import-error = 選択した設定をインポートできません:{ $error }
+settings-status-wezterm-config-loaded = { $path } を読み込み、対応する設定を { $count } 件見つけました。
+settings-status-wezterm-config-loaded-warnings = { $path } を読み込み、対応する設定を { $count } 件、警告を { $warnings } 件見つけました。
+settings-status-import-field-enabled = 「{ $field }」をインポート対象にしました。
+settings-status-import-field-disabled = 「{ $field }」をインポート対象から外しました。
+settings-status-import-selection-error = インポート対象を保存できません:{ $error }
+settings-status-import-all-selected = 対応する設定をすべて選択しました({ $count } 件)。
+settings-status-import-all-cleared = インポート対象をすべて解除しました。
diff --git a/wezterm-gui/i18n/zh-CN.ftl b/wezterm-gui/i18n/zh-CN.ftl
index 60e085df..f02dbb57 100644
--- a/wezterm-gui/i18n/zh-CN.ftl
+++ b/wezterm-gui/i18n/zh-CN.ftl
@@ -30,20 +30,20 @@ settings-section-appearance = 外观
settings-section-terminal = 终端
settings-section-workspaces = 工作区
settings-section-keymap = 快捷键
-settings-section-compatibility = 兼容性
+settings-section-compatibility = 从 WezTerm 导入
settings-section-developer = 开发者
settings-section-about = 关于
settings-search-placeholder = 搜索设置…
settings-search-no-results = 未找到设置
settings-keymap-description = 键盘快捷键和命令面板操作。
-settings-about-description = ThinkTerm 版本、项目信息和应用元数据。
+settings-about-description = 查看 ThinkTerm 版本和应用信息。
settings-general-heading = 配置
settings-config-source = 配置来源
-settings-native-settings = ThinkTerm 原生设置
-settings-native-settings-default = 使用默认值;可选文件位于 { $path }
-settings-native-settings-description = 少量 ThinkTerm 原生状态;终端配置仍保存在 ThinkTerm 自己的 thinkterm.lua 中。
+settings-native-settings = ThinkTerm 设置
+settings-native-settings-default = 使用内置默认值;可选设置文件:{ $path }
+settings-native-settings-description = 保存 ThinkTerm 的应用偏好;终端行为仍由 thinkterm.lua 配置。
settings-theme-mode = 主题模式
-settings-theme-description = ThinkTerm 原生窗口外观偏好。
+settings-theme-description = 选择跟随系统外观,或固定使用浅色或深色主题。
settings-theme-system = 跟随系统
settings-theme-light = 浅色
settings-theme-dark = 深色
@@ -53,12 +53,12 @@ settings-main-renderer = 主窗口渲染器
settings-main-renderer-description = 重启后应用于主终端窗口。
settings-restore-window-frame = 恢复主窗口位置与大小
settings-restore-window-frame-description = macOS 会恢复上次主终端窗口的大小和位置。
-settings-restart = 重启
-settings-restart-app = 重启 ThinkTerm
-settings-restart-status = 渲染器更改状态:{ $status }。
-settings-quit = 退出
-settings-quit-description = 关闭所有 ThinkTerm 窗口并退出应用。
-settings-quit-app = 退出 ThinkTerm
+settings-restart = 重启 ThinkTerm
+settings-restart-app = 重启
+settings-restart-status = 渲染器更改:{ $status }。
+settings-quit = 退出 ThinkTerm
+settings-quit-description = 关闭所有窗口并退出应用。
+settings-quit-app = 退出
settings-appearance-theme-heading = 主题
settings-app-icon = 应用图标
settings-app-icon-description = 更改当前程序坞和应用切换器中的图标。
@@ -66,12 +66,12 @@ settings-app-icon-note = 目前仅支持 macOS。
settings-app-icon-simple = 简约
settings-app-icon-classic = 经典
settings-effective-color-scheme = 当前配色方案
-settings-effective-color-scheme-description = 通过 WezTerm 兼容配置解析。
+settings-effective-color-scheme-description = thinkterm.lua 当前选择的配色方案。
settings-typography-heading = 字体排版
settings-font-size-settings = 设置界面字号
-settings-font-size-settings-description = 控制设置窗口框架和内容文字。
+settings-font-size-settings-description = 调整整个设置窗口的文字大小。
settings-font-size-home = 主页字号
-settings-font-size-home-description = 控制主主页和内容视图文字。
+settings-font-size-home-description = 调整主页和主要内容区域的文字大小。
settings-font-size-right-sidebar = 右侧栏字号
settings-font-size-right-sidebar-description = 未单独设置时跟随主页字号——用于文件、笔记和片段面板。
settings-font-size-workspace-sidebar = 工作区侧栏字号
@@ -87,56 +87,96 @@ settings-sftp-idle = 远程文件连接空闲超时
settings-sftp-idle-description = 断开未使用的 SFTP 会话,并立即释放目录和预览数据。
settings-download-folder = 下载文件夹
settings-system-download-folder = 使用系统下载文件夹
-settings-system-download-folder-description = 清除所选文件夹,让下载遵循此电脑的系统设置。
+settings-system-download-folder-description = 取消自定义路径,改用本机系统下载文件夹。
settings-remote-drop-destination = 远程拖放目标
settings-remote-drop-destination-description = 拖到远程终端的文件上传位置。使用 cwd 表示 shell 当前目录。
settings-notifications-heading = 通知
settings-notification-sounds = 提示音
-settings-notification-sounds-description = Thread 完成或者开始等待你输入时,响一声。
-settings-terminal-heading = 当前终端配置
+settings-notification-sounds-description = Thread 完成或等待你输入时播放提示音。
+settings-terminal-heading = 终端配置
settings-terminal-font-size = 字号
-settings-terminal-font-size-description = WezTerm 兼容配置中的当前有效值。
+settings-terminal-font-size-description = thinkterm.lua 当前设置的字号。
settings-terminal-font-family = 字体
-settings-terminal-font-family-description = 当前主要终端字体。
+settings-terminal-font-family-description = thinkterm.lua 当前设置的主要终端字体。
settings-terminal-native-font-size = ThinkTerm 字号
settings-terminal-native-font-size-description = 本地保存,并立即应用于已打开的终端窗口。
settings-terminal-native-font-family = 原生字体
settings-terminal-native-font-family-description = 本地快速设置草稿;保存和应用到终端的功能尚未完成。
settings-remote-pane-resize-mode = 远程分屏缩放
-settings-remote-pane-resize-mode-description = 自动模式在 mux 响应快时实时同步,网络较慢时只在松手后同步一次。
+settings-remote-pane-resize-mode-description = 自动模式在连接较快时持续更新,连接较慢时只发送松手后的最终尺寸。
settings-remote-pane-resize-mode-auto = 自动
settings-remote-pane-resize-mode-live = 实时
settings-remote-pane-resize-mode-on-release = 松手后
settings-bottom-quote = 底部语录
-settings-bottom-quote-description = 在现有底部留白中显示一条小语录。
+settings-bottom-quote-description = 在终端窗口底部显示一条简短语录。
settings-quote-font-size = 语录字号
-settings-quote-font-size-description = 只更改语录文字大小,不改变底部留白高度。
+settings-quote-font-size-description = 调整语录字号,不改变终端布局。
settings-quote-rotation = 语录轮换
-settings-quote-rotation-description = 定时模式按顺序轮换;伪随机模式在每个间隔内固定选择一条。
-settings-quote-mode-timed = 定时
-settings-quote-mode-random = 伪随机
+settings-quote-rotation-description = 顺序模式依次显示语录;随机模式每次选择不同语录。
+settings-quote-mode-timed = 顺序
+settings-quote-mode-random = 随机
settings-quote-interval = 语录间隔
settings-quote-interval-description = 控制底部语录的轮换频率。
settings-open-quotes-json = 打开语录 JSON
settings-reset-quotes-json = 重置语录 JSON
-settings-compatibility-description = ThinkTerm 使用自己兼容 WezTerm 的配置。现有 WezTerm 文件仅作为可选导入来源,不会实时共享状态。
-settings-thinkterm-config = ThinkTerm 配置
-settings-thinkterm-config-missing = 尚未创建;目标位置为 { $path }
-settings-wezterm-source = WezTerm 来源
-settings-wezterm-source-missing = 未找到现有 WezTerm 配置
+settings-compatibility-description = 从现有 WezTerm 配置中选择要复制的设置。导入后不会与原文件保持同步。
+settings-thinkterm-config = ThinkTerm 配置文件
+settings-thinkterm-config-missing = 将创建于 { $path }
+settings-wezterm-source = 检测到的 WezTerm 配置
+settings-wezterm-source-missing = 未找到 WezTerm 配置
settings-loaded-source = 已加载来源
settings-not-loaded = 尚未加载
settings-loaded-source-warnings = { $source }({ $count } 个警告)
-settings-importable-fields = 可导入字段
-settings-importable-fields-description = 精确选择 ThinkTerm 要复制的来源配置值。
+settings-importable-fields = 要导入的设置
+settings-importable-fields-description = 选择要复制到 ThinkTerm 的设置。
settings-no-fields-loaded = 未加载字段
settings-fields-selected = 已选择 { $selected }/{ $total }
settings-detected-fields = 检测到的字段
-settings-load-source-description = 加载 WezTerm 来源配置以查看可导入字段。
-settings-load-wezterm-source = 加载 WezTerm 来源
+settings-load-source-description = 读取检测到的 WezTerm 配置并查看支持的设置。
+settings-load-wezterm-source = 查看检测到的设置
settings-import-selected = 导入所选项
-settings-open-wezterm-source = 打开 WezTerm 来源
+settings-open-wezterm-source = 打开 WezTerm 配置
settings-open-thinkterm-config = 打开 ThinkTerm 配置
+settings-import-config-ready = 已就绪
+settings-import-config-will-create = 将创建
+settings-import-selection = 导入选择
+settings-import-selection-description = 查看检测到的设置,选择需要的项目,然后导入一次。
+settings-import-category-appearance = 外观
+settings-import-category-terminal = 终端
+settings-import-category-window = 窗口
+settings-import-category-keymap = 快捷键
+settings-import-field-color-scheme = 配色方案
+settings-import-field-window-opacity = 窗口背景透明度
+settings-import-field-macos-blur = macOS 背景模糊
+settings-import-field-inactive-pane = 非活动窗格配色
+settings-import-field-font-size = 字号
+settings-import-field-font = 字体
+settings-import-field-line-height = 行高
+settings-import-field-cell-width = 字符宽度
+settings-import-field-default-program = 默认程序
+settings-import-field-default-directory = 默认目录
+settings-import-field-renderer = 渲染器
+settings-import-field-window-decorations = 窗口装饰
+settings-import-field-disable-default-keys = 禁用默认快捷键
+settings-import-field-key-bindings = 快捷键绑定
+settings-import-field-key-tables = 快捷键表
+settings-import-description-color-scheme = 来源配置中选择的配色方案。
+settings-import-description-window-opacity = 终端窗口的背景透明度。
+settings-import-description-macos-blur = macOS 透明窗口后的模糊效果。
+settings-import-description-inactive-pane = 非活动分屏窗格使用的颜色调整。
+settings-import-description-font-size = 终端文字大小。
+settings-import-description-font = 终端字体列表。
+settings-import-description-line-height = 终端各行之间的垂直间距。
+settings-import-description-cell-width = 终端字符的水平间距。
+settings-import-description-default-program = 新窗格中打开的 shell 或命令。
+settings-import-description-default-directory = 新窗格使用的工作目录。
+settings-import-description-renderer = OpenGL 或 WebGPU 渲染后端。
+settings-import-description-window-decorations = 系统或自定义标题栏和窗口按钮。
+settings-import-description-disable-default-keys = 是否禁用 ThinkTerm 的内置快捷键。
+settings-import-description-key-bindings = { $count } 条自定义快捷键绑定。
+settings-import-description-key-tables = { $count } 个自定义快捷键表。
+settings-import-preview-custom-colors = 自定义配色
+settings-import-preview-font-table = 字体配置
sidebar-default-space = 默认
sidebar-connecting = 正在连接…
sidebar-reconnect = 重新连接
@@ -290,7 +330,7 @@ ssh-field-host = 主机
ssh-field-port = 端口
ssh-field-user = 用户
ssh-field-password = 密码
-ssh-field-identity = 身份文件
+ssh-field-identity = 私钥文件
ssh-field-workspace = 工作区
ssh-group-connection = 连接
ssh-group-authentication = 身份验证
@@ -316,12 +356,12 @@ remote-thread-project = 项目
remote-thread-endpoint = 端点
remote-thread-thread = 会话
remote-thread-connecting = { $frame } 正在连接…
-remote-thread-transport-elapsed = 传输方式:{ $transport } · 已用 { $seconds } 秒
+remote-thread-transport-elapsed = 连接方式:{ $transport } · 已用 { $seconds } 秒
remote-thread-failed = 连接失败。
-remote-thread-failed-detail = 传输方式:{ $transport } · 可重试,或取消并关闭。
+remote-thread-failed-detail = 连接方式:{ $transport } · 可重试,或取消并关闭。
remote-thread-mosh-detail = 通过 SSH 启动 mosh-server,然后打开 mosh-client。
remote-thread-ssh-detail = 打开 ThinkTerm SSH 会话。
-remote-thread-transport = 传输方式:{ $transport }
+remote-thread-transport = 连接方式:{ $transport }
remote-thread-connect = 连接
remote-thread-delete = 删除会话
remote-thread-cancel = 取消
@@ -334,7 +374,7 @@ menu-reveal-folder = 在文件夹中显示
settings-developer-description = 保持普通设置简洁。启用开发者模式可显示内部页面;内存采样仍需手动开始。
settings-developer-mode = 开发者模式
settings-developer-mode-description = 显示用于 UI 调整和内存诊断的内部设置页面。
-settings-fallback-menu = 使用备用上下文菜单
+settings-fallback-menu = 使用备用右键菜单
settings-fallback-menu-description = 在 macOS 上将右键菜单切换为应用内绘制版本,以便本地测试。
settings-developer-tabs = 可见的开发者标签页
settings-developer-tabs-description = 此处会显示 UI Kit 和内存/输入标签页;诊断不会自动运行。
@@ -381,3 +421,18 @@ settings-status-reset-quotes = 已重置底部语录 JSON:{ $path }
settings-status-reset-quotes-error = 无法重置底部语录 JSON:{ $error }
settings-status-app-icon = 应用图标现为{ $icon }。
settings-status-app-icon-error = 无法保存应用图标:{ $error }
+settings-status-opening-thinkterm-config = 正在打开 ThinkTerm 配置:{ $path }
+settings-status-no-thinkterm-config = ThinkTerm 配置尚未创建。请先导入设置或创建 { $path }。
+settings-status-opening-wezterm-config = 正在打开 WezTerm 配置:{ $path }
+settings-status-no-wezterm-config = 未找到 WezTerm 配置。
+settings-status-load-wezterm-error = 无法读取 WezTerm 配置:{ $error }
+settings-status-import-complete = 已将 { $count } 项设置导入 ThinkTerm。
+settings-status-import-complete-created = 已导入 { $count } 项设置并创建 ThinkTerm 配置。
+settings-status-import-error = 无法导入所选设置:{ $error }
+settings-status-wezterm-config-loaded = 已读取 { $path },找到 { $count } 项支持的设置。
+settings-status-wezterm-config-loaded-warnings = 已读取 { $path },找到 { $count } 项支持的设置,并有 { $warnings } 条警告。
+settings-status-import-field-enabled = 已选择导入“{ $field }”。
+settings-status-import-field-disabled = 已从导入选择中移除“{ $field }”。
+settings-status-import-selection-error = 无法保存导入选择:{ $error }
+settings-status-import-all-selected = 已选择全部 { $count } 项支持的设置。
+settings-status-import-all-cleared = 已清除导入选择。
diff --git a/wezterm-gui/src/settings_window.rs b/wezterm-gui/src/settings_window.rs
index b04288e4..76b2a2a1 100644
--- a/wezterm-gui/src/settings_window.rs
+++ b/wezterm-gui/src/settings_window.rs
@@ -14,7 +14,7 @@ use crate::ui::{
TextInputSpec, TextInputState, UiContext, UiPalette, UiTokens, WidgetKind,
};
use crate::utilsprites::RenderMetrics;
-use anyhow::Context;
+use anyhow::{Context, Error};
use config::{configuration, Dimension, GeometryOrigin};
use std::cell::{Cell, RefCell};
use std::collections::HashMap;
@@ -514,64 +514,80 @@ impl ImportFieldId {
}
}
- fn category(self) -> &'static str {
- match self {
+ fn category(self) -> String {
+ crate::i18n::tr(match self {
Self::ColorScheme
| Self::WindowBackgroundOpacity
| Self::MacosWindowBackgroundBlur
- | Self::InactivePaneHsb => "Appearance",
+ | Self::InactivePaneHsb => "settings-import-category-appearance",
Self::FontSize
| Self::Font
| Self::LineHeight
| Self::CellWidth
| Self::DefaultProg
- | Self::DefaultCwd => "Terminal",
- Self::FrontEnd | Self::WindowDecorations => "Window",
- Self::DisableDefaultKeyBindings | Self::Keys | Self::KeyTables => "Keymap",
- }
+ | Self::DefaultCwd => "settings-import-category-terminal",
+ Self::FrontEnd | Self::WindowDecorations => "settings-import-category-window",
+ Self::DisableDefaultKeyBindings | Self::Keys | Self::KeyTables => {
+ "settings-import-category-keymap"
+ }
+ })
}
- fn label(self) -> &'static str {
- match self {
- Self::ColorScheme => "Color Scheme",
- Self::WindowBackgroundOpacity => "Window Background Opacity",
- Self::MacosWindowBackgroundBlur => "macOS Background Blur",
- Self::InactivePaneHsb => "Inactive Pane HSB",
- Self::FontSize => "Font Size",
- Self::Font => "Font",
- Self::LineHeight => "Line Height",
- Self::CellWidth => "Cell Width",
- Self::DefaultProg => "Default Program",
- Self::DefaultCwd => "Default CWD",
- Self::FrontEnd => "Renderer Backend",
- Self::WindowDecorations => "Window Decorations",
- Self::DisableDefaultKeyBindings => "Disable Default Key Bindings",
- Self::Keys => "Key Bindings",
- Self::KeyTables => "Key Tables",
- }
+ fn label(self) -> String {
+ crate::i18n::tr(match self {
+ Self::ColorScheme => "settings-import-field-color-scheme",
+ Self::WindowBackgroundOpacity => "settings-import-field-window-opacity",
+ Self::MacosWindowBackgroundBlur => "settings-import-field-macos-blur",
+ Self::InactivePaneHsb => "settings-import-field-inactive-pane",
+ Self::FontSize => "settings-import-field-font-size",
+ Self::Font => "settings-import-field-font",
+ Self::LineHeight => "settings-import-field-line-height",
+ Self::CellWidth => "settings-import-field-cell-width",
+ Self::DefaultProg => "settings-import-field-default-program",
+ Self::DefaultCwd => "settings-import-field-default-directory",
+ Self::FrontEnd => "settings-import-field-renderer",
+ Self::WindowDecorations => "settings-import-field-window-decorations",
+ Self::DisableDefaultKeyBindings => "settings-import-field-disable-default-keys",
+ Self::Keys => "settings-import-field-key-bindings",
+ Self::KeyTables => "settings-import-field-key-tables",
+ })
}
fn description(self, config: &config::Config) -> String {
match self {
- Self::ColorScheme => "Theme name from the source config.".to_string(),
- Self::WindowBackgroundOpacity => "Terminal window opacity.".to_string(),
- Self::MacosWindowBackgroundBlur => {
- "macOS blur amount behind transparent windows.".to_string()
- }
- Self::InactivePaneHsb => "Color transform for inactive split panes.".to_string(),
- Self::FontSize => "Terminal cell font size.".to_string(),
- Self::Font => "Terminal font stack.".to_string(),
- Self::LineHeight => "Terminal line-height multiplier.".to_string(),
- Self::CellWidth => "Terminal cell-width multiplier.".to_string(),
- Self::DefaultProg => "Default shell or command launched in new panes.".to_string(),
- Self::DefaultCwd => "Default working directory for new panes.".to_string(),
- Self::FrontEnd => "OpenGL/WebGpu renderer choice.".to_string(),
- Self::WindowDecorations => "Native/custom window decoration flags.".to_string(),
- Self::DisableDefaultKeyBindings => {
- "Whether built-in key bindings are disabled.".to_string()
+ Self::Keys | Self::KeyTables => {
+ let count = if self == Self::Keys {
+ config.keys.len()
+ } else {
+ config.key_tables.len()
+ };
+ settings_tr(
+ if self == Self::Keys {
+ "settings-import-description-key-bindings"
+ } else {
+ "settings-import-description-key-tables"
+ },
+ &[("count", count.to_string())],
+ )
}
- Self::Keys => format!("{} custom key binding entries.", config.keys.len()),
- Self::KeyTables => format!("{} custom key tables.", config.key_tables.len()),
+ _ => crate::i18n::tr(match self {
+ Self::ColorScheme => "settings-import-description-color-scheme",
+ Self::WindowBackgroundOpacity => "settings-import-description-window-opacity",
+ Self::MacosWindowBackgroundBlur => "settings-import-description-macos-blur",
+ Self::InactivePaneHsb => "settings-import-description-inactive-pane",
+ Self::FontSize => "settings-import-description-font-size",
+ Self::Font => "settings-import-description-font",
+ Self::LineHeight => "settings-import-description-line-height",
+ Self::CellWidth => "settings-import-description-cell-width",
+ Self::DefaultProg => "settings-import-description-default-program",
+ Self::DefaultCwd => "settings-import-description-default-directory",
+ Self::FrontEnd => "settings-import-description-renderer",
+ Self::WindowDecorations => "settings-import-description-window-decorations",
+ Self::DisableDefaultKeyBindings => {
+ "settings-import-description-disable-default-keys"
+ }
+ Self::Keys | Self::KeyTables => unreachable!(),
+ }),
}
}
@@ -580,7 +596,7 @@ impl ImportFieldId {
Self::ColorScheme => config
.color_scheme
.clone()
- .unwrap_or_else(|| "Custom colors".to_string()),
+ .unwrap_or_else(|| crate::i18n::tr("settings-import-preview-custom-colors")),
Self::WindowBackgroundOpacity => format!("{:.2}", config.window_background_opacity),
Self::MacosWindowBackgroundBlur => config.macos_window_background_blur.to_string(),
Self::InactivePaneHsb => format!(
@@ -595,7 +611,7 @@ impl ImportFieldId {
.font
.first()
.map(|font| font.family.clone())
- .unwrap_or_else(|| "Font table".to_string()),
+ .unwrap_or_else(|| crate::i18n::tr("settings-import-preview-font-table")),
Self::LineHeight => format!("{:.2}", config.line_height),
Self::CellWidth => format!("{:.2}", config.cell_width),
Self::DefaultProg => config
@@ -636,8 +652,8 @@ impl ImportFieldId {
#[derive(Debug, Clone)]
struct ImportableField {
id: ImportFieldId,
- category: &'static str,
- label: &'static str,
+ category: String,
+ label: String,
description: String,
preview: String,
lua_value: Option<String>,
@@ -645,9 +661,7 @@ struct ImportableField {
#[derive(Debug, Clone, Default)]
struct CompatibilityImportState {
- loaded_source: Option<PathBuf>,
fields: Vec<ImportableField>,
- warnings: Vec<String>,
error: Option<String>,
}
@@ -1391,6 +1405,11 @@ struct SettingsWindow {
/// keep — it returns only once the fallback is in place, so a cached run
/// is final rather than a first guess to be revised.
shape_cache: RefCell<HashMap<ShapedTextKey, Rc<ShapedText>>>,
+ /// Glyph allocation can discover that the shared texture atlas is full
+ /// while a helper is only measuring text and cannot return an error. Keep
+ /// the first failure here so the enclosing paint pass can grow the atlas
+ /// and retry the whole frame instead of caching a run with missing glyphs.
+ pending_glyph_error: RefCell<Option<Error>>,
}
impl SettingsWindow {
@@ -1490,6 +1509,7 @@ impl SettingsWindow {
compatibility_import: CompatibilityImportState::default(),
status: Self::initial_status(),
shape_cache: RefCell::new(HashMap::new()),
+ pending_glyph_error: RefCell::new(None),
}));
let event_settings = Rc::clone(&settings);
@@ -2898,22 +2918,28 @@ impl SettingsWindow {
self.ui.open_dropdown = None;
let path = Self::thinkterm_compatible_config_path();
if path.exists() {
- self.status = format!("Opening ThinkTerm config {}", path.display());
+ self.status = settings_tr(
+ "settings-status-opening-thinkterm-config",
+ &[("path", path.display().to_string())],
+ );
Self::open_path(path);
} else {
- self.status = format!(
- "No ThinkTerm config yet. Copy or create {} first.",
- path.display()
+ self.status = settings_tr(
+ "settings-status-no-thinkterm-config",
+ &[("path", path.display().to_string())],
);
}
}
SettingsAction::OpenWezTermConfigFile => {
self.ui.open_dropdown = None;
- if let Some(path) = Self::first_wezterm_config_path() {
- self.status = format!("Opening WezTerm source config {}", path.display());
+ if let Some(path) = self.selected_wezterm_source_path() {
+ self.status = settings_tr(
+ "settings-status-opening-wezterm-config",
+ &[("path", path.display().to_string())],
+ );
Self::open_path(path);
} else {
- self.status = "No existing WezTerm config was found to open.".to_string();
+ self.status = crate::i18n::tr("settings-status-no-wezterm-config");
}
}
SettingsAction::LoadWezTermSource => {
@@ -2922,7 +2948,10 @@ impl SettingsWindow {
Ok(()) => window.invalidate(),
Err(err) => {
self.compatibility_import.error = Some(err.to_string());
- self.status = format!("Unable to load WezTerm source: {err:#}");
+ self.status = settings_tr(
+ "settings-status-load-wezterm-error",
+ &[("error", format!("{err:#}"))],
+ );
}
}
}
@@ -2930,18 +2959,20 @@ impl SettingsWindow {
self.ui.open_dropdown = None;
match self.import_selected_compatibility_fields() {
Ok((count, entry_created)) => {
- self.status = format!(
- "Imported {count} selected field{} into ThinkTerm's managed config layer{}.",
- if count == 1 { "" } else { "s" },
+ self.status = settings_tr(
if entry_created {
- " and created the ThinkTerm config entry"
+ "settings-status-import-complete-created"
} else {
- ""
- }
+ "settings-status-import-complete"
+ },
+ &[("count", count.to_string())],
);
}
Err(err) => {
- self.status = format!("Unable to import selected fields: {err:#}");
+ self.status = settings_tr(
+ "settings-status-import-error",
+ &[("error", format!("{err:#}"))],
+ );
}
}
}
@@ -3567,6 +3598,7 @@ impl SettingsWindow {
}
fn paint_pass(&mut self) -> anyhow::Result<()> {
+ self.pending_glyph_error.borrow_mut().take();
if let Some(render_state) = self.render_state.as_ref() {
for layer in render_state.layers.borrow().iter() {
layer.clear_quad_allocation();
@@ -3587,6 +3619,10 @@ impl SettingsWindow {
self.paint_content_chrome_mask(&mut layers)?;
self.paint_window_chrome(&mut layers)?;
+ if let Some(err) = self.pending_glyph_error.borrow_mut().take() {
+ return Err(err);
+ }
+
Ok(())
}
@@ -4472,8 +4508,8 @@ impl SettingsWindow {
let row_step = self.settings_row_step();
let section_y = self.ui_px(CONTENT_SECTION_Y) - scroll;
// Each settings card owns its row count because rows are painted manually.
- // Terminal currently paints nine rows below; the count drives card height and scroll extent.
- let row_count = 9;
+ // Terminal currently paints eight rows below; the count drives card height and scroll extent.
+ let row_count = 8;
let (card_y, first_row_y) = self.settings_card_geometry(section_y, row_count);
let card_height = self.settings_card_height(row_count);
let button_y = card_y + card_height + self.settings_section_card_gap();
@@ -4548,23 +4584,10 @@ impl SettingsWindow {
SettingsAction::IncreaseFontSize,
true,
)?;
- let native_font_family = self.ui.font_family_input.text().to_string();
- self.paint_text_setting_row(
- layers,
- row_x,
- first_row_y + row_step * 3.0,
- row_width,
- &crate::i18n::tr("settings-terminal-native-font-family"),
- &crate::i18n::tr("settings-terminal-native-font-family-description"),
- &native_font_family,
- "JetBrains Mono",
- SettingsAction::FontFamilyInput,
- true,
- )?;
self.paint_action_setting_row(
layers,
row_x,
- first_row_y + row_step * 4.0,
+ first_row_y + row_step * 3.0,
row_width,
&crate::i18n::tr("settings-remote-pane-resize-mode"),
&crate::i18n::tr("settings-remote-pane-resize-mode-description"),
@@ -4577,7 +4600,7 @@ impl SettingsWindow {
self.paint_toggle_setting_row(
layers,
row_x,
- first_row_y + row_step * 5.0,
+ first_row_y + row_step * 4.0,
row_width,
&crate::i18n::tr("settings-bottom-quote"),
&crate::i18n::tr("settings-bottom-quote-description"),
@@ -4588,7 +4611,7 @@ impl SettingsWindow {
self.paint_font_size_stepper_row(
layers,
row_x,
- first_row_y + row_step * 6.0,
+ first_row_y + row_step * 5.0,
row_width,
&crate::i18n::tr("settings-quote-font-size"),
&crate::i18n::tr("settings-quote-font-size-description"),
@@ -4602,7 +4625,7 @@ impl SettingsWindow {
self.paint_action_setting_row(
layers,
row_x,
- first_row_y + row_step * 7.0,
+ first_row_y + row_step * 6.0,
row_width,
&crate::i18n::tr("settings-quote-rotation"),
&crate::i18n::tr("settings-quote-rotation-description"),
@@ -4613,7 +4636,7 @@ impl SettingsWindow {
self.paint_font_size_stepper_row(
layers,
row_x,
- first_row_y + row_step * 8.0,
+ first_row_y + row_step * 7.0,
row_width,
&crate::i18n::tr("settings-quote-interval"),
&crate::i18n::tr("settings-quote-interval-description"),
@@ -5630,7 +5653,7 @@ impl SettingsWindow {
let row_step = self.settings_row_step();
let section_y = self.ui_px(CONTENT_SECTION_Y) - scroll;
let field_count = self.compatibility_import.fields.len();
- let row_count = 4 + field_count.max(1);
+ let row_count = 3 + field_count;
let (card_y, first_row_y) = self.settings_card_geometry(section_y, row_count);
let card_height = self.settings_card_height(row_count);
let buttons_y = card_y + card_height + self.settings_section_card_gap();
@@ -5648,40 +5671,42 @@ impl SettingsWindow {
args.set("path", thinkterm_path.display().to_string());
crate::i18n::tr_args("settings-thinkterm-config-missing", &args)
};
- let wezterm_source = Self::first_wezterm_config_path()
- .map(|path| path.display().to_string())
- .unwrap_or_else(|| crate::i18n::tr("settings-wezterm-source-missing"));
- let loaded_source = self
- .compatibility_import
- .loaded_source
+ let wezterm_source_path = self.selected_wezterm_source_path();
+ let wezterm_source = wezterm_source_path
.as_ref()
.map(|path| path.display().to_string())
- .unwrap_or_else(|| crate::i18n::tr("settings-not-loaded"));
- let loaded_source_description = if self.compatibility_import.warnings.is_empty() {
- loaded_source
- } else {
- let mut args = FluentArgs::new();
- args.set("source", loaded_source);
- args.set("count", self.compatibility_import.warnings.len());
- crate::i18n::tr_args("settings-loaded-source-warnings", &args)
- };
+ .unwrap_or_else(|| crate::i18n::tr("settings-wezterm-source-missing"));
let thinkterm_status = if thinkterm_path.exists() {
- crate::i18n::tr("common-independent")
+ crate::i18n::tr("settings-import-config-ready")
} else {
- crate::i18n::tr("common-defaults")
+ crate::i18n::tr("settings-import-config-will-create")
};
- let wezterm_status = if Self::first_wezterm_config_path().is_some() {
+ let wezterm_status = if wezterm_source_path.is_some() {
crate::i18n::tr("common-found")
} else {
crate::i18n::tr("common-missing")
};
- let loaded_status = if self.compatibility_import.error.is_some() {
+ let selected_count = self
+ .compatibility_import
+ .fields
+ .iter()
+ .filter(|field| field.lua_value.is_some() && self.import_field_selected(field.id))
+ .count();
+ let selection_status = if self.compatibility_import.error.is_some() {
crate::i18n::tr("common-error")
- } else if field_count > 0 {
- crate::i18n::tr("common-parsed")
+ } else if field_count == 0 {
+ crate::i18n::tr("settings-not-loaded")
} else {
- crate::i18n::tr("common-idle")
+ let mut args = FluentArgs::new();
+ args.set("selected", selected_count);
+ args.set("total", field_count);
+ crate::i18n::tr_args("settings-fields-selected", &args)
};
+ let selection_description = self
+ .compatibility_import
+ .error
+ .clone()
+ .unwrap_or_else(|| crate::i18n::tr("settings-import-selection-description"));
self.draw_text(
layers,
@@ -5721,61 +5746,14 @@ impl SettingsWindow {
row_x,
first_row_y + row_step * 2.0,
row_width,
- &crate::i18n::tr("settings-loaded-source"),
- &loaded_source_description,
- &loaded_status,
+ &crate::i18n::tr("settings-import-selection"),
+ &selection_description,
+ &selection_status,
true,
)?;
let mut row_y = first_row_y + row_step * 3.0;
- let selected_count = self
- .compatibility_import
- .fields
- .iter()
- .filter(|field| field.lua_value.is_some() && self.import_field_selected(field.id))
- .count();
- let detected_label = if field_count == 0 {
- crate::i18n::tr("settings-no-fields-loaded")
- } else {
- let mut args = FluentArgs::new();
- args.set("selected", selected_count);
- args.set("total", field_count);
- crate::i18n::tr_args("settings-fields-selected", &args)
- };
- self.paint_setting_row(
- layers,
- row_x,
- row_y,
- row_width,
- &crate::i18n::tr("settings-importable-fields"),
- &crate::i18n::tr("settings-importable-fields-description"),
- &detected_label,
- true,
- )?;
- row_y += row_step;
-
- if self.compatibility_import.fields.is_empty() {
- let empty_description = self
- .compatibility_import
- .error
- .clone()
- .unwrap_or_else(|| crate::i18n::tr("settings-load-source-description"));
- let empty_status = if self.compatibility_import.error.is_some() {
- crate::i18n::tr("common-error")
- } else {
- crate::i18n::tr("common-empty")
- };
- self.paint_setting_row(
- layers,
- row_x,
- row_y,
- row_width,
- &crate::i18n::tr("settings-detected-fields"),
- &empty_description,
- &empty_status,
- true,
- )?;
- } else {
+ if !self.compatibility_import.fields.is_empty() {
let fields = self.compatibility_import.fields.clone();
for field in fields {
self.paint_import_field_row(layers, row_x, row_y, row_width, &field, true)?;
@@ -6953,11 +6931,7 @@ impl SettingsWindow {
self.paint_separator(layers, x, y - self.ui_px(28.0), width)?;
}
- let button_label = if self.main_renderer_restart_required() {
- crate::i18n::tr("settings-restart-app")
- } else {
- crate::i18n::tr("settings-restart")
- };
+ let button_label = crate::i18n::tr("settings-restart-app");
let button_width = self
.button_width_for_label(&button_label, 0.0)
.max(self.ui_px(220.0));
@@ -7857,15 +7831,21 @@ impl SettingsWindow {
let render_state = self.render_state.as_ref()?;
let mut glyph_cache = render_state.glyph_cache.borrow_mut();
let style = font.style();
- let glyphs: Vec<Rc<CachedGlyph>> = infos
+ let glyphs = infos
.into_iter()
- .filter_map(|info| {
- glyph_cache
- .cached_glyph(&info, style, false, font, &self.metrics, 1)
- .ok()
- })
- .collect();
+ .map(|info| glyph_cache.cached_glyph(&info, style, false, font, &self.metrics, 1))
+ .collect::<anyhow::Result<Vec<Rc<CachedGlyph>>>>();
drop(glyph_cache);
+ let glyphs = match glyphs {
+ Ok(glyphs) => glyphs,
+ Err(err) => {
+ let mut pending = self.pending_glyph_error.borrow_mut();
+ if pending.is_none() {
+ *pending = Some(err);
+ }
+ return None;
+ }
+ };
let shaped = Rc::new(ShapedText {
width: glyphs
@@ -8039,16 +8019,22 @@ impl SettingsWindow {
self.native_settings.compatibility.source_path = Some(loaded.file_name.clone());
let _ = crate::native_settings::save(&self.native_settings);
let field_count = fields.len();
+ let warning_count = loaded.warnings.len();
self.compatibility_import = CompatibilityImportState {
- loaded_source: Some(loaded.file_name.clone()),
fields,
- warnings: loaded.warnings,
error: None,
};
- self.status = format!(
- "Loaded {} and found {field_count} supported field{}.",
- loaded.file_name.display(),
- if field_count == 1 { "" } else { "s" }
+ self.status = settings_tr(
+ if warning_count == 0 {
+ "settings-status-wezterm-config-loaded"
+ } else {
+ "settings-status-wezterm-config-loaded-warnings"
+ },
+ &[
+ ("path", loaded.file_name.display().to_string()),
+ ("count", field_count.to_string()),
+ ("warnings", warning_count.to_string()),
+ ],
);
Ok(())
}
@@ -8124,17 +8110,26 @@ impl SettingsWindow {
.compatibility
.selected_fields
.remove(pos);
- self.status = format!("{} disabled for import.", field_id.label());
+ self.status = settings_tr(
+ "settings-status-import-field-disabled",
+ &[("field", field_id.label())],
+ );
} else {
self.native_settings
.compatibility
.selected_fields
.push(key.to_string());
- self.status = format!("{} enabled for import.", field_id.label());
+ self.status = settings_tr(
+ "settings-status-import-field-enabled",
+ &[("field", field_id.label())],
+ );
}
if let Err(err) = crate::native_settings::save(&self.native_settings) {
- self.status = format!("Unable to save import field selection: {err:#}");
+ self.status = settings_tr(
+ "settings-status-import-selection-error",
+ &[("error", format!("{err:#}"))],
+ );
}
}
@@ -8150,13 +8145,16 @@ impl SettingsWindow {
self.native_settings.compatibility.selected_fields = selected;
match crate::native_settings::save(&self.native_settings) {
Ok(()) => {
- self.status = format!(
- "{count} importable field{} selected.",
- if count == 1 { "" } else { "s" }
+ self.status = settings_tr(
+ "settings-status-import-all-selected",
+ &[("count", count.to_string())],
);
}
Err(err) => {
- self.status = format!("Unable to save import field selection: {err:#}");
+ self.status = settings_tr(
+ "settings-status-import-selection-error",
+ &[("error", format!("{err:#}"))],
+ );
}
}
}
@@ -8165,10 +8163,13 @@ impl SettingsWindow {
self.native_settings.compatibility.selected_fields.clear();
match crate::native_settings::save(&self.native_settings) {
Ok(()) => {
- self.status = "All import fields cleared.".to_string();
+ self.status = crate::i18n::tr("settings-status-import-all-cleared");
}
Err(err) => {
- self.status = format!("Unable to save import field selection: {err:#}");
+ self.status = settings_tr(
+ "settings-status-import-selection-error",
+ &[("error", format!("{err:#}"))],
+ );
}
}
}