l10n daemon script
46691b17ac
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-08-16 10:09:08 +00:00
Martin Gräßlin
3a730fa51e
Merge branch 'Plasma/5.7'
2016-08-15 16:07:50 +02:00
l10n daemon script
81d0454147
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-08-14 11:55:28 +00:00
l10n daemon script
0c69ca69ce
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-07-28 13:13:42 +00:00
l10n daemon script
4578eab797
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-07-28 09:56:48 +00:00
l10n daemon script
710b5fb068
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-07-21 13:28:46 +00:00
l10n daemon script
aa3691b831
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-07-21 10:07:48 +00:00
l10n daemon script
c240755dee
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-06-23 23:41:42 +00:00
l10n daemon script
8b1a5f27df
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-06-23 21:12:32 +00:00
l10n daemon script
344650fe5d
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-06-21 10:41:58 +00:00
l10n daemon script
a22e3254ec
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-06-19 12:57:39 +00:00
l10n daemon script
2f1014555c
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-06-17 13:26:16 +00:00
Burkhard Lück
50184cc53f
Fix X-DocPath in kcmkwineffects.desktop
...
change X-DocPath in kcmkwineffects.desktop to kcontrol/kwineffects/index.html
REVIEW:127907
2016-05-17 18:06:03 +02:00
l10n daemon script
c331b3f825
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-05-16 10:31:39 +00:00
l10n daemon script
731e9c8d41
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-05-05 10:01:17 +00:00
l10n daemon script
2010bedb1e
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-25 10:26:42 +00: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
1309b8c8a0
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-16 09:59:16 +00:00
l10n daemon script
9a10eabc11
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-13 09:34:52 +00:00
l10n daemon script
390bad1ed8
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-11 10:23:59 +00:00
l10n daemon script
240be60787
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-10 09:41:00 +00:00
l10n daemon script
58e2bca56d
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-09 09:58:54 +00:00
l10n daemon script
bfda50ab68
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-08 09:41:47 +00:00
l10n daemon script
58b59d3e20
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-07 10:11:11 +00:00
Thomas Pfeiffer
d847ddf841
Fix search keywords between Desktop Effects KCM and Compositing KCM
...
Searching for "animation speed" now points to the Compositing KCM, where
the animation speed setting is, instead of the Destkop Effects KCM,
where it was before.
Same for compositing, OpenGL, XRender and video settings
BUG: 361436
FIXED-IN: 5.7
Differential Revision: https://phabricator.kde.org/D1326
2016-04-06 19:24:22 +02: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
aa0f2c88f0
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-10 11:46:53 +00:00
l10n daemon script
aff81afd27
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-12-30 09:40:57 +00:00
l10n daemon script
7b23cbc13e
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-12-14 10:29:43 +00:00
l10n daemon script
0dd2917cba
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-12-01 10:31:47 +00:00
l10n daemon script
e24e39b528
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-26 15:58:56 +00:00
l10n daemon script
c69c46d8ca
SVN_SILENT made messages (.desktop file)
2015-11-25 18:20:33 +00:00
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
7d8fcbfd72
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-12 11:51:31 +00:00
l10n daemon script
4924e9479b
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-11 10:36:31 +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
99c3e5c290
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-06 12:18:24 +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
b33a878e45
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-02 11:12:07 +00:00
l10n daemon script
129636de2e
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-27 12:33:37 +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
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
8af6238b27
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-23 10:12:06 +00:00
l10n daemon script
2abd939a0a
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-22 11:11:28 +00:00
l10n daemon script
0e15c07cf0
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-21 10:15:30 +00:00
Martin Gräßlin
c408e9ccec
Drop remaning code for ShowDashboard
...
Removes the ElectricAction for ShowDashboard and the relevant code
in screenedges and the KCM.
Also a leftover in the glide effect.
REVIEW: 125700
BUG: 353928
2015-10-21 08:12:01 +02: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
l10n daemon script
99237c9b3f
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-06-01 10:08:03 +00:00
l10n daemon script
cea4b7faeb
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-05-15 10:25:45 +00:00
l10n daemon script
a3c7eac1b8
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-05-14 10:21:14 +00:00
l10n daemon script
b4c8fa64b8
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-28 13:46:57 +00:00
l10n daemon script
a00f1f3ad4
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-21 13:24:50 +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
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
l10n daemon script
d173ff7412
SVN_SILENT made messages (.desktop file)
2015-01-13 12:47:17 +00:00
l10n daemon script
6f0ff3ff7e
SVN_SILENT made messages (.desktop file)
2014-11-06 08:51:14 +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
87878572de
SVN_SILENT made messages (.desktop file)
2014-10-21 11:18:35 +00:00
l10n daemon script
98b2402688
SVN_SILENT made messages (.desktop file)
2014-10-10 09:32:35 +00: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
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
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
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
l10n daemon script
1a99520426
SVN_SILENT made messages (.desktop file)
2014-07-09 03:36:32 +00: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
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
l10n daemon script
b70107b463
SVN_SILENT made messages (.desktop file)
2014-06-01 08:11:53 +00:00
l10n daemon script
979071a44c
SVN_SILENT made messages (.desktop file)
2014-05-23 08:15:19 +00:00
l10n daemon script
203d043a09
SVN_SILENT made messages (.desktop file)
2014-05-16 08:23:41 +00:00
l10n daemon script
7dec86078c
SVN_SILENT made messages (.desktop file)
2014-05-04 08:44:36 +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