Commit e7313c3f 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 b33272d0
......@@ -20,6 +20,7 @@
"Description[sk]": "Zvukový backend pre GStreamer.",
"Description[sl]": "Zvočno zaledje za GStreamer.",
"Description[sv]": "Ljudgränssnitt för Gstreamer.",
"Description[tr]": "GStreamer için ses arka yüzü.",
"Description[uk]": "Звуковий модуль для GStreamer.",
"Description[x-test]": "xxSound backend for GStreamer.xx",
"Description[zh_CN]": "GStreamer 声音后端",
......@@ -43,6 +44,7 @@
"Name[pt_BR]": "Infraestrutura do GStreamer",
"Name[sl]": "Zaledje GStreamer",
"Name[sv]": "Gstreamer-gränssnitt",
"Name[tr]": "GStreamer Arka Yüzü",
"Name[uk]": "Модуль GStreamer",
"Name[x-test]": "xxGStreamer Backendxx",
"Name[zh_CN]": "GStreamer 后端",
......
......@@ -20,6 +20,7 @@
"Description[sk]": "Zvukový backend pre QtMultimedia.",
"Description[sl]": "Zvočno zaledje za QtMultimedia.",
"Description[sv]": "Ljudgränssnitt för QtMultimedia.",
"Description[tr]": "QtMultimedia için ses arka yüzü.",
"Description[uk]": "Звуковий модуль для QtMultimedia.",
"Description[x-test]": "xxSound backend for QtMultimedia.xx",
"Description[zh_CN]": "QtMultimedia 声音后端",
......@@ -43,6 +44,7 @@
"Name[pt_BR]": "Infraestrutura QtMultimedia",
"Name[sl]": "Zaledje QtMultimedia",
"Name[sv]": "QtMultimedia-gränssnitt",
"Name[tr]": "QtMultimedia Arka Yüzü",
"Name[uk]": "Модуль QtMultimedia",
"Name[x-test]": "xxQtMultimedia Backendxx",
"Name[zh_CN]": "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