From 21f96680a68133de3eaa3673d7bdfd35f3113a9d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 8 Sep 2021 01:23:37 +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/libokularGenerator_chmlib.json | 2 +- generators/chm/org.kde.mobile.okular_chm.desktop | 1 + generators/comicbook/org.kde.mobile.okular_comicbook.desktop | 1 + generators/djvu/org.kde.mobile.okular_djvu.desktop | 1 + generators/dvi/libokularGenerator_dvi.json | 2 +- generators/dvi/org.kde.mobile.okular_dvi.desktop | 1 + generators/epub/org.kde.mobile.okular_epub.desktop | 1 + generators/fax/org.kde.mobile.okular_fax.desktop | 1 + generators/fictionbook/org.kde.mobile.okular_fb.desktop | 1 + generators/kimgio/org.kde.mobile.okular_kimgio.desktop | 1 + generators/markdown/org.kde.mobile.okular_md.desktop | 1 + generators/mobipocket/org.kde.mobile.okular_mobi.desktop | 1 + generators/plucker/org.kde.mobile.okular_plucker.desktop | 1 + generators/poppler/libokularGenerator_poppler.json | 2 +- generators/poppler/org.kde.mobile.okular_pdf.desktop | 1 + generators/spectre/org.kde.mobile.okular_ghostview.desktop | 1 + generators/tiff/libokularGenerator_tiff.json | 2 +- generators/tiff/org.kde.mobile.okular_tiff.desktop | 1 + generators/txt/libokularGenerator_txt.json | 2 +- generators/txt/org.kde.mobile.okular_txt.desktop | 1 + generators/xps/org.kde.mobile.okular_xps.desktop | 1 + mobile/app/package/metadata.desktop | 1 + 22 files changed, 22 insertions(+), 5 deletions(-) diff --git a/generators/chm/libokularGenerator_chmlib.json b/generators/chm/libokularGenerator_chmlib.json index 17cc767dd..6b5b24f6d 100644 --- a/generators/chm/libokularGenerator_chmlib.json +++ b/generators/chm/libokularGenerator_chmlib.json @@ -127,7 +127,7 @@ "Description": "A Microsoft Windows help file renderer", "Description[ar]": "عارض مستندات مساعدة ويندوز", "Description[az]": "Microsoft Windows köməkçi fayl tərtibatçısı", - "Description[ca@valencia]": "Un renderitzador per als fitxers d'ajuda de Microsoft Windows", + "Description[ca@valencia]": "Un renderitzador de fitxers d'ajuda de Microsoft Windows", "Description[ca]": "Un renderitzador de fitxers d'ajuda de Microsoft Windows", "Description[cs]": "Nástroj pro zobrazování nápovědy Microsoft Windows", "Description[da]": "En gengiver til Microsoft Windows-hjælpfiler", diff --git a/generators/chm/org.kde.mobile.okular_chm.desktop b/generators/chm/org.kde.mobile.okular_chm.desktop index 94908fc86..6ac83d7e1 100644 --- a/generators/chm/org.kde.mobile.okular_chm.desktop +++ b/generators/chm/org.kde.mobile.okular_chm.desktop @@ -70,6 +70,7 @@ GenericName[fi]=Asiakirjakatselin GenericName[fr]=Afficheur de document GenericName[ga]=Amharcán cáipéisí GenericName[gl]=Visor de documentos +GenericName[hi]=दस्तावेज़ प्रदर्शक GenericName[hu]=Dokumentummegjelenítő GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari diff --git a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop index 3e021101c..386c409aa 100644 --- a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop +++ b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop @@ -71,6 +71,7 @@ GenericName[fi]=Asiakirjakatselin GenericName[fr]=Afficheur de document GenericName[ga]=Amharcán cáipéisí GenericName[gl]=Visor de documentos +GenericName[hi]=दस्तावेज़ प्रदर्शक GenericName[hu]=Dokumentummegjelenítő GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari diff --git a/generators/djvu/org.kde.mobile.okular_djvu.desktop b/generators/djvu/org.kde.mobile.okular_djvu.desktop index d2edb8f37..c323781d8 100644 --- a/generators/djvu/org.kde.mobile.okular_djvu.desktop +++ b/generators/djvu/org.kde.mobile.okular_djvu.desktop @@ -71,6 +71,7 @@ GenericName[fi]=Asiakirjakatselin GenericName[fr]=Afficheur de document GenericName[ga]=Amharcán cáipéisí GenericName[gl]=Visor de documentos +GenericName[hi]=दस्तावेज़ प्रदर्शक GenericName[hu]=Dokumentummegjelenítő GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari diff --git a/generators/dvi/libokularGenerator_dvi.json b/generators/dvi/libokularGenerator_dvi.json index 0f510dda6..066986f37 100644 --- a/generators/dvi/libokularGenerator_dvi.json +++ b/generators/dvi/libokularGenerator_dvi.json @@ -85,7 +85,7 @@ "Description": "A DVI file renderer", "Description[ar]": "عارض ملف DVI", "Description[az]": "DVİ faylı tərtibatçısı", - "Description[ca@valencia]": "Un renderitzador per als fitxers DVI", + "Description[ca@valencia]": "Un renderitzador de fitxers DVI", "Description[ca]": "Un renderitzador de fitxers DVI", "Description[cs]": "Vykreslovač DVI souborů", "Description[da]": "En gengiver til DVI-filer", diff --git a/generators/dvi/org.kde.mobile.okular_dvi.desktop b/generators/dvi/org.kde.mobile.okular_dvi.desktop index a29266c8f..2df3f8279 100644 --- a/generators/dvi/org.kde.mobile.okular_dvi.desktop +++ b/generators/dvi/org.kde.mobile.okular_dvi.desktop @@ -71,6 +71,7 @@ GenericName[fi]=Asiakirjakatselin GenericName[fr]=Afficheur de document GenericName[ga]=Amharcán cáipéisí GenericName[gl]=Visor de documentos +GenericName[hi]=दस्तावेज़ प्रदर्शक GenericName[hu]=Dokumentummegjelenítő GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari diff --git a/generators/epub/org.kde.mobile.okular_epub.desktop b/generators/epub/org.kde.mobile.okular_epub.desktop index c358a9162..2e66bc177 100644 --- a/generators/epub/org.kde.mobile.okular_epub.desktop +++ b/generators/epub/org.kde.mobile.okular_epub.desktop @@ -71,6 +71,7 @@ GenericName[fi]=Asiakirjakatselin GenericName[fr]=Afficheur de document GenericName[ga]=Amharcán cáipéisí GenericName[gl]=Visor de documentos +GenericName[hi]=दस्तावेज़ प्रदर्शक GenericName[hu]=Dokumentummegjelenítő GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari diff --git a/generators/fax/org.kde.mobile.okular_fax.desktop b/generators/fax/org.kde.mobile.okular_fax.desktop index fda2d2613..4eae62bf0 100644 --- a/generators/fax/org.kde.mobile.okular_fax.desktop +++ b/generators/fax/org.kde.mobile.okular_fax.desktop @@ -71,6 +71,7 @@ GenericName[fi]=Asiakirjakatselin GenericName[fr]=Afficheur de document GenericName[ga]=Amharcán cáipéisí GenericName[gl]=Visor de documentos +GenericName[hi]=दस्तावेज़ प्रदर्शक GenericName[hu]=Dokumentummegjelenítő GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari diff --git a/generators/fictionbook/org.kde.mobile.okular_fb.desktop b/generators/fictionbook/org.kde.mobile.okular_fb.desktop index 03d973e88..defa2eeb2 100644 --- a/generators/fictionbook/org.kde.mobile.okular_fb.desktop +++ b/generators/fictionbook/org.kde.mobile.okular_fb.desktop @@ -71,6 +71,7 @@ GenericName[fi]=Asiakirjakatselin GenericName[fr]=Afficheur de document GenericName[ga]=Amharcán cáipéisí GenericName[gl]=Visor de documentos +GenericName[hi]=दस्तावेज़ प्रदर्शक GenericName[hu]=Dokumentummegjelenítő GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari diff --git a/generators/kimgio/org.kde.mobile.okular_kimgio.desktop b/generators/kimgio/org.kde.mobile.okular_kimgio.desktop index 73457ead8..39099e904 100755 --- a/generators/kimgio/org.kde.mobile.okular_kimgio.desktop +++ b/generators/kimgio/org.kde.mobile.okular_kimgio.desktop @@ -71,6 +71,7 @@ GenericName[fi]=Asiakirjakatselin GenericName[fr]=Afficheur de document GenericName[ga]=Amharcán cáipéisí GenericName[gl]=Visor de documentos +GenericName[hi]=दस्तावेज़ प्रदर्शक GenericName[hu]=Dokumentummegjelenítő GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari diff --git a/generators/markdown/org.kde.mobile.okular_md.desktop b/generators/markdown/org.kde.mobile.okular_md.desktop index df55f9f27..d4cd5f7f5 100644 --- a/generators/markdown/org.kde.mobile.okular_md.desktop +++ b/generators/markdown/org.kde.mobile.okular_md.desktop @@ -71,6 +71,7 @@ GenericName[fi]=Asiakirjakatselin GenericName[fr]=Afficheur de document GenericName[ga]=Amharcán cáipéisí GenericName[gl]=Visor de documentos +GenericName[hi]=दस्तावेज़ प्रदर्शक GenericName[hu]=Dokumentummegjelenítő GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari diff --git a/generators/mobipocket/org.kde.mobile.okular_mobi.desktop b/generators/mobipocket/org.kde.mobile.okular_mobi.desktop index 77af46f57..2041c0d05 100755 --- a/generators/mobipocket/org.kde.mobile.okular_mobi.desktop +++ b/generators/mobipocket/org.kde.mobile.okular_mobi.desktop @@ -71,6 +71,7 @@ GenericName[fi]=Asiakirjakatselin GenericName[fr]=Afficheur de document GenericName[ga]=Amharcán cáipéisí GenericName[gl]=Visor de documentos +GenericName[hi]=दस्तावेज़ प्रदर्शक GenericName[hu]=Dokumentummegjelenítő GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari diff --git a/generators/plucker/org.kde.mobile.okular_plucker.desktop b/generators/plucker/org.kde.mobile.okular_plucker.desktop index 12d7d1494..8083ac715 100644 --- a/generators/plucker/org.kde.mobile.okular_plucker.desktop +++ b/generators/plucker/org.kde.mobile.okular_plucker.desktop @@ -71,6 +71,7 @@ GenericName[fi]=Asiakirjakatselin GenericName[fr]=Afficheur de document GenericName[ga]=Amharcán cáipéisí GenericName[gl]=Visor de documentos +GenericName[hi]=दस्तावेज़ प्रदर्शक GenericName[hu]=Dokumentummegjelenítő GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari diff --git a/generators/poppler/libokularGenerator_poppler.json b/generators/poppler/libokularGenerator_poppler.json index 20367b1af..240c5ce1e 100644 --- a/generators/poppler/libokularGenerator_poppler.json +++ b/generators/poppler/libokularGenerator_poppler.json @@ -86,7 +86,7 @@ "Description": "A PDF file renderer", "Description[ar]": "عارض ملفات بي دي اف", "Description[az]": "PDF faylı tərtibatçısı", - "Description[ca@valencia]": "Un renderitzador per als fitxers PDF", + "Description[ca@valencia]": "Un renderitzador de fitxers PDF", "Description[ca]": "Un renderitzador de fitxers PDF", "Description[cs]": "Vykreslovač PDF souborů", "Description[da]": "En gengiver til PDF-filer", diff --git a/generators/poppler/org.kde.mobile.okular_pdf.desktop b/generators/poppler/org.kde.mobile.okular_pdf.desktop index e68f71235..eee6b398d 100644 --- a/generators/poppler/org.kde.mobile.okular_pdf.desktop +++ b/generators/poppler/org.kde.mobile.okular_pdf.desktop @@ -71,6 +71,7 @@ GenericName[fi]=Asiakirjakatselin GenericName[fr]=Afficheur de document GenericName[ga]=Amharcán cáipéisí GenericName[gl]=Visor de documentos +GenericName[hi]=दस्तावेज़ प्रदर्शक GenericName[hu]=Dokumentummegjelenítő GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari diff --git a/generators/spectre/org.kde.mobile.okular_ghostview.desktop b/generators/spectre/org.kde.mobile.okular_ghostview.desktop index d9aaa712f..2fc32a80e 100644 --- a/generators/spectre/org.kde.mobile.okular_ghostview.desktop +++ b/generators/spectre/org.kde.mobile.okular_ghostview.desktop @@ -71,6 +71,7 @@ GenericName[fi]=Asiakirjakatselin GenericName[fr]=Afficheur de document GenericName[ga]=Amharcán cáipéisí GenericName[gl]=Visor de documentos +GenericName[hi]=दस्तावेज़ प्रदर्शक GenericName[hu]=Dokumentummegjelenítő GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari diff --git a/generators/tiff/libokularGenerator_tiff.json b/generators/tiff/libokularGenerator_tiff.json index 06dad6859..8898c4e1b 100644 --- a/generators/tiff/libokularGenerator_tiff.json +++ b/generators/tiff/libokularGenerator_tiff.json @@ -86,7 +86,7 @@ "Description": "A TIFF backend", "Description[ar]": "خلفية TIFF", "Description[az]": "TİFF modulu", - "Description[ca@valencia]": "Un dorsal per al TIFF", + "Description[ca@valencia]": "Un dorsal de TIFF", "Description[ca]": "Un dorsal de TIFF", "Description[cs]": "Podpůrná vrstva pro TIFF", "Description[da]": "En TIFF-backend", diff --git a/generators/tiff/org.kde.mobile.okular_tiff.desktop b/generators/tiff/org.kde.mobile.okular_tiff.desktop index 1fc282e2a..e06265625 100644 --- a/generators/tiff/org.kde.mobile.okular_tiff.desktop +++ b/generators/tiff/org.kde.mobile.okular_tiff.desktop @@ -71,6 +71,7 @@ GenericName[fi]=Asiakirjakatselin GenericName[fr]=Afficheur de document GenericName[ga]=Amharcán cáipéisí GenericName[gl]=Visor de documentos +GenericName[hi]=दस्तावेज़ प्रदर्शक GenericName[hu]=Dokumentummegjelenítő GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari diff --git a/generators/txt/libokularGenerator_txt.json b/generators/txt/libokularGenerator_txt.json index 0c5936440..3d05459c5 100644 --- a/generators/txt/libokularGenerator_txt.json +++ b/generators/txt/libokularGenerator_txt.json @@ -85,7 +85,7 @@ "Description": "Txt backend", "Description[ar]": "خلفية النص", "Description[az]": "Txt modulu", - "Description[ca@valencia]": "Dorsal txt", + "Description[ca@valencia]": "Dorsal de txt", "Description[ca]": "Dorsal de txt", "Description[cs]": "Podpůrná vrstva txt", "Description[da]": "Txt-backend", diff --git a/generators/txt/org.kde.mobile.okular_txt.desktop b/generators/txt/org.kde.mobile.okular_txt.desktop index ad2294072..c80de5865 100644 --- a/generators/txt/org.kde.mobile.okular_txt.desktop +++ b/generators/txt/org.kde.mobile.okular_txt.desktop @@ -71,6 +71,7 @@ GenericName[fi]=Asiakirjakatselin GenericName[fr]=Afficheur de document GenericName[ga]=Amharcán cáipéisí GenericName[gl]=Visor de documentos +GenericName[hi]=दस्तावेज़ प्रदर्शक GenericName[hu]=Dokumentummegjelenítő GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari diff --git a/generators/xps/org.kde.mobile.okular_xps.desktop b/generators/xps/org.kde.mobile.okular_xps.desktop index 10ab4fa53..fdee98857 100644 --- a/generators/xps/org.kde.mobile.okular_xps.desktop +++ b/generators/xps/org.kde.mobile.okular_xps.desktop @@ -71,6 +71,7 @@ GenericName[fi]=Asiakirjakatselin GenericName[fr]=Afficheur de document GenericName[ga]=Amharcán cáipéisí GenericName[gl]=Visor de documentos +GenericName[hi]=दस्तावेज़ प्रदर्शक GenericName[hu]=Dokumentummegjelenítő GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari diff --git a/mobile/app/package/metadata.desktop b/mobile/app/package/metadata.desktop index b809e9ca1..af2bb3ee4 100644 --- a/mobile/app/package/metadata.desktop +++ b/mobile/app/package/metadata.desktop @@ -79,6 +79,7 @@ GenericName[fi]=Asiakirjakatselin GenericName[fr]=Afficheur de document GenericName[ga]=Amharcán cáipéisí GenericName[gl]=Visor de documentos +GenericName[hi]=दस्तावेज़ प्रदर्शक GenericName[hu]=Dokumentummegjelenítő GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari