Commit 2011b327 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 e74fc069
......@@ -200,6 +200,7 @@ X-KDE-Keywords[bg]=стил,каскаден стил,достъпност,CSS,H
X-KDE-Keywords[bs]=CSS,HTML,style,stylesheet,accessibility
X-KDE-Keywords[ca]=CSS,HTML,estil,fulls d'estil,accessibilitat
X-KDE-Keywords[ca@valencia]=CSS,HTML,estil,fulls d'estil,accessibilitat
X-KDE-Keywords[cs]=CSS,HTML,styl,styly,zpřístupnění
X-KDE-Keywords[da]=CSS,HTML,stil,stylesheet,stilark,tilgængelighed,accessibility
X-KDE-Keywords[de]=CSS,HTML,Stylesheet,Stilvorlagen,Zugangshilfen
X-KDE-Keywords[el]=CSS,HTML,στιλ,φύλλο αισθητικής επικάλυψης,προσβασιμότητα
......
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