From c53a64c8da3bf5ea5cc24c5fe757d81129faedab Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 9 May 2022 02:50:27 +0000 Subject: [PATCH] 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" --- generators/xps/libokularGenerator_xps.json | 1 + 1 file changed, 1 insertion(+) diff --git a/generators/xps/libokularGenerator_xps.json b/generators/xps/libokularGenerator_xps.json index 81c2be2ca..591ef10e4 100644 --- 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",