py3: code from python3-branch broke the translation in Start-wb. This…

… commit should fix this

src/Mod/Start/StartPage/StartPage.py

@@ -40,25 +40,30 @@ def translate(context,text):
     # return str(QtGui.QApplication.translate(context, text, None, QtGui.QApplication.UnicodeUTF8).toUtf8())
     try:
         _encoding = QtGui.QApplication.UnicodeUTF8
-        u = QtGui.QApplication.translate(context, text, None, _encoding).encode("utf8")
+        u = QtGui.QApplication.translate(context, text, None, _encoding)
     except AttributeError:
-        u = QtGui.QApplication.translate(context, text, None).encode("utf8")
-
-    s = cStringIO.StringIO()
-    for i in u:
-        if sys.version_info.major > 2: #below only works correctly in python3
-            if i == 39:
-                s.write("\\'")
-            else:
-                s.write(chr(i))
-        else:
-            if ord(i) == 39:
-                s.write(unicode("\\'"))
-            else:
-                s.write(unicode(i))
-    t = s.getvalue()
-    s.close()
-    return t
+        u = QtGui.QApplication.translate(context, text, None)
+
+    if sys.version_info.major < 3:
+        u = u.encode("utf8")
+
+    # s = cStringIO.StringIO()
+    # for i in u:
+    #     if sys.version_info.major > 2: #below only works correctly in python3
+    #         if i == 39:
+    #             s.write("\\'")
+    #         else:
+    #             s.write(chr(i))
+    #     else:
+    #         if ord(i) == 39:
+    #             s.write(unicode("\\'"))
+    #         else:
+    #             s.write(unicode(i))
+    # t = s.getvalue()
+    # s.close()
+    # return t
+
+    return u.replace(chr(39), "\\'")
 
 # texts to be translated