Commit 6939346e 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 1c382a7f
...@@ -40,6 +40,7 @@ Name[x-test]=xxExport Layoutxx ...@@ -40,6 +40,7 @@ Name[x-test]=xxExport Layoutxx
Name[zh_CN]=导出布局 Name[zh_CN]=导出布局
Name[zh_TW]=匯出佈局 Name[zh_TW]=匯出佈局
Comment=Export Layout for Object Diagrams Comment=Export Layout for Object Diagrams
Comment[ca]=Exporta la disposició dels diagrames d'objectes
Comment[cs]=Program rozložení pro diagramy objektu Comment[cs]=Program rozložení pro diagramy objektu
Comment[en_GB]=Export Layout for Object Diagrams Comment[en_GB]=Export Layout for Object Diagrams
Comment[es]=Exportar disposición de diagramas de objetos Comment[es]=Exportar disposición de diagramas de objetos
......
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