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
98d59e69ff
commit
0e714dee65
|
@ -160,7 +160,7 @@ Icon=partitionmanager
|
||||||
Categories=System;Filesystem;KDE;Qt;
|
Categories=System;Filesystem;KDE;Qt;
|
||||||
X-KDE-StartupNotify=true
|
X-KDE-StartupNotify=true
|
||||||
Keywords=partition;disk;
|
Keywords=partition;disk;
|
||||||
Keywords[ast]=partición;discu;
|
Keywords[ast]=partición;particionar;discu;
|
||||||
Keywords[ca]=partició;disc;
|
Keywords[ca]=partició;disc;
|
||||||
Keywords[ca@valencia]=partició;disc;
|
Keywords[ca@valencia]=partició;disc;
|
||||||
Keywords[cs]=oddíl;disk;
|
Keywords[cs]=oddíl;disk;
|
||||||
|
|
Loading…
Reference in New Issue