Commit d1ef71e4 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 60cb236d
......@@ -3,7 +3,6 @@
"KPlugin": {
"Category": "Plugins",
"Description": "Sound backend for GStreamer.",
"Description[ast]": "Backend de soníu pa GStreamer.",
"Description[ca@valencia]": "Dorsal de so pel GStreamer.",
"Description[ca]": "Dorsal de so pel GStreamer.",
"Description[cs]": "Podpůrná vrstva zvuku pro GStreamer.",
......@@ -28,7 +27,6 @@
"Id": "artikulate_gstreamer_backend",
"License": "GPL",
"Name": "GStreamer Backend",
"Name[ast]": "Backend de GStreamer",
"Name[ca@valencia]": "Dorsal GStreamer",
"Name[ca]": "Dorsal GStreamer",
"Name[cs]": "Podpůrná vrstva GStreamer",
......@@ -3,7 +3,6 @@
"KPlugin": {
"Category": "Plugins",
"Description": "Sound backend for QtMultimedia.",
"Description[ast]": "Backend de soníu pa QtMultimedia.",
"Description[ca@valencia]": "Dorsal de so pel QtMultimedia.",
"Description[ca]": "Dorsal de so pel QtMultimedia.",
"Description[cs]": "Podpůrná vrstva zvuku pro QtMultimedia.",
......@@ -28,7 +27,6 @@
"Id": "artikulate_qtmultimedia_backend",
"License": "GPL",
"Name": "QtMultimedia Backend",
"Name[ast]": "Backend de QtMultimedia",
"Name[ca@valencia]": "Dorsal QtMultimedia",
"Name[ca]": "Dorsal QtMultimedia",
"Name[cs]": "Podpůrná vrstva QtMultimedia",
......@@ -5,7 +5,6 @@ Exec=artikulate -caption %c %i
GenericName=Artikulate Pronunciation Trainer
GenericName[ast]=Entrenador de pronunciación d'Artikulate
GenericName[bs]=Artikulate vježba izgovora
GenericName[ca]=Entrenador de la pronunciació Artikulate
GenericName[ca@valencia]=Entrenador de la pronunciació Artikulate
Supports Markdown
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