Commit 69f69d42 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 d469b757
......@@ -334,6 +334,7 @@ Name[pt_BR]=Hora do chá
Name[sv]=Tekokaren
Name[uk]=Приготування чаю
Name[x-test]=xxThe Tea Cookerxx
Name[zh_CN]=煮茶器
Name[zh_TW]=煮茶器
Comment=The Tea Cooker
Comment[ca]=El cuiner de te
......@@ -355,5 +356,6 @@ Comment[pt_BR]=Hora do chá
Comment[sv]=Tekokaren
Comment[uk]=Приготування чаю
Comment[x-test]=xxThe Tea Cookerxx
Comment[zh_CN]=煮茶器
Comment[zh_TW]=煮茶器
Action=Popup
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