From 8563aa45cb7d2a40ea7cb40104f1dffa2e6b619c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 30 Jul 2020 05:49:55 +0200 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/kio-msits/ms-its.protocol | 4 ++-- generators/chm/libokularGenerator_chmlib.json | 4 ++-- generators/comicbook/libokularGenerator_comicbook.json | 4 ++-- generators/djvu/libokularGenerator_djvu.json | 4 ++-- generators/dvi/libokularGenerator_dvi.json | 8 ++++---- generators/epub/libokularGenerator_epub.json | 4 ++-- generators/fax/libokularGenerator_fax.json | 4 ++-- generators/fictionbook/libokularGenerator_fb.json | 4 ++-- generators/markdown/libokularGenerator_md.json | 4 ++-- generators/mobipocket/libokularGenerator_mobi.json | 8 ++++---- generators/ooo/libokularGenerator_ooo.json | 8 ++++---- generators/poppler/libokularGenerator_poppler.json | 8 ++++---- generators/spectre/libokularGenerator_ghostview.json | 4 ++-- generators/tiff/libokularGenerator_tiff.json | 4 ++-- generators/txt/libokularGenerator_txt.json | 8 ++++---- 15 files changed, 40 insertions(+), 40 deletions(-) diff --git a/generators/chm/kio-msits/ms-its.protocol b/generators/chm/kio-msits/ms-its.protocol index 627317fa1..96180f54f 100644 --- a/generators/chm/kio-msits/ms-its.protocol +++ b/generators/chm/kio-msits/ms-its.protocol @@ -10,8 +10,8 @@ Description=A kioslave for displaying WinHelp files Description[ar]=خاصية كِييُوسليْف لعرض ملفات WinHelp Description[bg]=kioslave за показване на помощни файлове за Windows Description[bs]=U/I alat za prikaz WinHelp datoteke -Description[ca]=Un kioslave per a visualitzar els fitxers WinHelp -Description[ca@valencia]=Un kioslave per a visualitzar els fitxers WinHelp +Description[ca]=Un kioslave per a visualitzar els fitxers de WinHelp +Description[ca@valencia]=Un kioslave per a visualitzar els fitxers de WinHelp Description[cs]=Kioslave pro zobrazení souborů WinHelp Description[da]=En kioslave til visning af WinHelp-filer Description[de]=Ein-/Ausgabemodul zur Anzeige von Windows-Hilfe-Dateien diff --git a/generators/chm/libokularGenerator_chmlib.json b/generators/chm/libokularGenerator_chmlib.json index e7a24d95c..4df428c78 100644 --- a/generators/chm/libokularGenerator_chmlib.json +++ b/generators/chm/libokularGenerator_chmlib.json @@ -117,8 +117,8 @@ "Copyright[zh_CN]": "© 2005-2007 Piotr Szymański\n© 2008 Albert Astals Cid", "Copyright[zh_TW]": "© 2005-2007 Piotr Szymański\n© 2008 Albert Astals Cid", "Description": "A Microsoft Windows help file renderer", - "Description[ca@valencia]": "Un renderitzador de fitxers d'ajuda del Windows de Microsoft", - "Description[ca]": "Un renderitzador de fitxers d'ajuda del Windows de Microsoft", + "Description[ca@valencia]": "Un renderitzador per als fitxers d'ajuda de Microsoft Windows", + "Description[ca]": "Un renderitzador per als 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", "Description[de]": "Darstellungsprogramm für Hilfedateien aus Microsoft Windows", diff --git a/generators/comicbook/libokularGenerator_comicbook.json b/generators/comicbook/libokularGenerator_comicbook.json index 36df174b8..768573b0f 100644 --- a/generators/comicbook/libokularGenerator_comicbook.json +++ b/generators/comicbook/libokularGenerator_comicbook.json @@ -123,8 +123,8 @@ "inode/directory" ], "Name": "ComicBook Backend", - "Name[ca@valencia]": "Dorsal de ComicBook", - "Name[ca]": "Dorsal de ComicBook", + "Name[ca@valencia]": "Dorsal ComicBook", + "Name[ca]": "Dorsal ComicBook", "Name[cs]": "Podpůrná vrstva ComicBook", "Name[da]": "ComicBook-backend", "Name[de]": "Anzeigemodul für Comic-Book", diff --git a/generators/djvu/libokularGenerator_djvu.json b/generators/djvu/libokularGenerator_djvu.json index dc53a002d..bf8efdb32 100644 --- a/generators/djvu/libokularGenerator_djvu.json +++ b/generators/djvu/libokularGenerator_djvu.json @@ -78,8 +78,8 @@ "Copyright[zh_CN]": "© 2006-2008 Pino Toscano", "Copyright[zh_TW]": "© 2006-2008 Pino Toscano", "Description": "DjVu backend based on DjVuLibre", - "Description[ca@valencia]": "Dorsal pel DjVu basat en el DjVuLibre", - "Description[ca]": "Dorsal pel DjVu basat en el DjVuLibre", + "Description[ca@valencia]": "Dorsal DjVu basat en el DjVuLibre", + "Description[ca]": "Dorsal DjVu basat en el DjVuLibre", "Description[cs]": "Implementace DjVu založena na DjVuLibre", "Description[da]": "DjVu-backend baseret på DjVuLibre", "Description[de]": "Anzeigemodul für DjVu auf der Basis von DjVuLibre", diff --git a/generators/dvi/libokularGenerator_dvi.json b/generators/dvi/libokularGenerator_dvi.json index 027c1a278..54515321e 100644 --- a/generators/dvi/libokularGenerator_dvi.json +++ b/generators/dvi/libokularGenerator_dvi.json @@ -78,8 +78,8 @@ "Copyright[zh_CN]": "© 2006 Luigi Toscano", "Copyright[zh_TW]": "© 2006 Luigi Toscano", "Description": "A DVI file renderer", - "Description[ca@valencia]": "Un renderitzador de fitxers DVI", - "Description[ca]": "Un renderitzador de fitxers DVI", + "Description[ca@valencia]": "Un renderitzador per als fitxers DVI", + "Description[ca]": "Un renderitzador per als fitxers DVI", "Description[cs]": "Vykreslovač DVI souborů", "Description[da]": "En gengiver til DVI-filer", "Description[de]": "Ein Renderer für DVI-Dateien", @@ -119,8 +119,8 @@ "application/x-dvi" ], "Name": "DVI Backend", - "Name[ca@valencia]": "Dorsal de DVI", - "Name[ca]": "Dorsal de DVI", + "Name[ca@valencia]": "Dorsal DVI", + "Name[ca]": "Dorsal DVI", "Name[cs]": "Implementace DVI", "Name[da]": "DVI-backend", "Name[de]": "Anzeigemodul für DVI", diff --git a/generators/epub/libokularGenerator_epub.json b/generators/epub/libokularGenerator_epub.json index 062a7f51b..836d4eb1f 100644 --- a/generators/epub/libokularGenerator_epub.json +++ b/generators/epub/libokularGenerator_epub.json @@ -78,8 +78,8 @@ "Copyright[zh_CN]": "© 2008 Ely Levy", "Copyright[zh_TW]": "© 2008 Ely Levy", "Description": "An EPub backend", - "Description[ca@valencia]": "Un dorsal per l'EPub", - "Description[ca]": "Un dorsal per l'EPub", + "Description[ca@valencia]": "Un dorsal per a l'EPub", + "Description[ca]": "Un dorsal per a l'EPub", "Description[cs]": "Podpůrná vrstva EPub", "Description[da]": "En EPub-backend", "Description[de]": "Ein Anzeigemodul für EPUB", diff --git a/generators/fax/libokularGenerator_fax.json b/generators/fax/libokularGenerator_fax.json index 2c4903054..03161c765 100644 --- a/generators/fax/libokularGenerator_fax.json +++ b/generators/fax/libokularGenerator_fax.json @@ -78,8 +78,8 @@ "Copyright[zh_CN]": "© 2008 Tobias Koenig", "Copyright[zh_TW]": "© 2008 Tobias Koenig", "Description": "A G3/G4 fax document backend", - "Description[ca@valencia]": "Un dorsal per documents de fax G3/G4", - "Description[ca]": "Un dorsal per documents de fax G3/G4", + "Description[ca@valencia]": "Un dorsal per a documents de fax G3/G4", + "Description[ca]": "Un dorsal per a documents de fax G3/G4", "Description[cs]": "Implementace dokumentu faxu A G3/G4", "Description[da]": "En G3/G4 faxdokument-backend", "Description[de]": "Ein Anzeigemodul für G3/G4-Faxe", diff --git a/generators/fictionbook/libokularGenerator_fb.json b/generators/fictionbook/libokularGenerator_fb.json index f44ad1ce8..91a9c12bf 100644 --- a/generators/fictionbook/libokularGenerator_fb.json +++ b/generators/fictionbook/libokularGenerator_fb.json @@ -119,8 +119,8 @@ "application/x-fictionbook+xml" ], "Name": "Fiction Book Backend", - "Name[ca@valencia]": "Dorsal per al Fiction Book", - "Name[ca]": "Dorsal per al Fiction Book", + "Name[ca@valencia]": "Dorsal Fiction Book", + "Name[ca]": "Dorsal Fiction Book", "Name[cs]": "Podpůrná vrstva Fiction Book", "Name[da]": "Fiction Book-backend", "Name[de]": "Anzeigemodul für FictionBook", diff --git a/generators/markdown/libokularGenerator_md.json b/generators/markdown/libokularGenerator_md.json index 0def1c2de..cd38e7629 100644 --- a/generators/markdown/libokularGenerator_md.json +++ b/generators/markdown/libokularGenerator_md.json @@ -84,8 +84,8 @@ "text/x-markdown" ], "Name": "Markdown Backend", - "Name[ca@valencia]": "Dorsal de Markdown", - "Name[ca]": "Dorsal de Markdown", + "Name[ca@valencia]": "Dorsal Markdown", + "Name[ca]": "Dorsal Markdown", "Name[cs]": "Podpůrná vrstva Markdown", "Name[da]": "Markdown-backend", "Name[de]": "Anzeigemodul für Markdown", diff --git a/generators/mobipocket/libokularGenerator_mobi.json b/generators/mobipocket/libokularGenerator_mobi.json index c5a05adb1..033b4d055 100644 --- a/generators/mobipocket/libokularGenerator_mobi.json +++ b/generators/mobipocket/libokularGenerator_mobi.json @@ -78,8 +78,8 @@ "Copyright[zh_CN]": "© 2008-2009 Jakub Stachowski", "Copyright[zh_TW]": "© 2008-2009 Jakub Stachowski", "Description": "A mobipocket backend", - "Description[ca@valencia]": "Un dorsal pel Mobipocket", - "Description[ca]": "Un dorsal pel Mobipocket", + "Description[ca@valencia]": "Un dorsal per al Mobipocket", + "Description[ca]": "Un dorsal per al Mobipocket", "Description[cs]": " Implementace Mobipocket", "Description[da]": "En mobipocket-backend", "Description[de]": "Ein Anzeigemodul für Mobipocket-Dateien", @@ -119,8 +119,8 @@ "application/x-mobipocket-ebook" ], "Name": "Mobipocket Backend", - "Name[ca@valencia]": "Dorsal del Mobipocket", - "Name[ca]": "Dorsal del Mobipocket", + "Name[ca@valencia]": "Dorsal Mobipocket", + "Name[ca]": "Dorsal Mobipocket", "Name[cs]": " Implementace Mobipocket", "Name[da]": "Mobipocket-backend", "Name[de]": "Anzeigemodul für Mobipocket-Dateien", diff --git a/generators/ooo/libokularGenerator_ooo.json b/generators/ooo/libokularGenerator_ooo.json index 017876561..e64d592d7 100644 --- a/generators/ooo/libokularGenerator_ooo.json +++ b/generators/ooo/libokularGenerator_ooo.json @@ -78,8 +78,8 @@ "Copyright[zh_CN]": "© 2006-2008 Tobias Koenig", "Copyright[zh_TW]": "© 2006-2008 Tobias Koenig", "Description": "A renderer for OpenDocument Text documents", - "Description[ca@valencia]": "Un renderitzador per als documents de text OpenDocument", - "Description[ca]": "Un renderitzador per als documents de text OpenDocument", + "Description[ca@valencia]": "Un renderitzador per als documents de text en OpenDocument", + "Description[ca]": "Un renderitzador per als documents de text en OpenDocument", "Description[cs]": "Vykreslovač textových dokumentů OpenDocument", "Description[da]": "En gengiver til OpenDocument-tekstdokumenter", "Description[de]": "Ein Renderer für OpenDocument-Textdokumente", @@ -119,8 +119,8 @@ "application/vnd.oasis.opendocument.text" ], "Name": "OpenDocument Text Backend", - "Name[ca@valencia]": "Dorsal per a textos OpenDocument", - "Name[ca]": "Dorsal per a textos OpenDocument", + "Name[ca@valencia]": "Dorsal per a textos en OpenDocument", + "Name[ca]": "Dorsal per a textos en OpenDocument", "Name[cs]": "Podpůrná vrstva OpenDocument Text", "Name[da]": "OpenDocument-tekst-backend", "Name[de]": "Anzeigemodul für OpenDocument-Textformat", diff --git a/generators/poppler/libokularGenerator_poppler.json b/generators/poppler/libokularGenerator_poppler.json index 125ff46e3..67bfba129 100644 --- a/generators/poppler/libokularGenerator_poppler.json +++ b/generators/poppler/libokularGenerator_poppler.json @@ -78,8 +78,8 @@ "Copyright[zh_CN]": "© 2005-2008 Albert Astals Cid", "Copyright[zh_TW]": "© 2005-2008 Albert Astals Cid", "Description": "A PDF file renderer", - "Description[ca@valencia]": "Un renderitzador de fitxers PDF", - "Description[ca]": "Un renderitzador de fitxers PDF", + "Description[ca@valencia]": "Un renderitzador per als fitxers PDF", + "Description[ca]": "Un renderitzador per als fitxers PDF", "Description[cs]": "Vykreslovač PDF souborů", "Description[da]": "En gengiver til PDF-filer", "Description[de]": "Ein Renderer für PDF-Dateien", @@ -121,8 +121,8 @@ "application/x-wwf" ], "Name": "PDF Backend", - "Name[ca@valencia]": "Dorsal per a PDF", - "Name[ca]": "Dorsal per a PDF", + "Name[ca@valencia]": "Dorsal PDF", + "Name[ca]": "Dorsal PDF", "Name[cs]": "Podpůrná vrstva PDF", "Name[da]": "PDF-backend", "Name[de]": "PDF-Anzeigemodul", diff --git a/generators/spectre/libokularGenerator_ghostview.json b/generators/spectre/libokularGenerator_ghostview.json index 1f79430e4..e481a54fe 100644 --- a/generators/spectre/libokularGenerator_ghostview.json +++ b/generators/spectre/libokularGenerator_ghostview.json @@ -78,8 +78,8 @@ "Copyright[zh_CN]": "© 2007-2008 Albert Astals Cid", "Copyright[zh_TW]": "© 2007-2008 Albert Astals Cid", "Description": "A PostScript file renderer based on the Spectre library", - "Description[ca@valencia]": "Un renderitzador de fitxers PostScript basat en la biblioteca Spectre", - "Description[ca]": "Un renderitzador de fitxers PostScript basat en la biblioteca Spectre", + "Description[ca@valencia]": "Un renderitzador per a fitxers PostScript basat en la biblioteca Spectre", + "Description[ca]": "Un renderitzador per a fitxers PostScript basat en la biblioteca Spectre", "Description[cs]": "Vykreslovač souborů PostScript založený na knihovně Spectre.", "Description[da]": "En gengiver til PostScript-filer baseret på Spectre-biblioteket", "Description[de]": "Ein Renderer für PostScript-Dateien entwickelt aus der Spectre-Bibliothek", diff --git a/generators/tiff/libokularGenerator_tiff.json b/generators/tiff/libokularGenerator_tiff.json index f09f79323..20c3d07d9 100644 --- a/generators/tiff/libokularGenerator_tiff.json +++ b/generators/tiff/libokularGenerator_tiff.json @@ -78,8 +78,8 @@ "Copyright[zh_CN]": "© 2006-2008 Pino Toscano", "Copyright[zh_TW]": "© 2006-2008 Pino Toscano", "Description": "A TIFF backend", - "Description[ca@valencia]": "Un dorsal pel TIFF", - "Description[ca]": "Un dorsal pel TIFF", + "Description[ca@valencia]": "Un dorsal per al TIFF", + "Description[ca]": "Un dorsal per al TIFF", "Description[cs]": "Podpůrná vrstva pro TIFF", "Description[da]": "En TIFF-backend", "Description[de]": "Ein Anzeigemodul für TIFF", diff --git a/generators/txt/libokularGenerator_txt.json b/generators/txt/libokularGenerator_txt.json index b267a6366..8881c1fa0 100644 --- a/generators/txt/libokularGenerator_txt.json +++ b/generators/txt/libokularGenerator_txt.json @@ -78,8 +78,8 @@ "Copyright[zh_CN]": "© 2013 Azat Khuzhin", "Copyright[zh_TW]": "© 2013 Azat Khuzhin", "Description": "Txt backend", - "Description[ca@valencia]": "Dorsal Txt", - "Description[ca]": "Dorsal Txt", + "Description[ca@valencia]": "Dorsal txt", + "Description[ca]": "Dorsal txt", "Description[cs]": "Podpůrná vrstva txt", "Description[da]": "Txt-backend", "Description[de]": "Anzeigemodul für Textformat", @@ -119,8 +119,8 @@ "text/plain" ], "Name": "Txt Backend", - "Name[ca@valencia]": "Dorsal Txt", - "Name[ca]": "Dorsal Txt", + "Name[ca@valencia]": "Dorsal txt", + "Name[ca]": "Dorsal txt", "Name[cs]": "Podpůrná vrstva txt", "Name[da]": "Txt-backend", "Name[de]": "Anzeigemodul für Textformat",