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
cfe1cf71b7
commit
3b246e7368
1 changed files with 1 additions and 1 deletions
|
@ -71,7 +71,7 @@ GenericName[eu]=Gailuak sinkronizatzea
|
|||
GenericName[fi]=Laitteiden synkronointi
|
||||
GenericName[fr]=Synchronisation de périphériques
|
||||
GenericName[gl]=Sincronización de dispositivos
|
||||
GenericName[he]=סנכרון מכשיר
|
||||
GenericName[he]=סנכרון מכשירים
|
||||
GenericName[hu]=Eszközszinkronizáció
|
||||
GenericName[ia]=Synchronisation de dispositivo
|
||||
GenericName[id]=Sinkronisasi Peranti
|
||||
|
|
Loading…
Reference in a new issue