Commit 44f48a84 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 29141d45
......@@ -14,6 +14,7 @@
"Description[fi]": "GStreamer-äänitaustajärjestelmä",
"Description[fr]": "Moteur de son pour GStreamer.",
"Description[gl]": "Infraestrutura de son para GStreamer.",
"Description[ia]": "Retro-administration de Sono per GStreamer.",
"Description[it]": "Motore sonoro per GStreamer.",
"Description[ko]": "GStreamer 소리 백엔드입니다.",
"Description[nl]": "Geluidsbackend voor GStreamer.",
......@@ -44,6 +45,7 @@
"Name[fi]": "GStreamer-taustajärjestelmä",
"Name[fr]": "Moteur GStreamer",
"Name[gl]": "Infraestrutura de GStreamer",
"Name[ia]": "Retro-administration de GStreamer",
"Name[it]": "Motore GStreamer",
"Name[ko]": "GStreamer 백엔드",
"Name[nl]": "GStreamer-backend",
......@@ -14,6 +14,7 @@
"Description[fi]": "QtMultimedia-äänitaustajärjestelmä",
"Description[fr]": "Moteur de son pour QtMultimedia",
"Description[gl]": "Infraestrutura de son para QtMultimedia.",
"Description[ia]": "Retro-administration de Sono per QtMultimedia.",
"Description[it]": "Motore sonoro per QtMultimedia.",
"Description[ko]": "QtMultimedia 소리 백엔드입니다.",
"Description[nl]": "Geluidsbackend voor QtMultimedia.",
......@@ -44,6 +45,7 @@
"Name[fi]": "QtMultimedia-taustajärjestelmä",
"Name[fr]": "Moteur QtMultimedia",
"Name[gl]": "Infraestrutura de QtMultimedia",
"Name[ia]": "Retro-Administration QtMultimedia",
"Name[it]": "Motore QtMultimedia",
"Name[ko]": "QtMultimedia 백엔드",
"Name[nl]": "QtMultimedia-backend",
......@@ -25,6 +25,7 @@ GenericName[fr]=Programme Artikulate d'entraînement à la prononciation
GenericName[gl]=Adestrador de pronuncia Artikulate
GenericName[hi]=आर्टिकुलेट उच्चारण प्रशिक्षक
GenericName[hu]=Artikulate kiejtés oktató
GenericName[ia]=Instructor de pronunciation Artikulate
GenericName[it]=Allenatore di pronuncia Artikulate
GenericName[ko]=Artikulate 발음 타이머
GenericName[mr]=आर्टिक्युलेट उच्चारण प्रशिक्षक
......@@ -64,6 +65,7 @@ Name[fr]=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