Commit 15ad1a19 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 c1028916
Pipeline #228934 skipped
......@@ -173,6 +173,7 @@ Comment[gl]=Explorar todos os caracteres de Unicode.
Comment[hu]=Böngészés az összes Unicode karakter között
Comment[ia]=Cerca in omne characteres unicode
Comment[id]=Telusuri semua karakter unicode
Comment[is]=Skoðaðu öll Unicode-staftákn
Comment[it]=Sfoglia tutti i caratteri unicode
Comment[ka]=უნიკოდის ყველა სიმბოლოს ნახვა
Comment[ko]=모든 유니코드 문자 탐색
......
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