Commit 5a5df1a2 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 eb6a3b66
......@@ -3,9 +3,23 @@
"KPlugin": {
"Category": "Plugins",
"Description": "Sound backend for GStreamer.",
"Description[ca]": "Dorsal de so pel GStreamer.",
"Description[nl]": "Geluidsbackend voor GStreamer.",
"Description[pt]": "Infra-estrutura de som para o GStreamer.",
"Description[pt_BR]": "Infraestrutura de som para o GStreamer.",
"Description[sv]": "Ljudgränssnitt för Gstreamer.",
"Description[uk]": "Звуковий модуль для GStreamer.",
"Description[x-test]": "xxSound backend for GStreamer.xx",
"Id": "artikulate_gstreamer_backend",
"License": "GPL",
"Name": "GStreamer Backend",
"Name[ca]": "Dorsal GStreamer",
"Name[nl]": "GStreamer-backend",
"Name[pt]": "Infra-Estrutura para o GStreamer",
"Name[pt_BR]": "Infraestrutura do GStreamer",
"Name[sv]": "Gstreamer-gränssnitt",
"Name[uk]": "Модуль GStreamer",
"Name[x-test]": "xxGStreamer Backendxx",
"ServiceTypes": [
"artikulate/libsound/backend"
],
......
......@@ -3,9 +3,23 @@
"KPlugin": {
"Category": "Plugins",
"Description": "Sound backend for QtMultimedia.",
"Description[ca]": "Dorsal de so pel QtMultimedia.",
"Description[nl]": "Geluidsbackend voor QtMultimedia.",
"Description[pt]": "Infra-estrutura de som para o QtMultimedia.",
"Description[pt_BR]": "Infraestrutura de som para o QtMultimedia.",
"Description[sv]": "Ljudgränssnitt för QtMultimedia.",
"Description[uk]": "Звуковий модуль для QtMultimedia.",
"Description[x-test]": "xxSound backend for QtMultimedia.xx",
"Id": "artikulate_qtmultimedia_backend",
"License": "GPL",
"Name": "QtMultimedia Backend",
"Name[ca]": "Dorsal QtMultimedia",
"Name[nl]": "QtMultimedia-backend",
"Name[pt]": "Infra-Estrutura para o QtMultimedia",
"Name[pt_BR]": "Infraestrutura QtMultimedia",
"Name[sv]": "QtMultimedia-gränssnitt",
"Name[uk]": "Модуль QtMultimedia",
"Name[x-test]": "xxQtMultimedia Backendxx",
"ServiceTypes": [
"artikulate/libsound/backend"
],
......
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