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"
5 years ago · 95f740e105
parent 600f0b03e1
commit 95f740e105
1 changed files with 3 additions and 0 deletions
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@ -1,8 +1,11 @@
 [Desktop Entry]
 Name=Altai
+Name[az]=Altay
 Name[ca]=Altai
 Name[de]=Altai
 Name[es]=Altai
+Name[nl]=Altai
+Name[sv]=Altai
 Name[uk]=Алтай
 Name[x-test]=xxAltaixx