Commit 74ede382 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 959933e8
......@@ -334,6 +334,7 @@ Name[nn]=Tekokaren
Name[pl]=Program do parzenia herbaty
Name[pt]=O Cozinheiro de Chá
Name[pt_BR]=Hora do chá
Name[sk]=Varič čaju
Name[uk]=Приготування чаю
Name[x-test]=xxThe Tea Cookerxx
......@@ -359,6 +360,7 @@ Comment[nn]=Tekokaren
Comment[pl]=Program do parzenia herbaty
Comment[pt]=O Cozinheiro de Chá
Comment[pt_BR]=Hora do chá
Comment[sk]=Varič čaju
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