Commit 553e6720 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 81f1c535
......@@ -10,6 +10,7 @@
"Name[nl]": "SSH-beheerder",
"Name[pl]": "Zarządzanie SSH",
"Name[pt]": "Gestor de SSH",
"Name[pt_BR]": "Gerenciador de SSH",
"Name[sl]": "Upravljalnik SSH",
"Name[sv]": "SSH-hanterare",
"Name[uk]": "Керування SSH",
......
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