Commit c499bfff 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 278c6afb
......@@ -44,6 +44,7 @@ Comment[ca]=Exporta la disposició dels diagrames d'objectes
Comment[cs]=Program rozložení pro diagramy objektu
Comment[en_GB]=Export Layout for Object Diagrams
Comment[es]=Exportar disposición de diagramas de objetos
Comment[it]=Disposizione di esportazione per i diagrammi degli oggetti
Comment[nl]=Indeling voor objectdiagrammen exporteren
Comment[pt]=Exportar a Disposição dos Diagramas de Objectos
Comment[sv]=Exportera layout av objektdiagram
......
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