office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-27 19:50:27 +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-10-28 01:22:19 +00:00
parent 531e2b56a1
commit d624d72d22
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/markdown/libokularGenerator_md.json
View file

@ -121,7 +121,7 @@
"Name[et]": "Markdowni taustaprogramm",
"Name[eu]": "Markdown-en bizkarraldekoa",
"Name[fi]": "Markdown-taustaosa",
"Name[fr]": "Moteur de markdown",
"Name[fr]": "Moteur de Markdown",
"Name[gl]": "Motor de Markdown",
"Name[hu]": "Markdown modul",
"Name[ia]": "Retro-Administration Markdown",