l10n daemon script
08f311eec8
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-04-27 09:34:18 +00:00
Martin Gräßlin
e64450c807
Merge branch 'Plasma/5.6'
2016-04-26 13:13:17 +02:00
l10n daemon script
21f246c279
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-04-21 10:02:53 +00:00
l10n daemon script
ca73e65ac1
SVN_SILENT made messages (.desktop file)
2016-04-11 13:10:20 +00:00
l10n daemon script
9331996a67
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-04-05 10:31:41 +00:00
l10n daemon script
e3272fea36
SVN_SILENT made messages (.desktop file)
2016-03-28 13:15:07 +00:00
l10n daemon script
863c586b19
SVN_SILENT made messages (.desktop file)
2016-03-15 14:32:45 +00:00
l10n daemon script
544e5a7fb8
SVN_SILENT made messages (.desktop file)
2016-03-10 12:46:31 +00:00
l10n daemon script
9fb71ef9a2
SVN_SILENT made messages (.desktop file)
2016-03-09 12:09:22 +00:00
l10n daemon script
25b6938804
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-27 09:32:00 +00:00
Marco Martin
a104a4af7f
try more aggressively to retarget
...
instead of deleting all animations when one is over,
try to retarget them all, and redo them only
if retargeting fails
REVIEW:127101
2016-02-26 10:28:47 +01:00
l10n daemon script
5e564cdf7f
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-24 09:14:01 +00:00
David Rosca
a982367a75
Morphingpopups: Don't skip small steps
...
Resize may happen in smaller steps, so we should not skip them.
REVIEW: 127137
2016-02-23 19:13:45 +01:00
l10n daemon script
53bc6b803b
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-22 10:55:49 +00:00
l10n daemon script
606d2ce362
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-21 09:53:46 +00: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
7ac1b02d15
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-19 09:28:04 +00:00
Marco Martin
82a1b3ee13
Morphingpopups effect, to animate tooltips
...
this effect, derived from the Maximize one, will
take the place of the manual window position
animation that Plasma tooltip are using.
this should cause less problems as animationg
positions on X is very error prone, plus it's
less jarring when the tooltip sizes changes too,
since that gets animated as well (behavior similar
to Windows7 taskbar tooltips)
REVIEW:126968
2016-02-17 15:03:55 +01:00
