Commit 73074cac authored by Script Kiddy's avatar Script Kiddy

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 dabd9b10
......@@ -89,6 +89,7 @@ Comment[en_GB]=Configure Plugins
Comment[es]=Configurar complementos
Comment[et]=Pluginate seadistamine
Comment[fi]=Liitännäisten asetukset
Comment[fr]=Configurer les modules complémentaires
Comment[it]=Configura estensioni
Comment[ko]=플러그인 설정
Comment[lt]=Konfigūruoti papildinius
......@@ -117,6 +118,7 @@ X-KDE-Keywords[en_GB]=akregator, configure, settings, webEngine, plugins
X-KDE-Keywords[es]=akregator, configurar, preferencias, motor-web, complementos
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 complémentaires
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
......
......@@ -18,7 +18,7 @@ Name[et]=Metakiti salvestamisrakendus
Name[eu]=Metakit-en biltegiratze euskarria
Name[fa]=پشتیبان ذخیره‌گاه Metakit
Name[fi]=Metakit-tallennusajuri
Name[fr]=Stockage avec Metakit
Name[fr]=Moteur de stockage Metakit
Name[fy]=Metakit-opslachefterein
Name[ga]=Inneall stórála Metakit
Name[gl]=Infraestrutura do almacenador Metakit
......
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