From 7b8f0a74594aca11e7837b432f8dbdeafe410fa3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 26 Sep 2015 04:04:15 +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 820331cc1..88129fb35 100755 --- a/generators/chm/okularApplication_chm.desktop +++ b/generators/chm/okularApplication_chm.desktop @@ -128,6 +128,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů Comment[de]=Universeller Dokumentenbetrachter +Comment[el]=Καθολικός προβολέας εγγράφων 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 186a350e6..ae28f0aa3 100755 --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/generators/comicbook/okularApplication_comicbook.desktop @@ -128,6 +128,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů Comment[de]=Universeller Dokumentenbetrachter +Comment[el]=Καθολικός προβολέας εγγράφων 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 c35744fab..17f15d9c8 100755 --- a/generators/djvu/okularApplication_djvu.desktop +++ b/generators/djvu/okularApplication_djvu.desktop @@ -128,6 +128,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů Comment[de]=Universeller Dokumentenbetrachter +Comment[el]=Καθολικός προβολέας εγγράφων 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 f75b77b46..2f69230b8 100755 --- a/generators/dvi/okularApplication_dvi.desktop +++ b/generators/dvi/okularApplication_dvi.desktop @@ -128,6 +128,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů Comment[de]=Universeller Dokumentenbetrachter +Comment[el]=Καθολικός προβολέας εγγράφων 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 78e4ea3c0..8db930cd6 100755 --- a/generators/epub/okularApplication_epub.desktop +++ b/generators/epub/okularApplication_epub.desktop @@ -128,6 +128,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů Comment[de]=Universeller Dokumentenbetrachter +Comment[el]=Καθολικός προβολέας εγγράφων 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 05d79a3b0..776872d1f 100755 --- a/generators/fax/okularApplication_fax.desktop +++ b/generators/fax/okularApplication_fax.desktop @@ -128,6 +128,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů Comment[de]=Universeller Dokumentenbetrachter +Comment[el]=Καθολικός προβολέας εγγράφων 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 b7d56fc3d..928de030c 100755 --- a/generators/fictionbook/okularApplication_fb.desktop +++ b/generators/fictionbook/okularApplication_fb.desktop @@ -128,6 +128,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů Comment[de]=Universeller Dokumentenbetrachter +Comment[el]=Καθολικός προβολέας εγγράφων 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 11ede9561..38abeed41 100755 --- a/generators/kimgio/okularApplication_kimgio.desktop +++ b/generators/kimgio/okularApplication_kimgio.desktop @@ -128,6 +128,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů Comment[de]=Universeller Dokumentenbetrachter +Comment[el]=Καθολικός προβολέας εγγράφων 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 9dd831509..3875aea5c 100755 --- a/generators/mobipocket/okularApplication_mobi.desktop +++ b/generators/mobipocket/okularApplication_mobi.desktop @@ -128,6 +128,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů Comment[de]=Universeller Dokumentenbetrachter +Comment[el]=Καθολικός προβολέας εγγράφων 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 b16a7a090..c63bdfad4 100755 --- a/generators/ooo/okularApplication_ooo.desktop +++ b/generators/ooo/okularApplication_ooo.desktop @@ -128,6 +128,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů Comment[de]=Universeller Dokumentenbetrachter +Comment[el]=Καθολικός προβολέας εγγράφων 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 bff971a06..cc77334c5 100755 --- a/generators/plucker/okularApplication_plucker.desktop +++ b/generators/plucker/okularApplication_plucker.desktop @@ -128,6 +128,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů Comment[de]=Universeller Dokumentenbetrachter +Comment[el]=Καθολικός προβολέας εγγράφων 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 287ca2b52..ab738d7ab 100755 --- a/generators/poppler/okularApplication_pdf.desktop +++ b/generators/poppler/okularApplication_pdf.desktop @@ -128,6 +128,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů Comment[de]=Universeller Dokumentenbetrachter +Comment[el]=Καθολικός προβολέας εγγράφων 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 f24fe45fb..406c1d415 100755 --- a/generators/spectre/okularApplication_ghostview.desktop +++ b/generators/spectre/okularApplication_ghostview.desktop @@ -128,6 +128,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů Comment[de]=Universeller Dokumentenbetrachter +Comment[el]=Καθολικός προβολέας εγγράφων 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 17ca583b2..3d39fa45f 100755 --- a/generators/tiff/okularApplication_tiff.desktop +++ b/generators/tiff/okularApplication_tiff.desktop @@ -128,6 +128,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů Comment[de]=Universeller Dokumentenbetrachter +Comment[el]=Καθολικός προβολέας εγγράφων 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 8b9409309..dbfcae064 100644 --- a/generators/txt/okularApplication_txt.desktop +++ b/generators/txt/okularApplication_txt.desktop @@ -128,6 +128,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů Comment[de]=Universeller Dokumentenbetrachter +Comment[el]=Καθολικός προβολέας εγγράφων 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 5564897c6..5cbbacaa1 100755 --- a/generators/xps/okularApplication_xps.desktop +++ b/generators/xps/okularApplication_xps.desktop @@ -128,6 +128,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů Comment[de]=Universeller Dokumentenbetrachter +Comment[el]=Καθολικός προβολέας εγγράφων 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 f394b73f1..24c4eec7f 100755 --- a/shell/okular.desktop +++ b/shell/okular.desktop @@ -127,6 +127,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů Comment[de]=Universeller Dokumentenbetrachter +Comment[el]=Καθολικός προβολέας εγγράφων Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin