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
Stefan Brüns
e44e2a7f35
Set permissions for links in remote:, necessary for correct visualization
...
KFileItem uses UDS_ACCESS to determine permissions. Readability is
subsequently used to create the list of overlay icons.
CCBUG: 339193
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
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
Montel Laurent
aa80e1182a
Port to qCDebug
11 years ago
Montel Laurent
2e14731199
Remove no necessary include moc
11 years ago
Lukáš Tinkl
99bfbce8f3
remove a useless KGlobal::locale() call
11 years ago
l10n daemon script
e0555d9ef1
SVN_SILENT made messages (.desktop file)
12 years ago
Lukáš Tinkl
032136c3cd
fix crash
...
applications:/ and programs:/ kio slaves can list apps again
12 years ago
Lukáš Tinkl
0853202b0c
fix crash
...
applications:/ and programs:/ kio slaves can list apps again
12 years ago
l10n daemon script
352e87eec9
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
68f45dcc1c
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
5d01f955db
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
ae30b993c4
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
697651faa6
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
5386b47a87
SVN_SILENT made messages (.desktop file)
12 years ago
Kevin Funk
0686e449ac
Make compile with Qt 5.4
...
BUG: 337929
12 years ago
Lukáš Tinkl
0e10fda2e0
set translation domain
12 years ago