office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-10-02 14:14:10 +00:00
Code Issues 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"
This commit is contained in:
l10n daemon script 2023-11-26 01:16:10 +00:00
parent 41e0a669ee
commit a9a77cd214
8 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generators/comicbook/okularApplication_comicbook.desktop
View file

@ -234,6 +234,6 @@ X-KDE-Keywords[tr]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[uk]=cbr,cbz,cbt,cb7,комікс
X-KDE-Keywords[vi]=cbr, cbz, cbt, cb7, Truyện tranh
X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx cb7xx,xx Comic Bookxx
X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, cb7, Comic Book, 漫画书, 漫画, 连环画
X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, cb7, Comic Book, 漫画书, 漫画, 连环画, manhua, lianhuanhua
X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, cb7, Comic Book, 漫畫, 漫畫書
X-KDE-AliasFor=org.kde.okular.desktop

2
generators/comicbook/org.kde.mobile.okular_comicbook.desktop
View file

@ -231,6 +231,6 @@ X-KDE-Keywords[tr]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[uk]=cbr,cbz,cbt,комікс
X-KDE-Keywords[vi]=cbr, cbz, cbt, Truyện tranh
X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx Comic Bookxx
X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, Comic Book, 漫画书, 漫画, 连环画
X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, Comic Book, 漫画书, 漫画, 连环画, manhua, lianhuanhua
X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, Comic Book, 漫畫, 漫畫書
X-KDE-AliasFor=org.kde.okular.kirigami.desktop

2
generators/fictionbook/okularApplication_fb.desktop
View file

@ -249,6 +249,6 @@ X-KDE-Keywords[tr]=FictionBook, e-book, fb2
X-KDE-Keywords[uk]=FictionBook,fb2,електронна,книга
X-KDE-Keywords[vi]=FictionBook, sách điện tử, fb2
X-KDE-Keywords[x-test]=xxFictionBookxx,xx e-bookxx,xx fb2xx
X-KDE-Keywords[zh_CN]=FictionBook, e-book, fb2 , 电子书
X-KDE-Keywords[zh_CN]=FictionBook, e-book, fb2 , 电子书, dianzishu
X-KDE-Keywords[zh_TW]=FictionBook, e-book, fb2
X-KDE-AliasFor=org.kde.okular.desktop

2
generators/fictionbook/org.kde.mobile.okular_fb.desktop
View file

@ -240,6 +240,6 @@ X-KDE-Keywords[tr]=FictionBook, e-book, fb2
X-KDE-Keywords[uk]=FictionBook,fb2,електронна,книга
X-KDE-Keywords[vi]=FictionBook, sách điện tử, fb2
X-KDE-Keywords[x-test]=xxFictionBookxx,xx e-bookxx,xx fb2xx
X-KDE-Keywords[zh_CN]=FictionBook, e-book, fb2 , 电子书
X-KDE-Keywords[zh_CN]=FictionBook, e-book, fb2 , 电子书, dianzishu
X-KDE-Keywords[zh_TW]=FictionBook, e-book, fb2
X-KDE-AliasFor=org.kde.okular.kirigami.desktop

2
generators/poppler/okularApplication_pdf.desktop
View file

@ -248,7 +248,7 @@ X-KDE-Keywords[tr]=PDF, Taşınabilir Belge Biçimi
X-KDE-Keywords[uk]=PDF,Portable Document Format,пдф
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_CN]=PDF, Portable Document Format, 可移植文档格式, keyizhiwangdanggeshi
X-KDE-Keywords[zh_TW]=PDF, Portable Document Format
X-KDE-AliasFor=org.kde.okular.desktop
NoDisplay=true

2
generators/poppler/org.kde.mobile.okular_pdf.desktop
View file

@ -240,6 +240,6 @@ X-KDE-Keywords[tr]=PDF, Taşınabilir Belge Biçimi
X-KDE-Keywords[uk]=PDF,Portable Document Format,пдф
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_CN]=PDF, Portable Document Format, 可移植文档格式, keyizhiwangdanggeshi
X-KDE-Keywords[zh_TW]=PDF, Portable Document Format
X-KDE-AliasFor=org.kde.okular.kirigami.desktop

2
generators/txt/okularApplication_txt.desktop
View file

@ -247,6 +247,6 @@ X-KDE-Keywords[ug]=txt
X-KDE-Keywords[uk]=txt
X-KDE-Keywords[vi]=txt
X-KDE-Keywords[x-test]=xxtxtxx
X-KDE-Keywords[zh_CN]=txt
X-KDE-Keywords[zh_CN]=txt, 文本, wenben
X-KDE-Keywords[zh_TW]=txt
X-KDE-AliasFor=org.kde.okular.desktop

2
generators/txt/org.kde.mobile.okular_txt.desktop
View file

@ -238,6 +238,6 @@ X-KDE-Keywords[ug]=txt
X-KDE-Keywords[uk]=txt
X-KDE-Keywords[vi]=txt
X-KDE-Keywords[x-test]=xxtxtxx
X-KDE-Keywords[zh_CN]=txt
X-KDE-Keywords[zh_CN]=txt, 文本, wenben
X-KDE-Keywords[zh_TW]=txt
X-KDE-AliasFor=org.kde.okular.kirigami.desktop