Skip to content

Commit

Permalink
Merge pull request nvaccess#12583 from nvaccess/beta
Browse files Browse the repository at this point in the history
Merge Beta to master
  • Loading branch information
seanbudd authored Jun 25, 2021
2 parents b1a5293 + 3dad636 commit 161ad1f
Show file tree
Hide file tree
Showing 15 changed files with 477 additions and 372 deletions.
6 changes: 3 additions & 3 deletions source/brailleDisplayDrivers/seikantk.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,14 @@ def _onReceive(self, data: bytes):
cmd = stream.read(3) # Note, first and third bytes are discarded
newByte: bytes = cmd[1:2] # use range to return bytes
self._hidBuffer += newByte
hasCommandBeenCollected = self._command is None
hasArgLenBeenCollected = self._argsLen is None
hasCommandBeenCollected = self._command is not None
hasArgLenBeenCollected = self._argsLen is not None
if ( # still collecting command bytes
not hasCommandBeenCollected
and len(self._hidBuffer) == COMMAND_LEN
):
self._command = self._hidBuffer # command found reset and wait for args length
self._hidBuffer = None
self._hidBuffer = b""
elif ( # next byte gives the command + args length
hasCommandBeenCollected
and not hasArgLenBeenCollected # argsLen has not
Expand Down
74 changes: 59 additions & 15 deletions source/locale/de/symbols.dic
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,33 @@ complexSymbols:
# identifier regexp

# Sentence endings.
. sentence ending (?<=[^\s.])\.(?=[\"'”’)\s]|$)
! sentence ending (?<=[^\s!])\!(?=[\"'”’)\s]|$)
? sentence ending (?<=[^\s?])\?(?=[\"'”’)\s]|$)
. Satzende (?<=[^\s.])\.(?=[\"'”’)\s]|$)
! Satzende (?<=[^\s!])\!(?=[\"'”’)\s]|$)
? Satzende (?<=[^\s?])\?(?=[\"'”’)\s]|$)

# Phrase endings.
; phrase ending (?<=[^\s;]);(?=\s|$)
: phrase ending (?<=[^\s:]):(?=\s|$)
; Satzzeichen (?<=[^\s;]);(?=\s|$)
: Satzzeichen (?<=[^\s:]):(?=\s|$)

# Others
decimal point (?<![^\d -])\.(?=\d)
Dezimalpunkt (?<![^\d -])\.(?=\d)
in-word ' (?<=[^\W_])['’]
negative number (?<!\w)[-−]{1}(?=[$£€¥.]?\d)
negative Zahl (?<!\w)[-−]{1}(?=[$£€¥.]?\d)
Tausender Punkt (?<=\d)\.(?=\d{3})
Datumstrennzeichen (?<=\d\d)\.(?=\d\d)

symbols:
# identifier replacement[[ level][ preserve]][ # display name]

# Complex symbols
. sentence ending dot all always
! sentence ending bang all always
? sentence ending question all always
; phrase ending semi most always
: phrase ending colon most always
. sentence ending Punkt all always
! sentence ending Ausrufezeichen all always
? sentence ending Fragezeichen all always
; phrase ending Semikolon most always
: phrase ending Doppelpunkt most always
decimal point none always
in-word ' tick all norep
negative number minus none norep
in-word ' Apostroph all norep
negative number Minus none norep

# Whitespace
\0 Leer char # null
Expand Down Expand Up @@ -175,7 +178,48 @@ _ Unterstrich most
⊕ Eingekreistes Plus none
⊖ Eingekreistes Minus none
⇄ Pfeil nach rechts über Pfeil nach links none
⇒ Doppelter rechtsweisender Pfeil none
⇒ Doppelter nach rechtsweisender Pfeil none
― Waagerechter Strich
، Arabisches Komma
、 Ideografisches Komma
؛ Arabisches Semikolon
؟ Arabisches Fragezeichen
。 Ideografischer Punkt
“ Typografisches Anführungszeichen rechts
〈 Spitze Klammer auf
〉 Spitze Klammer zu
《 Doppelte, spitze Klammer auf
》 Doppelte, spitze Klammer zu
「 Eckige Klammer auf
」 Eckige Klammer zu
『 Weiße, eckige Klammer auf
』 Weiße, eckige Klammer zu
【 Schwarze, konkave Klammer auf
】 Schwarze, konkave Klammer zu
〔 Stumpfe Klammer auf
〕 Stumpfe Klammer zu
〖 Hohle, konkave Klammer auf
〗 Hohle, konkave Klammer zu
& Und
‧ Silbentrennzeichen
‸ Dach
⁂ Asterismus
℗ Copyright-Zeichen für Audio-Aufnahme
↚ Durchgestrichener Pfeil nach links
↛ Durchgestrichener Pfeil nach rechts
↜ Wellenförmiger Pfeil nach links
↝ Wellenförmiger Pfeil nach rechts
↢ Pfeilende nach links
↣ Pfeilende nach rechts
↤ Pfeil nach links von Strich wegführend
↥ Pfeil nach oben von Strich wegführend
↦ Pfeil nach rechts von Strich wegführend
↧ Pfeil nach unten von Strich wegführend
↭ Wellenförmiger Pfeil nach links und rechts
↶ Halbkreisförmiger Pfeil gegen den Uhrzeigersinn nach oben
↷ Halbkreisförmiger Pfeil im Uhrzeigersinn nach oben
↺ Kreisförmiger Pfeil gegen den Uhrzeigersinn
⇅ Nach oben und nach unten weisende Pfeile

# Arithmetic Operators
+ plus some
Expand Down
16 changes: 8 additions & 8 deletions source/locale/pt_BR/LC_MESSAGES/nvda.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
msgid ""
msgstr ""
"Project-Id-Version: NVDA\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-06-18 00:01+0000\n"
"PO-Revision-Date: 2021-06-19 13:55-0300\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2021-06-21 07:04+0000\n"
"PO-Revision-Date: 2021-06-23 22:30-0300\n"
"Last-Translator: Cleverson Casarin Uliana <[email protected]>\n"
"Language-Team: NVDA Brazilian Portuguese translation team (Equipe de "
"tradução do NVDA para Português Brasileiro) <[email protected]>\n"
Expand Down Expand Up @@ -126,7 +126,7 @@ msgstr "figura"
#. Translators: a style of fill type (to color the inside of a control or text)
msgctxt "UIAHandler.FillType"
msgid "pattern"
msgstr "Padrão"
msgstr "padrão"

#. Translators: shown when an addon API version string is unknown
#. Translators: The word for an unknown control type.
Expand Down Expand Up @@ -3421,7 +3421,7 @@ msgstr "ligado anunciar atributos da fonte"

#. Translators: Input help mode message for toggle superscripts and subscripts command.
msgid "Toggles on and off the reporting of superscripts and subscripts"
msgstr "liga e desliga o anúncio de sobrescritos e subscritos"
msgstr "Liga e desliga o anúncio de sobrescritos e subscritos"

#. Translators: The message announced when toggling the report superscripts and subscripts
#. document formatting setting.
Expand Down Expand Up @@ -9805,7 +9805,7 @@ msgstr "Não"

#. Translators: This is the label for combobox in the Advanced settings panel.
msgid "Attempt to cancel speech for expired focus events:"
msgstr "Tentar cancelar a fala de eventos com foco expirado"
msgstr "Tentar cancelar a fala de eventos com foco expirado:"

#. Translators: This is the label for a group of advanced options in the
#. Advanced settings panel
Expand Down Expand Up @@ -11873,7 +11873,7 @@ msgstr "{start} até {end}"

#. Translators: the description for a script for Excel
msgid "opens a dropdown item at the current cell"
msgstr "Abre uma lista de seleção na célula atual"
msgstr "abre um item suspenso na célula atual"

#. Translators: the description for a script for Excel
msgid "Sets the current cell as start of column header"
Expand Down Expand Up @@ -11910,7 +11910,7 @@ msgstr ""

#. Translators: the description for a script for Excel
msgid "sets the current cell as start of row header"
msgstr "Coloca a célula atual como início do cabeçalho da linha"
msgstr "coloca a célula atual como início do cabeçalho da linha"

#. Translators: a message reported in the SetRowHeader script for Excel.
#, python-brace-format
Expand Down
18 changes: 11 additions & 7 deletions source/locale/ta/LC_MESSAGES/nvda.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: NVDA bzr main:5884\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-06-04 00:01+0000\n"
"PO-Revision-Date: 2021-06-05 19:46+0530\n"
"POT-Creation-Date: 2021-06-21 07:04+0000\n"
"PO-Revision-Date: 2021-06-24 10:15+0530\n"
"Last-Translator: DINAKAR T.D. <[email protected]>\n"
"Language-Team: DINAKAR T.D. <[email protected]>\n"
"Language: ta\n"
Expand Down Expand Up @@ -71,11 +71,11 @@ msgstr "ஐஎம்ஈ மூடப்பட்டது"

#. Translators: the label for an unknown language when switching input methods.
msgid "unknown language"
msgstr "தெரியாத மொழி"
msgstr "அறியப்படாத மொழி"

#. Translators: The label for an unknown input method when switching input methods.
msgid "unknown input method"
msgstr "தெரியாத உள்ளீட்டு முறை"
msgstr "அறியப்படாத உள்ளீட்டு முறை"

#. Translators: The label shown for a spelling and grammar error in the NVDA Elements List dialog in Microsoft Word.
#. {text} will be replaced with the text of the spelling error.
Expand Down Expand Up @@ -124,7 +124,7 @@ msgstr "வடிவவிதம்"
#. Translators: The word for an unknown control type.
#. Translators: Reported when the type of a chart is not known.
msgid "unknown"
msgstr "தெரியாதது"
msgstr "அறியப்படாதது"

#. Translators: This is presented when errors are found in an appModule
#. (example output: error in appModule explorer).
Expand Down Expand Up @@ -5346,7 +5346,7 @@ msgstr "மடிக்கணினி"
#. %s will be replaced with the key code.
#, python-format
msgid "unknown %s"
msgstr "தெரியாதது %s"
msgstr "அறியப்படாதது %s"

msgid "on"
msgstr "இடப்பட்டது"
Expand Down Expand Up @@ -7691,6 +7691,10 @@ msgstr "பேப்பன்மேயர் பிரெயிலெக்ஸ
msgid "Seika Braille Displays"
msgstr "சேக்கா பிரெயில் காட்சியமைவுகள்"

#. Translators: Name of a braille display.
msgid "Seika Notetaker"
msgstr "சேக்கா நோட்டேக்கர்"

#. Translators: Names of braille displays.
msgid "SuperBraille"
msgstr "சூப்பர் பிரெயில் "
Expand Down Expand Up @@ -11717,7 +11721,7 @@ msgstr "இயல்நிறம்"
#. Translators: The color of text cannot be detected.
#. Translators: The background color cannot be detected.
msgid "Unknown color"
msgstr "தெரியாத நிறம்"
msgstr "அறியப்படாத நிறம்"

#. Translators: A type of background pattern in Microsoft Excel.
#. Excel controls the pattern.
Expand Down
Loading

0 comments on commit 161ad1f

Please sign in to comment.