From cd1d36df291633397caa4e9acee1bb7c61f45708 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 22 Apr 2017 05:08:45 +0200
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/okularApplication_chm.desktop             | 1 +
 generators/comicbook/okularApplication_comicbook.desktop | 1 +
 generators/djvu/okularApplication_djvu.desktop           | 1 +
 generators/dvi/okularApplication_dvi.desktop             | 1 +
 generators/epub/okularApplication_epub.desktop           | 1 +
 generators/fax/okularApplication_fax.desktop             | 1 +
 generators/fictionbook/okularApplication_fb.desktop      | 1 +
 generators/kimgio/okularApplication_kimgio.desktop       | 1 +
 generators/mobipocket/okularApplication_mobi.desktop     | 1 +
 generators/ooo/okularApplication_ooo.desktop             | 1 +
 generators/plucker/okularApplication_plucker.desktop     | 1 +
 generators/poppler/okularApplication_pdf.desktop         | 1 +
 generators/spectre/okularApplication_ghostview.desktop   | 1 +
 generators/tiff/okularApplication_tiff.desktop           | 1 +
 generators/txt/okularApplication_txt.desktop             | 1 +
 generators/xps/okularApplication_xps.desktop             | 1 +
 shell/org.kde.okular.desktop                             | 1 +
 17 files changed, 17 insertions(+)

diff --git a/generators/chm/okularApplication_chm.desktop b/generators/chm/okularApplication_chm.desktop
index e46af68c5..03fb721db 100755
--- a/generators/chm/okularApplication_chm.desktop
+++ b/generators/chm/okularApplication_chm.desktop
@@ -155,6 +155,7 @@ Comment[sr@ijekavian]=Универзални приказивач докумен
 Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata
 Comment[sr@latin]=Univerzalni prikazivač dokumenata
 Comment[sv]=Generell dokumentvisare
+Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
 Comment[zh_TW]=通用文件檢視器
diff --git a/generators/comicbook/okularApplication_comicbook.desktop b/generators/comicbook/okularApplication_comicbook.desktop
index d57fe9a15..326c500a9 100755
--- a/generators/comicbook/okularApplication_comicbook.desktop
+++ b/generators/comicbook/okularApplication_comicbook.desktop
@@ -155,6 +155,7 @@ Comment[sr@ijekavian]=Универзални приказивач докумен
 Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata
 Comment[sr@latin]=Univerzalni prikazivač dokumenata
 Comment[sv]=Generell dokumentvisare
+Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
 Comment[zh_TW]=通用文件檢視器
diff --git a/generators/djvu/okularApplication_djvu.desktop b/generators/djvu/okularApplication_djvu.desktop
index 06e049b77..cfc1efc5a 100755
--- a/generators/djvu/okularApplication_djvu.desktop
+++ b/generators/djvu/okularApplication_djvu.desktop
@@ -155,6 +155,7 @@ Comment[sr@ijekavian]=Универзални приказивач докумен
 Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata
 Comment[sr@latin]=Univerzalni prikazivač dokumenata
 Comment[sv]=Generell dokumentvisare
+Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
 Comment[zh_TW]=通用文件檢視器
diff --git a/generators/dvi/okularApplication_dvi.desktop b/generators/dvi/okularApplication_dvi.desktop
index 5f4f795c5..5ea1b7b5e 100755
--- a/generators/dvi/okularApplication_dvi.desktop
+++ b/generators/dvi/okularApplication_dvi.desktop
@@ -155,6 +155,7 @@ Comment[sr@ijekavian]=Универзални приказивач докумен
 Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata
 Comment[sr@latin]=Univerzalni prikazivač dokumenata
 Comment[sv]=Generell dokumentvisare
+Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
 Comment[zh_TW]=通用文件檢視器
diff --git a/generators/epub/okularApplication_epub.desktop b/generators/epub/okularApplication_epub.desktop
index c3bf84222..939342387 100755
--- a/generators/epub/okularApplication_epub.desktop
+++ b/generators/epub/okularApplication_epub.desktop
@@ -155,6 +155,7 @@ Comment[sr@ijekavian]=Универзални приказивач докумен
 Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata
 Comment[sr@latin]=Univerzalni prikazivač dokumenata
 Comment[sv]=Generell dokumentvisare
+Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
 Comment[zh_TW]=通用文件檢視器
diff --git a/generators/fax/okularApplication_fax.desktop b/generators/fax/okularApplication_fax.desktop
index d084e72e5..7f121dcf0 100755
--- a/generators/fax/okularApplication_fax.desktop
+++ b/generators/fax/okularApplication_fax.desktop
@@ -155,6 +155,7 @@ Comment[sr@ijekavian]=Универзални приказивач докумен
 Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata
 Comment[sr@latin]=Univerzalni prikazivač dokumenata
 Comment[sv]=Generell dokumentvisare
+Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
 Comment[zh_TW]=通用文件檢視器
diff --git a/generators/fictionbook/okularApplication_fb.desktop b/generators/fictionbook/okularApplication_fb.desktop
index ae807192b..3b9dfcf9a 100755
--- a/generators/fictionbook/okularApplication_fb.desktop
+++ b/generators/fictionbook/okularApplication_fb.desktop
@@ -155,6 +155,7 @@ Comment[sr@ijekavian]=Универзални приказивач докумен
 Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata
 Comment[sr@latin]=Univerzalni prikazivač dokumenata
 Comment[sv]=Generell dokumentvisare
+Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
 Comment[zh_TW]=通用文件檢視器
diff --git a/generators/kimgio/okularApplication_kimgio.desktop b/generators/kimgio/okularApplication_kimgio.desktop
index 6708dd560..1bf4a2932 100755
--- a/generators/kimgio/okularApplication_kimgio.desktop
+++ b/generators/kimgio/okularApplication_kimgio.desktop
@@ -155,6 +155,7 @@ Comment[sr@ijekavian]=Универзални приказивач докумен
 Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata
 Comment[sr@latin]=Univerzalni prikazivač dokumenata
 Comment[sv]=Generell dokumentvisare
+Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
 Comment[zh_TW]=通用文件檢視器
diff --git a/generators/mobipocket/okularApplication_mobi.desktop b/generators/mobipocket/okularApplication_mobi.desktop
index 2b7370cf3..ec80eca79 100755
--- a/generators/mobipocket/okularApplication_mobi.desktop
+++ b/generators/mobipocket/okularApplication_mobi.desktop
@@ -155,6 +155,7 @@ Comment[sr@ijekavian]=Универзални приказивач докумен
 Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata
 Comment[sr@latin]=Univerzalni prikazivač dokumenata
 Comment[sv]=Generell dokumentvisare
+Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
 Comment[zh_TW]=通用文件檢視器
diff --git a/generators/ooo/okularApplication_ooo.desktop b/generators/ooo/okularApplication_ooo.desktop
index d2f9638c1..86102265c 100755
--- a/generators/ooo/okularApplication_ooo.desktop
+++ b/generators/ooo/okularApplication_ooo.desktop
@@ -155,6 +155,7 @@ Comment[sr@ijekavian]=Универзални приказивач докумен
 Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata
 Comment[sr@latin]=Univerzalni prikazivač dokumenata
 Comment[sv]=Generell dokumentvisare
+Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
 Comment[zh_TW]=通用文件檢視器
diff --git a/generators/plucker/okularApplication_plucker.desktop b/generators/plucker/okularApplication_plucker.desktop
index a16c7f5af..f3497a4fb 100755
--- a/generators/plucker/okularApplication_plucker.desktop
+++ b/generators/plucker/okularApplication_plucker.desktop
@@ -155,6 +155,7 @@ Comment[sr@ijekavian]=Универзални приказивач докумен
 Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata
 Comment[sr@latin]=Univerzalni prikazivač dokumenata
 Comment[sv]=Generell dokumentvisare
+Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
 Comment[zh_TW]=通用文件檢視器
diff --git a/generators/poppler/okularApplication_pdf.desktop b/generators/poppler/okularApplication_pdf.desktop
index da9528b7b..d8c4496f4 100755
--- a/generators/poppler/okularApplication_pdf.desktop
+++ b/generators/poppler/okularApplication_pdf.desktop
@@ -155,6 +155,7 @@ Comment[sr@ijekavian]=Универзални приказивач докумен
 Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata
 Comment[sr@latin]=Univerzalni prikazivač dokumenata
 Comment[sv]=Generell dokumentvisare
+Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
 Comment[zh_TW]=通用文件檢視器
diff --git a/generators/spectre/okularApplication_ghostview.desktop b/generators/spectre/okularApplication_ghostview.desktop
index 20fa1895b..0557aef3a 100755
--- a/generators/spectre/okularApplication_ghostview.desktop
+++ b/generators/spectre/okularApplication_ghostview.desktop
@@ -155,6 +155,7 @@ Comment[sr@ijekavian]=Универзални приказивач докумен
 Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata
 Comment[sr@latin]=Univerzalni prikazivač dokumenata
 Comment[sv]=Generell dokumentvisare
+Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
 Comment[zh_TW]=通用文件檢視器
diff --git a/generators/tiff/okularApplication_tiff.desktop b/generators/tiff/okularApplication_tiff.desktop
index b47b660ec..1ccbfb7d3 100755
--- a/generators/tiff/okularApplication_tiff.desktop
+++ b/generators/tiff/okularApplication_tiff.desktop
@@ -155,6 +155,7 @@ Comment[sr@ijekavian]=Универзални приказивач докумен
 Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata
 Comment[sr@latin]=Univerzalni prikazivač dokumenata
 Comment[sv]=Generell dokumentvisare
+Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
 Comment[zh_TW]=通用文件檢視器
diff --git a/generators/txt/okularApplication_txt.desktop b/generators/txt/okularApplication_txt.desktop
index e0e9c54f3..a944c8d98 100644
--- a/generators/txt/okularApplication_txt.desktop
+++ b/generators/txt/okularApplication_txt.desktop
@@ -155,6 +155,7 @@ Comment[sr@ijekavian]=Универзални приказивач докумен
 Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata
 Comment[sr@latin]=Univerzalni prikazivač dokumenata
 Comment[sv]=Generell dokumentvisare
+Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
 Comment[zh_TW]=通用文件檢視器
diff --git a/generators/xps/okularApplication_xps.desktop b/generators/xps/okularApplication_xps.desktop
index 5011c608c..5c4427b3d 100755
--- a/generators/xps/okularApplication_xps.desktop
+++ b/generators/xps/okularApplication_xps.desktop
@@ -155,6 +155,7 @@ Comment[sr@ijekavian]=Универзални приказивач докумен
 Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata
 Comment[sr@latin]=Univerzalni prikazivač dokumenata
 Comment[sv]=Generell dokumentvisare
+Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
 Comment[zh_TW]=通用文件檢視器
diff --git a/shell/org.kde.okular.desktop b/shell/org.kde.okular.desktop
index 0c8e935ba..7cf3033d0 100755
--- a/shell/org.kde.okular.desktop
+++ b/shell/org.kde.okular.desktop
@@ -154,6 +154,7 @@ Comment[sr@ijekavian]=Универзални приказивач докумен
 Comment[sr@ijekavianlatin]=Univerzalni prikazivač dokumenata
 Comment[sr@latin]=Univerzalni prikazivač dokumenata
 Comment[sv]=Generell dokumentvisare
+Comment[tr]=Evrensel belge görüntüleyici
 Comment[uk]=Універсальний переглядач документів
 Comment[x-test]=xxUniversal document viewerxx
 Comment[zh_TW]=通用文件檢視器