Commit c6dbbd61 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 2f3e0a68
...@@ -4,6 +4,7 @@ ServiceTypes=KTextEditor/Plugin ...@@ -4,6 +4,7 @@ ServiceTypes=KTextEditor/Plugin
X-KDE-Library=externaltoolsplugin X-KDE-Library=externaltoolsplugin
Name=External Tools Name=External Tools
Name[ar]=الأدوات الخارجية Name[ar]=الأدوات الخارجية
Name[ast]=Ferramientes esternes
Name[ca]=Eines externes Name[ca]=Eines externes
Name[cs]=Externí nástroje Name[cs]=Externí nástroje
Name[da]=Eksterne værktøjer Name[da]=Eksterne værktøjer
...@@ -45,6 +46,7 @@ Name[zh_CN]=外部工具 ...@@ -45,6 +46,7 @@ Name[zh_CN]=外部工具
Name[zh_TW]=外部工具 Name[zh_TW]=外部工具
Comment=External Tools Comment=External Tools
Comment[ar]=الأدوات الخارجية Comment[ar]=الأدوات الخارجية
Comment[ast]=Ferramientes esternes
Comment[be]=Знешнія інструменты Comment[be]=Знешнія інструменты
Comment[bg]=Външни инструменти Comment[bg]=Външни инструменти
Comment[ca]=Eines externes Comment[ca]=Eines externes
......
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