Merge remote-tracking branch 'origin/master'

trans/machine/google.py

@@ -47,4 +47,7 @@ class GoogleTranslation(MachineTranslation):
             oe='UTF-8'
         )
 
-        return [(response[0][0][0], 100, self.name, text)]
+        translation = ' '.join([sentence[0] for sentence in response[0]])
+        source = ' '.join([sentence[1] for sentence in response[0]])
+
+        return [(translation, 100, self.name, source)]

trans/machine/tmserver.py

@@ -59,7 +59,7 @@ class TMServerTranslation(MachineTranslation):
         url = '%s/tmserver/en/%s/unit/%s' % (
             MT_TMSERVER.rstrip('/'),
             urllib.quote(language),
-            urllib.quote(text),
+            urllib.quote(text.encode('utf-8')),
         )
         response = self.json_req(url)