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
bb6cd82f6d
commit
66fa786e00
|
@ -169,7 +169,7 @@ Icon=partitionmanager
|
|||
Categories=System;Filesystem;KDE;Qt;
|
||||
X-KDE-StartupNotify=true
|
||||
Keywords=partition;disk;
|
||||
Keywords[ar]=أقسام,قرص
|
||||
Keywords[ar]=أقسام;قرص;
|
||||
Keywords[ast]=partición;particionar;discu;
|
||||
Keywords[az]=partition;disk;bölmə;
|
||||
Keywords[ca]=partició;disc;
|
||||
|
|
Loading…
Reference in New Issue