Commit 4189b48b 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 c34a5e64
......@@ -28,7 +28,7 @@ Name[fi]=KHelpCenter
Name[fr]=Centre d'aide de KDE
Name[fy]=KHelpCenter
Name[ga]=KHelpCenter
Name[gl]=Centro de axuda de KDE
Name[gl]=KHelpCenter
Name[gu]=KHelpCenter
Name[he]=KHelpCenter
Name[hi]=के-हेल्प-सेंटर
......
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