From 326d3146773b1f47600a7f97cf19c73e89896e7c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 3 Jul 2022 01:54:16 +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 | 2 +- generators/chm/okularChm.desktop | 2 +- generators/comicbook/okularApplication_comicbook.desktop | 2 +- generators/comicbook/okularComicbook.desktop | 2 +- generators/djvu/okularApplication_djvu.desktop | 2 +- generators/djvu/okularDjvu.desktop | 2 +- generators/dvi/okularApplication_dvi.desktop | 2 +- generators/dvi/okularDvi.desktop | 2 +- generators/epub/okularApplication_epub.desktop | 2 +- generators/epub/okularEPub.desktop | 2 +- generators/fax/okularApplication_fax.desktop | 2 +- generators/fax/okularFax.desktop | 2 +- generators/fictionbook/okularApplication_fb.desktop | 2 +- generators/fictionbook/okularFb.desktop | 2 +- generators/kimgio/okularApplication_kimgio.desktop | 2 +- generators/kimgio/okularKimgio.desktop | 2 +- generators/markdown/okularApplication_md.desktop | 2 +- generators/markdown/okularMd.desktop | 2 +- generators/mobipocket/okularApplication_mobi.desktop | 2 +- generators/mobipocket/okularMobi.desktop | 2 +- generators/plucker/okularApplication_plucker.desktop | 2 +- generators/plucker/okularPlucker.desktop | 2 +- generators/poppler/okularApplication_pdf.desktop | 2 +- generators/poppler/okularPoppler.desktop | 2 +- generators/spectre/okularApplication_ghostview.desktop | 2 +- generators/spectre/okularGhostview.desktop | 2 +- generators/tiff/okularApplication_tiff.desktop | 2 +- generators/tiff/okularTiff.desktop | 2 +- generators/txt/okularApplication_txt.desktop | 2 +- generators/txt/okularTxt.desktop | 2 +- generators/xps/okularApplication_xps.desktop | 2 +- generators/xps/okularXps.desktop | 2 +- mobile/app/package/metadata.desktop | 2 +- okular_part.desktop | 2 +- shell/org.kde.okular.desktop | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/generators/chm/okularApplication_chm.desktop b/generators/chm/okularApplication_chm.desktop index b929c87cc..7db796d54 100755 --- a/generators/chm/okularApplication_chm.desktop +++ b/generators/chm/okularApplication_chm.desktop @@ -61,7 +61,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular GenericName=Document Viewer GenericName[ar]=عارض المستندات diff --git a/generators/chm/okularChm.desktop b/generators/chm/okularChm.desktop index 5197cac02..ef0218e69 100644 --- a/generators/chm/okularChm.desktop +++ b/generators/chm/okularChm.desktop @@ -60,7 +60,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=okularpart diff --git a/generators/comicbook/okularApplication_comicbook.desktop b/generators/comicbook/okularApplication_comicbook.desktop index 370735747..d7dd694fb 100755 --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/generators/comicbook/okularApplication_comicbook.desktop @@ -61,7 +61,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular GenericName=Document Viewer GenericName[ar]=عارض المستندات diff --git a/generators/comicbook/okularComicbook.desktop b/generators/comicbook/okularComicbook.desktop index 5ef8b82c0..b4c81f883 100644 --- a/generators/comicbook/okularComicbook.desktop +++ b/generators/comicbook/okularComicbook.desktop @@ -60,7 +60,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=okularpart diff --git a/generators/djvu/okularApplication_djvu.desktop b/generators/djvu/okularApplication_djvu.desktop index de30e4250..88b99e63f 100755 --- a/generators/djvu/okularApplication_djvu.desktop +++ b/generators/djvu/okularApplication_djvu.desktop @@ -61,7 +61,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular GenericName=Document Viewer GenericName[ar]=عارض المستندات diff --git a/generators/djvu/okularDjvu.desktop b/generators/djvu/okularDjvu.desktop index 17b737716..40a7fb5b5 100644 --- a/generators/djvu/okularDjvu.desktop +++ b/generators/djvu/okularDjvu.desktop @@ -60,7 +60,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=okularpart diff --git a/generators/dvi/okularApplication_dvi.desktop b/generators/dvi/okularApplication_dvi.desktop index 947a3fe3e..bfc8b3a7f 100755 --- a/generators/dvi/okularApplication_dvi.desktop +++ b/generators/dvi/okularApplication_dvi.desktop @@ -61,7 +61,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular GenericName=Document Viewer GenericName[ar]=عارض المستندات diff --git a/generators/dvi/okularDvi.desktop b/generators/dvi/okularDvi.desktop index fa7b7c1e3..a19718045 100644 --- a/generators/dvi/okularDvi.desktop +++ b/generators/dvi/okularDvi.desktop @@ -60,7 +60,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=okularpart diff --git a/generators/epub/okularApplication_epub.desktop b/generators/epub/okularApplication_epub.desktop index 0e58c4af2..95f545367 100755 --- a/generators/epub/okularApplication_epub.desktop +++ b/generators/epub/okularApplication_epub.desktop @@ -61,7 +61,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular GenericName=Document Viewer GenericName[ar]=عارض المستندات diff --git a/generators/epub/okularEPub.desktop b/generators/epub/okularEPub.desktop index 57de25300..4d4f74ceb 100644 --- a/generators/epub/okularEPub.desktop +++ b/generators/epub/okularEPub.desktop @@ -60,7 +60,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=okularpart diff --git a/generators/fax/okularApplication_fax.desktop b/generators/fax/okularApplication_fax.desktop index 0fb7945dd..eceefd319 100755 --- a/generators/fax/okularApplication_fax.desktop +++ b/generators/fax/okularApplication_fax.desktop @@ -61,7 +61,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular GenericName=Document Viewer GenericName[ar]=عارض المستندات diff --git a/generators/fax/okularFax.desktop b/generators/fax/okularFax.desktop index 7bd1fac92..f008a5b82 100644 --- a/generators/fax/okularFax.desktop +++ b/generators/fax/okularFax.desktop @@ -60,7 +60,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=okularpart diff --git a/generators/fictionbook/okularApplication_fb.desktop b/generators/fictionbook/okularApplication_fb.desktop index 9a7467ab8..41ec8446b 100755 --- a/generators/fictionbook/okularApplication_fb.desktop +++ b/generators/fictionbook/okularApplication_fb.desktop @@ -61,7 +61,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular GenericName=Document Viewer GenericName[ar]=عارض المستندات diff --git a/generators/fictionbook/okularFb.desktop b/generators/fictionbook/okularFb.desktop index 504c5eaa9..724f819fe 100644 --- a/generators/fictionbook/okularFb.desktop +++ b/generators/fictionbook/okularFb.desktop @@ -60,7 +60,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=okularpart diff --git a/generators/kimgio/okularApplication_kimgio.desktop b/generators/kimgio/okularApplication_kimgio.desktop index 6cd662077..3ad5df17f 100755 --- a/generators/kimgio/okularApplication_kimgio.desktop +++ b/generators/kimgio/okularApplication_kimgio.desktop @@ -61,7 +61,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular GenericName=Document Viewer GenericName[ar]=عارض المستندات diff --git a/generators/kimgio/okularKimgio.desktop b/generators/kimgio/okularKimgio.desktop index 0fc2c74bd..3e9126198 100644 --- a/generators/kimgio/okularKimgio.desktop +++ b/generators/kimgio/okularKimgio.desktop @@ -60,7 +60,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=okularpart diff --git a/generators/markdown/okularApplication_md.desktop b/generators/markdown/okularApplication_md.desktop index 6fd35a790..7bbce5062 100644 --- a/generators/markdown/okularApplication_md.desktop +++ b/generators/markdown/okularApplication_md.desktop @@ -61,7 +61,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular GenericName=Document Viewer GenericName[ar]=عارض المستندات diff --git a/generators/markdown/okularMd.desktop b/generators/markdown/okularMd.desktop index d42cf04d1..e32e2151d 100644 --- a/generators/markdown/okularMd.desktop +++ b/generators/markdown/okularMd.desktop @@ -60,7 +60,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=okularpart diff --git a/generators/mobipocket/okularApplication_mobi.desktop b/generators/mobipocket/okularApplication_mobi.desktop index edba14151..21ddddb56 100755 --- a/generators/mobipocket/okularApplication_mobi.desktop +++ b/generators/mobipocket/okularApplication_mobi.desktop @@ -61,7 +61,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular GenericName=Document Viewer GenericName[ar]=عارض المستندات diff --git a/generators/mobipocket/okularMobi.desktop b/generators/mobipocket/okularMobi.desktop index 06ac055ae..4c96b1e06 100644 --- a/generators/mobipocket/okularMobi.desktop +++ b/generators/mobipocket/okularMobi.desktop @@ -60,7 +60,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=okularpart diff --git a/generators/plucker/okularApplication_plucker.desktop b/generators/plucker/okularApplication_plucker.desktop index 12aee2459..40f8a9e7d 100755 --- a/generators/plucker/okularApplication_plucker.desktop +++ b/generators/plucker/okularApplication_plucker.desktop @@ -61,7 +61,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular GenericName=Document Viewer GenericName[ar]=عارض المستندات diff --git a/generators/plucker/okularPlucker.desktop b/generators/plucker/okularPlucker.desktop index b6a355b34..3738e9570 100644 --- a/generators/plucker/okularPlucker.desktop +++ b/generators/plucker/okularPlucker.desktop @@ -60,7 +60,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=okularpart diff --git a/generators/poppler/okularApplication_pdf.desktop b/generators/poppler/okularApplication_pdf.desktop index 006371640..166dc7222 100755 --- a/generators/poppler/okularApplication_pdf.desktop +++ b/generators/poppler/okularApplication_pdf.desktop @@ -61,7 +61,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular GenericName=Document Viewer GenericName[ar]=عارض المستندات diff --git a/generators/poppler/okularPoppler.desktop b/generators/poppler/okularPoppler.desktop index 5641bca82..2ddbaf05a 100644 --- a/generators/poppler/okularPoppler.desktop +++ b/generators/poppler/okularPoppler.desktop @@ -60,7 +60,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=okularpart diff --git a/generators/spectre/okularApplication_ghostview.desktop b/generators/spectre/okularApplication_ghostview.desktop index d2be535bb..b9b2b1298 100755 --- a/generators/spectre/okularApplication_ghostview.desktop +++ b/generators/spectre/okularApplication_ghostview.desktop @@ -61,7 +61,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular GenericName=Document Viewer GenericName[ar]=عارض المستندات diff --git a/generators/spectre/okularGhostview.desktop b/generators/spectre/okularGhostview.desktop index 5f8bc9931..94da4c6ca 100644 --- a/generators/spectre/okularGhostview.desktop +++ b/generators/spectre/okularGhostview.desktop @@ -60,7 +60,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=okularpart diff --git a/generators/tiff/okularApplication_tiff.desktop b/generators/tiff/okularApplication_tiff.desktop index 98211772f..11972d80d 100755 --- a/generators/tiff/okularApplication_tiff.desktop +++ b/generators/tiff/okularApplication_tiff.desktop @@ -61,7 +61,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular GenericName=Document Viewer GenericName[ar]=عارض المستندات diff --git a/generators/tiff/okularTiff.desktop b/generators/tiff/okularTiff.desktop index 264ccac0e..5ca08740d 100644 --- a/generators/tiff/okularTiff.desktop +++ b/generators/tiff/okularTiff.desktop @@ -60,7 +60,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=okularpart diff --git a/generators/txt/okularApplication_txt.desktop b/generators/txt/okularApplication_txt.desktop index d2cd210c7..ad581fb31 100644 --- a/generators/txt/okularApplication_txt.desktop +++ b/generators/txt/okularApplication_txt.desktop @@ -61,7 +61,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular GenericName=Document Viewer GenericName[ar]=عارض المستندات diff --git a/generators/txt/okularTxt.desktop b/generators/txt/okularTxt.desktop index 1428dd4e8..d8a7481fa 100644 --- a/generators/txt/okularTxt.desktop +++ b/generators/txt/okularTxt.desktop @@ -60,7 +60,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=okularpart diff --git a/generators/xps/okularApplication_xps.desktop b/generators/xps/okularApplication_xps.desktop index 50b6dea33..b75f05dcf 100755 --- a/generators/xps/okularApplication_xps.desktop +++ b/generators/xps/okularApplication_xps.desktop @@ -61,7 +61,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular GenericName=Document Viewer GenericName[ar]=عارض المستندات diff --git a/generators/xps/okularXps.desktop b/generators/xps/okularXps.desktop index 24a5830d1..9f24c7e20 100644 --- a/generators/xps/okularXps.desktop +++ b/generators/xps/okularXps.desktop @@ -60,7 +60,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=okularpart diff --git a/mobile/app/package/metadata.desktop b/mobile/app/package/metadata.desktop index d2d66e533..124f5f879 100644 --- a/mobile/app/package/metadata.desktop +++ b/mobile/app/package/metadata.desktop @@ -59,7 +59,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular GenericName=Document viewer GenericName[ar]=عارض المستندات diff --git a/okular_part.desktop b/okular_part.desktop index 5c6fb6f9a..b17d0e031 100644 --- a/okular_part.desktop +++ b/okular_part.desktop @@ -60,7 +60,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart X-KDE-Library=okularpart diff --git a/shell/org.kde.okular.desktop b/shell/org.kde.okular.desktop index 9fc77b7b5..2577ca224 100755 --- a/shell/org.kde.okular.desktop +++ b/shell/org.kde.okular.desktop @@ -60,7 +60,7 @@ Name[ug]=Okular Name[uk]=Okular Name[vi]=Okular Name[x-test]=xxOkularxx -Name[zh_CN]=Okular +Name[zh_CN]=Okular 文档查看器 Name[zh_TW]=文件檢視_Okular GenericName=Document Viewer GenericName[ar]=عارض المستندات