l10n daemon script
ba0b34c755
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"
2018-11-22 06:02:11 +01:00
Vlad Zagorodniy
fb68e162b0
[effects] Move Fade, Glide, and Scale effect into exclusive group
...
Summary:
Fade, glide, and scale effect are mutually exclusive effects so they have
to be put into an exclusive group in the desktop effects kcm.
Test Plan: {F6418669}
Reviewers: #kwin, #plasma, #vdg, ngraham, graesslin
Reviewed By: #kwin, #plasma, #vdg, ngraham, graesslin
Subscribers: kwin
Tags: #kwin
Differential Revision: https://phabricator.kde.org/D16858
2018-11-15 19:02:00 +02:00
l10n daemon script
cd6f56a443
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"
2018-08-11 05:34:25 +02:00
l10n daemon script
c302af7c66
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"
2018-08-03 05:41:05 +02:00
l10n daemon script
3b3aa82f58
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"
2018-07-23 05:24:40 +02:00
l10n daemon script
e3024908f5
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"
2017-06-10 04:29:59 +02:00
l10n daemon script
4c3404e150
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"
2017-04-16 04:05:25 +02:00
l10n daemon script
b160c5babb
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"
2017-03-25 04:37:53 +01:00
l10n daemon script
8725f2441e
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"
2017-03-22 05:17:38 +01:00
l10n daemon script
0380027611
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"
2017-02-20 07:43:31 +01:00
l10n daemon script
13d389efd1
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-20 13:30:44 +01:00
l10n daemon script
c855555903
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-13 04:11:59 +01:00
l10n daemon script
406a1e5326
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-02-20 09:52:01 +00:00
l10n daemon script
bd3083e81f
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-01-30 09:40:55 +00:00
l10n daemon script
75f3964db7
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"
2015-10-25 10:45:05 +00:00
l10n daemon script
262da1b7c9
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"
2015-04-07 13:20:00 +00:00
l10n daemon script
7553c411c2
SVN_SILENT made messages (.desktop file)
2014-05-03 08:32:58 +00:00
l10n daemon script
2f28437e24
SVN_SILENT made messages (.desktop file)
2014-05-02 08:51:14 +00:00
l10n daemon script
2838a9b606
SVN_SILENT made messages (.desktop file)
2014-04-29 10:12:33 +00:00
l10n daemon script
15aa971aab
SVN_SILENT made messages (.desktop file)
2014-04-29 04:54:44 +00:00
l10n daemon script
e1f418f4d0
SVN_SILENT made messages (.desktop file)
2014-04-28 09:00:35 +00:00
l10n daemon script
f44575ddbf
SVN_SILENT made messages (.desktop file)
2014-04-28 05:16:52 +00:00
l10n daemon script
69c3289c18
SVN_SILENT made messages (.desktop file)
2014-04-27 21:02:43 +00:00
l10n daemon script
e6db000065
SVN_SILENT made messages (.desktop file)
2014-04-04 05:29:27 +00:00
l10n daemon script
eef56c98b2
SVN_SILENT made messages (.desktop file)
2014-04-03 05:10:09 +00:00
l10n daemon script
22a5e1109f
SVN_SILENT made messages (.desktop file)
2014-01-19 04:06:03 +00:00
Script Kiddy
e5316fa9d9
SVN_SILENT made messages (.desktop file)
2013-05-17 09:43:27 +02:00
Script Kiddy
7d821f3814
SVN_SILENT made messages (.desktop file)
2013-01-26 09:04:17 +01:00
Script Kiddy
12f341712c
SVN_SILENT made messages (.desktop file)
2012-12-24 09:05:36 +01:00
Script Kiddy
d7316b9fcb
SVN_SILENT made messages (.desktop file)
2012-12-23 08:01:50 +01:00
Script Kiddy
953d088b6a
SVN_SILENT made messages (.desktop file)
2012-06-12 17:07:51 +02:00
Script Kiddy
62211420c7
SVN_SILENT made messages (.desktop file)
2012-05-28 11:08:19 +02:00
Martin Gräßlin
f8c0616574
Fade effect goes JavaScript
...
Our first effect written in JavaScript to replace an existing C++
effect. Fade effect has been chosen as it has shown to be problematic
in the past and would have needed a migration to AnimationEffect anyway.
2012-03-12 21:37:42 +01:00