Commit 13355874 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 183e1b75
......@@ -9,6 +9,10 @@ Name[nl]=akonadi-e-maillezer
Name[pl]=akonadimailreader
Name[pt]=akonadimailreader
Name[pt_BR]=akonadimailreader
Name[sr]=Аконадијев читач поште
Name[sr@ijekavian]=Аконадијев читач поште
Name[sr@ijekavianlatin]=Akonadijev čitač pošte
Name[sr@latin]=Akonadijev čitač pošte
Name[sv]=Akonadi e-postläsare
Name[uk]=akonadimailreader
Name[x-test]=xxakonadimailreaderxx
......
......@@ -33,6 +33,10 @@ Comment[nl]=Een opmaakplug-in voor text/calendar
Comment[pl]=Wtyczka formatująca dla typu 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[sr]=Прикључак форматирања дела тела за text/calendar
Comment[sr@ijekavian]=Прикључак форматирања дела тела за text/calendar
Comment[sr@ijekavianlatin]=Priključak formatiranja dela tela za text/calendar
Comment[sr@latin]=Priključak formatiranja dela tela za 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