diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp --- a/kcms/fonts/fonts.cpp +++ b/kcms/fonts/fonts.cpp @@ -437,7 +437,7 @@ , m_fontAASettings(new FontAASettings(this)) { qApp->setAttribute(Qt::AA_DontCreateNativeWidgetSiblings); - KAboutData* about = new KAboutData("kcm_fonts", i18n("Configure Fonts"), + KAboutData* about = new KAboutData("kcm_fonts", i18n("Configure the system fonts"), "0.1", QString(), KAboutLicense::LGPL); about->addAuthor(i18n("Antonis Tsiapaliokas"), QString(), "antonis.tsiapaliokas@kde.org"); setAboutData(about); diff --git a/kcms/fonts/kcm_fonts.desktop b/kcms/fonts/kcm_fonts.desktop --- a/kcms/fonts/kcm_fonts.desktop +++ b/kcms/fonts/kcm_fonts.desktop @@ -103,7 +103,7 @@ Name[zh_CN]=字体 Name[zh_TW]=字型 -Comment=Fonts +Comment=Configure the system fonts Comment[ar]=الخطوط Comment[bs]=Fontovi Comment[ca]=Tipus de lletra diff --git a/kcms/fonts/kxftconfig.cpp b/kcms/fonts/kxftconfig.cpp --- a/kcms/fonts/kxftconfig.cpp +++ b/kcms/fonts/kxftconfig.cpp @@ -441,7 +441,7 @@ switch (t) { default: case SubPixel::NotSet: - return i18nc("use system subpixel setting", "Vendor Default"); + return i18nc("use system subpixel setting", "Vendor default"); case SubPixel::None: return i18nc("no subpixel rendering", "None"); case SubPixel::Rgb: @@ -479,7 +479,7 @@ switch (s) { default: case Hint::NotSet: - return i18nc("use system hinting settings", "Vendor Default"); + return i18nc("use system hinting settings", "Vendor default"); case Hint::Medium: return i18nc("medium hinting", "Medium"); case Hint::None: diff --git a/kcms/fonts/package/contents/ui/FontWidget.qml b/kcms/fonts/package/contents/ui/FontWidget.qml --- a/kcms/fonts/package/contents/ui/FontWidget.qml +++ b/kcms/fonts/package/contents/ui/FontWidget.qml @@ -46,13 +46,13 @@ QtControls.TextField { readOnly: true Kirigami.Theme.inherit: true - text: root.font.family + " " + root.font.pointSize + text: root.font.family + " " + root.font.pointSize + "pt" font: root.font Layout.fillHeight: true } QtControls.Button { - text: i18n("Choose...") + icon.name: "document-edit" Layout.fillHeight: true Kirigami.MnemonicData.enabled: false focus: true @@ -63,6 +63,11 @@ fontDialog.currentFont = root.font; fontDialog.open() } + QtControls.ToolTip { + visible: parent.hovered + text: i18n("Select %1 Font...", label.replace(':', '')) + font.capitalization: Font.Capitalize + } } } } diff --git a/kcms/fonts/package/contents/ui/main.qml b/kcms/fonts/package/contents/ui/main.qml --- a/kcms/fonts/package/contents/ui/main.qml +++ b/kcms/fonts/package/contents/ui/main.qml @@ -27,15 +27,16 @@ KCM.SimpleKCM { id: root - KCM.ConfigModule.quickHelp: i18n("Fonts") + KCM.ConfigModule.quickHelp: i18n("This module lets you configure the system fonts.") Kirigami.FormLayout { id: formLayout readonly property int maxImplicitWidth: Math.max(adjustAllFontsButton.implicitWidth, Math.max(antiAliasingComboBox.implicitWidth, Math.max(excludeField.implicitWidth, Math.max(subPixelCombo.implicitWidth, hintingCombo.implicitWidth)))) QtControls.Button { id: adjustAllFontsButton Layout.preferredWidth: formLayout.maxImplicitWidth + icon.name: "font-select-symbolic" text: i18n("&Adjust All Fonts...") onClicked: kcm.adjustAllFonts(); @@ -82,7 +83,7 @@ Layout.preferredWidth: formLayout.maxImplicitWidth Kirigami.FormData.label: i18nc("Used as a noun, and precedes a combobox full of options", "Anti-aliasing:") - model: [i18n("Enabled"), i18n("Vendor Default"), i18n("Disabled")] + model: [i18n("Enabled"), i18n("Vendor default"), i18n("Disabled")] currentIndex: kcm.fontAASettings.antiAliasing onCurrentIndexChanged: kcm.fontAASettings.antiAliasing = antiAliasingComboBox.currentIndex @@ -99,8 +100,12 @@ RowLayout { id: excludeField - Layout.preferredWidth: formLayout.maxImplicitWidth enabled: antiAliasingComboBox.currentIndex == 0 + + Item { + width: units.largeSpacing + } + QtControls.SpinBox { id: excludeFromSpinBox stepSize: 1 @@ -208,7 +213,7 @@ QtControls.CheckBox { id: dpiCheckBox checked: kcm.fontAASettings.dpi !== 0 - text: i18n("Force Fonts DPI:") + text: i18n("Force font DPI:") } QtControls.SpinBox { @@ -230,7 +235,7 @@ QtDialogs.FontDialog { id: fontDialog - title: i18n("Choose a font") + title: i18n("Select Font") modality: Qt.WindowModal property string currentCategory property bool adjustAllFonts: false diff --git a/kcms/fonts/package/metadata.desktop b/kcms/fonts/package/metadata.desktop --- a/kcms/fonts/package/metadata.desktop +++ b/kcms/fonts/package/metadata.desktop @@ -91,7 +91,7 @@ Name[zh_CN]=字体 Name[zh_TW]=字型 -Comment=Fonts +Comment=Configure the system fonts Comment[ar]=الخطوط Comment[bs]=Fontovi Comment[ca]=Tipus de lletra