Commit aa3c0ed3 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 b7f86042
...@@ -317,6 +317,7 @@ Action=Sound ...@@ -317,6 +317,7 @@ Action=Sound
Name=The Tea Cooker Name=The Tea Cooker
Name[ca]=El cuiner de te Name[ca]=El cuiner de te
Name[cs]=Vařič čaje Name[cs]=Vařič čaje
Name[de]=Der Teekocher Name[de]=Der Teekocher
Name[el]=Ο βραστήρας τσαγιού Name[el]=Ο βραστήρας τσαγιού
Name[en_GB]=The Tea Cooker Name[en_GB]=The Tea Cooker
...@@ -343,6 +344,7 @@ Name[zh_TW]=煮茶器 ...@@ -343,6 +344,7 @@ Name[zh_TW]=煮茶器
Comment=The Tea Cooker Comment=The Tea Cooker
Comment[ca]=El cuiner de te Comment[ca]=El cuiner de te
Comment[cs]=Vařič čaje Comment[cs]=Vařič čaje
Comment[de]=Der Teekocher Comment[de]=Der Teekocher
Comment[el]=Ο βραστήρας τσαγιού Comment[el]=Ο βραστήρας τσαγιού
Comment[en_GB]=The Tea Cooker Comment[en_GB]=The Tea Cooker
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