l10n daemon script
d389cde75f
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
6ea0292868
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
bd8f77e9cf
Build test/autotest if BUILD_TESTING is defined
8 years ago
l10n daemon script
116174f442
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
64bc9941fc
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 Faure
31bbfe5987
Improve unittest for renaming desktop icons
...
to ensure that the target URL is updated by KDirLister.
This unittest requires the KIO fix 1449ecf136 (KF 5.37).
CCBUG: 382341
The unittest detected a "//" in the UDS_LOCAL_PATH values,
so this commit fixed that as well.
9 years ago
René J.V. Bertin
a5a18f5ac7
kio_desktop: don't use QDesktopServices::storageLocation
...
The method is deprecated and using it can generate build failures (e.g.
with Qt 5.8+ and GCC 7.1+).
BUG: 381566
9 years ago
Luigi Toscano
039bff026c
Rename the translation catalog (avoid conflicts)
...
Avoid the conflict with their still-shipped counterparts from
kdelibs and kde-runtime.
9 years ago
Kai Uwe Broulik
d6121f3f5c
[desktop:/ KIO] Add descriptive name for root item
...
This way Folder View could use the root item for its heading instead of special-casing it for desktop:/
Differential Revision: https://phabricator.kde.org/D5221
9 years ago
Elvis Angelaccio
f81c73b8e2
Drop remote ioslave, which is now in KIO 5.32
...
As discussed on plasma-devel [1], the remote ioslave has been moved to kio [2].
This bumps the minimum KF5 version to 5.32
[1]: https://mail.kde.org/pipermail/plasma-devel/2016-November/061750.html
[2]: https://phabricator.kde.org/D4690
BUG: 371825
FIXED-IN: 5.10
Differential Revision: https://phabricator.kde.org/D3531
9 years ago
Elvis Angelaccio
4c12339852
[kioslave/remote] Cleanup includes
...
GIT_SILENT
9 years ago
Elvis Angelaccio
2a3b74df75
[kioslave/remote] Fix broken kded module
...
Summary:
Commit 72e39f083a broke the kded module. Turns out that the old code
just forced a refresh of the `remote:/` QUrl, so we can just do that
explicitly and remove all the old cruft.
While at it, use a KDirWatcher that just watches the
`.local/share/remote/` folder, instead of checking *every* unrelated
QUrl emitted by KDirNotify.
Test Plan:
Adding/deleting/editing .desktop files in `.local/share/remoteview` now
automatically reloads the `remote:/` url in Dolphin or Folder View.
Reviewers: #plasma
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D4573
9 years ago
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
60eb1564da
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
126fc2f9e3
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
Elvis Angelaccio
e32b68ed61
[kioslave/remote] Use kf5 coding style
...
Summary: Ran `uncrustify-kf5` from kde-dev-scripts.
Test Plan: Builds; still works.
Reviewers: #plasma
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D4489
9 years ago
Elvis Angelaccio
c1858e3a84
[kioslave/remote] Remove unused variable
...
GIT_SILENT
9 years ago
Elvis Angelaccio
566bbf7ba6
[kioslave/remote] Fix porting bugs
...
Summary:
Commit 72e39f083a broke the remote ioslave from Dolphin Details view
mode, because of missing slashes or otherwise broken `QUrl`s.
BUG: 376131
FIXED-IN: 5.9.2
Test Plan: `remote:/` now works again from Dolphin Details view mode.
Reviewers: #plasma
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D4480
9 years ago
l10n daemon script
53cf059ff3
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
a1cbdfbc79
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 Faure
a433938667
Add unittest for bug 360487
...
CCBUG: 360487
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
b072ad0ac8
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
a79f279f07
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
Elvis Angelaccio
f81c843dcf
[kioslave/desktop] Port away from kdelibs4support
...
Differential Revision: https://phabricator.kde.org/D3294
9 years ago
Elvis Angelaccio
9e0839aebf
[kioslave/applications] Port away from kdelibs4support
...
Differential Revision: https://phabricator.kde.org/D3293
9 years ago
Elvis Angelaccio
ee91cd1972
[kioslave/remote] Remove unused tests folder
...
Differential Revision: https://phabricator.kde.org/D3243
10 years ago
Elvis Angelaccio
72e39f083a
[kioslave/remote] Port away from kdelibs4support
...
Differential Revision: https://phabricator.kde.org/D3243
10 years ago
l10n daemon script
43523918f1
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
6fc1a81b51
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
7f978fb4a8
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
e56d40453a
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 Edmundson
e38897c057
Remove very outdated config upgrding in kio_desktop
...
Summary:
This is clearly some upgrade code from many years ago - before Plasma 5.
Gets rid of a whole lot of deprecated function calls (and a unsigned vs
signed int wraning
Test Plan: make
Reviewers: #plasma
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D2579
10 years ago
l10n daemon script
fe110afa68
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
Chinmoy Ranjan Pradhan
6911541421
Fix files/folders in desktop not opening with right click context menu
...
UDS_LOCAL_PATH will return the path without file scheme. This schemeless
path will be set in UDS_TARGET_URL and then will be used by kio's
targetUrl and then final passed to Krun where it will fail the scheme test
eventually leading to the said bug.
Fix for this is to create a url using QUrl::fromLocalFile and then
pass the url.toString()'s result to insert.
BUG: 364530
CCMAIL: chinmoyrp65@gmail.com
Differential revision: https://phabricator.kde.org/D2054
10 years ago
l10n daemon script
df5e4e91ee
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
73f5302679
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
10be58f745
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
David Edmundson
6efdd7a14e
Port KIO Remote to use ECM declare logging category
...
Reviewers: #plasma, graesslin
Reviewed By: #plasma, graesslin
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D1954
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
Martin Gräßlin
6b70416fac
[kioslave/desktop] Ensure there are no multiple / when creating the file path
...
Summary: Fixes failing test.
Reviewers: #plasma
Subscribers: plasma-devel
Projects: #plasma
Differential Revision: https://phabricator.kde.org/D1497
10 years ago
l10n daemon script
9f625bdf15
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
0b794f091a
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
b872647e74
SVN_SILENT made messages (.desktop file)
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
l10n daemon script
1eebc709f0
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
ccb199b682
SVN_SILENT made messages (.desktop file)
10 years ago
Aleix Pol
96ff1c868e
Properly define overrides as suggested by the c++ standard
10 years ago