From 946406d114263403ed33eb01170004029d6abcaf Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 2 Jul 2022 03:15:11 +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 | 2 ++ generators/comicbook/org.kde.mobile.okular_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/markdown/okularApplication_md.desktop | 2 ++ generators/markdown/org.kde.mobile.okular_md.desktop | 1 + generators/mobipocket/okularApplication_mobi.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/org.kde.okular.desktop | 1 + 19 files changed, 21 insertions(+) diff --git a/generators/chm/okularApplication_chm.desktop b/generators/chm/okularApplication_chm.desktop index 976438dee..a876df73e 100755 --- a/generators/chm/okularApplication_chm.desktop +++ b/generators/chm/okularApplication_chm.desktop @@ -131,6 +131,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ar]=عارض المستندات عالمي Comment[az]=Sənədə universal baxış vasitəsi +Comment[bg]=Универсална програма за преглед на документи Comment[ca]=Visor universal de documents Comment[ca@valencia]=Visor universal de documents Comment[cs]=Univerzální prohlížeč dokumentů diff --git a/generators/comicbook/okularApplication_comicbook.desktop b/generators/comicbook/okularApplication_comicbook.desktop index e3d6783c6..b09d79908 100755 --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/generators/comicbook/okularApplication_comicbook.desktop @@ -131,6 +131,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ar]=عارض المستندات عالمي Comment[az]=Sənədə universal baxış vasitəsi +Comment[bg]=Универсална програма за преглед на документи Comment[ca]=Visor universal de documents Comment[ca@valencia]=Visor universal de documents Comment[cs]=Univerzální prohlížeč dokumentů @@ -181,6 +182,7 @@ NoDisplay=true X-KDE-Keywords=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[ar]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[az]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[bg]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[ca]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[ca@valencia]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[cs]=cbr, cbz, cbt, cb7, Comic Book diff --git a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop index d8d4dd75c..dcd28bf4b 100644 --- a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop +++ b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop @@ -171,6 +171,7 @@ NoDisplay=true X-KDE-Keywords=cbr, cbz, cbt, Comic Book X-KDE-Keywords[ar]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[az]=cbr, cbz, cbt, Comic Book +X-KDE-Keywords[bg]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[ca]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[ca@valencia]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[cs]=cbr, cbz, cbt, Comic Book diff --git a/generators/djvu/okularApplication_djvu.desktop b/generators/djvu/okularApplication_djvu.desktop index 5e09f8eef..c398105c7 100755 --- a/generators/djvu/okularApplication_djvu.desktop +++ b/generators/djvu/okularApplication_djvu.desktop @@ -131,6 +131,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ar]=عارض المستندات عالمي Comment[az]=Sənədə universal baxış vasitəsi +Comment[bg]=Универсална програма за преглед на документи Comment[ca]=Visor universal de documents Comment[ca@valencia]=Visor universal de documents Comment[cs]=Univerzální prohlížeč dokumentů diff --git a/generators/dvi/okularApplication_dvi.desktop b/generators/dvi/okularApplication_dvi.desktop index 91e4acb3b..5e0a5185f 100755 --- a/generators/dvi/okularApplication_dvi.desktop +++ b/generators/dvi/okularApplication_dvi.desktop @@ -131,6 +131,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ar]=عارض المستندات عالمي Comment[az]=Sənədə universal baxış vasitəsi +Comment[bg]=Универсална програма за преглед на документи Comment[ca]=Visor universal de documents Comment[ca@valencia]=Visor universal de documents Comment[cs]=Univerzální prohlížeč dokumentů diff --git a/generators/epub/okularApplication_epub.desktop b/generators/epub/okularApplication_epub.desktop index 6339042cc..03e639842 100755 --- a/generators/epub/okularApplication_epub.desktop +++ b/generators/epub/okularApplication_epub.desktop @@ -131,6 +131,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ar]=عارض المستندات عالمي Comment[az]=Sənədə universal baxış vasitəsi +Comment[bg]=Универсална програма за преглед на документи Comment[ca]=Visor universal de documents Comment[ca@valencia]=Visor universal de documents Comment[cs]=Univerzální prohlížeč dokumentů diff --git a/generators/fax/okularApplication_fax.desktop b/generators/fax/okularApplication_fax.desktop index 8ef74bd3a..45fb8056c 100755 --- a/generators/fax/okularApplication_fax.desktop +++ b/generators/fax/okularApplication_fax.desktop @@ -131,6 +131,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ar]=عارض المستندات عالمي Comment[az]=Sənədə universal baxış vasitəsi +Comment[bg]=Универсална програма за преглед на документи Comment[ca]=Visor universal de documents Comment[ca@valencia]=Visor universal de documents Comment[cs]=Univerzální prohlížeč dokumentů diff --git a/generators/fictionbook/okularApplication_fb.desktop b/generators/fictionbook/okularApplication_fb.desktop index 74d430949..b6f87f83d 100755 --- a/generators/fictionbook/okularApplication_fb.desktop +++ b/generators/fictionbook/okularApplication_fb.desktop @@ -131,6 +131,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ar]=عارض المستندات عالمي Comment[az]=Sənədə universal baxış vasitəsi +Comment[bg]=Универсална програма за преглед на документи Comment[ca]=Visor universal de documents Comment[ca@valencia]=Visor universal de documents Comment[cs]=Univerzální prohlížeč dokumentů diff --git a/generators/kimgio/okularApplication_kimgio.desktop b/generators/kimgio/okularApplication_kimgio.desktop index dc6615c72..2a4d37dbf 100755 --- a/generators/kimgio/okularApplication_kimgio.desktop +++ b/generators/kimgio/okularApplication_kimgio.desktop @@ -131,6 +131,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ar]=عارض المستندات عالمي Comment[az]=Sənədə universal baxış vasitəsi +Comment[bg]=Универсална програма за преглед на документи Comment[ca]=Visor universal de documents Comment[ca@valencia]=Visor universal de documents Comment[cs]=Univerzální prohlížeč dokumentů diff --git a/generators/markdown/okularApplication_md.desktop b/generators/markdown/okularApplication_md.desktop index 09bc94017..d875a657f 100644 --- a/generators/markdown/okularApplication_md.desktop +++ b/generators/markdown/okularApplication_md.desktop @@ -131,6 +131,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ar]=عارض المستندات عالمي Comment[az]=Sənədə universal baxış vasitəsi +Comment[bg]=Универсална програма за преглед на документи Comment[ca]=Visor universal de documents Comment[ca@valencia]=Visor universal de documents Comment[cs]=Univerzální prohlížeč dokumentů @@ -181,6 +182,7 @@ NoDisplay=true X-KDE-Keywords=Markdown X-KDE-Keywords[ar]=مارك‌داون X-KDE-Keywords[az]=Markdown +X-KDE-Keywords[bg]=Markdown X-KDE-Keywords[ca]=Markdown X-KDE-Keywords[ca@valencia]=Markdown X-KDE-Keywords[cs]=Markdown diff --git a/generators/markdown/org.kde.mobile.okular_md.desktop b/generators/markdown/org.kde.mobile.okular_md.desktop index 861e552fd..a66b3e3b6 100644 --- a/generators/markdown/org.kde.mobile.okular_md.desktop +++ b/generators/markdown/org.kde.mobile.okular_md.desktop @@ -170,6 +170,7 @@ NoDisplay=true X-KDE-Keywords=Markdown X-KDE-Keywords[ar]=مارك‌داون X-KDE-Keywords[az]=Markdown +X-KDE-Keywords[bg]=Markdown X-KDE-Keywords[ca]=Markdown X-KDE-Keywords[ca@valencia]=Markdown X-KDE-Keywords[cs]=Markdown diff --git a/generators/mobipocket/okularApplication_mobi.desktop b/generators/mobipocket/okularApplication_mobi.desktop index 5818cceda..8fef3c5e4 100755 --- a/generators/mobipocket/okularApplication_mobi.desktop +++ b/generators/mobipocket/okularApplication_mobi.desktop @@ -131,6 +131,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ar]=عارض المستندات عالمي Comment[az]=Sənədə universal baxış vasitəsi +Comment[bg]=Универсална програма за преглед на документи Comment[ca]=Visor universal de documents Comment[ca@valencia]=Visor universal de documents Comment[cs]=Univerzální prohlížeč dokumentů diff --git a/generators/plucker/okularApplication_plucker.desktop b/generators/plucker/okularApplication_plucker.desktop index 5995785e6..dd1550a7b 100755 --- a/generators/plucker/okularApplication_plucker.desktop +++ b/generators/plucker/okularApplication_plucker.desktop @@ -131,6 +131,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ar]=عارض المستندات عالمي Comment[az]=Sənədə universal baxış vasitəsi +Comment[bg]=Универсална програма за преглед на документи Comment[ca]=Visor universal de documents Comment[ca@valencia]=Visor universal de documents Comment[cs]=Univerzální prohlížeč dokumentů diff --git a/generators/poppler/okularApplication_pdf.desktop b/generators/poppler/okularApplication_pdf.desktop index 4587746cc..d0a15e4af 100755 --- a/generators/poppler/okularApplication_pdf.desktop +++ b/generators/poppler/okularApplication_pdf.desktop @@ -131,6 +131,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ar]=عارض المستندات عالمي Comment[az]=Sənədə universal baxış vasitəsi +Comment[bg]=Универсална програма за преглед на документи Comment[ca]=Visor universal de documents Comment[ca@valencia]=Visor universal de documents Comment[cs]=Univerzální prohlížeč dokumentů diff --git a/generators/spectre/okularApplication_ghostview.desktop b/generators/spectre/okularApplication_ghostview.desktop index bec10bc64..99b2b5800 100755 --- a/generators/spectre/okularApplication_ghostview.desktop +++ b/generators/spectre/okularApplication_ghostview.desktop @@ -131,6 +131,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ar]=عارض المستندات عالمي Comment[az]=Sənədə universal baxış vasitəsi +Comment[bg]=Универсална програма за преглед на документи Comment[ca]=Visor universal de documents Comment[ca@valencia]=Visor universal de documents Comment[cs]=Univerzální prohlížeč dokumentů diff --git a/generators/tiff/okularApplication_tiff.desktop b/generators/tiff/okularApplication_tiff.desktop index be59926ba..09be21e24 100755 --- a/generators/tiff/okularApplication_tiff.desktop +++ b/generators/tiff/okularApplication_tiff.desktop @@ -131,6 +131,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ar]=عارض المستندات عالمي Comment[az]=Sənədə universal baxış vasitəsi +Comment[bg]=Универсална програма за преглед на документи Comment[ca]=Visor universal de documents Comment[ca@valencia]=Visor universal de documents Comment[cs]=Univerzální prohlížeč dokumentů diff --git a/generators/txt/okularApplication_txt.desktop b/generators/txt/okularApplication_txt.desktop index a39a5987d..5e378f7a8 100644 --- a/generators/txt/okularApplication_txt.desktop +++ b/generators/txt/okularApplication_txt.desktop @@ -131,6 +131,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ar]=عارض المستندات عالمي Comment[az]=Sənədə universal baxış vasitəsi +Comment[bg]=Универсална програма за преглед на документи Comment[ca]=Visor universal de documents Comment[ca@valencia]=Visor universal de documents Comment[cs]=Univerzální prohlížeč dokumentů diff --git a/generators/xps/okularApplication_xps.desktop b/generators/xps/okularApplication_xps.desktop index a363e39ef..d309d212b 100755 --- a/generators/xps/okularApplication_xps.desktop +++ b/generators/xps/okularApplication_xps.desktop @@ -131,6 +131,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ar]=عارض المستندات عالمي Comment[az]=Sənədə universal baxış vasitəsi +Comment[bg]=Универсална програма за преглед на документи Comment[ca]=Visor universal de documents Comment[ca@valencia]=Visor universal de documents Comment[cs]=Univerzální prohlížeč dokumentů diff --git a/shell/org.kde.okular.desktop b/shell/org.kde.okular.desktop index 515ab62e6..9fc77b7b5 100755 --- a/shell/org.kde.okular.desktop +++ b/shell/org.kde.okular.desktop @@ -130,6 +130,7 @@ GenericName[zh_TW]=文件檢視器 Comment=Universal document viewer Comment[ar]=عارض المستندات عالمي Comment[az]=Sənədə universal baxış vasitəsi +Comment[bg]=Универсална програма за преглед на документи Comment[ca]=Visor universal de documents Comment[ca@valencia]=Visor universal de documents Comment[cs]=Univerzální prohlížeč dokumentů