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"master
parent
dc1a874188
commit
874d6c36ce
|
@ -15,6 +15,7 @@ GenericName[sk]=Programovací generátor väzieb
|
|||
GenericName[sv]=Programmerar bindningsgenerator
|
||||
GenericName[uk]=Засіб створення програмних прив'язок
|
||||
GenericName[x-test]=xxProgramming Binding Generatorxx
|
||||
GenericName[zh_TW]=程式 Binding 產生器
|
||||
Icon=applications-development
|
||||
Name=Rust Qt Binding Generator
|
||||
Name[ca]=Generador de vincles pel Rust a les Qt
|
||||
|
|
Loading…
Reference in New Issue