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
e3febae013
commit
0ed48894b8
1 changed files with 1 additions and 1 deletions
|
@ -101,7 +101,7 @@ GenericName[sr@ijekavianlatin]=Sinhronizacija uređaja
|
|||
GenericName[sr@latin]=Sinhronizacija uređaja
|
||||
GenericName[sv]=Enhetssynkronisering
|
||||
GenericName[ta]=சாதன ஒத்திசைவு
|
||||
GenericName[tr]=Aygıt Eşzamanlaması
|
||||
GenericName[tr]=Aygıt Eşzamanlama
|
||||
GenericName[uk]=Синхронізація із пристроями
|
||||
GenericName[x-test]=xxDevice Synchronizationxx
|
||||
GenericName[zh_CN]=设备同步
|
||||
|
|
Loading…
Reference in a new issue