l10n daemon script
|
6f02cf215b
|
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"
|
2017-02-26 05:55:37 +01:00 |
|
l10n daemon script
|
bba40b9b9d
|
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"
|
2017-02-05 06:07:10 +01:00 |
|
l10n daemon script
|
7d3d68a3c8
|
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"
|
2017-01-16 06:06:25 +01:00 |
|
l10n daemon script
|
2f4e59e902
|
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-12-22 05:52:51 +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
|
53d516a688
|
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-14 00:24:33 +00:00 |
|
l10n daemon script
|
83b79d9e74
|
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-05 09:59:21 +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
|
e2a864ebe3
|
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-15 09:59:55 +00:00 |
|
l10n daemon script
|
2e7fde27ca
|
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-14 09:36:38 +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
|
eb5a0a4489
|
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-09 09:34:03 +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 |
|
Friedrich W. H. Kossebau
|
9b288b77c9
|
Templates: register templates in own toplevel category "Plasma/"
|
2016-08-05 16:02:14 +02: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 |
|