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"
5 years ago · 21f96680a6
parent 2acaf9fc52
commit 21f96680a6
22 changed files with 22 additions and 5 deletions
--- 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",
--- 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
--- 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
--- 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
--- 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",
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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",
--- 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
--- 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
--- 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",
--- 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
--- 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",
--- 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
--- 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
--- 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