Commit f1e4f1b3 authored by Script Kiddy's avatar Script Kiddy

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 893d80f1
Pipeline #33841 skipped
......@@ -62,7 +62,7 @@ Comment[ko]=vCard 디렉터리에서 연락처를 가져옵니다
Comment[nl]=Laadt contactpersoon uit een vCard-map
Comment[pl]=Wczytuje kontakty z katalogu z wizytówkami vCard
Comment[pt]=Carrega um contacto de uma pasta de ficheiros vCard
Comment[pt_BR]=Carrega os contatos de um diretório vCard
Comment[pt_BR]=Carrega os contatos de uma pasta vCard
Comment[ru]=Загрузка контактов из каталога с файлами vCard
Comment[sk]=Načíta kontakt z adresára vCard
Comment[sl]=Naloži stik iz mape z datotekami vCard
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