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"
6 years ago · b5392802c2
parent 5d580b9fb2
commit b5392802c2
2 changed files with 3 additions and 0 deletions
--- a/effects/eyeonscreen/package/metadata.desktop
+++ b/effects/eyeonscreen/package/metadata.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Eye on Screen
 Name[ca]=Ull a la pantalla
+Name[es]=Ojo a la pantalla
 Name[et]=Eye on Screen
 Name[eu]=Begirada pantailan
 Name[id]=Mata di Layar
@ -16,6 +17,7 @@ Name[zh_TW]=螢幕之眼
 Icon=preferences-system-windows-effect-eyeonscreen
 Comment=Suck windows into the desktop
 Comment[ca]=Enganxa les finestres a l'escriptori
+Comment[es]=Aspirar las ventanas en el escritorio
 Comment[et]=Akende imemine töölauale
 Comment[eu]=Mahaigainak leihoak xurgatu
 Comment[id]=Sedot window ke desktop
--- a/effects/windowaperture/package/metadata.desktop
+++ b/effects/windowaperture/package/metadata.desktop
@ -43,6 +43,7 @@ Name[zh_TW]=視窗光圈
 Icon=preferences-system-windows-effect-windowaperture
 Comment=Move windows into screen corners
 Comment[ca]=Mou les finestres cap a les cantonades de la pantalla
+Comment[es]=Mover las ventanas a las esquinas de la pantalla
 Comment[et]=Akende liigutamine ekraani nurkadesse
 Comment[eu]=Eraman leihoak pantailako bazterretara
 Comment[id]=Pindahkan window ke sudut layar