Takahiro Hashimoto
f278e5c385
[kioslave/remote] check return of createWizardEntry
...
REVIEW: 126892
10 years ago
l10n daemon script
e85aecd08e
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
ba1498b06f
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
1f82660474
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
Leslie Zhai
6b2b0cf958
Wrongly git rm kioslave/desktop files
...
Sorry for my verification the REVIEW-126486
the patch git rm directory.sh and ExtraDesktop.sh
I forgot to revert those files when stash that patch, I am so sorry for that.
REVIEW: 126298
10 years ago
Leslie Zhai
30aecb47fe
Add HiddenStatus to systemtray for self-hiding plasmoid
...
As describled in 'Self-hiding plasmoid' requirement
https://forum.kde.org/viewtopic.php?f=83&t=39501
I added Plasma::Types::HiddenStatus, then when the plasmoid's status is
SystemTray.Task.HiddenStatus, the plasmoid is just self-hiding.
REVIEW: 126298
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
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
af1122076d
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
c87cfbbafc
SVN_SILENT made messages (.desktop file)
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
l10n daemon script
3453aa8aa0
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
l10n daemon script
b87767969a
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
aadd4b5683
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
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
l10n daemon script
4b35b41d74
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
708dfb7c07
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
a27a6ebdab
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
56affb4a44
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
4207c67625
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
4dbb05ac96
SVN_SILENT made messages (.desktop file)
11 years ago
Ragnar Thomsen
81c80964d6
Port desktopnotifier kded plugin to json metadata...
...
and disable installation of the desktop file.
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
l10n daemon script
66d1ad7ccf
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
83dc37d67a
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
5adf007260
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
a2f011e715
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
056da9e854
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
David Edmundson
03d7f8f015
Port to QStandardPaths and use setTestModeEnabled
...
This means we don't trash our real home directory with a test
11 years ago
David Edmundson
d349476f39
Fix porting to KF5
...
desktop:/something is not a localfile
11 years ago
l10n daemon script
70cd84260b
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
6cefb78d1e
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
58c69dcea7
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
4a20921c0e
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
f82de89fe9
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
22ef84f4a6
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
0cd67e377b
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
e6f7a741cd
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
Bhushan Shah
6f94dcc98f
Move desktop kio slave from kio-extras
...
As discussed on,
https://mail.kde.org/pipermail/release-team/2015-July/008686.html
desktop:/ kio slave is very much specific to Plasma workspace and
kio-extras will be moved to KDE Applications.
Branched from kio-extras.git, master branch, at commit
17bb1e1bf294c0600b1e351923a880e51ada7278
11 years ago