l10n daemon script
|
42bf272681
|
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-04-19 02:38:31 +00:00 |
|
l10n daemon script
|
f00a1baae9
|
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-04-13 02:33:38 +00:00 |
|
l10n daemon script
|
38e235b1b0
|
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-04-11 03:11:36 +00:00 |
|
l10n daemon script
|
bea89f08c1
|
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-04-04 02:38:04 +00:00 |
|
l10n daemon script
|
4b911fa0bc
|
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-04-03 02:25:31 +00:00 |
|
l10n daemon script
|
26c7836549
|
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-29 02:28:37 +00:00 |
|
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
|
68b94f31b3
|
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-21 02:44:34 +00:00 |
|
l10n daemon script
|
753aaa00fc
|
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-20 02:35:16 +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
|
872d63c5c2
|
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-16 02:34:43 +00:00 |
|
Devin Lin
|
56d530f855
|
kcms: Fix package format
Fix kcm package format so that they show up in the settings.
|
2023-03-14 20:56:30 -07:00 |
|