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 19b83275b4
commit 91ea6de3cd
  1. 2
      src/plugins/SSHManager/konsole_sshmanager.json

@ -9,10 +9,12 @@
"Name[el]": "Διαχειριστής SSH",
"Name[es]": "Gestor de SSH",
"Name[fr]": "Gestionnaire « SSH »",
"Name[it]": "Gestore SSH",
"Name[nl]": "SSH-beheerder",
"Name[pl]": "Zarządzanie SSH",
"Name[pt]": "Gestor de SSH",
"Name[pt_BR]": "Gerenciador de SSH",
"Name[sk]": "Správca SSH",
"Name[sl]": "Upravljalnik SSH",
"Name[sv]": "SSH-hanterare",
"Name[uk]": "Керування SSH",

Loading…
Cancel
Save