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
77529c1842
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
6c5bb0ea22
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
47089ddffb
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
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
Robin Appelman
9fde98302e
Only show system total cpu usage by default on high core count machines
...
Summary:
Currently, the default configuration of showing all individual cores is pretty useless on system with a high number of cores.
This changes the default to only show all individual cores on systems with 8 cores or less, on systems with more cores only the total cpu usage is shown
Reviewers: #plasma, #vdg, davidedmundson
Reviewed By: #plasma, davidedmundson
Subscribers: ngraham, davidedmundson, plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D21690
7 years ago
l10n daemon script
45388fa383
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
5b63edb807
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
9ffafd2c15
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
Nate Graham
1a980bedc4
[System Monitor] Port settings window to QQC2+Kirigami FormLayout and modernize UI
...
Summary:
- Port to QQC2+Kirigami FormLayout style, except for the SpinBox which cannot handle decimal values well in the QQC2 version
- Use standard import names
- Adjust some strings to sound a bit more natural
Test Plan:
Tested with all the variants (CPU, network, etc). All features still work and settings
are saved and loaded properly.
{F6814614}
Reviewers: #vdg, #plasma, filipf
Reviewed By: #vdg, filipf
Subscribers: filipf, plasma-devel
Tags: #plasma
Maniphest Tasks: T10586
Differential Revision: https://phabricator.kde.org/D21074
7 years ago
Pavel Mars
83045375ec
Show accurate checked state for system monitor configuration pages
...
Summary:
Fixed general settings of the widgets "Memory Status", "Hard Disk Space Usage", "Network Monitor", "Hard Disk Monitor".
- correctly set checked/unchecked state on load.
Reviewers: jriddell, #plasma, ngraham, broulik, davidedmundson
Reviewed By: #plasma, ngraham, davidedmundson
Subscribers: broulik, davidedmundson, ngraham, plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D17796
7 years ago
Laurent Montel
19144ab096
Fix warning == vs ===
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
abc2d564a7
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
9428884630
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
Nate Graham
64045dbddc
Improve up/down display for Monitor widgets
...
Summary: This patch improves the up/down display for the Monitor widgets
Test Plan:
Before, no activity: {F6549441}
After, no activity: {F6550787}
Before, some activity: {F6549443}
After, some activity: {F6550788}
All the other ones still look good or are improved: {F6550789}
Reviewers: #plasma, #vdg
Subscribers: abetts, davidedmundson, plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D18255
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
l10n daemon script
6816ccdb48
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
887d225c17
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
4332eceebf
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
Miklos Mate
740289bd82
Systemmonitor: use different label format when the applet is on a vertical panel
...
Summary:
When the applet is on a vertical panel, its horizontal size is limited, and the speedLabel clashes with the name label. I fixed that by moving the speed values below the sensor name in this case.
I also added some cleanups unintentionally (the first three hunks), as I couldn't find a way to change the diff after it's submitted. They remove an unneeded import, and fix some uninitialized variable warnings. Feel free to ignore them.
Reviewers: #plasma, mart
Reviewed By: #plasma, mart
Subscribers: ngraham, mart, plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D12857
8 years ago
Kai Uwe Broulik
2e129f84ce
[System Monitor Applet] Add setting for update interval
...
BUG: 353063
FIXED-IN: 5.13.0
Differential Revision: https://phabricator.kde.org/D6864
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
l10n daemon script
bfc86f245f
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
9409382219
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
1564553705
Remove long-time deprecated Encoding=UTF-8 from desktop format files
8 years ago
l10n daemon script
05fe32a90d
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
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
l10n daemon script
d5586c40c2
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
b9888e5f03
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
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
b0d12d435f
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
d389cde75f
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
6ea0292868
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
fa55a95bde
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
Jonathan Riddell
b0e8b75b85
Fix SPDX syntax http://metadata.neon.kde.org/appstream/html/xenial/main/issues/plasma-workspace.html
9 years ago
l10n daemon script
da52dac1bf
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
l10n daemon script
fa471c9d6a
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
Sebastian Kügler
e3bbe82ebf
Fix license in metadata.desktop files
...
Summary:
The license key is specified as GPL, while the actual code (I checked)
in all these cases is licensed under GPL version 2 or later. This commit
fixes the metadata.desktop files to reflect the actual license.
Test Plan: Manually checked, also compared to the keys looked for in kaboutdata.cpp
Reviewers: #plasma, sitter, davidedmundson
Reviewed By: #plasma, davidedmundson
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D6627
9 years ago