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"
2024-08-24 18:35:37 +00:00 · 2017-05-21 05:48:05 +02:00 · 2017-05-21 05:48:05 +02:00 · bb8c12d1eb
parent 34edbb7711
commit bb8c12d1eb
28 changed files with 28 additions and 0 deletions
--- a/generators/chm/libokularGenerator_chmlib.json
+++ b/generators/chm/libokularGenerator_chmlib.json
@ -57,6 +57,7 @@
        "Description[sv]": "Ett återgivningsprogram av Microsoft Windows hjälpfiler",
        "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",
--- a/generators/chm/okularApplication_chm.desktop
+++ b/generators/chm/okularApplication_chm.desktop
@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare
 Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
+Comment[zh_CN]=通用文档查看器
 Comment[zh_TW]=通用文件檢視器
 Exec=okular %U
 Icon=okular
--- a/generators/comicbook/libokularGenerator_comicbook.json
+++ b/generators/comicbook/libokularGenerator_comicbook.json
@ -50,6 +50,7 @@
        "Description[sv]": "Ett återgivningsprogram för diverse format för serieböcker",
        "Description[uk]": "Програма для відображення коміксів у різних форматах",
        "Description[x-test]": "xxA renderer for various comic book formatsxx",
+        "Description[zh_CN]": "多种漫画书格式的渲染器",
        "Description[zh_TW]": "多種漫畫書的成像器",
        "Id": "okular_comicbook",
        "License": "GPL",
--- a/generators/comicbook/okularApplication_comicbook.desktop
+++ b/generators/comicbook/okularApplication_comicbook.desktop
@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare
 Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
+Comment[zh_CN]=通用文档查看器
 Comment[zh_TW]=通用文件檢視器
 Exec=okular %U
 Icon=okular
--- a/generators/djvu/okularApplication_djvu.desktop
+++ b/generators/djvu/okularApplication_djvu.desktop
@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare
 Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
+Comment[zh_CN]=通用文档查看器
 Comment[zh_TW]=通用文件檢視器
 Exec=okular %U
 Icon=okular
--- a/generators/dvi/libokularGenerator_dvi.json
+++ b/generators/dvi/libokularGenerator_dvi.json
@ -46,6 +46,7 @@
        "Description[sv]": "Ett återgivningsprogram för DVI-filer",
        "Description[uk]": "Інструмент для показу файлів DVI",
        "Description[x-test]": "xxA DVI file rendererxx",
+        "Description[zh_CN]": "DVI 文件渲染器",
        "Description[zh_TW]": "DVI 檔成像器",
        "Id": "okular_dvi",
        "License": "GPL",
--- a/generators/dvi/okularApplication_dvi.desktop
+++ b/generators/dvi/okularApplication_dvi.desktop
@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare
 Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
+Comment[zh_CN]=通用文档查看器
 Comment[zh_TW]=通用文件檢視器
 Exec=okular %U
 Icon=okular
--- a/generators/epub/okularApplication_epub.desktop
+++ b/generators/epub/okularApplication_epub.desktop
@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare
 Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
+Comment[zh_CN]=通用文档查看器
 Comment[zh_TW]=通用文件檢視器
 Exec=okular %U
 Icon=okular
--- a/generators/fax/okularApplication_fax.desktop
+++ b/generators/fax/okularApplication_fax.desktop
@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare
 Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
+Comment[zh_CN]=通用文档查看器
 Comment[zh_TW]=通用文件檢視器
 Exec=okular %U
 Icon=okular
--- a/generators/fictionbook/libokularGenerator_fb.json
+++ b/generators/fictionbook/libokularGenerator_fb.json
@ -50,6 +50,7 @@
        "Description[sv]": "Ett återgivningsprogram för Fiction Book e-böcker",
        "Description[uk]": "Програма для відображення електронної белетристики",
        "Description[x-test]": "xxA renderer for FictionBook eBooksxx",
+        "Description[zh_CN]": "FictionBook 电子书渲染器",
        "Description[zh_TW]": "FictionBook 電子書成像器",
        "Id": "okular_fax",
        "License": "GPL",
--- a/generators/fictionbook/okularApplication_fb.desktop
+++ b/generators/fictionbook/okularApplication_fb.desktop
@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare
 Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
+Comment[zh_CN]=通用文档查看器
 Comment[zh_TW]=通用文件檢視器
 Exec=okular %U
 Icon=okular
--- a/generators/kimgio/okularApplication_kimgio.desktop
+++ b/generators/kimgio/okularApplication_kimgio.desktop
@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare
 Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
+Comment[zh_CN]=通用文档查看器
 Comment[zh_TW]=通用文件檢視器
 Exec=okular %U
 Icon=okular
--- a/generators/mobipocket/libokularGenerator_mobi.json
+++ b/generators/mobipocket/libokularGenerator_mobi.json
@ -48,6 +48,7 @@
        "Description[sv]": "Ett Mobipocket-gränssnitt",
        "Description[uk]": "Сервер mobipocket",
        "Description[x-test]": "xxA mobipocket backendxx",
+        "Description[zh_CN]": "Mobipocket 后端",
        "Description[zh_TW]": "Mobipocket 後端介面",
        "Id": "okular_mobi",
        "License": "GPL",
--- a/generators/mobipocket/okularApplication_mobi.desktop
+++ b/generators/mobipocket/okularApplication_mobi.desktop
@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare
 Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
+Comment[zh_CN]=通用文档查看器
 Comment[zh_TW]=通用文件檢視器
 TryExec=okular
 Exec=okular %U
--- a/generators/ooo/libokularGenerator_ooo.json
+++ b/generators/ooo/libokularGenerator_ooo.json
@ -50,6 +50,7 @@
        "Description[sv]": "Ett återgivningsprogram för OpenDocument-textdokument",
        "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",
--- a/generators/ooo/okularApplication_ooo.desktop
+++ b/generators/ooo/okularApplication_ooo.desktop
@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare
 Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
+Comment[zh_CN]=通用文档查看器
 Comment[zh_TW]=通用文件檢視器
 Exec=okular %U
 Icon=okular
--- a/generators/plucker/libokularGenerator_plucker.json
+++ b/generators/plucker/libokularGenerator_plucker.json
@ -50,6 +50,7 @@
        "Description[sv]": "Ett återgivningsprogram för Plucker e-böcker",
        "Description[uk]": "Програма для відображення ел. книг Plucker",
        "Description[x-test]": "xxA renderer for Plucker eBooksxx",
+        "Description[zh_CN]": "Plucker 电子书渲染器",
        "Description[zh_TW]": "Plucker 電子書成像器",
        "Id": "okular_plucker",
        "License": "GPL",
--- a/generators/plucker/okularApplication_plucker.desktop
+++ b/generators/plucker/okularApplication_plucker.desktop
@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare
 Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
+Comment[zh_CN]=通用文档查看器
 Comment[zh_TW]=通用文件檢視器
 Exec=okular %U
 Icon=okular
--- a/generators/poppler/libokularGenerator_poppler.json
+++ b/generators/poppler/libokularGenerator_poppler.json
@ -48,6 +48,7 @@
        "Description[sv]": "Ett återgivningsprogram för PDF-filer",
        "Description[uk]": "Програма для показу файлів PDF",
        "Description[x-test]": "xxA PDF file rendererxx",
+        "Description[zh_CN]": "PDF 文件渲染器",
        "Description[zh_TW]": "PDF 檔成像器",
        "Id": "okular_poppler",
        "License": "GPL",
--- a/generators/poppler/okularApplication_pdf.desktop
+++ b/generators/poppler/okularApplication_pdf.desktop
@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare
 Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
+Comment[zh_CN]=通用文档查看器
 Comment[zh_TW]=通用文件檢視器
 Exec=okular %U
 Icon=okular
--- a/generators/spectre/libokularGenerator_ghostview.json
+++ b/generators/spectre/libokularGenerator_ghostview.json
@ -48,6 +48,7 @@
        "Description[sv]": "Ett återgivningsprogram för Postscript-filer baserat på Spectre-biblioteket",
        "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",
--- a/generators/spectre/okularApplication_ghostview.desktop
+++ b/generators/spectre/okularApplication_ghostview.desktop
@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare
 Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
+Comment[zh_CN]=通用文档查看器
 Comment[zh_TW]=通用文件檢視器
 Exec=okular %U
 Icon=okular
--- a/generators/tiff/libokularGenerator_tiff.json
+++ b/generators/tiff/libokularGenerator_tiff.json
@ -48,6 +48,7 @@
        "Description[sv]": "Ett TIFF-gränssnitt",
        "Description[uk]": "Програма для TIFF",
        "Description[x-test]": "xxA TIFF backendxx",
+        "Description[zh_CN]": "TIFF 后端",
        "Description[zh_TW]": "TIFF 後端介面",
        "Id": "okular_tiff",
        "License": "GPL",
--- a/generators/tiff/okularApplication_tiff.desktop
+++ b/generators/tiff/okularApplication_tiff.desktop
@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare
 Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
+Comment[zh_CN]=通用文档查看器
 Comment[zh_TW]=通用文件檢視器
 Exec=okular %U
 Icon=okular
--- a/generators/txt/libokularGenerator_txt.json
+++ b/generators/txt/libokularGenerator_txt.json
@ -46,6 +46,7 @@
        "Description[sv]": "Textgränssnitt",
        "Description[uk]": "Модуль тексту",
        "Description[x-test]": "xxTxt backendxx",
+        "Description[zh_CN]": "纯文本后端",
        "Description[zh_TW]": "Txt 後端介面",
        "Id": "okular_txt",
        "License": "GPL",
--- a/generators/txt/okularApplication_txt.desktop
+++ b/generators/txt/okularApplication_txt.desktop
@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare
 Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
+Comment[zh_CN]=通用文档查看器
 Comment[zh_TW]=通用文件檢視器
 Exec=okular %U
 Icon=okular
--- a/generators/xps/okularApplication_xps.desktop
+++ b/generators/xps/okularApplication_xps.desktop
@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare
 Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
+Comment[zh_CN]=通用文档查看器
 Comment[zh_TW]=通用文件檢視器
 Exec=okular %U
 Icon=okular
--- a/shell/org.kde.okular.desktop
+++ b/shell/org.kde.okular.desktop
@ -157,6 +157,7 @@ Comment[sv]=Generell dokumentvisare
 Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
+Comment[zh_CN]=通用文档查看器
 Comment[zh_TW]=通用文件檢視器
 Exec=okular %U
 Icon=okular