Commit d210e25c 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 3744436a
......@@ -4,6 +4,7 @@ Name[ca]=Accés remot amb SSH
Name[ca@valencia]=Accés remot amb SSH
Name[cs]=Vzdálený přístup SSH
Name[da]=SSH-fjernadgang
Name[de]=SSH-Zugriff auf Fremdrechner
Name[el]=SSH απομακρυσμένη πρόσβαση
Name[en_GB]=SSH Remote Access
Name[es]=Acceso remoto 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