mirror of
https://invent.kde.org/graphics/okular
synced 2024-08-24 18:35:37 +00:00
SVN_SILENT made messages (.desktop file) - always resolve ours
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:
parent
8d1dbe5041
commit
6aecd5d5db
|
@ -172,6 +172,7 @@ X-KDE-Keywords[de]=cbr, cbz, cbt, cb7, Comic-Book
|
|||
X-KDE-Keywords[el]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[en_GB]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[es]=cbr, cbz, cbt, cb7, libro de cómic
|
||||
X-KDE-Keywords[et]=cbr, cbz, cbt, cb7, Comic Book, koomiks
|
||||
X-KDE-Keywords[eu]=cbr, cbz, cbt, cb7, komiki-liburua
|
||||
X-KDE-Keywords[fr]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[gl]=cbr, cbz, cbt, cb7, Comic Book
|
||||
|
|
|
@ -162,6 +162,7 @@ X-KDE-Keywords[cs]=cbr, cbz, cbt, Comic Book
|
|||
X-KDE-Keywords[de]=cbr, cbz, cbt, Comic-Book
|
||||
X-KDE-Keywords[en_GB]=cbr, cbz, cbt, Comic Book
|
||||
X-KDE-Keywords[es]=cbr, cbz, cbt, libro de cómic
|
||||
X-KDE-Keywords[et]=cbr, cbz, cbt, Comic Book, koomiks
|
||||
X-KDE-Keywords[eu]=cbr, cbz, cbt, komiki-liburua
|
||||
X-KDE-Keywords[fi]=cbr, cbz, cbt, Comic Book
|
||||
X-KDE-Keywords[fr]=cbr, cbz, cbt, Comic Book
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
"Name[el]": "Julian Wolff",
|
||||
"Name[en_GB]": "Julian Wolff",
|
||||
"Name[es]": "Julian Wolff",
|
||||
"Name[et]": "Julian Wolff",
|
||||
"Name[eu]": "Julian Wolff",
|
||||
"Name[fi]": "Julian Wolff",
|
||||
"Name[fr]": "Julian Wolff",
|
||||
|
@ -48,6 +49,7 @@
|
|||
"Copyright[el]": "© 2017 Julian Wolff",
|
||||
"Copyright[en_GB]": "© 2017 Julian Wolff",
|
||||
"Copyright[es]": "© 2017 Julian Wolff",
|
||||
"Copyright[et]": "© 2017: Julian Wolff",
|
||||
"Copyright[eu]": "© 2017 Julian Wolff",
|
||||
"Copyright[fi]": "© 2017 Julian Wolff",
|
||||
"Copyright[fr]": "© 2017 Julian Wolff",
|
||||
|
@ -88,6 +90,7 @@
|
|||
"Name[el]": "Σύστημα υποστήριξης markdown",
|
||||
"Name[en_GB]": "Markdown Backend",
|
||||
"Name[es]": "Motor para Markdown",
|
||||
"Name[et]": "Markdowni taustaprogramm",
|
||||
"Name[eu]": "Markdown-en bizkarraldekoa",
|
||||
"Name[fi]": "Markdown-taustaosa",
|
||||
"Name[fr]": "Moteur de markdown",
|
||||
|
|
|
@ -174,6 +174,7 @@ X-KDE-Keywords[de]=Markdown
|
|||
X-KDE-Keywords[el]=Markdown
|
||||
X-KDE-Keywords[en_GB]=Markdown
|
||||
X-KDE-Keywords[es]=Markdown
|
||||
X-KDE-Keywords[et]=Markdown
|
||||
X-KDE-Keywords[eu]=Markdown
|
||||
X-KDE-Keywords[fi]=Markdown
|
||||
X-KDE-Keywords[fr]=Markdown
|
||||
|
|
|
@ -164,6 +164,7 @@ X-KDE-Keywords[de]=Markdown
|
|||
X-KDE-Keywords[el]=Markdown
|
||||
X-KDE-Keywords[en_GB]=Markdown
|
||||
X-KDE-Keywords[es]=Markdown
|
||||
X-KDE-Keywords[et]=Markdown
|
||||
X-KDE-Keywords[eu]=Markdown
|
||||
X-KDE-Keywords[fi]=Markdown
|
||||
X-KDE-Keywords[fr]=Markdown
|
||||
|
|
Loading…
Reference in a new issue