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
2a0d25f07d
commit
d056b04483
|
@ -3,8 +3,20 @@ Categories=Qt;KDE;
|
|||
Comment=
|
||||
Exec=elisa %U
|
||||
GenericName=Programming Binding Generator
|
||||
GenericName[ca]=Generador de vincles de programació
|
||||
GenericName[ca@valencia]=Generador de vincles de programació
|
||||
GenericName[nl]=Binding Generator voor programmeren
|
||||
GenericName[sv]=Programmerar bindningsgenerator
|
||||
GenericName[uk]=Засіб створення програмних прив'язок
|
||||
GenericName[x-test]=xxProgramming Binding Generatorxx
|
||||
Icon=applications-development
|
||||
Name=Rust Qt Binding Generator
|
||||
Name[ca]=Generador de vincles pel Rust a les Qt
|
||||
Name[ca@valencia]=Generador de vincles pel Rust a les Qt
|
||||
Name[nl]=Rust Qt Binding Generator
|
||||
Name[sv]=Rust Qt-bindningsgenerator
|
||||
Name[uk]=Засіб створення прив'язок Qt до Rust
|
||||
Name[x-test]=xxRust Qt Binding Generatorxx
|
||||
StartupNotify=false
|
||||
Terminal=true
|
||||
Type=Application
|
||||
|
|
Loading…
Reference in New Issue