l10n daemon script
|
62a2633f72
|
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-28 01:30:06 +00:00 |
|
l10n daemon script
|
0e1d42db39
|
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-07-01 01:17:27 +00:00 |
|
l10n daemon script
|
518b94e018
|
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-06-28 01:25:09 +00:00 |
|
l10n daemon script
|
00edc45f4d
|
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-06-22 01:21:15 +00:00 |
|
l10n daemon script
|
9131752fd3
|
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-06-08 01:20:22 +00:00 |
|
l10n daemon script
|
f7851a3f8f
|
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-25 01:16:26 +00:00 |
|
l10n daemon script
|
4ca3a25d4f
|
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-03-09 01:15:44 +00:00 |
|
l10n daemon script
|
28e6d523fb
|
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-03-08 01:13:51 +00:00 |
|
l10n daemon script
|
bba776a5fb
|
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-05 02:08:21 +00:00 |
|
l10n daemon script
|
4d29b0f0ac
|
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-12-22 02:13:13 +00:00 |
|
l10n daemon script
|
dbe069edfa
|
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-12-17 02:07:26 +00:00 |
|
l10n daemon script
|
1a44c570f6
|
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-10 02:17:56 +00:00 |
|
l10n daemon script
|
6341f6619c
|
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-10-22 02:34:49 +00:00 |
|
Alexander Lohnau
|
45072177d5
|
Remove unneeded entries from metadata files
|
2023-10-17 05:14:04 +00:00 |
|
l10n daemon script
|
f2cedc32b6
|
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-08-15 02:14:27 +00:00 |
|
l10n daemon script
|
c9ff39a26f
|
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-26 02:17:02 +00:00 |
|
l10n daemon script
|
a9bab2af9d
|
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-23 03:30:47 +00:00 |
|
l10n daemon script
|
c8bb30dc0b
|
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-09 02:28:58 +00:00 |
|
l10n daemon script
|
9f6345c3f3
|
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-08 02:24:47 +00:00 |
|
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 |
|