l10n daemon script
|
3b61998f9b
|
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"
|
2024-12-14 01:44:24 +00:00 |
|
l10n daemon script
|
bd5e46b3a2
|
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"
|
2024-08-08 01:21:18 +00:00 |
|
l10n daemon script
|
c938385c07
|
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"
|
2024-04-29 01:18:23 +00:00 |
|
l10n daemon script
|
eb3ea40edb
|
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"
|
2024-02-10 01:15:57 +00:00 |
|
l10n daemon script
|
6ca937e668
|
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"
|
2024-02-05 01:12:58 +00:00 |
|
l10n daemon script
|
56c9abbebc
|
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"
|
2024-01-26 01:13:08 +00:00 |
|
l10n daemon script
|
77db3f2fc7
|
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"
|
2023-11-07 02:11:52 +00:00 |
|
l10n daemon script
|
fae380f409
|
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"
|
2023-11-04 11:52:13 +00:00 |
|
l10n daemon script
|
f127711f36
|
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"
|
2023-07-28 01:41:35 +00:00 |
|
l10n daemon script
|
62d627d288
|
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"
|
2023-06-24 01:47:07 +00:00 |
|
l10n daemon script
|
1457234caf
|
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"
|
2023-05-06 01:42:55 +00:00 |
|
l10n daemon script
|
7beef65ae1
|
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"
|
2023-01-26 01:57:35 +00:00 |
|
l10n daemon script
|
bdfeff5b08
|
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"
|
2022-09-06 01:45:36 +00:00 |
|
l10n daemon script
|
afa869e11e
|
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"
|
2022-09-03 01:44:14 +00:00 |
|
l10n daemon script
|
35e160afe2
|
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"
|
2022-08-23 01:47:02 +00:00 |
|
l10n daemon script
|
d7f8b9a3d3
|
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"
|
2022-08-14 01:43:43 +00:00 |
|
l10n daemon script
|
b71a5085cc
|
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"
|
2022-07-04 01:46:55 +00:00 |
|
l10n daemon script
|
43114cafd8
|
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"
|
2022-07-02 02:00:11 +00:00 |
|
l10n daemon script
|
eaeff714d6
|
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"
|
2022-04-22 01:44:19 +00:00 |
|
l10n daemon script
|
3ef3fd6ad0
|
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"
|
2022-03-05 01:43:20 +00:00 |
|
l10n daemon script
|
0568905c67
|
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"
|
2021-08-23 01:25:48 +00:00 |
|
l10n daemon script
|
1ccd81ecf1
|
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"
|
2020-12-29 06:14:58 +01:00 |
|
l10n daemon script
|
a661ac27d4
|
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"
|
2020-11-01 06:34:37 +01:00 |
|
l10n daemon script
|
02bf543919
|
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"
|
2020-10-29 06:36:15 +01:00 |
|
l10n daemon script
|
9d8a727f9f
|
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"
|
2020-09-05 06:13:09 +02:00 |
|
l10n daemon script
|
6fe0f76294
|
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"
|
2020-09-04 06:00:13 +02:00 |
|
l10n daemon script
|
cc6fc7a4fa
|
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"
|
2020-07-29 06:01:26 +02:00 |
|
l10n daemon script
|
3bb9314603
|
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"
|
2020-06-24 05:54:22 +02:00 |
|
l10n daemon script
|
6765b10f8d
|
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"
|
2020-06-18 05:39:07 +02:00 |
|
l10n daemon script
|
6e4afc466c
|
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"
|
2020-06-17 14:06:46 +02:00 |
|
l10n daemon script
|
c2b4350521
|
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"
|
2019-12-03 05:37:17 +01:00 |
|
l10n daemon script
|
6f1c729906
|
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"
|
2019-08-13 05:19:36 +02:00 |
|
l10n daemon script
|
2887d87ed5
|
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"
|
2019-05-30 05:09:20 +02:00 |
|
l10n daemon script
|
e4299fb85c
|
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"
|
2019-04-20 06:00:37 +02:00 |
|
David Rosca
|
d2d3d45932
|
Don't use subfolders for QML/Python extensions
|
2019-04-19 11:38:15 +02:00 |
|
l10n daemon script
|
1f1978751f
|
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"
|
2019-03-23 06:07:37 +01:00 |
|
l10n daemon script
|
524697d139
|
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"
|
2019-01-27 05:34:59 +01:00 |
|
l10n daemon script
|
caf1380774
|
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"
|
2019-01-21 05:18:24 +01:00 |
|
l10n daemon script
|
099901f0a6
|
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-08 05:44:02 +02:00 |
|
l10n daemon script
|
06020d9615
|
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-03 05:28:07 +02:00 |
|
l10n daemon script
|
034365355a
|
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-06-26 05:38:12 +02:00 |
|
l10n daemon script
|
9a725b3c62
|
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-06-22 05:22:41 +02:00 |
|
l10n daemon script
|
0c30443e84
|
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-06-06 05:35:48 +02:00 |
|
l10n daemon script
|
6fca2d6cef
|
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-06-02 05:39:44 +02:00 |
|
l10n daemon script
|
aca4f6c0a9
|
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-05-16 05:26:16 +02:00 |
|
l10n daemon script
|
4809dfacaa
|
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-05-01 05:43:21 +02:00 |
|
l10n daemon script
|
3f48bdf5db
|
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-04-21 05:30:07 +02:00 |
|
l10n daemon script
|
0d2776a261
|
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-04-11 05:05:41 +02:00 |
|
l10n daemon script
|
62c8ff085b
|
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-04-10 05:32:53 +02:00 |
|
l10n daemon script
|
4815b584f6
|
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-04-06 05:22:55 +02:00 |
|