Commit 37f53a9a 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 d5d6080e
......@@ -5,6 +5,7 @@ Version=1.0
Name=Kaidan
Name[ca]=Kaidan
Name[ca@valencia]=Kaidan
Name[es]=Kaidan
Name[et]=Kaidan
Name[fr]=Kaidan
Name[it]=Kaidan
......
......@@ -16,6 +16,7 @@ Comment[zh_TW]=適合每一台裝置且使用者友好的 XMPP 用戶端
Name=Kaidan
Name[ca]=Kaidan
Name[ca@valencia]=Kaidan
Name[es]=Kaidan
Name[et]=Kaidan
Name[fr]=Kaidan
Name[it]=Kaidan
......
......@@ -4,6 +4,7 @@ Version=1.0
Name=Kaidan
Name[ca]=Kaidan
Name[ca@valencia]=Kaidan
Name[es]=Kaidan
Name[et]=Kaidan
Name[fr]=Kaidan
Name[it]=Kaidan
......
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