Commit 2e1117f5 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 5fa5072f
......@@ -19,7 +19,6 @@ Name[en_GB]=KmPlotPart
Name[eo]=KmPlotPart
Name[es]=KmPlotPart
Name[et]=KmPloti komponent
Name[eu]=KmPlotPart
Name[fi]=KmPlotPart
Name[fr]=KmPlotPart
Name[ga]=KmPlotPart
......
......@@ -23,7 +23,6 @@ Comment[en_GB]=Function Plotter
Comment[eo]=Desegnilo de funkcioj
Comment[es]=Trazador de funciones
Comment[et]=Funktsioonide graafiku joonistaja
Comment[eu]=Funtzio-marrazkigilea
Comment[fa]=رسام تابع
Comment[fi]=Funktiopiirturi
Comment[fr]=Traceur de fonctions
......@@ -92,7 +91,6 @@ Name[en_GB]=KmPlot
Name[eo]=KmPlot
Name[es]=KmPlot
Name[et]=KmPlot
Name[eu]=KmPlot
Name[fi]=KmPlot
Name[fr]=KmPlot
Name[ga]=KmPlot
......@@ -161,7 +159,6 @@ GenericName[en_GB]=Mathematical Function Plotter
GenericName[eo]=Desegnilo de matematikaj funkcioj
GenericName[es]=Trazador de funciones matemáticas
GenericName[et]=Matemaatiliste funktsioonide graafiku joonistaja
GenericName[eu]=Funtzio matematikoen marrazkigilea
GenericName[fa]=رسام تابع ریاضی
GenericName[fi]=Matemaattisten funktioiden piirturi
GenericName[fr]=Traceur de fonctions mathématiques
......
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