Commit 80d11fd1 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 21374aa1
......@@ -5,6 +5,7 @@ Name[ca]=Exporta un projecte del K3b
Name[ca@valencia]=Exporta un projecte del K3b
Name[cs]=Export projektu K3B
Name[de]=K3B Projekt-Export
Name[es]=Exportación de proyecto de K3B
Name[nl]=Exporteren van K3B-project
Name[pt]=Exportação para Projecto do K3B
Name[sv]=K3B-projektexport
......
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