[orca] Updated Traditional Chinese translation(Hong Kong and Taiwan)

From: Chao-Hsiung Liao <chliao src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [orca] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Mon, 21 Sep 2009 13:09:43 +0000 (UTC)
commit afdc0719b17a70e2d3f5c8e447219d8134e77f9a
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Mon Sep 21 21:09:32 2009 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 4211 +++++++++++++++++++++++++++++------------------------------
 po/zh_TW.po | 4211 +++++++++++++++++++++++++++++------------------------------
 2 files changed, 4140 insertions(+), 4282 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 317f226..e779e2a 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Orca 2.25.91pre\n"
+"Project-Id-Version: Orca 2.27.92pre\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-14 11:42+0800\n"
-"PO-Revision-Date: 2009-02-14 11:42+0800\n"
+"POT-Creation-Date: 2009-09-21 21:07+0800\n"
+"PO-Revision-Date: 2009-09-21 21:08+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
@@ -16,185 +16,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../orca.desktop.in.h:1
+#: ../orca.desktop.in.h:1 ../src/orca/app_gui_prefs.py:210
+#: ../src/orca/keybindings.py:157 ../src/orca/orca_gui_prefs.py:2273
+#: ../src/orca/orca_gui_prefs.py:2378
+msgid "Orca"
+msgstr "Orca"
+
+#: ../orca.desktop.in.h:2
 msgid "Orca Screen Reader and Magnifier"
 msgstr "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 "å°?ç?«é?¢è³?è¨?ä»¥èª?é?³æ??é»?å?å±?ç¤ºï¼?æ??æ?¾å¤§ç?«é?¢"
 
-#. 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
-#. 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:27
-#, fuzzy
-msgid "Czech Grade 1"
-msgstr "Ã¦Â?Â·Ã¥Â?Â?Ã¥Â?Â±Ã¥Â?Â?Ã¥Â?Â?"
-
-#: ../src/louis/constants.py.in:28
-msgid "Spanish Grade 1"
-msgstr ""
-
-#: ../src/louis/constants.py.in:29
-#, fuzzy
-msgid "Canada French Grade 2"
-msgstr "æ³?å±¬å??é?¨å±¬å?°"
-
-#: ../src/louis/constants.py.in:30
-#, fuzzy
-msgid "France French Grade 2"
-msgstr "æ³?å±¬å??é?¨å±¬å?°"
-
-#: ../src/louis/constants.py.in:31
-msgid "Latvian Grade 1"
-msgstr ""
-
-#: ../src/louis/constants.py.in:32
-msgid "Netherlands Dutch Grade 1"
-msgstr ""
-
-#: ../src/louis/constants.py.in:33
-#, fuzzy
-msgid "Norwegian Grade 0"
-msgstr "æ?ªå¨?èª?/Bokmaal"
-
-#: ../src/louis/constants.py.in:34
-#, fuzzy
-msgid "Norwegian Grade 1"
-msgstr "æ?ªå¨?èª?/Bokmaal"
-
-#: ../src/louis/constants.py.in:35
-#, fuzzy
-msgid "Norwegian Grade 2"
-msgstr "æ?ªå¨?èª?/Bokmaal"
-
-#: ../src/louis/constants.py.in:36
-#, fuzzy
-msgid "Norwegian Grade 3"
-msgstr "æ?ªå¨?èª?/Bokmaal"
-
-#: ../src/louis/constants.py.in:37
-msgid "Polish Grade 1"
-msgstr ""
-
-#: ../src/louis/constants.py.in:38
-#, fuzzy
-msgid "Portuguese Grade 1"
-msgstr "è?¡æ??ï¼?è?¡è??ç??ï¼?"
-
-#: ../src/louis/constants.py.in:39
-msgid "Swedish Grade 1"
-msgstr ""
-
-#: ../src/louis/constants.py.in:40
-msgid "Arabic Grade 1"
-msgstr ""
-
-#: ../src/louis/constants.py.in:41
-msgid "Welsh Grade 1"
-msgstr ""
-
-#: ../src/louis/constants.py.in:42
-msgid "Welsh Grade 2"
-msgstr ""
-
-#: ../src/louis/constants.py.in:43
-#, fuzzy
-msgid "German Grade 0"
-msgstr "å¾·æ??ï¼?å¥§å?°å?©ï¼?"
-
-#: ../src/louis/constants.py.in:44
-#, fuzzy
-msgid "German Grade 1"
-msgstr "å¾·æ??ï¼?å¥§å?°å?©ï¼?"
-
-#: ../src/louis/constants.py.in:45
-#, fuzzy
-msgid "German Grade 2"
-msgstr "å¾·æ??ï¼?å¥§å?°å?©ï¼?"
-
-#: ../src/louis/constants.py.in:46
-#, fuzzy
-msgid "U.K. English Grade 2"
-msgstr "è?±æ??ï¼?ç¾?å??ï¼?"
-
-#: ../src/louis/constants.py.in:47
-#, fuzzy
-msgid "U.K. English Grade 1"
-msgstr "è?±æ??ï¼?ç¾?å??ï¼?"
-
-#: ../src/louis/constants.py.in:48
-#, fuzzy
-msgid "U.S. English Grade 1"
-msgstr "è?±æ??ï¼?ç¾?å??ï¼?"
-
-#: ../src/louis/constants.py.in:49
-#, fuzzy
-msgid "U.S. English Grade 2"
-msgstr "è?±æ??ï¼?ç¾?å??ï¼?"
-
-#: ../src/louis/constants.py.in:50
-#, fuzzy
-msgid "Canada French Grade 1"
-msgstr "æ³?å±¬å??é?¨å±¬å?°"
-
-#: ../src/louis/constants.py.in:51
-#, fuzzy
-msgid "France French Grade 1"
-msgstr "æ³?å±¬å??é?¨å±¬å?°"
-
-#: ../src/louis/constants.py.in:52
-msgid "Greek Grade 1"
-msgstr ""
-
-#: ../src/louis/constants.py.in:53
-msgid "Hindi Grade 1"
-msgstr ""
-
-#: ../src/louis/constants.py.in:54
-msgid "Italian Grade 1"
-msgstr ""
-
-#: ../src/louis/constants.py.in:55
-msgid "Belgium Dutch Grade 1"
-msgstr ""
+#: ../orca.desktop.in.h:4
+msgid "Screen Reader and Magnifier"
+msgstr "è?¢å¹?é?±è®?ç¨?å¼?å??æ?¾å¤§é?¡"
 
 #: ../src/orca/app_gui_prefs.py:129
 #, python-format
 msgid "Orca Preferences for %s"
 msgstr "Orca ç?? %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/app_gui_prefs.py:215 ../src/orca/orca_gui_prefs.py:2384
 msgid "Unbound"
 msgstr "æ?ªç¹«çµ?"
 
@@ -223,134 +72,67 @@ msgstr "è¼¸å?¥ç??æ?¸ç±¤"
 #. 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 "æ?¸ç±¤æ?¯ç?®å??ç??ç?©ä»¶"
 
 #. 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 "æ?¸ç±¤å??ç?®å??ç??ç?©ä»¶æ??ç?¸å??ç??ç?¶é ?"
 
 #. 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
 #, fuzzy, python-format
 msgid "shared ancestor %s"
-msgstr "å?±ç?¨å??å¿?é??(_S)"
+msgstr "<b>å?±äº«è³?æ??å¤¾</b>"
 
 #. 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 "æ¯?è¼?çµ?æ??ä¸?æ??"
 
 #. 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 "æ?¸ç±¤å·²å?²å?"
 
 #. 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 "æ?¸ç±¤ç?¡æ³?è¢«å?²å?"
 
-#. 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 "grayed"
-
 #. 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 å??å°?è©±ç??)"
 
-#. 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 "å·²å±?é??"
-
-#. 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 "å·²æ?¶èµ·"
-
-#. 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 "ç¬¬ %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 "å??æ??"
-
-#. 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 "TREE LEVEL %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 "Line Left"
 
@@ -358,7 +140,7 @@ msgstr "Line Left"
 #. 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 "Line Right"
 
@@ -366,7 +148,7 @@ msgstr "Line Right"
 #. 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 "Line Up"
 
@@ -374,7 +156,7 @@ msgstr "Line Up"
 #. 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 "Line Down"
 
@@ -382,7 +164,7 @@ msgstr "Line Down"
 #. 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
 #, fuzzy
 msgid "Freeze"
 msgstr "Tree"
@@ -392,7 +174,7 @@ msgstr "Tree"
 #. 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 "Top Left"
 
@@ -401,7 +183,7 @@ msgstr "Top Left"
 #. 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 "Bottom Right"
 
@@ -410,14 +192,180 @@ msgstr "Bottom Right"
 #. 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 "æ¸¸æ¨?ä½?ç½®"
 
+#. 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
+#, fuzzy
+msgid "Six Dots"
+msgstr "æ?¼é»?"
+
+#. 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
+#, fuzzy
+msgid "Cursor Routing"
+msgstr "æ¸¸æ¨?ä½?ç½®"
+
+#. 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
+#, fuzzy
+msgid "Cut Begin"
+msgstr "KP_Begin"
+
+#. 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
+#, fuzzy
+msgid "Cut Line"
+msgstr "æ??é??æ¬?ä½?"
+
+#. 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
+#, fuzzy
+msgid "Czech Grade 1"
+msgstr "æ?·å??æ??é?µç?¤å°?æ??è¡¨"
+
+#: ../src/orca/braille.py:242
+msgid "Spanish Grade 1"
+msgstr "è¥¿ç?ç??æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:243
+msgid "Canada French Grade 2"
+msgstr "å? æ?¿å¤§æ³?èª?(ç¬¬äº?ç´?)"
+
+#: ../src/orca/braille.py:244
+msgid "France French Grade 2"
+msgstr "æ³?å??æ³?èª? (ç¬¬äº?ç´?)"
+
+#: ../src/orca/braille.py:245
+msgid "Latvian Grade 1"
+msgstr "æ??è?«ç¶äº?æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:246
+msgid "Netherlands Dutch Grade 1"
+msgstr "è?·è?æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:247
+msgid "Norwegian Grade 0"
+msgstr "æ?ªå¨?æ??(ç¬¬é?¶ç´?)"
+
+#: ../src/orca/braille.py:248
+msgid "Norwegian Grade 1"
+msgstr "æ?ªå¨?æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:249
+msgid "Norwegian Grade 2"
+msgstr "æ?ªå¨?æ??(ç¬¬äº?ç´?)"
+
+#: ../src/orca/braille.py:250
+msgid "Norwegian Grade 3"
+msgstr "æ?ªå¨?æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:251
+msgid "Polish Grade 1"
+msgstr "æ³¢è?æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:252
+msgid "Portuguese Grade 1"
+msgstr "è?¡è??ç??æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:253
+msgid "Swedish Grade 1"
+msgstr "ç??å?¸æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:254
+msgid "Arabic Grade 1"
+msgstr "é?¿æ??ä¼¯æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:255
+msgid "Welsh Grade 1"
+msgstr "å¨?ç?¾æ?¯èª?(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:256
+msgid "Welsh Grade 2"
+msgstr "å¨?ç?¾æ?¯èª?(ç¬¬äº?ç´?)"
+
+#: ../src/orca/braille.py:257
+msgid "German Grade 0"
+msgstr "å¾·æ??(ç¬¬é?¶ç´?)"
+
+#: ../src/orca/braille.py:258
+msgid "German Grade 1"
+msgstr "å¾·æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:259
+msgid "German Grade 2"
+msgstr "å¾·æ??(ç¬¬äº?ç´?)"
+
+#: ../src/orca/braille.py:260
+msgid "U.K. English Grade 2"
+msgstr "è?±å¼?è?±æ??(ç¬¬äº?ç´?)"
+
+#: ../src/orca/braille.py:261
+msgid "U.K. English Grade 1"
+msgstr "è?±å¼?è?±æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:262
+msgid "U.S. English Grade 1"
+msgstr "ç¾?å¼?è?±æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:263
+msgid "U.S. English Grade 2"
+msgstr "ç¾?å¼?è?±æ??(ç¬¬äº?ç´?)"
+
+#: ../src/orca/braille.py:264
+msgid "Canada French Grade 1"
+msgstr "å? æ?¿å¤§æ³?èª?(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:265
+msgid "France French Grade 1"
+msgstr "æ³?å??æ³?èª?(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:266
+msgid "Greek Grade 1"
+msgstr "å¸?è??æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:267
+msgid "Hindi Grade 1"
+msgstr "å??å?°åº¦æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:268
+msgid "Italian Grade 1"
+msgstr "æ??å¤§å?©æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:269
+msgid "Belgium Dutch Grade 1"
+msgstr "æ¯?å?©æ??è?·è?æ??(ç¬¬ä¸?ç´?)"
+
 #. Translators: this is the spoken word for the space character
 #.
-#: ../src/orca/chnames.py:39 ../src/orca/default.py:6870
-#: ../src/orca/default.py:6877 ../src/orca/keynames.py:133
+#: ../src/orca/chnames.py:39 ../src/orca/default.py:7334
+#: ../src/orca/default.py:7341 ../src/orca/keynames.py:133
 msgid "space"
 msgstr "ç©ºç?½"
 
@@ -599,7 +547,10 @@ msgstr "åº?ç·?"
 
 #. Translators: this is the spoken word for the character '`' (U+0060)
 #.
-#: ../src/orca/chnames.py:159
+#. 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 "grave"
 
@@ -623,43 +574,53 @@ msgstr "å?³å¤§æ?¬è??"
 
 #. Translators: this is the spoken word for the character '~' (U+007e)
 #.
-#: ../src/orca/chnames.py:175
+#. 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 "æ³¢ç´?è??"
 
+#. 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 "no break space"
+msgstr "æ²?æ??æ?·é??ç??ç©ºç?½"
+
 #. 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 "inverted exclamation point"
 
 #. Translators: this is the spoken word for the character 'Â¢' (U+00a2)
 #.
-#: ../src/orca/chnames.py:183
+#: ../src/orca/chnames.py:188
 msgid "cents"
 msgstr "cents"
 
 #. Translators: this is the spoken word for the character 'Â£' (U+00a3)
 #.
-#: ../src/orca/chnames.py:187
+#: ../src/orca/chnames.py:192
 msgid "pounds"
 msgstr "é??"
 
 #. 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 "currency sign"
 
 #. Translators: this is the spoken word for the character 'Â¥' (U+00a5)
 #.
-#: ../src/orca/chnames.py:195
+#: ../src/orca/chnames.py:200
 msgid "yen"
 msgstr "æ?¥å??"
 
 #. 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 "broken bar"
 
@@ -667,697 +628,712 @@ msgstr "broken bar"
 #.
 #. Translators: spoken words for the rolename of a section (e.g., in html).
 #.
-#: ../src/orca/chnames.py:203 ../src/orca/rolenames.py:840
+#: ../src/orca/chnames.py:208 ../src/orca/rolenames.py:840
 msgid "section"
 msgstr "ç« ç¯?"
 
 #. Translators: this is the spoken word for the character 'Â¨' (U+00a8)
 #.
-#: ../src/orca/chnames.py:207
+#: ../src/orca/chnames.py:212
 msgid "umlaut"
 msgstr "umlaut"
 
 #. Translators: this is the spoken word for the character 'Â©' (U+00a9)
 #.
-#: ../src/orca/chnames.py:211
+#: ../src/orca/chnames.py:216
 msgid "copyright"
 msgstr "ç??æ¬?"
 
 #. 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 "superscript a"
 
 #. 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 "left double angle bracket"
 
 #. 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 "logical not"
 
 #. 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 "soft hyphen"
 
 #. Translators: this is the spoken word for the character 'Â®' (U+00ae)
 #.
-#: ../src/orca/chnames.py:231
+#: ../src/orca/chnames.py:236
 msgid "registered"
 msgstr "registered"
 
 #. Translators: this is the spoken word for the character 'Â¯' (U+00af)
 #.
-#: ../src/orca/chnames.py:235
+#: ../src/orca/chnames.py:240
 msgid "macron"
 msgstr "macron"
 
 #. Translators: this is the spoken word for the character 'Â°' (U+00b0)
 #.
-#: ../src/orca/chnames.py:239
+#: ../src/orca/chnames.py:244
 msgid "degrees"
 msgstr "åº¦"
 
 #. 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 "å? æ¸?"
 
 #. 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 "superscript 2"
 
 #. 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 "superscript 3"
 
 #. 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 "acute accent"
 
 #. Translators: this is the spoken word for the character 'Âµ' (U+00b5)
 #.
-#: ../src/orca/chnames.py:259
+#: ../src/orca/chnames.py:264
 msgid "mu"
 msgstr "mu"
 
 #. 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 "æ®µè?½æ¨?è¨?"
 
 #. 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 "middle dot"
 
 #. 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 "cedilla"
 
 #. 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 "superscript 1"
 
 #. Translators: this is the spoken word for the character 'Âº' (U+00ba)
 #.
-#: ../src/orca/chnames.py:279
+#: ../src/orca/chnames.py:284
 msgid "ordinal"
 msgstr "ordinal"
 
 #. 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 "right double angle bracket"
 
 #. 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 "one fourth"
 
 #. 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 "one half"
 
 #. 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 "three fourths"
 
 #. 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 "å??å??è??"
 
 #. 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 acute"
 
 #. 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 GRAVE"
 
 #. 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 ACUTE"
 
 #. 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 CIRCUMFLEX"
 
 #. 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 TILDE"
 
 #. 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 UMLAUT"
 
 #. 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 RING"
 
 #. 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"
 
 #. 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 CEDILLA"
 
 #. 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 GRAVE"
 
 #. 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 ACUTE"
 
 #. 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 CIRCUMFLEX"
 
 #. 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 UMLAUT"
 
 #. 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 GRAVE"
 
 #. 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 ACUTE"
 
 #. 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 CIRCUMFLEX"
 
 #. 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 UMLAUT"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d0)
 #.
-#: ../src/orca/chnames.py:371
+#: ../src/orca/chnames.py:376
 msgid "ETH"
 msgstr "ETH"
 
 #. 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 TILDE"
 
 #. 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 GRAVE"
 
 #. 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 ACUTE"
 
 #. 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 CIRCUMFLEX"
 
 #. 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 TILDE"
 
 #. 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 UMLAUT"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d7)
 #.
-#: ../src/orca/chnames.py:399
+#: ../src/orca/chnames.py:404
 msgid "times"
 msgstr "ä¹?"
 
 #. 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 STROKE"
 
 #. 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 GRAVE"
 
 #. 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 ACUTE"
 
 #. 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 CIRCUMFLEX"
 
 #. 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 UMLAUT"
 
 #. 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 ACUTE"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00de)
 #.
-#: ../src/orca/chnames.py:427
+#: ../src/orca/chnames.py:432
 msgid "THORN"
 msgstr "THORN"
 
 #. 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 "s sharp"
 
 #. 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 grave"
 
 #. 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 circumflex"
 
 #. 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 tilde"
 
 #. 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 umlaut"
 
 #. 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 ring"
 
 #. 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"
 
 #. 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 cedilla"
 
 #. 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 grave"
 
 #. 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 acute"
 
 #. 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 circumflex"
 
 #. 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 umlaut"
 
 #. 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 grave"
 
 #. 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 acute"
 
 #. 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 circumflex"
 
 #. 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 umlaut"
 
 #. Translators: this is the spoken word for the character 'Ã°' (U+00f0)
 #.
-#: ../src/orca/chnames.py:495
+#: ../src/orca/chnames.py:500
 msgid "eth"
 msgstr "eth"
 
 #. 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 tilde"
 
 #. 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 grave"
 
 #. 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 acute"
 
 #. 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 circumflex"
 
 #. 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 tilde"
 
 #. 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 umlaut"
 
 #. 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 "é?¤ä»¥"
 
 #. 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 stroke"
 
 #. Translators: this is the spoken word for the character 'Ã¾' (U+00fe)
 #.
-#: ../src/orca/chnames.py:531
+#: ../src/orca/chnames.py:536
 msgid "thorn"
 msgstr "thorn"
 
 #. 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 acute"
 
 #. 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 grave"
 
 #. 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 circumflex"
 
 #. 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 umlaut"
 
 #. 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 acute"
 
 #. 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 umlaut"
 
 #. 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 "Y UMLAUT"
 
 #. Translators: this is the spoken word for the character 'Æ?' (U+0192)
 #.
-#: ../src/orca/chnames.py:563
+#: ../src/orca/chnames.py:568
 msgid "florin"
 msgstr "florin"
 
 #. 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 "en dash"
 
 #. 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 "å·¦å?®å¼?è??"
 
 #. 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 "å?³å?®å¼?è??"
 
 #. Translators: this is the spoken word for the character 'â??' (U+201a)
 #.
-#: ../src/orca/chnames.py:581
+#: ../src/orca/chnames.py:586
 #, fuzzy
-#| msgid "left single quote"
 msgid "single low quote"
-msgstr "ä¸?ä½¿ç?¨å¼?æ??"
+msgstr "å·¦å?®å¼?è??"
 
 #. 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 "å·¦é??å¼?è??"
 
 #. 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 "å?³é??å¼?è??"
 
 #. Translators: this is the spoken word for the character 'â??' (U+201e)
 #.
-#: ../src/orca/chnames.py:593
+#: ../src/orca/chnames.py:598
 #, fuzzy
-#| msgid "left double quote"
 msgid "double low quote"
-msgstr "ä¸?ä½¿ç?¨å¼?æ??"
+msgstr "å·¦é??å¼?è??"
 
 #. Translators: this is the spoken word for the character 'â? ' (U+2020)
 #.
-#: ../src/orca/chnames.py:597
+#: ../src/orca/chnames.py:602
 msgid "dagger"
 msgstr "dagger"
 
 #. 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 "double dagger"
 
 #. Translators: this is the spoken word for the character 'â?¢' (U+2022)
 #.
-#: ../src/orca/chnames.py:605
+#: ../src/orca/chnames.py:610
 msgid "bullet"
 msgstr "é ?ç?®ç¬¦è??"
 
 #. 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 "ä¸?è§?é ?ç?®ç¬¦è??"
 
 #. 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 "per mille"
 
 #. Translators: this is the spoken word for the character 'â?²' (U+2032)
 #.
-#: ../src/orca/chnames.py:617
+#: ../src/orca/chnames.py:622
 msgid "prime"
 msgstr "prime"
 
 #. 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 "double prime"
 
 #. 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 "hyphen bullet"
 
 #. Translators: this is the spoken word for the character 'â?¬' (U+20ac)
 #.
-#: ../src/orca/chnames.py:629
+#: ../src/orca/chnames.py:634
 msgid "euro"
 msgstr "æ?å??"
 
 #. Translators: this is the spoken word for the character 'â?¢' (U+2122)
 #.
-#: ../src/orca/chnames.py:633
+#: ../src/orca/chnames.py:638
 msgid "trademark"
 msgstr "è¨»å??å??æ¨?"
 
+#. Translators: this is the spoken word for the character 'â??' (U+2190)
+#.
+#: ../src/orca/chnames.py:642
+#, fuzzy
+msgid "left arrow"
+msgstr "ç®é æ?¹å??"
+
+#. Translators: this is the spoken word for the character 'â??' (U+2192)
+#.
+#: ../src/orca/chnames.py:646
+#, fuzzy
+msgid "right arrow"
+msgstr "å?³ç®é "
+
 #. 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 "å¹¾ä¹?ç?æ?¼"
 
 #. 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 "ä¸?ç?æ?¼"
 
 #. 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 "å°?æ?¼ç?æ?¼"
 
 #. 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 "å¤§æ?¼ç?æ?¼"
 
 #. 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 "é??æ ¹è??"
 
 #. 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 "é??ä¸?æ?¹"
 
 #. Translators: this is the spoken word for the character 'â??' (U+221e)
 #.
-#: ../src/orca/chnames.py:661
+#: ../src/orca/chnames.py:674
 msgid "infinity"
 msgstr "ç?¡é??å¤§"
 
@@ -1368,14 +1344,14 @@ msgstr "ç?¡é??å¤§"
 #. 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 "å¯¦å¿?æ?¹æ¡?"
 
 #. 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 "ç©ºå¿?æ?¹æ¡?"
 
@@ -1386,41 +1362,41 @@ msgstr "ç©ºå¿?æ?¹æ¡?"
 #. 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 "å¯¦å¿?è?±å½¢"
 
 #. 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 "ç©ºå¿?å??"
 
 #. 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 "å¯¦å¿?å??å½¢"
 
 #. 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 "ç©ºå¿?é ?ç?®ç¬¦è??"
 
 #. 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 "check mark"
 
 #. 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 "heavy check mark"
 
@@ -1431,7 +1407,7 @@ msgstr "heavy check mark"
 #. 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å??é ?ç?®ç¬¦è??"
 
@@ -1440,7 +1416,7 @@ msgstr "xå??é ?ç?®ç¬¦è??"
 #. 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 "å?³ç®é "
 
@@ -1449,10 +1425,18 @@ msgstr "å?³ç®é "
 #. 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 "right-pointing arrowhead"
 
+#. Translators: this command will move the mouse pointer
+#. to the current item without clicking on it.
+#.
+#: ../src/orca/default.py:151
+#, fuzzy
+msgid "Routes the pointer to the current item."
+msgstr "è®?å?ºè¼¸å?¥è¡?ç??å?§å®¹ã??"
+
 #. 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
@@ -1463,7 +1447,7 @@ msgstr "right-pointing arrowhead"
 #. {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:166
 msgid "Performs left click on current flat review item."
 msgstr "å?¨ç?®å??ç?? flat review é ?ç?®ä¸æ??ä¸?å·¦é?µ"
 
@@ -1477,7 +1461,7 @@ msgstr "å?¨ç?®å??ç?? flat review é ?ç?®ä¸æ??ä¸?å·¦é?µ"
 #. {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:181
 msgid "Performs right click on current flat review item."
 msgstr "å?¨ç?®å??ç?? flat review é ?ç?®ä¸æ??ä¸?å?³é?µ"
 
@@ -1489,9 +1473,9 @@ msgstr "å?¨ç?®å??ç?? flat review é ?ç?®ä¸æ??ä¸?å?³é?µ"
 #. be positioned at the point where the speech was
 #. interrupted.
 #.
-#: ../src/orca/default.py:167 ../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/default.py:194 ../src/orca/scripts/apps/acroread.py:114
+#: ../src/orca/scripts/apps/evolution/script.py:153
+#: ../src/orca/scripts/toolkits/Gecko/script.py:531
 msgid "Speaks entire document."
 msgstr "è®?å?ºæ?´å??æ??ä»¶ã??"
 
@@ -1502,7 +1486,7 @@ msgstr "è®?å?ºæ?´å??æ??ä»¶ã??"
 #. name of the current pushbutton with focus as well as
 #. its mnemonic.
 #.
-#: ../src/orca/default.py:179
+#: ../src/orca/default.py:206
 msgid "Performs the basic where am I operation."
 msgstr "é?²è¡?å?ºæ?¬ç??ã??æ??å?¨å?ªè£?ã??æ??ä½?ã??"
 
@@ -1513,21 +1497,21 @@ msgstr "é?²è¡?å?ºæ?¬ç??ã??æ??å?¨å?ªè£?ã??æ??ä½?ã??"
 #. name of the current pushbutton with focus as well as
 #. its mnemonic.
 #.
-#: ../src/orca/default.py:191
+#: ../src/orca/default.py:218
 msgid "Performs the detailed where am I operation."
 msgstr "é?²è¡?è©³ç´°ç??ã??æ??å?¨å?ªè£?ã??æ??ä½?ã??"
 
 #. Translators: This command will cause the window's
 #. title to be spoken.
 #.
-#: ../src/orca/default.py:199
+#: ../src/orca/default.py:231
 msgid "Speaks the title bar."
 msgstr "è®?å?ºæ¨?é¡?å??ã??"
 
 #. Translators: This command will cause the window's
 #. status bar contents to be spoken.
 #.
-#: ../src/orca/default.py:207
+#: ../src/orca/default.py:244
 msgid "Speaks the status bar."
 msgstr "è®?å?ºç??æ??å??ã??"
 
@@ -1536,7 +1520,7 @@ msgstr "è®?å?ºç??æ??å??ã??"
 #. that text.  For example, they may want to find the
 #. "OK" button.
 #.
-#: ../src/orca/default.py:217
+#: ../src/orca/default.py:254
 msgid "Opens the Orca Find dialog."
 msgstr "é??å?? Orca å°?æ?¾å°?è©±è¦?çª?ã??"
 
@@ -1546,7 +1530,7 @@ msgstr "é??å?? Orca å°?æ?¾å°?è©±è¦?çª?ã??"
 #. "OK" button.  This string is used for finding the
 #. next occurence of a string.
 #.
-#: ../src/orca/default.py:228
+#: ../src/orca/default.py:265
 msgid "Searches for the next instance of a string."
 msgstr "æ??å°?ä¸?ä¸?å??ç?¸å??ç??å?ä¸²ã??"
 
@@ -1556,7 +1540,7 @@ msgstr "æ??å°?ä¸?ä¸?å??ç?¸å??ç??å?ä¸²ã??"
 #. "OK" button.  This string is used for finding the
 #. previous occurence of a string.
 #.
-#: ../src/orca/default.py:239
+#: ../src/orca/default.py:276
 msgid "Searches for the previous instance of a string."
 msgstr "æ??å°?ä¸?ä¸?å??ç?¸å??ç??å?ä¸²ã??"
 
@@ -1566,7 +1550,7 @@ msgstr "æ??å°?ä¸?ä¸?å??ç?¸å??ç??å?ä¸²ã??"
 #. zones in the active window for the application that
 #. currently has focus.
 #.
-#: ../src/orca/default.py:250
+#: ../src/orca/default.py:287
 msgid "Paints and prints the visible zones in the active window."
 msgstr "å?¨ä½¿ç?¨ç??è¦?çª?ä¸ç¹ªç?«å??å?°å?ºå?¯è¦?å??å??ã??"
 
@@ -1579,7 +1563,7 @@ msgstr "å?¨ä½¿ç?¨ç??è¦?çª?ä¸ç¹ªç?«å??å?°å?ºå?¯è¦?å??å??ã??"
 #. the user to explore this text by the {previous,next}
 #. {line,word,character}.
 #.
-#: ../src/orca/default.py:264
+#: ../src/orca/default.py:301
 msgid "Enters and exits flat review mode."
 msgstr "é?²å?¥å??é?¢é?? flat review æ¨¡å¼?ã??"
 
@@ -1592,7 +1576,7 @@ msgstr "é?²å?¥å??é?¢é?? flat review æ¨¡å¼?ã??"
 #. the user to explore this text by the {previous,next}
 #. {line,word,character}.
 #.
-#: ../src/orca/default.py:278
+#: ../src/orca/default.py:315
 msgid "Moves flat review to the beginning of the previous line."
 msgstr "å°? flat review ç§»è?³ä¸?ä¸?è¡?ç??è¡?é¦?ã??"
 
@@ -1606,7 +1590,7 @@ msgstr "å°? flat review ç§»è?³ä¸?ä¸?è¡?ç??è¡?é¦?ã??"
 #. {line,word,character}.  The home position is the
 #. beginning of the content in the window.
 #.
-#: ../src/orca/default.py:293
+#: ../src/orca/default.py:330
 msgid "Moves flat review to the home position."
 msgstr "å°? flat review ç§»è?³å®¶ä½?ç½®ã??"
 
@@ -1620,7 +1604,7 @@ msgstr "å°? flat review ç§»è?³å®¶ä½?ç½®ã??"
 #. {line,word,character}.  This particular command will
 #. cause Orca to speak the current line.
 #.
-#: ../src/orca/default.py:308
+#: ../src/orca/default.py:345
 msgid "Speaks the current flat review line."
 msgstr "è®?å?ºç?®å??ç?? flat review è¡?ã??"
 
@@ -1634,7 +1618,7 @@ msgstr "è®?å?ºç?®å??ç?? flat review è¡?ã??"
 #. {line,word,character}. This particular command will
 #. cause Orca to spell the current line.
 #.
-#: ../src/orca/default.py:323
+#: ../src/orca/default.py:360
 msgid "Spells the current flat review line."
 msgstr "æ?¼å?ºç?®å??ç?? flat review è¡?ã??"
 
@@ -1649,10 +1633,10 @@ msgstr "æ?¼å?ºç?®å??ç?? flat review è¡?ã??"
 #. 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:376
 #, fuzzy
 msgid "Phonetically spells the current flat review line."
-msgstr "æ?¼å?ºç?®å??ç?? flat review è¡?ã??"
+msgstr "æ?¼å?ºç?®å??ç?? flat review é ?ç?®æ??å?è©?ã??"
 
 #. Translators: the 'flat review' feature of Orca
 #. allows the blind user to explore the text in a
@@ -1663,7 +1647,7 @@ msgstr "æ?¼å?ºç?®å??ç?? flat review è¡?ã??"
 #. the user to explore this text by the {previous,next}
 #. {line,word,character}.
 #.
-#: ../src/orca/default.py:353
+#: ../src/orca/default.py:390
 msgid "Moves flat review to the beginning of the next line."
 msgstr "å°? flat review ç§»è?³ä¸?ä¸?è¡?ç??è¡?é¦?ã??"
 
@@ -1677,7 +1661,7 @@ msgstr "å°? flat review ç§»è?³ä¸?ä¸?è¡?ç??è¡?é¦?ã??"
 #. {line,word,character}.  The end position is the last
 #. bit of information in the window.
 #.
-#: ../src/orca/default.py:368
+#: ../src/orca/default.py:405
 msgid "Moves flat review to the end position."
 msgstr "å°? flat review ç§»è?³æ??å°¾ä½?ç½®ã??"
 
@@ -1692,7 +1676,7 @@ msgstr "å°? flat review ç§»è?³æ??å°¾ä½?ç½®ã??"
 #. 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:421
 msgid "Moves flat review to the previous item or word."
 msgstr "å°? flat review ç§»è?³ä¸?ä¸?å??å?ç¬¦æ??å?è©?ã??"
 
@@ -1707,7 +1691,7 @@ msgstr "å°? flat review ç§»è?³ä¸?ä¸?å??å?ç¬¦æ??å?è©?ã??"
 #. geographically above, as if you drew a vertical line
 #. in the window.
 #.
-#: ../src/orca/default.py:400
+#: ../src/orca/default.py:437
 msgid "Moves flat review to the word above the current word."
 msgstr "å°? flat review ç§»è?³ç?®å??å?è©?ä¹?ä¸?ã??"
 
@@ -1721,7 +1705,7 @@ msgstr "å°? flat review ç§»è?³ç?®å??å?è©?ä¹?ä¸?ã??"
 #. {line,word,character}.  This command will speak the
 #. current word or item.
 #.
-#: ../src/orca/default.py:415
+#: ../src/orca/default.py:452
 msgid "Speaks the current flat review item or word."
 msgstr "è®?å?ºç?®å??ç?? flat review é ?ç?®æ??å?è©?ã??"
 
@@ -1735,7 +1719,7 @@ msgstr "è®?å?ºç?®å??ç?? flat review é ?ç?®æ??å?è©?ã??"
 #. {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:467
 msgid "Spells the current flat review item or word."
 msgstr "æ?¼å?ºç?®å??ç?? flat review é ?ç?®æ??å?è©?ã??"
 
@@ -1750,7 +1734,7 @@ msgstr "æ?¼å?ºç?®å??ç?? flat review é ?ç?®æ??å?è©?ã??"
 #. 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:483
 #, fuzzy
 msgid "Phonetically spells the current flat review item or word."
 msgstr "æ?¼å?ºç?®å??ç?? flat review é ?ç?®æ??å?è©?ã??"
@@ -1767,7 +1751,7 @@ msgstr "æ?¼å?ºç?®å??ç?? flat review é ?ç?®æ??å?è©?ã??"
 #. 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:500
 msgid "Speaks the current flat review object."
 msgstr "è®?å?ºç?®å??ç?? flat review ç?©ä»¶ã??"
 
@@ -1782,7 +1766,7 @@ msgstr "è®?å?ºç?®å??ç?? flat review ç?©ä»¶ã??"
 #. 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:516
 msgid "Moves flat review to the next item or word."
 msgstr "å°? flat review ç§»è?³ä¸?ä¸?å??é ?ç?®æ??å?è©?ã??"
 
@@ -1797,7 +1781,7 @@ msgstr "å°? flat review ç§»è?³ä¸?ä¸?å??é ?ç?®æ??å?è©?ã??"
 #. geographically below, as if you drew a vertical line
 #. downward on the screen.
 #.
-#: ../src/orca/default.py:495
+#: ../src/orca/default.py:532
 msgid "Moves flat review to the word below the current word."
 msgstr "å°? flat review ç§»è?³ç?®å??å?è©?ä¹?ä¸?ã??"
 
@@ -1812,7 +1796,7 @@ msgstr "å°? flat review ç§»è?³ç?®å??å?è©?ä¹?ä¸?ã??"
 #. 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:548
 msgid "Moves flat review to the previous character."
 msgstr "å°? flat review ç§»è?³ä¸?ä¸?å??å?ç¬¦ã??"
 
@@ -1825,7 +1809,7 @@ msgstr "å°? flat review ç§»è?³ä¸?ä¸?å??å?ç¬¦ã??"
 #. the user to explore this text by the {previous,next}
 #. {line,word,character}.
 #.
-#: ../src/orca/default.py:525
+#: ../src/orca/default.py:562
 msgid "Moves flat review to the end of the line."
 msgstr "å°? flat review ç§»è?³è¡?å°¾ã??"
 
@@ -1842,7 +1826,7 @@ msgstr "å°? flat review ç§»è?³è¡?å°¾ã??"
 #. this case will be the spoken language form of the
 #. character currently being reviewed.
 #.
-#: ../src/orca/default.py:543
+#: ../src/orca/default.py:580
 msgid "Speaks the current flat review character."
 msgstr "è®?å?ºç?®å??ç?? flat review å?ç¬¦ã??"
 
@@ -1860,10 +1844,10 @@ msgstr "è®?å?ºç?®å??ç?? flat review å?ç¬¦ã??"
 #. character currently being reviewed, saying "Alpha"
 #. for "a", "Bravo" for "b" and so on.
 #.
-#: ../src/orca/default.py:562
+#: ../src/orca/default.py:599
 #, fuzzy
 msgid "Phonetically speaks the current flat review character."
-msgstr "è®?å?ºç?®å??ç?? flat review å?ç¬¦ã??"
+msgstr "è®?å?ºç?®å??ç?? flat review é ?ç?®æ??å?è©?ã??"
 
 #. Translators: the 'flat review' feature of Orca
 #. allows the blind user to explore the text in a
@@ -1876,7 +1860,7 @@ msgstr "è®?å?ºç?®å??ç?? flat review å?ç¬¦ã??"
 #. 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:615
 msgid "Moves flat review to the next character."
 msgstr "å°? flat review ç§»è?³ä¸?ä¸?å??å?ç¬¦ã??"
 
@@ -1884,7 +1868,7 @@ msgstr "å°? flat review ç§»è?³ä¸?ä¸?å??å?ç¬¦ã??"
 #. 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:624
 msgid "Toggles whether to read just the current table cell or the whole row."
 msgstr "å??æ??æ??å?¦é?±è®?ç?®å??ç??è¡¨æ ¼æ??æ?´å??ã??"
 
@@ -1892,7 +1876,7 @@ msgstr "å??æ??æ??å?¦é?±è®?ç?®å??ç??è¡¨æ ¼æ??æ?´å??ã??"
 #. text attributes, such as bold, italic, font name,
 #. font size, etc.
 #.
-#: ../src/orca/default.py:597
+#: ../src/orca/default.py:634
 msgid "Reads the attributes associated with the current text character."
 msgstr "é?±è®?ç?®å??å?ç¬¦ç?¸é??ç??å±¬æ?§ã??"
 
@@ -1902,7 +1886,7 @@ msgstr "é?±è®?ç?®å??å?ç¬¦ç?¸é??ç??å±¬æ?§ã??"
 #. via speech and braille. This information will be
 #. helpful to script writers.
 #.
-#: ../src/orca/default.py:609
+#: ../src/orca/default.py:646
 msgid "Reports information on current script."
 msgstr "å ±å??ç?®å?? script ç??è³?è¨?ã??"
 
@@ -1915,7 +1899,7 @@ msgstr "å ±å??ç?®å?? script ç??è³?è¨?ã??"
 #. braille display so they can pan left and right over
 #. this line.
 #.
-#: ../src/orca/default.py:623
+#: ../src/orca/default.py:660 ../src/orca/scripts/toolkits/Gecko/script.py:545
 msgid "Pans the braille display to the left."
 msgstr "é»?å?é¡¯ç¤ºå??å·¦ç§»ã??"
 
@@ -1928,7 +1912,7 @@ msgstr "é»?å?é¡¯ç¤ºå??å·¦ç§»ã??"
 #. braille display so they can pan left and right over
 #. this line.
 #.
-#: ../src/orca/default.py:638
+#: ../src/orca/default.py:675 ../src/orca/scripts/toolkits/Gecko/script.py:560
 msgid "Pans the braille display to the right."
 msgstr "é»?å?é¡¯ç¤ºå??å?³ç§»ã??"
 
@@ -1942,7 +1926,7 @@ msgstr "é»?å?é¡¯ç¤ºå??å?³ç§»ã??"
 #. {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:691
 msgid "Moves flat review to the bottom left."
 msgstr "å°? flat review ç§»è?³å·¦ä¸?ã??"
 
@@ -1959,10 +1943,46 @@ msgstr "å°? flat review ç§»è?³å·¦ä¸?ã??"
 #. feature used here will return the flat review to the
 #. object with focus.
 #.
-#: ../src/orca/default.py:672
+#: ../src/orca/default.py:709
 msgid "Returns to object with keyboard focus."
 msgstr "å??å?°æ??é?µç?¤ç?¦é»?ç??ç?©ä»¶"
 
+#. 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:720
+msgid "Turns contracted braille on and off."
+msgstr ""
+
+#. 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:731
+msgid "Processes a cursor routing key."
+msgstr ""
+
+#. Translators: this is used to indicate the start point
+#. of a text selection.
+#.
+#: ../src/orca/default.py:739
+#, fuzzy
+msgid "Marks the beginning of a text selection."
+msgstr "ç§»è?³è¡?é¦?ã??"
+
+#. Translators: this is used to indicate the end point
+#. of a text selection.
+#.
+#: ../src/orca/default.py:747
+#, fuzzy
+msgid "Marks the end of a text selection."
+msgstr "ç§»è?³è¡?å°¾ã??"
+
 #. 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
@@ -1970,21 +1990,21 @@ msgstr "å??å?°æ??é?µç?¤ç?¦é»?ç??ç?©ä»¶"
 #. 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:759
 msgid "Enters learn mode.  Press escape to exit learn mode."
 msgstr "é?²å?¥å¸ç¿?æ¨¡å¼?ã??  æ??é?¢é??é?µé?¢é??å¸ç¿?æ¨¡å¼?ã??"
 
 #. Translators: the speech rate is how fast the speech
 #. synthesis engine will generate speech.
 #.
-#: ../src/orca/default.py:692
+#: ../src/orca/default.py:767
 msgid "Decreases the speech rate."
 msgstr "æ¸?æ?¢æ??è®?é??åº¦ã??"
 
 #. Translators: the speech rate is how fast the speech
 #. synthesis engine will generate speech.
 #.
-#: ../src/orca/default.py:700
+#: ../src/orca/default.py:775
 msgid "Increases the speech rate."
 msgstr "å? å¿«æ??è®?é??åº¦ã??"
 
@@ -1992,7 +2012,7 @@ msgstr "å? å¿«æ??è®?é??åº¦ã??"
 #. pitch/frequency the speech synthesis engine will
 #. generate speech.
 #.
-#: ../src/orca/default.py:709
+#: ../src/orca/default.py:784
 msgid "Decreases the speech pitch."
 msgstr "æ¸?ä½?æ??è®?é?³èª¿ã??"
 
@@ -2000,11 +2020,11 @@ msgstr "æ¸?ä½?æ??è®?é?³èª¿ã??"
 #. pitch/frequency the speech synthesis engine will
 #. generate speech.
 #.
-#: ../src/orca/default.py:718
+#: ../src/orca/default.py:793
 msgid "Increases the speech pitch."
 msgstr "å? é«?æ??è®?é?³èª¿ã??"
 
-#: ../src/orca/default.py:723
+#: ../src/orca/default.py:798
 msgid "Quits Orca"
 msgstr "é?¢é?? Orca"
 
@@ -2012,7 +2032,7 @@ msgstr "é?¢é?? Orca"
 #. the dialog that allows users to set their preferences
 #. for Orca.
 #.
-#: ../src/orca/default.py:732
+#: ../src/orca/default.py:807
 msgid "Displays the preferences configuration dialog."
 msgstr "é¡¯ç¤ºå??å¥½è¨å®?å°?è©±è¦?çª?ã??"
 
@@ -2020,14 +2040,14 @@ msgstr "é¡¯ç¤ºå??å¥½è¨å®?å°?è©±è¦?çª?ã??"
 #. 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:816
 msgid "Displays the application preferences configuration dialog."
 msgstr "é¡¯ç¤ºå??å¥½è¨å®?å°?è©±ç??ã??"
 
 #. 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:824
 msgid "Toggles the silencing of speech."
 msgstr "å??æ??ç?ºé??é?³ã??"
 
@@ -2036,7 +2056,7 @@ msgstr "å??æ??ç?ºé??é?³ã??"
 #. that prints a list of all known applications currently
 #. running on the desktop, to stdout.
 #.
-#: ../src/orca/default.py:759
+#: ../src/orca/default.py:834
 msgid ""
 "Prints a debug listing of all known applications to the console where Orca "
 "is running."
@@ -2047,30 +2067,19 @@ msgstr "ç?¶ Orca æ£å?¨é??è¡?æ??ï¼?é¡¯ç¤ºæ??æ??å·²ç?¥ç¨?å¼?ç??å?µé?¯è³?è¨?æ¸?å?®
 #. 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:845
 msgid "Cycles the debug level at run time."
 msgstr "å?¨å?·è¡?æ??å??å?ºå?µé?¯ç´?å?¥ã??"
 
 #. 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 "ç?¶ Orca æ£å?¨é??è¡?æ??ï¼?é¡¯ç¤ºç?®å??ä½¿ç?¨ä¸ç??ç¨?å¼?ç??å?µé?¯è³?è¨?"
-
-#. 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:858
 msgid "Prints debug information about the ancestry of the object with focus."
 msgstr "é¡¯ç¤ºå??å¾?ç?¦é»?ç?©ä»¶ç??è??çµ¡ç??å?µé?¯è³?è¨?ã??"
 
@@ -2081,7 +2090,7 @@ msgstr "é¡¯ç¤ºå??å¾?ç?¦é»?ç?©ä»¶ç??è??çµ¡ç??å?µé?¯è³?è¨?ã??"
 #. component hierarchy (i.e. all the components and all
 #. their descendants in the component tree).
 #.
-#: ../src/orca/default.py:807
+#: ../src/orca/default.py:871
 msgid "Prints debug information about the application with focus."
 msgstr "é¡¯ç¤ºå??å¾?ç?¦é»?ç??ç¨?å¼?ç??å?µé?¯è³?è¨?ã??"
 
@@ -2089,7 +2098,7 @@ msgstr "é¡¯ç¤ºå??å¾?ç?¦é»?ç??ç¨?å¼?ç??å?µé?¯è³?è¨?ã??"
 #. 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:880
 #, fuzzy
 msgid "Prints memory usage information."
 msgstr "å??å¾?æ¸?å?®ä½¿ç?¨è³?è¨?(_U)"
@@ -2098,35 +2107,35 @@ msgstr "å??å¾?æ¸?å?®ä½¿ç?¨è³?è¨?(_U)"
 #. the relationship of the given bookmark to the current
 #. position
 #.
-#: ../src/orca/default.py:825
+#: ../src/orca/default.py:889
 msgid "Bookmark where am I with respect to current position."
-msgstr ""
+msgstr "æ??å?ºæ??ç?®å??ä½?ç½®å?°æ?¸ç±¤ç??ç?¸å°?é??ä¿?"
 
 #. Translators: this command moves the current position to the
 #. location stored at the bookmark.
 #.
-#: ../src/orca/default.py:833
+#: ../src/orca/default.py:897
 msgid "Go to bookmark."
 msgstr "ç§»è?³æ?¸ç±¤ã??"
 
 #. 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:905
 msgid "Add bookmark."
 msgstr "å? å?¥æ?¸ç±¤ã??"
 
 #. Translators: this event handler saves all bookmarks for the
 #. current application to disk.
 #.
-#: ../src/orca/default.py:849
+#: ../src/orca/default.py:913
 msgid "Save bookmarks."
 msgstr "å?²å?æ?¸ç±¤ã??"
 
 #. 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:921
 msgid "Go to next bookmark location."
 msgstr "ç§»è?³ä¸?ä¸?å??æ?¸ç±¤ä½?ç½®ã??"
 
@@ -2134,7 +2143,7 @@ msgstr "ç§»è?³ä¸?ä¸?å??æ?¸ç±¤ä½?ç½®ã??"
 #. registered bookmarks and takes the user to the previous
 #. bookmark location.
 #.
-#: ../src/orca/default.py:866
+#: ../src/orca/default.py:930
 msgid "Go to previous bookmark location."
 msgstr "ç§»è?³ä¸?ä¸?å??æ?¸ç±¤ä½?ç½®ã??"
 
@@ -2143,7 +2152,7 @@ msgstr "ç§»è?³ä¸?ä¸?å??æ?¸ç±¤ä½?ç½®ã??"
 #. 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:940
 msgid "Toggles color enhancements."
 msgstr "å??æ??é¡?è?²å¼·å??ã??"
 
@@ -2153,21 +2162,21 @@ msgstr "å??æ??é¡?è?²å¼·å??ã??"
 #. color, and surrounding it with crosshairs.  This command
 #. toggles these enhancements on/off.
 #.
-#: ../src/orca/default.py:887
+#: ../src/orca/default.py:951
 msgid "Toggles mouse enhancements."
 msgstr "å??æ??æ»?é¼ å¼·å??ã??"
 
 #. Translators: this command increases the magnification
 #. level.
 #.
-#: ../src/orca/default.py:895
+#: ../src/orca/default.py:959
 msgid "Increases the magnification level."
 msgstr "å¢?å? æ?¾å¤§å??ç??ã??"
 
 #. Translators: this command decreases the magnification
 #. level.
 #.
-#: ../src/orca/default.py:903
+#: ../src/orca/default.py:967
 msgid "Decreases the magnification level."
 msgstr "æ¸?å°?æ?¾å¤§å??ç??ã??"
 
@@ -2176,7 +2185,7 @@ msgstr "æ¸?å°?æ?¾å¤§å??ç??ã??"
 #. but also all of the color and pointer customizations
 #. made through the magnifier.
 #.
-#: ../src/orca/default.py:913
+#: ../src/orca/default.py:977
 msgid "Toggles the magnifier."
 msgstr "å??æ??æ?¾å¤§é?¡ã??"
 
@@ -2185,14 +2194,14 @@ msgstr "å??æ??æ?¾å¤§é?¡ã??"
 #. screen.  The "position" here refers to location of the
 #. magnifier.
 #.
-#: ../src/orca/default.py:923
+#: ../src/orca/default.py:987
 msgid "Cycles to the next magnifier position."
 msgstr "å¾ªç?°è?³ä¸?ä¸?å??æ?¾å¤§é?¡ä½?ç½®ã??"
 
 #. Translators: Orca allows the item under the pointer to
 #. be spoken. This toggles the feature.
 #.
-#: ../src/orca/default.py:931
+#: ../src/orca/default.py:995
 msgid "Toggle mouse review mode."
 msgstr "å??æ??æ»?é¼ é ?è¦½æ¨¡å¼?ã??"
 
@@ -2203,37 +2212,14 @@ msgstr "å??æ??æ»?é¼ é ?è¦½æ¨¡å¼?ã??"
 #. along to the current application, bypassing Orca's
 #. interception of it.
 #.
-#: ../src/orca/default.py:943
+#: ../src/orca/default.py:1007
 msgid "Passes the next command on to the current application."
 msgstr "å?³é??ã??ä¸?ä¸?æ¥ã??æ??ä»¤çµ¦ç?®å??ç??æ??ç?¨ç¨?å¼?"
 
-#. 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:2462
-#: ../src/orca/default.py:4991 ../src/orca/default.py:5146
-#: ../src/orca/default.py:5154 ../src/orca/default.py:5262
-#: ../src/orca/default.py:5270
-#: ../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:5443
-#: ../src/orca/structural_navigation.py:3315 ../src/orca/where_am_I.py:1617
-msgid "blank"
-msgstr "ç©ºç?½"
-
 #. Translators: this is the number of space characters on a line
 #. of text.
 #.
-#: ../src/orca/default.py:2221
+#: ../src/orca/default.py:2304
 #, python-format
 msgid "%d space"
 msgid_plural "%d spaces"
@@ -2242,53 +2228,52 @@ msgstr[0] "%d å??ç©ºæ ¼"
 #. Translators: this is the number of tab characters on a line
 #. of text.
 #.
-#: ../src/orca/default.py:2233
+#: ../src/orca/default.py:2315
 #, 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:2696
-#, python-format
-msgid "Progress bar %d."
-msgstr "é?²åº¦å??%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:2704 ../src/orca/flat_review.py:444
-#: ../src/orca/speechgenerator.py:1143
-#, python-format
-msgid "%d percent."
-msgstr "ç?¾å??ä¹? %dã??"
+#: ../src/orca/default.py:2534 ../src/orca/default.py:5324
+#: ../src/orca/default.py:5480 ../src/orca/default.py:5488
+#: ../src/orca/default.py:5596 ../src/orca/default.py:5604
+#: ../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:5849
+#: ../src/orca/settings.py:1276 ../src/orca/speech_generator.py:473
+#: ../src/orca/speech_generator.py:779
+#: ../src/orca/structural_navigation.py:3304
+msgid "blank"
+msgstr "ç©ºç?½"
 
-#. 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:2955
-#: ../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:2877
 #, python-format
-msgid "tree level %d"
-msgstr "tree level %d"
-
-#. Translators: this is in reference to a table cell being
-#. selected or not.
-#.
-#: ../src/orca/default.py:2992
-msgctxt "tablecell"
-msgid " not selected"
-msgstr "æ²?æ??é?¸å??"
+msgid "Progress bar %d."
+msgstr "é?²åº¦å??%dã??"
 
 #. Translators: this object is now selected.
 #. Let the user know this.
@@ -2297,11 +2282,9 @@ msgstr "æ²?æ??é?¸å??"
 #. Translators: when the user selects (highlights) text in
 #. a document, Orca lets them know this.
 #.
-#: ../src/orca/default.py:3885 ../src/orca/default.py:4228
-#: ../src/orca/default.py:7528
-#: ../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:3921 ../src/orca/default.py:4350
+#: ../src/orca/default.py:7994 ../src/orca/speech_generator.py:863
+#: ../src/orca/speech_generator.py:887
 msgctxt "text"
 msgid "selected"
 msgstr "å·²é?¸å??"
@@ -2314,16 +2297,25 @@ msgstr "å·²é?¸å??"
 #. (unhighlights) text in a document, Orca lets
 #. them know this.
 #.
-#: ../src/orca/default.py:3891 ../src/orca/default.py:7534
+#: ../src/orca/default.py:3927 ../src/orca/default.py:8000
 msgctxt "text"
 msgid "unselected"
 msgstr "å??æ¶?é?¸å??"
 
+#. 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:4095 ../src/orca/default.py:8319
+#, fuzzy
+msgid "misspelled"
+msgstr "æ?¼é?¯å?è©?ï¼?%s"
+
 #. 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:4285
+#: ../src/orca/default.py:4407
 msgid "Speak row"
 msgstr "è®?å?ºæ?´å??"
 
@@ -2331,13 +2323,13 @@ msgstr "è®?å?ºæ?´å??"
 #. 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:4291
+#: ../src/orca/default.py:4413
 msgid "Speak cell"
 msgstr "è®?å?ºå?²å?æ ¼"
 
 #. Translators: bold as in the font sense.
 #.
-#: ../src/orca/default.py:4379 ../src/orca/where_am_I.py:1674
+#: ../src/orca/default.py:4501 ../src/orca/speech_generator.py:696
 msgid "bold"
 msgstr "ç²?é«?"
 
@@ -2348,11 +2340,11 @@ msgstr "ç²?é«?"
 #. application, so we leave things in plural form
 #. here.
 #.
-#: ../src/orca/default.py:4396 ../src/orca/default.py:4407
-#, python-format
-msgid "%s %s pixel"
-msgid_plural "%s %s pixels"
-msgstr[0] "%s %s å??ç´ "
+#: ../src/orca/default.py:4518 ../src/orca/default.py:4530
+#, fuzzy, python-format
+msgid "%(key)s %(value)s pixel"
+msgid_plural "%(key)s %(value)s pixels"
+msgstr[0] "ç?¨æ³?ï¼? %s key=value key=value ..."
 
 #. Translators: this indicates that this piece of
 #. text is a hypertext link.
@@ -2362,10 +2354,10 @@ msgstr[0] "%s %s å??ç´ "
 #. Translators: this indicates that this piece of
 #. text is a hypertext link.
 #.
-#: ../src/orca/default.py:4483 ../src/orca/default.py:6399
+#: ../src/orca/default.py:4614 ../src/orca/default.py:6747
 #: ../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 "é?£çµ?"
 
@@ -2376,7 +2368,7 @@ msgstr "é?£çµ?"
 #. along to the current application, bypassing Orca's
 #. interception of it.
 #.
-#: ../src/orca/default.py:4530
+#: ../src/orca/default.py:4725
 msgid "Bypass mode enabled."
 msgstr "å·²å??ç?¨ç?¥é??å??è?½ã??"
 
@@ -2388,7 +2380,7 @@ msgstr "å·²å??ç?¨ç?¥é??å??è?½ã??"
 #. 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:4553
+#: ../src/orca/default.py:4748
 msgid ""
 "Entering learn mode.  Press any key to hear its function.  To exit learn "
 "mode, press the escape key."
@@ -2403,14 +2395,35 @@ msgstr "é?²å?¥å¸ç¿?æ¨¡å¼?ã?? æ??ä»»ä½?é?µä¾?è?½å®?ç??å??è?½ã??è¦?é?¢é??å¸ç¿?
 #. This text here is what is to be presented on the braille
 #. display.
 #.
-#: ../src/orca/default.py:4565
+#: ../src/orca/default.py:4760
 msgid "Learn mode.  Press escape to exit."
 msgstr "å¸ç¿?æ¨¡å¼?ã?? æ??é?¢é??é?µé?¢é??ã??"
 
+#: ../src/orca/default.py:4931
+#, fuzzy
+msgid "Leaving flat review."
+msgstr "è®?å?ºç?®å??ç?? flat review è¡?ã??"
+
+#: ../src/orca/default.py:4949
+#, fuzzy
+msgid "Entering flat review."
+msgstr "è®?å?ºç?®å??ç?? flat review è¡?ã??"
+
+#. 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:5231 ../src/orca/default.py:5252
+#: ../src/orca/default.py:5272
+#, fuzzy
+msgid "Could not find current location."
+msgstr "ç?¡æ³?æ±ºå®?ã??%sã??ç??å??å§?ä½?ç½®"
+
 #. 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:4996 ../src/orca/default.py:5159
+#: ../src/orca/default.py:5329 ../src/orca/default.py:5493
 msgid "white space"
 msgstr "ç©ºç?½ç©ºé??"
 
@@ -2420,7 +2433,7 @@ msgstr "ç©ºç?½ç©ºé??"
 #. "OK" button.  This message lets them know a string
 #. they were searching for was not found.
 #.
-#: ../src/orca/default.py:5391
+#: ../src/orca/default.py:5725
 msgid "string not found"
 msgstr "æ?¾ä¸?å?°å?ä¸²"
 
@@ -2429,12 +2442,12 @@ msgstr "æ?¾ä¸?å?°å?ä¸²"
 #. thing it does is let them know what the misspelled word
 #. is.
 #.
-#: ../src/orca/default.py:6205
+#: ../src/orca/default.py:6553
 #, python-format
 msgid "Misspelled word: %s"
 msgstr "æ?¼é?¯å?è©?ï¼?%s"
 
-#: ../src/orca/default.py:6213
+#: ../src/orca/default.py:6561
 #, python-format
 msgid "Context is %s"
 msgstr "å?§æ??æ?¯ %s"
@@ -2444,7 +2457,7 @@ msgstr "å?§æ??æ?¯ %s"
 #. space characters".  The %d is the number and the %s
 #. is the spoken word for the character.
 #.
-#: ../src/orca/default.py:6351
+#: ../src/orca/default.py:6699
 #, python-format
 msgid "%(count)d %(repeatChar)s character"
 msgid_plural "%(count)d %(repeatChar)s characters"
@@ -2454,7 +2467,31 @@ msgstr[0] "%(count)d å?? %(repeatChar)s å?ç¬¦"
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7374
+#: ../src/orca/default.py:7792
+#, fuzzy
+msgid "paragraph selected down from cursor position"
+msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?é?¸å??è¡?"
+
+#: ../src/orca/default.py:7793
+#, fuzzy
+msgid "paragraph unselected down from cursor position"
+msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?å??æ¶?é?¸å??è¡?"
+
+#: ../src/orca/default.py:7794
+#, fuzzy
+msgid "paragraph selected up from cursor position"
+msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?é?¸å??è¡?"
+
+#: ../src/orca/default.py:7795
+#, fuzzy
+msgid "paragraph unselected up from cursor position"
+msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?å??æ¶?é?¸å??è¡?"
+
+#. Translators: when the user selects (highlights) text in
+#. a document, Orca will speak information about what they
+#. have selected.
+#.
+#: ../src/orca/default.py:7852
 msgid "line selected to end from previous cursor position"
 msgstr "å¾?å??ä¸?å??æ¸¸æ¨?ä½?ç½®é?¸å??è¡?è?³çµ?å°¾"
 
@@ -2462,7 +2499,7 @@ msgstr "å¾?å??ä¸?å??æ¸¸æ¨?ä½?ç½®é?¸å??è¡?è?³çµ?å°¾"
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7382
+#: ../src/orca/default.py:7860
 msgid "line selected from start to previous cursor position"
 msgstr "å¾?é??å§?å?°å??ä¸?å??æ¸¸æ¨?ä½?ç½®é?¸å??è¡?"
 
@@ -2470,14 +2507,14 @@ msgstr "å¾?é??å§?å?°å??ä¸?å??æ¸¸æ¨?ä½?ç½®é?¸å??è¡?"
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7391
+#: ../src/orca/default.py:7869
 msgid "page selected from cursor position"
 msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?é?¸å??é ?"
 
 #. Translators: when the user unselects text in a document,
 #. Orca will speak information about what they have unselected.
 #.
-#: ../src/orca/default.py:7396
+#: ../src/orca/default.py:7874
 msgid "page unselected from cursor position"
 msgstr "å¾?æ¸¸æ¨?ä½?ç½®å??æ¶?é?¸å??é ?"
 
@@ -2485,14 +2522,14 @@ msgstr "å¾?æ¸¸æ¨?ä½?ç½®å??æ¶?é?¸å??é ?"
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7405
+#: ../src/orca/default.py:7883
 msgid "page selected to cursor position"
 msgstr "é?¸å??è?³æ¸¸æ¨?ä½?ç½®ç??é ?"
 
 #. Translators: when the user unselects text in a document,
 #. Orca will speak information about what they have unselected.
 #.
-#: ../src/orca/default.py:7410
+#: ../src/orca/default.py:7888
 msgid "page unselected to cursor position"
 msgstr "å??æ¶?é?¸å??é ?è?³æ¸¸æ¨?ä½?ç½®"
 
@@ -2500,44 +2537,14 @@ msgstr "å??æ¶?é?¸å??é ?è?³æ¸¸æ¨?ä½?ç½®"
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7419
-msgid "line selected down from cursor position"
-msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?é?¸å??è¡?"
-
-#. Translators: when the user unselects text in a document,
-#. Orca will speak information about what they have unselected.
-#.
-#: ../src/orca/default.py:7424
-msgid "line unselected down from cursor position"
-msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?å??æ¶?é?¸å??è¡?"
-
-#. Translators: when the user selects (highlights) text in
-#. a document, Orca will speak information about what they
-#. have selected.
-#.
-#: ../src/orca/default.py:7433
-msgid "line selected up from cursor position"
-msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?é?¸å??è¡?"
-
-#. Translators: when the user unselects text in a document,
-#. Orca will speak information about what they have unselected.
-#.
-#: ../src/orca/default.py:7438
-msgid "line unselected up from cursor position"
-msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?å??æ¶?é?¸å??è¡?"
-
-#. Translators: when the user selects (highlights) text in
-#. a document, Orca will speak information about what they
-#. have selected.
-#.
-#: ../src/orca/default.py:7447
+#: ../src/orca/default.py:7913
 msgid "document selected to cursor position"
 msgstr "é?¸å??è?³æ¸¸æ¨?ä½?ç½®ç??æ??ä»¶"
 
 #. Translators: when the user unselects text in a document,
 #. Orca will speak information about what they have unselected.
 #.
-#: ../src/orca/default.py:7452
+#: ../src/orca/default.py:7918
 msgid "document unselected to cursor position"
 msgstr "å??æ¶?é?¸å??è?³æ¸¸æ¨?ä½?ç½®ç??æ??ä»¶"
 
@@ -2545,21 +2552,21 @@ msgstr "å??æ¶?é?¸å??è?³æ¸¸æ¨?ä½?ç½®ç??æ??ä»¶"
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7461
+#: ../src/orca/default.py:7927
 msgid "document selected from cursor position"
 msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?é?¸å??æ??ä»¶"
 
 #. Translators: when the user unselects text in a document,
 #. Orca will speak information about what they have unselected.
 #.
-#: ../src/orca/default.py:7466
+#: ../src/orca/default.py:7932
 msgid "document unselected from cursor position"
 msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??æ¶?é?¸å??æ??ä»¶"
 
 #. Translators: this means the user has selected
 #. all the text in a document (e.g., Ctrl+a in gedit).
 #.
-#: ../src/orca/default.py:7483
+#: ../src/orca/default.py:7949
 msgid "entire document selected"
 msgstr "å·²é?¸å??æ?´å??æ??ä»¶"
 
@@ -2599,59 +2606,44 @@ msgstr "å??å?°é??å§?"
 
 #. Translators: this represents the state of a checkbox.
 #.
-#: ../src/orca/flat_review.py:352
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:639
-#: ../src/orca/speechgenerator.py:451 ../src/orca/where_am_I.py:417
-#: ../src/orca/where_am_I.py:1381
+#: ../src/orca/flat_review.py:352 ../src/orca/settings.py:1301
 msgid "partially checked"
 msgstr "é?¨ä»½é?¸å??"
 
 #. 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:643
-#: ../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/flat_review.py:356 ../src/orca/settings.py:1300
 msgid "checked"
 msgstr "å·²é»?é?¸"
 
 #. Translators: this represents the state of a checkbox.
 #.
-#: ../src/orca/flat_review.py:360
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:647
-#: ../src/orca/speechgenerator.py:459 ../src/orca/where_am_I.py:425
-#: ../src/orca/where_am_I.py:1389
+#. 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/settings.py:1299
 msgid "not checked"
 msgstr "æ?ªé»?é?¸"
 
 #. 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/flat_review.py:367 ../src/orca/settings.py:1312
 msgid "pressed"
 msgstr "å·²æ??ä¸?"
 
 #. Translators: the state of a toggle button.
 #.
-#: ../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
+#. 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/settings.py:1312
 msgid "not pressed"
 msgstr "æ?ªæ??ä¸?"
 
 #. Translators: this is in reference to a radio button being
 #. selected or not.
 #.
-#: ../src/orca/flat_review.py:379
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:583
-#: ../src/orca/speechgenerator.py:1201 ../src/orca/where_am_I.py:223
+#: ../src/orca/flat_review.py:379 ../src/orca/settings.py:1307
 msgctxt "radiobutton"
 msgid "selected"
 msgstr "å·²é?¸å??"
@@ -2659,9 +2651,10 @@ msgstr "å·²é?¸å??"
 #. Translators: this is in reference to a radio button being
 #. selected or not.
 #.
-#: ../src/orca/flat_review.py:384
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:588
-#: ../src/orca/speechgenerator.py:1206 ../src/orca/where_am_I.py:228
+#. 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/settings.py:1306
 msgctxt "radiobutton"
 msgid "not selected"
 msgstr "æ²?æ??é?¸å??"
@@ -2678,15 +2671,38 @@ msgstr "æ°´å¹³"
 msgid "vertical"
 msgstr "å??ç?´ç??"
 
+#. 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ã??"
+
+#. 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:191
+#: ../src/orca/tutorialgenerator.py:526 ../src/orca/tutorialgenerator.py:566
+msgid "toggle"
+msgstr "å??æ??"
+
 #. 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:952
 msgid "No focus"
 msgstr "æ²?æ??ç?¦é»?"
 
-#: ../src/orca/gnomespeechfactory.py:221
+#: ../src/orca/gnomespeechfactory.py:235
 msgid "GNOME Speech Services"
 msgstr "GNOME æ??è®?æ??å??"
 
@@ -2696,7 +2712,7 @@ msgstr "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 " é»?é»?é»?"
 
@@ -2707,15 +2723,15 @@ msgstr " é»?é»?é»?"
 #. 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 "è² "
 
 #. 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 "è¼?é«?ã??"
 
@@ -2723,8 +2739,8 @@ msgstr "è¼?é«?ã??"
 #. 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 "è¼?ä½?ã??"
 
@@ -2732,8 +2748,8 @@ msgstr "è¼?ä½?ã??"
 #. 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 "è¼?å¿«ã??"
 
@@ -2742,8 +2758,8 @@ msgstr "è¼?å¿«ã??"
 #. 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 "è¼?æ?¢ã??"
 
@@ -2961,7 +2977,7 @@ msgstr "é?¸å?®"
 #: ../src/orca/keynames.py:193
 #, fuzzy
 msgid "ISO level 3 shift"
-msgstr "æ³¢ç¾?ç??æµ·èª?ç³» (ISO-8859-4)"
+msgstr "é??ç½®æ?¹è®?æ?¹å¼?"
 
 #. Translators: this is how someone would speak the name of the help key
 #.
@@ -3014,8 +3030,49 @@ msgstr "çµ?æ??"
 #. Translators: this is how someone would speak the name of the begin key
 #.
 #: ../src/orca/keynames.py:245
+#, fuzzy
 msgid "begin"
-msgstr ""
+msgstr "é??å§?"
+
+#. Translators: this is how someone would speak the name of the
+#. non-spacing diacritical key for the acute glyph
+#.
+#: ../src/orca/keynames.py:255
+#, fuzzy
+msgid "acute"
+msgstr "a acute"
+
+#. Translators: this is how someone would speak the name of the
+#. non-spacing diacritical key for the circumflex glyph
+#.
+#: ../src/orca/keynames.py:260
+#, fuzzy
+msgid "circumflex"
+msgstr "A CIRCUMFLEX"
+
+#. Translators: this is how someone would speak the name of the
+#. non-spacing diacritical key for the diaeresis glyph
+#.
+#: ../src/orca/keynames.py:270
+#, fuzzy
+msgid "diaeresis"
+msgstr "åº¦"
+
+#. Translators: this is how someone would speak the name of the
+#. non-spacing diacritical key for the ring glyph
+#.
+#: ../src/orca/keynames.py:275
+#, fuzzy
+msgid "ring"
+msgstr "A RING"
+
+#. Translators: this is how someone would speak the name of the
+#. non-spacing diacritical key for the stroke glyph
+#.
+#: ../src/orca/keynames.py:285
+#, fuzzy
+msgid "stroke"
+msgstr "O STROKE"
 
 #. Translators:  sets the live region politeness level to polite
 #.
@@ -3047,7 +3104,7 @@ msgstr ""
 #: ../src/orca/liveregions.py:299
 #, fuzzy
 msgid "no live message saved"
-msgstr "é?µä»¶æ²?æ??é??å? æª?æ¡?"
+msgstr "æ²?æ?? %s é??é¡?é?µä»¶å?¨ %s ä¸"
 
 #. Translators: This lets the user know that all live regions
 #. have been turned off.
@@ -3073,7 +3130,7 @@ msgstr "politeness level %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 "è?²å½©å¼·å??å·²é??é??ã??"
 
@@ -3081,7 +3138,7 @@ msgstr "è?²å½©å¼·å??å·²é??é??ã??"
 #. 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 "è?²å½©å¼·å??å·²é??å??ã??"
 
@@ -3090,7 +3147,7 @@ msgstr "è?²å½©å¼·å??å·²é??å??ã??"
 #. 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 "æ»?é¼ å¢?å¼·å??è?½å·²å??ç?¨ã??"
 
@@ -3099,7 +3156,7 @@ msgstr "æ»?é¼ å¢?å¼·å??è?½å·²å??ç?¨ã??"
 #. 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 "æ»?é¼ å¢?å¼·å??è?½å·²å??ç?¨ã??"
 
@@ -3107,7 +3164,7 @@ msgstr "æ»?é¼ å¢?å¼·å??è?½å·²å??ç?¨ã??"
 #. magnifier.  In addition to screen magnification, the user's
 #. preferred colors and mouse customizations are loaded.
 #.
-#: ../src/orca/mag.py:1690
+#: ../src/orca/mag.py:1684
 msgid "Magnifier enabled."
 msgstr "æ?¾å¤§é?¡å·²å??ç?¨ã??"
 
@@ -3115,7 +3172,7 @@ msgstr "æ?¾å¤§é?¡å·²å??ç?¨ã??"
 #. magnifier, restoring the screen contents to their normal colors
 #. and sizes.
 #.
-#: ../src/orca/mag.py:1697
+#: ../src/orca/mag.py:1691
 msgid "Magnifier disabled."
 msgstr "æ?¾å¤§é?¡å·²å??ç?¨ã??"
 
@@ -3124,49 +3181,233 @@ msgstr "æ?¾å¤§é?¡å·²å??ç?¨ã??"
 #. 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:1844
+#: ../src/orca/orca_gui_prefs.py:1870 ../src/orca/orca_gui_prefs.py:1873
+#: ../src/orca/orca-setup.ui.h:66
 msgid "Full Screen"
 msgstr "å?¨è?¢å¹?"
 
 #. 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 "ç?¡æ³?ä½¿ç?¨å?¨è?¢å¹?æ¨¡å¼?"
 
 #. 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:1848
+#: ../src/orca/orca_gui_prefs.py:1874 ../src/orca/orca-setup.ui.h:119
 msgid "Top Half"
 msgstr "ä¸?å??é?¨"
 
 #. 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:1852
+#: ../src/orca/orca_gui_prefs.py:1875 ../src/orca/orca-setup.ui.h:27
 msgid "Bottom Half"
 msgstr "ä¸?å??é?¨"
 
 #. 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:1856
+#: ../src/orca/orca_gui_prefs.py:1876 ../src/orca/orca-setup.ui.h:74
 msgid "Left Half"
 msgstr "å·¦å??é?¨"
 
 #. 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:1860
+#: ../src/orca/orca_gui_prefs.py:1877 ../src/orca/orca-setup.ui.h:96
 msgid "Right Half"
 msgstr "å?³å??é?¨"
 
 #. 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:1865
+#: ../src/orca/orca_gui_prefs.py:1878 ../src/orca/orca-setup.ui.h:39
 msgid "Custom"
 msgstr "è?ªé?¸"
 
+#: ../src/orca/orca-advanced-magnification.ui.h:1
+msgid "<b>Brightness</b>"
+msgstr "<b>äº®åº¦</b>"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:2
+msgid "<b>Contrast</b>"
+msgstr "<b>å°?æ¯?</b>"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:3
+msgid "<b>Multi-monitor Settings</b>"
+msgstr "<b>å¤?è?¢å¹?è¨å®?å?¼</b>"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:4
+msgid "Advanced Settings"
+msgstr "é?²é??è¨å®?"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:5
+msgid "B_lue:"
+msgstr "è??è?²(_L):"
+
+#. 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:4482 ../src/orca/orca_gui_prefs.py:4493
+#: ../src/orca/orca_gui_prefs.py:4495 ../src/orca/orca_gui_prefs.py:4516
+msgid "Bilinear"
+msgstr "é??ç·?æ?§"
+
+#. 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:4739 ../src/orca/orca_gui_prefs.py:4766
+#: ../src/orca/orca_gui_prefs.py:4837
+#, fuzzy
+msgid "Desaturate blue"
+msgstr "è??è?²æ©«ç´?"
+
+#. 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:4731 ../src/orca/orca_gui_prefs.py:4829
+#, fuzzy
+msgid "Desaturate green"
+msgstr "é??è??å?°"
+
+#. 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:4723 ../src/orca/orca_gui_prefs.py:4765
+#: ../src/orca/orca_gui_prefs.py:4821
+#, fuzzy
+msgid "Desaturate red"
+msgstr "ç´?è?² joker"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:10
+msgid "Gree_n:"
+msgstr "ç¶ è?²(_N):"
+
+#. 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:4755 ../src/orca/orca_gui_prefs.py:4768
+#: ../src/orca/orca_gui_prefs.py:4853
+#, fuzzy
+msgid "Negative hue shift"
+msgstr "è² å??è?²èª¿å??ç§»"
+
+#. 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:86 ../src/orca/orca_gui_prefs.py:1921
+#: ../src/orca/orca_gui_prefs.py:1941 ../src/orca/orca_gui_prefs.py:4488
+#: ../src/orca/orca_gui_prefs.py:4495 ../src/orca/orca_gui_prefs.py:4518
+#: ../src/orca/orca_gui_prefs.py:4691 ../src/orca/orca_gui_prefs.py:4758
+#: ../src/orca/orca_gui_prefs.py:4761 ../src/orca/orca_gui_prefs.py:4789
+#: ../src/orca/orca-setup.ui.h:83
+msgid "None"
+msgstr "æ²?æ??"
+
+#. 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:4747 ../src/orca/orca_gui_prefs.py:4767
+#: ../src/orca/orca_gui_prefs.py:4845
+#, fuzzy
+msgid "Positive hue shift"
+msgstr "æ£å??è?²èª¿å??ç§»"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:14
+msgid "R_ed:"
+msgstr "ç´?è?²(_E):"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:15
+msgid "S_ource display:"
+msgstr "å??å§?é¡¯ç¤º(_O):"
+
+#. 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:4715 ../src/orca/orca_gui_prefs.py:4764
+#: ../src/orca/orca_gui_prefs.py:4813
+#, fuzzy
+msgid "Saturate blue"
+msgstr "è??è?²æ©«ç´?"
+
+#. 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:4707 ../src/orca/orca_gui_prefs.py:4763
+#: ../src/orca/orca_gui_prefs.py:4805
+#, fuzzy
+msgid "Saturate green"
+msgstr "é??è??å?°"
+
+#. 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:4699 ../src/orca/orca_gui_prefs.py:4762
+#: ../src/orca/orca_gui_prefs.py:4797
+#, fuzzy
+msgid "Saturate red"
+msgstr "ç´?è?² joker"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:19
+msgid "Target displa_y:"
+msgstr "ç?®æ¨?é¡¯ç¤º(_Y):"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:20
+msgid "_Blue:"
+msgstr "è??(_B):"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:21
+msgid "_Color Filtering:"
+msgstr "é¡?è?²æ¿¾é?¡(_C):"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:22
+msgid "_Green:"
+msgstr "ç¶ (_G):"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:23
+msgid "_Red:"
+msgstr "ç´?(_R):"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:24
+msgid "_Smoothing:"
+msgstr "å??æ»?(_S):"
+
 #. 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
@@ -3183,18 +3424,18 @@ msgstr "è?ªé?¸"
 #. 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 ""
+msgstr "^[Yy1]"
 
 #. 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:135 ../src/orca/orca_console_prefs.py:154
 msgid "Speech is unavailable."
 msgstr "èª?é?³å??è?½ä¸?å?å?¨ã??"
 
-#: ../src/orca/orca_console_prefs.py:140
+#: ../src/orca/orca_console_prefs.py:139
 msgid "Welcome to Orca setup."
 msgstr "æ¡è¿?ä½¿ç?¨ Orca è¨å®?ã??"
 
@@ -3204,36 +3445,36 @@ msgstr "æ¡è¿?ä½¿ç?¨ 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:163
 msgid "Select desired speech system:"
 msgstr "é?¸æ??å??å¥½ç??èª?é?³ç³»çµ±ï¼?"
 
 #. 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:174 ../src/orca/orca_console_prefs.py:206
+#: ../src/orca/orca_console_prefs.py:253 ../src/orca/orca_console_prefs.py:402
 msgid "Enter choice: "
 msgstr "è¼¸å?¥é?¸æ??ï¼?"
 
 #. 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:211 ../src/orca/orca_console_prefs.py:227
-#: ../src/orca/orca_console_prefs.py:261
+#: ../src/orca/orca_console_prefs.py:178 ../src/orca/orca_console_prefs.py:189
+#: ../src/orca/orca_console_prefs.py:210 ../src/orca/orca_console_prefs.py:226
+#: ../src/orca/orca_console_prefs.py:260
 msgid "Speech will not be used.\n"
 msgstr "ä¸?æ??ä½¿ç?¨èª?é?³å??è?½ã??\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:188
 msgid "No servers available.\n"
 msgstr "æ²?æ??ä¼ºæ??å?¨å?å?¨ã??\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:195
 msgid "Select desired speech server."
 msgstr "é?¸æ??å??å¥½ç??èª?é?³ä¼ºæ??å?¨ã??"
 
@@ -3241,7 +3482,7 @@ msgstr "é?¸æ??å??å¥½ç??èª?é?³ä¼ºæ??å?¨ã??"
 #. 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:222
 msgid "No voices available.\n"
 msgstr "æ²?æ??è?²é?³å?å?¨ã??\n"
 
@@ -3249,14 +3490,14 @@ msgstr "æ²?æ??è?²é?³å?å?¨ã??\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:233
 msgid "Select desired voice:"
 msgstr "é?¸æ??å??å¥½ç??è?²é?³ï¼?"
 
 #. 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:294
 msgid "Enable echo by word?  Enter y or n: "
 msgstr "å??ç?¨å?è©?å??é?¿ï¼? è¼¸å?¥ y æ?? nï¼?"
 
@@ -3264,35 +3505,35 @@ msgstr "å??ç?¨å?è©?å??é?¿ï¼? è¼¸å?¥ y æ?? nï¼?"
 #. 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:305
 msgid "Enable key echo?  Enter y or n: "
 msgstr "å??ç?¨æ??é?µå??é?¿ï¼? è¼¸å?¥ y æ?? nï¼?"
 
 #. 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:317
 msgid "Enable alphanumeric and punctuation keys?  Enter y or n: "
 msgstr "å??ç?¨æ??æ?¸å?ç¬¦å??æ¨?é»?ç¬¦è??æ??é?µï¼? è¼¸å?¥ y æ?? nï¼?"
 
 #. 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:327
 msgid "Enable modifier keys?  Enter y or n: "
 msgstr "å??ç?¨ä¿®æ?¹é?µï¼? è¼¸å?¥ y æ?? nï¼?"
 
 #. 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:337
 msgid "Enable locking keys?  Enter y or n: "
 msgstr "å??ç?¨é??å®?é?µï¼? è¼¸å?¥ y æ?? nï¼?"
 
 #. 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:347
 msgid "Enable function keys?  Enter y or n: "
 msgstr "å??ç?¨å??è?½é?µï¼? è¼¸å?¥ y æ?? nï¼?"
 
@@ -3300,7 +3541,7 @@ msgstr "å??ç?¨å??è?½é?µï¼? è¼¸å?¥ y æ?? nï¼?"
 #. 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:358
 msgid "Enable action keys?  Enter y or n: "
 msgstr "å??ç?¨å??ä½?é?µï¼? è¼¸å?¥ y æ?? nï¼?"
 
@@ -3308,7 +3549,7 @@ msgstr "å??ç?¨å??ä½?é?µï¼? è¼¸å?¥ y æ?? 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:378
+#: ../src/orca/orca_console_prefs.py:377
 msgid "Select desired keyboard layout."
 msgstr "é?¸æ??å??å¥½ç??é?µç?¤é??ç½®ã??"
 
@@ -3316,7 +3557,7 @@ msgstr "é?¸æ??å??å¥½ç??é?µç?¤é??ç½®ã??"
 #. 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:389
 msgid "1. Desktop"
 msgstr "1. æ¡?é?¢"
 
@@ -3324,18 +3565,18 @@ msgstr "1. æ¡?é?¢"
 #. 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:396
 msgid "2. Laptop"
 msgstr "2. ç?è¨?æ?¬é?»è?¦"
 
-#: ../src/orca/orca_console_prefs.py:414
+#: ../src/orca/orca_console_prefs.py:413
 msgid "Invalid choice. Selecting desktop keyboard layout.\n"
 msgstr "ç?¡æ??ç??é?¸æ??ã??æ£é?¸æ??æ¡?é?¢é?µç?¤é??ç½®ã??\n"
 
 #. 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:441
 msgid "Enable Braille?  Enter y or n: "
 msgstr "å??ç?¨é»?å?ï¼? è¼¸å?¥ y æ?? nï¼?"
 
@@ -3344,46 +3585,46 @@ msgstr "å??ç?¨é»?å?ï¼? è¼¸å?¥ y æ?? nï¼?"
 #. 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:453
 msgid "Enable Braille Monitor?  Enter y or n: "
 msgstr "å??ç?¨é»?å?ç?£å¯?å?¨ï¼?è¼¸å?¥ y æ?? nï¼?"
 
 #. 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:463
 msgid "Automatically start orca when you log in?  Enter y or n: "
 msgstr "æ?¯å?¦å?¨ä½ ç?»å?¥æ??è?ªå??å??å?? orcaï¼?æ?? y æ?? nï¼?"
 
-#: ../src/orca/orca_console_prefs.py:480 ../src/orca/orca_gui_prefs.py:456
+#: ../src/orca/orca_console_prefs.py:473 ../src/orca/orca_gui_prefs.py:471
 msgid "Accessibility support for GNOME has just been enabled."
 msgstr "å·²ç¶?å??ç?¨ GNOME ç??ç?¡é??ç¤?ç?°å¢?ã??"
 
-#: ../src/orca/orca_console_prefs.py:486 ../src/orca/orca_gui_prefs.py:458
+#: ../src/orca/orca_console_prefs.py:479 ../src/orca/orca_gui_prefs.py:473
 msgid "You need to log out and log back in for the change to take effect."
 msgstr "é??è¦?ç?»å?ºå¾?å??ç?»å?¥ä¾?å¥?ç?¨æ?°è¨å®?ã??"
 
-#: ../src/orca/orca_console_prefs.py:494
+#: ../src/orca/orca_console_prefs.py:487
 msgid "Do you want to logout now?  Enter y or n: "
 msgstr "ä½ ç¢ºå®?ç?¾å?¨è¦?ç?»å?ºå??ï¼?æ?? y æ?? nï¼?"
 
-#: ../src/orca/orca_console_prefs.py:500
+#: ../src/orca/orca_console_prefs.py:493
 msgid "Setup complete. Logging out now."
 msgstr "è¨å®?å®?æ??ã??ç?¾å?¨ç?»å?ºã??"
 
-#: ../src/orca/orca_console_prefs.py:514
+#: ../src/orca/orca_console_prefs.py:507
 msgid "Setup complete.  Press Return to continue."
 msgstr "è¨å®?å®?æ??ã??  æ?? Enter ç¹¼çº?ã??"
 
-#: ../src/orca/orca-find.glade.h:1
+#: ../src/orca/orca-find.ui.h:1
 msgid "<b>Start from:</b>"
 msgstr "<b>é??å§?è?ªï¼?</b>"
 
-#: ../src/orca/orca-find.glade.h:2 ../src/orca/orca_gui_find.py:147
+#: ../src/orca/orca-find.ui.h:2 ../src/orca/orca_gui_find.py:147
 msgid "C_urrent location"
 msgstr "ç?®å??ä½?ç½®(_U)"
 
-#: ../src/orca/orca-find.glade.h:3
+#: ../src/orca/orca-find.ui.h:3
 msgid "Close"
 msgstr "é??é??"
 
@@ -3397,50 +3638,49 @@ msgstr "é??é??"
 #. 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/scripts/apps/gedit/script.py:320
+#: ../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 "å°?æ?¾"
 
-#: ../src/orca/orca-find.glade.h:5
+#: ../src/orca/orca-find.ui.h:5
 msgid "Match _entire word only"
 msgstr "å?ªç¬¦å??æ?´å??å?è©?(_E)"
 
-#: ../src/orca/orca-find.glade.h:6
+#: ../src/orca/orca-find.ui.h:6
 msgid "Orca Find Dialog"
 msgstr "Orca å°?æ?¾å°?è©±è¦?çª?"
 
-#: ../src/orca/orca-find.glade.h:7
+#: ../src/orca/orca-find.ui.h:7
 msgid "Search _backwards"
 msgstr "å??ä¸?æ??å°?(_B)"
 
-#: ../src/orca/orca-find.glade.h:8
+#: ../src/orca/orca-find.ui.h:8
 msgid "Search for:"
 msgstr "æ??å°?ï¼?"
 
-#: ../src/orca/orca-find.glade.h:9
+#: ../src/orca/orca-find.ui.h:9
 msgid "Start from:"
 msgstr "é??å§?è?ªï¼?"
 
-#: ../src/orca/orca-find.glade.h:10
+#: ../src/orca/orca-find.ui.h:10
 msgid "Top of window"
 msgstr "æ??ä¸?å±¤è¦?çª?"
 
-#: ../src/orca/orca-find.glade.h:11
+#: ../src/orca/orca-find.ui.h:11
 msgid "_Match case"
 msgstr "ç¬¦å??å¤§å°?å¯«(_M)"
 
-#: ../src/orca/orca-find.glade.h:12
+#: ../src/orca/orca-find.ui.h:12
 msgid "_Search for:"
 msgstr "æ??å°?å?ä¸²(_S):"
 
-#: ../src/orca/orca-find.glade.h:13
+#: ../src/orca/orca-find.ui.h:13
 msgid "_Top of window"
 msgstr "æ??ä¸?å±¤è¦?çª?(_T)"
 
-#: ../src/orca/orca-find.glade.h:14
+#: ../src/orca/orca-find.ui.h:14
 msgid "_Wrap around"
 msgstr "å??å?°æª?æ¡?é??å§?é?¨ä»½å??æ??å°?(_W)"
 
@@ -3449,24 +3689,11 @@ msgstr "å??å?°æª?æ¡?é??å§?é?¨ä»½å??æ??å°?(_W)"
 #. 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:80 ../src/orca/orca_gui_prefs.py:1921
+#: ../src/orca/orca_gui_prefs.py:1941 ../src/orca/orca-setup.ui.h:32
 msgid "Centered"
 msgstr "ç½®ä¸"
 
-#. 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 "æ²?æ??"
-
 #. 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
@@ -3475,7 +3702,8 @@ msgstr "æ²?æ??"
 #. 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:96 ../src/orca/orca_gui_prefs.py:1921
+#: ../src/orca/orca-setup.ui.h:91
 msgid "Proportional"
 msgstr "æ??æ¯?ä¾?ç??"
 
@@ -3484,7 +3712,8 @@ msgstr "æ??æ¯?ä¾?ç??"
 #. 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:103 ../src/orca/orca_gui_prefs.py:1921
+#: ../src/orca/orca_gui_prefs.py:1941 ../src/orca/orca-setup.ui.h:92
 msgid "Push"
 msgstr "æ?¨"
 
@@ -3495,7 +3724,7 @@ msgstr "æ?¨"
 #. 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:227
 msgid "Function"
 msgstr "å??è?½"
 
@@ -3503,7 +3732,7 @@ msgstr "å??è?½"
 #. 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:305
 msgid "Key Binding"
 msgstr "æ??é?µçµ?å??"
 
@@ -3514,7 +3743,7 @@ msgstr "æ??é?µçµ?å??"
 #. addition to the key bindings in the "Key Bindings"
 #. column.
 #.
-#: ../src/orca/orca_gui_prefs.py:356
+#: ../src/orca/orca_gui_prefs.py:384
 msgid "Alternate"
 msgstr "Alternate"
 
@@ -3522,28 +3751,35 @@ msgstr "Alternate"
 #. 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:404
 msgid "Modified"
 msgstr "å·²ä¿®æ?¹"
 
-#. 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:721
+#, fuzzy
+msgctxt "VoiceType"
 msgid "Default"
-msgstr "é ?è¨"
+msgstr "é ?è¨å?¼"
 
-#. 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:725
+#, fuzzy
+msgctxt "VoiceType"
 msgid "Uppercase"
-msgstr "å¤§å¯«å?æ¯?"
+msgstr "å?æ¯?ï¼?å¤§å¯«"
 
-#. 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:730
+msgctxt "VoiceType"
 msgid "Hyperlink"
 msgstr "è¶?é?£çµ?"
 
@@ -3552,7 +3788,7 @@ msgstr "è¶?é?£çµ?"
 #. 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:1153
 msgid "Attribute Name"
 msgstr "å±¬æ?§å??ç¨±"
 
@@ -3563,7 +3799,7 @@ msgstr "å±¬æ?§å??ç¨±"
 #. 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:1168
 msgid "Speak"
 msgstr "è®?å?º "
 
@@ -3574,7 +3810,7 @@ msgstr "è®?å?º "
 #. 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:1186
 #, fuzzy
 msgid "Mark in braille"
 msgstr "å?¨é?µä»¶ã??é ?è¦½ã??ä¸æ¨?ç¤ºå¼?ç?¨"
@@ -3594,10 +3830,10 @@ msgstr "å?¨é?µä»¶ã??é ?è¦½ã??ä¸æ¨?ç¤ºå¼?ç?¨"
 #. 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:1212
 #, fuzzy
 msgid "Present Unless"
-msgstr "å¦?æ??ä¾? HTML å??é¡¯ç¤ºä¹?"
+msgstr "é¡¯ç¤ºå·¥å?·æ??ç¤º(_P)"
 
 #. Pronunciation Dictionary actual string (word) column (ACTUAL).
 #.
@@ -3606,7 +3842,7 @@ msgstr "å¦?æ??ä¾? HTML å??é¡¯ç¤ºä¹?"
 #. 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:1326
 msgid "Actual String"
 msgstr "å¯¦é??å?ä¸²"
 
@@ -3617,15 +3853,106 @@ msgstr "å¯¦é??å?ä¸²"
 #. 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:1343
 msgid "Replacement String"
 msgstr "ç½®æ??å?ä¸²"
 
+#. 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:1529 ../src/orca/orca-setup.ui.h:29
+msgid "Break speech into ch_unks between pauses"
+msgstr ""
+
+#. 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:1541 ../src/orca/orca_gui_prefs.py:3043
+#: ../src/orca/orca-setup.ui.h:75
+msgid "Line"
+msgstr "è¡?"
+
+#. 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:1541 ../src/orca/orca_gui_prefs.py:3049
+#: ../src/orca/orca-setup.ui.h:99
+msgid "Sentence"
+msgstr "å?¥å?"
+
+#. 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.
+#.
+#. 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_gui_prefs.py:1559 ../src/orca/orca-setup.ui.h:95
+#, fuzzy
+msgid "Restrict progress bar updates to:"
+msgstr "å??é?²åº¦å??æ??é??ç?? GtkAdjustmentï¼?ä¸?å»ºè°å??ä½¿ç?¨ï¼?"
+
+#. 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:1571 ../src/orca/orca_gui_prefs.py:3008
+msgctxt "ProgressBar"
+msgid "All"
+msgstr "å?¨é?¨"
+
+#. 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:1578
+msgctxt "ProgressBar"
+msgid "Application"
+msgstr "æ??ç?¨ç¨?å¼?"
+
+#. 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:1584 ../src/orca/orca_gui_prefs.py:3016
+msgctxt "ProgressBar"
+msgid "Window"
+msgstr "è¦?çª?"
+
+#. Translators: When this option is enabled, dead keys will be
+#. announced when pressed.
+#.
+#: ../src/orca/orca_gui_prefs.py:1691 ../src/orca/orca-setup.ui.h:65
+#, fuzzy
+msgid "Enable non-spacing _diacritical keys"
+msgstr "å??ç?¨å°?è¦½é?µ(_N)"
+
+#. 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.
+#.
+#: ../src/orca/orca_gui_prefs.py:1699 ../src/orca/orca-setup.ui.h:63
+#, fuzzy
+msgid "Enable echo by cha_racter"
+msgstr "å??ç?¨å?è©?å??é?¿ï¼? è¼¸å?¥ y æ?? nï¼?"
+
 #. 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:2211
 msgid "(double click)"
 msgstr "(é?£æ??å?©ä¸?)"
 
@@ -3633,7 +3960,7 @@ msgstr "(é?£æ??å?©ä¸?)"
 #. and triple "clicks" or key presses, similar to
 #. using a mouse.
 #.
-#: ../src/orca/orca_gui_prefs.py:2082
+#: ../src/orca/orca_gui_prefs.py:2217
 msgid "(triple click)"
 msgstr "(ä¸?æ??)"
 
@@ -3642,7 +3969,7 @@ msgstr "(ä¸?æ??)"
 #. 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:2321 ../src/orca/orca_gui_prefs.py:2419
 msgid "Braille Bindings"
 msgstr "é»?å?æ??é?µçµ?å??"
 
@@ -3651,8 +3978,8 @@ msgstr "é»?å?æ??é?µçµ?å??"
 #. 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:2853 ../src/orca/orca_gui_prefs.py:2894
+#: ../src/orca/orca_gui_prefs.py:2934 ../src/orca/orca-setup.ui.h:44
 #, fuzzy
 msgid "Dot _7"
 msgstr "é»?"
@@ -3661,8 +3988,8 @@ msgstr "é»?"
 #. 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:2860 ../src/orca/orca_gui_prefs.py:2901
+#: ../src/orca/orca_gui_prefs.py:2941 ../src/orca/orca-setup.ui.h:45
 #, fuzzy
 msgid "Dot _8"
 msgstr "é»?"
@@ -3671,15 +3998,16 @@ msgstr "é»?"
 #. 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:2867 ../src/orca/orca_gui_prefs.py:2908
+#: ../src/orca/orca_gui_prefs.py:2948 ../src/orca/orca-setup.ui.h:46
+#, fuzzy
 msgid "Dots 7 an_d 8"
-msgstr ""
+msgstr "æ??é»?"
 
 #. 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:2971 ../src/orca/orca-setup.ui.h:135
 msgid "_None"
 msgstr "æ²?æ??(_N)"
 
@@ -3688,7 +4016,7 @@ msgstr "æ²?æ??(_N)"
 #. 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:2979 ../src/orca/orca-setup.ui.h:101
 msgid "So_me"
 msgstr "ä¸?äº?(_M)"
 
@@ -3696,32 +4024,16 @@ msgstr "ä¸?äº?(_M)"
 #. 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:2986 ../src/orca/orca-setup.ui.h:76
 msgid "M_ost"
 msgstr "å¤§é?¨ä»½(_O)"
 
-#. 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 "è¡?"
-
-#. 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 "å?¥å?"
-
 #. 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:3069 ../src/orca/orca_gui_prefs.py:3200
+#: ../src/orca/orca-setup.ui.h:30
 msgid "Brie_f"
 msgstr "ç°¡ç?(_F)"
 
@@ -3729,7 +4041,7 @@ msgstr "ç°¡ç?(_F)"
 #. 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:3093 ../src/orca/orca-setup.ui.h:107
 msgid "Speak current _cell"
 msgstr "è®?å?ºç?®å??ç??å?²å?æ ¼(_C)"
 
@@ -3737,7 +4049,7 @@ msgstr "è®?å?ºç?®å??ç??å?²å?æ ¼(_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:3847
 msgid "enter new key"
 msgstr "è¼¸å?¥æ?°ç??æ??é?µ"
 
@@ -3745,7 +4057,7 @@ msgstr "è¼¸å?¥æ?°ç??æ??é?µ"
 #. Orca has deleted an existing key combination based upon
 #. their input.
 #.
-#: ../src/orca/orca_gui_prefs.py:3657
+#: ../src/orca/orca_gui_prefs.py:3876
 msgid "Key binding deleted. Press enter to confirm."
 msgstr "æ??é?µçµ?å??å·²å?ªé?¤ã??æ?? enter ç¢ºèª?ã??"
 
@@ -3753,7 +4065,7 @@ msgstr "æ??é?µçµ?å??å·²å?ªé?¤ã??æ?? enter ç¢ºèª?ã??"
 #. 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:3900
 #, python-format
 msgid "The key entered is already bound to %s"
 msgstr "è¼¸å?¥ç??æ??é?µå·²ç¹«çµ?æ?¼ %s"
@@ -3762,7 +4074,7 @@ msgstr "è¼¸å?¥ç??æ??é?µå·²ç¹«çµ?æ?¼ %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:3907
 #, python-format
 msgid "Key captured: %s. Press enter to confirm."
 msgstr "æ??é?µæ?·å??ï¼?%sã??æ?? enter ç¢ºèª?ã??"
@@ -3771,7 +4083,7 @@ msgstr "æ??é?µæ?·å??ï¼?%sã??æ?? enter ç¢ºèª?ã??"
 #. 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:3946
 #, python-format
 msgid "The new key is: %s"
 msgstr "æ?°ç??æ??é?µæ?¯ï¼?%s"
@@ -3780,118 +4092,30 @@ msgstr "æ?°ç??æ??é?µæ?¯ï¼?%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:3954
 msgid "The keybinding has been removed."
 msgstr "è©²æ??é?µçµ?å??å·²ç¶?è¢«ç§»é?¤ã??"
 
 #. 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:4032 ../src/orca/orca-setup.ui.h:129
 msgid "_Desktop"
 msgstr "æ¡?é?¢(_D)"
 
-#. 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 "é??ç·?æ?§"
-
-#. 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
-#, fuzzy
-msgid "Saturate red"
-msgstr "Ã©Â?Â·Ã¥Â¸Â?Ã¦Â?Â?Ã¥Â¤Â«"
-
-#. 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
-#, fuzzy
-msgid "Saturate green"
-msgstr "Ã¥Â¸Â?Ã¦Â?Â?Ã¦Â Â¼Ã©Â?Âµ"
-
-#. 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
-#, fuzzy
-msgid "Saturate blue"
-msgstr "Blue Canyon"
-
-#. 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
-#, fuzzy
-msgid "Desaturate red"
-msgstr "Ã©Â?Â·Ã¥Â¸Â?Ã¦Â?Â?Ã¥Â¤Â«"
-
-#. 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
-#, fuzzy
-msgid "Desaturate green"
-msgstr "Ã¥Â¸Â?Ã¦Â?Â?Ã¦Â Â¼Ã©Â?Âµ"
-
-#. 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
-#, fuzzy
-msgid "Desaturate blue"
-msgstr "Blue Canyon"
-
-#. 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
-#, fuzzy
-msgid "Positive hue shift"
-msgstr "èª¿æ?´è?²ç?¸/äº®åº¦/å½©åº¦"
-
-#. 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
-#, fuzzy
-msgid "Negative hue shift"
-msgstr "èª¿æ?´è?²ç?¸/äº®åº¦/å½©åº¦"
-
 #. Translators: Orca Preferences is the configuration GUI for Orca.
 #.
-#: ../src/orca/orca_gui_prefs.py:4833
+#: ../src/orca/orca_gui_prefs.py:5090
 msgid "Starting Orca Preferences."
 msgstr "å??å?? Orca å??å¥½è¨å®?ã??"
 
-#: ../src/orca/orca-mainwin.glade.h:1
+#: ../src/orca/orca-mainwin.ui.h:1
 msgid "Orca Screen Reader / Magnifier"
 msgstr "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:291 ../src/orca/orca.py:1353 ../src/orca/orca.py:1354
 msgid "Goodbye."
 msgstr "å??è¦?ã??"
 
@@ -3904,21 +4128,43 @@ msgstr "å??è¦?ã??"
 #. Exiting learn mode puts the user back in normal operating
 #. mode.
 #.
-#: ../src/orca/orca.py:353
+#: ../src/orca/orca.py:363
 msgid "Exiting learn mode."
 msgstr "é?¢é??å¸ç¿?æ¨¡å¼?ã??"
 
+#. 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:612
+#: ../src/orca/scripts/apps/soffice/speech_generator.py:172
+#: ../src/orca/speech.py:261 ../src/orca/speechserver.py:218
+msgid "off"
+msgstr " é??"
+
+#. 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:616
+#: ../src/orca/scripts/apps/soffice/speech_generator.py:168
+#: ../src/orca/speech.py:256 ../src/orca/speechserver.py:213
+msgid "on"
+msgstr " é??"
+
 #. 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:954
 msgid "Speech enabled."
 msgstr "å·²å??ç?¨æ??è®?å??è?½ã??"
 
 #. 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:959
 msgid "Speech disabled."
 msgstr "å·²å??ç?¨æ??è®?å??è?½ã??"
 
@@ -3926,18 +4172,18 @@ msgstr "å·²å??ç?¨æ??è®?å??è?½ã??"
 #. 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:1026
 msgid "Orca user settings reloaded."
 msgstr "å·²é??æ?°è¼?å?¥ Orca ä½¿ç?¨è??è¨å®?ã??"
 
-#: ../src/orca/orca.py:1350
+#: ../src/orca/orca.py:1435
 msgid "Usage: orca [OPTION...]"
 msgstr "ç?¨æ³?ï¼?orca [é?¸é ?...]"
 
 #. 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:1441
 msgid "Show this help message"
 msgstr "é¡¯ç¤ºæ¤èªªæ??è¨?æ?¯"
 
@@ -3945,15 +4191,36 @@ msgstr "é¡¯ç¤ºæ¤èªªæ??è¨?æ?¯"
 #. the names of the applications known to the accessibility infrastructure
 #. to stdout and then exits.
 #.
-#: ../src/orca/orca.py:1365
+#: ../src/orca/orca.py:1450
 msgid "Print the known running applications"
 msgstr "é¡¯ç¤ºå·²ç?¥å?·è¡?ç??æ??ç?¨ç¨?å¼?"
 
+#. 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:1461
+msgid "Send debug output to debug-YYYY-MM-DD-HH:MM:SS.out"
+msgstr "å°?é?¤é?¯è³?è¨?è¼¸å?ºç?º debug-YYYY-MM-DD-HH:MM:SS.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:1468
+#, fuzzy
+msgid "Send debug output to the specified file"
+msgstr "å°?å?¨é?¨å??ä»¶ç??é?¤é?¯è¼¸å?ºè³?æ??å?³é??è?³ä¸?å??æª?æ¡?ã??"
+
 #. 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:1474
 msgid "Set up user preferences"
 msgstr "è¨å®?ä½¿ç?¨è??å??å¥½è¨å®?"
 
@@ -3963,7 +4230,7 @@ msgstr "è¨å®?ä½¿ç?¨è??å??å¥½è¨å®?"
 #. 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:1483
 msgid "Set up user preferences (text version)"
 msgstr "è¨å®?ä½¿ç?¨è??å??å¥½è¨å®?ï¼?æ??å?ç??æ?¬ï¼?"
 
@@ -3971,7 +4238,7 @@ msgstr "è¨å®?ä½¿ç?¨è??å??å¥½è¨å®?ï¼?æ??å?ç??æ?¬ï¼?"
 #. '-n, --no-setup' that means that Orca will startup without setting
 #. up any user preferences.
 #.
-#: ../src/orca/orca.py:1387
+#: ../src/orca/orca.py:1490
 msgid "Skip set up of user preferences"
 msgstr "ç?¥é??ä½¿ç?¨è??å??å¥½è¨å®?"
 
@@ -3981,7 +4248,7 @@ msgstr "ç?¥é??ä½¿ç?¨è??å??å¥½è¨å®?"
 #. '-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:1499
 msgid "Use alternate directory for user preferences"
 msgstr "å?¶å®?ä½¿ç?¨è??å??å¥½è¨å®?ç??è³?æ??å¤¾å??ç¨±"
 
@@ -3989,7 +4256,7 @@ msgstr "å?¶å®?ä½¿ç?¨è??å??å¥½è¨å®?ç??è³?æ??å¤¾å??ç¨±"
 #. command line option, it will be automatically enabled as Orca is
 #. started.
 #.
-#: ../src/orca/orca.py:1409
+#: ../src/orca/orca.py:1512
 msgid "Force use of option"
 msgstr "å¼·å?¶ä½¿ç?¨ç??é?¸é ?"
 
@@ -3997,7 +4264,7 @@ msgstr "å¼·å?¶ä½¿ç?¨ç??é?¸é ?"
 #. command line option, it will be automatically disabled as Orca is
 #. started.
 #.
-#: ../src/orca/orca.py:1422
+#: ../src/orca/orca.py:1525
 msgid "Prevent use of option"
 msgstr "é?¿å??ä½¿ç?¨ç??é?¸é ?"
 
@@ -4006,14 +4273,14 @@ msgstr "é?¿å??ä½¿ç?¨ç??é?¸é ?"
 #. 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:1533
 msgid "Quits Orca (if shell script used)"
 msgstr "é?¢é?? Orcaï¼?å¦?æ?? shell script æ??ä½¿ç?¨ï¼?"
 
 #. Translators: this is text being sent to a terminal and we want to
 #. keep the text lines within terminal boundaries.
 #.
-#: ../src/orca/orca.py:1437
+#: ../src/orca/orca.py:1540
 msgid ""
 "If Orca has not been previously set up by the user, Orca\n"
 "will automatically launch the preferences set up unless\n"
@@ -4023,7 +4290,7 @@ msgstr ""
 "Orca æ??è?ªå??å?·è¡?å??å¥½è¨å®?ï¼?\n"
 "é?¤é??æ??å®?äº? -n æ?? --no-setup é??é ?ã??"
 
-#: ../src/orca/orca.py:1445
+#: ../src/orca/orca.py:1548
 msgid ""
 "WARNING: suspending Orca, e.g. by pressing Control-Z, from\n"
 "an AT-SPI enabled shell (such as gnome-terminal), can also\n"
@@ -4033,15 +4300,29 @@ msgstr ""
 "ç³»çµ±æ®¼(gnome-terminal)ä¸æ??ä¸? Control-Z ï¼?\n"
 "æ??å??æ??ä½¿æ¡?é?¢æ?«å??ï¼?ç?´å?° Orca è¢«ä¸æ¢ã??"
 
-#: ../src/orca/orca.py:1450
+#: ../src/orca/orca.py:1553
 msgid "Report bugs to orca-list gnome org "
 msgstr "å?¯å ±é?¯èª¤è?³ orca-list gnome org"
 
-#: ../src/orca/orca.py:1621
+#: ../src/orca/orca.py:1736
 msgid "Welcome to Orca."
 msgstr "æ¡è¿?ä½¿ç?¨ Orcaã??"
 
-#: ../src/orca/orca-quit.glade.h:1
+#: ../src/orca/orca-preferences-warning.ui.h:1
+msgid "Warning"
+msgstr "è¦å??"
+
+#: ../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 ""
+"ä½ å·²ç¶?æ??ä¸?å??é??å??ç?? Orca å??å¥½è¨å®?å°?è©±ç??å¯¦é«?ã??\n"
+"\n"
+"è«?å?¨é??å??æ?°ç??ä¹?å??å??é??é??å®?ã??"
+
+#: ../src/orca/orca-quit.ui.h:1
 msgid ""
 "<b><big>Quit Orca?</big></b>\n"
 "\n"
@@ -4053,12 +4334,12 @@ msgstr ""
 "é??æ¨£æ??å??æ¢æ??æ??ç??èª?é?³è¼¸å?ºè??è?¢å¹?æ?¾å¤§é?¡ã??\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>"
@@ -4066,598 +4347,480 @@ msgstr ""
 "<b>èª¿æ?´é?¸å??ç??\n"
 "å±¬æ?§</b>"
 
-#: ../src/orca/orca-setup.glade.h:5
+#: ../src/orca/orca-setup.ui.h:5
 msgid "<b>Border Settings</b>"
 msgstr "<b>æ¡?ç·?è¨å®?å?¼</b>"
 
-#: ../src/orca/orca-setup.glade.h:6
+#: ../src/orca/orca-setup.ui.h:6
 #, fuzzy
 msgid "<b>Braille Indicator</b>"
-msgstr "æ??æ¨?å¤§å°?"
-
-#: ../src/orca/orca-setup.glade.h:7
-msgid "<b>Brightness</b>"
-msgstr "<b>äº®åº¦</b>"
+msgstr "è¡¨ç¤ºé??æ??ç??æ?¹å¼?"
 
-#: ../src/orca/orca-setup.glade.h:8
+#: ../src/orca/orca-setup.ui.h:7
 msgid "<b>Color Settings</b>"
 msgstr "<b>è?²å½©è¨å®?</b>"
 
-#: ../src/orca/orca-setup.glade.h:9
+#: ../src/orca/orca-setup.ui.h:8
 #, fuzzy
 msgid "<b>Contracted Braille</b>"
-msgstr "<b>å°?æ¯?</b>"
-
-#: ../src/orca/orca-setup.glade.h:10
-msgid "<b>Contrast</b>"
-msgstr "<b>å°?æ¯?</b>"
+msgstr "é»?å?æ??é?µçµ?å??"
 
-#: ../src/orca/orca-setup.glade.h:11
+#: ../src/orca/orca-setup.ui.h:9
 msgid "<b>Cross-hair Settings</b>"
 msgstr "<b>å??å?æº?æ??è¨å®?</b>"
 
-#: ../src/orca/orca-setup.glade.h:12
+#: ../src/orca/orca-setup.ui.h:10
 msgid "<b>Cursor Settings</b>"
 msgstr "<b>æ¸¸æ¨?è¨å®?</b>"
 
-#: ../src/orca/orca-setup.glade.h:13
+#: ../src/orca/orca-setup.ui.h:11
 msgid "<b>Hyperlink Indicator</b>"
 msgstr "<b>è¶?é?£çµ?æ??ç¤ºå?¨</b>"
 
-#: ../src/orca/orca-setup.glade.h:14
+#: ../src/orca/orca-setup.ui.h:12
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>é?µç?¤é??ç½®</b>"
 
-#: ../src/orca/orca-setup.glade.h:15
-msgid "<b>Multi-monitor Settings</b>"
-msgstr "<b>å¤?è?¢å¹?è¨å®?å?¼</b>"
-
-#: ../src/orca/orca-setup.glade.h:16
+#: ../src/orca/orca-setup.ui.h:13
 msgid "<b>Pronunciation Dictionary</b>"
 msgstr "<b>ç?¼é?³å?å?¸</b>"
 
-#: ../src/orca/orca-setup.glade.h:17
+#: ../src/orca/orca-setup.ui.h:14
 msgid "<b>Punctuation Level</b>"
 msgstr "<b>æ¨?é»?ç¬¦è??ç´?å?¥</b>"
 
-#: ../src/orca/orca-setup.glade.h:18
+#: ../src/orca/orca-setup.ui.h:15
 msgid "<b>Selection Indicator</b>"
 msgstr "<b>é?¸å??å??æ??ç¤ºå?¨</b>"
 
-#: ../src/orca/orca-setup.glade.h:19
+#: ../src/orca/orca-setup.ui.h:16
 msgid "<b>Table Row Speech</b>"
 msgstr "<b>è¡¨æ ¼å??æ??è®?</b>"
 
-#: ../src/orca/orca-setup.glade.h:20
+#: ../src/orca/orca-setup.ui.h:17
 msgid "<b>Text attributes</b>"
 msgstr "<b>æ??å?å±¬æ?§</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
+#: ../src/orca/orca-setup.ui.h:18
 msgid "<b>Tracking and Alignment Settings</b>"
 msgstr "<b>è¿½è¹¤è??æ??å??è¨å®?</b>"
 
-#: ../src/orca/orca-setup.glade.h:23
+#: ../src/orca/orca-setup.ui.h:19
 msgid "<b>Verbosity</b>"
 msgstr "<b>è¼¸å?ºå?§å®¹</b>"
 
-#: ../src/orca/orca-setup.glade.h:24
+#: ../src/orca/orca-setup.ui.h:20
 msgid "<b>Zoomer Settings</b>"
 msgstr "<b>æ?¾å¤§é?¡è¨å®?</b>"
 
-#: ../src/orca/orca-setup.glade.h:25
-msgid "Advanced Settings"
-msgstr "é?²é??è¨å®?"
-
-#: ../src/orca/orca-setup.glade.h:26
+#: ../src/orca/orca-setup.ui.h:21
 msgid "Advanced _Settings..."
 msgstr "é?²é??è¨å®?(_S)..."
 
-#: ../src/orca/orca-setup.glade.h:27
-msgid "B_lue:"
-msgstr "è??è?²(_L):"
+#. 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:23
+msgid "All"
+msgstr "å?¨é?¨"
 
-#: ../src/orca/orca-setup.glade.h:28
+#. Translators: long braille for the rolename of a application.
+#.
+#: ../src/orca/orca-setup.ui.h:24 ../src/orca/rolenames.py:1127
+msgid "Application"
+msgstr "æ??ç?¨ç¨?å¼?"
+
+#: ../src/orca/orca-setup.ui.h:25
 msgid "Border color:"
 msgstr "é??æ¡?é¡?è?²ï¼?"
 
-#: ../src/orca/orca-setup.glade.h:29
+#: ../src/orca/orca-setup.ui.h:26
 msgid "Border size:"
 msgstr "é??æ¡?å¤§å°?ï¼?"
 
-#: ../src/orca/orca-setup.glade.h:30
+#: ../src/orca/orca-setup.ui.h:28
 msgid "Braille"
 msgstr "é»?å?"
 
-#: ../src/orca/orca-setup.glade.h:32
+#: ../src/orca/orca-setup.ui.h:31
 msgid "Brightness:"
 msgstr "äº®åº¦ï¼?"
 
-#: ../src/orca/orca-setup.glade.h:33
-msgid ""
-"Centered\n"
-"Proportional\n"
-"Push\n"
-"None"
-msgstr ""
-"ç½®ä¸\n"
-"æ??æ¯?ä¾?ç??\n"
-"æ?¨\n"
-"æ²?æ??"
-
-#: ../src/orca/orca-setup.glade.h:37
-msgid ""
-"Centered\n"
-"Push\n"
-"None"
-msgstr ""
-"ç½®ä¸\n"
-"æ?¨\n"
-"æ²?æ??"
-
-#: ../src/orca/orca-setup.glade.h:40
+#: ../src/orca/orca-setup.ui.h:33
 #, fuzzy
 msgid "Contraction _Table:"
-msgstr "è?æ?¸è¡¨æ ¼"
+msgstr "æ¨¹ç??è³?æ??è¡¨æ ¼"
 
-#: ../src/orca/orca-setup.glade.h:41
+#: ../src/orca/orca-setup.ui.h:34
 msgid "Contrast:"
 msgstr "å°?æ¯?ï¼?"
 
-#: ../src/orca/orca-setup.glade.h:42
+#: ../src/orca/orca-setup.ui.h:35
 msgid "Cross-hair color:"
 msgstr "å??å?æº?æ??é¡?è?²:"
 
-#: ../src/orca/orca-setup.glade.h:43
+#: ../src/orca/orca-setup.ui.h:36
 msgid "Cross-hair si_ze:"
 msgstr "å??å?æº?æ??å¤§å°?(_Z):"
 
-#: ../src/orca/orca-setup.glade.h:44
+#: ../src/orca/orca-setup.ui.h:37
 msgid "Cursor color:"
 msgstr "æ¸¸æ¨?è?²å½©ï¼?"
 
-#: ../src/orca/orca-setup.glade.h:45
+#: ../src/orca/orca-setup.ui.h:38
 msgid "Cursor size:"
 msgstr "æ¸¸æ¨?å¤§å°?ï¼?"
 
-#: ../src/orca/orca-setup.glade.h:46
+#: ../src/orca/orca-setup.ui.h:40
 msgid "Custom siz_e"
 msgstr "è?ªé?¸å¤§å°?(_E)"
 
-#: ../src/orca/orca-setup.glade.h:47
-msgid ""
-"Default\n"
-"Uppercase\n"
-"Hyperlink"
-msgstr ""
-"é ?è¨\n"
-"å¤§å¯«å?æ¯?\n"
-"è¶?é?£çµ?"
+#: ../src/orca/orca-setup.ui.h:41
+msgid "Default"
+msgstr "é ?è¨"
 
-#: ../src/orca/orca-setup.glade.h:50
+#: ../src/orca/orca-setup.ui.h:42
+#, fuzzy
 msgid "Disable _end of line symbol"
-msgstr ""
+msgstr "ç§»è?³è¡?å°¾ã??"
 
-#: ../src/orca/orca-setup.glade.h:51
+#: ../src/orca/orca-setup.ui.h:43
 msgid "Disable gksu _keyboard grab"
 msgstr "å??æ¢ gksu é?µç?¤æ?·å??(_K)"
 
-#. 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:47
 #, fuzzy
 msgid "Edge mar_gin:"
 msgstr "ç?¡é??ç¤?ç?»å?¥(_G)"
 
-#: ../src/orca/orca-setup.glade.h:57
+#: ../src/orca/orca-setup.ui.h:48
 msgid "Enable Braille _monitor"
 msgstr "å??ç?¨é»?å?ç?£å?¨(_M)"
 
-#: ../src/orca/orca-setup.glade.h:58
+#: ../src/orca/orca-setup.ui.h:49
 msgid "Enable Braille _support"
 msgstr "å??ç?¨é»?å?æ?¯æ?´(_S)"
 
-#: ../src/orca/orca-setup.glade.h:59
+#: ../src/orca/orca-setup.ui.h:50
 msgid "Enable _alphanumeric and punctuation keys"
 msgstr "å??ç?¨æ??æ?¸å?ç¬¦å??æ¨?é»?ç¬¦è??æ??é?µ(_A)"
 
-#: ../src/orca/orca-setup.glade.h:60
+#: ../src/orca/orca-setup.ui.h:51
 msgid "Enable _function keys"
 msgstr "å??ç?¨å??è?½é?µ(_F)"
 
-#: ../src/orca/orca-setup.glade.h:61
+#: ../src/orca/orca-setup.ui.h:52
 msgid "Enable _key echo"
 msgstr "å??ç?¨æ??é?µå??é?¿(_K)"
 
-#: ../src/orca/orca-setup.glade.h:62
+#: ../src/orca/orca-setup.ui.h:53
 msgid "Enable _magnifier"
 msgstr "å??ç?¨æ?¾å¤§é?¡(_M)"
 
-#: ../src/orca/orca-setup.glade.h:63
+#: ../src/orca/orca-setup.ui.h:54
 msgid "Enable _modifier keys"
 msgstr "å??ç?¨ä¿®æ?¹é?µ(_M)"
 
-#: ../src/orca/orca-setup.glade.h:64
+#: ../src/orca/orca-setup.ui.h:55
 msgid "Enable _navigation keys"
 msgstr "å??ç?¨å°?è¦½é?µ(_N)"
 
-#: ../src/orca/orca-setup.glade.h:65
+#: ../src/orca/orca-setup.ui.h:56
 msgid "Enable ac_tion keys"
 msgstr "å??ç?¨å??ä½?é?µ(_T)"
 
-#: ../src/orca/orca-setup.glade.h:66
+#: ../src/orca/orca-setup.ui.h:57
 msgid "Enable bor_der"
 msgstr "å??ç?¨æ¡?ç·?(_D)"
 
-#: ../src/orca/orca-setup.glade.h:67
+#: ../src/orca/orca-setup.ui.h:58
 msgid "Enable c_ursor"
 msgstr "å??ç?¨æ¸¸æ¨?(_U)"
 
-#: ../src/orca/orca-setup.glade.h:68
+#: ../src/orca/orca-setup.ui.h:59
 msgid "Enable cross-h_air"
 msgstr "å??ç?¨å??å?æº?æ??(_A)"
 
-#: ../src/orca/orca-setup.glade.h:69
+#: ../src/orca/orca-setup.ui.h:60
 msgid "Enable cross-hair cl_ip"
 msgstr "å??ç?¨å??å?æº?æ??(_I)"
 
-#: ../src/orca/orca-setup.glade.h:70
+#: ../src/orca/orca-setup.ui.h:61
 msgid "Enable echo by _sentence"
 msgstr "å??ç?¨å?¥å?å??é?¿(_S)"
 
-#: ../src/orca/orca-setup.glade.h:71
+#: ../src/orca/orca-setup.ui.h:62
 msgid "Enable echo by _word"
 msgstr "å??ç?¨å?è©?å??é?¿(_W)"
 
-#: ../src/orca/orca-setup.glade.h:72
+#: ../src/orca/orca-setup.ui.h:64
 msgid "Enable lockin_g keys"
 msgstr "å??ç?¨é??å®?é?µ(_G)"
 
-#: ../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 ""
-
-#: ../src/orca/orca-setup.glade.h:79
+#: ../src/orca/orca-setup.ui.h:67
 msgid "General"
 msgstr "ä¸?è?¬"
 
-#: ../src/orca/orca-setup.glade.h:80
-msgid "Gree_n:"
-msgstr "ç¶ è?²(_N):"
-
-#: ../src/orca/orca-setup.glade.h:81
+#: ../src/orca/orca-setup.ui.h:68
 msgid "Hide s_ystem pointer"
 msgstr "é?±è??ç³»çµ±æ??æ¨?(_Y)"
 
-#: ../src/orca/orca-setup.glade.h:82
+#: ../src/orca/orca-setup.ui.h:69
+msgid "Hyperlink"
+msgstr "è¶?é?£çµ?"
+
+#: ../src/orca/orca-setup.ui.h:70
 msgid "In_vert colors"
 msgstr "ç?¸å??é¡?è?²(_V)"
 
-#: ../src/orca/orca-setup.glade.h:83
+#: ../src/orca/orca-setup.ui.h:71
 msgid "Key Binding List"
 msgstr "æ??é?µçµ?å??æ¸?å?®"
 
-#: ../src/orca/orca-setup.glade.h:84
+#: ../src/orca/orca-setup.ui.h:72
 msgid "Key Bindings"
 msgstr "æ??é?µçµ?å??"
 
-#: ../src/orca/orca-setup.glade.h:85
+#: ../src/orca/orca-setup.ui.h:73
 msgid "Key Echo"
 msgstr "æ??é?µå??é?¿"
 
-#: ../src/orca/orca-setup.glade.h:86
-msgid ""
-"Line\n"
-"Sentence"
-msgstr ""
-"æ¯?è¡?\n"
-"æ®µè?½"
-
-#: ../src/orca/orca-setup.glade.h:89
+#: ../src/orca/orca-setup.ui.h:77
 msgid "Magnifier"
 msgstr "æ?¾å¤§é?¡"
 
-#: ../src/orca/orca-setup.glade.h:90
+#: ../src/orca/orca-setup.ui.h:78
 msgid "Mouse poi_nter:"
 msgstr "é¼ æ¨?(_N):"
 
-#. 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:79
 msgid "Move _down one"
 msgstr "ä¸?ç§»ä¸?è¡?(_D)"
 
-#. 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:80
 msgid "Move _up one"
 msgstr "ä¸?ç§»ä¸?è¡?(_U)"
 
-#. 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:81
 msgid "Move to _bottom"
 msgstr "ç§»è?³åº?é?¨(_B)"
 
-#. 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:82
 msgid "Move to _top"
 msgstr "ç§»è?³é ?ç«¯(_T)"
 
-#: ../src/orca/orca-setup.glade.h:99
-msgid ""
-"None\n"
-"Bilinear"
-msgstr ""
-"æ²?æ??\n"
-"é??ç·?æ?§"
-
-#: ../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 ""
-
-#: ../src/orca/orca-setup.glade.h:110
+#: ../src/orca/orca-setup.ui.h:84
 msgid "Orca Modifier Keys"
 msgstr "Orca ä¿®æ?¹é?µ"
 
-#: ../src/orca/orca-setup.glade.h:111
+#: ../src/orca/orca-setup.ui.h:85
 msgid "Orca Preferences"
 msgstr "Orca å??å¥½è¨å®?"
 
-#: ../src/orca/orca-setup.glade.h:112
+#: ../src/orca/orca-setup.ui.h:86
 msgid "Orca _Modifier Key(s):"
 msgstr "Orca ä¿®æ?¹é?µ(_M):"
 
-#: ../src/orca/orca-setup.glade.h:113
+#: ../src/orca/orca-setup.ui.h:87
 msgid "Pi_tch:"
 msgstr "é?³èª¿(_T):"
 
-#. 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:88
 msgid "Pointer follows focus"
 msgstr "æ??æ¨?è·?é?¨ç?¦é»?"
 
-#. 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:89
 msgid "Pointer follows zoomer"
 msgstr "æ??æ¨?è·?é?¨æ?¾å¤§é?¡"
 
-#: ../src/orca/orca-setup.glade.h:118
+#: ../src/orca/orca-setup.ui.h:90
 msgid "Pronunciation"
 msgstr "ç?¼é?³"
 
-#: ../src/orca/orca-setup.glade.h:119
+#: ../src/orca/orca-setup.ui.h:93
 msgid "Quit Orca _without confirmation"
 msgstr "ä¸?ç¢ºèª?è??é?¢é?? Orca(_W)"
 
-#: ../src/orca/orca-setup.glade.h:120
-msgid "R_ed:"
-msgstr "ç´?è?²(_E):"
-
-#: ../src/orca/orca-setup.glade.h:121
-msgid "S_ource display:"
-msgstr "å??å§?é¡¯ç¤º(_O):"
-
-#. 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:97
 msgid "Say All B_y:"
 msgstr "é?±è®?å??é ?æ?¼(_Y):"
 
-#: ../src/orca/orca-setup.glade.h:124
+#: ../src/orca/orca-setup.ui.h:98
 msgid "Scale _factor:"
 msgstr "æ?¾å¤§ç??(_F):"
 
-#: ../src/orca/orca-setup.glade.h:125
+#: ../src/orca/orca-setup.ui.h:100
 msgid "Show Orca _main window"
 msgstr "é¡¯ç¤º Orca ä¸»è¦?çª?(_M)"
 
-#: ../src/orca/orca-setup.glade.h:127
+#: ../src/orca/orca-setup.ui.h:102
 msgid "Spea_k object mnemonics"
 msgstr "è®?å?ºç?©ä»¶å?©è¨?ç¬¦(_K)"
 
-#: ../src/orca/orca-setup.glade.h:128
+#: ../src/orca/orca-setup.ui.h:103
 msgid "Speak _indentation and justification"
 msgstr "è®?å?ºç¸®æ??å??å°?é½?(_I)"
 
-#: ../src/orca/orca-setup.glade.h:129
+#: ../src/orca/orca-setup.ui.h:104
 msgid "Speak _none"
 msgstr "è®?å?ºã??æ²?æ??ã??(_N)"
 
-#: ../src/orca/orca-setup.glade.h:130
+#: ../src/orca/orca-setup.ui.h:105
 msgid "Speak blank lines"
 msgstr "è®?å?ºç©ºç?½ç??è¡?"
 
-#: ../src/orca/orca-setup.glade.h:132
+#: ../src/orca/orca-setup.ui.h:106
+#, fuzzy
+msgid "Speak child p_osition"
+msgstr "å?ç¨?å¼?çª?ç?¶é?¢é??"
+
+#: ../src/orca/orca-setup.ui.h:108
 msgid "Speak current ro_w"
 msgstr "è®?å?ºç?®å??ç??å??(_W)"
 
-#. Translators: multicase strings are StringsWithWordsMashedTogetherLikeThis.
-#: ../src/orca/orca-setup.glade.h:134
+#: ../src/orca/orca-setup.ui.h:109
 #, fuzzy
-#| msgid "Speak results during _find"
 msgid "Speak multicase strings as wor_ds"
 msgstr "å°?æ?¾æ??è®?å?ºçµ?æ??(_F)"
 
-#: ../src/orca/orca-setup.glade.h:135
+#: ../src/orca/orca-setup.ui.h:110
 msgid "Speak object under mo_use"
 msgstr "å?¸å?ºæ»?é¼ ä¸?æ?¹ç??ç?©ä»¶(_U)"
 
-#: ../src/orca/orca-setup.glade.h:136
+#: ../src/orca/orca-setup.ui.h:111
 msgid "Speak progress bar _updates"
 msgstr "è®?å?ºé?²åº¦å??ç??æ?´æ?°(_U)"
 
-#: ../src/orca/orca-setup.glade.h:137
+#: ../src/orca/orca-setup.ui.h:112
 msgid "Speak tutorial messages"
 msgstr "è®?å?ºæ??å¸è¨?æ?¯"
 
-#: ../src/orca/orca-setup.glade.h:138
+#: ../src/orca/orca-setup.ui.h:113
 msgid "Speech"
 msgstr "æ??è®?"
 
-#: ../src/orca/orca-setup.glade.h:139
+#: ../src/orca/orca-setup.ui.h:114
 msgid "Speech _system:"
 msgstr "æ??è®?ç³»çµ±(_S):"
 
-#: ../src/orca/orca-setup.glade.h:140
+#: ../src/orca/orca-setup.ui.h:115
 msgid "Speech synthesi_zer:"
 msgstr "æ??è®?å??æ??å?¨(_Z):"
 
-#: ../src/orca/orca-setup.glade.h:141
+#: ../src/orca/orca-setup.ui.h:116
 msgid "Start Orca when you lo_gin"
 msgstr "ç?¶ä½ ç?»å?¥æ??å??å?? Orca(_G)"
 
-#: ../src/orca/orca-setup.glade.h:142
-msgid "Target displa_y:"
-msgstr "ç?®æ¨?é¡¯ç¤º(_Y):"
-
-#: ../src/orca/orca-setup.glade.h:143
+#: ../src/orca/orca-setup.ui.h:117
 msgid "Te_xt cursor:"
 msgstr "æ??å?æ¸¸æ¨?(_X):"
 
-#: ../src/orca/orca-setup.glade.h:144
+#: ../src/orca/orca-setup.ui.h:118
 msgid "Text Attributes"
 msgstr "æ??å?å±¬æ?§"
 
-#: ../src/orca/orca-setup.glade.h:145
+#: ../src/orca/orca-setup.ui.h:120
+msgid "Uppercase"
+msgstr "å¤§å¯«å?æ¯?"
+
+#: ../src/orca/orca-setup.ui.h:121
 msgid "Ver_bose"
 msgstr "è©³ç´°(_B)"
 
-#: ../src/orca/orca-setup.glade.h:146
+#: ../src/orca/orca-setup.ui.h:122
 msgid "Vo_lume:"
 msgstr "é?³é??(_L):"
 
-#: ../src/orca/orca-setup.glade.h:147
-msgid "Warning"
-msgstr "è¦å??"
-
-#: ../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 ""
-"ä½ å·²ç¶?æ??ä¸?å??é??å??ç?? Orca å??å¥½è¨å®?å°?è©±ç??å¯¦é«?ã??\n"
-"\n"
-"è«?å?¨é??å??æ?°ç??ä¹?å??å??é??é??å®?ã??"
+#. Translators: long braille for the rolename of a window.
+#.
+#: ../src/orca/orca-setup.ui.h:123 ../src/orca/rolenames.py:1079
+msgid "Window"
+msgstr "è¦?çª?"
 
-#: ../src/orca/orca-setup.glade.h:151
+#: ../src/orca/orca-setup.ui.h:124
 msgid "_Abbreviated role names"
 msgstr "ç¸®å¯«ä»»å??å??ç¨±(_A)"
 
-#: ../src/orca/orca-setup.glade.h:152
+#: ../src/orca/orca-setup.ui.h:125
 msgid "_All"
 msgstr "å?¨é?¨(_A)"
 
-#: ../src/orca/orca-setup.glade.h:153
-msgid "_Blue:"
-msgstr "è??(_B):"
-
-#: ../src/orca/orca-setup.glade.h:154
+#: ../src/orca/orca-setup.ui.h:126
 msgid "_Bottom:"
 msgstr "ä¸?(_B):"
 
-#: ../src/orca/orca-setup.glade.h:155
-msgid "_Color Filtering:"
-msgstr "é¡?è?²æ¿¾é?¡(_C):"
-
-#: ../src/orca/orca-setup.glade.h:156
+#: ../src/orca/orca-setup.ui.h:127
 msgid "_Control and menu item:"
 msgstr "æ?§å?¶è??é?¸å?®é ?ç?®(_C):"
 
-#: ../src/orca/orca-setup.glade.h:157
+#: ../src/orca/orca-setup.ui.h:128
 msgid "_Delete"
 msgstr "å?ªé?¤(_D)"
 
-#: ../src/orca/orca-setup.glade.h:159
+#: ../src/orca/orca-setup.ui.h:130
 #, fuzzy
 msgid "_Enable Contracted Braille"
-msgstr "å??ç?¨é?¤é?¯ç¢¼"
+msgstr "å??ç?¨é»?å?ç?£å?¨(_M)"
 
-#: ../src/orca/orca-setup.glade.h:160
+#: ../src/orca/orca-setup.ui.h:131
 msgid "_Enable speech"
 msgstr "å??ç?¨æ??è®?(_E)"
 
-#: ../src/orca/orca-setup.glade.h:161
-msgid "_Green:"
-msgstr "ç¶ (_G):"
-
-#: ../src/orca/orca-setup.glade.h:162
+#: ../src/orca/orca-setup.ui.h:132
 msgid "_Laptop"
 msgstr "ç?è¨?æ?¬é?»è?¦(_L)"
 
-#: ../src/orca/orca-setup.glade.h:163
+#: ../src/orca/orca-setup.ui.h:133
 msgid "_Left:"
 msgstr "å·¦(_L):"
 
-#: ../src/orca/orca-setup.glade.h:164
+#: ../src/orca/orca-setup.ui.h:134
 msgid "_New entry"
 msgstr "æ?°é ?ç?®(_N)"
 
-#: ../src/orca/orca-setup.glade.h:166
+#: ../src/orca/orca-setup.ui.h:136
 msgid "_Person:"
 msgstr "æ??è®?è??(_P):"
 
-#: ../src/orca/orca-setup.glade.h:167
+#: ../src/orca/orca-setup.ui.h:137
 msgid "_Position:"
 msgstr "ä½?ç½®(_P):"
 
-#: ../src/orca/orca-setup.glade.h:168
+#: ../src/orca/orca-setup.ui.h:138
 msgid "_Present tooltips"
 msgstr "é¡¯ç¤ºå·¥å?·æ??ç¤º(_P)"
 
-#: ../src/orca/orca-setup.glade.h:169
+#: ../src/orca/orca-setup.ui.h:139
 msgid "_Rate:"
 msgstr "é??åº¦(_R):"
 
-#: ../src/orca/orca-setup.glade.h:170
-msgid "_Red:"
-msgstr "ç´?(_R):"
-
-#: ../src/orca/orca-setup.glade.h:171
+#: ../src/orca/orca-setup.ui.h:140
 msgid "_Reset"
 msgstr "é??è¨(_R)"
 
-#: ../src/orca/orca-setup.glade.h:172
+#: ../src/orca/orca-setup.ui.h:141
 msgid "_Right:"
 msgstr "å?³(_R):"
 
-#: ../src/orca/orca-setup.glade.h:173
-msgid "_Smoothing:"
-msgstr "å??æ»?(_S):"
-
-#: ../src/orca/orca-setup.glade.h:174
+#: ../src/orca/orca-setup.ui.h:142
 msgid "_Speak all"
 msgstr "å?¨é?¨è®?å?º(_S)"
 
-#: ../src/orca/orca-setup.glade.h:175
+#: ../src/orca/orca-setup.ui.h:143
 msgid "_Top:"
 msgstr "ä¸?(_T):"
 
-#: ../src/orca/orca-setup.glade.h:176
+#: ../src/orca/orca-setup.ui.h:144
 msgid "_Voice settings:"
 msgstr "è?²é?³è¨å®?(_V):"
 
-#. 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
+#: ../src/orca/orca-setup.ui.h:145
 msgid "every"
 msgstr "æ¯?"
 
-#: ../src/orca/orca-setup.glade.h:179
+#: ../src/orca/orca-setup.ui.h:146
 msgid "pixels"
 msgstr "å??ç´ "
 
-#: ../src/orca/orca-setup.glade.h:180
+#: ../src/orca/orca-setup.ui.h:147
 msgid "seconds"
 msgstr "ç§?"
 
@@ -5012,7 +5175,7 @@ msgstr "æ¡?é?¢æ¡?æ?¶"
 #, fuzzy
 msgctxt "shortbraille"
 msgid "dial"
-msgstr "æ?¥è??"
+msgstr "å°?è©±è¦?çª?"
 
 #. Translators: long braille for the rolename of a dial.
 #.
@@ -5439,7 +5602,7 @@ msgstr "é?¸é ?çª?æ ¼"
 #.
 #: ../src/orca/rolenames.py:678
 msgid "pgt"
-msgstr ""
+msgstr "pgt"
 
 #. Translators: long braille for the rolename of a page tab.
 #.
@@ -5810,8 +5973,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 "å?²å?æ ¼"
 
@@ -6001,12 +6162,6 @@ msgstr "è¦?å? "
 msgid "wnd"
 msgstr "wnd"
 
-#. Translators: long braille for the rolename of a window.
-#.
-#: ../src/orca/rolenames.py:1079
-msgid "Window"
-msgstr "è¦?çª?"
-
 #. Translators: spoken words for the rolename of a window.
 #.
 #: ../src/orca/rolenames.py:1082
@@ -6073,12 +6228,6 @@ msgstr "æ®µè?½"
 msgid "app"
 msgstr "app"
 
-#. Translators: long braille for the rolename of a application.
-#.
-#: ../src/orca/rolenames.py:1127
-msgid "Application"
-msgstr "æ??ç?¨ç¨?å¼?"
-
 #. Translators: spoken words for the rolename of a application.
 #.
 #: ../src/orca/rolenames.py:1130
@@ -6163,15 +6312,15 @@ msgstr "æ??ä»¶"
 #. We've entered a table.  Announce the dimensions.
 #.
 #: ../src/orca/scripts/apps/acroread.py:276
-#: ../src/orca/scripts/apps/soffice/script.py:703
-#, python-format
-msgid "table with %d rows and %d columns."
+#: ../src/orca/scripts/apps/soffice/script.py:888
+#, fuzzy, python-format
+msgid "table with %(rows)d rows and %(columns)d columns."
 msgstr "å·¥ä½?è¡¨æ?? %d å??å?? %d æ¬?ã??"
 
 #. 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 "é?¢é??å·¥ä½?è¡¨ã??"
 
@@ -6179,15 +6328,17 @@ msgstr "é?¢é??å·¥ä½?è¡¨ã??"
 #. on in a table.
 #.
 #: ../src/orca/scripts/apps/acroread.py:301
-#, python-format
-msgid "row %d, column %d"
+#, fuzzy, python-format
+msgid "row %(row)d, column %(column)d"
 msgstr "å?? %dï¼?æ¬? %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 "æ¬? %d"
@@ -6232,7 +6383,7 @@ msgstr "æ??æ??äº?ä»¶"
 #. 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 "æ²?æ??æ??è®?æ??æ??å?¦å±?ç¤ºæ?°é?µä»¶ã??"
 
@@ -6240,7 +6391,7 @@ msgstr "æ²?æ??æ??è®?æ??æ??å?¦å±?ç¤ºæ?°é?µä»¶ã??"
 #. 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 "æ²?æ??æ??è®?æ??å±?ç¤ºæ?°é?µä»¶ã??"
 
@@ -6248,47 +6399,17 @@ msgstr "æ²?æ??æ??è®?æ??å±?ç¤ºæ?°é?µä»¶ã??"
 #. 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 "æ²?æ??æ??è®?æ??ä»?ä¸?è¦?å±?ç¤ºæ?°é?µä»¶"
 
-#. 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 "%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 "è«?"
-
-#: ../src/orca/scripts/apps/evolution/script.py:305
-msgid "Welcome"
-msgstr "æ¡è¿?"
-
-#: ../src/orca/scripts/apps/evolution/script.py:306
-msgid "Congratulations"
-msgstr "æ?å??"
-
 #. 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 "ç??æ??"
 
@@ -6297,8 +6418,8 @@ msgstr "ç??æ??"
 #. 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 "æ??æ¨?å¹?ç??"
 
@@ -6306,7 +6427,7 @@ msgstr "æ??æ¨?å¹?ç??"
 #. 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 "æ?ªè®?"
 
@@ -6315,14 +6436,14 @@ msgstr "æ?ªè®?"
 #. 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 "é??ä»¶"
 
 #. 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 "æ²?æ??ç´?æ??"
 
@@ -6330,35 +6451,30 @@ msgstr "æ²?æ??ç´?æ??"
 #. 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 "ç?®é??æ??é??"
 
-#. 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 "å??å?©"
-
-#. 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 "å·²è®?"
 
+#. 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 "%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:103
 msgid "Unable to get calculator display"
 msgstr "ç?¡æ³?å??å¾?è¨?æ?¸æ©?ç??é¡¯ç¤º"
 
@@ -6367,11 +6483,11 @@ msgstr "ç?¡æ³?å??å¾?è¨?æ?¸æ©?ç??é¡¯ç¤º"
 #. 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 "æ?´æ??ç?ºï¼?"
 
-#: ../src/orca/scripts/apps/gedit/script.py:229
+#: ../src/orca/scripts/apps/gedit/script.py:231
 msgid "Misspelled word:"
 msgstr "æ?¼é?¯ç??å?è©?:"
 
@@ -6383,15 +6499,15 @@ msgstr "æ?¼é?¯ç??å?è©?:"
 #. 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 "æ?¼å?æª¢æ?¥å®?æ??"
 
-#: ../src/orca/scripts/apps/gedit/script.py:263
+#: ../src/orca/scripts/apps/gedit/script.py:265
 msgid "Spell checking is complete."
 msgstr "æ?¼å?æª¢æ?¥å·²å®?æ??ã??"
 
-#: ../src/orca/scripts/apps/gedit/script.py:265
+#: ../src/orca/scripts/apps/gedit/script.py:267
 msgid "Press Tab and Return to terminate."
 msgstr "æ??ä¸? Tab å?? Enter ä¾?çµ?æ¢ã??"
 
@@ -6405,12 +6521,12 @@ msgstr "æ??ä¸? Tab å?? Enter ä¾?çµ?æ¢ã??"
 #. 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/gedit/script.py:394
+#: ../src/orca/scripts/apps/gedit/script.py:477
 #: ../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/Thunderbird/script.py:302
+#: ../src/orca/scripts/apps/Thunderbird/script.py:519
+#: ../src/orca/scripts/apps/Thunderbird/speech_generator.py:88
 msgid "Check Spelling"
 msgstr "æ?¼å?æª¢æ?¥"
 
@@ -6431,14 +6547,14 @@ msgstr "æ?¼å?æª¢æ?¥"
 #. 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 "æ?¾ä¸?å?°ç??èª?"
 
 #. 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 "æ?¾å?°ç??èª?ã??"
 
@@ -6478,6 +6594,15 @@ msgstr[0] "æ?¾å?° %d å??æª?æ¡?"
 msgid "No files found."
 msgstr "æ?¾ä¸?å?°ä»»ä½?æª?æ¡?ã??"
 
+#. 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:112
+msgid "inaccessible"
+msgstr "ä¸?è?½å?å??"
+
 #: ../src/orca/scripts/apps/liferea.py:117
 msgid "Work online / offline"
 msgstr "ç¶²ä¸?/é?¢ç·?å·¥ä½?"
@@ -6496,49 +6621,77 @@ msgstr "å·¥ä½?å??"
 msgid "Desk "
 msgstr "Desk "
 
-#. 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 "ä¸?è?½å?å??"
+#: ../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 å??é ?ç?®"
 
 #. 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 "é??ç?¥ %s"
 
-#: ../src/orca/scripts/apps/pidgin/script.py:192
+#. Translators: this is in reference to loading a web page
+#. or some other content.
+#.
+#: ../src/orca/scripts/apps/packagemanager/script.py:104
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1935
+msgid "Loading.  Please wait."
+msgstr "è¼?å?¥ä¸ï¼?è«?ç¨?å??ã??"
+
+#. Translators: this is in reference to loading a web page
+#. or some other content.
+#.
+#: ../src/orca/scripts/apps/packagemanager/script.py:110
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1948
+msgid "Finished loading."
+msgstr "è¼?å?¥å®?æ??ã??"
+
+#. 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 "ä½¿ç?¨ Ctrl+L å°?ç?¦é»?ç§»è?³çµ?æ??ã??"
+
+#: ../src/orca/scripts/apps/pidgin/script.py:191
 msgid ""
 "Toggle whether we prefix chat room messages with the name of the chat room."
 msgstr "å??æ??æ?¯å?¦å°?è??å¤©å®¤ç??å??ç¨±å? å?¥è??å¤©å®¤ç??è¨?æ?¯å??ã??"
 
-#: ../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 "å??æ??ç?¶æ??å??ç??æ??å??å?¨è¼¸å?¥æ??æ?¯å?¦å??ç?¥æ??å??ã??"
 
-#: ../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 "å??æ??æ?¯å?¦æ??ä¾?æ??å®?è??å¤©å®¤ç??ç??è¨?æ?¯æ·å?²ç´?é??ã??"
 
-#: ../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 "è®?å?ºå??é»?å?ºä¸?ä¸?å??è??å¤©å®¤ç??è¨?æ?¯ã??"
 
 #. 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 "è®?å?ºè??å¤©å®¤å??ç¨±(_S)"
 
 #. 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 "ç?¶ä½ ç??æ??å??å?¨è¼¸å?¥æ??å??ç?¥(_B)"
 
@@ -6547,7 +6700,7 @@ msgstr "ç?¶ä½ ç??æ??å??å?¨è¼¸å?¥æ??å??ç?¥(_B)"
 #. 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 "æ??ä¾?æ??å®?è??å¤©å®¤ç??è¨?æ?¯æ·å?²ç´?é??(_M)"
 
@@ -6555,7 +6708,7 @@ msgstr "æ??ä¾?æ??å®?è??å¤©å®¤ç??è¨?æ?¯æ·å?²ç´?é??(_M)"
 #. 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 "æ??æ??é »é??(_N)"
 
@@ -6563,106 +6716,85 @@ msgstr "æ??æ??é »é??(_N)"
 #. 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 "å?ªæ??ä½¿ç?¨ä¸è¦?çª?ç??é »é??(_W)"
 
-#: ../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 "ç?¶ä»»ä½? Pidgin è¦?çª?å?¨ä½¿ç?¨ä¸ç??æ??æ??é »é??(_Y)"
 
 #. 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 "è®?å?ºè¨?æ?¯æ?¼"
 
-#: ../src/orca/scripts/apps/pidgin/script.py:454
+#: ../src/orca/scripts/apps/pidgin/script.py:447
 msgid "speak chat room name."
 msgstr "è®?å?ºè??å¤©å®¤å??ç¨±ã??"
 
-#: ../src/orca/scripts/apps/pidgin/script.py:458
+#: ../src/orca/scripts/apps/pidgin/script.py:451
 msgid "Do not speak chat room name."
 msgstr "ä¸?è¦?è®?å?ºè??å¤©å®¤å??ç¨±ã??"
 
-#: ../src/orca/scripts/apps/pidgin/script.py:473
+#: ../src/orca/scripts/apps/pidgin/script.py:466
 msgid "announce when your buddies are typing."
 msgstr "ç?¶ä½ ç??æ??å??å?¨è¼¸å?¥æ??å??ç?¥ã??"
 
-#: ../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 "ç?¶ä½ ç??æ??å??å?¨è¼¸å?¥æ??ä¸?è¦?å??ç?¥ã??"
 
-#: ../src/orca/scripts/apps/pidgin/script.py:492
+#: ../src/orca/scripts/apps/pidgin/script.py:485
 msgid "Provide chat room specific message histories."
 msgstr "æ??ä¾?æ??å®?è??å¤©å®¤ç??è¨?æ?¯æ·å?²ç´?é??ã??"
 
-#: ../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 "ä¸?è¦?æ??ä¾?æ??å®?è??å¤©å®¤ç??è¨?æ?¯æ·å?²ç´?é??ã??"
 
-#: ../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 "ä¾?è?ªè??å¤©å®¤ %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 "æ?°è??å¤©å??é ? %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 å??é ?ç?®"
-
-#. 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 "å?? %d/%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 "é¡¯ç¤ºæ?´å¤?é?¸é ?"
 
 #. 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 "è®?å?ºè¼¸å?¥è¡?ç??å?§å®¹ã??"
 
 #. 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 "ç?¶æ??è®? calc å?²å?æ ¼æ??å°?å??è¨å®?ç?ºä½¿ç?¨å??æ??æ¬?æ¨?é "
 
 #. 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 "æ¸?é?¤å??æ??æ¬?æ¨?é ã??"
 
 #. 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 "ç?¶æ??è®? calc å?²å?æ ¼æ??å°?æ¬?è¨å®?ç?ºä½¿ç?¨å??æ??å??æ¨?é "
@@ -6670,7 +6802,7 @@ msgstr "ç?¶æ??è®? calc å?²å?æ ¼æ??å°?æ¬?è¨å®?ç?ºä½¿ç?¨å??æ??å??æ¨?é "
 #. 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 "æ¸?é?¤å??æ??å¼?å??æ¨?é¡?"
 
@@ -6680,21 +6812,63 @@ msgstr "æ¸?é?¤å??æ??å¼?å??æ¨?é¡?"
 #. 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 "è®?å?ºå·¥ä½?è¡¨ç??å?²å?æ ¼å??æ¨?"
 
+#. 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:897
+msgid "Speak _cell coordinates"
+msgstr "è®?å?ºå?²å?æ ¼å??æ¨?(_C)"
+
+#. 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:909
+#, fuzzy
+msgid "Speak _multiple cell spans"
+msgstr "å?²å?æ ¼è·¨é?? %d å??å?? %d æ¬?ã??"
+
+#. 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:920
+msgid "Announce cell _header"
+msgstr "è®?å?ºå?²å?æ ¼æ¨?é¡?(_H)"
+
+#. 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:931
+msgid "Skip _blank cells"
+msgstr "ç?¥é??ç©ºç?½å?²å?æ ¼(_B)"
+
+#. 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:942
+msgid "Table Navigation"
+msgstr "è¡¨æ ¼å°?è¦½"
+
 #. 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 "ç©ºç?½"
 
 #. 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 "å??æ??æ¬?æ¨?é è¨å®?çµ¦ç¬¬ %d å??"
@@ -6702,14 +6876,14 @@ msgstr "å??æ??æ¬?æ¨?é è¨å®?çµ¦ç¬¬ %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 "å·²æ¸?é?¤å??æ??æ¬?æ¨?é ã??"
 
 #. 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 "å??æ??å??æ¨?é è¨å®?çµ¦æ¬? %s"
@@ -6717,7 +6891,7 @@ msgstr "å??æ??å??æ¨?é è¨å®?çµ¦æ¬? %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 "å·²æ¸?é?¤å??æ??å??æ¨?é ã??"
 
@@ -6727,7 +6901,7 @@ msgstr "å·²æ¸?é?¤å??æ??å??æ¨?é ã??"
 #. 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 "æ¡è¿?ä½¿ç?¨ StarOffice"
 
@@ -6738,15 +6912,15 @@ msgstr "æ¡è¿?ä½¿ç?¨ 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 "å?¯ç?¨ç??æ¬?ä½?"
 
-#: ../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 "æ³¨æ??å??ä¸?æ?²å??æ??é??å·²æ??ä¸?äº?æ?¸æ¬¡ã??"
 
-#: ../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 "ç?¾å?¨å°?ç?¦ç??æ?¥å??æ??æ¬?æ¢?æ¬¾ç??æ??é??ã??"
 
@@ -6756,7 +6930,7 @@ msgstr "ç?¾å?¨å°?ç?¦ç??æ?¥å??æ??æ¬?æ¢?æ¬¾ç??æ??é??ã??"
 #. 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 "å??å?"
 
@@ -6764,7 +6938,7 @@ msgstr "å??å?"
 #. 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 "ç§»è?³å?²å?æ ¼"
 
@@ -6775,7 +6949,7 @@ msgstr "ç§»è?³å?²å?æ ¼"
 #. 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 "ç°¡å ±ç²¾é??"
 
@@ -6784,59 +6958,40 @@ msgstr "ç°¡å ±ç²¾é??"
 #. 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 "æ??å?¬å¼?"
 
 #. 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: this is the number of 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.
 #.
-#: ../src/orca/scripts/apps/soffice/speech_generator.py:128
-#: ../src/orca/speechgenerator.py:859 ../src/orca/speechgenerator.py:1415
-msgid "0 items"
-msgstr "0 å??é ?ç?®"
-
-#. 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 " é??"
+#: ../src/orca/scripts/apps/soffice/speech_generator.py:341
+#, fuzzy, python-format
+msgid "%d character too long"
+msgid_plural "%d characters too long"
+msgstr[0] "è·¯å¾?å¤ªé?·ï¼?%s"
 
-#. 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 " é??"
-
-#: ../src/orca/scripts/apps/soffice/where_am_i.py:99
-#, python-format
-msgid "row %d"
-msgstr "å?? %d"
+#: ../src/orca/scripts/apps/soffice/structural_navigation.py:123
+#: ../src/orca/structural_navigation.py:3311
+#, fuzzy, python-format
+msgid "Row %(row)d, column %(column)d."
+msgstr "å?? %dï¼?æ¬? %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:557
+#: ../src/orca/scripts/apps/Thunderbird/script.py:574
 #, python-format
 msgid "%s panel"
 msgstr "%s é?¢æ?¿"
@@ -6847,123 +7002,135 @@ msgstr "%s é?¢æ?¿"
 msgid "entered bookmark"
 msgstr "è¼¸å?¥ç??æ?¸ç±¤"
 
+#. 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 "å??å??å?°å??é?£çµ?"
+
 #. 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:378
 msgid "Goes to next character."
 msgstr "ç§»è?³ä¸?ä¸?å??å?ç¬¦ã??"
 
 #. 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:386
 msgid "Goes to previous character."
 msgstr "ç§»è?³å??ä¸?å??å?ç¬¦ã??"
 
 #. 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:394
 msgid "Goes to next word."
 msgstr "ç§»è?³ä¸?ä¸?å??å?®å?ã??"
 
 #. 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:402
 msgid "Goes to previous word."
 msgstr "ç§»è?³ä¸?ä¸?å??å?®å?ã??"
 
 #. 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:410
 msgid "Goes to next line."
 msgstr "ç§»è?³ä¸?ä¸?è¡?ã??"
 
 #. 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:418
 msgid "Goes to previous line."
 msgstr "ç§»è?³ä¸?ä¸?è¡?ã??"
 
 #. 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:426
 msgid "Goes to the top of the file."
 msgstr "ç§»è?³æª?æ¡?ç??æ??ä¸?é?¢ã??"
 
 #. 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:434
 msgid "Goes to the bottom of the file."
 msgstr "ç§»è?³æª?æ¡?ç??æ??ä¸?é?¢ã??"
 
 #. 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:442
 msgid "Goes to the beginning of the line."
 msgstr "ç§»è?³è¡?é¦?ã??"
 
 #. 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:450
 msgid "Goes to the end of the line."
 msgstr "ç§»è?³è¡?å°¾ã??"
 
 #. 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:458
 msgid "Causes the current combo box to be expanded."
 msgstr "ä½¿ç?®å??ç??çµ?å??æ?¹å¡?å±?é??ã??"
 
 #. 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:466
 msgid "Advance live region politeness setting."
 msgstr ""
 
 #. 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:474
 msgid "Set default live region politeness level to off."
 msgstr ""
 
 #. 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:482
 #, fuzzy
 msgid "Monitor live regions."
-msgstr "é?¸æ??ç?£è¦?å?¨é¡?è?²è¨å®?çµ?å??"
+msgstr "No more live regions."
 
 #. 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:490
 msgid "Review live region announcement."
 msgstr ""
 
 #. 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:498
 msgid "Goes to the previous object."
 msgstr "ç§»è?³ä¸?ä¸?å??ç?©ä»¶ã??"
 
 #. 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:506
 msgid "Goes to the next object."
 msgstr "ç§»è?³ä¸?ä¸?å??ç?©ä»¶ã??"
 
@@ -6974,9 +7141,21 @@ msgstr "ç§»è?³ä¸?ä¸?å??ç?©ä»¶ã??"
 #. 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:518
 msgid "Switches between Gecko native and Orca caret navigation."
-msgstr ""
+msgstr "å?¨ Gecko å??ç??ç??è¦½è?? Orca é?µç?¤ç??è¦½æ?¹å¼?é??å??æ??ã??"
+
+#. 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:574
+msgid "Moves focus into and away from the current mouse over."
+msgstr "å°?ç?¦é»?ç§»å?¥æ??ç§»å?ºç?®å??æ»?é¼ å??é§?ç??ä½?ç½®ã??"
 
 #. Translators: Gecko native caret navigation is where
 #. Firefox itself controls how the arrow keys move the caret
@@ -6985,7 +7164,7 @@ msgstr ""
 #. 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:821
 #, fuzzy
 msgid "Use _Orca Caret Navigation"
 msgstr "é?¢é ?å°?è¦½"
@@ -6994,10 +7173,10 @@ msgstr "é?¢é ?å°?è¦½"
 #. 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:834
 #, fuzzy
 msgid "Use Orca _Structural Navigation"
-msgstr "çµ?æ§?å°?è¦½é?µé??å??ã??"
+msgstr "å??æ??çµ?æ§?å°?è¦½é?µã??"
 
 #. Translators: when the user arrows up and down in HTML content,
 #. it is some times beneficial to always position the cursor at the
@@ -7005,7 +7184,7 @@ msgstr "çµ?æ§?å°?è¦½é?µé??å??ã??"
 #. 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:849
 msgid "_Position cursor at start of line when navigating vertically"
 msgstr "å?¨å??ç?´å°?è¦½æ??å°?æ¸¸æ¨?æ?¾ç½®æ?¼è¡?ç??é??é (_P)"
 
@@ -7013,7 +7192,7 @@ msgstr "å?¨å??ç?´å°?è¦½æ??å°?æ¸¸æ¨?æ?¾ç½®æ?¼è¡?ç??é??é (_P)"
 #. 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:862
 msgid "Automatically start speaking a page when it is first _loaded"
 msgstr "ç?¶ç¬¬ä¸?æ¬¡è¼?å?¥ä¸?å??é ?é?¢æ??è?ªå??é??å§?è®?å?ºå?§å®¹(_L)"
 
@@ -7021,51 +7200,15 @@ msgstr "ç?¶ç¬¬ä¸?æ¬¡è¼?å?¥ä¸?å??é ?é?¢æ??è?ªå??é??å§?è®?å?ºå?§å®¹(_L)"
 #. 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:874
 msgid "Page Navigation"
 msgstr "é?¢é ?å°?è¦½"
 
-#. 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 "è®?å?ºå?²å?æ ¼å??æ¨?(_C)"
-
-#. 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 ""
-
-#. 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 "è®?å?ºå?²å?æ ¼æ¨?é¡?(_H)"
-
-#. 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)"
-
-#. 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 "è¡¨æ ¼å°?è¦½"
-
 #. 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:966
 msgid "Speak results during _find"
 msgstr "å°?æ?¾æ??è®?å?ºçµ?æ??(_F)"
 
@@ -7074,7 +7217,7 @@ msgstr "å°?æ?¾æ??è®?å?ºçµ?æ??(_F)"
 #. 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:979
 msgid "Onl_y speak changed lines during find"
 msgstr "å°?æ?¾æ??å?ªè®?å?ºæ??æ?¹è®?ç??è¡?(_Y)"
 
@@ -7082,36 +7225,55 @@ msgstr "å°?æ?¾æ??å?ªè®?å?ºæ??æ?¹è®?ç??è¡?(_Y)"
 #. 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:996
 msgid "Minimum length of matched text:"
 msgstr "æ¯?å°?æ??å?ç??æ??å°?é?·åº¦ï¼?"
 
 #. 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:1021
 msgid "Find Options"
 msgstr "ã??å°?æ?¾ã??é?¸é ?"
 
-#. 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:1798
-msgid "Loading.  Please wait."
-msgstr "è¼?å?¥ä¸ï¼?è«?ç¨?å??ã??"
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1605
+msgid "line selected down from cursor position"
+msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?é?¸å??è¡?"
+
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1606
+msgid "line unselected down from cursor position"
+msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?å??æ¶?é?¸å??è¡?"
+
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1607
+msgid "line selected up from cursor position"
+msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?é?¸å??è¡?"
+
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1608
+msgid "line unselected up from cursor position"
+msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?å??æ¶?é?¸å??è¡?"
 
-#. Translators: this is in reference to loading a web page.
+#. 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:1803
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1651
+#, fuzzy
+msgid "New item has been added"
+msgstr "æ?°ç??å°?æ¡?å·²æ??å??å»ºç«?ã??"
+
+#. Translators: this is in reference to loading a web page
+#. or some other content.
+#.
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1941
 #, python-format
 msgid "Finished loading %s."
 msgstr "è¼?å?¥ %s å®?æ??ã??"
 
-#. Translators: this is in reference to loading a web page.
-#.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:1809
-msgid "Finished loading."
-msgstr "è¼?å?¥å®?æ??ã??"
-
 #. 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
@@ -7119,14 +7281,25 @@ msgstr "è¼?å?¥å®?æ??ã??"
 #. heading level, where the single character is to indicate
 #. 'heading'.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:2270
+#: ../src/orca/scripts/toolkits/Gecko/script.py:2431
 #, 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:6008
+#, fuzzy
+msgid "Mouse over object not found."
+msgstr "å?¨å?²å?åº«å?§æ?¾ä¸?å?°ç?©ä»¶"
+
 #. Translators: this is the action name for the 'open' action.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5990
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6494
 msgid "open"
 msgstr "é??å??"
 
@@ -7136,7 +7309,7 @@ msgstr "é??å??"
 #. 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:6063
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6567
 #: ../src/orca/structural_navigation.py:883
 msgid "Wrapping to bottom."
 msgstr "è·³è?³åº?é?¨ã??"
@@ -7147,7 +7320,7 @@ msgstr "è·³è?³åº?é?¨ã??"
 #. 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:6131
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6635
 #: ../src/orca/structural_navigation.py:891
 msgid "Wrapping to top."
 msgstr "å??å?°é??å§?ã??"
@@ -7155,9 +7328,9 @@ msgstr "å??å?°é??å§?ã??"
 #. Translators: this announces to the user that live region
 #. support has been turned off.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6157
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6181
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6191
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6661
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6685
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6695
 #: ../src/orca/structural_navigation.py:396
 msgid "Live region support is off"
 msgstr ""
@@ -7165,13 +7338,15 @@ msgstr ""
 #. Translators: this announces to the user that live region
 #. are being monitored.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6165
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6669
+#, fuzzy
 msgid "Live regions monitoring on"
-msgstr ""
+msgstr "No more live regions."
 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6172
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6676
+#, fuzzy
 msgid "Live regions monitoring off"
-msgstr ""
+msgstr "No more live regions."
 
 #. Translators: Gecko native caret navigation is where
 #. Firefox itself controls how the arrow keys move the caret
@@ -7180,9 +7355,10 @@ msgstr ""
 #. 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:6711
+#, fuzzy
 msgid "Gecko is controlling the caret."
-msgstr ""
+msgstr "å?¶ä»?ä½¿ç?¨è??æ£å?¨æ?§å?¶ä½ ç??æ¡?é?¢"
 
 #. Translators: Gecko native caret navigation is where
 #. Firefox itself controls how the arrow keys move the caret
@@ -7191,55 +7367,34 @@ msgstr ""
 #. the ability to switch between the Firefox mode and the
 #. Orca mode.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6219
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6723
+#, fuzzy
 msgid "Orca is controlling the caret."
-msgstr ""
+msgstr "å?¶ä»?ä½¿ç?¨è??æ£å?¨æ?§å?¶ä½ ç??æ¡?é?¢"
 
-#. 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
 #, fuzzy, python-format
-#| msgid "level %d"
-msgid "%s level %d"
-msgstr "level %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:410
-msgid "multi-select"
-msgstr "å¤?é??é?¸å??"
+msgid "%(role)s level %(level)d"
+msgstr "è¼¸å?¥ç?ç´?:"
 
 #. Translators: this represents a list in HTML.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:414
-#: ../src/orca/structural_navigation.py:2803
+#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:281
+#: ../src/orca/structural_navigation.py:2792
 #, python-format
 msgid "List with %d item"
 msgid_plural "List with %d items"
 msgstr[0] "æ?? %d å??é ?ç?®ç??æ¸?å?®"
 
-#. 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 "å??ç??å?°å??é?£çµ?"
-
 #. 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"
@@ -7248,7 +7403,7 @@ msgstr[0] "%d å??æ¨?é¡?"
 #. 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"
@@ -7257,7 +7412,7 @@ msgstr[0] "%d å??è¡¨å?®"
 #. 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"
@@ -7266,7 +7421,7 @@ msgstr[0] "%d å??è¡¨æ ¼"
 #. 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"
@@ -7275,7 +7430,7 @@ msgstr[0] "%d å??ç??è¦½é??ç??é?£çµ?"
 #. 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"
@@ -7286,28 +7441,11 @@ msgstr[0] "%d å??æ?ªç??è¦½ç??é?£çµ?"
 #. 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å·²è®?"
 
-#. 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 "å?¯è®?"
-
-#. 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 "å?¯è®?"
-
 #. 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
@@ -7317,28 +7455,28 @@ msgstr "å?¯è®?"
 #. 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:1040
 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:1045
 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:1050
 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:1055
 msgid "[Ee]volution"
 msgstr "[Ee]volution"
 
@@ -7346,7 +7484,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:1061
 msgid "Deer Park"
 msgstr "Deer Park"
 
@@ -7354,7 +7492,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:1067
 msgid "Bon Echo"
 msgstr "Bon Echo"
 
@@ -7362,43 +7500,35 @@ msgstr "Bon Echo"
 #. 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:1073
 msgid "Minefield"
 msgstr "æ??å?°é?·"
 
-#. 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:1102
 msgid "Mail/News"
 msgstr "é?µä»¶/æ?°è??çµ?"
 
 #. 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:1107
 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:1112
 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:1117
 msgid "gaim"
 msgstr "gaim"
 
@@ -7408,10 +7538,115 @@ 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:1284 ../src/orca/settings.py:1361
 msgid "required"
 msgstr "å¿?è¦?ç??"
 
+#. 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:1289
+msgctxt "text"
+msgid "read only"
+msgstr "å?¯è®?"
+
+#. Translators: this represents an item on the screen that has
+#. been set insensitive (or grayed out).
+#.
+#: ../src/orca/settings.py:1294 ../src/orca/settings.py:1372
+msgid "grayed"
+msgstr "grayed"
+
+#. 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:1318 ../src/orca/settings.py:1384
+msgid "collapsed"
+msgstr "å·²æ?¶èµ·"
+
+#: ../src/orca/settings.py:1318 ../src/orca/settings.py:1384
+msgid "expanded"
+msgstr "å·²å±?é??"
+
+#. 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:1323
+msgid "multi-select"
+msgstr "å¤?é??é?¸å??"
+
+#. 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:1329
+#, python-format
+msgid "tree level %d"
+msgstr "tree level %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:1336 ../src/orca/structural_navigation.py:2807
+#, python-format
+msgid "Nesting level %d"
+msgstr "å·¢ç??æ¸?å?®ç¬¬ %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:1342
+#, fuzzy, python-format
+msgid "on %(index)d of %(total)d"
+msgstr "(ç¸½å?±å??å?« %'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:1348
+#, fuzzy, python-format
+msgid "%(index)d of %(total)d"
+msgstr "ç¸½å®¹é??:"
+
+#. 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:1367
+msgctxt "text"
+msgid "rdonly"
+msgstr "å?¯è®?"
+
+#. 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:1390
+#, python-format
+msgid "TREE LEVEL %d"
+msgstr "TREE LEVEL %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:1398
+#, python-format
+msgid "LEVEL %d"
+msgstr "ç¬¬ %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
@@ -7428,7 +7663,7 @@ msgstr "é ?è¨èª?é?³å??æ??å?¨"
 #: ../src/orca/speechdispatcherfactory.py:89
 #, fuzzy
 msgid "Speech Dispatcher"
-msgstr "å·²å??ç?¨æ??è®?å??è?½ã??"
+msgstr "å·²å??ç?¨æ??è®?å??è?½ã??"
 
 #. Translators: This string will appear in the list of
 #. available voices for the current speech engine.  %s will be
@@ -7439,26 +7674,163 @@ msgstr "å·²å??ç?¨æ??è®?å??è?½ã??"
 #. 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 "%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
+#, fuzzy, python-format
+msgid "%(uri)s link to %(file)s"
+msgstr "æ£å?¨å»ºç«?å?° %'d å??æª?æ¡?ç??é?£çµ?"
+
+#. Translators: this is the protocol of a link eg. http, mailto.
+#.
+#: ../src/orca/speech_generator.py:242
+#, python-format
+msgid "%s link"
+msgstr "%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 "ç?¸å??é ?é?¢"
+
+#. 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 "ç?¸å??ç¶²ç«?"
+
+#. 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 "ä¸?å??ç¶²ç«?"
+
+#. 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 ä½?å??çµ?"
+
+#. Translators: This is the size of a file in kilobytes
+#.
+#: ../src/orca/speech_generator.py:331
+#, python-format
+msgid "%.2f kilobytes"
+msgstr "%.2f KB"
+
+#. Translators: This is the size of a file in megabytes
+#.
+#: ../src/orca/speech_generator.py:335
+#, python-format
+msgid "%.2f megabytes"
+msgstr "%.2f MB"
+
+#. Translators: this is in reference to a table cell being
+#. selected or not.
+#.
+#: ../src/orca/speech_generator.py:521
+#, fuzzy
+msgctxt "tablecell"
+msgid "not selected"
+msgstr "æ²?æ??é?¸å??"
+
+#. Translators: this is in references to a row in a table.
+#.
+#: ../src/orca/speech_generator.py:568
+#, python-format
+msgid "row %d"
+msgstr "å?? %d"
+
+#. Translators: this is in references to a column in a
+#. table.
+#: ../src/orca/speech_generator.py:591
+#, fuzzy, python-format
+msgid "column %(index)d of %(total)d"
+msgstr "(ç¸½å?±å??å?« %'d å??é ?ç?®)"
+
+#. Translators: this is in reference to a row in a table.
+#.
+#: ../src/orca/speech_generator.py:596
+#, fuzzy, python-format
+msgid "row %(index)d of %(total)d"
+msgstr "(ç¸½å?±å??å?« %'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
+#, fuzzy
+msgid "End of table"
+msgstr "æ¨¹ç??è³?æ??è¡¨æ ¼"
+
+#. Translators: this is the percentage value of a progress bar.
+#.
+#: ../src/orca/speech_generator.py:936
+#, fuzzy, python-format
+msgid "%d percent"
+msgstr "percent"
+
+#. 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 å??é ?ç?®"
+
+#. 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
+#, fuzzy, python-format
+msgid "%(index)d of %(total)d item selected"
+msgid_plural "%(index)d of %(total)d items selected"
+msgstr[0] "è¤?è£½æ??æ??é?¸å®?ç??é ?ç?®"
+
 #. 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 å??æ?ªå??å¾?ç?¦é»?ç??å°?è©±ç??"
 
-#. 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 "æµ®å??"
+#: ../src/orca/speech_generator.py:1189
+msgid "Icon panel"
+msgstr "å??ç¤ºé?¢æ?¿"
+
+#. 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 "é ?è¨æ??é??ç?º%s"
 
 #. Translators: the structural navigation keys are designed
 #. to move the caret around the document content by object
@@ -7578,15 +7950,15 @@ msgstr[0] "%d æ¬?"
 #. or "spans" more than a single row and/or column.
 #.
 #: ../src/orca/structural_navigation.py:1486
-#, python-format
-msgid "Cell spans %d rows and %d columns"
+#, fuzzy, python-format
+msgid "Cell spans %(rows)d rows and %(columns)d columns"
 msgstr "å?²å?æ ¼è·¨é?? %d å??å?? %d æ¬?ã??"
 
 #. 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:1494
 #, python-format
 msgid "Cell spans %d columns"
 msgstr "å?²å?æ ¼å??ä½µ%då??æ¬?ä½?"
@@ -7595,7 +7967,7 @@ msgstr "å?²å?æ ¼å??ä½µ%då??æ¬?ä½?"
 #. 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:1500
 #, python-format
 msgid "Cell spans %d rows"
 msgstr "å?²å?æ ¼å??ä½µ%då??å??"
@@ -7603,14 +7975,14 @@ msgstr "å?²å?æ ¼å??ä½µ%då??å??"
 #. 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:1837
 msgid "Goes to previous anchor."
 msgstr "ç§»è?³å??ä¸?å??é?¨é»?ã??"
 
 #. 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:1842
 msgid "Goes to next anchor."
 msgstr "ç§»è?³ä¸?ä¸?å??é?¨é»?ã??"
 
@@ -7619,46 +7991,46 @@ msgstr "ç§»è?³ä¸?ä¸?å??é?¨é»?ã??"
 #. 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:1899
 msgid "No more anchors."
 msgstr "æ²?æ??å?¶ä»?é?¨é»?ã??"
 
 #. Translators: this is for navigating among blockquotes in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:1927
+#: ../src/orca/structural_navigation.py:1916
 #, fuzzy
 msgid "Goes to previous blockquote."
-msgstr "ç§»è?³ä¸?å??ç¬¦å??ç??é ?ç?®"
+msgstr "ç§»è?³å??ä¸?å??å?ç¬¦ã??"
 
 #. Translators: this is for navigating among blockquotes in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:1932
+#: ../src/orca/structural_navigation.py:1921
 #, fuzzy
 msgid "Goes to next blockquote."
-msgstr "ç§»è?³ä¸?å??ç¬¦å??ç??é ?ç?®"
+msgstr "ç§»è?³ä¸?ä¸?å??å?ç¬¦ã??"
 
 #. Translators: this is for navigating document content by
 #. 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:1981
 #, fuzzy
 msgid "No more blockquotes."
-msgstr "é¡¯ç¤ºæ?´å¤?çµ?æ??"
+msgstr "æ²?æ??å?¶ä»?é?¨é»?ã??"
 
 #. Translators: this is for navigating among buttons in a form
 #. within a document.
 #.
-#: ../src/orca/structural_navigation.py:2009
+#: ../src/orca/structural_navigation.py:1998
 msgid "Goes to previous button."
 msgstr "ç§»è?³å??ä¸?å??æ??é??ã??"
 
 #. Translators: this is for navigating among buttons in a form
 #. within a document.
 #.
-#: ../src/orca/structural_navigation.py:2014
+#: ../src/orca/structural_navigation.py:2003
 msgid "Goes to next button."
 msgstr "ç§»è?³ä¸?ä¸?å??æ??é??ã??"
 
@@ -7667,21 +8039,21 @@ msgstr "ç§»è?³ä¸?ä¸?å??æ??é??ã??"
 #. string is what Orca will say if there are no more buttons
 #. found.
 #.
-#: ../src/orca/structural_navigation.py:2071
+#: ../src/orca/structural_navigation.py:2060
 msgid "No more buttons."
 msgstr "æ²?æ??å?¶ä»?æ??é??ã??"
 
 #. 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:2077
 msgid "Goes to previous check box."
 msgstr "ç§»è?³å??ä¸?å??æ ¸å??æ?¹å¡?ã??"
 
 #. 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:2082
 msgid "Goes to next check box."
 msgstr "ç§»è?³ä¸?ä¸?å??æ ¸å??æ?¹å¡?ã??"
 
@@ -7690,7 +8062,7 @@ msgstr "ç§»è?³ä¸?ä¸?å??æ ¸å??æ?¹å¡?ã??"
 #. 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:2139
 msgid "No more check boxes."
 msgstr "æ²?æ??å?¶ä»?æ ¸å??æ?¹å¡?ã??"
 
@@ -7698,7 +8070,7 @@ msgstr "æ²?æ??å?¶ä»?æ ¸å??æ?¹å¡?ã??"
 #. 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:2157
 msgid "Goes to previous large object."
 msgstr "ç§»è?³å??ä¸?å??å¤§å??ç?©ä»¶ã??"
 
@@ -7706,7 +8078,7 @@ msgstr "ç§»è?³å??ä¸?å??å¤§å??ç?©ä»¶ã??"
 #. 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:2163
 msgid "Goes to next large object."
 msgstr "ç§»è?³ä¸?ä¸?å??å¤§å??ç?©ä»¶ã??"
 
@@ -7716,21 +8088,21 @@ msgstr "ç§»è?³ä¸?ä¸?å??å¤§å??ç?©ä»¶ã??"
 #. 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:2232
 msgid "No more large objects."
 msgstr "æ²?æ??å?¶ä»?å¤§å??ç?©ä»¶ã??"
 
 #. 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:2249
 msgid "Goes to previous combo box."
 msgstr "ç§»è?³å??ä¸?å??çµ?å??æ?¹å¡?ã??"
 
 #. 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:2254
 msgid "Goes to next combo box."
 msgstr "ç§»è?³ä¸?ä¸?å??çµ?å??æ?¹å¡?ã??"
 
@@ -7739,21 +8111,21 @@ msgstr "ç§»è?³ä¸?ä¸?å??çµ?å??æ?¹å¡?ã??"
 #. 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:2311
 msgid "No more combo boxes."
 msgstr "æ²?æ??å?¶ä»?çµ?å??æ?¹å¡?ã??"
 
 #. 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:2328
 msgid "Goes to previous entry."
 msgstr "ç§»è?³å??ä¸?å??é ?ç?®ã??"
 
 #. Translators: this is for navigating among text entries
 #. in a form.
 #.
-#: ../src/orca/structural_navigation.py:2344
+#: ../src/orca/structural_navigation.py:2333
 msgid "Goes to next entry."
 msgstr "ç§»è?³ä¸?ä¸?å??é ?ç?®ã??"
 
@@ -7762,21 +8134,21 @@ msgstr "ç§»è?³ä¸?ä¸?å??é ?ç?®ã??"
 #. string is what Orca will say if there are no more entries
 #. found.
 #.
-#: ../src/orca/structural_navigation.py:2410
+#: ../src/orca/structural_navigation.py:2399
 msgid "No more entries."
 msgstr "æ²?æ??å?¶ä»?é ?ç?®ã??"
 
 #. Translators: this is for navigating among fields in a form within
 #. a document.
 #.
-#: ../src/orca/structural_navigation.py:2427
+#: ../src/orca/structural_navigation.py:2416
 msgid "Goes to previous form field."
 msgstr "ç§»è?³å??ä¸?å??è¡¨å?®æ¬?ä½?ã??"
 
 #. Translators: this is for navigating among fields in a form within
 #. a document.
 #.
-#: ../src/orca/structural_navigation.py:2434
+#: ../src/orca/structural_navigation.py:2423
 msgid "Goes to next form field."
 msgstr "ç§»è?³ä¸?ä¸?å??è¡¨å?®æ¬?ä½?ã??"
 
@@ -7784,28 +8156,28 @@ msgstr "ç§»è?³ä¸?ä¸?å??è¡¨å?®æ¬?ä½?ã??"
 #. 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:2493
 msgid "No more form fields."
 msgstr "æ²?æ??å?¶ä»?è¡¨å?®æ¬?ä½?ã??"
 
 #. Translators: this is for navigating in a document by heading.
 #. (e.g. <h1>)
 #.
-#: ../src/orca/structural_navigation.py:2521
+#: ../src/orca/structural_navigation.py:2510
 msgid "Goes to previous heading."
 msgstr "ç§»è?³å??ä¸?å??æ¨?é¡?ã??"
 
 #. Translators: this is for navigating in a document by heading.
 #. (e.g., <h1>)
 #.
-#: ../src/orca/structural_navigation.py:2526
+#: ../src/orca/structural_navigation.py:2515
 msgid "Goes to next heading."
 msgstr "ç§»è?³ä¸?ä¸?å??æ¨?é¡?ã??"
 
 #. 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:2525
 #, python-format
 msgid "Goes to previous heading at level %d."
 msgstr "ç§»è?³å??ä¸?å??ç¬¬ %d ç´?æ¨?é¡?ã??"
@@ -7813,7 +8185,7 @@ msgstr "ç§»è?³å??ä¸?å??ç¬¬ %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:2532
 #, python-format
 msgid "Goes to next heading at level %d."
 msgstr "ç§»è?³ä¸?ä¸?å??ç¬¬ %d ç´?æ¨?é¡?ã??"
@@ -7823,7 +8195,7 @@ msgstr "ç§»è?³ä¸?ä¸?å??ç¬¬ %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:2604
 msgid "No more headings."
 msgstr "æ²?æ??å?¶ä»?æ¨?é¡?ã??"
 
@@ -7832,7 +8204,7 @@ msgstr "æ²?æ??å?¶ä»?æ¨?é¡?ã??"
 #. (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:2611
 #, python-format
 msgid "No more headings at level %d."
 msgstr "æ²?æ??å?¶ä»?ç¬¬ %d ç´?æ¨?é¡?ã??"
@@ -7842,20 +8214,20 @@ msgstr "æ²?æ??å?¶ä»?ç¬¬ %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:2630
 #, fuzzy
 msgid "Goes to previous landmark."
-msgstr "ç§»è?³ä¸?å??ç¬¦å??ç??é ?ç?®"
+msgstr "ç§»è?³å??ä¸?å??å?ç¬¦ã??"
 
 #. Translators: this is for navigating to the next ARIA
 #. role landmark.  ARIA role landmarks are the W3C defined
 #. 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:2637
 #, fuzzy
 msgid "Goes to next landmark."
-msgstr "ç§»è?³ä¸?å??ç¬¦å??ç??é ?ç?®"
+msgstr "ç§»è?³ä¸?ä¸?å??å?ç¬¦ã??"
 
 #. Translators: this is for navigating to the previous ARIA
 #. role landmark.  ARIA role landmarks are the W3C defined
@@ -7863,53 +8235,43 @@ msgstr "ç§»è?³ä¸?å??ç¬¦å??ç??é ?ç?®"
 #. 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:2711
 msgid "No landmark found."
 msgstr "No landmark found."
 
 #. Translators: this is for navigating among bulleted/numbered
 #. lists in a document.
 #.
-#: ../src/orca/structural_navigation.py:2739
+#: ../src/orca/structural_navigation.py:2728
 msgid "Goes to previous list."
 msgstr "ç§»è?³å??ä¸?å??æ¸?å?®ã??"
 
 #. Translators: this is for navigating among bulleted/numbered
 #. lists in a document.
 #.
-#: ../src/orca/structural_navigation.py:2744
+#: ../src/orca/structural_navigation.py:2733
 msgid "Goes to next list."
 msgstr "ç§»è?³ä¸?ä¸?å??æ¸?å?®ã??"
 
-#. 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 "å·¢ç??æ¸?å?®ç¬¬ %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:2816
 msgid "No more lists."
 msgstr "æ²?æ??å?¶ä»?æ¸?å?®ã??"
 
 #. Translators: this is for navigating among bulleted/numbered list
 #. items in a document.
 #.
-#: ../src/orca/structural_navigation.py:2844
+#: ../src/orca/structural_navigation.py:2833
 msgid "Goes to previous list item."
 msgstr "ç§»è?³å??ä¸?å??æ¸?å?®é ?ç?®ã??"
 
 #. Translators: this is for navigating among bulleted/numbered list
 #. items in a document.
 #.
-#: ../src/orca/structural_navigation.py:2849
+#: ../src/orca/structural_navigation.py:2838
 msgid "Goes to next list item."
 msgstr "ç§»è?³ä¸?ä¸?å??æ¸?å?®é ?ç?®ã??"
 
@@ -7918,49 +8280,49 @@ msgstr "ç§»è?³ä¸?ä¸?å??æ¸?å?®é ?ç?®ã??"
 #. 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:2901
 msgid "No more list items."
 msgstr "æ²?æ??å?¶ä»?æ¸?å?®é ?ç?®ã??"
 
 #. Translators: this is for navigating between live regions
 #.
-#: ../src/orca/structural_navigation.py:2928
+#: ../src/orca/structural_navigation.py:2917
 #, fuzzy
 msgid "Goes to previous live region."
-msgstr "ç§»è?³ä¸?ä¸?è¡?ã??"
+msgstr "ç§»è?³å??ä¸?å??æ ¸å??æ?¹å¡?ã??"
 
 #. Translators: this is for navigating between live regions
 #.
-#: ../src/orca/structural_navigation.py:2932
+#: ../src/orca/structural_navigation.py:2921
 #, fuzzy
 msgid "Goes to next live region."
-msgstr "ç§»è?³ä¸?ä¸?è¡?ã??"
+msgstr "ç§»è?³ä¸?ä¸?å??æ ¸å??æ?¹å¡?ã??"
 
 #. 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:2926
 #, fuzzy
 msgid "Goes to last live region."
-msgstr "No more live regions."
+msgstr "ç§»è?³è¡¨æ ¼ä¸ç??æ??å¾?ä¸?å??å?²å?æ ¼ã??"
 
 #. Translators: this is for navigating HTML in a structural
 #. 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:2975
 msgid "No more live regions."
 msgstr "No more live regions."
 
 #. Translators: this is for navigating among paragraphs in a document.
 #.
-#: ../src/orca/structural_navigation.py:3002
+#: ../src/orca/structural_navigation.py:2991
 msgid "Goes to previous paragraph."
 msgstr "ç§»è?³å??ä¸?æ®µã??"
 
 #. Translators: this is for navigating among paragraphs in a document.
 #.
-#: ../src/orca/structural_navigation.py:3006
+#: ../src/orca/structural_navigation.py:2995
 msgid "Goes to next paragraph."
 msgstr "ç§»è?³ä¸?ä¸?æ®µã??"
 
@@ -7968,21 +8330,21 @@ msgstr "ç§»è?³ä¸?ä¸?æ®µã??"
 #. 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:3055
 msgid "No more paragraphs."
 msgstr "æ²?æ??å?¶ä»?æ®µè?½ã??"
 
 #. 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:3072
 msgid "Goes to previous radio button."
 msgstr "ç§»è?³å??ä¸?å??å?®é?¸æ??é??ã??"
 
 #. 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:3077
 msgid "Goes to next radio button."
 msgstr "ç§»è?³ä¸?ä¸?å??å?®é?¸æ??é??ã??"
 
@@ -7991,19 +8353,19 @@ msgstr "ç§»è?³ä¸?ä¸?å??å?®é?¸æ??é??ã??"
 #. 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:3134
 msgid "No more radio buttons."
 msgstr "æ²?æ??å?¶ä»?å?®é?¸æ??é??ã??"
 
 #. Translators: this is for navigating among tables in a document.
 #.
-#: ../src/orca/structural_navigation.py:3161
+#: ../src/orca/structural_navigation.py:3150
 msgid "Goes to previous table."
 msgstr "ç§»è?³å??ä¸?å??å·¥ä½?è¡¨ã??"
 
 #. Translators: this is for navigating among tables in a document.
 #.
-#: ../src/orca/structural_navigation.py:3165
+#: ../src/orca/structural_navigation.py:3154
 msgid "Goes to next table."
 msgstr "ç§»è?³ä¸?ä¸?å??å·¥ä½?è¡¨ã??"
 
@@ -8011,65 +8373,57 @@ msgstr "ç§»è?³ä¸?ä¸?å??å·¥ä½?è¡¨ã??"
 #. 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:3213
 msgid "No more tables."
 msgstr "æ²?æ??å?¶ä»?ç??è¡¨æ ¼ã??"
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3240
+#: ../src/orca/structural_navigation.py:3229
 msgid "Goes left one cell."
 msgstr "ç§»è?³å·¦é??ä¸?å??å?²å?æ ¼ã??"
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3244
+#: ../src/orca/structural_navigation.py:3233
 msgid "Goes right one cell."
 msgstr "ç§»è?³å?³é??ä¸?å??å?²å?æ ¼ã??"
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3248
+#: ../src/orca/structural_navigation.py:3237
 msgid "Goes up one cell."
 msgstr "ç§»è?³ä¸?é?¢ä¸?å??å?²å?æ ¼ã??"
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3252
+#: ../src/orca/structural_navigation.py:3241
 msgid "Goes down one cell."
 msgstr "ç§»è?³ä¸?é?¢ä¸?å??å?²å?æ ¼ã??"
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3256
+#: ../src/orca/structural_navigation.py:3245
 msgid "Goes to the first cell in a table."
 msgstr "ç§»è?³è¡¨æ ¼ä¸ç??ç¬¬ä¸?å??å?²å?æ ¼ã??"
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3260
+#: ../src/orca/structural_navigation.py:3249
 msgid "Goes to the last cell in a table."
 msgstr "ç§»è?³è¡¨æ ¼ä¸ç??æ??å¾?ä¸?å??å?²å?æ ¼ã??"
 
-#. 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 "å?? %dï¼?æ¬? %dã??"
-
 #. Translators: this is for navigating among unvisited links in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:3343
+#: ../src/orca/structural_navigation.py:3333
 msgid "Goes to previous unvisited link."
 msgstr "ç§»è?³å??ä¸?å??æ?ªç??è¦½ç??é?£çµ?ã??"
 
 #. Translators: this is for navigating among unvisited links in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:3348
+#: ../src/orca/structural_navigation.py:3338
 msgid "Goes to next unvisited link."
 msgstr "ç§»è?³ä¸?ä¸?å??æ?ªç??è¦½é?£çµ?ã??"
 
@@ -8078,21 +8432,21 @@ msgstr "ç§»è?³ä¸?ä¸?å??æ?ªç??è¦½é?£çµ?ã??"
 #. is what Orca will say if there are no more unvisited links
 #. found.
 #.
-#: ../src/orca/structural_navigation.py:3407
+#: ../src/orca/structural_navigation.py:3401
 msgid "No more unvisited links."
 msgstr "No more unvisited links."
 
 #. Translators: this is for navigating among visited links in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:3424
+#: ../src/orca/structural_navigation.py:3418
 msgid "Goes to previous visited link."
 msgstr "ç§»è?³å??ä¸?å??ç??è¦½é??ç??é?£çµ?ã??"
 
 #. Translators: this is for navigating among visited links in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:3429
+#: ../src/orca/structural_navigation.py:3423
 msgid "Goes to next visited link."
 msgstr "ç§»è?³ä¸?ä¸?å??ç??è¦½é??ç??é?£çµ?ã??"
 
@@ -8101,7 +8455,7 @@ msgstr "ç§»è?³ä¸?ä¸?å??ç??è¦½é??ç??é?£çµ?ã??"
 #. what Orca will say if there are no more visited links
 #. found.
 #.
-#: ../src/orca/structural_navigation.py:3487
+#: ../src/orca/structural_navigation.py:3479
 msgid "No more visited links."
 msgstr "æ²?æ??å?¶ä»?å??è¨ªé??ç??é?£çµ?ã??"
 
@@ -8136,7 +8490,7 @@ msgstr "è??æ?¯å®?æ?´é«?åº¦"
 #, fuzzy
 msgctxt "textattr"
 msgid "background stipple"
-msgstr "å¡«å?¥ç¶²é»?"
+msgstr "è??æ?¯é»?ç??é?®ç½©"
 
 #. Translators: this attribute specifies the direction of the text.
 #. Values are "none", "ltr" or "rtl".
@@ -8186,7 +8540,7 @@ msgstr "å??æ?¯é¡?è?²"
 #, fuzzy
 msgctxt "textattr"
 msgid "foreground stipple"
-msgstr "å¡«å?¥ç¶²é»?"
+msgstr "å??æ?¯é»?ç??é?®ç½©"
 
 #. Translators: this attribute specifies the effect applied to the font
 #. used by the text.
@@ -8214,9 +8568,10 @@ msgstr "ç¸®æ??"
 #. https://developer.mozilla.org/en/Accessibility/AT-APIs/Gecko/TextAttrs
 #.
 #: ../src/orca/text_attribute_names.py:133
+#, fuzzy
 msgctxt "textattr"
-msgid "invalid"
-msgstr "ç?¡æ??ç??"
+msgid "mistake"
+msgstr "mike"
 
 #. Translators: this attribute specifies whether the text is invisible.
 #. It will be a "true" or "false" value.
@@ -8289,7 +8644,7 @@ msgstr "æ®µè?½æ¨£å¼?"
 #, fuzzy
 msgctxt "textattr"
 msgid "pixels above lines"
-msgstr "æ¸?é?¤é?¸å??ç??å??ç´ "
+msgstr "æ¯?è¡?é ?é?¨å? ä¸?ç??å??ç´ "
 
 #. Translators: this attribute specifies the pixels of blank space to
 #. leave below each newline-terminated line.
@@ -8300,7 +8655,7 @@ msgstr "æ¸?é?¤é?¸å??ç??å??ç´ "
 #, fuzzy
 msgctxt "textattr"
 msgid "pixels below lines"
-msgstr "æ??å?å?¨å??ç¤ºä¸?"
+msgstr "æ¯?è¡?åº?é?¨å? ä¸?ç??å??ç´ "
 
 #. Translators: this attribute specifies the pixels of blank space to
 #. leave between wrapped lines inside the same newline-terminated line
@@ -8312,7 +8667,7 @@ msgstr "æ??å?å?¨å??ç¤ºä¸?"
 #, fuzzy
 msgctxt "textattr"
 msgid "pixels inside wrap"
-msgstr "æ¸?é?¤é?¸å??ç??å??ç´ "
+msgstr "æ??è¡?æ??å? ä¸?ç??å??ç´ "
 
 #. Translators: this attribute specifies the pixel width of the right margin.
 #. See:
@@ -8643,11 +8998,25 @@ msgid "word"
 msgstr "æ??å?"
 
 #. 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
+#, fuzzy
+msgctxt "textattr"
+msgid "word char"
+msgstr "æ?¼é?¯å?è©?ï¼?%s"
+
+#. 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 "å·¦è?³å?³"
@@ -8657,7 +9026,7 @@ msgstr "å·¦è?³å?³"
 #. 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 "å?³è?³å·¦"
@@ -8667,7 +9036,7 @@ msgstr "å?³è?³å·¦"
 #. 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 "é? å·¦"
@@ -8677,7 +9046,7 @@ msgstr "é? å·¦"
 #. 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 "é? å?³"
@@ -8687,7 +9056,7 @@ msgstr "é? å?³"
 #. 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 "ç½®ä¸"
@@ -8696,7 +9065,7 @@ msgstr "ç½®ä¸"
 #. 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 "ä¸?ä½¿ç?¨å°?é½?"
@@ -8706,7 +9075,7 @@ msgstr "ä¸?ä½¿ç?¨å°?é½?"
 #. 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 "å·¦å?³å°?é½?"
@@ -8716,7 +9085,7 @@ msgstr "å·¦å?³å°?é½?"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "ultra condensed"
@@ -8727,18 +9096,18 @@ msgstr "æ??è¡?æ¨¡å¼?"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "extra condensed"
-msgstr "æ??é??é??é??æ¯?"
+msgstr "A3 Extra"
 
 #. Translators: this is one of the text attribute values for the following
 #. text attributes: "stretch".
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "condensed"
@@ -8749,7 +9118,7 @@ msgstr "ç¸®æ??"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "semi condensed"
@@ -8760,7 +9129,7 @@ msgstr "ç¸®æ??"
 #. 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 "ä¸?è?¬"
@@ -8770,51 +9139,51 @@ msgstr "ä¸?è?¬"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "semi expanded"
-msgstr "ç¸®æ??"
+msgstr "è©³ç´°é¡¯ç¤º(_E)"
 
 #. Translators: this is one of the text attribute values for the following
 #. text attributes: "stretch".
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "expanded"
-msgstr "å±?é??"
+msgstr "å·²å±?é??"
 
 #. Translators: this is one of the text attribute values for the following
 #. text attributes: "stretch".
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "extra expanded"
-msgstr "æ??é??é??é??æ¯?"
+msgstr "è©³ç´°é¡¯ç¤º(_E)"
 
 #. Translators: this is one of the text attribute values for the following
 #. text attributes: "stretch".
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "ultra expanded"
-msgstr "å·¦è?³å?³"
+msgstr "è©³ç´°é¡¯ç¤º(_E)"
 
 #. Translators: this is one of the text attribute values for the following
 #. text attributes: "variant".
 #. 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 "å°?å¯«"
@@ -8824,7 +9193,7 @@ msgstr "å°?å¯«"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "oblique"
@@ -8835,7 +9204,7 @@ msgstr "é??ç·?"
 #. 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 "æ??é«?"
@@ -8845,7 +9214,7 @@ msgstr "æ??é«?"
 #. 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 "é ?è¨å?¼"
@@ -8855,7 +9224,7 @@ msgstr "é ?è¨å?¼"
 #. 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 "å?§æ??"
@@ -8865,7 +9234,7 @@ msgstr "å?§æ??"
 #. 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 "æ¨?é¡?"
@@ -8876,7 +9245,7 @@ msgstr "æ¨?é¡?"
 #. 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 "å?ºç·?"
@@ -8886,7 +9255,7 @@ msgstr "å?ºç·?"
 #. 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 "ä¸?æ¨?"
@@ -8896,7 +9265,7 @@ msgstr "ä¸?æ¨?"
 #. 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 "ä¸?æ¨?"
@@ -8906,7 +9275,7 @@ msgstr "ä¸?æ¨?"
 #. 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 "é ?ç«¯"
@@ -8916,7 +9285,7 @@ msgstr "é ?ç«¯"
 #. 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 "æ??å?é ?ç«¯"
@@ -8926,7 +9295,7 @@ msgstr "æ??å?é ?ç«¯"
 #. 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 "ä¸é??"
@@ -8936,7 +9305,7 @@ msgstr "ä¸é??"
 #. 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 "åº?é?¨"
@@ -8946,7 +9315,7 @@ msgstr "åº?é?¨"
 #. 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 "æ??å?åº?é?¨"
@@ -8957,7 +9326,7 @@ msgstr "æ??å?åº?é?¨"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "inherit"
@@ -8968,7 +9337,7 @@ msgstr "ç¸®æ??"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "lr-tb"
@@ -8979,7 +9348,7 @@ msgstr "å·¦è?³å?³"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "rl-tb"
@@ -8990,7 +9359,7 @@ msgstr "å·¦è?³å?³"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "tb-rl"
@@ -9001,7 +9370,7 @@ msgstr "å·¦è?³å?³"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "tb-lr"
@@ -9012,7 +9381,7 @@ msgstr "å·¦è?³å?³"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "bt-rl"
@@ -9023,7 +9392,7 @@ msgstr "å·¦è?³å?³"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "bt-lr"
@@ -9034,7 +9403,7 @@ msgstr "å·¦è?³å?³"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "lr"
@@ -9045,7 +9414,7 @@ msgstr "å·¦è?³å?³"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "rl"
@@ -9056,7 +9425,7 @@ msgstr "å?³è?³å·¦"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "tb"
@@ -9065,7 +9434,7 @@ msgstr "å·¦è?³å?³"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "solid"
@@ -9076,7 +9445,7 @@ msgstr "å?ºå®?é¡?è?²(_S)"
 #. 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 "æ?¼å?"
@@ -9088,30 +9457,30 @@ msgstr "æ??ä¸?ç©ºç?½é?µå??æ??ã??"
 
 #. 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 "ä½¿ç?¨ç©ºç?½é?µå±?é??ï¼?ä¸¦ä½¿ç?¨ä¸?æ??ä¸?æ?¹å??é?µä¾?é?¸æ??é ?ç?®ã??"
 
 #. 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 "æ??ä¸? alt+f6 å°?ç?¦é»?é??ä¸è?³å?è¦?çª?ã??"
 
 #. 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 "è¦?ç§»è?³æ??é ?ç?®ï¼?å?¯ä½¿ç?¨æ?¹å??é?µæ??è¼¸å?¥æ??å°?ã??"
 
 #. 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 "è¦?ä½¿ç?¨ç³»çµ±é?¸å?®ï¼?è«?æ?? 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 "ä½¿ç?¨ä¸?æ??ä¸?æ?¹å??é?µä¾?é?¸æ??é ?ç?®ã??"
 
@@ -9119,7 +9488,7 @@ msgstr "ä½¿ç?¨ä¸?æ??ä¸?æ?¹å??é?µä¾?é?¸æ??é ?ç?®ã??"
 #. '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 "è¦?æ?ºç??ï¼?æ??ä¸? shift å? ä¸?å·¦æ?¹å??é?µã??"
 
@@ -9127,42 +9496,42 @@ msgstr "è¦?æ?ºç??ï¼?æ??ä¸? shift å? ä¸?å·¦æ?¹å??é?µã??"
 #. '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 "è¦?å±?é??ï¼?æ??ä¸? shift å? ä¸?å?³æ?¹å??é?µã??"
 
 #. 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 "è¼¸å?¥æ??å?ã??"
 
 #. 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 "ä½¿ç?¨å·¦å??å?³æ?¹å??é?µä¾?æª¢è¦?å?¶ä»?å??é ?ã??"
 
 #. 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 "è¦?ä½¿ç?¨è«?æ??ç©ºç?½é?µã??"
 
 #. 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 "ä½¿ç?¨ä¸?æ??ä¸?æ?¹å??é?µä¾?é?¸æ??æ?¸å?¼ã??æ??ç?´æ?¥è¼¸å?¥æ?³è¦?ç??æ?¸å?å?¼ã??"
 
 #. 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 "ä½¿ç?¨æ?¹å??é?µä¾?æ?´æ?¹ã??"
 
 #. 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."
@@ -9170,454 +9539,14 @@ msgstr "è¦?å°?è¦½è«?æ??å·¦æ??å?³æ?¹å??é?µã??è¦?ç§»å??è?³é ?ç?®è«?æ??ä¸?æ??ä¸?æ?¹
 
 #. 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 "è¦?é?²å?¥å?é?¸å?®ï¼?è«?æ??å?³æ?¹å??é?µã??"
 
 #. 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 ""
-
-#. Translators: this is the percentage value of a slider.
-#.
-#: ../src/orca/where_am_I.py:370
-#, python-format
-msgid "%s percent"
-msgstr "%s ç?¾å??æ¯?"
-
-#. Translators: this is in reference to a radio button being
-#. selected or not.
-#.
-#: ../src/orca/where_am_I.py:433
-msgid "selected"
-msgstr "å·²é?¸å??"
-
-#. Translators: this is in reference to a radio button being
-#. selected or not.
-#.
-#: ../src/orca/where_am_I.py:438
-msgid "not selected"
-msgstr "æ²?æ??é?¸å??"
-
-#. 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 é ?"
-
-#. 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 "æ¬? %d / %d"
-
-#: ../src/orca/where_am_I.py:777
-msgid "Icon panel"
-msgstr "å??ç¤ºé?¢æ?¿"
-
-#. 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 "%s é?£çµ?"
-
-#: ../src/orca/where_am_I.py:832
-#, python-format
-msgid "%s link to %s"
-msgstr "%s é?£çµ?è?³ %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 "ç?¸å??é ?é?¢"
-
-#: ../src/orca/where_am_I.py:844 ../src/orca/where_am_I.py:852
-msgid "same site"
-msgstr "ç?¸å??ç¶²ç«?"
-
-#: ../src/orca/where_am_I.py:854
-msgid "different site"
-msgstr "ä¸?å??ç¶²ç«?"
-
-#. 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 / %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/where_am_I.py:1023
-#, python-format
-msgid "on item %d of %d"
-msgstr "é ?ç?® %d / %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 ä½?å??çµ?"
-
-#. Translators: This is the size of a file in kilobytes
-#.
-#: ../src/orca/where_am_I.py:1060
-#, python-format
-msgid "%.2f kilobytes"
-msgstr "%.2f KB"
-
-#. Translators: This is the size of a file in megabytes
-#.
-#: ../src/orca/where_am_I.py:1064
-#, python-format
-msgid "%.2f megabytes"
-msgstr "%.2f MB"
-
-#. 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 "é ?ç?® %d/%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 "é ?è¨æ??é??ç?º%s"
-
-#~ msgid "Update interval:"
-#~ msgstr "æ?´æ?°é??é??:"
-
-#~ msgid "Calc"
-#~ msgstr "Calc"
-
-#~ msgid "Text Document"
-#~ msgstr "æ??å?æª?"
-
-#~ msgid "Spellcheck:"
-#~ msgstr "æ?¼å?æª¢æ?¥ï¼?"
-
-#~ msgid "Writer"
-#~ msgstr "Writer"
-
-#~ msgid "yelp"
-#~ msgstr "yelp"
-
-#~ msgid "Exits learn mode."
-#~ msgstr "é?¢é??å¸ç¿?æ¨¡å¼?ã??"
-
-#, fuzzy
-#~ msgid "listitem|selected"
-#~ msgstr "å·²é?¸å??"
-
-#, fuzzy
-#~ msgid "listitem|unselected"
-#~ msgstr "æ²?æ??é?¸å??"
-
-#, fuzzy
-#~ msgid "option|speech"
-#~ msgstr "é?¸é ?çª?æ ¼"
-
-#, fuzzy
-#~ msgid "option|braille-monitor"
-#~ msgstr "å??ç?¨é»?å?ç?£å?¨(_M)"
-
-#, fuzzy
-#~ msgid "option|magnifier"
-#~ msgstr "é?¸é ?çª?æ ¼"
-
-#~ msgid "pidgin"
-#~ msgstr "pidgin"
-
-#~ msgid "underscore"
-#~ msgstr "åº?ç·?"
-
-#~ msgid "Toggles keystroke recording on and off."
-#~ msgstr "å??æ??ç?å??ç´?é??ç?ºé??æ??é??ã??"
-
-#~ msgid "Reloads user settings and reinitializes services as necessary."
-#~ msgstr "å¦?é??è¦?æ??é??æ?°è¼?å?¥ä½¿ç?¨è??è¨å®?å??é??æ?°èµ·å??æ??å??ã??"
-
-#~ msgid "Switches to the next presentation manager."
-#~ msgstr "å??æ??è?³ä¸?ä¸?å??å±?ç¤ºç®¡ç??å?¡ã??"
-
-#~ msgid "1 space "
-#~ msgstr "1 å??ç©ºæ ¼ "
-
-#~ msgid "1 tab "
-#~ msgstr "1 å??å??é ? "
-
-#~ msgid "row"
-#~ msgstr "å??"
-
-#~ msgid "Switching to focus tracking mode."
-#~ msgstr "å??æ??è?³ç?¦é»?è¿½è¹¤æ¨¡å¼?ã??"
-
-#~ msgid "Switching to hierarchical navigation mode."
-#~ msgstr "å??æ??è?³çµ?ç¹?å°?è?ªæ¨¡å¼?ã??"
-
-#~ msgid "%d. %s"
-#~ msgstr "%d. %s"
-
-#~ msgid "Accessibility support for GNOME has just been enabled. "
-#~ msgstr "å·²ç¶?å??ç?¨ GNOME ç??ç?¡é??ç¤?ç?°å¢?ã??"
-
-#~ msgid "You need to log out and log back in for the change to take effect. "
-#~ msgstr "é??è¦?ç?»å?ºå¾?å??ç?»å?¥ä¾?å¥?ç?¨æ?°è¨å®?ã??"
-
-#~ msgid "Orca Find"
-#~ msgstr "Orca å°?æ?¾"
-
-#~ msgid "Handler"
-#~ msgstr "è??ç??ç¨?å¼?"
-
-#~ msgid "Mod.Mask 1"
-#~ msgstr "Mod.Mask 1"
-
-#~ msgid "Use Mod.1"
-#~ msgstr "Use Mod.1"
-
-#~ msgid "Key1"
-#~ msgstr "Key1"
-
-#~ msgid "Mod.Mask 2"
-#~ msgstr "Mod.Mask 2"
-
-#~ msgid "Use Mod.2"
-#~ msgstr "Use Mod.2"
-
-#~ msgid "Key2"
-#~ msgstr "Key2"
-
-#~ msgid "Speech not available."
-#~ msgstr "èª?é?³å??è?½ä¸?å?å?¨ã??"
-
-#~ msgid "Preferences"
-#~ msgstr "å??å¥½è¨å®?"
-
-#~ msgid "Quit"
-#~ msgstr "çµ?æ??"
-
-#~ msgid "User logged out - shutting down."
-#~ msgstr "ä½¿ç?¨è??ç?»å?º - é??é??ä¸ã??"
-
-#~ msgid "Debug level all."
-#~ msgstr "å?¨é?¨å?µé?¯ç´?å?¥ã??"
-
-#~ msgid "Debug level finest."
-#~ msgstr "æ??å°?å?µé?¯ç´?å?¥ã??"
-
-#~ msgid "Debug level finer."
-#~ msgstr "è¼?å°?å?µé?¯ç´?å?¥ã??"
-
-#~ msgid " off"
-#~ msgstr " é??"
-
-#~ msgid " on"
-#~ msgstr " é??"
-
-#~ msgid "Num_Lock"
-#~ msgstr "Num_Lock"
-
-#~ msgid "goodbye."
-#~ msgstr "å??è¦?ã??"
-
-#~ msgid "-v, --version                %s"
-#~ msgstr "-v, --version                %s"
-
-#~ msgid "-s, --setup, --gui-setup     Set up user preferences"
-#~ msgstr "-s, --setup, --gui-setup     è¨ç½®ä½¿ç?¨è??å??å¥½è¨å®?"
-
-#~ msgid ""
-#~ "-e, --enable=[speech|braille|braille-monitor|magnifier|main-window] Force "
-#~ "use of option"
-#~ msgstr ""
-#~ "-e, --enable=[speech|braille|braille-monitor|magnifier|main-window] å¼·å?¶å?·"
-#~ "è¡?é?¸é ?"
-
-#~ msgid ""
-#~ "-d, --disable=[speech|braille|braille-monitor|magnifier|main-window] "
-#~ "Prevent use of option"
-#~ msgstr ""
-#~ "-d, --disable=[speech|braille|braille-monitor|magnifier|main-window] ç¦?ç?¨"
-#~ "é?¸é ?"
-
-#~ msgid "Do you really want to quit Orca?"
-#~ msgstr "æ?¨ç??ç??è¦?é?¢é?? Orcaï¼?"
-
-#~ msgid "Question"
-#~ msgstr "å??é¡?"
-
-#~ msgid "<b>Zoomer Position</b>"
-#~ msgstr "<b>æ?¾å¤§é?¡ä½?ç½®</b>"
-
-#~ msgid "Color:"
-#~ msgstr "é¡?è?²ï¼?"
-
-#~ msgid "Mouse trac_king mode:"
-#~ msgstr "æ»?é¼ è¿½è¹¤æ¨¡å¼?(_K):"
-
-#~ msgid "Si_ze:"
-#~ msgstr "å¤§å°?(_Z):"
-
-#~ msgid "_Width:"
-#~ msgstr "å¯¬åº¦(_W):"
-
-#~ msgid "alpha"
-#~ msgstr "alpha"
-
-#~ msgid "bravo"
-#~ msgstr "bravo"
-
-#~ msgid "charlie"
-#~ msgstr "charlie"
-
-#~ msgid "delta"
-#~ msgstr "delta"
-
-#~ msgid "echo"
-#~ msgstr "echo"
-
-#~ msgid "foxtrot"
-#~ msgstr "foxtrot"
-
-#~ msgid "golf"
-#~ msgstr "golf"
-
-#~ msgid "hotel"
-#~ msgstr "hotel"
-
-#~ msgid "india"
-#~ msgstr "india"
-
-#~ msgid "kilo"
-#~ msgstr "kilo"
-
-#~ msgid "lima"
-#~ msgstr "lima"
-
-#~ msgid "mike"
-#~ msgstr "mike"
-
-#~ msgid "november"
-#~ msgstr "november"
-
-#~ msgid "oscar"
-#~ msgstr "oscar"
-
-#~ msgid "papa"
-#~ msgstr "papa"
-
-#~ msgid "quebec"
-#~ msgstr "quebec"
-
-#~ msgid "sierra"
-#~ msgstr "sierra"
-
-#~ msgid "tango"
-#~ msgstr "tango"
-
-#~ msgid "victor"
-#~ msgstr "victor"
-
-#~ msgid "whiskey"
-#~ msgstr "whiskey"
-
-#~ msgid "xray"
-#~ msgstr "xray"
-
-#~ msgid "yankee"
-#~ msgstr "yankee"
-
-#~ msgid "ASAP"
-#~ msgstr "ASAP"
-
-#~ msgid "as soon as possible"
-#~ msgstr "è¶?å¿«è¶?å¥½"
-
-#~ msgid "GHz"
-#~ msgstr "GHz"
-
-#~ msgid "gigahertz"
-#~ msgstr "gigahertz"
-
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
-#~ msgid "eye map"
-#~ msgstr "é³¥ç?°å??"
-
-#~ msgid "LDAP"
-#~ msgstr "LDAP"
-
-#~ msgid "ell dap"
-#~ msgstr "ell dap"
-
-#~ msgid "LOL"
-#~ msgstr "LOL"
-
-#~ msgid "laughing out loud"
-#~ msgstr "å??å??å¤§ç¬?"
-
-#~ msgid "MHz"
-#~ msgstr "MHz"
-
-#~ msgid "megahertz"
-#~ msgstr "megahertz"
-
-#~ msgid "strikethrough"
-#~ msgstr "å?ªé?¤ç·?"
-
-#~ msgid "SELinux"
-#~ msgstr "SELinux"
-
-#~ msgid "ess ee linux"
-#~ msgstr "ess ee linux"
-
-#~ msgid "ckm"
-#~ msgstr "ckm"
-
-#~ msgid "CheckMenu"
-#~ msgstr "å?¾é?¸é?¸å?®"
-
-#~ msgid "check menu"
-#~ msgstr "å?¾é?¸é?¸å?®"
-
-#~ msgid "rdmnu"
-#~ msgstr "rdmnu"
-
-#~ msgid "RadioMenu"
-#~ msgstr "å??é?¸é?¸å?®"
-
-#~ msgid "radio menu"
-#~ msgstr "å??é?¸é?¸å?®"
-
-#~ msgid "chrome://"
-#~ msgstr "chrome://"
-
-#~ msgid "time-admin"
-#~ msgstr "time-admin"
-
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
+msgstr "è¦?æ¸?å°?æ??å·¦æ?¹å??é?µï¼?å¢?å? æ??å?³æ?¹å??é?µã??è¦?å°?æ?? home æ??é?µï¼?å¤?æ?? end æ??é?µã??"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f7bf720..3d80825 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Orca 2.25.91pre\n"
+"Project-Id-Version: Orca 2.27.92pre\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-14 11:42+0800\n"
-"PO-Revision-Date: 2009-02-09 20:35+0800\n"
+"POT-Creation-Date: 2009-09-21 21:07+0800\n"
+"PO-Revision-Date: 2009-08-29 22:12+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
 "MIME-Version: 1.0\n"
@@ -16,185 +16,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../orca.desktop.in.h:1
+#: ../orca.desktop.in.h:1 ../src/orca/app_gui_prefs.py:210
+#: ../src/orca/keybindings.py:157 ../src/orca/orca_gui_prefs.py:2273
+#: ../src/orca/orca_gui_prefs.py:2378
+msgid "Orca"
+msgstr "Orca"
+
+#: ../orca.desktop.in.h:2
 msgid "Orca Screen Reader and Magnifier"
 msgstr "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 "å°?ç?«é?¢è³?è¨?ä»¥èª?é?³æ??é»?å?å±?ç¤ºï¼?æ??æ?¾å¤§ç?«é?¢"
 
-#. 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
-#. 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:27
-#, fuzzy
-msgid "Czech Grade 1"
-msgstr "Ã¦Â?Â·Ã¥Â?Â?Ã¥Â?Â±Ã¥Â?Â?Ã¥Â?Â?"
-
-#: ../src/louis/constants.py.in:28
-msgid "Spanish Grade 1"
-msgstr ""
-
-#: ../src/louis/constants.py.in:29
-#, fuzzy
-msgid "Canada French Grade 2"
-msgstr "æ³?å±¬å??é?¨å±¬å?°"
-
-#: ../src/louis/constants.py.in:30
-#, fuzzy
-msgid "France French Grade 2"
-msgstr "æ³?å±¬å??é?¨å±¬å?°"
-
-#: ../src/louis/constants.py.in:31
-msgid "Latvian Grade 1"
-msgstr ""
-
-#: ../src/louis/constants.py.in:32
-msgid "Netherlands Dutch Grade 1"
-msgstr ""
-
-#: ../src/louis/constants.py.in:33
-#, fuzzy
-msgid "Norwegian Grade 0"
-msgstr "æ?ªå¨?èª?/Bokmaal"
-
-#: ../src/louis/constants.py.in:34
-#, fuzzy
-msgid "Norwegian Grade 1"
-msgstr "æ?ªå¨?èª?/Bokmaal"
-
-#: ../src/louis/constants.py.in:35
-#, fuzzy
-msgid "Norwegian Grade 2"
-msgstr "æ?ªå¨?èª?/Bokmaal"
-
-#: ../src/louis/constants.py.in:36
-#, fuzzy
-msgid "Norwegian Grade 3"
-msgstr "æ?ªå¨?èª?/Bokmaal"
-
-#: ../src/louis/constants.py.in:37
-msgid "Polish Grade 1"
-msgstr ""
-
-#: ../src/louis/constants.py.in:38
-#, fuzzy
-msgid "Portuguese Grade 1"
-msgstr "è?¡æ??ï¼?è?¡è??ç??ï¼?"
-
-#: ../src/louis/constants.py.in:39
-msgid "Swedish Grade 1"
-msgstr ""
-
-#: ../src/louis/constants.py.in:40
-msgid "Arabic Grade 1"
-msgstr ""
-
-#: ../src/louis/constants.py.in:41
-msgid "Welsh Grade 1"
-msgstr ""
-
-#: ../src/louis/constants.py.in:42
-msgid "Welsh Grade 2"
-msgstr ""
-
-#: ../src/louis/constants.py.in:43
-#, fuzzy
-msgid "German Grade 0"
-msgstr "å¾·æ??ï¼?å¥§å?°å?©ï¼?"
-
-#: ../src/louis/constants.py.in:44
-#, fuzzy
-msgid "German Grade 1"
-msgstr "å¾·æ??ï¼?å¥§å?°å?©ï¼?"
-
-#: ../src/louis/constants.py.in:45
-#, fuzzy
-msgid "German Grade 2"
-msgstr "å¾·æ??ï¼?å¥§å?°å?©ï¼?"
-
-#: ../src/louis/constants.py.in:46
-#, fuzzy
-msgid "U.K. English Grade 2"
-msgstr "è?±æ??ï¼?ç¾?å??ï¼?"
-
-#: ../src/louis/constants.py.in:47
-#, fuzzy
-msgid "U.K. English Grade 1"
-msgstr "è?±æ??ï¼?ç¾?å??ï¼?"
-
-#: ../src/louis/constants.py.in:48
-#, fuzzy
-msgid "U.S. English Grade 1"
-msgstr "è?±æ??ï¼?ç¾?å??ï¼?"
-
-#: ../src/louis/constants.py.in:49
-#, fuzzy
-msgid "U.S. English Grade 2"
-msgstr "è?±æ??ï¼?ç¾?å??ï¼?"
-
-#: ../src/louis/constants.py.in:50
-#, fuzzy
-msgid "Canada French Grade 1"
-msgstr "æ³?å±¬å??é?¨å±¬å?°"
-
-#: ../src/louis/constants.py.in:51
-#, fuzzy
-msgid "France French Grade 1"
-msgstr "æ³?å±¬å??é?¨å±¬å?°"
-
-#: ../src/louis/constants.py.in:52
-msgid "Greek Grade 1"
-msgstr ""
-
-#: ../src/louis/constants.py.in:53
-msgid "Hindi Grade 1"
-msgstr ""
-
-#: ../src/louis/constants.py.in:54
-msgid "Italian Grade 1"
-msgstr ""
-
-#: ../src/louis/constants.py.in:55
-msgid "Belgium Dutch Grade 1"
-msgstr ""
+#: ../orca.desktop.in.h:4
+msgid "Screen Reader and Magnifier"
+msgstr "è?¢å¹?é?±è®?ç¨?å¼?å??æ?¾å¤§é?¡"
 
 #: ../src/orca/app_gui_prefs.py:129
 #, python-format
 msgid "Orca Preferences for %s"
 msgstr "Orca ç?? %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/app_gui_prefs.py:215 ../src/orca/orca_gui_prefs.py:2384
 msgid "Unbound"
 msgstr "æ?ªç¹«çµ?"
 
@@ -223,134 +72,67 @@ msgstr "è¼¸å?¥ç??æ?¸ç±¤"
 #. 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 "æ?¸ç±¤æ?¯ç?®å??ç??ç?©ä»¶"
 
 #. 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 "æ?¸ç±¤å??ç?®å??ç??ç?©ä»¶æ??ç?¸å??ç??ç?¶é ?"
 
 #. 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
 #, fuzzy, python-format
 msgid "shared ancestor %s"
-msgstr "å?±ç?¨å??å¿?é??(_S)"
+msgstr "<b>å?±äº«è³?æ??å¤¾</b>"
 
 #. 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 "æ¯?è¼?çµ?æ??ä¸?æ??"
 
 #. 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 "æ?¸ç±¤å·²å?²å?"
 
 #. 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 "æ?¸ç±¤ç?¡æ³?è¢«å?²å?"
 
-#. 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 "grayed"
-
 #. 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 å??å°?è©±ç??)"
 
-#. 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 "å·²å±?é??"
-
-#. 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 "å·²æ?¶èµ·"
-
-#. 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 "ç¬¬ %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 "å??æ??"
-
-#. 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 "TREE LEVEL %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 "Line Left"
 
@@ -358,7 +140,7 @@ msgstr "Line Left"
 #. 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 "Line Right"
 
@@ -366,7 +148,7 @@ msgstr "Line Right"
 #. 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 "Line Up"
 
@@ -374,7 +156,7 @@ msgstr "Line Up"
 #. 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 "Line Down"
 
@@ -382,7 +164,7 @@ msgstr "Line Down"
 #. 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
 #, fuzzy
 msgid "Freeze"
 msgstr "Tree"
@@ -392,7 +174,7 @@ msgstr "Tree"
 #. 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 "Top Left"
 
@@ -401,7 +183,7 @@ msgstr "Top Left"
 #. 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 "Bottom Right"
 
@@ -410,14 +192,180 @@ msgstr "Bottom Right"
 #. 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 "æ¸¸æ¨?ä½?ç½®"
 
+#. 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
+#, fuzzy
+msgid "Six Dots"
+msgstr "æ?¼é»?"
+
+#. 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
+#, fuzzy
+msgid "Cursor Routing"
+msgstr "æ¸¸æ¨?ä½?ç½®"
+
+#. 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
+#, fuzzy
+msgid "Cut Begin"
+msgstr "KP_Begin"
+
+#. 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
+#, fuzzy
+msgid "Cut Line"
+msgstr "æ??é??æ¬?ä½?"
+
+#. 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
+#, fuzzy
+msgid "Czech Grade 1"
+msgstr "æ?·å??æ??é?µç?¤å°?æ??è¡¨"
+
+#: ../src/orca/braille.py:242
+msgid "Spanish Grade 1"
+msgstr "è¥¿ç?ç??æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:243
+msgid "Canada French Grade 2"
+msgstr "å? æ?¿å¤§æ³?èª?(ç¬¬äº?ç´?)"
+
+#: ../src/orca/braille.py:244
+msgid "France French Grade 2"
+msgstr "æ³?å??æ³?èª? (ç¬¬äº?ç´?)"
+
+#: ../src/orca/braille.py:245
+msgid "Latvian Grade 1"
+msgstr "æ??è?«ç¶äº?æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:246
+msgid "Netherlands Dutch Grade 1"
+msgstr "è?·è?æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:247
+msgid "Norwegian Grade 0"
+msgstr "æ?ªå¨?æ??(ç¬¬é?¶ç´?)"
+
+#: ../src/orca/braille.py:248
+msgid "Norwegian Grade 1"
+msgstr "æ?ªå¨?æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:249
+msgid "Norwegian Grade 2"
+msgstr "æ?ªå¨?æ??(ç¬¬äº?ç´?)"
+
+#: ../src/orca/braille.py:250
+msgid "Norwegian Grade 3"
+msgstr "æ?ªå¨?æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:251
+msgid "Polish Grade 1"
+msgstr "æ³¢è?æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:252
+msgid "Portuguese Grade 1"
+msgstr "è?¡è??ç??æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:253
+msgid "Swedish Grade 1"
+msgstr "ç??å?¸æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:254
+msgid "Arabic Grade 1"
+msgstr "é?¿æ??ä¼¯æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:255
+msgid "Welsh Grade 1"
+msgstr "å¨?ç?¾æ?¯èª?(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:256
+msgid "Welsh Grade 2"
+msgstr "å¨?ç?¾æ?¯èª?(ç¬¬äº?ç´?)"
+
+#: ../src/orca/braille.py:257
+msgid "German Grade 0"
+msgstr "å¾·æ??(ç¬¬é?¶ç´?)"
+
+#: ../src/orca/braille.py:258
+msgid "German Grade 1"
+msgstr "å¾·æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:259
+msgid "German Grade 2"
+msgstr "å¾·æ??(ç¬¬äº?ç´?)"
+
+#: ../src/orca/braille.py:260
+msgid "U.K. English Grade 2"
+msgstr "è?±å¼?è?±æ??(ç¬¬äº?ç´?)"
+
+#: ../src/orca/braille.py:261
+msgid "U.K. English Grade 1"
+msgstr "è?±å¼?è?±æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:262
+msgid "U.S. English Grade 1"
+msgstr "ç¾?å¼?è?±æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:263
+msgid "U.S. English Grade 2"
+msgstr "ç¾?å¼?è?±æ??(ç¬¬äº?ç´?)"
+
+#: ../src/orca/braille.py:264
+msgid "Canada French Grade 1"
+msgstr "å? æ?¿å¤§æ³?èª?(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:265
+msgid "France French Grade 1"
+msgstr "æ³?å??æ³?èª?(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:266
+msgid "Greek Grade 1"
+msgstr "å¸?è??æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:267
+msgid "Hindi Grade 1"
+msgstr "å??å?°åº¦æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:268
+msgid "Italian Grade 1"
+msgstr "ç¾©å¤§å?©æ??(ç¬¬ä¸?ç´?)"
+
+#: ../src/orca/braille.py:269
+msgid "Belgium Dutch Grade 1"
+msgstr "æ¯?å?©æ??è?·è?æ??(ç¬¬ä¸?ç´?)"
+
 #. Translators: this is the spoken word for the space character
 #.
-#: ../src/orca/chnames.py:39 ../src/orca/default.py:6870
-#: ../src/orca/default.py:6877 ../src/orca/keynames.py:133
+#: ../src/orca/chnames.py:39 ../src/orca/default.py:7334
+#: ../src/orca/default.py:7341 ../src/orca/keynames.py:133
 msgid "space"
 msgstr "ç©ºç?½"
 
@@ -599,7 +547,10 @@ msgstr "åº?ç·?"
 
 #. Translators: this is the spoken word for the character '`' (U+0060)
 #.
-#: ../src/orca/chnames.py:159
+#. 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 "grave"
 
@@ -623,43 +574,53 @@ msgstr "å?³å¤§æ?¬è??"
 
 #. Translators: this is the spoken word for the character '~' (U+007e)
 #.
-#: ../src/orca/chnames.py:175
+#. 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 "æ³¢ç´?è??"
 
+#. 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 "no break space"
+msgstr "æ²?æ??æ?·é??ç??ç©ºç?½"
+
 #. 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 "inverted exclamation point"
 
 #. Translators: this is the spoken word for the character 'Â¢' (U+00a2)
 #.
-#: ../src/orca/chnames.py:183
+#: ../src/orca/chnames.py:188
 msgid "cents"
 msgstr "cents"
 
 #. Translators: this is the spoken word for the character 'Â£' (U+00a3)
 #.
-#: ../src/orca/chnames.py:187
+#: ../src/orca/chnames.py:192
 msgid "pounds"
 msgstr "é??"
 
 #. 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 "currency sign"
 
 #. Translators: this is the spoken word for the character 'Â¥' (U+00a5)
 #.
-#: ../src/orca/chnames.py:195
+#: ../src/orca/chnames.py:200
 msgid "yen"
 msgstr "æ?¥å??"
 
 #. 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 "broken bar"
 
@@ -667,697 +628,712 @@ msgstr "broken bar"
 #.
 #. Translators: spoken words for the rolename of a section (e.g., in html).
 #.
-#: ../src/orca/chnames.py:203 ../src/orca/rolenames.py:840
+#: ../src/orca/chnames.py:208 ../src/orca/rolenames.py:840
 msgid "section"
 msgstr "ç« ç¯?"
 
 #. Translators: this is the spoken word for the character 'Â¨' (U+00a8)
 #.
-#: ../src/orca/chnames.py:207
+#: ../src/orca/chnames.py:212
 msgid "umlaut"
 msgstr "umlaut"
 
 #. Translators: this is the spoken word for the character 'Â©' (U+00a9)
 #.
-#: ../src/orca/chnames.py:211
+#: ../src/orca/chnames.py:216
 msgid "copyright"
 msgstr "ç??æ¬?"
 
 #. 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 "superscript a"
 
 #. 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 "left double angle bracket"
 
 #. 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 "logical not"
 
 #. 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 "soft hyphen"
 
 #. Translators: this is the spoken word for the character 'Â®' (U+00ae)
 #.
-#: ../src/orca/chnames.py:231
+#: ../src/orca/chnames.py:236
 msgid "registered"
 msgstr "registered"
 
 #. Translators: this is the spoken word for the character 'Â¯' (U+00af)
 #.
-#: ../src/orca/chnames.py:235
+#: ../src/orca/chnames.py:240
 msgid "macron"
 msgstr "macron"
 
 #. Translators: this is the spoken word for the character 'Â°' (U+00b0)
 #.
-#: ../src/orca/chnames.py:239
+#: ../src/orca/chnames.py:244
 msgid "degrees"
 msgstr "åº¦"
 
 #. 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 "å? æ¸?"
 
 #. 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 "superscript 2"
 
 #. 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 "superscript 3"
 
 #. 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 "acute accent"
 
 #. Translators: this is the spoken word for the character 'Âµ' (U+00b5)
 #.
-#: ../src/orca/chnames.py:259
+#: ../src/orca/chnames.py:264
 msgid "mu"
 msgstr "mu"
 
 #. 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 "æ®µè?½æ¨?è¨?"
 
 #. 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 "middle dot"
 
 #. 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 "cedilla"
 
 #. 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 "superscript 1"
 
 #. Translators: this is the spoken word for the character 'Âº' (U+00ba)
 #.
-#: ../src/orca/chnames.py:279
+#: ../src/orca/chnames.py:284
 msgid "ordinal"
 msgstr "ordinal"
 
 #. 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 "right double angle bracket"
 
 #. 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 "one fourth"
 
 #. 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 "one half"
 
 #. 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 "three fourths"
 
 #. 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 "å??å??è??"
 
 #. 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 acute"
 
 #. 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 GRAVE"
 
 #. 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 ACUTE"
 
 #. 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 CIRCUMFLEX"
 
 #. 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 TILDE"
 
 #. 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 UMLAUT"
 
 #. 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 RING"
 
 #. 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"
 
 #. 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 CEDILLA"
 
 #. 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 GRAVE"
 
 #. 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 ACUTE"
 
 #. 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 CIRCUMFLEX"
 
 #. 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 UMLAUT"
 
 #. 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 GRAVE"
 
 #. 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 ACUTE"
 
 #. 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 CIRCUMFLEX"
 
 #. 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 UMLAUT"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d0)
 #.
-#: ../src/orca/chnames.py:371
+#: ../src/orca/chnames.py:376
 msgid "ETH"
 msgstr "ETH"
 
 #. 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 TILDE"
 
 #. 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 GRAVE"
 
 #. 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 ACUTE"
 
 #. 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 CIRCUMFLEX"
 
 #. 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 TILDE"
 
 #. 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 UMLAUT"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d7)
 #.
-#: ../src/orca/chnames.py:399
+#: ../src/orca/chnames.py:404
 msgid "times"
 msgstr "ä¹?"
 
 #. 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 STROKE"
 
 #. 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 GRAVE"
 
 #. 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 ACUTE"
 
 #. 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 CIRCUMFLEX"
 
 #. 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 UMLAUT"
 
 #. 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 ACUTE"
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00de)
 #.
-#: ../src/orca/chnames.py:427
+#: ../src/orca/chnames.py:432
 msgid "THORN"
 msgstr "THORN"
 
 #. 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 "s sharp"
 
 #. 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 grave"
 
 #. 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 circumflex"
 
 #. 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 tilde"
 
 #. 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 umlaut"
 
 #. 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 ring"
 
 #. 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"
 
 #. 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 cedilla"
 
 #. 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 grave"
 
 #. 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 acute"
 
 #. 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 circumflex"
 
 #. 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 umlaut"
 
 #. 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 grave"
 
 #. 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 acute"
 
 #. 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 circumflex"
 
 #. 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 umlaut"
 
 #. Translators: this is the spoken word for the character 'Ã°' (U+00f0)
 #.
-#: ../src/orca/chnames.py:495
+#: ../src/orca/chnames.py:500
 msgid "eth"
 msgstr "eth"
 
 #. 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 tilde"
 
 #. 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 grave"
 
 #. 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 acute"
 
 #. 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 circumflex"
 
 #. 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 tilde"
 
 #. 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 umlaut"
 
 #. 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 "é?¤ä»¥"
 
 #. 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 stroke"
 
 #. Translators: this is the spoken word for the character 'Ã¾' (U+00fe)
 #.
-#: ../src/orca/chnames.py:531
+#: ../src/orca/chnames.py:536
 msgid "thorn"
 msgstr "thorn"
 
 #. 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 acute"
 
 #. 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 grave"
 
 #. 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 circumflex"
 
 #. 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 umlaut"
 
 #. 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 acute"
 
 #. 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 umlaut"
 
 #. 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 "Y UMLAUT"
 
 #. Translators: this is the spoken word for the character 'Æ?' (U+0192)
 #.
-#: ../src/orca/chnames.py:563
+#: ../src/orca/chnames.py:568
 msgid "florin"
 msgstr "florin"
 
 #. 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 "en dash"
 
 #. 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 "å·¦å?®å¼?è??"
 
 #. 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 "å?³å?®å¼?è??"
 
 #. Translators: this is the spoken word for the character 'â??' (U+201a)
 #.
-#: ../src/orca/chnames.py:581
+#: ../src/orca/chnames.py:586
 #, fuzzy
-#| msgid "left single quote"
 msgid "single low quote"
-msgstr "ä¸?ä½¿ç?¨å¼?æ??"
+msgstr "å·¦å?®å¼?è??"
 
 #. 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 "å·¦é??å¼?è??"
 
 #. 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 "å?³é??å¼?è??"
 
 #. Translators: this is the spoken word for the character 'â??' (U+201e)
 #.
-#: ../src/orca/chnames.py:593
+#: ../src/orca/chnames.py:598
 #, fuzzy
-#| msgid "left double quote"
 msgid "double low quote"
-msgstr "ä¸?ä½¿ç?¨å¼?æ??"
+msgstr "å·¦é??å¼?è??"
 
 #. Translators: this is the spoken word for the character 'â? ' (U+2020)
 #.
-#: ../src/orca/chnames.py:597
+#: ../src/orca/chnames.py:602
 msgid "dagger"
 msgstr "dagger"
 
 #. 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 "double dagger"
 
 #. Translators: this is the spoken word for the character 'â?¢' (U+2022)
 #.
-#: ../src/orca/chnames.py:605
+#: ../src/orca/chnames.py:610
 msgid "bullet"
 msgstr "é ?ç?®ç¬¦è??"
 
 #. 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 "ä¸?è§?é ?ç?®ç¬¦è??"
 
 #. 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 "per mille"
 
 #. Translators: this is the spoken word for the character 'â?²' (U+2032)
 #.
-#: ../src/orca/chnames.py:617
+#: ../src/orca/chnames.py:622
 msgid "prime"
 msgstr "prime"
 
 #. 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 "double prime"
 
 #. 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 "hyphen bullet"
 
 #. Translators: this is the spoken word for the character 'â?¬' (U+20ac)
 #.
-#: ../src/orca/chnames.py:629
+#: ../src/orca/chnames.py:634
 msgid "euro"
 msgstr "æ?å??"
 
 #. Translators: this is the spoken word for the character 'â?¢' (U+2122)
 #.
-#: ../src/orca/chnames.py:633
+#: ../src/orca/chnames.py:638
 msgid "trademark"
 msgstr "è¨»å??å??æ¨?"
 
+#. Translators: this is the spoken word for the character 'â??' (U+2190)
+#.
+#: ../src/orca/chnames.py:642
+#, fuzzy
+msgid "left arrow"
+msgstr "ç®é æ?¹å??"
+
+#. Translators: this is the spoken word for the character 'â??' (U+2192)
+#.
+#: ../src/orca/chnames.py:646
+#, fuzzy
+msgid "right arrow"
+msgstr "å?³ç®é "
+
 #. 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 "å¹¾ä¹?ç?æ?¼"
 
 #. 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 "ä¸?ç?æ?¼"
 
 #. 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 "å°?æ?¼ç?æ?¼"
 
 #. 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 "å¤§æ?¼ç?æ?¼"
 
 #. 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 "é??æ ¹è??"
 
 #. 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 "é??ä¸?æ?¹"
 
 #. Translators: this is the spoken word for the character 'â??' (U+221e)
 #.
-#: ../src/orca/chnames.py:661
+#: ../src/orca/chnames.py:674
 msgid "infinity"
 msgstr "ç?¡é??å¤§"
 
@@ -1368,14 +1344,14 @@ msgstr "ç?¡é??å¤§"
 #. 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 "å¯¦å¿?æ?¹æ¡?"
 
 #. 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 "ç©ºå¿?æ?¹æ¡?"
 
@@ -1386,41 +1362,41 @@ msgstr "ç©ºå¿?æ?¹æ¡?"
 #. 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 "å¯¦å¿?è?±å½¢"
 
 #. 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 "ç©ºå¿?å??"
 
 #. 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 "å¯¦å¿?å??å½¢"
 
 #. 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 "ç©ºå¿?é ?ç?®ç¬¦è??"
 
 #. 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 "check mark"
 
 #. 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 "heavy check mark"
 
@@ -1431,7 +1407,7 @@ msgstr "heavy check mark"
 #. 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å??é ?ç?®ç¬¦è??"
 
@@ -1440,7 +1416,7 @@ msgstr "xå??é ?ç?®ç¬¦è??"
 #. 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 "å?³ç®é "
 
@@ -1449,10 +1425,18 @@ msgstr "å?³ç®é "
 #. 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 "right-pointing arrowhead"
 
+#. Translators: this command will move the mouse pointer
+#. to the current item without clicking on it.
+#.
+#: ../src/orca/default.py:151
+#, fuzzy
+msgid "Routes the pointer to the current item."
+msgstr "è®?å?ºè¼¸å?¥è¡?ç??å?§å®¹ã??"
+
 #. 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
@@ -1463,7 +1447,7 @@ msgstr "right-pointing arrowhead"
 #. {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:166
 msgid "Performs left click on current flat review item."
 msgstr "å?¨ç?®å??ç?? flat review é ?ç?®ä¸æ??ä¸?å·¦é?µ"
 
@@ -1477,7 +1461,7 @@ msgstr "å?¨ç?®å??ç?? flat review é ?ç?®ä¸æ??ä¸?å·¦é?µ"
 #. {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:181
 msgid "Performs right click on current flat review item."
 msgstr "å?¨ç?®å??ç?? flat review é ?ç?®ä¸æ??ä¸?å?³é?µ"
 
@@ -1489,9 +1473,9 @@ msgstr "å?¨ç?®å??ç?? flat review é ?ç?®ä¸æ??ä¸?å?³é?µ"
 #. be positioned at the point where the speech was
 #. interrupted.
 #.
-#: ../src/orca/default.py:167 ../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/default.py:194 ../src/orca/scripts/apps/acroread.py:114
+#: ../src/orca/scripts/apps/evolution/script.py:153
+#: ../src/orca/scripts/toolkits/Gecko/script.py:531
 msgid "Speaks entire document."
 msgstr "è®?å?ºæ?´å??æ??ä»¶ã??"
 
@@ -1502,7 +1486,7 @@ msgstr "è®?å?ºæ?´å??æ??ä»¶ã??"
 #. name of the current pushbutton with focus as well as
 #. its mnemonic.
 #.
-#: ../src/orca/default.py:179
+#: ../src/orca/default.py:206
 msgid "Performs the basic where am I operation."
 msgstr "é?²è¡?å?ºæ?¬ç??ã??æ??å?¨å?ªè£¡ã??æ??ä½?ã??"
 
@@ -1513,21 +1497,21 @@ msgstr "é?²è¡?å?ºæ?¬ç??ã??æ??å?¨å?ªè£¡ã??æ??ä½?ã??"
 #. name of the current pushbutton with focus as well as
 #. its mnemonic.
 #.
-#: ../src/orca/default.py:191
+#: ../src/orca/default.py:218
 msgid "Performs the detailed where am I operation."
 msgstr "é?²è¡?è©³ç´°ç??ã??æ??å?¨å?ªè£¡ã??æ??ä½?ã??"
 
 #. Translators: This command will cause the window's
 #. title to be spoken.
 #.
-#: ../src/orca/default.py:199
+#: ../src/orca/default.py:231
 msgid "Speaks the title bar."
 msgstr "è®?å?ºæ¨?é¡?å??ã??"
 
 #. Translators: This command will cause the window's
 #. status bar contents to be spoken.
 #.
-#: ../src/orca/default.py:207
+#: ../src/orca/default.py:244
 msgid "Speaks the status bar."
 msgstr "è®?å?ºç??æ??å??ã??"
 
@@ -1536,7 +1520,7 @@ msgstr "è®?å?ºç??æ??å??ã??"
 #. that text.  For example, they may want to find the
 #. "OK" button.
 #.
-#: ../src/orca/default.py:217
+#: ../src/orca/default.py:254
 msgid "Opens the Orca Find dialog."
 msgstr "é??å?? Orca å°?æ?¾å°?è©±è¦?çª?ã??"
 
@@ -1546,7 +1530,7 @@ msgstr "é??å?? Orca å°?æ?¾å°?è©±è¦?çª?ã??"
 #. "OK" button.  This string is used for finding the
 #. next occurence of a string.
 #.
-#: ../src/orca/default.py:228
+#: ../src/orca/default.py:265
 msgid "Searches for the next instance of a string."
 msgstr "æ??å°?ä¸?ä¸?å??ç?¸å??ç??å?ä¸²ã??"
 
@@ -1556,7 +1540,7 @@ msgstr "æ??å°?ä¸?ä¸?å??ç?¸å??ç??å?ä¸²ã??"
 #. "OK" button.  This string is used for finding the
 #. previous occurence of a string.
 #.
-#: ../src/orca/default.py:239
+#: ../src/orca/default.py:276
 msgid "Searches for the previous instance of a string."
 msgstr "æ??å°?ä¸?ä¸?å??ç?¸å??ç??å?ä¸²ã??"
 
@@ -1566,7 +1550,7 @@ msgstr "æ??å°?ä¸?ä¸?å??ç?¸å??ç??å?ä¸²ã??"
 #. zones in the active window for the application that
 #. currently has focus.
 #.
-#: ../src/orca/default.py:250
+#: ../src/orca/default.py:287
 msgid "Paints and prints the visible zones in the active window."
 msgstr "å?¨ä½¿ç?¨ç??è¦?çª?ä¸ç¹ªç?«å??å?°å?ºå?¯è¦?å??å??ã??"
 
@@ -1579,7 +1563,7 @@ msgstr "å?¨ä½¿ç?¨ç??è¦?çª?ä¸ç¹ªç?«å??å?°å?ºå?¯è¦?å??å??ã??"
 #. the user to explore this text by the {previous,next}
 #. {line,word,character}.
 #.
-#: ../src/orca/default.py:264
+#: ../src/orca/default.py:301
 msgid "Enters and exits flat review mode."
 msgstr "é?²å?¥å??é?¢é?? flat review æ¨¡å¼?ã??"
 
@@ -1592,7 +1576,7 @@ msgstr "é?²å?¥å??é?¢é?? flat review æ¨¡å¼?ã??"
 #. the user to explore this text by the {previous,next}
 #. {line,word,character}.
 #.
-#: ../src/orca/default.py:278
+#: ../src/orca/default.py:315
 msgid "Moves flat review to the beginning of the previous line."
 msgstr "å°? flat review ç§»è?³ä¸?ä¸?è¡?ç??è¡?é¦?ã??"
 
@@ -1606,7 +1590,7 @@ msgstr "å°? flat review ç§»è?³ä¸?ä¸?è¡?ç??è¡?é¦?ã??"
 #. {line,word,character}.  The home position is the
 #. beginning of the content in the window.
 #.
-#: ../src/orca/default.py:293
+#: ../src/orca/default.py:330
 msgid "Moves flat review to the home position."
 msgstr "å°? flat review ç§»è?³å®¶ä½?ç½®ã??"
 
@@ -1620,7 +1604,7 @@ msgstr "å°? flat review ç§»è?³å®¶ä½?ç½®ã??"
 #. {line,word,character}.  This particular command will
 #. cause Orca to speak the current line.
 #.
-#: ../src/orca/default.py:308
+#: ../src/orca/default.py:345
 msgid "Speaks the current flat review line."
 msgstr "è®?å?ºç?®å??ç?? flat review è¡?ã??"
 
@@ -1634,7 +1618,7 @@ msgstr "è®?å?ºç?®å??ç?? flat review è¡?ã??"
 #. {line,word,character}. This particular command will
 #. cause Orca to spell the current line.
 #.
-#: ../src/orca/default.py:323
+#: ../src/orca/default.py:360
 msgid "Spells the current flat review line."
 msgstr "æ?¼å?ºç?®å??ç?? flat review è¡?ã??"
 
@@ -1649,10 +1633,10 @@ msgstr "æ?¼å?ºç?®å??ç?? flat review è¡?ã??"
 #. 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:376
 #, fuzzy
 msgid "Phonetically spells the current flat review line."
-msgstr "æ?¼å?ºç?®å??ç?? flat review è¡?ã??"
+msgstr "æ?¼å?ºç?®å??ç?? flat review é ?ç?®æ??å?è©?ã??"
 
 #. Translators: the 'flat review' feature of Orca
 #. allows the blind user to explore the text in a
@@ -1663,7 +1647,7 @@ msgstr "æ?¼å?ºç?®å??ç?? flat review è¡?ã??"
 #. the user to explore this text by the {previous,next}
 #. {line,word,character}.
 #.
-#: ../src/orca/default.py:353
+#: ../src/orca/default.py:390
 msgid "Moves flat review to the beginning of the next line."
 msgstr "å°? flat review ç§»è?³ä¸?ä¸?è¡?ç??è¡?é¦?ã??"
 
@@ -1677,7 +1661,7 @@ msgstr "å°? flat review ç§»è?³ä¸?ä¸?è¡?ç??è¡?é¦?ã??"
 #. {line,word,character}.  The end position is the last
 #. bit of information in the window.
 #.
-#: ../src/orca/default.py:368
+#: ../src/orca/default.py:405
 msgid "Moves flat review to the end position."
 msgstr "å°? flat review ç§»è?³æ??å°¾ä½?ç½®ã??"
 
@@ -1692,7 +1676,7 @@ msgstr "å°? flat review ç§»è?³æ??å°¾ä½?ç½®ã??"
 #. 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:421
 msgid "Moves flat review to the previous item or word."
 msgstr "å°? flat review ç§»è?³ä¸?ä¸?å??å?å??æ??å?è©?ã??"
 
@@ -1707,7 +1691,7 @@ msgstr "å°? flat review ç§»è?³ä¸?ä¸?å??å?å??æ??å?è©?ã??"
 #. geographically above, as if you drew a vertical line
 #. in the window.
 #.
-#: ../src/orca/default.py:400
+#: ../src/orca/default.py:437
 msgid "Moves flat review to the word above the current word."
 msgstr "å°? flat review ç§»è?³ç?®å??å?è©?ä¹?ä¸?ã??"
 
@@ -1721,7 +1705,7 @@ msgstr "å°? flat review ç§»è?³ç?®å??å?è©?ä¹?ä¸?ã??"
 #. {line,word,character}.  This command will speak the
 #. current word or item.
 #.
-#: ../src/orca/default.py:415
+#: ../src/orca/default.py:452
 msgid "Speaks the current flat review item or word."
 msgstr "è®?å?ºç?®å??ç?? flat review é ?ç?®æ??å?è©?ã??"
 
@@ -1735,7 +1719,7 @@ msgstr "è®?å?ºç?®å??ç?? flat review é ?ç?®æ??å?è©?ã??"
 #. {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:467
 msgid "Spells the current flat review item or word."
 msgstr "æ?¼å?ºç?®å??ç?? flat review é ?ç?®æ??å?è©?ã??"
 
@@ -1750,7 +1734,7 @@ msgstr "æ?¼å?ºç?®å??ç?? flat review é ?ç?®æ??å?è©?ã??"
 #. 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:483
 #, fuzzy
 msgid "Phonetically spells the current flat review item or word."
 msgstr "æ?¼å?ºç?®å??ç?? flat review é ?ç?®æ??å?è©?ã??"
@@ -1767,7 +1751,7 @@ msgstr "æ?¼å?ºç?®å??ç?? flat review é ?ç?®æ??å?è©?ã??"
 #. 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:500
 msgid "Speaks the current flat review object."
 msgstr "è®?å?ºç?®å??ç?? flat review ç?©ä»¶ã??"
 
@@ -1782,7 +1766,7 @@ msgstr "è®?å?ºç?®å??ç?? flat review ç?©ä»¶ã??"
 #. 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:516
 msgid "Moves flat review to the next item or word."
 msgstr "å°? flat review ç§»è?³ä¸?ä¸?å??é ?ç?®æ??å?è©?ã??"
 
@@ -1797,7 +1781,7 @@ msgstr "å°? flat review ç§»è?³ä¸?ä¸?å??é ?ç?®æ??å?è©?ã??"
 #. geographically below, as if you drew a vertical line
 #. downward on the screen.
 #.
-#: ../src/orca/default.py:495
+#: ../src/orca/default.py:532
 msgid "Moves flat review to the word below the current word."
 msgstr "å°? flat review ç§»è?³ç?®å??å?è©?ä¹?ä¸?ã??"
 
@@ -1812,7 +1796,7 @@ msgstr "å°? flat review ç§»è?³ç?®å??å?è©?ä¹?ä¸?ã??"
 #. 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:548
 msgid "Moves flat review to the previous character."
 msgstr "å°? flat review ç§»è?³ä¸?ä¸?å??å?å??ã??"
 
@@ -1825,7 +1809,7 @@ msgstr "å°? flat review ç§»è?³ä¸?ä¸?å??å?å??ã??"
 #. the user to explore this text by the {previous,next}
 #. {line,word,character}.
 #.
-#: ../src/orca/default.py:525
+#: ../src/orca/default.py:562
 msgid "Moves flat review to the end of the line."
 msgstr "å°? flat review ç§»è?³è¡?å°¾ã??"
 
@@ -1842,7 +1826,7 @@ msgstr "å°? flat review ç§»è?³è¡?å°¾ã??"
 #. this case will be the spoken language form of the
 #. character currently being reviewed.
 #.
-#: ../src/orca/default.py:543
+#: ../src/orca/default.py:580
 msgid "Speaks the current flat review character."
 msgstr "è®?å?ºç?®å??ç?? flat review å?å??ã??"
 
@@ -1860,10 +1844,10 @@ msgstr "è®?å?ºç?®å??ç?? flat review å?å??ã??"
 #. character currently being reviewed, saying "Alpha"
 #. for "a", "Bravo" for "b" and so on.
 #.
-#: ../src/orca/default.py:562
+#: ../src/orca/default.py:599
 #, fuzzy
 msgid "Phonetically speaks the current flat review character."
-msgstr "è®?å?ºç?®å??ç?? flat review å?å??ã??"
+msgstr "è®?å?ºç?®å??ç?? flat review é ?ç?®æ??å?è©?ã??"
 
 #. Translators: the 'flat review' feature of Orca
 #. allows the blind user to explore the text in a
@@ -1876,7 +1860,7 @@ msgstr "è®?å?ºç?®å??ç?? flat review å?å??ã??"
 #. 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:615
 msgid "Moves flat review to the next character."
 msgstr "å°? flat review ç§»è?³ä¸?ä¸?å??å?å??ã??"
 
@@ -1884,7 +1868,7 @@ msgstr "å°? flat review ç§»è?³ä¸?ä¸?å??å?å??ã??"
 #. 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:624
 msgid "Toggles whether to read just the current table cell or the whole row."
 msgstr "å??æ??æ??å?¦é?±è®?ç?®å??ç??è¡¨æ ¼æ??æ?´å??ã??"
 
@@ -1892,7 +1876,7 @@ msgstr "å??æ??æ??å?¦é?±è®?ç?®å??ç??è¡¨æ ¼æ??æ?´å??ã??"
 #. text attributes, such as bold, italic, font name,
 #. font size, etc.
 #.
-#: ../src/orca/default.py:597
+#: ../src/orca/default.py:634
 msgid "Reads the attributes associated with the current text character."
 msgstr "é?±è®?ç?®å??å?å??ç?¸é??ç??å±¬æ?§ã??"
 
@@ -1902,7 +1886,7 @@ msgstr "é?±è®?ç?®å??å?å??ç?¸é??ç??å±¬æ?§ã??"
 #. via speech and braille. This information will be
 #. helpful to script writers.
 #.
-#: ../src/orca/default.py:609
+#: ../src/orca/default.py:646
 msgid "Reports information on current script."
 msgstr "å ±å??ç?®å?? script ç??è³?è¨?ã??"
 
@@ -1915,7 +1899,7 @@ msgstr "å ±å??ç?®å?? script ç??è³?è¨?ã??"
 #. braille display so they can pan left and right over
 #. this line.
 #.
-#: ../src/orca/default.py:623
+#: ../src/orca/default.py:660 ../src/orca/scripts/toolkits/Gecko/script.py:545
 msgid "Pans the braille display to the left."
 msgstr "é»?å?é¡¯ç¤ºå??å·¦ç§»ã??"
 
@@ -1928,7 +1912,7 @@ msgstr "é»?å?é¡¯ç¤ºå??å·¦ç§»ã??"
 #. braille display so they can pan left and right over
 #. this line.
 #.
-#: ../src/orca/default.py:638
+#: ../src/orca/default.py:675 ../src/orca/scripts/toolkits/Gecko/script.py:560
 msgid "Pans the braille display to the right."
 msgstr "é»?å?é¡¯ç¤ºå??å?³ç§»ã??"
 
@@ -1942,7 +1926,7 @@ msgstr "é»?å?é¡¯ç¤ºå??å?³ç§»ã??"
 #. {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:691
 msgid "Moves flat review to the bottom left."
 msgstr "å°? flat review ç§»è?³å·¦ä¸?ã??"
 
@@ -1959,10 +1943,46 @@ msgstr "å°? flat review ç§»è?³å·¦ä¸?ã??"
 #. feature used here will return the flat review to the
 #. object with focus.
 #.
-#: ../src/orca/default.py:672
+#: ../src/orca/default.py:709
 msgid "Returns to object with keyboard focus."
 msgstr "å??å?°æ??é?µç?¤ç?¦é»?ç??ç?©ä»¶"
 
+#. 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:720
+msgid "Turns contracted braille on and off."
+msgstr ""
+
+#. 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:731
+msgid "Processes a cursor routing key."
+msgstr ""
+
+#. Translators: this is used to indicate the start point
+#. of a text selection.
+#.
+#: ../src/orca/default.py:739
+#, fuzzy
+msgid "Marks the beginning of a text selection."
+msgstr "ç§»è?³è¡?é¦?ã??"
+
+#. Translators: this is used to indicate the end point
+#. of a text selection.
+#.
+#: ../src/orca/default.py:747
+#, fuzzy
+msgid "Marks the end of a text selection."
+msgstr "ç§»è?³è¡?å°¾ã??"
+
 #. 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
@@ -1970,21 +1990,21 @@ msgstr "å??å?°æ??é?µç?¤ç?¦é»?ç??ç?©ä»¶"
 #. 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:759
 msgid "Enters learn mode.  Press escape to exit learn mode."
 msgstr "é?²å?¥å¸ç¿?æ¨¡å¼?ã??  æ??é?¢é??é?µé?¢é??å¸ç¿?æ¨¡å¼?ã??"
 
 #. Translators: the speech rate is how fast the speech
 #. synthesis engine will generate speech.
 #.
-#: ../src/orca/default.py:692
+#: ../src/orca/default.py:767
 msgid "Decreases the speech rate."
 msgstr "æ¸?æ?¢æ??è®?é??åº¦ã??"
 
 #. Translators: the speech rate is how fast the speech
 #. synthesis engine will generate speech.
 #.
-#: ../src/orca/default.py:700
+#: ../src/orca/default.py:775
 msgid "Increases the speech rate."
 msgstr "å? å¿«æ??è®?é??åº¦ã??"
 
@@ -1992,7 +2012,7 @@ msgstr "å? å¿«æ??è®?é??åº¦ã??"
 #. pitch/frequency the speech synthesis engine will
 #. generate speech.
 #.
-#: ../src/orca/default.py:709
+#: ../src/orca/default.py:784
 msgid "Decreases the speech pitch."
 msgstr "æ¸?ä½?æ??è®?é?³èª¿ã??"
 
@@ -2000,11 +2020,11 @@ msgstr "æ¸?ä½?æ??è®?é?³èª¿ã??"
 #. pitch/frequency the speech synthesis engine will
 #. generate speech.
 #.
-#: ../src/orca/default.py:718
+#: ../src/orca/default.py:793
 msgid "Increases the speech pitch."
 msgstr "å? é«?æ??è®?é?³èª¿ã??"
 
-#: ../src/orca/default.py:723
+#: ../src/orca/default.py:798
 msgid "Quits Orca"
 msgstr "é?¢é?? Orca"
 
@@ -2012,7 +2032,7 @@ msgstr "é?¢é?? Orca"
 #. the dialog that allows users to set their preferences
 #. for Orca.
 #.
-#: ../src/orca/default.py:732
+#: ../src/orca/default.py:807
 msgid "Displays the preferences configuration dialog."
 msgstr "é¡¯ç¤ºå??å¥½è¨å®?å°?è©±è¦?çª?ã??"
 
@@ -2020,14 +2040,14 @@ msgstr "é¡¯ç¤ºå??å¥½è¨å®?å°?è©±è¦?çª?ã??"
 #. 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:816
 msgid "Displays the application preferences configuration dialog."
 msgstr "é¡¯ç¤ºå??å¥½è¨å®?å°?è©±ç??ã??"
 
 #. 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:824
 msgid "Toggles the silencing of speech."
 msgstr "å??æ??ç?ºé??é?³ã??"
 
@@ -2036,7 +2056,7 @@ msgstr "å??æ??ç?ºé??é?³ã??"
 #. that prints a list of all known applications currently
 #. running on the desktop, to stdout.
 #.
-#: ../src/orca/default.py:759
+#: ../src/orca/default.py:834
 msgid ""
 "Prints a debug listing of all known applications to the console where Orca "
 "is running."
@@ -2047,30 +2067,19 @@ msgstr "ç?¶ Orca æ£å?¨é??è¡?æ??ï¼?å??å?°æ??æ??å·²ç?¥ç¨?å¼?ç??å?µé?¯è³?è¨?æ¸?å?®
 #. 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:845
 msgid "Cycles the debug level at run time."
 msgstr "å?¨å?·è¡?æ??å??å?ºå?µé?¯ç´?å?¥ã??"
 
 #. 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 "ç?¶ Orca æ£å?¨é??è¡?æ??ï¼?å??å?°ç?®å??ä½¿ç?¨ä¸ç??ç¨?å¼?ç??å?µé?¯è³?è¨?"
-
-#. 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:858
 msgid "Prints debug information about the ancestry of the object with focus."
 msgstr "é¡¯ç¤ºå??å¾?ç?¦é»?ç?©ä»¶ç??è??çµ¡ç??å?µé?¯è³?è¨?ã??"
 
@@ -2081,7 +2090,7 @@ msgstr "é¡¯ç¤ºå??å¾?ç?¦é»?ç?©ä»¶ç??è??çµ¡ç??å?µé?¯è³?è¨?ã??"
 #. component hierarchy (i.e. all the components and all
 #. their descendants in the component tree).
 #.
-#: ../src/orca/default.py:807
+#: ../src/orca/default.py:871
 msgid "Prints debug information about the application with focus."
 msgstr "é¡¯ç¤ºå??å¾?ç?¦é»?ç??ç¨?å¼?ç??å?µé?¯è³?è¨?ã??"
 
@@ -2089,7 +2098,7 @@ msgstr "é¡¯ç¤ºå??å¾?ç?¦é»?ç??ç¨?å¼?ç??å?µé?¯è³?è¨?ã??"
 #. 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:880
 #, fuzzy
 msgid "Prints memory usage information."
 msgstr "å??å¾?æ¸?å?®ä½¿ç?¨è³?è¨?(_U)"
@@ -2098,35 +2107,35 @@ msgstr "å??å¾?æ¸?å?®ä½¿ç?¨è³?è¨?(_U)"
 #. the relationship of the given bookmark to the current
 #. position
 #.
-#: ../src/orca/default.py:825
+#: ../src/orca/default.py:889
 msgid "Bookmark where am I with respect to current position."
-msgstr ""
+msgstr "æ??å?ºæ??ç?®å??ä½?ç½®å?°æ?¸ç±¤ç??ç?¸å°?é??ä¿?"
 
 #. Translators: this command moves the current position to the
 #. location stored at the bookmark.
 #.
-#: ../src/orca/default.py:833
+#: ../src/orca/default.py:897
 msgid "Go to bookmark."
 msgstr "ç§»è?³æ?¸ç±¤ã??"
 
 #. 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:905
 msgid "Add bookmark."
 msgstr "å? å?¥æ?¸ç±¤ã??"
 
 #. Translators: this event handler saves all bookmarks for the
 #. current application to disk.
 #.
-#: ../src/orca/default.py:849
+#: ../src/orca/default.py:913
 msgid "Save bookmarks."
 msgstr "å?²å?æ?¸ç±¤ã??"
 
 #. 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:921
 msgid "Go to next bookmark location."
 msgstr "ç§»è?³ä¸?ä¸?å??æ?¸ç±¤ä½?ç½®ã??"
 
@@ -2134,7 +2143,7 @@ msgstr "ç§»è?³ä¸?ä¸?å??æ?¸ç±¤ä½?ç½®ã??"
 #. registered bookmarks and takes the user to the previous
 #. bookmark location.
 #.
-#: ../src/orca/default.py:866
+#: ../src/orca/default.py:930
 msgid "Go to previous bookmark location."
 msgstr "ç§»è?³ä¸?ä¸?å??æ?¸ç±¤ä½?ç½®ã??"
 
@@ -2143,7 +2152,7 @@ msgstr "ç§»è?³ä¸?ä¸?å??æ?¸ç±¤ä½?ç½®ã??"
 #. 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:940
 msgid "Toggles color enhancements."
 msgstr "å??æ??é¡?è?²å¼·å??ã??"
 
@@ -2153,21 +2162,21 @@ msgstr "å??æ??é¡?è?²å¼·å??ã??"
 #. color, and surrounding it with crosshairs.  This command
 #. toggles these enhancements on/off.
 #.
-#: ../src/orca/default.py:887
+#: ../src/orca/default.py:951
 msgid "Toggles mouse enhancements."
 msgstr "å??æ??æ»?é¼ å¼·å??ã??"
 
 #. Translators: this command increases the magnification
 #. level.
 #.
-#: ../src/orca/default.py:895
+#: ../src/orca/default.py:959
 msgid "Increases the magnification level."
 msgstr "å¢?å? æ?¾å¤§å??ç??ã??"
 
 #. Translators: this command decreases the magnification
 #. level.
 #.
-#: ../src/orca/default.py:903
+#: ../src/orca/default.py:967
 msgid "Decreases the magnification level."
 msgstr "æ¸?å°?æ?¾å¤§å??ç??ã??"
 
@@ -2176,7 +2185,7 @@ msgstr "æ¸?å°?æ?¾å¤§å??ç??ã??"
 #. but also all of the color and pointer customizations
 #. made through the magnifier.
 #.
-#: ../src/orca/default.py:913
+#: ../src/orca/default.py:977
 msgid "Toggles the magnifier."
 msgstr "å??æ??æ?¾å¤§é?¡ã??"
 
@@ -2185,14 +2194,14 @@ msgstr "å??æ??æ?¾å¤§é?¡ã??"
 #. screen.  The "position" here refers to location of the
 #. magnifier.
 #.
-#: ../src/orca/default.py:923
+#: ../src/orca/default.py:987
 msgid "Cycles to the next magnifier position."
 msgstr "å¾ªç?°è?³ä¸?ä¸?å??æ?¾å¤§é?¡ä½?ç½®ã??"
 
 #. Translators: Orca allows the item under the pointer to
 #. be spoken. This toggles the feature.
 #.
-#: ../src/orca/default.py:931
+#: ../src/orca/default.py:995
 msgid "Toggle mouse review mode."
 msgstr "å??æ??æ»?é¼ é ?è¦½æ¨¡å¼?ã??"
 
@@ -2203,37 +2212,14 @@ msgstr "å??æ??æ»?é¼ é ?è¦½æ¨¡å¼?ã??"
 #. along to the current application, bypassing Orca's
 #. interception of it.
 #.
-#: ../src/orca/default.py:943
+#: ../src/orca/default.py:1007
 msgid "Passes the next command on to the current application."
 msgstr "å?³é??ã??ä¸?ä¸?æ¥ã??æ??ä»¤çµ¦ç?®å??ç??æ??ç?¨ç¨?å¼?"
 
-#. 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:2462
-#: ../src/orca/default.py:4991 ../src/orca/default.py:5146
-#: ../src/orca/default.py:5154 ../src/orca/default.py:5262
-#: ../src/orca/default.py:5270
-#: ../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:5443
-#: ../src/orca/structural_navigation.py:3315 ../src/orca/where_am_I.py:1617
-msgid "blank"
-msgstr "ç©ºç?½"
-
 #. Translators: this is the number of space characters on a line
 #. of text.
 #.
-#: ../src/orca/default.py:2221
+#: ../src/orca/default.py:2304
 #, python-format
 msgid "%d space"
 msgid_plural "%d spaces"
@@ -2242,53 +2228,52 @@ msgstr[0] "%d å??ç©ºæ ¼"
 #. Translators: this is the number of tab characters on a line
 #. of text.
 #.
-#: ../src/orca/default.py:2233
+#: ../src/orca/default.py:2315
 #, 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:2696
-#, python-format
-msgid "Progress bar %d."
-msgstr "é?²åº¦å??%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:2704 ../src/orca/flat_review.py:444
-#: ../src/orca/speechgenerator.py:1143
-#, python-format
-msgid "%d percent."
-msgstr "ç?¾å??ä¹? %dã??"
+#: ../src/orca/default.py:2534 ../src/orca/default.py:5324
+#: ../src/orca/default.py:5480 ../src/orca/default.py:5488
+#: ../src/orca/default.py:5596 ../src/orca/default.py:5604
+#: ../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:5849
+#: ../src/orca/settings.py:1276 ../src/orca/speech_generator.py:473
+#: ../src/orca/speech_generator.py:779
+#: ../src/orca/structural_navigation.py:3304
+msgid "blank"
+msgstr "ç©ºç?½"
 
-#. 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:2955
-#: ../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:2877
 #, python-format
-msgid "tree level %d"
-msgstr "tree level %d"
-
-#. Translators: this is in reference to a table cell being
-#. selected or not.
-#.
-#: ../src/orca/default.py:2992
-msgctxt "tablecell"
-msgid " not selected"
-msgstr "æ²?æ??é?¸å??"
+msgid "Progress bar %d."
+msgstr "é?²åº¦å??%dã??"
 
 #. Translators: this object is now selected.
 #. Let the user know this.
@@ -2297,11 +2282,9 @@ msgstr "æ²?æ??é?¸å??"
 #. Translators: when the user selects (highlights) text in
 #. a document, Orca lets them know this.
 #.
-#: ../src/orca/default.py:3885 ../src/orca/default.py:4228
-#: ../src/orca/default.py:7528
-#: ../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:3921 ../src/orca/default.py:4350
+#: ../src/orca/default.py:7994 ../src/orca/speech_generator.py:863
+#: ../src/orca/speech_generator.py:887
 msgctxt "text"
 msgid "selected"
 msgstr "å·²é?¸å??"
@@ -2314,16 +2297,25 @@ msgstr "å·²é?¸å??"
 #. (unhighlights) text in a document, Orca lets
 #. them know this.
 #.
-#: ../src/orca/default.py:3891 ../src/orca/default.py:7534
+#: ../src/orca/default.py:3927 ../src/orca/default.py:8000
 msgctxt "text"
 msgid "unselected"
 msgstr "å??æ¶?é?¸å??"
 
+#. 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:4095 ../src/orca/default.py:8319
+#, fuzzy
+msgid "misspelled"
+msgstr "æ?¼é?¯å?è©?ï¼?%s"
+
 #. 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:4285
+#: ../src/orca/default.py:4407
 msgid "Speak row"
 msgstr "è®?å?ºæ?´å??"
 
@@ -2331,13 +2323,13 @@ msgstr "è®?å?ºæ?´å??"
 #. 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:4291
+#: ../src/orca/default.py:4413
 msgid "Speak cell"
 msgstr "è®?å?ºå?²å?æ ¼"
 
 #. Translators: bold as in the font sense.
 #.
-#: ../src/orca/default.py:4379 ../src/orca/where_am_I.py:1674
+#: ../src/orca/default.py:4501 ../src/orca/speech_generator.py:696
 msgid "bold"
 msgstr "ç²?é«?"
 
@@ -2348,11 +2340,11 @@ msgstr "ç²?é«?"
 #. application, so we leave things in plural form
 #. here.
 #.
-#: ../src/orca/default.py:4396 ../src/orca/default.py:4407
-#, python-format
-msgid "%s %s pixel"
-msgid_plural "%s %s pixels"
-msgstr[0] "%s %s å??ç´ "
+#: ../src/orca/default.py:4518 ../src/orca/default.py:4530
+#, fuzzy, python-format
+msgid "%(key)s %(value)s pixel"
+msgid_plural "%(key)s %(value)s pixels"
+msgstr[0] "ç?¨æ³?ï¼? %s key=value key=value ..."
 
 #. Translators: this indicates that this piece of
 #. text is a hypertext link.
@@ -2362,10 +2354,10 @@ msgstr[0] "%s %s å??ç´ "
 #. Translators: this indicates that this piece of
 #. text is a hypertext link.
 #.
-#: ../src/orca/default.py:4483 ../src/orca/default.py:6399
+#: ../src/orca/default.py:4614 ../src/orca/default.py:6747
 #: ../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 "é?£çµ?"
 
@@ -2376,7 +2368,7 @@ msgstr "é?£çµ?"
 #. along to the current application, bypassing Orca's
 #. interception of it.
 #.
-#: ../src/orca/default.py:4530
+#: ../src/orca/default.py:4725
 msgid "Bypass mode enabled."
 msgstr "å·²å??ç?¨ç?¥é??å??è?½ã??"
 
@@ -2388,7 +2380,7 @@ msgstr "å·²å??ç?¨ç?¥é??å??è?½ã??"
 #. 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:4553
+#: ../src/orca/default.py:4748
 msgid ""
 "Entering learn mode.  Press any key to hear its function.  To exit learn "
 "mode, press the escape key."
@@ -2403,14 +2395,35 @@ msgstr "é?²å?¥å¸ç¿?æ¨¡å¼?ã?? æ??ä»»ä½?é?µä¾?è?½å®?ç??å??è?½ã??è¦?é?¢é??å¸ç¿?
 #. This text here is what is to be presented on the braille
 #. display.
 #.
-#: ../src/orca/default.py:4565
+#: ../src/orca/default.py:4760
 msgid "Learn mode.  Press escape to exit."
 msgstr "å¸ç¿?æ¨¡å¼?ã?? æ??é?¢é??é?µé?¢é??ã??"
 
+#: ../src/orca/default.py:4931
+#, fuzzy
+msgid "Leaving flat review."
+msgstr "è®?å?ºç?®å??ç?? flat review è¡?ã??"
+
+#: ../src/orca/default.py:4949
+#, fuzzy
+msgid "Entering flat review."
+msgstr "è®?å?ºç?®å??ç?? flat review è¡?ã??"
+
+#. 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:5231 ../src/orca/default.py:5252
+#: ../src/orca/default.py:5272
+#, fuzzy
+msgid "Could not find current location."
+msgstr "ç?¡æ³?æ±ºå®?ã??%sã??ç??å??å§?ä½?ç½®"
+
 #. 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:4996 ../src/orca/default.py:5159
+#: ../src/orca/default.py:5329 ../src/orca/default.py:5493
 msgid "white space"
 msgstr "ç©ºç?½ç©ºé??"
 
@@ -2420,7 +2433,7 @@ msgstr "ç©ºç?½ç©ºé??"
 #. "OK" button.  This message lets them know a string
 #. they were searching for was not found.
 #.
-#: ../src/orca/default.py:5391
+#: ../src/orca/default.py:5725
 msgid "string not found"
 msgstr "æ?¾ä¸?å?°å?ä¸²"
 
@@ -2429,12 +2442,12 @@ msgstr "æ?¾ä¸?å?°å?ä¸²"
 #. thing it does is let them know what the misspelled word
 #. is.
 #.
-#: ../src/orca/default.py:6205
+#: ../src/orca/default.py:6553
 #, python-format
 msgid "Misspelled word: %s"
 msgstr "æ?¼é?¯å?è©?ï¼?%s"
 
-#: ../src/orca/default.py:6213
+#: ../src/orca/default.py:6561
 #, python-format
 msgid "Context is %s"
 msgstr "å?§æ??æ?¯ %s"
@@ -2444,7 +2457,7 @@ msgstr "å?§æ??æ?¯ %s"
 #. space characters".  The %d is the number and the %s
 #. is the spoken word for the character.
 #.
-#: ../src/orca/default.py:6351
+#: ../src/orca/default.py:6699
 #, python-format
 msgid "%(count)d %(repeatChar)s character"
 msgid_plural "%(count)d %(repeatChar)s characters"
@@ -2454,7 +2467,31 @@ msgstr[0] "%(count)d å?? %(repeatChar)s å?å??"
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7374
+#: ../src/orca/default.py:7792
+#, fuzzy
+msgid "paragraph selected down from cursor position"
+msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?é?¸å??è¡?"
+
+#: ../src/orca/default.py:7793
+#, fuzzy
+msgid "paragraph unselected down from cursor position"
+msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?å??æ¶?é?¸å??è¡?"
+
+#: ../src/orca/default.py:7794
+#, fuzzy
+msgid "paragraph selected up from cursor position"
+msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?é?¸å??è¡?"
+
+#: ../src/orca/default.py:7795
+#, fuzzy
+msgid "paragraph unselected up from cursor position"
+msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?å??æ¶?é?¸å??è¡?"
+
+#. Translators: when the user selects (highlights) text in
+#. a document, Orca will speak information about what they
+#. have selected.
+#.
+#: ../src/orca/default.py:7852
 msgid "line selected to end from previous cursor position"
 msgstr "å¾?å??ä¸?å??æ¸¸æ¨?ä½?ç½®é?¸å??è¡?è?³çµ?å°¾"
 
@@ -2462,7 +2499,7 @@ msgstr "å¾?å??ä¸?å??æ¸¸æ¨?ä½?ç½®é?¸å??è¡?è?³çµ?å°¾"
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7382
+#: ../src/orca/default.py:7860
 msgid "line selected from start to previous cursor position"
 msgstr "å¾?é??å§?å?°å??ä¸?å??æ¸¸æ¨?ä½?ç½®é?¸å??è¡?"
 
@@ -2470,14 +2507,14 @@ msgstr "å¾?é??å§?å?°å??ä¸?å??æ¸¸æ¨?ä½?ç½®é?¸å??è¡?"
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7391
+#: ../src/orca/default.py:7869
 msgid "page selected from cursor position"
 msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?é?¸å??é ?"
 
 #. Translators: when the user unselects text in a document,
 #. Orca will speak information about what they have unselected.
 #.
-#: ../src/orca/default.py:7396
+#: ../src/orca/default.py:7874
 msgid "page unselected from cursor position"
 msgstr "å¾?æ¸¸æ¨?ä½?ç½®å??æ¶?é?¸å??é ?"
 
@@ -2485,14 +2522,14 @@ msgstr "å¾?æ¸¸æ¨?ä½?ç½®å??æ¶?é?¸å??é ?"
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7405
+#: ../src/orca/default.py:7883
 msgid "page selected to cursor position"
 msgstr "é?¸å??è?³æ¸¸æ¨?ä½?ç½®ç??é ?"
 
 #. Translators: when the user unselects text in a document,
 #. Orca will speak information about what they have unselected.
 #.
-#: ../src/orca/default.py:7410
+#: ../src/orca/default.py:7888
 msgid "page unselected to cursor position"
 msgstr "å??æ¶?é?¸å??é ?è?³æ¸¸æ¨?ä½?ç½®"
 
@@ -2500,44 +2537,14 @@ msgstr "å??æ¶?é?¸å??é ?è?³æ¸¸æ¨?ä½?ç½®"
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7419
-msgid "line selected down from cursor position"
-msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?é?¸å??è¡?"
-
-#. Translators: when the user unselects text in a document,
-#. Orca will speak information about what they have unselected.
-#.
-#: ../src/orca/default.py:7424
-msgid "line unselected down from cursor position"
-msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?å??æ¶?é?¸å??è¡?"
-
-#. Translators: when the user selects (highlights) text in
-#. a document, Orca will speak information about what they
-#. have selected.
-#.
-#: ../src/orca/default.py:7433
-msgid "line selected up from cursor position"
-msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?é?¸å??è¡?"
-
-#. Translators: when the user unselects text in a document,
-#. Orca will speak information about what they have unselected.
-#.
-#: ../src/orca/default.py:7438
-msgid "line unselected up from cursor position"
-msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?å??æ¶?é?¸å??è¡?"
-
-#. Translators: when the user selects (highlights) text in
-#. a document, Orca will speak information about what they
-#. have selected.
-#.
-#: ../src/orca/default.py:7447
+#: ../src/orca/default.py:7913
 msgid "document selected to cursor position"
 msgstr "é?¸å??è?³æ¸¸æ¨?ä½?ç½®ç??æ??ä»¶"
 
 #. Translators: when the user unselects text in a document,
 #. Orca will speak information about what they have unselected.
 #.
-#: ../src/orca/default.py:7452
+#: ../src/orca/default.py:7918
 msgid "document unselected to cursor position"
 msgstr "å??æ¶?é?¸å??è?³æ¸¸æ¨?ä½?ç½®ç??æ??ä»¶"
 
@@ -2545,21 +2552,21 @@ msgstr "å??æ¶?é?¸å??è?³æ¸¸æ¨?ä½?ç½®ç??æ??ä»¶"
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7461
+#: ../src/orca/default.py:7927
 msgid "document selected from cursor position"
 msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?é?¸å??æ??ä»¶"
 
 #. Translators: when the user unselects text in a document,
 #. Orca will speak information about what they have unselected.
 #.
-#: ../src/orca/default.py:7466
+#: ../src/orca/default.py:7932
 msgid "document unselected from cursor position"
 msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??æ¶?é?¸å??æ??ä»¶"
 
 #. Translators: this means the user has selected
 #. all the text in a document (e.g., Ctrl+a in gedit).
 #.
-#: ../src/orca/default.py:7483
+#: ../src/orca/default.py:7949
 msgid "entire document selected"
 msgstr "å·²é?¸å??æ?´å??æ??ä»¶"
 
@@ -2599,59 +2606,44 @@ msgstr "å??å?°é??å§?"
 
 #. Translators: this represents the state of a checkbox.
 #.
-#: ../src/orca/flat_review.py:352
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:639
-#: ../src/orca/speechgenerator.py:451 ../src/orca/where_am_I.py:417
-#: ../src/orca/where_am_I.py:1381
+#: ../src/orca/flat_review.py:352 ../src/orca/settings.py:1301
 msgid "partially checked"
 msgstr "é?¨ä»½é?¸å??"
 
 #. 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:643
-#: ../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/flat_review.py:356 ../src/orca/settings.py:1300
 msgid "checked"
 msgstr "å·²é»?é?¸"
 
 #. Translators: this represents the state of a checkbox.
 #.
-#: ../src/orca/flat_review.py:360
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:647
-#: ../src/orca/speechgenerator.py:459 ../src/orca/where_am_I.py:425
-#: ../src/orca/where_am_I.py:1389
+#. 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/settings.py:1299
 msgid "not checked"
 msgstr "æ?ªé»?é?¸"
 
 #. 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/flat_review.py:367 ../src/orca/settings.py:1312
 msgid "pressed"
 msgstr "å·²æ??ä¸?"
 
 #. Translators: the state of a toggle button.
 #.
-#: ../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
+#. 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/settings.py:1312
 msgid "not pressed"
 msgstr "æ?ªæ??ä¸?"
 
 #. Translators: this is in reference to a radio button being
 #. selected or not.
 #.
-#: ../src/orca/flat_review.py:379
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:583
-#: ../src/orca/speechgenerator.py:1201 ../src/orca/where_am_I.py:223
+#: ../src/orca/flat_review.py:379 ../src/orca/settings.py:1307
 msgctxt "radiobutton"
 msgid "selected"
 msgstr "å·²é?¸å??"
@@ -2659,9 +2651,10 @@ msgstr "å·²é?¸å??"
 #. Translators: this is in reference to a radio button being
 #. selected or not.
 #.
-#: ../src/orca/flat_review.py:384
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:588
-#: ../src/orca/speechgenerator.py:1206 ../src/orca/where_am_I.py:228
+#. 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/settings.py:1306
 msgctxt "radiobutton"
 msgid "not selected"
 msgstr "æ²?æ??é?¸å??"
@@ -2678,15 +2671,38 @@ msgstr "æ°´å¹³"
 msgid "vertical"
 msgstr "å??ç?´ç??"
 
+#. 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ã??"
+
+#. 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:191
+#: ../src/orca/tutorialgenerator.py:526 ../src/orca/tutorialgenerator.py:566
+msgid "toggle"
+msgstr "å??æ??"
+
 #. 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:952
 msgid "No focus"
 msgstr "æ²?æ??ç?¦é»?"
 
-#: ../src/orca/gnomespeechfactory.py:221
+#: ../src/orca/gnomespeechfactory.py:235
 msgid "GNOME Speech Services"
 msgstr "GNOME æ??è®?æ??å??"
 
@@ -2696,7 +2712,7 @@ msgstr "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 " é»?é»?é»?"
 
@@ -2707,15 +2723,15 @@ msgstr " é»?é»?é»?"
 #. 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 "è² "
 
 #. 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 "è¼?é«?ã??"
 
@@ -2723,8 +2739,8 @@ msgstr "è¼?é«?ã??"
 #. 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 "è¼?ä½?ã??"
 
@@ -2732,8 +2748,8 @@ msgstr "è¼?ä½?ã??"
 #. 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 "è¼?å¿«ã??"
 
@@ -2742,8 +2758,8 @@ msgstr "è¼?å¿«ã??"
 #. 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 "è¼?æ?¢ã??"
 
@@ -2961,7 +2977,7 @@ msgstr "é?¸å?®"
 #: ../src/orca/keynames.py:193
 #, fuzzy
 msgid "ISO level 3 shift"
-msgstr "æ³¢ç¾?ç??æµ·èª?ç³» (ISO-8859-4)"
+msgstr "é??ç½®æ?¹è®?æ?¹å¼?"
 
 #. Translators: this is how someone would speak the name of the help key
 #.
@@ -3014,8 +3030,49 @@ msgstr "çµ?æ??"
 #. Translators: this is how someone would speak the name of the begin key
 #.
 #: ../src/orca/keynames.py:245
+#, fuzzy
 msgid "begin"
-msgstr ""
+msgstr "é??å§?"
+
+#. Translators: this is how someone would speak the name of the
+#. non-spacing diacritical key for the acute glyph
+#.
+#: ../src/orca/keynames.py:255
+#, fuzzy
+msgid "acute"
+msgstr "a acute"
+
+#. Translators: this is how someone would speak the name of the
+#. non-spacing diacritical key for the circumflex glyph
+#.
+#: ../src/orca/keynames.py:260
+#, fuzzy
+msgid "circumflex"
+msgstr "A CIRCUMFLEX"
+
+#. Translators: this is how someone would speak the name of the
+#. non-spacing diacritical key for the diaeresis glyph
+#.
+#: ../src/orca/keynames.py:270
+#, fuzzy
+msgid "diaeresis"
+msgstr "åº¦"
+
+#. Translators: this is how someone would speak the name of the
+#. non-spacing diacritical key for the ring glyph
+#.
+#: ../src/orca/keynames.py:275
+#, fuzzy
+msgid "ring"
+msgstr "A RING"
+
+#. Translators: this is how someone would speak the name of the
+#. non-spacing diacritical key for the stroke glyph
+#.
+#: ../src/orca/keynames.py:285
+#, fuzzy
+msgid "stroke"
+msgstr "O STROKE"
 
 #. Translators:  sets the live region politeness level to polite
 #.
@@ -3047,7 +3104,7 @@ msgstr ""
 #: ../src/orca/liveregions.py:299
 #, fuzzy
 msgid "no live message saved"
-msgstr "é?µä»¶æ²?æ??é??å? æª?æ¡?"
+msgstr "æ²?æ?? %s é??é¡?é?µä»¶å?¨ %s ä¸"
 
 #. Translators: This lets the user know that all live regions
 #. have been turned off.
@@ -3073,7 +3130,7 @@ msgstr "politeness level %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 "è?²å½©å¼·å??å·²é??é??ã??"
 
@@ -3081,7 +3138,7 @@ msgstr "è?²å½©å¼·å??å·²é??é??ã??"
 #. 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 "è?²å½©å¼·å??å·²é??å??ã??"
 
@@ -3090,7 +3147,7 @@ msgstr "è?²å½©å¼·å??å·²é??å??ã??"
 #. 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 "æ»?é¼ å¢?å¼·å??è?½å·²å??ç?¨ã??"
 
@@ -3099,7 +3156,7 @@ msgstr "æ»?é¼ å¢?å¼·å??è?½å·²å??ç?¨ã??"
 #. 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 "æ»?é¼ å¢?å¼·å??è?½å·²å??ç?¨ã??"
 
@@ -3107,7 +3164,7 @@ msgstr "æ»?é¼ å¢?å¼·å??è?½å·²å??ç?¨ã??"
 #. magnifier.  In addition to screen magnification, the user's
 #. preferred colors and mouse customizations are loaded.
 #.
-#: ../src/orca/mag.py:1690
+#: ../src/orca/mag.py:1684
 msgid "Magnifier enabled."
 msgstr "æ?¾å¤§é?¡å·²å??ç?¨ã??"
 
@@ -3115,7 +3172,7 @@ msgstr "æ?¾å¤§é?¡å·²å??ç?¨ã??"
 #. magnifier, restoring the screen contents to their normal colors
 #. and sizes.
 #.
-#: ../src/orca/mag.py:1697
+#: ../src/orca/mag.py:1691
 msgid "Magnifier disabled."
 msgstr "æ?¾å¤§é?¡å·²å??ç?¨ã??"
 
@@ -3124,49 +3181,233 @@ msgstr "æ?¾å¤§é?¡å·²å??ç?¨ã??"
 #. 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:1844
+#: ../src/orca/orca_gui_prefs.py:1870 ../src/orca/orca_gui_prefs.py:1873
+#: ../src/orca/orca-setup.ui.h:66
 msgid "Full Screen"
 msgstr "å?¨è?¢å¹?"
 
 #. 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 "ç?¡æ³?ä½¿ç?¨å?¨è?¢å¹?æ¨¡å¼?"
 
 #. 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:1848
+#: ../src/orca/orca_gui_prefs.py:1874 ../src/orca/orca-setup.ui.h:119
 msgid "Top Half"
 msgstr "ä¸?å??é?¨"
 
 #. 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:1852
+#: ../src/orca/orca_gui_prefs.py:1875 ../src/orca/orca-setup.ui.h:27
 msgid "Bottom Half"
 msgstr "ä¸?å??é?¨"
 
 #. 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:1856
+#: ../src/orca/orca_gui_prefs.py:1876 ../src/orca/orca-setup.ui.h:74
 msgid "Left Half"
 msgstr "å·¦å??é?¨"
 
 #. 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:1860
+#: ../src/orca/orca_gui_prefs.py:1877 ../src/orca/orca-setup.ui.h:96
 msgid "Right Half"
 msgstr "å?³å??é?¨"
 
 #. 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:1865
+#: ../src/orca/orca_gui_prefs.py:1878 ../src/orca/orca-setup.ui.h:39
 msgid "Custom"
 msgstr "è?ªè¨?"
 
+#: ../src/orca/orca-advanced-magnification.ui.h:1
+msgid "<b>Brightness</b>"
+msgstr "<b>äº®åº¦</b>"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:2
+msgid "<b>Contrast</b>"
+msgstr "<b>å°?æ¯?</b>"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:3
+msgid "<b>Multi-monitor Settings</b>"
+msgstr "<b>å¤?è?¢å¹?è¨å®?å?¼</b>"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:4
+msgid "Advanced Settings"
+msgstr "é?²é??è¨å®?"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:5
+msgid "B_lue:"
+msgstr "è??è?²(_L):"
+
+#. 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:4482 ../src/orca/orca_gui_prefs.py:4493
+#: ../src/orca/orca_gui_prefs.py:4495 ../src/orca/orca_gui_prefs.py:4516
+msgid "Bilinear"
+msgstr "é??ç·?æ?§"
+
+#. 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:4739 ../src/orca/orca_gui_prefs.py:4766
+#: ../src/orca/orca_gui_prefs.py:4837
+#, fuzzy
+msgid "Desaturate blue"
+msgstr "è??è?²æ©«ç´?"
+
+#. 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:4731 ../src/orca/orca_gui_prefs.py:4829
+#, fuzzy
+msgid "Desaturate green"
+msgstr "é??è??å?°"
+
+#. 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:4723 ../src/orca/orca_gui_prefs.py:4765
+#: ../src/orca/orca_gui_prefs.py:4821
+#, fuzzy
+msgid "Desaturate red"
+msgstr "ç´?è?² joker"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:10
+msgid "Gree_n:"
+msgstr "ç¶ è?²(_N):"
+
+#. 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:4755 ../src/orca/orca_gui_prefs.py:4768
+#: ../src/orca/orca_gui_prefs.py:4853
+#, fuzzy
+msgid "Negative hue shift"
+msgstr "è² å??è?²èª¿å??ç§»"
+
+#. 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:86 ../src/orca/orca_gui_prefs.py:1921
+#: ../src/orca/orca_gui_prefs.py:1941 ../src/orca/orca_gui_prefs.py:4488
+#: ../src/orca/orca_gui_prefs.py:4495 ../src/orca/orca_gui_prefs.py:4518
+#: ../src/orca/orca_gui_prefs.py:4691 ../src/orca/orca_gui_prefs.py:4758
+#: ../src/orca/orca_gui_prefs.py:4761 ../src/orca/orca_gui_prefs.py:4789
+#: ../src/orca/orca-setup.ui.h:83
+msgid "None"
+msgstr "æ²?æ??"
+
+#. 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:4747 ../src/orca/orca_gui_prefs.py:4767
+#: ../src/orca/orca_gui_prefs.py:4845
+#, fuzzy
+msgid "Positive hue shift"
+msgstr "æ£å??è?²èª¿å??ç§»"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:14
+msgid "R_ed:"
+msgstr "ç´?è?²(_E):"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:15
+msgid "S_ource display:"
+msgstr "å??å§?é¡¯ç¤º(_O):"
+
+#. 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:4715 ../src/orca/orca_gui_prefs.py:4764
+#: ../src/orca/orca_gui_prefs.py:4813
+#, fuzzy
+msgid "Saturate blue"
+msgstr "è??è?²æ©«ç´?"
+
+#. 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:4707 ../src/orca/orca_gui_prefs.py:4763
+#: ../src/orca/orca_gui_prefs.py:4805
+#, fuzzy
+msgid "Saturate green"
+msgstr "é??è??å?°"
+
+#. 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:4699 ../src/orca/orca_gui_prefs.py:4762
+#: ../src/orca/orca_gui_prefs.py:4797
+#, fuzzy
+msgid "Saturate red"
+msgstr "ç´?è?² joker"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:19
+msgid "Target displa_y:"
+msgstr "ç?®æ¨?é¡¯ç¤º(_Y):"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:20
+msgid "_Blue:"
+msgstr "è??(_B):"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:21
+msgid "_Color Filtering:"
+msgstr "é¡?è?²æ¿¾é?¡(_C):"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:22
+msgid "_Green:"
+msgstr "ç¶ (_G):"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:23
+msgid "_Red:"
+msgstr "ç´?(_R):"
+
+#: ../src/orca/orca-advanced-magnification.ui.h:24
+msgid "_Smoothing:"
+msgstr "å??æ»?(_S):"
+
 #. 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
@@ -3183,18 +3424,18 @@ msgstr "è?ªè¨?"
 #. 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 ""
+msgstr "^[Yy1]"
 
 #. 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:135 ../src/orca/orca_console_prefs.py:154
 msgid "Speech is unavailable."
 msgstr "èª?é?³å??è?½ä¸?å?å?¨ã??"
 
-#: ../src/orca/orca_console_prefs.py:140
+#: ../src/orca/orca_console_prefs.py:139
 msgid "Welcome to Orca setup."
 msgstr "æ¡è¿?ä½¿ç?¨ Orca è¨å®?ã??"
 
@@ -3204,36 +3445,36 @@ msgstr "æ¡è¿?ä½¿ç?¨ 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:163
 msgid "Select desired speech system:"
 msgstr "é?¸æ??å??å¥½ç??èª?é?³ç³»çµ±ï¼?"
 
 #. 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:174 ../src/orca/orca_console_prefs.py:206
+#: ../src/orca/orca_console_prefs.py:253 ../src/orca/orca_console_prefs.py:402
 msgid "Enter choice: "
 msgstr "è¼¸å?¥é?¸æ??ï¼?"
 
 #. 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:211 ../src/orca/orca_console_prefs.py:227
-#: ../src/orca/orca_console_prefs.py:261
+#: ../src/orca/orca_console_prefs.py:178 ../src/orca/orca_console_prefs.py:189
+#: ../src/orca/orca_console_prefs.py:210 ../src/orca/orca_console_prefs.py:226
+#: ../src/orca/orca_console_prefs.py:260
 msgid "Speech will not be used.\n"
 msgstr "ä¸?æ??ä½¿ç?¨èª?é?³å??è?½ã??\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:188
 msgid "No servers available.\n"
 msgstr "æ²?æ??ä¼ºæ??å?¨å?å?¨ã??\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:195
 msgid "Select desired speech server."
 msgstr "é?¸æ??å??å¥½ç??èª?é?³ä¼ºæ??å?¨ã??"
 
@@ -3241,7 +3482,7 @@ msgstr "é?¸æ??å??å¥½ç??èª?é?³ä¼ºæ??å?¨ã??"
 #. 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:222
 msgid "No voices available.\n"
 msgstr "æ²?æ??è?²é?³å?å?¨ã??\n"
 
@@ -3249,14 +3490,14 @@ msgstr "æ²?æ??è?²é?³å?å?¨ã??\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:233
 msgid "Select desired voice:"
 msgstr "é?¸æ??å??å¥½ç??è?²é?³ï¼?"
 
 #. 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:294
 msgid "Enable echo by word?  Enter y or n: "
 msgstr "å??ç?¨å?è©?å??é?¿ï¼? è¼¸å?¥ y æ?? nï¼?"
 
@@ -3264,35 +3505,35 @@ msgstr "å??ç?¨å?è©?å??é?¿ï¼? è¼¸å?¥ y æ?? nï¼?"
 #. 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:305
 msgid "Enable key echo?  Enter y or n: "
 msgstr "å??ç?¨æ??é?µå??é?¿ï¼? è¼¸å?¥ y æ?? nï¼?"
 
 #. 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:317
 msgid "Enable alphanumeric and punctuation keys?  Enter y or n: "
 msgstr "å??ç?¨æ??æ?¸å?å??å??æ¨?é»?ç¬¦è??æ??é?µï¼? è¼¸å?¥ y æ?? nï¼?"
 
 #. 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:327
 msgid "Enable modifier keys?  Enter y or n: "
 msgstr "å??ç?¨ä¿®æ?¹é?µï¼? è¼¸å?¥ y æ?? nï¼?"
 
 #. 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:337
 msgid "Enable locking keys?  Enter y or n: "
 msgstr "å??ç?¨é??å®?é?µï¼? è¼¸å?¥ y æ?? nï¼?"
 
 #. 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:347
 msgid "Enable function keys?  Enter y or n: "
 msgstr "å??ç?¨å??è?½é?µï¼? è¼¸å?¥ y æ?? nï¼?"
 
@@ -3300,7 +3541,7 @@ msgstr "å??ç?¨å??è?½é?µï¼? è¼¸å?¥ y æ?? nï¼?"
 #. 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:358
 msgid "Enable action keys?  Enter y or n: "
 msgstr "å??ç?¨å??ä½?é?µï¼? è¼¸å?¥ y æ?? nï¼?"
 
@@ -3308,7 +3549,7 @@ msgstr "å??ç?¨å??ä½?é?µï¼? è¼¸å?¥ y æ?? 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:378
+#: ../src/orca/orca_console_prefs.py:377
 msgid "Select desired keyboard layout."
 msgstr "é?¸æ??å??å¥½ç??é?µç?¤é??ç½®ã??"
 
@@ -3316,7 +3557,7 @@ msgstr "é?¸æ??å??å¥½ç??é?µç?¤é??ç½®ã??"
 #. 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:389
 msgid "1. Desktop"
 msgstr "1. æ¡?é?¢"
 
@@ -3324,18 +3565,18 @@ msgstr "1. æ¡?é?¢"
 #. 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:396
 msgid "2. Laptop"
 msgstr "2. ç?è¨?æ?¬é?»è?¦"
 
-#: ../src/orca/orca_console_prefs.py:414
+#: ../src/orca/orca_console_prefs.py:413
 msgid "Invalid choice. Selecting desktop keyboard layout.\n"
 msgstr "ç?¡æ??ç??é?¸æ??ã??æ£é?¸æ??æ¡?é?¢é?µç?¤é??ç½®ã??\n"
 
 #. 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:441
 msgid "Enable Braille?  Enter y or n: "
 msgstr "å??ç?¨é»?å?ï¼? è¼¸å?¥ y æ?? nï¼?"
 
@@ -3344,46 +3585,46 @@ msgstr "å??ç?¨é»?å?ï¼? è¼¸å?¥ y æ?? nï¼?"
 #. 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:453
 msgid "Enable Braille Monitor?  Enter y or n: "
 msgstr "å??ç?¨é»?å?ç?£å¯?å?¨ï¼?è¼¸å?¥ y æ?? nï¼?"
 
 #. 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:463
 msgid "Automatically start orca when you log in?  Enter y or n: "
 msgstr "æ?¯å?¦å?¨æ?¨ç?»å?¥æ??è?ªå??å??å?? orcaï¼?æ?? y æ?? nï¼?"
 
-#: ../src/orca/orca_console_prefs.py:480 ../src/orca/orca_gui_prefs.py:456
+#: ../src/orca/orca_console_prefs.py:473 ../src/orca/orca_gui_prefs.py:471
 msgid "Accessibility support for GNOME has just been enabled."
 msgstr "å·²ç¶?å??ç?¨ GNOME ç??ç?¡é??ç¤?ç?°å¢?ã??"
 
-#: ../src/orca/orca_console_prefs.py:486 ../src/orca/orca_gui_prefs.py:458
+#: ../src/orca/orca_console_prefs.py:479 ../src/orca/orca_gui_prefs.py:473
 msgid "You need to log out and log back in for the change to take effect."
 msgstr "é??è¦?ç?»å?ºå¾?å??ç?»å?¥ä¾?å¥?ç?¨æ?°è¨å®?ã??"
 
-#: ../src/orca/orca_console_prefs.py:494
+#: ../src/orca/orca_console_prefs.py:487
 msgid "Do you want to logout now?  Enter y or n: "
 msgstr "æ?¨ç¢ºå®?ç?¾å?¨è¦?ç?»å?ºå??ï¼?æ?? y æ?? nï¼?"
 
-#: ../src/orca/orca_console_prefs.py:500
+#: ../src/orca/orca_console_prefs.py:493
 msgid "Setup complete. Logging out now."
 msgstr "è¨å®?å®?æ??ã??ç?¾å?¨ç?»å?ºã??"
 
-#: ../src/orca/orca_console_prefs.py:514
+#: ../src/orca/orca_console_prefs.py:507
 msgid "Setup complete.  Press Return to continue."
 msgstr "è¨å®?å®?æ??ã??  æ?? Enter ç¹¼çº?ã??"
 
-#: ../src/orca/orca-find.glade.h:1
+#: ../src/orca/orca-find.ui.h:1
 msgid "<b>Start from:</b>"
 msgstr "<b>é??å§?è?ªï¼?</b>"
 
-#: ../src/orca/orca-find.glade.h:2 ../src/orca/orca_gui_find.py:147
+#: ../src/orca/orca-find.ui.h:2 ../src/orca/orca_gui_find.py:147
 msgid "C_urrent location"
 msgstr "ç?®å??ä½?ç½®(_U)"
 
-#: ../src/orca/orca-find.glade.h:3
+#: ../src/orca/orca-find.ui.h:3
 msgid "Close"
 msgstr "é??é??"
 
@@ -3397,50 +3638,49 @@ msgstr "é??é??"
 #. 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/scripts/apps/gedit/script.py:320
+#: ../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 "å°?æ?¾"
 
-#: ../src/orca/orca-find.glade.h:5
+#: ../src/orca/orca-find.ui.h:5
 msgid "Match _entire word only"
 msgstr "å?ªç¬¦å??æ?´å??å?è©?(_E)"
 
-#: ../src/orca/orca-find.glade.h:6
+#: ../src/orca/orca-find.ui.h:6
 msgid "Orca Find Dialog"
 msgstr "Orca å°?æ?¾å°?è©±è¦?çª?"
 
-#: ../src/orca/orca-find.glade.h:7
+#: ../src/orca/orca-find.ui.h:7
 msgid "Search _backwards"
 msgstr "å??ä¸?æ??å°?(_B)"
 
-#: ../src/orca/orca-find.glade.h:8
+#: ../src/orca/orca-find.ui.h:8
 msgid "Search for:"
 msgstr "æ??å°?ï¼?"
 
-#: ../src/orca/orca-find.glade.h:9
+#: ../src/orca/orca-find.ui.h:9
 msgid "Start from:"
 msgstr "é??å§?è?ªï¼?"
 
-#: ../src/orca/orca-find.glade.h:10
+#: ../src/orca/orca-find.ui.h:10
 msgid "Top of window"
 msgstr "æ??ä¸?å±¤è¦?çª?"
 
-#: ../src/orca/orca-find.glade.h:11
+#: ../src/orca/orca-find.ui.h:11
 msgid "_Match case"
 msgstr "ç¬¦å??å¤§å°?å¯«(_M)"
 
-#: ../src/orca/orca-find.glade.h:12
+#: ../src/orca/orca-find.ui.h:12
 msgid "_Search for:"
 msgstr "æ??å°?å?ä¸²(_S):"
 
-#: ../src/orca/orca-find.glade.h:13
+#: ../src/orca/orca-find.ui.h:13
 msgid "_Top of window"
 msgstr "æ??ä¸?å±¤è¦?çª?(_T)"
 
-#: ../src/orca/orca-find.glade.h:14
+#: ../src/orca/orca-find.ui.h:14
 msgid "_Wrap around"
 msgstr "å??å?°æª?æ¡?é??å§?é?¨ä»½å??æ??å°?(_W)"
 
@@ -3449,24 +3689,11 @@ msgstr "å??å?°æª?æ¡?é??å§?é?¨ä»½å??æ??å°?(_W)"
 #. 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:80 ../src/orca/orca_gui_prefs.py:1921
+#: ../src/orca/orca_gui_prefs.py:1941 ../src/orca/orca-setup.ui.h:32
 msgid "Centered"
 msgstr "ç½®ä¸"
 
-#. 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 "æ²?æ??"
-
 #. 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
@@ -3475,7 +3702,8 @@ msgstr "æ²?æ??"
 #. 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:96 ../src/orca/orca_gui_prefs.py:1921
+#: ../src/orca/orca-setup.ui.h:91
 msgid "Proportional"
 msgstr "æ??æ¯?ä¾?ç??"
 
@@ -3484,7 +3712,8 @@ msgstr "æ??æ¯?ä¾?ç??"
 #. 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:103 ../src/orca/orca_gui_prefs.py:1921
+#: ../src/orca/orca_gui_prefs.py:1941 ../src/orca/orca-setup.ui.h:92
 msgid "Push"
 msgstr "æ?¨"
 
@@ -3495,7 +3724,7 @@ msgstr "æ?¨"
 #. 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:227
 msgid "Function"
 msgstr "å??è?½"
 
@@ -3503,7 +3732,7 @@ msgstr "å??è?½"
 #. 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:305
 msgid "Key Binding"
 msgstr "æ??é?µçµ?å??"
 
@@ -3514,7 +3743,7 @@ msgstr "æ??é?µçµ?å??"
 #. addition to the key bindings in the "Key Bindings"
 #. column.
 #.
-#: ../src/orca/orca_gui_prefs.py:356
+#: ../src/orca/orca_gui_prefs.py:384
 msgid "Alternate"
 msgstr "Alternate"
 
@@ -3522,28 +3751,35 @@ msgstr "Alternate"
 #. 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:404
 msgid "Modified"
 msgstr "å·²ä¿®æ?¹"
 
-#. 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:721
+#, fuzzy
+msgctxt "VoiceType"
 msgid "Default"
-msgstr "é ?è¨"
+msgstr "é ?è¨å?¼"
 
-#. 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:725
+#, fuzzy
+msgctxt "VoiceType"
 msgid "Uppercase"
-msgstr "å¤§å¯«å?æ¯?"
+msgstr "å?æ¯?ï¼?å¤§å¯«"
 
-#. 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:730
+msgctxt "VoiceType"
 msgid "Hyperlink"
 msgstr "è¶?é?£çµ?"
 
@@ -3552,7 +3788,7 @@ msgstr "è¶?é?£çµ?"
 #. 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:1153
 msgid "Attribute Name"
 msgstr "å±¬æ?§å??ç¨±"
 
@@ -3563,7 +3799,7 @@ msgstr "å±¬æ?§å??ç¨±"
 #. 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:1168
 msgid "Speak"
 msgstr "è®?å?º "
 
@@ -3574,7 +3810,7 @@ msgstr "è®?å?º "
 #. 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:1186
 #, fuzzy
 msgid "Mark in braille"
 msgstr "å?¨é?µä»¶ã??é ?è¦½ã??ä¸æ¨?ç¤ºå¼?ç?¨"
@@ -3594,10 +3830,10 @@ msgstr "å?¨é?µä»¶ã??é ?è¦½ã??ä¸æ¨?ç¤ºå¼?ç?¨"
 #. 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:1212
 #, fuzzy
 msgid "Present Unless"
-msgstr "å¦?æ??ä¾? HTML å??é¡¯ç¤ºä¹?"
+msgstr "é¡¯ç¤ºå·¥å?·æ??ç¤º(_P)"
 
 #. Pronunciation Dictionary actual string (word) column (ACTUAL).
 #.
@@ -3606,7 +3842,7 @@ msgstr "å¦?æ??ä¾? HTML å??é¡¯ç¤ºä¹?"
 #. 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:1326
 msgid "Actual String"
 msgstr "å¯¦é??å?ä¸²"
 
@@ -3617,15 +3853,106 @@ msgstr "å¯¦é??å?ä¸²"
 #. 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:1343
 msgid "Replacement String"
 msgstr "ç½®æ??å?ä¸²"
 
+#. 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:1529 ../src/orca/orca-setup.ui.h:29
+msgid "Break speech into ch_unks between pauses"
+msgstr ""
+
+#. 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:1541 ../src/orca/orca_gui_prefs.py:3043
+#: ../src/orca/orca-setup.ui.h:75
+msgid "Line"
+msgstr "è¡?"
+
+#. 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:1541 ../src/orca/orca_gui_prefs.py:3049
+#: ../src/orca/orca-setup.ui.h:99
+msgid "Sentence"
+msgstr "å?¥å?"
+
+#. 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.
+#.
+#. 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_gui_prefs.py:1559 ../src/orca/orca-setup.ui.h:95
+#, fuzzy
+msgid "Restrict progress bar updates to:"
+msgstr "å??é?²åº¦å??æ??é??ç?? GtkAdjustmentï¼?ä¸?å»ºè°å??ä½¿ç?¨ï¼?"
+
+#. 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:1571 ../src/orca/orca_gui_prefs.py:3008
+msgctxt "ProgressBar"
+msgid "All"
+msgstr "å?¨é?¨"
+
+#. 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:1578
+msgctxt "ProgressBar"
+msgid "Application"
+msgstr "æ??ç?¨ç¨?å¼?"
+
+#. 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:1584 ../src/orca/orca_gui_prefs.py:3016
+msgctxt "ProgressBar"
+msgid "Window"
+msgstr "è¦?çª?"
+
+#. Translators: When this option is enabled, dead keys will be
+#. announced when pressed.
+#.
+#: ../src/orca/orca_gui_prefs.py:1691 ../src/orca/orca-setup.ui.h:65
+#, fuzzy
+msgid "Enable non-spacing _diacritical keys"
+msgstr "å??ç?¨å°?è¦½é?µ(_N)"
+
+#. 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.
+#.
+#: ../src/orca/orca_gui_prefs.py:1699 ../src/orca/orca-setup.ui.h:63
+#, fuzzy
+msgid "Enable echo by cha_racter"
+msgstr "å??ç?¨å?è©?å??é?¿ï¼? è¼¸å?¥ y æ?? nï¼?"
+
 #. 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:2211
 msgid "(double click)"
 msgstr "(é??æ??)"
 
@@ -3633,7 +3960,7 @@ msgstr "(é??æ??)"
 #. and triple "clicks" or key presses, similar to
 #. using a mouse.
 #.
-#: ../src/orca/orca_gui_prefs.py:2082
+#: ../src/orca/orca_gui_prefs.py:2217
 msgid "(triple click)"
 msgstr "(ä¸?æ??)"
 
@@ -3642,7 +3969,7 @@ msgstr "(ä¸?æ??)"
 #. 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:2321 ../src/orca/orca_gui_prefs.py:2419
 msgid "Braille Bindings"
 msgstr "é»?å?æ??é?µçµ?å??"
 
@@ -3651,8 +3978,8 @@ msgstr "é»?å?æ??é?µçµ?å??"
 #. 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:2853 ../src/orca/orca_gui_prefs.py:2894
+#: ../src/orca/orca_gui_prefs.py:2934 ../src/orca/orca-setup.ui.h:44
 #, fuzzy
 msgid "Dot _7"
 msgstr "é»?"
@@ -3661,8 +3988,8 @@ msgstr "é»?"
 #. 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:2860 ../src/orca/orca_gui_prefs.py:2901
+#: ../src/orca/orca_gui_prefs.py:2941 ../src/orca/orca-setup.ui.h:45
 #, fuzzy
 msgid "Dot _8"
 msgstr "é»?"
@@ -3671,15 +3998,16 @@ msgstr "é»?"
 #. 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:2867 ../src/orca/orca_gui_prefs.py:2908
+#: ../src/orca/orca_gui_prefs.py:2948 ../src/orca/orca-setup.ui.h:46
+#, fuzzy
 msgid "Dots 7 an_d 8"
-msgstr ""
+msgstr "æ??é»?"
 
 #. 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:2971 ../src/orca/orca-setup.ui.h:135
 msgid "_None"
 msgstr "æ²?æ??(_N)"
 
@@ -3688,7 +4016,7 @@ msgstr "æ²?æ??(_N)"
 #. 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:2979 ../src/orca/orca-setup.ui.h:101
 msgid "So_me"
 msgstr "ä¸?äº?(_M)"
 
@@ -3696,32 +4024,16 @@ msgstr "ä¸?äº?(_M)"
 #. 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:2986 ../src/orca/orca-setup.ui.h:76
 msgid "M_ost"
 msgstr "å¤§é?¨ä»½(_O)"
 
-#. 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 "è¡?"
-
-#. 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 "å?¥å?"
-
 #. 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:3069 ../src/orca/orca_gui_prefs.py:3200
+#: ../src/orca/orca-setup.ui.h:30
 msgid "Brie_f"
 msgstr "ç°¡ç?(_F)"
 
@@ -3729,7 +4041,7 @@ msgstr "ç°¡ç?(_F)"
 #. 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:3093 ../src/orca/orca-setup.ui.h:107
 msgid "Speak current _cell"
 msgstr "è®?å?ºç?®å??ç??å?²å?æ ¼(_C)"
 
@@ -3737,7 +4049,7 @@ msgstr "è®?å?ºç?®å??ç??å?²å?æ ¼(_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:3847
 msgid "enter new key"
 msgstr "è¼¸å?¥æ?°ç??æ??é?µ"
 
@@ -3745,7 +4057,7 @@ msgstr "è¼¸å?¥æ?°ç??æ??é?µ"
 #. Orca has deleted an existing key combination based upon
 #. their input.
 #.
-#: ../src/orca/orca_gui_prefs.py:3657
+#: ../src/orca/orca_gui_prefs.py:3876
 msgid "Key binding deleted. Press enter to confirm."
 msgstr "æ??é?µçµ?å??å·²å?ªé?¤ã??æ?? enter ç¢ºèª?ã??"
 
@@ -3753,7 +4065,7 @@ msgstr "æ??é?µçµ?å??å·²å?ªé?¤ã??æ?? enter ç¢ºèª?ã??"
 #. 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:3900
 #, python-format
 msgid "The key entered is already bound to %s"
 msgstr "è¼¸å?¥ç??æ??é?µå·²ç¹«çµ?æ?¼ %s"
@@ -3762,7 +4074,7 @@ msgstr "è¼¸å?¥ç??æ??é?µå·²ç¹«çµ?æ?¼ %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:3907
 #, python-format
 msgid "Key captured: %s. Press enter to confirm."
 msgstr "æ??é?µæ?·å??ï¼?%sã??æ?? enter ç¢ºèª?ã??"
@@ -3771,7 +4083,7 @@ msgstr "æ??é?µæ?·å??ï¼?%sã??æ?? enter ç¢ºèª?ã??"
 #. 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:3946
 #, python-format
 msgid "The new key is: %s"
 msgstr "æ?°ç??æ??é?µæ?¯ï¼?%s"
@@ -3780,118 +4092,30 @@ msgstr "æ?°ç??æ??é?µæ?¯ï¼?%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:3954
 msgid "The keybinding has been removed."
 msgstr "è©²æ??é?µçµ?å??å·²ç¶?è¢«ç§»é?¤ã??"
 
 #. 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:4032 ../src/orca/orca-setup.ui.h:129
 msgid "_Desktop"
 msgstr "æ¡?é?¢(_D)"
 
-#. 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 "é??ç·?æ?§"
-
-#. 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
-#, fuzzy
-msgid "Saturate red"
-msgstr "Ã©Â?Â·Ã¥Â¸Â?Ã¦Â?Â?Ã¥Â¤Â«"
-
-#. 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
-#, fuzzy
-msgid "Saturate green"
-msgstr "Ã¥Â¸Â?Ã¦Â?Â?Ã¦Â Â¼Ã©Â?Âµ"
-
-#. 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
-#, fuzzy
-msgid "Saturate blue"
-msgstr "Blue Canyon"
-
-#. 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
-#, fuzzy
-msgid "Desaturate red"
-msgstr "Ã©Â?Â·Ã¥Â¸Â?Ã¦Â?Â?Ã¥Â¤Â«"
-
-#. 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
-#, fuzzy
-msgid "Desaturate green"
-msgstr "Ã¥Â¸Â?Ã¦Â?Â?Ã¦Â Â¼Ã©Â?Âµ"
-
-#. 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
-#, fuzzy
-msgid "Desaturate blue"
-msgstr "Blue Canyon"
-
-#. 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
-#, fuzzy
-msgid "Positive hue shift"
-msgstr "èª¿æ?´è?²ç?¸/äº®åº¦/å½©åº¦"
-
-#. 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
-#, fuzzy
-msgid "Negative hue shift"
-msgstr "èª¿æ?´è?²ç?¸/äº®åº¦/å½©åº¦"
-
 #. Translators: Orca Preferences is the configuration GUI for Orca.
 #.
-#: ../src/orca/orca_gui_prefs.py:4833
+#: ../src/orca/orca_gui_prefs.py:5090
 msgid "Starting Orca Preferences."
 msgstr "å??å?? Orca å??å¥½è¨å®?ã??"
 
-#: ../src/orca/orca-mainwin.glade.h:1
+#: ../src/orca/orca-mainwin.ui.h:1
 msgid "Orca Screen Reader / Magnifier"
 msgstr "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:291 ../src/orca/orca.py:1353 ../src/orca/orca.py:1354
 msgid "Goodbye."
 msgstr "å??è¦?ã??"
 
@@ -3904,21 +4128,43 @@ msgstr "å??è¦?ã??"
 #. Exiting learn mode puts the user back in normal operating
 #. mode.
 #.
-#: ../src/orca/orca.py:353
+#: ../src/orca/orca.py:363
 msgid "Exiting learn mode."
 msgstr "é?¢é??å¸ç¿?æ¨¡å¼?ã??"
 
+#. 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:612
+#: ../src/orca/scripts/apps/soffice/speech_generator.py:172
+#: ../src/orca/speech.py:261 ../src/orca/speechserver.py:218
+msgid "off"
+msgstr " é??"
+
+#. 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:616
+#: ../src/orca/scripts/apps/soffice/speech_generator.py:168
+#: ../src/orca/speech.py:256 ../src/orca/speechserver.py:213
+msgid "on"
+msgstr " é??"
+
 #. 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:954
 msgid "Speech enabled."
 msgstr "å·²å??ç?¨æ??è®?å??è?½ã??"
 
 #. 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:959
 msgid "Speech disabled."
 msgstr "å·²å??ç?¨æ??è®?å??è?½ã??"
 
@@ -3926,18 +4172,18 @@ msgstr "å·²å??ç?¨æ??è®?å??è?½ã??"
 #. 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:1026
 msgid "Orca user settings reloaded."
 msgstr "å·²é??æ?°è¼?å?¥ Orca ä½¿ç?¨è??è¨å®?ã??"
 
-#: ../src/orca/orca.py:1350
+#: ../src/orca/orca.py:1435
 msgid "Usage: orca [OPTION...]"
 msgstr "ç?¨æ³?ï¼?orca [é?¸é ?...]"
 
 #. 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:1441
 msgid "Show this help message"
 msgstr "é¡¯ç¤ºæ¤èªªæ??è¨?æ?¯"
 
@@ -3945,15 +4191,36 @@ msgstr "é¡¯ç¤ºæ¤èªªæ??è¨?æ?¯"
 #. the names of the applications known to the accessibility infrastructure
 #. to stdout and then exits.
 #.
-#: ../src/orca/orca.py:1365
+#: ../src/orca/orca.py:1450
 msgid "Print the known running applications"
 msgstr "é¡¯ç¤ºå·²ç?¥å?·è¡?ç??æ??ç?¨ç¨?å¼?"
 
+#. 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:1461
+msgid "Send debug output to debug-YYYY-MM-DD-HH:MM:SS.out"
+msgstr "å°?é?¤é?¯è³?è¨?è¼¸å?ºç?º debug-YYYY-MM-DD-HH:MM:SS.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:1468
+#, fuzzy
+msgid "Send debug output to the specified file"
+msgstr "å°?å?¨é?¨å??ä»¶ç??é?¤é?¯è¼¸å?ºè³?æ??å?³é??è?³ä¸?å??æª?æ¡?ã??"
+
 #. 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:1474
 msgid "Set up user preferences"
 msgstr "è¨å®?ä½¿ç?¨è??å??å¥½è¨å®?"
 
@@ -3963,7 +4230,7 @@ msgstr "è¨å®?ä½¿ç?¨è??å??å¥½è¨å®?"
 #. 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:1483
 msgid "Set up user preferences (text version)"
 msgstr "è¨å®?ä½¿ç?¨è??å??å¥½è¨å®?ï¼?æ??å?ç??æ?¬ï¼?"
 
@@ -3971,7 +4238,7 @@ msgstr "è¨å®?ä½¿ç?¨è??å??å¥½è¨å®?ï¼?æ??å?ç??æ?¬ï¼?"
 #. '-n, --no-setup' that means that Orca will startup without setting
 #. up any user preferences.
 #.
-#: ../src/orca/orca.py:1387
+#: ../src/orca/orca.py:1490
 msgid "Skip set up of user preferences"
 msgstr "ç?¥é??ä½¿ç?¨è??å??å¥½è¨å®?"
 
@@ -3981,7 +4248,7 @@ msgstr "ç?¥é??ä½¿ç?¨è??å??å¥½è¨å®?"
 #. '-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:1499
 msgid "Use alternate directory for user preferences"
 msgstr "å?¶å®?ä½¿ç?¨è??å??å¥½è¨å®?ç??è³?æ??å¤¾å??ç¨±"
 
@@ -3989,7 +4256,7 @@ msgstr "å?¶å®?ä½¿ç?¨è??å??å¥½è¨å®?ç??è³?æ??å¤¾å??ç¨±"
 #. command line option, it will be automatically enabled as Orca is
 #. started.
 #.
-#: ../src/orca/orca.py:1409
+#: ../src/orca/orca.py:1512
 msgid "Force use of option"
 msgstr "å¼·å?¶ä½¿ç?¨ç??é?¸é ?"
 
@@ -3997,7 +4264,7 @@ msgstr "å¼·å?¶ä½¿ç?¨ç??é?¸é ?"
 #. command line option, it will be automatically disabled as Orca is
 #. started.
 #.
-#: ../src/orca/orca.py:1422
+#: ../src/orca/orca.py:1525
 msgid "Prevent use of option"
 msgstr "é?¿å??ä½¿ç?¨ç??é?¸é ?"
 
@@ -4006,14 +4273,14 @@ msgstr "é?¿å??ä½¿ç?¨ç??é?¸é ?"
 #. 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:1533
 msgid "Quits Orca (if shell script used)"
 msgstr "é?¢é?? Orcaï¼?å¦?æ?? shell script æ??ä½¿ç?¨ï¼?"
 
 #. Translators: this is text being sent to a terminal and we want to
 #. keep the text lines within terminal boundaries.
 #.
-#: ../src/orca/orca.py:1437
+#: ../src/orca/orca.py:1540
 msgid ""
 "If Orca has not been previously set up by the user, Orca\n"
 "will automatically launch the preferences set up unless\n"
@@ -4023,7 +4290,7 @@ msgstr ""
 "Orca æ??è?ªå??å?·è¡?å??å¥½è¨å®?ï¼?\n"
 "é?¤é??æ??å®?äº? -n æ?? --no-setup é??é ?ã??"
 
-#: ../src/orca/orca.py:1445
+#: ../src/orca/orca.py:1548
 msgid ""
 "WARNING: suspending Orca, e.g. by pressing Control-Z, from\n"
 "an AT-SPI enabled shell (such as gnome-terminal), can also\n"
@@ -4033,15 +4300,29 @@ msgstr ""
 "ç³»çµ±æ®¼(gnome-terminal)ä¸æ??ä¸? Control-Z ï¼?\n"
 "æ??å??æ??ä½¿æ¡?é?¢æ?«å??ï¼?ç?´å?° Orca è¢«ä¸æ¢ã??"
 
-#: ../src/orca/orca.py:1450
+#: ../src/orca/orca.py:1553
 msgid "Report bugs to orca-list gnome org "
 msgstr "å?¯å ±é?¯èª¤è?³ orca-list gnome org"
 
-#: ../src/orca/orca.py:1621
+#: ../src/orca/orca.py:1736
 msgid "Welcome to Orca."
 msgstr "æ¡è¿?ä½¿ç?¨ Orcaã??"
 
-#: ../src/orca/orca-quit.glade.h:1
+#: ../src/orca/orca-preferences-warning.ui.h:1
+msgid "Warning"
+msgstr "è¦å??"
+
+#: ../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 ""
+"æ?¨å·²ç¶?æ??ä¸?å??é??å??ç?? Orca å??å¥½è¨å®?å°?è©±ç??å¯¦é«?ã??\n"
+"\n"
+"è«?å?¨é??å??æ?°ç??ä¹?å??å??é??é??å®?ã??"
+
+#: ../src/orca/orca-quit.ui.h:1
 msgid ""
 "<b><big>Quit Orca?</big></b>\n"
 "\n"
@@ -4053,12 +4334,12 @@ msgstr ""
 "é??æ¨£æ??å??æ¢æ??æ??ç??èª?é?³è¼¸å?ºè??è?¢å¹?æ?¾å¤§é?¡ã??\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>"
@@ -4066,598 +4347,480 @@ msgstr ""
 "<b>èª¿æ?´é?¸å??ç??\n"
 "å±¬æ?§</b>"
 
-#: ../src/orca/orca-setup.glade.h:5
+#: ../src/orca/orca-setup.ui.h:5
 msgid "<b>Border Settings</b>"
 msgstr "<b>æ¡?ç·?è¨å®?å?¼</b>"
 
-#: ../src/orca/orca-setup.glade.h:6
+#: ../src/orca/orca-setup.ui.h:6
 #, fuzzy
 msgid "<b>Braille Indicator</b>"
-msgstr "æ??æ¨?å¤§å°?"
+msgstr "è¡¨ç¤ºé??æ??ç??æ?¹å¼?"
 
-#: ../src/orca/orca-setup.glade.h:7
-msgid "<b>Brightness</b>"
-msgstr "<b>äº®åº¦</b>"
-
-#: ../src/orca/orca-setup.glade.h:8
+#: ../src/orca/orca-setup.ui.h:7
 msgid "<b>Color Settings</b>"
 msgstr "<b>è?²å½©è¨å®?</b>"
 
-#: ../src/orca/orca-setup.glade.h:9
+#: ../src/orca/orca-setup.ui.h:8
 #, fuzzy
 msgid "<b>Contracted Braille</b>"
-msgstr "<b>å°?æ¯?</b>"
-
-#: ../src/orca/orca-setup.glade.h:10
-msgid "<b>Contrast</b>"
-msgstr "<b>å°?æ¯?</b>"
+msgstr "é»?å?æ??é?µçµ?å??"
 
-#: ../src/orca/orca-setup.glade.h:11
+#: ../src/orca/orca-setup.ui.h:9
 msgid "<b>Cross-hair Settings</b>"
 msgstr "<b>å??å?æº?æ??è¨å®?</b>"
 
-#: ../src/orca/orca-setup.glade.h:12
+#: ../src/orca/orca-setup.ui.h:10
 msgid "<b>Cursor Settings</b>"
 msgstr "<b>æ¸¸æ¨?è¨å®?</b>"
 
-#: ../src/orca/orca-setup.glade.h:13
+#: ../src/orca/orca-setup.ui.h:11
 msgid "<b>Hyperlink Indicator</b>"
 msgstr "<b>è¶?é?£çµ?æ??ç¤ºå?¨</b>"
 
-#: ../src/orca/orca-setup.glade.h:14
+#: ../src/orca/orca-setup.ui.h:12
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>é?µç?¤é??ç½®</b>"
 
-#: ../src/orca/orca-setup.glade.h:15
-msgid "<b>Multi-monitor Settings</b>"
-msgstr "<b>å¤?è?¢å¹?è¨å®?å?¼</b>"
-
-#: ../src/orca/orca-setup.glade.h:16
+#: ../src/orca/orca-setup.ui.h:13
 msgid "<b>Pronunciation Dictionary</b>"
 msgstr "<b>ç?¼é?³å?å?¸</b>"
 
-#: ../src/orca/orca-setup.glade.h:17
+#: ../src/orca/orca-setup.ui.h:14
 msgid "<b>Punctuation Level</b>"
 msgstr "<b>æ¨?é»?ç¬¦è??ç´?å?¥</b>"
 
-#: ../src/orca/orca-setup.glade.h:18
+#: ../src/orca/orca-setup.ui.h:15
 msgid "<b>Selection Indicator</b>"
 msgstr "<b>é?¸å??å??æ??ç¤ºå?¨</b>"
 
-#: ../src/orca/orca-setup.glade.h:19
+#: ../src/orca/orca-setup.ui.h:16
 msgid "<b>Table Row Speech</b>"
 msgstr "<b>è¡¨æ ¼å??æ??è®?</b>"
 
-#: ../src/orca/orca-setup.glade.h:20
+#: ../src/orca/orca-setup.ui.h:17
 msgid "<b>Text attributes</b>"
 msgstr "<b>æ??å?å±¬æ?§</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
+#: ../src/orca/orca-setup.ui.h:18
 msgid "<b>Tracking and Alignment Settings</b>"
 msgstr "<b>è¿½è¹¤è??æ??å??è¨å®?</b>"
 
-#: ../src/orca/orca-setup.glade.h:23
+#: ../src/orca/orca-setup.ui.h:19
 msgid "<b>Verbosity</b>"
 msgstr "<b>è¼¸å?ºå?§å®¹</b>"
 
-#: ../src/orca/orca-setup.glade.h:24
+#: ../src/orca/orca-setup.ui.h:20
 msgid "<b>Zoomer Settings</b>"
 msgstr "<b>æ?¾å¤§é?¡è¨å®?</b>"
 
-#: ../src/orca/orca-setup.glade.h:25
-msgid "Advanced Settings"
-msgstr "é?²é??è¨å®?"
-
-#: ../src/orca/orca-setup.glade.h:26
+#: ../src/orca/orca-setup.ui.h:21
 msgid "Advanced _Settings..."
 msgstr "é?²é??è¨å®?(_S)..."
 
-#: ../src/orca/orca-setup.glade.h:27
-msgid "B_lue:"
-msgstr "è??è?²(_L):"
+#. 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:23
+msgid "All"
+msgstr "å?¨é?¨"
+
+#. Translators: long braille for the rolename of a application.
+#.
+#: ../src/orca/orca-setup.ui.h:24 ../src/orca/rolenames.py:1127
+msgid "Application"
+msgstr "æ??ç?¨ç¨?å¼?"
 
-#: ../src/orca/orca-setup.glade.h:28
+#: ../src/orca/orca-setup.ui.h:25
 msgid "Border color:"
 msgstr "é??æ¡?é¡?è?²ï¼?"
 
-#: ../src/orca/orca-setup.glade.h:29
+#: ../src/orca/orca-setup.ui.h:26
 msgid "Border size:"
 msgstr "é??æ¡?å¤§å°?ï¼?"
 
-#: ../src/orca/orca-setup.glade.h:30
+#: ../src/orca/orca-setup.ui.h:28
 msgid "Braille"
 msgstr "é»?å?"
 
-#: ../src/orca/orca-setup.glade.h:32
+#: ../src/orca/orca-setup.ui.h:31
 msgid "Brightness:"
 msgstr "äº®åº¦ï¼?"
 
-#: ../src/orca/orca-setup.glade.h:33
-msgid ""
-"Centered\n"
-"Proportional\n"
-"Push\n"
-"None"
-msgstr ""
-"ç½®ä¸\n"
-"æ??æ¯?ä¾?ç??\n"
-"æ?¨\n"
-"æ²?æ??"
-
-#: ../src/orca/orca-setup.glade.h:37
-msgid ""
-"Centered\n"
-"Push\n"
-"None"
-msgstr ""
-"ç½®ä¸\n"
-"æ?¨\n"
-"æ²?æ??"
-
-#: ../src/orca/orca-setup.glade.h:40
+#: ../src/orca/orca-setup.ui.h:33
 #, fuzzy
 msgid "Contraction _Table:"
-msgstr "æ??è?è¡¨æ ¼"
+msgstr "æ¨¹ç??è³?æ??è¡¨æ ¼"
 
-#: ../src/orca/orca-setup.glade.h:41
+#: ../src/orca/orca-setup.ui.h:34
 msgid "Contrast:"
 msgstr "å°?æ¯?ï¼?"
 
-#: ../src/orca/orca-setup.glade.h:42
+#: ../src/orca/orca-setup.ui.h:35
 msgid "Cross-hair color:"
 msgstr "å??å?æº?æ??é¡?è?²:"
 
-#: ../src/orca/orca-setup.glade.h:43
+#: ../src/orca/orca-setup.ui.h:36
 msgid "Cross-hair si_ze:"
 msgstr "å??å?æº?æ??å¤§å°?(_Z):"
 
-#: ../src/orca/orca-setup.glade.h:44
+#: ../src/orca/orca-setup.ui.h:37
 msgid "Cursor color:"
 msgstr "æ¸¸æ¨?è?²å½©ï¼?"
 
-#: ../src/orca/orca-setup.glade.h:45
+#: ../src/orca/orca-setup.ui.h:38
 msgid "Cursor size:"
 msgstr "æ¸¸æ¨?å¤§å°?ï¼?"
 
-#: ../src/orca/orca-setup.glade.h:46
+#: ../src/orca/orca-setup.ui.h:40
 msgid "Custom siz_e"
 msgstr "è?ªè¨?å¤§å°?(_E)"
 
-#: ../src/orca/orca-setup.glade.h:47
-msgid ""
-"Default\n"
-"Uppercase\n"
-"Hyperlink"
-msgstr ""
-"é ?è¨\n"
-"å¤§å¯«å?æ¯?\n"
-"è¶?é?£çµ?"
+#: ../src/orca/orca-setup.ui.h:41
+msgid "Default"
+msgstr "é ?è¨"
 
-#: ../src/orca/orca-setup.glade.h:50
+#: ../src/orca/orca-setup.ui.h:42
+#, fuzzy
 msgid "Disable _end of line symbol"
-msgstr ""
+msgstr "ç§»è?³è¡?å°¾ã??"
 
-#: ../src/orca/orca-setup.glade.h:51
+#: ../src/orca/orca-setup.ui.h:43
 msgid "Disable gksu _keyboard grab"
 msgstr "å??æ¢ gksu é?µç?¤æ?·å??(_K)"
 
-#. 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:47
 #, fuzzy
 msgid "Edge mar_gin:"
 msgstr "ç?¡é??ç¤?ç?»å?¥(_G)"
 
-#: ../src/orca/orca-setup.glade.h:57
+#: ../src/orca/orca-setup.ui.h:48
 msgid "Enable Braille _monitor"
 msgstr "å??ç?¨é»?å?ç?£å?¨(_M)"
 
-#: ../src/orca/orca-setup.glade.h:58
+#: ../src/orca/orca-setup.ui.h:49
 msgid "Enable Braille _support"
 msgstr "å??ç?¨é»?å?æ?¯æ?´(_S)"
 
-#: ../src/orca/orca-setup.glade.h:59
+#: ../src/orca/orca-setup.ui.h:50
 msgid "Enable _alphanumeric and punctuation keys"
 msgstr "å??ç?¨æ??æ?¸å?å??å??æ¨?é»?ç¬¦è??æ??é?µ(_A)"
 
-#: ../src/orca/orca-setup.glade.h:60
+#: ../src/orca/orca-setup.ui.h:51
 msgid "Enable _function keys"
 msgstr "å??ç?¨å??è?½é?µ(_F)"
 
-#: ../src/orca/orca-setup.glade.h:61
+#: ../src/orca/orca-setup.ui.h:52
 msgid "Enable _key echo"
 msgstr "å??ç?¨æ??é?µå??é?¿(_K)"
 
-#: ../src/orca/orca-setup.glade.h:62
+#: ../src/orca/orca-setup.ui.h:53
 msgid "Enable _magnifier"
 msgstr "å??ç?¨æ?¾å¤§é?¡(_M)"
 
-#: ../src/orca/orca-setup.glade.h:63
+#: ../src/orca/orca-setup.ui.h:54
 msgid "Enable _modifier keys"
 msgstr "å??ç?¨ä¿®æ?¹é?µ(_M)"
 
-#: ../src/orca/orca-setup.glade.h:64
+#: ../src/orca/orca-setup.ui.h:55
 msgid "Enable _navigation keys"
 msgstr "å??ç?¨å°?è¦½é?µ(_N)"
 
-#: ../src/orca/orca-setup.glade.h:65
+#: ../src/orca/orca-setup.ui.h:56
 msgid "Enable ac_tion keys"
 msgstr "å??ç?¨å??ä½?é?µ(_T)"
 
-#: ../src/orca/orca-setup.glade.h:66
+#: ../src/orca/orca-setup.ui.h:57
 msgid "Enable bor_der"
 msgstr "å??ç?¨æ¡?ç·?(_D)"
 
-#: ../src/orca/orca-setup.glade.h:67
+#: ../src/orca/orca-setup.ui.h:58
 msgid "Enable c_ursor"
 msgstr "å??ç?¨æ¸¸æ¨?(_U)"
 
-#: ../src/orca/orca-setup.glade.h:68
+#: ../src/orca/orca-setup.ui.h:59
 msgid "Enable cross-h_air"
 msgstr "å??ç?¨å??å?æº?æ??(_A)"
 
-#: ../src/orca/orca-setup.glade.h:69
+#: ../src/orca/orca-setup.ui.h:60
 msgid "Enable cross-hair cl_ip"
 msgstr "å??ç?¨å??å?æº?æ??(_I)"
 
-#: ../src/orca/orca-setup.glade.h:70
+#: ../src/orca/orca-setup.ui.h:61
 msgid "Enable echo by _sentence"
 msgstr "å??ç?¨å?¥å?å??é?¿(_S)"
 
-#: ../src/orca/orca-setup.glade.h:71
+#: ../src/orca/orca-setup.ui.h:62
 msgid "Enable echo by _word"
 msgstr "å??ç?¨å?è©?å??é?¿(_W)"
 
-#: ../src/orca/orca-setup.glade.h:72
+#: ../src/orca/orca-setup.ui.h:64
 msgid "Enable lockin_g keys"
 msgstr "å??ç?¨é??å®?é?µ(_G)"
 
-#: ../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 ""
-
-#: ../src/orca/orca-setup.glade.h:79
+#: ../src/orca/orca-setup.ui.h:67
 msgid "General"
 msgstr "ä¸?è?¬"
 
-#: ../src/orca/orca-setup.glade.h:80
-msgid "Gree_n:"
-msgstr "ç¶ è?²(_N):"
-
-#: ../src/orca/orca-setup.glade.h:81
+#: ../src/orca/orca-setup.ui.h:68
 msgid "Hide s_ystem pointer"
 msgstr "é?±è??ç³»çµ±æ??æ¨?(_Y)"
 
-#: ../src/orca/orca-setup.glade.h:82
+#: ../src/orca/orca-setup.ui.h:69
+msgid "Hyperlink"
+msgstr "è¶?é?£çµ?"
+
+#: ../src/orca/orca-setup.ui.h:70
 msgid "In_vert colors"
 msgstr "ç?¸å??é¡?è?²(_V)"
 
-#: ../src/orca/orca-setup.glade.h:83
+#: ../src/orca/orca-setup.ui.h:71
 msgid "Key Binding List"
 msgstr "æ??é?µçµ?å??æ¸?å?®"
 
-#: ../src/orca/orca-setup.glade.h:84
+#: ../src/orca/orca-setup.ui.h:72
 msgid "Key Bindings"
 msgstr "æ??é?µçµ?å??"
 
-#: ../src/orca/orca-setup.glade.h:85
+#: ../src/orca/orca-setup.ui.h:73
 msgid "Key Echo"
 msgstr "æ??é?µå??é?¿"
 
-#: ../src/orca/orca-setup.glade.h:86
-msgid ""
-"Line\n"
-"Sentence"
-msgstr ""
-"æ¯?è¡?\n"
-"æ®µè?½"
-
-#: ../src/orca/orca-setup.glade.h:89
+#: ../src/orca/orca-setup.ui.h:77
 msgid "Magnifier"
 msgstr "æ?¾å¤§é?¡"
 
-#: ../src/orca/orca-setup.glade.h:90
+#: ../src/orca/orca-setup.ui.h:78
 msgid "Mouse poi_nter:"
 msgstr "æ»?é¼ æ??æ¨?(_N):"
 
-#. 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:79
 msgid "Move _down one"
 msgstr "ä¸?ç§»ä¸?è¡?(_D)"
 
-#. 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:80
 msgid "Move _up one"
 msgstr "ä¸?ç§»ä¸?è¡?(_U)"
 
-#. 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:81
 msgid "Move to _bottom"
 msgstr "ç§»è?³åº?é?¨(_B)"
 
-#. 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:82
 msgid "Move to _top"
 msgstr "ç§»è?³é ?ç«¯(_T)"
 
-#: ../src/orca/orca-setup.glade.h:99
-msgid ""
-"None\n"
-"Bilinear"
-msgstr ""
-"æ²?æ??\n"
-"é??ç·?æ?§"
-
-#: ../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 ""
-
-#: ../src/orca/orca-setup.glade.h:110
+#: ../src/orca/orca-setup.ui.h:84
 msgid "Orca Modifier Keys"
 msgstr "Orca ä¿®æ?¹é?µ"
 
-#: ../src/orca/orca-setup.glade.h:111
+#: ../src/orca/orca-setup.ui.h:85
 msgid "Orca Preferences"
 msgstr "Orca å??å¥½è¨å®?"
 
-#: ../src/orca/orca-setup.glade.h:112
+#: ../src/orca/orca-setup.ui.h:86
 msgid "Orca _Modifier Key(s):"
 msgstr "Orca ä¿®æ?¹é?µ(_M):"
 
-#: ../src/orca/orca-setup.glade.h:113
+#: ../src/orca/orca-setup.ui.h:87
 msgid "Pi_tch:"
 msgstr "é?³èª¿(_T):"
 
-#. 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:88
 msgid "Pointer follows focus"
 msgstr "æ??æ¨?è·?é?¨ç?¦é»?"
 
-#. 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:89
 msgid "Pointer follows zoomer"
 msgstr "æ??æ¨?è·?é?¨æ?¾å¤§é?¡"
 
-#: ../src/orca/orca-setup.glade.h:118
+#: ../src/orca/orca-setup.ui.h:90
 msgid "Pronunciation"
 msgstr "ç?¼é?³"
 
-#: ../src/orca/orca-setup.glade.h:119
+#: ../src/orca/orca-setup.ui.h:93
 msgid "Quit Orca _without confirmation"
 msgstr "ä¸?ç¢ºèª?è??é?¢é?? Orca(_W)"
 
-#: ../src/orca/orca-setup.glade.h:120
-msgid "R_ed:"
-msgstr "ç´?è?²(_E):"
-
-#: ../src/orca/orca-setup.glade.h:121
-msgid "S_ource display:"
-msgstr "å??å§?é¡¯ç¤º(_O):"
-
-#. 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:97
 msgid "Say All B_y:"
 msgstr "é?±è®?å??é ?æ?¼(_Y):"
 
-#: ../src/orca/orca-setup.glade.h:124
+#: ../src/orca/orca-setup.ui.h:98
 msgid "Scale _factor:"
 msgstr "æ?¾å¤§ç??(_F):"
 
-#: ../src/orca/orca-setup.glade.h:125
+#: ../src/orca/orca-setup.ui.h:100
 msgid "Show Orca _main window"
 msgstr "é¡¯ç¤º Orca ä¸»è¦?çª?(_M)"
 
-#: ../src/orca/orca-setup.glade.h:127
+#: ../src/orca/orca-setup.ui.h:102
 msgid "Spea_k object mnemonics"
 msgstr "è®?å?ºç?©ä»¶å?©è¨?ç¬¦(_K)"
 
-#: ../src/orca/orca-setup.glade.h:128
+#: ../src/orca/orca-setup.ui.h:103
 msgid "Speak _indentation and justification"
 msgstr "è®?å?ºç¸®æ??å??å°?é½?(_I)"
 
-#: ../src/orca/orca-setup.glade.h:129
+#: ../src/orca/orca-setup.ui.h:104
 msgid "Speak _none"
 msgstr "è®?å?ºã??æ²?æ??ã??(_N)"
 
-#: ../src/orca/orca-setup.glade.h:130
+#: ../src/orca/orca-setup.ui.h:105
 msgid "Speak blank lines"
 msgstr "è®?å?ºç©ºç?½ç??è¡?"
 
-#: ../src/orca/orca-setup.glade.h:132
+#: ../src/orca/orca-setup.ui.h:106
+#, fuzzy
+msgid "Speak child p_osition"
+msgstr "å?ç¨?å¼?çª?ç?¶é?¢é??"
+
+#: ../src/orca/orca-setup.ui.h:108
 msgid "Speak current ro_w"
 msgstr "è®?å?ºç?®å??ç??å??(_W)"
 
-#. Translators: multicase strings are StringsWithWordsMashedTogetherLikeThis.
-#: ../src/orca/orca-setup.glade.h:134
+#: ../src/orca/orca-setup.ui.h:109
 #, fuzzy
-#| msgid "Speak results during _find"
 msgid "Speak multicase strings as wor_ds"
 msgstr "å°?æ?¾æ??è®?å?ºçµ?æ??(_F)"
 
-#: ../src/orca/orca-setup.glade.h:135
+#: ../src/orca/orca-setup.ui.h:110
 msgid "Speak object under mo_use"
 msgstr "å?¸å?ºæ»?é¼ ä¸?æ?¹ç??ç?©ä»¶(_U)"
 
-#: ../src/orca/orca-setup.glade.h:136
+#: ../src/orca/orca-setup.ui.h:111
 msgid "Speak progress bar _updates"
 msgstr "è®?å?ºé?²åº¦å??ç??æ?´æ?°(_U)"
 
-#: ../src/orca/orca-setup.glade.h:137
+#: ../src/orca/orca-setup.ui.h:112
 msgid "Speak tutorial messages"
 msgstr "è®?å?ºæ??å¸è¨?æ?¯"
 
-#: ../src/orca/orca-setup.glade.h:138
+#: ../src/orca/orca-setup.ui.h:113
 msgid "Speech"
 msgstr "æ??è®?"
 
-#: ../src/orca/orca-setup.glade.h:139
+#: ../src/orca/orca-setup.ui.h:114
 msgid "Speech _system:"
 msgstr "æ??è®?ç³»çµ±(_S):"
 
-#: ../src/orca/orca-setup.glade.h:140
+#: ../src/orca/orca-setup.ui.h:115
 msgid "Speech synthesi_zer:"
 msgstr "æ??è®?å??æ??å?¨(_Z):"
 
-#: ../src/orca/orca-setup.glade.h:141
+#: ../src/orca/orca-setup.ui.h:116
 msgid "Start Orca when you lo_gin"
 msgstr "ç?¶æ?¨ç?»å?¥æ??å??å?? Orca(_G)"
 
-#: ../src/orca/orca-setup.glade.h:142
-msgid "Target displa_y:"
-msgstr "ç?®æ¨?é¡¯ç¤º(_Y):"
-
-#: ../src/orca/orca-setup.glade.h:143
+#: ../src/orca/orca-setup.ui.h:117
 msgid "Te_xt cursor:"
 msgstr "æ??å?æ¸¸æ¨?(_X):"
 
-#: ../src/orca/orca-setup.glade.h:144
+#: ../src/orca/orca-setup.ui.h:118
 msgid "Text Attributes"
 msgstr "æ??å?å±¬æ?§"
 
-#: ../src/orca/orca-setup.glade.h:145
+#: ../src/orca/orca-setup.ui.h:120
+msgid "Uppercase"
+msgstr "å¤§å¯«å?æ¯?"
+
+#: ../src/orca/orca-setup.ui.h:121
 msgid "Ver_bose"
 msgstr "è©³ç´°(_B)"
 
-#: ../src/orca/orca-setup.glade.h:146
+#: ../src/orca/orca-setup.ui.h:122
 msgid "Vo_lume:"
 msgstr "é?³é??(_L):"
 
-#: ../src/orca/orca-setup.glade.h:147
-msgid "Warning"
-msgstr "è¦å??"
-
-#: ../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 ""
-"æ?¨å·²ç¶?æ??ä¸?å??é??å??ç?? Orca å??å¥½è¨å®?å°?è©±ç??å¯¦é«?ã??\n"
-"\n"
-"è«?å?¨é??å??æ?°ç??ä¹?å??å??é??é??å®?ã??"
+#. Translators: long braille for the rolename of a window.
+#.
+#: ../src/orca/orca-setup.ui.h:123 ../src/orca/rolenames.py:1079
+msgid "Window"
+msgstr "è¦?çª?"
 
-#: ../src/orca/orca-setup.glade.h:151
+#: ../src/orca/orca-setup.ui.h:124
 msgid "_Abbreviated role names"
 msgstr "ç¸®å¯«ä»»å??å??ç¨±(_A)"
 
-#: ../src/orca/orca-setup.glade.h:152
+#: ../src/orca/orca-setup.ui.h:125
 msgid "_All"
 msgstr "å?¨é?¨(_A)"
 
-#: ../src/orca/orca-setup.glade.h:153
-msgid "_Blue:"
-msgstr "è??(_B):"
-
-#: ../src/orca/orca-setup.glade.h:154
+#: ../src/orca/orca-setup.ui.h:126
 msgid "_Bottom:"
 msgstr "ä¸?(_B):"
 
-#: ../src/orca/orca-setup.glade.h:155
-msgid "_Color Filtering:"
-msgstr "é¡?è?²æ¿¾é?¡(_C):"
-
-#: ../src/orca/orca-setup.glade.h:156
+#: ../src/orca/orca-setup.ui.h:127
 msgid "_Control and menu item:"
 msgstr "æ?§å?¶è??é?¸å?®é ?ç?®(_C):"
 
-#: ../src/orca/orca-setup.glade.h:157
+#: ../src/orca/orca-setup.ui.h:128
 msgid "_Delete"
 msgstr "å?ªé?¤(_D)"
 
-#: ../src/orca/orca-setup.glade.h:159
+#: ../src/orca/orca-setup.ui.h:130
 #, fuzzy
 msgid "_Enable Contracted Braille"
-msgstr "å??ç?¨é?¤é?¯ç¢¼"
+msgstr "å??ç?¨é»?å?ç?£å?¨(_M)"
 
-#: ../src/orca/orca-setup.glade.h:160
+#: ../src/orca/orca-setup.ui.h:131
 msgid "_Enable speech"
 msgstr "å??ç?¨æ??è®?(_E)"
 
-#: ../src/orca/orca-setup.glade.h:161
-msgid "_Green:"
-msgstr "ç¶ (_G):"
-
-#: ../src/orca/orca-setup.glade.h:162
+#: ../src/orca/orca-setup.ui.h:132
 msgid "_Laptop"
 msgstr "ç?è¨?æ?¬é?»è?¦(_L)"
 
-#: ../src/orca/orca-setup.glade.h:163
+#: ../src/orca/orca-setup.ui.h:133
 msgid "_Left:"
 msgstr "å·¦(_L):"
 
-#: ../src/orca/orca-setup.glade.h:164
+#: ../src/orca/orca-setup.ui.h:134
 msgid "_New entry"
 msgstr "æ?°é ?ç?®(_N)"
 
-#: ../src/orca/orca-setup.glade.h:166
+#: ../src/orca/orca-setup.ui.h:136
 msgid "_Person:"
 msgstr "æ??è®?è??(_P):"
 
-#: ../src/orca/orca-setup.glade.h:167
+#: ../src/orca/orca-setup.ui.h:137
 msgid "_Position:"
 msgstr "ä½?ç½®(_P):"
 
-#: ../src/orca/orca-setup.glade.h:168
+#: ../src/orca/orca-setup.ui.h:138
 msgid "_Present tooltips"
 msgstr "é¡¯ç¤ºå·¥å?·æ??ç¤º(_P)"
 
-#: ../src/orca/orca-setup.glade.h:169
+#: ../src/orca/orca-setup.ui.h:139
 msgid "_Rate:"
 msgstr "é??åº¦(_R):"
 
-#: ../src/orca/orca-setup.glade.h:170
-msgid "_Red:"
-msgstr "ç´?(_R):"
-
-#: ../src/orca/orca-setup.glade.h:171
+#: ../src/orca/orca-setup.ui.h:140
 msgid "_Reset"
 msgstr "é??è¨(_R)"
 
-#: ../src/orca/orca-setup.glade.h:172
+#: ../src/orca/orca-setup.ui.h:141
 msgid "_Right:"
 msgstr "å?³(_R):"
 
-#: ../src/orca/orca-setup.glade.h:173
-msgid "_Smoothing:"
-msgstr "å??æ»?(_S):"
-
-#: ../src/orca/orca-setup.glade.h:174
+#: ../src/orca/orca-setup.ui.h:142
 msgid "_Speak all"
 msgstr "å?¨é?¨è®?å?º(_S)"
 
-#: ../src/orca/orca-setup.glade.h:175
+#: ../src/orca/orca-setup.ui.h:143
 msgid "_Top:"
 msgstr "ä¸?(_T):"
 
-#: ../src/orca/orca-setup.glade.h:176
+#: ../src/orca/orca-setup.ui.h:144
 msgid "_Voice settings:"
 msgstr "è?²é?³è¨å®?(_V):"
 
-#. 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
+#: ../src/orca/orca-setup.ui.h:145
 msgid "every"
 msgstr "æ¯?"
 
-#: ../src/orca/orca-setup.glade.h:179
+#: ../src/orca/orca-setup.ui.h:146
 msgid "pixels"
 msgstr "å??ç´ "
 
-#: ../src/orca/orca-setup.glade.h:180
+#: ../src/orca/orca-setup.ui.h:147
 msgid "seconds"
 msgstr "ç§?"
 
@@ -5016,7 +5179,7 @@ msgstr "æ¡?é?¢æ¡?æ?¶"
 #, fuzzy
 msgctxt "shortbraille"
 msgid "dial"
-msgstr "æ?¥è??"
+msgstr "å°?è©±è¦?çª?"
 
 #. Translators: long braille for the rolename of a dial.
 #.
@@ -5443,7 +5606,7 @@ msgstr "é?¸é ?çª?æ ¼"
 #.
 #: ../src/orca/rolenames.py:678
 msgid "pgt"
-msgstr ""
+msgstr "pgt"
 
 #. Translators: long braille for the rolename of a page tab.
 #.
@@ -5814,8 +5977,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 "å?²å?æ ¼"
 
@@ -6005,12 +6166,6 @@ msgstr "è¦?å? "
 msgid "wnd"
 msgstr "wnd"
 
-#. Translators: long braille for the rolename of a window.
-#.
-#: ../src/orca/rolenames.py:1079
-msgid "Window"
-msgstr "è¦?çª?"
-
 #. Translators: spoken words for the rolename of a window.
 #.
 #: ../src/orca/rolenames.py:1082
@@ -6077,12 +6232,6 @@ msgstr "æ®µè?½"
 msgid "app"
 msgstr "app"
 
-#. Translators: long braille for the rolename of a application.
-#.
-#: ../src/orca/rolenames.py:1127
-msgid "Application"
-msgstr "æ??ç?¨ç¨?å¼?"
-
 #. Translators: spoken words for the rolename of a application.
 #.
 #: ../src/orca/rolenames.py:1130
@@ -6167,15 +6316,15 @@ msgstr "æ??ä»¶"
 #. We've entered a table.  Announce the dimensions.
 #.
 #: ../src/orca/scripts/apps/acroread.py:276
-#: ../src/orca/scripts/apps/soffice/script.py:703
-#, python-format
-msgid "table with %d rows and %d columns."
+#: ../src/orca/scripts/apps/soffice/script.py:888
+#, fuzzy, python-format
+msgid "table with %(rows)d rows and %(columns)d columns."
 msgstr "å·¥ä½?è¡¨æ?? %d å??å?? %d æ¬?ã??"
 
 #. 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 "é?¢é??å·¥ä½?è¡¨ã??"
 
@@ -6183,15 +6332,17 @@ msgstr "é?¢é??å·¥ä½?è¡¨ã??"
 #. on in a table.
 #.
 #: ../src/orca/scripts/apps/acroread.py:301
-#, python-format
-msgid "row %d, column %d"
+#, fuzzy, python-format
+msgid "row %(row)d, column %(column)d"
 msgstr "å?? %dï¼?æ¬? %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 "æ¬? %d"
@@ -6236,7 +6387,7 @@ msgstr "æ??æ??äº?ä»¶"
 #. 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 "æ²?æ??æ??è®?æ??æ??å?¦å±?ç¤ºæ?°é?µä»¶ã??"
 
@@ -6244,7 +6395,7 @@ msgstr "æ²?æ??æ??è®?æ??æ??å?¦å±?ç¤ºæ?°é?µä»¶ã??"
 #. 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 "æ²?æ??æ??è®?æ??å±?ç¤ºæ?°é?µä»¶ã??"
 
@@ -6252,47 +6403,17 @@ msgstr "æ²?æ??æ??è®?æ??å±?ç¤ºæ?°é?µä»¶ã??"
 #. 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 "æ²?æ??æ??è®?æ??ä»?ä¸?è¦?å±?ç¤ºæ?°é?µä»¶"
 
-#. 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 "%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 "è«?"
-
-#: ../src/orca/scripts/apps/evolution/script.py:305
-msgid "Welcome"
-msgstr "æ¡è¿?"
-
-#: ../src/orca/scripts/apps/evolution/script.py:306
-msgid "Congratulations"
-msgstr "æ?å??"
-
 #. 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 "ç??æ??"
 
@@ -6301,8 +6422,8 @@ msgstr "ç??æ??"
 #. 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 "æ??æ¨?å¹?ç??"
 
@@ -6310,7 +6431,7 @@ msgstr "æ??æ¨?å¹?ç??"
 #. 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 "æ?ªè®?"
 
@@ -6319,14 +6440,14 @@ msgstr "æ?ªè®?"
 #. 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 "é??ä»¶"
 
 #. 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 "æ²?æ??ç´?æ??"
 
@@ -6334,35 +6455,30 @@ msgstr "æ²?æ??ç´?æ??"
 #. 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 "ç?®é??æ??é??"
 
-#. 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.
+#. Translators: this in reference to an e-mail message
+#. status of having been read or unread.
 #.
-#: ../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 "å??å?©"
-
-#. 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 "å·²è®?"
 
+#. 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 "%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:103
 msgid "Unable to get calculator display"
 msgstr "ç?¡æ³?å??å¾?è¨?ç®?æ©?ç??é¡¯ç¤º"
 
@@ -6371,11 +6487,11 @@ msgstr "ç?¡æ³?å??å¾?è¨?ç®?æ©?ç??é¡¯ç¤º"
 #. 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 "æ?´æ??ç?ºï¼?"
 
-#: ../src/orca/scripts/apps/gedit/script.py:229
+#: ../src/orca/scripts/apps/gedit/script.py:231
 msgid "Misspelled word:"
 msgstr "æ?¼é?¯ç??å?è©?:"
 
@@ -6387,15 +6503,15 @@ msgstr "æ?¼é?¯ç??å?è©?:"
 #. 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 "æ?¼å?æª¢æ?¥å®?æ??"
 
-#: ../src/orca/scripts/apps/gedit/script.py:263
+#: ../src/orca/scripts/apps/gedit/script.py:265
 msgid "Spell checking is complete."
 msgstr "æ?¼å?æª¢æ?¥å·²å®?æ??ã??"
 
-#: ../src/orca/scripts/apps/gedit/script.py:265
+#: ../src/orca/scripts/apps/gedit/script.py:267
 msgid "Press Tab and Return to terminate."
 msgstr "æ??ä¸? Tab å?? Enter ä¾?çµ?æ¢ã??"
 
@@ -6409,12 +6525,12 @@ msgstr "æ??ä¸? Tab å?? Enter ä¾?çµ?æ¢ã??"
 #. 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/gedit/script.py:394
+#: ../src/orca/scripts/apps/gedit/script.py:477
 #: ../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/Thunderbird/script.py:302
+#: ../src/orca/scripts/apps/Thunderbird/script.py:519
+#: ../src/orca/scripts/apps/Thunderbird/speech_generator.py:88
 msgid "Check Spelling"
 msgstr "æ?¼å?æª¢æ?¥"
 
@@ -6435,14 +6551,14 @@ msgstr "æ?¼å?æª¢æ?¥"
 #. 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 "æ?¾ä¸?å?°ç??èª?"
 
 #. 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 "æ?¾å?°ç??èª?ã??"
 
@@ -6482,6 +6598,15 @@ msgstr[0] "æ?¾å?° %d å??æª?æ¡?"
 msgid "No files found."
 msgstr "æ?¾ä¸?å?°ä»»ä½?æª?æ¡?ã??"
 
+#. 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:112
+msgid "inaccessible"
+msgstr "ä¸?è?½å?å??"
+
 #: ../src/orca/scripts/apps/liferea.py:117
 msgid "Work online / offline"
 msgstr "ç·?ä¸?/é?¢ç·?å·¥ä½?"
@@ -6500,49 +6625,77 @@ msgstr "å·¥ä½?å??"
 msgid "Desk "
 msgstr "Desk "
 
-#. 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 "ä¸?è?½å?å??"
+#: ../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 å??é ?ç?®"
 
 #. 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 "é??ç?¥ %s"
 
-#: ../src/orca/scripts/apps/pidgin/script.py:192
+#. Translators: this is in reference to loading a web page
+#. or some other content.
+#.
+#: ../src/orca/scripts/apps/packagemanager/script.py:104
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1935
+msgid "Loading.  Please wait."
+msgstr "è¼?å?¥ä¸ï¼?è«?ç¨?å??ã??"
+
+#. Translators: this is in reference to loading a web page
+#. or some other content.
+#.
+#: ../src/orca/scripts/apps/packagemanager/script.py:110
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1948
+msgid "Finished loading."
+msgstr "è¼?å?¥å®?æ??ã??"
+
+#. 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 "ä½¿ç?¨ Ctrl+L å°?ç?¦é»?ç§»è?³çµ?æ??ã??"
+
+#: ../src/orca/scripts/apps/pidgin/script.py:191
 msgid ""
 "Toggle whether we prefix chat room messages with the name of the chat room."
 msgstr "å??æ??æ?¯å?¦å°?è??å¤©å®¤ç??å??ç¨±å? å?¥è??å¤©å®¤ç??è¨?æ?¯å??ã??"
 
-#: ../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 "å??æ??ç?¶æ??å??ç??æ??å??å?¨è¼¸å?¥æ??æ?¯å?¦å??ç?¥æ??å??ã??"
 
-#: ../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 "å??æ??æ?¯å?¦æ??ä¾?æ??å®?è??å¤©å®¤ç??ç??è¨?æ?¯æ·å?²ç´?é??ã??"
 
-#: ../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 "è®?å?ºå??é»?å?ºä¸?ä¸?å??è??å¤©å®¤ç??è¨?æ?¯ã??"
 
 #. 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 "è®?å?ºè??å¤©å®¤å??ç¨±(_S)"
 
 #. 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 "ç?¶æ?¨ç??æ??å??å?¨è¼¸å?¥æ??å??ç?¥(_B)"
 
@@ -6551,7 +6704,7 @@ msgstr "ç?¶æ?¨ç??æ??å??å?¨è¼¸å?¥æ??å??ç?¥(_B)"
 #. 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 "æ??ä¾?æ??å®?è??å¤©å®¤ç??è¨?æ?¯æ·å?²ç´?é??(_M)"
 
@@ -6559,7 +6712,7 @@ msgstr "æ??ä¾?æ??å®?è??å¤©å®¤ç??è¨?æ?¯æ·å?²ç´?é??(_M)"
 #. 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 "æ??æ??é »é??(_N)"
 
@@ -6567,106 +6720,85 @@ msgstr "æ??æ??é »é??(_N)"
 #. 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 "å?ªæ??ä½¿ç?¨ä¸è¦?çª?ç??é »é??(_W)"
 
-#: ../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 "ç?¶ä»»ä½? Pidgin è¦?çª?å?¨ä½¿ç?¨ä¸ç??æ??æ??é »é??(_Y)"
 
 #. 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 "è®?å?ºè¨?æ?¯æ?¼"
 
-#: ../src/orca/scripts/apps/pidgin/script.py:454
+#: ../src/orca/scripts/apps/pidgin/script.py:447
 msgid "speak chat room name."
 msgstr "è®?å?ºè??å¤©å®¤å??ç¨±ã??"
 
-#: ../src/orca/scripts/apps/pidgin/script.py:458
+#: ../src/orca/scripts/apps/pidgin/script.py:451
 msgid "Do not speak chat room name."
 msgstr "ä¸?è¦?è®?å?ºè??å¤©å®¤å??ç¨±ã??"
 
-#: ../src/orca/scripts/apps/pidgin/script.py:473
+#: ../src/orca/scripts/apps/pidgin/script.py:466
 msgid "announce when your buddies are typing."
 msgstr "ç?¶æ?¨ç??æ??å??å?¨è¼¸å?¥æ??å??ç?¥ã??"
 
-#: ../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 "ç?¶æ?¨ç??æ??å??å?¨è¼¸å?¥æ??ä¸?è¦?å??ç?¥ã??"
 
-#: ../src/orca/scripts/apps/pidgin/script.py:492
+#: ../src/orca/scripts/apps/pidgin/script.py:485
 msgid "Provide chat room specific message histories."
 msgstr "æ??ä¾?æ??å®?è??å¤©å®¤ç??è¨?æ?¯æ·å?²ç´?é??ã??"
 
-#: ../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 "ä¸?è¦?æ??ä¾?æ??å®?è??å¤©å®¤ç??è¨?æ?¯æ·å?²ç´?é??ã??"
 
-#: ../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 "ä¾?è?ªè??å¤©å®¤ %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 "æ?°è??å¤©å??é ? %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 å??é ?ç?®"
-
-#. 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 "å?? %d/%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 "é¡¯ç¤ºæ?´å¤?é?¸é ?"
 
 #. 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 "è®?å?ºè¼¸å?¥è¡?ç??å?§å®¹ã??"
 
 #. 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 "ç?¶æ??è®? calc å?²å?æ ¼æ??å°?å??è¨å®?ç?ºä½¿ç?¨å??æ??æ¬?æ¨?é "
 
 #. 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 "æ¸?é?¤å??æ??æ¬?æ¨?é ã??"
 
 #. 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 "ç?¶æ??è®? calc å?²å?æ ¼æ??å°?æ¬?è¨å®?ç?ºä½¿ç?¨å??æ??å??æ¨?é "
@@ -6674,7 +6806,7 @@ msgstr "ç?¶æ??è®? calc å?²å?æ ¼æ??å°?æ¬?è¨å®?ç?ºä½¿ç?¨å??æ??å??æ¨?é "
 #. 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 "æ¸?é?¤å??æ??å¼?å??æ¨?é¡?"
 
@@ -6684,21 +6816,63 @@ msgstr "æ¸?é?¤å??æ??å¼?å??æ¨?é¡?"
 #. 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 "è®?å?ºå·¥ä½?è¡¨ç??å?²å?æ ¼å??æ¨?"
 
+#. 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:897
+msgid "Speak _cell coordinates"
+msgstr "è®?å?ºå?²å?æ ¼å??æ¨?(_C)"
+
+#. 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:909
+#, fuzzy
+msgid "Speak _multiple cell spans"
+msgstr "å?²å?æ ¼è·¨é?? %d å??å?? %d æ¬?ã??"
+
+#. 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:920
+msgid "Announce cell _header"
+msgstr "è®?å?ºå?²å?æ ¼æ¨?é¡?(_H)"
+
+#. 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:931
+msgid "Skip _blank cells"
+msgstr "ç?¥é??ç©ºç?½å?²å?æ ¼(_B)"
+
+#. 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:942
+msgid "Table Navigation"
+msgstr "è¡¨æ ¼å°?è¦½"
+
 #. 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 "ç©ºç?½"
 
 #. 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 "å??æ??æ¬?æ¨?é è¨å®?çµ¦ç¬¬ %d å??"
@@ -6706,14 +6880,14 @@ msgstr "å??æ??æ¬?æ¨?é è¨å®?çµ¦ç¬¬ %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 "å·²æ¸?é?¤å??æ??æ¬?æ¨?é ã??"
 
 #. 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 "å??æ??å??æ¨?é è¨å®?çµ¦æ¬? %s"
@@ -6721,7 +6895,7 @@ msgstr "å??æ??å??æ¨?é è¨å®?çµ¦æ¬? %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 "å·²æ¸?é?¤å??æ??å??æ¨?é ã??"
 
@@ -6731,7 +6905,7 @@ msgstr "å·²æ¸?é?¤å??æ??å??æ¨?é ã??"
 #. 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 "æ¡è¿?ä½¿ç?¨ StarOffice"
 
@@ -6742,15 +6916,15 @@ msgstr "æ¡è¿?ä½¿ç?¨ 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 "å?¯ç?¨ç??æ¬?ä½?"
 
-#: ../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 "æ³¨æ??å??ä¸?æ?²å??æ??é??å·²æ??ä¸?äº?æ?¸æ¬¡ã??"
 
-#: ../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 "ç?¾å?¨å°?ç?¦è??æ?¥å??æ??æ¬?æ¢?æ¬¾ç??æ??é??ã??"
 
@@ -6760,7 +6934,7 @@ msgstr "ç?¾å?¨å°?ç?¦è??æ?¥å??æ??æ¬?æ¢?æ¬¾ç??æ??é??ã??"
 #. 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 "å??å?"
 
@@ -6768,7 +6942,7 @@ msgstr "å??å?"
 #. 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 "ç§»è?³å?²å?æ ¼"
 
@@ -6779,7 +6953,7 @@ msgstr "ç§»è?³å?²å?æ ¼"
 #. 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 "ç°¡å ±ç²¾é??"
 
@@ -6788,59 +6962,40 @@ msgstr "ç°¡å ±ç²¾é??"
 #. 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 "æ??å?¬å¼?"
 
 #. 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: 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 å??é ?ç?®"
-
-#. Translators: this represents the state of a check box
+#. 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 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 " é??"
+#: ../src/orca/scripts/apps/soffice/speech_generator.py:341
+#, fuzzy, python-format
+msgid "%d character too long"
+msgid_plural "%d characters too long"
+msgstr[0] "è·¯å¾?å¤ªé?·ï¼?%s"
 
-#. 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 " é??"
-
-#: ../src/orca/scripts/apps/soffice/where_am_i.py:99
-#, python-format
-msgid "row %d"
-msgstr "å?? %d"
+#: ../src/orca/scripts/apps/soffice/structural_navigation.py:123
+#: ../src/orca/structural_navigation.py:3311
+#, fuzzy, python-format
+msgid "Row %(row)d, column %(column)d."
+msgstr "å?? %dï¼?æ¬? %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:557
+#: ../src/orca/scripts/apps/Thunderbird/script.py:574
 #, python-format
 msgid "%s panel"
 msgstr "%s é?¢æ?¿"
@@ -6851,123 +7006,135 @@ msgstr "%s é?¢æ?¿"
 msgid "entered bookmark"
 msgstr "è¼¸å?¥ç??æ?¸ç±¤"
 
+#. 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 "å½±å??å?°å??é?£çµ?"
+
 #. 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:378
 msgid "Goes to next character."
 msgstr "ç§»è?³ä¸?ä¸?å??å?å??ã??"
 
 #. 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:386
 msgid "Goes to previous character."
 msgstr "ç§»è?³å??ä¸?å??å?å??ã??"
 
 #. 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:394
 msgid "Goes to next word."
 msgstr "ç§»è?³ä¸?ä¸?å??å?®å?ã??"
 
 #. 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:402
 msgid "Goes to previous word."
 msgstr "ç§»è?³ä¸?ä¸?å??å?®å?ã??"
 
 #. 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:410
 msgid "Goes to next line."
 msgstr "ç§»è?³ä¸?ä¸?è¡?ã??"
 
 #. 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:418
 msgid "Goes to previous line."
 msgstr "ç§»è?³ä¸?ä¸?è¡?ã??"
 
 #. 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:426
 msgid "Goes to the top of the file."
 msgstr "ç§»è?³æª?æ¡?ç??æ??ä¸?é?¢ã??"
 
 #. 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:434
 msgid "Goes to the bottom of the file."
 msgstr "ç§»è?³æª?æ¡?ç??æ??ä¸?é?¢ã??"
 
 #. 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:442
 msgid "Goes to the beginning of the line."
 msgstr "ç§»è?³è¡?é¦?ã??"
 
 #. 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:450
 msgid "Goes to the end of the line."
 msgstr "ç§»è?³è¡?å°¾ã??"
 
 #. 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:458
 msgid "Causes the current combo box to be expanded."
 msgstr "ä½¿ç?®å??ç??çµ?å??æ?¹å¡?å±?é??ã??"
 
 #. 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:466
 msgid "Advance live region politeness setting."
 msgstr ""
 
 #. 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:474
 msgid "Set default live region politeness level to off."
 msgstr ""
 
 #. 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:482
 #, fuzzy
 msgid "Monitor live regions."
-msgstr "é?¸æ??ç?£è¦?å?¨é¡?è?²è¨å®?çµ?å??"
+msgstr "No more live regions."
 
 #. 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:490
 msgid "Review live region announcement."
 msgstr ""
 
 #. 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:498
 msgid "Goes to the previous object."
 msgstr "ç§»è?³ä¸?ä¸?å??ç?©ä»¶ã??"
 
 #. 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:506
 msgid "Goes to the next object."
 msgstr "ç§»è?³ä¸?ä¸?å??ç?©ä»¶ã??"
 
@@ -6978,9 +7145,21 @@ msgstr "ç§»è?³ä¸?ä¸?å??ç?©ä»¶ã??"
 #. 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:518
 msgid "Switches between Gecko native and Orca caret navigation."
-msgstr ""
+msgstr "å?¨ Gecko å??ç??ç??è¦½è?? Orca é?µç?¤ç??è¦½æ?¹å¼?é??å??æ??ã??"
+
+#. 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:574
+msgid "Moves focus into and away from the current mouse over."
+msgstr "å°?ç?¦é»?ç§»å?¥æ??ç§»å?ºç?®å??æ»?é¼ å??é§?ç??ä½?ç½®ã??"
 
 #. Translators: Gecko native caret navigation is where
 #. Firefox itself controls how the arrow keys move the caret
@@ -6989,7 +7168,7 @@ msgstr ""
 #. 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:821
 #, fuzzy
 msgid "Use _Orca Caret Navigation"
 msgstr "é?¢é ?å°?è¦½"
@@ -6998,10 +7177,10 @@ msgstr "é?¢é ?å°?è¦½"
 #. 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:834
 #, fuzzy
 msgid "Use Orca _Structural Navigation"
-msgstr "çµ?æ§?å°?è¦½é?µé??å??ã??"
+msgstr "å??æ??çµ?æ§?å°?è¦½é?µã??"
 
 #. Translators: when the user arrows up and down in HTML content,
 #. it is some times beneficial to always position the cursor at the
@@ -7009,7 +7188,7 @@ msgstr "çµ?æ§?å°?è¦½é?µé??å??ã??"
 #. 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:849
 msgid "_Position cursor at start of line when navigating vertically"
 msgstr "å?¨å??ç?´å°?è¦½æ??å°?æ¸¸æ¨?æ?¾ç½®æ?¼è¡?ç??é??é (_P)"
 
@@ -7017,7 +7196,7 @@ msgstr "å?¨å??ç?´å°?è¦½æ??å°?æ¸¸æ¨?æ?¾ç½®æ?¼è¡?ç??é??é (_P)"
 #. 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:862
 msgid "Automatically start speaking a page when it is first _loaded"
 msgstr "ç?¶ç¬¬ä¸?æ¬¡è¼?å?¥ä¸?å??é ?é?¢æ??è?ªå??é??å§?è®?å?ºå?§å®¹(_L)"
 
@@ -7025,51 +7204,15 @@ msgstr "ç?¶ç¬¬ä¸?æ¬¡è¼?å?¥ä¸?å??é ?é?¢æ??è?ªå??é??å§?è®?å?ºå?§å®¹(_L)"
 #. 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:874
 msgid "Page Navigation"
 msgstr "é?¢é ?å°?è¦½"
 
-#. 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 "è®?å?ºå?²å?æ ¼å??æ¨?(_C)"
-
-#. 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 ""
-
-#. 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 "è®?å?ºå?²å?æ ¼æ¨?é¡?(_H)"
-
-#. 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)"
-
-#. 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 "è¡¨æ ¼å°?è¦½"
-
 #. 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:966
 msgid "Speak results during _find"
 msgstr "å°?æ?¾æ??è®?å?ºçµ?æ??(_F)"
 
@@ -7078,7 +7221,7 @@ msgstr "å°?æ?¾æ??è®?å?ºçµ?æ??(_F)"
 #. 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:979
 msgid "Onl_y speak changed lines during find"
 msgstr "å°?æ?¾æ??å?ªè®?å?ºæ??æ?¹è®?ç??è¡?(_Y)"
 
@@ -7086,36 +7229,55 @@ msgstr "å°?æ?¾æ??å?ªè®?å?ºæ??æ?¹è®?ç??è¡?(_Y)"
 #. 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:996
 msgid "Minimum length of matched text:"
 msgstr "æ¯?å°?æ??å?ç??æ??å°?é?·åº¦ï¼?"
 
 #. 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:1021
 msgid "Find Options"
 msgstr "ã??å°?æ?¾ã??é?¸é ?"
 
-#. 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:1798
-msgid "Loading.  Please wait."
-msgstr "è¼?å?¥ä¸ï¼?è«?ç¨?å??ã??"
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1605
+msgid "line selected down from cursor position"
+msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?é?¸å??è¡?"
+
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1606
+msgid "line unselected down from cursor position"
+msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?å??æ¶?é?¸å??è¡?"
+
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1607
+msgid "line selected up from cursor position"
+msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?é?¸å??è¡?"
+
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1608
+msgid "line unselected up from cursor position"
+msgstr "å¾?æ¸¸æ¨?ä½?ç½®é??å§?å??ä¸?å??æ¶?é?¸å??è¡?"
 
-#. Translators: this is in reference to loading a web page.
+#. 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:1803
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1651
+#, fuzzy
+msgid "New item has been added"
+msgstr "æ?°ç??å°?æ¡?å·²æ??å??å»ºç«?ã??"
+
+#. Translators: this is in reference to loading a web page
+#. or some other content.
+#.
+#: ../src/orca/scripts/toolkits/Gecko/script.py:1941
 #, python-format
 msgid "Finished loading %s."
 msgstr "è¼?å?¥ %s å®?æ??ã??"
 
-#. Translators: this is in reference to loading a web page.
-#.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:1809
-msgid "Finished loading."
-msgstr "è¼?å?¥å®?æ??ã??"
-
 #. 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
@@ -7123,14 +7285,25 @@ msgstr "è¼?å?¥å®?æ??ã??"
 #. heading level, where the single character is to indicate
 #. 'heading'.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:2270
+#: ../src/orca/scripts/toolkits/Gecko/script.py:2431
 #, 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:6008
+#, fuzzy
+msgid "Mouse over object not found."
+msgstr "å?¨å?²å?åº«å?§æ?¾ä¸?å?°ç?©ä»¶"
+
 #. Translators: this is the action name for the 'open' action.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5990
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6494
 msgid "open"
 msgstr "é??å??"
 
@@ -7140,7 +7313,7 @@ msgstr "é??å??"
 #. 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:6063
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6567
 #: ../src/orca/structural_navigation.py:883
 msgid "Wrapping to bottom."
 msgstr "è·³è?³åº?é?¨ã??"
@@ -7151,7 +7324,7 @@ msgstr "è·³è?³åº?é?¨ã??"
 #. 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:6131
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6635
 #: ../src/orca/structural_navigation.py:891
 msgid "Wrapping to top."
 msgstr "å??å?°é??å§?ã??"
@@ -7159,9 +7332,9 @@ msgstr "å??å?°é??å§?ã??"
 #. Translators: this announces to the user that live region
 #. support has been turned off.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6157
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6181
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6191
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6661
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6685
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6695
 #: ../src/orca/structural_navigation.py:396
 msgid "Live region support is off"
 msgstr ""
@@ -7169,13 +7342,15 @@ msgstr ""
 #. Translators: this announces to the user that live region
 #. are being monitored.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6165
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6669
+#, fuzzy
 msgid "Live regions monitoring on"
-msgstr ""
+msgstr "No more live regions."
 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6172
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6676
+#, fuzzy
 msgid "Live regions monitoring off"
-msgstr ""
+msgstr "No more live regions."
 
 #. Translators: Gecko native caret navigation is where
 #. Firefox itself controls how the arrow keys move the caret
@@ -7184,9 +7359,10 @@ msgstr ""
 #. 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:6711
+#, fuzzy
 msgid "Gecko is controlling the caret."
-msgstr ""
+msgstr "å?¶ä»?ä½¿ç?¨è??æ£å?¨æ?§å?¶æ?¨ç??æ¡?é?¢"
 
 #. Translators: Gecko native caret navigation is where
 #. Firefox itself controls how the arrow keys move the caret
@@ -7195,55 +7371,34 @@ msgstr ""
 #. the ability to switch between the Firefox mode and the
 #. Orca mode.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:6219
+#: ../src/orca/scripts/toolkits/Gecko/script.py:6723
+#, fuzzy
 msgid "Orca is controlling the caret."
-msgstr ""
+msgstr "å?¶ä»?ä½¿ç?¨è??æ£å?¨æ?§å?¶æ?¨ç??æ¡?é?¢"
 
-#. 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
 #, fuzzy, python-format
-#| msgid "level %d"
-msgid "%s level %d"
-msgstr "level %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:410
-msgid "multi-select"
-msgstr "å¤?é??é?¸å??"
+msgid "%(role)s level %(level)d"
+msgstr "è¼¸å?¥ç?ç´?:"
 
 #. Translators: this represents a list in HTML.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:414
-#: ../src/orca/structural_navigation.py:2803
+#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:281
+#: ../src/orca/structural_navigation.py:2792
 #, python-format
 msgid "List with %d item"
 msgid_plural "List with %d items"
 msgstr[0] "æ?? %d å??é ?ç?®ç??æ¸?å?®"
 
-#. 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 "å½±å??å?°å??é?£çµ?"
-
 #. 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"
@@ -7252,7 +7407,7 @@ msgstr[0] "%d å??æ¨?é¡?"
 #. 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"
@@ -7261,7 +7416,7 @@ msgstr[0] "%d å??è¡¨å?®"
 #. 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"
@@ -7270,7 +7425,7 @@ msgstr[0] "%d å??è¡¨æ ¼"
 #. 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"
@@ -7279,7 +7434,7 @@ msgstr[0] "%d å??ç??è¦½é??ç??é?£çµ?"
 #. 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"
@@ -7290,28 +7445,11 @@ msgstr[0] "%d å??æ?ªç??è¦½ç??é?£çµ?"
 #. 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å·²è®?"
 
-#. 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 "å?¯è®?"
-
-#. 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 "å?¯è®?"
-
 #. 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
@@ -7321,28 +7459,28 @@ msgstr "å?¯è®?"
 #. 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:1040
 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:1045
 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:1050
 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:1055
 msgid "[Ee]volution"
 msgstr "[Ee]volution"
 
@@ -7350,7 +7488,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:1061
 msgid "Deer Park"
 msgstr "Deer Park"
 
@@ -7358,7 +7496,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:1067
 msgid "Bon Echo"
 msgstr "Bon Echo"
 
@@ -7366,43 +7504,35 @@ msgstr "Bon Echo"
 #. 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:1073
 msgid "Minefield"
 msgstr "æ??å?°é?·"
 
-#. 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:1102
 msgid "Mail/News"
 msgstr "é?µä»¶/æ?°è??çµ?"
 
 #. 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:1107
 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:1112
 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:1117
 msgid "gaim"
 msgstr "gaim"
 
@@ -7412,10 +7542,115 @@ 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:1284 ../src/orca/settings.py:1361
 msgid "required"
 msgstr "å¿?è¦?ç??"
 
+#. 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:1289
+msgctxt "text"
+msgid "read only"
+msgstr "å?¯è®?"
+
+#. Translators: this represents an item on the screen that has
+#. been set insensitive (or grayed out).
+#.
+#: ../src/orca/settings.py:1294 ../src/orca/settings.py:1372
+msgid "grayed"
+msgstr "grayed"
+
+#. 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:1318 ../src/orca/settings.py:1384
+msgid "collapsed"
+msgstr "å·²æ?¶èµ·"
+
+#: ../src/orca/settings.py:1318 ../src/orca/settings.py:1384
+msgid "expanded"
+msgstr "å·²å±?é??"
+
+#. 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:1323
+msgid "multi-select"
+msgstr "å¤?é??é?¸å??"
+
+#. 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:1329
+#, python-format
+msgid "tree level %d"
+msgstr "tree level %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:1336 ../src/orca/structural_navigation.py:2807
+#, python-format
+msgid "Nesting level %d"
+msgstr "å·¢ç??æ¸?å?®ç¬¬ %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:1342
+#, fuzzy, python-format
+msgid "on %(index)d of %(total)d"
+msgstr "(ç¸½å?±å??å?« %'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:1348
+#, fuzzy, python-format
+msgid "%(index)d of %(total)d"
+msgstr "ç¸½å®¹é??:"
+
+#. 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:1367
+msgctxt "text"
+msgid "rdonly"
+msgstr "å?¯è®?"
+
+#. 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:1390
+#, python-format
+msgid "TREE LEVEL %d"
+msgstr "TREE LEVEL %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:1398
+#, python-format
+msgid "LEVEL %d"
+msgstr "ç¬¬ %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
@@ -7432,7 +7667,7 @@ msgstr "é ?è¨èª?é?³å??æ??å?¨"
 #: ../src/orca/speechdispatcherfactory.py:89
 #, fuzzy
 msgid "Speech Dispatcher"
-msgstr "å·²å??ç?¨æ??è®?å??è?½ã??"
+msgstr "å·²å??ç?¨æ??è®?å??è?½ã??"
 
 #. Translators: This string will appear in the list of
 #. available voices for the current speech engine.  %s will be
@@ -7443,26 +7678,163 @@ msgstr "å·²å??ç?¨æ??è®?å??è?½ã??"
 #. 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 "%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
+#, fuzzy, python-format
+msgid "%(uri)s link to %(file)s"
+msgstr "æ£å?¨å»ºç«?å?° %'d å??æª?æ¡?ç??é?£çµ?"
+
+#. Translators: this is the protocol of a link eg. http, mailto.
+#.
+#: ../src/orca/speech_generator.py:242
+#, python-format
+msgid "%s link"
+msgstr "%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 "ç?¸å??é ?é?¢"
+
+#. 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 "ç?¸å??ç¶²ç«?"
+
+#. 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 "ä¸?å??ç¶²ç«?"
+
+#. 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 ä½?å??çµ?"
+
+#. Translators: This is the size of a file in kilobytes
+#.
+#: ../src/orca/speech_generator.py:331
+#, python-format
+msgid "%.2f kilobytes"
+msgstr "%.2f KB"
+
+#. Translators: This is the size of a file in megabytes
+#.
+#: ../src/orca/speech_generator.py:335
+#, python-format
+msgid "%.2f megabytes"
+msgstr "%.2f MB"
+
+#. Translators: this is in reference to a table cell being
+#. selected or not.
+#.
+#: ../src/orca/speech_generator.py:521
+#, fuzzy
+msgctxt "tablecell"
+msgid "not selected"
+msgstr "æ²?æ??é?¸å??"
+
+#. Translators: this is in references to a row in a table.
+#.
+#: ../src/orca/speech_generator.py:568
+#, python-format
+msgid "row %d"
+msgstr "å?? %d"
+
+#. Translators: this is in references to a column in a
+#. table.
+#: ../src/orca/speech_generator.py:591
+#, fuzzy, python-format
+msgid "column %(index)d of %(total)d"
+msgstr "(ç¸½å?±å??å?« %'d å??é ?ç?®)"
+
+#. Translators: this is in reference to a row in a table.
+#.
+#: ../src/orca/speech_generator.py:596
+#, fuzzy, python-format
+msgid "row %(index)d of %(total)d"
+msgstr "(ç¸½å?±å??å?« %'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
+#, fuzzy
+msgid "End of table"
+msgstr "æ¨¹ç??è³?æ??è¡¨æ ¼"
+
+#. Translators: this is the percentage value of a progress bar.
+#.
+#: ../src/orca/speech_generator.py:936
+#, fuzzy, python-format
+msgid "%d percent"
+msgstr "percent"
+
+#. 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 å??é ?ç?®"
+
+#. 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
+#, fuzzy, python-format
+msgid "%(index)d of %(total)d item selected"
+msgid_plural "%(index)d of %(total)d items selected"
+msgstr[0] "è¤?è£½æ??æ??é?¸å®?ç??é ?ç?®"
+
 #. 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 å??æ?ªå??å¾?ç?¦é»?ç??å°?è©±ç??"
 
-#. 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 "æµ®å??"
+#: ../src/orca/speech_generator.py:1189
+msgid "Icon panel"
+msgstr "å??ç¤ºé?¢æ?¿"
+
+#. 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 "é ?è¨æ??é??ç?º%s"
 
 #. Translators: the structural navigation keys are designed
 #. to move the caret around the document content by object
@@ -7582,15 +7954,15 @@ msgstr[0] "%d æ¬?"
 #. or "spans" more than a single row and/or column.
 #.
 #: ../src/orca/structural_navigation.py:1486
-#, python-format
-msgid "Cell spans %d rows and %d columns"
+#, fuzzy, python-format
+msgid "Cell spans %(rows)d rows and %(columns)d columns"
 msgstr "å?²å?æ ¼è·¨é?? %d å??å?? %d æ¬?ã??"
 
 #. 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:1494
 #, python-format
 msgid "Cell spans %d columns"
 msgstr "å?²å?æ ¼å??ä½µ%då??æ¬?ä½?"
@@ -7599,7 +7971,7 @@ msgstr "å?²å?æ ¼å??ä½µ%då??æ¬?ä½?"
 #. 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:1500
 #, python-format
 msgid "Cell spans %d rows"
 msgstr "å?²å?æ ¼å??ä½µ%då??å??"
@@ -7607,14 +7979,14 @@ msgstr "å?²å?æ ¼å??ä½µ%då??å??"
 #. 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:1837
 msgid "Goes to previous anchor."
 msgstr "ç§»è?³å??ä¸?å??é?¨é»?ã??"
 
 #. 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:1842
 msgid "Goes to next anchor."
 msgstr "ç§»è?³ä¸?ä¸?å??é?¨é»?ã??"
 
@@ -7623,46 +7995,46 @@ msgstr "ç§»è?³ä¸?ä¸?å??é?¨é»?ã??"
 #. 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:1899
 msgid "No more anchors."
 msgstr "æ²?æ??å?¶ä»?é?¨é»?ã??"
 
 #. Translators: this is for navigating among blockquotes in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:1927
+#: ../src/orca/structural_navigation.py:1916
 #, fuzzy
 msgid "Goes to previous blockquote."
-msgstr "ç§»è?³ä¸?å??ç¬¦å??ç??é ?ç?®"
+msgstr "ç§»è?³å??ä¸?å??å?å??ã??"
 
 #. Translators: this is for navigating among blockquotes in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:1932
+#: ../src/orca/structural_navigation.py:1921
 #, fuzzy
 msgid "Goes to next blockquote."
-msgstr "ç§»è?³ä¸?å??ç¬¦å??ç??é ?ç?®"
+msgstr "ç§»è?³ä¸?ä¸?å??å?å??ã??"
 
 #. Translators: this is for navigating document content by
 #. 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:1981
 #, fuzzy
 msgid "No more blockquotes."
-msgstr "é¡¯ç¤ºæ?´å¤?çµ?æ??"
+msgstr "æ²?æ??å?¶ä»?é?¨é»?ã??"
 
 #. Translators: this is for navigating among buttons in a form
 #. within a document.
 #.
-#: ../src/orca/structural_navigation.py:2009
+#: ../src/orca/structural_navigation.py:1998
 msgid "Goes to previous button."
 msgstr "ç§»è?³å??ä¸?å??æ??é??ã??"
 
 #. Translators: this is for navigating among buttons in a form
 #. within a document.
 #.
-#: ../src/orca/structural_navigation.py:2014
+#: ../src/orca/structural_navigation.py:2003
 msgid "Goes to next button."
 msgstr "ç§»è?³ä¸?ä¸?å??æ??é??ã??"
 
@@ -7671,21 +8043,21 @@ msgstr "ç§»è?³ä¸?ä¸?å??æ??é??ã??"
 #. string is what Orca will say if there are no more buttons
 #. found.
 #.
-#: ../src/orca/structural_navigation.py:2071
+#: ../src/orca/structural_navigation.py:2060
 msgid "No more buttons."
 msgstr "æ²?æ??å?¶ä»?æ??é??ã??"
 
 #. 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:2077
 msgid "Goes to previous check box."
 msgstr "ç§»è?³å??ä¸?å??æ ¸å??æ?¹å¡?ã??"
 
 #. 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:2082
 msgid "Goes to next check box."
 msgstr "ç§»è?³ä¸?ä¸?å??æ ¸å??æ?¹å¡?ã??"
 
@@ -7694,7 +8066,7 @@ msgstr "ç§»è?³ä¸?ä¸?å??æ ¸å??æ?¹å¡?ã??"
 #. 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:2139
 msgid "No more check boxes."
 msgstr "æ²?æ??å?¶ä»?æ ¸å??æ?¹å¡?ã??"
 
@@ -7702,7 +8074,7 @@ msgstr "æ²?æ??å?¶ä»?æ ¸å??æ?¹å¡?ã??"
 #. 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:2157
 msgid "Goes to previous large object."
 msgstr "ç§»è?³å??ä¸?å??å¤§å??ç?©ä»¶ã??"
 
@@ -7710,7 +8082,7 @@ msgstr "ç§»è?³å??ä¸?å??å¤§å??ç?©ä»¶ã??"
 #. 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:2163
 msgid "Goes to next large object."
 msgstr "ç§»è?³ä¸?ä¸?å??å¤§å??ç?©ä»¶ã??"
 
@@ -7720,21 +8092,21 @@ msgstr "ç§»è?³ä¸?ä¸?å??å¤§å??ç?©ä»¶ã??"
 #. 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:2232
 msgid "No more large objects."
 msgstr "æ²?æ??å?¶ä»?å¤§å??ç?©ä»¶ã??"
 
 #. 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:2249
 msgid "Goes to previous combo box."
 msgstr "ç§»è?³å??ä¸?å??çµ?å??æ?¹å¡?ã??"
 
 #. 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:2254
 msgid "Goes to next combo box."
 msgstr "ç§»è?³ä¸?ä¸?å??çµ?å??æ?¹å¡?ã??"
 
@@ -7743,21 +8115,21 @@ msgstr "ç§»è?³ä¸?ä¸?å??çµ?å??æ?¹å¡?ã??"
 #. 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:2311
 msgid "No more combo boxes."
 msgstr "æ²?æ??å?¶ä»?çµ?å??æ?¹å¡?ã??"
 
 #. 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:2328
 msgid "Goes to previous entry."
 msgstr "ç§»è?³å??ä¸?å??é ?ç?®ã??"
 
 #. Translators: this is for navigating among text entries
 #. in a form.
 #.
-#: ../src/orca/structural_navigation.py:2344
+#: ../src/orca/structural_navigation.py:2333
 msgid "Goes to next entry."
 msgstr "ç§»è?³ä¸?ä¸?å??é ?ç?®ã??"
 
@@ -7766,21 +8138,21 @@ msgstr "ç§»è?³ä¸?ä¸?å??é ?ç?®ã??"
 #. string is what Orca will say if there are no more entries
 #. found.
 #.
-#: ../src/orca/structural_navigation.py:2410
+#: ../src/orca/structural_navigation.py:2399
 msgid "No more entries."
 msgstr "æ²?æ??å?¶ä»?é ?ç?®ã??"
 
 #. Translators: this is for navigating among fields in a form within
 #. a document.
 #.
-#: ../src/orca/structural_navigation.py:2427
+#: ../src/orca/structural_navigation.py:2416
 msgid "Goes to previous form field."
 msgstr "ç§»è?³å??ä¸?å??è¡¨å?®æ¬?ä½?ã??"
 
 #. Translators: this is for navigating among fields in a form within
 #. a document.
 #.
-#: ../src/orca/structural_navigation.py:2434
+#: ../src/orca/structural_navigation.py:2423
 msgid "Goes to next form field."
 msgstr "ç§»è?³ä¸?ä¸?å??è¡¨å?®æ¬?ä½?ã??"
 
@@ -7788,28 +8160,28 @@ msgstr "ç§»è?³ä¸?ä¸?å??è¡¨å?®æ¬?ä½?ã??"
 #. 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:2493
 msgid "No more form fields."
 msgstr "æ²?æ??å?¶ä»?è¡¨å?®æ¬?ä½?ã??"
 
 #. Translators: this is for navigating in a document by heading.
 #. (e.g. <h1>)
 #.
-#: ../src/orca/structural_navigation.py:2521
+#: ../src/orca/structural_navigation.py:2510
 msgid "Goes to previous heading."
 msgstr "ç§»è?³å??ä¸?å??æ¨?é¡?ã??"
 
 #. Translators: this is for navigating in a document by heading.
 #. (e.g., <h1>)
 #.
-#: ../src/orca/structural_navigation.py:2526
+#: ../src/orca/structural_navigation.py:2515
 msgid "Goes to next heading."
 msgstr "ç§»è?³ä¸?ä¸?å??æ¨?é¡?ã??"
 
 #. 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:2525
 #, python-format
 msgid "Goes to previous heading at level %d."
 msgstr "ç§»è?³å??ä¸?å??ç¬¬ %d ç´?æ¨?é¡?ã??"
@@ -7817,7 +8189,7 @@ msgstr "ç§»è?³å??ä¸?å??ç¬¬ %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:2532
 #, python-format
 msgid "Goes to next heading at level %d."
 msgstr "ç§»è?³ä¸?ä¸?å??ç¬¬ %d ç´?æ¨?é¡?ã??"
@@ -7827,7 +8199,7 @@ msgstr "ç§»è?³ä¸?ä¸?å??ç¬¬ %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:2604
 msgid "No more headings."
 msgstr "æ²?æ??å?¶ä»?æ¨?é¡?ã??"
 
@@ -7836,7 +8208,7 @@ msgstr "æ²?æ??å?¶ä»?æ¨?é¡?ã??"
 #. (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:2611
 #, python-format
 msgid "No more headings at level %d."
 msgstr "æ²?æ??å?¶ä»?ç¬¬ %d ç´?æ¨?é¡?ã??"
@@ -7846,20 +8218,20 @@ msgstr "æ²?æ??å?¶ä»?ç¬¬ %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:2630
 #, fuzzy
 msgid "Goes to previous landmark."
-msgstr "ç§»è?³ä¸?å??ç¬¦å??ç??é ?ç?®"
+msgstr "ç§»è?³å??ä¸?å??å?å??ã??"
 
 #. Translators: this is for navigating to the next ARIA
 #. role landmark.  ARIA role landmarks are the W3C defined
 #. 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:2637
 #, fuzzy
 msgid "Goes to next landmark."
-msgstr "ç§»è?³ä¸?å??ç¬¦å??ç??é ?ç?®"
+msgstr "ç§»è?³ä¸?ä¸?å??å?å??ã??"
 
 #. Translators: this is for navigating to the previous ARIA
 #. role landmark.  ARIA role landmarks are the W3C defined
@@ -7867,53 +8239,43 @@ msgstr "ç§»è?³ä¸?å??ç¬¦å??ç??é ?ç?®"
 #. 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:2711
 msgid "No landmark found."
 msgstr "No landmark found."
 
 #. Translators: this is for navigating among bulleted/numbered
 #. lists in a document.
 #.
-#: ../src/orca/structural_navigation.py:2739
+#: ../src/orca/structural_navigation.py:2728
 msgid "Goes to previous list."
 msgstr "ç§»è?³å??ä¸?å??æ¸?å?®ã??"
 
 #. Translators: this is for navigating among bulleted/numbered
 #. lists in a document.
 #.
-#: ../src/orca/structural_navigation.py:2744
+#: ../src/orca/structural_navigation.py:2733
 msgid "Goes to next list."
 msgstr "ç§»è?³ä¸?ä¸?å??æ¸?å?®ã??"
 
-#. 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 "å·¢ç??æ¸?å?®ç¬¬ %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:2816
 msgid "No more lists."
 msgstr "æ²?æ??å?¶ä»?æ¸?å?®ã??"
 
 #. Translators: this is for navigating among bulleted/numbered list
 #. items in a document.
 #.
-#: ../src/orca/structural_navigation.py:2844
+#: ../src/orca/structural_navigation.py:2833
 msgid "Goes to previous list item."
 msgstr "ç§»è?³å??ä¸?å??æ¸?å?®é ?ç?®ã??"
 
 #. Translators: this is for navigating among bulleted/numbered list
 #. items in a document.
 #.
-#: ../src/orca/structural_navigation.py:2849
+#: ../src/orca/structural_navigation.py:2838
 msgid "Goes to next list item."
 msgstr "ç§»è?³ä¸?ä¸?å??æ¸?å?®é ?ç?®ã??"
 
@@ -7922,49 +8284,49 @@ msgstr "ç§»è?³ä¸?ä¸?å??æ¸?å?®é ?ç?®ã??"
 #. 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:2901
 msgid "No more list items."
 msgstr "æ²?æ??å?¶ä»?æ¸?å?®é ?ç?®ã??"
 
 #. Translators: this is for navigating between live regions
 #.
-#: ../src/orca/structural_navigation.py:2928
+#: ../src/orca/structural_navigation.py:2917
 #, fuzzy
 msgid "Goes to previous live region."
-msgstr "ç§»è?³ä¸?ä¸?è¡?ã??"
+msgstr "ç§»è?³å??ä¸?å??æ ¸å??æ?¹å¡?ã??"
 
 #. Translators: this is for navigating between live regions
 #.
-#: ../src/orca/structural_navigation.py:2932
+#: ../src/orca/structural_navigation.py:2921
 #, fuzzy
 msgid "Goes to next live region."
-msgstr "ç§»è?³ä¸?ä¸?è¡?ã??"
+msgstr "ç§»è?³ä¸?ä¸?å??æ ¸å??æ?¹å¡?ã??"
 
 #. 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:2926
 #, fuzzy
 msgid "Goes to last live region."
-msgstr "No more live regions."
+msgstr "ç§»è?³è¡¨æ ¼ä¸ç??æ??å¾?ä¸?å??å?²å?æ ¼ã??"
 
 #. Translators: this is for navigating HTML in a structural
 #. 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:2975
 msgid "No more live regions."
 msgstr "No more live regions."
 
 #. Translators: this is for navigating among paragraphs in a document.
 #.
-#: ../src/orca/structural_navigation.py:3002
+#: ../src/orca/structural_navigation.py:2991
 msgid "Goes to previous paragraph."
 msgstr "ç§»è?³å??ä¸?æ®µã??"
 
 #. Translators: this is for navigating among paragraphs in a document.
 #.
-#: ../src/orca/structural_navigation.py:3006
+#: ../src/orca/structural_navigation.py:2995
 msgid "Goes to next paragraph."
 msgstr "ç§»è?³ä¸?ä¸?æ®µã??"
 
@@ -7972,21 +8334,21 @@ msgstr "ç§»è?³ä¸?ä¸?æ®µã??"
 #. 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:3055
 msgid "No more paragraphs."
 msgstr "æ²?æ??å?¶ä»?æ®µè?½ã??"
 
 #. 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:3072
 msgid "Goes to previous radio button."
 msgstr "ç§»è?³å??ä¸?å??å?®é?¸æ??é??ã??"
 
 #. 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:3077
 msgid "Goes to next radio button."
 msgstr "ç§»è?³ä¸?ä¸?å??å?®é?¸æ??é??ã??"
 
@@ -7995,19 +8357,19 @@ msgstr "ç§»è?³ä¸?ä¸?å??å?®é?¸æ??é??ã??"
 #. 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:3134
 msgid "No more radio buttons."
 msgstr "æ²?æ??å?¶ä»?å?®é?¸æ??é??ã??"
 
 #. Translators: this is for navigating among tables in a document.
 #.
-#: ../src/orca/structural_navigation.py:3161
+#: ../src/orca/structural_navigation.py:3150
 msgid "Goes to previous table."
 msgstr "ç§»è?³å??ä¸?å??å·¥ä½?è¡¨ã??"
 
 #. Translators: this is for navigating among tables in a document.
 #.
-#: ../src/orca/structural_navigation.py:3165
+#: ../src/orca/structural_navigation.py:3154
 msgid "Goes to next table."
 msgstr "ç§»è?³ä¸?ä¸?å??å·¥ä½?è¡¨ã??"
 
@@ -8015,65 +8377,57 @@ msgstr "ç§»è?³ä¸?ä¸?å??å·¥ä½?è¡¨ã??"
 #. 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:3213
 msgid "No more tables."
 msgstr "æ²?æ??å?¶ä»?ç??è¡¨æ ¼ã??"
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3240
+#: ../src/orca/structural_navigation.py:3229
 msgid "Goes left one cell."
 msgstr "ç§»è?³å·¦é??ä¸?å??å?²å?æ ¼ã??"
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3244
+#: ../src/orca/structural_navigation.py:3233
 msgid "Goes right one cell."
 msgstr "ç§»è?³å?³é??ä¸?å??å?²å?æ ¼ã??"
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3248
+#: ../src/orca/structural_navigation.py:3237
 msgid "Goes up one cell."
 msgstr "ç§»è?³ä¸?é?¢ä¸?å??å?²å?æ ¼ã??"
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3252
+#: ../src/orca/structural_navigation.py:3241
 msgid "Goes down one cell."
 msgstr "ç§»è?³ä¸?é?¢ä¸?å??å?²å?æ ¼ã??"
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3256
+#: ../src/orca/structural_navigation.py:3245
 msgid "Goes to the first cell in a table."
 msgstr "ç§»è?³è¡¨æ ¼ä¸ç??ç¬¬ä¸?å??å?²å?æ ¼ã??"
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3260
+#: ../src/orca/structural_navigation.py:3249
 msgid "Goes to the last cell in a table."
 msgstr "ç§»è?³è¡¨æ ¼ä¸ç??æ??å¾?ä¸?å??å?²å?æ ¼ã??"
 
-#. 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 "å?? %dï¼?æ¬? %dã??"
-
 #. Translators: this is for navigating among unvisited links in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:3343
+#: ../src/orca/structural_navigation.py:3333
 msgid "Goes to previous unvisited link."
 msgstr "ç§»è?³å??ä¸?å??æ?ªç??è¦½ç??é?£çµ?ã??"
 
 #. Translators: this is for navigating among unvisited links in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:3348
+#: ../src/orca/structural_navigation.py:3338
 msgid "Goes to next unvisited link."
 msgstr "ç§»è?³ä¸?ä¸?å??æ?ªç??è¦½é?£çµ?ã??"
 
@@ -8082,21 +8436,21 @@ msgstr "ç§»è?³ä¸?ä¸?å??æ?ªç??è¦½é?£çµ?ã??"
 #. is what Orca will say if there are no more unvisited links
 #. found.
 #.
-#: ../src/orca/structural_navigation.py:3407
+#: ../src/orca/structural_navigation.py:3401
 msgid "No more unvisited links."
 msgstr "No more unvisited links."
 
 #. Translators: this is for navigating among visited links in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:3424
+#: ../src/orca/structural_navigation.py:3418
 msgid "Goes to previous visited link."
 msgstr "ç§»è?³å??ä¸?å??ç??è¦½é??ç??é?£çµ?ã??"
 
 #. Translators: this is for navigating among visited links in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:3429
+#: ../src/orca/structural_navigation.py:3423
 msgid "Goes to next visited link."
 msgstr "ç§»è?³ä¸?ä¸?å??ç??è¦½é??ç??é?£çµ?ã??"
 
@@ -8105,7 +8459,7 @@ msgstr "ç§»è?³ä¸?ä¸?å??ç??è¦½é??ç??é?£çµ?ã??"
 #. what Orca will say if there are no more visited links
 #. found.
 #.
-#: ../src/orca/structural_navigation.py:3487
+#: ../src/orca/structural_navigation.py:3479
 msgid "No more visited links."
 msgstr "æ²?æ??å?¶ä»?å??è¨ªé??ç??é?£çµ?ã??"
 
@@ -8140,7 +8494,7 @@ msgstr "è??æ?¯å®?æ?´é«?åº¦"
 #, fuzzy
 msgctxt "textattr"
 msgid "background stipple"
-msgstr "å¡«å?¥ç¶²é»?"
+msgstr "è??æ?¯é»?ç??é?®ç½©"
 
 #. Translators: this attribute specifies the direction of the text.
 #. Values are "none", "ltr" or "rtl".
@@ -8190,7 +8544,7 @@ msgstr "å??æ?¯é¡?è?²"
 #, fuzzy
 msgctxt "textattr"
 msgid "foreground stipple"
-msgstr "å¡«å?¥ç¶²é»?"
+msgstr "å??æ?¯é»?ç??é?®ç½©"
 
 #. Translators: this attribute specifies the effect applied to the font
 #. used by the text.
@@ -8218,9 +8572,10 @@ msgstr "ç¸®æ??"
 #. https://developer.mozilla.org/en/Accessibility/AT-APIs/Gecko/TextAttrs
 #.
 #: ../src/orca/text_attribute_names.py:133
+#, fuzzy
 msgctxt "textattr"
-msgid "invalid"
-msgstr "ç?¡æ??ç??"
+msgid "mistake"
+msgstr "mike"
 
 #. Translators: this attribute specifies whether the text is invisible.
 #. It will be a "true" or "false" value.
@@ -8293,7 +8648,7 @@ msgstr "æ®µè?½æ¨£å¼?"
 #, fuzzy
 msgctxt "textattr"
 msgid "pixels above lines"
-msgstr "æ¸?é?¤é?¸å??ç??å??ç´ "
+msgstr "æ¯?è¡?é ?é?¨å? ä¸?ç??å??ç´ "
 
 #. Translators: this attribute specifies the pixels of blank space to
 #. leave below each newline-terminated line.
@@ -8304,7 +8659,7 @@ msgstr "æ¸?é?¤é?¸å??ç??å??ç´ "
 #, fuzzy
 msgctxt "textattr"
 msgid "pixels below lines"
-msgstr "æ??å?å?¨å??ç¤ºä¸?"
+msgstr "æ¯?è¡?åº?é?¨å? ä¸?ç??å??ç´ "
 
 #. Translators: this attribute specifies the pixels of blank space to
 #. leave between wrapped lines inside the same newline-terminated line
@@ -8316,7 +8671,7 @@ msgstr "æ??å?å?¨å??ç¤ºä¸?"
 #, fuzzy
 msgctxt "textattr"
 msgid "pixels inside wrap"
-msgstr "æ¸?é?¤é?¸å??ç??å??ç´ "
+msgstr "æ??è¡?æ??å? ä¸?ç??å??ç´ "
 
 #. Translators: this attribute specifies the pixel width of the right margin.
 #. See:
@@ -8647,11 +9002,25 @@ msgid "word"
 msgstr "æ??å?"
 
 #. 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
+#, fuzzy
+msgctxt "textattr"
+msgid "word char"
+msgstr "æ?¼é?¯å?è©?ï¼?%s"
+
+#. 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 "å·¦è?³å?³"
@@ -8661,7 +9030,7 @@ msgstr "å·¦è?³å?³"
 #. 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 "å?³è?³å·¦"
@@ -8671,7 +9040,7 @@ msgstr "å?³è?³å·¦"
 #. 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 "é? å·¦"
@@ -8681,7 +9050,7 @@ msgstr "é? å·¦"
 #. 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 "é? å?³"
@@ -8691,7 +9060,7 @@ msgstr "é? å?³"
 #. 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 "ç½®ä¸"
@@ -8700,7 +9069,7 @@ msgstr "ç½®ä¸"
 #. 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 "ä¸?ä½¿ç?¨å°?é½?"
@@ -8710,7 +9079,7 @@ msgstr "ä¸?ä½¿ç?¨å°?é½?"
 #. 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 "å·¦å?³å°?é½?"
@@ -8720,7 +9089,7 @@ msgstr "å·¦å?³å°?é½?"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "ultra condensed"
@@ -8731,18 +9100,18 @@ msgstr "æ??è¡?æ¨¡å¼?"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "extra condensed"
-msgstr "æ??é??é??é??æ¯?"
+msgstr "A3 Extra"
 
 #. Translators: this is one of the text attribute values for the following
 #. text attributes: "stretch".
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "condensed"
@@ -8753,7 +9122,7 @@ msgstr "ç¸®æ??"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "semi condensed"
@@ -8764,7 +9133,7 @@ msgstr "ç¸®æ??"
 #. 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 "ä¸?è?¬"
@@ -8774,51 +9143,51 @@ msgstr "ä¸?è?¬"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "semi expanded"
-msgstr "ç¸®æ??"
+msgstr "è©³ç´°é¡¯ç¤º(_E)"
 
 #. Translators: this is one of the text attribute values for the following
 #. text attributes: "stretch".
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "expanded"
-msgstr "å±?é??"
+msgstr "å·²å±?é??"
 
 #. Translators: this is one of the text attribute values for the following
 #. text attributes: "stretch".
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "extra expanded"
-msgstr "æ??é??é??é??æ¯?"
+msgstr "è©³ç´°é¡¯ç¤º(_E)"
 
 #. Translators: this is one of the text attribute values for the following
 #. text attributes: "stretch".
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "ultra expanded"
-msgstr "å·¦è?³å?³"
+msgstr "è©³ç´°é¡¯ç¤º(_E)"
 
 #. Translators: this is one of the text attribute values for the following
 #. text attributes: "variant".
 #. 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 "å°?å¯«"
@@ -8828,7 +9197,7 @@ msgstr "å°?å¯«"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "oblique"
@@ -8839,7 +9208,7 @@ msgstr "é??ç·?"
 #. 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 "æ??é«?"
@@ -8849,7 +9218,7 @@ msgstr "æ??é«?"
 #. 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 "é ?è¨å?¼"
@@ -8859,7 +9228,7 @@ msgstr "é ?è¨å?¼"
 #. 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 "å?§æ??"
@@ -8869,7 +9238,7 @@ msgstr "å?§æ??"
 #. 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 "æ¨?é¡?"
@@ -8880,7 +9249,7 @@ msgstr "æ¨?é¡?"
 #. 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 "å?ºç·?"
@@ -8890,7 +9259,7 @@ msgstr "å?ºç·?"
 #. 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 "ä¸?æ¨?"
@@ -8900,7 +9269,7 @@ msgstr "ä¸?æ¨?"
 #. 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 "ä¸?æ¨?"
@@ -8910,7 +9279,7 @@ msgstr "ä¸?æ¨?"
 #. 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 "é ?ç«¯"
@@ -8920,7 +9289,7 @@ msgstr "é ?ç«¯"
 #. 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 "æ??å?é ?ç«¯"
@@ -8930,7 +9299,7 @@ msgstr "æ??å?é ?ç«¯"
 #. 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 "ä¸é??"
@@ -8940,7 +9309,7 @@ msgstr "ä¸é??"
 #. 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 "åº?é?¨"
@@ -8950,7 +9319,7 @@ msgstr "åº?é?¨"
 #. 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 "æ??å?åº?é?¨"
@@ -8961,7 +9330,7 @@ msgstr "æ??å?åº?é?¨"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "inherit"
@@ -8972,7 +9341,7 @@ msgstr "ç¸®æ??"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "lr-tb"
@@ -8983,7 +9352,7 @@ msgstr "å·¦è?³å?³"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "rl-tb"
@@ -8994,7 +9363,7 @@ msgstr "å·¦è?³å?³"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "tb-rl"
@@ -9005,7 +9374,7 @@ msgstr "å·¦è?³å?³"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "tb-lr"
@@ -9016,7 +9385,7 @@ msgstr "å·¦è?³å?³"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "bt-rl"
@@ -9027,7 +9396,7 @@ msgstr "å·¦è?³å?³"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "bt-lr"
@@ -9038,7 +9407,7 @@ msgstr "å·¦è?³å?³"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "lr"
@@ -9049,7 +9418,7 @@ msgstr "å·¦è?³å?³"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "rl"
@@ -9060,7 +9429,7 @@ msgstr "å?³è?³å·¦"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "tb"
@@ -9069,7 +9438,7 @@ msgstr "å·¦è?³å?³"
 #. 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
 #, fuzzy
 msgctxt "textattr"
 msgid "solid"
@@ -9080,7 +9449,7 @@ msgstr "å?ºå®?é¡?è?²(_S)"
 #. 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 "æ?¼å?"
@@ -9092,30 +9461,30 @@ msgstr "æ??ä¸?ç©ºç?½é?µå??æ??ã??"
 
 #. 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 "ä½¿ç?¨ç©ºç?½é?µå±?é??ï¼?ä¸¦ä½¿ç?¨ä¸?æ??ä¸?æ?¹å??é?µä¾?é?¸æ??é ?ç?®ã??"
 
 #. 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 "æ??ä¸? alt+f6 å°?ç?¦é»?é??ä¸è?³å?è¦?çª?ã??"
 
 #. 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 "è¦?ç§»è?³æ??é ?ç?®ï¼?å?¯ä½¿ç?¨æ?¹å??é?µæ??è¼¸å?¥æ??å°?ã??"
 
 #. 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 "è¦?ä½¿ç?¨ç³»çµ±é?¸å?®ï¼?è«?æ?? 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 "ä½¿ç?¨ä¸?æ??ä¸?æ?¹å??é?µä¾?é?¸æ??é ?ç?®ã??"
 
@@ -9123,7 +9492,7 @@ msgstr "ä½¿ç?¨ä¸?æ??ä¸?æ?¹å??é?µä¾?é?¸æ??é ?ç?®ã??"
 #. '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 "è¦?æ?ºç??ï¼?æ??ä¸? shift å? ä¸?å·¦æ?¹å??é?µã??"
 
@@ -9131,42 +9500,42 @@ msgstr "è¦?æ?ºç??ï¼?æ??ä¸? shift å? ä¸?å·¦æ?¹å??é?µã??"
 #. '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 "è¦?å±?é??ï¼?æ??ä¸? shift å? ä¸?å?³æ?¹å??é?µã??"
 
 #. 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 "è¼¸å?¥æ??å?ã??"
 
 #. 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 "ä½¿ç?¨å·¦å??å?³æ?¹å??é?µä¾?æª¢è¦?å?¶ä»?å??é ?ã??"
 
 #. 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 "è¦?ä½¿ç?¨è«?æ??ç©ºç?½é?µã??"
 
 #. 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 "ä½¿ç?¨ä¸?æ??ä¸?æ?¹å??é?µä¾?é?¸æ??æ?¸å?¼ã??æ??ç?´æ?¥è¼¸å?¥æ?³è¦?ç??æ?¸å?å?¼ã??"
 
 #. 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 "ä½¿ç?¨æ?¹å??é?µä¾?è®?æ?´ã??"
 
 #. 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."
@@ -9174,454 +9543,14 @@ msgstr "è¦?å°?è¦½è«?æ??å·¦æ??å?³æ?¹å??é?µã??è¦?ç§»å??è?³é ?ç?®è«?æ??ä¸?æ??ä¸?æ?¹
 
 #. 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 "è¦?é?²å?¥å?é?¸å?®ï¼?è«?æ??å?³æ?¹å??é?µã??"
 
 #. 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 ""
-
-#. Translators: this is the percentage value of a slider.
-#.
-#: ../src/orca/where_am_I.py:370
-#, python-format
-msgid "%s percent"
-msgstr "%s ç?¾å??æ¯?"
-
-#. Translators: this is in reference to a radio button being
-#. selected or not.
-#.
-#: ../src/orca/where_am_I.py:433
-msgid "selected"
-msgstr "å·²é?¸å??"
-
-#. Translators: this is in reference to a radio button being
-#. selected or not.
-#.
-#: ../src/orca/where_am_I.py:438
-msgid "not selected"
-msgstr "æ²?æ??é?¸å??"
-
-#. 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 é ?"
-
-#. 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 "æ¬? %d / %d"
-
-#: ../src/orca/where_am_I.py:777
-msgid "Icon panel"
-msgstr "å??ç¤ºé?¢æ?¿"
-
-#. 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 "%s é?£çµ?"
-
-#: ../src/orca/where_am_I.py:832
-#, python-format
-msgid "%s link to %s"
-msgstr "%s é?£çµ?è?³ %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 "ç?¸å??é ?é?¢"
-
-#: ../src/orca/where_am_I.py:844 ../src/orca/where_am_I.py:852
-msgid "same site"
-msgstr "ç?¸å??ç¶²ç«?"
-
-#: ../src/orca/where_am_I.py:854
-msgid "different site"
-msgstr "ä¸?å??ç¶²ç«?"
-
-#. 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 / %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/where_am_I.py:1023
-#, python-format
-msgid "on item %d of %d"
-msgstr "é ?ç?® %d / %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 ä½?å??çµ?"
-
-#. Translators: This is the size of a file in kilobytes
-#.
-#: ../src/orca/where_am_I.py:1060
-#, python-format
-msgid "%.2f kilobytes"
-msgstr "%.2f KB"
-
-#. Translators: This is the size of a file in megabytes
-#.
-#: ../src/orca/where_am_I.py:1064
-#, python-format
-msgid "%.2f megabytes"
-msgstr "%.2f MB"
-
-#. 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 "é ?ç?® %d/%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 "é ?è¨æ??é??ç?º%s"
-
-#~ msgid "Update interval:"
-#~ msgstr "æ?´æ?°é??é??:"
-
-#~ msgid "Calc"
-#~ msgstr "Calc"
-
-#~ msgid "Text Document"
-#~ msgstr "æ??å?æª?"
-
-#~ msgid "Spellcheck:"
-#~ msgstr "æ?¼å?æª¢æ?¥ï¼?"
-
-#~ msgid "Writer"
-#~ msgstr "Writer"
-
-#~ msgid "yelp"
-#~ msgstr "yelp"
-
-#~ msgid "Exits learn mode."
-#~ msgstr "é?¢é??å¸ç¿?æ¨¡å¼?ã??"
-
-#, fuzzy
-#~ msgid "listitem|selected"
-#~ msgstr "å·²é?¸å??"
-
-#, fuzzy
-#~ msgid "listitem|unselected"
-#~ msgstr "æ²?æ??é?¸å??"
-
-#, fuzzy
-#~ msgid "option|speech"
-#~ msgstr "é?¸é ?çª?æ ¼"
-
-#, fuzzy
-#~ msgid "option|braille-monitor"
-#~ msgstr "å??ç?¨é»?å?ç?£å?¨(_M)"
-
-#, fuzzy
-#~ msgid "option|magnifier"
-#~ msgstr "é?¸é ?çª?æ ¼"
-
-#~ msgid "pidgin"
-#~ msgstr "pidgin"
-
-#~ msgid "underscore"
-#~ msgstr "åº?ç·?"
-
-#~ msgid "Toggles keystroke recording on and off."
-#~ msgstr "å??æ??ç?å??ç´?é??ç?ºé??æ??é??ã??"
-
-#~ msgid "Reloads user settings and reinitializes services as necessary."
-#~ msgstr "å¦?é??è¦?æ??é??æ?°è¼?å?¥ä½¿ç?¨è??è¨å®?å??é??æ?°èµ·å??æ??å??ã??"
-
-#~ msgid "Switches to the next presentation manager."
-#~ msgstr "å??æ??è?³ä¸?ä¸?å??å±?ç¤ºç®¡ç??å?¡ã??"
-
-#~ msgid "1 space "
-#~ msgstr "1 å??ç©ºæ ¼ "
-
-#~ msgid "1 tab "
-#~ msgstr "1 å??å??é ? "
-
-#~ msgid "row"
-#~ msgstr "å??"
-
-#~ msgid "Switching to focus tracking mode."
-#~ msgstr "å??æ??è?³ç?¦é»?è¿½è¹¤æ¨¡å¼?ã??"
-
-#~ msgid "Switching to hierarchical navigation mode."
-#~ msgstr "å??æ??è?³çµ?ç¹?å°?è?ªæ¨¡å¼?ã??"
-
-#~ msgid "%d. %s"
-#~ msgstr "%d. %s"
-
-#~ msgid "Accessibility support for GNOME has just been enabled. "
-#~ msgstr "å·²ç¶?å??ç?¨ GNOME ç??ç?¡é??ç¤?ç?°å¢?ã??"
-
-#~ msgid "You need to log out and log back in for the change to take effect. "
-#~ msgstr "é??è¦?ç?»å?ºå¾?å??ç?»å?¥ä¾?å¥?ç?¨æ?°è¨å®?ã??"
-
-#~ msgid "Orca Find"
-#~ msgstr "Orca å°?æ?¾"
-
-#~ msgid "Handler"
-#~ msgstr "è??ç??ç¨?å¼?"
-
-#~ msgid "Mod.Mask 1"
-#~ msgstr "Mod.Mask 1"
-
-#~ msgid "Use Mod.1"
-#~ msgstr "Use Mod.1"
-
-#~ msgid "Key1"
-#~ msgstr "Key1"
-
-#~ msgid "Mod.Mask 2"
-#~ msgstr "Mod.Mask 2"
-
-#~ msgid "Use Mod.2"
-#~ msgstr "Use Mod.2"
-
-#~ msgid "Key2"
-#~ msgstr "Key2"
-
-#~ msgid "Speech not available."
-#~ msgstr "èª?é?³å??è?½ä¸?å?å?¨ã??"
-
-#~ msgid "Preferences"
-#~ msgstr "å??å¥½è¨å®?"
-
-#~ msgid "Quit"
-#~ msgstr "çµ?æ??"
-
-#~ msgid "User logged out - shutting down."
-#~ msgstr "ä½¿ç?¨è??ç?»å?º - é??é??ä¸ã??"
-
-#~ msgid "Debug level all."
-#~ msgstr "å?¨é?¨å?µé?¯ç´?å?¥ã??"
-
-#~ msgid "Debug level finest."
-#~ msgstr "æ??å°?å?µé?¯ç´?å?¥ã??"
-
-#~ msgid "Debug level finer."
-#~ msgstr "è¼?å°?å?µé?¯ç´?å?¥ã??"
-
-#~ msgid " off"
-#~ msgstr " é??"
-
-#~ msgid " on"
-#~ msgstr " é??"
-
-#~ msgid "Num_Lock"
-#~ msgstr "Num_Lock"
-
-#~ msgid "goodbye."
-#~ msgstr "å??è¦?ã??"
-
-#~ msgid "-v, --version                %s"
-#~ msgstr "-v, --version                %s"
-
-#~ msgid "-s, --setup, --gui-setup     Set up user preferences"
-#~ msgstr "-s, --setup, --gui-setup     è¨ç½®ä½¿ç?¨è??å??å¥½è¨å®?"
-
-#~ msgid ""
-#~ "-e, --enable=[speech|braille|braille-monitor|magnifier|main-window] Force "
-#~ "use of option"
-#~ msgstr ""
-#~ "-e, --enable=[speech|braille|braille-monitor|magnifier|main-window] å¼·å?¶å?·"
-#~ "è¡?é?¸é ?"
-
-#~ msgid ""
-#~ "-d, --disable=[speech|braille|braille-monitor|magnifier|main-window] "
-#~ "Prevent use of option"
-#~ msgstr ""
-#~ "-d, --disable=[speech|braille|braille-monitor|magnifier|main-window] ç¦?ç?¨"
-#~ "é?¸é ?"
-
-#~ msgid "Do you really want to quit Orca?"
-#~ msgstr "æ?¨ç??ç??è¦?é?¢é?? Orcaï¼?"
-
-#~ msgid "Question"
-#~ msgstr "å??é¡?"
-
-#~ msgid "<b>Zoomer Position</b>"
-#~ msgstr "<b>æ?¾å¤§é?¡ä½?ç½®</b>"
-
-#~ msgid "Color:"
-#~ msgstr "é¡?è?²ï¼?"
-
-#~ msgid "Mouse trac_king mode:"
-#~ msgstr "æ»?é¼ è¿½è¹¤æ¨¡å¼?(_K):"
-
-#~ msgid "Si_ze:"
-#~ msgstr "å¤§å°?(_Z):"
-
-#~ msgid "_Width:"
-#~ msgstr "å¯¬åº¦(_W):"
-
-#~ msgid "alpha"
-#~ msgstr "alpha"
-
-#~ msgid "bravo"
-#~ msgstr "bravo"
-
-#~ msgid "charlie"
-#~ msgstr "charlie"
-
-#~ msgid "delta"
-#~ msgstr "delta"
-
-#~ msgid "echo"
-#~ msgstr "echo"
-
-#~ msgid "foxtrot"
-#~ msgstr "foxtrot"
-
-#~ msgid "golf"
-#~ msgstr "golf"
-
-#~ msgid "hotel"
-#~ msgstr "hotel"
-
-#~ msgid "india"
-#~ msgstr "india"
-
-#~ msgid "kilo"
-#~ msgstr "kilo"
-
-#~ msgid "lima"
-#~ msgstr "lima"
-
-#~ msgid "mike"
-#~ msgstr "mike"
-
-#~ msgid "november"
-#~ msgstr "november"
-
-#~ msgid "oscar"
-#~ msgstr "oscar"
-
-#~ msgid "papa"
-#~ msgstr "papa"
-
-#~ msgid "quebec"
-#~ msgstr "quebec"
-
-#~ msgid "sierra"
-#~ msgstr "sierra"
-
-#~ msgid "tango"
-#~ msgstr "tango"
-
-#~ msgid "victor"
-#~ msgstr "victor"
-
-#~ msgid "whiskey"
-#~ msgstr "whiskey"
-
-#~ msgid "xray"
-#~ msgstr "xray"
-
-#~ msgid "yankee"
-#~ msgstr "yankee"
-
-#~ msgid "ASAP"
-#~ msgstr "ASAP"
-
-#~ msgid "as soon as possible"
-#~ msgstr "è¶?å¿«è¶?å¥½"
-
-#~ msgid "GHz"
-#~ msgstr "GHz"
-
-#~ msgid "gigahertz"
-#~ msgstr "gigahertz"
-
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
-#~ msgid "eye map"
-#~ msgstr "é³¥ç?°å??"
-
-#~ msgid "LDAP"
-#~ msgstr "LDAP"
-
-#~ msgid "ell dap"
-#~ msgstr "ell dap"
-
-#~ msgid "LOL"
-#~ msgstr "LOL"
-
-#~ msgid "laughing out loud"
-#~ msgstr "å??å??å¤§ç¬?"
-
-#~ msgid "MHz"
-#~ msgstr "MHz"
-
-#~ msgid "megahertz"
-#~ msgstr "megahertz"
-
-#~ msgid "strikethrough"
-#~ msgstr "å?ªé?¤ç·?"
-
-#~ msgid "SELinux"
-#~ msgstr "SELinux"
-
-#~ msgid "ess ee linux"
-#~ msgstr "ess ee linux"
-
-#~ msgid "ckm"
-#~ msgstr "ckm"
-
-#~ msgid "CheckMenu"
-#~ msgstr "å?¾é?¸é?¸å?®"
-
-#~ msgid "check menu"
-#~ msgstr "å?¾é?¸é?¸å?®"
-
-#~ msgid "rdmnu"
-#~ msgstr "rdmnu"
-
-#~ msgid "RadioMenu"
-#~ msgstr "å??é?¸é?¸å?®"
-
-#~ msgid "radio menu"
-#~ msgstr "å??é?¸é?¸å?®"
-
-#~ msgid "chrome://"
-#~ msgstr "chrome://"
-
-#~ msgid "time-admin"
-#~ msgstr "time-admin"
-
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
+msgstr "è¦?æ¸?å°?æ??å·¦æ?¹å??é?µï¼?å¢?å? æ??å?³æ?¹å??é?µã??è¦?å°?æ?? home æ??é?µï¼?å¤?æ?? end æ??é?µã??"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]