Commit 254f0d80 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 6c8e0db2
......@@ -139,6 +139,7 @@ X-KDE-Keywords[mr]=एक्रीगेटर, संयोजना, संय
X-KDE-Keywords[nb]=akregator, sett opp, innstillinger, avansert
X-KDE-Keywords[nds]=Akregator, fastleggen, Instellen, verwiedert
X-KDE-Keywords[nl]=akregator, instellen, instellingen, geavanceerd
X-KDE-Keywords[nn]=akregator, kjelder, oppsett, set opp, innstillingar, lesarar, tilkopla-lesarar, nyheitskjelder
X-KDE-Keywords[pl]=akregator, konfiguruj, ustawienia, zaawansowane
X-KDE-Keywords[pt]=akregator, configurar, configuração, avançado
X-KDE-Keywords[pt_BR]=akregator,configurar,configurações,avançado
......
......@@ -138,6 +138,7 @@ X-KDE-Keywords[mr]=एक्रीगेटर, संयोजना, संय
X-KDE-Keywords[nb]=akregator, sett opp, innstillinger, arkiv
X-KDE-Keywords[nds]=Akregator, fastleggen, Instellen, Archiev
X-KDE-Keywords[nl]=akregator, instellen, instellingen, archief
X-KDE-Keywords[nn]=akregator, kjelder, oppsett, set opp, innstillingar, lesarar, tilkopla-lesarar, nyheitskjelder, arkiv
X-KDE-Keywords[pl]=akregator, konfiguruj, ustawienia, archiwum
X-KDE-Keywords[pt]=akregator, configurar, configuração, arquivo
X-KDE-Keywords[pt_BR]=akregator,configurar,configurações,arquivar
......
......@@ -159,6 +159,7 @@ X-KDE-Keywords[mr]=एक्रीगेटर, संयोजना, संय
X-KDE-Keywords[nb]=akregator, sett opp, innstillinger, Generelt
X-KDE-Keywords[nds]=Akregator, fastleggen, Instellen, allmeen
X-KDE-Keywords[nl]=akregator, instellen, instellingen, algemeen
X-KDE-Keywords[nn]=akregator, kjelder, oppsett, set opp, innstillingar, lesarar, tilkopla-lesarar, nyheitskjelder, generelt
X-KDE-Keywords[pl]=akregator, konfiguruj, ustawienia, ogólne
X-KDE-Keywords[pt]=akregator, configurar, configuração, Geral
X-KDE-Keywords[pt_BR]=akregator, configurar, configurações, geral
......
......@@ -97,6 +97,7 @@ Comment[ko]=플러그인 설정
Comment[lt]=Konfigūruoti papildinius
Comment[nb]=Sett opp programtillegg
Comment[nl]=Plugins instellen
Comment[nn]=Set opp programtillegg
Comment[pl]=Ustawienia wtyczek
Comment[pt]=Configurar os 'Plugins'
Comment[pt_BR]=Configurar plugins
......@@ -130,6 +131,7 @@ X-KDE-Keywords[it]=akregator, configurazione, impostazioni, webEngine, estension
X-KDE-Keywords[ko]=akregator, configure, settings, online readers, 설정, 온라인 리더, webEngine, plugins
X-KDE-Keywords[lt]=akregator, konfigūruoti, nuostatos, interneto variklis, papildiniai
X-KDE-Keywords[nl]=akregator, instellen, instellingen, webEngine, plug-ins
X-KDE-Keywords[nn]=akregator, kjelder, oppsett, set opp, innstillingar, lesarar, tilkopla-lesarar, nyheitskjelder, programtillegg, vevmotor
X-KDE-Keywords[pl]=akregator, konfiguruj, ustawienia, webEngine, wtyczki
X-KDE-Keywords[pt]=akregator, configurar, configuração, motor Web, 'plugins'
X-KDE-Keywords[pt_BR]=akregator, configurar, configurações, mecanismo Web, plugins
......
......@@ -149,6 +149,7 @@ Comment[mr]=केडीई बातम्या फीड वाचक
Comment[nb]=En nyhetskildeleser for KDE
Comment[nds]=En Mellenstroom-Kieker för KDE
Comment[nl]=Een KDE newsfeedlezer.
Comment[nn]=Ein nyheitskjeldelesar frå KDE
Comment[pa]=KDE ਨਿਊਜ਼ ਫੀਡ ਰੀਡਰ
Comment[pl]=Czytnik kanałów aktualności dla KDE
Comment[pt]=Um Leitor de Fontes Noticiosas do KDE
......
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