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

@@ -127,7 +127,7 @@
         "Description": "A Microsoft Windows help file renderer",
         "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]": "Un renderitzador per als 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",
         "Description[de]": "Darstellungsprogramm für Hilfedateien aus Microsoft Windows",

generators/dvi/libokularGenerator_dvi.json

@@ -85,7 +85,7 @@
         "Description": "A DVI file renderer",
         "Description[az]": "DVİ faylı tərtibatçısı",
         "Description[ca@valencia]": "Un renderitzador per als fitxers DVI",
-        "Description[ca]": "Un renderitzador per als fitxers DVI",
+        "Description[ca]": "Un renderitzador de fitxers DVI",
         "Description[cs]": "Vykreslovač DVI souborů",
         "Description[da]": "En gengiver til DVI-filer",
         "Description[de]": "Ein Renderer für DVI-Dateien",

generators/epub/libokularGenerator_epub.json

@@ -83,7 +83,7 @@
         "Copyright[zh_TW]": "© 2008 Ely Levy",
         "Description": "An EPub backend",
         "Description[az]": "EPub modulu",
-        "Description[ca@valencia]": "Un dorsal per a l'EPub",
+        "Description[ca@valencia]": "Un dorsal d'EPub",
         "Description[ca]": "Un dorsal d'EPub",
         "Description[cs]": "Podpůrná vrstva EPub",
         "Description[da]": "En EPub-backend",

generators/fax/libokularGenerator_fax.json

@@ -85,7 +85,7 @@
         "Copyright[zh_TW]": "© 2008 Tobias Koenig",
         "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@valencia]": "Un dorsal de 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",

generators/mobipocket/libokularGenerator_mobi.json

@@ -85,7 +85,7 @@
         "Copyright[zh_TW]": "© 2008-2009 Jakub Stachowski",
         "Description": "A mobipocket backend",
         "Description[az]": "Mobipocket modulu",
-        "Description[ca@valencia]": "Un dorsal per al Mobipocket",
+        "Description[ca@valencia]": "Un dorsal de Mobipocket",
         "Description[ca]": "Un dorsal de Mobipocket",
         "Description[cs]": " Implementace Mobipocket",
         "Description[da]": "En mobipocket-backend",

generators/plucker/libokularGenerator_plucker.json

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

generators/poppler/libokularGenerator_poppler.json

@@ -86,7 +86,7 @@
         "Description": "A PDF file renderer",
         "Description[az]": "PDF faylı tərtibatçısı",
         "Description[ca@valencia]": "Un renderitzador per als fitxers PDF",
-        "Description[ca]": "Un renderitzador per als fitxers PDF",
+        "Description[ca]": "Un renderitzador de fitxers PDF",
         "Description[cs]": "Vykreslovač PDF souborů",
         "Description[da]": "En gengiver til PDF-filer",
         "Description[de]": "Ein Renderer für PDF-Dateien",

generators/spectre/libokularGenerator_ghostview.json

@@ -85,7 +85,7 @@
         "Copyright[zh_TW]": "© 2007-2008 Albert Astals Cid",
         "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@valencia]": "Un renderitzador de 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",

generators/tiff/libokularGenerator_tiff.json

@@ -86,7 +86,7 @@
         "Description": "A TIFF backend",
         "Description[az]": "TİFF modulu",
         "Description[ca@valencia]": "Un dorsal per al TIFF",
-        "Description[ca]": "Un dorsal per al TIFF",
+        "Description[ca]": "Un dorsal de TIFF",
         "Description[cs]": "Podpůrná vrstva pro TIFF",
         "Description[da]": "En TIFF-backend",
         "Description[de]": "Ein Anzeigemodul für TIFF",

generators/txt/libokularGenerator_txt.json

@@ -85,7 +85,7 @@
         "Description": "Txt backend",
         "Description[az]": "Txt modulu",
         "Description[ca@valencia]": "Dorsal txt",
-        "Description[ca]": "Dorsal txt",
+        "Description[ca]": "Dorsal de txt",
         "Description[cs]": "Podpůrná vrstva txt",
         "Description[da]": "Txt-backend",
         "Description[de]": "Anzeigemodul für Textformat",

generators/xps/libokularGenerator_xps.json

@@ -168,7 +168,7 @@
         "Copyright[zh_TW]": "© 2006-2007 Brad Hards\n© 2007 Jiri Klement\n© 2008 Pino Toscano",
         "Description": "An XPS backend",
         "Description[az]": "XPS modulu",
-        "Description[ca@valencia]": "Un dorsal per a l'XPS",
+        "Description[ca@valencia]": "Un dorsal de XPS",
         "Description[ca]": "Un dorsal de XPS",
         "Description[cs]": "Podpůrná vrstva XPS",
         "Description[da]": "En XPS-backend",