From 7cd0d78b5cba601cc90e763241179b2f6f7ca545 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 14 Apr 2022 01:42:53 +0000 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 | 2 +- generators/comicbook/okularApplication_comicbook.desktop | 2 +- generators/djvu/okularApplication_djvu.desktop | 2 +- generators/dvi/okularApplication_dvi.desktop | 2 +- generators/epub/okularApplication_epub.desktop | 2 +- generators/fax/okularApplication_fax.desktop | 2 +- generators/fictionbook/okularApplication_fb.desktop | 2 +- generators/kimgio/okularApplication_kimgio.desktop | 2 +- generators/markdown/okularApplication_md.desktop | 2 +- generators/mobipocket/okularApplication_mobi.desktop | 2 +- generators/plucker/okularApplication_plucker.desktop | 2 +- generators/poppler/okularApplication_pdf.desktop | 2 +- generators/spectre/okularApplication_ghostview.desktop | 2 +- generators/tiff/okularApplication_tiff.desktop | 2 +- generators/txt/okularApplication_txt.desktop | 2 +- generators/xps/okularApplication_xps.desktop | 2 +- shell/org.kde.okular.desktop | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/generators/chm/okularApplication_chm.desktop b/generators/chm/okularApplication_chm.desktop index d6335e81c..976438dee 100755 --- 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 diff --git a/generators/comicbook/okularApplication_comicbook.desktop b/generators/comicbook/okularApplication_comicbook.desktop index 55eb223c3..e3d6783c6 100755 --- 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 diff --git a/generators/djvu/okularApplication_djvu.desktop b/generators/djvu/okularApplication_djvu.desktop index ca5eb8aa5..5e09f8eef 100755 --- 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 diff --git a/generators/dvi/okularApplication_dvi.desktop b/generators/dvi/okularApplication_dvi.desktop index 7bdb70a57..91e4acb3b 100755 --- 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 diff --git a/generators/epub/okularApplication_epub.desktop b/generators/epub/okularApplication_epub.desktop index 72490dbed..6339042cc 100755 --- 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 diff --git a/generators/fax/okularApplication_fax.desktop b/generators/fax/okularApplication_fax.desktop index 9b8d5f1cf..8ef74bd3a 100755 --- 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 diff --git a/generators/fictionbook/okularApplication_fb.desktop b/generators/fictionbook/okularApplication_fb.desktop index 844d9d6a7..74d430949 100755 --- 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 diff --git a/generators/kimgio/okularApplication_kimgio.desktop b/generators/kimgio/okularApplication_kimgio.desktop index f51ea17d0..dc6615c72 100755 --- 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 diff --git a/generators/markdown/okularApplication_md.desktop b/generators/markdown/okularApplication_md.desktop index b0578ba3b..09bc94017 100644 --- 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 diff --git a/generators/mobipocket/okularApplication_mobi.desktop b/generators/mobipocket/okularApplication_mobi.desktop index 5f6edd877..5818cceda 100755 --- 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 diff --git a/generators/plucker/okularApplication_plucker.desktop b/generators/plucker/okularApplication_plucker.desktop index 74aeb4650..5995785e6 100755 --- 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 diff --git a/generators/poppler/okularApplication_pdf.desktop b/generators/poppler/okularApplication_pdf.desktop index 07f59df95..f5919bf09 100755 --- 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 diff --git a/generators/spectre/okularApplication_ghostview.desktop b/generators/spectre/okularApplication_ghostview.desktop index b378f9820..bec10bc64 100755 --- 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 diff --git a/generators/tiff/okularApplication_tiff.desktop b/generators/tiff/okularApplication_tiff.desktop index 3f3dc79c2..be59926ba 100755 --- 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 diff --git a/generators/txt/okularApplication_txt.desktop b/generators/txt/okularApplication_txt.desktop index f5db36402..a39a5987d 100644 --- 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 diff --git a/generators/xps/okularApplication_xps.desktop b/generators/xps/okularApplication_xps.desktop index aa7e017ed..a363e39ef 100755 --- 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 diff --git a/shell/org.kde.okular.desktop b/shell/org.kde.okular.desktop index dd8f88d8e..515ab62e6 100755 --- 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