From b7cda548344cff8de9e850be46b211847585b7b2 Mon Sep 17 00:00:00 2001 From: pei-jiankang Date: Thu, 16 Dec 2021 20:07:40 +0800 Subject: [PATCH] Modify the shortcut key prompt --- 0002-Modify-the-shortcut-key-prompt.patch | 41 +++++++++++++++++++++++ ukui-settings-daemon.spec | 14 +++++--- 2 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 0002-Modify-the-shortcut-key-prompt.patch diff --git a/0002-Modify-the-shortcut-key-prompt.patch b/0002-Modify-the-shortcut-key-prompt.patch new file mode 100644 index 0000000..87fbca1 --- /dev/null +++ b/0002-Modify-the-shortcut-key-prompt.patch @@ -0,0 +1,41 @@ +From c3c66c32b0fd14f1b565f94cc131667578f64bff Mon Sep 17 00:00:00 2001 +From: root +Date: Thu, 16 Dec 2021 19:56:41 +0800 +Subject: [PATCH] Modify the shortcut key prompt + +--- + .../org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in | 2 +- + po/zh_CN.po | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/data/org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in b/data/org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in +index ddc2a0f..ab947c6 100755 +--- a/data/org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in ++++ b/data/org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in +@@ -47,7 +47,7 @@ + + + '<Control><Alt>Delete' +- Log out ++ Open the shutdown management interfac + Binding to log out. + + +diff --git a/po/zh_CN.po b/po/zh_CN.po +index d94aa3d..1d01c69 100755 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -468,8 +468,8 @@ msgid "Binding to shut down." + msgstr "конец связи" + + #: ../data/org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:19 +-msgid "Log out" +-msgstr "注销" ++msgid "Open the shutdown management interfac" ++msgstr "打开关机管理界面" + + #: ../data/org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:20 + msgid "Binding to log out." +-- +2.30.0 + diff --git a/ukui-settings-daemon.spec b/ukui-settings-daemon.spec index 205b2aa..e77a4c7 100644 --- a/ukui-settings-daemon.spec +++ b/ukui-settings-daemon.spec @@ -1,15 +1,15 @@ %define debug_package %{nil} Name: ukui-settings-daemon Version: 3.0.1 -Release: 1 +Release: 2 Summary: daemon handling the UKUI session settings License: GPL-2.0, GPL-2+, GPL-2.1, LGPL-2.1+, GPL-3+, LGPL-2+, MIT~OldStyleWithDisclaimer+RedHat, MIT~OldStyle+RedHat URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz patch0: 0001-fix-dependency-issue.patch - -BuildRequires: intltool libcanberra-devel dbus-glib-devel dconf-devel fontconfig-devel glib2-devel gtk3-devel libnotify-devel nss-devel polkit-devel pulseaudio-devel startup-notification-devel libX11-devel libXext-devel libXi-devel libxklavier-devel libXrandr-devel libXt-devel mate-desktop-libs xorg-x11-server-utils libusb-devel +patch1: 0002-Modify-the-shortcut-key-prompt.patch +BuildRequires: intltool libcanberra-devel dbus-glib-devel dconf-devel fontconfig-devel glib2-devel gtk3-devel libnotify-devel nss-devel polkit-devel pulseaudio-libs-devel startup-notification-devel libX11-devel libXext-devel libXi-devel libxklavier-devel libXrandr-devel libXt-devel mate-desktop-libs xorg-x11-server-utils libusb-devel #x11proto-kb-devel BuildRequires:mate-desktop-devel >= 1.18 BuildRequires:libmatekbd-devel >= 1.18 @@ -35,7 +35,7 @@ Requires: mate-desktop-libs ukui-polkit ukui-settings-daemon-common imwheel xorg %package common Summary: daemon handling the UKUI session settings (common files) -Requires: intltool libcanberra-devel dbus-glib-devel dconf-devel fontconfig-devel glib2-devel gtk3-devel libnotify-devel nss-devel polkit-devel pulseaudio-devel startup-notification-devel libX11-devel libXext-devel libXi-devel libxklavier-devel libXrandr-devel libXt-devel mate-desktop-libs xorg-x11-server-utils mate-desktop-devel libmatekbd-devel libmatemixer-devel mate-common +Requires: intltool libcanberra-devel dbus-glib-devel dconf-devel fontconfig-devel glib2-devel gtk3-devel libnotify-devel nss-devel polkit-devel pulseaudio-libs-devel startup-notification-devel libX11-devel libXext-devel libXi-devel libxklavier-devel libXrandr-devel libXt-devel mate-desktop-libs xorg-x11-server-utils mate-desktop-devel libmatekbd-devel libmatemixer-devel mate-common %description common This package contains the daemon which is responsible for setting the @@ -58,7 +58,7 @@ Requires: intltool libcanberra-devel dbus-glib-devel dconf-devel fontconfig-deve %package devel Summary: daemon handling the UKUI session settings (development files) -Requires: intltool libcanberra-devel dbus-glib-devel dconf-devel fontconfig-devel glib2-devel gtk3-devel libnotify-devel nss-devel polkit-devel pulseaudio-devel startup-notification-devel libX11-devel libXext-devel libXi-devel libxklavier-devel libXrandr-devel libXt-devel mate-desktop-libs xorg-x11-server-utils mate-desktop-devel libmatekbd-devel libmatemixer-devel mate-common +Requires: intltool libcanberra-devel dbus-glib-devel dconf-devel fontconfig-devel glib2-devel gtk3-devel libnotify-devel nss-devel polkit-devel pulseaudio-libs-devel startup-notification-devel libX11-devel libXext-devel libXi-devel libxklavier-devel libXrandr-devel libXt-devel mate-desktop-libs xorg-x11-server-utils mate-desktop-devel libmatekbd-devel libmatemixer-devel mate-common Requires: ukui-settings-daemon %description devel @@ -83,6 +83,7 @@ Requires: ukui-settings-daemon %prep %setup -q %patch0 -p1 +%patch1 -p1 %build ./autogen.sh --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib64 --sysconfdir=/etc @@ -122,6 +123,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/ %changelog +* Thu Dec 16 2021 peijiankang - 3.0.1-2 +- Modify the shortcut key prompt + * Mon Oct 26 2020 douyan - 3.0.1-1 - update to upstream version 3.0.0-1+1026