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

@@ -32,6 +32,7 @@
         "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[cs]": "Nástroj pro zobrazování nápovědy Microsoft Windows", 
         "Description[de]": "Darstellungsprogramm für Hilfedateien aus Microsoft Windows", 
         "Description[es]": "Un visor de archivos de ayuda de Microsoft Windows", 
         "Description[fi]": "Microsoft Windows -ohjetiedostohahmonnin", 
@@ -59,6 +60,7 @@
         "Name": "CHM Backend", 
         "Name[ca@valencia]": "Dorsal CHM", 
         "Name[ca]": "Dorsal CHM", 
+        "Name[cs]": "Podpora CHM", 
         "Name[de]": "Anzeigemodul für CHM", 
         "Name[es]": "Motor para CHM", 
         "Name[fi]": "CHM-taustaosa", 
@@ -85,4 +87,4 @@
     "X-KDE-Priority": 2, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": false
-}
+}

generators/comicbook/libokularGenerator_comicbook.json

@@ -24,6 +24,7 @@
         "Description": "A renderer for various comic book formats", 
         "Description[ca@valencia]": "Un renderitzador per a diversos formats de ComicBook", 
         "Description[ca]": "Un renderitzador per a diversos formats de ComicBook", 
+        "Description[cs]": "Vykreslovač různých formátů knih komiksů", 
         "Description[de]": "Ein Renderer für verschiedene Comic-Book-Formate", 
         "Description[es]": "Un visor para diversos formatos de libros de cómics", 
         "Description[fi]": "Eri sarjakuvakirjamuotojen hahmonnin", 
@@ -54,6 +55,7 @@
         "Name": "ComicBook Backend", 
         "Name[ca@valencia]": "Dorsal de ComicBook", 
         "Name[ca]": "Dorsal de ComicBook", 
+        "Name[cs]": "Podpůrná vrstva ComicBook", 
         "Name[de]": "Anzeigemodul für Comic-Book", 
         "Name[es]": "Motor para ComicBook", 
         "Name[fi]": "ComicBook-taustaosa", 
@@ -81,4 +83,4 @@
     "X-KDE-Priority": 1, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": false
-}
+}

generators/djvu/libokularGenerator_djvu.json

@@ -23,6 +23,7 @@
         "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[cs]": "Implementace DjVu založena na DjVuLibre", 
         "Description[de]": "Anzeigemodul für DjVu auf der Basis von DjVuLibre", 
         "Description[es]": "Motor DjVu basado en DjVuLibre", 
         "Description[fi]": "DjVuLibreen perustuva DjVu-taustaosa", 
@@ -50,6 +51,7 @@
         "Name": "DjVu Backend", 
         "Name[ca@valencia]": "Dorsal DjVu", 
         "Name[ca]": "Dorsal DjVu", 
+        "Name[cs]": "Podpůrná vrstva DjVu", 
         "Name[de]": "Anzeigemodul für DjVu", 
         "Name[es]": "Motor para DjVu", 
         "Name[fi]": "DjVu-taustaosa", 
@@ -76,4 +78,4 @@
     "X-KDE-Priority": 2, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": false
-}
+}

generators/dvi/libokularGenerator_dvi.json

@@ -21,6 +21,7 @@
         "Description": "A DVI file renderer", 
         "Description[ca@valencia]": "Un renderitzador de fitxers DVI", 
         "Description[ca]": "Un renderitzador de fitxers DVI", 
+        "Description[cs]": "Vykreslovač DVI souborů", 
         "Description[de]": "Ein Renderer für DVI-Dateien", 
         "Description[es]": "Un visor de archivos DVI", 
         "Description[fi]": "DVI-tiedostohahmonnin", 
@@ -48,6 +49,7 @@
         "Name": "DVI Backend", 
         "Name[ca@valencia]": "Dorsal de DVI", 
         "Name[ca]": "Dorsal de DVI", 
+        "Name[cs]": "Implementace DVI", 
         "Name[de]": "Anzeigemodul für DVI", 
         "Name[es]": "Motor para DVI", 
         "Name[fi]": "DVI-taustaosa", 
@@ -74,4 +76,4 @@
     "X-KDE-Priority": 2, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": false
-}
+}

generators/epub/libokularGenerator_epub.json

@@ -21,6 +21,7 @@
         "Description": "An EPub backend", 
         "Description[ca@valencia]": "Un dorsal per l'EPub", 
         "Description[ca]": "Un dorsal per l'EPub", 
+        "Description[cs]": "Podpůrná vrstva EPub", 
         "Description[de]": "Ein Anzeigemodul für EPUB", 
         "Description[es]": "Un motor para EPub", 
         "Description[fi]": "EPub-taustaosa", 
@@ -48,6 +49,7 @@
         "Name": "EPub Backend", 
         "Name[ca@valencia]": "Dorsal EPub", 
         "Name[ca]": "Dorsal EPub", 
+        "Name[cs]": "Podpůrná vrstva EPub", 
         "Name[de]": "Anzeigemodul für EPUB", 
         "Name[es]": "Motor para EPub", 
         "Name[fi]": "EPub-taustaosa", 
@@ -74,4 +76,4 @@
     "X-KDE-Priority": 1, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": true
-}
+}

generators/fax/libokularGenerator_fax.json

@@ -23,6 +23,7 @@
         "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[cs]": "Implementace dokumentu faxu A G3/G4", 
         "Description[de]": "Ein Anzeigemodul für G3/G4-Faxe", 
         "Description[es]": "Un motor para documentos de fax G3/G4", 
         "Description[fi]": "G3/G4-faksitiedostotaustaosa", 
@@ -51,6 +52,7 @@
         "Name": "Fax Backend", 
         "Name[ca@valencia]": "Dorsal de fax", 
         "Name[ca]": "Dorsal de fax", 
+        "Name[cs]": "Implementace faxu", 
         "Name[de]": "Anzeigemodul für Faxe", 
         "Name[es]": "Motor para fax", 
         "Name[fi]": "Faksitaustaosa", 
@@ -76,4 +78,4 @@
     "X-KDE-Priority": 1, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": false
-}
+}

generators/fictionbook/libokularGenerator_fb.json

@@ -24,6 +24,7 @@
         "Description": "A renderer for FictionBook eBooks", 
         "Description[ca@valencia]": "Un renderitzador per a llibres electrònics FictionBook", 
         "Description[ca]": "Un renderitzador per a llibres electrònics FictionBook", 
+        "Description[cs]": "Renderer elektronických knih Fiction Book", 
         "Description[de]": "Ein Renderer für FictionBook-eBooks", 
         "Description[es]": "Un visor para libros electrónicos FictionBook", 
         "Description[fi]": "FictionBook-e-kirjojen hahmonnin", 
@@ -51,6 +52,7 @@
         "Name": "Fiction Book Backend", 
         "Name[ca@valencia]": "Dorsal per al Fiction Book", 
         "Name[ca]": "Dorsal per al Fiction Book", 
+        "Name[cs]": "Podpůrná vrstva Fiction Book", 
         "Name[de]": "Anzeigemodul für FictionBook", 
         "Name[es]": "Motor para Fiction Book", 
         "Name[fi]": "FictionBook-taustaosa", 
@@ -77,4 +79,4 @@
     "X-KDE-Priority": 1, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": true
-}
+}

generators/kimgio/libokularGenerator_kimgio.json

@@ -43,6 +43,7 @@
         "Description": "A simple image backend", 
         "Description[ca@valencia]": "Un dorsal d'imatges senzill", 
         "Description[ca]": "Un dorsal d'imatges senzill", 
+        "Description[cs]": "Jednoduchá podpůrná vrstva obrázků", 
         "Description[de]": "Ein einfaches Anzeigemodul für Bilder", 
         "Description[es]": "Un sencillo motor para imágenes", 
         "Description[fi]": "Yksinkertainen kuvataustaosa", 
@@ -91,6 +92,7 @@
         "Name": "Image Backend", 
         "Name[ca@valencia]": "Dorsal d'imatges", 
         "Name[ca]": "Dorsal d'imatges", 
+        "Name[cs]": "Podpůrná vrstva obrázků", 
         "Name[de]": "Anzeigemodul für Bilder", 
         "Name[es]": "Motor para imágenes", 
         "Name[fi]": "Kuvataustaosa", 
@@ -118,4 +120,4 @@
     "X-KDE-Priority": 1, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": false
-}
+}

generators/mobipocket/libokularGenerator_mobi.json

@@ -23,6 +23,7 @@
         "Description": "A mobipocket backend", 
         "Description[ca@valencia]": "Un dorsal pel Mobipocket", 
         "Description[ca]": "Un dorsal pel Mobipocket", 
+        "Description[cs]": " Implementace Mobipocket", 
         "Description[de]": "Ein Anzeigemodul für Mobipocket-Dateien", 
         "Description[es]": "Un motor para mobipocket", 
         "Description[fi]": "MobiPocket-taustaosa", 
@@ -50,6 +51,7 @@
         "Name": "Mobipocket Backend", 
         "Name[ca@valencia]": "Dorsal del Mobipocket", 
         "Name[ca]": "Dorsal del Mobipocket", 
+        "Name[cs]": " Implementace Mobipocket", 
         "Name[de]": "Anzeigemodul für Mobipocket-Dateien", 
         "Name[es]": "Motor para Mobipocket", 
         "Name[fi]": "Mobipocket-taustaosa", 
@@ -76,4 +78,4 @@
     "X-KDE-Priority": 1, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": true
-}
+}

generators/ooo/libokularGenerator_ooo.json

@@ -24,6 +24,7 @@
         "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[cs]": "Vykreslovač textových dokumentů OpenDocument", 
         "Description[de]": "Ein Renderer für OpenDocument-Textdokumente", 
         "Description[es]": "Un visor para documentos de texto OpenDocument", 
         "Description[fi]": "OpenDocument-tekstitiedostojen hahmonnin", 
@@ -51,6 +52,7 @@
         "Name": "OpenDocument Text Backend", 
         "Name[ca@valencia]": "Dorsal per a textos OpenDocument", 
         "Name[ca]": "Dorsal per a textos OpenDocument", 
+        "Name[cs]": "Podpůrná vrstva OpenDocument Text", 
         "Name[de]": "Anzeigemodul für OpenDocument-Textformat", 
         "Name[es]": "Motor para texto de OpenDocument", 
         "Name[fi]": "OpenDocument-tekstitaustaosa", 
@@ -78,4 +80,4 @@
     "X-KDE-Priority": 1, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": true
-}
+}

generators/plucker/libokularGenerator_plucker.json

@@ -24,6 +24,7 @@
         "Description": "A renderer for Plucker eBooks", 
         "Description[ca@valencia]": "Un renderitzador per a llibres electrònics Plucker", 
         "Description[ca]": "Un renderitzador per a llibres electrònics Plucker", 
+        "Description[cs]": "Renderer elektronických knih Plucker", 
         "Description[de]": "Ein Renderer für Plucker eBooks", 
         "Description[es]": "Un visor de libros electrónicos Plucker", 
         "Description[fi]": "Plucker-e-kirjojen hahmonnin", 
@@ -51,6 +52,7 @@
         "Name": "Plucker Document Backend", 
         "Name[ca@valencia]": "Dorsal per a documents Plucker", 
         "Name[ca]": "Dorsal per a documents Plucker", 
+        "Name[cs]": "Podpůrná vrstva Plucker Dokumentu", 
         "Name[de]": "Anzeigemodul für Plucker-Dokumente", 
         "Name[es]": "Motor para documento de Plucker", 
         "Name[fi]": "Plucker-tiedostotaustaosa", 
@@ -78,4 +80,4 @@
     "X-KDE-Priority": 1, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": false
-}
+}

generators/poppler/libokularGenerator_poppler.json

@@ -23,6 +23,7 @@
         "Description": "A PDF file renderer", 
         "Description[ca@valencia]": "Un renderitzador de fitxers PDF", 
         "Description[ca]": "Un renderitzador de fitxers PDF", 
+        "Description[cs]": "Vykreslovač PDF souborů", 
         "Description[de]": "Ein Renderer für PDF-Dateien", 
         "Description[es]": "Un visor de archivos PDF", 
         "Description[fi]": "PDF-tiedostohahmonnin", 
@@ -52,6 +53,7 @@
         "Name": "PDF Backend", 
         "Name[ca@valencia]": "Dorsal per a PDF", 
         "Name[ca]": "Dorsal per a PDF", 
+        "Name[cs]": "Podpůrná vrstva PDF", 
         "Name[de]": "PDF-Anzeigemodul", 
         "Name[es]": "Motor para PDF", 
         "Name[fi]": "PDF-taustaosa", 
@@ -78,4 +80,4 @@
     "X-KDE-Priority": 1, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": true
-}
+}

generators/spectre/libokularGenerator_ghostview.json

@@ -51,6 +51,7 @@
         "Name": "PS Backend", 
         "Name[ca@valencia]": "Dorsal PS", 
         "Name[ca]": "Dorsal PS", 
+        "Name[cs]": "Podpůrná vrstva PS", 
         "Name[de]": "PS-Anzeigemodul", 
         "Name[es]": "Motor para PS", 
         "Name[fi]": "PS-taustaosa", 
@@ -77,4 +78,4 @@
     "X-KDE-Priority": 2, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": true
-}
+}

generators/tiff/libokularGenerator_tiff.json

@@ -23,6 +23,7 @@
         "Description": "A TIFF backend", 
         "Description[ca@valencia]": "Un dorsal pel TIFF", 
         "Description[ca]": "Un dorsal pel TIFF", 
+        "Description[cs]": "Podpůrná vrstva pro TIFF", 
         "Description[de]": "Ein Anzeigemodul für TIFF", 
         "Description[es]": "Un motor para TIFF", 
         "Description[fi]": "TIFF-taustaosa", 
@@ -50,6 +51,7 @@
         "Name": "TIFF Backend", 
         "Name[ca@valencia]": "Dorsal TIFF", 
         "Name[ca]": "Dorsal TIFF", 
+        "Name[cs]": "Podpůrná vrstva pro TIFF", 
         "Name[de]": "Anzeigemodul für TIFF", 
         "Name[es]": "Motor para TIFF", 
         "Name[fi]": "TIFF-taustaosa", 
@@ -76,4 +78,4 @@
     "X-KDE-Priority": 4, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": false
-}
+}

generators/txt/libokularGenerator_txt.json

@@ -21,6 +21,7 @@
         "Description": "Txt backend", 
         "Description[ca@valencia]": "Dorsal Txt", 
         "Description[ca]": "Dorsal Txt", 
+        "Description[cs]": "Podpůrná vrstva txt", 
         "Description[de]": "Anzeigemodul für Textformat", 
         "Description[es]": "Motor Txt", 
         "Description[fi]": "Txt-taustaosa", 
@@ -47,6 +48,7 @@
         "Name": "Txt Backend", 
         "Name[ca@valencia]": "Dorsal Txt", 
         "Name[ca]": "Dorsal Txt", 
+        "Name[cs]": "Podpůrná vrstva txt", 
         "Name[de]": "Anzeigemodul für Textformat", 
         "Name[es]": "Motor para Txt", 
         "Name[fi]": "Txt-taustaosa", 
@@ -74,4 +76,4 @@
     "X-KDE-Priority": 2, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": true
-}
+}

generators/xps/libokularGenerator_xps.json

@@ -13,6 +13,7 @@
             {
                 "Email": "jiri.klement@gmail.com", 
                 "Name": "Jiri Klement", 
+                "Name[cs]": "Jiří Klement", 
                 "Name[sr@ijekavian]": "Јиржи Клемент", 
                 "Name[sr@ijekavianlatin]": "Jirži Klement", 
                 "Name[sr@latin]": "Jirži Klement", 
@@ -41,6 +42,7 @@
         "Description": "An XPS backend", 
         "Description[ca@valencia]": "Un dorsal per a l'XPS", 
         "Description[ca]": "Un dorsal per a l'XPS", 
+        "Description[cs]": "Podpůrná vrstva XPS", 
         "Description[de]": "Ein Anzeigemodul für XPS", 
         "Description[es]": "Un motor para XPS", 
         "Description[fi]": "XPS-taustaosa", 
@@ -69,6 +71,7 @@
         "Name": "XPS Backend", 
         "Name[ca@valencia]": "Dorsal XPS", 
         "Name[ca]": "Dorsal XPS", 
+        "Name[cs]": "Podpůrná vrstva XPS", 
         "Name[de]": "Anzeigemodul für XPS", 
         "Name[es]": "Motor para XPS", 
         "Name[fi]": "XPS-taustaosa", 
@@ -95,4 +98,4 @@
     "X-KDE-Priority": 4, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": false
-}
+}