Commit d06100f1 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 ccab81e8
Pipeline #34539 skipped
......@@ -8,6 +8,7 @@ Comment[de]=KAlarm
Comment[el]=KAlarm
Comment[es]=KAlarm
Comment[ia]=KAlarm
Comment[it]=KAlarm
Comment[nl]=KAlarm
Comment[pt]=KAlarm
Comment[sl]=KAlarm
......@@ -23,6 +24,7 @@ Name[de]=Erinnerungsnachricht
Name[el]=Μήνυμα συναγερμού
Name[es]=Mensaje de alarma
Name[ia]=Message de alarma
Name[it]=Messaggio di avviso
Name[nl]=Herinneringsbericht
Name[pt]=Mensagem do alarme
Name[sl]=Obvestilo alarma
......@@ -38,6 +40,7 @@ Name[ca@valencia]=Missatge d'error d'alarma
Name[el]=Μήνυμα σφάλματος συναγερμού
Name[es]=Mensaje de error de la alarma
Name[ia]=Message de error de Alarma
Name[it]=Messaggio di errore di avviso
Name[nl]=Foutmelding van Alarm
Name[pt]=Mensagem de erro do alarme
Name[sl]=Alarmovo obvestilo o napaki
......
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