Commit 8fd477f8 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 82ce45ca
......@@ -316,18 +316,24 @@ Action=Sound
Name=The Tea Cooker
Name[ca]=El cuiner de te
Name[fr]=La théière
Name[ko]=차 끓이기 도구
Name[nl]=De Theezetter
Name[pt]=O Cozinheiro de Chá
Name[pt_BR]=Hora do chá
Name[uk]=Приготування чаю
Name[x-test]=xxThe Tea Cookerxx
Comment=The Tea Cooker
Comment[ca]=El cuiner de te
Comment[fr]=La théière
Comment[ko]=차 끓이기 도구
Comment[nl]=De Theezetter
Comment[pt]=O Cozinheiro de Chá
Comment[pt_BR]=Hora do chá
Comment[uk]=Приготування чаю
Comment[x-test]=xxThe Tea Cookerxx
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