Commit 1c3a6fd6 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 b454aa3c
......@@ -48,6 +48,7 @@ Name[zh_CN]=全局菜单
Comment=Global menubar in your Plasma Desktop
Comment[ca]=Barra de menús global a l'escriptori Plasma
Comment[de]=Globale Menüleiste auf der Plasma-Arbeitsfläche
Comment[es]=Barra de menú global para el escritorio Plasma
Comment[fr]=Barre globale de menu de votre bureau Plasma
Comment[nl]=Globale menubalk in uw Plasma-bureaublad
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