Commit dc58e281 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 4ae4d6a4
......@@ -10,6 +10,7 @@ Name[nl]=akonadi-e-maillezer
Name[pl]=akonadimailreader
Name[pt]=akonadimailreader
Name[pt_BR]=akonadimailreader
Name[sk]=akonadimailreader
Name[sr]=Аконадијев читач поште
Name[sr@ijekavian]=Аконадијев читач поште
Name[sr@ijekavianlatin]=Akonadijev čitač pošte
......
......@@ -36,6 +36,7 @@ Comment[nn]=Eit programtillegg for formatering av meldingstekstar i «text/calen
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[sk]=Modul pre formátovanie tela pre text/calendar
Comment[sr]=Прикључак форматирања дела тела за text/calendar
Comment[sr@ijekavian]=Прикључак форматирања дела тела за text/calendar
Comment[sr@ijekavianlatin]=Priključak formatiranja dela tela za text/calendar
......
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