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:
parent
2af3245033
commit
23825bfca3
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue