Commit bf7700e5 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 2db1c139
......@@ -18,6 +18,7 @@ Name[fi]=Videotiedostot (ffmpegthumbs)
Name[fr]=Fichiers vidéo (ffmpegthumbs)
Name[ga]=Comhaid Fhíse (ffmpegthumbs)
Name[gl]=Ficheiros de vídeo (ffmpegthumbs)
Name[hi]=वीडियो फ़ाइलें (ffmpegthumbs)
Name[hu]=Videofájlok (ffmpegthumbs)
Name[ia]=Files Video (ffmpegthumbs)
Name[id]=File-file Video (ffmpegthumbs)
......
Supports Markdown
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