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/tabbox/switchers/thumbnail_grid/metadata.json

@@ -17,6 +17,7 @@
                 "Name[nl]": "Chris Holland",
                 "Name[pl]": "Chris Holland",
                 "Name[sl]": "Chris Holland",
+                "Name[ta]": "கிரிஸ் ஹாளண்டு",
                 "Name[tr]": "Chris Holland",
                 "Name[uk]": "Chris Holland",
                 "Name[x-test]": "xxChris Hollandxx"
@@ -53,6 +54,7 @@
         "Name[nl]": "Raster voor miniaturen",
         "Name[pl]": "Siatka miniatur",
         "Name[sl]": "Mreža predoglednih sličic",
+        "Name[ta]": "சிறுபட கிரிட்",
         "Name[tr]": "Küçük Görsel Izgarası",
         "Name[uk]": "Таблиця мініатюр",
         "Name[x-test]": "xxThumbnail Gridxx",