From bdf48484411675f1afbbc50b0702d91297a4529f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 24 Oct 2021 01:18:27 +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 + 1 file changed, 1 insertion(+) diff --git a/desktop/org.kde.konsole.desktop b/desktop/org.kde.konsole.desktop index e3c08eb5..8a89a427 100755 --- a/desktop/org.kde.konsole.desktop +++ b/desktop/org.kde.konsole.desktop @@ -19,6 +19,7 @@ Keywords[el]=τερματικό;κονσόλα;σενάριο;εκτελείτα 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[it]=terminale;console;script;esegui;comando;riga di comando;cli;bash;sh;shell;zsh Keywords[nl]=terminal;console;script;run;uitvoeren;commando;commandoregel;cli;bash;sh;shell;zsh Keywords[sv]=terminal;konsoll;skript;köra;kommando;kommandorad;bash;sh;skal;zsh Keywords[uk]=terminal;console;script;run;execute;command;command-line;commandline;cli;bash;sh;shell;zsh;термінал;консоль;скрипт;сценарій;виконати;запустити;команда;командний рядок;клі;командний інтерфейс;баш;оболонка;шел;зш;