Commit da030b61 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 63ff267b
......@@ -321,6 +321,7 @@ Name[de]=Der Teekocher
Name[el]=Ο βραστήρας τσαγιού
Name[en_GB]=The Tea Cooker
Name[es]=Tetera
Name[et]=Teekann
Name[eu]=Te eltzea
Name[fi]=Teenkeitin
Name[fr]=La théière
......@@ -345,6 +346,7 @@ Comment[de]=Der Teekocher
Comment[el]=Ο βραστήρας τσαγιού
Comment[en_GB]=The Tea Cooker
Comment[es]=Tetera
Comment[et]=Teekann
Comment[eu]=Te eltzea
Comment[fi]=Teenkeitin
Comment[fr]=La théière
......
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