Commit b64734d0 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 006c04e3
......@@ -12,6 +12,7 @@
"Description[en_GB]": "Sound backend for GStreamer.",
"Description[es]": "Motor de sonido para GStreamer.",
"Description[et]": "GStreameri heli-taustaprogramm",
"Description[eu]": "GStreamer-rerako soinu-bizkarraldekoa.",
"Description[fi]": "GStreamer-äänitaustajärjestelmä",
"Description[fr]": "Moteur de son pour GStreamer.",
"Description[gl]": "Infraestrutura de son para GStreamer.",
......@@ -45,6 +46,7 @@
"Name[en_GB]": "GStreamer Backend",
"Name[es]": "Motor GStreamer",
"Name[et]": "GStreameri taustaprogramm",
"Name[eu]": "GStreamer bizkarraldekoa",
"Name[fi]": "GStreamer-taustajärjestelmä",
"Name[fr]": "Moteur GStreamer",
"Name[gl]": "Infraestrutura de GStreamer",
......@@ -12,6 +12,7 @@
"Description[en_GB]": "Sound backend for QtMultimedia.",
"Description[es]": "Motor de sonido para QtMultimedia.",
"Description[et]": "QtMultimedia heli-taustaprogramm",
"Description[eu]": "QtMultimedia-rako soinu-bizkarraldekoa.",
"Description[fi]": "QtMultimedia-äänitaustajärjestelmä",
"Description[fr]": "Moteur de son pour QtMultimedia",
"Description[gl]": "Infraestrutura de son para QtMultimedia.",
......@@ -45,6 +46,7 @@
"Name[en_GB]": "QtMultimedia Backend",
"Name[es]": "Motor QtMultimedia",
"Name[et]": "QtMultimedia taustaprogramm",
"Name[eu]": "QtMultimedia bizkarraldekoa",
"Name[fi]": "QtMultimedia-taustajärjestelmä",
"Name[fr]": "Moteur QtMultimedia",
"Name[gl]": "Infraestrutura de QtMultimedia",
......@@ -20,7 +20,7 @@ GenericName[en_GB]=Artikulate Pronunciation Trainer
GenericName[eo]=Artikulate Prononciada Trejnilo
GenericName[es]=Entrenador de pronunciación Artikulate
GenericName[et]=Häälduse harjutaja Artikulate
GenericName[eu]=Artikulate Pronunciation Trainer
GenericName[eu]=Artikulate ahoskatze entrenatzailea
GenericName[fi]=Artikulate ääntämisen harjoitteluohjelma
GenericName[fr]=Programme Artikulate d'entraînement à la prononciation
GenericName[gl]=Adestrador de pronuncia Artikulate
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