mirror of
https://invent.kde.org/graphics/okular
synced 2024-09-12 20:51:17 +00:00
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"
This commit is contained in:
parent
685ae66b45
commit
8563aa45cb
|
@ -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
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
Loading…
Reference in a new issue