Commit 6844c684 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 809df6cb
Pipeline #66228 skipped
......@@ -20,7 +20,6 @@ Name[bs]=Sigurnost
Name[ca]=Seguretat
Name[cy]=Diogelwch
Name[da]=Sikkerhed
Name[de]=Sicherheit
Name[el]=Ασφάλεια
Name[en_GB]=Security
Name[eo]=Sekureco
......@@ -71,16 +70,20 @@ Name[x-test]=xxSecurityxx
Comment=Configure Security
Comment[az]=Təhlükəsizlik ayarları
Comment[ca]=Configura la seguretat
Comment[el]=Διαμόρφωση ασφάλειας
Comment[es]=Configurar la seguridad
Comment[nl]=Beveiliging configureren
Comment[pt]=Configurar a Segurança
Comment[sl]=Nastavitve varnosti
Comment[uk]=Налаштовування захисту
Comment[x-test]=xxConfigure Securityxx
X-KDE-Keywords=akregator, configure, settings, security
X-KDE-Keywords[az]=akregator, configure, settings, security, tənzimləmə, ayarlar, təhlükəsizlik
X-KDE-Keywords[ca]=akregator, configura, arranjament, seguretat
X-KDE-Keywords[el]=akregator, διαμόρφωση, ρυθμίσεις, ασφάλεια
X-KDE-Keywords[es]=akregator, configurar, preferencias, seguridad
X-KDE-Keywords[nl]=akregator, configureren, instellingen, beveiliging
X-KDE-Keywords[pt]=akregator, configurar, configuração, segurança
X-KDE-Keywords[sl]=akregator, nastavi, nastavitve, varnost
X-KDE-Keywords[uk]=akregator,configure,settings,security,налаштувати,налаштування,параметри,захист,безпека
X-KDE-Keywords[x-test]=xxakregatorxx,xx configurexx,xx settingsxx,xx securityxx
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