From a520e4378bb030de3e7b9a9a0e13fa2ff680fb25 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 14 Nov 2021 01:27:45 +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/chm/libokularGenerator_chmlib.json | 1 + generators/djvu/libokularGenerator_djvu.json | 1 + generators/dvi/libokularGenerator_dvi.json | 1 + generators/epub/libokularGenerator_epub.json | 1 + generators/kimgio/libokularGenerator_kimgio.json | 1 + generators/poppler/libokularGenerator_poppler.json | 1 + 6 files changed, 6 insertions(+) diff --git a/generators/chm/libokularGenerator_chmlib.json b/generators/chm/libokularGenerator_chmlib.json index 5b322f037..850b5c529 100644 --- a/generators/chm/libokularGenerator_chmlib.json +++ b/generators/chm/libokularGenerator_chmlib.json @@ -210,6 +210,7 @@ "Name[sr@latin]": "Pozadina za CHM", "Name[sr]": "Позадина за ЦХМ", "Name[sv]": "CHM-gränssnitt", + "Name[ta]": "CHM பின்நிலை", "Name[tr]": "CHM Arka Ucu", "Name[uk]": "Модуль CHM", "Name[vi]": "Hậu phương CHM", diff --git a/generators/djvu/libokularGenerator_djvu.json b/generators/djvu/libokularGenerator_djvu.json index ce765756b..198eda296 100644 --- a/generators/djvu/libokularGenerator_djvu.json +++ b/generators/djvu/libokularGenerator_djvu.json @@ -166,6 +166,7 @@ "Name[sr@latin]": "Pozadina za DjVu", "Name[sr]": "Позадина за ДјВу", "Name[sv]": "DjVu-gränssnitt", + "Name[ta]": "DjVu பின்நிலை", "Name[tr]": "DjVu Arka Ucu", "Name[uk]": "Модуль DjVu", "Name[vi]": "Hậu phương DjVu", diff --git a/generators/dvi/libokularGenerator_dvi.json b/generators/dvi/libokularGenerator_dvi.json index 51ec18c63..0b8592be3 100644 --- a/generators/dvi/libokularGenerator_dvi.json +++ b/generators/dvi/libokularGenerator_dvi.json @@ -166,6 +166,7 @@ "Name[sr@latin]": "Pozadina za DVI", "Name[sr]": "Позадина за ДВИ", "Name[sv]": "DVI-gränssnitt", + "Name[ta]": "DVI பின்நிலை", "Name[tr]": "DVI Arka Ucu", "Name[uk]": "Модуль DVI", "Name[vi]": "Hậu phương DVI", diff --git a/generators/epub/libokularGenerator_epub.json b/generators/epub/libokularGenerator_epub.json index 0f03bb748..e3e280761 100644 --- a/generators/epub/libokularGenerator_epub.json +++ b/generators/epub/libokularGenerator_epub.json @@ -166,6 +166,7 @@ "Name[sr@latin]": "Pozadina za EPUB", "Name[sr]": "Позадина за ЕПУБ", "Name[sv]": "Epub-gränssnitt", + "Name[ta]": "EPub பின்நிலை", "Name[tr]": "EPub Arka Ucu", "Name[uk]": "Модуль EPub", "Name[vi]": "Hậu phương EPub", diff --git a/generators/kimgio/libokularGenerator_kimgio.json b/generators/kimgio/libokularGenerator_kimgio.json index 7b9737b55..0a417e993 100644 --- a/generators/kimgio/libokularGenerator_kimgio.json +++ b/generators/kimgio/libokularGenerator_kimgio.json @@ -281,6 +281,7 @@ "Name[sr@latin]": "Pozadina za slike", "Name[sr]": "Позадина за слике", "Name[sv]": "Bildgränssnitt", + "Name[ta]": "பட பின்நிலை", "Name[tr]": "Resim Arka Ucu", "Name[uk]": "Модуль зображень", "Name[vi]": "Hậu phương ảnh", diff --git a/generators/poppler/libokularGenerator_poppler.json b/generators/poppler/libokularGenerator_poppler.json index f1c20b187..86eb04576 100644 --- a/generators/poppler/libokularGenerator_poppler.json +++ b/generators/poppler/libokularGenerator_poppler.json @@ -170,6 +170,7 @@ "Name[sr@latin]": "Pozadina za PDF", "Name[sr]": "Позадина за ПДФ", "Name[sv]": "PDF-gränssnitt", + "Name[ta]": "PDF பின்நிலை", "Name[tr]": "PDF Arka Ucu", "Name[uk]": "Модуль PDF", "Name[vi]": "Hậu phương PDF",