Commit 6b41f50b 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 892327ec
Pipeline #34858 skipped
......@@ -6,7 +6,9 @@ Comment[ca]=KAlarm
Comment[ca@valencia]=KAlarm
Comment[de]=KAlarm
Comment[el]=KAlarm
Comment[en_GB]=KAlarm
Comment[es]=KAlarm
Comment[fr]=KAlarm
Comment[ia]=KAlarm
Comment[it]=KAlarm
Comment[nl]=KAlarm
......@@ -23,7 +25,9 @@ Name[ca]=Missatge d'alarma
Name[ca@valencia]=Missatge d'alarma
Name[de]=Erinnerungsnachricht
Name[el]=Μήνυμα συναγερμού
Name[en_GB]=Alarm message
Name[es]=Mensaje de alarma
Name[fr]=Message d'alarme
Name[ia]=Message de alarma
Name[it]=Messaggio di avviso
Name[nl]=Herinneringsbericht
......@@ -40,7 +44,9 @@ Name=Alarm error message
Name[ca]=Missatge d'error d'alarma
Name[ca@valencia]=Missatge d'error d'alarma
Name[el]=Μήνυμα σφάλματος συναγερμού
Name[en_GB]=Alarm error message
Name[es]=Mensaje de error de la alarma
Name[fr]=Message d'erreur d'alarmes
Name[ia]=Message de error de Alarma
Name[it]=Messaggio di errore di avviso
Name[nl]=Foutmelding van Alarm
......
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