From 335148184c94a06830eb5501075cd8c9bcf78a9a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 13 Jul 2022 01:49:11 +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"
---
 desktop/org.kde.konsole.desktop                      | 1 +
 src/plugins/QuickCommands/konsole_quickcommands.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/desktop/org.kde.konsole.desktop b/desktop/org.kde.konsole.desktop
index 5b8277d0..351c691f 100755
--- a/desktop/org.kde.konsole.desktop
+++ b/desktop/org.kde.konsole.desktop
@@ -35,6 +35,7 @@ Keywords[ro]=terminal;consolă;script;rulează;execută;comandă;linie de comand
 Keywords[sk]=terminál;konzola;skript;spustiť;vykonať;príkaz;príkazový riadok;príkazový riadok;cli;bash;sh;shell;zsh;cmd;príkazový riadok
 Keywords[sl]=terminal;console;script;run;execute;command;command-line;commandline;cli;bash;sh;shell;zsh;ukazni poziv
 Keywords[sv]=terminal;konsoll;skript;köra;kommando;kommandorad;bash;sh;skal;zsh;cmd;kommandoprompt
+Keywords[ta]=terminal;console;script;run;execute;command;command-line;commandline;cli;bash;sh;shell;zsh;cmd;command prompt; முனையம்; கான்சோல்; சிறுநிரல்; நிரல்; இயக்கு; கட்டளை; ஆணை; கட்டளை வரி
 Keywords[tr]=uçbirim;terminal;konsol;betik;çalıştır;komut;komut-satırı;komut satırı;cli;bash;sh;kabuk;shell;zsh;cmd;komut istemi
 Keywords[uk]=terminal;console;script;run;execute;command;command-line;commandline;cli;bash;sh;shell;zsh;cmd;command prompt;термінал;консоль;скрипт;сценарій;виконати;запустити;команда;командний рядок;клі;командний інтерфейс;баш;оболонка;шел;зш;кмд;командний запит
 Keywords[x-test]=xxterminalxx;xxconsolexx;xxscriptxx;xxrunxx;xxexecutexx;xxcommandxx;xxcommand-linexx;xxcommandlinexx;xxclixx;xxbashxx;xxshxx;xxshellxx;xxzshxx;xxcmdxx;xxcommand promptxx
diff --git a/src/plugins/QuickCommands/konsole_quickcommands.json b/src/plugins/QuickCommands/konsole_quickcommands.json
index 40c9ee01..a10f3a1f 100644
--- a/src/plugins/QuickCommands/konsole_quickcommands.json
+++ b/src/plugins/QuickCommands/konsole_quickcommands.json
@@ -24,6 +24,7 @@
         "Name[sk]": "Rýchle príkazy",
         "Name[sl]": "Hitri ukazi",
         "Name[sv]": "Snabbkommandon",
+        "Name[ta]": "விரை கட்டளைகள்",
         "Name[tr]": "Hızlı Komutlar",
         "Name[uk]": "Швидкі команди",
         "Name[x-test]": "xxQuick Commandsxx",