From 26c678e290ab384efda03244712a624adb02c97d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 11 Sep 2022 01:45:48 +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/QuickCommands/konsole_quickcommands.json | 1 + src/plugins/SSHManager/konsole_sshmanager.json | 1 + 2 files changed, 2 insertions(+) diff --git a/src/plugins/QuickCommands/konsole_quickcommands.json b/src/plugins/QuickCommands/konsole_quickcommands.json index 5bfc0192..c86f198c 100644 --- a/src/plugins/QuickCommands/konsole_quickcommands.json +++ b/src/plugins/QuickCommands/konsole_quickcommands.json @@ -3,6 +3,7 @@ "Name": "Quick Commands", "Name[ar]": "الأوامر السريعة", "Name[az]": "Sürətli əmrlər", + "Name[be]": "Хуткія загады", "Name[bg]": "Бързи команди", "Name[ca@valencia]": "Ordres ràpides", "Name[ca]": "Ordres ràpides", diff --git a/src/plugins/SSHManager/konsole_sshmanager.json b/src/plugins/SSHManager/konsole_sshmanager.json index d4227c74..83a63bf3 100644 --- a/src/plugins/SSHManager/konsole_sshmanager.json +++ b/src/plugins/SSHManager/konsole_sshmanager.json @@ -3,6 +3,7 @@ "Name": "SSH Manager", "Name[ar]": "مدير SSH", "Name[az]": "SSH meneceri", + "Name[be]": "Кіраўнік SSH", "Name[bg]": "Управление на SSH", "Name[ca@valencia]": "Gestor de SSH", "Name[ca]": "Gestor de SSH",