Merge branch '0629-cll-main' into 'main'

Change name of kylin-nm in desktop-notify

See merge request kylin-desktop/kylin-nm!72
This commit is contained in:
Zhang Jiaping 2021-06-30 13:05:51 +00:00
commit c6fb7c9ca4
4 changed files with 5 additions and 4 deletions

View File

@ -4,6 +4,7 @@ Name=Kylin NM
Name[zh_CN]=麒麟网络设置工具 Name[zh_CN]=麒麟网络设置工具
Name[zh_HK]=麒麟網路設置工具 Name[zh_HK]=麒麟網路設置工具
Name[zh_TW]=麒麟網路設置工具 Name[zh_TW]=麒麟網路設置工具
Icon=gnome-dev-ethernet
Comment=Beautiful Network Config Applet Comment=Beautiful Network Config Applet
Comment[zh_CN]=麒麟网络设置工具,提供查看和简单设置功能,拥有美观的界面和舒适的操作. Comment[zh_CN]=麒麟网络设置工具,提供查看和简单设置功能,拥有美观的界面和舒适的操作.
Keywords=applet;nm;network;network-manager; Keywords=applet;nm;network;network-manager;

View File

@ -81,7 +81,7 @@ void Utils::onRequestSendDesktopNotify(QString message)
"org.freedesktop.Notifications", "org.freedesktop.Notifications",
QDBusConnection::sessionBus()); QDBusConnection::sessionBus());
QList<QVariant> args; QList<QVariant> args;
args<<(tr("kylin-nm")) args<<(tr("Kylin NM"))
<<((unsigned int) 0) <<((unsigned int) 0)
<<QString("/usr/share/icons/ukui-icon-theme-default/24x24/devices/gnome-dev-ethernet.png") <<QString("/usr/share/icons/ukui-icon-theme-default/24x24/devices/gnome-dev-ethernet.png")
<<tr("kylin network applet desktop message") //显示的是什么类型的信息 <<tr("kylin network applet desktop message") //显示的是什么类型的信息

Binary file not shown.

View File

@ -1801,9 +1801,9 @@
<context> <context>
<name>Utils</name> <name>Utils</name>
<message> <message>
<location filename="../src/utils.cpp" line="89"/> <location filename="../src/utils.cpp" line="84"/>
<source>kylin-nm</source> <source>Kylin NM</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/utils.cpp" line="92"/> <location filename="../src/utils.cpp" line="92"/>