Commit deb88f41 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 da0ff323
......@@ -12,7 +12,7 @@
"Description[et]": "Cantori KAlgebra taustaprogramm. Võimaldab kasutada Cantori töölehtedel sama keelt, mida kasutab rakendus KAlgebra.",
"Description[fi]": "Cantorin KAlgebra-taustajärjestelmä. Mahdollistaa KAlgebran kielen käytön Cantorin työkirjoissa.",
"Description[fr]": "Moteur KAlgebra pour Cantor vous permettant d'utiliser le même langage que dans l'application KAlgebra pour les feuilles de calcul de Cantor.",
"Description[gl]": "Infraestrutura de KAlgebra para Cantor. Permite empregar a mesma linguaxe que no aplicativo KAlgebra nas fichas de Cantor.",
"Description[gl]": "Infraestrutura de KAlgebra para Cantor. Permite empregar a mesma linguaxe que na aplicación KAlgebra nas fichas de Cantor.",
"Description[it]": "Backend KAlgebra per Cantor. Permette di usare in Cantor lo stesso linguaggio usato in KAlgebra.",
"Description[nl]": "Kalgebra backend voor Cantor. Het laat u dezelfde taal als in Kalgebra gebruiken in Cantor-werkbladen.",
"Description[nn]": "KAlgebra-motor for Cantor. Lèt deg bruka same språk som du brukar i KAlgebra-program i Cantor-arbeidsark.",
......
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