Commit e313b343 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 73eeee9c
......@@ -65,6 +65,7 @@ GenericName[fr]=Interface pour des logiciels de mathématiques
GenericName[gl]=Interface de software matemático
GenericName[hu]=Előtétprogram matematikai alkalmazásokhoz
GenericName[it]=Interfaccia per software matematico
GenericName[ko]=수학 소프트웨어 백엔드
GenericName[nl]=Frontend tot wiskundige software
GenericName[nn]=Grafisk grensesnitt til matematikkprogram
GenericName[pa]=ਗਣਿਤ ਸਾਫਟਵੇਅਰਾਂ ਲਈ ਫਰੰਟਐਂਡ ਹੈ
......@@ -96,6 +97,7 @@ Comment[fr]=Interface KDE pour des logiciels de mathématiques
Comment[gl]=Interface de KDE de software matemático
Comment[hu]=KDE előtétprogram matematikai alkalmazásokhoz
Comment[it]=Interfaccia KDE per software matematico
Comment[ko]=KDE 수학 소프트웨어 백엔드
Comment[nl]=KDE-frontend tot wiskundige software
Comment[nn]=KDE-grensesnitt til matematikkprogram
Comment[pa]=ਗਣਿਤ ਸਾਫਟਵੇਅਰਾਂ ਲਈ ਕੇਡੀਈ ਫਰੰਟਐਂਡ ਹੈ
......
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