Commit acbba0ef 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 74ede382
......@@ -174,7 +174,7 @@ Comment[pt_BR]=O chá está pronto
Comment[ro]=Ceaiul este gata
Comment[ru]=Чай готов
Comment[sk]=Čaj je pripravený
Comment[sl]=Čaj je pripravljen.
Comment[sl]=Čaj je pripravljen
Comment[sr]=Чај је готов
Comment[sr@ijekavian]=Чај је готов
Comment[sr@ijekavianlatin]=Čaj je gotov
......@@ -335,6 +335,7 @@ Name[pl]=Program do parzenia herbaty
Name[pt]=O Cozinheiro de Chá
Name[pt_BR]=Hora do chá
Name[sk]=Varič čaju
Name[sl]=Kuhalnik čaja
Name[uk]=Приготування чаю
Name[x-test]=xxThe Tea Cookerxx
......@@ -361,6 +362,7 @@ Comment[pl]=Program do parzenia herbaty
Comment[pt]=O Cozinheiro de Chá
Comment[pt_BR]=Hora do chá
Comment[sk]=Varič čaju
Comment[sl]=Kuhalnik čaja
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