From 553e67203a75176cbe8429c264be7af94fdc7fdb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 30 Jun 2021 01:24:35 +0000 Subject: [PATCH] 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" --- src/plugins/SSHManager/konsole_sshmanager.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/SSHManager/konsole_sshmanager.json b/src/plugins/SSHManager/konsole_sshmanager.json index 6ada834f3..409130ce4 100644 --- a/src/plugins/SSHManager/konsole_sshmanager.json +++ b/src/plugins/SSHManager/konsole_sshmanager.json @@ -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",