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

@@ -126,7 +126,7 @@
         "Copyright[zh_TW]": "© 2005-2007 Piotr Szymański\n© 2008 Albert Astals Cid",
         "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@valencia]": "Un renderitzador de 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",

generators/dvi/libokularGenerator_dvi.json

@@ -84,7 +84,7 @@
         "Copyright[zh_TW]": "© 2006 Luigi Toscano",
         "Description": "A DVI file renderer",
         "Description[az]": "DVİ faylı tərtibatçısı",
-        "Description[ca@valencia]": "Un renderitzador per als fitxers DVI",
+        "Description[ca@valencia]": "Un renderitzador de fitxers DVI",
         "Description[ca]": "Un renderitzador de fitxers DVI",
         "Description[cs]": "Vykreslovač DVI souborů",
         "Description[da]": "En gengiver til DVI-filer",

generators/poppler/libokularGenerator_poppler.json

@@ -85,7 +85,7 @@
         "Copyright[zh_TW]": "© 2005-2008 Albert Astals Cid",
         "Description": "A PDF file renderer",
         "Description[az]": "PDF faylı tərtibatçısı",
-        "Description[ca@valencia]": "Un renderitzador per als fitxers PDF",
+        "Description[ca@valencia]": "Un renderitzador de fitxers PDF",
         "Description[ca]": "Un renderitzador de fitxers PDF",
         "Description[cs]": "Vykreslovač PDF souborů",
         "Description[da]": "En gengiver til PDF-filer",

generators/tiff/libokularGenerator_tiff.json

@@ -85,7 +85,7 @@
         "Copyright[zh_TW]": "© 2006-2008 Pino Toscano",
         "Description": "A TIFF backend",
         "Description[az]": "TİFF modulu",
-        "Description[ca@valencia]": "Un dorsal per al TIFF",
+        "Description[ca@valencia]": "Un dorsal de TIFF",
         "Description[ca]": "Un dorsal de TIFF",
         "Description[cs]": "Podpůrná vrstva pro TIFF",
         "Description[da]": "En TIFF-backend",

generators/txt/libokularGenerator_txt.json

@@ -84,7 +84,7 @@
         "Copyright[zh_TW]": "© 2013 Azat Khuzhin",
         "Description": "Txt backend",
         "Description[az]": "Txt modulu",
-        "Description[ca@valencia]": "Dorsal txt",
+        "Description[ca@valencia]": "Dorsal de txt",
         "Description[ca]": "Dorsal de txt",
         "Description[cs]": "Podpůrná vrstva txt",
         "Description[da]": "Txt-backend",