Commit e62f3b19 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 2b1547b3
......@@ -32,7 +32,6 @@ Name[sr@latin]=Sučelje za dekoraciju kalendara
Name[sv]=Gränssnitt för kalenderdekoration
Name[tr]=Takvim Dekorasyon Arayüzü
Name[uk]=Інтерфейс оздоблення календаря
Name[x-test]=xxCalendar Decoration Interfacexx
......@@ -71,6 +70,5 @@ Comment[sr@latin]=Priključak za dekoraciju kalendara
Comment[sv]=Insticksprogram för kalenderdekoration
Comment[tr]=Takvim Dekorasyon Eklentisi
Comment[uk]=Додаток прикрас календаря
Comment[x-test]=xxCalendar Decoration Pluginxx
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