Commit d469b757 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 00394f60
......@@ -318,10 +318,12 @@ Name=The Tea Cooker
Name[ca]=El cuiner de te
Name[de]=Der Teekocher
Name[el]=Ο βραστήρας τσαγιού
Name[en_GB]=The Tea Cooker
Name[eu]=Te eltzea
Name[fr]=La théière
Name[it]=La teiera
Name[ko]=차 끓이기 도구
Name[nl]=De Theezetter
......@@ -337,10 +339,12 @@ Comment=The Tea Cooker
Comment[ca]=El cuiner de te
Comment[de]=Der Teekocher
Comment[el]=Ο βραστήρας τσαγιού
Comment[en_GB]=The Tea Cooker
Comment[eu]=Te eltzea
Comment[fr]=La théière
Comment[it]=La teiera
Comment[ko]=차 끓이기 도구
Comment[nl]=De Theezetter
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