Commit 1f9435e0 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 2e2fb098
Pipeline #34226 skipped
......@@ -4,8 +4,12 @@ DesktopEntry=org.kde.kalarm
Comment=KAlarm
Comment[ca]=KAlarm
Comment[ca@valencia]=KAlarm
Comment[el]=KAlarm
Comment[es]=KAlarm
Comment[ia]=KAlarm
Comment[nl]=KAlarm
Comment[pt]=KAlarm
Comment[sl]=KAlarm
Comment[sv]=Kalarm
Comment[uk]=KAlarm
Comment[x-test]=xxKAlarmxx
......@@ -14,8 +18,12 @@ Comment[x-test]=xxKAlarmxx
Name=Alarm message
Name[ca]=Missatge d'alarma
Name[ca@valencia]=Missatge d'alarma
Name[el]=Μήνυμα συναγερμού
Name[es]=Mensaje de alarma
Name[ia]=Message de alarma
Name[nl]=Herinneringsbericht
Name[pt]=Mensagem do alarme
Name[sl]=Obvestilo alarma
Name[sv]=Alarmmeddelande
Name[uk]=Повідомлення нагадування
Name[x-test]=xxAlarm messagexx
......@@ -25,8 +33,12 @@ Action=Popup
Name=Alarm error message
Name[ca]=Missatge d'error d'alarma
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[nl]=Foutmelding van Alarm
Name[pt]=Mensagem de erro do alarme
Name[sl]=Alarmovo obvestilo o napaki
Name[sv]=Alarmfelmeddelande
Name[uk]=Повідомлення помилки нагадування
Name[x-test]=xxAlarm error 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