Commit 53a7a027 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 320351b5
......@@ -92,6 +92,7 @@ Comment[et]=Pluginate seadistamine
Comment[fi]=Liitännäisten asetukset
Comment[fr]=Configurer les modules externes
Comment[gl]=Configurar os complementos
Comment[ia]=Configura Plug-ins
Comment[it]=Configura estensioni
Comment[ko]=플러그인 설정
Comment[lt]=Konfigūruoti papildinius
......@@ -127,6 +128,7 @@ X-KDE-Keywords[et]=akregator, seadistamine, seadistused, veebimootor, pluginad
X-KDE-Keywords[fi]=akregator, asetukset, webEngine, liitännäiset
X-KDE-Keywords[fr]=Akregator, configurer, paramétrage, webEngine, modules externes
X-KDE-Keywords[gl]=akregator, configurar, configuración, motor web, complementos
X-KDE-Keywords[ia]=akregator, configure, settings, webEngine, plugins
X-KDE-Keywords[it]=akregator, configurazione, impostazioni, webEngine, estensioni
X-KDE-Keywords[ko]=akregator, configure, settings, online readers, 설정, 온라인 리더, webEngine, plugins
X-KDE-Keywords[lt]=akregator, konfigūruoti, nuostatos, interneto variklis, papildiniai
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