Commit 9b51d962 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 98fbd82c
......@@ -3,6 +3,7 @@ Type=Service
ServiceTypes=KTextEditor/Plugin
X-KDE-Library=katefiletreeplugin
Name=Document Tree View
Name[ast]=Vista n'árbole de documentos
Name[ca]=Vista en arbre de documents
Name[ca@valencia]=Vista en arbre de documents
Name[de]=Dokumentbaumansicht
......
......@@ -28,6 +28,7 @@ Name[x-test]=xxSnippets Tool Viewxx
Name[zh_CN]=代码片段工具视图
Name[zh_TW]=片段工具檢視
Comment=Manage your code snippets or download new ones
Comment[ast]=Xestiona snippets de códigu o baxa otros nuevos
Comment[ca]=Gestiona els retalls de codi o en baixa de nous
Comment[ca@valencia]=Gestiona els retalls de codi o en baixa de nous
Comment[de]=Verwaltung Ihrer Textbausteine oder Herunterladen neuer 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