Arjen Hiemstra
8ae9b561c8
Use the right targets for KSysGuard
...
Summary: Otherwise the build fails when things try to link to KF5::SysGuard etc.
Test Plan: Builds again
Reviewers: #plasma, meven
Reviewed By: meven
Subscribers: meven, plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D29628
6 years ago
l10n daemon script
d6821b3d2e
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"
6 years ago
Heiko Becker
6f7a878e6d
Replace plasma.kde.org with kde.org/plasma-desktop
...
Summary:
plasma.kde.org doesn't exist anymore and causes the appstream test to
to fail.
Reviewers: #plasma
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D27304
6 years ago
l10n daemon script
909f9145e7
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"
6 years ago
l10n daemon script
4c244e6081
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"
7 years ago
l10n daemon script
dbc616f0fd
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"
7 years ago
l10n daemon script
b46752be5b
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"
7 years ago
l10n daemon script
7fe7856b63
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"
7 years ago
l10n daemon script
592df93013
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"
7 years ago
l10n daemon script
fc5bff8db6
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"
7 years ago
l10n daemon script
4dfc454d51
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"
7 years ago
l10n daemon script
92a6d3f3a3
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"
7 years ago
l10n daemon script
8e9d63c132
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"
7 years ago
l10n daemon script
194f49655b
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"
7 years ago
l10n daemon script
132b85b36d
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"
7 years ago
l10n daemon script
537a9ca3d5
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"
7 years ago
l10n daemon script
4434af7725
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"
7 years ago
l10n daemon script
5d6410de38
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"
7 years ago
Aleix Pol
722aff93b5
Include the website on the metadata.desktop files
7 years ago
Yuri Chornoivan
ea415539fc
Fix minor EBN issues
8 years ago
Friedrich W. H. Kossebau
3dc1e3e7bd
Consistently use X-KDE-ServiceTypes instead of ServiceTypes
8 years ago
Friedrich W. H. Kossebau
45a19fa16c
Remove long-time deprecated Encoding=UTF-8 from desktop format files
...
Summary:
The "Encoding" entry had been deprecated in 2006
(https://cgit.freedesktop.org/xdg/xdg-specs/commit/?id=6855384d021d88557f80674798c584c15b547f36 )
and there is no current workspace known which still requires it being set
(incl. Plasma itself).
Also has the usage been incomplete and sometimes not at the beginning as
required if used (once scripty had sorted all entries in desktop files
alphabetically and it was not restored everywhere).
Removing them altogether creates consistency and avoids further confusion
about and wasted resources for this unused data bit.
Removing those entries also from Plasma/5.12 branch avoid conflicts on
merging to master, given the entries are often next to translated entries,
or generous merging which lets the entries slip back into existance.
Reviewers: #plasma, fvogt, broulik, mart
Reviewed By: #plasma, mart
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D11563
8 years ago
Friedrich W. H. Kossebau
1564553705
Remove long-time deprecated Encoding=UTF-8 from desktop format files
8 years ago
l10n daemon script
1832948dc9
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"
8 years ago
l10n daemon script
4f9795bd49
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"
8 years ago
l10n daemon script
5cff4a6e4c
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"
8 years ago
Friedrich W. H. Kossebau
6e1946cec7
Remove module prefix from Qt includes
8 years ago
l10n daemon script
fa85921f5f
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"
8 years ago
l10n daemon script
4f41079669
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"
8 years ago
l10n daemon script
94d8fe26fb
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"
8 years ago
l10n daemon script
4b2e7975c7
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"
8 years ago
Elvis Angelaccio
f060ad5f1a
Always add data sources in SystemMonitorEngine::sourceRequestEvent()
...
Summary:
Otherwise if we show the plasma-nm applet twice, m_sensors won't be empty
and we won't be able to fect the connection speed data.
git blame points to
ba7444f99a
and
235fea1868
but they don't really explain why setData() was called only if m_sensors
was empty.
BUG: 380209
Test Plan:
- plasmoidviewer -a org.kde.plasma.networkmanagement
- open the networkmanager applet twice
- make sure the connection's speed graph works the 2nd time.
Reviewers: #plasma, jgrulich
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D5973
9 years ago
l10n daemon script
50b7c832f3
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"
9 years ago
Lindsay Roberts
8dbda77a3b
systemmonitor: Optimise source updates.
...
Summary:
Profiling indicates the highest CPU usage process during idle is the
system monitor engine. This attempts to get rid of the most obvious
usage, which was QStringList::indexOf, and QString temporaries.
Test Plan: Profiling only, as well as no local functional regression.
Reviewers: apol, #plasma, davidedmundson
Reviewed By: #plasma, davidedmundson
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D3141
10 years ago
Aleix Pol
96ff1c868e
Properly define overrides as suggested by the c++ standard
10 years ago
l10n daemon script
0e35c812b0
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"
10 years ago
Montel Laurent
a007f294b4
Use new connect api + QStringLiteral
11 years ago
Bhushan Shah
fb97ce9914
Pass arguments to parent
...
Don't keep args for ourself.. They are useful
BUG: 351250
11 years ago
l10n daemon script
738b59196a
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"
11 years ago
Montel Laurent
5f9ae5e13c
We depend against kf5-5.8 => ecm > 1.6 => we can use new KDE_ variable
11 years ago
David Edmundson
d03b205276
kservice_desktop_to_json -> kcoreaddons_desktop_to_json
11 years ago
Hrvoje Senjan
2e5a98d1d3
[dataengines/systemmonitor] Get rid of KDELibs4Support
...
REVIEW: 120415
12 years ago
l10n daemon script
b4d7c387c7
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
700ffb1dc8
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
6ef6c7e692
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
cf13f672b0
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
f6fa9c9cd7
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
7340ee7972
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
02b92c46d5
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
55744e1106
SVN_SILENT made messages (.desktop file)
12 years ago