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 · ad3e5b2c30
parent 4fe1675c22
commit ad3e5b2c30
1 changed files with 6 additions and 0 deletions
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@ -1,9 +1,15 @@
 [Desktop Entry]
 Name=Patak
 Name[ca]=Patak
+Name[cs]=Patak
+Name[el]=Patak
 Name[es]=Patak
 Name[eu]=Patak
+Name[fr]=Patak
+Name[it]=Patak
 Name[nl]=Patak
+Name[sl]=Patak
+Name[sv]=Patak
 Name[uk]=Патак
 Name[x-test]=xxPatakxx