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
385507c3cb
commit
931b1e90e0
|
@ -163,6 +163,7 @@ X-KDE-StartupNotify=true
|
|||
Keywords=partition;disk;
|
||||
Keywords[ca]=partició;disc;
|
||||
Keywords[ca@valencia]=partició;disc;
|
||||
Keywords[cs]=oddíl;disk;
|
||||
Keywords[es]=partición;disco;
|
||||
Keywords[nl]=partitie;schijf
|
||||
Keywords[pt]=partição;disco;
|
||||
|
|
Loading…
Reference in New Issue