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 |
|
l10n daemon script
|
4d59eff413
|
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-05 01:18:30 +00:00 |
|
l10n daemon script
|
2ef1d5bc66
|
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-03 01:20:02 +00:00 |
|
l10n daemon script
|
a51e9de6ca
|
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-02 01:19:10 +00:00 |
|
l10n daemon script
|
a9f9647152
|
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-30 01:19:39 +00:00 |
|
l10n daemon script
|
701ca91afa
|
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-29 01:19:44 +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
|
fe3a39a5a9
|
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-27 01:19:29 +00:00 |
|
Devin Lin
|
b4f7ca1139
|
layout-templates: Move default panel configuration to layout template package
|
2024-06-26 00:57:56 +00:00 |
|