Merge remote-tracking branch 'origin/master'

weblate/trans/machine/base.py

@@ -104,7 +104,7 @@ class MachineTranslation(object):
         if text.startswith('\xef\xbb\xbf'):
             text = text.decode('UTF-8-sig')
         # Replace literal \t
-        text = text.replace(
+        text = text.strip().replace(
             '\t', '\\t'
         ).replace(
             '\r', '\\r'

weblate/trans/tests/test_machine.py

@@ -59,6 +59,7 @@ GLOSBE_JSON = u'''
 }
 '''.encode('utf-8')
 MYMEMORY_JSON = u'''
+\r\n
 {"responseData":{"translatedText":"svět"},"responseDetails":"",
 "responseStatus":200,
 "matches":[