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
072e8c4720
commit
789a014df2
|
@ -175,7 +175,7 @@ Keywords[ca]=partició;disc;
|
||||||
Keywords[ca@valencia]=partició;disc;
|
Keywords[ca@valencia]=partició;disc;
|
||||||
Keywords[cs]=oddíl;disk;
|
Keywords[cs]=oddíl;disk;
|
||||||
Keywords[da]=partition;disk;
|
Keywords[da]=partition;disk;
|
||||||
Keywords[de]=partition;disk;festplatte
|
Keywords[de]=partition;disk;festplatte;
|
||||||
Keywords[el]=κατάτμηση;δίσκος;
|
Keywords[el]=κατάτμηση;δίσκος;
|
||||||
Keywords[en_GB]=partition;disk;
|
Keywords[en_GB]=partition;disk;
|
||||||
Keywords[es]=partición;disco;
|
Keywords[es]=partición;disco;
|
||||||
|
|
Loading…
Reference in New Issue