Commit 3cacbed8 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 31e1fd6d
......@@ -10,7 +10,7 @@ X-KDE-ParentApp=kcontrol
X-KDE-Weight=50
Name=Oxygen Widget Style
Name[ca]=Estil dels estris Oxygen
Name[ca]=Estil Oxygen per als estris
Name[ca@valencia]=Estil dels ginys («widgets») Oxygen
Name[cs]=Styl widgetů Oxygen
Name[da]=Oxygen kontrolstil
......
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