Commit ea70faad 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 12abee6a
......@@ -5,6 +5,7 @@
"Description[ca]": "Dorsal per a la programació científica Python",
"Description[es]": "Motor para programación científica en Python",
"Description[et]": "Pythoni teadusliku programmeerimise taustaprogramm",
"Description[nl]": "Backend voor wetenschappelijk programmeren in Python",
"Description[pt]": "Infra-Estrutura de Programação Científica com Python",
"Description[pt_BR]": "Infraestrutura de programação científica Python",
"Description[sv]": "Bakgrundsprogram för Python vetenskaplig programmeringsmiljö",
......@@ -17,6 +18,7 @@
"Name[ca]": "Python",
"Name[es]": "Python",
"Name[et]": "Python",
"Name[nl]": "Python",
"Name[pt]": "Python",
"Name[pt_BR]": "Python",
"Name[sv]": "Python",
......
......@@ -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]=ਗਣਿਤ ਸਾਫਟਵੇਅਰਾਂ ਲਈ ਕੇਡੀਈ ਫਰੰਟਐਂਡ ਹੈ
......
......@@ -44,7 +44,7 @@
"Name[fr]": "Gestionnaire de variables",
"Name[gl]": "Xestor de variábeis",
"Name[it]": "Gestore variabili",
"Name[nl]": "Beheerder van variabelen",
"Name[nl]": "Variabelenbeheer",
"Name[nn]": "Variabelhandsamar",
"Name[pl]": "Zarządzanie zmiennymi",
"Name[pt]": "Gestor de Variáveis",
......
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