l10n daemon script
49d79637c5
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
f1167336c1
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
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
David Edmundson
dc1e6ae260
warnings--
...
Test Plan: Compiled.
Reviewers: #plasma, mart
Reviewed By: mart
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D2849
10 years ago
l10n daemon script
f5546cb5e6
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
l10n daemon script
f9893549ba
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
Aleix Pol
96ff1c868e
Properly define overrides as suggested by the c++ standard
10 years ago
l10n daemon script
c937f440b1
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
l10n daemon script
5435e568df
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
l10n daemon script
278ba70509
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
b2173723ce
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
l10n daemon script
1ea9490105
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
272bc46d63
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
l10n daemon script
10856b8411
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
8e5a578302
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
l10n daemon script
29e7eaf0be
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
l10n daemon script
40f0461650
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
l10n daemon script
ed0ce07ac5
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
a007f294b4
Use new connect api + QStringLiteral
11 years ago
David Rosca
87029dd53d
systemmonitor: Don't link to unused libraries
...
REVIEW: 125888
11 years ago
l10n daemon script
80c1c7eada
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
d3277e8269
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
l10n daemon script
ef8e9abb33
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
6635cdc956
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
Ragnar Thomsen
498cd08a19
Port KDED plugins to json metadata
...
Port all remaining KDED modules to json metadata and disables
installation of the desktop files.
The plugins now get installed in ${KDE_INSTALL_PLUGINDIR}/kf5/kded and
the "kded_" prefix is removed.
REVIEW: 124845
11 years ago
Vishesh Handa
2b56c3b02e
SystemMonitor: Always center the dialog on the screen
...
Reviewed By: Aleix
11 years ago
Vishesh Handa
6188a7ad05
SystemMonitor: Remember the correct size
...
BUG: 343595
11 years ago
Vishesh Handa
cde792bdb5
KSystemActivityDialog: Remove extra corner widget
...
it doesn't seem to do anything. The code is from 2009 -
From kde-workspace -
commit 586c37e1f3e6d70d6a819aae7d80d3488666241b
Author: John Tapsell <john.tapsell@kdemail.net>
Date: Fri Dec 18 04:16:03 2009 +0000
Since we have a sizegrip, add an empty corner widget so that there
is space for it
svn path=/trunk/KDE/kdebase/workspace/; revision=1063409
11 years ago
Montel Laurent
5f9ae5e13c
We depend against kf5-5.8 => ecm > 1.6 => we can use new KDE_ variable
11 years ago
l10n daemon script
a54f4802de
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
640f47fdd2
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
2569d35ff4
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
5e058803f7
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
8e3c188f58
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
99bd87a5ad
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
5629da4cb1
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
6b458cad48
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
96a84be147
SVN_SILENT made messages (.desktop file)
11 years ago
Montel Laurent
06cf4131e5
Fix includes
11 years ago
l10n daemon script
e0555d9ef1
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
352e87eec9
SVN_SILENT made messages (.desktop file)
12 years ago
Montel Laurent
0d25924cd0
Use new connect api
12 years ago
l10n daemon script
683c131e75
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
2f911ca9a3
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
92f9c24988
SVN_SILENT made messages (.desktop file)
12 years ago
Martin Klapetek
6e7be85d77
[systemmonitor] Set the shortcut for starting ksysguard as global
...
This also sets the shortcut as Default too
REVIEW: 120513
12 years ago
l10n daemon script
ebd5d8f98e
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
68f45dcc1c
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
5d01f955db
SVN_SILENT made messages (.desktop file)
12 years ago
Hrvoje Senjan
6b64bc2119
[systemmonitor] Get rid of KDELibs4Support
...
REVIEW: 120413
12 years ago