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"
11 years ago · dde68921b6
parent 7ac2b9ac2f
commit dde68921b6
17 changed files with 17 additions and 0 deletions
--- 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[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
 Comment[it]=Visore di documenti universale
--- 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[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
 Comment[it]=Visore di documenti universale
--- 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[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
 Comment[it]=Visore di documenti universale
--- 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[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
 Comment[it]=Visore di documenti universale
--- 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[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
 Comment[it]=Visore di documenti universale
--- 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[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
 Comment[it]=Visore di documenti universale
--- 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[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
 Comment[it]=Visore di documenti universale
--- 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[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
 Comment[it]=Visore di documenti universale
--- 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[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
 Comment[it]=Visore di documenti universale
--- 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[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
 Comment[it]=Visore di documenti universale
--- 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[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
 Comment[it]=Visore di documenti universale
--- 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[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
 Comment[it]=Visore di documenti universale
--- 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[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
 Comment[it]=Visore di documenti universale
--- 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[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
 Comment[it]=Visore di documenti universale
--- 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[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
 Comment[it]=Visore di documenti universale
--- 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[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
 Comment[it]=Visore di documenti universale
--- 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[en_GB]=Universal document viewer
 Comment[es]=Visor de documentos universal
 Comment[fi]=Yleinen asiakirjakatselin
 Comment[it]=Visore di documenti universale