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"
wilder
l10n daemon script 5 years ago
parent fd96aad2c2
commit 2d5f3f4541
  1. 1
      src/plugins/SSHManager/konsole_sshmanager.json

@ -9,6 +9,7 @@
"Name[el]": "Διαχειριστής SSH",
"Name[en_GB]": "SSH Manager",
"Name[es]": "Gestor de SSH",
"Name[eu]": "SSH kudeatzailea",
"Name[fi]": "SSH-hallinta",
"Name[fr]": "Gestionnaire « SSH »",
"Name[it]": "Gestore SSH",

Loading…
Cancel
Save