Merge remote-tracking branch 'origin/master'

weblate/trans/checks/same.py

@@ -802,8 +802,8 @@ SAME_BLACKLIST = frozenset((
     'x86_64',
 
     # Language names
-    'afrikaans',
     'acholi',
+    'afrikaans',
     'akan',
     'albanian',
     'amharic',
@@ -816,11 +816,12 @@ SAME_BLACKLIST = frozenset((
     'asturian',
     'aymará',
     'azerbaijani',
+    'bashkir',
     'basque',
     'belarusian',
     'bengali',
     'bodo',
-    'bokmål',
+    u'bokmål',
     'bosnian',
     'brazil',
     'breton',
@@ -828,6 +829,9 @@ SAME_BLACKLIST = frozenset((
     'burmese',
     'canada',
     'catalan',
+    'chhattisgarhi',
+    'chiga',
+    'chinese',
     'colognian',
     'cornish',
     'croatian',
@@ -861,9 +865,6 @@ SAME_BLACKLIST = frozenset((
     'hebrew',
     'hindi',
     'hungarian',
-    'chhattisgarhi',
-    'chiga',
-    'chinese',
     'icelandic',
     'indonesian',
     'interlingua',
@@ -928,6 +929,7 @@ SAME_BLACKLIST = frozenset((
     'sardinian',
     'scots',
     'serbian',
+    'serbo',
     'sindhi',
     'sinhala',
     'slovak',