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
d4dbd9a5e5
commit
68678fc698
1 changed files with 1 additions and 1 deletions
|
@ -58,7 +58,7 @@ GenericName[ar]=مزامنة الأجهزة
|
|||
GenericName[az]=Cihazların eyniləşdirilməsi
|
||||
GenericName[bg]=Синхронизация на устройство
|
||||
GenericName[ca]=Sincronització de dispositius
|
||||
GenericName[ca@valencia]=Sincronització de dispositius
|
||||
GenericName[ca@valencia]=Sincronitzeu els dispositius
|
||||
GenericName[cs]=Synchronizace zařízení
|
||||
GenericName[da]=Enhedssynkronisering
|
||||
GenericName[de]=Geräteabgleich
|
||||
|
|
Loading…
Reference in a new issue