From 02db4b22fdaa7d1b393ac0f06397dfb4e70536ce Mon Sep 17 00:00:00 2001 From: Daniel Chalmers Date: Tue, 22 Sep 2026 14:59:41 -0500 Subject: [PATCH] Show dropdown options in the UI language The font style, font weight, and image fit dropdowns listed the raw setting values (SemiBold, UniformToFill). Each option now has a display name in the UI language, and the settings file still stores the same values, so existing settings keep working. Image fit also reads better in English: None, Fill, Uniform, and UniformToFill are now Original size, Stretch, Fit, and Fill, matching the names Windows uses for wallpaper. --- DesktopClock/Localization/Strings.de.resx | 51 ++++++++++++++ DesktopClock/Localization/Strings.es.resx | 51 ++++++++++++++ DesktopClock/Localization/Strings.fr.resx | 51 ++++++++++++++ DesktopClock/Localization/Strings.id.resx | 51 ++++++++++++++ DesktopClock/Localization/Strings.it.resx | 51 ++++++++++++++ DesktopClock/Localization/Strings.ja.resx | 51 ++++++++++++++ DesktopClock/Localization/Strings.ko.resx | 51 ++++++++++++++ DesktopClock/Localization/Strings.nl.resx | 51 ++++++++++++++ DesktopClock/Localization/Strings.pl.resx | 51 ++++++++++++++ DesktopClock/Localization/Strings.pt.resx | 51 ++++++++++++++ DesktopClock/Localization/Strings.resx | 68 +++++++++++++++++++ DesktopClock/Localization/Strings.ru.resx | 51 ++++++++++++++ DesktopClock/Localization/Strings.tr.resx | 51 ++++++++++++++ DesktopClock/Localization/Strings.uk.resx | 51 ++++++++++++++ DesktopClock/Localization/Strings.vi.resx | 51 ++++++++++++++ .../Localization/Strings.zh-Hans.resx | 51 ++++++++++++++ .../Localization/Strings.zh-Hant.resx | 51 ++++++++++++++ DesktopClock/SettingsWindow.xaml | 12 +++- DesktopClock/SettingsWindow.xaml.cs | 45 ++++++++++-- 19 files changed, 932 insertions(+), 9 deletions(-) diff --git a/DesktopClock/Localization/Strings.de.resx b/DesktopClock/Localization/Strings.de.resx index 3dc63a3..831bd94 100644 --- a/DesktopClock/Localization/Strings.de.resx +++ b/DesktopClock/Localization/Strings.de.resx @@ -289,6 +289,45 @@ Wenn das Problem weiterhin besteht, bitte über diesen Link melden. Den Text dünner oder fetter machen. + + Normal + + + Kursiv + + + Schräg + + + Dünn + + + Extraleicht + + + Leicht + + + Normal + + + Mittel + + + Halbfett + + + Fett + + + Extrafett + + + Schwarz + + + Extraschwarz + Textfarbe @@ -352,6 +391,18 @@ Wenn das Problem weiterhin besteht, bitte über diesen Link melden. Festlegen, wie das Bild in die Uhr eingepasst wird. + + Originalgröße + + + Strecken + + + Anpassen + + + Ausfüllen + Signale diff --git a/DesktopClock/Localization/Strings.es.resx b/DesktopClock/Localization/Strings.es.resx index a84783f..89c131b 100644 --- a/DesktopClock/Localization/Strings.es.resx +++ b/DesktopClock/Localization/Strings.es.resx @@ -289,6 +289,45 @@ Si el problema continúa, notifícalo en ese vínculo. Haz el texto más fino o más grueso. + + Normal + + + Cursiva + + + Oblicua + + + Fina + + + Extraligera + + + Ligera + + + Normal + + + Media + + + Seminegrita + + + Negrita + + + Extranegrita + + + Negra + + + Extranegra + Color del texto @@ -352,6 +391,18 @@ Si el problema continúa, notifícalo en ese vínculo. Elige cómo se ajusta la imagen dentro del reloj. + + Tamaño original + + + Expandir + + + Ajustar + + + Rellenar + Alertas diff --git a/DesktopClock/Localization/Strings.fr.resx b/DesktopClock/Localization/Strings.fr.resx index 42ba7a3..03e5846 100644 --- a/DesktopClock/Localization/Strings.fr.resx +++ b/DesktopClock/Localization/Strings.fr.resx @@ -289,6 +289,45 @@ Si le problème persiste, signalez-le via ce lien. Affiner ou épaissir le texte. + + Normal + + + Italique + + + Oblique + + + Ultra-maigre + + + Extra-maigre + + + Maigre + + + Normal + + + Médium + + + Demi-gras + + + Gras + + + Extra-gras + + + Noir + + + Extra-noir + Couleur du texte @@ -352,6 +391,18 @@ Si le problème persiste, signalez-le via ce lien. Choisissez comment l'image s'ajuste dans l'horloge. + + Taille d'origine + + + Étirer + + + Ajuster + + + Remplir + Alertes diff --git a/DesktopClock/Localization/Strings.id.resx b/DesktopClock/Localization/Strings.id.resx index 2950465..11e306e 100644 --- a/DesktopClock/Localization/Strings.id.resx +++ b/DesktopClock/Localization/Strings.id.resx @@ -289,6 +289,45 @@ Jika masalah berlanjut, laporkan di tautan tersebut. Buat teks lebih tipis atau lebih tebal. + + Normal + + + Miring + + + Condong + + + Tipis + + + Ekstra ringan + + + Ringan + + + Normal + + + Sedang + + + Semi tebal + + + Tebal + + + Ekstra tebal + + + Hitam + + + Ekstra hitam + Warna teks @@ -352,6 +391,18 @@ Jika masalah berlanjut, laporkan di tautan tersebut. Pilih cara gambar disesuaikan di dalam jam. + + Ukuran asli + + + Regangkan + + + Paskan + + + Isi + Peringatan diff --git a/DesktopClock/Localization/Strings.it.resx b/DesktopClock/Localization/Strings.it.resx index 1c172dc..ddb62cb 100644 --- a/DesktopClock/Localization/Strings.it.resx +++ b/DesktopClock/Localization/Strings.it.resx @@ -289,6 +289,45 @@ Se il problema persiste, segnalalo tramite quel collegamento. Rendi il testo più sottile o più spesso. + + Normale + + + Corsivo + + + Obliquo + + + Sottile + + + Extraleggero + + + Leggero + + + Normale + + + Medio + + + Semigrassetto + + + Grassetto + + + Extragrassetto + + + Nero + + + Extranero + Colore testo @@ -352,6 +391,18 @@ Se il problema persiste, segnalalo tramite quel collegamento. Scegli come adattare l'immagine all'orologio. + + Dimensioni originali + + + Estendi + + + Adatta + + + Riempi + Avvisi diff --git a/DesktopClock/Localization/Strings.ja.resx b/DesktopClock/Localization/Strings.ja.resx index 9020b76..4dfb675 100644 --- a/DesktopClock/Localization/Strings.ja.resx +++ b/DesktopClock/Localization/Strings.ja.resx @@ -289,6 +289,45 @@ テキストを細くしたり太くしたりします。 + + 標準 + + + イタリック + + + 斜体 + + + シン + + + エクストラライト + + + ライト + + + 標準 + + + ミディアム + + + セミボールド + + + ボールド + + + エクストラボールド + + + ブラック + + + エクストラブラック + テキストの色 @@ -352,6 +391,18 @@ 時計内での画像の合わせ方を選択します。 + + 元のサイズ + + + 拡大して表示 + + + ページに合わせる + + + ページ幅に合わせる + アラート diff --git a/DesktopClock/Localization/Strings.ko.resx b/DesktopClock/Localization/Strings.ko.resx index fb7c8d9..34937bc 100644 --- a/DesktopClock/Localization/Strings.ko.resx +++ b/DesktopClock/Localization/Strings.ko.resx @@ -289,6 +289,45 @@ 텍스트를 더 가늘게 또는 더 굵게 만듭니다. + + 보통 + + + 기울임꼴 + + + 오블리크 + + + 씬 + + + 엑스트라 라이트 + + + 라이트 + + + 보통 + + + 미디엄 + + + 세미볼드 + + + 볼드 + + + 엑스트라 볼드 + + + 블랙 + + + 엑스트라 블랙 + 텍스트 색 @@ -352,6 +391,18 @@ 시계 안에서 이미지를 맞추는 방식을 선택합니다. + + 원래 크기 + + + 확대 + + + 맞춤 + + + 채우기 + 알림 diff --git a/DesktopClock/Localization/Strings.nl.resx b/DesktopClock/Localization/Strings.nl.resx index a89e9d7..ec03952 100644 --- a/DesktopClock/Localization/Strings.nl.resx +++ b/DesktopClock/Localization/Strings.nl.resx @@ -289,6 +289,45 @@ Als het probleem blijft bestaan, meld het dan via die koppeling. Maak de tekst dunner of dikker. + + Normaal + + + Cursief + + + Schuin + + + Dun + + + Extra licht + + + Licht + + + Normaal + + + Medium + + + Halfvet + + + Vet + + + Extra vet + + + Zwart + + + Extra zwart + Tekstkleur @@ -352,6 +391,18 @@ Als het probleem blijft bestaan, meld het dan via die koppeling. Kies hoe de afbeelding in de klok past. + + Oorspronkelijke grootte + + + Uitrekken + + + Passend + + + Opvullen + Meldingen diff --git a/DesktopClock/Localization/Strings.pl.resx b/DesktopClock/Localization/Strings.pl.resx index 6940644..df95b9d 100644 --- a/DesktopClock/Localization/Strings.pl.resx +++ b/DesktopClock/Localization/Strings.pl.resx @@ -289,6 +289,45 @@ Jeśli problem będzie się powtarzał, zgłoś go pod tym linkiem. Ustaw cieńszy lub grubszy tekst. + + Zwykły + + + Kursywa + + + Pochylony + + + Cienki + + + Ekstralekki + + + Lekki + + + Zwykły + + + Średni + + + Półpogrubiony + + + Pogrubiony + + + Ekstrapogrubiony + + + Czarny + + + Ekstraczarny + Kolor tekstu @@ -352,6 +391,18 @@ Jeśli problem będzie się powtarzał, zgłoś go pod tym linkiem. Wybierz sposób dopasowania obrazu do zegara. + + Oryginalny rozmiar + + + Rozciągnięcie + + + Dopasowanie + + + Wypełnienie + Alerty diff --git a/DesktopClock/Localization/Strings.pt.resx b/DesktopClock/Localization/Strings.pt.resx index fbbe2bf..79a7328 100644 --- a/DesktopClock/Localization/Strings.pt.resx +++ b/DesktopClock/Localization/Strings.pt.resx @@ -289,6 +289,45 @@ Se o problema persistir, informe-o nesse link. Deixe o texto mais fino ou mais grosso. + + Normal + + + Itálico + + + Oblíquo + + + Fino + + + Extraleve + + + Leve + + + Normal + + + Médio + + + Seminegrito + + + Negrito + + + Extranegrito + + + Pesado + + + Extrapesado + Cor do texto @@ -352,6 +391,18 @@ Se o problema persistir, informe-o nesse link. Escolha como a imagem se ajusta ao relógio. + + Tamanho original + + + Ampliar + + + Ajustar + + + Preencher + Alertas diff --git a/DesktopClock/Localization/Strings.resx b/DesktopClock/Localization/Strings.resx index 175ae2d..9e8b4e0 100644 --- a/DesktopClock/Localization/Strings.resx +++ b/DesktopClock/Localization/Strings.resx @@ -325,6 +325,58 @@ If the problem persists, report it at that link. Make the text thinner or thicker. + + Normal + Font style option: upright text. + + + Italic + Font style option. + + + Oblique + Font style option: slanted text, like italic but without cursive letter shapes. + + + Thin + Font weight option, from thinnest to thickest: Thin, Extra light, Light, Normal, Medium, Semibold, Bold, Extra bold, Black, Extra black. Use the names word processors in this language use. + + + Extra light + Font weight option. + + + Light + Font weight option. + + + Normal + Font weight option: the regular weight. + + + Medium + Font weight option. + + + Semibold + Font weight option. + + + Bold + Font weight option. + + + Extra bold + Font weight option. + + + Black + Font weight option: very heavy, not the color. + + + Extra black + Font weight option: the heaviest, not the color. + Text color @@ -390,6 +442,22 @@ If the problem persists, report it at that link. Choose how the image fits within the clock. + + Original size + Image fit option: show the image at its own size. + + + Stretch + Image fit option: stretch the image to the clock's shape, distorting it. + + + Fit + Image fit option: show the whole image, keeping its shape. + + + Fill + Image fit option: cover the whole clock, keeping the image's shape and cropping the edges. + Alerts diff --git a/DesktopClock/Localization/Strings.ru.resx b/DesktopClock/Localization/Strings.ru.resx index 8c48765..f72471b 100644 --- a/DesktopClock/Localization/Strings.ru.resx +++ b/DesktopClock/Localization/Strings.ru.resx @@ -289,6 +289,45 @@ Сделайте текст тоньше или толще. + + Обычный + + + Курсив + + + Наклонный + + + Тонкий + + + Сверхсветлый + + + Светлый + + + Обычный + + + Средний + + + Полужирный + + + Жирный + + + Сверхжирный + + + Черный + + + Сверхчерный + Цвет текста @@ -352,6 +391,18 @@ Выберите, как изображение размещается в часах. + + Исходный размер + + + Растянуть + + + По размеру + + + Заполнение + Сигналы diff --git a/DesktopClock/Localization/Strings.tr.resx b/DesktopClock/Localization/Strings.tr.resx index c9bcee6..d4e85fc 100644 --- a/DesktopClock/Localization/Strings.tr.resx +++ b/DesktopClock/Localization/Strings.tr.resx @@ -289,6 +289,45 @@ Sorun devam ederse bu bağlantıdan bildirin. Metni daha ince veya daha kalın yapın. + + Normal + + + İtalik + + + Eğik + + + İnce + + + Ekstra hafif + + + Hafif + + + Normal + + + Orta + + + Yarı kalın + + + Kalın + + + Ekstra kalın + + + Siyah + + + Ekstra siyah + Metin rengi @@ -352,6 +391,18 @@ Sorun devam ederse bu bağlantıdan bildirin. Resmin saate nasıl sığacağını seçin. + + Orijinal boyut + + + Uzat + + + Sığdır + + + Doldur + Uyarılar diff --git a/DesktopClock/Localization/Strings.uk.resx b/DesktopClock/Localization/Strings.uk.resx index 2f56f9b..3cc3ead 100644 --- a/DesktopClock/Localization/Strings.uk.resx +++ b/DesktopClock/Localization/Strings.uk.resx @@ -289,6 +289,45 @@ Зробіть текст тоншим або товстішим. + + Звичайний + + + Курсив + + + Похилий + + + Тонкий + + + Надсвітлий + + + Світлий + + + Звичайний + + + Середній + + + Напівжирний + + + Жирний + + + Наджирний + + + Чорний + + + Надчорний + Колір тексту @@ -352,6 +391,18 @@ Виберіть, як зображення розміщується в годиннику. + + Вихідний розмір + + + Розтягнути + + + За розміром + + + Заповнення + Сигнали diff --git a/DesktopClock/Localization/Strings.vi.resx b/DesktopClock/Localization/Strings.vi.resx index 2e26253..745778c 100644 --- a/DesktopClock/Localization/Strings.vi.resx +++ b/DesktopClock/Localization/Strings.vi.resx @@ -289,6 +289,45 @@ Nếu sự cố vẫn tiếp diễn, hãy báo cáo tại liên kết đó. Làm chữ mảnh hơn hoặc đậm hơn. + + Bình thường + + + Nghiêng + + + Xiên + + + Mảnh + + + Siêu nhẹ + + + Nhẹ + + + Bình thường + + + Vừa + + + Nửa đậm + + + Đậm + + + Siêu đậm + + + Đen + + + Siêu đen + Màu chữ @@ -352,6 +391,18 @@ Nếu sự cố vẫn tiếp diễn, hãy báo cáo tại liên kết đó. Chọn cách hình ảnh vừa khít trong đồng hồ. + + Kích thước gốc + + + Kéo giãn + + + Vừa khít + + + Lấp đầy + Cảnh báo diff --git a/DesktopClock/Localization/Strings.zh-Hans.resx b/DesktopClock/Localization/Strings.zh-Hans.resx index eb2532e..c6f41c4 100644 --- a/DesktopClock/Localization/Strings.zh-Hans.resx +++ b/DesktopClock/Localization/Strings.zh-Hans.resx @@ -289,6 +289,45 @@ 让文字变细或变粗。 + + 常规 + + + 斜体 + + + 倾斜 + + + 极细 + + + 超细 + + + 细体 + + + 常规 + + + 中等 + + + 半粗 + + + 粗体 + + + 特粗 + + + 超粗 + + + 极粗 + 文字颜色 @@ -352,6 +391,18 @@ 选择图片在时钟内的适应方式。 + + 原始大小 + + + 拉伸 + + + 适应 + + + 填充 + 提醒 diff --git a/DesktopClock/Localization/Strings.zh-Hant.resx b/DesktopClock/Localization/Strings.zh-Hant.resx index aaa55a2..a8d829d 100644 --- a/DesktopClock/Localization/Strings.zh-Hant.resx +++ b/DesktopClock/Localization/Strings.zh-Hant.resx @@ -289,6 +289,45 @@ 讓文字變細或變粗。 + + 一般 + + + 斜體 + + + 傾斜 + + + 極細 + + + 超細 + + + 細體 + + + 一般 + + + 中等 + + + 半粗 + + + 粗體 + + + 特粗 + + + 超粗 + + + 極粗 + 文字色彩 @@ -352,6 +391,18 @@ 選擇圖片在時鐘內的調整方式。 + + 原始大小 + + + 延展 + + + 符合 + + + 填滿 + 提醒 diff --git a/DesktopClock/SettingsWindow.xaml b/DesktopClock/SettingsWindow.xaml index 4369724..b67e94f 100644 --- a/DesktopClock/SettingsWindow.xaml +++ b/DesktopClock/SettingsWindow.xaml @@ -271,7 +271,9 @@ + SelectedValue="{Binding Settings.FontStyle, Mode=TwoWay}" + SelectedValuePath="Value" + DisplayMemberPath="Name" /> @@ -279,7 +281,9 @@ + SelectedValue="{Binding Settings.FontWeight, Mode=TwoWay}" + SelectedValuePath="Value" + DisplayMemberPath="Name" /> @@ -467,7 +471,9 @@ + SelectedValue="{Binding Settings.BackgroundImageStretch, Mode=TwoWay}" + SelectedValuePath="Value" + DisplayMemberPath="Name" /> diff --git a/DesktopClock/SettingsWindow.xaml.cs b/DesktopClock/SettingsWindow.xaml.cs index d671ba4..e5d6439 100644 --- a/DesktopClock/SettingsWindow.xaml.cs +++ b/DesktopClock/SettingsWindow.xaml.cs @@ -347,9 +347,32 @@ public SettingsWindowViewModel(Settings settings) { Settings = settings; AppVersion = FileVersionInfo.GetVersionInfo(App.MainFileInfo.FullName).FileVersion; - FontStyles = ["Normal", "Italic", "Oblique"]; - FontWeights = ["Thin", "ExtraLight", "Light", "Normal", "Medium", "SemiBold", "Bold", "ExtraBold", "Black", "ExtraBlack"]; - ImageStretches = Enum.GetValues(typeof(Stretch)).Cast().ToArray(); + FontStyles = + [ + new("Normal", Loc.Get("FontStyleNormal")), + new("Italic", Loc.Get("FontStyleItalic")), + new("Oblique", Loc.Get("FontStyleOblique")), + ]; + FontWeights = + [ + new("Thin", Loc.Get("FontWeightThin")), + new("ExtraLight", Loc.Get("FontWeightExtraLight")), + new("Light", Loc.Get("FontWeightLight")), + new("Normal", Loc.Get("FontWeightNormal")), + new("Medium", Loc.Get("FontWeightMedium")), + new("SemiBold", Loc.Get("FontWeightSemiBold")), + new("Bold", Loc.Get("FontWeightBold")), + new("ExtraBold", Loc.Get("FontWeightExtraBold")), + new("Black", Loc.Get("FontWeightBlack")), + new("ExtraBlack", Loc.Get("FontWeightExtraBlack")), + ]; + ImageStretches = + [ + new(Stretch.None, Loc.Get("ImageFitNone")), + new(Stretch.Fill, Loc.Get("ImageFitFill")), + new(Stretch.Uniform, Loc.Get("ImageFitUniform")), + new(Stretch.UniformToFill, Loc.Get("ImageFitUniformToFill")), + ]; } /// @@ -365,17 +388,17 @@ public SettingsWindowViewModel(Settings settings) /// /// All available font styles. /// - public IList FontStyles { get; } + public IList FontStyles { get; } /// /// All available font weights. /// - public IList FontWeights { get; } + public IList FontWeights { get; } /// /// All available stretch options for background images. /// - public IList ImageStretches { get; } + public IList ImageStretches { get; } /// /// All available time zones reported by the system. @@ -452,3 +475,13 @@ private static IEnumerable GetAllSystemFonts() } } } + +/// +/// A choice in a settings dropdown: the value saved in settings, and the name shown in the UI language. +/// +public sealed class SettingOption(object value, string name) +{ + public object Value { get; } = value; + + public string Name { get; } = name; +}