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/djvu/libokularGenerator_djvu.json

@@ -123,7 +123,7 @@
         "Description[et]": "DjVu taustaprogramm DjVuLibre alusel",
         "Description[eu]": "DjVu-ren bizkarraldekoa DjVuLibre-n oinarritua",
         "Description[fi]": "DjVuLibreen perustuva DjVu-taustaosa",
-        "Description[fr]": "Moteur DjVu utilisant DjVuLibre",
+        "Description[fr]": "Moteur pour DjVU utilisant DjVULibre",
         "Description[gl]": "Motor de DjVu baseado en DjVuLibre.",
         "Description[he]": "מעבד DjVu מבוסס DjVuLibre",
         "Description[hu]": "DjVuLibre-alapú DjVu modul",
@@ -175,7 +175,7 @@
         "Name[et]": "DjVu taustaprogramm",
         "Name[eu]": "DjVu-ren bizkarraldekoa",
         "Name[fi]": "DjVu-taustaosa",
-        "Name[fr]": "Moteur DjVu",
+        "Name[fr]": "Moteur pour DjVU",
         "Name[gl]": "Motor de DjVu",
         "Name[he]": "מנגנון DjVu",
         "Name[hu]": "DjVu modul",

generators/epub/libokularGenerator_epub.json

@@ -120,7 +120,7 @@
         "Description[et]": "EPubi taustaprogramm",
         "Description[eu]": "EPub-en bizkarraldeko bat",
         "Description[fi]": "EPub-taustaosa",
-        "Description[fr]": "Un moteur EPub",
+        "Description[fr]": "Un moteur pour ePub",
         "Description[gl]": "Motor de EPub.",
         "Description[he]": "מנגנון EPub",
         "Description[hu]": "EPub modul",
@@ -174,7 +174,7 @@
         "Name[et]": "EPubi taustaprogramm",
         "Name[eu]": "EPub-en bizkarraldekoa",
         "Name[fi]": "EPub-taustaosa",
-        "Name[fr]": "Moteur EPub",
+        "Name[fr]": "Moteur pour ePub",
         "Name[gl]": "Motor de EPub",
         "Name[he]": "מנגנון EPub",
         "Name[hu]": "EPub modul",