Commit 95cb1408 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 42608b7f
Pipeline #33842 skipped
......@@ -156,7 +156,7 @@ X-KDE-Keywords[nl]=ldap,directory,services,hkp,keyserver
X-KDE-Keywords[pl]=ldap,katalog,usługi,hkp,serwer kluczy
X-KDE-Keywords[pt]=LDAP,directório,serviços,HKP,servidor de chaves
X-KDE-Keywords[pt_BR]=LDAP,diretório,serviços,hkp,servidor de chaves
X-KDE-Keywords[pt_BR]=LDAP,diretório,pasta,serviços,hkp,servidor de chaves
X-KDE-Keywords[ro]=ldap,directoriu,servicii,hkp,server de chei
X-KDE-Keywords[ru]=ldap,directory,services,hkp,keyserver,службы каталогов,сервер ключей
X-KDE-Keywords[sk]=ldap,adresár,služby,khp,server kľúčov
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