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
a4773460f0
commit
37ebbd46ab
|
@ -168,6 +168,7 @@ 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;
|
||||||
|
Keywords[fi]=osio;levy;
|
||||||
Keywords[fr]=partition;disque;
|
Keywords[fr]=partition;disque;
|
||||||
Keywords[gl]=partition;disk;partición;disco;
|
Keywords[gl]=partition;disk;partición;disco;
|
||||||
Keywords[id]=partisi;disk;
|
Keywords[id]=partisi;disk;
|
||||||
|
|
Loading…
Reference in New Issue