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
9348e14b01
commit
688b21f9f7
|
@ -162,6 +162,7 @@ Categories=System;Filesystem;KDE;Qt;
|
|||
X-KDE-StartupNotify=true
|
||||
Keywords=partition;disk;
|
||||
Keywords[ca]=partició;disc;
|
||||
Keywords[es]=partición;disco;
|
||||
Keywords[nl]=partitie;schijf
|
||||
Keywords[pt]=partição;disco;
|
||||
Keywords[sr]=partition;disk;партиција;диск;
|
||||
|
|
Loading…
Reference in New Issue