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-06-23 01:42:59 +00:00
parent fd459910b9
commit 3fce995a78
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generators/fictionbook/libokularGenerator_fb.json
View file

@ -106,7 +106,7 @@
"Description[bg]": "Визуализатор на електронни книги на FictionBook",
"Description[ca@valencia]": "Un renderitzador per a llibres electrònics FictionBook",
"Description[ca]": "Un renderitzador per a llibres electrònics FictionBook",
"Description[cs]": "Renderer elektronických knih Fiction Book",
"Description[cs]": "Vykreslovač elektronických knih Fiction Book",
"Description[da]": "En gengiver til FictionBook-e-bøger",
"Description[de]": "Ein Renderer für FictionBook-eBooks",
"Description[el]": "Πρόγραμμα αποτύπωσης για FictionBook eBooks",

2
generators/plucker/libokularGenerator_plucker.json
View file

@ -106,7 +106,7 @@
"Description[bg]": "Визуализатор на електронни книги на Plucker",
"Description[ca@valencia]": "Un renderitzador per a llibres electrònics Plucker",
"Description[ca]": "Un renderitzador per a llibres electrònics Plucker",
"Description[cs]": "Renderer elektronických knih Plucker",
"Description[cs]": "Vykreslovač elektronických knih Plucker",
"Description[da]": "En gengiver til Plucker-e-bøger",
"Description[de]": "Ein Renderer für Plucker eBooks",
"Description[el]": "Πρόγραμμα αποτύπωσης για Plucker eBooks",