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
l10n daemon script
42a0c5637a
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
bbc1b685ae
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
Noah Davis
ffc47c6e22
Change icons for Activities dataengine and runner
...
Summary:
KCMs should have color icons while widgets should have monochrome icons, so I have changed the name of the KCM icon.
Depends on D18529
Reviewers: #vdg, #plasma, ngraham
Reviewed By: #vdg, ngraham
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D18532
7 years ago
l10n daemon script
7383a93e21
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
b21e262bb9
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
ec7f62b766
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
Laurent Montel
ce04cdc185
Fix url
7 years ago
Friedrich W. H. Kossebau
6e1946cec7
Remove module prefix from Qt includes
8 years ago
Friedrich W. H. Kossebau
f6dad3c07b
Update D-Bus xml files to use "Out*" for signal type Qt annotations
...
Since Qt 5.6.3/5.7.1 qdbusxml2cpp favours as name for signals argument
annotations the name "org.qtproject.QtDBus.QtTypeName.Out*", matching
the "out" direction nature of the arguments.
".In*" is still supported for backward compat, but with a warning.
8 years ago
Laurent Montel
31421a6e5f
Use nullptr
8 years ago
l10n daemon script
c996c13c53
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
8ad9c6ba90
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
l10n daemon script
bd633d8289
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
5101b0b5f9
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
3973041666
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
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
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
fb88c728e1
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
37ba29973a
don't use deprecated argument
11 years ago
Montel Laurent
5f9ae5e13c
We depend against kf5-5.8 => ecm > 1.6 => we can use new KDE_ variable
11 years ago
Jonathan Riddell
f1ac30fa83
remove second calls to project() only 1 allowed per cmake project
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
David Edmundson
d03b205276
kservice_desktop_to_json -> kcoreaddons_desktop_to_json
11 years ago
Montel Laurent
0d25924cd0
Use new connect api
12 years ago
Montel Laurent
ed441f0bc3
Remove not necessary include moc
12 years ago
Sebastian Kügler
8804c1bbe1
Streamline name of activities engine's desktop file
12 years ago
l10n daemon script
6ef6c7e692
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
31ad166b6b
SVN_SILENT made messages (.desktop file)
12 years ago
Bhushan Shah
cc3ab5e0f4
Export toggleActivityManager method over dbus
...
This unbreaks the activities dataengine
REVIEW: 118367
BUG: 335427
12 years ago
Elias Probst
7b5e47c1e7
Fix build (multiple missing Qt5:: components in target_link_libraries).
...
REVIEW: 118209
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
Aleix Pol
bb43827e62
Revert "Port dataengines to PLASMA_DATA_INSTALL_DIR"
...
This reverts commit 73736e80ea .
DataEngines are actual plugins to plasma-framework, so the change
is not correct. Otherwise they end up in /share
12 years ago
Aleix Pol
73736e80ea
Port dataengines to PLASMA_DATA_INSTALL_DIR
12 years ago
l10n daemon script
bc51c4f2b0
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
c12cad775c
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
8356528abc
SVN_SILENT made messages (.desktop file)
12 years ago