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 04:36:10 +02:00 · 2017-05-21 04:36:10 +02:00 · 767a1c0eac
parent bfe1f62eb5
commit 767a1c0eac
17 changed files with 17 additions and 0 deletions
--- 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/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/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/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/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/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/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/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/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/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/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