Commit 4c70f22f 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 fb8fe6b9
Pipeline #35413 skipped
......@@ -44,6 +44,7 @@ Name=Alarm message with beep
Name[ca]=Missatge d'alarma amb timbre
Name[ca@valencia]=Missatge d'alarma amb timbre
Name[el]=Μήνυμα συναγερμού με σύντομο ήχο
Name[fr]=Message d'alarme avec un bip
Name[ia]=Message de alarma con bip
Name[nl]=Alarmbericht met piep
Name[pt]=Mensagem do alarme com apito
......@@ -59,6 +60,7 @@ Name=Spoken alarm message
Name[ca]=Missatge d'alarma parlat
Name[ca@valencia]=Missatge d'alarma parlat
Name[el]=Μήνυμα συναγερμού με ομιλία
Name[fr]=Message d'alarme vocal
Name[ia]=Message de alarma parlante
Name[nl]=Gesproken alarmbericht
Name[pt]=Mensagem do alarme falada
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