l10n daemon script
|
ed7b13ed53
|
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"
|
4 years ago |
l10n daemon script
|
10d6e9527f
|
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"
|
4 years ago |
l10n daemon script
|
67ff3980fe
|
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"
|
4 years ago |
l10n daemon script
|
3897585976
|
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"
|
4 years ago |
l10n daemon script
|
2a7a7fd141
|
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"
|
4 years ago |
l10n daemon script
|
7a085f6b0f
|
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"
|
4 years ago |
l10n daemon script
|
6ee4f674e7
|
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"
|
4 years ago |
Han Young
|
134e2d5c98
|
merge Language and Formats
BUG: 192019
BUG: 341235
BUG: 344588
BUG: 394477
BUG: 397974
BUG: 397975
BUG: 403580
BUG: 417564
BUG: 420268
BUG: 429474
BUG: 431292
BUG: 444772
BUG: 446785
BUG: 447787
BUG: 448324
BUG: 448355
BUG: 451919
BUG: 451944
BUG: 454991
closes https://invent.kde.org/plasma/plasma-workspace/-/issues/23
|
4 years ago |