Commit 62ce3db9 authored by Script Kiddy's avatar Script Kiddy

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"
parent f81b6603
......@@ -11,7 +11,7 @@ Comment[ca@valencia]=Dorsal de format de fitxer per a l'Okular
Comment[cs]=Podpůrná vrstva formátu souboru pro Okular
Comment[da]=Filformatmotor til Okular
Comment[de]=Dateiformat-Modul für Okular
Comment[el]=Σύστημα υποστήριξης μορφής αρχείων για το Okular
Comment[el]=Σύστημα υποστήριξης τύπου αρχείων για το Okular
Comment[en_GB]=File format backend for Okular
Comment[es]=Motor de formatos de archivos para Okular
Comment[et]=Okulari failivormingu taustaprogramm
......
......@@ -28,6 +28,7 @@
"Name[ca@valencia]": "Dorsal de Markdown",
"Name[ca]": "Dorsal de Markdown",
"Name[cs]": "Podpůrná vrstva Markdown",
"Name[el]": "Σύστημα υποστήριξης markdown",
"Name[es]": "Motor para Markdown",
"Name[fr]": "Moteur de markdown",
"Name[it]": "Backend Markdown",
......
......@@ -170,6 +170,7 @@ X-KDE-Keywords=Markdown
X-KDE-Keywords[ca]=Markdown
X-KDE-Keywords[ca@valencia]=Markdown
X-KDE-Keywords[cs]=Markdown
X-KDE-Keywords[el]=Markdown
X-KDE-Keywords[es]=Markdown
X-KDE-Keywords[fr]=Markdown
X-KDE-Keywords[it]=Markdown
......
......@@ -159,6 +159,7 @@ X-KDE-Keywords=Markdown
X-KDE-Keywords[ca]=Markdown
X-KDE-Keywords[ca@valencia]=Markdown
X-KDE-Keywords[cs]=Markdown
X-KDE-Keywords[el]=Markdown
X-KDE-Keywords[es]=Markdown
X-KDE-Keywords[fr]=Markdown
X-KDE-Keywords[it]=Markdown
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment