Commit bd7126d0 authored by Script Kiddy's avatar Script Kiddy

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 a6ac8b92
......@@ -80,7 +80,7 @@ GenericName[ar]=مجدول التنبيهات الشخصي
GenericName[bg]=Настройки на аларма
GenericName[bs]=Razpoređivač osobnih alarma
GenericName[ca]=Planificador personal per a alarmes
GenericName[ca@valencia]=Planificador d'alarmes personals
GenericName[ca@valencia]=Planificador personal per a alarmes
GenericName[cs]=Osobní plánovač alarmů
GenericName[cy]=Trefnlennydd Larwm Personol
GenericName[da]=Personlig skemalægning af 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