Commit 0395d029 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 ffe151ac
......@@ -5,6 +5,7 @@
"Description": "Sound backend for GStreamer.",
"Description[ca@valencia]": "Dorsal de so pel GStreamer.",
"Description[ca]": "Dorsal de so pel GStreamer.",
"Description[cs]": "Podpůrná vrstva zvuku pro GStreamer.",
"Description[de]": "Sound-Backend für GStreamer.",
"Description[es]": "Motor de sonido para GStreamer.",
"Description[fi]": "GStreamer-äänitaustajärjestelmä",
......@@ -23,6 +24,7 @@
"Name": "GStreamer Backend",
"Name[ca@valencia]": "Dorsal GStreamer",
"Name[ca]": "Dorsal GStreamer",
"Name[cs]": "Podpůrná vrstva GStreamer",
"Name[de]": "Backend für GStreamer",
"Name[es]": "Motor GStreamer",
"Name[fi]": "GStreamer-taustajärjestelmä",
......
......@@ -5,6 +5,7 @@
"Description": "Sound backend for QtMultimedia.",
"Description[ca@valencia]": "Dorsal de so pel QtMultimedia.",
"Description[ca]": "Dorsal de so pel QtMultimedia.",
"Description[cs]": "Podpůrná vrstva zvuku pro QtMultimedia.",
"Description[de]": "Sound-Backend für QtMultimedia.",
"Description[es]": "Motor de sonido para QtMultimedia.",
"Description[fi]": "QtMultimedia-äänitaustajärjestelmä",
......@@ -23,6 +24,7 @@
"Name": "QtMultimedia Backend",
"Name[ca@valencia]": "Dorsal QtMultimedia",
"Name[ca]": "Dorsal QtMultimedia",
"Name[cs]": "Podpůrná vrstva QtMultimedia",
"Name[de]": "Backend für QtMultimedia",
"Name[es]": "Motor QtMultimedia",
"Name[fi]": "QtMultimedia-taustajärjestelmä",
......
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