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"
4 years ago · c53a64c8da
parent ff8932363b
commit c53a64c8da
1 changed files with 1 additions and 0 deletions
--- a/generators/xps/libokularGenerator_xps.json
+++ b/generators/xps/libokularGenerator_xps.json
@ -39,6 +39,7 @@
                "Name[sr@latin]": "Bred Hards",
                "Name[sr]": "Бред Хардс",
                "Name[sv]": "Brad Hards",
+                "Name[ta]": "பிராட் ஹார்ட்ஸ்",
                "Name[tr]": "Brad Hards",
                "Name[uk]": "Brad Hards",
                "Name[vi]": "Brad Hards",