Commit d36dcdb7 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 6e37bcd1
Pipeline #67542 skipped
......@@ -79,6 +79,7 @@ Comment[de]=Sicherheit einrichten
Comment[el]=Διαμόρφωση ασφάλειας
Comment[es]=Configurar la seguridad
Comment[eu]=Konfiguratu segurtasuna
Comment[fr]=Configuration de la sécurité
Comment[it]=Configura la sicurezza
Comment[ko]=보안 설정
Comment[nl]=Beveiliging configureren
......@@ -95,6 +96,7 @@ X-KDE-Keywords[de]=Akregator,einstellen,konfigurieren,Konfiguration,Einrichtung,
X-KDE-Keywords[el]=akregator, διαμόρφωση, ρυθμίσεις, ασφάλεια
X-KDE-Keywords[es]=akregator, configurar, preferencias, seguridad
X-KDE-Keywords[eu]=akregator, konfiguratu, ezarpenak, segurtasuna
X-KDE-Keywords[fr]=Akregator, configurer, configuration, sécurité
X-KDE-Keywords[it]=akregator, configura, impostazioni, sicurezza
X-KDE-Keywords[ko]=akregator, configure, settings, security, 설정, 보안
X-KDE-Keywords[nl]=akregator, configureren, instellingen, beveiliging
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