From 558b4bb7657e9a07dc38b5439287de6eb22dd90d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 15 Sep 2015 05:00:52 +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/okularApplication_chm.desktop | 1 + generators/comicbook/okularApplication_comicbook.desktop | 1 + generators/djvu/okularApplication_djvu.desktop | 1 + generators/dvi/okularApplication_dvi.desktop | 1 + generators/epub/okularApplication_epub.desktop | 1 + generators/fax/okularApplication_fax.desktop | 1 + generators/fictionbook/okularApplication_fb.desktop | 1 + generators/kimgio/okularApplication_kimgio.desktop | 1 + generators/mobipocket/okularApplication_mobi.desktop | 1 + generators/ooo/okularApplication_ooo.desktop | 1 + generators/plucker/okularApplication_plucker.desktop | 1 + generators/poppler/okularApplication_pdf.desktop | 1 + generators/spectre/okularApplication_ghostview.desktop | 1 + generators/tiff/okularApplication_tiff.desktop | 1 + generators/txt/okularApplication_txt.desktop | 1 + generators/xps/okularApplication_xps.desktop | 1 + shell/okular.desktop | 1 + 17 files changed, 17 insertions(+) diff --git a/generators/chm/okularApplication_chm.desktop b/generators/chm/okularApplication_chm.desktop index e86f6c6af..c68ef4fe7 100755 --- a/generators/chm/okularApplication_chm.desktop +++ b/generators/chm/okularApplication_chm.desktop @@ -127,6 +127,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[de]=Universeller Dokumentenbetrachter Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin diff --git a/generators/comicbook/okularApplication_comicbook.desktop b/generators/comicbook/okularApplication_comicbook.desktop index 8c85efb78..f10f614a3 100755 --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/generators/comicbook/okularApplication_comicbook.desktop @@ -127,6 +127,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[de]=Universeller Dokumentenbetrachter Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin diff --git a/generators/djvu/okularApplication_djvu.desktop b/generators/djvu/okularApplication_djvu.desktop index 34b34ea7a..8f5f85699 100755 --- a/generators/djvu/okularApplication_djvu.desktop +++ b/generators/djvu/okularApplication_djvu.desktop @@ -127,6 +127,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[de]=Universeller Dokumentenbetrachter Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin diff --git a/generators/dvi/okularApplication_dvi.desktop b/generators/dvi/okularApplication_dvi.desktop index 6770e7a4e..528efceb9 100755 --- a/generators/dvi/okularApplication_dvi.desktop +++ b/generators/dvi/okularApplication_dvi.desktop @@ -127,6 +127,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[de]=Universeller Dokumentenbetrachter Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin diff --git a/generators/epub/okularApplication_epub.desktop b/generators/epub/okularApplication_epub.desktop index ff27570b5..2dfe62313 100755 --- a/generators/epub/okularApplication_epub.desktop +++ b/generators/epub/okularApplication_epub.desktop @@ -127,6 +127,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[de]=Universeller Dokumentenbetrachter Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin diff --git a/generators/fax/okularApplication_fax.desktop b/generators/fax/okularApplication_fax.desktop index 2f69c0d44..c19fe85a7 100755 --- a/generators/fax/okularApplication_fax.desktop +++ b/generators/fax/okularApplication_fax.desktop @@ -127,6 +127,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[de]=Universeller Dokumentenbetrachter Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin diff --git a/generators/fictionbook/okularApplication_fb.desktop b/generators/fictionbook/okularApplication_fb.desktop index 0f9791736..2ee06742d 100755 --- a/generators/fictionbook/okularApplication_fb.desktop +++ b/generators/fictionbook/okularApplication_fb.desktop @@ -127,6 +127,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[de]=Universeller Dokumentenbetrachter Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin diff --git a/generators/kimgio/okularApplication_kimgio.desktop b/generators/kimgio/okularApplication_kimgio.desktop index 5f5effea8..1546017b9 100755 --- a/generators/kimgio/okularApplication_kimgio.desktop +++ b/generators/kimgio/okularApplication_kimgio.desktop @@ -127,6 +127,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[de]=Universeller Dokumentenbetrachter Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin diff --git a/generators/mobipocket/okularApplication_mobi.desktop b/generators/mobipocket/okularApplication_mobi.desktop index a410f54f2..31e812879 100755 --- a/generators/mobipocket/okularApplication_mobi.desktop +++ b/generators/mobipocket/okularApplication_mobi.desktop @@ -127,6 +127,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[de]=Universeller Dokumentenbetrachter Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin diff --git a/generators/ooo/okularApplication_ooo.desktop b/generators/ooo/okularApplication_ooo.desktop index 7ca0eb87e..89d683b63 100755 --- a/generators/ooo/okularApplication_ooo.desktop +++ b/generators/ooo/okularApplication_ooo.desktop @@ -127,6 +127,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[de]=Universeller Dokumentenbetrachter Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin diff --git a/generators/plucker/okularApplication_plucker.desktop b/generators/plucker/okularApplication_plucker.desktop index 3a5c47e5f..dce1bfaff 100755 --- a/generators/plucker/okularApplication_plucker.desktop +++ b/generators/plucker/okularApplication_plucker.desktop @@ -127,6 +127,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[de]=Universeller Dokumentenbetrachter Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin diff --git a/generators/poppler/okularApplication_pdf.desktop b/generators/poppler/okularApplication_pdf.desktop index 32a03d3ee..9c3083607 100755 --- a/generators/poppler/okularApplication_pdf.desktop +++ b/generators/poppler/okularApplication_pdf.desktop @@ -127,6 +127,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[de]=Universeller Dokumentenbetrachter Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin diff --git a/generators/spectre/okularApplication_ghostview.desktop b/generators/spectre/okularApplication_ghostview.desktop index 58d3e32e2..fd499b37b 100755 --- a/generators/spectre/okularApplication_ghostview.desktop +++ b/generators/spectre/okularApplication_ghostview.desktop @@ -127,6 +127,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[de]=Universeller Dokumentenbetrachter Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin diff --git a/generators/tiff/okularApplication_tiff.desktop b/generators/tiff/okularApplication_tiff.desktop index a373fd656..21aff3baa 100755 --- a/generators/tiff/okularApplication_tiff.desktop +++ b/generators/tiff/okularApplication_tiff.desktop @@ -127,6 +127,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[de]=Universeller Dokumentenbetrachter Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin diff --git a/generators/txt/okularApplication_txt.desktop b/generators/txt/okularApplication_txt.desktop index 462bcb08a..deb1ce4de 100644 --- a/generators/txt/okularApplication_txt.desktop +++ b/generators/txt/okularApplication_txt.desktop @@ -127,6 +127,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[de]=Universeller Dokumentenbetrachter Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin diff --git a/generators/xps/okularApplication_xps.desktop b/generators/xps/okularApplication_xps.desktop index 7580ec388..a9b98ef4f 100755 --- a/generators/xps/okularApplication_xps.desktop +++ b/generators/xps/okularApplication_xps.desktop @@ -127,6 +127,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[de]=Universeller Dokumentenbetrachter Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin diff --git a/shell/okular.desktop b/shell/okular.desktop index 13a52a31c..65e408f10 100755 --- a/shell/okular.desktop +++ b/shell/okular.desktop @@ -126,6 +126,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[de]=Universeller Dokumentenbetrachter Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin