l10n daemon script
|
1f99e09948
|
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"
|
2021-11-13 01:28:37 +00:00 |
|
l10n daemon script
|
d7b7290451
|
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"
|
2021-10-19 01:17:49 +00:00 |
|
l10n daemon script
|
21f28c6ae8
|
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"
|
2021-10-18 01:18:59 +00:00 |
|
l10n daemon script
|
9cc7722e2a
|
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"
|
2021-10-15 01:16:07 +00:00 |
|
l10n daemon script
|
ae77de27e2
|
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"
|
2021-10-11 01:22:06 +00:00 |
|
l10n daemon script
|
4d8bf06da1
|
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"
|
2021-10-09 01:18:16 +00:00 |
|
l10n daemon script
|
d14f21231c
|
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"
|
2021-10-06 01:19:51 +00:00 |
|
l10n daemon script
|
204acee273
|
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"
|
2021-10-05 01:20:23 +00:00 |
|
l10n daemon script
|
fa9b0c9710
|
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"
|
2021-09-26 01:14:52 +00:00 |
|
l10n daemon script
|
abf5be8ccd
|
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"
|
2021-09-24 01:14:39 +00:00 |
|
l10n daemon script
|
8d76bfd4f4
|
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"
|
2021-09-23 01:15:02 +00:00 |
|
l10n daemon script
|
e6c27636da
|
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"
|
2021-09-20 01:26:01 +00:00 |
|
l10n daemon script
|
1e01aa53e5
|
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"
|
2021-09-19 01:28:51 +00:00 |
|
l10n daemon script
|
1e96ec0f3f
|
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"
|
2021-09-18 01:15:29 +00:00 |
|
Bhushan Shah
|
ed9517161d
|
Add airplane mode in quicksettings
Based on original patch from Nicolas Fella
|
2021-09-16 09:14:31 +00:00 |
|