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"
This commit is contained in:
l10n daemon script 2015-06-13 11:31:00 +00:00
parent 2af3245033
commit 23825bfca3
1 changed files with 1 additions and 1 deletions

View File

@ -84,7 +84,7 @@ GenericName[nds]=Partitschonen-Editor
GenericName[nl]=Partitiebewerker
GenericName[nn]=Partisjonsredigering
GenericName[pa]=
GenericName[pl]=Zarządzanie partycjami dla KDE
GenericName[pl]=Zarządzanie partycjami
GenericName[pt]=Editor de Partições
GenericName[pt_BR]=Editor de partições
GenericName[ro]=Editor de partiții