Commit 62dfda07 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 c9a23601
Pipeline #45500 skipped
......@@ -131,7 +131,7 @@ X-KDE-Keywords[nb]=signer,krypter,e-post.rask modus,sjekksum,oppsett
X-KDE-Keywords[nds]=ünnerschrieven,verslöteln,Nettpost,Nettbreef,Fixbedrief,Pröövsumm,Instellen
X-KDE-Keywords[nl]=ondertekenen,versleutelen,e-mail,snelle modus,controlesom,instellingen
X-KDE-Keywords[nn]=signatur, kryptering, e-post, snøggmodus, sjekksum, innstillingar, oppsett
X-KDE-Keywords[pl]=podpisz,szyfruj,email,szybki tryb,suma sprawdzenia,konfiguracja
X-KDE-Keywords[pl]=podpisz,szyfruj,email,szybki tryb,suma sprawdzająca,konfiguracja
X-KDE-Keywords[pt]=assinar,encriptar,e-mail,modo rápido,verificação,configuração
X-KDE-Keywords[pt_BR]=assinar,criptografar,e-mail,modo rápido,soma de verificação,configuração
X-KDE-Keywords[ro]=semnează, criptează, email, poștă, regim rapid, sumă de control, configurare
......
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