Commit efcebd12 authored by Script Kiddy's avatar Script Kiddy

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 ff7b0374
......@@ -73,6 +73,7 @@ Name[cs]=Zvoní
Name[de]=Es klingelt
Name[en_GB]=Ringing
Name[es]=Sonando
Name[fr]=Sonnerie en cours
Name[gl]=Chámano
Name[it]=Sta squillando
Name[nl]=Bel gaat over
......@@ -93,6 +94,7 @@ Comment[cs]=Telefon zvoní
Comment[de]=Das Telefon klingelt
Comment[en_GB]=The phone is ringing
Comment[es]=El teléfono está sonando
Comment[fr]=Le téléphone est en train de sonner
Comment[gl]=Está a recibir unha chamada.
Comment[it]=Il telefono sta squillando
Comment[nl]=De telefoon gaat over
......
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