Commit graph

10 commits

Author SHA1 Message Date
l10n daemon script
dd289b5dee 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"
2016-12-26 05:59:30 +01:00
l10n daemon script
879a1ee367 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"
2016-12-25 05:53:01 +01:00
l10n daemon script
404a5afad7 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"
2016-12-24 06:36:00 +01:00
l10n daemon script
286ad7104d 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"
2016-12-23 05:44:53 +01:00
l10n daemon script
1d622fbbc3 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"
2016-12-22 05:55:50 +01:00
Aleix Pol
1c394ab645 Add names to the knsrc files
Summary: This way they can be properly listed by Discover

Reviewers: graesslin, #plasma

Reviewed By: graesslin, #plasma

Subscribers: plasma-devel, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D3765
2016-12-21 00:08:59 +01:00
Hrvoje Senjan
9bddd0fe8a Fix installation of GHNS material
plasmapkg is no more

Reviewed-by: Martin Gräßlin
2015-03-13 15:51:20 +01:00
Martin Gräßlin
a6c47e0314 [kwin] Add ProvidersUrl to *.knsrc
That at least inits the GHNS download dialog.
2014-02-03 13:04:12 +01:00
Martin Gräßlin
8176c91b2f Enable GHNS for Window Switcher
Thanks to the new category on kde-look.org we can now show the GHNS
button inside the KCM.

BUG: 297636
FIXED-IN: 4.9.3
REVIEW: 106991
2012-10-24 20:36:05 +02:00
Martin Gräßlin
ea5c84dd35 GHNS support for Window Switcher Layouts
Next to the preview/configure button a GHNS button is included
as a simple button with icon only to not break the layout.

Currently the button is not shown as the category on kde-look
has not yet been created yet.

CCBUG: 297636
REVIEW: 104894
2012-05-17 21:18:29 +02:00