l10n daemon script
|
3962e29b61
|
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-11-30 04:25:52 +01:00 |
|
l10n daemon script
|
7c13492f2a
|
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-11-29 04:25:11 +01:00 |
|
l10n daemon script
|
3b33c0a566
|
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-10-04 10:22:57 +00:00 |
|
l10n daemon script
|
84f2e93be9
|
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-09-30 09:38:09 +00:00 |
|
l10n daemon script
|
71b8f9b22d
|
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-09-09 09:25:38 +00:00 |
|
Friedrich W. H. Kossebau
|
3ec4f26e79
|
Fix: update wallpaper example Autumn's config.qml to QtQuick.Controls
|
2016-08-03 23:01:07 +02:00 |
|
l10n daemon script
|
19e8f37753
|
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-29 09:34:42 +00:00 |
|
Marco Martin
|
92bad819e7
|
remove kpart related code
those were the last files licensed LGPL2 only
this code wasn't built or installed so in the end is just
removing dead code
|
2016-05-19 17:47:09 +02:00 |
|
l10n daemon script
|
4883c580f9
|
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-18 09:38:52 +00:00 |
|
l10n daemon script
|
e2edaa2c1a
|
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:23:50 +00:00 |
|
Marco Martin
|
12ea79b341
|
Merge branch 'mart/customShell'
Conflicts:
examples/CMakeLists.txt
src/plasma/pluginloader.cpp
|
2016-03-08 15:38:31 +01:00 |
|
l10n daemon script
|
3847dc6d91
|
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:12:03 +00:00 |
|
l10n daemon script
|
42e5ffe5ee
|
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-15 10:35:12 +00:00 |
|
l10n daemon script
|
13dc03991d
|
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-06 09:49:14 +00:00 |
|
l10n daemon script
|
087c10cd43
|
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-05 09:18:18 +00:00 |
|
l10n daemon script
|
3dac19023c
|
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-02 10:51:53 +00:00 |
|
l10n daemon script
|
e965b8c647
|
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-26 10:21:15 +00:00 |
|
l10n daemon script
|
bd10d78e1e
|
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-22 09:52:02 +00:00 |
|
l10n daemon script
|
3908c521ca
|
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-13 10:35:10 +00:00 |
|
l10n daemon script
|
345fba11bf
|
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:28:22 +00:00 |
|
l10n daemon script
|
a1feac929b
|
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-16 09:05:14 +00:00 |
|
l10n daemon script
|
9d96277a5e
|
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-09 09:05:50 +00:00 |
|
l10n daemon script
|
4a6cc3319e
|
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-08 10:05:59 +00:00 |
|
l10n daemon script
|
3c90a5d835
|
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-07 10:15:57 +00:00 |
|
l10n daemon script
|
8d9fd0846a
|
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-06 09:14:26 +00:00 |
|
l10n daemon script
|
26ca3e43b2
|
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-05 09:08:31 +00:00 |
|
l10n daemon script
|
8a21e2bb27
|
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-04 09:12:31 +00:00 |
|
l10n daemon script
|
67a6976f8c
|
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-03 09:40:56 +00:00 |
|
Sebastian Kügler
|
16b3124578
|
Don't install plasmoid for now
This may get in the way of users copying it and forgetting to change the
plugin name. The dev guide assumes manual installation anyway.
|
2015-12-03 02:45:04 +01:00 |
|
Sebastian Kügler
|
b2d4f3a6bc
|
Add basic plasmoid as example for developerguide
|
2015-12-03 02:45:04 +01:00 |
|
Marco Martin
|
24150a3932
|
make the example containment REALLY simple
remove all the fluff, make it the least code possible
for a base containment to work
|
2015-11-26 18:16:35 +01:00 |
|
Marco Martin
|
4e143813b4
|
example without a wallpaper
|
2015-11-24 12:15:11 +01:00 |
|
Marco Martin
|
ff83c3ac99
|
install some plasmaquick headers
|
2015-11-24 10:58:05 +01:00 |
|
Marco Martin
|
2750155af4
|
a minimal example of a custom shell
|
2015-11-23 20:31:20 +01:00 |
|
l10n daemon script
|
4519c25d5c
|
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-10 12:46:43 +00:00 |
|
l10n daemon script
|
01f4cf59ea
|
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:07:45 +00:00 |
|
l10n daemon script
|
b4a42d3616
|
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-26 10:07:41 +00:00 |
|
andreas kainz
|
6c20f17af9
|
Breeze Icon: add widget icon to notes
|
2015-10-12 11:41:42 +02:00 |
|
l10n daemon script
|
98583160cb
|
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-08-28 10:20:30 +00:00 |
|
l10n daemon script
|
c718ba4b48
|
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-08-26 10:19:25 +00:00 |
|
l10n daemon script
|
a5ff979996
|
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-08-10 10:12:53 +00:00 |
|
l10n daemon script
|
a989a77a0d
|
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-03 10:14:00 +00:00 |
|
l10n daemon script
|
9ea35bd26d
|
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-27 10:14:57 +00:00 |
|
l10n daemon script
|
81ec3e0d58
|
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-16 11:30:30 +00:00 |
|
l10n daemon script
|
a48529b3c8
|
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-01 10:21:06 +00:00 |
|
l10n daemon script
|
4207218d8b
|
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-26 09:45:20 +00:00 |
|
l10n daemon script
|
7897780310
|
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-18 10:26:53 +00:00 |
|
l10n daemon script
|
505c1f8cba
|
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:16:44 +00:00 |
|
l10n daemon script
|
b7e5392a7b
|
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-19 09:50:52 +00:00 |
|
l10n daemon script
|
104f37b8c8
|
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:11:21 +00:00 |
|