Commit 1f2e66f2 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 249a56f0
......@@ -335,6 +335,7 @@ Name[nn]=Tekokaren
Name[pl]=Program do parzenia herbaty
Name[pt]=O Cozinheiro de Chá
Name[pt_BR]=Hora do chá
Name[ru]=Помощник в приготовлении чая
Name[sk]=Varič čaju
Name[sl]=Kuhalnik čaja
......@@ -363,6 +364,7 @@ Comment[nn]=Tekokaren
Comment[pl]=Program do parzenia herbaty
Comment[pt]=O Cozinheiro de Chá
Comment[pt_BR]=Hora do chá
Comment[ru]=Помощник в приготовлении чая
Comment[sk]=Varič čaju
Comment[sl]=Kuhalnik čaja
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