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 2022-08-07 01:45:43 +00:00
parent c1d91bbb39
commit f0d3e6f047
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generators/djvu/libokularGenerator_djvu.json
View file

@ -95,7 +95,7 @@
"Description[ar]": "خلفية DjVu بالمعتمدة على DjVuLibre",
"Description[az]": "DjVuLibre'yə əsaslanan DjVu modulu",
"Description[bg]": "Бекенд на DjVu, базиран на DjVuLibre",
"Description[ca@valencia]": "Dorsal DjVu basat en el DjVuLibre",
"Description[ca@valencia]": "Dorsal DjVu basat en DjVuLibre",
"Description[ca]": "Dorsal DjVu basat en el DjVuLibre",
"Description[cs]": "Implementace DjVu založena na DjVuLibre",
"Description[da]": "DjVu-backend baseret på DjVuLibre",