Commit f2faa165 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 016117ea
......@@ -6,6 +6,7 @@
"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[pt]": "Infra-estrutura de som para o GStreamer.",
......@@ -20,6 +21,7 @@
"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[pt]": "Infra-Estrutura para o GStreamer",
......
......@@ -6,6 +6,7 @@
"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[pt]": "Infra-estrutura de som para o QtMultimedia.",
......@@ -20,6 +21,7 @@
"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[pt]": "Infra-Estrutura para o 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