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

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

generators/comicbook/libokularGenerator_comicbook.json

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

generators/djvu/libokularGenerator_djvu.json

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

generators/dvi/libokularGenerator_dvi.json

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

generators/epub/libokularGenerator_epub.json

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

generators/fax/libokularGenerator_fax.json

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

generators/fictionbook/libokularGenerator_fb.json

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

generators/kimgio/libokularGenerator_kimgio.json

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

generators/mobipocket/libokularGenerator_mobi.json

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

generators/ooo/libokularGenerator_ooo.json

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

generators/plucker/libokularGenerator_plucker.json

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

generators/poppler/libokularGenerator_poppler.json

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

generators/spectre/libokularGenerator_ghostview.json

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

generators/tiff/libokularGenerator_tiff.json

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

generators/txt/libokularGenerator_txt.json

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

generators/xps/libokularGenerator_xps.json

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