Commit graph

8 commits

Author SHA1 Message Date
l10n daemon script
fae10ece8b SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2022-07-01 01:48:04 +00:00
l10n daemon script
889beb8a53 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2022-06-13 02:25:53 +00:00
l10n daemon script
1910ada166 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2022-05-31 01:57:25 +00:00
l10n daemon script
b0c8db667e SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2022-04-07 01:42:30 +00:00
l10n daemon script
a09825c498 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2022-03-20 02:05:33 +00:00
Nate Graham
21b2f53b22 Change X-GNOME-SingleWindow key to SingleMainWindow
X-GNOME-SingleWindow was upstreamed to be an XDG thing with the name
"SingleMainWindow" in
https://gitlab.freedesktop.org/xdg/xdg-specs/-/merge_requests/53
2022-01-05 17:08:49 -07:00
Nicolas Fella
6ac5e8b044 Mark settings and SMS app as single window
There is only ever one window of those

This was shells know that launching a second instance makes no sense and can disable the relevant actions
2021-12-25 21:56:19 +01:00
Nicolas Fella
5d5679c20b [settings] Rename desktop file to match desktop entry defined by KAboutData
Fix task manager icon on Wayland
2021-12-25 21:47:41 +01:00
Renamed from settings/org.kde.kdeconnect.settings.desktop (Browse further)