From 2b1cf2972835f26428cc42907b44231bee7d4f15 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 6 Sep 2015 04:39:34 +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 | 5 +++++ generators/comicbook/okularApplication_comicbook.desktop | 5 +++++ generators/djvu/okularApplication_djvu.desktop | 5 +++++ generators/dvi/okularApplication_dvi.desktop | 5 +++++ generators/epub/okularApplication_epub.desktop | 5 +++++ generators/fax/okularApplication_fax.desktop | 5 +++++ generators/fictionbook/okularApplication_fb.desktop | 5 +++++ generators/kimgio/okularApplication_kimgio.desktop | 5 +++++ generators/mobipocket/okularApplication_mobi.desktop | 5 +++++ generators/ooo/okularApplication_ooo.desktop | 5 +++++ generators/plucker/okularApplication_plucker.desktop | 5 +++++ generators/poppler/okularApplication_pdf.desktop | 5 +++++ generators/spectre/okularApplication_ghostview.desktop | 5 +++++ generators/tiff/okularApplication_tiff.desktop | 5 +++++ generators/txt/okularApplication_txt.desktop | 5 +++++ generators/xps/okularApplication_xps.desktop | 5 +++++ shell/okular.desktop | 5 +++++ 17 files changed, 85 insertions(+) diff --git a/generators/chm/okularApplication_chm.desktop b/generators/chm/okularApplication_chm.desktop index d299b52fb..038290c39 100755 --- a/generators/chm/okularApplication_chm.desktop +++ b/generators/chm/okularApplication_chm.desktop @@ -129,8 +129,13 @@ Comment[ca]=Visualitzador universal de documents Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[nl]=Universele documentviewer +Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[sr]=Универзални приказивач докумената +Comment[sr@ijekavian]=Универзални приказивач докумената +Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata +Comment[sr@latin]=Univerzalni prikazivač dokumenata Comment[sv]=Generell dokumentvisare Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx diff --git a/generators/comicbook/okularApplication_comicbook.desktop b/generators/comicbook/okularApplication_comicbook.desktop index def9ed9de..3a3c67ffa 100755 --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/generators/comicbook/okularApplication_comicbook.desktop @@ -129,8 +129,13 @@ Comment[ca]=Visualitzador universal de documents Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[nl]=Universele documentviewer +Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[sr]=Универзални приказивач докумената +Comment[sr@ijekavian]=Универзални приказивач докумената +Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata +Comment[sr@latin]=Univerzalni prikazivač dokumenata Comment[sv]=Generell dokumentvisare Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx diff --git a/generators/djvu/okularApplication_djvu.desktop b/generators/djvu/okularApplication_djvu.desktop index d8f27051f..3cc76d594 100755 --- a/generators/djvu/okularApplication_djvu.desktop +++ b/generators/djvu/okularApplication_djvu.desktop @@ -129,8 +129,13 @@ Comment[ca]=Visualitzador universal de documents Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[nl]=Universele documentviewer +Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[sr]=Универзални приказивач докумената +Comment[sr@ijekavian]=Универзални приказивач докумената +Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata +Comment[sr@latin]=Univerzalni prikazivač dokumenata Comment[sv]=Generell dokumentvisare Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx diff --git a/generators/dvi/okularApplication_dvi.desktop b/generators/dvi/okularApplication_dvi.desktop index f8d265988..c64982d25 100755 --- a/generators/dvi/okularApplication_dvi.desktop +++ b/generators/dvi/okularApplication_dvi.desktop @@ -129,8 +129,13 @@ Comment[ca]=Visualitzador universal de documents Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[nl]=Universele documentviewer +Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[sr]=Универзални приказивач докумената +Comment[sr@ijekavian]=Универзални приказивач докумената +Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata +Comment[sr@latin]=Univerzalni prikazivač dokumenata Comment[sv]=Generell dokumentvisare Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx diff --git a/generators/epub/okularApplication_epub.desktop b/generators/epub/okularApplication_epub.desktop index 283ab4635..e8374eeee 100755 --- a/generators/epub/okularApplication_epub.desktop +++ b/generators/epub/okularApplication_epub.desktop @@ -129,8 +129,13 @@ Comment[ca]=Visualitzador universal de documents Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[nl]=Universele documentviewer +Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[sr]=Универзални приказивач докумената +Comment[sr@ijekavian]=Универзални приказивач докумената +Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata +Comment[sr@latin]=Univerzalni prikazivač dokumenata Comment[sv]=Generell dokumentvisare Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx diff --git a/generators/fax/okularApplication_fax.desktop b/generators/fax/okularApplication_fax.desktop index 55c0b29b4..05d16046a 100755 --- a/generators/fax/okularApplication_fax.desktop +++ b/generators/fax/okularApplication_fax.desktop @@ -129,8 +129,13 @@ Comment[ca]=Visualitzador universal de documents Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[nl]=Universele documentviewer +Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[sr]=Универзални приказивач докумената +Comment[sr@ijekavian]=Универзални приказивач докумената +Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata +Comment[sr@latin]=Univerzalni prikazivač dokumenata Comment[sv]=Generell dokumentvisare Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx diff --git a/generators/fictionbook/okularApplication_fb.desktop b/generators/fictionbook/okularApplication_fb.desktop index b8b9948e3..96480cc8c 100755 --- a/generators/fictionbook/okularApplication_fb.desktop +++ b/generators/fictionbook/okularApplication_fb.desktop @@ -129,8 +129,13 @@ Comment[ca]=Visualitzador universal de documents Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[nl]=Universele documentviewer +Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[sr]=Универзални приказивач докумената +Comment[sr@ijekavian]=Универзални приказивач докумената +Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata +Comment[sr@latin]=Univerzalni prikazivač dokumenata Comment[sv]=Generell dokumentvisare Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx diff --git a/generators/kimgio/okularApplication_kimgio.desktop b/generators/kimgio/okularApplication_kimgio.desktop index 0cdf10636..29c9fecd1 100755 --- a/generators/kimgio/okularApplication_kimgio.desktop +++ b/generators/kimgio/okularApplication_kimgio.desktop @@ -129,8 +129,13 @@ Comment[ca]=Visualitzador universal de documents Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[nl]=Universele documentviewer +Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[sr]=Универзални приказивач докумената +Comment[sr@ijekavian]=Универзални приказивач докумената +Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata +Comment[sr@latin]=Univerzalni prikazivač dokumenata Comment[sv]=Generell dokumentvisare Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx diff --git a/generators/mobipocket/okularApplication_mobi.desktop b/generators/mobipocket/okularApplication_mobi.desktop index 3fb3b9767..220775ea1 100755 --- a/generators/mobipocket/okularApplication_mobi.desktop +++ b/generators/mobipocket/okularApplication_mobi.desktop @@ -129,8 +129,13 @@ Comment[ca]=Visualitzador universal de documents Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[nl]=Universele documentviewer +Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[sr]=Универзални приказивач докумената +Comment[sr@ijekavian]=Универзални приказивач докумената +Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata +Comment[sr@latin]=Univerzalni prikazivač dokumenata Comment[sv]=Generell dokumentvisare Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx diff --git a/generators/ooo/okularApplication_ooo.desktop b/generators/ooo/okularApplication_ooo.desktop index ccd4a5521..7694a29e9 100755 --- a/generators/ooo/okularApplication_ooo.desktop +++ b/generators/ooo/okularApplication_ooo.desktop @@ -129,8 +129,13 @@ Comment[ca]=Visualitzador universal de documents Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[nl]=Universele documentviewer +Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[sr]=Универзални приказивач докумената +Comment[sr@ijekavian]=Универзални приказивач докумената +Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata +Comment[sr@latin]=Univerzalni prikazivač dokumenata Comment[sv]=Generell dokumentvisare Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx diff --git a/generators/plucker/okularApplication_plucker.desktop b/generators/plucker/okularApplication_plucker.desktop index e083d8efd..46974d6d0 100755 --- a/generators/plucker/okularApplication_plucker.desktop +++ b/generators/plucker/okularApplication_plucker.desktop @@ -129,8 +129,13 @@ Comment[ca]=Visualitzador universal de documents Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[nl]=Universele documentviewer +Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[sr]=Универзални приказивач докумената +Comment[sr@ijekavian]=Универзални приказивач докумената +Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata +Comment[sr@latin]=Univerzalni prikazivač dokumenata Comment[sv]=Generell dokumentvisare Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx diff --git a/generators/poppler/okularApplication_pdf.desktop b/generators/poppler/okularApplication_pdf.desktop index 6d0a2a8c3..5cec6b5a1 100755 --- a/generators/poppler/okularApplication_pdf.desktop +++ b/generators/poppler/okularApplication_pdf.desktop @@ -129,8 +129,13 @@ Comment[ca]=Visualitzador universal de documents Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[nl]=Universele documentviewer +Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[sr]=Универзални приказивач докумената +Comment[sr@ijekavian]=Универзални приказивач докумената +Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata +Comment[sr@latin]=Univerzalni prikazivač dokumenata Comment[sv]=Generell dokumentvisare Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx diff --git a/generators/spectre/okularApplication_ghostview.desktop b/generators/spectre/okularApplication_ghostview.desktop index 35674c313..0e078c9c5 100755 --- a/generators/spectre/okularApplication_ghostview.desktop +++ b/generators/spectre/okularApplication_ghostview.desktop @@ -129,8 +129,13 @@ Comment[ca]=Visualitzador universal de documents Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[nl]=Universele documentviewer +Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[sr]=Универзални приказивач докумената +Comment[sr@ijekavian]=Универзални приказивач докумената +Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata +Comment[sr@latin]=Univerzalni prikazivač dokumenata Comment[sv]=Generell dokumentvisare Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx diff --git a/generators/tiff/okularApplication_tiff.desktop b/generators/tiff/okularApplication_tiff.desktop index 965f53d9e..367902233 100755 --- a/generators/tiff/okularApplication_tiff.desktop +++ b/generators/tiff/okularApplication_tiff.desktop @@ -129,8 +129,13 @@ Comment[ca]=Visualitzador universal de documents Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[nl]=Universele documentviewer +Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[sr]=Универзални приказивач докумената +Comment[sr@ijekavian]=Универзални приказивач докумената +Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata +Comment[sr@latin]=Univerzalni prikazivač dokumenata Comment[sv]=Generell dokumentvisare Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx diff --git a/generators/txt/okularApplication_txt.desktop b/generators/txt/okularApplication_txt.desktop index a2835d0bf..ffd2eb5a9 100644 --- a/generators/txt/okularApplication_txt.desktop +++ b/generators/txt/okularApplication_txt.desktop @@ -129,8 +129,13 @@ Comment[ca]=Visualitzador universal de documents Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[nl]=Universele documentviewer +Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[sr]=Универзални приказивач докумената +Comment[sr@ijekavian]=Универзални приказивач докумената +Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata +Comment[sr@latin]=Univerzalni prikazivač dokumenata Comment[sv]=Generell dokumentvisare Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx diff --git a/generators/xps/okularApplication_xps.desktop b/generators/xps/okularApplication_xps.desktop index 81ae99a60..509f8c51a 100755 --- a/generators/xps/okularApplication_xps.desktop +++ b/generators/xps/okularApplication_xps.desktop @@ -129,8 +129,13 @@ Comment[ca]=Visualitzador universal de documents Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[nl]=Universele documentviewer +Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[sr]=Универзални приказивач докумената +Comment[sr@ijekavian]=Универзални приказивач докумената +Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata +Comment[sr@latin]=Univerzalni prikazivač dokumenata Comment[sv]=Generell dokumentvisare Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx diff --git a/shell/okular.desktop b/shell/okular.desktop index e5e37b8d6..ba27d6155 100755 --- a/shell/okular.desktop +++ b/shell/okular.desktop @@ -128,8 +128,13 @@ Comment[ca]=Visualitzador universal de documents Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[nl]=Universele documentviewer +Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[sr]=Универзални приказивач докумената +Comment[sr@ijekavian]=Универзални приказивач докумената +Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata +Comment[sr@latin]=Univerzalni prikazivač dokumenata Comment[sv]=Generell dokumentvisare Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx