From bfe1f62eb5485cd4544d70574a90500b4735d26e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 12 May 2017 04:21:17 +0200 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/comicbook/libokularGenerator_comicbook.json | 1 + generators/dvi/libokularGenerator_dvi.json | 1 + generators/fictionbook/libokularGenerator_fb.json | 1 + generators/mobipocket/libokularGenerator_mobi.json | 1 + generators/ooo/libokularGenerator_ooo.json | 1 + generators/plucker/libokularGenerator_plucker.json | 1 + generators/poppler/libokularGenerator_poppler.json | 1 + generators/spectre/libokularGenerator_ghostview.json | 1 + generators/tiff/libokularGenerator_tiff.json | 1 + generators/txt/libokularGenerator_txt.json | 1 + 11 files changed, 11 insertions(+) diff --git a/generators/chm/libokularGenerator_chmlib.json b/generators/chm/libokularGenerator_chmlib.json index 7418c5f54..08906d6cd 100644 --- a/generators/chm/libokularGenerator_chmlib.json +++ b/generators/chm/libokularGenerator_chmlib.json @@ -60,6 +60,7 @@ "Description[tr]": "Microsoft Windows yardım dosyası oluşturucusu", "Description[uk]": "Відображення файлів довідки Microsoft Windows", "Description[x-test]": "xxA Microsoft Windows help file rendererxx", + "Description[zh_CN]": "Microsoft Windows 帮助文件渲染器", "Description[zh_TW]": "Microsoft Windows 說明檔成像器", "Id": "okular_chm", "License": "GPL", diff --git a/generators/comicbook/libokularGenerator_comicbook.json b/generators/comicbook/libokularGenerator_comicbook.json index 6aae30b96..5d77fa72f 100644 --- a/generators/comicbook/libokularGenerator_comicbook.json +++ b/generators/comicbook/libokularGenerator_comicbook.json @@ -52,6 +52,7 @@ "Description[tr]": "Çeşitli çizgi roman biçimleri için bir oluşturucu", "Description[uk]": "Програма для відображення коміксів у різних форматах", "Description[x-test]": "xxA renderer for various comic book formatsxx", + "Description[zh_CN]": "多种漫画书格式的渲染器", "Description[zh_TW]": "多種漫畫書的成像器", "Id": "okular_comicbook", "License": "GPL", diff --git a/generators/dvi/libokularGenerator_dvi.json b/generators/dvi/libokularGenerator_dvi.json index 220e1d969..1fc225aa1 100644 --- a/generators/dvi/libokularGenerator_dvi.json +++ b/generators/dvi/libokularGenerator_dvi.json @@ -49,6 +49,7 @@ "Description[tr]": "Bir DVI dosya oluşturucu", "Description[uk]": "Інструмент для показу файлів DVI", "Description[x-test]": "xxA DVI file rendererxx", + "Description[zh_CN]": "DVI 文件渲染器", "Description[zh_TW]": "DVI 檔成像器", "Id": "okular_dvi", "License": "GPL", diff --git a/generators/fictionbook/libokularGenerator_fb.json b/generators/fictionbook/libokularGenerator_fb.json index 10c8e936b..dfb708fd4 100644 --- a/generators/fictionbook/libokularGenerator_fb.json +++ b/generators/fictionbook/libokularGenerator_fb.json @@ -52,6 +52,7 @@ "Description[tr]": "FictionBook e-kitapları için bir oluşturucu", "Description[uk]": "Програма для відображення електронної белетристики", "Description[x-test]": "xxA renderer for FictionBook eBooksxx", + "Description[zh_CN]": "FictionBook 电子书渲染器", "Description[zh_TW]": "FictionBook 電子書成像器", "Id": "okular_fax", "License": "GPL", diff --git a/generators/mobipocket/libokularGenerator_mobi.json b/generators/mobipocket/libokularGenerator_mobi.json index b0d2269d7..2b2c79aae 100644 --- a/generators/mobipocket/libokularGenerator_mobi.json +++ b/generators/mobipocket/libokularGenerator_mobi.json @@ -52,6 +52,7 @@ "Description[tr]": "Bir mobipocket arka ucu", "Description[uk]": "Сервер mobipocket", "Description[x-test]": "xxA mobipocket backendxx", + "Description[zh_CN]": "Mobipocket 后端", "Description[zh_TW]": "Mobipocket 後端介面", "Id": "okular_mobi", "License": "GPL", diff --git a/generators/ooo/libokularGenerator_ooo.json b/generators/ooo/libokularGenerator_ooo.json index aa8d28421..0a2a1ef65 100644 --- a/generators/ooo/libokularGenerator_ooo.json +++ b/generators/ooo/libokularGenerator_ooo.json @@ -52,6 +52,7 @@ "Description[tr]": "OpenDocument Metin belgeleri için bir oluşturucu", "Description[uk]": "Модуль для показу текстових документів OpenDocument", "Description[x-test]": "xxA renderer for OpenDocument Text documentsxx", + "Description[zh_CN]": "OpenDocument 文本文档渲染器", "Description[zh_TW]": "OpenDocument 文字檔成像器", "Id": "okular_ooo", "License": "GPL", diff --git a/generators/plucker/libokularGenerator_plucker.json b/generators/plucker/libokularGenerator_plucker.json index b030191d7..5aacdd95f 100644 --- a/generators/plucker/libokularGenerator_plucker.json +++ b/generators/plucker/libokularGenerator_plucker.json @@ -52,6 +52,7 @@ "Description[tr]": "Plucker e-kitapları için bir oluşturucu", "Description[uk]": "Програма для відображення ел. книг Plucker", "Description[x-test]": "xxA renderer for Plucker eBooksxx", + "Description[zh_CN]": "Plucker 电子书渲染器", "Description[zh_TW]": "Plucker 電子書成像器", "Id": "okular_plucker", "License": "GPL", diff --git a/generators/poppler/libokularGenerator_poppler.json b/generators/poppler/libokularGenerator_poppler.json index 863f297da..bcf56f21f 100644 --- a/generators/poppler/libokularGenerator_poppler.json +++ b/generators/poppler/libokularGenerator_poppler.json @@ -52,6 +52,7 @@ "Description[tr]": "PDF dosyası oluşturucu", "Description[uk]": "Програма для показу файлів PDF", "Description[x-test]": "xxA PDF file rendererxx", + "Description[zh_CN]": "PDF 文件渲染器", "Description[zh_TW]": "PDF 檔成像器", "Id": "okular_poppler", "License": "GPL", diff --git a/generators/spectre/libokularGenerator_ghostview.json b/generators/spectre/libokularGenerator_ghostview.json index 8876e3cb2..03971c890 100644 --- a/generators/spectre/libokularGenerator_ghostview.json +++ b/generators/spectre/libokularGenerator_ghostview.json @@ -51,6 +51,7 @@ "Description[tr]": "Spectre kitaplığına dayalı bir PostScript dosya oluşturucu", "Description[uk]": "Обробник файлів PostScript на основі бібліотеки Spectre", "Description[x-test]": "xxA PostScript file renderer based on the Spectre libraryxx", + "Description[zh_CN]": "基于 Spectre 库的 PostScript 文件渲染器", "Description[zh_TW]": "基於 Spectre 函式庫的 PostScript 檔成像器", "Id": "okular_ghostview", "License": "GPL", diff --git a/generators/tiff/libokularGenerator_tiff.json b/generators/tiff/libokularGenerator_tiff.json index 7a277da78..9d6863d74 100644 --- a/generators/tiff/libokularGenerator_tiff.json +++ b/generators/tiff/libokularGenerator_tiff.json @@ -50,6 +50,7 @@ "Description[tr]": "Bir TIFF arka ucu", "Description[uk]": "Програма для TIFF", "Description[x-test]": "xxA TIFF backendxx", + "Description[zh_CN]": "TIFF 后端", "Description[zh_TW]": "TIFF 後端介面", "Id": "okular_tiff", "License": "GPL", diff --git a/generators/txt/libokularGenerator_txt.json b/generators/txt/libokularGenerator_txt.json index a6529db64..4a414ec38 100644 --- a/generators/txt/libokularGenerator_txt.json +++ b/generators/txt/libokularGenerator_txt.json @@ -48,6 +48,7 @@ "Description[tr]": "Txt arka ucu", "Description[uk]": "Модуль тексту", "Description[x-test]": "xxTxt backendxx", + "Description[zh_CN]": "纯文本后端", "Description[zh_TW]": "Txt 後端介面", "Id": "okular_txt", "License": "GPL", -- GitLab