yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
18079 commits 3 branches 0 tags 96 MiB
Commit graph

806 commits

Author SHA1 Message Date
l10n daemon script
6bb9f6db7b 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-11-17 13:07:36 +00:00
l10n daemon script
56860e63f5 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-11-07 21:21:42 +00:00
l10n daemon script
3433b05c97 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-11-04 17:27:21 +00:00
l10n daemon script
87285ece17 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-24 10:47:31 +00:00
l10n daemon script
eab663565d 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-10 12:16:11 +00:00
l10n daemon script
c342be5961 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-03 11:20:49 +00:00
Eike Hein
26ee92cd67 'Defaults' should set the title bar double-click action to 'Maximize.' 2015-06-05 18:03:05 +02:00
l10n daemon script
d07fd3a140 SVN_SILENT made messages (.desktop file) 2015-06-01 11:58:20 +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
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
Sebastian Kügler
999baabcfa [kwin] Streamline Comment fields of KCMs 
This patch applies a common language and type-setting to the
systemsettings modules in kwin.

Considerations:
- The comment field might repeat the name, or give more detail about the
  specific settings on this page, this makes sense with how
  systemsettings and kcmshell present it
- Mentioning the words settings, configure, options, etc. is avoided --
  it is clear from the context that these are settings and options.
- Title-case throughout in line with human interface guidelines, see
  http://techbase.kde.org/Projects/Usability/HIG/Capitalization
- The comment ends up being the title, so the
- tech slang is avoided as much as possible, but left in where really
  necessary
- I've left the Name field "mostly untouched", as that one is key for
  the user to find the right module in systemsettings' icon view and in
  the sidebars

The most prominent change is "Compositor" to "Graphics Compositor" (in
the Title field). This is more like a "suggestion", if you don't like
it, I'll take it out again. Reasoning: "Compositor" is a very technical
term, people who know graphics might recognize it. Others might not
understand that "composite" is about graphics -- hence the
specialization. Please enter the commit message for your changes. Lines starting

REVIEW:118338
 2014-06-04 13:31:33 +02:00
Andreas Hartmetz
9c73055a10 Adapt to changes in KAboutData. 2014-05-14 05:04:40 +02:00
Martin Gräßlin
75cac7632b [kcmkwin/kwinoptions] Drop kcmkwm.png icons 
According to git grep it's not used anywhere.

REVIEW: 117998
 2014-05-07 11:50:22 +02:00
Martin Gräßlin
1c2f27945c Adjust kcmkwins to new ki18n 
Define the TRANSLATION_DOMAIN in each of the kcms and use
ki18n_wrap_ui.
 2014-05-05 08:03:55 +02: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
Martin Gräßlin
ee20101142 Fix deprecated warnings for KAboutData 
Ctor with catalog name got deprecated, use ctor without it.
 2014-04-28 17:11:20 +02:00
Martin Gräßlin
7fcecc616c Drop "kwin4_effect_" prefix for BuiltIn Effects 
This removes all the hacks to add kwin4_effect_ to the name of the Effect
and adjusts the desktop files of the effect configuration's parent
component.

Note: the scripted effects still start with kwin4_effect_ prefix.

REVIEW: 117367
 2014-04-28 13:52:50 +02: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
10f89d6019 SVN_SILENT made messages (.desktop file) 2014-03-24 04:35:26 +00:00
Martin Gräßlin
8e4f8f0d9c [kwin/kcms] Only link KCMUtils where needed 
In some KCMs we don't use anything from KCMUtils but just KCModule
which is in ConfigWidgets.
 2014-03-18 07:41:30 +01:00
Martin Gräßlin
2fad6dbf46 [kwin/kcmkwinoption] Remove unused kdialog.h include 
It's kde4support and we don't have that.
 2014-03-18 07:34:33 +01:00
Martin Gräßlin
74a4a1cd42 [kwin/kcmkwinoption] Remove not needed config-workspace.h include 
There are no ifdefs taken from that code.
 2014-03-18 07:32:45 +01:00
Aleix Pol
c72e519d9c Remove KDE/ prefix in include directories 
It's unneeded and deprecated since KF5.
 2014-03-17 16:24:10 +01:00
l10n daemon script
6f8c3dd771 SVN_SILENT made messages (.desktop file) 2014-02-18 05:12:30 +00:00
Bhushan Shah
be8920d76c kwin is now free of KDE4Support 
REVIEW: 115760
 2014-02-16 00:31:01 +05:30
Laurent Navet
d246518b9f KWin: kwinoptions: port to KF5 
CMakelist ui port to KF5
clean unneeded #include

Signed-off-by: Laurent Navet <laurent.navet@gmail.com>
REVIEW: 115272
 2014-01-24 14:15:34 +01:00
Laurent Navet
2fe4d47c15 KF5 port KButtonGroup -> QGroupBox 
Replace deprecated KButtonGroup by QGroupBox

Signed-off-by: Laurent Navet <laurent.navet@gmail.com>
REVIEW: 114423
 2014-01-22 08:27:44 +01:00
l10n daemon script
22a5e1109f SVN_SILENT made messages (.desktop file) 2014-01-19 04:06:03 +00:00
l10n daemon script
eac8a41fed SVN_SILENT made messages (.desktop file) 2014-01-15 04:10:52 +00:00
l10n daemon script
1f5b73941d SVN_SILENT made messages (.desktop file) 2014-01-14 04:06:51 +00:00
l10n daemon script
63165c870f SVN_SILENT made messages (.desktop file) 2013-12-23 03:57:54 +00:00
Laurent Navet
17d28f2639 KF5 port KTabWidget -> QTabWidget 
Replace deprecated KTabWidget with QTabWidget

Signed-off-by: Laurent Navet <laurent.navet@gmail.com>

REVIEW: 114465
 2013-12-16 10:10:17 +01:00
Laurent Navet
2f62a2d1b8 KF5 Port KIntNumInput->QSpinBox 
Replace deprecated KIntNumImput with QSpinBox

Signed-off-by: Laurent Navet <laurent.navet@gmail.com>

REVIEW: 114413
 2013-12-13 08:54:42 +01:00
Martin Klapetek
54bc491c46 Port to KF5 renaming changes 2013-12-11 21:41:47 +01:00
l10n daemon script
8484628fd0 SVN_SILENT made messages (.desktop file) 2013-11-24 04:09:32 +00:00
l10n daemon script
551988ebd4 SVN_SILENT made messages (.desktop file) 2013-11-23 03:52:00 +00:00
l10n daemon script
833d1f85c2 SVN_SILENT made messages (.desktop file) 2013-11-17 04:07:54 +00:00
Aleix Pol
7b110f0671 Improve CMake usage 
It's basically a run of the port-cmake.sh script in here, mostly the changes
are the following:
- Using KF5::* targets
- Using the proper macros, following recent developments in frameworks
 2013-11-15 13:37:47 +01:00
David Edmundson
59e3d0e099 kde4_install_icons -> ecm_install_icons 
REVIEW: 113600
 2013-11-04 13:24:41 +01:00
l10n daemon script
865bcdce38 SVN_SILENT made messages (.desktop file) 2013-11-03 03:52:50 +00:00
Bhushan Shah
935851a2b5 kDebug -> qDebug in kwin 2013-11-01 17:00:41 +05:30
Aurélien Gâteau
05b6de1002 ${KDE4Support_LIBRARIES} => KF5::KDE4Support 
Fixes a few link errors
 2013-10-29 13:00:46 +01:00
l10n daemon script
e01d259072 SVN_SILENT made messages (.desktop file) 2013-10-21 04:05:04 +00:00
l10n daemon script
23fbf4395f SVN_SILENT made messages (.desktop file) 2013-10-09 04:14:36 +00:00
Martin Gräßlin
acb02be357 [kwinoptions] kcmshell4 -> kcmshell5 2013-09-30 07:32:23 +02:00
Martin Gräßlin
d4735333d5 [kwinoptions] Adjust target link libraries for Qt5/KF5 2013-09-30 07:31:40 +02:00
Martin Gräßlin
65516b64b7 [kwinoptions] Add missing includes 2013-09-30 07:30:06 +02:00
Martin Gräßlin
4413859084 [kwinoptions] Drop componentData() 2013-09-30 07:29:38 +02:00
Martin Gräßlin
e1e76f9e17 [kwinoptions] Port KAboutData 
Not sure whether it's still useful given the plugin data, but it's such
a nice who's who of the first KDE developer generation.
 2013-09-30 07:27:48 +02:00
Martin Gräßlin
d70ad3b275 [kwinoptions] slots -> Q_SLOTS 2013-09-30 07:26:46 +02:00
Martin Gräßlin
969e6b85e7 Merge branch 'master' into frameworks-scratch 
Conflicts:
	CMakeLists.txt
	kwin/client.cpp
	kwin/effects/highlightwindow/highlightwindow.cpp
	kwin/libkwineffects/kwingltexture.cpp
	kwin/libkwineffects/kwinxrenderutils.cpp
	kwin/scene_opengl.cpp
	kwin/workspace.cpp
	plasma/desktop/applets/kickoff/CMakeLists.txt
	plasma/desktop/applets/taskmanager/package/contents/code/tools.js
	plasma/desktop/applets/taskmanager/package/contents/ui/Task.qml
	plasma/desktop/applets/taskmanager/package/contents/ui/main.qml
	plasma/desktop/applets/taskmanager/package/metadata.desktop
	plasma/desktop/applets/taskmanager/plugin/textlabel.h
	plasma/desktop/applets/tasks/CMakeLists.txt
	plasma/desktop/applets/tasks/package/metadata.desktop
	plasma/desktop/applets/tasks/tasks.cpp
	plasma/desktop/toolboxes/plasma-toolbox-desktoptoolbox.desktop
	plasma/generic/applets/activitybar/activitybar.cpp
	plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop
	plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop
 2013-09-24 11:28:38 +02:00
l10n daemon script
52cea9285d SVN_SILENT made messages (.desktop file) 2013-09-09 04:11:16 +00:00
l10n daemon script
df17849412 SVN_SILENT made messages (.desktop file) 2013-08-13 04:19:10 +00:00
Sebastian Kügler
08a53e6a11 Remove K_EXPORT_PLUGIN macros 
Include .moc file in configs_builtins.cpp, and reenable the build of the
configs.

REVIEW:111940
 2013-08-08 13:47:25 +02:00
l10n daemon script
30aac961f0 SVN_SILENT made messages (.desktop file) 2013-08-05 04:16:04 +00:00
l10n daemon script
50dfc83d2e SVN_SILENT made messages (.desktop file) 2013-07-31 04:07:19 +00:00
l10n daemon script
68bf8072b2 SVN_SILENT made messages (.desktop file) 2013-07-30 04:11:51 +00:00
l10n daemon script
87a7569100 SVN_SILENT made messages (.desktop file) 2013-07-27 04:01:18 +00:00
l10n daemon script
467b772a90 SVN_SILENT made messages (.desktop file) 2013-07-21 04:08:51 +00:00
l10n daemon script
52461e5885 SVN_SILENT made messages (.desktop file) 2013-07-20 06:40:25 +00:00
Thomas Lübking
f97fa509ae align initial slider and desscription 
BUG: 322522
FIXED-IN: 4.11
REVIEW: 111565
 2013-07-19 21:19:49 +02:00
l10n daemon script
205c557f89 SVN_SILENT made messages (.desktop file) 2013-07-05 03:48:50 +00:00
l10n daemon script
dcd670692b SVN_SILENT made messages (.desktop file) 2013-07-01 03:54:58 +00:00
l10n daemon script
502d003ef5 SVN_SILENT made messages (.desktop file) 2013-06-23 04:02:47 +00:00
l10n daemon script
a2e9957860 SVN_SILENT made messages (.desktop file) 2013-06-10 03:46:39 +00:00
l10n daemon script
34c8d6feb6 SVN_SILENT made messages (.desktop file) 2013-06-05 04:54:40 +00:00
l10n daemon script
020f6fd612 SVN_SILENT made messages (.desktop file) 2013-05-30 04:29:57 +00:00
l10n daemon script
3a0999688f SVN_SILENT made messages (.desktop file) 2013-05-24 03:35:07 +00:00
Yuri Chornoivan
0ef7822d65 Fix typos 2013-05-23 08:34:36 +03:00
Thomas Lübking
e5028bb7fc redesign focus config GUI 
REVIEW: 110001
 2013-05-22 22:24:23 +02:00
l10n daemon script
a3b09b7ac4 SVN_SILENT made messages (.desktop file) 2013-05-22 03:36:01 +00:00
Script Kiddy
7e1386f415 SVN_SILENT made messages (.desktop file) 2013-05-18 10:23:03 +02:00
Script Kiddy
68ddc5f236 SVN_SILENT made messages (.desktop file) 2013-05-11 10:34:17 +02:00
Script Kiddy
44c8899fee SVN_SILENT made messages (.desktop file) 2013-05-10 11:04:42 +02:00
Script Kiddy
5a32f8e813 SVN_SILENT made messages (.desktop file) 2013-05-06 09:31:10 +02:00
Script Kiddy
dfd72523b1 SVN_SILENT made messages (.desktop file) 2013-05-02 09:17:01 +02:00
Script Kiddy
ffc0e62f9d SVN_SILENT made messages (.desktop file) 2013-05-01 09:12:42 +02:00
Script Kiddy
0922410d5b SVN_SILENT made messages (.desktop file) 2013-04-30 17:35:40 +02:00
Will Stephenson
aa8fd5f86c Fix copy and paste error in desktop file 2013-04-26 23:40:26 +02:00
Thomas Lübking
56d39cb327 remove moveResizeMaximized GUI 
REVIEW: 110000
 2013-04-16 22:07:05 +02:00
Martin Gräßlin
60c42b7a34 s/KLocale/KLocalizedString/g 
Many headers included KLocale to use i18n and co. But those methods are
defined in KLocalizedString and not in KLocale.

With KF5 klocale.h does no longer include KLocalizedString causing lots
of compile errors.
 2013-03-07 13:59:15 +01:00
Martin Gräßlin
32b6ef42b9 Strip module path from all Qt #include <> 
Done with:
fixqt4headers.pl --strip-modules

REVIEW: 109176
 2013-03-06 10:26:56 +01:00
Script Kiddy
9af0232217 SVN_SILENT made messages (.desktop file) 2013-02-12 19:49:11 +01:00
Luigi Toscano
9668273441 Merge branch 'KDE/4.10' 2013-02-08 00:28:52 +01:00
Luigi Toscano
ce5e47be5d Extract previously untranslated UI messages. 
CCMAIL: kde-i18n-doc@kde.org
CCMAIL: kwin@kde.org
 2013-02-08 00:26:48 +01:00
Script Kiddy
dad894d830 SVN_SILENT made messages (.desktop file) 2013-02-06 08:18:00 +01:00
Script Kiddy
7d16cef10e SVN_SILENT made messages (.desktop file) 2013-02-05 21:32:15 +01:00
Marco Martin
baf21f6b34 Merge branch 'KDE/4.10' 
Conflicts:
	plasma/generic/applets/batterymonitor/metadata.desktop
	plasma/generic/applets/lock_logout/metadata.desktop
 2013-01-31 17:00:02 +01:00
Script Kiddy
f193c56957 SVN_SILENT made messages (.desktop file) 2013-01-31 16:31:28 +01:00
Script Kiddy
ca2cf4d697 SVN_SILENT made messages (.desktop file) 2013-01-31 12:00:36 +01:00
Script Kiddy
1416c8d62c SVN_SILENT made messages (.desktop file) 2013-01-30 16:27:26 +01:00
Thomas Lübking
9ae3cd3618 turn labels into checkboxes 
BUG: 313228
 2013-01-23 21:28:26 +01:00
Thomas Lübking
671f84debc turn labels into checkboxes 
BUG: 313228
 2013-01-23 21:27:47 +01:00
Martin Gräßlin
5f4935fc66 Merge branch 'KDE/4.10' 
Conflicts:
	kwin/workspace.cpp
 2013-01-14 15:43:01 +01:00
Script Kiddy
88f998a924 SVN_SILENT made messages (.desktop file) 2013-01-14 12:46:29 +01:00