l10n daemon script
|
cb307e16b2
|
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"
|
2019-11-17 05:06:27 +01:00 |
|
l10n daemon script
|
c5b769508c
|
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"
|
2019-08-12 05:05:01 +02:00 |
|
l10n daemon script
|
688a7df097
|
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"
|
2019-08-06 04:49:33 +02:00 |
|
l10n daemon script
|
b7a6b1f00e
|
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"
|
2019-07-23 05:10:46 +02:00 |
|
l10n daemon script
|
b68c82a8c3
|
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"
|
2019-07-12 05:12:34 +02:00 |
|
l10n daemon script
|
c53108bb25
|
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"
|
2019-07-08 04:56:21 +02:00 |
|
l10n daemon script
|
3d0acf15a5
|
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"
|
2019-06-27 05:13:07 +02:00 |
|
l10n daemon script
|
ee1a535cc2
|
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"
|
2019-05-08 05:42:59 +02:00 |
|
l10n daemon script
|
437ded0aa6
|
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"
|
2019-05-06 05:50:17 +02:00 |
|
l10n daemon script
|
6c6cd751ba
|
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"
|
2019-05-03 05:51:06 +02:00 |
|
l10n daemon script
|
58e2f142e0
|
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"
|
2019-05-01 05:56:02 +02:00 |
|
l10n daemon script
|
4fb4547666
|
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"
|
2019-04-20 06:00:49 +02:00 |
|
l10n daemon script
|
fe02874ca1
|
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"
|
2019-04-19 05:46:04 +02:00 |
|
l10n daemon script
|
c1be806f9d
|
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"
|
2019-04-16 05:57:25 +02:00 |
|
l10n daemon script
|
af97c5f1ff
|
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"
|
2019-04-14 05:49:06 +02:00 |
|
Volker Krause
|
834f9c3790
|
Handle sms: URLs too
Handling those URLs works perfectly fine already, for transferring the
phone number and the body, we just need to register for it.
|
2019-04-11 17:58:14 +02:00 |
|