Commit 6d7224f1 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 d49f156d
Pipeline #66007 skipped
......@@ -12,16 +12,19 @@ X-KDE-Weight=260
Name=Security
Name[af]=Sekuriteit
Name[ar]=الأمن
Name[az]=Təhlükəsizlik
Name[be]=Бяспека
Name[bg]=Сигурност
Name[br]=Surentez
Name[bs]=Sigurnost
Name[ca]=Seguretat
Name[cy]=Diogelwch
Name[da]=Sikkerhed
Name[de]=Sicherheit
Name[el]=Ασφάλεια
Name[en_GB]=Security
Name[eo]=Sekureco
Name[es]=Seguridad
Name[et]=Turvalisus
Name[eu]=Sekuritatea
Name[fa]=امنیت
......@@ -49,6 +52,7 @@ Name[ne]=सुरक्षा
Name[nl]=Beveiliging
Name[pa]=ਸੁਰੱਖਿਆ
Name[pl]=Bezpieczeństwo
Name[pt]=Segurança
Name[ro]=Securitate
Name[ru]=Безопасность
Name[sk]=Zabezpečenie
......@@ -59,8 +63,24 @@ Name[tg]=Амният
Name[th]=ความปลอดภัย
Name[tr]=Güvenlik
Name[ug]=بىخەتەرلىك
Name[uk]=Захист
Name[uz]=Xavfsizlik
Name[uz@cyrillic]=Хавфсизлик
Name[wa]=Såvrité
Name[x-test]=xxSecurityxx
Comment=Configure Security
Comment[az]=Təhlükəsizlik ayarları
Comment[ca]=Configura la seguretat
Comment[es]=Configurar la seguridad
Comment[nl]=Beveiliging configureren
Comment[pt]=Configurar a Segurança
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[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[uk]=akregator,configure,settings,security,налаштувати,налаштування,параметри,захист,безпека
X-KDE-Keywords[x-test]=xxakregatorxx,xx configurexx,xx settingsxx,xx securityxx
Supports Markdown
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