Commit 6fa92032 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 d019ff0b
Pipeline #35164 skipped
......@@ -41,11 +41,24 @@ Action=Popup
Name=Alarm message with beep
Name[ca]=Missatge d'alarma amb timbre
Name[nl]=Alarmbericht met piep
Name[pt]=Mensagem do alarme com apito
Name[pt_BR]=Mensagem de alarme com bip
Name[sv]=Alarmmeddelande med ton
Name[uk]=Повідомлення нагадування з гудком
Name[x-test]=xxAlarm message with beepxx
Name=Spoken alarm message
Name[ca]=Missatge d'alarma parlat
Name[nl]=Gesproken alarmbericht
Name[pt]=Mensagem do alarme falada
Name[sv]=Talat alarmmeddelande
Name[uk]=Повідомлення нагадування з виголошенням тексту
Name[x-test]=xxSpoken alarm messagexx
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