Commit 2679582b 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 d06100f1
Pipeline #34640 skipped
......@@ -11,6 +11,7 @@ Comment[ia]=KAlarm
Comment[it]=KAlarm
Comment[nl]=KAlarm
Comment[pt]=KAlarm
Comment[pt_BR]=KAlarm
Comment[sl]=KAlarm
Comment[sv]=Kalarm
Comment[uk]=KAlarm
......@@ -27,6 +28,7 @@ Name[ia]=Message de alarma
Name[it]=Messaggio di avviso
Name[nl]=Herinneringsbericht
Name[pt]=Mensagem do alarme
Name[pt_BR]=Mensagem de alarme
Name[sl]=Obvestilo alarma
Name[sv]=Alarmmeddelande
Name[uk]=Повідомлення нагадування
......@@ -43,6 +45,7 @@ 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[pt_BR]=Mensagem de erro no alarme
Name[sl]=Alarmovo obvestilo o napaki
Name[sv]=Alarmfelmeddelande
Name[uk]=Повідомлення помилки нагадування
......
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