Merge Beta into Alpha

Merge remote-tracking branch 'origin/beta'
Including:
- Update translations.
- Update liblouis to 3.16.1 (PR nvaccess#11888)
- Fix deadlock between nvWave stop and feed (PR nvaccess#11886)
- Detect Humanware Brailliant BI 40X and 20X via both USB and Bluetooth (PR nvaccess#11819)

readme.md

@@ -89,7 +89,7 @@ For reference, the following run time dependencies are included in Git submodule
 * [IAccessible2](https://wiki.linuxfoundation.org/accessibility/iaccessible2/start), commit cbc1f29631780
 * [ConfigObj](https://github.com/DiffSK/configobj), commit f9a265c
 * [Six](https://pypi.python.org/pypi/six), version 1.12.0, required by wxPython and ConfigObj
-* [liblouis](http://www.liblouis.org/), version 3.15.0
+* [liblouis](http://www.liblouis.org/), version 3.16.1
 * [Unicode Common Locale Data Repository (CLDR)](http://cldr.unicode.org/) Emoji Annotations, version 38.0
 * NVDA images and sounds
 * [Adobe Acrobat accessibility interface, version XI](https://download.macromedia.com/pub/developer/acrobat/AcrobatAccess.zip)

source/bdDetect.py

@@ -465,6 +465,8 @@ def driverSupportsAutoDetection(driver):
 	"VID_1C71&PID_CE01",  # NLS eReader 20 HID
 	"VID_1C71&PID_C006", # Brailliant BI 32, 40 and 80
 	"VID_1C71&PID_C022", # Brailliant BI 14
+	"VID_1C71&PID_C131",  # Brailliant BI 40X
+	"VID_1C71&PID_C141",  # Brailliant BI 20X
 	"VID_1C71&PID_C00A", # BrailleNote Touch
 	"VID_1C71&PID_C00E",  # BrailleNote Touch v2
 })
@@ -491,6 +493,8 @@ def driverSupportsAutoDetection(driver):
 			"Humanware BrailleOne",
 			"NLS eReader",
 			"NLS eReader Humanware",
+			"Brailliant BI 40X",
+			"Brailliant BI 20X",
 		)
 	)
 )

source/brailleTables.py

@@ -81,6 +81,7 @@ def listTables():
 	"no-no.ctb":"no-no-8dot.utb",
 	"no-no-comp8.ctb":"no-no-8dot.utb",
 	"ru-compbrl.ctb":"ru.ctb",
+	"ru-ru-g1.utb": "ru-litbrl-detailed.utb",
 	"sk-sk-g1.utb":"sk-g1.ctb",
 	"UEBC-g1.ctb":"en-ueb-g1.ctb",
 	"UEBC-g2.ctb":"en-ueb-g2.ctb",
@@ -104,6 +105,9 @@ def listTables():
 addTable("as-in-g1.utb", _("Assamese grade 1"))
 # Translators: The name of a braille table displayed in the
 # braille settings dialog.
+addTable("ba.utb", _("Bashkir grade 1"), input=False)
+# Translators: The name of a braille table displayed in the
+# braille settings dialog.
 addTable("be-in-g1.utb", _("Bengali grade 1"))
 # Translators: The name of a braille table displayed in the
 # braille settings dialog.
@@ -113,6 +117,9 @@ def listTables():
 addTable("ckb-g1.ctb", _("Central Kurdish grade 1"))
 # Translators: The name of a braille table displayed in the
 # braille settings dialog.
+addTable("cop-eg-comp8.utb", _("Coptic 8 dot computer braille"), input=False)
+# Translators: The name of a braille table displayed in the
+# braille settings dialog.
 addTable("cy-cy-g1.utb", _("Welsh grade 1"))
 # Translators: The name of a braille table displayed in the
 # braille settings dialog.
@@ -380,7 +387,10 @@ def listTables():
 addTable("ru.ctb", _("Russian computer braille"))
 # Translators: The name of a braille table displayed in the
 # braille settings dialog.
-addTable("ru-ru-g1.utb", _("Russian grade 1"))
+addTable("ru-litbrl.ctb", _("Russian literary braille"), input=False)
+# Translators: The name of a braille table displayed in the
+# braille settings dialog.
+addTable("ru-litbrl-detailed.utb", _("Russian literary braille (detailed)"), input=False)
 # Translators: The name of a braille table displayed in the
 # braille settings dialog.
 addTable("sa-in-g1.utb", _("Sanskrit grade 1"))