[orca] Updated Vietnamese translation

From: Clytie Siddall <clyties src gnome org>
To: commits-list gnome org
Cc:
Subject: [orca] Updated Vietnamese translation
Date: Mon, 22 Mar 2010 10:48:06 +0000 (UTC)
commit 4265a9d3253264f632bef908a505bb7fbf344231
Author: Clytie <pearl clytie-siddalls-macbook-pro local>
Date:   Mon Mar 22 21:17:56 2010 +1030

    Updated Vietnamese translation

 po/vi.po | 4327 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 2415 insertions(+), 1912 deletions(-)
---
diff --git a/po/vi.po b/po/vi.po
index 04ffea2..cb166a6 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,13 +1,13 @@
 # Vietnamese translation for Orca.
-# Copyright Â© 2009 GNOME i18n Project for Vietnamese.
+# Copyright Â© 2010 GNOME i18n Project for Vietnamese.
 # Nguyá»?n ThÃ¡i Ngá»?c Duy <pclouds gmail com>, 2007.
-# Clytie Siddall <clytie riverland net au>, 2007-2009.
+# Clytie Siddall <clytie riverland net au>, 2007-2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: orca TRUNK\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=orca&component=general\n";
-"POT-Creation-Date: 2009-02-11 19:56+0000\n"
-"PO-Revision-Date: 2009-02-13 21:54+0930\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=orca&component=i18n\n";
+"POT-Creation-Date: 2010-02-19 16:57+0000\n"
+"PO-Revision-Date: 2010-03-22 21:17+0930\n"
 "Last-Translator: Clytie Siddall <clytie riverland net au>\n"
 "Language-Team: Vietnamese <vi-VN googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,37 @@ msgstr ""
 "X-Generator: LocFactoryEditor 1.8\n"
 
 #: ../orca.desktop.in.h:1
+#: ../src/orca/app_gui_prefs.py:210
+#: ../src/orca/keybindings.py:157
+#: ../src/orca/orca_gui_main.py:141
+#: ../src/orca/orca_gui_prefs.py:2278
+#: ../src/orca/orca_gui_prefs.py:2383
+msgid "Orca"
+msgstr "Orca"
+
+#: ../orca.desktop.in.h:2
 msgid "Orca Screen Reader and Magnifier"
 msgstr "Bá»? Ä?á»?c vÃ  PhÃ³ng To MÃ n HÃ¬nh Orca"
 
-#: ../orca.desktop.in.h:2
+#: ../orca.desktop.in.h:3
 msgid "Present on-screen information as speech or braille, or magnify the screen"
 msgstr "Ä?Æ°a ra thÃ´ng tin trÃªn mÃ n hÃ¬nh nhÆ° lÃ  tiáº¿ng nÃ³i hay chá»¯ ná»?i Braille, hoáº·c phÃ³ng to mÃ n hÃ¬nh"
 
-#. Liblouis Python bindings
-#.
-#. Copyright 2007-2008 Eitan Isaacson
-#.
-#. This library is free software; you can redistribute it and/or
-#. modify it under the terms of the GNU Library General Public
-#. License as published by the Free Software Foundation; either
-#. version 2 of the License, or (at your option) any later version.
-#.
-#. This library is distributed in the hope that it will be useful,
-#. but WITHOUT ANY WARRANTY; without even the implied warranty of
-#. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#. Library General Public License for more details.
-#.
-#. You should have received a copy of the GNU Library General Public
-#. License along with this library; if not, write to the
-#. Free Software Foundation, Inc., Franklin Street, Fifth Floor,
-#. Boston MA  02110-1301 USA.
-#. for gettext support
-#. to provide qualified translatable strings
-#. Translators: These are the braille translation table names for different
-#. languages. You could read about braille tables at:
-#. http://en.wikipedia.org/wiki/Braille
-#.
-#: ../src/louis/constants.py.in:28
-msgid "Czech Grade 1"
-msgstr "SÃ©c lá»?p 1"
-
-#: ../src/louis/constants.py.in:29
-msgid "Spanish Grade 1"
-msgstr "TÃ¢y Ban Nha lá»?p 1"
-
-#: ../src/louis/constants.py.in:30
-msgid "Canada French Grade 2"
-msgstr "PhÃ¡p (Ca-na-Ä?a) lá»?p 2"
-
-#: ../src/louis/constants.py.in:31
-msgid "France French Grade 2"
-msgstr "PhÃ¡p (PhÃ¡p) lá»?p 2"
-
-#: ../src/louis/constants.py.in:32
-msgid "Latvian Grade 1"
-msgstr "LÃ¡t-vi-a lá»?p 1"
-
-#: ../src/louis/constants.py.in:33
-msgid "Netherlands Dutch Grade 1"
-msgstr "HÃ  Lan (HÃ  Lan) lá»?p 1"
-
-#: ../src/louis/constants.py.in:34
-msgid "Norwegian Grade 0"
-msgstr "Na Uy lá»?p 0"
-
-#: ../src/louis/constants.py.in:35
-msgid "Norwegian Grade 1"
-msgstr "Na Uy lá»?p 1"
-
-#: ../src/louis/constants.py.in:36
-msgid "Norwegian Grade 2"
-msgstr "Na Uy lá»?p 2"
-
-#: ../src/louis/constants.py.in:37
-msgid "Norwegian Grade 3"
-msgstr "Na Uy lá»?p 3"
-
-#: ../src/louis/constants.py.in:38
-msgid "Polish Grade 1"
-msgstr "Ba Lan lá»?p 1"
-
-#: ../src/louis/constants.py.in:39
-msgid "Portuguese Grade 1"
-msgstr "Bá»? Ä?Ã o Nha lá»?p 1"
-
-#: ../src/louis/constants.py.in:40
-msgid "Swedish Grade 1"
-msgstr "Thuá»µ Ä?iá»?n lá»?p 1"
-
-#: ../src/louis/constants.py.in:41
-msgid "Arabic Grade 1"
-msgstr "A Ráºp lá»?p 1"
-
-#: ../src/louis/constants.py.in:42
-msgid "Welsh Grade 1"
-msgstr "Ouen-s lá»?p 1"
-
-#: ../src/louis/constants.py.in:43
-msgid "Welsh Grade 2"
-msgstr "Ouen-s lá»?p 2"
-
-#: ../src/louis/constants.py.in:44
-msgid "German Grade 0"
-msgstr "Ä?á»©c lá»?p 0"
-
-#: ../src/louis/constants.py.in:45
-msgid "German Grade 1"
-msgstr "Ä?á»©c lá»?p 1"
-
-#: ../src/louis/constants.py.in:46
-msgid "German Grade 2"
-msgstr "Ä?á»©c lá»?p 2"
-
-#: ../src/louis/constants.py.in:47
-msgid "U.K. English Grade 2"
-msgstr "Anh (Quá»?c Anh) lá»?p 2"
-
-#: ../src/louis/constants.py.in:48
-msgid "U.K. English Grade 1"
-msgstr "Anh (Quá»?c Anh) lá»?p 1"
-
-#: ../src/louis/constants.py.in:49
-msgid "U.S. English Grade 1"
-msgstr "Anh (Má»¹) lá»?p 1"
-
-#: ../src/louis/constants.py.in:50
-msgid "U.S. English Grade 2"
-msgstr "Anh (Má»¹) lá»?p 2"
-
-#: ../src/louis/constants.py.in:51
-msgid "Canada French Grade 1"
-msgstr "PhÃ¡p (Ca-na-Ä?a) lá»?p 1"
-
-#: ../src/louis/constants.py.in:52
-msgid "France French Grade 1"
-msgstr "PhÃ¡p (PhÃ¡p) lá»?p 1"
-
-#: ../src/louis/constants.py.in:53
-msgid "Greek Grade 1"
-msgstr "Hy Láº¡p lá»?p 1"
-
-#: ../src/louis/constants.py.in:54
-msgid "Hindi Grade 1"
-msgstr "Hin-Ä?i lá»?p 1"
-
-#: ../src/louis/constants.py.in:55
-msgid "Italian Grade 1"
-msgstr "Ã? lá»?p 1"
-
-#: ../src/louis/constants.py.in:56
-msgid "Belgium Dutch Grade 1"
-msgstr "HÃ  Lan (Bá»?) lá»?p 1"
+#: ../orca.desktop.in.h:4
+#| msgid "Orca Screen Reader and Magnifier"
+msgid "Screen Reader and Magnifier"
+msgstr "Bá»? Ä?á»?c mÃ n hÃ¬nh vÃ  kÃnh lÃºp"
 
 #: ../src/orca/app_gui_prefs.py:129
 #, python-format
 msgid "Orca Preferences for %s"
 msgstr "TÃ¹y thÃch Orca cho %s"
 
-#: ../src/orca/app_gui_prefs.py:210
-#: ../src/orca/keybindings.py:157
-#: ../src/orca/orca_gui_prefs.py:2138
-#: ../src/orca/orca_gui_prefs.py:2243
-msgid "Orca"
-msgstr "Orca"
-
 #. Translators: this refers to commands that do not currently have
 #. an associated key binding.
 #.
 #: ../src/orca/app_gui_prefs.py:215
-#: ../src/orca/orca_gui_prefs.py:2249
+#: ../src/orca/orca_gui_prefs.py:2389
 msgid "Unbound"
 msgstr "ChÆ°a káº¿t há»£p"
 
@@ -209,24 +76,24 @@ msgstr "liÃªn káº¿t Ä?Ã£ lÆ°u"
 #. Translators: this announces that the current object is the same
 #. object pointed to by the bookmark.
 #.
-#: ../src/orca/bookmarks.py:102
-#: ../src/orca/scripts/toolkits/Gecko/bookmarks.py:108
+#: ../src/orca/bookmarks.py:103
+#: ../src/orca/scripts/toolkits/Gecko/bookmarks.py:107
 msgid "bookmark is current object"
 msgstr "liÃªn káº¿t lÆ°u lÃ  Ä?á»?i tÆ°á»£ng hiá»?n táº¡i"
 
 #. Translators: this announces that the current object's parent and
 #. the parent of the object pointed to by the bookmark are the same.
 #.
-#: ../src/orca/bookmarks.py:109
-#: ../src/orca/scripts/toolkits/Gecko/bookmarks.py:115
+#: ../src/orca/bookmarks.py:110
+#: ../src/orca/scripts/toolkits/Gecko/bookmarks.py:114
 msgid "bookmark and current object have same parent"
 msgstr "liÃªn káº¿t lÆ°u vÃ  Ä?á»?i tÆ°á»£ng hiá»?n táº¡i cÃ³ cÃ¹ng máº¹"
 
 #. Translators: this announces that the bookmark and the current
 #. object share a common ancestor
 #.
-#: ../src/orca/bookmarks.py:126
-#: ../src/orca/scripts/toolkits/Gecko/bookmarks.py:132
+#: ../src/orca/bookmarks.py:127
+#: ../src/orca/scripts/toolkits/Gecko/bookmarks.py:131
 #, python-format
 msgid "shared ancestor %s"
 msgstr "tá»? tiÃªn chung %s"
@@ -234,120 +101,42 @@ msgstr "tá»? tiÃªn chung %s"
 #. Translators: This announces that a comparison between the bookmark
 #. and the current object can not be determined.
 #.
-#: ../src/orca/bookmarks.py:133
-#: ../src/orca/scripts/toolkits/Gecko/bookmarks.py:139
+#: ../src/orca/bookmarks.py:134
+#: ../src/orca/scripts/toolkits/Gecko/bookmarks.py:138
 msgid "comparison unknown"
 msgstr "so sÃ¡nh khÃ´ng rÃµ"
 
 #. Translators: this announces that a bookmark has been saved to
 #. disk
 #.
-#: ../src/orca/bookmarks.py:142
-#: ../src/orca/scripts/toolkits/Gecko/bookmarks.py:154
+#: ../src/orca/bookmarks.py:143
+#: ../src/orca/scripts/toolkits/Gecko/bookmarks.py:153
 msgid "bookmarks saved"
 msgstr "liÃªn káº¿t Ä?Ã£ lÆ°u vÃ o Ä?Ä©a"
 
 #. Translators: this announces that a bookmark could not be saved to
 #. disk
 #.
-#: ../src/orca/bookmarks.py:147
-#: ../src/orca/scripts/toolkits/Gecko/bookmarks.py:159
+#: ../src/orca/bookmarks.py:148
+#: ../src/orca/scripts/toolkits/Gecko/bookmarks.py:158
 msgid "bookmarks could not be saved"
 msgstr "khÃ´ng thá»? lÆ°u liÃªn káº¿t"
 
-#. Translators: this represents an item on the screen that has
-#. been set insensitive (or grayed out).
-#.
-#: ../src/orca/braillegenerator.py:195
-#: ../src/orca/speechgenerator.py:220
-msgid "grayed"
-msgstr "mÃ u xÃ¡m táº¯t"
-
 #. Translators: this tells the user how many unfocused
 #. alert and dialog windows plus the total number of
 #. windows that this application has.
 #.
-#: ../src/orca/braillegenerator.py:620
+#: ../src/orca/braille_generator.py:166
 #, python-format
 msgid "(%d dialog)"
 msgid_plural "(%d dialogs)"
 msgstr[0] "(%d há»?p thoáº¡i)"
 
-#. Translators: this represents the state of a node in a tree.
-#. 'expanded' means the children are showing.
-#. 'collapsed' means the children are not showing.
-#.
-#: ../src/orca/braillegenerator.py:757
-#: ../src/orca/braillegenerator.py:1404
-#: ../src/orca/scripts/apps/pidgin/speech_generator.py:91
-#: ../src/orca/scripts/apps/pidgin/where_am_i.py:144
-#: ../src/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.py:70
-#: ../src/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.py:70
-#: ../src/orca/speechgenerator.py:913
-#: ../src/orca/speechgenerator.py:1528
-#: ../src/orca/where_am_I.py:668
-#: ../src/orca/where_am_I.py:733
-msgid "expanded"
-msgstr "Ä?Ã£ giÃ£n ra"
-
-#. Translators: this represents the state of a node in a tree.
-#. 'expanded' means the children are showing.
-#. 'collapsed' means the children are not showing.
-#.
-#: ../src/orca/braillegenerator.py:763
-#: ../src/orca/braillegenerator.py:1410
-#: ../src/orca/scripts/apps/pidgin/speech_generator.py:110
-#: ../src/orca/scripts/apps/pidgin/where_am_i.py:150
-#: ../src/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.py:76
-#: ../src/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.py:77
-#: ../src/orca/speechgenerator.py:919
-#: ../src/orca/speechgenerator.py:1547
-#: ../src/orca/where_am_I.py:674
-#: ../src/orca/where_am_I.py:739
-msgid "collapsed"
-msgstr "Ä?Ã£ co láº¡i"
-
-#. Translators: this represents the depth of a node in a tree
-#. view (i.e., how many ancestors a node has).
-#.
-#: ../src/orca/braillegenerator.py:778
-#, python-format
-msgid "LEVEL %d"
-msgstr "Cáº¤P %d"
-
-#. Translators: this is the action name for
-#. the 'toggle' action. It must be the same
-#. string used in the *.po file for gail.
-#.
-#: ../src/orca/braillegenerator.py:1299
-#: ../src/orca/braillegenerator.py:1340
-#: ../src/orca/flat_review.py:1071
-#: ../src/orca/scripts/apps/evolution/script.py:829
-#: ../src/orca/scripts/apps/evolution/where_am_i.py:61
-#: ../src/orca/speechgenerator.py:1452
-#: ../src/orca/speechgenerator.py:1492
-#: ../src/orca/speechgenerator.py:1626
-#: ../src/orca/tutorialgenerator.py:521
-#: ../src/orca/tutorialgenerator.py:561
-#: ../src/orca/where_am_I.py:1341
-#: ../src/orca/where_am_I.py:1371
-msgid "toggle"
-msgstr "báºt/táº¯t"
-
-#. Translators: this represents the depth of a node in a tree
-#. view (i.e., how many ancestors a node has).
-#.
-#: ../src/orca/braillegenerator.py:1492
-#: ../src/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.py:84
-#, python-format
-msgid "TREE LEVEL %d"
-msgstr "Cáº¤P CÃ?Y %d"
-
 #. Translators: this is a command for a button on a refreshable braille
 #. display (an external hardware device used by people who are blind).
 #. When pressing the button, the display scrolls to the left.
 #.
-#: ../src/orca/braille.py:172
+#: ../src/orca/braille.py:97
 msgid "Line Left"
 msgstr "DÃ²ng trÃ¡i"
 
@@ -355,7 +144,7 @@ msgstr "DÃ²ng trÃ¡i"
 #. display (an external hardware device used by people who are blind).
 #. When pressing the button, the display scrolls to the right.
 #.
-#: ../src/orca/braille.py:178
+#: ../src/orca/braille.py:103
 msgid "Line Right"
 msgstr "DÃ²ng pháº£i"
 
@@ -363,7 +152,7 @@ msgstr "DÃ²ng pháº£i"
 #. display (an external hardware device used by people who are blind).
 #. When pressing the button, the display scrolls up.
 #.
-#: ../src/orca/braille.py:184
+#: ../src/orca/braille.py:109
 msgid "Line Up"
 msgstr "DÃ²ng trÃªn"
 
@@ -371,7 +160,7 @@ msgstr "DÃ²ng trÃªn"
 #. display (an external hardware device used by people who are blind).
 #. When pressing the button, the display scrolls down.
 #.
-#: ../src/orca/braille.py:190
+#: ../src/orca/braille.py:115
 msgid "Line Down"
 msgstr "DÃ²ng dÆ°á»?i"
 
@@ -379,7 +168,7 @@ msgstr "DÃ²ng dÆ°á»?i"
 #. display (an external hardware device used by people who are blind).
 #. When pressing the button, it instructs the braille display to freeze.
 #.
-#: ../src/orca/braille.py:196
+#: ../src/orca/braille.py:121
 msgid "Freeze"
 msgstr "Ä?Ã´ng Ä?áº·c"
 
@@ -388,7 +177,7 @@ msgstr "Ä?Ã´ng Ä?áº·c"
 #. When pressing the button, the display scrolls to the top left of the
 #. window.
 #.
-#: ../src/orca/braille.py:203
+#: ../src/orca/braille.py:128
 msgid "Top Left"
 msgstr "TrÃªn trÃ¡i"
 
@@ -397,7 +186,7 @@ msgstr "TrÃªn trÃ¡i"
 #. When pressing the button, the display scrolls to the bottom right of
 #. the window.
 #.
-#: ../src/orca/braille.py:210
+#: ../src/orca/braille.py:135
 msgid "Bottom Right"
 msgstr "DÆ°á»?i trÃ¡i"
 
@@ -406,15 +195,178 @@ msgstr "DÆ°á»?i trÃ¡i"
 #. When pressing the button, the display scrolls to position containing
 #. the cursor.
 #.
-#: ../src/orca/braille.py:217
+#: ../src/orca/braille.py:142
 msgid "Cursor Position"
 msgstr "Vá»? trÃ con nhÃ¡y"
 
+#. Translators: this is a command for a button on a refreshable braille
+#. display (an external hardware device used by people who are blind).
+#. When pressing the button, the display toggles between contracted and
+#. contracted braille.
+#.
+#: ../src/orca/braille.py:149
+msgid "Six Dots"
+msgstr "SÃ¡u Cháº¥m"
+
+#. Translators: this is a command for a button on a refreshable braille
+#. display (an external hardware device used by people who are blind).
+#. This command represents a whole set of buttons known as cursor
+#. routings keys and are a way for a user to tell the machine they are
+#. interested in a particular character on the display.
+#.
+#: ../src/orca/braille.py:157
+#| msgid "Cursor Position"
+msgid "Cursor Routing"
+msgstr "Ä?á»?nh tuyáº¿n con trá»?"
+
+#. Translators: this is a command for a button on a refreshable braille
+#. display (an external hardware device used by people who are blind).
+#. This command represents the start of a selection operation.  It is
+#. called "Cut Begin" to map to what BrlTTY users are used to:  in
+#. character cell mode operation on virtual consoles, the act of copying
+#. text is erroneously called a "cut" operation.
+#.
+#: ../src/orca/braille.py:166
+msgid "Cut Begin"
+msgstr "Báº¯t Ä?áº§u ChÃ©p"
+
+#. Translators: this is a command for a button on a refreshable braille
+#. display (an external hardware device used by people who are blind).
+#. This command represents marking the endpoint of a selection.  It is
+#. called "Cut Line" to map to what BrlTTY users are used to:  in
+#. character cell mode operation on virtual consoles, the act of copying
+#. text is erroneously called a "cut" operation.
+#.
+#: ../src/orca/braille.py:175
+#| msgid "Line"
+msgid "Cut Line"
+msgstr "Káº¿t thÃºc chÃ©p"
+
+#. Translators: These are the braille translation table names for different
+#. languages. You could read about braille tables at:
+#. http://en.wikipedia.org/wiki/Braille
+#.
+#: ../src/orca/braille.py:241
+msgid "Czech Grade 1"
+msgstr "SÃ©c lá»?p 1"
+
+#: ../src/orca/braille.py:242
+msgid "Spanish Grade 1"
+msgstr "TÃ¢y Ban Nha lá»?p 1"
+
+#: ../src/orca/braille.py:243
+msgid "Canada French Grade 2"
+msgstr "PhÃ¡p (Ca-na-Ä?a) lá»?p 2"
+
+#: ../src/orca/braille.py:244
+msgid "France French Grade 2"
+msgstr "PhÃ¡p (PhÃ¡p) lá»?p 2"
+
+#: ../src/orca/braille.py:245
+msgid "Latvian Grade 1"
+msgstr "LÃ¡t-vi-a lá»?p 1"
+
+#: ../src/orca/braille.py:246
+msgid "Netherlands Dutch Grade 1"
+msgstr "HÃ  Lan (HÃ  Lan) lá»?p 1"
+
+#: ../src/orca/braille.py:247
+msgid "Norwegian Grade 0"
+msgstr "Na Uy lá»?p 0"
+
+#: ../src/orca/braille.py:248
+msgid "Norwegian Grade 1"
+msgstr "Na Uy lá»?p 1"
+
+#: ../src/orca/braille.py:249
+msgid "Norwegian Grade 2"
+msgstr "Na Uy lá»?p 2"
+
+#: ../src/orca/braille.py:250
+msgid "Norwegian Grade 3"
+msgstr "Na Uy lá»?p 3"
+
+#: ../src/orca/braille.py:251
+msgid "Polish Grade 1"
+msgstr "Ba Lan lá»?p 1"
+
+#: ../src/orca/braille.py:252
+msgid "Portuguese Grade 1"
+msgstr "Bá»? Ä?Ã o Nha lá»?p 1"
+
+#: ../src/orca/braille.py:253
+msgid "Swedish Grade 1"
+msgstr "Thuá»µ Ä?iá»?n lá»?p 1"
+
+#: ../src/orca/braille.py:254
+msgid "Arabic Grade 1"
+msgstr "A Ráºp lá»?p 1"
+
+#: ../src/orca/braille.py:255
+msgid "Welsh Grade 1"
+msgstr "Ouen-s lá»?p 1"
+
+#: ../src/orca/braille.py:256
+msgid "Welsh Grade 2"
+msgstr "Ouen-s lá»?p 2"
+
+#: ../src/orca/braille.py:257
+msgid "German Grade 0"
+msgstr "Ä?á»©c lá»?p 0"
+
+#: ../src/orca/braille.py:258
+msgid "German Grade 1"
+msgstr "Ä?á»©c lá»?p 1"
+
+#: ../src/orca/braille.py:259
+msgid "German Grade 2"
+msgstr "Ä?á»©c lá»?p 2"
+
+#: ../src/orca/braille.py:260
+msgid "U.K. English Grade 2"
+msgstr "Anh (Quá»?c Anh) lá»?p 2"
+
+#: ../src/orca/braille.py:261
+msgid "U.K. English Grade 1"
+msgstr "Anh (Quá»?c Anh) lá»?p 1"
+
+#: ../src/orca/braille.py:262
+msgid "U.S. English Grade 1"
+msgstr "Anh (Má»¹) lá»?p 1"
+
+#: ../src/orca/braille.py:263
+msgid "U.S. English Grade 2"
+msgstr "Anh (Má»¹) lá»?p 2"
+
+#: ../src/orca/braille.py:264
+msgid "Canada French Grade 1"
+msgstr "PhÃ¡p (Ca-na-Ä?a) lá»?p 1"
+
+#: ../src/orca/braille.py:265
+msgid "France French Grade 1"
+msgstr "PhÃ¡p (PhÃ¡p) lá»?p 1"
+
+#: ../src/orca/braille.py:266
+msgid "Greek Grade 1"
+msgstr "Hy Láº¡p lá»?p 1"
+
+#: ../src/orca/braille.py:267
+msgid "Hindi Grade 1"
+msgstr "Hin-Ä?i lá»?p 1"
+
+#: ../src/orca/braille.py:268
+msgid "Italian Grade 1"
+msgstr "Ã? lá»?p 1"
+
+#: ../src/orca/braille.py:269
+msgid "Belgium Dutch Grade 1"
+msgstr "HÃ  Lan (Bá»?) lá»?p 1"
+
 #. Translators: this is the spoken word for the space character
 #.
 #: ../src/orca/chnames.py:39
-#: ../src/orca/default.py:6864
-#: ../src/orca/default.py:6871
+#: ../src/orca/default.py:7463
+#: ../src/orca/default.py:7470
 #: ../src/orca/keynames.py:133
 msgid "space"
 msgstr "dáº¥u cÃ¡ch"
@@ -598,7 +550,11 @@ msgstr "gáº¡ch dÆ°á»?i"
 
 #. Translators: this is the spoken word for the character '`' (U+0060)
 #.
+#. Translators: this is how someone would speak the name of the
+#. non-spacing diacritical key for the grave glyph
+#.
 #: ../src/orca/chnames.py:159
+#: ../src/orca/keynames.py:250
 msgid "grave"
 msgstr "huyá»?n"
 
@@ -622,43 +578,55 @@ msgstr "dáº¥u ngoáº·c mÃ³c pháº£i"
 
 #. Translators: this is the spoken word for the character '~' (U+007e)
 #.
+#. Translators: this is how someone would speak the name of the
+#. non-spacing diacritical key for the tilde glyph
+#.
 #: ../src/orca/chnames.py:175
+#: ../src/orca/keynames.py:265
 msgid "tilde"
 msgstr "dáº¥u ngÃ£"
 
+#. Translators: this is the spoken character for the no break space
+#. character (e.g., "&nbsp;" in HTML -- U+00a0)
+#.
+#: ../src/orca/chnames.py:180
+#| msgid "backspace"
+msgid "no break space"
+msgstr "dáº¥u cÃ¡ch khÃ´ng ngáº¯t"
+
 #. Translators: this is the spoken word for the character 'Â¡' (U+00a1)
 #.
-#: ../src/orca/chnames.py:179
+#: ../src/orca/chnames.py:184
 msgid "inverted exclamation point"
 msgstr "dáº¥u cháº¥m than ngÆ°á»£c"
 
 #. Translators: this is the spoken word for the character 'Â¢' (U+00a2)
 #.
-#: ../src/orca/chnames.py:183
+#: ../src/orca/chnames.py:188
 msgid "cents"
 msgstr "dáº¥u Ä?á»?ng xu"
 
 #. Translators: this is the spoken word for the character 'Â£' (U+00a3)
 #.
-#: ../src/orca/chnames.py:187
+#: ../src/orca/chnames.py:192
 msgid "pounds"
 msgstr "dáº¥u Ä?á»?ng Anh"
 
 #. Translators: this is the spoken word for the character 'Â¤' (U+00a4)
 #.
-#: ../src/orca/chnames.py:191
+#: ../src/orca/chnames.py:196
 msgid "currency sign"
 msgstr "dáº¥u tiá»?n tá»?"
 
 #. Translators: this is the spoken word for the character 'Â¥' (U+00a5)
 #.
-#: ../src/orca/chnames.py:195
+#: ../src/orca/chnames.py:200
 msgid "yen"
 msgstr "dáº¥u Ä?á»?ng Nháºt"
 
 #. Translators: this is the spoken word for the character 'Â¦' (U+00a6)
 #.
-#: ../src/orca/chnames.py:199
+#: ../src/orca/chnames.py:204
 msgid "broken bar"
 msgstr "thanh bá»? ngáº¯t"
 
@@ -666,694 +634,712 @@ msgstr "thanh bá»? ngáº¯t"
 #.
 #. Translators: spoken words for the rolename of a section (e.g., in html).
 #.
-#: ../src/orca/chnames.py:203
+#: ../src/orca/chnames.py:208
 #: ../src/orca/rolenames.py:840
 msgid "section"
 msgstr "pháº§n"
 
 #. Translators: this is the spoken word for the character 'Â¨' (U+00a8)
 #.
-#: ../src/orca/chnames.py:207
+#: ../src/orca/chnames.py:212
 msgid "umlaut"
 msgstr "hai cháº¥m trÃªn"
 
 #. Translators: this is the spoken word for the character 'Â©' (U+00a9)
 #.
-#: ../src/orca/chnames.py:211
+#: ../src/orca/chnames.py:216
 msgid "copyright"
 msgstr "tÃ¡c quyá»?n"
 
 #. Translators: this is the spoken word for the character 'Âª' (U+00aa)
 #.
-#: ../src/orca/chnames.py:215
+#: ../src/orca/chnames.py:220
 msgid "superscript a"
 msgstr "chá»¯ a cao"
 
 #. Translators: this is the spoken word for the character 'Â«' (U+00ab)
 #.
-#: ../src/orca/chnames.py:219
+#: ../src/orca/chnames.py:224
 msgid "left double angle bracket"
 msgstr "dáº¥u ngoáº·c nhá»?n Ä?Ã´i trÃ¡i"
 
 #. Translators: this is the spoken word for the character 'Â¬' (U+00ac)
 #.
-#: ../src/orca/chnames.py:223
+#: ../src/orca/chnames.py:228
 msgid "logical not"
 msgstr "phá»§ Ä?á»?nh"
 
 #. Translators: this is the spoken word for the character 'Â' (U+00ad)
 #.
-#: ../src/orca/chnames.py:227
+#: ../src/orca/chnames.py:232
 msgid "soft hyphen"
 msgstr "dáº¥u ná»?i má»?m"
 
 #. Translators: this is the spoken word for the character 'Â®' (U+00ae)
 #.
-#: ../src/orca/chnames.py:231
+#: ../src/orca/chnames.py:236
 msgid "registered"
 msgstr "dáº¥u Ä?Ä?ng kÃ½"
 
 #. Translators: this is the spoken word for the character 'Â¯' (U+00af)
 #.
-#: ../src/orca/chnames.py:235
+#: ../src/orca/chnames.py:240
 msgid "macron"
 msgstr "dáº¥u ná»?i á»? trÃªn"
 
 #. Translators: this is the spoken word for the character 'Â°' (U+00b0)
 #.
-#: ../src/orca/chnames.py:239
+#: ../src/orca/chnames.py:244
 msgid "degrees"
 msgstr "dáº¥u Ä?á»?"
 
 #. Translators: this is the spoken word for the character 'Â±' (U+00b1)
 #.
-#: ../src/orca/chnames.py:243
+#: ../src/orca/chnames.py:248
 msgid "plus or minus"
 msgstr "cá»?ng hay trá»«"
 
 #. Translators: this is the spoken word for the character 'Â²' (U+00b2)
 #.
-#: ../src/orca/chnames.py:247
+#: ../src/orca/chnames.py:252
 msgid "superscript 2"
 msgstr "sá»? hai cao"
 
 #. Translators: this is the spoken word for the character 'Â³' (U+00b3)
 #.
-#: ../src/orca/chnames.py:251
+#: ../src/orca/chnames.py:256
 msgid "superscript 3"
 msgstr "sá»? ba cao"
 
 #. Translators: this is the spoken word for the character 'Â´' (U+00b4)
 #.
-#: ../src/orca/chnames.py:255
+#: ../src/orca/chnames.py:260
 msgid "acute accent"
 msgstr "dáº¥u sáº¯c"
 
 #. Translators: this is the spoken word for the character 'Âµ' (U+00b5)
 #.
-#: ../src/orca/chnames.py:259
+#: ../src/orca/chnames.py:264
 msgid "mu"
 msgstr "chá»¯ Hy Láº¡p cá»? Â« miu Â»"
 
 #. Translators: this is the spoken word for the character 'Â¶' (U+00b6)
 #.
-#: ../src/orca/chnames.py:263
+#: ../src/orca/chnames.py:268
 msgid "paragraph marker"
 msgstr "dáº¥u Ä?oáº¡n vÄ?n"
 
 #. Translators: this is the spoken word for the character 'Â·' (U+00b7)
 #.
-#: ../src/orca/chnames.py:267
+#: ../src/orca/chnames.py:272
 msgid "middle dot"
 msgstr "cháº¥m giá»¯a"
 
 #. Translators: this is the spoken word for the character 'Â¸' (U+00b8)
 #.
-#: ../src/orca/chnames.py:271
+#. Translators: this is how someone would speak the name of the
+#. non-spacing diacritical key for the cedilla glyph
+#.
+#: ../src/orca/chnames.py:276
+#: ../src/orca/keynames.py:280
 msgid "cedilla"
 msgstr "dáº¥u mÃ³c dÆ°á»?i"
 
 #. Translators: this is the spoken word for the character 'Â¹' (U+00b9)
 #.
-#: ../src/orca/chnames.py:275
+#: ../src/orca/chnames.py:280
 msgid "superscript 1"
 msgstr "sá»? 1 cao"
 
 #. Translators: this is the spoken word for the character 'Âº' (U+00ba)
 #.
-#: ../src/orca/chnames.py:279
+#: ../src/orca/chnames.py:284
 msgid "ordinal"
 msgstr "kÃ½ hiá»?u Ä?á»?"
 
 #. Translators: this is the spoken word for the character 'Â»' (U+00bb)
 #.
-#: ../src/orca/chnames.py:283
+#: ../src/orca/chnames.py:288
 msgid "right double angle bracket"
 msgstr "dáº¥u ngoáº·c nhá»?n Ä?Ã´i pháº£i"
 
 #. Translators: this is the spoken word for the character 'Â¼' (U+00bc)
 #.
-#: ../src/orca/chnames.py:287
+#: ../src/orca/chnames.py:292
 msgid "one fourth"
 msgstr "má»?t pháº§n tÆ°"
 
 #. Translators: this is the spoken word for the character 'Â½' (U+00bd)
 #.
-#: ../src/orca/chnames.py:291
+#: ../src/orca/chnames.py:296
 msgid "one half"
 msgstr "má»?t pháº§n hai"
 
 #. Translators: this is the spoken word for the character 'Â¾' (U+00be)
 #.
-#: ../src/orca/chnames.py:295
+#: ../src/orca/chnames.py:300
 msgid "three fourths"
 msgstr "ba pháº§n tÆ°"
 
 #. Translators: this is the spoken word for the character 'Â¿' (U+00bf)
 #.
-#: ../src/orca/chnames.py:299
+#: ../src/orca/chnames.py:304
 msgid "inverted question mark"
 msgstr "dáº¥u cháº¥m than Ä?áº£o"
 
 #. Translators: this is the spoken word for the character 'Ã¡' (U+00e1)
 #.
-#: ../src/orca/chnames.py:303
+#: ../src/orca/chnames.py:308
 msgid "a acute"
 msgstr "a sáº¯c"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00c0)
 #.
-#: ../src/orca/chnames.py:307
+#: ../src/orca/chnames.py:312
 msgid "A GRAVE"
 msgstr "A HUYá»?N"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00c1)
 #.
-#: ../src/orca/chnames.py:311
+#: ../src/orca/chnames.py:316
 msgid "A ACUTE"
 msgstr "A Sáº®C"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00c2)
 #.
-#: ../src/orca/chnames.py:315
+#: ../src/orca/chnames.py:320
 msgid "A CIRCUMFLEX"
 msgstr "A MÅ¨"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00c3)
 #.
-#: ../src/orca/chnames.py:319
+#: ../src/orca/chnames.py:324
 msgid "A TILDE"
 msgstr "A NGÃ?"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00c4)
 #.
-#: ../src/orca/chnames.py:323
+#: ../src/orca/chnames.py:328
 msgid "A UMLAUT"
 msgstr "A HAI CHáº¤M TRÃ?N"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00c5)
 #.
-#: ../src/orca/chnames.py:327
+#: ../src/orca/chnames.py:332
 msgid "A RING"
 msgstr "A TRÃ?N TRÃ?N"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00c6)
 #.
-#: ../src/orca/chnames.py:331
+#: ../src/orca/chnames.py:336
 msgid "A E"
 msgstr "A E má»?t Ã¢m"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00c7)
 #.
-#: ../src/orca/chnames.py:335
+#: ../src/orca/chnames.py:340
 msgid "C CEDILLA"
 msgstr "C MÃ?C DÆ¯á»?I"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00c8)
 #.
-#: ../src/orca/chnames.py:339
+#: ../src/orca/chnames.py:344
 msgid "E GRAVE"
 msgstr "E HUYá»?N"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00c9)
 #.
-#: ../src/orca/chnames.py:343
+#: ../src/orca/chnames.py:348
 msgid "E ACUTE"
 msgstr "E Sáº®C"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00ca)
 #.
-#: ../src/orca/chnames.py:347
+#: ../src/orca/chnames.py:352
 msgid "E CIRCUMFLEX"
 msgstr "E MÅ¨"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00cb)
 #.
-#: ../src/orca/chnames.py:351
+#: ../src/orca/chnames.py:356
 msgid "E UMLAUT"
 msgstr "E HAI CHáº¤M TRÃ?N"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00cc)
 #.
-#: ../src/orca/chnames.py:355
+#: ../src/orca/chnames.py:360
 msgid "I GRAVE"
 msgstr "I HUYá»?N"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00cd)
 #.
-#: ../src/orca/chnames.py:359
+#: ../src/orca/chnames.py:364
 msgid "I ACUTE"
 msgstr "I Sáº®C"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00ce)
 #.
-#: ../src/orca/chnames.py:363
+#: ../src/orca/chnames.py:368
 msgid "I CIRCUMFLEX"
 msgstr "I MÅ¨"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00cf)
 #.
-#: ../src/orca/chnames.py:367
+#: ../src/orca/chnames.py:372
 msgid "I UMLAUT"
 msgstr "I HAI CHáº¤M TRÃ?N"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d0)
 #.
-#: ../src/orca/chnames.py:371
+#: ../src/orca/chnames.py:376
 msgid "ETH"
 msgstr "Ã?"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d1)
 #.
-#: ../src/orca/chnames.py:375
+#: ../src/orca/chnames.py:380
 msgid "N TILDE"
 msgstr "N NGÃ?"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d2)
 #.
-#: ../src/orca/chnames.py:379
+#: ../src/orca/chnames.py:384
 msgid "O GRAVE"
 msgstr "O HUYá»?N"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d3)
 #.
-#: ../src/orca/chnames.py:383
+#: ../src/orca/chnames.py:388
 msgid "O ACUTE"
 msgstr "O Sáº®C"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d4)
 #.
-#: ../src/orca/chnames.py:387
+#: ../src/orca/chnames.py:392
 msgid "O CIRCUMFLEX"
 msgstr "O MÅ¨"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d5)
 #.
-#: ../src/orca/chnames.py:391
+#: ../src/orca/chnames.py:396
 msgid "O TILDE"
 msgstr "O NGÃ?"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d6)
 #.
-#: ../src/orca/chnames.py:395
+#: ../src/orca/chnames.py:400
 msgid "O UMLAUT"
 msgstr "O HAI CHáº¤M TRÃ?N"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d7)
 #.
-#: ../src/orca/chnames.py:399
+#: ../src/orca/chnames.py:404
 msgid "times"
 msgstr "nhÃ¢n"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d8)
 #.
-#: ../src/orca/chnames.py:403
+#: ../src/orca/chnames.py:408
 msgid "O STROKE"
 msgstr "O THANH TRÃ?N"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d9)
 #.
-#: ../src/orca/chnames.py:407
+#: ../src/orca/chnames.py:412
 msgid "U GRAVE"
 msgstr "U HUYá»?N"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00da)
 #.
-#: ../src/orca/chnames.py:411
+#: ../src/orca/chnames.py:416
 msgid "U ACUTE"
 msgstr "U Sáº®C"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00db)
 #.
-#: ../src/orca/chnames.py:415
+#: ../src/orca/chnames.py:420
 msgid "U CIRCUMFLEX"
 msgstr "U MÅ¨"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00dc)
 #.
-#: ../src/orca/chnames.py:419
+#: ../src/orca/chnames.py:424
 msgid "U UMLAUT"
 msgstr "U HAI CHáº¤M TRÃ?N"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00dd)
 #.
-#: ../src/orca/chnames.py:423
+#: ../src/orca/chnames.py:428
 msgid "Y ACUTE"
 msgstr "Y Sáº®C"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00de)
 #.
-#: ../src/orca/chnames.py:427
+#: ../src/orca/chnames.py:432
 msgid "THORN"
 msgstr "Ã¾"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00df)
 #.
-#: ../src/orca/chnames.py:431
+#: ../src/orca/chnames.py:436
 msgid "s sharp"
 msgstr "dáº¥u thÄ?ng"
 
 #. Translators: this is the spoken word for the character 'Ã ' (U+00e0)
 #.
-#: ../src/orca/chnames.py:435
+#: ../src/orca/chnames.py:440
 msgid "a grave"
 msgstr "a huyá»?n"
 
 #. Translators: this is the spoken word for the character 'Ã¢' (U+00e2)
 #.
-#: ../src/orca/chnames.py:439
+#: ../src/orca/chnames.py:444
 msgid "a circumflex"
 msgstr "a mÅ©"
 
 #. Translators: this is the spoken word for the character 'Ã£' (U+00e3)
 #.
-#: ../src/orca/chnames.py:443
+#: ../src/orca/chnames.py:448
 msgid "a tilde"
 msgstr "a ngÃ£"
 
 #. Translators: this is the spoken word for the character 'Ã¤' (U+00e4)
 #.
-#: ../src/orca/chnames.py:447
+#: ../src/orca/chnames.py:452
 msgid "a umlaut"
 msgstr "a hai cháº¥m trÃªn"
 
 #. Translators: this is the spoken word for the character 'Ã¥' (U+00e5)
 #.
-#: ../src/orca/chnames.py:451
+#: ../src/orca/chnames.py:456
 msgid "a ring"
 msgstr "a trÃ²n trÃªn"
 
 #. Translators: this is the spoken word for the character 'Ã¦' (U+00e6)
 #.
-#: ../src/orca/chnames.py:455
+#: ../src/orca/chnames.py:460
 msgid "a e"
 msgstr "a e cÃ¹ng chá»¯"
 
 #. Translators: this is the spoken word for the character 'Ã§' (U+00e7)
 #.
-#: ../src/orca/chnames.py:459
+#: ../src/orca/chnames.py:464
 msgid "c cedilla"
 msgstr "c mÃ³c dÆ°á»?i"
 
 #. Translators: this is the spoken word for the character 'Ã¨' (U+00e8)
 #.
-#: ../src/orca/chnames.py:463
+#: ../src/orca/chnames.py:468
 msgid "e grave"
 msgstr "e huyá»?n"
 
 #. Translators: this is the spoken word for the character 'Ã©' (U+00e9)
 #.
-#: ../src/orca/chnames.py:467
+#: ../src/orca/chnames.py:472
 msgid "e acute"
 msgstr "e sáº¯c"
 
 #. Translators: this is the spoken word for the character 'Ãª' (U+00ea)
 #.
-#: ../src/orca/chnames.py:471
+#: ../src/orca/chnames.py:476
 msgid "e circumflex"
 msgstr "e mÅ©"
 
 #. Translators: this is the spoken word for the character 'Ã«' (U+00eb)
 #.
-#: ../src/orca/chnames.py:475
+#: ../src/orca/chnames.py:480
 msgid "e umlaut"
 msgstr "e hai cháº¥m trÃªn"
 
 #. Translators: this is the spoken word for the character 'Ã¬' (U+00ec)
 #.
-#: ../src/orca/chnames.py:479
+#: ../src/orca/chnames.py:484
 msgid "i grave"
 msgstr "i huyá»?n"
 
 #. Translators: this is the spoken word for the character 'Ã' (U+00ed)
 #.
-#: ../src/orca/chnames.py:483
+#: ../src/orca/chnames.py:488
 msgid "i acute"
 msgstr "i sáº¯c"
 
 #. Translators: this is the spoken word for the character 'Ã®' (U+00ee)
 #.
-#: ../src/orca/chnames.py:487
+#: ../src/orca/chnames.py:492
 msgid "i circumflex"
 msgstr "i mÅ©"
 
 #. Translators: this is the spoken word for the character 'Ã¯' (U+00ef)
 #.
-#: ../src/orca/chnames.py:491
+#: ../src/orca/chnames.py:496
 msgid "i umlaut"
 msgstr "i hai cháº¥m trÃªn"
 
 #. Translators: this is the spoken word for the character 'Ã°' (U+00f0)
 #.
-#: ../src/orca/chnames.py:495
+#: ../src/orca/chnames.py:500
 msgid "eth"
 msgstr "Ã°"
 
 #. Translators: this is the spoken word for the character 'Ã±' (U+00f1)
 #.
-#: ../src/orca/chnames.py:499
+#: ../src/orca/chnames.py:504
 msgid "n tilde"
 msgstr "n ngÃ£"
 
 #. Translators: this is the spoken word for the character 'Ã²' (U+00f2)
 #.
-#: ../src/orca/chnames.py:503
+#: ../src/orca/chnames.py:508
 msgid "o grave"
 msgstr "o huyá»?n"
 
 #. Translators: this is the spoken word for the character 'Ã³' (U+00f3)
 #.
-#: ../src/orca/chnames.py:507
+#: ../src/orca/chnames.py:512
 msgid "o acute"
 msgstr "o sáº¯c"
 
 #. Translators: this is the spoken word for the character 'Ã´' (U+00f4)
 #.
-#: ../src/orca/chnames.py:511
+#: ../src/orca/chnames.py:516
 msgid "o circumflex"
 msgstr "o mÅ©"
 
 #. Translators: this is the spoken word for the character 'Ãµ' (U+00f5)
 #.
-#: ../src/orca/chnames.py:515
+#: ../src/orca/chnames.py:520
 msgid "o tilde"
 msgstr "o ngÃ£"
 
 #. Translators: this is the spoken word for the character 'Ã¶' (U+00f6)
 #.
-#: ../src/orca/chnames.py:519
+#: ../src/orca/chnames.py:524
 msgid "o umlaut"
 msgstr "o hai cháº¥m trÃªn"
 
 #. Translators: this is the spoken word for the character 'Ã·' (U+00f7)
 #.
-#: ../src/orca/chnames.py:523
+#: ../src/orca/chnames.py:528
 msgid "divided by"
 msgstr "chia"
 
 #. Translators: this is the spoken word for the character 'Ã¸' (U+00f8)
 #.
-#: ../src/orca/chnames.py:527
+#: ../src/orca/chnames.py:532
 msgid "o stroke"
 msgstr "o thanh trÃªn"
 
 #. Translators: this is the spoken word for the character 'Ã¾' (U+00fe)
 #.
-#: ../src/orca/chnames.py:531
+#: ../src/orca/chnames.py:536
 msgid "thorn"
 msgstr "Ã?"
 
 #. Translators: this is the spoken word for the character 'Ãº' (U+00fa)
 #.
-#: ../src/orca/chnames.py:535
+#: ../src/orca/chnames.py:540
 msgid "u acute"
 msgstr "u sáº¯c"
 
 #. Translators: this is the spoken word for the character 'Ã¹' (U+00f9)
 #.
-#: ../src/orca/chnames.py:539
+#: ../src/orca/chnames.py:544
 msgid "u grave"
 msgstr "u huyá»?n"
 
 #. Translators: this is the spoken word for the character 'Ã»' (U+00fb)
 #.
-#: ../src/orca/chnames.py:543
+#: ../src/orca/chnames.py:548
 msgid "u circumflex"
 msgstr "u mÅ©"
 
 #. Translators: this is the spoken word for the character 'Ã¼' (U+00fc)
 #.
-#: ../src/orca/chnames.py:547
+#: ../src/orca/chnames.py:552
 msgid "u umlaut"
 msgstr "u hai cháº¥m trÃªn"
 
 #. Translators: this is the spoken word for the character 'Ã½' (U+00fd)
 #.
-#: ../src/orca/chnames.py:551
+#: ../src/orca/chnames.py:556
 msgid "y acute"
 msgstr "y sáº¯c"
 
 #. Translators: this is the spoken word for the character 'Ã¿' (U+00ff)
 #.
-#: ../src/orca/chnames.py:555
+#: ../src/orca/chnames.py:560
 msgid "y umlaut"
 msgstr "y hai cháº¥m trÃªn"
 
 #. Translators: this is the spoken word for the character 'Å¸' (U+0178)
 #.
-#: ../src/orca/chnames.py:559
+#: ../src/orca/chnames.py:564
 msgid "Y UMLAUT"
 msgstr "U HAI CHáº¤M TRÃ?N"
 
 #. Translators: this is the spoken word for the character 'Æ?' (U+0192)
 #.
-#: ../src/orca/chnames.py:563
+#: ../src/orca/chnames.py:568
 msgid "florin"
 msgstr "Æ?"
 
 #. Translators: this is the spoken word for the character 'â??' (U+2013)
 #.
-#: ../src/orca/chnames.py:567
+#: ../src/orca/chnames.py:572
 msgid "en dash"
 msgstr "dáº¥u ná»?i"
 
 #. Translators: this is the spoken word for the left single quote: â??
 #. (U+2018)
 #.
-#: ../src/orca/chnames.py:572
+#: ../src/orca/chnames.py:577
 msgid "left single quote"
 msgstr "dáº¥u trÃch dáº«n Ä?Æ¡n trÃ¡i"
 
 #. Translators: this is the spoken word for the right single quote: â??
 #. (U+2019)
 #.
-#: ../src/orca/chnames.py:577
+#: ../src/orca/chnames.py:582
 msgid "right single quote"
 msgstr "dáº¥u trÃch dáº«n Ä?Æ¡n pháº£i"
 
 #. Translators: this is the spoken word for the character 'â??' (U+201a)
 #.
-#: ../src/orca/chnames.py:581
+#: ../src/orca/chnames.py:586
 msgid "single low quote"
 msgstr "dáº¥u trÃch dáº«n dÆ°á»?i Ä?Æ¡n"
 
 #. Translators: this is the spoken word for the character 'â??' (U+201c)
 #.
-#: ../src/orca/chnames.py:585
+#: ../src/orca/chnames.py:590
 msgid "left double quote"
 msgstr "dáº¥u trÃch dáº«n Ä?Ã´i trÃ¡i"
 
 #. Translators: this is the spoken word for the character 'â??' (U+201d)
 #.
-#: ../src/orca/chnames.py:589
+#: ../src/orca/chnames.py:594
 msgid "right double quote"
 msgstr "dáº¥u trÃch dáº«n Ä?Ã´i pháº£i"
 
 #. Translators: this is the spoken word for the character 'â??' (U+201e)
 #.
-#: ../src/orca/chnames.py:593
+#: ../src/orca/chnames.py:598
 msgid "double low quote"
 msgstr "dáº¥u trÃch dáº«n dÆ°á»?i Ä?Ã´i"
 
 #. Translators: this is the spoken word for the character 'â? ' (U+2020)
 #.
-#: ../src/orca/chnames.py:597
+#: ../src/orca/chnames.py:602
 msgid "dagger"
 msgstr "â? "
 
 #. Translators: this is the spoken word for the character 'â?¡' (U+2021)
 #.
-#: ../src/orca/chnames.py:601
+#: ../src/orca/chnames.py:606
 msgid "double dagger"
 msgstr "â?¡"
 
 #. Translators: this is the spoken word for the character 'â?¢' (U+2022)
 #.
-#: ../src/orca/chnames.py:605
+#: ../src/orca/chnames.py:610
 msgid "bullet"
 msgstr "cháº¥m Ä?áº§u dÃ²ng"
 
 #. Translators: this is the spoken word for the character 'â?£' (U+2023)
 #.
-#: ../src/orca/chnames.py:609
+#: ../src/orca/chnames.py:614
 msgid "triangular bullet"
 msgstr "hÃ¬nh giÃ¡c Ä?áº§u dÃ²ng"
 
 #. Translators: this is the spoken word for the character 'â?°' (U+2030)
 #.
-#: ../src/orca/chnames.py:613
+#: ../src/orca/chnames.py:618
 msgid "per mille"
 msgstr "trÃªn nghÃ¬n â?°"
 
 #. Translators: this is the spoken word for the character 'â?²' (U+2032)
 #.
-#: ../src/orca/chnames.py:617
+#: ../src/orca/chnames.py:622
 msgid "prime"
 msgstr "â?²"
 
 #. Translators: this is the spoken word for the character 'â?³' (U+2033)
 #.
-#: ../src/orca/chnames.py:621
+#: ../src/orca/chnames.py:626
 msgid "double prime"
 msgstr "â?³"
 
 #. Translators: this is the spoken word for the character 'â??' (U+2043)
 #.
-#: ../src/orca/chnames.py:625
+#: ../src/orca/chnames.py:630
 msgid "hyphen bullet"
 msgstr "dáº¥u ná»?i Ä?áº§u dÃ²ng"
 
 #. Translators: this is the spoken word for the character 'â?¬' (U+20ac)
 #.
-#: ../src/orca/chnames.py:629
+#: ../src/orca/chnames.py:634
 msgid "euro"
 msgstr "Ä?á»?ng Ã?u â?¬"
 
 #. Translators: this is the spoken word for the character 'â?¢' (U+2122)
 #.
-#: ../src/orca/chnames.py:633
+#: ../src/orca/chnames.py:638
 msgid "trademark"
 msgstr "nhÃ£n hiá»?u"
 
+#. Translators: this is the spoken word for the character 'â??' (U+2190)
+#.
+#: ../src/orca/chnames.py:642
+#| msgid "left paren"
+msgid "left arrow"
+msgstr "mÅ©i tÃªn trÃ¡i"
+
+#. Translators: this is the spoken word for the character 'â??' (U+2192)
+#.
+#: ../src/orca/chnames.py:646
+#| msgid "right paren"
+msgid "right arrow"
+msgstr "mÅ©i tÃªn pháº£i"
+
 #. Translators: this is the spoken word for the character 'â??' (U+2248)
 #.
-#: ../src/orca/chnames.py:637
+#: ../src/orca/chnames.py:650
 msgid "almost equal to"
 msgstr "gáº§n báº±ng"
 
 #. Translators: this is the spoken word for the character 'â? ' (U+2260)
 #.
-#: ../src/orca/chnames.py:641
+#: ../src/orca/chnames.py:654
 msgid "not equal to"
 msgstr "khÃ´ng báº±ng"
 
 #. Translators: this is the spoken word for the character 'â?¤' (U+2264)
 #.
-#: ../src/orca/chnames.py:645
+#: ../src/orca/chnames.py:658
 msgid "less than or equal to"
 msgstr "Ãt hÆ¡n hay báº±ng"
 
 #. Translators: this is the spoken word for the character 'â?¥' (U+2265)
 #.
-#: ../src/orca/chnames.py:649
+#: ../src/orca/chnames.py:662
 msgid "greater than or equal to"
 msgstr "lá»?n hÆ¡n hay báº±ng"
 
 #. Translators: this is the spoken word for the character 'â??' (U+221a)
 #.
-#: ../src/orca/chnames.py:653
+#: ../src/orca/chnames.py:666
 msgid "square root"
 msgstr "cÄ?n báºc hai"
 
 #. Translators: this is the spoken word for the character 'â??' (U+221b)
 #.
-#: ../src/orca/chnames.py:657
+#: ../src/orca/chnames.py:670
 msgid "cube root"
 msgstr "cÄ?n báºc ba"
 
 #. Translators: this is the spoken word for the character 'â??' (U+221e)
 #.
-#: ../src/orca/chnames.py:661
+#: ../src/orca/chnames.py:674
 msgid "infinity"
 msgstr "vÃ´ háº¡n"
 
@@ -1364,15 +1350,15 @@ msgstr "vÃ´ háº¡n"
 #. as a bullet which looks like the black square: â?  (U+25A0).  Therefore,
 #. please use the same translation for this character.
 #.
-#: ../src/orca/chnames.py:666
-#: ../src/orca/chnames.py:729
+#: ../src/orca/chnames.py:679
+#: ../src/orca/chnames.py:742
 msgid "black square"
 msgstr "vuÃ´ng Ä?en"
 
 #. Translators: this is the spoken word for the character 'â?¡' (U+25a1)
 #. It can be used as a bullet in a list.
 #.
-#: ../src/orca/chnames.py:671
+#: ../src/orca/chnames.py:684
 msgid "white square"
 msgstr "vuÃ´ng tráº¯ng"
 
@@ -1383,42 +1369,42 @@ msgstr "vuÃ´ng tráº¯ng"
 #. as a bullet which looks like the black diamond: â?? (U+25C6).  Therefore,
 #. please use the same translation for this character.
 #.
-#: ../src/orca/chnames.py:676
-#: ../src/orca/chnames.py:735
+#: ../src/orca/chnames.py:689
+#: ../src/orca/chnames.py:748
 msgid "black diamond"
 msgstr "thoi Ä?en"
 
 #. Translators: this is the spoken word for the character 'â??' (U+25cb)
 #. It can be used as a bullet in a list.
 #.
-#: ../src/orca/chnames.py:681
+#: ../src/orca/chnames.py:694
 msgid "white circle"
 msgstr "trÃ²n tráº¯ng"
 
 #. Translators: this is the spoken word for the character 'â??' (U+25cf)
 #. It can be used as a bullet in a list.
 #.
-#: ../src/orca/chnames.py:686
+#: ../src/orca/chnames.py:699
 msgid "black circle"
 msgstr "trÃ²n Ä?en"
 
 #. Translators: this is the spoken word for the character 'â?¦' (U+25e6)
 #.
-#: ../src/orca/chnames.py:690
+#: ../src/orca/chnames.py:703
 msgid "white bullet"
 msgstr "cháº¥m tráº¯ng Ä?áº§u dÃ²ng"
 
 #. Translators: this is the spoken word for the character 'â??' (U+2713)
 #. It can be used as a bullet in a list.
 #.
-#: ../src/orca/chnames.py:695
+#: ../src/orca/chnames.py:708
 msgid "check mark"
 msgstr "dáº¥u kiá»?m"
 
 #. Translators: this is the spoken word for the character 'â??' (U+2714)
 #. It can be used as a bullet in a list.
 #.
-#: ../src/orca/chnames.py:700
+#: ../src/orca/chnames.py:713
 msgid "heavy check mark"
 msgstr "dáº¥u kiá»?m Ä?áºm"
 
@@ -1429,7 +1415,7 @@ msgstr "dáº¥u kiá»?m Ä?áºm"
 #. the typed letter 'x'.  "Ballot x" might confuse the user.  Hence the
 #. use of "x-shaped bullet".
 #.
-#: ../src/orca/chnames.py:709
+#: ../src/orca/chnames.py:722
 msgid "x-shaped bullet"
 msgstr "x Ä?áº§u dÃ²ng"
 
@@ -1438,7 +1424,7 @@ msgstr "x Ä?áº§u dÃ²ng"
 #. an OOo list. The goal is to inform the user of the appearance of
 #. the bullet without too much verbiage, hence simply "right-pointing arrow".
 #.
-#: ../src/orca/chnames.py:716
+#: ../src/orca/chnames.py:729
 msgid "right-pointing arrow"
 msgstr "mÅ©i tÃªn pháº£i"
 
@@ -1447,10 +1433,18 @@ msgstr "mÅ©i tÃªn pháº£i"
 #. OOo list. The goal is to inform the user of the appearance of the bullet
 #. without too much verbiage, hence simply "right-pointing arrowhead".
 #.
-#: ../src/orca/chnames.py:723
+#: ../src/orca/chnames.py:736
 msgid "right-pointing arrowhead"
 msgstr "Ä?áº§u mÅ©i tÃªn pháº£i"
 
+#. Translators: this command will move the mouse pointer
+#. to the current item without clicking on it.
+#.
+#: ../src/orca/default.py:154
+#| msgid "Speaks the contents of the input line."
+msgid "Routes the pointer to the current item."
+msgstr "Chuyá»?n con trá»? sang má»¥c hiá»?n thá»?i."
+
 #. Translators: the 'flat review' feature of Orca
 #. allows the blind user to explore the text in a
 #. window in a 2D fashion.  That is, Orca treats all
@@ -1461,7 +1455,7 @@ msgstr "Ä?áº§u mÅ©i tÃªn pháº£i"
 #. {line,word,character}.  A left click means to generate
 #. a left mouse button click on the current item.
 #.
-#: ../src/orca/default.py:139
+#: ../src/orca/default.py:169
 msgid "Performs left click on current flat review item."
 msgstr "Thá»±c hiá»?n nháº¯p trÃ¡i trÃªn má»¥c xem láº¡i pháº³ng hiá»?n cÃ³."
 
@@ -1475,7 +1469,7 @@ msgstr "Thá»±c hiá»?n nháº¯p trÃ¡i trÃªn má»¥c xem láº¡i pháº³ng hiá»?n cÃ³."
 #. {line,word,character}.  A right click means to generate
 #. a right mouse button click on the current item.
 #.
-#: ../src/orca/default.py:154
+#: ../src/orca/default.py:184
 msgid "Performs right click on current flat review item."
 msgstr "Thá»±c hiá»?n nháº¯p trÃ¡i trÃªn má»¥c xem láº¡i pháº³ng hiá»?n cÃ³."
 
@@ -1487,10 +1481,10 @@ msgstr "Thá»±c hiá»?n nháº¯p trÃ¡i trÃªn má»¥c xem láº¡i pháº³ng hiá»?n cÃ³."
 #. be positioned at the point where the speech was
 #. interrupted.
 #.
-#: ../src/orca/default.py:167
+#: ../src/orca/default.py:197
 #: ../src/orca/scripts/apps/acroread.py:114
-#: ../src/orca/scripts/apps/evolution/script.py:155
-#: ../src/orca/scripts/toolkits/Gecko/script.py:522
+#: ../src/orca/scripts/apps/evolution/script.py:153
+#: ../src/orca/scripts/toolkits/Gecko/script.py:536
 msgid "Speaks entire document."
 msgstr "NÃ³i toÃ n tÃ i liá»?u."
 
@@ -1501,7 +1495,7 @@ msgstr "NÃ³i toÃ n tÃ i liá»?u."
 #. name of the current pushbutton with focus as well as
 #. its mnemonic.
 #.
-#: ../src/orca/default.py:179
+#: ../src/orca/default.py:209
 msgid "Performs the basic where am I operation."
 msgstr "Thá»±c hiá»?n thao tÃ¡c cÆ¡ báº£n TÃ´i á»? Ä?Ã¢u?"
 
@@ -1512,21 +1506,21 @@ msgstr "Thá»±c hiá»?n thao tÃ¡c cÆ¡ báº£n TÃ´i á»? Ä?Ã¢u?"
 #. name of the current pushbutton with focus as well as
 #. its mnemonic.
 #.
-#: ../src/orca/default.py:191
+#: ../src/orca/default.py:221
 msgid "Performs the detailed where am I operation."
 msgstr "Thá»±c hiá»?n thao tÃ¡c chi tiáº¿t TÃ´i á»? Ä?Ã¢u?"
 
 #. Translators: This command will cause the window's
 #. title to be spoken.
 #.
-#: ../src/orca/default.py:199
+#: ../src/orca/default.py:234
 msgid "Speaks the title bar."
 msgstr "NÃ³i nhÃ£n cá»§a thanh tá»±a Ä?á»?."
 
 #. Translators: This command will cause the window's
 #. status bar contents to be spoken.
 #.
-#: ../src/orca/default.py:207
+#: ../src/orca/default.py:247
 msgid "Speaks the status bar."
 msgstr "NÃ³i nhÃ£n cá»§a thanh tráº¡ng thÃ¡i."
 
@@ -1535,7 +1529,7 @@ msgstr "NÃ³i nhÃ£n cá»§a thanh tráº¡ng thÃ¡i."
 #. that text.  For example, they may want to find the
 #. "OK" button.
 #.
-#: ../src/orca/default.py:217
+#: ../src/orca/default.py:257
 msgid "Opens the Orca Find dialog."
 msgstr "Má»? há»?p thoáº¡i TÃ¬m."
 
@@ -1545,7 +1539,7 @@ msgstr "Má»? há»?p thoáº¡i TÃ¬m."
 #. "OK" button.  This string is used for finding the
 #. next occurence of a string.
 #.
-#: ../src/orca/default.py:228
+#: ../src/orca/default.py:268
 msgid "Searches for the next instance of a string."
 msgstr "TÃ¬m chuá»?i tÆ°Æ¡ng tá»± láº§n ná»¯a"
 
@@ -1555,7 +1549,7 @@ msgstr "TÃ¬m chuá»?i tÆ°Æ¡ng tá»± láº§n ná»¯a"
 #. "OK" button.  This string is used for finding the
 #. previous occurence of a string.
 #.
-#: ../src/orca/default.py:239
+#: ../src/orca/default.py:279
 msgid "Searches for the previous instance of a string."
 msgstr "TÃ¬m chuá»?i cÅ©."
 
@@ -1565,7 +1559,7 @@ msgstr "TÃ¬m chuá»?i cÅ©."
 #. zones in the active window for the application that
 #. currently has focus.
 #.
-#: ../src/orca/default.py:250
+#: ../src/orca/default.py:290
 msgid "Paints and prints the visible zones in the active window."
 msgstr "SÆ¡n vÃ  in ra cÃ¡c vÃ¹ng hiá»?n thá»? trong cá»a sá»? hoáº¡t Ä?á»?ng."
 
@@ -1578,7 +1572,7 @@ msgstr "SÆ¡n vÃ  in ra cÃ¡c vÃ¹ng hiá»?n thá»? trong cá»a sá»? hoáº¡t Ä?á»?ng."
 #. the user to explore this text by the {previous,next}
 #. {line,word,character}.
 #.
-#: ../src/orca/default.py:264
+#: ../src/orca/default.py:304
 msgid "Enters and exits flat review mode."
 msgstr "VÃ o vÃ  rá»?i cháº¿ Ä?á»? xem láº¡i pháº³ng."
 
@@ -1591,7 +1585,7 @@ msgstr "VÃ o vÃ  rá»?i cháº¿ Ä?á»? xem láº¡i pháº³ng."
 #. the user to explore this text by the {previous,next}
 #. {line,word,character}.
 #.
-#: ../src/orca/default.py:278
+#: ../src/orca/default.py:318
 msgid "Moves flat review to the beginning of the previous line."
 msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng vá»? Ä?áº§u dÃ²ng trÆ°á»?c."
 
@@ -1605,7 +1599,7 @@ msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng vá»? Ä?áº§u dÃ²ng trÆ°á»?c."
 #. {line,word,character}.  The home position is the
 #. beginning of the content in the window.
 #.
-#: ../src/orca/default.py:293
+#: ../src/orca/default.py:333
 msgid "Moves flat review to the home position."
 msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng vá»?."
 
@@ -1619,7 +1613,7 @@ msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng vá»?."
 #. {line,word,character}.  This particular command will
 #. cause Orca to speak the current line.
 #.
-#: ../src/orca/default.py:308
+#: ../src/orca/default.py:348
 msgid "Speaks the current flat review line."
 msgstr "NÃ³i dÃ²ng xem láº¡i pháº³ng hiá»?n cÃ³."
 
@@ -1633,7 +1627,7 @@ msgstr "NÃ³i dÃ²ng xem láº¡i pháº³ng hiá»?n cÃ³."
 #. {line,word,character}. This particular command will
 #. cause Orca to spell the current line.
 #.
-#: ../src/orca/default.py:323
+#: ../src/orca/default.py:363
 msgid "Spells the current flat review line."
 msgstr "NÃ³i theo chÃnh táº£ dÃ²ng xem láº¡i pháº³ng hiá»?n táº¡i."
 
@@ -1648,7 +1642,7 @@ msgstr "NÃ³i theo chÃnh táº£ dÃ²ng xem láº¡i pháº³ng hiá»?n táº¡i."
 #. cause Orca to "phonetically spell" the current line,
 #. saying "Alpha" for "a", "Bravo" for "b" and so on.
 #.
-#: ../src/orca/default.py:339
+#: ../src/orca/default.py:379
 msgid "Phonetically spells the current flat review line."
 msgstr "NÃ³i theo chÃnh táº£ ngá»¯ Ã¢m dÃ²ng xem láº¡i pháº³ng hiá»?n táº¡i."
 
@@ -1661,7 +1655,7 @@ msgstr "NÃ³i theo chÃnh táº£ ngá»¯ Ã¢m dÃ²ng xem láº¡i pháº³ng hiá»?n táº¡i."
 #. the user to explore this text by the {previous,next}
 #. {line,word,character}.
 #.
-#: ../src/orca/default.py:353
+#: ../src/orca/default.py:393
 msgid "Moves flat review to the beginning of the next line."
 msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng tá»?i Ä?áº§u dÃ²ng káº¿ tiáº¿p."
 
@@ -1675,7 +1669,7 @@ msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng tá»?i Ä?áº§u dÃ²ng káº¿ tiáº¿p."
 #. {line,word,character}.  The end position is the last
 #. bit of information in the window.
 #.
-#: ../src/orca/default.py:368
+#: ../src/orca/default.py:408
 msgid "Moves flat review to the end position."
 msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng tá»?i vá»? trÃ cuá»?i."
 
@@ -1690,7 +1684,7 @@ msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng tá»?i vá»? trÃ cuá»?i."
 #. in the window until you reach the top (i.e., it will
 #. wrap across lines if necessary).
 #.
-#: ../src/orca/default.py:384
+#: ../src/orca/default.py:424
 msgid "Moves flat review to the previous item or word."
 msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng vá»? má»¥c hay tá»« trÆ°á»?c Ä?Ã³."
 
@@ -1705,7 +1699,7 @@ msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng vá»? má»¥c hay tá»« trÆ°á»?c Ä?Ã³."
 #. geographically above, as if you drew a vertical line
 #. in the window.
 #.
-#: ../src/orca/default.py:400
+#: ../src/orca/default.py:440
 msgid "Moves flat review to the word above the current word."
 msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng lÃªn tá»« trÃªn tá»« hiá»?n cÃ³."
 
@@ -1719,7 +1713,7 @@ msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng lÃªn tá»« trÃªn tá»« hiá»?n cÃ³."
 #. {line,word,character}.  This command will speak the
 #. current word or item.
 #.
-#: ../src/orca/default.py:415
+#: ../src/orca/default.py:455
 msgid "Speaks the current flat review item or word."
 msgstr "NÃ³i má»¥c hay tá»« xem láº¡i pháº³ng hiá»?n thá»?i."
 
@@ -1733,7 +1727,7 @@ msgstr "NÃ³i má»¥c hay tá»« xem láº¡i pháº³ng hiá»?n thá»?i."
 #. {line,word,character}.  This command will spell out
 #. the current word or item letter by letter.
 #.
-#: ../src/orca/default.py:430
+#: ../src/orca/default.py:470
 msgid "Spells the current flat review item or word."
 msgstr "NÃ³i theo chÃnh táº£ má»¥c hay tá»« xem láº¡i pháº³ng hiá»?n thá»?i."
 
@@ -1748,7 +1742,7 @@ msgstr "NÃ³i theo chÃnh táº£ má»¥c hay tá»« xem láº¡i pháº³ng hiá»?n thá»?i."
 #. the current word or item phonetically, saying "Alpha"
 #. for "a", "Bravo" for "b" and so on.
 #.
-#: ../src/orca/default.py:446
+#: ../src/orca/default.py:486
 msgid "Phonetically spells the current flat review item or word."
 msgstr "NÃ³i theo chÃnh táº£ ngá»¯ Ã¢m má»¥c hay tá»« xem láº¡i pháº³ng hiá»?n thá»?i."
 
@@ -1764,7 +1758,7 @@ msgstr "NÃ³i theo chÃnh táº£ ngá»¯ Ã¢m má»¥c hay tá»« xem láº¡i pháº³ng hiá»?n
 #. some other GUI widget.  The 'speaks' means it will
 #. speak the text associated with the object.
 #.
-#: ../src/orca/default.py:463
+#: ../src/orca/default.py:503
 msgid "Speaks the current flat review object."
 msgstr "NÃ³i Ä?á»?i tÆ°á»£ng xem láº¡i pháº³ng hiá»?n cÃ³."
 
@@ -1779,7 +1773,7 @@ msgstr "NÃ³i Ä?á»?i tÆ°á»£ng xem láº¡i pháº³ng hiá»?n cÃ³."
 #. in the window until you reach the end (i.e., it will
 #. wrap across lines if necessary).
 #.
-#: ../src/orca/default.py:479
+#: ../src/orca/default.py:519
 msgid "Moves flat review to the next item or word."
 msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng tá»?i má»¥c hay tá»« káº¿ tiáº¿p."
 
@@ -1794,7 +1788,7 @@ msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng tá»?i má»¥c hay tá»« káº¿ tiáº¿p."
 #. geographically below, as if you drew a vertical line
 #. downward on the screen.
 #.
-#: ../src/orca/default.py:495
+#: ../src/orca/default.py:535
 msgid "Moves flat review to the word below the current word."
 msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng xuá»?ng tá»« dÆ°á»?i tá»« hiá»?n cÃ³."
 
@@ -1809,7 +1803,7 @@ msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng xuá»?ng tá»« dÆ°á»?i tá»« hiá»?n cÃ³.
 #. in the window until you reach the top (i.e., it will
 #. wrap across lines if necessary).
 #.
-#: ../src/orca/default.py:511
+#: ../src/orca/default.py:551
 msgid "Moves flat review to the previous character."
 msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng vá»? kÃ½ tá»± trÆ°á»?c Ä?Ã³."
 
@@ -1822,7 +1816,7 @@ msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng vá»? kÃ½ tá»± trÆ°á»?c Ä?Ã³."
 #. the user to explore this text by the {previous,next}
 #. {line,word,character}.
 #.
-#: ../src/orca/default.py:525
+#: ../src/orca/default.py:565
 msgid "Moves flat review to the end of the line."
 msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng tá»?i cuá»?i dÃ²ng."
 
@@ -1839,7 +1833,7 @@ msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng tá»?i cuá»?i dÃ²ng."
 #. this case will be the spoken language form of the
 #. character currently being reviewed.
 #.
-#: ../src/orca/default.py:543
+#: ../src/orca/default.py:583
 msgid "Speaks the current flat review character."
 msgstr "NÃ³i kÃ½ tá»± xem láº¡i pháº³ng hiá»?n cÃ³."
 
@@ -1857,7 +1851,7 @@ msgstr "NÃ³i kÃ½ tá»± xem láº¡i pháº³ng hiá»?n cÃ³."
 #. character currently being reviewed, saying "Alpha"
 #. for "a", "Bravo" for "b" and so on.
 #.
-#: ../src/orca/default.py:562
+#: ../src/orca/default.py:602
 msgid "Phonetically speaks the current flat review character."
 msgstr "NÃ³i ngá»¯ Ã¢m kÃ½ tá»± xem láº¡i pháº³ng hiá»?n cÃ³."
 
@@ -1868,11 +1862,29 @@ msgstr "NÃ³i ngá»¯ Ã¢m kÃ½ tá»± xem láº¡i pháº³ng hiá»?n cÃ³."
 #. buttons, labels, etc.) as a sequence of words in a
 #. sequence of lines.  The flat review feature allows
 #. the user to explore this text by the {previous,next}
+#. {line,word,character}.  Previous will go backwards
+#. in the window until you reach the top (i.e., it will
+#. wrap across lines if necessary).  This command will
+#. cause Orca to speak information about the current character
+#. Like its unicode value and other relevant information
+#.
+#: ../src/orca/default.py:620
+#| msgid "Speaks the current flat review character."
+msgid "Speaks unicode value of the current flat review character."
+msgstr "NÃ³i giÃ¡ trá»? Unicode cá»§a kÃ½ tá»± xem láº¡i pháº³ng hiá»?n cÃ³."
+
+#. Translators: the 'flat review' feature of Orca
+#. allows the blind user to explore the text in a
+#. window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g.,
+#. buttons, labels, etc.) as a sequence of words in a
+#. sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next}
 #. {line,word,character}.  Next will go forwards
 #. in the window until you reach the end (i.e., it will
 #. wrap across lines if necessary).
 #.
-#: ../src/orca/default.py:578
+#: ../src/orca/default.py:637
 msgid "Moves flat review to the next character."
 msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng tá»?i kÃ½ tá»± káº¿ tiáº¿p."
 
@@ -1880,7 +1892,7 @@ msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng tá»?i kÃ½ tá»± káº¿ tiáº¿p."
 #. sometimes want the entire row of a table read, or
 #. they just want the current cell to be presented to them.
 #.
-#: ../src/orca/default.py:587
+#: ../src/orca/default.py:646
 msgid "Toggles whether to read just the current table cell or the whole row."
 msgstr "Báºt/táº¯t cÃ³ nÃªn Ä?á»?c chá»? Ã´ báº£ng hiá»?n thá»?i, hoáº·c toÃ n bá»? hÃ ng."
 
@@ -1888,7 +1900,7 @@ msgstr "Báºt/táº¯t cÃ³ nÃªn Ä?á»?c chá»? Ã´ báº£ng hiá»?n thá»?i, hoáº·c toÃ n
 #. text attributes, such as bold, italic, font name,
 #. font size, etc.
 #.
-#: ../src/orca/default.py:597
+#: ../src/orca/default.py:656
 msgid "Reads the attributes associated with the current text character."
 msgstr "Ä?á»?c cÃ¡c thuá»?c tÃnh liÃªn quan Ä?áº¿n kÃ½ tá»± chá»¯ hiá»?n cÃ³."
 
@@ -1898,7 +1910,7 @@ msgstr "Ä?á»?c cÃ¡c thuá»?c tÃnh liÃªn quan Ä?áº¿n kÃ½ tá»± chá»¯ hiá»?n cÃ³."
 #. via speech and braille. This information will be
 #. helpful to script writers.
 #.
-#: ../src/orca/default.py:609
+#: ../src/orca/default.py:668
 msgid "Reports information on current script."
 msgstr "ThÃ´ng bÃ¡o thÃ´ng tin vá»? táºp lá»?nh hiá»?n cÃ³."
 
@@ -1911,7 +1923,8 @@ msgstr "ThÃ´ng bÃ¡o thÃ´ng tin vá»? táºp lá»?nh hiá»?n cÃ³."
 #. braille display so they can pan left and right over
 #. this line.
 #.
-#: ../src/orca/default.py:623
+#: ../src/orca/default.py:682
+#: ../src/orca/scripts/toolkits/Gecko/script.py:550
 msgid "Pans the braille display to the left."
 msgstr "KÃ©o ngang vÃ¹ng hiá»?n thá»? ná»?i qua trÃ¡i."
 
@@ -1924,7 +1937,8 @@ msgstr "KÃ©o ngang vÃ¹ng hiá»?n thá»? ná»?i qua trÃ¡i."
 #. braille display so they can pan left and right over
 #. this line.
 #.
-#: ../src/orca/default.py:638
+#: ../src/orca/default.py:697
+#: ../src/orca/scripts/toolkits/Gecko/script.py:565
 msgid "Pans the braille display to the right."
 msgstr "KÃ©o ngang vÃ¹ng hiá»?n thá»? ná»?i qua pháº£i."
 
@@ -1938,7 +1952,7 @@ msgstr "KÃ©o ngang vÃ¹ng hiá»?n thá»? ná»?i qua pháº£i."
 #. {line,word,character}.  The bottom left is the bottom
 #. left of the window currently being reviewed.
 #.
-#: ../src/orca/default.py:654
+#: ../src/orca/default.py:713
 msgid "Moves flat review to the bottom left."
 msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng qua trÃ¡i, gÃ³c dÆ°á»?i."
 
@@ -1955,10 +1969,46 @@ msgstr "Chuyá»?n Ä?iá»?m xem láº¡i pháº³ng qua trÃ¡i, gÃ³c dÆ°á»?i."
 #. feature used here will return the flat review to the
 #. object with focus.
 #.
-#: ../src/orca/default.py:672
+#: ../src/orca/default.py:731
 msgid "Returns to object with keyboard focus."
 msgstr "Trá»? vá»? Ä?á»?i tÆ°á»£ng cÃ³ tiÃªu Ä?iá»?m bÃ n phÃm."
 
+#. Translators: braille can be displayed in many ways.
+#. Contracted braille provides a more efficient means
+#. to represent text, especially long documents.  The
+#. feature used here is an option to toggle between
+#. contracted and uncontracted.
+#.
+#: ../src/orca/default.py:742
+msgid "Turns contracted braille on and off."
+msgstr "Báºt/táº¯t chá»¯ ná»?i sÃºc tÃch."
+
+#. Translators: hardware braille displays often have
+#. buttons near each braille cell.  These are called
+#. cursor routing keys and are a way for a user to
+#. tell the machine they are interested in a particular
+#. character on the display.
+#.
+#: ../src/orca/default.py:753
+msgid "Processes a cursor routing key."
+msgstr "Xá» lÃ½ má»?t phÃm Ä?á»?nh tuyáº¿n con trá»?."
+
+#. Translators: this is used to indicate the start point
+#. of a text selection.
+#.
+#: ../src/orca/default.py:761
+#| msgid "Goes to the beginning of the line."
+msgid "Marks the beginning of a text selection."
+msgstr "Ä?Ã¡nh dáº¥u Ä?iá»?m báº¯t Ä?áº§u lá»±a chá»?n Ä?oáº¡n vÄ?n."
+
+#. Translators: this is used to indicate the end point
+#. of a text selection.
+#.
+#: ../src/orca/default.py:769
+#| msgid "Goes to the end of the line."
+msgid "Marks the end of a text selection."
+msgstr "Ä?Ã¡nh dáº¥u Ä?iá»?m káº¿t thÃºc lá»±a chá»?n Ä?oáº¡n vÄ?n."
+
 #. Translators: Orca has a "Learn Mode" that will allow
 #. the user to type any key on the keyboard and hear what
 #. the effects of that key would be.  The effects might
@@ -1966,21 +2016,21 @@ msgstr "Trá»? vá»? Ä?á»?i tÆ°á»£ng cÃ³ tiÃªu Ä?iá»?m bÃ n phÃm."
 #. particular key combination, or they might just be to
 #. echo the name of the key if Orca doesn't have a handler.
 #.
-#: ../src/orca/default.py:684
+#: ../src/orca/default.py:781
 msgid "Enters learn mode.  Press escape to exit learn mode."
 msgstr "VÃ o cháº¿ Ä?á»? há»?c. HÃ£y báº¥m phÃm Escape Ä?á»? thoÃ¡t khá»?i cháº¿ Ä?á»? há»?c."
 
 #. Translators: the speech rate is how fast the speech
 #. synthesis engine will generate speech.
 #.
-#: ../src/orca/default.py:692
+#: ../src/orca/default.py:789
 msgid "Decreases the speech rate."
 msgstr "Giáº£m tá»?c Ä?á»? nÃ³i tiáº¿ng."
 
 #. Translators: the speech rate is how fast the speech
 #. synthesis engine will generate speech.
 #.
-#: ../src/orca/default.py:700
+#: ../src/orca/default.py:797
 msgid "Increases the speech rate."
 msgstr "TÄ?ng tá»?c Ä?á»? nÃ³i tiáº¿ng."
 
@@ -1988,7 +2038,7 @@ msgstr "TÄ?ng tá»?c Ä?á»? nÃ³i tiáº¿ng."
 #. pitch/frequency the speech synthesis engine will
 #. generate speech.
 #.
-#: ../src/orca/default.py:709
+#: ../src/orca/default.py:806
 msgid "Decreases the speech pitch."
 msgstr "Giáº£m Ä?á»? cao giá»?ng nÃ³i."
 
@@ -1996,11 +2046,11 @@ msgstr "Giáº£m Ä?á»? cao giá»?ng nÃ³i."
 #. pitch/frequency the speech synthesis engine will
 #. generate speech.
 #.
-#: ../src/orca/default.py:718
+#: ../src/orca/default.py:815
 msgid "Increases the speech pitch."
 msgstr "TÄ?ng Ä?á»? cao giá»?ng nÃ³i."
 
-#: ../src/orca/default.py:723
+#: ../src/orca/default.py:820
 msgid "Quits Orca"
 msgstr "ThoÃ¡t khá»?i Orca"
 
@@ -2008,7 +2058,7 @@ msgstr "ThoÃ¡t khá»?i Orca"
 #. the dialog that allows users to set their preferences
 #. for Orca.
 #.
-#: ../src/orca/default.py:732
+#: ../src/orca/default.py:829
 msgid "Displays the preferences configuration dialog."
 msgstr "Hiá»?n thá»? há»?p thoáº¡i cáº¥u hÃ¬nh tÃ¹y thÃch."
 
@@ -2016,14 +2066,14 @@ msgstr "Hiá»?n thá»? há»?p thoáº¡i cáº¥u hÃ¬nh tÃ¹y thÃch."
 #. dialog is the dialog that allows users to set their
 #. preferences for a specific application within Orca.
 #.
-#: ../src/orca/default.py:741
+#: ../src/orca/default.py:838
 msgid "Displays the application preferences configuration dialog."
 msgstr "Hiá»?n thá»? há»?p thoáº¡i cáº¥u hÃ¬nh tÃ¹y thÃch cá»§a á»©ng dá»¥ng."
 
 #. Translators: Orca allows the user to turn speech synthesis
 #. on or off.  We call it 'silencing'.
 #.
-#: ../src/orca/default.py:749
+#: ../src/orca/default.py:846
 msgid "Toggles the silencing of speech."
 msgstr "Báºt/táº¯t cÃ¢m giá»?ng nÃ³i."
 
@@ -2032,7 +2082,7 @@ msgstr "Báºt/táº¯t cÃ¢m giá»?ng nÃ³i."
 #. that prints a list of all known applications currently
 #. running on the desktop, to stdout.
 #.
-#: ../src/orca/default.py:759
+#: ../src/orca/default.py:856
 msgid "Prints a debug listing of all known applications to the console where Orca is running."
 msgstr "In danh sÃ¡ch gá»¡ lá»?i cá»§a má»?i á»©ng dá»¥ng Ä?Ã£ biáº¿t ra bÃ n giao tiáº¿p nÆ¡i Orca Ä?ang cháº¡y."
 
@@ -2041,28 +2091,19 @@ msgstr "In danh sÃ¡ch gá»¡ lá»?i cá»§a má»?i á»©ng dá»¥ng Ä?Ã£ biáº¿t ra bÃ n gi
 #. that allows the user to adjust the level of debug
 #. information that Orca generates at run time.
 #.
-#: ../src/orca/default.py:770
+#: ../src/orca/default.py:867
 msgid "Cycles the debug level at run time."
 msgstr "Xoay vÃ²ng cháº¿ Ä?á»? gá»¡ lá»?i vÃ o lÃºc cháº¡y."
 
 #. Translators: this is a debug message that Orca users
 #. will not normally see. It describes a debug routine
-#. that prints useful debugging information to the console,
-#. for the application that is currently running (has focus).
-#.
-#: ../src/orca/default.py:780
-msgid "Prints debug information about the currently active application to the console where Orca is running."
-msgstr "In thÃ´ng tin gá»¡ lá»?i vá»? á»©ng dá»¥ng hoáº¡t Ä?á»?ng hiá»?n thá»?i ra bÃ n giao tiáº¿p nÆ¡i Orca Ä?ang cháº¡y."
-
-#. Translators: this is a debug message that Orca users
-#. will not normally see. It describes a debug routine
 #. that will take the component in the currently running
 #. application that has focus, and print debug information
 #. to the console giving its component ancestry (i.e. all
 #. the components that are its descendants in the component
 #. tree).
 #.
-#: ../src/orca/default.py:794
+#: ../src/orca/default.py:880
 msgid "Prints debug information about the ancestry of the object with focus."
 msgstr "In thÃ´ng tin gá»¡ lá»?i vá»? cÃ¡c Ä?iá»?u cáº¥p trÃªn cá»§a Ä?á»?i tÆ°á»£ng cÃ³ tiÃªu Ä?iá»?m."
 
@@ -2073,7 +2114,7 @@ msgstr "In thÃ´ng tin gá»¡ lá»?i vá»? cÃ¡c Ä?iá»?u cáº¥p trÃªn cá»§a Ä?á»?i tÆ°
 #. component hierarchy (i.e. all the components and all
 #. their descendants in the component tree).
 #.
-#: ../src/orca/default.py:807
+#: ../src/orca/default.py:893
 msgid "Prints debug information about the application with focus."
 msgstr "In thÃ´ng tin gá»¡ lá»?i vá»? á»©ng dá»¥ng cÃ³ tiÃªu Ä?iá»?m."
 
@@ -2081,7 +2122,7 @@ msgstr "In thÃ´ng tin gá»¡ lá»?i vá»? á»©ng dá»¥ng cÃ³ tiÃªu Ä?iá»?m."
 #. will not normally see. It describes a debug routine
 #. that will print Orca memory usage information.
 #.
-#: ../src/orca/default.py:816
+#: ../src/orca/default.py:902
 msgid "Prints memory usage information."
 msgstr "In thÃ´ng tin vá»? cÃ¡ch sá» dá»¥ng bá»? nhá»?."
 
@@ -2089,35 +2130,35 @@ msgstr "In thÃ´ng tin vá»? cÃ¡ch sá» dá»¥ng bá»? nhá»?."
 #. the relationship of the given bookmark to the current
 #. position
 #.
-#: ../src/orca/default.py:825
+#: ../src/orca/default.py:911
 msgid "Bookmark where am I with respect to current position."
 msgstr "LÆ°u liÃªn káº¿t Ä?áº¿n chá»? nÃ y tÆ°Æ¡ng á»©ng vá»?i vá»? trÃ hiá»?n táº¡i."
 
 #. Translators: this command moves the current position to the
 #. location stored at the bookmark.
 #.
-#: ../src/orca/default.py:833
+#: ../src/orca/default.py:919
 msgid "Go to bookmark."
 msgstr "Theo liÃªn káº¿t lÆ°u."
 
 #. Translators: this event handler binds an in-page accessible
 #. object location to the given input key command.
 #.
-#: ../src/orca/default.py:841
+#: ../src/orca/default.py:927
 msgid "Add bookmark."
 msgstr "LÆ°u liÃªn káº¿t"
 
 #. Translators: this event handler saves all bookmarks for the
 #. current application to disk.
 #.
-#: ../src/orca/default.py:849
+#: ../src/orca/default.py:935
 msgid "Save bookmarks."
 msgstr "LÆ°u cÃ¡c liÃªn káº¿t."
 
 #. Translators: this event handler cycles through the registered
 #. bookmarks and takes the user to the next bookmark location.
 #.
-#: ../src/orca/default.py:857
+#: ../src/orca/default.py:943
 msgid "Go to next bookmark location."
 msgstr "Ä?i tá»?i Ä?á»?a chá»? liÃªn káº¿t káº¿ tiáº¿p."
 
@@ -2125,7 +2166,7 @@ msgstr "Ä?i tá»?i Ä?á»?a chá»? liÃªn káº¿t káº¿ tiáº¿p."
 #. registered bookmarks and takes the user to the previous
 #. bookmark location.
 #.
-#: ../src/orca/default.py:866
+#: ../src/orca/default.py:952
 msgid "Go to previous bookmark location."
 msgstr "Vá»? Ä?á»?a chá»? liÃªn káº¿t trÆ°á»?c."
 
@@ -2134,7 +2175,7 @@ msgstr "Vá»? Ä?á»?a chá»? liÃªn káº¿t trÆ°á»?c."
 #. to see, such as inverting the colors or applying a tint.
 #. This command toggles these enhancements on/off.
 #.
-#: ../src/orca/default.py:876
+#: ../src/orca/default.py:962
 msgid "Toggles color enhancements."
 msgstr "Báºt/táº¯t tÄ?ng cÆ°á»?ng mÃ u sáº¯c."
 
@@ -2144,21 +2185,21 @@ msgstr "Báºt/táº¯t tÄ?ng cÆ°á»?ng mÃ u sáº¯c."
 #. color, and surrounding it with crosshairs.  This command
 #. toggles these enhancements on/off.
 #.
-#: ../src/orca/default.py:887
+#: ../src/orca/default.py:973
 msgid "Toggles mouse enhancements."
 msgstr "Báºt/táº¯t tÄ?ng cÆ°á»?ng con chuá»?t."
 
 #. Translators: this command increases the magnification
 #. level.
 #.
-#: ../src/orca/default.py:895
+#: ../src/orca/default.py:981
 msgid "Increases the magnification level."
 msgstr "PhÃ³ng to."
 
 #. Translators: this command decreases the magnification
 #. level.
 #.
-#: ../src/orca/default.py:903
+#: ../src/orca/default.py:989
 msgid "Decreases the magnification level."
 msgstr "Thu nhá»?."
 
@@ -2167,7 +2208,7 @@ msgstr "Thu nhá»?."
 #. but also all of the color and pointer customizations
 #. made through the magnifier.
 #.
-#: ../src/orca/default.py:913
+#: ../src/orca/default.py:999
 msgid "Toggles the magnifier."
 msgstr "Báºt/táº¯t kÃnh lÃºp."
 
@@ -2176,14 +2217,14 @@ msgstr "Báºt/táº¯t kÃnh lÃºp."
 #. screen.  The "position" here refers to location of the
 #. magnifier.
 #.
-#: ../src/orca/default.py:923
+#: ../src/orca/default.py:1009
 msgid "Cycles to the next magnifier position."
 msgstr "Ä?áº¿n vá»? trÃ káº¿ tiáº¿p khi phÃ³ng to."
 
 #. Translators: Orca allows the item under the pointer to
 #. be spoken. This toggles the feature.
 #.
-#: ../src/orca/default.py:931
+#: ../src/orca/default.py:1017
 msgid "Toggle mouse review mode."
 msgstr "Báºt/táº¯t cháº¿ Ä?á»? xem láº¡i con chuá»?t."
 
@@ -2194,41 +2235,14 @@ msgstr "Báºt/táº¯t cháº¿ Ä?á»? xem láº¡i con chuá»?t."
 #. along to the current application, bypassing Orca's
 #. interception of it.
 #.
-#: ../src/orca/default.py:943
+#: ../src/orca/default.py:1029
 msgid "Passes the next command on to the current application."
 msgstr "Gá»i lá»?nh káº¿ tiáº¿p cho á»©ng dá»¥ng hiá»?n thá»?i."
 
-#. Translators: "blank" is a short word to mean the
-#. user has navigated to an empty line.
-#.
-#. Translators: this indicates an empty (blank) spread
-#. sheet cell.
-#.
-#. Translators: "blank" is a short word to mean the
-#. user has navigated to an empty line.
-#.
-#: ../src/orca/default.py:2144
-#: ../src/orca/default.py:2456
-#: ../src/orca/default.py:4985
-#: ../src/orca/default.py:5140
-#: ../src/orca/default.py:5148
-#: ../src/orca/default.py:5256
-#: ../src/orca/default.py:5264
-#: ../src/orca/scripts/apps/evolution/script.py:551
-#: ../src/orca/scripts/apps/soffice/script.py:731
-#: ../src/orca/scripts/apps/soffice/script.py:1236
-#: ../src/orca/scripts/apps/soffice/script.py:2077
-#: ../src/orca/scripts/apps/soffice/speech_generator.py:275
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5431
-#: ../src/orca/structural_navigation.py:3315
-#: ../src/orca/where_am_I.py:1617
-msgid "blank"
-msgstr "tráº¯ng"
-
 #. Translators: this is the number of space characters on a line
 #. of text.
 #.
-#: ../src/orca/default.py:2224
+#: ../src/orca/default.py:2344
 #, python-format
 msgid "%d space"
 msgid_plural "%d spaces"
@@ -2237,55 +2251,56 @@ msgstr[0] "%d dáº¥u cÃ¡ch"
 #. Translators: this is the number of tab characters on a line
 #. of text.
 #.
-#: ../src/orca/default.py:2231
+#: ../src/orca/default.py:2355
 #, python-format
 msgid "%d tab"
 msgid_plural "%d tabs"
 msgstr[0] "%d tab"
 
-#. Translators: this is an index value
-#. so that we can tell which progress bar
-#. we are referring to.
+#. Translators: "blank" is a short word to mean the
+#. user has navigated to an empty line.
 #.
-#: ../src/orca/default.py:2690
-#, python-format
-msgid "Progress bar %d."
-msgstr "Thanh tiáº¿n hÃ nh %d."
-
-#. Translators: this is the percentage value of a
-#. progress bar.
+#. Translators: this indicates an empty (blank) spread
+#. sheet cell.
 #.
-#. Translators: this is the percentage value of a slider,
-#. progress bar or other component that displays a value as
-#. a percentage.
+#. Translators: "blank" is a short word to mean the
+#. user has navigated to an empty line.
 #.
-#. Translators: this is the percentage value of a progress bar.
+#. #######################################################################
+#. #
+#. Strings for speech and braille                                       #
+#. #
+#. #######################################################################
+#. Translators: "blank" is a short word to mean the
+#. user has navigated to an empty line.
 #.
-#: ../src/orca/default.py:2698
-#: ../src/orca/flat_review.py:444
-#: ../src/orca/speechgenerator.py:1143
-#, python-format
-msgid "%d percent."
-msgstr "%d pháº§n trÄ?m."
+#: ../src/orca/default.py:2574
+#: ../src/orca/default.py:5379
+#: ../src/orca/default.py:5535
+#: ../src/orca/default.py:5543
+#: ../src/orca/default.py:5664
+#: ../src/orca/default.py:5672
+#: ../src/orca/scripts/apps/evolution/script.py:708
+#: ../src/orca/scripts/apps/soffice/script.py:1415
+#: ../src/orca/scripts/apps/soffice/speech_generator.py:360
+#: ../src/orca/scripts/apps/soffice/speech_generator.py:469
+#: ../src/orca/scripts/apps/soffice/structural_navigation.py:116
+#: ../src/orca/scripts/toolkits/Gecko/script.py:5882
+#: ../src/orca/settings.py:1293
+#: ../src/orca/speech_generator.py:473
+#: ../src/orca/speech_generator.py:779
+#: ../src/orca/structural_navigation.py:3375
+msgid "blank"
+msgstr "tráº¯ng"
 
-#. Translators: this represents the depth of a node in a tree
-#. view (i.e., how many ancestors a node has).
+#. Translators: this is an index value
+#. so that we can tell which progress bar
+#. we are referring to.
 #.
-#: ../src/orca/default.py:2949
-#: ../src/orca/scripts/apps/pidgin/where_am_i.py:158
-#: ../src/orca/where_am_I.py:682
-#: ../src/orca/where_am_I.py:747
+#: ../src/orca/default.py:2917
 #, python-format
-msgid "tree level %d"
-msgstr "cáº¥p cÃ¢y %d"
-
-#. Translators: this is in reference to a table cell being
-#. selected or not.
-#.
-#: ../src/orca/default.py:2986
-msgctxt "tablecell"
-msgid " not selected"
-msgstr "chÆ°a chá»?n Ã´ báº£ng"
+msgid "Progress bar %d."
+msgstr "Thanh tiáº¿n hÃ nh %d."
 
 #. Translators: this object is now selected.
 #. Let the user know this.
@@ -2294,13 +2309,11 @@ msgstr "chÆ°a chá»?n Ã´ báº£ng"
 #. Translators: when the user selects (highlights) text in
 #. a document, Orca lets them know this.
 #.
-#: ../src/orca/default.py:3879
-#: ../src/orca/default.py:4222
-#: ../src/orca/default.py:7522
-#: ../src/orca/scripts/apps/soffice/where_am_i.py:159
-#: ../src/orca/speechgenerator.py:268
-#: ../src/orca/where_am_I.py:563
-#: ../src/orca/where_am_I.py:982
+#: ../src/orca/default.py:3974
+#: ../src/orca/default.py:4403
+#: ../src/orca/default.py:8124
+#: ../src/orca/speech_generator.py:863
+#: ../src/orca/speech_generator.py:887
 msgctxt "text"
 msgid "selected"
 msgstr "Ä?Æ°á»£c chá»?n"
@@ -2313,17 +2326,27 @@ msgstr "Ä?Æ°á»£c chá»?n"
 #. (unhighlights) text in a document, Orca lets
 #. them know this.
 #.
-#: ../src/orca/default.py:3885
-#: ../src/orca/default.py:7528
+#: ../src/orca/default.py:3980
+#: ../src/orca/default.py:8130
 msgctxt "text"
 msgid "unselected"
 msgstr "chÆ°a chá»?n"
 
+#. Translators: this is to inform the user of the presence
+#. of the red squiggly line which indicates that a given
+#. word is not spelled correctly.
+#.
+#: ../src/orca/default.py:4148
+#: ../src/orca/default.py:8451
+#| msgid "Misspelled word:"
+msgid "misspelled"
+msgstr "sai chÃnh táº£"
+
 #. Translators: when users are navigating a table, they
 #. sometimes want the entire row of a table read, or
 #. they just want the current cell to be presented to them.
 #.
-#: ../src/orca/default.py:4279
+#: ../src/orca/default.py:4460
 msgid "Speak row"
 msgstr "NÃ³i hÃ ng"
 
@@ -2331,14 +2354,14 @@ msgstr "NÃ³i hÃ ng"
 #. sometimes want the entire row of a table read, or
 #. they just want the current cell to be presented to them.
 #.
-#: ../src/orca/default.py:4285
+#: ../src/orca/default.py:4466
 msgid "Speak cell"
 msgstr "NÃ³i Ã´"
 
 #. Translators: bold as in the font sense.
 #.
-#: ../src/orca/default.py:4373
-#: ../src/orca/where_am_I.py:1674
+#: ../src/orca/default.py:4554
+#: ../src/orca/speech_generator.py:696
 msgid "bold"
 msgstr "Ä?áºm"
 
@@ -2349,12 +2372,14 @@ msgstr "Ä?áºm"
 #. application, so we leave things in plural form
 #. here.
 #.
-#: ../src/orca/default.py:4390
-#: ../src/orca/default.py:4401
+#: ../src/orca/default.py:4571
+#: ../src/orca/default.py:4583
 #, python-format
-msgid "%s %s pixel"
-msgid_plural "%s %s pixels"
-msgstr[0] "%s %s Ä?iá»?m áº£nh"
+#| msgid "%s %s pixel"
+#| msgid_plural "%s %s pixels"
+msgid "%(key)s %(value)s pixel"
+msgid_plural "%(key)s %(value)s pixels"
+msgstr[0] "%(key)s %(value)s Ä?iá»?m áº£nh"
 
 #. Translators: this indicates that this piece of
 #. text is a hypertext link.
@@ -2364,11 +2389,11 @@ msgstr[0] "%s %s Ä?iá»?m áº£nh"
 #. Translators: this indicates that this piece of
 #. text is a hypertext link.
 #.
-#: ../src/orca/default.py:4477
-#: ../src/orca/default.py:6393
+#: ../src/orca/default.py:4667
+#: ../src/orca/default.py:6847
 #: ../src/orca/rolenames.py:600
-#: ../src/orca/scripts/apps/soffice/script.py:1117
-#: ../src/orca/where_am_I.py:1696
+#: ../src/orca/scripts/apps/soffice/script.py:1296
+#: ../src/orca/speech_generator.py:716
 msgid "link"
 msgstr "liÃªn káº¿t"
 
@@ -2379,7 +2404,7 @@ msgstr "liÃªn káº¿t"
 #. along to the current application, bypassing Orca's
 #. interception of it.
 #.
-#: ../src/orca/default.py:4524
+#: ../src/orca/default.py:4780
 msgid "Bypass mode enabled."
 msgstr "Cháº¿ Ä?á»? Ä?i vÃ²ng Ä?Ã£ báºt."
 
@@ -2391,7 +2416,7 @@ msgstr "Cháº¿ Ä?á»? Ä?i vÃ²ng Ä?Ã£ báºt."
 #. echo the name of the key if Orca doesn't have a handler.
 #. This text here is what is spoken to the user.
 #.
-#: ../src/orca/default.py:4547
+#: ../src/orca/default.py:4803
 msgid "Entering learn mode.  Press any key to hear its function.  To exit learn mode, press the escape key."
 msgstr "Ä?ang vÃ o cháº¿ Ä?á»? há»?c. HÃ£y báº¥m báº¥t cá»© phÃm nÃ o Ä?á»? nghe chá»©c nÄ?ng cá»§a nÃ³. Ä?á»? thoÃ¡t khá»?i cháº¿ Ä?á»? há»?c nÃ y, báº¥m phÃm thoÃ¡t (Esc)."
 
@@ -2404,25 +2429,55 @@ msgstr "Ä?ang vÃ o cháº¿ Ä?á»? há»?c. HÃ£y báº¥m báº¥t cá»© phÃm nÃ o Ä?á»? ngh
 #. This text here is what is to be presented on the braille
 #. display.
 #.
-#: ../src/orca/default.py:4559
+#: ../src/orca/default.py:4815
 msgid "Learn mode.  Press escape to exit."
 msgstr "Cháº¿ Ä?á»? há»?c. HÃ£y báº¥m phim Escape Ä?á»? thoÃ¡t."
 
+#: ../src/orca/default.py:4986
+msgid "Leaving flat review."
+msgstr "Ä?ang rá»?i cháº¿ Ä?á»? xem láº¡i pháº³ng."
+
+#: ../src/orca/default.py:5004
+#| msgid "Enters and exits flat review mode."
+msgid "Entering flat review."
+msgstr "Ä?ang vÃ o cháº¿ Ä?á»? xem láº¡i pháº³ng."
+
+#. Translators: Orca has a command that allows the user
+#. to move the mouse pointer to the current object. If
+#. for some reason Orca cannot identify the current
+#. location, it will speak this message.
+#.
+#: ../src/orca/default.py:5286
+#: ../src/orca/default.py:5307
+#: ../src/orca/default.py:5327
+#| msgid "C_urrent location"
+msgid "Could not find current location."
+msgstr "KhÃ´ng tÃ¬m tháº¥y vá»? trÃ hiá»?n thá»?i."
+
 #. Translators: "white space" is a short phrase to mean the
 #. user has navigated to a line with only whitespace on it.
 #.
-#: ../src/orca/default.py:4990
-#: ../src/orca/default.py:5153
+#: ../src/orca/default.py:5384
+#: ../src/orca/default.py:5548
 msgid "white space"
 msgstr "khoáº£ng tráº¯ng"
 
+#. Translators: this is information about a unicode character
+#. reported to the user.  The value is the unicode number value
+#. of this character in hex.
+#.
+#: ../src/orca/default.py:5699
+#, python-format
+msgid "Unicode %s"
+msgstr "Unicode %s"
+
 #. Translators: the Orca "Find" dialog allows a user to
 #. search for text in a window and then move focus to
 #. that text.  For example, they may want to find the
 #. "OK" button.  This message lets them know a string
 #. they were searching for was not found.
 #.
-#: ../src/orca/default.py:5385
+#: ../src/orca/default.py:5825
 msgid "string not found"
 msgstr "khÃ´ng tÃ¬m tháº¥y"
 
@@ -2431,12 +2486,12 @@ msgstr "khÃ´ng tÃ¬m tháº¥y"
 #. thing it does is let them know what the misspelled word
 #. is.
 #.
-#: ../src/orca/default.py:6199
+#: ../src/orca/default.py:6653
 #, python-format
 msgid "Misspelled word: %s"
 msgstr "Tá»« sai chÃnh táº£ : %s"
 
-#: ../src/orca/default.py:6207
+#: ../src/orca/default.py:6661
 #, python-format
 msgid "Context is %s"
 msgstr "Ngá»¯ cáº£nh lÃ  %s"
@@ -2446,7 +2501,7 @@ msgstr "Ngá»¯ cáº£nh lÃ  %s"
 #. space characters".  The %d is the number and the %s
 #. is the spoken word for the character.
 #.
-#: ../src/orca/default.py:6345
+#: ../src/orca/default.py:6799
 #, python-format
 msgid "%(count)d %(repeatChar)s character"
 msgid_plural "%(count)d %(repeatChar)s characters"
@@ -2456,7 +2511,31 @@ msgstr[0] "%(count)d %(repeatChar)s kÃ½ tá»±"
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7368
+#: ../src/orca/default.py:7921
+#| msgid "page selected from cursor position"
+msgid "paragraph selected down from cursor position"
+msgstr "Ä?oáº¡n vÄ?n Ä?Æ°á»£c chá»?n bÃªn dÆ°á»?i vá»? trÃ con trá»?"
+
+#: ../src/orca/default.py:7922
+#| msgid "page unselected from cursor position"
+msgid "paragraph unselected down from cursor position"
+msgstr "Ä?oáº¡n vÄ?n bá»? bá»? chá»?n bÃªn dÆ°á»?i vá»? trÃ con trá»?"
+
+#: ../src/orca/default.py:7923
+#| msgid "page selected from cursor position"
+msgid "paragraph selected up from cursor position"
+msgstr "Ä?oáº¡n vÄ?n Ä?Æ°á»£c chá»?n bÃªn trÃªn vá»? trÃ con trá»?"
+
+#: ../src/orca/default.py:7924
+#| msgid "page unselected from cursor position"
+msgid "paragraph unselected up from cursor position"
+msgstr "Ä?oáº¡n vÄ?n bá»? bá»? chá»?n bÃªn trÃªn vá»? trÃ con trá»?"
+
+#. Translators: when the user selects (highlights) text in
+#. a document, Orca will speak information about what they
+#. have selected.
+#.
+#: ../src/orca/default.py:7982
 msgid "line selected to end from previous cursor position"
 msgstr "dÃ²ng Ä?Æ°á»£c chá»?n bÃªn pháº£i vá»? trÃ con trá»?"
 
@@ -2464,7 +2543,7 @@ msgstr "dÃ²ng Ä?Æ°á»£c chá»?n bÃªn pháº£i vá»? trÃ con trá»?"
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7376
+#: ../src/orca/default.py:7990
 msgid "line selected from start to previous cursor position"
 msgstr "dÃ²ng Ä?Æ°á»£c chá»?n bÃªn trÃ¡i vá»? trÃ con trá»?"
 
@@ -2472,14 +2551,14 @@ msgstr "dÃ²ng Ä?Æ°á»£c chá»?n bÃªn trÃ¡i vá»? trÃ con trá»?"
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7385
+#: ../src/orca/default.py:7999
 msgid "page selected from cursor position"
 msgstr "trang Ä?Æ°á»£c chá»?n tá»« vá»? trÃ con trá»?"
 
 #. Translators: when the user unselects text in a document,
 #. Orca will speak information about what they have unselected.
 #.
-#: ../src/orca/default.py:7390
+#: ../src/orca/default.py:8004
 msgid "page unselected from cursor position"
 msgstr "trang bá»? bá»? chá»?n tá»« vá»? trÃ con trá»?"
 
@@ -2487,14 +2566,14 @@ msgstr "trang bá»? bá»? chá»?n tá»« vá»? trÃ con trá»?"
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7399
+#: ../src/orca/default.py:8013
 msgid "page selected to cursor position"
 msgstr "trang Ä?Æ°á»£c chá»?n Ä?áº¿n vá»? trÃ con trá»?"
 
 #. Translators: when the user unselects text in a document,
 #. Orca will speak information about what they have unselected.
 #.
-#: ../src/orca/default.py:7404
+#: ../src/orca/default.py:8018
 msgid "page unselected to cursor position"
 msgstr "trang bá»? bá»? chá»?n Ä?áº¿n vá»? trÃ con trá»?"
 
@@ -2502,44 +2581,14 @@ msgstr "trang bá»? bá»? chá»?n Ä?áº¿n vá»? trÃ con trá»?"
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7413
-msgid "line selected down from cursor position"
-msgstr "dÃ²ng Ä?Æ°á»£c chá»?n bÃªn dÆ°á»?i vá»? trÃ con trá»?"
-
-#. Translators: when the user unselects text in a document,
-#. Orca will speak information about what they have unselected.
-#.
-#: ../src/orca/default.py:7418
-msgid "line unselected down from cursor position"
-msgstr "dÃ²ng bá»? bá»? chá»?n bÃªn dÆ°á»?i vá»? trÃ con trá»?"
-
-#. Translators: when the user selects (highlights) text in
-#. a document, Orca will speak information about what they
-#. have selected.
-#.
-#: ../src/orca/default.py:7427
-msgid "line selected up from cursor position"
-msgstr "dÃ²ng Ä?Æ°á»£c chá»?n bÃªn trÃªn vá»? trÃ con trá»?"
-
-#. Translators: when the user unselects text in a document,
-#. Orca will speak information about what they have unselected.
-#.
-#: ../src/orca/default.py:7432
-msgid "line unselected up from cursor position"
-msgstr "dÃ²ng bá»? bá»? chá»?n bÃªn trÃªn vá»? trÃ con trá»?"
-
-#. Translators: when the user selects (highlights) text in
-#. a document, Orca will speak information about what they
-#. have selected.
-#.
-#: ../src/orca/default.py:7441
+#: ../src/orca/default.py:8043
 msgid "document selected to cursor position"
 msgstr "tÃ i liá»?u Ä?Æ°á»£c chá»?n Ä?áº¿n vá»? trÃ con trá»?"
 
 #. Translators: when the user unselects text in a document,
 #. Orca will speak information about what they have unselected.
 #.
-#: ../src/orca/default.py:7446
+#: ../src/orca/default.py:8048
 msgid "document unselected to cursor position"
 msgstr "tÃ i liá»?u bá»? bá»? chá»?n Ä?áº¿n vá»? trÃ con trá»?"
 
@@ -2547,21 +2596,21 @@ msgstr "tÃ i liá»?u bá»? bá»? chá»?n Ä?áº¿n vá»? trÃ con trá»?"
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7455
+#: ../src/orca/default.py:8057
 msgid "document selected from cursor position"
 msgstr "tÃ i liá»?u Ä?Æ°á»£c chá»?n tá»« vá»? trÃ con trá»?"
 
 #. Translators: when the user unselects text in a document,
 #. Orca will speak information about what they have unselected.
 #.
-#: ../src/orca/default.py:7460
+#: ../src/orca/default.py:8062
 msgid "document unselected from cursor position"
 msgstr "tÃ i liá»?u bá»? bá»? chá»?n tá»« vá»? trÃ con trá»?"
 
 #. Translators: this means the user has selected
 #. all the text in a document (e.g., Ctrl+a in gedit).
 #.
-#: ../src/orca/default.py:7477
+#: ../src/orca/default.py:8079
 msgid "entire document selected"
 msgstr "toÃ n bá»? tÃ i liá»?u Ä?Ã£ chá»?n"
 
@@ -2602,55 +2651,41 @@ msgstr "Cuá»?n Ä?áº¿n Ä?á»?nh"
 #. Translators: this represents the state of a checkbox.
 #.
 #: ../src/orca/flat_review.py:352
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:618
-#: ../src/orca/speechgenerator.py:451
-#: ../src/orca/where_am_I.py:417
-#: ../src/orca/where_am_I.py:1381
+#: ../src/orca/settings.py:1318
 msgid "partially checked"
 msgstr "chá»?n má»?t pháº§n"
 
 #. Translators: this represents the state of a checkbox.
 #.
-#. Translators: this represents the state of a checked menu item.
-#.
-#. Translators: this represents the state of a checkbox.
-#.
 #: ../src/orca/flat_review.py:356
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:622
-#: ../src/orca/speechgenerator.py:455
-#: ../src/orca/speechgenerator.py:1009
-#: ../src/orca/where_am_I.py:421
-#: ../src/orca/where_am_I.py:1385
+#: ../src/orca/settings.py:1317
 msgid "checked"
 msgstr "Ä?Ã£ kiá»?m tra"
 
 #. Translators: this represents the state of a checkbox.
 #.
+#. Translators: this represents the state of a checkbox.  It is meant
+#. to be spoken to the user.
+#.
 #: ../src/orca/flat_review.py:360
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:626
-#: ../src/orca/speechgenerator.py:459
-#: ../src/orca/where_am_I.py:425
-#: ../src/orca/where_am_I.py:1389
+#: ../src/orca/settings.py:1316
 msgid "not checked"
 msgstr "chÆ°a kiá»?m tra"
 
 #. Translators: the state of a toggle button.
 #.
 #: ../src/orca/flat_review.py:367
-#: ../src/orca/scripts/apps/planner/speech_generator.py:63
-#: ../src/orca/scripts/apps/planner/speech_generator.py:71
-#: ../src/orca/speechgenerator.py:1755
-#: ../src/orca/where_am_I.py:880
+#: ../src/orca/settings.py:1329
 msgid "pressed"
 msgstr "Ä?Ã£ báº¥m"
 
 #. Translators: the state of a toggle button.
 #.
+#. Translators: this represents the state of a toggle button.  It is
+#. meant to be spoken to the user.
+#.
 #: ../src/orca/flat_review.py:371
-#: ../src/orca/scripts/apps/planner/speech_generator.py:65
-#: ../src/orca/scripts/apps/planner/speech_generator.py:73
-#: ../src/orca/speechgenerator.py:1759
-#: ../src/orca/where_am_I.py:884
+#: ../src/orca/settings.py:1329
 msgid "not pressed"
 msgstr "chÆ°a báº¥m"
 
@@ -2658,9 +2693,7 @@ msgstr "chÆ°a báº¥m"
 #. selected or not.
 #.
 #: ../src/orca/flat_review.py:379
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:562
-#: ../src/orca/speechgenerator.py:1201
-#: ../src/orca/where_am_I.py:223
+#: ../src/orca/settings.py:1324
 msgctxt "radiobutton"
 msgid "selected"
 msgstr "Ä?Æ°á»£c chá»?n"
@@ -2668,10 +2701,11 @@ msgstr "Ä?Æ°á»£c chá»?n"
 #. Translators: this is in reference to a radio button being
 #. selected or not.
 #.
+#. Translators: this represents the state of a radio button.  It is
+#. meant to be spoken to the user.
+#.
 #: ../src/orca/flat_review.py:384
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:567
-#: ../src/orca/speechgenerator.py:1206
-#: ../src/orca/where_am_I.py:228
+#: ../src/orca/settings.py:1323
 msgctxt "radiobutton"
 msgid "not selected"
 msgstr "chÆ°a chá»?n"
@@ -2688,15 +2722,41 @@ msgstr "náº±m ngang"
 msgid "vertical"
 msgstr "tháº³ng Ä?á»©ng"
 
+#. Translators: this is the percentage value of a slider,
+#. progress bar or other component that displays a value as
+#. a percentage.
+#.
+#: ../src/orca/flat_review.py:444
+#, python-format
+msgid "%d percent."
+msgstr "%d pháº§n trÄ?m."
+
+#. Translators: this is the action name for
+#. the 'toggle' action. It must be the same
+#. string used in the *.po file for gail.
+#.
+#: ../src/orca/flat_review.py:1071
+#: ../src/orca/generator.py:437
+#: ../src/orca/generator.py:694
+#: ../src/orca/generator.py:736
+#: ../src/orca/generator.py:782
+#: ../src/orca/scripts/apps/evolution/script.py:985
+#: ../src/orca/scripts/apps/evolution/speech_generator.py:115
+#: ../src/orca/scripts/apps/packagemanager/script.py:714
+#: ../src/orca/tutorialgenerator.py:526
+#: ../src/orca/tutorialgenerator.py:566
+msgid "toggle"
+msgstr "báºt/táº¯t"
+
 #. Translators: this is intended to be a short phrase to
 #. speak and braille to tell the user that no component
 #. has keyboard focus.
 #.
-#: ../src/orca/focus_tracking_presenter.py:943
+#: ../src/orca/focus_tracking_presenter.py:958
 msgid "No focus"
 msgstr "KhÃ´ng cÃ³ tiÃªu Ä?iá»?m"
 
-#: ../src/orca/gnomespeechfactory.py:221
+#: ../src/orca/gnomespeechfactory.py:235
 msgid "GNOME Speech Services"
 msgstr "Dá»?ch vá»¥ NÃ³i tiáº¿ng Gnome"
 
@@ -2706,8 +2766,8 @@ msgstr "Dá»?ch vá»¥ NÃ³i tiáº¿ng Gnome"
 #. new string well.  For example, "Open..." turns into
 #. "Open dot dot dot".
 #.
-#: ../src/orca/gnomespeechfactory.py:772
-#: ../src/orca/gnomespeechfactory.py:773
+#: ../src/orca/gnomespeechfactory.py:815
+#: ../src/orca/gnomespeechfactory.py:816
 msgid " dot dot dot"
 msgstr " cháº¥m cháº¥m cháº¥m"
 
@@ -2718,15 +2778,15 @@ msgstr " cháº¥m cháº¥m cháº¥m"
 #. odd characters, etc.), so we need to unfortunately
 #. build up the utterance in this manner.
 #.
-#: ../src/orca/gnomespeechfactory.py:844
+#: ../src/orca/gnomespeechfactory.py:887
 msgid "minus"
 msgstr "trá»«"
 
 #. Translators: this is a short string saying that the speech
 #. synthesis engine is now speaking in a higher pitch.
 #.
-#: ../src/orca/gnomespeechfactory.py:999
-#: ../src/orca/speechdispatcherfactory.py:297
+#: ../src/orca/gnomespeechfactory.py:1047
+#: ../src/orca/speechdispatcherfactory.py:303
 msgid "higher."
 msgstr "cao hÆ¡n."
 
@@ -2734,8 +2794,8 @@ msgstr "cao hÆ¡n."
 #. synthesis engine is now speaking in a lower pitch.
 #.
 #. Translators: This string announces speech pitch change.
-#: ../src/orca/gnomespeechfactory.py:1030
-#: ../src/orca/speechdispatcherfactory.py:297
+#: ../src/orca/gnomespeechfactory.py:1078
+#: ../src/orca/speechdispatcherfactory.py:303
 msgid "lower."
 msgstr "tháº¥p hÆ¡n."
 
@@ -2743,8 +2803,8 @@ msgstr "tháº¥p hÆ¡n."
 #. synthesis engine is now speaking at a faster rate (words
 #. per minute).
 #.
-#: ../src/orca/gnomespeechfactory.py:1059
-#: ../src/orca/speechdispatcherfactory.py:287
+#: ../src/orca/gnomespeechfactory.py:1107
+#: ../src/orca/speechdispatcherfactory.py:293
 msgid "faster."
 msgstr "nhanh hÆ¡n."
 
@@ -2753,11 +2813,29 @@ msgstr "nhanh hÆ¡n."
 #. per minute).
 #.
 #. Translators: This string announces speech rate change.
-#: ../src/orca/gnomespeechfactory.py:1093
-#: ../src/orca/speechdispatcherfactory.py:287
+#: ../src/orca/gnomespeechfactory.py:1141
+#: ../src/orca/speechdispatcherfactory.py:293
 msgid "slower."
 msgstr "cháºm hÆ¡n."
 
+#. Translators: this is the message spoken when a user enables the
+#. magnifier.  In addition to screen magnification, the user's
+#. preferred colors and mouse customizations are loaded.
+#.
+#: ../src/orca/gsmag.py:548
+#: ../src/orca/mag.py:1684
+msgid "Magnifier enabled."
+msgstr "KÃnh lÃºp Ä?Ã£ báºt."
+
+#. Translators: this is the message spoken when a user disables the
+#. magnifier, restoring the screen contents to their normal colors
+#. and sizes.
+#.
+#: ../src/orca/gsmag.py:555
+#: ../src/orca/mag.py:1691
+msgid "Magnifier disabled."
+msgstr "KÃnh lÃºp bá»? táº¯t."
+
 #. Translators: this is presented in a GUI to represent the
 #. "right alt" modifier.
 #.
@@ -3040,6 +3118,46 @@ msgstr "end"
 msgid "begin"
 msgstr "báº¯t Ä?áº§u"
 
+#. Translators: this is how someone would speak the name of the
+#. non-spacing diacritical key for the acute glyph
+#.
+#: ../src/orca/keynames.py:255
+#| msgid "a acute"
+msgid "acute"
+msgstr "dáº¥u sáº¯c"
+
+#. Translators: this is how someone would speak the name of the
+#. non-spacing diacritical key for the circumflex glyph
+#.
+#: ../src/orca/keynames.py:260
+#| msgid "a circumflex"
+msgid "circumflex"
+msgstr "dáº¥u mÅ©"
+
+#. Translators: this is how someone would speak the name of the
+#. non-spacing diacritical key for the diaeresis glyph
+#.
+#: ../src/orca/keynames.py:270
+#| msgid "degrees"
+msgid "diaeresis"
+msgstr "dáº¥u tÃ¡ch Ä?Ã´i"
+
+#. Translators: this is how someone would speak the name of the
+#. non-spacing diacritical key for the ring glyph
+#.
+#: ../src/orca/keynames.py:275
+#| msgid "a ring"
+msgid "ring"
+msgstr "dáº¥u vÃ²ng"
+
+#. Translators: this is how someone would speak the name of the
+#. non-spacing diacritical key for the stroke glyph
+#.
+#: ../src/orca/keynames.py:285
+#| msgid "o stroke"
+msgid "stroke"
+msgstr "gáº¡ch Ä?Ã¨"
+
 #. Translators:  sets the live region politeness level to polite
 #.
 #: ../src/orca/liveregions.py:265
@@ -3094,7 +3212,7 @@ msgstr "má»©c tÃ¹y theo %s"
 #. make to the appearance of the screen to make things easier
 #. to see, such as inverting the colors or applying a tint.
 #.
-#: ../src/orca/mag.py:1562
+#: ../src/orca/mag.py:1556
 msgid "Color enhancements disabled."
 msgstr "MÃ u sáº¯c tÄ?ng cÆ°á»?ng bá»? táº¯t."
 
@@ -3102,7 +3220,7 @@ msgstr "MÃ u sáº¯c tÄ?ng cÆ°á»?ng bá»? táº¯t."
 #. make to the appearance of the screen to make things easier
 #. to see, such as inverting the colors or applying a tint.
 #.
-#: ../src/orca/mag.py:1570
+#: ../src/orca/mag.py:1564
 msgid "Color enhancements enabled."
 msgstr "MÃ u sáº¯c tÄ?ng cÆ°á»?ng Ä?Ã£ báºt."
 
@@ -3111,7 +3229,7 @@ msgstr "MÃ u sáº¯c tÄ?ng cÆ°á»?ng Ä?Ã£ báºt."
 #. easier to see, such as increasing its size, changing its
 #. color, and surrounding it with crosshairs.
 #.
-#: ../src/orca/mag.py:1592
+#: ../src/orca/mag.py:1586
 msgid "Mouse enhancements disabled."
 msgstr "Con chuá»?t tÄ?ng cÆ°á»?ng bá»? táº¯t."
 
@@ -3120,80 +3238,261 @@ msgstr "Con chuá»?t tÄ?ng cÆ°á»?ng bá»? táº¯t."
 #. easier to see, such as increasing its size, changing its
 #. color, and surrounding it with crosshairs.
 #.
-#: ../src/orca/mag.py:1625
+#: ../src/orca/mag.py:1619
 msgid "Mouse enhancements enabled."
 msgstr "Con chuá»?t tÄ?ng cÆ°á»?ng Ä?Ã£ báºt."
 
-#. Translators: this is the message spoken when a user enables the
-#. magnifier.  In addition to screen magnification, the user's
-#. preferred colors and mouse customizations are loaded.
-#.
-#: ../src/orca/mag.py:1690
-msgid "Magnifier enabled."
-msgstr "KÃnh lÃºp Ä?Ã£ báºt."
-
-#. Translators: this is the message spoken when a user disables the
-#. magnifier, restoring the screen contents to their normal colors
-#. and sizes.
-#.
-#: ../src/orca/mag.py:1697
-msgid "Magnifier disabled."
-msgstr "KÃnh lÃºp bá»? táº¯t."
-
 #. Translators: magnification will use the full screen.
 #.
 #. Translators: this is an algorithm for magnifying pixels
 #. on the screen.
 #.
-#: ../src/orca/mag.py:1752
-#: ../src/orca/orca_gui_prefs.py:1740
-#: ../src/orca/orca_gui_prefs.py:1766
+#: ../src/orca/mag.py:1746
+#: ../src/orca/orca_gui_prefs.py:1849
+#: ../src/orca/orca_gui_prefs.py:1875
+#: ../src/orca/orca_gui_prefs.py:1878
+#: ../src/orca/orca-setup.ui.h:83
 msgid "Full Screen"
 msgstr "ToÃ n mÃ n hÃ¬nh"
 
 #. Translators: the user attempted to switch to full screen
 #. magnification, but his/her system doesn't support it.
 #.
-#: ../src/orca/mag.py:1757
+#: ../src/orca/mag.py:1751
 msgid "Full Screen mode unavailable"
 msgstr "Cháº¿ Ä?á»? toÃ n mÃ n hÃ¬nh khÃ´ng sáºµn sÃ ng"
 
 #. Translators: magnification will use the top half of the screen.
 #.
-#: ../src/orca/mag.py:1761
-#: ../src/orca/orca_gui_prefs.py:1744
+#: ../src/orca/mag.py:1755
+#: ../src/orca/orca_gui_prefs.py:1853
+#: ../src/orca/orca_gui_prefs.py:1879
+#: ../src/orca/orca-setup.ui.h:145
 msgid "Top Half"
 msgstr "Ná»a bÃªn trÃªn"
 
 #. Translators: magnification will use the bottom half of the screen.
 #.
-#: ../src/orca/mag.py:1765
-#: ../src/orca/orca_gui_prefs.py:1748
+#: ../src/orca/mag.py:1759
+#: ../src/orca/orca_gui_prefs.py:1857
+#: ../src/orca/orca_gui_prefs.py:1880
+#: ../src/orca/orca-setup.ui.h:36
 msgid "Bottom Half"
 msgstr "Ná»a bÃªn dÆ°á»?i"
 
 #. Translators: magnification will use the left half of the screen.
 #.
-#: ../src/orca/mag.py:1769
-#: ../src/orca/orca_gui_prefs.py:1752
+#: ../src/orca/mag.py:1763
+#: ../src/orca/orca_gui_prefs.py:1861
+#: ../src/orca/orca_gui_prefs.py:1881
+#: ../src/orca/orca-setup.ui.h:90
 msgid "Left Half"
 msgstr "Ná»a bÃªn trÃ¡i"
 
 #. Translators: magnification will use the right half of the screen.
 #.
-#: ../src/orca/mag.py:1773
-#: ../src/orca/orca_gui_prefs.py:1756
+#: ../src/orca/mag.py:1767
+#: ../src/orca/orca_gui_prefs.py:1865
+#: ../src/orca/orca_gui_prefs.py:1882
+#: ../src/orca/orca-setup.ui.h:118
 msgid "Right Half"
 msgstr "Ná»a bÃªn pháº£i"
 
 #. Translators: the user has selected a custom area of the screen
 #. to use for magnification.
 #.
-#: ../src/orca/mag.py:1778
-#: ../src/orca/orca_gui_prefs.py:1761
+#: ../src/orca/mag.py:1772
+#: ../src/orca/orca_gui_prefs.py:1870
+#: ../src/orca/orca_gui_prefs.py:1883
+#: ../src/orca/orca-setup.ui.h:49
 msgid "Custom"
 msgstr "Tá»± chá»?n"
 
+#: ../src/orca/orca-advanced-magnification.ui.h:1
+msgid "<b>Brightness</b>"
+msgstr "<b>Ä?á»? sÃ¡ng</b>"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:2
+msgid "<b>Contrast</b>"
+msgstr "<b>Ä?á»? tÆ°Æ¡ng pháº£n</b>"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:3
+msgid "<b>Multi-monitor Settings</b>"
+msgstr "<b>Thiáº¿t láºp Ä?a mÃ n hÃ¬nh</b>"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:4
+msgid "Advanced Settings"
+msgstr "Thiáº¿t láºp Cáº¥p cao"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:5
+msgid "B_lue:"
+msgstr "_Xanh:"
+
+#. Translators: this is an algorithm for magnifying pixels
+#. on the screen.
+#.
+#: ../src/orca/orca-advanced-magnification.ui.h:6
+#: ../src/orca/orca_gui_prefs.py:4488
+#: ../src/orca/orca_gui_prefs.py:4499
+#: ../src/orca/orca_gui_prefs.py:4501
+#: ../src/orca/orca_gui_prefs.py:4522
+msgid "Bilinear"
+msgstr "Tuyáº¿n kÃ©p"
+
+#. Translators: this refers to a color filter for people with
+#. color blindness. It will eliminate the blue value for all
+#. pixels on the screen. For example, an RGB value of
+#. (75, 100, 125) would become (75, 100, 0).
+#.
+#: ../src/orca/orca-advanced-magnification.ui.h:7
+#: ../src/orca/orca_gui_prefs.py:4745
+#: ../src/orca/orca_gui_prefs.py:4772
+#: ../src/orca/orca_gui_prefs.py:4843
+msgid "Desaturate blue"
+msgstr "MÃ u xanh tá»?i thiá»?u"
+
+#. Translators: this refers to a color filter for people with
+#. color blindness. It will eliminate the green value for all
+#. pixels on the screen. For example, an RGB value of
+#. (75, 100, 125) would become (75, 0, 125).
+#.
+#: ../src/orca/orca-advanced-magnification.ui.h:8
+#: ../src/orca/orca_gui_prefs.py:4737
+#: ../src/orca/orca_gui_prefs.py:4835
+msgid "Desaturate green"
+msgstr "MÃ u lá»¥c tá»?i thiá»?u"
+
+#. Translators: this refers to a color filter for people with
+#. color blindness. It will eliminate the red value for all
+#. pixels on the screen. For example, an RGB value of
+#. (75, 100, 125) would be become (0, 100, 125).
+#.
+#: ../src/orca/orca-advanced-magnification.ui.h:9
+#: ../src/orca/orca_gui_prefs.py:4729
+#: ../src/orca/orca_gui_prefs.py:4771
+#: ../src/orca/orca_gui_prefs.py:4827
+msgid "Desaturate red"
+msgstr "MÃ u Ä?á»? tá»?i thiá»?u"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:10
+msgid "Gree_n:"
+msgstr "_Lá»¥c:"
+
+#. Translators: this refers to a color filter for people with
+#. color blindness. It shifts RGB values to the left. For
+#. example, an RGB value of (75, 100, 125) would become
+#. (100, 125, 75).
+#.
+#: ../src/orca/orca-advanced-magnification.ui.h:11
+#: ../src/orca/orca_gui_prefs.py:4761
+#: ../src/orca/orca_gui_prefs.py:4774
+#: ../src/orca/orca_gui_prefs.py:4859
+msgid "Negative hue shift"
+msgstr "Dá»?i sáº¯c mÃ u vá»? Ã¢m"
+
+#. Translators: there is no special algorithm used for tracking an
+#. object of interest (mouse pointer, caret, or widget) with the
+#. magnifier.
+#.
+#. Translators: this is an algorithm for tracking the mouse
+#. with the magnifier.  None means that Orca does nothing to
+#. track the mouse.
+#.
+#: ../src/orca/orca-advanced-magnification.ui.h:12
+#: ../src/orca/orca_gui_prefs.py:89
+#: ../src/orca/orca_gui_prefs.py:1926
+#: ../src/orca/orca_gui_prefs.py:1946
+#: ../src/orca/orca_gui_prefs.py:4494
+#: ../src/orca/orca_gui_prefs.py:4501
+#: ../src/orca/orca_gui_prefs.py:4524
+#: ../src/orca/orca_gui_prefs.py:4697
+#: ../src/orca/orca_gui_prefs.py:4764
+#: ../src/orca/orca_gui_prefs.py:4767
+#: ../src/orca/orca_gui_prefs.py:4795
+#: ../src/orca/orca-setup.ui.h:103
+msgid "None"
+msgstr "KhÃ´ng cÃ³"
+
+#. Translators: this refers to a color filter for people with
+#. color blindness. It shifts RGB values to the right. For
+#. example, an RGB value of (75, 100, 125) would become
+#. (125, 75, 100).
+#.
+#: ../src/orca/orca-advanced-magnification.ui.h:13
+#: ../src/orca/orca_gui_prefs.py:4753
+#: ../src/orca/orca_gui_prefs.py:4773
+#: ../src/orca/orca_gui_prefs.py:4851
+msgid "Positive hue shift"
+msgstr "Dá»?i sáº¯c mÃ u vá»? dÆ°Æ¡ng"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:14
+msgid "R_ed:"
+msgstr "Ä?_á»? :"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:15
+msgid "S_ource display:"
+msgstr "Hiá»?n thá»? n_guá»?n:"
+
+#. Translators: this refers to a color filter for people with
+#. color blindness. It will maximize the blue value for all
+#. pixels on the screen. For example, an RGB value of
+#. (75, 100, 125) would become (75, 100, 255).
+#.
+#: ../src/orca/orca-advanced-magnification.ui.h:16
+#: ../src/orca/orca_gui_prefs.py:4721
+#: ../src/orca/orca_gui_prefs.py:4770
+#: ../src/orca/orca_gui_prefs.py:4819
+msgid "Saturate blue"
+msgstr "MÃ u xanh tá»?i Ä?a"
+
+#. Translators: this refers to a color filter for people with
+#. color blindness. It will maximize the green value for all
+#. pixels on the screen.  For example, an RGB value of
+#. (75, 100, 125) would become (75, 255, 125).
+#.
+#: ../src/orca/orca-advanced-magnification.ui.h:17
+#: ../src/orca/orca_gui_prefs.py:4713
+#: ../src/orca/orca_gui_prefs.py:4769
+#: ../src/orca/orca_gui_prefs.py:4811
+msgid "Saturate green"
+msgstr "MÃ u lá»¥c tá»?i Ä?a"
+
+#. Translators: this refers to a color filter for people with
+#. color blindness. It will maximize the red value for all
+#. pixels on the screen. For example, an RGB value of
+#. (75, 100, 125) would be become (255, 100, 125).
+#.
+#: ../src/orca/orca-advanced-magnification.ui.h:18
+#: ../src/orca/orca_gui_prefs.py:4705
+#: ../src/orca/orca_gui_prefs.py:4768
+#: ../src/orca/orca_gui_prefs.py:4803
+msgid "Saturate red"
+msgstr "MÃ u Ä?á»? tá»?i Ä?a"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:19
+msgid "Target displa_y:"
+msgstr "_Hiá»?n thá»? Ä?Ãch:"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:20
+msgid "_Blue:"
+msgstr "_Xanh:"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:21
+msgid "_Color Filtering:"
+msgstr "_Lá»?c mÃ u :"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:22
+msgid "_Green:"
+msgstr "_Lá»¥c:"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:23
+msgid "_Red:"
+msgstr "Ä?_á»? :"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:24
+msgid "_Smoothing:"
+msgstr "LÃ m _má»?n:"
+
 #. Translators: this is a regular expression that is intended to match
 #. a positive 'yes' response from a user at the command line.  The expression
 #. as given means - does it begin with (that's the '^' character) any of
@@ -3210,19 +3509,25 @@ msgstr "Tá»± chá»?n"
 #. Finally, this expression should match what you've chosen for the
 #. translation of the "Enter y or n:" strings for this file.
 #.
-#: ../src/orca/orca_console_prefs.py:69
+#: ../src/orca/orca_console_prefs.py:68
 msgid "^[Yy1]"
 msgstr "^[Cc1]"
 
+# Viáº¿t táº¯t Â« khÃ´ng Â» ? CÃ³ thÃ¬ dá»?ch sang Â« ^[KkNn0]
+#: ../src/orca/orca_console_prefs.py:69
+msgid "^[Nn0]"
+msgstr "^[Nn0]"
+
 #. Translators: this means speech synthesis (i.e., the machine
 #. speaks to you from its speakers) is not installed or working.
 #.
-#: ../src/orca/orca_console_prefs.py:136
-#: ../src/orca/orca_console_prefs.py:155
+#: ../src/orca/orca_console_prefs.py:140
+#: ../src/orca/orca_console_prefs.py:149
+#: ../src/orca/orca_console_prefs.py:167
 msgid "Speech is unavailable."
 msgstr "Tiáº¿ng nÃ³i khÃ´ng sáºµn sÃ ng."
 
-#: ../src/orca/orca_console_prefs.py:140
+#: ../src/orca/orca_console_prefs.py:152
 msgid "Welcome to Orca setup."
 msgstr "ChÃºc má»«ng báº¡n thiáº¿t láºp Orca."
 
@@ -3232,40 +3537,52 @@ msgstr "ChÃºc má»«ng báº¡n thiáº¿t láºp Orca."
 #. another, emacspeak is another.  These all then provide
 #. wrappers around specific speech servers (engines).
 #.
-#: ../src/orca/orca_console_prefs.py:164
+#: ../src/orca/orca_console_prefs.py:176
 msgid "Select desired speech system:"
 msgstr "Chá»?n há»? thá»?ng tiáº¿ng nÃ³i Ä?Ã£ muá»?n:"
 
 #. Translators: this is prompting for a numerical choice.
 #.
-#: ../src/orca/orca_console_prefs.py:175
-#: ../src/orca/orca_console_prefs.py:207
-#: ../src/orca/orca_console_prefs.py:254
-#: ../src/orca/orca_console_prefs.py:403
+#: ../src/orca/orca_console_prefs.py:189
+#: ../src/orca/orca_console_prefs.py:230
+#: ../src/orca/orca_console_prefs.py:282
+#: ../src/orca/orca_console_prefs.py:486
 msgid "Enter choice: "
 msgstr "Nháºp sá»± chá»?n: "
 
+#. Translators: this is letting the user they input an
+#. invalid integer value on the command line and is
+#. also requesting they enter a valid integer value.
+#.
+#: ../src/orca/orca_console_prefs.py:196
+#: ../src/orca/orca_console_prefs.py:233
+#: ../src/orca/orca_console_prefs.py:288
+#: ../src/orca/orca_console_prefs.py:501
+#: ../src/orca/orca_console_prefs.py:503
+msgid "Please enter a valid number."
+msgstr "HÃ£y gÃµ má»?t con sá»? Ä?Ãºng."
+
 #. Translators: this means speech synthesis will not be used.
 #.
-#: ../src/orca/orca_console_prefs.py:179
-#: ../src/orca/orca_console_prefs.py:190
+#: ../src/orca/orca_console_prefs.py:200
 #: ../src/orca/orca_console_prefs.py:211
-#: ../src/orca/orca_console_prefs.py:227
-#: ../src/orca/orca_console_prefs.py:261
+#: ../src/orca/orca_console_prefs.py:237
+#: ../src/orca/orca_console_prefs.py:253
+#: ../src/orca/orca_console_prefs.py:292
 msgid "Speech will not be used.\n"
 msgstr "Sáº½ khÃ´ng nÃ³i gÃ¬.\n"
 
 #. Translators: this means no working speech servers (speech
 #. synthesis engines) can be found.
 #.
-#: ../src/orca/orca_console_prefs.py:189
+#: ../src/orca/orca_console_prefs.py:210
 msgid "No servers available.\n"
 msgstr "KhÃ´ng cÃ³ mÃ¡y phá»¥c vá»¥ sáºµn sÃ ng.\n"
 
 #. Translators: this is prompting for a numerical choice from a list
 #. of available speech synthesis engines.
 #.
-#: ../src/orca/orca_console_prefs.py:196
+#: ../src/orca/orca_console_prefs.py:217
 msgid "Select desired speech server."
 msgstr "HÃ£y chá»?n mÃ¡y phá»¥c vá»¥ tiáº¿ng nÃ³i Ä?Ã£ muá»?n."
 
@@ -3273,7 +3590,7 @@ msgstr "HÃ£y chá»?n mÃ¡y phá»¥c vá»¥ tiáº¿ng nÃ³i Ä?Ã£ muá»?n."
 #. engine) is not working properly and no voices (e.g., male,
 #. female, child) are available.
 #.
-#: ../src/orca/orca_console_prefs.py:223
+#: ../src/orca/orca_console_prefs.py:249
 msgid "No voices available.\n"
 msgstr "KhÃ´ng cÃ³ giá»?ng nÃ³i nÃ o sáºµn sÃ ng.\n"
 
@@ -3281,50 +3598,67 @@ msgstr "KhÃ´ng cÃ³ giá»?ng nÃ³i nÃ o sáºµn sÃ ng.\n"
 #. list of choices of speech synthesis voices (e.g., male,
 #. female, child).
 #.
-#: ../src/orca/orca_console_prefs.py:234
+#: ../src/orca/orca_console_prefs.py:260
 msgid "Select desired voice:"
 msgstr "Chá»?n giá»?ng nÃ³i Ä?Ã£ muá»?n:"
 
-#. Translators: the word echo feature of Orca will speak the word
-#. prior to the caret when the user types a word delimiter.
+#. Translators: the word echo feature of Orca will speak the
+#. word prior to the caret when the user types a word
+#. delimiter.
 #.
-#: ../src/orca/orca_console_prefs.py:295
+#: ../src/orca/orca_console_prefs.py:329
 msgid "Enable echo by word?  Enter y or n: "
 msgstr "Báºt pháº£n há»?i theo tá»« khÃ´ng? Nháºp y (cÃ³) hay n (khÃ´ng): "
 
-#. Translators: if key echo is enabled, Orca will speak the name of a key
-#. as the user types on the keyboard.  If the user wants key echo, they
-#. will then be prompted for which classes of keys they want echoed.
+#: ../src/orca/orca_console_prefs.py:339
+#: ../src/orca/orca_console_prefs.py:358
+#: ../src/orca/orca_console_prefs.py:385
+#: ../src/orca/orca_console_prefs.py:402
+#: ../src/orca/orca_console_prefs.py:419
+#: ../src/orca/orca_console_prefs.py:436
+#: ../src/orca/orca_console_prefs.py:454
+#: ../src/orca/orca_console_prefs.py:544
+#: ../src/orca/orca_console_prefs.py:563
+#: ../src/orca/orca_console_prefs.py:581
+#: ../src/orca/orca_console_prefs.py:624
+#| msgid "Enable Braille?  Enter y or n: "
+msgid "Please enter y or n."
+msgstr "HÃ£y nháºp chá»¯ Â« y Â» (cÃ³) hay Â« n Â» (khÃ´ng)."
+
+#. Translators: if key echo is enabled, Orca will speak the
+#. name of a key as the user types on the keyboard.  If the
+#. user wants key echo, they will then be prompted for which
+#. classes of keys they want echoed.
 #.
-#: ../src/orca/orca_console_prefs.py:306
+#: ../src/orca/orca_console_prefs.py:348
 msgid "Enable key echo?  Enter y or n: "
 msgstr "Báºt pháº£n há»?i phÃm khÃ´ng? Nháºp y (cÃ³) hay n (khÃ´ng): "
 
 #. Translators: this is in reference to key echo for
 #. normal text entry keys.
 #.
-#: ../src/orca/orca_console_prefs.py:318
+#: ../src/orca/orca_console_prefs.py:375
 msgid "Enable alphanumeric and punctuation keys?  Enter y or n: "
 msgstr "Báºt cÃ¡c phÃm abc vÃ  cháº¥m cÃ¢u khÃ´ng? Nháºp y (cÃ³) hay n (khÃ´ng): "
 
 #. Translators: this is in reference to key echo for
 #. CTRL, ALT, Shift, Insert, and "Fn" on laptops.
 #.
-#: ../src/orca/orca_console_prefs.py:328
+#: ../src/orca/orca_console_prefs.py:392
 msgid "Enable modifier keys?  Enter y or n: "
 msgstr "Báºt cÃ¡c phÃm sá»a Ä?á»?i khÃ´ng? Nháºp y (cÃ³) hay n (khÃ´ng): "
 
 #. Translators: this is in reference to key echo for
 #. Caps Lock, Num Lock, Scroll Lock, etc.
 #.
-#: ../src/orca/orca_console_prefs.py:338
+#: ../src/orca/orca_console_prefs.py:409
 msgid "Enable locking keys?  Enter y or n: "
 msgstr "Báºt cÃ¡c phÃm khoÃ¡ khÃ´ng? Nháºp y (cÃ³) hay n (khÃ´ng): "
 
 #. Translators: this is in reference to key echo for
 #. the keys at the top of the keyboard.
 #.
-#: ../src/orca/orca_console_prefs.py:348
+#: ../src/orca/orca_console_prefs.py:426
 msgid "Enable function keys?  Enter y or n: "
 msgstr "Báºt cÃ¡c phÃm chá»©c nÄ?ng khÃ´ng? Nháºp y (cÃ³) hay n (khÃ´ng): "
 
@@ -3332,7 +3666,7 @@ msgstr "Báºt cÃ¡c phÃm chá»©c nÄ?ng khÃ´ng? Nháºp y (cÃ³) hay n (khÃ´ng): "
 #. space, enter, escape, tab, backspace, delete, arrow
 #. keys, page up, page down, etc.
 #.
-#: ../src/orca/orca_console_prefs.py:359
+#: ../src/orca/orca_console_prefs.py:444
 msgid "Enable action keys?  Enter y or n: "
 msgstr "Báºt cÃ¡c phÃm hÃ nh Ä?á»?ng khÃ´ng? Nháºp y (cÃ³) hay n (khÃ´ng): "
 
@@ -3340,7 +3674,7 @@ msgstr "Báºt cÃ¡c phÃm hÃ nh Ä?á»?ng khÃ´ng? Nháºp y (cÃ³) hay n (khÃ´ng): "
 #. has a numeric keypad) and laptop (i.e., small and compact) keyboard
 #. layouts for how they might control Orca.
 #.
-#: ../src/orca/orca_console_prefs.py:378
+#: ../src/orca/orca_console_prefs.py:460
 msgid "Select desired keyboard layout."
 msgstr "Chá»?n bá»? trÃ bÃ n phÃm yÃªu cáº§u."
 
@@ -3348,7 +3682,7 @@ msgstr "Chá»?n bá»? trÃ bÃ n phÃm yÃªu cáº§u."
 #. has a numeric keypad) and laptop (i.e., small and compact) keyboard
 #. layouts for how they might control Orca.
 #.
-#: ../src/orca/orca_console_prefs.py:390
+#: ../src/orca/orca_console_prefs.py:472
 msgid "1. Desktop"
 msgstr "1. MÃ¡y Ä?á»? bÃ n"
 
@@ -3356,69 +3690,66 @@ msgstr "1. MÃ¡y Ä?á»? bÃ n"
 #. has a numeric keypad) and laptop (i.e., small and compact) keyboard
 #. layouts for how they might control Orca.
 #.
-#: ../src/orca/orca_console_prefs.py:397
+#: ../src/orca/orca_console_prefs.py:479
 msgid "2. Laptop"
 msgstr "2. MÃ¡y tÃnh xÃ¡ch tay"
 
-#: ../src/orca/orca_console_prefs.py:414
-msgid "Invalid choice. Selecting desktop keyboard layout.\n"
-msgstr "Lá»±a chá»?n khÃ´ng há»£p lá»?. HÃ£y chá»?n láº¡i bá»? trÃ bÃ n phÃm.\n"
-
-#. Translators: this is prompting for whether the user wants to use a
-#. refreshable braille display (an external hardware device) or not.
+#. Translators: this is prompting for whether the user wants to
+#. use a refreshable braille display (an external hardware
+#. device) or not.
 #.
-#: ../src/orca/orca_console_prefs.py:448
+#: ../src/orca/orca_console_prefs.py:534
 msgid "Enable Braille?  Enter y or n: "
 msgstr "Báºt chá»¯ ná»?i khÃ´ng? Nháºp y (cÃ³) hay n (khÃ´ng): "
 
-#. Translators: the braille monitor is a graphical display on the screen
-#. that is used for debugging and demoing purposes.  It presents what
-#. would be (or is being) shown on the external refreshable braille
-#. display.
+#. Translators: the braille monitor is a graphical display on
+#. the screen that is used for debugging and demoing purposes.
+#. It presents what would be (or is being) shown on the
+#. external refreshable braille display.
 #.
-#: ../src/orca/orca_console_prefs.py:460
+#: ../src/orca/orca_console_prefs.py:553
 msgid "Enable Braille Monitor?  Enter y or n: "
 msgstr "Báºt bá»? trÃ¬nh bÃ y chá»¯ ná»?i khÃ´ng? Nháºp y (cÃ³) hay n (khÃ´ng): "
 
-#. Translators: orca can be set up to automatically start when the
-#. user logs in.
+#. Translators: orca can be set up to automatically start when
+#. the user logs in.
 #.
-#: ../src/orca/orca_console_prefs.py:470
+#: ../src/orca/orca_console_prefs.py:570
 msgid "Automatically start orca when you log in?  Enter y or n: "
 msgstr "Tá»± Ä?á»?ng khá»?i cháº¡y Orca khi báº¡n Ä?Ä?ng nháºp khÃ´ng? GÃµ y hoáº·c n: "
 
-#: ../src/orca/orca_console_prefs.py:480
-#: ../src/orca/orca_gui_prefs.py:456
+#: ../src/orca/orca_console_prefs.py:585
+#: ../src/orca/orca_gui_prefs.py:477
 msgid "Accessibility support for GNOME has just been enabled."
 msgstr "Má»?i hiá»?u lá»±c há»? trá»£ kháº£ nÄ?ng truy cáºp GNOME."
 
-#: ../src/orca/orca_console_prefs.py:486
-#: ../src/orca/orca_gui_prefs.py:458
+#: ../src/orca/orca_console_prefs.py:591
+#: ../src/orca/orca_gui_prefs.py:479
 msgid "You need to log out and log back in for the change to take effect."
 msgstr "Báº¡n cáº§n pháº£i Ä?Ä?ng xuáº¥t rá»?i Ä?Ä?ng nháºp láº¡i Ä?á»? thay Ä?á»?i cÃ³ tÃ¡c Ä?á»?ng."
 
-#: ../src/orca/orca_console_prefs.py:494
+#: ../src/orca/orca_console_prefs.py:601
 msgid "Do you want to logout now?  Enter y or n: "
 msgstr "Báº¡n cÃ³ muá»?n Ä?Ä?ng xuáº¥t khÃ´ng? Nháºp y hoáº·c n: "
 
-#: ../src/orca/orca_console_prefs.py:500
+#: ../src/orca/orca_console_prefs.py:608
 msgid "Setup complete. Logging out now."
 msgstr "Thiáº¿t láºp hoÃ n táº¥t. Ä?ang Ä?Ä?ng xuáº¥t."
 
-#: ../src/orca/orca_console_prefs.py:514
+#: ../src/orca/orca_console_prefs.py:626
 msgid "Setup complete.  Press Return to continue."
 msgstr "Thiáº¿t láºp xong. HÃ£y báº¥m phÃm Return Ä?á»? tiáº¿p tá»¥c."
 
-#: ../src/orca/orca-find.glade.h:1
+#: ../src/orca/orca-find.ui.h:1
 msgid "<b>Start from:</b>"
 msgstr "<b>Báº¯t Ä?áº§u tá»«:</b>"
 
-#: ../src/orca/orca-find.glade.h:2
+#: ../src/orca/orca-find.ui.h:2
 #: ../src/orca/orca_gui_find.py:147
 msgid "C_urrent location"
 msgstr "Vá»? trÃ _hiá»?n táº¡i"
 
-#: ../src/orca/orca-find.glade.h:3
+#: ../src/orca/orca-find.ui.h:3
 msgid "Close"
 msgstr "Ä?Ã³ng"
 
@@ -3432,79 +3763,139 @@ msgstr "Ä?Ã³ng"
 #. is using.  We hate keying off stuff like this, but we're forced
 #. to do so in this case.
 #.
-#: ../src/orca/orca-find.glade.h:4
-#: ../src/orca/scripts/apps/gedit/script.py:318
+#: ../src/orca/orca-find.ui.h:4
 #: ../src/orca/scripts/apps/gedit/script.py:320
+#: ../src/orca/scripts/apps/gedit/script.py:322
 #: ../src/orca/scripts/apps/gnome-search-tool.py:165
 msgid "Find"
 msgstr "TÃ¬m"
 
-#: ../src/orca/orca-find.glade.h:5
+#: ../src/orca/orca-find.ui.h:5
 msgid "Match _entire word only"
 msgstr "TÃ¬m _nguyÃªn tá»«"
 
-#: ../src/orca/orca-find.glade.h:6
+#: ../src/orca/orca-find.ui.h:6
 msgid "Orca Find Dialog"
 msgstr "Há»?p thoáº¡i TÃ¬m"
 
-#: ../src/orca/orca-find.glade.h:7
+#: ../src/orca/orca-find.ui.h:7
 msgid "Search _backwards"
 msgstr "TÃ¬m _ngÆ°á»£c"
 
-#: ../src/orca/orca-find.glade.h:8
+#: ../src/orca/orca-find.ui.h:8
 msgid "Search for:"
 msgstr "TÃ¬m:"
 
-#: ../src/orca/orca-find.glade.h:9
+#: ../src/orca/orca-find.ui.h:9
 msgid "Start from:"
 msgstr "Báº¯t Ä?áº§u tá»«:"
 
-#: ../src/orca/orca-find.glade.h:10
+#: ../src/orca/orca-find.ui.h:10
 msgid "Top of window"
 msgstr "Ä?á»?nh cá»a sá»?"
 
-#: ../src/orca/orca-find.glade.h:11
+#: ../src/orca/orca-find.ui.h:11
 msgid "_Match case"
 msgstr "_PhÃ¢n biá»?t hoa/thÆ°á»?ng"
 
-#: ../src/orca/orca-find.glade.h:12
+#: ../src/orca/orca-find.ui.h:12
 msgid "_Search for:"
 msgstr "_TÃ¬m:"
 
-#: ../src/orca/orca-find.glade.h:13
+#: ../src/orca/orca-find.ui.h:13
 msgid "_Top of window"
 msgstr "Ä?á»?_nh cá»a sá»?"
 
-#: ../src/orca/orca-find.glade.h:14
+#: ../src/orca/orca-find.ui.h:14
 msgid "_Wrap around"
 msgstr "_Cuá»?n láº¡i"
 
+#. Translators: This is used in the Orca About dialog.
+#.
+#: ../src/orca/orca_gui_main.py:95
+msgid "The Orca Team"
+msgstr "NhÃ³m Orca"
+
+#. Translators: This text is used in the Orca About dialog.
+#.
+#: ../src/orca/orca_gui_main.py:98
+msgid "A free, open source scriptable screen reader, which provides access to applications and toolkits that support AT-SPI (e.g., the GNOME desktop)."
+msgstr "Má»?t trÃ¬nh Ä?á»?c mÃ n hÃ¬nh cÃ³ thá»? Ä?Æ°á»£c vÄ?n lá»?nh Ä?iá»?u khiá»?n (pháº§n má»?m nguá»?n má»? vÃ  sá» dá»¥ng tá»± do) mÃ  cung cáº¥p truy cáºp Ä?áº¿n cÃ¡c á»©ng dá»¥ng vÃ  bá»? cÃ´ng cá»¥ cÅ©ng há»? trá»£ AT-SPI (v.d. mÃ´i trÆ°á»?ng GNOME)."
+
+#. Translators: This text is used in the Orca About dialog.
+#.
+#: ../src/orca/orca_gui_main.py:103
+msgid ""
+"Copyright (c) 2005-2010 Sun Microsystems Inc. \n"
+"Copyright (c) 2005-2008 Google Inc. \n"
+"Copyright (c) 2008, 2009 Eitan Isaacson \n"
+"Copyright (c) 2006-2009 Brailcom, o.p.s. \n"
+"Copyright (c) 2001, 2002 BAUM Retec, A.G."
+msgstr ""
+"TÃ¡c quyá»?n Â© nÄ?m 2005-2010 cá»§a Sun Microsystems Inc. \n"
+"TÃ¡c quyá»?n Â© nÄ?m 2005-2008 cá»§a Google Inc. \n"
+"TÃ¡c quyá»?n Â© nÄ?m 2008, 2009 cá»§a Eitan Isaacson \n"
+"TÃ¡c quyá»?n Â© nÄ?m 2006-2009 cá»§a Brailcom, o.p.s. \n"
+"TÃ¡c quyá»?n Â© nÄ?m 2001, 2002 cá»§a BAUM Retec, A.G."
+
+#. Translators: This text is used in the Orca About dialog. Please
+#. translate it to contain your name. And thank you for your work!
+#.
+#: ../src/orca/orca_gui_main.py:111
+msgid "translator-credits"
+msgstr "Clytie Siddall (clytie riverland net au)"
+
+#. Translators: This text is used in the Orca About dialog. Orca is
+#. licensed under GPL2+.
+#.
+#: ../src/orca/orca_gui_main.py:116
+msgid ""
+"Orca is free software; you can redistribute it and/or\n"
+"modify it under the terms of the GNU Library General\n"
+"Public License as published by the Free Software Foundation;\n"
+"either version 2 of the License, or (at your option) any\n"
+"later version.\n"
+"\n"
+"Orca is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See\n"
+"the GNU Library General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU Library General\n"
+"Public License along with Orca; if not, write to the\n"
+"Free Software Foundation, Inc., Franklin Street, Fifth Floor,\n"
+"Boston MA  02110-1301 USA."
+msgstr ""
+"ChÆ°Æ¡ng trÃ¬nh nÃ y lÃ  pháº§n má»?m tá»± do; báº¡n cÃ³ thá»? phÃ¡t hÃ nh láº¡i nÃ³\n"
+"vÃ /hoáº·c sá»a Ä?á»?i nÃ³ vá»?i Ä?iá»?u kiá»?n cá»§a Giáº¥y PhÃ©p CÃ´ng Cá»?ng ThÆ° Viá»?n GNU\n"
+"nhÆ° Ä?Æ°á»£c xuáº¥t báº£n bá»?i Tá»? Chá»©c Pháº§n Má»?m Tá»± Do; hoáº·c phiÃªn báº£n 2\n"
+"cá»§a Giáº¥y PhÃ©p nÃ y, hoáº·c (tÃ¹y chá»?n) báº¥t ká»³ phiÃªn báº£n sau nÃ o.\n"
+"\n"
+"ChÆ°Æ¡ng trÃ¬nh nÃ y Ä?Æ°á»£c phÃ¡t hÃ nh vÃ¬ mong muá»?n nÃ³ cÃ³ Ãch,\n"
+"nhÆ°ng KHÃ?NG CÃ? Báº¢O HÃ?NH GÃ? Cáº¢, THáº¬M CHÃ? KHÃ?NG CÃ?\n"
+"Báº¢O Ä?áº¢M Ä?Æ¯á»¢C NGá»¤ Ã? KHáº¢ NÄ?NG BÃ?N HAY KHáº¢ NÄ?NG\n"
+"LÃ?M Ä?Æ¯á»¢C VIá»?C Dá»¨T KHOÃ?T.\n"
+"Xem Giáº¥y PhÃ©p CÃ´ng Cá»?ng ThÆ° Viá»?n GNU Ä?á»? biáº¿t thÃªm chi tiáº¿t.\n"
+"\n"
+"Báº¡n Ä?Ã£ nháºn má»?t báº£n sao cá»§a Giáº¥y PhÃ©p CÃ´ng Cá»?ng ThÆ° Viá»?n GNU\n"
+"cÃ¹ng vá»?i chÆ°Æ¡ng trÃ¬nh nÃ y; náº¿u khÃ´ng, hÃ£y viáº¿t thÆ°\n"
+"cho Tá»? Chá»©c Pháº§n Má»?m Tá»± Do :\n"
+"Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor,\n"
+"Boston, MA  02110-1301, USA (Má»¹)."
+
 #. Translators: this is an algorithm for tracking an object
 #. of interest (mouse pointer, caret, or widget) with the
 #. magnifier.  Centered means that Orca attempts to keep
 #. the object of interest in the center of the magnified window.
 #.
-#: ../src/orca/orca_gui_prefs.py:75
+#: ../src/orca/orca_gui_prefs.py:83
+#: ../src/orca/orca_gui_prefs.py:1926
+#: ../src/orca/orca_gui_prefs.py:1946
+#: ../src/orca/orca-setup.ui.h:42
 msgid "Centered"
 msgstr "Giá»¯a láº¡i"
 
-#. Translators: there is no special algorithm used for tracking an
-#. object of interest (mouse pointer, caret, or widget) with the
-#. magnifier.
-#.
-#. Translators: this is an algorithm for tracking the mouse
-#. with the magnifier.  None means that Orca does nothing to
-#. track the mouse.
-#.
-#: ../src/orca/orca_gui_prefs.py:81
-#: ../src/orca/orca_gui_prefs.py:4240
-#: ../src/orca/orca_gui_prefs.py:4269
-#: ../src/orca/orca_gui_prefs.py:4442
-#: ../src/orca/orca_gui_prefs.py:4509
-#: ../src/orca/orca_gui_prefs.py:4532
-msgid "None"
-msgstr "KhÃ´ng cÃ³"
-
 #. Translators: this is an algorithm for tracking the mouse
 #. with the magnifier.  Proportional means that Orca attempts
 #. to position the mouse in the magnifier window in a way
@@ -3513,7 +3904,9 @@ msgstr "KhÃ´ng cÃ³"
 #. the desktop, Orca positions the mouse 25% from the left edge
 #. of the magnified region.
 #.
-#: ../src/orca/orca_gui_prefs.py:91
+#: ../src/orca/orca_gui_prefs.py:99
+#: ../src/orca/orca_gui_prefs.py:1926
+#: ../src/orca/orca-setup.ui.h:113
 msgid "Proportional"
 msgstr "Tá»· lá»?"
 
@@ -3522,7 +3915,10 @@ msgstr "Tá»· lá»?"
 #. magnifier.  Push means that Orca will move the magnified
 #. region just enough to display the object of interest.
 #.
-#: ../src/orca/orca_gui_prefs.py:98
+#: ../src/orca/orca_gui_prefs.py:106
+#: ../src/orca/orca_gui_prefs.py:1926
+#: ../src/orca/orca_gui_prefs.py:1946
+#: ../src/orca/orca-setup.ui.h:114
 msgid "Push"
 msgstr "Ä?áº©y"
 
@@ -3533,7 +3929,7 @@ msgstr "Ä?áº©y"
 #. what action Orca will take when the user invokes an Orca-specific
 #. keyboard command.
 #.
-#: ../src/orca/orca_gui_prefs.py:199
+#: ../src/orca/orca_gui_prefs.py:231
 msgid "Function"
 msgstr "HÃ m"
 
@@ -3541,7 +3937,7 @@ msgstr "HÃ m"
 #. the cells in the column represent keyboard combinations
 #. the user can press to invoke Orca commands.
 #.
-#: ../src/orca/orca_gui_prefs.py:277
+#: ../src/orca/orca_gui_prefs.py:309
 msgid "Key Binding"
 msgstr "Tá»? há»£p phÃm"
 
@@ -3552,7 +3948,7 @@ msgstr "Tá»? há»£p phÃm"
 #. addition to the key bindings in the "Key Bindings"
 #. column.
 #.
-#: ../src/orca/orca_gui_prefs.py:356
+#: ../src/orca/orca_gui_prefs.py:388
 msgid "Alternate"
 msgstr "Thay tháº¿"
 
@@ -3560,31 +3956,36 @@ msgstr "Thay tháº¿"
 #. cells represent whether a key binding has been modified
 #. from the default key binding.
 #.
-#: ../src/orca/orca_gui_prefs.py:376
+#: ../src/orca/orca_gui_prefs.py:408
 msgid "Modified"
 msgstr "Ä?iá»?u chá»?nh"
 
-#. Translators: this refers to the speech synthesis voice that Orca
-#. will use most of the time.
+#. Translators: This refers to the default/typical voice used
+#. by Orca when presenting the content of the screen and other
+#. messages.
 #.
-#: ../src/orca/orca_gui_prefs.py:429
-#: ../src/orca/orca_gui_prefs.py:478
+#: ../src/orca/orca_gui_prefs.py:727
+#| msgid "Default"
+msgctxt "VoiceType"
 msgid "Default"
 msgstr "Máº·c Ä?á»?nh"
 
-#. Translators: this refers to the speech synthesis voice that Orca
-#. will use to speak capitalized words and letters.
+#. Translators: This refers to the voice used by Orca when
+#. presenting one or more characters which is in uppercase.
 #.
-#: ../src/orca/orca_gui_prefs.py:435
-#: ../src/orca/orca_gui_prefs.py:484
+#: ../src/orca/orca_gui_prefs.py:731
+#| msgid "Uppercase"
+msgctxt "VoiceType"
 msgid "Uppercase"
 msgstr "Chá»¯ hoa"
 
-#. Translators: this refers to the speech synthesis voice that Orca
-#. will use to speak text associated with hyperlinks in HTML content.
+#. Translators: This refers to the voice used by Orca when
+#. presenting one or more characters which is part of a
+#. hyperlink.
 #.
-#: ../src/orca/orca_gui_prefs.py:441
-#: ../src/orca/orca_gui_prefs.py:494
+#: ../src/orca/orca_gui_prefs.py:736
+#| msgid "Hyperlink"
+msgctxt "VoiceType"
 msgid "Hyperlink"
 msgstr "SiÃªu liÃªn káº¿t"
 
@@ -3593,7 +3994,7 @@ msgstr "SiÃªu liÃªn káº¿t"
 #. Translators: Attribute here refers to text attributes such
 #. as bold, underline, family-name, etc.
 #.
-#: ../src/orca/orca_gui_prefs.py:1127
+#: ../src/orca/orca_gui_prefs.py:1168
 msgid "Attribute Name"
 msgstr "TÃªn thuá»?c tÃnh"
 
@@ -3604,7 +4005,7 @@ msgstr "TÃªn thuá»?c tÃnh"
 #. will speak that attribute, if it is present, when the user
 #. presses Orca_Modifier+F.
 #.
-#: ../src/orca/orca_gui_prefs.py:1142
+#: ../src/orca/orca_gui_prefs.py:1183
 msgid "Speak"
 msgstr "NÃ³i"
 
@@ -3615,7 +4016,7 @@ msgstr "NÃ³i"
 #. Orca will "underline" that attribute, if it is present, on
 #. the refreshable braille display.
 #.
-#: ../src/orca/orca_gui_prefs.py:1160
+#: ../src/orca/orca_gui_prefs.py:1201
 msgid "Mark in braille"
 msgstr "Ä?Ã¡nh dáº¥u báº±ng chá»¯ ná»?i"
 
@@ -3634,7 +4035,7 @@ msgstr "Ä?Ã¡nh dáº¥u báº±ng chá»¯ ná»?i"
 #. value of underline is none (i.e. when it's not underlined).
 #. "Present" here is being used as a verb.
 #.
-#: ../src/orca/orca_gui_prefs.py:1186
+#: ../src/orca/orca_gui_prefs.py:1227
 msgid "Present Unless"
 msgstr "CÃ³ pháº£i trá»« khi"
 
@@ -3645,7 +4046,7 @@ msgstr "CÃ³ pháº£i trá»« khi"
 #. or a particular word that is pronounced differently then the way
 #. that it looks.
 #.
-#: ../src/orca/orca_gui_prefs.py:1301
+#: ../src/orca/orca_gui_prefs.py:1341
 msgid "Actual String"
 msgstr "Chuá»?i tháºt"
 
@@ -3656,15 +4057,108 @@ msgstr "Chuá»?i tháºt"
 #. For example: if the actual string was "MHz", then the replacement
 #. (spoken) string would be "megahertz".
 #.
-#: ../src/orca/orca_gui_prefs.py:1318
+#: ../src/orca/orca_gui_prefs.py:1358
 msgid "Replacement String"
 msgstr "Chuá»?i thay tháº¿"
 
+#. Translators: different speech systems and speech engines work
+#. differently when it comes to handling pauses (e.g., sentence
+#. boundaries). This property allows the user to specify whether
+#. speech should be sent to the speech synthesis system immediately
+#. when a pause directive is enountered or if it should be queued
+#. up and sent to the speech synthesis system once the entire set
+#. of utterances has been calculated.
+#.
+#. Translators: different speech systems and speech engines work differently when it comes to handling pauses (e.g., sentence boundaries).  This property allows the user to specify whether speech should be sent to the speech synthesis system immediately when a pause directive is enountered or if it should be queued up and sent to the speech synthesis system once the entire set of utterances has been calculated.
+#: ../src/orca/orca_gui_prefs.py:1544
+#: ../src/orca/orca-setup.ui.h:39
+msgid "Break speech into ch_unks between pauses"
+msgstr "Chia ra tá»«ng Ä?_oáº¡n tiáº¿ng nÃ³i giá»¯a hai láº§n táº¡m dá»«ng"
+
+#. Translators: If this setting is chosen and the user is reading
+#. over an entire document, Orca will pause at the end of each
+#. line.
+#.
+#: ../src/orca/orca_gui_prefs.py:1556
+#: ../src/orca/orca_gui_prefs.py:3048
+#: ../src/orca/orca-setup.ui.h:91
+msgid "Line"
+msgstr "DÃ²ng"
+
+#. Translators: If this setting is chosen and the user is reading
+#. over an entire document, Orca will pause at the end of each
+#. sentence.
+#.
+#: ../src/orca/orca_gui_prefs.py:1556
+#: ../src/orca/orca_gui_prefs.py:3054
+#: ../src/orca/orca-setup.ui.h:122
+msgid "Sentence"
+msgstr "CÃ¢u"
+
+#. Translators: Orca has a setting which determines which progress
+#. bar updates should be announced. Choosing "All" means that Orca
+#. will present progress bar updates regardless of what application
+#. and window they happen to be in.
+#.
+#: ../src/orca/orca_gui_prefs.py:1576
+#: ../src/orca/orca_gui_prefs.py:3013
+#| msgid "_All"
+msgctxt "ProgressBar"
+msgid "All"
+msgstr "Táº¥t cáº£"
+
+#. Translators: Orca has a setting which determines which progress
+#. bar updates should be announced. Choosing "Application" means
+#. that Orca will present progress bar updates as long as the
+#. progress bar is in the active application (but not necessarily
+#. in the current window).
+#.
+#: ../src/orca/orca_gui_prefs.py:1583
+#| msgid "Application"
+msgctxt "ProgressBar"
+msgid "Application"
+msgstr "á»¨ng dá»¥ng"
+
+#. Translators: Orca has a setting which determines which progress
+#. bar updates should be announced. Choosing "Window" means that
+#. Orca will present progress bar updates as long as the progress
+#. bar is in the active window.
+#.
+#: ../src/orca/orca_gui_prefs.py:1589
+#: ../src/orca/orca_gui_prefs.py:3021
+#| msgid "Window"
+msgctxt "ProgressBar"
+msgid "Window"
+msgstr "Cá»a sá»?"
+
+#. Translators: When this option is enabled, dead keys will be
+#. announced when pressed.
+#.
+#. Translators: When this option is enabled, dead keys will be announced when pressed.
+#: ../src/orca/orca_gui_prefs.py:1696
+#: ../src/orca/orca-setup.ui.h:78
+#| msgid "Enable _navigation keys"
+msgid "Enable non-spacing _diacritical keys"
+msgstr "Báºt phÃm chá»? thÃªm _dáº¥u phá»¥"
+
+#. TODO - JD: I did the above because GtkBuilder translator notes
+#. (which we have for the above string) are not getting sucked in
+#. to orca.pot. :-(
+#. Translators: When this option is enabled, inserted text of length
+#. 1 is spoken.
+#.
+#. Translators: When this option is enabled, inserted text of length 1 is spoken.
+#: ../src/orca/orca_gui_prefs.py:1704
+#: ../src/orca/orca-setup.ui.h:75
+#| msgid "Enable echo by _word"
+msgid "Enable echo by cha_racter"
+msgstr "Báºt pháº£n há»?i theo _kÃ½ tá»±"
+
 #. Translators: Orca keybindings support double
 #. and triple "clicks" or key presses, similar to
 #. using a mouse.
 #.
-#: ../src/orca/orca_gui_prefs.py:2076
+#: ../src/orca/orca_gui_prefs.py:2216
 msgid "(double click)"
 msgstr "(nháº¥n Ä?Ãºp)"
 
@@ -3672,7 +4166,7 @@ msgstr "(nháº¥n Ä?Ãºp)"
 #. and triple "clicks" or key presses, similar to
 #. using a mouse.
 #.
-#: ../src/orca/orca_gui_prefs.py:2082
+#: ../src/orca/orca_gui_prefs.py:2222
 msgid "(triple click)"
 msgstr "(nháº¥n ba láº§n)"
 
@@ -3681,8 +4175,8 @@ msgstr "(nháº¥n ba láº§n)"
 #. The braille bindings are what determine the actions Orca will
 #. take when the user presses these buttons.
 #.
-#: ../src/orca/orca_gui_prefs.py:2186
-#: ../src/orca/orca_gui_prefs.py:2284
+#: ../src/orca/orca_gui_prefs.py:2326
+#: ../src/orca/orca_gui_prefs.py:2424
 msgid "Braille Bindings"
 msgstr "Tá»? há»£p chá»¯ ná»?i"
 
@@ -3691,10 +4185,10 @@ msgstr "Tá»? há»£p chá»¯ ná»?i"
 #. chooses this setting, the dot in the bottom left
 #. corner will be used to 'underline' text of interest.
 #.
-#: ../src/orca/orca_gui_prefs.py:2671
-#: ../src/orca/orca_gui_prefs.py:2712
-#: ../src/orca/orca_gui_prefs.py:2752
-#: ../src/orca/orca-setup.glade.h:52
+#: ../src/orca/orca_gui_prefs.py:2858
+#: ../src/orca/orca_gui_prefs.py:2899
+#: ../src/orca/orca_gui_prefs.py:2939
+#: ../src/orca/orca-setup.ui.h:54
 msgid "Dot _7"
 msgstr "Cháº¥m _7"
 
@@ -3702,10 +4196,10 @@ msgstr "Cháº¥m _7"
 #. dot in the bottom right corner of the braille cell
 #. will be used to 'underline' text of interest.
 #.
-#: ../src/orca/orca_gui_prefs.py:2678
-#: ../src/orca/orca_gui_prefs.py:2719
-#: ../src/orca/orca_gui_prefs.py:2759
-#: ../src/orca/orca-setup.glade.h:53
+#: ../src/orca/orca_gui_prefs.py:2865
+#: ../src/orca/orca_gui_prefs.py:2906
+#: ../src/orca/orca_gui_prefs.py:2946
+#: ../src/orca/orca-setup.ui.h:55
 msgid "Dot _8"
 msgstr "Cháº¥m _8"
 
@@ -3713,18 +4207,18 @@ msgstr "Cháº¥m _8"
 #. two dots at the bottom of the braille cell will be
 #. used to 'underline' text of interest.
 #.
-#: ../src/orca/orca_gui_prefs.py:2685
-#: ../src/orca/orca_gui_prefs.py:2726
-#: ../src/orca/orca_gui_prefs.py:2766
-#: ../src/orca/orca-setup.glade.h:54
+#: ../src/orca/orca_gui_prefs.py:2872
+#: ../src/orca/orca_gui_prefs.py:2913
+#: ../src/orca/orca_gui_prefs.py:2953
+#: ../src/orca/orca-setup.ui.h:56
 msgid "Dots 7 an_d 8"
 msgstr "Cháº¥m 7 _vÃ  8"
 
 #. Translators: If this setting is chosen, no punctuation
 #. symbols will be spoken as a user reads a document.
 #.
-#: ../src/orca/orca_gui_prefs.py:2789
-#: ../src/orca/orca-setup.glade.h:165
+#: ../src/orca/orca_gui_prefs.py:2976
+#: ../src/orca/orca-setup.ui.h:161
 msgid "_None"
 msgstr "KhÃ´_ng cÃ³"
 
@@ -3733,8 +4227,8 @@ msgstr "KhÃ´_ng cÃ³"
 #. spoken as a user reads a document, but less common symbols
 #. (such as #, @, $) will.
 #.
-#: ../src/orca/orca_gui_prefs.py:2797
-#: ../src/orca/orca-setup.glade.h:126
+#: ../src/orca/orca_gui_prefs.py:2984
+#: ../src/orca/orca-setup.ui.h:124
 msgid "So_me"
 msgstr "Má»?t _sá»?"
 
@@ -3742,34 +4236,18 @@ msgstr "Má»?t _sá»?"
 #. punctuation symbols will be spoken as a user reads a
 #. document.
 #.
-#: ../src/orca/orca_gui_prefs.py:2804
-#: ../src/orca/orca-setup.glade.h:88
+#: ../src/orca/orca_gui_prefs.py:2991
+#: ../src/orca/orca-setup.ui.h:92
 msgid "M_ost"
 msgstr "Pháº§n _lá»?n"
 
-#. Translators: If this setting is chosen and the user is reading
-#. over an entire document, Orca will pause at the end of each
-#. line.
-#.
-#: ../src/orca/orca_gui_prefs.py:2825
-msgid "Line"
-msgstr "DÃ²ng"
-
-#. Translators: If this setting is chosen and the user is reading
-#. over an entire document, Orca will pause at the end of each
-#. sentence.
-#.
-#: ../src/orca/orca_gui_prefs.py:2831
-msgid "Sentence"
-msgstr "CÃ¢u"
-
 #. Translators: This refers to the amount of information
 #. Orca provides about a particular object that receives
 #. focus.
 #.
-#: ../src/orca/orca_gui_prefs.py:2851
-#: ../src/orca/orca_gui_prefs.py:2981
-#: ../src/orca/orca-setup.glade.h:31
+#: ../src/orca/orca_gui_prefs.py:3074
+#: ../src/orca/orca_gui_prefs.py:3205
+#: ../src/orca/orca-setup.ui.h:40
 msgid "Brie_f"
 msgstr "_Ngáº¯n"
 
@@ -3777,8 +4255,7 @@ msgstr "_Ngáº¯n"
 #. sometimes want the entire row of a table read, or
 #. they just want the current cell to be presented to them.
 #.
-#: ../src/orca/orca_gui_prefs.py:2875
-#: ../src/orca/orca-setup.glade.h:131
+#: ../src/orca/orca_gui_prefs.py:3098
 msgid "Speak current _cell"
 msgstr "NÃ³i Ã´ hiá»?n _cÃ³"
 
@@ -3786,7 +4263,7 @@ msgstr "NÃ³i Ã´ hiá»?n _cÃ³"
 #. a new key combination (e.g., Alt+Ctrl+g) to create a new
 #. key bindings.
 #.
-#: ../src/orca/orca_gui_prefs.py:3628
+#: ../src/orca/orca_gui_prefs.py:3852
 msgid "enter new key"
 msgstr "nháºp phÃm má»?i"
 
@@ -3794,7 +4271,7 @@ msgstr "nháºp phÃm má»?i"
 #. Orca has deleted an existing key combination based upon
 #. their input.
 #.
-#: ../src/orca/orca_gui_prefs.py:3657
+#: ../src/orca/orca_gui_prefs.py:3881
 msgid "Key binding deleted. Press enter to confirm."
 msgstr "Tá»? há»£p phÃm bá»? xoÃ¡. Nháº¥n phÃm Enter Ä?á»? xÃ¡c nháºn."
 
@@ -3802,7 +4279,7 @@ msgstr "Tá»? há»£p phÃm bá»? xoÃ¡. Nháº¥n phÃm Enter Ä?á»? xÃ¡c nháºn."
 #. that the key combination (e.g., Ctrl+Alt+f) they just
 #. entered has already been bound to another command.
 #.
-#: ../src/orca/orca_gui_prefs.py:3681
+#: ../src/orca/orca_gui_prefs.py:3905
 #, python-format
 msgid "The key entered is already bound to %s"
 msgstr "Báº¡n Ä?Ã£ nháºp má»?t phÃm Ä?Ã£ Ä?Ã³ng káº¿t vá»?i %s"
@@ -3811,7 +4288,7 @@ msgstr "Báº¡n Ä?Ã£ nháºp má»?t phÃm Ä?Ã£ Ä?Ã³ng káº¿t vá»?i %s"
 #. know Orca has recorded a new key combination (e.g., Alt+Ctrl+g)
 #. based upon their input.
 #.
-#: ../src/orca/orca_gui_prefs.py:3688
+#: ../src/orca/orca_gui_prefs.py:3912
 #, python-format
 msgid "Key captured: %s. Press enter to confirm."
 msgstr "Ä?Ã£ báº¯t phÃm: %s. Nháº¥n enter Ä?á»? xÃ¡c nháºn."
@@ -3820,7 +4297,7 @@ msgstr "Ä?Ã£ báº¯t phÃm: %s. Nháº¥n enter Ä?á»? xÃ¡c nháºn."
 #. combination (e.g., Ctrl+Alt+f) the user just typed when
 #. creating a new key binding.
 #.
-#: ../src/orca/orca_gui_prefs.py:3727
+#: ../src/orca/orca_gui_prefs.py:3951
 #, python-format
 msgid "The new key is: %s"
 msgstr "PhÃm má»?i lÃ : %s"
@@ -3829,122 +4306,33 @@ msgstr "PhÃm má»?i lÃ : %s"
 #. existing key combination (e.g., Ctrl+Alt+f) that was
 #. associated with a command has been deleted.
 #.
-#: ../src/orca/orca_gui_prefs.py:3735
+#: ../src/orca/orca_gui_prefs.py:3959
 msgid "The keybinding has been removed."
 msgstr "Tá»? há»£p phÃm Ä?Ã£ bá»? xoÃ¡."
 
 #. Translators: this refers to the keyboard layout (desktop
 #. or laptop).
 #.
-#: ../src/orca/orca_gui_prefs.py:3813
-#: ../src/orca/orca-setup.glade.h:158
+#: ../src/orca/orca_gui_prefs.py:4037
+#: ../src/orca/orca-setup.ui.h:155
 msgid "_Desktop"
 msgstr "_MÃ¡y Ä?á»? bÃ n"
 
-#. Translators: this is an algorithm for magnifying pixels
-#. on the screen.
-#.
-#: ../src/orca/orca_gui_prefs.py:4234
-#: ../src/orca/orca_gui_prefs.py:4245
-#: ../src/orca/orca_gui_prefs.py:4267
-msgid "Bilinear"
-msgstr "Tuyáº¿n kÃ©p"
-
-#. Translators: this refers to a color filter for people with
-#. color blindness. It will maximize the red value for all
-#. pixels on the screen. For example, an RGB value of
-#. (75, 100, 125) would be become (255, 100, 125).
-#.
-#: ../src/orca/orca_gui_prefs.py:4450
-#: ../src/orca/orca_gui_prefs.py:4540
-msgid "Saturate red"
-msgstr "MÃ u Ä?á»? tá»?i Ä?a"
-
-#. Translators: this refers to a color filter for people with
-#. color blindness. It will maximize the green value for all
-#. pixels on the screen.  For example, an RGB value of
-#. (75, 100, 125) would become (75, 255, 125).
-#.
-#: ../src/orca/orca_gui_prefs.py:4458
-#: ../src/orca/orca_gui_prefs.py:4548
-msgid "Saturate green"
-msgstr "MÃ u lá»¥c tá»?i Ä?a"
-
-#. Translators: this refers to a color filter for people with
-#. color blindness. It will maximize the blue value for all
-#. pixels on the screen. For example, an RGB value of
-#. (75, 100, 125) would become (75, 100, 255).
-#.
-#: ../src/orca/orca_gui_prefs.py:4466
-#: ../src/orca/orca_gui_prefs.py:4556
-msgid "Saturate blue"
-msgstr "MÃ u xanh tá»?i Ä?a"
-
-#. Translators: this refers to a color filter for people with
-#. color blindness. It will eliminate the red value for all
-#. pixels on the screen. For example, an RGB value of
-#. (75, 100, 125) would be become (0, 100, 125).
-#.
-#: ../src/orca/orca_gui_prefs.py:4474
-#: ../src/orca/orca_gui_prefs.py:4564
-msgid "Desaturate red"
-msgstr "MÃ u Ä?á»? tá»?i thiá»?u"
-
-#. Translators: this refers to a color filter for people with
-#. color blindness. It will eliminate the green value for all
-#. pixels on the screen. For example, an RGB value of
-#. (75, 100, 125) would become (75, 0, 125).
-#.
-#: ../src/orca/orca_gui_prefs.py:4482
-#: ../src/orca/orca_gui_prefs.py:4572
-msgid "Desaturate green"
-msgstr "MÃ u lá»¥c tá»?i thiá»?u"
-
-#. Translators: this refers to a color filter for people with
-#. color blindness. It will eliminate the blue value for all
-#. pixels on the screen. For example, an RGB value of
-#. (75, 100, 125) would become (75, 100, 0).
-#.
-#: ../src/orca/orca_gui_prefs.py:4490
-#: ../src/orca/orca_gui_prefs.py:4580
-msgid "Desaturate blue"
-msgstr "MÃ u xanh tá»?i thiá»?u"
-
-#. Translators: this refers to a color filter for people with
-#. color blindness. It shifts RGB values to the right. For
-#. example, an RGB value of (75, 100, 125) would become
-#. (125, 75, 100).
-#.
-#: ../src/orca/orca_gui_prefs.py:4498
-#: ../src/orca/orca_gui_prefs.py:4588
-msgid "Positive hue shift"
-msgstr "Dá»?i sáº¯c mÃ u vá»? dÆ°Æ¡ng"
-
-#. Translators: this refers to a color filter for people with
-#. color blindness. It shifts RGB values to the left. For
-#. example, an RGB value of (75, 100, 125) would become
-#. (100, 125, 75).
-#.
-#: ../src/orca/orca_gui_prefs.py:4506
-#: ../src/orca/orca_gui_prefs.py:4596
-msgid "Negative hue shift"
-msgstr "Dá»?i sáº¯c mÃ u vá»? Ã¢m"
-
 #. Translators: Orca Preferences is the configuration GUI for Orca.
 #.
-#: ../src/orca/orca_gui_prefs.py:4833
+#: ../src/orca/orca_gui_prefs.py:5096
 msgid "Starting Orca Preferences."
 msgstr "Ä?ang khá»?i cháº¡y TÃ¹y thÃch Orca."
 
-#: ../src/orca/orca-mainwin.glade.h:1
+#: ../src/orca/orca-mainwin.ui.h:1
 msgid "Orca Screen Reader / Magnifier"
 msgstr "Bá»? Ä?á»?c vÃ  PhÃ³ng To MÃ n HÃ¬nh Orca"
 
 #. Translators: this is what Orca speaks and brailles when it quits.
 #.
-#: ../src/orca/orca.py:281
-#: ../src/orca/orca.py:1268
-#: ../src/orca/orca.py:1269
+#: ../src/orca/orca.py:298
+#: ../src/orca/orca.py:1360
+#: ../src/orca/orca.py:1361
 msgid "Goodbye."
 msgstr "Táº¡m biá»?t nhÃ©."
 
@@ -3957,21 +4345,45 @@ msgstr "Táº¡m biá»?t nhÃ©."
 #. Exiting learn mode puts the user back in normal operating
 #. mode.
 #.
-#: ../src/orca/orca.py:353
+#: ../src/orca/orca.py:370
 msgid "Exiting learn mode."
 msgstr "Ä?ang thoÃ¡t khá»?i cháº¿ Ä?á»? há»?c."
 
+#. Translators: this represents the state of a check box
+#.
+#. Translators: this represents the state of a locking modifier
+#. key (e.g., Caps Lock)
+#.
+#: ../src/orca/orca.py:619
+#: ../src/orca/scripts/apps/soffice/speech_generator.py:172
+#: ../src/orca/speech.py:275
+#: ../src/orca/speechserver.py:218
+msgid "off"
+msgstr "táº¯t"
+
+#. Translators: this represents the state of a check box
+#.
+#. Translators: this represents the state of a locking modifier
+#. key (e.g., Caps Lock)
+#.
+#: ../src/orca/orca.py:623
+#: ../src/orca/scripts/apps/soffice/speech_generator.py:168
+#: ../src/orca/speech.py:270
+#: ../src/orca/speechserver.py:213
+msgid "on"
+msgstr "báºt"
+
 #. Translators: this is a spoken prompt letting the user know
 #. that speech synthesis has been turned back on.
 #.
-#: ../src/orca/orca.py:870
+#: ../src/orca/orca.py:961
 msgid "Speech enabled."
 msgstr "Tiáº¿ng nÃ³i Ä?Ã£ báºt."
 
 #. Translators: this is a spoken prompt letting the user know
 #. that speech synthesis has been temporarily turned off.
 #.
-#: ../src/orca/orca.py:875
+#: ../src/orca/orca.py:966
 msgid "Speech disabled."
 msgstr "Tiáº¿ng nÃ³i bá»? táº¯t."
 
@@ -3979,18 +4391,18 @@ msgstr "Tiáº¿ng nÃ³i bá»? táº¯t."
 #. preferences.  This is a spoken prompt to let the user
 #. know when the preferences has been reloaded.
 #.
-#: ../src/orca/orca.py:938
+#: ../src/orca/orca.py:1033
 msgid "Orca user settings reloaded."
 msgstr "Thiáº¿t láºp ngÆ°á»?i dÃ¹ng Orca Ä?Ã£ Ä?Æ°á»£c táº£i láº¡i."
 
-#: ../src/orca/orca.py:1350
+#: ../src/orca/orca.py:1442
 msgid "Usage: orca [OPTION...]"
 msgstr "Sá» dá»¥ng: orca [TÃ?Y_CHá»?N...]"
 
 #. Translators: this is the description of the command line option
 #. '-?, --help' that is used to display usage information.
 #.
-#: ../src/orca/orca.py:1356
+#: ../src/orca/orca.py:1448
 msgid "Show this help message"
 msgstr "Hiá»?n thá»? trá»£ giÃºp nÃ y"
 
@@ -3998,15 +4410,35 @@ msgstr "Hiá»?n thá»? trá»£ giÃºp nÃ y"
 #. the names of the applications known to the accessibility infrastructure
 #. to stdout and then exits.
 #.
-#: ../src/orca/orca.py:1365
+#: ../src/orca/orca.py:1457
 msgid "Print the known running applications"
 msgstr "In nhá»¯ng á»©ng dá»¥ng Ä?Æ°á»£c biáº¿t lÃ  váº«n cháº¡y"
 
+#. Translators: this enables debug output for Orca.  The
+#. YYYY-MM-DD-HH:MM:SS portion is a shorthand way of saying that
+#. the file name will be formed from the current date and time with
+#. 'debug' in front and '.out' at the end.  The 'debug' and '.out'
+#. portions of this string should not be translated (i.e., it will
+#. always start with 'debug' and end with '.out', regardless of the
+#. locale.).
+#.
+#: ../src/orca/orca.py:1468
+msgid "Send debug output to debug-YYYY-MM-DD-HH:MM:SS.out"
+msgstr "Gá»i káº¿t xuáº¥t gá»¡ lá»?i cho táºp tin debug-NNÄ?M-TG-NG-GI:PH:GY.out"
+
+#. Translators: this enables debug output for Orca and overrides
+#. the name of the debug file Orca will use for debug output if the
+#. --debug option is used.
+#.
+#: ../src/orca/orca.py:1475
+msgid "Send debug output to the specified file"
+msgstr "Gá»i káº¿t xuáº¥t gá»¡ lá»?i cho táºp tin Ä?Æ°a ra"
+
 #. Translators: this is the description of the command line option
 #. '-s, --setup, --gui-setup' that will initially display a GUI dialog
 #. that would allow the user to set their Orca preferences.
 #.
-#: ../src/orca/orca.py:1371
+#: ../src/orca/orca.py:1481
 msgid "Set up user preferences"
 msgstr "Thiáº¿t láºp tÃ¹y thÃch ngÆ°á»?i dÃ¹ng"
 
@@ -4016,7 +4448,7 @@ msgstr "Thiáº¿t láºp tÃ¹y thÃch ngÆ°á»?i dÃ¹ng"
 #. startup. For this to happen properly, Orca will need to be run
 #. from a terminal window.
 #.
-#: ../src/orca/orca.py:1380
+#: ../src/orca/orca.py:1490
 msgid "Set up user preferences (text version)"
 msgstr "Thiáº¿t láºp tÃ¹y thÃch ngÆ°á»?i dÃ¹ng (kiá»?u vÄ?n báº£n)"
 
@@ -4024,7 +4456,7 @@ msgstr "Thiáº¿t láºp tÃ¹y thÃch ngÆ°á»?i dÃ¹ng (kiá»?u vÄ?n báº£n)"
 #. '-n, --no-setup' that means that Orca will startup without setting
 #. up any user preferences.
 #.
-#: ../src/orca/orca.py:1387
+#: ../src/orca/orca.py:1497
 msgid "Skip set up of user preferences"
 msgstr "Bá»? qua viá»?c thiáº¿t láºp tÃ¹y thÃch ngÆ°á»?i dÃ¹ng"
 
@@ -4034,7 +4466,7 @@ msgstr "Bá»? qua viá»?c thiáº¿t láºp tÃ¹y thÃch ngÆ°á»?i dÃ¹ng"
 #. '-u, --user-prefs-dir=dirname' that allows you to specify an alternate
 #. location for those user preferences.
 #.
-#: ../src/orca/orca.py:1396
+#: ../src/orca/orca.py:1506
 msgid "Use alternate directory for user preferences"
 msgstr "DÃ¹ng thÆ° má»¥c xen káº½ cho tÃ¹y thÃch ngÆ°á»?i dÃ¹ng"
 
@@ -4042,7 +4474,7 @@ msgstr "DÃ¹ng thÆ° má»¥c xen káº½ cho tÃ¹y thÃch ngÆ°á»?i dÃ¹ng"
 #. command line option, it will be automatically enabled as Orca is
 #. started.
 #.
-#: ../src/orca/orca.py:1409
+#: ../src/orca/orca.py:1519
 msgid "Force use of option"
 msgstr "Ã?p buá»?c dÃ¹ng tÃ¹y chá»?n"
 
@@ -4050,7 +4482,7 @@ msgstr "Ã?p buá»?c dÃ¹ng tÃ¹y chá»?n"
 #. command line option, it will be automatically disabled as Orca is
 #. started.
 #.
-#: ../src/orca/orca.py:1422
+#: ../src/orca/orca.py:1532
 msgid "Prevent use of option"
 msgstr "NgÄ?n cáº£n dÃ¹ng tÃ¹y chá»?n"
 
@@ -4059,14 +4491,19 @@ msgstr "NgÄ?n cáº£n dÃ¹ng tÃ¹y chá»?n"
 #. If this command line option is specified, the script will quit any
 #. instances of Orca that are already running.
 #.
-#: ../src/orca/orca.py:1430
+#: ../src/orca/orca.py:1540
 msgid "Quits Orca (if shell script used)"
 msgstr "ThoÃ¡t Orca (náº¿u dÃ¹ng vÄ?n lá»?nh trÃ¬nh bao)"
 
-#. Translators: this is text being sent to a terminal and we want to
-#. keep the text lines within terminal boundaries.
+#. Translators: this is the Orca command line option to tell Orca to
+#. replace any existing Orca process(es) that might be running.
 #.
-#: ../src/orca/orca.py:1437
+#: ../src/orca/orca.py:1546
+#| msgid "Replacement String"
+msgid "Replace a currently running Orca"
+msgstr "Thay tháº¿ má»?t tiáº¿n trÃ¬nh Orca Ä?ang cháº¡y"
+
+#: ../src/orca/orca.py:1552
 msgid ""
 "If Orca has not been previously set up by the user, Orca\n"
 "will automatically launch the preferences set up unless\n"
@@ -4077,7 +4514,7 @@ msgstr ""
 "tÃ¹y thÃch, náº¿u tÃ¹y chá»?n Â« -n Â» hay Â« --no-setup Â»\n"
 "khÃ´ng Ä?Æ°á»£c dÃ¹ng."
 
-#: ../src/orca/orca.py:1445
+#: ../src/orca/orca.py:1560
 msgid ""
 "WARNING: suspending Orca, e.g. by pressing Control-Z, from\n"
 "an AT-SPI enabled shell (such as gnome-terminal), can also\n"
@@ -4088,15 +4525,29 @@ msgstr ""
 "nhÆ° gnome-terminal) cÅ©ng cÃ³ thá»? ngÆ°ng toÃ n bá»? mÃ´i trÆ°á»?ng\n"
 "Ä?á»? há»?a Ä?áº¿n khi tiáº¿n trÃ¬nh Orca bá»? Ã©p buá»?c káº¿t thÃºc."
 
-#: ../src/orca/orca.py:1450
+#: ../src/orca/orca.py:1565
 msgid "Report bugs to orca-list gnome org "
 msgstr "HÃ£y thÃ´ng bÃ¡o lá»?i nÃ o cho <orca-list gnome org>."
 
-#: ../src/orca/orca.py:1621
+#: ../src/orca/orca.py:1750
 msgid "Welcome to Orca."
 msgstr "ChÃºc má»«ng báº¡n dÃ¹ng Orca."
 
-#: ../src/orca/orca-quit.glade.h:1
+#: ../src/orca/orca-preferences-warning.ui.h:1
+msgid "Warning"
+msgstr "Cáº£nh bÃ¡o"
+
+#: ../src/orca/orca-preferences-warning.ui.h:2
+msgid ""
+"You already have an instance of an Orca preferences dialog open.\n"
+"\n"
+"Please close it before opening a new one."
+msgstr ""
+"Báº¡n Ä?Ã£ má»? má»?t há»?p thoáº¡i tÃ¹y thÃch Orca.\n"
+"\n"
+"HÃ£y Ä?Ã³ng nÃ³ trÆ°á»?c khi má»? cÃ¡i má»?i."
+
+#: ../src/orca/orca-quit.ui.h:1
 msgid ""
 "<b><big>Quit Orca?</big></b>\n"
 "\n"
@@ -4108,12 +4559,12 @@ msgstr ""
 "Viá»?c nÃ y sáº½ thÃ´i toÃ n bá»? káº¿t xuáº¥t nÃ³i vÃ  sá»± phÃ³ng Ä?áº¡i mÃ n hÃ¬nh.\n"
 "\n"
 
-#: ../src/orca/orca-setup.glade.h:2
+#: ../src/orca/orca-setup.ui.h:2
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: ../src/orca/orca-setup.glade.h:3
+#: ../src/orca/orca-setup.ui.h:3
 msgid ""
 "<b>Adjust selected\n"
 "attributes</b>"
@@ -4121,609 +4572,514 @@ msgstr ""
 "<b>Ä?iá»?u chá»?nh cÃ¡c\n"
 "thuá»?c tÃnh Ä?Ã£ chá»?n.</b>"
 
-#: ../src/orca/orca-setup.glade.h:5
-msgid "<b>Border Settings</b>"
-msgstr "<b>Thiáº¿t láºp viá»?n</b>"
+#. Translators: This is a label in the Preferences dialog box. It applies to a group of settings related to the border which separates the magnified and non-magnified views of the screen contents (i.e. when a split screen is being used). The options include whether or not there should be a border, the size of the border, and the color of the border.
+#: ../src/orca/orca-setup.ui.h:6
+#| msgid "<b>Border Settings</b>"
+msgid "<b>Border</b>"
+msgstr "<b>Viá»?n</b>"
 
-#: ../src/orca/orca-setup.glade.h:6
+#: ../src/orca/orca-setup.ui.h:7
 msgid "<b>Braille Indicator</b>"
 msgstr "<b>CÃ¡i chá»? chá»¯ ná»?i</b>"
 
-#: ../src/orca/orca-setup.glade.h:7
-msgid "<b>Brightness</b>"
-msgstr "<b>Ä?á»? sÃ¡ng</b>"
-
-#: ../src/orca/orca-setup.glade.h:8
-msgid "<b>Color Settings</b>"
-msgstr "<b>Thiáº¿t láºp mÃ u sáº¯c</b>"
-
-#: ../src/orca/orca-setup.glade.h:9
-msgid "<b>Contracted Braille</b>"
-msgstr "<b>Chá»¯ ná»?i rÃºt gá»?n</b>"
-
-#: ../src/orca/orca-setup.glade.h:10
-msgid "<b>Contrast</b>"
-msgstr "<b>Ä?á»? tÆ°Æ¡ng pháº£n</b>"
-
-#: ../src/orca/orca-setup.glade.h:11
-msgid "<b>Cross-hair Settings</b>"
-msgstr "<b>Thiáº¿t láºp chá»¯ tháºp</b>"
-
-#: ../src/orca/orca-setup.glade.h:12
-msgid "<b>Cursor Settings</b>"
-msgstr "<b>Thiáº¿t láºp con cháº¡y</b>"
-
-#: ../src/orca/orca-setup.glade.h:13
+#. Translators: This is a label in the Preferences dialog box. It applies to a group of settings related to the colors displayed for magnification users, namely brightness, contrast, and whether or not all colors should be inverted.
+#: ../src/orca/orca-setup.ui.h:9
+#| msgid "<b>Contrast</b>"
+msgid "<b>Color</b>"
+msgstr "<b>MÃ u</b>"
+
+#. Translators: This is a label in the Preferences dialog box. It applies to a group of settings related to the customization of the mouse pointer by adding a plus/cross-hair around it to make it easier to see. Options include whether or not cross-hairs should be enabled, as well as what their color and size should be.
+#: ../src/orca/orca-setup.ui.h:11
+#| msgid "<b>Cross-hair Settings</b>"
+msgid "<b>Cross-hair</b>"
+msgstr "<b>Chá»¯ tháºp máº£nh</b>"
+
+#. Translators: This is a label in the Preferences dialog box. It applies to a group of settings related to the cursor displayed for magnification users. Users can opt to enable an enlarged cursor, and customize its size and color.
+#: ../src/orca/orca-setup.ui.h:13
+#| msgid "<b>Cursor Settings</b>"
+msgid "<b>Cursor</b>"
+msgstr "<b>Con trá»?</b>"
+
+#: ../src/orca/orca-setup.ui.h:14
 msgid "<b>Hyperlink Indicator</b>"
 msgstr "<b>CÃ¡i chá»? siÃªu liÃªn káº¿t</b>"
 
-#: ../src/orca/orca-setup.glade.h:14
+#: ../src/orca/orca-setup.ui.h:15
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Bá»? trÃ bÃ n phÃm</b>"
 
-#: ../src/orca/orca-setup.glade.h:15
-msgid "<b>Multi-monitor Settings</b>"
-msgstr "<b>Thiáº¿t láºp Ä?a mÃ n hÃ¬nh</b>"
+#. Translators: This is a label in the Preferences dialog box. It applies to several options related to which progress bars Orca should speak and how often Orca should speak them.
+#: ../src/orca/orca-setup.ui.h:17
+#| msgid "Speak progress bar _updates"
+msgid "<b>Progress Bar Updates</b>"
+msgstr "<b>Cáºp nháºt thanh tiáº¿n hÃ nh</b>"
 
-#: ../src/orca/orca-setup.glade.h:16
+#: ../src/orca/orca-setup.ui.h:18
 msgid "<b>Pronunciation Dictionary</b>"
 msgstr "<b>Tá»« Ä?iá»?n PhÃ¡t Ã¢m</b>"
 
-#: ../src/orca/orca-setup.glade.h:17
+#: ../src/orca/orca-setup.ui.h:19
 msgid "<b>Punctuation Level</b>"
 msgstr "<b>Cáº¥p cháº¥m cÃ¢u</b>"
 
-#: ../src/orca/orca-setup.glade.h:18
+#: ../src/orca/orca-setup.ui.h:20
 msgid "<b>Selection Indicator</b>"
 msgstr "<b>CÃ¡i chá»? vÃ¹ng chá»?n</b>"
 
-#: ../src/orca/orca-setup.glade.h:19
-msgid "<b>Table Row Speech</b>"
-msgstr "<b>Tiáº¿ng nÃ³i hÃ ng báº£ng</b>"
+#. Translators: This is label in the Preferences dialog box. It refers to what Orca will speak when the user arrows Up or Down in a table. The choices are to speak just the new cell or to speak the entire row.
+#: ../src/orca/orca-setup.ui.h:22
+#| msgid "<b>Table Row Speech</b>"
+msgid "<b>Table Rows</b>"
+msgstr "<b>HÃ ng Báº£ng</b>"
 
-#: ../src/orca/orca-setup.glade.h:20
+#: ../src/orca/orca-setup.ui.h:23
 msgid "<b>Text attributes</b>"
 msgstr "<b>Thuá»?c tÃnh vÄ?n báº£n</b>"
 
 #. Translators:  In the context of magnifying the contents of the screen, "tracking" refers to whether or not an object (mouse pointer, the caret, or the widget with focus) is of interest.  Objects of interest must always be displayed.  "Alignment" refers to where on the screen objects of interest should be displayed.
-#: ../src/orca/orca-setup.glade.h:22
-msgid "<b>Tracking and Alignment Settings</b>"
-msgstr "<b>Thiáº¿t láºp Theo dÃµi vÃ  Vá»? trÃ</b>"
+#: ../src/orca/orca-setup.ui.h:25
+#| msgid "<b>Tracking and Alignment Settings</b>"
+msgid "<b>Tracking and Alignment</b>"
+msgstr "<b>Theo dÃµi vÃ  Sáº¯p hÃ ng</b>"
 
-#: ../src/orca/orca-setup.glade.h:23
+#: ../src/orca/orca-setup.ui.h:26
 msgid "<b>Verbosity</b>"
 msgstr "<b>Ä?á»? chi tiáº¿t</b>"
 
-#: ../src/orca/orca-setup.glade.h:24
-msgid "<b>Zoomer Settings</b>"
-msgstr "<b>Thiáº¿t láºp bá»? thu phÃ³ng</b>"
+#. Translators: This is a label in the Preferences dialog. It applies to a number of settings related to magnification. The Zoomer is what holds/displays the magnified version of the screen contents.
+#: ../src/orca/orca-setup.ui.h:28
+#| msgid "<b>Zoomer Settings</b>"
+msgid "<b>Zoomer</b>"
+msgstr "<b>Thu PhÃ³ng</b>"
 
-#: ../src/orca/orca-setup.glade.h:25
-msgid "Advanced Settings"
-msgstr "Thiáº¿t láºp Cáº¥p cao"
+#. This is a button on the Magnifier notebook page of the Preferences dialog. Pressing this button results in a dialog in which the user can fine tune more advanced settings.
+#: ../src/orca/orca-setup.ui.h:30
+#| msgid "Advanced _Settings..."
+msgid "Advanced..."
+msgstr "Cáº¥p cao..."
 
-#: ../src/orca/orca-setup.glade.h:26
-msgid "Advanced _Settings..."
-msgstr "Thiáº¿t láºp Cáº¥p c_ao..."
+#. Translators: Orca has a setting which determines which progress bar updates should be announced. Choosing All means that Orca will present progress bar updates regardless of what application and window they happen to be in.
+#: ../src/orca/orca-setup.ui.h:32
+#| msgid "_All"
+msgid "All"
+msgstr "Táº¥t cáº£"
 
-#: ../src/orca/orca-setup.glade.h:27
-msgid "B_lue:"
-msgstr "_Xanh:"
+#. Translators: long braille for the rolename of a application.
+#.
+#: ../src/orca/orca-setup.ui.h:33
+#: ../src/orca/rolenames.py:1127
+msgid "Application"
+msgstr "á»¨ng dá»¥ng"
 
-#: ../src/orca/orca-setup.glade.h:28
+#: ../src/orca/orca-setup.ui.h:34
 msgid "Border color:"
 msgstr "MÃ u viá»?n:"
 
-#: ../src/orca/orca-setup.glade.h:29
+#: ../src/orca/orca-setup.ui.h:35
 msgid "Border size:"
 msgstr "KÃch cá»¡ viá»?n:"
 
-#: ../src/orca/orca-setup.glade.h:30
+#: ../src/orca/orca-setup.ui.h:37
 msgid "Braille"
 msgstr "Chá»¯ ná»?i"
 
-#: ../src/orca/orca-setup.glade.h:32
+#: ../src/orca/orca-setup.ui.h:41
 msgid "Brightness:"
 msgstr "Ä?á»? sÃ¡ng:"
 
-#: ../src/orca/orca-setup.glade.h:33
-msgid ""
-"Centered\n"
-"Proportional\n"
-"Push\n"
-"None"
-msgstr ""
-"Giá»¯a láº¡i\n"
-"Tá»· lá»?\n"
-"Ä?áº©y\n"
-"KhÃ´ng cÃ³"
-
-#: ../src/orca/orca-setup.glade.h:37
-msgid ""
-"Centered\n"
-"Push\n"
-"None"
-msgstr ""
-"Giá»¯a láº¡i\n"
-"Ä?áº©y\n"
-"KhÃ´ng cÃ³"
-
-#: ../src/orca/orca-setup.glade.h:40
+#: ../src/orca/orca-setup.ui.h:43
 msgid "Contraction _Table:"
 msgstr "Báº£ng _tá»« rÃºt gá»?n:"
 
-#: ../src/orca/orca-setup.glade.h:41
+#: ../src/orca/orca-setup.ui.h:44
 msgid "Contrast:"
 msgstr "TÆ°Æ¡ng pháº£n:"
 
-#: ../src/orca/orca-setup.glade.h:42
+#: ../src/orca/orca-setup.ui.h:45
 msgid "Cross-hair color:"
 msgstr "MÃ u chá»¯ tháºp:"
 
-#: ../src/orca/orca-setup.glade.h:43
+#: ../src/orca/orca-setup.ui.h:46
 msgid "Cross-hair si_ze:"
 msgstr "_KÃch cá»¡ chá»¯ tháºp:"
 
-#: ../src/orca/orca-setup.glade.h:44
+#: ../src/orca/orca-setup.ui.h:47
 msgid "Cursor color:"
 msgstr "MÃ u con trá»? :"
 
-#: ../src/orca/orca-setup.glade.h:45
+#: ../src/orca/orca-setup.ui.h:48
 msgid "Cursor size:"
 msgstr "KÃch cá»¡ con trá»? :"
 
-#: ../src/orca/orca-setup.glade.h:46
+#: ../src/orca/orca-setup.ui.h:50
 msgid "Custom siz_e"
 msgstr "Cá»¡ _riÃªng"
 
-#: ../src/orca/orca-setup.glade.h:47
-msgid ""
-"Default\n"
-"Uppercase\n"
-"Hyperlink"
-msgstr ""
-"Máº·c Ä?á»?nh\n"
-"Chá»¯ hoa\n"
-"SiÃªu liÃªn káº¿t"
+#: ../src/orca/orca-setup.ui.h:51
+msgid "Default"
+msgstr "Máº·c Ä?á»?nh"
 
-#: ../src/orca/orca-setup.glade.h:50
+#: ../src/orca/orca-setup.ui.h:52
 msgid "Disable _end of line symbol"
 msgstr "Táº¯t _kÃ½ hiá»?u káº¿t thÃºc dÃ²ng"
 
-#: ../src/orca/orca-setup.glade.h:51
+#: ../src/orca/orca-setup.ui.h:53
 msgid "Disable gksu _keyboard grab"
 msgstr "Táº¯t báº¯t phÃm _gksu"
 
 #. Translators: When a user chooses a tracking alignment of "push", Orca moves the magnified view just enough to fit the object of interest at the very edge of the screen.  The "edge margin" allows the user to specify a margin so that objects are not displayed too close to the edge.
-#: ../src/orca/orca-setup.glade.h:56
+#: ../src/orca/orca-setup.ui.h:58
 msgid "Edge mar_gin:"
 msgstr "_Lá»? cáº¡nh:"
 
-#: ../src/orca/orca-setup.glade.h:57
+#: ../src/orca/orca-setup.ui.h:59
 msgid "Enable Braille _monitor"
 msgstr "DÃ¹ng bá»? trÃ¬nh bÃ y chá»¯ _ná»?i"
 
-#: ../src/orca/orca-setup.glade.h:58
+#: ../src/orca/orca-setup.ui.h:60
 msgid "Enable Braille _support"
 msgstr "Báºt kháº£ nÄ?ng _há»? trá»£ chá»¯ ná»?i"
 
-#: ../src/orca/orca-setup.glade.h:59
+#: ../src/orca/orca-setup.ui.h:61
 msgid "Enable _alphanumeric and punctuation keys"
 msgstr "Báºt phÃm _abc vÃ  cháº¥m cÃ¢u"
 
-#: ../src/orca/orca-setup.glade.h:60
+#: ../src/orca/orca-setup.ui.h:62
 msgid "Enable _function keys"
 msgstr "Báºt phÃm chá»©c _nÄ?ng"
 
-#: ../src/orca/orca-setup.glade.h:61
+#: ../src/orca/orca-setup.ui.h:63
 msgid "Enable _key echo"
 msgstr "Báºt _pháº£n há»?i phÃm"
 
-#: ../src/orca/orca-setup.glade.h:62
+#: ../src/orca/orca-setup.ui.h:64
 msgid "Enable _magnifier"
 msgstr "Báºt _kÃnh lÃºp"
 
-#: ../src/orca/orca-setup.glade.h:63
+#: ../src/orca/orca-setup.ui.h:65
 msgid "Enable _modifier keys"
 msgstr "Báºt phÃ_m sá»a Ä?á»?i"
 
-#: ../src/orca/orca-setup.glade.h:64
+#: ../src/orca/orca-setup.ui.h:66
 msgid "Enable _navigation keys"
 msgstr "Báºt phÃm du_yá»?t qua"
 
-#: ../src/orca/orca-setup.glade.h:65
+#: ../src/orca/orca-setup.ui.h:67
 msgid "Enable ac_tion keys"
 msgstr "Báº_t phÃm hÃ nh Ä?á»?ng"
 
-#: ../src/orca/orca-setup.glade.h:66
+#: ../src/orca/orca-setup.ui.h:68
 msgid "Enable bor_der"
 msgstr "Báºt _viá»?n"
 
-#: ../src/orca/orca-setup.glade.h:67
+#: ../src/orca/orca-setup.ui.h:69
 msgid "Enable c_ursor"
 msgstr "Báºt con cháº¡_y"
 
-#: ../src/orca/orca-setup.glade.h:68
+#: ../src/orca/orca-setup.ui.h:70
 msgid "Enable cross-h_air"
 msgstr "Báºt _chá»¯ tháºp"
 
-#: ../src/orca/orca-setup.glade.h:69
+#: ../src/orca/orca-setup.ui.h:71
 msgid "Enable cross-hair cl_ip"
 msgstr "Báºt trÃch chá»¯ tháº_p"
 
-#: ../src/orca/orca-setup.glade.h:70
+#: ../src/orca/orca-setup.ui.h:72
 msgid "Enable echo by _sentence"
 msgstr "Báºt pháº£n há»?i theo cÃ¢_u"
 
-#: ../src/orca/orca-setup.glade.h:71
+#: ../src/orca/orca-setup.ui.h:73
 msgid "Enable echo by _word"
 msgstr "Báºt pháº£n há»?i th_eo tá»«"
 
-#: ../src/orca/orca-setup.glade.h:72
+#: ../src/orca/orca-setup.ui.h:76
 msgid "Enable lockin_g keys"
 msgstr "Báºt _khoÃ¡ phÃm"
 
-#: ../src/orca/orca-setup.glade.h:73
-msgid ""
-"Full Screen\n"
-"Top Half\n"
-"Bottom Half\n"
-"Left Half\n"
-"Right Half\n"
-"Custom"
-msgstr ""
-"ToÃ n mÃ n hÃ¬nh\n"
-"Ná»a bÃªn trÃªn\n"
-"Ná»a bÃªn dÆ°á»?i\n"
-"Ná»a bÃªn trÃ¡i\n"
-"Ná»a bÃªn pháº£i\n"
-"Tá»± chá»?n"
-
-#: ../src/orca/orca-setup.glade.h:79
+#. Translators: This is an option in the Preferences dialog box related to the speaking of progress bar information. If checked, Orca will speak progress bar information.
+#: ../src/orca/orca-setup.ui.h:80
+#| msgid "Enable bor_der"
+msgid "Enable_d"
+msgstr "_Báºt"
+
+#. Translators: Here this is a label for a spin button through which a user can customize the frequency in seconds an announcement should be made regarding the current value of a progress bar.
+#: ../src/orca/orca-setup.ui.h:82
+msgid "Frequency (secs):"
+msgstr "Táº§n sá»? (giÃ¢y):"
+
+#: ../src/orca/orca-setup.ui.h:84
 msgid "General"
 msgstr "Chung"
 
-#: ../src/orca/orca-setup.glade.h:80
-msgid "Gree_n:"
-msgstr "_Lá»¥c:"
-
-#: ../src/orca/orca-setup.glade.h:81
+#: ../src/orca/orca-setup.ui.h:85
 msgid "Hide s_ystem pointer"
 msgstr "áº¨n con t_rá»? há»? thá»?ng"
 
-#: ../src/orca/orca-setup.glade.h:82
+#: ../src/orca/orca-setup.ui.h:86
+msgid "Hyperlink"
+msgstr "SiÃªu liÃªn káº¿t"
+
+#: ../src/orca/orca-setup.ui.h:87
 msgid "In_vert colors"
 msgstr "Ä?áº£_o mÃ u"
 
-#: ../src/orca/orca-setup.glade.h:83
-msgid "Key Binding List"
-msgstr "Danh sÃ¡ch tá»? há»£p bÃ n phÃm"
-
-#: ../src/orca/orca-setup.glade.h:84
+#: ../src/orca/orca-setup.ui.h:88
 msgid "Key Bindings"
 msgstr "Tá»? há»£p bÃ n phÃm"
 
-#: ../src/orca/orca-setup.glade.h:85
+#: ../src/orca/orca-setup.ui.h:89
 msgid "Key Echo"
 msgstr "Pháº£n há»?i phÃm"
 
-#: ../src/orca/orca-setup.glade.h:86
-msgid ""
-"Line\n"
-"Sentence"
-msgstr ""
-"DÃ²ng\n"
-"CÃ¢u"
-
-#: ../src/orca/orca-setup.glade.h:89
+#: ../src/orca/orca-setup.ui.h:93
 msgid "Magnifier"
 msgstr "KÃnh lÃºp"
 
-#: ../src/orca/orca-setup.glade.h:90
+#: ../src/orca/orca-setup.ui.h:94
 msgid "Mouse poi_nter:"
 msgstr "C_on trá»? chuá»?t:"
 
 #. Translators: This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move _down one button, move that attribute down one line in the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order.
-#: ../src/orca/orca-setup.glade.h:92
+#: ../src/orca/orca-setup.ui.h:96
 msgid "Move _down one"
 msgstr "Chuyá»?n _xuá»?ng má»?t"
 
 #. Translators: This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move _up one button, move that attribute up one line in the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order.
-#: ../src/orca/orca-setup.glade.h:94
+#: ../src/orca/orca-setup.ui.h:98
 msgid "Move _up one"
 msgstr "Chuyá»?n _lÃªn má»?t"
 
 #. Translators: This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move to _bottom button, move that attribute to the bottom of the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order.
-#: ../src/orca/orca-setup.glade.h:96
+#: ../src/orca/orca-setup.ui.h:100
 msgid "Move to _bottom"
 msgstr "Chuyá»?n xuá»?ng _dÆ°á»?i"
 
 #. Translators:  This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move to _top button, move that attribute to the top of the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order.
-#: ../src/orca/orca-setup.glade.h:98
+#: ../src/orca/orca-setup.ui.h:102
 msgid "Move to _top"
 msgstr "Chuyá»?n lÃªn _trÃªn"
 
-#: ../src/orca/orca-setup.glade.h:99
-msgid ""
-"None\n"
-"Bilinear"
-msgstr ""
-"KhÃ´ng cÃ³\n"
-"Tuyáº¿n kÃ©p"
-
-#: ../src/orca/orca-setup.glade.h:101
-msgid ""
-"None\n"
-"Saturate red\n"
-"Saturate green\n"
-"Saturate blue\n"
-"Desaturate red\n"
-"Desaturate green\n"
-"Desaturate blue\n"
-"Positive hue shift\n"
-"Negative hue shift"
-msgstr ""
-"KhÃ´ng cÃ³\n"
-"MÃ u Ä?á»? tá»?i Ä?a\n"
-"MÃ u lá»¥c tá»?i Ä?a\n"
-"MÃ u xanh tá»?i Ä?a\n"
-"MÃ u Ä?á»? tá»?i thiá»?u\n"
-"MÃ u lá»¥c tá»?i thiá»?u\n"
-"MÃ u xanh tá»?i thiá»?u\n"
-"Dá»?i sáº¯c mÃ u vá»? dÆ°Æ¡ng\n"
-"Dá»?i sáº¯c mÃ u vá»? Ã¢m"
-
-#: ../src/orca/orca-setup.glade.h:110
+#: ../src/orca/orca-setup.ui.h:104
 msgid "Orca Modifier Keys"
 msgstr "PhÃm bá»? trá»£ Orca"
 
-#: ../src/orca/orca-setup.glade.h:111
+#: ../src/orca/orca-setup.ui.h:105
 msgid "Orca Preferences"
 msgstr "TÃ¹y thÃch Orca"
 
-#: ../src/orca/orca-setup.glade.h:112
+#: ../src/orca/orca-setup.ui.h:106
 msgid "Orca _Modifier Key(s):"
 msgstr "PhÃm _bá»? trá»£ Orca:"
 
-#: ../src/orca/orca-setup.glade.h:113
+#: ../src/orca/orca-setup.ui.h:107
 msgid "Pi_tch:"
 msgstr "C_ao:"
 
 #. Translators:  if this setting is enabled, the mouse pointer will move to each menu item that the user has arrowed to and each dialog box control that the user has tabbed to.
-#: ../src/orca/orca-setup.glade.h:115
+#: ../src/orca/orca-setup.ui.h:109
 msgid "Pointer follows focus"
 msgstr "Con trá»? theo tiÃªu Ä?iá»?m"
 
 #. Translators: when using magnification software, it is possible for the mouse pointer to not be visible in the "zoomer," which is the magnified view of the screen.  If the "pointer follows zoomer" setting is enabled and the mouse is moved, the pointer will be moved so that it is visible in the zoomer.  If it is not enabled, the zoomer will be moved to display the location of the mouse pointer.
-#: ../src/orca/orca-setup.glade.h:117
+#: ../src/orca/orca-setup.ui.h:111
 msgid "Pointer follows zoomer"
 msgstr "Con trá»? theo kÃnh lÃºp"
 
-#: ../src/orca/orca-setup.glade.h:118
+#: ../src/orca/orca-setup.ui.h:112
 msgid "Pronunciation"
 msgstr "PhÃ¡t Ã¢m"
 
-#: ../src/orca/orca-setup.glade.h:119
+#: ../src/orca/orca-setup.ui.h:115
 msgid "Quit Orca _without confirmation"
 msgstr "ThoÃ¡t khá»?i Orca, khÃ´ng cáº§n _xÃ¡c nháºn"
 
-#: ../src/orca/orca-setup.glade.h:120
-msgid "R_ed:"
-msgstr "Ä?_á»? :"
-
-#: ../src/orca/orca-setup.glade.h:121
-msgid "S_ource display:"
-msgstr "Hiá»?n thá»? n_guá»?n:"
+#. Translators: Orca has a setting which determines which progress bar updates should be announced. The options are all progress bars, only progress bars in the active application, or only progress bars in the current window.
+#: ../src/orca/orca-setup.ui.h:117
+msgid "Restrict to:"
+msgstr "Háº¡n cháº¿ thÃ nh:"
 
 #. Translators: Say all by refers to the way that Orca will say (speak) an amount of text -- in particular, where Orca where insert pauses. There are currently two choices (supplied by a combo box to the right of this label): say all by sentence and  say all by line.  If Orca were speaking a work of fiction, it's probably best to do say all by sentence so it sound more natural. If Orca were speaking something like a page of computer commands, doing a say all by line would work better.
-#: ../src/orca/orca-setup.glade.h:123
+#: ../src/orca/orca-setup.ui.h:120
 msgid "Say All B_y:"
 msgstr "NÃ³i táº¥t cáº£ th_eo :"
 
-#: ../src/orca/orca-setup.glade.h:124
+#: ../src/orca/orca-setup.ui.h:121
 msgid "Scale _factor:"
 msgstr "_Há»? sá»? co dÃ£n:"
 
-#: ../src/orca/orca-setup.glade.h:125
+#: ../src/orca/orca-setup.ui.h:123
 msgid "Show Orca _main window"
 msgstr "Hiá»?n _cá»a sá»? Orca chÃnh"
 
-#: ../src/orca/orca-setup.glade.h:127
+#: ../src/orca/orca-setup.ui.h:125
 msgid "Spea_k object mnemonics"
 msgstr "NÃ³i phÃm gá»?i nhá»? _vá»? Ä?á»?i tÆ°á»£ng"
 
-#: ../src/orca/orca-setup.glade.h:128
+#. Translators: This is one of two options available in the Preferences dialog for the Table Rows setting. If chosen, Orca will speak just the new cell when the user arrows Up or Down in a table.
+#: ../src/orca/orca-setup.ui.h:127
+#| msgid "Speak cell"
+msgid "Speak _cell"
+msgstr "NÃ³_i Ã´"
+
+#: ../src/orca/orca-setup.ui.h:128
 msgid "Speak _indentation and justification"
 msgstr "CÅ©ng nÃ³_i sá»± thá»¥t lá»? vÃ  canh Ä?á»?u"
 
-#: ../src/orca/orca-setup.glade.h:129
+#: ../src/orca/orca-setup.ui.h:129
 msgid "Speak _none"
 msgstr "KhÃ´ng _nÃ³i"
 
-#: ../src/orca/orca-setup.glade.h:130
+#: ../src/orca/orca-setup.ui.h:130
 msgid "Speak blank lines"
 msgstr "Ä?á»?c dÃ²ng trá»?ng"
 
-#: ../src/orca/orca-setup.glade.h:132
-msgid "Speak current ro_w"
-msgstr "NÃ³i _hÃ ng hiá»?n cÃ³"
+#. Translators: This checkbox toggles whether or not Orca says the child position (e.g., 'item 6 of 7').
+#: ../src/orca/orca-setup.ui.h:132
+msgid "Speak child p_osition"
+msgstr "NÃ³i vá»? trÃ _phá»¥"
 
 #. Translators: multicase strings are StringsWithWordsMashedTogetherLikeThis.
-#: ../src/orca/orca-setup.glade.h:134
+#: ../src/orca/orca-setup.ui.h:134
 msgid "Speak multicase strings as wor_ds"
 msgstr "NÃ³i chuá»?i Ä?a tá»« th_eo tá»«"
 
-#: ../src/orca/orca-setup.glade.h:135
+#: ../src/orca/orca-setup.ui.h:135
 msgid "Speak object under mo_use"
 msgstr "NÃ³i Ä?á»?i tÆ°á»£ng náº±m dÆ°á»?i ch_uá»?t"
 
-#: ../src/orca/orca-setup.glade.h:136
-msgid "Speak progress bar _updates"
-msgstr "NÃ³i sá»± _cáºp nháºt thanh tiáº¿n hÃ nh"
+#. Translators: This is one of two options available in the Preferences dialog for the Table Rows setting. If chosen, Orca will speak the entire row when the user arrows Up or Down in a table.
+#: ../src/orca/orca-setup.ui.h:137
+#| msgid "Speak row"
+msgid "Speak ro_w"
+msgstr "NÃ³i hÃ n_g"
 
-#: ../src/orca/orca-setup.glade.h:137
+#: ../src/orca/orca-setup.ui.h:138
 msgid "Speak tutorial messages"
 msgstr "NÃ³i thÃ´ng Ä?iá»?p trá»£ lÃ½"
 
-#: ../src/orca/orca-setup.glade.h:138
+#: ../src/orca/orca-setup.ui.h:139
 msgid "Speech"
 msgstr "Tiáº¿ng nÃ³i"
 
-#: ../src/orca/orca-setup.glade.h:139
+#: ../src/orca/orca-setup.ui.h:140
 msgid "Speech _system:"
 msgstr "Há»? thá»?ng tiáº¿ng _nÃ³i:"
 
-#: ../src/orca/orca-setup.glade.h:140
+#: ../src/orca/orca-setup.ui.h:141
 msgid "Speech synthesi_zer:"
 msgstr "Bá»? tá»?ng há»£_p tiáº¿ng nÃ³i:"
 
-#: ../src/orca/orca-setup.glade.h:141
+#: ../src/orca/orca-setup.ui.h:142
 msgid "Start Orca when you lo_gin"
 msgstr "Khá»?i cháº¡y Orca vÃ o lÃºc Ä?Ä?n_g nháºp"
 
-#: ../src/orca/orca-setup.glade.h:142
-msgid "Target displa_y:"
-msgstr "_Hiá»?n thá»? Ä?Ãch:"
-
-#: ../src/orca/orca-setup.glade.h:143
+#: ../src/orca/orca-setup.ui.h:143
 msgid "Te_xt cursor:"
 msgstr "Con cháº¡y _vÄ?n báº£n:"
 
-#: ../src/orca/orca-setup.glade.h:144
+#: ../src/orca/orca-setup.ui.h:144
 msgid "Text Attributes"
 msgstr "Thuá»?c tÃnh vÄ?n báº£n"
 
-#: ../src/orca/orca-setup.glade.h:145
+#: ../src/orca/orca-setup.ui.h:146
+msgid "Uppercase"
+msgstr "Chá»¯ hoa"
+
+#: ../src/orca/orca-setup.ui.h:147
 msgid "Ver_bose"
 msgstr "Ch_i tiáº¿t"
 
-#: ../src/orca/orca-setup.glade.h:146
+#: ../src/orca/orca-setup.ui.h:148
 msgid "Vo_lume:"
 msgstr "Ã?m _lÆ°á»£ng:"
 
-#: ../src/orca/orca-setup.glade.h:147
-msgid "Warning"
-msgstr "Cáº£nh bÃ¡o"
-
-#: ../src/orca/orca-setup.glade.h:148
-msgid ""
-"You already have an instance of an Orca preferences dialog open.\n"
-"\n"
-"Please close it before opening a new one."
-msgstr ""
-"Báº¡n Ä?Ã£ má»? má»?t há»?p thoáº¡i tÃ¹y thÃch Orca.\n"
-"\n"
-"HÃ£y Ä?Ã³ng nÃ³ trÆ°á»?c khi má»? cÃ¡i má»?i."
+#. Translators: long braille for the rolename of a window.
+#.
+#: ../src/orca/orca-setup.ui.h:149
+#: ../src/orca/rolenames.py:1079
+msgid "Window"
+msgstr "Cá»a sá»?"
 
-#: ../src/orca/orca-setup.glade.h:151
+#: ../src/orca/orca-setup.ui.h:150
 msgid "_Abbreviated role names"
 msgstr "TÃªn v_ai viáº¿t táº¯t"
 
-#: ../src/orca/orca-setup.glade.h:152
+#: ../src/orca/orca-setup.ui.h:151
 msgid "_All"
 msgstr "Táº¥t _cáº£"
 
-#: ../src/orca/orca-setup.glade.h:153
-msgid "_Blue:"
-msgstr "_Xanh:"
-
-#: ../src/orca/orca-setup.glade.h:154
+#: ../src/orca/orca-setup.ui.h:152
 msgid "_Bottom:"
 msgstr "_DÆ°á»?i:"
 
-#: ../src/orca/orca-setup.glade.h:155
-msgid "_Color Filtering:"
-msgstr "_Lá»?c mÃ u :"
-
-#: ../src/orca/orca-setup.glade.h:156
+#: ../src/orca/orca-setup.ui.h:153
 msgid "_Control and menu item:"
 msgstr "Ä?iá»?u khiá»?n vÃ  má»¥_c trÃ¬nh Ä?Æ¡n:"
 
-#: ../src/orca/orca-setup.glade.h:157
+#: ../src/orca/orca-setup.ui.h:154
 msgid "_Delete"
 msgstr "_XoÃ¡"
 
-#: ../src/orca/orca-setup.glade.h:159
+#: ../src/orca/orca-setup.ui.h:156
 msgid "_Enable Contracted Braille"
 msgstr "Báºt chá»¯ ná»?i _rÃºt gá»?n"
 
-#: ../src/orca/orca-setup.glade.h:160
+#: ../src/orca/orca-setup.ui.h:157
 msgid "_Enable speech"
 msgstr "Báºt _nÃ³i"
 
-#: ../src/orca/orca-setup.glade.h:161
-msgid "_Green:"
-msgstr "_Lá»¥c:"
-
-#: ../src/orca/orca-setup.glade.h:162
+#: ../src/orca/orca-setup.ui.h:158
 msgid "_Laptop"
 msgstr "MÃ¡y _xÃ¡ch tay"
 
-#: ../src/orca/orca-setup.glade.h:163
+#: ../src/orca/orca-setup.ui.h:159
 msgid "_Left:"
 msgstr "T_rÃ¡i:"
 
-#: ../src/orca/orca-setup.glade.h:164
+#: ../src/orca/orca-setup.ui.h:160
 msgid "_New entry"
 msgstr "_Má»¥c má»?i"
 
-#: ../src/orca/orca-setup.glade.h:166
+#: ../src/orca/orca-setup.ui.h:162
 msgid "_Person:"
 msgstr "N_gÆ°á»?i:"
 
-#: ../src/orca/orca-setup.glade.h:167
+#: ../src/orca/orca-setup.ui.h:163
 msgid "_Position:"
 msgstr "_Vá»? trÃ:"
 
-#: ../src/orca/orca-setup.glade.h:168
+#: ../src/orca/orca-setup.ui.h:164
 msgid "_Present tooltips"
 msgstr "_Hiá»?n gá»£i Ã½ cÃ´ng cá»¥"
 
-#: ../src/orca/orca-setup.glade.h:169
+#: ../src/orca/orca-setup.ui.h:165
 msgid "_Rate:"
 msgstr "_Tá»· lá»?:"
 
-#: ../src/orca/orca-setup.glade.h:170
-msgid "_Red:"
-msgstr "Ä?_á»? :"
-
-#: ../src/orca/orca-setup.glade.h:171
+#: ../src/orca/orca-setup.ui.h:166
 msgid "_Reset"
 msgstr "Ä?áº·t _láº¡i"
 
-#: ../src/orca/orca-setup.glade.h:172
+#: ../src/orca/orca-setup.ui.h:167
 msgid "_Right:"
 msgstr "_Pháº£i:"
 
-#: ../src/orca/orca-setup.glade.h:173
-msgid "_Smoothing:"
-msgstr "LÃ m _má»?n:"
-
-#: ../src/orca/orca-setup.glade.h:174
+#: ../src/orca/orca-setup.ui.h:168
 msgid "_Speak all"
 msgstr "_NÃ³i táº¥t cáº£"
 
-#: ../src/orca/orca-setup.glade.h:175
+#: ../src/orca/orca-setup.ui.h:169
 msgid "_Top:"
 msgstr "_TrÃªn:"
 
-#: ../src/orca/orca-setup.glade.h:176
+#: ../src/orca/orca-setup.ui.h:170
 msgid "_Voice settings:"
 msgstr "Thiáº¿t láºp giá»?ng _nÃ³i:"
 
-#. Translators: Here 'every' labels a spin button through which a user can customize the frequency in seconds an announcement should be made. (The spin button is followed by the label 'seconds'.) Thus if a user chooses 5 in the spin button, the complete phrase would be 'every 5 seconds'.
-#: ../src/orca/orca-setup.glade.h:178
-msgid "every"
-msgstr "má»?i"
-
-#: ../src/orca/orca-setup.glade.h:179
+#: ../src/orca/orca-setup.ui.h:171
 msgid "pixels"
 msgstr "Ä?iá»?m áº£nh"
 
-#: ../src/orca/orca-setup.glade.h:180
-msgid "seconds"
-msgstr "giÃ¢y"
-
 #. for gettext support
 #. Translators: this is a structure to assist in the generation of
 #. spoken military-style spelling.  For example, 'abc' becomes 'alpha
@@ -5877,8 +6233,6 @@ msgstr "Ã?"
 #. Translators: spoken words for the rolename of a table cell.
 #.
 #: ../src/orca/rolenames.py:924
-#: ../src/orca/scripts/apps/soffice/where_am_i.py:65
-#: ../src/orca/scripts/apps/soffice/where_am_i.py:147
 msgid "cell"
 msgstr "Ã´"
 
@@ -6068,12 +6422,6 @@ msgstr "cá»?ng xem"
 msgid "wnd"
 msgstr "csá»?"
 
-#. Translators: long braille for the rolename of a window.
-#.
-#: ../src/orca/rolenames.py:1079
-msgid "Window"
-msgstr "Cá»a sá»?"
-
 #. Translators: spoken words for the rolename of a window.
 #.
 #: ../src/orca/rolenames.py:1082
@@ -6141,12 +6489,6 @@ msgstr "Ä?oáº¡n vÄ?n"
 msgid "app"
 msgstr "á»©ng"
 
-#. Translators: long braille for the rolename of a application.
-#.
-#: ../src/orca/rolenames.py:1127
-msgid "Application"
-msgstr "á»¨ng dá»¥ng"
-
 #. Translators: spoken words for the rolename of a application.
 #.
 #: ../src/orca/rolenames.py:1130
@@ -6231,15 +6573,16 @@ msgstr "tÃ i liá»?u"
 #. We've entered a table.  Announce the dimensions.
 #.
 #: ../src/orca/scripts/apps/acroread.py:276
-#: ../src/orca/scripts/apps/soffice/script.py:703
+#: ../src/orca/scripts/apps/soffice/script.py:888
 #, python-format
-msgid "table with %d rows and %d columns."
-msgstr "báº£ng %d hÃ ng %d cá»?t."
+#| msgid "table with %d rows and %d columns."
+msgid "table with %(rows)d rows and %(columns)d columns."
+msgstr "báº£ng cÃ³ %(rows)d hÃ ng vÃ  %(columns)d cá»?t."
 
 #. We've left a table.  Announce this fact.
 #.
 #: ../src/orca/scripts/apps/acroread.py:283
-#: ../src/orca/scripts/apps/soffice/script.py:699
+#: ../src/orca/scripts/apps/soffice/script.py:884
 msgid "leaving table."
 msgstr "rá»?i báº£ng."
 
@@ -6248,14 +6591,17 @@ msgstr "rá»?i báº£ng."
 #.
 #: ../src/orca/scripts/apps/acroread.py:301
 #, python-format
-msgid "row %d, column %d"
-msgstr "hÃ ng %d, cá»?t %d"
+#| msgid "row %d, column %d"
+msgid "row %(row)d, column %(column)d"
+msgstr "hÃ ng %(row)d, cá»?t %(column)d"
 
 #. Translators: this represents the column we're
 #. on in a table.
 #.
-#: ../src/orca/scripts/apps/acroread.py:307
-#: ../src/orca/scripts/apps/soffice/where_am_i.py:73
+#. Translators: this is in references to a column in a
+#. table.
+#: ../src/orca/scripts/apps/acroread.py:308
+#: ../src/orca/speech_generator.py:545
 #, python-format
 msgid "column %d"
 msgstr "cá»?t %d"
@@ -6300,7 +6646,7 @@ msgstr "sá»± kiá»?n lá»?ch"
 #. the user know when new mail has arrived, even if Evolution
 #. doesn't have focus.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:164
+#: ../src/orca/scripts/apps/evolution/script.py:162
 msgid "Toggle whether we present new mail if we are not the active script."
 msgstr "Báºt táº¯t hiá»?n thá»? thÆ° má»?i khi khÃ´ng pháº£i lÃ  script Ä?ang hoáº¡t Ä?á»?ng."
 
@@ -6308,7 +6654,7 @@ msgstr "Báºt táº¯t hiá»?n thá»? thÆ° má»?i khi khÃ´ng pháº£i lÃ  script Ä?ang h
 #. the user know when new mail has arrived, even if Evolution
 #. doesn't have focus.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:209
+#: ../src/orca/scripts/apps/evolution/script.py:248
 msgid "present new mail if this script is not active."
 msgstr "hiá»?n thá»? thÆ° má»?i náº¿u script khÃ´ng hoáº¡t Ä?á»?ng."
 
@@ -6316,47 +6662,17 @@ msgstr "hiá»?n thá»? thÆ° má»?i náº¿u script khÃ´ng hoáº¡t Ä?á»?ng."
 #. the user know when new mail has arrived, even if Evolution
 #. doesn't have focus.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:216
+#: ../src/orca/scripts/apps/evolution/script.py:255
 msgid "do not present new mail if this script is not active."
 msgstr "khÃ´ng hiá»?n thá»? thÆ° má»?i náº¿u script khÃ´ng hoáº¡t Ä?á»?ng."
 
-#. Translators: this is the name of a setup
-#. assistant window/screen in Evolution.
-#.
-#: ../src/orca/scripts/apps/evolution/script.py:268
-#, python-format
-msgid "%s screen"
-msgstr "mÃ n hÃ¬nh %s"
-
-#. Most of the Setup Assistant screens have a useful piece
-#. of text starting with the word "Please". We want to speak
-#. these. For the first screen, the useful piece of text
-#. starts with "Welcome". For the last screen, it starts
-#. with "Congratulations". Speak those too.
-#.
-#. Translators: we regret having to do this, but the
-#. translated string here has to match what the translated
-#. string is for Evolution.
-#.
-#: ../src/orca/scripts/apps/evolution/script.py:304
-msgid "Please"
-msgstr "Xin hÃ£y"
-
-#: ../src/orca/scripts/apps/evolution/script.py:305
-msgid "Welcome"
-msgstr "ChÃºc má»«ng"
-
-#: ../src/orca/scripts/apps/evolution/script.py:306
-msgid "Congratulations"
-msgstr "ChÃºc má»«ng"
-
 #. Translators: this is the name of the
 #. status column header in the message
 #. list in Evolution.  The name needs to
 #. match what Evolution is using.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:839
-#: ../src/orca/scripts/apps/evolution/script.py:901
+#: ../src/orca/scripts/apps/evolution/script.py:995
+#: ../src/orca/scripts/apps/evolution/script.py:1063
 msgid "Status"
 msgstr "Tráº¡ng thÃ¡i"
 
@@ -6365,8 +6681,8 @@ msgstr "Tráº¡ng thÃ¡i"
 #. list in Evolution.  The name needs to
 #. match what Evolution is using.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:848
-#: ../src/orca/scripts/apps/evolution/script.py:926
+#: ../src/orca/scripts/apps/evolution/script.py:1004
+#: ../src/orca/scripts/apps/evolution/script.py:1088
 msgid "Flagged"
 msgstr "Ä?áº·t cá»?"
 
@@ -6374,7 +6690,7 @@ msgstr "Ä?áº·t cá»?"
 #. indicate that an email message has not been
 #. marked as having been read.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:906
+#: ../src/orca/scripts/apps/evolution/script.py:1068
 msgid "unread"
 msgstr "chÆ°a Ä?á»?c"
 
@@ -6383,14 +6699,14 @@ msgstr "chÆ°a Ä?á»?c"
 #. list in Evolution.  The name needs to
 #. match what Evolution is using.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:915
+#: ../src/orca/scripts/apps/evolution/script.py:1077
 msgid "Attachment"
 msgstr "Ä?Ãnh kÃ¨m"
 
 #. Translators: this means there are no scheduled entries
 #. in the calendar.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:1089
+#: ../src/orca/scripts/apps/evolution/script.py:1258
 msgid "No appointments"
 msgstr "KhÃ´ng cÃ³ cuá»?c háº¹n"
 
@@ -6398,35 +6714,30 @@ msgstr "KhÃ´ng cÃ³ cuá»?c háº¹n"
 #. top of the mail view Insert Attachment dialog in Evolution.
 #. We give it a name.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:1166
+#: ../src/orca/scripts/apps/evolution/script.py:1335
 msgid "Directories button"
 msgstr "NÃºt thÆ° má»¥c"
 
-#. Translators: this is the ending of the name of the
-#. Evolution Setup Assistant window.  The translated
-#. form has to match what Evolution is using.  We hate
-#. keying off stuff like this, but we're forced to do
-#. so in this case.
-#.
-#: ../src/orca/scripts/apps/evolution/script.py:1337
-#: ../src/orca/scripts/apps/evolution/script.py:1338
-#: ../src/orca/scripts/apps/evolution/script.py:1409
-#: ../src/orca/scripts/apps/evolution/script.py:1410
-msgid "Assistant"
-msgstr "Trá»£ lÃ½"
-
-#. Translators: this in reference to an e-mail message status of
-#. having been read or unread.
+#. Translators: this in reference to an e-mail message
+#. status of having been read or unread.
 #.
-#: ../src/orca/scripts/apps/evolution/where_am_i.py:77
+#: ../src/orca/scripts/apps/evolution/speech_generator.py:128
 msgid "Read"
 msgstr "Ä?á»?c"
 
+#. Translators: this is the name of a setup
+#. assistant window/screen in Evolution.
+#.
+#: ../src/orca/scripts/apps/evolution/speech_generator.py:164
+#, python-format
+msgid "%s screen"
+msgstr "mÃ n hÃ¬nh %s"
+
 #. Translators: this is an indication that Orca is unable to
 #. obtain the display of the gcalctool calculator, which is
 #. the area where calculation results are presented.
 #.
-#: ../src/orca/scripts/apps/gcalctool/script.py:108
+#: ../src/orca/scripts/apps/gcalctool/script.py:86
 msgid "Unable to get calculator display"
 msgstr "KhÃ´ng thá»? hiá»?n thá»? bÃ n tÃnh"
 
@@ -6435,11 +6746,11 @@ msgstr "KhÃ´ng thá»? hiá»?n thá»? bÃ n tÃnh"
 #. keying off stuff like this, but we're forced to do so in
 #. in this case.
 #.
-#: ../src/orca/scripts/apps/gedit/script.py:228
+#: ../src/orca/scripts/apps/gedit/script.py:230
 msgid "Change to:"
 msgstr "Ä?á»?i sang:"
 
-#: ../src/orca/scripts/apps/gedit/script.py:229
+#: ../src/orca/scripts/apps/gedit/script.py:231
 msgid "Misspelled word:"
 msgstr "Tá»« sai chÃnh táº£ :"
 
@@ -6451,15 +6762,15 @@ msgstr "Tá»« sai chÃnh táº£ :"
 #. gedit.  We hate keying off stuff like this, but we're
 #. forced to do so in this case.
 #.
-#: ../src/orca/scripts/apps/gedit/script.py:262
+#: ../src/orca/scripts/apps/gedit/script.py:264
 msgid "Completed spell checking"
 msgstr "Má»?i kiá»?m tra xong chÃnh táº£"
 
-#: ../src/orca/scripts/apps/gedit/script.py:263
+#: ../src/orca/scripts/apps/gedit/script.py:265
 msgid "Spell checking is complete."
 msgstr "Viá»?c kiá»?m tra chÃnh táº£ lÃ  hoÃ n táº¥t."
 
-#: ../src/orca/scripts/apps/gedit/script.py:265
+#: ../src/orca/scripts/apps/gedit/script.py:267
 msgid "Press Tab and Return to terminate."
 msgstr "HÃ£y báº¥m phÃm Tab vÃ  Return Ä?á»? káº¿t thÃºc."
 
@@ -6473,12 +6784,12 @@ msgstr "HÃ£y báº¥m phÃm Tab vÃ  Return Ä?á»? káº¿t thÃºc."
 #. has to match what Thunderbird is using.  We hate keying
 #. off stuff like this, but we're forced to do so in this case.
 #.
-#: ../src/orca/scripts/apps/gedit/script.py:392
-#: ../src/orca/scripts/apps/gedit/script.py:475
-#: ../src/orca/scripts/apps/Thunderbird/script.py:152
-#: ../src/orca/scripts/apps/Thunderbird/script.py:284
-#: ../src/orca/scripts/apps/Thunderbird/script.py:503
-#: ../src/orca/scripts/apps/Thunderbird/speech_generator.py:81
+#: ../src/orca/scripts/apps/gedit/script.py:394
+#: ../src/orca/scripts/apps/gedit/script.py:477
+#: ../src/orca/scripts/apps/Thunderbird/script.py:163
+#: ../src/orca/scripts/apps/Thunderbird/script.py:314
+#: ../src/orca/scripts/apps/Thunderbird/script.py:540
+#: ../src/orca/scripts/apps/Thunderbird/speech_generator.py:88
 msgid "Check Spelling"
 msgstr "Kiá»?m tra chÃnh táº£"
 
@@ -6499,14 +6810,14 @@ msgstr "Kiá»?m tra chÃnh táº£"
 #. keying off stuff like this, but we're forced to do so in this
 #. case.
 #.
-#: ../src/orca/scripts/apps/gedit/script.py:502
+#: ../src/orca/scripts/apps/gedit/script.py:505
 msgid "Phrase not found"
 msgstr "KhÃ´ng tÃ¬m tháº¥y"
 
 #. Translators: this indicates a find command succeeded in
 #. finding something.
 #.
-#: ../src/orca/scripts/apps/gedit/script.py:568
+#: ../src/orca/scripts/apps/gedit/script.py:572
 msgid "Phrase found."
 msgstr "Ä?Ã£ tÃ¬m tháº¥y."
 
@@ -6546,6 +6857,15 @@ msgstr[0] "TÃ¬m tháº¥y %d táºp tin"
 msgid "No files found."
 msgstr "KhÃ´ng tÃ¬m ra."
 
+#. Translators: inaccessible means that the application cannot
+#. be read by Orca.  This usually means the application is not
+#. friendly to the assistive technology infrastructure.
+#.
+#: ../src/orca/scripts/apps/gtk-window-decorator.py:90
+#: ../src/orca/scripts/apps/metacity.py:115
+msgid "inaccessible"
+msgstr "khÃ´ng tá»?i Ä?Æ°á»£c"
+
 #: ../src/orca/scripts/apps/liferea.py:117
 msgid "Work online / offline"
 msgstr "Hoáº¡t Ä?á»?ng trá»±c tuyáº¿n / ngoáº¡i tuyáº¿n"
@@ -6556,56 +6876,105 @@ msgstr "Hoáº¡t Ä?á»?ng trá»±c tuyáº¿n / ngoáº¡i tuyáº¿n"
 #. between workspaces.  The goal here is to find a match
 #. with that prefix.
 #.
-#: ../src/orca/scripts/apps/metacity.py:105
+#: ../src/orca/scripts/apps/metacity.py:108
 msgid "Workspace "
 msgstr "VÃ¹ng lÃ m viá»?c "
 
-#: ../src/orca/scripts/apps/metacity.py:105
+#: ../src/orca/scripts/apps/metacity.py:108
 msgid "Desk "
 msgstr "BÃ n "
 
-#. Translators: inaccessible means that the application cannot
-#. be read by Orca.  This usually means the application is not
-#. friendly to the assistive technology infrastructure.
+#. Translators: this is the number of items in a layered
+#. pane or table.
 #.
-#: ../src/orca/scripts/apps/metacity.py:112
-msgid "inaccessible"
-msgstr "khÃ´ng tá»?i Ä?Æ°á»£c"
+#: ../src/orca/scripts/apps/nautilus.py:138
+#: ../src/orca/speech_generator.py:996
+#, python-format
+msgid "%d item"
+msgid_plural "%d items"
+msgstr[0] "%d má»¥c"
 
 #. Translators: This denotes a notification to the user of some sort.
 #.
 #: ../src/orca/scripts/apps/notification-daemon.py:64
+#: ../src/orca/scripts/apps/notify-osd.py:83
 #, python-format
 msgid "Notification %s"
 msgstr "ThÃ´ng bÃ¡o %s"
 
-#: ../src/orca/scripts/apps/pidgin/script.py:192
+#. Translators: The Package Manager application notifies the
+#. user of minor errors by displaying an icon in the status
+#. bar and adding them to an error log rather than displaying
+#. the error in a dialog box. This string is the label for a
+#. checkbox. If it is checked, Orca will inform the user when
+#. the notification icon has appeared.
+#.
+#: ../src/orca/scripts/apps/packagemanager/script.py:109
+msgid "Notify me when errors have been logged."
+msgstr "ThÃ´ng bÃ¡o khi lá»?i nÃ o Ä?Ã£ Ä?Æ°á»£c ghi lÆ°u."
+
+#. Translators: this is in reference to loading a web page
+#. or some other content.
+#.
+#: ../src/orca/scripts/apps/packagemanager/script.py:221
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1962
+msgid "Loading.  Please wait."
+msgstr "Ä?ang náº¡p. Vui lÃ²ng chá»?."
+
+#. Translators: this is in reference to loading a web page
+#. or some other content.
+#.
+#: ../src/orca/scripts/apps/packagemanager/script.py:229
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1975
+msgid "Finished loading."
+msgstr "HoÃ n táº¥t náº¡p."
+
+#. Translators: The Package Manager application notifies the
+#. user of minor errors by displaying an icon in the status
+#. bar and adding them to an error log rather than displaying
+#. the error in a dialog box. This is the message Orca will
+#. present to inform the user that this has occurred.
+#.
+#: ../src/orca/scripts/apps/packagemanager/script.py:250
+msgid "An error occurred. View the error log for details."
+msgstr "Gáº·p lá»?i. Xem sá»? theo dÃµi lá»?i Ä?á»? tÃ¬m chi tiáº¿t."
+
+#. Translators: This is the tutorial string associated with a
+#. specific search field in the Packagemanager application.
+#. It is designed to inform the user how to move directly to
+#. the search results after the search has been completed.
+#.
+#: ../src/orca/scripts/apps/packagemanager/tutorialgenerator.py:60
+msgid "Use Ctrl+L to move focus to the results."
+msgstr "DÃ¹ng tá»? há»£p phÃm Ctrl+L Ä?á»? chuyá»?n tiÃªu Ä?iá»?m sang káº¿t quáº£."
+
+#: ../src/orca/scripts/apps/pidgin/script.py:191
 msgid "Toggle whether we prefix chat room messages with the name of the chat room."
 msgstr "Báºt/táº¯t thÃªm tÃªn cá»§a phÃ²ng trÃ² chuyá»?n trÆ°á»?c tin nháº¯n trong phÃ²ng trÃ² chuyá»?n."
 
-#: ../src/orca/scripts/apps/pidgin/script.py:198
+#: ../src/orca/scripts/apps/pidgin/script.py:197
 msgid "Toggle whether we announce when our buddies are typing."
 msgstr "Báºt/táº¯t chá»©c nÄ?ng thÃ´ng bÃ¡o khi báº¡n bÃ¨ Ä?ang gÃµ."
 
-#: ../src/orca/scripts/apps/pidgin/script.py:203
+#: ../src/orca/scripts/apps/pidgin/script.py:202
 msgid "Toggle whether we provide chat room specific message histories."
 msgstr "Báºt/táº¯t chá»©c nÄ?ng cung cáº¥p lÆ°á»£c sá» cho má»?i phÃ²ng trÃ² chuyá»?n."
 
-#: ../src/orca/scripts/apps/pidgin/script.py:211
+#: ../src/orca/scripts/apps/pidgin/script.py:210
 msgid "Speak and braille a previous chat room message."
 msgstr "NÃ³i vÃ  hiá»?n thá»? báº±ng chá»¯ ná»?i má»?t tin nháº¯n phÃ²ng trÃ² chuyá»?n trÆ°á»?c."
 
 #. Translators: If this checkbox is checked, then Orca will speak
 #. the name of the chat room.
 #.
-#: ../src/orca/scripts/apps/pidgin/script.py:282
+#: ../src/orca/scripts/apps/pidgin/script.py:275
 msgid "_Speak Chat Room name"
 msgstr "_NÃ³i tÃªn phÃ²ng trÃ² chuyá»?n"
 
 #. Translators: If this checkbox is checked, then Orca will tell
 #. you when one of your buddies is typing a message.
 #.
-#: ../src/orca/scripts/apps/pidgin/script.py:292
+#: ../src/orca/scripts/apps/pidgin/script.py:285
 msgid "Announce when your _buddies are typing"
 msgstr "ThÃ´ng bÃ¡o khi _báº¡n bÃ¨ Ä?ang gÃµ"
 
@@ -6614,7 +6983,7 @@ msgstr "ThÃ´ng bÃ¡o khi _báº¡n bÃ¨ Ä?ang gÃµ"
 #. a single history which contains the latest messages from all the
 #. chat rooms that they are currently in.
 #.
-#: ../src/orca/scripts/apps/pidgin/script.py:304
+#: ../src/orca/scripts/apps/pidgin/script.py:297
 msgid "Provide chat room specific _message histories"
 msgstr "Cung cáº¥p lÆ°á»£c sá» _má»?i phÃ²ng chÃ¡t"
 
@@ -6622,7 +6991,7 @@ msgstr "Cung cáº¥p lÆ°á»£c sá» _má»?i phÃ²ng chÃ¡t"
 #. irrespective of whether the pidgin application currently has focus.
 #. This is the default behaviour.
 #.
-#: ../src/orca/scripts/apps/pidgin/script.py:331
+#: ../src/orca/scripts/apps/pidgin/script.py:324
 msgid "All cha_nnels"
 msgstr "Má»?i kÃª_nh"
 
@@ -6630,113 +6999,92 @@ msgstr "Má»?i kÃª_nh"
 #. that currently has focus, irrespective of whether the pidgin
 #. application has focus.
 #.
-#: ../src/orca/scripts/apps/pidgin/script.py:346
+#: ../src/orca/scripts/apps/pidgin/script.py:339
 msgid "A channel only if its _window is active"
 msgstr "Chá»? kÃªnh cÃ³ cá»a _sá»? hoáº¡t Ä?á»?ng"
 
-#: ../src/orca/scripts/apps/pidgin/script.py:359
+#: ../src/orca/scripts/apps/pidgin/script.py:352
 msgid "All channels when an_y Pidgin window is active"
 msgstr "Má»?i kÃªnh khi cÃ³ má»?t cá»a sá»? _Pidgin hoáº¡t Ä?á»?ng"
 
 #. Translators: this is the title of a panel holding options for
 #. how messages in the pidgin chat rooms should be spoken.
 #.
-#: ../src/orca/scripts/apps/pidgin/script.py:370
+#: ../src/orca/scripts/apps/pidgin/script.py:363
 msgid "Speak messages from"
 msgstr "NÃ³i má»?i tin nháº¯n tá»«"
 
-#: ../src/orca/scripts/apps/pidgin/script.py:454
+#: ../src/orca/scripts/apps/pidgin/script.py:447
 msgid "speak chat room name."
 msgstr "nÃ³i tÃªn cá»§a phÃ²ng chÃ¡t."
 
-#: ../src/orca/scripts/apps/pidgin/script.py:458
+#: ../src/orca/scripts/apps/pidgin/script.py:451
 msgid "Do not speak chat room name."
 msgstr "KhÃ´ng nÃ³i tÃªn cá»§a phÃ²ng chÃ¡t."
 
-#: ../src/orca/scripts/apps/pidgin/script.py:473
+#: ../src/orca/scripts/apps/pidgin/script.py:466
 msgid "announce when your buddies are typing."
 msgstr "thÃ´ng bÃ¡o khi báº¡n bÃ¨ Ä?ang gÃµ."
 
-#: ../src/orca/scripts/apps/pidgin/script.py:477
+#: ../src/orca/scripts/apps/pidgin/script.py:470
 msgid "Do not announce when your buddies are typing."
 msgstr "KhÃ´ng thÃ´ng bÃ¡o khi báº¡n bÃ¨ Ä?ang gÃµ."
 
-#: ../src/orca/scripts/apps/pidgin/script.py:492
+#: ../src/orca/scripts/apps/pidgin/script.py:485
 msgid "Provide chat room specific message histories."
 msgstr "Cung cáº¥p lÆ°á»£c sá» má»?i phÃ²ng chÃ¡t."
 
-#: ../src/orca/scripts/apps/pidgin/script.py:496
+#: ../src/orca/scripts/apps/pidgin/script.py:489
 msgid "Do not provide chat room specific message histories."
 msgstr "KhÃ´ng cung cáº¥p lÆ°á»£c sá» má»?i phÃ²ng chÃ¡t"
 
-#: ../src/orca/scripts/apps/pidgin/script.py:525
+#: ../src/orca/scripts/apps/pidgin/script.py:518
 #, python-format
 msgid "Message from chat room %s"
 msgstr "Tin nháº¯n tá»« phÃ²ng chÃ¡t %s"
 
-#: ../src/orca/scripts/apps/pidgin/script.py:614
+#: ../src/orca/scripts/apps/pidgin/script.py:607
 #, python-format
 msgid "New chat tab %s"
 msgstr "Tháº» chÃ¡t má»?i %s"
 
-#. Translators: this is the number of items in a layered
-#. pane or table.
-#.
-#: ../src/orca/scripts/apps/pidgin/speech_generator.py:101
-#: ../src/orca/speechgenerator.py:1538
-#, python-format
-msgid "%d item"
-msgid_plural "%d items"
-msgstr[0] "%d má»¥c"
-
-#. Translators: this in reference to a row in a table.
-#.
-#. Translators: this is in reference to a row in a table.
-#.
-#: ../src/orca/scripts/apps/pidgin/where_am_i.py:100
-#: ../src/orca/scripts/apps/pidgin/where_am_i.py:127
-#: ../src/orca/where_am_I.py:647
-#, python-format
-msgid "row %d of %d"
-msgstr "hÃ ng %d trÃªn %d"
-
-#: ../src/orca/scripts/apps/planner/braille_generator.py:72
-#: ../src/orca/scripts/apps/planner/speech_generator.py:59
+#: ../src/orca/scripts/apps/planner/braille_generator.py:67
+#: ../src/orca/scripts/apps/planner/speech_generator.py:63
 msgid "Display more options"
 msgstr "Hiá»?n thá»? tÃ¹y chá»?n thÃªm"
 
 #. Translators: this is the input line of a spreadsheet
 #. (i.e., the place where enter formulas)
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:199
+#: ../src/orca/scripts/apps/soffice/script.py:235
 msgid "Speaks the contents of the input line."
 msgstr "NÃ³i Ä?oáº¡n náº±m trÃªn dÃ²ng nháºp."
 
 #. Translators: Orca allows you to dynamically define which
 #. row of a spreadsheet or table counts as column headers.
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:207
+#: ../src/orca/scripts/apps/soffice/script.py:243
 msgid "Set the row to use as dynamic column headers when speaking calc cells."
 msgstr "Ä?áº·t hÃ ng cáº§n dÃ¹ng lÃ m pháº§n Ä?áº§u cá»?t Ä?á»?ng khi nÃ³i Ã´ kiá»?u tÃnh."
 
 #. Translators: Orca allows you to dynamically define which
 #. row of a spreadsheet or table counts as column headers.
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:216
+#: ../src/orca/scripts/apps/soffice/script.py:252
 msgid "Clears the dynamic column headers."
 msgstr "XoÃ¡ sáº¡ch cÃ¡c Ä?áº§u cá»?t Ä?á»?ng."
 
 #. Translators: Orca allows you to dynamically define which
 #. column of a spreadsheet or table counts as row headers.
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:224
+#: ../src/orca/scripts/apps/soffice/script.py:260
 msgid "Set the column to use as dynamic row headers to use when speaking calc cells."
 msgstr "Ä?áº·t cá»?t cáº§n dÃ¹ng lÃ m pháº§n Ä?áº§u hÃ ng Ä?á»?ng khi nÃ³i Ã´ báº£ng tÃnh."
 
 #. Translators: Orca allows you to dynamically define which
 #. column of a spreadsheet or table counts as row headers.
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:233
+#: ../src/orca/scripts/apps/soffice/script.py:269
 msgid "Clears the dynamic row headers"
 msgstr "XoÃ¡ sáº¡ch cÃ¡c Ä?áº§u hÃ ng Ä?á»?ng."
 
@@ -6746,21 +7094,62 @@ msgstr "XoÃ¡ sáº¡ch cÃ¡c Ä?áº§u hÃ ng Ä?á»?ng."
 #. of the current spread sheet cell. Coordinates are the row and
 #. column position within the spread sheet (i.e. A1, B1, C2 ...)
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:300
+#: ../src/orca/scripts/apps/soffice/script.py:340
 msgid "Speak spread sheet cell coordinates"
 msgstr "NÃ³i toáº¡ Ä?á»? Ã´ trong báº£ng tÃnh"
 
+#. Translators: this is an option to tell Orca whether or not it
+#. should speak table cell coordinates in document content.
+#.
+#: ../src/orca/scripts/apps/soffice/script.py:367
+#: ../src/orca/scripts/toolkits/Gecko/script.py:919
+msgid "Speak _cell coordinates"
+msgstr "NÃ³i t_oáº¡ Ä?á»? Ã´"
+
+#. Translators: this is an option to tell Orca whether or not it
+#. should speak the span size of a table cell (e.g., how many
+#. rows and columns a particular table cell spans in a table).
+#.
+#: ../src/orca/scripts/apps/soffice/script.py:379
+#: ../src/orca/scripts/toolkits/Gecko/script.py:931
+msgid "Speak _multiple cell spans"
+msgstr "NÃ³i Ã´ th_eo nhiá»?u hÃ ng"
+
+#. Translators: this is an option for whether or not to speak
+#. the header of a table cell in document content.
+#.
+#: ../src/orca/scripts/apps/soffice/script.py:390
+#: ../src/orca/scripts/toolkits/Gecko/script.py:942
+msgid "Announce cell _header"
+msgstr "T_hÃ´ng bÃ¡o pháº§n Ä?áº§u Ã´"
+
+#. Translators: this is an option to allow users to skip over
+#. empty/blank cells when navigating tables in document content.
+#.
+#: ../src/orca/scripts/apps/soffice/script.py:401
+#: ../src/orca/scripts/toolkits/Gecko/script.py:953
+msgid "Skip _blank cells"
+msgstr "Bá»? qua Ã´ _rá»?ng"
+
+#. Translators: this is the title of a panel containing options
+#. for specifying how to navigate tables in document content.
+#.
+#: ../src/orca/scripts/apps/soffice/script.py:412
+#: ../src/orca/scripts/toolkits/Gecko/script.py:964
+msgid "Table Navigation"
+msgstr "Duyá»?t Báº£ng"
+
 #. Translators: this is used to announce that the
 #. current input line in a spreadsheet is blank/empty.
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:778
+#: ../src/orca/scripts/apps/soffice/script.py:957
 msgid "empty"
 msgstr "rá»?ng"
 
 #. Translators: Orca allows you to dynamically define which
 #. row of a spreadsheet or table counts as column headers.
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:856
+#: ../src/orca/scripts/apps/soffice/script.py:1035
 #, python-format
 msgid "Dynamic column header set for row %d"
 msgstr "Pháº§n Ä?áº§u cá»?t Ä?á»?ng Ä?Ã£ Ä?áº·t cho hÃ ng %d"
@@ -6768,14 +7157,14 @@ msgstr "Pháº§n Ä?áº§u cá»?t Ä?á»?ng Ä?Ã£ Ä?áº·t cho hÃ ng %d"
 #. Translators: Orca allows you to dynamically define which
 #. row of a spreadsheet or table counts as column headers.
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:879
+#: ../src/orca/scripts/apps/soffice/script.py:1058
 msgid "Dynamic column header cleared."
 msgstr "Pháº§n Ä?áº§u cá»?t Ä?á»?ng bá»? xoÃ¡."
 
 #. Translators: Orca allows you to dynamically define which
 #. column of a spreadsheet or table counts as row headers.
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:932
+#: ../src/orca/scripts/apps/soffice/script.py:1111
 #, python-format
 msgid "Dynamic row header set for column %s"
 msgstr "Pháº§n Ä?áº§u hÃ ng Ä?á»?ng Ä?Ã£ Ä?áº·t cho cá»?t %s"
@@ -6783,7 +7172,7 @@ msgstr "Pháº§n Ä?áº§u hÃ ng Ä?á»?ng Ä?Ã£ Ä?áº·t cho cá»?t %s"
 #. Translators: Orca allows you to dynamically define which
 #. column of a spreadsheet or table counts as row headers.
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:956
+#: ../src/orca/scripts/apps/soffice/script.py:1135
 msgid "Dynamic row header cleared."
 msgstr "Pháº§n Ä?áº§u hÃ ng Ä?á»?ng bá»? xoÃ¡."
 
@@ -6793,7 +7182,7 @@ msgstr "Pháº§n Ä?áº§u hÃ ng Ä?á»?ng bá»? xoÃ¡."
 #. using.  We hate keying off stuff like this, but
 #. we're forced to do so in this case.
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:1141
+#: ../src/orca/scripts/apps/soffice/script.py:1320
 msgid "Welcome to StarOffice"
 msgstr "ChÃºc má»«ng báº¡n dÃ¹ng StarOffice"
 
@@ -6804,15 +7193,15 @@ msgstr "ChÃºc má»«ng báº¡n dÃ¹ng StarOffice"
 #. We really try to avoid doing this kind of thing, but
 #. sometimes it is necessary and we apologize.
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:1188
+#: ../src/orca/scripts/apps/soffice/script.py:1367
 msgid "Available fields"
 msgstr "TrÆ°á»?ng sáºµn sÃ ng"
 
-#: ../src/orca/scripts/apps/soffice/script.py:1351
+#: ../src/orca/scripts/apps/soffice/script.py:1530
 msgid "Note that the Scroll Down button has to be pressed numerous times."
 msgstr "Ghi chÃº ráº±ng cÃ¡i nÃºt Cuá»?n Xuá»?ng cáº§n Ä?Æ°á»£c báº¥m nhiá»?u láº§n."
 
-#: ../src/orca/scripts/apps/soffice/script.py:1367
+#: ../src/orca/scripts/apps/soffice/script.py:1546
 msgid "License Agreement Accept button now has focus."
 msgstr "CÃ¡i nÃºt Ä?á»?ng Ã½ vá»?i cÃ¡c Ä?iá»?u kiá»?n giáº¥y phÃ©p lÃºc bÃ¢y giá»? lÃ  hoáº¡t Ä?á»?ng."
 
@@ -6822,7 +7211,7 @@ msgstr "CÃ¡i nÃºt Ä?á»?ng Ã½ vá»?i cÃ¡c Ä?iá»?u kiá»?n giáº¥y phÃ©p lÃºc bÃ¢y gi
 #. is using.  We hate keying off stuff like this, but we're
 #. forced to in this case.
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:1396
+#: ../src/orca/scripts/apps/soffice/script.py:1575
 msgid "First name"
 msgstr "TÃªn"
 
@@ -6830,7 +7219,7 @@ msgstr "TÃªn"
 #. in StarOffice/OpenOffice calc that allows you to type in a
 #. cell coordinate (e.g., A4) and then move to it.
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:1470
+#: ../src/orca/scripts/apps/soffice/script.py:1649
 msgid "Move to cell"
 msgstr "Chuyá»?n sang Ã´"
 
@@ -6841,7 +7230,7 @@ msgstr "Chuyá»?n sang Ã´"
 #. stuff like this, but we're forced to do so in this
 #. case.
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:1777
+#: ../src/orca/scripts/apps/soffice/script.py:1982
 msgid "Presentation Wizard"
 msgstr "Trá»£ lÃ½ TrÃ¬nh diá»?n"
 
@@ -6850,62 +7239,41 @@ msgstr "Trá»£ lÃ½ TrÃ¬nh diá»?n"
 #. has a formula
 #. (e.g., "=sum(a1:d1)")
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:1912
+#: ../src/orca/scripts/apps/soffice/script.py:2118
 msgid "has formula"
 msgstr "cÃ³ cÃ´ng thá»©c"
 
 #. Translators: this is the name of a cell in a spreadsheet.
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:1965
+#: ../src/orca/scripts/apps/soffice/script.py:2171
 #, python-format
 msgid "Cell %s"
 msgstr "Ã? %s"
 
-#. Translators: this indicates that there are zero items in
-#. a layered pane or table.
+#. Translators: people can enter a string of text that is
+#. too wide for a spreadsheet cell.  This string will be
+#. spoken if such a cell is encountered.
 #.
-#. Translators: this is the number of items in a layered pane
-#. or table.
-#.
-#: ../src/orca/scripts/apps/soffice/speech_generator.py:128
-#: ../src/orca/speechgenerator.py:859
-#: ../src/orca/speechgenerator.py:1415
-msgid "0 items"
-msgstr "0 má»¥c"
-
-#. Translators: this represents the state of a check box
-#.
-#. Translators: this represents the state of a locking modifier
-#. key (e.g., Caps Lock)
-#.
-#: ../src/orca/scripts/apps/soffice/speech_generator.py:372
-#: ../src/orca/scripts/apps/soffice/speech_generator.py:402
-#: ../src/orca/speechserver.py:213
-#: ../src/orca/speech.py:202
-msgid "on"
-msgstr "báºt"
+#: ../src/orca/scripts/apps/soffice/speech_generator.py:341
+#, python-format
+msgid "%d character too long"
+msgid_plural "%d characters too long"
+msgstr[0] "quÃ¡ dÃ i theo %d kÃ½ tá»±"
 
-#. Translators: this represents the state of a check box
-#.
-#. Translators: this represents the state of a locking modifier
-#. key (e.g., Caps Lock)
+#. Translators: this represents the (row, col) position of
+#. a cell in a table.
 #.
-#: ../src/orca/scripts/apps/soffice/speech_generator.py:376
-#: ../src/orca/scripts/apps/soffice/speech_generator.py:406
-#: ../src/orca/speechserver.py:218
-#: ../src/orca/speech.py:207
-msgid "off"
-msgstr "táº¯t"
-
-#: ../src/orca/scripts/apps/soffice/where_am_i.py:99
+#: ../src/orca/scripts/apps/soffice/structural_navigation.py:123
+#: ../src/orca/structural_navigation.py:3382
 #, python-format
-msgid "row %d"
-msgstr "hÃ ng %d"
+#| msgid "Row %d, column %d."
+msgid "Row %(row)d, column %(column)d."
+msgstr "HÃ ng %(row)d, cá»?t %(column)d."
 
 #. Translators: this is the name of a panel in Thunderbird.
 #.
-#: ../src/orca/scripts/apps/Thunderbird/script.py:541
-#: ../src/orca/scripts/apps/Thunderbird/script.py:558
+#: ../src/orca/scripts/apps/Thunderbird/script.py:578
+#: ../src/orca/scripts/apps/Thunderbird/script.py:595
 #, python-format
 msgid "%s panel"
 msgstr "báº£ng Ä?iá»?u khiá»?n %s"
@@ -6916,122 +7284,134 @@ msgstr "báº£ng Ä?iá»?u khiá»?n %s"
 msgid "entered bookmark"
 msgstr "liÃªn káº¿t lÆ°u Ä?Ã£ nháºp vÃ o"
 
+#. Translators: The following string is spoken to let the user
+#. know that he/she is on a link within an image map. An image
+#. map is an image/graphic which has been divided into regions.
+#. Each region can be clicked on and has an associated link.
+#. Please see http://en.wikipedia.org/wiki/Imagemap for more
+#. information and examples.
+#.
+#: ../src/orca/scripts/toolkits/Gecko/braille_generator.py:152
+#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:129
+msgid "image map link"
+msgstr "liÃªn káº¿t sÆ¡ Ä?á»? áº£nh"
+
 #. Translators: this is for navigating HTML content one
 #. character at a time.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:369
+#: ../src/orca/scripts/toolkits/Gecko/script.py:383
 msgid "Goes to next character."
 msgstr "Ä?i tá»?i kÃ½ tá»± káº¿ tiáº¿p."
 
 #. Translators: this is for navigating HTML content one
 #. character at a time.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:377
+#: ../src/orca/scripts/toolkits/Gecko/script.py:391
 msgid "Goes to previous character."
 msgstr "Ä?i vá»? kÃ½ tá»± trÆ°á»?c Ä?Ã³."
 
 #. Translators: this is for navigating HTML content one
 #. word at a time.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:385
+#: ../src/orca/scripts/toolkits/Gecko/script.py:399
 msgid "Goes to next word."
 msgstr "Ä?i tá»?i tá»« káº¿ tiáº¿p."
 
 #. Translators: this is for navigating HTML content one
 #. word at a time.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:393
+#: ../src/orca/scripts/toolkits/Gecko/script.py:407
 msgid "Goes to previous word."
 msgstr "Ä?i vá»? tá»« trÆ°á»?c Ä?Ã³."
 
 #. Translators: this is for navigating HTML content one
 #. line at a time.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:401
+#: ../src/orca/scripts/toolkits/Gecko/script.py:415
 msgid "Goes to next line."
 msgstr "Ä?i tá»?i dÃ²ng káº¿ tiáº¿p."
 
 #. Translators: this is for navigating HTML content one
 #. line at a time.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:409
+#: ../src/orca/scripts/toolkits/Gecko/script.py:423
 msgid "Goes to previous line."
 msgstr "Ä?i vá»? dÃ²ng trÆ°á»?c Ä?Ã³."
 
 #. Translators: this command will move the user to the
 #. beginning of an HTML document.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:417
+#: ../src/orca/scripts/toolkits/Gecko/script.py:431
 msgid "Goes to the top of the file."
 msgstr "Ä?i vá»? Ä?áº§u cá»§a táºp tin."
 
 #. Translators: this command will move the user to the
 #. end of an HTML document.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:425
+#: ../src/orca/scripts/toolkits/Gecko/script.py:439
 msgid "Goes to the bottom of the file."
 msgstr "Ä?i tá»?i cuá»?i cá»§a táºp tin."
 
 #. Translators: this command will move the user to the
 #. beginning of the line in an HTML document.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:433
+#: ../src/orca/scripts/toolkits/Gecko/script.py:447
 msgid "Goes to the beginning of the line."
 msgstr "Ä?i vá»? Ä?áº§u cá»§a dÃ²ng."
 
 #. Translators: this command will move the user to the
 #. end of the line in an HTML document.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:441
+#: ../src/orca/scripts/toolkits/Gecko/script.py:455
 msgid "Goes to the end of the line."
 msgstr "Ä?i tá»?i cuá»?i cá»§a dÃ²ng."
 
 #. Translators: this is for causing a collapsed combo box
 #. which was reached by Orca's caret navigation to be expanded.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:449
+#: ../src/orca/scripts/toolkits/Gecko/script.py:463
 msgid "Causes the current combo box to be expanded."
 msgstr "GÃ¢y ra há»?p tá»? há»£p Ä?Æ°á»£c giÃ£n ra."
 
 #. Translators: this is for advancing the live regions
 #. politeness setting
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:457
+#: ../src/orca/scripts/toolkits/Gecko/script.py:471
 msgid "Advance live region politeness setting."
 msgstr "TÄ?ng giÃ¡ trá»? tÃ¹y theo vÃ¹ng Ä?á»?ng."
 
 #. Translators: this is for setting all live regions
 #. to 'off' politeness.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:465
+#: ../src/orca/scripts/toolkits/Gecko/script.py:479
 msgid "Set default live region politeness level to off."
 msgstr "Táº¯t má»©c tÃ¹y theo vÃ¹ng Ä?á»?ng."
 
 #. Translators: this is a toggle to monitor live regions
 #. or not.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:473
+#: ../src/orca/scripts/toolkits/Gecko/script.py:487
 msgid "Monitor live regions."
 msgstr "Theo dÃµi vÃ¹ng Ä?á»?ng."
 
 #. Translators: this is for reviewing up to nine stored
 #. previous live messages.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:481
+#: ../src/orca/scripts/toolkits/Gecko/script.py:495
 msgid "Review live region announcement."
 msgstr "Xem láº¡i thÃ´ng bÃ¡o vÃ¹ng Ä?á»?ng."
 
 #. Translators: this is for navigating between objects
 #. (regardless of type) in HTML
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:489
+#: ../src/orca/scripts/toolkits/Gecko/script.py:503
 msgid "Goes to the previous object."
 msgstr "Ä?i vá»? Ä?á»?i tÆ°á»£ng trÆ°á»?c."
 
 #. Translators: this is for navigating between objects
 #. (regardless of type) in HTML
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:497
+#: ../src/orca/scripts/toolkits/Gecko/script.py:511
 msgid "Goes to the next object."
 msgstr "Ä?i tá»?i Ä?á»?i tÆ°á»£ng káº¿ tiáº¿p."
 
@@ -7042,10 +7422,22 @@ msgstr "Ä?i tá»?i Ä?á»?i tÆ°á»£ng káº¿ tiáº¿p."
 #. the ability to switch between the Firefox mode and the
 #. Orca mode.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:509
+#: ../src/orca/scripts/toolkits/Gecko/script.py:523
 msgid "Switches between Gecko native and Orca caret navigation."
 msgstr "Chuyá»?n Ä?á»?i giá»¯a cÃ¡ch duyá»?t qua sá»? há»¯u cá»§a Gecko vÃ  kiá»?u dáº¥u mÅ© cá»§a Oca."
 
+#. Translators: hovering the mouse over certain objects
+#. on a web page causes a new object to appear such as
+#. a pop-up menu. This command will move the user to the
+#. object which just appeared as a result of the user
+#. hovering the mouse. If the user is already in the
+#. mouse over object, this command will hide the mouse
+#. over and return the user to the object he/she was in.
+#.
+#: ../src/orca/scripts/toolkits/Gecko/script.py:579
+msgid "Moves focus into and away from the current mouse over."
+msgstr "Chuyá»?n tiÃªu Ä?iá»?m vÃ o vÃ  ra vá»? trÃ con chuá»?t hiá»?n thá»?i."
+
 #. Translators: Gecko native caret navigation is where
 #. Firefox itself controls how the arrow keys move the caret
 #. around HTML content.  It's often broken, so Orca needs
@@ -7053,7 +7445,7 @@ msgstr "Chuyá»?n Ä?á»?i giá»¯a cÃ¡ch duyá»?t qua sá»? há»¯u cá»§a Gecko vÃ  ki
 #. the ability to switch between the Firefox mode and the
 #. Orca mode.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:753
+#: ../src/orca/scripts/toolkits/Gecko/script.py:826
 msgid "Use _Orca Caret Navigation"
 msgstr "DÃ¹ng kháº£ nÄ?ng duyá»?t qua dáº¥u mÅ© _Orca"
 
@@ -7061,17 +7453,30 @@ msgstr "DÃ¹ng kháº£ nÄ?ng duyá»?t qua dáº¥u mÅ© _Orca"
 #. in a structural manner: go to previous/next header, list item,
 #. table, etc.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:766
+#: ../src/orca/scripts/toolkits/Gecko/script.py:839
 msgid "Use Orca _Structural Navigation"
 msgstr "DÃ¹ng kháº£ nÄ?ng duyá»?t qua cáº¥u trÃºc O_rca"
 
+#. Translators: Orca has had to implement its own caret navigation
+#. model to work around issues in Gecko/Firefox. In certain versions
+#. of Firefox, we must perform a focus grab on each object being
+#. navigated in order for things to work as expected; in other
+#. versions of Firefox, we must avoid doing so in order for things
+#. to work as expected. We cannot identify with certainty which
+#. situation the user is in, so we must provide this as an option
+#. within Orca.
+#.
+#: ../src/orca/scripts/toolkits/Gecko/script.py:856
+msgid "_Grab focus on objects when navigating"
+msgstr "Báº¯t tiÃªu Ä?iá»?m trÃªn Ä?á»?i tÆ°á»£n_g khi duyá»?t qua"
+
 #. Translators: when the user arrows up and down in HTML content,
 #. it is some times beneficial to always position the cursor at the
 #. beginning of the line rather than guessing the position directly
 #. above the current cursor position.  This option allows the user
 #. to decide the behavior they want.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:781
+#: ../src/orca/scripts/toolkits/Gecko/script.py:871
 msgid "_Position cursor at start of line when navigating vertically"
 msgstr "Ä?á»? con cháº¡y á»? Ä?áº§u dÃ²ng khi duyá»?t qua theo chiá»?u dá»?c"
 
@@ -7079,7 +7484,7 @@ msgstr "Ä?á»? con cháº¡y á»? Ä?áº§u dÃ²ng khi duyá»?t qua theo chiá»?u dá»?c"
 #. can optionally tell Orca to automatically start reading a
 #. page from beginning to end.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:794
+#: ../src/orca/scripts/toolkits/Gecko/script.py:884
 msgid "Automatically start speaking a page when it is first _loaded"
 msgstr "Tá»± Ä?á»?ng _báº¯t Ä?áº§u nÃ³i má»?t trang má»?i náº¡p"
 
@@ -7087,51 +7492,15 @@ msgstr "Tá»± Ä?á»?ng _báº¯t Ä?áº§u nÃ³i má»?t trang má»?i náº¡p"
 #. how to navigate HTML content (e.g., Orca caret navigation,
 #. positioning of caret, etc.).
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:806
+#: ../src/orca/scripts/toolkits/Gecko/script.py:896
 msgid "Page Navigation"
 msgstr "Duyá»?t Trang"
 
-#. Translators: this is an option to tell Orca whether or not it
-#. should speak table cell coordinates in HTML content.
-#.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:829
-msgid "Speak _cell coordinates"
-msgstr "NÃ³i t_oáº¡ Ä?á»? Ã´"
-
-#. Translators: this is an option to tell Orca whether or not it
-#. should speak the span size of a table cell (e.g., how many
-#. rows and columns a particular table cell spans in a table).
-#.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:841
-msgid "Speak _multiple cell spans"
-msgstr "NÃ³i Ã´ th_eo nhiá»?u hÃ ng"
-
-#. Translators: this is an option for whether or not to speak
-#. the header of a table cell in HTML content.
-#.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:852
-msgid "Announce cell _header"
-msgstr "T_hÃ´ng bÃ¡o pháº§n Ä?áº§u Ã´"
-
-#. Translators: this is an option to allow users to skip over
-#. empty/blank cells when navigating tables in HTML content.
-#.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:863
-msgid "Skip _blank cells"
-msgstr "Bá»? qua Ã´ _rá»?ng"
-
-#. Translators: this is the title of a panel containing options
-#. for specifying how to navigate tables in HTML content.
-#.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:874
-msgid "Table Navigation"
-msgstr "Duyá»?t Báº£ng"
-
 #. Translators: this is an option to allow users to have Orca
 #. automatically speak the line that contains the match while
 #. the user is still in Firefox's Find toolbar.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:898
+#: ../src/orca/scripts/toolkits/Gecko/script.py:988
 msgid "Speak results during _find"
 msgstr "NÃ³i _káº¿t quáº£ trong khi tÃ¬m"
 
@@ -7140,7 +7509,7 @@ msgstr "NÃ³i _káº¿t quáº£ trong khi tÃ¬m"
 #. be spoken, or only spoken if it is a different line than the
 #. line which contained the last match.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:911
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1001
 msgid "Onl_y speak changed lines during find"
 msgstr "Chá»? nÃ³i dÃ²ng nÃ o tha_y Ä?á»?i trong khi tÃ¬m"
 
@@ -7148,36 +7517,54 @@ msgstr "Chá»? nÃ³i dÃ²ng nÃ o tha_y Ä?á»?i trong khi tÃ¬m"
 #. of matched characters that must be present before Orca speaks
 #. the line that contains the results from the Find toolbar.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:928
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1018
 msgid "Minimum length of matched text:"
 msgstr "Ä?á»? dÃ i vÄ?n báº£n khá»?p tá»?i thiá»?u :"
 
 #. Translators: this is the title of a panel containing options
 #. for using Firefox's Find toolbar.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:953
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1043
 msgid "Find Options"
 msgstr "TÃ¹y chá»?n tÃ¬m"
 
-#. Translators: this is in reference to loading a web page.
+#. Translators: when the user selects (highlights) text in
+#. a document, Orca will speak information about what they
+#. have selected.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:1808
-msgid "Loading.  Please wait."
-msgstr "Ä?ang náº¡p. Vui lÃ²ng chá»?."
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1632
+msgid "line selected down from cursor position"
+msgstr "dÃ²ng Ä?Æ°á»£c chá»?n bÃªn dÆ°á»?i vá»? trÃ con trá»?"
+
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1633
+msgid "line unselected down from cursor position"
+msgstr "dÃ²ng bá»? bá»? chá»?n bÃªn dÆ°á»?i vá»? trÃ con trá»?"
 
-#. Translators: this is in reference to loading a web page.
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1634
+msgid "line selected up from cursor position"
+msgstr "dÃ²ng Ä?Æ°á»£c chá»?n bÃªn trÃªn vá»? trÃ con trá»?"
+
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1635
+msgid "line unselected up from cursor position"
+msgstr "dÃ²ng bá»? bá»? chá»?n bÃªn trÃªn vá»? trÃ con trá»?"
+
+#. Translators: Orca has a command that moves the mouse
+#. pointer to the current location on a web page. If
+#. moving the mouse pointer caused an item to appear
+#. such as a pop-up menu, we want to present that fact.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:1813
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1678
+msgid "New item has been added"
+msgstr "Má»¥c má»?i Ä?Ã£ Ä?Æ°á»£c thÃªm vÃ o"
+
+#. Translators: this is in reference to loading a web page
+#. or some other content.
+#.
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1968
 #, python-format
 msgid "Finished loading %s."
 msgstr "HoÃ n táº¥t náº¡p %s."
 
-#. Translators: this is in reference to loading a web page.
-#.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:1819
-msgid "Finished loading."
-msgstr "HoÃ n táº¥t náº¡p."
-
 #. Translators: the 'h' below represents a heading level
 #. attribute for content that you might find in something
 #. such as HTML content (e.g., <h1>). The translated form
@@ -7185,14 +7572,24 @@ msgstr "HoÃ n táº¥t náº¡p."
 #. heading level, where the single character is to indicate
 #. 'heading'.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:2281
+#: ../src/orca/scripts/toolkits/Gecko/script.py:2458
 #, python-format
 msgid "h%d"
 msgstr "h%d"
 
+#. Translators: hovering the mouse over certain objects on a
+#. web page causes a new object to appear such as a pop-up
+#. menu. Orca has a command will move the user to the object
+#. which just appeared as a result of the user hovering the
+#. mouse. If this command fails, Orca will present this message.
+#.
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6053
+msgid "Mouse over object not found."
+msgstr "KhÃ´ng tÃ¬m tháº¥y con chuá»?t á»? trÃªn Ä?á»?i tÆ°á»£ng."
+
 #. Translators: this is the action name for the 'open' action.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5978
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6539
 msgid "open"
 msgstr "má»?"
 
@@ -7202,8 +7599,8 @@ msgstr "má»?"
 #. the bottom of the page and continuing looking upwards.
 #. We need to inform the user when this is taking place.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6051
-#: ../src/orca/structural_navigation.py:883
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6612
+#: ../src/orca/structural_navigation.py:884
 msgid "Wrapping to bottom."
 msgstr "Cuá»?n Ä?áº¿n Ä?Ã¡y."
 
@@ -7213,17 +7610,17 @@ msgstr "Cuá»?n Ä?áº¿n Ä?Ã¡y."
 #. top of the page and continuing looking downwards. We need
 #. to inform the user when this is taking place.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6119
-#: ../src/orca/structural_navigation.py:891
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6680
+#: ../src/orca/structural_navigation.py:892
 msgid "Wrapping to top."
 msgstr "Cuá»?n Ä?áº¿n Ä?á»?nh."
 
 #. Translators: this announces to the user that live region
 #. support has been turned off.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6145
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6169
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6179
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6706
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6730
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6740
 #: ../src/orca/structural_navigation.py:396
 msgid "Live region support is off"
 msgstr "Há»? trá»£ vÃ¹ng Ä?á»?ng bá»? táº¯t"
@@ -7231,11 +7628,11 @@ msgstr "Há»? trá»£ vÃ¹ng Ä?á»?ng bá»? táº¯t"
 #. Translators: this announces to the user that live region
 #. are being monitored.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6153
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6714
 msgid "Live regions monitoring on"
 msgstr "Theo dÃµi vÃ¹ng Ä?á»?ng Ä?Ã£ báºt"
 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6160
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6721
 msgid "Live regions monitoring off"
 msgstr "Theo dÃµi vÃ¹ng Ä?á»?ng bá»? táº¯t"
 
@@ -7246,7 +7643,7 @@ msgstr "Theo dÃµi vÃ¹ng Ä?á»?ng bá»? táº¯t"
 #. the ability to switch between the Firefox mode and the
 #. Orca mode.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6195
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6756
 msgid "Gecko is controlling the caret."
 msgstr "Gecko Ä?ang Ä?iá»?u khiá»?n dáº¥u mÅ©."
 
@@ -7257,55 +7654,34 @@ msgstr "Gecko Ä?ang Ä?iá»?u khiá»?n dáº¥u mÅ©."
 #. the ability to switch between the Firefox mode and the
 #. Orca mode.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6207
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6768
 msgid "Orca is controlling the caret."
 msgstr "Orca Ä?ang Ä?iá»?u khiá»?n dáº¥u mÅ©."
 
-#. Translators: the %d is in reference to a heading
+#. Translators: the %(level)d is in reference to a heading
 #. level in HTML (e.g., For <h3>, the level is 3)
-#. and the %s is in reference to a previously
-#. translated rolename for the heading.  If you
-#. change the order of the %s and %d in the string
-#. (as needed for Hungarian, for example), Orca will
-#. detect it and do the right thing.
+#. and the %(role)s is in reference to a previously
+#. translated rolename for the heading.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:93
+#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:250
 #, python-format
-#| msgid "level %d"
-msgid "%s level %d"
-msgstr "%s cáº¥p %d"
-
-#. Translators: "multi-select" refers to a web form list
-#. in which more than one item can be selected at a time.
-#.
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:389
-msgid "multi-select"
-msgstr "Ä?a chá»?n"
+#| msgid "%s level %d"
+msgid "%(role)s level %(level)d"
+msgstr "%(role)s cáº¥p %(level)d"
 
 #. Translators: this represents a list in HTML.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:393
-#: ../src/orca/structural_navigation.py:2803
+#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:281
+#: ../src/orca/structural_navigation.py:2793
 #, python-format
 msgid "List with %d item"
 msgid_plural "List with %d items"
 msgstr[0] "Danh sÃ¡ch cÃ³ %d má»¥c"
 
-#. Translators: The following string is spoken to let the user
-#. know that he/she is on a link within an image map. An image
-#. map is an image/graphic which has been divided into regions.
-#. Each region can be clicked on and has an associated link.
-#. Please see http://en.wikipedia.org/wiki/Imagemap for more
-#. information and examples.
-#.
-#: ../src/orca/scripts/toolkits/Gecko/where_am_i.py:130
-msgid "image map link"
-msgstr "liÃªn káº¿t sÆ¡ Ä?á»? áº£nh"
-
 #. Translators: Announces the number of headings in the
 #. web page that is currently being displayed.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/where_am_i.py:228
+#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:461
 #, python-format
 msgid "%d heading"
 msgid_plural "%d headings"
@@ -7314,7 +7690,7 @@ msgstr[0] "%d pháº§n Ä?áº§u"
 #. Translators: Announces the number of forms in the
 #. web page that is currently being displayed.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/where_am_i.py:234
+#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:466
 #, python-format
 msgid "%d form"
 msgid_plural "%d forms"
@@ -7323,7 +7699,7 @@ msgstr[0] "%d máº«u"
 #. Translators: Announces the number of non-layout tables in the
 #. web page that is currently being displayed.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/where_am_i.py:240
+#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:471
 #, python-format
 msgid "%d table"
 msgid_plural "%d tables"
@@ -7332,7 +7708,7 @@ msgstr[0] "%d báº£ng"
 #. Translators: Announces the number of visited links in the
 #. web page that is currently being displayed.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/where_am_i.py:246
+#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:477
 #, python-format
 msgid "%d visited link"
 msgid_plural "%d visited links"
@@ -7341,7 +7717,7 @@ msgstr[0] "%d liÃªn káº¿t Ä?Ã£ thÄ?m"
 #. Translators: Announces the number of unvisited links in the
 #. web page that is currently being displayed.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/where_am_i.py:252
+#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:483
 #, python-format
 msgid "%d unvisited link"
 msgid_plural "%d unvisited links"
@@ -7352,28 +7728,11 @@ msgstr[0] "%d liÃªn káº¿t chÆ°a thÄ?m"
 #. current position divided by the total number of objects on the
 #. page.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/where_am_i.py:259
+#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:490
 #, python-format
 msgid "%d percent of document read"
 msgstr "%d pháº§n trÄ?m tÃ i liá»?u Ä?Ã£ Ä?á»?c"
 
-#. Translators: this is used to indicate the user is in a text
-#. area that is not editable.  It is meant to be spoken to the user.
-#.
-#: ../src/orca/settings.py:659
-msgctxt "text"
-msgid "read only"
-msgstr "chá»? Ä?á»?c"
-
-#. Translators: this is used to indicate the user is in a text
-#. area that is not editable.  It is meant to be a short abbreviation
-#. to be presented on the braille display.
-#.
-#: ../src/orca/settings.py:665
-msgctxt "text"
-msgid "rdonly"
-msgstr "chá»?_Ä?á»?c"
-
 #. Translators: the regular expression here represents a string to
 #. match in the localized application name as seen by at-poke.  For
 #. most cases, the application name is the name of the binary used to
@@ -7383,28 +7742,28 @@ msgstr "chá»?_Ä?á»?c"
 #. I wish the AT-SPI spec'd this out as machine readable (unlocalized)
 #. names, but it's what we're stuck with (unfortunately).
 #.
-#: ../src/orca/settings.py:999
+#: ../src/orca/settings.py:1046
 msgid "[\\S\\s]*StarOffice[\\s\\S]*"
 msgstr "[\\S\\s]*StarOffice[\\s\\S]*"
 
 #. Translators: see the regular expression note above.  This is for
 #. OpenOffice and StarOffice.
 #.
-#: ../src/orca/settings.py:1004
+#: ../src/orca/settings.py:1051
 msgid "soffice.bin"
 msgstr "soffice.bin"
 
 #. Translators: see the regular expression note above.  This is for
 #. OpenOffice and StarOffice.
 #.
-#: ../src/orca/settings.py:1009
+#: ../src/orca/settings.py:1056
 msgid "soffice"
 msgstr "soffice"
 
 #. Translators: see the regular expression note above.  This is for the
 #. Evolution mail application.
 #.
-#: ../src/orca/settings.py:1014
+#: ../src/orca/settings.py:1061
 msgid "[Ee]volution"
 msgstr "[Ee]volution"
 
@@ -7412,7 +7771,7 @@ msgstr "[Ee]volution"
 #. version of Mozilla Firefox, which chooses to create strange names
 #. for itself at the drop of a hat.
 #.
-#: ../src/orca/settings.py:1020
+#: ../src/orca/settings.py:1067
 msgid "Deer Park"
 msgstr "Deer Park"
 
@@ -7420,7 +7779,7 @@ msgstr "Deer Park"
 #. version of Mozilla Firefox, which chooses to create strange names
 #. for itself at the drop of a hat.
 #.
-#: ../src/orca/settings.py:1026
+#: ../src/orca/settings.py:1073
 msgid "Bon Echo"
 msgstr "Pháº£n há»?i Bon"
 
@@ -7428,44 +7787,35 @@ msgstr "Pháº£n há»?i Bon"
 #. version of Mozilla Firefox, which chooses to create strange names
 #. for itself at the drop of a hat.
 #.
-#: ../src/orca/settings.py:1032
+#: ../src/orca/settings.py:1079
 msgid "Minefield"
 msgstr "Minefield"
 
-# TÃªn chÆ°Æ¡ng trÃ¬nh: Ä?á»«ng dá»?ch.
-#. Translators: see the regular expression note above.  This is for a
-#. version of Thunderbird, which chooses to now call itself by a different
-#. name.
-#.
-#: ../src/orca/settings.py:1052
-msgid "Shredder"
-msgstr "Shredder"
-
 #. Translators: see the regular expression note above.  This is for
 #. the Thunderbird e-mail application.
 #.
-#: ../src/orca/settings.py:1057
+#: ../src/orca/settings.py:1110
 msgid "Mail/News"
 msgstr "ThÆ°/Tin tá»©c"
 
 #. Translators: see the regular expression note above.  This is for
 #. gnome_segv2, which calls itself bug-buddy in at-poke.
 #.
-#: ../src/orca/settings.py:1062
+#: ../src/orca/settings.py:1115
 msgid "bug-buddy"
 msgstr "bug-buddy"
 
 #. Translators: see the regular expression note above.  This is for
 #. the underlying terminal support in gnome-terminal.
 #.
-#: ../src/orca/settings.py:1067
+#: ../src/orca/settings.py:1120
 msgid "vte"
 msgstr "vte"
 
 #. Translators: see the regular expression note above.  This is for
 #. supporting gaim, which has recently be renamed to pidgin.
 #.
-#: ../src/orca/settings.py:1072
+#: ../src/orca/settings.py:1125
 msgid "gaim"
 msgstr "gaim"
 
@@ -7475,11 +7825,120 @@ msgstr "gaim"
 #. will be spoken and displayed in braille to indicate this state is
 #. present.
 #.
-#: ../src/orca/settings.py:1217
-#: ../src/orca/settings.py:1225
+#: ../src/orca/settings.py:1301
+#: ../src/orca/settings.py:1378
 msgid "required"
 msgstr "yÃªu cáº§u"
 
+#. Translators: this is used to indicate the user is in a text
+#. area that is not editable.  It is meant to be spoken to the user.
+#.
+#: ../src/orca/settings.py:1306
+msgctxt "text"
+msgid "read only"
+msgstr "chá»? Ä?á»?c"
+
+#. Translators: this represents an item on the screen that has
+#. been set insensitive (or grayed out).
+#.
+#: ../src/orca/settings.py:1311
+#: ../src/orca/settings.py:1389
+msgid "grayed"
+msgstr "mÃ u xÃ¡m táº¯t"
+
+#. Translators: this represents the state of a node in a tree.
+#. 'expanded' means the children are showing.  'collapsed' means the
+#. children are not showing.
+#.
+#: ../src/orca/settings.py:1335
+#: ../src/orca/settings.py:1401
+msgid "collapsed"
+msgstr "Ä?Ã£ co láº¡i"
+
+#: ../src/orca/settings.py:1335
+#: ../src/orca/settings.py:1401
+msgid "expanded"
+msgstr "Ä?Ã£ giÃ£n ra"
+
+#. Translators: "multi-select" refers to a web form list
+#. in which more than one item can be selected at a time.
+#.
+#: ../src/orca/settings.py:1340
+msgid "multi-select"
+msgstr "Ä?a chá»?n"
+
+#. Translators: this represents the depth of a node in a tree
+#. view (i.e., how many ancestors a node has).  It is meant to be
+#. spoken.
+#.
+#: ../src/orca/settings.py:1346
+#, python-format
+msgid "tree level %d"
+msgstr "cáº¥p cÃ¢y %d"
+
+#. Translators: this represents a list item in a document.
+#. The nesting level is how 'deep' the item is (e.g., a
+#. level of 2 represents a list item inside a list that's
+#. inside another list). This is meant to be spoken.
+#.
+#. Translators: this represents a list item in a document.
+#. The nesting level is how 'deep' the item is (e.g., a
+#. level of 2 represents a list item inside a list that's
+#. inside another list).
+#.
+#: ../src/orca/settings.py:1353
+#: ../src/orca/structural_navigation.py:2808
+#, python-format
+msgid "Nesting level %d"
+msgstr "Cáº¥p lá»?ng nhau %d"
+
+#. Translators: this is a indication of the focused icon and the
+#. count of the total number of icons within an icon panel. An
+#. example of an icon panel is the Nautilus folder view.
+#.
+#: ../src/orca/settings.py:1359
+#, python-format
+msgid "on %(index)d of %(total)d"
+msgstr "trÃªn %(index)d cá»§a %(total)d"
+
+#. Translators: this refers to the position of an item in a list
+#. or group of objects, such as menu items in a menu, radio buttons
+#. in a radio button group, combobox item in a combobox, etc.
+#.
+#: ../src/orca/settings.py:1365
+#, python-format
+msgid "%(index)d of %(total)d"
+msgstr "%(index)d cá»§a %(total)d"
+
+#. Translators: this is used to indicate the user is in a text
+#. area that is not editable.  It is meant to be a short abbreviation
+#. to be presented on the braille display.
+#.
+#: ../src/orca/settings.py:1384
+msgctxt "text"
+msgid "rdonly"
+msgstr "chá»?_Ä?á»?c"
+
+#. Translators: this represents the depth of a node in a tree
+#. view (i.e., how many ancestors a node has).  It is meant to
+#. be presented on a braille display.
+#.
+#: ../src/orca/settings.py:1407
+#, python-format
+msgid "TREE LEVEL %d"
+msgstr "Cáº¤P CÃ?Y %d"
+
+#. Translators: this represents a list item in a document.
+#. The nesting level is how 'deep' the item is (e.g., a
+#. level of 2 represents a list item inside a list that's
+#. inside another list).  It is meant to be presented on
+#. the braille display.
+#.
+#: ../src/orca/settings.py:1415
+#, python-format
+msgid "LEVEL %d"
+msgstr "Cáº¤P %d"
+
 #. Translators: "Default Synthesizer" will appear in the list of available
 #. speech engines as a special item.  It refers to the default engine
 #. configured within the speech subsystem.  Apart from this item, the user
@@ -7506,27 +7965,173 @@ msgstr "Bá»? PhÃ¡t Tiáº¿ng NÃ³i"
 #. the list will contain the names of all available "real"
 #. voices provided by the speech engine.
 #.
-#: ../src/orca/speechdispatcherfactory.py:171
+#: ../src/orca/speechdispatcherfactory.py:173
 #, python-format
 msgid "%s default voice"
 msgstr "Giá»?ng nÃ³i máº·c Ä?á»?nh %s"
 
+#. Translators: this refers to a link to a file, where
+#. the first item is the protocol (ftp, ftps, or file)
+#. and the second item the name of the file being linked
+#. to.
+#.
+#: ../src/orca/speech_generator.py:236
+#, python-format
+#| msgid "%s link to %s"
+msgid "%(uri)s link to %(file)s"
+msgstr "liÃªn káº¿t %(uri)s Ä?áº¿n táºp tin %(file)s"
+
+#. Translators: this is the protocol of a link eg. http, mailto.
+#.
+#: ../src/orca/speech_generator.py:242
+#, python-format
+msgid "%s link"
+msgstr "liÃªn káº¿t %s"
+
+#. Translators: this is an indication that a given
+#. link points to an object that is on the same page.
+#.
+#: ../src/orca/speech_generator.py:275
+msgid "same page"
+msgstr "cÃ¹ng trang"
+
+#. Translators: this is an indication that a given
+#. link points to an object that is at the same site
+#. (but not on the same page as the link).
+#.
+#. Translators: this is an indication that a given
+#. link points to an object that is at the same site
+#. (but not on the same page) as the link.
+#.
+#: ../src/orca/speech_generator.py:281
+#: ../src/orca/speech_generator.py:294
+msgid "same site"
+msgstr "cÃ¹ng trang chá»§"
+
+#. Translators: this is an indication that a given
+#. link points to an object that is at a different
+#. site than that of the link.
+#.
+#: ../src/orca/speech_generator.py:300
+msgid "different site"
+msgstr "trang chá»§ khÃ¡c"
+
+#. Translators: This is the size of a file in bytes
+#.
+#: ../src/orca/speech_generator.py:327
+#, python-format
+msgid "%d byte"
+msgid_plural "%d bytes"
+msgstr[0] "%d byte"
+
+#. Translators: This is the size of a file in kilobytes
+#.
+#: ../src/orca/speech_generator.py:331
+#, python-format
+msgid "%.2f kilobytes"
+msgstr "%.2f kilÃ´byte"
+
+#. Translators: This is the size of a file in megabytes
+#.
+#: ../src/orca/speech_generator.py:335
+#, python-format
+msgid "%.2f megabytes"
+msgstr "%.2f megabyte"
+
+#. Translators: this is in reference to a table cell being
+#. selected or not.
+#.
+#: ../src/orca/speech_generator.py:521
+#| msgid "not selected"
+msgctxt "tablecell"
+msgid "not selected"
+msgstr "chÆ°a chá»?n"
+
+#. Translators: this is in references to a row in a table.
+#.
+#: ../src/orca/speech_generator.py:568
+#, python-format
+msgid "row %d"
+msgstr "hÃ ng %d"
+
+#. Translators: this is in references to a column in a
+#. table.
+#: ../src/orca/speech_generator.py:591
+#, python-format
+#| msgid "column %d of %d"
+msgid "column %(index)d of %(total)d"
+msgstr "cá»?t %(index)d cá»§a %(total)d"
+
+#. Translators: this is in reference to a row in a table.
+#.
+#: ../src/orca/speech_generator.py:596
+#, python-format
+#| msgid "row %d of %d"
+msgid "row %(index)d of %(total)d"
+msgstr "hÃ ng %(index)d cá»§a %(total)d"
+
+#. Translators: This is to indicate to the user that
+#. he/she is in the last cell of a table in a document.
+#.
+#: ../src/orca/speech_generator.py:626
+#| msgid "%d table"
+#| msgid_plural "%d tables"
+msgid "End of table"
+msgstr "Káº¿t thÃºc báº£ng"
+
+#. Translators: this is the percentage value of a progress bar.
+#.
+#: ../src/orca/speech_generator.py:936
+#, python-format
+#| msgid "%d percent."
+msgid "%d percent"
+msgstr "%d pháº§n trÄ?m"
+
+#. Translators: this is the number of items in a layered pane
+#. or table.
+#.
+#: ../src/orca/speech_generator.py:1019
+#: ../src/orca/speech_generator.py:1035
+msgid "0 items"
+msgstr "0 má»¥c"
+
+#. Translators: this is a count of the number of selected icons
+#. and the count of the total number of icons within an icon panel.
+#. An example of an icon panel is the Nautilus folder view.
+#.
+#: ../src/orca/speech_generator.py:1065
+#, python-format
+#| msgid "%d of %d item selected"
+#| msgid_plural "%d of %d items selected"
+msgid "%(index)d of %(total)d item selected"
+msgid_plural "%(index)d of %(total)d items selected"
+msgstr[0] "%(index)d cá»§a %(total)d má»¥c Ä?Æ°á»£c chá»?n"
+
 #. Translators: this tells the user how many unfocused
 #. alert and dialog windows that this application has.
 #.
-#: ../src/orca/speechgenerator.py:714
-#: ../src/orca/where_am_I.py:1755
+#: ../src/orca/speech_generator.py:1114
+#: ../src/orca/speech_generator.py:1383
 #, python-format
 msgid "%d unfocused dialog"
 msgid_plural "%d unfocused dialogs"
 msgstr[0] "%d há»?p thoáº¡i khÃ´ng cÃ³ tiÃªu Ä?iá»?m"
 
-#. Translators: brief spoken words for the rolename of a tear off
-#. menu item.
+#. Translators: this is an alternative name for the
+#. parent object of a series of icons.
 #.
-#: ../src/orca/speechgenerator.py:1702
-msgid "tear off"
-msgstr "tÃ¡ch rá»?i"
+#: ../src/orca/speech_generator.py:1189
+msgid "Icon panel"
+msgstr "Báº£ng biá»?u tÆ°á»£ng"
+
+#. Translators: The "default" button in a dialog box is the
+#. button that gets activated when Enter is pressed anywhere
+#. within that dialog box.
+#.
+#: ../src/orca/speech_generator.py:1332
+#, python-format
+msgid "Default button is %s"
+msgstr "NÃºt máº·c Ä?á»?nh lÃ  %s"
 
 #. Translators: the structural navigation keys are designed
 #. to move the caret around the document content by object
@@ -7535,7 +8140,7 @@ msgstr "tÃ¡ch rá»?i"
 #. This feature needs to be toggle-able so that it does not
 #. interfere with normal writing functions.
 #.
-#: ../src/orca/structural_navigation.py:589
+#: ../src/orca/structural_navigation.py:590
 msgid "Toggles structural navigation keys."
 msgstr "Báºt/táº¯t cÃ¡c phÃm duyá»?t qua kiá»?u cáº¥u trÃºc."
 
@@ -7549,7 +8154,7 @@ msgstr "Báºt/táº¯t cÃ¡c phÃm duyá»?t qua kiá»?u cáº¥u trÃºc."
 #. toggles the structural navigation feature of Orca.
 #. It should be a brief informative message.
 #.
-#: ../src/orca/structural_navigation.py:643
+#: ../src/orca/structural_navigation.py:644
 msgid "Structural navigation keys on."
 msgstr "CÃ¡c phÃm duyá»?t qua kiá»?u cáº¥u trÃºc Ä?Ã£ báºt."
 
@@ -7563,7 +8168,7 @@ msgstr "CÃ¡c phÃm duyá»?t qua kiá»?u cáº¥u trÃºc Ä?Ã£ báºt."
 #. toggles the structural navigation feature of Orca.
 #. It should be a brief informative message.
 #.
-#: ../src/orca/structural_navigation.py:655
+#: ../src/orca/structural_navigation.py:656
 msgid "Structural navigation keys off."
 msgstr "CÃ¡c phÃm duyá»?t qua kiá»?u cáº¥u trÃºc bá»? táº¯t."
 
@@ -7572,7 +8177,7 @@ msgstr "CÃ¡c phÃm duyá»?t qua kiá»?u cáº¥u trÃºc bá»? táº¯t."
 #. table navigation command but is not in a table, Orca speaks
 #. this message.
 #.
-#: ../src/orca/structural_navigation.py:695
+#: ../src/orca/structural_navigation.py:696
 msgid "Not in a table."
 msgstr "KhÃ´ng pháº£i trong báº£ng."
 
@@ -7582,7 +8187,7 @@ msgstr "KhÃ´ng pháº£i trong báº£ng."
 #. to move to the left of the current cell and is
 #. already in the first column.
 #.
-#: ../src/orca/structural_navigation.py:715
+#: ../src/orca/structural_navigation.py:716
 msgid "Beginning of row."
 msgstr "Ä?áº§u hÃ ng."
 
@@ -7592,7 +8197,7 @@ msgstr "Ä?áº§u hÃ ng."
 #. to move to the right of the current cell and is
 #. already in the last column.
 #.
-#: ../src/orca/structural_navigation.py:724
+#: ../src/orca/structural_navigation.py:725
 msgid "End of row."
 msgstr "Cuá»?i hÃ ng."
 
@@ -7602,7 +8207,7 @@ msgstr "Cuá»?i hÃ ng."
 #. to move to the cell above the current cell and is
 #. already in the first row.
 #.
-#: ../src/orca/structural_navigation.py:733
+#: ../src/orca/structural_navigation.py:734
 msgid "Top of column."
 msgstr "Ä?áº§u cá»?t."
 
@@ -7612,7 +8217,7 @@ msgstr "Ä?áº§u cá»?t."
 #. to move to the cell below the current cell and is
 #. already in the last row.
 #.
-#: ../src/orca/structural_navigation.py:742
+#: ../src/orca/structural_navigation.py:743
 msgid "Bottom of column."
 msgstr "Cuá»?i cá»?t."
 
@@ -7621,13 +8226,13 @@ msgstr "Cuá»?i cá»?t."
 #. In contrast, a non-uniform table is one in which at least
 #. one table cell occupies more than one row and/or column.
 #.
-#: ../src/orca/structural_navigation.py:1326
+#: ../src/orca/structural_navigation.py:1327
 msgid "Non-uniform"
 msgstr "KhÃ´ng Ä?á»?u"
 
 #. Translators: this represents the number of rows in a table.
 #.
-#: ../src/orca/structural_navigation.py:1333
+#: ../src/orca/structural_navigation.py:1334
 #, python-format
 msgid "Table with %d row"
 msgid_plural "Table with %d rows"
@@ -7635,7 +8240,7 @@ msgstr[0] "Báº£ng %d hÃ ng"
 
 #. Translators: this represents the number of cols in a table.
 #.
-#: ../src/orca/structural_navigation.py:1338
+#: ../src/orca/structural_navigation.py:1339
 #, python-format
 msgid "%d column"
 msgid_plural "%d columns"
@@ -7645,16 +8250,17 @@ msgstr[0] "%d cá»?t"
 #. within a document.  We need to announce when the cell occupies
 #. or "spans" more than a single row and/or column.
 #.
-#: ../src/orca/structural_navigation.py:1486
+#: ../src/orca/structural_navigation.py:1487
 #, python-format
-msgid "Cell spans %d rows and %d columns"
-msgstr "Ã? theo %d hÃ ng vÃ  %d cá»?t"
+#| msgid "Cell spans %d rows and %d columns"
+msgid "Cell spans %(rows)d rows and %(columns)d columns"
+msgstr "Ã? theo %(rows)d hÃ ng vÃ  %(columns)d cá»?t"
 
 #. Translators: The cell here refers to a cell within a table
 #. within a document.  We need to announce when the cell occupies
 #. or "spans" more than a single row and/or column.
 #.
-#: ../src/orca/structural_navigation.py:1493
+#: ../src/orca/structural_navigation.py:1495
 #, python-format
 msgid "Cell spans %d columns"
 msgstr "Ã? theo %d cá»?t"
@@ -7663,7 +8269,7 @@ msgstr "Ã? theo %d cá»?t"
 #. within a document.  We need to announce when the cell occupies
 #. or "spans" more than a single row and/or column.
 #.
-#: ../src/orca/structural_navigation.py:1499
+#: ../src/orca/structural_navigation.py:1501
 #, python-format
 msgid "Cell spans %d rows"
 msgstr "Ã? theo %d hÃ ng"
@@ -7671,14 +8277,14 @@ msgstr "Ã? theo %d hÃ ng"
 #. Translators: this is for navigating among anchors in a document.
 #. An anchor is a named spot that one can jump to.
 #.
-#: ../src/orca/structural_navigation.py:1848
+#: ../src/orca/structural_navigation.py:1838
 msgid "Goes to previous anchor."
 msgstr "Nháº£y vá»? neo trÆ°á»?c."
 
 #. Translators: this is for navigating among anchors in a document.
 #. An anchor is a named spot that one can jump to.
 #.
-#: ../src/orca/structural_navigation.py:1853
+#: ../src/orca/structural_navigation.py:1843
 msgid "Goes to next anchor."
 msgstr "Nháº£y tá»?i neo tiáº¿p."
 
@@ -7687,21 +8293,21 @@ msgstr "Nháº£y tá»?i neo tiáº¿p."
 #. that one can jump to. This stirng is what orca will say
 #. if there are no more anchors found.
 #.
-#: ../src/orca/structural_navigation.py:1910
+#: ../src/orca/structural_navigation.py:1900
 msgid "No more anchors."
 msgstr "KhÃ´ng cÃ²n neo nÃ o ná»¯a."
 
 #. Translators: this is for navigating among blockquotes in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:1927
+#: ../src/orca/structural_navigation.py:1917
 msgid "Goes to previous blockquote."
 msgstr "Ä?i vá»? khá»?i trÃch dáº«n trÆ°á»?c."
 
 #. Translators: this is for navigating among blockquotes in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:1932
+#: ../src/orca/structural_navigation.py:1922
 msgid "Goes to next blockquote."
 msgstr "Ä?i tá»?i khá»?i trÃch dáº«n káº¿ tiáº¿p."
 
@@ -7709,21 +8315,21 @@ msgstr "Ä?i tá»?i khá»?i trÃch dáº«n káº¿ tiáº¿p."
 #. moving from blockquote to blockquote. This string is what
 #. Orca will say if there are no more blockquotes found.
 #.
-#: ../src/orca/structural_navigation.py:1992
+#: ../src/orca/structural_navigation.py:1982
 msgid "No more blockquotes."
 msgstr "KhÃ´ng cÃ²n khá»?i trÃch dáº«n nÃ o ná»¯a."
 
 #. Translators: this is for navigating among buttons in a form
 #. within a document.
 #.
-#: ../src/orca/structural_navigation.py:2009
+#: ../src/orca/structural_navigation.py:1999
 msgid "Goes to previous button."
 msgstr "Nháº£y vá»? nÃºt trÆ°á»?c."
 
 #. Translators: this is for navigating among buttons in a form
 #. within a document.
 #.
-#: ../src/orca/structural_navigation.py:2014
+#: ../src/orca/structural_navigation.py:2004
 msgid "Goes to next button."
 msgstr "Nháº£y tá»?i nÃºt tiáº¿p."
 
@@ -7732,21 +8338,21 @@ msgstr "Nháº£y tá»?i nÃºt tiáº¿p."
 #. string is what Orca will say if there are no more buttons
 #. found.
 #.
-#: ../src/orca/structural_navigation.py:2071
+#: ../src/orca/structural_navigation.py:2061
 msgid "No more buttons."
 msgstr "KhÃ´ng cÃ²n nÃºt nÃ o ná»¯a."
 
 #. Translators: this is for navigating among check boxes in a form
 #. within a document.
 #.
-#: ../src/orca/structural_navigation.py:2088
+#: ../src/orca/structural_navigation.py:2078
 msgid "Goes to previous check box."
 msgstr "Nháº£y vá»? há»?p chá»?n trÆ°á»?c."
 
 #. Translators: this is for navigating among check boxes in a form
 #. within a document.
 #.
-#: ../src/orca/structural_navigation.py:2093
+#: ../src/orca/structural_navigation.py:2083
 msgid "Goes to next check box."
 msgstr "Nháº£y tá»?i há»?p chá»?n tiáº¿p."
 
@@ -7755,7 +8361,7 @@ msgstr "Nháº£y tá»?i há»?p chá»?n tiáº¿p."
 #. string is what Orca will say if there are no more check
 #. boxes found.
 #.
-#: ../src/orca/structural_navigation.py:2150
+#: ../src/orca/structural_navigation.py:2140
 msgid "No more check boxes."
 msgstr "KhÃ´ng cÃ²n há»?p chá»?n nÃ o ná»¯a."
 
@@ -7763,7 +8369,7 @@ msgstr "KhÃ´ng cÃ²n há»?p chá»?n nÃ o ná»¯a."
 #. structural manner, where a 'large object' is a logical
 #. chunk of text, such as a paragraph, a list, a table, etc.
 #.
-#: ../src/orca/structural_navigation.py:2168
+#: ../src/orca/structural_navigation.py:2158
 msgid "Goes to previous large object."
 msgstr "Ä?i vá»? Ä?á»?i tÆ°á»£ng lá»?n trÆ°á»?c."
 
@@ -7771,7 +8377,7 @@ msgstr "Ä?i vá»? Ä?á»?i tÆ°á»£ng lá»?n trÆ°á»?c."
 #. structural manner, where a 'large object' is a logical
 #. chunk of text, such as a paragraph, a list, a table, etc.
 #.
-#: ../src/orca/structural_navigation.py:2174
+#: ../src/orca/structural_navigation.py:2164
 msgid "Goes to next large object."
 msgstr "Ä?i tá»?i Ä?á»?i tÆ°á»£ng lá»?n káº¿ tiáº¿p."
 
@@ -7781,21 +8387,21 @@ msgstr "Ä?i tá»?i Ä?á»?i tÆ°á»£ng lá»?n káº¿ tiáº¿p."
 #. a list, a table, etc. This string is what Orca will say
 #. if there are no more large objects found.
 #.
-#: ../src/orca/structural_navigation.py:2243
+#: ../src/orca/structural_navigation.py:2233
 msgid "No more large objects."
 msgstr "KhÃ´ng cÃ²n Ä?á»?i tÆ°á»£ng lá»?n nÃ o ná»¯a."
 
 #. Translators: this is for navigating among combo boxes in a form
 #. within a document.
 #.
-#: ../src/orca/structural_navigation.py:2260
+#: ../src/orca/structural_navigation.py:2250
 msgid "Goes to previous combo box."
 msgstr "Nháº£y vá»? há»?p tá»? há»£p trÆ°á»?c."
 
 #. Translators: this is for navigating among combo boxes in a form
 #. within a document.
 #.
-#: ../src/orca/structural_navigation.py:2265
+#: ../src/orca/structural_navigation.py:2255
 msgid "Goes to next combo box."
 msgstr "Nháº£y tá»?i há»?p tá»? há»£p tiáº¿p."
 
@@ -7804,21 +8410,21 @@ msgstr "Nháº£y tá»?i há»?p tá»? há»£p tiáº¿p."
 #. string is what Orca will say if there are no more combo
 #. boxes found.
 #.
-#: ../src/orca/structural_navigation.py:2322
+#: ../src/orca/structural_navigation.py:2312
 msgid "No more combo boxes."
 msgstr "KhÃ´ng cÃ²n há»?p tá»? há»£p nÃ o ná»¯a."
 
 #. Translators: this is for navigating among text entries in a form
 #. within a document.
 #.
-#: ../src/orca/structural_navigation.py:2339
+#: ../src/orca/structural_navigation.py:2329
 msgid "Goes to previous entry."
 msgstr "Nháº£y vá»? má»¥c nháºp trÆ°á»?c."
 
 #. Translators: this is for navigating among text entries
 #. in a form.
 #.
-#: ../src/orca/structural_navigation.py:2344
+#: ../src/orca/structural_navigation.py:2334
 msgid "Goes to next entry."
 msgstr "Nháº£y tá»?i má»¥c nháºp tiáº¿p."
 
@@ -7827,21 +8433,21 @@ msgstr "Nháº£y tá»?i má»¥c nháºp tiáº¿p."
 #. string is what Orca will say if there are no more entries
 #. found.
 #.
-#: ../src/orca/structural_navigation.py:2410
+#: ../src/orca/structural_navigation.py:2400
 msgid "No more entries."
 msgstr "KhÃ´ng cÃ²n má»¥c nháºp nÃ o ná»¯a."
 
 #. Translators: this is for navigating among fields in a form within
 #. a document.
 #.
-#: ../src/orca/structural_navigation.py:2427
+#: ../src/orca/structural_navigation.py:2417
 msgid "Goes to previous form field."
 msgstr "Ä?i vá»? trÆ°á»?ng máº«u trÆ°á»?c."
 
 #. Translators: this is for navigating among fields in a form within
 #. a document.
 #.
-#: ../src/orca/structural_navigation.py:2434
+#: ../src/orca/structural_navigation.py:2424
 msgid "Goes to next form field."
 msgstr "Ä?i tá»?i trÆ°á»?ng máº«u káº¿ tiáº¿p."
 
@@ -7849,28 +8455,28 @@ msgstr "Ä?i tá»?i trÆ°á»?ng máº«u káº¿ tiáº¿p."
 #. by moving from form field to form field. This string is
 #. what Orca will say if there are no more form fields found.
 #.
-#: ../src/orca/structural_navigation.py:2504
+#: ../src/orca/structural_navigation.py:2494
 msgid "No more form fields."
 msgstr "KhÃ´ng cÃ²n trÆ°á»?ng máº«u nÃ o ná»¯a."
 
 #. Translators: this is for navigating in a document by heading.
 #. (e.g. <h1>)
 #.
-#: ../src/orca/structural_navigation.py:2521
+#: ../src/orca/structural_navigation.py:2511
 msgid "Goes to previous heading."
 msgstr "Ä?i vá»? tiÃªu Ä?á»? trÆ°á»?c Ä?Ã³."
 
 #. Translators: this is for navigating in a document by heading.
 #. (e.g., <h1>)
 #.
-#: ../src/orca/structural_navigation.py:2526
+#: ../src/orca/structural_navigation.py:2516
 msgid "Goes to next heading."
 msgstr "Ä?i tá»?i tiÃªu Ä?á»? káº¿ tiáº¿p."
 
 #. Translators: this is for navigating in a document by heading.
 #. (e.g. <h1> is a heading at level 1).
 #.
-#: ../src/orca/structural_navigation.py:2536
+#: ../src/orca/structural_navigation.py:2526
 #, python-format
 msgid "Goes to previous heading at level %d."
 msgstr "Nháº£y vá»? tiÃªu Ä?á»? trÆ°á»?c á»? cáº¥p %d."
@@ -7878,7 +8484,7 @@ msgstr "Nháº£y vá»? tiÃªu Ä?á»? trÆ°á»?c á»? cáº¥p %d."
 #. Translators: this is for navigating in a document by heading.
 #. (e.g. <h1> is a heading at level 1).
 #.
-#: ../src/orca/structural_navigation.py:2543
+#: ../src/orca/structural_navigation.py:2533
 #, python-format
 msgid "Goes to next heading at level %d."
 msgstr "Nháº£y tá»?i tiÃªu Ä?á»? tiáº¿p á»? cáº¥p %d."
@@ -7888,7 +8494,7 @@ msgstr "Nháº£y tá»?i tiÃªu Ä?á»? tiáº¿p á»? cáº¥p %d."
 #. This string is what Orca will say if there are no more
 #. headings found.
 #.
-#: ../src/orca/structural_navigation.py:2615
+#: ../src/orca/structural_navigation.py:2605
 msgid "No more headings."
 msgstr "KhÃ´ng cÃ²n tiÃªu Ä?á»? nÃ o ná»¯a."
 
@@ -7897,7 +8503,7 @@ msgstr "KhÃ´ng cÃ²n tiÃªu Ä?á»? nÃ o ná»¯a."
 #. (i.e. only <h1> or only <h2>, etc.) This string is
 #. what Orca will say if there are no more headings found.
 #.
-#: ../src/orca/structural_navigation.py:2622
+#: ../src/orca/structural_navigation.py:2612
 #, python-format
 msgid "No more headings at level %d."
 msgstr "KhÃ´ng cÃ²n tiÃªu Ä?áº§u nÃ o ná»¯a á»? cáº¥p %d."
@@ -7907,7 +8513,7 @@ msgstr "KhÃ´ng cÃ²n tiÃªu Ä?áº§u nÃ o ná»¯a á»? cáº¥p %d."
 #. HTML tag attribute 'role' used to identify important part
 #. of webpage like banners, main context, search etc.
 #.
-#: ../src/orca/structural_navigation.py:2641
+#: ../src/orca/structural_navigation.py:2631
 msgid "Goes to previous landmark."
 msgstr "Ä?i vá»? má»?c trÆ°á»?c Ä?Ã³."
 
@@ -7916,7 +8522,7 @@ msgstr "Ä?i vá»? má»?c trÆ°á»?c Ä?Ã³."
 #. HTML tag attribute 'role' used to identify important part
 #. of webpage like banners, main context, search etc.
 #.
-#: ../src/orca/structural_navigation.py:2648
+#: ../src/orca/structural_navigation.py:2638
 msgid "Goes to next landmark."
 msgstr "Ä?i tá»?i má»?c káº¿ tiáº¿p."
 
@@ -7926,53 +8532,43 @@ msgstr "Ä?i tá»?i má»?c káº¿ tiáº¿p."
 #. of webpage like banners, main context, search etc.  This
 #. is an indication that one was not found.
 #.
-#: ../src/orca/structural_navigation.py:2722
+#: ../src/orca/structural_navigation.py:2712
 msgid "No landmark found."
 msgstr "KhÃ´ng tÃ¬m tháº¥y."
 
 #. Translators: this is for navigating among bulleted/numbered
 #. lists in a document.
 #.
-#: ../src/orca/structural_navigation.py:2739
+#: ../src/orca/structural_navigation.py:2729
 msgid "Goes to previous list."
 msgstr "Ä?i vá»? danh sÃ¡ch trÆ°á»?c."
 
 #. Translators: this is for navigating among bulleted/numbered
 #. lists in a document.
 #.
-#: ../src/orca/structural_navigation.py:2744
+#: ../src/orca/structural_navigation.py:2734
 msgid "Goes to next list."
 msgstr "Ä?i tá»?i danh sÃ¡ch káº¿ tiáº¿p."
 
-#. Translators: this represents a list item in a document.
-#. The nesting level is how 'deep' the item is (e.g., a
-#. level of 2 represents a list item inside a list that's
-#. inside another list).
-#.
-#: ../src/orca/structural_navigation.py:2818
-#, python-format
-msgid "Nesting level %d"
-msgstr "Cáº¥p lá»?ng nhau %d"
-
 #. Translators: this is for navigating document content by moving
 #. from bulleted/numbered list to bulleted/numbered list. This
 #. string is what Orca will say if there are no more lists found.
 #.
-#: ../src/orca/structural_navigation.py:2827
+#: ../src/orca/structural_navigation.py:2817
 msgid "No more lists."
 msgstr "KhÃ´ng cÃ²n danh sÃ¡ch nÃ o ná»¯a."
 
 #. Translators: this is for navigating among bulleted/numbered list
 #. items in a document.
 #.
-#: ../src/orca/structural_navigation.py:2844
+#: ../src/orca/structural_navigation.py:2834
 msgid "Goes to previous list item."
 msgstr "Ä?i vá»? má»¥c danh sÃ¡ch trÆ°á»?c."
 
 #. Translators: this is for navigating among bulleted/numbered list
 #. items in a document.
 #.
-#: ../src/orca/structural_navigation.py:2849
+#: ../src/orca/structural_navigation.py:2839
 msgid "Goes to next list item."
 msgstr "Ä?i tá»?i má»¥c danh sÃ¡ch káº¿ tiáº¿p."
 
@@ -7981,26 +8577,26 @@ msgstr "Ä?i tá»?i má»¥c danh sÃ¡ch káº¿ tiáº¿p."
 #. numbered list item.  This string is what Orca will say
 #. if there are no more list items found.
 #.
-#: ../src/orca/structural_navigation.py:2912
+#: ../src/orca/structural_navigation.py:2902
 msgid "No more list items."
 msgstr "KhÃ´ng cÃ²n má»¥c danh sÃ¡ch nÃ o ná»¯a."
 
 #. Translators: this is for navigating between live regions
 #.
-#: ../src/orca/structural_navigation.py:2928
+#: ../src/orca/structural_navigation.py:2918
 msgid "Goes to previous live region."
 msgstr "Ä?i vá»? vÃ¹ng Ä?á»?ng trÆ°á»?c Ä?Ã³."
 
 #. Translators: this is for navigating between live regions
 #.
-#: ../src/orca/structural_navigation.py:2932
+#: ../src/orca/structural_navigation.py:2922
 msgid "Goes to next live region."
 msgstr "Ä?i tá»?i vÃ¹ng Ä?á»?ng káº¿ tiáº¿p."
 
 #. Translators: this is for navigating to the last live region
 #. to make an announcement.
 #.
-#: ../src/orca/structural_navigation.py:2937
+#: ../src/orca/structural_navigation.py:2927
 msgid "Goes to last live region."
 msgstr "Ä?i tá»?i vÃ¹ng Ä?á»?ng cuá»?i cÃ¹ng."
 
@@ -8008,19 +8604,19 @@ msgstr "Ä?i tá»?i vÃ¹ng Ä?á»?ng cuá»?i cÃ¹ng."
 #. manner, where a 'live region' is a location in a web page
 #. that are updated without having to refresh the entire page.
 #.
-#: ../src/orca/structural_navigation.py:2986
+#: ../src/orca/structural_navigation.py:2976
 msgid "No more live regions."
 msgstr "KhÃ´ng cÃ³ vÃ¹ng Ä?á»?ng nÃ o ná»¯a."
 
 #. Translators: this is for navigating among paragraphs in a document.
 #.
-#: ../src/orca/structural_navigation.py:3002
+#: ../src/orca/structural_navigation.py:2992
 msgid "Goes to previous paragraph."
 msgstr "Nháº£y vá»? Ä?oáº¡n vÄ?n trÆ°á»?c."
 
 #. Translators: this is for navigating among paragraphs in a document.
 #.
-#: ../src/orca/structural_navigation.py:3006
+#: ../src/orca/structural_navigation.py:2996
 msgid "Goes to next paragraph."
 msgstr "Nháº£y tá»?i Ä?oáº¡n vÄ?n tiáº¿p."
 
@@ -8028,21 +8624,21 @@ msgstr "Nháº£y tá»?i Ä?oáº¡n vÄ?n tiáº¿p."
 #. moving from paragraph to paragraph. This string is what
 #. Orca will say if there are no more large objects found.
 #.
-#: ../src/orca/structural_navigation.py:3066
+#: ../src/orca/structural_navigation.py:3056
 msgid "No more paragraphs."
 msgstr "KhÃ´ng cÃ²n Ä?oáº¡n vÄ?n nÃ o ná»¯a."
 
 #. Translators: this is for navigating among radio buttons in a
 #. form within a document.
 #.
-#: ../src/orca/structural_navigation.py:3083
+#: ../src/orca/structural_navigation.py:3073
 msgid "Goes to previous radio button."
 msgstr "Nháº£y vá»? nÃºt chá»?n má»?t trÆ°á»?c."
 
 #. Translators: this is for navigating among radio buttons in a
 #. form within a document.
 #.
-#: ../src/orca/structural_navigation.py:3088
+#: ../src/orca/structural_navigation.py:3078
 msgid "Goes to next radio button."
 msgstr "Nháº£y tá»?i nÃºt chá»?n má»?t tiáº¿p."
 
@@ -8051,19 +8647,45 @@ msgstr "Nháº£y tá»?i nÃºt chá»?n má»?t tiáº¿p."
 #. This string is what Orca will say if there are no more
 #. radio buttons found.
 #.
-#: ../src/orca/structural_navigation.py:3145
+#: ../src/orca/structural_navigation.py:3135
 msgid "No more radio buttons."
 msgstr "KhÃ´ng cÃ²n nÃºt chá»?n má»?t nÃ o ná»¯a."
 
+#. Translators: this is for navigating among separators, such as the
+#. <hr> tag, in a document.
+#.
+#: ../src/orca/structural_navigation.py:3152
+#| msgid "Goes to previous character."
+msgid "Goes to previous separator."
+msgstr "Ä?i vá»? dáº¥u tÃ¡ch trÆ°á»?c Ä?Ã³."
+
+#. Translators: this is for navigating among separators, such as the
+#. <hr> tag, in a document.
+#.
+#: ../src/orca/structural_navigation.py:3157
+#| msgid "Goes to next character."
+msgid "Goes to next separator."
+msgstr "Ä?i tá»?i dáº¥u tÃ¡ch káº¿ tiáº¿p."
+
+#. Translators: this is for navigating document content by
+#. moving amongst separators (e.g. <hr> tags). This string
+#. is what Orca will say if there are no more separators
+#. found.
+#.
+#: ../src/orca/structural_navigation.py:3205
+#| msgid "No more paragraphs."
+msgid "No more separators."
+msgstr "KhÃ´ng cÃ²n dáº¥u tÃ¡ch nÃ o ná»¯a."
+
 #. Translators: this is for navigating among tables in a document.
 #.
-#: ../src/orca/structural_navigation.py:3161
+#: ../src/orca/structural_navigation.py:3221
 msgid "Goes to previous table."
 msgstr "Ä?i vá»? báº£ng trÆ°á»?c."
 
 #. Translators: this is for navigating among tables in a document.
 #.
-#: ../src/orca/structural_navigation.py:3165
+#: ../src/orca/structural_navigation.py:3225
 msgid "Goes to next table."
 msgstr "Ä?i tá»?i báº£ng káº¿ tiáº¿p."
 
@@ -8071,65 +8693,57 @@ msgstr "Ä?i tá»?i báº£ng káº¿ tiáº¿p."
 #. from table to table.  This string is what Orca will say if there
 #. are no more tables found.
 #.
-#: ../src/orca/structural_navigation.py:3224
+#: ../src/orca/structural_navigation.py:3284
 msgid "No more tables."
 msgstr "KhÃ´ng cÃ²n báº£ng nÃ o ná»¯a."
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3240
+#: ../src/orca/structural_navigation.py:3300
 msgid "Goes left one cell."
 msgstr "Chuyá»?n bÃªn trÃ¡i theo má»?t Ã´"
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3244
+#: ../src/orca/structural_navigation.py:3304
 msgid "Goes right one cell."
 msgstr "Chuyá»?n bÃªn pháº£i theo má»?t Ã´"
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3248
+#: ../src/orca/structural_navigation.py:3308
 msgid "Goes up one cell."
 msgstr "Chuyá»?n bÃªn trÃªn theo má»?t Ã´"
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3252
+#: ../src/orca/structural_navigation.py:3312
 msgid "Goes down one cell."
 msgstr "Chuyá»?n bÃªn dÆ°á»?i theo má»?t Ã´"
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3256
+#: ../src/orca/structural_navigation.py:3316
 msgid "Goes to the first cell in a table."
 msgstr "Ä?i vá»? Ã´ Ä?áº§u cá»§a báº£ng."
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3260
+#: ../src/orca/structural_navigation.py:3320
 msgid "Goes to the last cell in a table."
 msgstr "Ä?i tá»?i Ã´ cuá»?i cá»§a báº£ng."
 
-#. Translators: this represents the (row, col) position of
-#. a cell in a table.
-#.
-#: ../src/orca/structural_navigation.py:3322
-#, python-format
-msgid "Row %d, column %d."
-msgstr "HÃ ng %d, cá»?t %d."
-
 #. Translators: this is for navigating among unvisited links in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:3343
+#: ../src/orca/structural_navigation.py:3404
 msgid "Goes to previous unvisited link."
 msgstr "Ä?i vá»? liÃªn káº¿t chÆ°a thÄ?m trÆ°á»?c."
 
 #. Translators: this is for navigating among unvisited links in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:3348
+#: ../src/orca/structural_navigation.py:3409
 msgid "Goes to next unvisited link."
 msgstr "Ä?i tá»?i liÃªn káº¿t chÆ°a thÄ?m káº¿ tiáº¿p."
 
@@ -8138,21 +8752,21 @@ msgstr "Ä?i tá»?i liÃªn káº¿t chÆ°a thÄ?m káº¿ tiáº¿p."
 #. is what Orca will say if there are no more unvisited links
 #. found.
 #.
-#: ../src/orca/structural_navigation.py:3407
+#: ../src/orca/structural_navigation.py:3472
 msgid "No more unvisited links."
 msgstr "KhÃ´ng cÃ²n liÃªn káº¿t chÆ°a thÄ?m nÃ o ná»¯a."
 
 #. Translators: this is for navigating among visited links in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:3424
+#: ../src/orca/structural_navigation.py:3489
 msgid "Goes to previous visited link."
 msgstr "Ä?i vá»? liÃªn káº¿t Ä?Ã£ thÄ?m trÆ°á»?c."
 
 #. Translators: this is for navigating among visited links in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:3429
+#: ../src/orca/structural_navigation.py:3494
 msgid "Goes to next visited link."
 msgstr "Ä?i tá»?i liÃªn káº¿t Ä?Ã£ tham káº¿ tiáº¿p."
 
@@ -8161,7 +8775,7 @@ msgstr "Ä?i tá»?i liÃªn káº¿t Ä?Ã£ tham káº¿ tiáº¿p."
 #. what Orca will say if there are no more visited links
 #. found.
 #.
-#: ../src/orca/structural_navigation.py:3487
+#: ../src/orca/structural_navigation.py:3550
 msgid "No more visited links."
 msgstr "KhÃ´ng cÃ²n liÃªn káº¿t Ä?Ã£ thÄ?m nÃ o ná»¯a."
 
@@ -8273,8 +8887,8 @@ msgstr "thá»¥t lá»?"
 #.
 #: ../src/orca/text_attribute_names.py:133
 msgctxt "textattr"
-msgid "invalid"
-msgstr "khÃ´ng há»£p lá»?"
+msgid "mistake"
+msgstr "lá»?i"
 
 #. Translators: this attribute specifies whether the text is invisible.
 #. It will be a "true" or "false" value.
@@ -8695,11 +9309,26 @@ msgid "word"
 msgstr "tá»«"
 
 #. Translators: this is one of the text attribute values for the following
+#. text attributes: "wrap mode." It corresponds to GTK_WRAP_WORD_CHAR,
+#. defined in the Gtk documentation as "Wrap text, breaking lines in
+#. between words, or if that is not enough, also between graphemes."
+#. See:
+#. http://library.gnome.org/devel/atk/1.27/AtkText.html#AtkTextAttribute
+#. http://library.gnome.org/devel/gtk/stable/GtkTextTag.html#GtkWrapMode
+#.
+#: ../src/orca/text_attribute_names.py:443
+#| msgctxt "textattr"
+#| msgid "char"
+msgctxt "textattr"
+msgid "word char"
+msgstr "ngáº¯t theo tá»«"
+
+#. Translators: this is one of the text attribute values for the following
 #. text attributes: "direction".
 #. See:
 #. http://library.gnome.org/devel/atk/1.22/AtkText.html#AtkTextAttribute
 #.
-#: ../src/orca/text_attribute_names.py:440
+#: ../src/orca/text_attribute_names.py:450
 msgctxt "textattr"
 msgid "ltr"
 msgstr "ltr"
@@ -8709,7 +9338,7 @@ msgstr "ltr"
 #. See:
 #. http://library.gnome.org/devel/atk/1.22/AtkText.html#AtkTextAttribute
 #.
-#: ../src/orca/text_attribute_names.py:447
+#: ../src/orca/text_attribute_names.py:457
 msgctxt "textattr"
 msgid "rtl"
 msgstr "rtl"
@@ -8719,7 +9348,7 @@ msgstr "rtl"
 #. See:
 #. http://library.gnome.org/devel/atk/1.22/AtkText.html#AtkTextAttribute
 #.
-#: ../src/orca/text_attribute_names.py:454
+#: ../src/orca/text_attribute_names.py:464
 msgctxt "textattr"
 msgid "left"
 msgstr "trÃ¡i"
@@ -8729,7 +9358,7 @@ msgstr "trÃ¡i"
 #. See:
 #. http://library.gnome.org/devel/atk/1.22/AtkText.html#AtkTextAttribute
 #.
-#: ../src/orca/text_attribute_names.py:461
+#: ../src/orca/text_attribute_names.py:471
 msgctxt "textattr"
 msgid "right"
 msgstr "pháº£i"
@@ -8739,7 +9368,7 @@ msgstr "pháº£i"
 #. See:
 #. http://library.gnome.org/devel/atk/1.22/AtkText.html#AtkTextAttribute
 #.
-#: ../src/orca/text_attribute_names.py:468
+#: ../src/orca/text_attribute_names.py:478
 msgctxt "textattr"
 msgid "center"
 msgstr "giá»¯a"
@@ -8748,7 +9377,7 @@ msgstr "giá»¯a"
 #. text attributes: "justification". In Gecko, when no justification has
 #. be explicitly set, they report a justification of "start".
 #.
-#: ../src/orca/text_attribute_names.py:474
+#: ../src/orca/text_attribute_names.py:484
 msgctxt "textattr"
 msgid "no justification"
 msgstr "khÃ´ng sáº¯p tháº³ng"
@@ -8758,7 +9387,7 @@ msgstr "khÃ´ng sáº¯p tháº³ng"
 #. See:
 #. http://library.gnome.org/devel/atk/1.22/AtkText.html#AtkTextAttribute
 #.
-#: ../src/orca/text_attribute_names.py:481
+#: ../src/orca/text_attribute_names.py:491
 msgctxt "textattr"
 msgid "fill"
 msgstr "tÃ´ Ä?áº§y"
@@ -8768,7 +9397,7 @@ msgstr "tÃ´ Ä?áº§y"
 #. See:
 #. http://library.gnome.org/devel/atk/1.22/AtkText.html#AtkTextAttribute
 #.
-#: ../src/orca/text_attribute_names.py:488
+#: ../src/orca/text_attribute_names.py:498
 msgctxt "textattr"
 msgid "ultra condensed"
 msgstr "ráº¥t háº¹p"
@@ -8778,7 +9407,7 @@ msgstr "ráº¥t háº¹p"
 #. See:
 #. http://library.gnome.org/devel/atk/1.22/AtkText.html#AtkTextAttribute
 #.
-#: ../src/orca/text_attribute_names.py:495
+#: ../src/orca/text_attribute_names.py:505
 msgctxt "textattr"
 msgid "extra condensed"
 msgstr "ráº¥t háº¹p"
@@ -8788,7 +9417,7 @@ msgstr "ráº¥t háº¹p"
 #. See:
 #. http://library.gnome.org/devel/atk/1.22/AtkText.html#AtkTextAttribute
 #.
-#: ../src/orca/text_attribute_names.py:502
+#: ../src/orca/text_attribute_names.py:512
 msgctxt "textattr"
 msgid "condensed"
 msgstr "háº¹p"
@@ -8798,7 +9427,7 @@ msgstr "háº¹p"
 #. See:
 #. http://library.gnome.org/devel/atk/1.22/AtkText.html#AtkTextAttribute
 #.
-#: ../src/orca/text_attribute_names.py:509
+#: ../src/orca/text_attribute_names.py:519
 msgctxt "textattr"
 msgid "semi condensed"
 msgstr "bÃ¡n háº¹p"
@@ -8808,7 +9437,7 @@ msgstr "bÃ¡n háº¹p"
 #. See:
 #. http://library.gnome.org/devel/atk/1.22/AtkText.html#AtkTextAttribute
 #.
-#: ../src/orca/text_attribute_names.py:516
+#: ../src/orca/text_attribute_names.py:526
 msgctxt "textattr"
 msgid "normal"
 msgstr "chuáº©n"
@@ -8818,7 +9447,7 @@ msgstr "chuáº©n"
 #. See:
 #. http://library.gnome.org/devel/atk/1.22/AtkText.html#AtkTextAttribute
 #.
-#: ../src/orca/text_attribute_names.py:523
+#: ../src/orca/text_attribute_names.py:533
 msgctxt "textattr"
 msgid "semi expanded"
 msgstr "bÃ¡n má»? rá»?ng"
@@ -8828,7 +9457,7 @@ msgstr "bÃ¡n má»? rá»?ng"
 #. See:
 #. http://library.gnome.org/devel/atk/1.22/AtkText.html#AtkTextAttribute
 #.
-#: ../src/orca/text_attribute_names.py:530
+#: ../src/orca/text_attribute_names.py:540
 msgctxt "textattr"
 msgid "expanded"
 msgstr "má»? rá»?ng"
@@ -8838,7 +9467,7 @@ msgstr "má»? rá»?ng"
 #. See:
 #. http://library.gnome.org/devel/atk/1.22/AtkText.html#AtkTextAttribute
 #.
-#: ../src/orca/text_attribute_names.py:537
+#: ../src/orca/text_attribute_names.py:547
 msgctxt "textattr"
 msgid "extra expanded"
 msgstr "ráº¥t má»? rá»?ng"
@@ -8848,7 +9477,7 @@ msgstr "ráº¥t má»? rá»?ng"
 #. See:
 #. http://library.gnome.org/devel/atk/1.22/AtkText.html#AtkTextAttribute
 #.
-#: ../src/orca/text_attribute_names.py:544
+#: ../src/orca/text_attribute_names.py:554
 msgctxt "textattr"
 msgid "ultra expanded"
 msgstr "cá»±c má»? rá»?ng"
@@ -8858,7 +9487,7 @@ msgstr "cá»±c má»? rá»?ng"
 #. See:
 #. http://library.gnome.org/devel/atk/1.22/AtkText.html#AtkTextAttribute
 #.
-#: ../src/orca/text_attribute_names.py:551
+#: ../src/orca/text_attribute_names.py:561
 msgctxt "textattr"
 msgid "small caps"
 msgstr "chá»¯ hoa nhá»?"
@@ -8868,7 +9497,7 @@ msgstr "chá»¯ hoa nhá»?"
 #. See:
 #. http://library.gnome.org/devel/atk/1.22/AtkText.html#AtkTextAttribute
 #.
-#: ../src/orca/text_attribute_names.py:558
+#: ../src/orca/text_attribute_names.py:568
 msgctxt "textattr"
 msgid "oblique"
 msgstr "xiÃªn"
@@ -8878,7 +9507,7 @@ msgstr "xiÃªn"
 #. See:
 #. http://library.gnome.org/devel/atk/1.22/AtkText.html#AtkTextAttribute
 #.
-#: ../src/orca/text_attribute_names.py:565
+#: ../src/orca/text_attribute_names.py:575
 msgctxt "textattr"
 msgid "italic"
 msgstr "nghiÃªng"
@@ -8888,7 +9517,7 @@ msgstr "nghiÃªng"
 #. See:
 #. http://wiki.services.openoffice.org/wiki/Accessibility/TextAttributes
 #.
-#: ../src/orca/text_attribute_names.py:572
+#: ../src/orca/text_attribute_names.py:582
 msgctxt "textattr"
 msgid "Default"
 msgstr "Máº·c Ä?á»?nh"
@@ -8898,7 +9527,7 @@ msgstr "Máº·c Ä?á»?nh"
 #. See:
 #. http://wiki.services.openoffice.org/wiki/Accessibility/TextAttributes
 #.
-#: ../src/orca/text_attribute_names.py:579
+#: ../src/orca/text_attribute_names.py:589
 msgctxt "textattr"
 msgid "Text body"
 msgstr "ThÃ¢n vÄ?n báº£n"
@@ -8908,7 +9537,7 @@ msgstr "ThÃ¢n vÄ?n báº£n"
 #. See:
 #. http://wiki.services.openoffice.org/wiki/Accessibility/TextAttributes
 #.
-#: ../src/orca/text_attribute_names.py:586
+#: ../src/orca/text_attribute_names.py:596
 msgctxt "textattr"
 msgid "Heading"
 msgstr "TiÃªu Ä?á»?"
@@ -8919,7 +9548,7 @@ msgstr "TiÃªu Ä?á»?"
 #. http://www.w3.org/TR/1998/REC-CSS2-19980512/visudet.html#propdef-vertical-align
 #. http://wiki.services.openoffice.org/wiki/Accessibility/TextAttributes
 #.
-#: ../src/orca/text_attribute_names.py:594
+#: ../src/orca/text_attribute_names.py:604
 msgctxt "textattr"
 msgid "baseline"
 msgstr "Ä?Æ°á»?ng cÆ¡ báº£n"
@@ -8929,7 +9558,7 @@ msgstr "Ä?Æ°á»?ng cÆ¡ báº£n"
 #. See:
 #. http://www.w3.org/TR/1998/REC-CSS2-19980512/visudet.html#propdef-vertical-align
 #.
-#: ../src/orca/text_attribute_names.py:601
+#: ../src/orca/text_attribute_names.py:611
 msgctxt "textattr"
 msgid "sub"
 msgstr "dÆ°á»?i"
@@ -8939,7 +9568,7 @@ msgstr "dÆ°á»?i"
 #. See:
 #. http://www.w3.org/TR/1998/REC-CSS2-19980512/visudet.html#propdef-vertical-align
 #.
-#: ../src/orca/text_attribute_names.py:608
+#: ../src/orca/text_attribute_names.py:618
 msgctxt "textattr"
 msgid "super"
 msgstr "siÃªu"
@@ -8949,7 +9578,7 @@ msgstr "siÃªu"
 #. See:
 #. http://www.w3.org/TR/1998/REC-CSS2-19980512/visudet.html#propdef-vertical-align
 #.
-#: ../src/orca/text_attribute_names.py:615
+#: ../src/orca/text_attribute_names.py:625
 msgctxt "textattr"
 msgid "top"
 msgstr "trÃªn"
@@ -8959,7 +9588,7 @@ msgstr "trÃªn"
 #. See:
 #. http://www.w3.org/TR/1998/REC-CSS2-19980512/visudet.html#propdef-vertical-align
 #.
-#: ../src/orca/text_attribute_names.py:622
+#: ../src/orca/text_attribute_names.py:632
 msgctxt "textattr"
 msgid "text-top"
 msgstr "trÃªn vÄ?n báº£n"
@@ -8969,7 +9598,7 @@ msgstr "trÃªn vÄ?n báº£n"
 #. See:
 #. http://www.w3.org/TR/1998/REC-CSS2-19980512/visudet.html#propdef-vertical-align
 #.
-#: ../src/orca/text_attribute_names.py:629
+#: ../src/orca/text_attribute_names.py:639
 msgctxt "textattr"
 msgid "middle"
 msgstr "giá»¯a"
@@ -8979,7 +9608,7 @@ msgstr "giá»¯a"
 #. See:
 #. http://www.w3.org/TR/1998/REC-CSS2-19980512/visudet.html#propdef-vertical-align
 #.
-#: ../src/orca/text_attribute_names.py:636
+#: ../src/orca/text_attribute_names.py:646
 msgctxt "textattr"
 msgid "bottom"
 msgstr "dÆ°á»?i"
@@ -8989,7 +9618,7 @@ msgstr "dÆ°á»?i"
 #. See:
 #. http://www.w3.org/TR/1998/REC-CSS2-19980512/visudet.html#propdef-vertical-align
 #.
-#: ../src/orca/text_attribute_names.py:643
+#: ../src/orca/text_attribute_names.py:653
 msgctxt "textattr"
 msgid "text-bottom"
 msgstr "dÆ°á»?i vÄ?n báº£n"
@@ -9000,7 +9629,7 @@ msgstr "dÆ°á»?i vÄ?n báº£n"
 #. http://www.w3.org/TR/1998/REC-CSS2-19980512/visudet.html#propdef-vertical-align
 #. http://www.w3.org/TR/2001/WD-css3-text-20010517/#PrimaryTextAdvanceDirection
 #.
-#: ../src/orca/text_attribute_names.py:651
+#: ../src/orca/text_attribute_names.py:661
 msgctxt "textattr"
 msgid "inherit"
 msgstr "káº¿ thá»«a"
@@ -9010,7 +9639,7 @@ msgstr "káº¿ thá»«a"
 #. See:
 #. http://www.w3.org/TR/2001/WD-css3-text-20010517/#PrimaryTextAdvanceDirection
 #.
-#: ../src/orca/text_attribute_names.py:658
+#: ../src/orca/text_attribute_names.py:668
 msgctxt "textattr"
 msgid "lr-tb"
 msgstr "lr-tb"
@@ -9020,7 +9649,7 @@ msgstr "lr-tb"
 #. See:
 #. http://www.w3.org/TR/2001/WD-css3-text-20010517/#PrimaryTextAdvanceDirection
 #.
-#: ../src/orca/text_attribute_names.py:665
+#: ../src/orca/text_attribute_names.py:675
 msgctxt "textattr"
 msgid "rl-tb"
 msgstr "rl-tb"
@@ -9030,7 +9659,7 @@ msgstr "rl-tb"
 #. See:
 #. http://www.w3.org/TR/2001/WD-css3-text-20010517/#PrimaryTextAdvanceDirection
 #.
-#: ../src/orca/text_attribute_names.py:672
+#: ../src/orca/text_attribute_names.py:682
 msgctxt "textattr"
 msgid "tb-rl"
 msgstr "tb-rl"
@@ -9040,7 +9669,7 @@ msgstr "tb-rl"
 #. See:
 #. http://www.w3.org/TR/2001/WD-css3-text-20010517/#PrimaryTextAdvanceDirection
 #.
-#: ../src/orca/text_attribute_names.py:679
+#: ../src/orca/text_attribute_names.py:689
 msgctxt "textattr"
 msgid "tb-lr"
 msgstr "tb-lr"
@@ -9050,7 +9679,7 @@ msgstr "tb-lr"
 #. See:
 #. http://www.w3.org/TR/2001/WD-css3-text-20010517/#PrimaryTextAdvanceDirection
 #.
-#: ../src/orca/text_attribute_names.py:686
+#: ../src/orca/text_attribute_names.py:696
 msgctxt "textattr"
 msgid "bt-rl"
 msgstr "bt-rl"
@@ -9060,7 +9689,7 @@ msgstr "bt-rl"
 #. See:
 #. http://www.w3.org/TR/2001/WD-css3-text-20010517/#PrimaryTextAdvanceDirection
 #.
-#: ../src/orca/text_attribute_names.py:693
+#: ../src/orca/text_attribute_names.py:703
 msgctxt "textattr"
 msgid "bt-lr"
 msgstr "bt-lr"
@@ -9070,7 +9699,7 @@ msgstr "bt-lr"
 #. See:
 #. http://www.w3.org/TR/2001/WD-css3-text-20010517/#PrimaryTextAdvanceDirection
 #.
-#: ../src/orca/text_attribute_names.py:700
+#: ../src/orca/text_attribute_names.py:710
 msgctxt "textattr"
 msgid "lr"
 msgstr "lr"
@@ -9080,7 +9709,7 @@ msgstr "lr"
 #. See:
 #. http://www.w3.org/TR/2001/WD-css3-text-20010517/#PrimaryTextAdvanceDirection
 #.
-#: ../src/orca/text_attribute_names.py:707
+#: ../src/orca/text_attribute_names.py:717
 msgctxt "textattr"
 msgid "rl"
 msgstr "rl"
@@ -9090,7 +9719,7 @@ msgstr "rl"
 #. See:
 #. http://www.w3.org/TR/2001/WD-css3-text-20010517/#PrimaryTextAdvanceDirection
 #.
-#: ../src/orca/text_attribute_names.py:714
+#: ../src/orca/text_attribute_names.py:724
 msgctxt "textattr"
 msgid "tb"
 msgstr "tb"
@@ -9098,7 +9727,7 @@ msgstr "tb"
 #. Translators: this is one of the text attribute values for the following
 #. text attributes: "strikethrough." It refers to the line style.
 #.
-#: ../src/orca/text_attribute_names.py:719
+#: ../src/orca/text_attribute_names.py:729
 msgctxt "textattr"
 msgid "solid"
 msgstr "Ä?áº·c"
@@ -9108,7 +9737,7 @@ msgstr "Ä?áº·c"
 #. spelled correctly. See:
 #. https://developer.mozilla.org/en/Accessibility/AT-APIs/Gecko/TextAttrs
 #.
-#: ../src/orca/text_attribute_names.py:726
+#: ../src/orca/text_attribute_names.py:736
 msgctxt "textattr"
 msgid "spelling"
 msgstr "chÃnh táº£"
@@ -9120,30 +9749,30 @@ msgstr "Báº¥m phÃm dÃ i Ä?á»? báºt/táº¯t."
 
 #. Translators: this is a tip for the user on how to interact
 #. with a combobox.
-#: ../src/orca/tutorialgenerator.py:184
+#: ../src/orca/tutorialgenerator.py:185
 msgid "Press space to expand, and use up and down to select an item."
 msgstr "Báº¥m phÃm dÃ i Ä?á»? má»? rá»?ng, báº¥m mÅ©i tÃªn trÃªn vÃ  dÆ°á»?i Ä?á»? chá»?n má»¥c."
 
 #. Translators: If this application has more than one unfocused alert or
 #. dialog window, inform user of how to refocus these.
-#: ../src/orca/tutorialgenerator.py:214
+#: ../src/orca/tutorialgenerator.py:216
 msgid "Press alt+f6 to give focus to child windows."
 msgstr "Báº¥m tá»? há»£p phÃm Alt+F6 Ä?á»? Ä?áº·t tiÃªu Ä?iá»?m trong cá»a sá»? con."
 
 #. Translators: this gives tips on how to navigate items in a
 #. layered pane.
-#: ../src/orca/tutorialgenerator.py:275
+#: ../src/orca/tutorialgenerator.py:277
 msgid "To move to items, use either the arrow keys or type ahead searching."
 msgstr "Ä?á»? chuyá»?n sang má»¥c, dÃ¹ng hoáº·c phÃm mÅ©i tÃªn hoáº·c chá»©c nÄ?ng tÃ¬m kiáº¿m theo chuá»?i gÃµ."
 
 #. Translators: this is the tutorial string for when first landing
 #. on the desktop, describing how to access the system menus.
-#: ../src/orca/tutorialgenerator.py:281
+#: ../src/orca/tutorialgenerator.py:283
 msgid "To get to the system menus press the alt+f1 key."
 msgstr "Ä?á»? vÃ o trÃ¬nh Ä?Æ¡n há»? thá»?ng, báº¥m tá»? há»£p phÃm Alt+F1."
 
 #. Translators: this is the tutorial string when navigating lists.
-#: ../src/orca/tutorialgenerator.py:315
+#: ../src/orca/tutorialgenerator.py:317
 msgid "Use up and down to select an item."
 msgstr "DÃ¹ng mÅ©i tÃªn trÃªn vÃ  dÆ°á»?i Ä?á»? chá»?n má»¥c."
 
@@ -9151,8 +9780,8 @@ msgstr "DÃ¹ng mÅ©i tÃªn trÃªn vÃ  dÆ°á»?i Ä?á»? chá»?n má»¥c."
 #. 'expanded' means the children are showing.
 #. 'collapsed' means the children are not showing.
 #. this string informs the user how to collapse the node.
-#: ../src/orca/tutorialgenerator.py:344
-#: ../src/orca/tutorialgenerator.py:492
+#: ../src/orca/tutorialgenerator.py:347
+#: ../src/orca/tutorialgenerator.py:497
 msgid "To collapse, press shift plus left."
 msgstr "Ä?á»? co láº¡i, báº¥m Ä?á»?ng thá»?i phÃm dÃ i vÃ  mÅ©i tÃªn bÃªn trÃ¡i."
 
@@ -9160,180 +9789,54 @@ msgstr "Ä?á»? co láº¡i, báº¥m Ä?á»?ng thá»?i phÃm dÃ i vÃ  mÅ©i tÃªn bÃªn trÃ¡i
 #. 'expanded' means the children are showing.
 #. 'collapsed' means the children are not showing.
 #. this string informs the user how to expand the node.
-#: ../src/orca/tutorialgenerator.py:350
-#: ../src/orca/tutorialgenerator.py:498
+#: ../src/orca/tutorialgenerator.py:353
+#: ../src/orca/tutorialgenerator.py:503
 msgid "To expand, press shift plus right."
 msgstr "Ä?á»? má»? rá»?ng, báº¥m Ä?á»?ng thá»?i phÃm dÃ i vÃ  mÅ©i tÃªn bÃªn pháº£i."
 
 #. Translators: This is the tutorial string for when landing
 #. on text fields.
-#: ../src/orca/tutorialgenerator.py:382
+#: ../src/orca/tutorialgenerator.py:385
 msgid "Type in text."
 msgstr "GÃµ chuá»?i."
 
 #. Translators: this is the tutorial string for landing
 #. on a page tab, we are informing the
 #. user how to navigate these.
-#: ../src/orca/tutorialgenerator.py:410
+#: ../src/orca/tutorialgenerator.py:413
 msgid "Use left and right to view other tabs."
 msgstr "DÃ¹ng phÃm mÅ©i tÃªn bÃªn trÃªn/pháº£i Ä?á»? xem cÃ¡c thanh khÃ¡c."
 
 #. Translators: this is the tutorial string for activating a push button.
-#: ../src/orca/tutorialgenerator.py:435
+#: ../src/orca/tutorialgenerator.py:438
 msgid "To activate press space."
 msgstr "Ä?á»? kÃch hoáº¡t, báº¥m phÃm dÃ i."
 
 #. Translators: this is the tutorial string for when landing
 #. on a spin button.
-#: ../src/orca/tutorialgenerator.py:462
+#: ../src/orca/tutorialgenerator.py:466
 msgid "Use up or down arrow to select value. Or type in the desired numerical value."
 msgstr "DÃ¹ng phÃm mÅ©i tÃªn bÃªn trÃªn/dÆ°á»?i Ä?á»? chá»?n giÃ¡ trá»?. Hoáº·c gÃµ giÃ¡ trá»? thuá»?c sá»? Ä?Ã£ muá»?n."
 
 #. Translators: this is a tip for the user, how to navigate radiobuttons.
-#: ../src/orca/tutorialgenerator.py:649
+#: ../src/orca/tutorialgenerator.py:654
 msgid "Use arrow keys to change."
 msgstr "DÃ¹ng phÃm mÅ©i tÃªn Ä?á»? thay Ä?á»?i."
 
 #. Translators: this is a tip for the user, how to navigate menues.
-#: ../src/orca/tutorialgenerator.py:673
+#: ../src/orca/tutorialgenerator.py:679
 msgid "To navigate, press left or right arrow. To move through items press up or down arrow."
 msgstr "Ä?á»? duyá»?t qua, báº¥m phÃm mÅ©i tÃªn bÃªn trÃ¡i/pháº£i. Ä?á»? chuyá»?n qua cÃ¡c má»¥c, báº¥m mÅ©i tÃªn bÃªn trÃªn/dÆ°á»?i."
 
 #. Translators: this is a tip for the user, how to
 #. navigate into sub menues.
-#: ../src/orca/tutorialgenerator.py:678
+#: ../src/orca/tutorialgenerator.py:684
 msgid "To enter sub menu, press right arrow."
 msgstr "Ä?á»? vÃ o trÃ¬nh Ä?Æ¡n con, báº¥m phÃm mÅ©i tÃªn bÃªn pháº£i."
 
 #. Translators: this is the tutorial string for when landing
 #. on a slider.
-#: ../src/orca/tutorialgenerator.py:710
+#: ../src/orca/tutorialgenerator.py:716
 msgid "To decrease press left arrow, to increase press right arrow. To go to minimum press home, and for maximum press end."
 msgstr "Ä?á»? giáº£m, báº¥m phÃm mÅ©i tÃªn bÃªn trÃ¡i; Ä?á»? tÄ?ng, báº¥m phÃm mÅ©i tÃªn bÃªn pháº£i. Ä?á»? xuá»?ng tá»?i thiá»?u, báº¥m phÃm Home, lÃªn tá»?i Ä?a thÃ¬ báº¥m phÃm End."
 
-#. Translators: this is the percentage value of a slider.
-#.
-#: ../src/orca/where_am_I.py:370
-#, python-format
-msgid "%s percent"
-msgstr "pháº§n trÄ?m %s"
-
-#. Translators: this is in reference to a radio button being
-#. selected or not.
-#.
-#: ../src/orca/where_am_I.py:433
-msgid "selected"
-msgstr "Ä?Ã£ chá»?n"
-
-#. Translators: this is in reference to a radio button being
-#. selected or not.
-#.
-#: ../src/orca/where_am_I.py:438
-msgid "not selected"
-msgstr "chÆ°a chá»?n"
-
-#. Translators: "page" is the word for a page tab in a tab list.
-#.
-#: ../src/orca/where_am_I.py:478
-#, python-format
-msgid "%s page"
-msgstr "%s trang"
-
-#. Translators: this is in references to a column in a
-#. table.
-#: ../src/orca/where_am_I.py:642
-#, python-format
-msgid "column %d of %d"
-msgstr "cá»?t %d trÃªn %d"
-
-#: ../src/orca/where_am_I.py:777
-msgid "Icon panel"
-msgstr "Báº£ng biá»?u tÆ°á»£ng"
-
-#. initialize our three outputs.  Output may change below for some
-#. protocols.
-#. Translators: this is the protocol of a link eg. http, mailto.
-#.
-#: ../src/orca/where_am_I.py:822
-#, python-format
-msgid "%s link"
-msgstr "liÃªn káº¿t %s"
-
-#: ../src/orca/where_am_I.py:832
-#, python-format
-msgid "%s link to %s"
-msgstr "liÃªn káº¿t %s tá»?i %s"
-
-#. Translators: this is the domain relationship of a given
-#. link to the current page.  eg. same page, same site.
-#: ../src/orca/where_am_I.py:842
-msgid "same page"
-msgstr "cÃ¹ng trang"
-
-#: ../src/orca/where_am_I.py:844
-#: ../src/orca/where_am_I.py:852
-msgid "same site"
-msgstr "cÃ¹ng trang chá»§"
-
-#: ../src/orca/where_am_I.py:854
-msgid "different site"
-msgstr "trang chá»§ khÃ¡c"
-
-#. Translators: this is a count of the number of selected icons
-#. and the count of the total number of icons within an icon panel.
-#. An example of an icon panel is the Nautilus folder view.
-#.
-#: ../src/orca/where_am_I.py:1013
-#, python-format
-msgid "%d of %d item selected"
-msgid_plural "%d of %d items selected"
-msgstr[0] "%d trÃªn %d má»¥c Ä?Ã£ chá»?n"
-
-#. Translators: this is a indication of the focused icon and the
-#. count of the total number of icons within an icon panel. An
-#. example of an icon panel is the Nautilus folder view.
-#.
-#: ../src/orca/where_am_I.py:1023
-#, python-format
-msgid "on item %d of %d"
-msgstr "trÃªn má»¥c %d trÃªn %d"
-
-#. Translators: This is the size of a file in bytes
-#.
-#: ../src/orca/where_am_I.py:1056
-#, python-format
-msgid "%d byte"
-msgid_plural "%d bytes"
-msgstr[0] "%d byte"
-
-#. Translators: This is the size of a file in kilobytes
-#.
-#: ../src/orca/where_am_I.py:1060
-#, python-format
-msgid "%.2f kilobytes"
-msgstr "%.2f kilÃ´byte"
-
-#. Translators: This is the size of a file in megabytes
-#.
-#: ../src/orca/where_am_I.py:1064
-#, python-format
-msgid "%.2f megabytes"
-msgstr "%.2f megabyte"
-
-#. Translators: this is an item in a list.
-#.
-#: ../src/orca/where_am_I.py:1197
-#: ../src/orca/where_am_I.py:1241
-#, python-format
-msgid "item %d of %d"
-msgstr "má»¥c %d trÃªn %d"
-
-#. Translators: The "default" button in a dialog box is the button
-#. that gets activated when Enter is pressed anywhere within that
-#. dialog box.
-#.
-#: ../src/orca/where_am_I.py:1897
-#, python-format
-msgid "Default button is %s"
-msgstr "NÃºt máº·c Ä?á»?nh lÃ  %s"
-
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]