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"
pull/7/head
l10n daemon script
parent c43fe45758
commit bc16b0f315

@ -1,5 +1,6 @@
[Desktop Entry]
Name=Latte
Name[ast]=Latte
Name[ca]=Latte
Name[ca@valencia]=Latte
Name[cs]=Latte

@ -1,6 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
Name=Latte
Name[ast]=Latte
Name[ca]=Latte
Name[ca@valencia]=Latte
Name[cs]=Latte

@ -1,6 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
Name=Latte
Name[ast]=Latte
Name[ca]=Latte
Name[ca@valencia]=Latte
Name[cs]=Latte

@ -1,5 +1,6 @@
[Desktop Entry]
Name=Latte
Name[ast]=Latte
Name[ca]=Latte
Name[ca@valencia]=Latte
Name[cs]=Latte

Loading…
Cancel
Save