Commit b0189029 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 653c1cb9
Pipeline #89722 skipped
......@@ -14,6 +14,7 @@ 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[ca@valencia]=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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment