Merge remote-tracking branch 'origin/master'

trans/checks/same.py

@@ -164,6 +164,8 @@ SAME_BLACKLIST = frozenset((
     'gammu',
     'general',
     'gentoo',
+    'geocache',
+    'geocaching',
     'gettext',
     'global',
     'gnu',
@@ -171,6 +173,7 @@ SAME_BLACKLIST = frozenset((
     'gib',
     'git',
     'gpl',
+    'gpx',
     'graphic',
     'graphics',
     'gtk',
@@ -417,6 +420,7 @@ SAME_BLACKLIST = frozenset((
     'source',
     'spatial',
     'spline',
+    'sport',
     'sql',
     'standard',
     'start',

trans/machine/base.py

@@ -190,6 +190,8 @@ class MachineTranslation(object):
         Returns list of machine translations.
         '''
         language = self.convert_language(language)
+        if text == '':
+            return []
         if not self.is_supported(language):
             return []
 

trans/machine/tmserver.py

@@ -69,7 +69,7 @@ class TMServerTranslation(MachineTranslation):
             self.url,
             urllib.quote(appsettings.SOURCE_LANGUAGE),
             urllib.quote(language),
-            urllib.quote(text.encode('utf-8')),
+            urllib.quote(text[:500].encode('utf-8')),
         )
         response = self.json_req(url)