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/epub/libokularGenerator_epub.json

@@ -84,7 +84,7 @@
         "Description": "An EPub backend",
         "Description[az]": "EPub modulu",
         "Description[ca@valencia]": "Un dorsal per a l'EPub",
-        "Description[ca]": "Un dorsal per a l'EPub",
+        "Description[ca]": "Un dorsal d'EPub",
         "Description[cs]": "Podpůrná vrstva EPub",
         "Description[da]": "En EPub-backend",
         "Description[de]": "Ein Anzeigemodul für EPUB",

generators/fax/libokularGenerator_fax.json

@@ -86,7 +86,7 @@
         "Description": "A G3/G4 fax document backend",
         "Description[az]": "A G3/G4 fax sənədi modulu",
         "Description[ca@valencia]": "Un dorsal per a documents de fax G3/G4",
-        "Description[ca]": "Un dorsal per a documents de fax G3/G4",
+        "Description[ca]": "Un dorsal de 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",

generators/mobipocket/libokularGenerator_mobi.json

@@ -86,7 +86,7 @@
         "Description": "A mobipocket backend",
         "Description[az]": "Mobipocket modulu",
         "Description[ca@valencia]": "Un dorsal per al Mobipocket",
-        "Description[ca]": "Un dorsal per al Mobipocket",
+        "Description[ca]": "Un dorsal de Mobipocket",
         "Description[cs]": " Implementace Mobipocket",
         "Description[da]": "En mobipocket-backend",
         "Description[de]": "Ein Anzeigemodul für Mobipocket-Dateien",

generators/plucker/libokularGenerator_plucker.json

@@ -128,7 +128,7 @@
         "Name": "Plucker Document Backend",
         "Name[az]": "Plucker sənədi modulu",
         "Name[ca@valencia]": "Dorsal per a documents Plucker",
-        "Name[ca]": "Dorsal per a documents Plucker",
+        "Name[ca]": "Dorsal de documents Plucker",
         "Name[cs]": "Podpůrná vrstva Plucker Dokumentu",
         "Name[da]": "Plucker-dokument-backend",
         "Name[de]": "Anzeigemodul für Plucker-Dokumente",

generators/spectre/libokularGenerator_ghostview.json

@@ -86,7 +86,7 @@
         "Description": "A PostScript file renderer based on the Spectre library",
         "Description[az]": "Spectre library'ə əsasında PostScript fayl tərtibatçısı",
         "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[ca]": "Un renderitzador de 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",

generators/xps/libokularGenerator_xps.json

@@ -169,7 +169,7 @@
         "Description": "An XPS backend",
         "Description[az]": "XPS modulu",
         "Description[ca@valencia]": "Un dorsal per a l'XPS",
-        "Description[ca]": "Un dorsal per a l'XPS",
+        "Description[ca]": "Un dorsal de XPS",
         "Description[cs]": "Podpůrná vrstva XPS",
         "Description[da]": "En XPS-backend",
         "Description[de]": "Ein Anzeigemodul für XPS",