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

@@ -62,4 +62,4 @@
     "X-KDE-Priority": 2, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": false
-}
+}

generators/comicbook/libokularGenerator_comicbook.json

@@ -62,4 +62,4 @@
     "X-KDE-Priority": 1, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": false
-}
+}

generators/djvu/libokularGenerator_djvu.json

@@ -57,4 +57,4 @@
     "X-KDE-Priority": 2, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": false
-}
+}

generators/dvi/libokularGenerator_dvi.json

@@ -56,4 +56,4 @@
     "X-KDE-Priority": 2, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": false
-}
+}

generators/epub/libokularGenerator_epub.json

@@ -56,4 +56,4 @@
     "X-KDE-Priority": 1, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": true
-}
+}

generators/fax/libokularGenerator_fax.json

@@ -58,4 +58,4 @@
     "X-KDE-Priority": 1, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": false
-}
+}

generators/fictionbook/libokularGenerator_fb.json

@@ -58,4 +58,4 @@
     "X-KDE-Priority": 1, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": true
-}
+}

generators/kimgio/libokularGenerator_kimgio.json

@@ -91,4 +91,4 @@
     "X-KDE-Priority": 1, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": false
-}
+}

generators/mobipocket/libokularGenerator_mobi.json

@@ -57,4 +57,4 @@
     "X-KDE-Priority": 1, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": true
-}
+}

generators/ooo/libokularGenerator_ooo.json

@@ -59,4 +59,4 @@
     "X-KDE-Priority": 1, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": true
-}
+}

generators/plucker/libokularGenerator_plucker.json

@@ -59,4 +59,4 @@
     "X-KDE-Priority": 1, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": false
-}
+}

generators/poppler/libokularGenerator_poppler.json

@@ -59,4 +59,4 @@
     "X-KDE-Priority": 1, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": true
-}
+}

generators/spectre/libokularGenerator_ghostview.json

@@ -58,4 +58,4 @@
     "X-KDE-Priority": 2, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": true
-}
+}

generators/tiff/libokularGenerator_tiff.json

@@ -57,4 +57,4 @@
     "X-KDE-Priority": 4, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": false
-}
+}

generators/txt/libokularGenerator_txt.json

@@ -56,4 +56,4 @@
     "X-KDE-Priority": 2, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": true
-}
+}

generators/xps/libokularGenerator_xps.json

@@ -68,4 +68,4 @@
     "X-KDE-Priority": 4, 
     "X-KDE-okularAPIVersion": 1, 
     "X-KDE-okularHasInternalSettings": false
-}
+}