Commit d96f5614 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 6dd5f5c6
......@@ -5,8 +5,8 @@ X-KDE-Library=katesnippetsplugin
Icon=document-new
Name=Snippets Tool View
Name[ast]=Vista de ferramientes de snippets
Name[ca]=Vista d'eina per als retalls
Name[ca@valencia]=Vista d'eina per als retalls
Name[ca]=Vista d'eina de retalls
Name[ca@valencia]=Vista d'eina de retalls
Name[cs]=Nástrojový pohled ústřižků
Name[da]=Værktøjsvisning til tekststumper
Name[de]=Werkzeugansicht für Textbausteine
......
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