Commit ca191b08 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 c32c54a2
......@@ -327,6 +327,7 @@ Name[fr]=La théière
Name[gl]=Quece-tés
Name[it]=La teiera
Name[ko]=차 끓이기 도구
Name[lt]=Arbatos virėjas
Name[nl]=De Theezetter
Name[nn]=Tekokaren
Name[pl]=Program do parzenia herbaty
......@@ -350,6 +351,7 @@ Comment[fr]=La théière
Comment[gl]=Quece-tés
Comment[it]=La teiera
Comment[ko]=차 끓이기 도구
Comment[lt]=Arbatos virėjas
Comment[nl]=De Theezetter
Comment[nn]=Tekokaren
Comment[pl]=Program do parzenia herbaty
......
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