From abf00cfad2a2e7d0f15edbb504212fe1b7fcdfff Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 16 Oct 2021 01:17:56 +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 7fb7de88..ae9c903c 100755 --- a/desktop/org.kde.konsole.desktop +++ b/desktop/org.kde.konsole.desktop @@ -15,6 +15,7 @@ Keywords=terminal;console;script;run;execute;command;command-line;commandline;cl 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[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 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;термінал;консоль;скрипт;сценарій;виконати;запустити;команда;командний рядок;клі;командний інтерфейс;баш;оболонка;шел;зш;