l10n daemon script
|
c2b3e3cfc8
|
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-03-23 02:52:45 +00:00 |
|
l10n daemon script
|
6fe1c74947
|
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-03-17 02:54:12 +00:00 |
|
l10n daemon script
|
cc7fac30e8
|
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-03-11 02:59:39 +00:00 |
|
l10n daemon script
|
8ba56dc286
|
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-03-10 02:43:40 +00:00 |
|
l10n daemon script
|
064ceaa1da
|
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-03-08 02:41:57 +00:00 |
|
l10n daemon script
|
7d410d2fdb
|
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-03-07 02:40:31 +00:00 |
|
l10n daemon script
|
2f923efd21
|
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-03-06 02:30:53 +00:00 |
|
l10n daemon script
|
ea6e2be7de
|
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-03-05 03:33:35 +00:00 |
|
l10n daemon script
|
ddb9252f45
|
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-03-04 02:29:43 +00:00 |
|
Devin Lin
|
1dbb1c78f6
|
Port to Qt6/KF6
|
2023-03-03 06:01:23 +00:00 |
|