Beta to master#13186
Merged
Merged
Conversation
From translation svn revision: 65616 Authors: Jorge Perez <jorgtum@gmail.com> Jose M. Delicado <jm.delicado@nvda.es> Stats: 192 57 source/locale/an/LC_MESSAGES/nvda.po 89 0 user_docs/an/changes.t2t 79 21 user_docs/an/userGuide.t2t 3 files changed, 360 insertions(+), 78 deletions(-)
From translation svn revision: 65616 Authors: Fatma Mehanna <fatma.mehanna@gmail.com> Shaimaa Ibrahim <shamse1@gmail.com> Abdelkrim Bensaid <abdelkrim.bensaid@free.fr> Omar Alojaimi <amrahmad1995@gmail.com> Stats: 733 353 source/locale/ar/LC_MESSAGES/nvda.po 164 57 user_docs/ar/userGuide.t2t 2 files changed, 897 insertions(+), 410 deletions(-)
From translation svn revision: 65616 Authors: Zahari Yurukov <zahari.yurukov@gmail.com> Kostadin Kolev <k_kolev1985@mail.bg> Stats: 192 57 source/locale/bg/LC_MESSAGES/nvda.po 89 0 user_docs/bg/changes.t2t 63 4 user_docs/bg/userGuide.t2t 3 files changed, 344 insertions(+), 61 deletions(-)
From translation svn revision: 65616 Authors: Irene Nakas <irnakas@gmail.com> Nikos Demetriou <nikosdemetriou@googlemail.com> access@e-rhetor.com Stats: 194 59 source/locale/el/LC_MESSAGES/nvda.po 1 file changed, 194 insertions(+), 59 deletions(-)
From translation svn revision: 65616 Authors: Ali Aslani <aslani.ali@gmail.com> Mohammadreza Rashad <mohammadreza5712@gmail.com> Stats: 189 60 source/locale/fa/LC_MESSAGES/nvda.po 75 1 user_docs/fa/changes.t2t 65 7 user_docs/fa/userGuide.t2t 3 files changed, 329 insertions(+), 68 deletions(-)
From translation svn revision: 65616 Authors: Aron OcsvAri <oaron@nvda.hu> Stats: 73 0 user_docs/hu/changes.t2t 1 file changed, 73 insertions(+)
From translation svn revision: 65616 Authors: Simone Dal Maso <simone.dalmaso@gmail.com> Alberto Buffolino <a.buffolino@gmail.com> Stats: 3 3 source/locale/it/LC_MESSAGES/nvda.po 89 0 user_docs/it/changes.t2t 72 13 user_docs/it/userGuide.t2t 3 files changed, 164 insertions(+), 16 deletions(-)
From translation svn revision: 65616 Authors: Takuya Nishimoto <nishimotz@gmail.com> Minako Nonogaki <minakonono3519@gmail.com> Stats: 90 1 user_docs/ja/changes.t2t 1 1 user_docs/ja/userGuide.t2t 2 files changed, 91 insertions(+), 2 deletions(-)
From translation svn revision: 65616 Authors: Joseph Lee <joseph.lee22590@gmail.com> Chang-Hwan Jang <462356@gmail.com> Dong Hee Park <hi@aheu.org> Stanley Chung <stanley@mail.com> Stats: 5 9 source/locale/ko/LC_MESSAGES/nvda.po 1 file changed, 5 insertions(+), 9 deletions(-)
From translation svn revision: 65616 Authors: Bram Duvigneau <bram@bramd.nl> Bart Simons <bart@bartsimons.be> A Campen <a.campen@wxs.nl> Leonard de Ruijter <alderuijter@gmail.com> Stats: 186 53 source/locale/nl/LC_MESSAGES/nvda.po 78 0 user_docs/nl/changes.t2t 2 files changed, 264 insertions(+), 53 deletions(-)
From translation svn revision: 65616 Authors: Cleverson Casarin Uliana <clul@disr.it> Marlin Rodrigues <marlincgrodrigues@yahoo.com.br> Tiago Melo Casal <tcasal@intervox.nce.ufrj.br> Lucas Antonio <lucasantoniocwb@gmail.com> Stats: 89 0 user_docs/pt_BR/changes.t2t 1 file changed, 89 insertions(+)
From translation svn revision: 65616 Authors: Diogo Costa <diogojoca@gmail.com> Rui Batista <ruiandrebatista@gmail.com> Rui Fontes <rui.fontes@tiflotecnia.com> Ângelo Abrantes <ampa4374@gmail.com> Stats: 37 37 user_docs/pt_PT/userGuide.t2t 1 file changed, 37 insertions(+), 37 deletions(-)
From translation svn revision: 65616 Authors: Dan Pungă <dan.punga@gmail.com> Florian Ionașcu <7ro2014@gmail.com> Alexandru Matei <alexandrumateistelian@gmail.com> Nicuşor Untilă <nicusoruntila@yahoo.com> Adriani Ionuț Botez <ionutz_tero@yahoo.com> Dragoș Grecianu <grecianu.dragos@gmail.com> Daniela Popovici <vlajna95@gmail.com> George Antonio Andrei <george.andrei2002@gmail.com> Stats: 192 59 source/locale/ro/LC_MESSAGES/nvda.po 1 file changed, 192 insertions(+), 59 deletions(-)
From translation svn revision: 65616 Authors: Zvonimir Stanecic <9a5dsz@gozaltech.org> Aleksandr Lin'kov <kvark128@yandex.ru> Stats: 8 0 source/locale/ru/symbols.dic 156 0 user_docs/ru/changes.t2t 2 files changed, 164 insertions(+)
From translation svn revision: 65616 Authors: Ondrej Rosik <ondrej.rosik@gmail.com> Peter Vagner <peter.v@datagate.sk> Jan Kulik <jan.kulik.szsle@outlook.sk> Stats: 185 56 source/locale/sk/LC_MESSAGES/nvda.po 73 0 user_docs/sk/changes.t2t 71 13 user_docs/sk/userGuide.t2t 3 files changed, 329 insertions(+), 69 deletions(-)
From translation svn revision: 65616 Authors: Dinakar T.D. <td.dinkar@gmail.com> Stats: 153 50 user_docs/ta/userGuide.t2t 1 file changed, 153 insertions(+), 50 deletions(-)
From translation svn revision: 65616 Authors: Cagri Dogan <cagrid@hotmail.com> Stats: 5 5 user_docs/tr/userGuide.t2t 1 file changed, 5 insertions(+), 5 deletions(-)
From translation svn revision: 65616 Authors: Volodymyr Pyrig <vp88.mobile@gmail.com> Stats: 189 59 source/locale/uk/LC_MESSAGES/nvda.po 92 3 user_docs/uk/changes.t2t 65 7 user_docs/uk/userGuide.t2t 3 files changed, 346 insertions(+), 69 deletions(-)
From translation svn revision: 65616 Authors: vgjh2005@gmail.com jiangtiandao901647@gmail.com manchen_0528@outlook.com dingpengyu06@gmail.com singer.mike.zhao@gmail.com 1872265132@qq.com Stats: 28 51 source/locale/zh_CN/LC_MESSAGES/nvda.po 36 35 user_docs/zh_CN/changes.t2t 73 15 user_docs/zh_CN/userGuide.t2t 3 files changed, 137 insertions(+), 101 deletions(-)
From translation svn revision: 65616 Authors: wangjanli@gmail.com maro.zhang@gmail.com Aaron Wu <waaron2000@gmail.com> Victor Cai <surfer0627@gmail.com> haach111000@gmail.com Stats: 21 20 source/locale/zh_TW/LC_MESSAGES/nvda.po 1884 1871 source/locale/zh_TW/characterDescriptions.dic 11 0 user_docs/zh_TW/changes.t2t 343 343 user_docs/zh_TW/userGuide.t2t 4 files changed, 2259 insertions(+), 2234 deletions(-)
From translation svn revision: 65616
From translation svn revision: 65650 Authors: Bernd Dorer <bdorer@mailbox.org> David Parduhn <xkill85@gmx.net> Rene Linke <rene.linke@hamburg.de> Adriani Botez <adriani.botez@gmail.com> Karl Eick <hozosch@web.de> Robert Hänggi <aarjay.robert@gmail.com> Astrid Waldschmetterling <a.r.waldschmetterling@gmx.de> Stats: 10 10 source/locale/de/LC_MESSAGES/nvda.po 1 file changed, 10 insertions(+), 10 deletions(-)
From translation svn revision: 65650 Authors: Michel such <michel.such@free.fr> Patrick ZAJDA <patrick@zajda.fr> Remy Ruiz <remyruiz@gmail.com> Abdelkrim Bensaid <abdelkrim.bensaid@free.fr> Cyrille Bougot <cyrille.bougot2@laposte.net> Corentin Bacqué-Cazenave <corentin@progaccess.net> Sylvie Duchateau <sylvieduchateau@gmail.com> Sof <hellosof@gmail.com> Stats: 1 0 source/locale/fr/symbols.dic 1 file changed, 1 insertion(+)
From translation svn revision: 65650 Authors: vgjh2005@gmail.com jiangtiandao901647@gmail.com manchen_0528@outlook.com dingpengyu06@gmail.com singer.mike.zhao@gmail.com 1872265132@qq.com Stats: 196 4 source/locale/zh_CN/symbols.dic 1 file changed, 196 insertions(+), 4 deletions(-)
From translation svn revision: 65650 Authors: wangjanli@gmail.com maro.zhang@gmail.com Aaron Wu <waaron2000@gmail.com> Victor Cai <surfer0627@gmail.com> haach111000@gmail.com Stats: 1 1 user_docs/zh_TW/userGuide.t2t 1 file changed, 1 insertion(+), 1 deletion(-)
From translation svn revision: 65650
Preparation for 2021.3.1
…lle (PR #13160) Fixes #13158 PR #12814 replaced usages of deprecated controlTypes.roleLabels with role.displayString. However braille has its own mapping of roles to labels which should be used for abbreviations of roles for braille. The role label used for speech has been mistakenly used for a role of landmark.
Try to use new HID protocol after, not before all other driver matches Closes #13153 Summary: Auto detection was broken for Humanware Brailliant and APH Mantis q40 when working over Bluetooth. It looks like they implement an incomplete version of the HID protocol.
From translation svn revision: 65678 Authors: Bernd Dorer <bdorer@mailbox.org> David Parduhn <xkill85@gmx.net> Rene Linke <rene.linke@hamburg.de> Adriani Botez <adriani.botez@gmail.com> Karl Eick <hozosch@web.de> Robert Hänggi <aarjay.robert@gmail.com> Astrid Waldschmetterling <a.r.waldschmetterling@gmx.de> Stats: 3 3 source/locale/de/symbols.dic 1 file changed, 3 insertions(+), 3 deletions(-)
From translation svn revision: 65678 Authors: Beqa Gozalishvili <beqaprogger@gmail.com> Goderdzi Gogoladze <goderdzigogoladze@gmail.com> Stats: 140 16 source/locale/ka/symbols.dic 1 file changed, 140 insertions(+), 16 deletions(-)
From translation svn revision: 65678 Authors: Jozko Gregorc <jozko.gregorc@gmail.com> Stats: 5007 4614 source/locale/sl/LC_MESSAGES/nvda.po 358 244 source/locale/sl/symbols.dic 2 files changed, 5365 insertions(+), 4858 deletions(-)
From translation svn revision: 65678 Authors: Cagri Dogan <cagrid@hotmail.com> Stats: 17 18 source/locale/tr/LC_MESSAGES/nvda.po 6 6 user_docs/tr/userGuide.t2t 2 files changed, 23 insertions(+), 24 deletions(-)
From translation svn revision: 65678 Authors: Dang Hoai Phuc <danghoaiphuc@gmail.com> Nguyen Van Dung <dungnv1984@gmail.com> Stats: 4 4 source/locale/vi/LC_MESSAGES/nvda.po 1 1 user_docs/vi/changes.t2t 2 files changed, 5 insertions(+), 5 deletions(-)
From translation svn revision: 65678 Authors: vgjh2005@gmail.com jiangtiandao901647@gmail.com manchen_0528@outlook.com dingpengyu06@gmail.com singer.mike.zhao@gmail.com 1872265132@qq.com Stats: 1 1 user_docs/zh_CN/userGuide.t2t 1 file changed, 1 insertion(+), 1 deletion(-)
From translation svn revision: 65678
Add type information and fix port listing for seikantk driver Move registration of seikantk to bdDetect - This reflects how the other drivers are registered Fall back to base implementation for check method All other drivers for which check is shadowed either do not support auto-detection yet or cannot be detected passively i.e. because they're using a serial connection.
Duplication of the string makes it a "magic value" and hard to trace its meaning.
Explicitly map to BrailleDisplayDriver on the module.
Ensure there is no confusion with KEY_HID="hid" in bdDetect.py
* add setting to disable HID Braille
seanbudd
approved these changes
Dec 22, 2021
seanbudd
left a comment
Member
There was a problem hiding this comment.
I reviewed the merge commit and it appeared as expected, noting the final diff of the conflicting files user_docs/en/changes.t2t and source/buildVersion.py
LeonarddeR
approved these changes
Dec 22, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Janitorial: Update Alpha with translations and other changes from beta
Note: this should be completed as a merge, not squash merge
An extra commit was required to resolve conflicts between master and beta.