From 653c1cb90a03b24fed18aab79a3a777c9242d994 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 18 Oct 2021 01:19: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"
---
 desktop/org.kde.konsole.desktop | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/desktop/org.kde.konsole.desktop b/desktop/org.kde.konsole.desktop
index ae9c903c..68f8b9ee 100755
--- a/desktop/org.kde.konsole.desktop
+++ b/desktop/org.kde.konsole.desktop
@@ -14,6 +14,8 @@ StartupWMClass=konsole
 Keywords=terminal;console;script;run;execute;command;command-line;commandline;cli;bash;sh;shell;zsh
 Keywords[az]=terminal;console;script;run;execute;command;command-line;commandline;cli;bash;sh;shell;zsh;terminal;konsol;işə salmaq;icra etmək;əmr;əmr sətri
 Keywords[ca]=terminal;consola;script;executar;ordre;línia d'ordres;línia ordres;cli;bash;sh;shell;zsh
+Keywords[el]=τερματικό;κονσόλα;σενάριο;εκτελείται;εκτέλεση;εντολή;γραμμή-εντολών;commandline;cli;bash;sh;shell;zsh
+Keywords[en_GB]=terminal;console;script;run;execute;command;command-line;commandline;cli;bash;sh;shell;zsh
 Keywords[es]=terminal;consola;script;guion;guión;lanzar;ejecutar;comando;orden;línea de órdenes;línea de comandos;cli;bash;sh;shell;intérprete;zsh
 Keywords[fr]=terminal ; console ; script ; lancer ; exécuter ;commande ; commande en ligne ; bash ; sh ; shell ; zsh
 Keywords[nl]=terminal;console;script;run;uitvoeren;commando;commandoregel;cli;bash;sh;shell;zsh