From 84917cb92afd972dd866a350274f2b379bb28aba Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 30 Oct 2021 01:21:10 +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 c1594efd..804096dd 100755 --- a/desktop/org.kde.konsole.desktop +++ b/desktop/org.kde.konsole.desktop @@ -23,6 +23,7 @@ Keywords[ia]=terminal;console;script;run;execute;command;command-line;commandlin 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[pl]=terminal;konsola;skrypt;uruchom;wykonaj;polecenie;wiersz poleceń;linia komend;cli;bash;sh;powłoka;zsh +Keywords[pt]=terminal;consola;programa;executar;comando;linha de comandos;cli;bash;sh;shell;zsh Keywords[pt_BR]=terminal;console;script;executar;rodar;comando;linha de comando;cli;bash;sh;shell;zsh Keywords[sl]=terminal;console;script;run;execute;command;command-line;commandline;cli;bash;sh;shell;zsh Keywords[sv]=terminal;konsoll;skript;köra;kommando;kommandorad;bash;sh;skal;zsh