Commit 6843ee46 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 4fc69880
......@@ -29,6 +29,7 @@ Name[nb]=GStreamer
Name[nl]=GStreamer
Name[nn]=GStreamer
Name[pl]=GStreamer
Name[pt]=GStreamer
Name[pt_BR]=GStreamer
Name[se]=GStreamer
Name[sk]=GStreamer
......@@ -61,6 +62,7 @@ Comment[nb]=Phonon-motor for GStreamer
Comment[nl]=GStreamer-backend (Phonon)
Comment[nn]=Phonon-motor for GStreamer
Comment[pl]=Silnik GStreamer Phonona
Comment[pt]=Infra-estrutura do GStreamer para o Phonon
Comment[pt_BR]=Infraestrutura do GStreamer para o Phonon
Comment[se]=Phonon GStreamer duogášmohtor
Comment[sk]=Podsystém Phonon GStreamer
......
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