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
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
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
l10n daemon script
c761342a0f
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
d20799548a
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
0d1c0e8b9e
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
703f837f6b
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
d2737d2b55
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
Kai Uwe Broulik
f896fb554e
[Places Runner] Add place category as subtext
...
This allows to tell between "Pictures" location and "Search for Pictures".
Differential Revision: https://phabricator.kde.org/D13844
8 years ago
Kai Uwe Broulik
5a951e9a7e
[Places Runner] Fix opening search and timeline URLs
...
KFilePlacesModel internally only stores search:/ URLs and then translates them to the correct Baloo query as needed.
Differential Revision: https://phabricator.kde.org/D13841
8 years ago
Kai Uwe Broulik
12b3fb2e3b
[Places Runner] Fix opening devices
...
The codepath for opening devices was never actually entered as always a QUrl was set as data.
This resulted in errors like "Cannot open URL /org/freedesktop/someudi".
Moreover, for some reason the run() code created a new KFilePlacesModel but since devices are added delayed,
searching for a device in the model right after creation doesn't work.
The code is adjusted to use the one KFilePlacesModel instance in the helper, since run() is executed on the main thread anyway.
Differential Revision: https://phabricator.kde.org/D13840
8 years ago
l10n daemon script
ba1cb7bc80
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
4d2179ae95
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
beefcb1581
Use explicit
8 years ago
Friedrich W. H. Kossebau
2608ccce81
Use nullptr
8 years ago
l10n daemon script
265ab95965
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
aee0a5cf06
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
ccc944d570
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
Laurent Montel
7063bba5f7
Use nullptr. Initialize variables. Don't use 0 for QString()
8 years ago
l10n daemon script
15df7f02c0
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
5a540fe5af
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
a93e47f3d0
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
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
d5a7ad93fb
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
David Faure
1abaaa55e9
add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + fix compilation
10 years ago
Kai Uwe Broulik
40e35e0257
[Places Runner] Add mimeDataForMatch
...
This allows to drag found places, like "Pictures" or mounted hard drives elsewhere,
eg. to create a shortcut on the desktop
Differential Revision: https://phabricator.kde.org/D1590
10 years ago
Aleix Pol
96ff1c868e
Properly define overrides as suggested by the c++ standard
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
36b2d40cae
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
8180c50abd
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
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
738b59196a
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
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
6ef6c7e692
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
e558bc76b9
SVN_SILENT made messages (.desktop file)
12 years ago
Lukáš Tinkl
9f658c0e9b
i18n fixes
...
also ported the modules to K_PLUGIN_FACTORY_WITH_JSON while at it
12 years ago
l10n daemon script
31ad166b6b
SVN_SILENT made messages (.desktop file)
12 years ago
Vishesh Handa
d55cd5217c
PlacesRunner: Port away from KDELibs4Support
12 years ago
l10n daemon script
cf13f672b0
SVN_SILENT made messages (.desktop file)
12 years ago