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"
master
l10n daemon script 6 years ago
parent 3cfb7a30f0
commit a143a83f67

@ -60,7 +60,7 @@ Name[pl]=Sześcian pulpitu
Name[pt]=Cubo de Ecrãs
Name[pt_BR]=Cubo de áreas de trabalho
Name[ro]=Cub de birou
Name[ru]=Куб с рабочими столами
Name[ru]=Куб рабочих столов
Name[si]=වැඩතල ඝනකය
Name[sk]=Plochy na kocke
Name[sl]=Kocka z namizji

Loading…
Cancel
Save