office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-11-05 18:34:53 +00:00
Code Issues Projects Releases Packages 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 2019-09-09 08:45:37 +02:00
parent 26c5d9c8de
commit 86fba9df67
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
generators/comicbook/okularApplication_comicbook.desktop
View file

@ -190,3 +190,4 @@ X-KDE-Keywords[sv]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[uk]=cbr,cbz,cbt,Comic Book,комікс
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_TW]=cbr, cbz, cbt, Comic Book, 漫畫書

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

@ -181,3 +181,4 @@ X-KDE-Keywords[sv]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[uk]=cbr,cbz,cbt,Comic Book,комікс
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_TW]=cbr, cbz, cbt, Comic Book, 漫畫書

2
generators/fictionbook/libokularGenerator_fb.json
View file

@ -146,7 +146,7 @@
"Name[sr]": "Позадина за фикшнбук",
"Name[sv]": "Fiction Book-gränssnitt",
"Name[tr]": "Kurgu Kitabı Arka Ucu",
"Name[uk]": "Модуль белетристики",
"Name[uk]": "Модуль FictionBook",
"Name[x-test]": "xxFiction Book Backendxx",
"Name[zh_CN]": "Fiction Book 后端",
"Name[zh_TW]": "Fiction Book 後端介面",