l10n daemon script
|
33a5f67eb2
|
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"
|
2018-10-24 05:59:57 +02:00 |
|
l10n daemon script
|
f1d3c68115
|
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"
|
2018-08-04 05:43:46 +02:00 |
|
l10n daemon script
|
879a46ac55
|
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"
|
2018-07-07 05:17:35 +02:00 |
|
l10n daemon script
|
29b1dec92b
|
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"
|
2018-01-29 05:04:25 +01:00 |
|
l10n daemon script
|
066805c550
|
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-12-01 04:51:24 +01:00 |
|
l10n daemon script
|
02a4cfb26a
|
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-11-28 06:52:56 +01:00 |
|
l10n daemon script
|
36c60741fb
|
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-07-30 04:54:11 +02:00 |
|
l10n daemon script
|
bfe1f62eb5
|
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-05-12 04:21:17 +02:00 |
|
l10n daemon script
|
94fbca1c95
|
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-04-22 04:06:38 +02:00 |
|
l10n daemon script
|
91e740c236
|
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-04-17 04:01:59 +02:00 |
|
l10n daemon script
|
cce5cf2592
|
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-04-09 04:02:44 +02:00 |
|
l10n daemon script
|
c55c44ed95
|
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-07 12:50:18 +01:00 |
|
l10n daemon script
|
7381616690
|
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-06 06:04:23 +01:00 |
|
l10n daemon script
|
e44b17080a
|
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-09 06:00:41 +01:00 |
|
l10n daemon script
|
4952893372
|
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-12 03:58:04 +01:00 |
|
l10n daemon script
|
0d6f6edf60
|
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-09 03:56:48 +01:00 |
|
l10n daemon script
|
dcb3edcf30
|
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-02 04:33:12 +01:00 |
|
l10n daemon script
|
297795d40d
|
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:27:22 +01:00 |
|
l10n daemon script
|
fe628b9dbf
|
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:46 +01:00 |
|
l10n daemon script
|
3fe1bef3d6
|
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-28 04:07:25 +01:00 |
|
l10n daemon script
|
da42e4b166
|
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-25 05:01:26 +01:00 |
|
l10n daemon script
|
5a7f11927f
|
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-23 04:21:05 +01:00 |
|
l10n daemon script
|
151a8f7e78
|
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-21 04:18:14 +01:00 |
|
l10n daemon script
|
66cba6e293
|
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-09 09:19:08 +00:00 |
|
l10n daemon script
|
3f484b44a9
|
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-08 10:00:59 +00:00 |
|
l10n daemon script
|
a673dca880
|
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-07 09:47:04 +00:00 |
|
l10n daemon script
|
b1bb8bfc61
|
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-06 09:39:30 +00:00 |
|
l10n daemon script
|
3a16c16a17
|
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 10:00:05 +00:00 |
|
l10n daemon script
|
191e10300d
|
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:54 +00:00 |
|
Alex Richardson
|
00b15528a4
|
Add the Copyright information back to the JSON files
REVIEW: 126193
|
2016-01-04 15:59:07 +01:00 |
|
Alex Richardson
|
2f9246ae42
|
Port to new JSON plugin loading system
This means Okular can now work without ksycoca and KDELibs4Support.
REVIEW: 126193
|
2016-01-04 15:59:07 +01:00 |
|