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/backgroundcontrast/metadata.json

@@ -64,6 +64,7 @@
         "Name[ta]": "பின்புல நிறமாறுபாடு",
         "Name[tr]": "Arka Plan Karşıtlığı",
         "Name[uk]": "Контрастність тла",
+        "Name[vi]": "Tương phản nền",
         "Name[x-test]": "xxBackground Contrastxx",
         "Name[zh_CN]": "背景对比度",
         "Name[zh_TW]": "背景對比"

src/effects/morphingpopups/package/metadata.json

@@ -98,6 +98,7 @@
         "Name[sl]": "Pogovorna okna pretvorb",
         "Name[tr]": "Dönüşen Açılır Pencereler",
         "Name[uk]": "Аморфні контекстні панелі",
+        "Name[vi]": "Ô bật lên biến dạng",
         "Name[x-test]": "xxMorphing Popupsxx",
         "Name[zh_CN]": "气泡大小渐变动画",
         "Name[zh_TW]": "交錯彈出視窗",

src/effects/slidingpopups/metadata.json

@@ -63,6 +63,7 @@
         "Name[sl]": "Drsne pretvorbe",
         "Name[tr]": "Kayan Açılır Pencereler",
         "Name[uk]": "Ковзні контекстні вікна",
+        "Name[vi]": "Ô bật lên dạng trượt",
         "Name[x-test]": "xxSliding Popupsxx",
         "Name[zh_CN]": "气泡滑动动效",
         "Name[zh_TW]": "滑動的彈出視窗"