l10n daemon script
|
b4f2611125
|
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-04 09:43:11 +00:00 |
|
l10n daemon script
|
e14a60f9a4
|
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-01 10:05:42 +00:00 |
|
l10n daemon script
|
96bb3e7645
|
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-21 09:28:41 +00:00 |
|
l10n daemon script
|
05e86467c4
|
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-17 09:30:20 +00:00 |
|
l10n daemon script
|
98b7f48a89
|
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-11 10:31:56 +00:00 |
|
l10n daemon script
|
8466512bee
|
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-10 09:44:06 +00:00 |
|
l10n daemon script
|
44acd8c802
|
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-07 09:30:31 +00: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
|
818a67ea91
|
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-02 09:31:16 +00:00 |
|
l10n daemon script
|
77a23d261f
|
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-01 09:59:55 +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 |
|
Pino Toscano
|
79c258cf7b
|
i18n: review strings in kdevtemplate files
These files are not extracted (yet).
|
2016-09-28 09:56:01 +02: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
|
9b288b77c9
|
Templates: register templates in own toplevel category "Plasma/"
|
2016-08-05 16:02:14 +02:00 |
|
Friedrich W. H. Kossebau
|
80b966559e
|
Templates: Update techbase wiki links in READMEs
|
2016-08-05 16:02:14 +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 |
|
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
|
e37a2d454a
|
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-29 09:46:18 +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 |
|
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
|
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 |
|
Aleix Pol
|
942f571094
|
Let KDE*CompilerSettings change the policies in the project
As suggested in ECM documentation.
|
2016-01-28 14:56:45 +01: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
|
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 |
|
Alex Richardson
|
f35e514b7d
|
Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()
|
2015-12-09 23:10:41 +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
|
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
|
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
|
94070a6aec
|
make preview naming consistent with template name
This will allow to install the template correctly, once
https://git.reviewboard.kde.org/r/126226/ is in.
|
2015-12-03 02:28:58 +01:00 |
|
l10n daemon script
|
faca537924
|
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-02 08:47:47 +00:00 |
|
Marco Martin
|
46789eb1c8
|
add a couple of plasmoid templates for kapptemplate/kdevelop
this makes easier to develop a new plasmoid,
there are two templates:
one is for a pure QML plasmoid
the othe rone has a C++ part
|
2015-11-30 15:02:43 +01:00 |
|