Commit 017f8894 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 1d75ad9e
......@@ -30,6 +30,7 @@ Comment[de]=Ein Textinhalt-Formatierungsmodul für text/calender
Comment[gl]=Un engadido para formatar o corpo do texto/calendario
Comment[nl]=Een opmaakplug-in voor text/calendar
Comment[pt]=Um 'plugin' de formatação do conteúdo para o tipo 'text/calendar'
Comment[pt_BR]=Um plugin formatador de componente para o tipo text/calendar
Comment[sv]=Ett insticksprogram för brevtextformatering av text/calendar
Comment[uk]=Додаток форматування для text/calendar
Comment[x-test]=xxA bodypart formatter plugin for text/calendarxx
......
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