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-25 02:45:38 +00:00 · 2015-10-08 04:21:25 +00:00 · 2015-10-08 04:21:25 +00:00 · cd34059f53
parent e9e5cb6317
commit cd34059f53
17 changed files with 17 additions and 0 deletions
--- a/generators/chm/okularApplication_chm.desktop
+++ b/generators/chm/okularApplication_chm.desktop
@ -132,6 +132,7 @@ Comment[el]=Καθολικός προβολέας εγγράφων
 Comment[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
+Comment[is]=Fjölhæfur skjalaskoðari
 Comment[it]=Visore di documenti universale
 Comment[nl]=Universele documentviewer
 Comment[pl]=Wszechstronna przeglądarka dokumentów
--- a/generators/comicbook/okularApplication_comicbook.desktop
+++ b/generators/comicbook/okularApplication_comicbook.desktop
@ -132,6 +132,7 @@ Comment[el]=Καθολικός προβολέας εγγράφων
 Comment[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
+Comment[is]=Fjölhæfur skjalaskoðari
 Comment[it]=Visore di documenti universale
 Comment[nl]=Universele documentviewer
 Comment[pl]=Wszechstronna przeglądarka dokumentów
--- a/generators/djvu/okularApplication_djvu.desktop
+++ b/generators/djvu/okularApplication_djvu.desktop
@ -132,6 +132,7 @@ Comment[el]=Καθολικός προβολέας εγγράφων
 Comment[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
+Comment[is]=Fjölhæfur skjalaskoðari
 Comment[it]=Visore di documenti universale
 Comment[nl]=Universele documentviewer
 Comment[pl]=Wszechstronna przeglądarka dokumentów
--- a/generators/dvi/okularApplication_dvi.desktop
+++ b/generators/dvi/okularApplication_dvi.desktop
@ -132,6 +132,7 @@ Comment[el]=Καθολικός προβολέας εγγράφων
 Comment[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
+Comment[is]=Fjölhæfur skjalaskoðari
 Comment[it]=Visore di documenti universale
 Comment[nl]=Universele documentviewer
 Comment[pl]=Wszechstronna przeglądarka dokumentów
--- a/generators/epub/okularApplication_epub.desktop
+++ b/generators/epub/okularApplication_epub.desktop
@ -132,6 +132,7 @@ Comment[el]=Καθολικός προβολέας εγγράφων
 Comment[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
+Comment[is]=Fjölhæfur skjalaskoðari
 Comment[it]=Visore di documenti universale
 Comment[nl]=Universele documentviewer
 Comment[pl]=Wszechstronna przeglądarka dokumentów
--- a/generators/fax/okularApplication_fax.desktop
+++ b/generators/fax/okularApplication_fax.desktop
@ -132,6 +132,7 @@ Comment[el]=Καθολικός προβολέας εγγράφων
 Comment[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
+Comment[is]=Fjölhæfur skjalaskoðari
 Comment[it]=Visore di documenti universale
 Comment[nl]=Universele documentviewer
 Comment[pl]=Wszechstronna przeglądarka dokumentów
--- a/generators/fictionbook/okularApplication_fb.desktop
+++ b/generators/fictionbook/okularApplication_fb.desktop
@ -132,6 +132,7 @@ Comment[el]=Καθολικός προβολέας εγγράφων
 Comment[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
+Comment[is]=Fjölhæfur skjalaskoðari
 Comment[it]=Visore di documenti universale
 Comment[nl]=Universele documentviewer
 Comment[pl]=Wszechstronna przeglądarka dokumentów
--- a/generators/kimgio/okularApplication_kimgio.desktop
+++ b/generators/kimgio/okularApplication_kimgio.desktop
@ -132,6 +132,7 @@ Comment[el]=Καθολικός προβολέας εγγράφων
 Comment[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
+Comment[is]=Fjölhæfur skjalaskoðari
 Comment[it]=Visore di documenti universale
 Comment[nl]=Universele documentviewer
 Comment[pl]=Wszechstronna przeglądarka dokumentów
--- a/generators/mobipocket/okularApplication_mobi.desktop
+++ b/generators/mobipocket/okularApplication_mobi.desktop
@ -132,6 +132,7 @@ Comment[el]=Καθολικός προβολέας εγγράφων
 Comment[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
+Comment[is]=Fjölhæfur skjalaskoðari
 Comment[it]=Visore di documenti universale
 Comment[nl]=Universele documentviewer
 Comment[pl]=Wszechstronna przeglądarka dokumentów
--- a/generators/ooo/okularApplication_ooo.desktop
+++ b/generators/ooo/okularApplication_ooo.desktop
@ -132,6 +132,7 @@ Comment[el]=Καθολικός προβολέας εγγράφων
 Comment[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
+Comment[is]=Fjölhæfur skjalaskoðari
 Comment[it]=Visore di documenti universale
 Comment[nl]=Universele documentviewer
 Comment[pl]=Wszechstronna przeglądarka dokumentów
--- a/generators/plucker/okularApplication_plucker.desktop
+++ b/generators/plucker/okularApplication_plucker.desktop
@ -132,6 +132,7 @@ Comment[el]=Καθολικός προβολέας εγγράφων
 Comment[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
+Comment[is]=Fjölhæfur skjalaskoðari
 Comment[it]=Visore di documenti universale
 Comment[nl]=Universele documentviewer
 Comment[pl]=Wszechstronna przeglądarka dokumentów
--- a/generators/poppler/okularApplication_pdf.desktop
+++ b/generators/poppler/okularApplication_pdf.desktop
@ -132,6 +132,7 @@ Comment[el]=Καθολικός προβολέας εγγράφων
 Comment[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
+Comment[is]=Fjölhæfur skjalaskoðari
 Comment[it]=Visore di documenti universale
 Comment[nl]=Universele documentviewer
 Comment[pl]=Wszechstronna przeglądarka dokumentów
--- a/generators/spectre/okularApplication_ghostview.desktop
+++ b/generators/spectre/okularApplication_ghostview.desktop
@ -132,6 +132,7 @@ Comment[el]=Καθολικός προβολέας εγγράφων
 Comment[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
+Comment[is]=Fjölhæfur skjalaskoðari
 Comment[it]=Visore di documenti universale
 Comment[nl]=Universele documentviewer
 Comment[pl]=Wszechstronna przeglądarka dokumentów
--- a/generators/tiff/okularApplication_tiff.desktop
+++ b/generators/tiff/okularApplication_tiff.desktop
@ -132,6 +132,7 @@ Comment[el]=Καθολικός προβολέας εγγράφων
 Comment[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
+Comment[is]=Fjölhæfur skjalaskoðari
 Comment[it]=Visore di documenti universale
 Comment[nl]=Universele documentviewer
 Comment[pl]=Wszechstronna przeglądarka dokumentów
--- a/generators/txt/okularApplication_txt.desktop
+++ b/generators/txt/okularApplication_txt.desktop
@ -132,6 +132,7 @@ Comment[el]=Καθολικός προβολέας εγγράφων
 Comment[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
+Comment[is]=Fjölhæfur skjalaskoðari
 Comment[it]=Visore di documenti universale
 Comment[nl]=Universele documentviewer
 Comment[pl]=Wszechstronna przeglądarka dokumentów
--- a/generators/xps/okularApplication_xps.desktop
+++ b/generators/xps/okularApplication_xps.desktop
@ -132,6 +132,7 @@ Comment[el]=Καθολικός προβολέας εγγράφων
 Comment[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
+Comment[is]=Fjölhæfur skjalaskoðari
 Comment[it]=Visore di documenti universale
 Comment[nl]=Universele documentviewer
 Comment[pl]=Wszechstronna przeglądarka dokumentów
--- a/shell/okular.desktop
+++ b/shell/okular.desktop
@ -131,6 +131,7 @@ Comment[el]=Καθολικός προβολέας εγγράφων
 Comment[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
+Comment[is]=Fjölhæfur skjalaskoðari
 Comment[it]=Visore di documenti universale
 Comment[nl]=Universele documentviewer
 Comment[pl]=Wszechstronna przeglądarka dokumentów