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"
9 years ago · da42e4b166
parent 854d997fd5
commit da42e4b166
16 changed files with 16 additions and 16 deletions
--- a/generators/chm/libokularGenerator_chmlib.json
+++ b/generators/chm/libokularGenerator_chmlib.json
@ -62,4 +62,4 @@
    "X-KDE-Priority": 2, 
    "X-KDE-okularAPIVersion": 1, 
    "X-KDE-okularHasInternalSettings": false
-}
+}
--- a/generators/comicbook/libokularGenerator_comicbook.json
+++ b/generators/comicbook/libokularGenerator_comicbook.json
@ -62,4 +62,4 @@
    "X-KDE-Priority": 1, 
    "X-KDE-okularAPIVersion": 1, 
    "X-KDE-okularHasInternalSettings": false
-}
+}
--- a/generators/djvu/libokularGenerator_djvu.json
+++ b/generators/djvu/libokularGenerator_djvu.json
@ -57,4 +57,4 @@
    "X-KDE-Priority": 2, 
    "X-KDE-okularAPIVersion": 1, 
    "X-KDE-okularHasInternalSettings": false
-}
+}
--- a/generators/dvi/libokularGenerator_dvi.json
+++ b/generators/dvi/libokularGenerator_dvi.json
@ -56,4 +56,4 @@
    "X-KDE-Priority": 2, 
    "X-KDE-okularAPIVersion": 1, 
    "X-KDE-okularHasInternalSettings": false
-}
+}
--- a/generators/epub/libokularGenerator_epub.json
+++ b/generators/epub/libokularGenerator_epub.json
@ -56,4 +56,4 @@
    "X-KDE-Priority": 1, 
    "X-KDE-okularAPIVersion": 1, 
    "X-KDE-okularHasInternalSettings": true
-}
+}
--- a/generators/fax/libokularGenerator_fax.json
+++ b/generators/fax/libokularGenerator_fax.json
@ -58,4 +58,4 @@
    "X-KDE-Priority": 1, 
    "X-KDE-okularAPIVersion": 1, 
    "X-KDE-okularHasInternalSettings": false
-}
+}
--- a/generators/fictionbook/libokularGenerator_fb.json
+++ b/generators/fictionbook/libokularGenerator_fb.json
@ -58,4 +58,4 @@
    "X-KDE-Priority": 1, 
    "X-KDE-okularAPIVersion": 1, 
    "X-KDE-okularHasInternalSettings": true
-}
+}
--- a/generators/kimgio/libokularGenerator_kimgio.json
+++ b/generators/kimgio/libokularGenerator_kimgio.json
@ -91,4 +91,4 @@
    "X-KDE-Priority": 1, 
    "X-KDE-okularAPIVersion": 1, 
    "X-KDE-okularHasInternalSettings": false
-}
+}
--- a/generators/mobipocket/libokularGenerator_mobi.json
+++ b/generators/mobipocket/libokularGenerator_mobi.json
@ -57,4 +57,4 @@
    "X-KDE-Priority": 1, 
    "X-KDE-okularAPIVersion": 1, 
    "X-KDE-okularHasInternalSettings": true
-}
+}
--- a/generators/ooo/libokularGenerator_ooo.json
+++ b/generators/ooo/libokularGenerator_ooo.json
@ -59,4 +59,4 @@
    "X-KDE-Priority": 1, 
    "X-KDE-okularAPIVersion": 1, 
    "X-KDE-okularHasInternalSettings": true
-}
+}
--- a/generators/plucker/libokularGenerator_plucker.json
+++ b/generators/plucker/libokularGenerator_plucker.json
@ -59,4 +59,4 @@
    "X-KDE-Priority": 1, 
    "X-KDE-okularAPIVersion": 1, 
    "X-KDE-okularHasInternalSettings": false
-}
+}
--- a/generators/poppler/libokularGenerator_poppler.json
+++ b/generators/poppler/libokularGenerator_poppler.json
@ -59,4 +59,4 @@
    "X-KDE-Priority": 1, 
    "X-KDE-okularAPIVersion": 1, 
    "X-KDE-okularHasInternalSettings": true
-}
+}
--- a/generators/spectre/libokularGenerator_ghostview.json
+++ b/generators/spectre/libokularGenerator_ghostview.json
@ -58,4 +58,4 @@
    "X-KDE-Priority": 2, 
    "X-KDE-okularAPIVersion": 1, 
    "X-KDE-okularHasInternalSettings": true
-}
+}
--- a/generators/tiff/libokularGenerator_tiff.json
+++ b/generators/tiff/libokularGenerator_tiff.json
@ -57,4 +57,4 @@
    "X-KDE-Priority": 4, 
    "X-KDE-okularAPIVersion": 1, 
    "X-KDE-okularHasInternalSettings": false
-}
+}
--- a/generators/txt/libokularGenerator_txt.json
+++ b/generators/txt/libokularGenerator_txt.json
@ -56,4 +56,4 @@
    "X-KDE-Priority": 2, 
    "X-KDE-okularAPIVersion": 1, 
    "X-KDE-okularHasInternalSettings": true
-}
+}
--- a/generators/xps/libokularGenerator_xps.json
+++ b/generators/xps/libokularGenerator_xps.json
@ -68,4 +68,4 @@
    "X-KDE-Priority": 4, 
    "X-KDE-okularAPIVersion": 1, 
    "X-KDE-okularHasInternalSettings": false
-}
+}