Commit b349581e 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 f2faa165
......@@ -3,12 +3,14 @@
"KPlugin": {
"Category": "Plugins",
"Description": "Sound backend for GStreamer.",
"Description[ca@valencia]": "Dorsal de so pel GStreamer.",
"Description[ca]": "Dorsal de so pel GStreamer.",
"Description[de]": "Sound-Backend für GStreamer.",
"Description[es]": "Motor de sonido para GStreamer.",
"Description[fi]": "GStreamer-äänitaustajärjestelmä",
"Description[gl]": "Infraestrutura de son para GStreamer.",
"Description[nl]": "Geluidsbackend voor GStreamer.",
"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[sk]": "Zvukový backend pre GStreamer.",
......@@ -18,12 +20,14 @@
"Id": "artikulate_gstreamer_backend",
"License": "GPL",
"Name": "GStreamer Backend",
"Name[ca@valencia]": "Dorsal GStreamer",
"Name[ca]": "Dorsal GStreamer",
"Name[de]": "Backend für GStreamer",
"Name[es]": "Motor GStreamer",
"Name[fi]": "GStreamer-taustajärjestelmä",
"Name[gl]": "Infraestrutura de GStreamer",
"Name[nl]": "GStreamer-backend",
"Name[pl]": "Silnik GStreamer",
"Name[pt]": "Infra-Estrutura para o GStreamer",
"Name[pt_BR]": "Infraestrutura do GStreamer",
"Name[sv]": "Gstreamer-gränssnitt",
......
......@@ -3,12 +3,14 @@
"KPlugin": {
"Category": "Plugins",
"Description": "Sound backend for QtMultimedia.",
"Description[ca@valencia]": "Dorsal de so pel QtMultimedia.",
"Description[ca]": "Dorsal de so pel QtMultimedia.",
"Description[de]": "Sound-Backend für QtMultimedia.",
"Description[es]": "Motor de sonido para QtMultimedia.",
"Description[fi]": "QtMultimedia-äänitaustajärjestelmä",
"Description[gl]": "Infraestrutura de son para QtMultimedia.",
"Description[nl]": "Geluidsbackend voor QtMultimedia.",
"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[sk]": "Zvukový backend pre QtMultimedia.",
......@@ -18,12 +20,14 @@
"Id": "artikulate_qtmultimedia_backend",
"License": "GPL",
"Name": "QtMultimedia Backend",
"Name[ca@valencia]": "Dorsal QtMultimedia",
"Name[ca]": "Dorsal QtMultimedia",
"Name[de]": "Backend für QtMultimedia",
"Name[es]": "Motor QtMultimedia",
"Name[fi]": "QtMultimedia-taustajärjestelmä",
"Name[gl]": "Infraestrutura de QtMultimedia",
"Name[nl]": "QtMultimedia-backend",
"Name[pl]": "Silnik QtMultimedia",
"Name[pt]": "Infra-Estrutura para o QtMultimedia",
"Name[pt_BR]": "Infraestrutura QtMultimedia",
"Name[sv]": "QtMultimedia-gränssnitt",
......
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