Permalink
Browse files

Merge branch 'beta'

  • Loading branch information...
michaelDCurran committed Dec 14, 2018
2 parents 2d8f08a + 888e85c commit c25104b5da1c5bbc6225f1bfb25be335ccc6c1a2
@@ -37,6 +37,9 @@ init:
$version = "alpha-$env:APPVEYOR_BUILD_NUMBER," + $env:APPVEYOR_REPO_COMMIT.Substring(0, 8)
} else {
$version = "$env:APPVEYOR_REPO_BRANCH-$env:APPVEYOR_BUILD_NUMBER," + $env:APPVEYOR_REPO_COMMIT.Substring(0, 8)
if($env:APPVEYOR_REPO_BRANCH.StartsWith("try-release-")) {
Set-AppveyorBuildVariable "release" "1"
}
}
# The version is unique even for rebuilds, so we can use it for the AppVeyor version.
Update-AppveyorBuild -Version $version
@@ -17,6 +17,7 @@ This license can be found at:
#include <windows.h>
#include <oleacc.h>
#include <oleidl.h>
#include <atlcomcli.h>
#include <mshtml.h>
#include <set>
#include <string>
@@ -401,8 +402,11 @@ inline void getCurrentStyleInfoFromHTMLDOMNode(IHTMLDOMNode* pHTMLDOMNode, bool&
if (pHTMLCurrentStyle) pHTMLCurrentStyle->Release();
}

// #8976: the string in the following macro must be passed to the COM method as a BSTR
// otherwise the COM marshaller will try and read the BSTR length and hit either inaccessible memory or get back junk.
// This is seen in optimized builds of NVDA when accessing some CHM files in hh.exe.
#define macro_addHTMLAttributeToMap(attribName,allowEmpty,attribsObj,attribsMap,tempVar,tempAttrObj) {\
attribsObj->getNamedItem(attribName,&tempAttrObj);\
attribsObj->getNamedItem(CComBSTR(attribName),&tempAttrObj);\
if(tempAttrObj) {\
VariantInit(&tempVar);\
tempAttrObj->get_nodeValue(&tempVar);\
@@ -1676,7 +1676,14 @@ def setDisplayByName(self, name, isFallback=False, detected=None):
else: # detected:
self._disableDetection()
log.info("Loaded braille display driver %s, current display has %d cells." %(name, self.displaySize))
self.initialDisplay()
try:
self.initialDisplay()
except:
# #8877: initialDisplay might fail because NVDA tries to focus
# an object for which property fetching raises an exception.
# We should handle this more gracefully, since this is no reason
# to stop a display from loading successfully.
log.debugWarning("Error in initial display after display load", exc_info=True)
return True
except:
# For auto display detection, logging an error for every failure is too obnoxious.
@@ -3,9 +3,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Russian translation NVDA\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-07 00:10+1000\n"
"PO-Revision-Date: 2018-12-09 19:22+0100\n"
"Last-Translator: Kvark <kvark128@yandex.ru>\n"
"POT-Creation-Date: 2018-12-10 10:30+1000\n"
"PO-Revision-Date: 2018-12-11 15:35+0100\n"
"Last-Translator: zvonimir stanecic <zvonimirek222@yandex.com>\n"
"Language-Team: \n"
"Language: ru_RU\n"
"MIME-Version: 1.0\n"
@@ -299,7 +299,7 @@ msgstr "⠸⠏⠗⠊⠇⠸"
#. Translators: Displayed in braille for an object which is a
#. grouping.
msgid "grp"
msgstr "⠛⠗⠏⠸"
msgstr "⠛⠗⠏⠸"

#. Translators: Displayed in braille for an object which is a
#. embedded object.
@@ -4,8 +4,8 @@ msgid ""
msgstr ""
"Project-Id-Version: NVDA source-master-4ccb2ab\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-07 00:10+1000\n"
"PO-Revision-Date: 2018-12-07 09:43+0000\n"
"POT-Creation-Date: 2018-12-10 10:30+1000\n"
"PO-Revision-Date: 2018-12-12 09:28+0000\n"
"Last-Translator: Osman H Baiia <othman82@hotmail.com>\n"
"Language-Team: \n"
"Language: so\n"
@@ -3747,22 +3747,28 @@ msgid ""
"Moves the review cursor to the next word of the current navigator object and "
"speaks it"
msgstr ""
"Wuxuu guurayaa calammaadda dib u eegista ilaa ereygii xiga ee shayga "
"nafigeeshinka oo ku hadla"

#. Translators: a message reported when review cursor is at the leftmost character of the current navigator object's text.
msgid "Left"
msgstr ""
msgstr "bidix"

#. Translators: Input help mode message for move review cursor to start of current line command.
msgid ""
"Moves the review cursor to the first character of the line where it is "
"situated in the current navigator object and speaks it"
msgstr ""
"Kursiga dib u eegista wuxuu u guuraa dabeecada koowaad ee xariiqda halka uu "
"ku yaala shayga nafigeeshinka ee hadda taagan oo ka hadlaya"

#. Translators: Input help mode message for move review cursor to previous character command.
msgid ""
"Moves the review cursor to the previous character of the current navigator "
"object and speaks it"
msgstr ""
"Wuxuu guurayaa calammaadda dib u eegista ilaa xarafka hore ee shayga "
"nafigeeshinka oo ku hadla"

#. Translators: Input help mode message for report current character under review cursor command.
msgid ""
@@ -3771,45 +3777,57 @@ msgid ""
"character. Pressing three times reports the numeric value of the character "
"in decimal and hexadecimal"
msgstr ""
"Wuxuu soo sheegaa dabeecadda walxaha socdaalka halkaasoo calaamadda dib u "
"eegista ay ku taal. Riixista laba jeer warbixinta sharaxaad ama tusaalahan "
"dabeecaddaas. Riixidda sadex jeer ayaa ka warbixinaya qiimaha tirada ee "
"dabeecadda ee tobanleyda iyo tobanlaha"

#. Translators: a message reported when review cursor is at the rightmost character of the current navigator object's text.
msgid "Right"
msgstr ""
msgstr "midig"

#. Translators: Input help mode message for move review cursor to next character command.
msgid ""
"Moves the review cursor to the next character of the current navigator "
"object and speaks it"
msgstr ""
"Kursiga dib u eegista wuxuu u guuriyaa dabeecadda soo socota ee shayada "
"socdaalka ee hadda socda"

#. Translators: Input help mode message for move review cursor to end of current line command.
msgid ""
"Moves the review cursor to the last character of the line where it is "
"situated in the current navigator object and speaks it"
msgstr ""
"Kursiga dib u eegista wuxuu u guuraa dabeecadda ugu dambeysa ee xariiqda "
"halka uu ku yaala shayga socdaalka ee hadda socda"

#. Translators: A speech mode which disables speech output.
msgid "Speech mode off"
msgstr ""
msgstr "Hababka Hadalka wuu dimsiyyahay"

#. Translators: A speech mode which will cause NVDA to beep instead of speaking.
msgid "Speech mode beeps"
msgstr ""
msgstr "Hababka Hadalka qaraac"

#. Translators: The normal speech mode; i.e. NVDA will talk as normal.
msgid "Speech mode talk"
msgstr ""
msgstr "Hababka Hadalka dhawaaq"

#. Translators: Input help mode message for toggle speech mode command.
msgid ""
"Toggles between the speech modes of off, beep and talk. When set to off NVDA "
"will not speak anything. If beeps then NVDA will simply beep each time it "
"its supposed to speak something. If talk then NVDA wil just speak normally."
msgstr ""
"Wadajir u dhexeeya hababka hadalka ee dimmi, qaraac iyo dhawaaq. Marka la "
"dimsiyyo NVDA ma hadli doonto wax. Haddii qaraac NVDA markasta waxay ku "
"qaraac doontaa mar kasta oo ay u malaynayso in ay wax uun ku hadlaan. haddii "
"dhawaaq NVDA ay si caadi ah u hadlaan."

#. Translators: Input help mode message for move to next document with focus command, mostly used in web browsing to move from embedded object to the webpage document.
msgid "Moves the focus to the next closest document that contains the focus"
msgstr ""
msgstr "Wuxuu saaraa diiradda dukumeentiga ugu dhow kuwaas oo ku jira diiradda"

#. Translators: Input help mode message for toggle focus and browse mode command in web browsing and other situations.
msgid ""
@@ -3821,15 +3839,15 @@ msgstr ""

#. Translators: Input help mode message for quit NVDA command.
msgid "Quits NVDA!"
msgstr ""
msgstr "NVDA ka tagay!"

#. Translators: Input help mode message for restart NVDA command.
msgid "Restarts NVDA!"
msgstr ""
msgstr "Dib u furfurista NVDA!"

#. Translators: Input help mode message for show NVDA menu command.
msgid "Shows the NVDA menu"
msgstr ""
msgstr "Waxay muujisaa menu NVDA"

#. Translators: Input help mode message for say all in review cursor command.
msgid ""
@@ -3845,11 +3863,11 @@ msgstr ""

#. Translators: Reported when trying to obtain formatting information (such as font name, indentation and so on) but there is no formatting information for the text under cursor.
msgid "No formatting information"
msgstr ""
msgstr "Macluumaadka xogta qaabaynta ma jiraan"

#. Translators: title for formatting information dialog.
msgid "Formatting"
msgstr ""
msgstr "xogta qaabaynta "

#. Translators: Input help mode message for report formatting command.
msgid ""
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Vietnamese Language for NVDA\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-11-02 00:10+1000\n"
"PO-Revision-Date: 2018-12-09 22:22+0700\n"
"POT-Creation-Date: 2018-12-10 10:30+1000\n"
"PO-Revision-Date: 2018-12-10 09:34+0700\n"
"Last-Translator: Dang Manh Cuong <dangmanhcuong@gmail.com>\n"
"Language-Team: Sao Mai Center for the Blind <danghoaiphuc@gmail.com>\n"
"Language: vi_VN\n"
@@ -6834,6 +6834,18 @@ msgstr "chưa đọc"
msgid "Editing profile {profile}"
msgstr "Đang sửa hồ sơ {profile}"

#. Translators: the last action taken on an Outlook mail message
msgid "replied"
msgstr "đã trả lời"

#. Translators: the last action taken on an Outlook mail message
msgid "replied all"
msgstr "đã trả lời tất cả"

#. Translators: the last action taken on an Outlook mail message
msgid "forwarded"
msgstr "đã chuyển tiếp"

#. Translators: for a high importance email
msgid "high importance"
msgstr "quan trọng"
@@ -8548,6 +8560,16 @@ msgstr "&Mức độ thông báo dấu câu và ký hiệu:"
msgid "Trust voice's language when processing characters and symbols"
msgstr "Sử dụng giọng đọc của ngôn ngữ để xử lý ký hiệu và ký tự"

#. Translators: This is the label for a checkbox in the
#. voice settings panel (if checked, data from the unicode CLDR will be used
#. to speak emoji descriptions).
msgid ""
"Include Unicode Consortium data (including emoji) when processing characters "
"and symbols"
msgstr ""
"Tích hợp dữ liệu của Unicode Consortium (bao gồm biểu tượng cảm xúc) khi xử "
"lý kí hiệu và kí tự"

#. Translators: This is a label for a setting in voice settings (an edit box to change voice pitch for capital letters; the higher the value, the pitch will be higher).
msgid "Capital pitch change percentage"
msgstr "Phần trăm thay đổi độ cao khi đọc chữ hoa"
@@ -10647,6 +10669,16 @@ msgstr "nhận xét: {text} bởi {author} vào {date}"
msgid "{revisionType} {description}: {text} by {author} on {date}"
msgstr "{revisionType} {description}: {text} bởi {author} vào {date}"

#. Translators: a distance from the left edge of the page in Microsoft Word
#, python-brace-format
msgid "{distance} from left edge of page"
msgstr "{distance} từ lề trái của trang"

#. Translators: a distance from the left edge of the page in Microsoft Word
#, python-brace-format
msgid "{distance} from top edge of page"
msgstr "{distance} từ lề trên của trang"

#. Translators: single line spacing
msgctxt "line spacing value"
msgid "single"
Oops, something went wrong.

0 comments on commit c25104b

Please sign in to comment.