Commit 543b75e6 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 9f1619ef
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
"Description[fr]": "Moteur de son pour GStreamer.", "Description[fr]": "Moteur de son pour GStreamer.",
"Description[gl]": "Infraestrutura de son para GStreamer.", "Description[gl]": "Infraestrutura de son para GStreamer.",
"Description[it]": "Motore sonoro per GStreamer.", "Description[it]": "Motore sonoro per GStreamer.",
"Description[ko]": "GStreamer 소리 백엔드입니다.",
"Description[nl]": "Geluidsbackend voor GStreamer.", "Description[nl]": "Geluidsbackend voor GStreamer.",
"Description[nn]": "Lydmotor for GStreamer.", "Description[nn]": "Lydmotor for GStreamer.",
"Description[pl]": "Silnik dźwięku dla GStreamer.", "Description[pl]": "Silnik dźwięku dla GStreamer.",
...@@ -44,6 +45,7 @@ ...@@ -44,6 +45,7 @@
"Name[fr]": "Moteur GStreamer", "Name[fr]": "Moteur GStreamer",
"Name[gl]": "Infraestrutura de GStreamer", "Name[gl]": "Infraestrutura de GStreamer",
"Name[it]": "Motore GStreamer", "Name[it]": "Motore GStreamer",
"Name[ko]": "GStreamer 백엔드",
"Name[nl]": "GStreamer-backend", "Name[nl]": "GStreamer-backend",
"Name[nn]": "GStreamer-motor", "Name[nn]": "GStreamer-motor",
"Name[pl]": "Silnik GStreamer", "Name[pl]": "Silnik GStreamer",
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
"Description[fr]": "Moteur de son pour QtMultimedia", "Description[fr]": "Moteur de son pour QtMultimedia",
"Description[gl]": "Infraestrutura de son para QtMultimedia.", "Description[gl]": "Infraestrutura de son para QtMultimedia.",
"Description[it]": "Motore sonoro per QtMultimedia.", "Description[it]": "Motore sonoro per QtMultimedia.",
"Description[ko]": "QtMultimedia 소리 백엔드입니다.",
"Description[nl]": "Geluidsbackend voor QtMultimedia.", "Description[nl]": "Geluidsbackend voor QtMultimedia.",
"Description[nn]": "Lydmotor for QtMultimedia.", "Description[nn]": "Lydmotor for QtMultimedia.",
"Description[pl]": "Silnik dźwięku dla QtMultimedia.", "Description[pl]": "Silnik dźwięku dla QtMultimedia.",
...@@ -44,6 +45,7 @@ ...@@ -44,6 +45,7 @@
"Name[fr]": "Moteur QtMultimedia", "Name[fr]": "Moteur QtMultimedia",
"Name[gl]": "Infraestrutura de QtMultimedia", "Name[gl]": "Infraestrutura de QtMultimedia",
"Name[it]": "Motore QtMultimedia", "Name[it]": "Motore QtMultimedia",
"Name[ko]": "QtMultimedia 백엔드",
"Name[nl]": "QtMultimedia-backend", "Name[nl]": "QtMultimedia-backend",
"Name[nn]": "QtMultimedia-motor", "Name[nn]": "QtMultimedia-motor",
"Name[pl]": "Silnik QtMultimedia", "Name[pl]": "Silnik QtMultimedia",
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