Commit 659eb2a8 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 e91fd94b
......@@ -46,6 +46,7 @@ GenericName[it]=Software per tracciare i grafici e per l'analisi dei dati.
GenericName[nl]=Software voor plotten en analyse van gegevens
GenericName[nn]=Plotte- og dataanalyse­program
GenericName[pt]=Aplicação de Gráficos e Análise de Dados
GenericName[pt_BR]=Software de gráficos e análises de dados
GenericName[sl]=Programska oprema za risanje in analizo podatkov
GenericName[sv]=Diagramritnings- och dataanalysprogramvara
GenericName[uk]=Програма для креслення і аналізу даних
......
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