Commit 2be35266 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 0fbb0a0b
......@@ -3,6 +3,7 @@ Encoding=UTF-8
Name=K3b Project Export
Name[ca]=Exporta un projecte del K3b
Name[ca@valencia]=Exporta un projecte del K3b
Name[de]=K3b Projekt-Export
Name[nl]=Exporteren van K3b-project
Name[pt]=Exportação para Projecto do K3b
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