From da42e4b166b622eacff0bbfc048d9faeebdbc9c3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 25 Nov 2016 05:01:26 +0100 Subject: [PATCH] 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 | 2 +- generators/comicbook/libokularGenerator_comicbook.json | 2 +- generators/djvu/libokularGenerator_djvu.json | 2 +- generators/dvi/libokularGenerator_dvi.json | 2 +- generators/epub/libokularGenerator_epub.json | 2 +- generators/fax/libokularGenerator_fax.json | 2 +- generators/fictionbook/libokularGenerator_fb.json | 2 +- generators/kimgio/libokularGenerator_kimgio.json | 2 +- generators/mobipocket/libokularGenerator_mobi.json | 2 +- generators/ooo/libokularGenerator_ooo.json | 2 +- generators/plucker/libokularGenerator_plucker.json | 2 +- generators/poppler/libokularGenerator_poppler.json | 2 +- generators/spectre/libokularGenerator_ghostview.json | 2 +- generators/tiff/libokularGenerator_tiff.json | 2 +- generators/txt/libokularGenerator_txt.json | 2 +- generators/xps/libokularGenerator_xps.json | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/generators/chm/libokularGenerator_chmlib.json b/generators/chm/libokularGenerator_chmlib.json index 55fa281af..807a3bdf2 100644 --- 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 -} \ No newline at end of file +} diff --git a/generators/comicbook/libokularGenerator_comicbook.json b/generators/comicbook/libokularGenerator_comicbook.json index 4caf22d9f..3b234fbe1 100644 --- 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 -} \ No newline at end of file +} diff --git a/generators/djvu/libokularGenerator_djvu.json b/generators/djvu/libokularGenerator_djvu.json index 1aeb21ac5..6e0ce5e97 100644 --- 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 -} \ No newline at end of file +} diff --git a/generators/dvi/libokularGenerator_dvi.json b/generators/dvi/libokularGenerator_dvi.json index c8016d4ff..019b99e2b 100644 --- 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 -} \ No newline at end of file +} diff --git a/generators/epub/libokularGenerator_epub.json b/generators/epub/libokularGenerator_epub.json index 5bc93ad73..42fdecddf 100644 --- 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 -} \ No newline at end of file +} diff --git a/generators/fax/libokularGenerator_fax.json b/generators/fax/libokularGenerator_fax.json index 2f98e3749..2a070fda8 100644 --- 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 -} \ No newline at end of file +} diff --git a/generators/fictionbook/libokularGenerator_fb.json b/generators/fictionbook/libokularGenerator_fb.json index a8b41dd41..8cc701995 100644 --- 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 -} \ No newline at end of file +} diff --git a/generators/kimgio/libokularGenerator_kimgio.json b/generators/kimgio/libokularGenerator_kimgio.json index 2f99a2d4c..4913ce9d2 100644 --- 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 -} \ No newline at end of file +} diff --git a/generators/mobipocket/libokularGenerator_mobi.json b/generators/mobipocket/libokularGenerator_mobi.json index 24a935776..f34b62936 100644 --- 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 -} \ No newline at end of file +} diff --git a/generators/ooo/libokularGenerator_ooo.json b/generators/ooo/libokularGenerator_ooo.json index 0b08dfa4f..b57ee2fdf 100644 --- 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 -} \ No newline at end of file +} diff --git a/generators/plucker/libokularGenerator_plucker.json b/generators/plucker/libokularGenerator_plucker.json index 0755a24d9..2ddf40538 100644 --- 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 -} \ No newline at end of file +} diff --git a/generators/poppler/libokularGenerator_poppler.json b/generators/poppler/libokularGenerator_poppler.json index 3fa17cad1..d8cd11f71 100644 --- 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 -} \ No newline at end of file +} diff --git a/generators/spectre/libokularGenerator_ghostview.json b/generators/spectre/libokularGenerator_ghostview.json index da186256a..8ca07a094 100644 --- 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 -} \ No newline at end of file +} diff --git a/generators/tiff/libokularGenerator_tiff.json b/generators/tiff/libokularGenerator_tiff.json index 330667019..076faf599 100644 --- 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 -} \ No newline at end of file +} diff --git a/generators/txt/libokularGenerator_txt.json b/generators/txt/libokularGenerator_txt.json index 2229a90d5..4c009cb59 100644 --- 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 -} \ No newline at end of file +} diff --git a/generators/xps/libokularGenerator_xps.json b/generators/xps/libokularGenerator_xps.json index ded1f9310..f9effac0d 100644 --- 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 -} \ No newline at end of file +}