From a425a1c51bf2ce6ee72620c76bc85778f60ee1a6 Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Fri, 1 Dec 2017 14:56:06 +0100
Subject: [PATCH 1/2] Fix legacy profile loading

CURA-4075
---
 plugins/LegacyProfileReader/LegacyProfileReader.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/LegacyProfileReader/LegacyProfileReader.py b/plugins/LegacyProfileReader/LegacyProfileReader.py
index ca04ec4b36..369bdd6cf0 100644
--- a/plugins/LegacyProfileReader/LegacyProfileReader.py
+++ b/plugins/LegacyProfileReader/LegacyProfileReader.py
@@ -151,6 +151,9 @@ class LegacyProfileReader(ProfileReader):
         data = profile.serialize()
         parser.read_string(data)
         parser["general"]["version"] = "1"
+        if parser.has_section("values"):
+            parser["settings"] = parser["values"]
+            del parser["values"]
         stream = io.StringIO()
         parser.write(stream)
         data = stream.getvalue()

From 7068f6c28c3676b6a99f490c34393b5d01d72c00 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Fri, 1 Dec 2017 14:43:41 +0100
Subject: [PATCH 2/2] Fix whitespace at the end

Otherwise gettext will complain that one of them ends with \n but the other doesn't.

Contributes to issue CURA-4601.
---
 resources/i18n/es_ES/cura.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po
index 48459b5746..7b4a343be4 100644
--- a/resources/i18n/es_ES/cura.po
+++ b/resources/i18n/es_ES/cura.po
@@ -1137,7 +1137,7 @@ msgid ""
 "<p><b>A fatal exception has occurred. Please send us this Crash Report to fix the problem</p></b>\n"
 "            <p>Please use the \"Send report\" button to post a bug report automatically to our servers</p>\n"
 "        "
-msgstr "<p><b>Se ha producido una excepción fatal. Envíenos este informe de errores para que podamos solucionar el problema.</p></b>\n            <p>Utilice el botón «Enviar informe» para publicar automáticamente un informe de errores en nuestros servidores.</p>\n"
+msgstr "<p><b>Se ha producido una excepción fatal. Envíenos este informe de errores para que podamos solucionar el problema.</p></b>\n            <p>Utilice el botón «Enviar informe» para publicar automáticamente un informe de errores en nuestros servidores.</p>\n        "
 
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:101
 msgctxt "@title:groupbox"