wilderjds
/
okular
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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"
remotes/origin/work/numberformattest
l10n daemon script 4 years ago
parent 3001fcb88d
commit e8d5f24ad4
4 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      core/okularGenerator.desktop
  2. 2
      generators/comicbook/libokularGenerator_comicbook.json
  3. 2
      generators/poppler/okularApplication_pdf.desktop
  4. 2
      generators/poppler/org.kde.mobile.okular_pdf.desktop

2
core/okularGenerator.desktop
Unescape View File

@ -56,7 +56,7 @@ Comment[ta]=ஆக்குலருக்கான கோப்புப் ப
Comment[th]=แบ็กเอนด์รูปแบบแฟ้มสำหรับ Okular
Comment[tr]=Okular için dosya biçimi arka ucu
Comment[uk]=Модуль типів файлів для okular
Comment[vi]=Hậu phương dạng thức tệp cho Okular
Comment[vi]=Hậu phương định dạng tệp cho Okular
Comment[x-test]=xxFile format backend for Okularxx
Comment[zh_CN]=Okular 文件格式后端
Comment[zh_TW]=Okular 檔案格式後端

2
generators/comicbook/libokularGenerator_comicbook.json
Unescape View File

@ -125,7 +125,7 @@
"Description[sv]": "Ett återgivningsprogram för diverse format för serieböcker",
"Description[tr]": "Çeşitli çizgi roman biçimleri için bir oluşturucu",
"Description[uk]": "Програма для відображення коміксів у різних форматах",
"Description[vi]": "Một trình kết xuất cho nhiều dạng thức truyện tranh khác nhau",
"Description[vi]": "Một trình kết xuất cho nhiều định dạng truyện tranh khác nhau",
"Description[x-test]": "xxA renderer for various comic book formatsxx",
"Description[zh_CN]": "多种漫画书格式的渲染器",
"Description[zh_TW]": "多種漫畫書的成像器",

2
generators/poppler/okularApplication_pdf.desktop
Unescape View File

@ -227,7 +227,7 @@ X-KDE-Keywords[sv]=PDF, Portabelt dokumentformat
X-KDE-Keywords[ta]=PDF, Portable Document Format, பிடிஎஃப், பீடீஎஃப்
X-KDE-Keywords[tr]=PDF, Taşınabilir Belge Biçimi
X-KDE-Keywords[uk]=PDF,Portable Document Format,пдф
X-KDE-Keywords[vi]=PDF, Dạng thức tài liệu linh động
X-KDE-Keywords[vi]=PDF, Định dạng tài liệu linh động
X-KDE-Keywords[x-test]=xxPDFxx,xx Portable Document Formatxx
X-KDE-Keywords[zh_CN]=PDF, Portable Document Format,开放文档格式
X-KDE-Keywords[zh_TW]=PDF, Portable Document Format

2
generators/poppler/org.kde.mobile.okular_pdf.desktop
Unescape View File

@ -218,7 +218,7 @@ X-KDE-Keywords[sv]=PDF, Portabelt dokumentformat
X-KDE-Keywords[ta]=PDF, Portable Document Format, பிடிஎஃப், பீடீஎஃப்
X-KDE-Keywords[tr]=PDF, Taşınabilir Belge Biçimi
X-KDE-Keywords[uk]=PDF,Portable Document Format,пдф
X-KDE-Keywords[vi]=PDF, Dạng thức tài liệu linh động
X-KDE-Keywords[vi]=PDF, Định dạng tài liệu linh động
X-KDE-Keywords[x-test]=xxPDFxx,xx Portable Document Formatxx
X-KDE-Keywords[zh_CN]=PDF, Portable Document Format,开放文档格式
X-KDE-Keywords[zh_TW]=PDF, Portable Document Format

Write Preview
Loading…
Cancel
Save