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"

src/effects/windowview/metadata.json

@@ -4,6 +4,7 @@
         "Description": "Helper effect for the task manager",
         "Description[ca@valencia]": "Efecte auxiliar per al gestor de tasques",
         "Description[ca]": "Efecte auxiliar per al gestor de tasques",
+        "Description[es]": "Efecto auxiliar para el gestor de tareas",
         "Description[fr]": "Effet d'assistance pour le gestionnaire de tâches",
         "Description[ko]": "작업 관리자용 도우미 효과",
         "Description[nl]": "Effect van hulp voor de takenbeheerder",
@@ -17,6 +18,7 @@
         "Name": "Window View",
         "Name[ca@valencia]": "Vista de finestres",
         "Name[ca]": "Vista de finestres",
+        "Name[es]": "Vista de ventanas",
         "Name[fr]": "Affichage en fenêtres",
         "Name[ko]": "창 보기",
         "Name[nl]": "Weergave met vensters",