Commit 0f8d36ad 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 85276fcf
......@@ -14,6 +14,7 @@
"Description[fi]": "GStreamer-äänitaustajärjestelmä",
"Description[fr]": "Moteur de son pour GStreamer.",
"Description[gl]": "Infraestrutura de son para GStreamer.",
"Description[it]": "Motore sonoro per GStreamer.",
"Description[nl]": "Geluidsbackend voor GStreamer.",
"Description[nn]": "Lydmotor for GStreamer.",
"Description[pl]": "Silnik dźwięku dla GStreamer.",
......@@ -42,6 +43,7 @@
"Name[fi]": "GStreamer-taustajärjestelmä",
"Name[fr]": "Moteur GStreamer",
"Name[gl]": "Infraestrutura de GStreamer",
"Name[it]": "Motore GStreamer",
"Name[nl]": "GStreamer-backend",
"Name[nn]": "GStreamer-motor",
"Name[pl]": "Silnik GStreamer",
......@@ -14,6 +14,7 @@
"Description[fi]": "QtMultimedia-äänitaustajärjestelmä",
"Description[fr]": "Moteur de son pour QtMultimedia",
"Description[gl]": "Infraestrutura de son para QtMultimedia.",
"Description[it]": "Motore sonoro per QtMultimedia.",
"Description[nl]": "Geluidsbackend voor QtMultimedia.",
"Description[nn]": "Lydmotor for QtMultimedia.",
"Description[pl]": "Silnik dźwięku dla QtMultimedia.",
......@@ -42,6 +43,7 @@
"Name[fi]": "QtMultimedia-taustajärjestelmä",
"Name[fr]": "Moteur QtMultimedia",
"Name[gl]": "Infraestrutura de QtMultimedia",
"Name[it]": "Motore QtMultimedia",
"Name[nl]": "QtMultimedia-backend",
"Name[nn]": "QtMultimedia-motor",
"Name[pl]": "Silnik QtMultimedia",
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