Commit b3ca334a authored by Script Kiddy's avatar Script Kiddy

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 ebf723e5
......@@ -17,6 +17,7 @@
"Description[pl]": "Silnik dźwięku dla GStreamer.",
"Description[pt]": "Infra-estrutura de som para o GStreamer.",
"Description[pt_BR]": "Infraestrutura de som para o GStreamer.",
"Description[ru]": "Работа со звуком через GStreamer.",
"Description[sk]": "Zvukový backend pre GStreamer.",
"Description[sl]": "Zvočno zaledje za GStreamer.",
"Description[sv]": "Ljudgränssnitt för Gstreamer.",
......@@ -42,6 +43,7 @@
"Name[pl]": "Silnik GStreamer",
"Name[pt]": "Infra-Estrutura para o GStreamer",
"Name[pt_BR]": "Infraestrutura do GStreamer",
"Name[ru]": "Модуль поддержки GStreamer",
"Name[sl]": "Zaledje GStreamer",
"Name[sv]": "Gstreamer-gränssnitt",
"Name[tr]": "GStreamer Arka Yüzü",
......
......@@ -17,6 +17,7 @@
"Description[pl]": "Silnik dźwięku dla QtMultimedia.",
"Description[pt]": "Infra-estrutura de som para o QtMultimedia.",
"Description[pt_BR]": "Infraestrutura de som para o QtMultimedia.",
"Description[ru]": "Работа со звуком через QtMultimedia.",
"Description[sk]": "Zvukový backend pre QtMultimedia.",
"Description[sl]": "Zvočno zaledje za QtMultimedia.",
"Description[sv]": "Ljudgränssnitt för QtMultimedia.",
......@@ -42,6 +43,7 @@
"Name[pl]": "Silnik QtMultimedia",
"Name[pt]": "Infra-Estrutura para o QtMultimedia",
"Name[pt_BR]": "Infraestrutura QtMultimedia",
"Name[ru]": "Модуль поддержки QtMultimedia",
"Name[sl]": "Zaledje QtMultimedia",
"Name[sv]": "QtMultimedia-gränssnitt",
"Name[tr]": "QtMultimedia Arka Yüzü",
......
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