Commit fcb2d612 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 229a6279
......@@ -14,7 +14,7 @@ Name[es]=Decodificador FFMpeg de K3b
Name[et]=K3b FFMpeg dekodeerija
Name[eu]=K3b FFMpeg deskodetzailea
Name[fi]=K3b:n FFMpeg-purkaja
Name[fr]=Décodeur « FFmpeg » pour K3b
Name[fr]=Décodeur « FFMpeg » pour K3b
Name[ga]=Díchódóir FFMpeg K3b
Name[gl]=Descodificador FFMpeg para o K3b
Name[he]=מפענח FFMpeg של K3b
......
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