Commit graph

698 commits

Author SHA1 Message Date
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
01b61a9ede 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-03-16 10:12:25 +00:00
l10n daemon script
9361fb8610 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-03-15 09:56:33 +00:00
l10n daemon script
a14e62dadc SVN_SILENT made messages (.desktop file) 2015-02-22 10:26:29 +00:00
l10n daemon script
f49fbdab5d SVN_SILENT made messages (.desktop file) 2015-02-15 10:18:01 +00:00
Martin Gräßlin
36b6fc4776 Merge branch 'Plasma/5.2' 2015-02-02 09:01:00 +01:00
Martin Gräßlin
62d71bc247 [kcmkwin/options] Load/Unload WindowGeometry effect
Depending on the state of the show window geometry we need to load
or unload the effect.

BUG: 343272
FIXED-IN: 5.2.1
REVIEW: 122258
2015-01-29 11:44:47 +01:00
l10n daemon script
795ebbb879 SVN_SILENT made messages (.desktop file) 2015-01-27 12:18:48 +00:00
l10n daemon script
e178851846 SVN_SILENT made messages (.desktop file) 2015-01-27 11:24:24 +00:00
l10n daemon script
56b830202e SVN_SILENT made messages (.desktop file) 2015-01-21 09:49:18 +00:00
l10n daemon script
2734f709ad SVN_SILENT made messages (.desktop file) 2015-01-21 08:55:56 +00:00
l10n daemon script
bf7bf73464 SVN_SILENT made messages (.desktop file) 2015-01-15 09:02:26 +00:00
Martin Gräßlin
a22ea244db Merge branch 'Plasma/5.2' 2015-01-14 13:56:15 +01:00
Martin Gräßlin
0577dee236 [kcmkwin/options] Ensure rich text is recognized as rich text
The heuristic checks whether there is something which looks like a
tag before the first line break. So let's use a <br> instead of a \n
for the first line break.

BUG: 315282
FIXED-IN: 5.3.0
REVIEW: 122032
2015-01-14 08:25:20 +01:00
l10n daemon script
d173ff7412 SVN_SILENT made messages (.desktop file) 2015-01-13 12:47:17 +00:00
l10n daemon script
a010bbc6a7 SVN_SILENT made messages (.desktop file) 2014-11-02 21:49:41 +00:00
l10n daemon script
7d9831d8b4 SVN_SILENT made messages (.desktop file) 2014-10-23 08:55:48 +00:00
l10n daemon script
5288363274 SVN_SILENT made messages (.desktop file) 2014-10-17 09:07:36 +00:00
l10n daemon script
6dcd8f4a01 SVN_SILENT made messages (.desktop file) 2014-09-28 14:28:25 +00:00
Volker Krause
5db2d5a556 Make constants const, saves a few symbols in the .data section. 2014-09-27 20:30:49 +02:00
l10n daemon script
857610668e SVN_SILENT made messages (.desktop file) 2014-09-27 08:47:58 +00:00
l10n daemon script
08540b45eb SVN_SILENT made messages (.desktop file) 2014-09-21 08:48:08 +00:00
l10n daemon script
1205c9c170 SVN_SILENT made messages (.desktop file) 2014-09-07 08:46:08 +00:00
l10n daemon script
493e9b3238 SVN_SILENT made messages (.desktop file) 2014-09-02 10:43:26 +00:00
l10n daemon script
baf37deacd SVN_SILENT made messages (.desktop file) 2014-09-01 08:42:05 +00:00
l10n daemon script
5114d9b5da SVN_SILENT made messages (.desktop file) 2014-08-31 08:41:36 +00:00
l10n daemon script
ed02a9fb96 SVN_SILENT made messages (.desktop file) 2014-08-28 08:49:28 +00:00
l10n daemon script
f2fc577770 SVN_SILENT made messages (.desktop file) 2014-08-24 08:45:33 +00:00
l10n daemon script
36b404057d SVN_SILENT made messages (.desktop file) 2014-08-15 09:08:57 +00:00
l10n daemon script
1478a08c31 SVN_SILENT made messages (.desktop file) 2014-08-14 08:44:45 +00:00
l10n daemon script
3340a5fa1a SVN_SILENT made messages (after extraction) 2014-08-08 08:31:20 +00:00
l10n daemon script
2f5daf5f4b SVN_SILENT made messages (after extraction) 2014-08-07 07:56:52 +00:00
l10n daemon script
b48595e86a SVN_SILENT made messages (after extraction) 2014-08-06 07:57:49 +00:00
l10n daemon script
2c78ff8bfd SVN_SILENT made messages (.desktop file) 2014-07-25 10:15:29 +00:00
l10n daemon script
5179d4d3c9 SVN_SILENT made messages (.desktop file) 2014-07-16 09:40:44 +00:00
l10n daemon script
ae9689a105 SVN_SILENT made messages (.desktop file) 2014-07-14 03:49:40 +00:00
Thomas Lübking
ddd8ea4c74 fix spinbox width
BUG: 336150
2014-07-03 18:39:38 +02:00
Sebastian Kügler
b82bce4d5b Adapt to latet changes from review 2014-07-01 12:44:42 +02:00
Sebastian Kügler
b5000a21b7 Adapt to new systemsettings categories
Roughly, this moves the systemsettings-visible KCModules under either
Workspace | Window Behavior and Workspace | Desktop Behavior, as laid
out here: http://forum.kde.org/viewtopic.php?f=285&t=121053&start=30#p313837
2014-07-01 12:44:41 +02:00
l10n daemon script
28c7f3c47d SVN_SILENT made messages (.desktop file) 2014-06-29 08:41:34 +00:00
l10n daemon script
026f5ea660 SVN_SILENT made messages (.desktop file) 2014-06-20 09:01:14 +00:00
l10n daemon script
4a88e1b005 SVN_SILENT made messages (.desktop file) 2014-06-16 08:24:58 +00:00
l10n daemon script
54d85c8a73 SVN_SILENT made messages (.desktop file) 2014-06-15 08:26:15 +00:00
l10n daemon script
eb5abedbe7 SVN_SILENT made messages (.desktop file) 2014-06-12 08:30:34 +00:00
l10n daemon script
ea866906f0 SVN_SILENT made messages (.desktop file) 2014-06-11 08:21:08 +00:00
l10n daemon script
e73f6b2278 SVN_SILENT made messages (.desktop file) 2014-06-10 10:37:36 +00:00
l10n daemon script
9b869958b3 SVN_SILENT made messages (.desktop file) 2014-06-08 08:27:53 +00:00
l10n daemon script
4c49449bcb SVN_SILENT made messages (.desktop file) 2014-06-07 08:25:25 +00:00
l10n daemon script
abe62085e8 SVN_SILENT made messages (.desktop file) 2014-06-06 08:52:09 +00:00
l10n daemon script
bbcacffd23 SVN_SILENT made messages (.desktop file) 2014-06-05 08:37:44 +00:00