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"
4 years ago · 7cd0d78b5c
parent 715b8707b5
commit 7cd0d78b5c
17 changed files with 17 additions and 17 deletions
--- a/generators/chm/okularApplication_chm.desktop
+++ b/generators/chm/okularApplication_chm.desktop
@ -121,7 +121,7 @@ GenericName[sr@latin]=Prikazivač dokumenata
 GenericName[sv]=Dokumentvisare
 GenericName[ta]=ஆவணங் காட்டி
 GenericName[th]=เครื่องมือแสดงเอกสาร
-GenericName[tr]=Belge Gösterici
+GenericName[tr]=Belge Görüntüleyici
 GenericName[ug]=پۈتۈك كۆرگۈ
 GenericName[uk]=Переглядач документів
 GenericName[vi]=Trình xem tài liệu
--- a/generators/comicbook/okularApplication_comicbook.desktop
+++ b/generators/comicbook/okularApplication_comicbook.desktop
@ -121,7 +121,7 @@ GenericName[sr@latin]=Prikazivač dokumenata
 GenericName[sv]=Dokumentvisare
 GenericName[ta]=ஆவணங் காட்டி
 GenericName[th]=เครื่องมือแสดงเอกสาร
-GenericName[tr]=Belge Gösterici
+GenericName[tr]=Belge Görüntüleyici
 GenericName[ug]=پۈتۈك كۆرگۈ
 GenericName[uk]=Переглядач документів
 GenericName[vi]=Trình xem tài liệu
--- a/generators/djvu/okularApplication_djvu.desktop
+++ b/generators/djvu/okularApplication_djvu.desktop
@ -121,7 +121,7 @@ GenericName[sr@latin]=Prikazivač dokumenata
 GenericName[sv]=Dokumentvisare
 GenericName[ta]=ஆவணங் காட்டி
 GenericName[th]=เครื่องมือแสดงเอกสาร
-GenericName[tr]=Belge Gösterici
+GenericName[tr]=Belge Görüntüleyici
 GenericName[ug]=پۈتۈك كۆرگۈ
 GenericName[uk]=Переглядач документів
 GenericName[vi]=Trình xem tài liệu
--- a/generators/dvi/okularApplication_dvi.desktop
+++ b/generators/dvi/okularApplication_dvi.desktop
@ -121,7 +121,7 @@ GenericName[sr@latin]=Prikazivač dokumenata
 GenericName[sv]=Dokumentvisare
 GenericName[ta]=ஆவணங் காட்டி
 GenericName[th]=เครื่องมือแสดงเอกสาร
-GenericName[tr]=Belge Gösterici
+GenericName[tr]=Belge Görüntüleyici
 GenericName[ug]=پۈتۈك كۆرگۈ
 GenericName[uk]=Переглядач документів
 GenericName[vi]=Trình xem tài liệu
--- a/generators/epub/okularApplication_epub.desktop
+++ b/generators/epub/okularApplication_epub.desktop
@ -121,7 +121,7 @@ GenericName[sr@latin]=Prikazivač dokumenata
 GenericName[sv]=Dokumentvisare
 GenericName[ta]=ஆவணங் காட்டி
 GenericName[th]=เครื่องมือแสดงเอกสาร
-GenericName[tr]=Belge Gösterici
+GenericName[tr]=Belge Görüntüleyici
 GenericName[ug]=پۈتۈك كۆرگۈ
 GenericName[uk]=Переглядач документів
 GenericName[vi]=Trình xem tài liệu
--- a/generators/fax/okularApplication_fax.desktop
+++ b/generators/fax/okularApplication_fax.desktop
@ -121,7 +121,7 @@ GenericName[sr@latin]=Prikazivač dokumenata
 GenericName[sv]=Dokumentvisare
 GenericName[ta]=ஆவணங் காட்டி
 GenericName[th]=เครื่องมือแสดงเอกสาร
-GenericName[tr]=Belge Gösterici
+GenericName[tr]=Belge Görüntüleyici
 GenericName[ug]=پۈتۈك كۆرگۈ
 GenericName[uk]=Переглядач документів
 GenericName[vi]=Trình xem tài liệu
--- a/generators/fictionbook/okularApplication_fb.desktop
+++ b/generators/fictionbook/okularApplication_fb.desktop
@ -121,7 +121,7 @@ GenericName[sr@latin]=Prikazivač dokumenata
 GenericName[sv]=Dokumentvisare
 GenericName[ta]=ஆவணங் காட்டி
 GenericName[th]=เครื่องมือแสดงเอกสาร
-GenericName[tr]=Belge Gösterici
+GenericName[tr]=Belge Görüntüleyici
 GenericName[ug]=پۈتۈك كۆرگۈ
 GenericName[uk]=Переглядач документів
 GenericName[vi]=Trình xem tài liệu
--- a/generators/kimgio/okularApplication_kimgio.desktop
+++ b/generators/kimgio/okularApplication_kimgio.desktop
@ -121,7 +121,7 @@ GenericName[sr@latin]=Prikazivač dokumenata
 GenericName[sv]=Dokumentvisare
 GenericName[ta]=ஆவணங் காட்டி
 GenericName[th]=เครื่องมือแสดงเอกสาร
-GenericName[tr]=Belge Gösterici
+GenericName[tr]=Belge Görüntüleyici
 GenericName[ug]=پۈتۈك كۆرگۈ
 GenericName[uk]=Переглядач документів
 GenericName[vi]=Trình xem tài liệu
--- a/generators/markdown/okularApplication_md.desktop
+++ b/generators/markdown/okularApplication_md.desktop
@ -121,7 +121,7 @@ GenericName[sr@latin]=Prikazivač dokumenata
 GenericName[sv]=Dokumentvisare
 GenericName[ta]=ஆவணங் காட்டி
 GenericName[th]=เครื่องมือแสดงเอกสาร
-GenericName[tr]=Belge Gösterici
+GenericName[tr]=Belge Görüntüleyici
 GenericName[ug]=پۈتۈك كۆرگۈ
 GenericName[uk]=Переглядач документів
 GenericName[vi]=Trình xem tài liệu
--- a/generators/mobipocket/okularApplication_mobi.desktop
+++ b/generators/mobipocket/okularApplication_mobi.desktop
@ -121,7 +121,7 @@ GenericName[sr@latin]=Prikazivač dokumenata
 GenericName[sv]=Dokumentvisare
 GenericName[ta]=ஆவணங் காட்டி
 GenericName[th]=เครื่องมือแสดงเอกสาร
-GenericName[tr]=Belge Gösterici
+GenericName[tr]=Belge Görüntüleyici
 GenericName[ug]=پۈتۈك كۆرگۈ
 GenericName[uk]=Переглядач документів
 GenericName[vi]=Trình xem tài liệu
--- a/generators/plucker/okularApplication_plucker.desktop
+++ b/generators/plucker/okularApplication_plucker.desktop
@ -121,7 +121,7 @@ GenericName[sr@latin]=Prikazivač dokumenata
 GenericName[sv]=Dokumentvisare
 GenericName[ta]=ஆவணங் காட்டி
 GenericName[th]=เครื่องมือแสดงเอกสาร
-GenericName[tr]=Belge Gösterici
+GenericName[tr]=Belge Görüntüleyici
 GenericName[ug]=پۈتۈك كۆرگۈ
 GenericName[uk]=Переглядач документів
 GenericName[vi]=Trình xem tài liệu
--- a/generators/poppler/okularApplication_pdf.desktop
+++ b/generators/poppler/okularApplication_pdf.desktop
@ -121,7 +121,7 @@ GenericName[sr@latin]=Prikazivač dokumenata
 GenericName[sv]=Dokumentvisare
 GenericName[ta]=ஆவணங் காட்டி
 GenericName[th]=เครื่องมือแสดงเอกสาร
-GenericName[tr]=Belge Gösterici
+GenericName[tr]=Belge Görüntüleyici
 GenericName[ug]=پۈتۈك كۆرگۈ
 GenericName[uk]=Переглядач документів
 GenericName[vi]=Trình xem tài liệu
--- a/generators/spectre/okularApplication_ghostview.desktop
+++ b/generators/spectre/okularApplication_ghostview.desktop
@ -121,7 +121,7 @@ GenericName[sr@latin]=Prikazivač dokumenata
 GenericName[sv]=Dokumentvisare
 GenericName[ta]=ஆவணங் காட்டி
 GenericName[th]=เครื่องมือแสดงเอกสาร
-GenericName[tr]=Belge Gösterici
+GenericName[tr]=Belge Görüntüleyici
 GenericName[ug]=پۈتۈك كۆرگۈ
 GenericName[uk]=Переглядач документів
 GenericName[vi]=Trình xem tài liệu
--- a/generators/tiff/okularApplication_tiff.desktop
+++ b/generators/tiff/okularApplication_tiff.desktop
@ -121,7 +121,7 @@ GenericName[sr@latin]=Prikazivač dokumenata
 GenericName[sv]=Dokumentvisare
 GenericName[ta]=ஆவணங் காட்டி
 GenericName[th]=เครื่องมือแสดงเอกสาร
-GenericName[tr]=Belge Gösterici
+GenericName[tr]=Belge Görüntüleyici
 GenericName[ug]=پۈتۈك كۆرگۈ
 GenericName[uk]=Переглядач документів
 GenericName[vi]=Trình xem tài liệu
--- a/generators/txt/okularApplication_txt.desktop
+++ b/generators/txt/okularApplication_txt.desktop
@ -121,7 +121,7 @@ GenericName[sr@latin]=Prikazivač dokumenata
 GenericName[sv]=Dokumentvisare
 GenericName[ta]=ஆவணங் காட்டி
 GenericName[th]=เครื่องมือแสดงเอกสาร
-GenericName[tr]=Belge Gösterici
+GenericName[tr]=Belge Görüntüleyici
 GenericName[ug]=پۈتۈك كۆرگۈ
 GenericName[uk]=Переглядач документів
 GenericName[vi]=Trình xem tài liệu
--- a/generators/xps/okularApplication_xps.desktop
+++ b/generators/xps/okularApplication_xps.desktop
@ -121,7 +121,7 @@ GenericName[sr@latin]=Prikazivač dokumenata
 GenericName[sv]=Dokumentvisare
 GenericName[ta]=ஆவணங் காட்டி
 GenericName[th]=เครื่องมือแสดงเอกสาร
-GenericName[tr]=Belge Gösterici
+GenericName[tr]=Belge Görüntüleyici
 GenericName[ug]=پۈتۈك كۆرگۈ
 GenericName[uk]=Переглядач документів
 GenericName[vi]=Trình xem tài liệu
--- a/shell/org.kde.okular.desktop
+++ b/shell/org.kde.okular.desktop
@ -120,7 +120,7 @@ GenericName[sr@latin]=Prikazivač dokumenata
 GenericName[sv]=Dokumentvisare
 GenericName[ta]=ஆவணங் காட்டி
 GenericName[th]=เครื่องมือแสดงเอกสาร
-GenericName[tr]=Belge Gösterici
+GenericName[tr]=Belge Görüntüleyici
 GenericName[ug]=پۈتۈك كۆرگۈ
 GenericName[uk]=Переглядач документів
 GenericName[vi]=Trình xem tài liệu