Commit 30e94ea4 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 0c225840
Pipeline #34343 skipped
...@@ -4,6 +4,7 @@ DesktopEntry=org.kde.kalarm ...@@ -4,6 +4,7 @@ DesktopEntry=org.kde.kalarm
Comment=KAlarm Comment=KAlarm
Comment[ca]=KAlarm Comment[ca]=KAlarm
Comment[ca@valencia]=KAlarm Comment[ca@valencia]=KAlarm
Comment[de]=KAlarm
Comment[el]=KAlarm Comment[el]=KAlarm
Comment[es]=KAlarm Comment[es]=KAlarm
Comment[ia]=KAlarm Comment[ia]=KAlarm
...@@ -18,6 +19,7 @@ Comment[x-test]=xxKAlarmxx ...@@ -18,6 +19,7 @@ Comment[x-test]=xxKAlarmxx
Name=Alarm message Name=Alarm message
Name[ca]=Missatge d'alarma Name[ca]=Missatge d'alarma
Name[ca@valencia]=Missatge d'alarma Name[ca@valencia]=Missatge d'alarma
Name[de]=Erinnerungsnachricht
Name[el]=Μήνυμα συναγερμού Name[el]=Μήνυμα συναγερμού
Name[es]=Mensaje de alarma Name[es]=Mensaje de alarma
Name[ia]=Message de alarma Name[ia]=Message de alarma
......
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