Commit 7da0ef82 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 38ac6a71
......@@ -31,7 +31,7 @@ Name[nds]=KAlgebra för Mobilreedschappen
Name[nn]=KAlgebra mobil
Name[pa]=ਕੇ-ਐਲਜਬਰਾ ਮੋਬਾਇਲ
Name[pl]=Mobilna KAlgebra
Name[pl]=Przenośna KAlgebra
Name[pt]=KAlgebra Móvel
Name[pt_BR]=KAlgebra Móvel
Name[ru]=Мобильная KAlgebra
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