Commit 2fe66b44 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 e9541b2e
......@@ -28,6 +28,7 @@
"Description": "Easily create value tables",
"Description[ca@valencia]": "Crea fàcilment taules de valors",
"Description[ca]": "Crea fàcilment taules de valors",
"Description[de]": "Wertetabellen einfach erstellen",
"Description[en_GB]": "Easily create value tables",
"Description[es]": "Crear tablas de valores con facilidad",
"Description[fi]": "Luo arvotaulukoita helposti",
......
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