Skip to content

Commit

Permalink
SVN_SILENT made messages (.desktop file) - always resolve ours
Browse files Browse the repository at this point in the history
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"
  • Loading branch information
l10n daemon script committed Jun 30, 2021
1 parent 81f1c53 commit 553e672
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/plugins/SSHManager/konsole_sshmanager.json
Expand Up @@ -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",
Expand Down

0 comments on commit 553e672

Please sign in to comment.