Commit 7a36e125 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 5d8e4c08
......@@ -109,6 +109,7 @@ GenericName[zh_CN]=通过点连接创建方形
GenericName[zh_TW]=將點連起來組成方塊
Comment=Connect the dots to create squares
Comment[ca]=Connecteu els punts per crear quadrats
Comment[ca@valencia]=Connecteu els punts per crear quadrats
Comment[en_GB]=Connect the dots to create squares
Comment[es]=Conecta los puntos para crear cuadrados
Comment[nl]=Verbind de stippen om vierkanten te maken
......
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