Commit b80a3c49 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 0df08a34
Pipeline #70672 skipped
......@@ -89,6 +89,7 @@ Comment[ko]=보안 설정
Comment[nl]=Beveiliging configureren
Comment[pt]=Configurar a Segurança
Comment[pt_BR]=Configurar segurança
Comment[sk]=Nastaviť zabezpečenie
Comment[sl]=Nastavitve varnosti
Comment[sv]=Anpassa säkerhet
Comment[uk]=Налаштовування захисту
......@@ -111,6 +112,7 @@ X-KDE-Keywords[ko]=akregator, configure, settings, security, 설정, 보안
X-KDE-Keywords[nl]=akregator, configureren, instellingen, beveiliging
X-KDE-Keywords[pt]=akregator, configurar, configuração, segurança
X-KDE-Keywords[sk]=akregator, nastaviť, nastavenia, bezpečnosť
X-KDE-Keywords[sl]=akregator, nastavi, nastavitve, varnost
X-KDE-Keywords[sv]=akregator, anpassa, inställningar, säkerhet
Markdown is supported
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