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 |
|
l10n daemon script
|
4db599dcf8
|
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-06 09:58:49 +00:00 |
|
Friedrich W. H. Kossebau
|
d4f10cd67e
|
Add a kapptemplate for Plasma Wallpaper
REVIEW: 128594
|
2016-08-05 16:02:14 +02:00 |
|