Commit f92f4b14 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 9c4b5034
Pipeline #27279 skipped
......@@ -306,8 +306,8 @@ Action=Sound
Name=Ready to capture
Name[ar]=جاهز للالتقاط
Name[bs]=Spreman za hvatanje
Name[ca]=A punt per capturar
Name[ca@valencia]=A punt per capturar
Name[ca]=A punt per a capturar
Name[ca@valencia]=A punt per a capturar
Name[cs]=Připraven zachytávat
Name[da]=Klar til at indfange
Name[de]=Bereit zur Aufnahme
......@@ -3,8 +3,8 @@ Type=Service
Name=MLT Playlist
Name[ar]=قائمة تشغيل MLT
Name[bs]=MLT lista izvođenja
Name[ca]=Llista de reproducció del MLT
Name[ca@valencia]=Llista de reproducció del MLT
Name[ca]=Llista de reproducció MLT
Name[ca@valencia]=Llista de reproducció MLT
Name[cs]=Seznam skladeb MLT
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