l10n daemon script
|
625deeb11d
|
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"
|
2025-09-09 02:09:50 +00:00 |
|
l10n daemon script
|
c3ee2fe339
|
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"
|
2025-08-05 01:37:48 +00:00 |
|
l10n daemon script
|
efb518c817
|
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"
|
2025-04-27 01:31:31 +00:00 |
|
l10n daemon script
|
7ea7550da5
|
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"
|
2025-04-19 01:30:30 +00:00 |
|
l10n daemon script
|
b993b510a4
|
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-15 01:40:00 +00:00 |
|
l10n daemon script
|
8b70761dcd
|
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-02 01:32:06 +00:00 |
|
l10n daemon script
|
4077fb3baa
|
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-10-10 01:23:11 +00:00 |
|
l10n daemon script
|
0dfa399b7b
|
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-09-25 01:24:12 +00:00 |
|
l10n daemon script
|
f10228cee8
|
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-09-24 01:22:51 +00:00 |
|
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
|
ab5d242ebc
|
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-21 01:31:01 +00:00 |
|
l10n daemon script
|
a8f76bc536
|
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-10 01:28:40 +00:00 |
|
l10n daemon script
|
5237d20ad9
|
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-28 01:23:22 +00:00 |
|
l10n daemon script
|
9fb99bffbc
|
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-25 01:20:43 +00:00 |
|
l10n daemon script
|
b75c70bfa1
|
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-23 01:21:13 +00:00 |
|
l10n daemon script
|
ad34f6f112
|
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-21 01:22:04 +00:00 |
|
l10n daemon script
|
ffdf4511cb
|
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-20 01:21:12 +00:00 |
|
l10n daemon script
|
10dbdac20a
|
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-19 01:21:05 +00:00 |
|
l10n daemon script
|
6835f49d8c
|
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-18 01:19:02 +00:00 |
|
l10n daemon script
|
a2b773f1db
|
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-17 01:19:42 +00:00 |
|
Devin Lin
|
0a09d935ac
|
layout-templates: Split out status bar and navigation panel to separate templates
This makes it more modular, and we can use the template in the mobileshellsettings code.
|
2024-07-15 17:07:26 -04:00 |
|