[orca] Updating Estonian translation

From: Priit Laes <plaes src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [orca] Updating Estonian translation
Date: Mon, 1 Feb 2010 07:41:49 +0000 (UTC)
commit e4bd0268e7927a55a213f5b038ab65e8c2cc3eb7
Author: Mattias PÃµldaru <mahfiaz gmail com>
Date:   Mon Feb 1 09:41:41 2010 +0200

    Updating Estonian translation

 po/et.po | 1681 ++++----------------------------------------------------------
 1 files changed, 102 insertions(+), 1579 deletions(-)
---
diff --git a/po/et.po b/po/et.po
index d5cbe34..272a829 100644
--- a/po/et.po
+++ b/po/et.po
@@ -11,19 +11,17 @@ msgstr ""
 "Project-Id-Version: orca HEAD\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-15 23:01+0000\n"
-"PO-Revision-Date: 2008-09-19 09:06+0300\n"
-"Last-Translator: Ivar Smolin <okul linux ee>\n"
+"PO-Revision-Date: 2010-02-01 09:04+0300\n"
+"Last-Translator: Mattias PÃµldaru <mahfiaz gmail com>\n"
 "Language-Team: Estonian <gnome-et linux ee>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../orca.desktop.in.h:1
 msgid "Orca Screen Reader and Magnifier"
 msgstr "Orca ekraanilugeja ja luup"
 
-#: ../orca.desktop.in.h:2
 msgid ""
 "Present on-screen information as speech or braille, or magnify the screen"
 msgstr ""
@@ -52,140 +50,106 @@ msgstr ""
 #. languages. You could read about braille tables at:
 #. http://en.wikipedia.org/wiki/Braille
 #.
-#: ../src/louis/constants.py.in:28
 msgid "Czech Grade 1"
 msgstr ""
 
-#: ../src/louis/constants.py.in:29
 msgid "Spanish Grade 1"
 msgstr ""
 
-#: ../src/louis/constants.py.in:30
 msgid "Canada French Grade 2"
 msgstr ""
 
-#: ../src/louis/constants.py.in:31
 msgid "France French Grade 2"
 msgstr ""
 
-#: ../src/louis/constants.py.in:32
 msgid "Latvian Grade 1"
 msgstr ""
 
-#: ../src/louis/constants.py.in:33
 msgid "Netherlands Dutch Grade 1"
 msgstr ""
 
-#: ../src/louis/constants.py.in:34
 msgid "Norwegian Grade 0"
 msgstr ""
 
-#: ../src/louis/constants.py.in:35
 msgid "Norwegian Grade 1"
 msgstr ""
 
-#: ../src/louis/constants.py.in:36
 msgid "Norwegian Grade 2"
 msgstr ""
 
-#: ../src/louis/constants.py.in:37
 msgid "Norwegian Grade 3"
 msgstr ""
 
-#: ../src/louis/constants.py.in:38
 msgid "Polish Grade 1"
 msgstr ""
 
-#: ../src/louis/constants.py.in:39
 msgid "Portuguese Grade 1"
 msgstr ""
 
-#: ../src/louis/constants.py.in:40
 msgid "Swedish Grade 1"
 msgstr ""
 
-#: ../src/louis/constants.py.in:41
 msgid "Arabic Grade 1"
 msgstr ""
 
-#: ../src/louis/constants.py.in:42
 msgid "Welsh Grade 1"
 msgstr ""
 
-#: ../src/louis/constants.py.in:43
 msgid "Welsh Grade 2"
 msgstr ""
 
-#: ../src/louis/constants.py.in:44
 msgid "German Grade 0"
 msgstr ""
 
-#: ../src/louis/constants.py.in:45
 msgid "German Grade 1"
 msgstr ""
 
-#: ../src/louis/constants.py.in:46
 msgid "German Grade 2"
 msgstr ""
 
-#: ../src/louis/constants.py.in:47
 msgid "U.K. English Grade 2"
 msgstr ""
 
-#: ../src/louis/constants.py.in:48
 msgid "U.K. English Grade 1"
 msgstr ""
 
-#: ../src/louis/constants.py.in:49
 msgid "U.S. English Grade 1"
 msgstr ""
 
-#: ../src/louis/constants.py.in:50
 msgid "U.S. English Grade 2"
 msgstr ""
 
-#: ../src/louis/constants.py.in:51
 msgid "Canada French Grade 1"
 msgstr ""
 
-#: ../src/louis/constants.py.in:52
 msgid "France French Grade 1"
 msgstr ""
 
-#: ../src/louis/constants.py.in:53
 msgid "Greek Grade 1"
 msgstr ""
 
-#: ../src/louis/constants.py.in:54
 msgid "Hindi Grade 1"
 msgstr ""
 
-#: ../src/louis/constants.py.in:55
 msgid "Italian Grade 1"
 msgstr ""
 
-#: ../src/louis/constants.py.in:56
 msgid "Belgium Dutch Grade 1"
 msgstr ""
 
-#: ../src/orca/app_gui_prefs.py:123
 #, python-format
 msgid "Orca Preferences for %s"
 msgstr ""
 
-#: ../src/orca/app_gui_prefs.py:189 ../src/orca/keybindings.py:157
-#: ../src/orca/orca_gui_prefs.py:2110 ../src/orca/orca_gui_prefs.py:2211
 msgid "Orca"
 msgstr ""
 
 #. Translators: this refers to commands that do not currently have
 #. an associated key binding.
 #.
-#: ../src/orca/app_gui_prefs.py:194 ../src/orca/orca_gui_prefs.py:2217
 msgid "Unbound"
 msgstr ""
 
-#: ../src/orca/app_gui_prefs.py:288
 msgid "No application has focus."
 msgstr ""
 
@@ -193,7 +157,6 @@ msgstr ""
 #. for allowing users to set application specific settings from within
 #. Orca for the application that currently has focus.
 #.
-#: ../src/orca/app_gui_prefs.py:305
 #, fuzzy, python-format
 msgid "Starting Orca Preferences for %s."
 msgstr "Orca eelistused"
@@ -203,31 +166,24 @@ msgstr "Orca eelistused"
 #. application window and provides keystrokes for the user to jump to
 #. those spots.  These spots are known as 'bookmarks'.
 #.
-#: ../src/orca/bookmarks.py:79
 msgid "bookmark entered"
 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
 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
 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
 #, python-format
 msgid "shared ancestor %s"
 msgstr ""
@@ -235,31 +191,24 @@ msgstr ""
 #. 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
 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
 msgid "bookmarks saved"
 msgstr "jÃ¤rjehoidja on salvestatud"
 
 #. 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
 msgid "bookmarks could not be saved"
 msgstr "jÃ¤rjehoidjaid pole vÃµimalik salvestada"
 
 #. 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:192
 msgid "grayed"
 msgstr ""
 
@@ -267,7 +216,6 @@ msgstr ""
 #. alert and dialog windows plus the total number of
 #. windows that this application has.
 #.
-#: ../src/orca/braillegenerator.py:620
 #, python-format
 msgid "(%d dialog)"
 msgid_plural "(%d dialogs)"
@@ -278,13 +226,6 @@ msgstr[1] "(%d dialoogi)"
 #. 'expanded' means the children are showing.
 #. 'collapsed' means the children are not showing.
 #.
-#: ../src/orca/braillegenerator.py:757 ../src/orca/braillegenerator.py:1402
-#: ../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:885 ../src/orca/speechgenerator.py:1483
-#: ../src/orca/where_am_I.py:674 ../src/orca/where_am_I.py:739
 msgid "expanded"
 msgstr "laiendatud"
 
@@ -292,20 +233,12 @@ msgstr "laiendatud"
 #. 'expanded' means the children are showing.
 #. 'collapsed' means the children are not showing.
 #.
-#: ../src/orca/braillegenerator.py:763 ../src/orca/braillegenerator.py:1408
-#: ../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:891 ../src/orca/speechgenerator.py:1502
-#: ../src/orca/where_am_I.py:680 ../src/orca/where_am_I.py:745
 msgid "collapsed"
 msgstr "ahendatud"
 
 #. 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 "TASE %d"
@@ -314,22 +247,12 @@ msgstr "TASE %d"
 #. the 'toggle' action. It must be the same
 #. string used in the *.po file for gail.
 #.
-#: ../src/orca/braillegenerator.py:1298 ../src/orca/braillegenerator.py:1339
-#: ../src/orca/flat_review.py:1035
-#: ../src/orca/scripts/apps/evolution/script.py:815
-#: ../src/orca/scripts/apps/evolution/where_am_i.py:61
-#: ../src/orca/speechgenerator.py:1407 ../src/orca/speechgenerator.py:1447
-#: ../src/orca/speechgenerator.py:1581 ../src/orca/tutorialgenerator.py:456
-#: ../src/orca/tutorialgenerator.py:496 ../src/orca/where_am_I.py:1349
-#: ../src/orca/where_am_I.py:1379
 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:1490
-#: ../src/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.py:84
 #, python-format
 msgid "TREE LEVEL %d"
 msgstr ""
@@ -338,7 +261,6 @@ msgstr ""
 #. 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
 msgid "Line Left"
 msgstr ""
 
@@ -346,7 +268,6 @@ msgstr ""
 #. 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
 msgid "Line Right"
 msgstr ""
 
@@ -354,7 +275,6 @@ msgstr ""
 #. display (an external hardware device used by people who are blind).
 #. When pressing the button, the display scrolls up.
 #.
-#: ../src/orca/braille.py:184
 msgid "Line Up"
 msgstr ""
 
@@ -362,7 +282,6 @@ msgstr ""
 #. display (an external hardware device used by people who are blind).
 #. When pressing the button, the display scrolls down.
 #.
-#: ../src/orca/braille.py:190
 msgid "Line Down"
 msgstr ""
 
@@ -371,7 +290,6 @@ msgstr ""
 #. When pressing the button, the display scrolls to the top left of the
 #. window.
 #.
-#: ../src/orca/braille.py:197
 msgid "Top Left"
 msgstr ""
 
@@ -380,7 +298,6 @@ msgstr ""
 #. When pressing the button, the display scrolls to the bottom right of
 #. the window.
 #.
-#: ../src/orca/braille.py:204
 msgid "Bottom Right"
 msgstr ""
 
@@ -389,20 +306,16 @@ msgstr ""
 #. When pressing the button, the display scrolls to position containing
 #. the cursor.
 #.
-#: ../src/orca/braille.py:211
 msgid "Cursor Position"
 msgstr ""
 
 #. Translators: this is the spoken word for the space character
 #.
-#: ../src/orca/chnames.py:39 ../src/orca/default.py:6800
-#: ../src/orca/default.py:6807 ../src/orca/keynames.py:133
 msgid "space"
 msgstr "tÃ¼hik"
 
 #. Translators: this is the spoken word for the newline character
 #.
-#: ../src/orca/chnames.py:43
 msgid "newline"
 msgstr "reavahetus"
 
@@ -410,235 +323,196 @@ msgstr "reavahetus"
 #.
 #. Translators: this is how someone would speak the name of the tab key
 #.
-#: ../src/orca/chnames.py:47 ../src/orca/keynames.py:117
 msgid "tab"
 msgstr "tabulaator"
 
 #. Translators: this is the spoken word for the character '!' (U+0021)
 #.
-#: ../src/orca/chnames.py:51
 msgid "exclaim"
 msgstr "hÃ¼Ã¼umÃ¤rk"
 
 #. Translators: this is the spoken word for the character '"' (U+0022)
 #.
-#: ../src/orca/chnames.py:55
 msgid "quote"
 msgstr "jutumÃ¤rk"
 
 #. Translators: this is the spoken word for the character '#' (U+0023)
 #.
-#: ../src/orca/chnames.py:59
 msgid "number"
 msgstr ""
 
 #. Translators: this is the spoken word for the character '$' (U+0024)
 #.
-#: ../src/orca/chnames.py:63
 msgid "dollar"
 msgstr "dollar"
 
 #. Translators: this is the spoken word for the character '%' (U+0025)
 #.
-#: ../src/orca/chnames.py:67
 msgid "percent"
 msgstr "protsent"
 
 #. Translators: this is the spoken word for the character '&' (U+0026)
 #.
-#: ../src/orca/chnames.py:71
 msgid "and"
 msgstr ""
 
 #. Translators: this is the spoken word for the character ''' (U+0027)
 #.
-#: ../src/orca/chnames.py:75
 msgid "apostrophe"
 msgstr ""
 
 #. Translators: this is the spoken word for the character '(' (U+0028)
 #.
-#: ../src/orca/chnames.py:79
 msgid "left paren"
 msgstr "vasak sulg"
 
 #. Translators: this is the spoken word for the character ')' (U+0029)
 #.
-#: ../src/orca/chnames.py:83
 msgid "right paren"
 msgstr "parem sulg"
 
 #. Translators: this is the spoken word for the character '*' (U+002a)
 #.
-#: ../src/orca/chnames.py:87
 msgid "star"
 msgstr "tÃ¤rn"
 
 #. Translators: this is the spoken word for the character '+' (U+002b)
 #.
-#: ../src/orca/chnames.py:91
 msgid "plus"
 msgstr "pluss"
 
 #. Translators: this is the spoken word for the character ',' (U+002c)
 #.
-#: ../src/orca/chnames.py:95
 msgid "comma"
 msgstr "koma"
 
 #. Translators: this is the spoken word for the character '-' (U+002d)
 #.
-#: ../src/orca/chnames.py:99
 msgid "dash"
 msgstr ""
 
 #. Translators: this is the spoken word for the character '.' (U+002e)
 #.
-#: ../src/orca/chnames.py:103
 msgid "dot"
 msgstr "punkt"
 
 #. Translators: this is the spoken word for the character '/' (U+002f)
 #.
-#: ../src/orca/chnames.py:107
 msgid "slash"
 msgstr "kaldkriips"
 
 #. Translators: this is the spoken word for the character ':' (U+003a)
 #.
-#: ../src/orca/chnames.py:111
 msgid "colon"
 msgstr "koolon"
 
 #. Translators: this is the spoken word for the character ';' (U+003b)
 #.
-#: ../src/orca/chnames.py:115
 msgid "semicolon"
 msgstr "semikoolon"
 
 #. Translators: this is the spoken word for the character '<Â ' (U+003c)
 #.
-#: ../src/orca/chnames.py:119
 msgid "less"
 msgstr ""
 
 #. Translators: this is the spoken word for the character '=' (U+003d)
 #.
-#: ../src/orca/chnames.py:123
 msgid "equals"
 msgstr "vÃµrdusmÃ¤rk"
 
 #. Translators: this is the spoken word for the character '>Â ' (U+003e)
 #.
-#: ../src/orca/chnames.py:127
 msgid "greater"
 msgstr ""
 
 #. Translators: this is the spoken word for the character '?' (U+003f)
 #.
-#: ../src/orca/chnames.py:131
 msgid "question"
 msgstr "kÃ¼simÃ¤rk"
 
 #. Translators: this is the spoken word for the character '@' (U+0040)
 #.
-#: ../src/orca/chnames.py:135
 msgid "at"
 msgstr ""
 
 #. Translators: this is the spoken word for the character '[' (U+005b)
 #.
-#: ../src/orca/chnames.py:139
 msgid "left bracket"
 msgstr "vasak nurksulg"
 
 #. Translators: this is the spoken word for the character '\' (U+005c)
 #.
-#: ../src/orca/chnames.py:143
 msgid "backslash"
 msgstr "langkriips"
 
 #. Translators: this is the spoken word for the character ']' (U+005d)
 #.
-#: ../src/orca/chnames.py:147
 msgid "right bracket"
 msgstr "parem nurksulg"
 
 #. Translators: this is the spoken word for the character '^' (U+005e)
 #.
-#: ../src/orca/chnames.py:151
 msgid "caret"
 msgstr "katus"
 
 #. Translators: this is the spoken word for the character '_' (U+005f)
 #.
-#: ../src/orca/chnames.py:155
 msgid "underline"
 msgstr "alakriips"
 
 #. Translators: this is the spoken word for the character '`' (U+0060)
 #.
-#: ../src/orca/chnames.py:159
 msgid "grave"
 msgstr ""
 
 #. Translators: this is the spoken word for the character '{' (U+007b)
 #.
-#: ../src/orca/chnames.py:163
 msgid "left brace"
 msgstr "vasak loogiline sulg"
 
 #. Translators: this is the spoken word for the character '|' (U+007c)
 #.
-#: ../src/orca/chnames.py:167
 msgid "vertical bar"
 msgstr "pÃ¼stkriips"
 
 #. Translators: this is the spoken word for the character '}' (U+007d)
 #.
-#: ../src/orca/chnames.py:171
 msgid "right brace"
 msgstr "parem loogiline sulg"
 
 #. Translators: this is the spoken word for the character '~' (U+007e)
 #.
-#: ../src/orca/chnames.py:175
 msgid "tilde"
 msgstr "tilde"
 
 #. Translators: this is the spoken word for the character 'Â¡' (U+00a1)
 #.
-#: ../src/orca/chnames.py:179
 msgid "inverted exclamation point"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Â¢' (U+00a2)
 #.
-#: ../src/orca/chnames.py:183
 msgid "cents"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Â£' (U+00a3)
 #.
-#: ../src/orca/chnames.py:187
 msgid "pounds"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Â¤' (U+00a4)
 #.
-#: ../src/orca/chnames.py:191
 msgid "currency sign"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Â¥' (U+00a5)
 #.
-#: ../src/orca/chnames.py:195
 msgid "yen"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Â¦' (U+00a6)
 #.
-#: ../src/orca/chnames.py:199
 msgid "broken bar"
 msgstr ""
 
@@ -646,681 +520,568 @@ msgstr ""
 #.
 #. Translators: spoken words for the rolename of a section (e.g., in html).
 #.
-#: ../src/orca/chnames.py:203 ../src/orca/rolenames.py:844
 msgid "section"
 msgstr "paragrahv"
 
 #. Translators: this is the spoken word for the character 'Â¨' (U+00a8)
 #.
-#: ../src/orca/chnames.py:207
 msgid "umlaut"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Â©' (U+00a9)
 #.
-#: ../src/orca/chnames.py:211
 msgid "copyright"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Âª' (U+00aa)
 #.
-#: ../src/orca/chnames.py:215
 msgid "superscript a"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Â«' (U+00ab)
 #.
-#: ../src/orca/chnames.py:219
 msgid "left double angle bracket"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Â¬' (U+00ac)
 #.
-#: ../src/orca/chnames.py:223
 msgid "logical not"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Â' (U+00ad)
 #.
-#: ../src/orca/chnames.py:227
 msgid "soft hyphen"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Â®' (U+00ae)
 #.
-#: ../src/orca/chnames.py:231
 msgid "registered"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Â¯' (U+00af)
 #.
-#: ../src/orca/chnames.py:235
 msgid "macron"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Â°' (U+00b0)
 #.
-#: ../src/orca/chnames.py:239
 msgid "degrees"
 msgstr "kraadi"
 
 #. Translators: this is the spoken word for the character 'Â±' (U+00b1)
 #.
-#: ../src/orca/chnames.py:243
 msgid "plus or minus"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Â²' (U+00b2)
 #.
-#: ../src/orca/chnames.py:247
 msgid "superscript 2"
 msgstr "ruudus"
 
 #. Translators: this is the spoken word for the character 'Â³' (U+00b3)
 #.
-#: ../src/orca/chnames.py:251
 msgid "superscript 3"
 msgstr "kuubis"
 
 #. Translators: this is the spoken word for the character 'Â´' (U+00b4)
 #.
-#: ../src/orca/chnames.py:255
 msgid "acute accent"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Âµ' (U+00b5)
 #.
-#: ../src/orca/chnames.py:259
 msgid "mu"
 msgstr "mÃ¼Ã¼"
 
 #. Translators: this is the spoken word for the character 'Â¶' (U+00b6)
 #.
-#: ../src/orca/chnames.py:263
 msgid "paragraph marker"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Â·' (U+00b7)
 #.
-#: ../src/orca/chnames.py:267
 msgid "middle dot"
 msgstr "keskpunkt"
 
 #. Translators: this is the spoken word for the character 'Â¸' (U+00b8)
 #.
-#: ../src/orca/chnames.py:271
 msgid "cedilla"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Â¹' (U+00b9)
 #.
-#: ../src/orca/chnames.py:275
 msgid "superscript 1"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Âº' (U+00ba)
 #.
-#: ../src/orca/chnames.py:279
 msgid "ordinal"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Â»' (U+00bb)
 #.
-#: ../src/orca/chnames.py:283
 msgid "right double angle bracket"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Â¼' (U+00bc)
 #.
-#: ../src/orca/chnames.py:287
 msgid "one fourth"
 msgstr "Ã¼ks neljandik"
 
 #. Translators: this is the spoken word for the character 'Â½' (U+00bd)
 #.
-#: ../src/orca/chnames.py:291
 msgid "one half"
 msgstr "Ã¼ks kahendik"
 
 #. Translators: this is the spoken word for the character 'Â¾' (U+00be)
 #.
-#: ../src/orca/chnames.py:295
 msgid "three fourths"
 msgstr "kolm neljandikku"
 
 #. Translators: this is the spoken word for the character 'Â¿' (U+00bf)
 #.
-#: ../src/orca/chnames.py:299
 msgid "inverted question mark"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã¡' (U+00e1)
 #.
-#: ../src/orca/chnames.py:303
 msgid "a acute"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00c0)
 #.
-#: ../src/orca/chnames.py:307
 msgid "A GRAVE"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00c1)
 #.
-#: ../src/orca/chnames.py:311
 msgid "A ACUTE"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00c2)
 #.
-#: ../src/orca/chnames.py:315
 msgid "A CIRCUMFLEX"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00c3)
 #.
-#: ../src/orca/chnames.py:319
 msgid "A TILDE"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00c4)
 #.
-#: ../src/orca/chnames.py:323
 msgid "A UMLAUT"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00c5)
 #.
-#: ../src/orca/chnames.py:327
 msgid "A RING"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00c6)
 #.
-#: ../src/orca/chnames.py:331
 msgid "A E"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00c7)
 #.
-#: ../src/orca/chnames.py:335
 msgid "C CEDILLA"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00c8)
 #.
-#: ../src/orca/chnames.py:339
 msgid "E GRAVE"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00c9)
 #.
-#: ../src/orca/chnames.py:343
 msgid "E ACUTE"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00ca)
 #.
-#: ../src/orca/chnames.py:347
 msgid "E CIRCUMFLEX"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00cb)
 #.
-#: ../src/orca/chnames.py:351
 msgid "E UMLAUT"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00cc)
 #.
-#: ../src/orca/chnames.py:355
 msgid "I GRAVE"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00cd)
 #.
-#: ../src/orca/chnames.py:359
 msgid "I ACUTE"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00ce)
 #.
-#: ../src/orca/chnames.py:363
 msgid "I CIRCUMFLEX"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00cf)
 #.
-#: ../src/orca/chnames.py:367
 msgid "I UMLAUT"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d0)
 #.
-#: ../src/orca/chnames.py:371
 msgid "ETH"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d1)
 #.
-#: ../src/orca/chnames.py:375
 msgid "N TILDE"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d2)
 #.
-#: ../src/orca/chnames.py:379
 msgid "O GRAVE"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d3)
 #.
-#: ../src/orca/chnames.py:383
 msgid "O ACUTE"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d4)
 #.
-#: ../src/orca/chnames.py:387
 msgid "O CIRCUMFLEX"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d5)
 #.
-#: ../src/orca/chnames.py:391
 msgid "O TILDE"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d6)
 #.
-#: ../src/orca/chnames.py:395
 msgid "O UMLAUT"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d7)
 #.
-#: ../src/orca/chnames.py:399
 msgid "times"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d8)
 #.
-#: ../src/orca/chnames.py:403
 msgid "O STROKE"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00d9)
 #.
-#: ../src/orca/chnames.py:407
 msgid "U GRAVE"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00da)
 #.
-#: ../src/orca/chnames.py:411
 msgid "U ACUTE"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00db)
 #.
-#: ../src/orca/chnames.py:415
 msgid "U CIRCUMFLEX"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00dc)
 #.
-#: ../src/orca/chnames.py:419
 msgid "U UMLAUT"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00dd)
 #.
-#: ../src/orca/chnames.py:423
 msgid "Y ACUTE"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00de)
 #.
-#: ../src/orca/chnames.py:427
 msgid "THORN"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã?' (U+00df)
 #.
-#: ../src/orca/chnames.py:431
 msgid "s sharp"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã ' (U+00e0)
 #.
-#: ../src/orca/chnames.py:435
 msgid "a grave"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã¢' (U+00e2)
 #.
-#: ../src/orca/chnames.py:439
 msgid "a circumflex"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã£' (U+00e3)
 #.
-#: ../src/orca/chnames.py:443
 msgid "a tilde"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã¤' (U+00e4)
 #.
-#: ../src/orca/chnames.py:447
 msgid "a umlaut"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã¥' (U+00e5)
 #.
-#: ../src/orca/chnames.py:451
 msgid "a ring"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã¦' (U+00e6)
 #.
-#: ../src/orca/chnames.py:455
 msgid "a e"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã§' (U+00e7)
 #.
-#: ../src/orca/chnames.py:459
 msgid "c cedilla"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã¨' (U+00e8)
 #.
-#: ../src/orca/chnames.py:463
 msgid "e grave"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã©' (U+00e9)
 #.
-#: ../src/orca/chnames.py:467
 msgid "e acute"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ãª' (U+00ea)
 #.
-#: ../src/orca/chnames.py:471
 msgid "e circumflex"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã«' (U+00eb)
 #.
-#: ../src/orca/chnames.py:475
 msgid "e umlaut"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã¬' (U+00ec)
 #.
-#: ../src/orca/chnames.py:479
 msgid "i grave"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã' (U+00ed)
 #.
-#: ../src/orca/chnames.py:483
 msgid "i acute"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã®' (U+00ee)
 #.
-#: ../src/orca/chnames.py:487
 msgid "i circumflex"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã¯' (U+00ef)
 #.
-#: ../src/orca/chnames.py:491
 msgid "i umlaut"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã°' (U+00f0)
 #.
-#: ../src/orca/chnames.py:495
 msgid "eth"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã±' (U+00f1)
 #.
-#: ../src/orca/chnames.py:499
 msgid "n tilde"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã²' (U+00f2)
 #.
-#: ../src/orca/chnames.py:503
 msgid "o grave"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã³' (U+00f3)
 #.
-#: ../src/orca/chnames.py:507
 msgid "o acute"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã´' (U+00f4)
 #.
-#: ../src/orca/chnames.py:511
 msgid "o circumflex"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ãµ' (U+00f5)
 #.
-#: ../src/orca/chnames.py:515
 msgid "o tilde"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã¶' (U+00f6)
 #.
-#: ../src/orca/chnames.py:519
 msgid "o umlaut"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã·' (U+00f7)
 #.
-#: ../src/orca/chnames.py:523
 msgid "divided by"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã¸' (U+00f8)
 #.
-#: ../src/orca/chnames.py:527
 msgid "o stroke"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã¾' (U+00fe)
 #.
-#: ../src/orca/chnames.py:531
 msgid "thorn"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ãº' (U+00fa)
 #.
-#: ../src/orca/chnames.py:535
 msgid "u acute"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã¹' (U+00f9)
 #.
-#: ../src/orca/chnames.py:539
 msgid "u grave"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã»' (U+00fb)
 #.
-#: ../src/orca/chnames.py:543
 msgid "u circumflex"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã¼' (U+00fc)
 #.
-#: ../src/orca/chnames.py:547
 msgid "u umlaut"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã½' (U+00fd)
 #.
-#: ../src/orca/chnames.py:551
 msgid "y acute"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Ã¿' (U+00ff)
 #.
-#: ../src/orca/chnames.py:555
 msgid "y umlaut"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Å¸' (U+0178)
 #.
-#: ../src/orca/chnames.py:559
 msgid "Y UMLAUT"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'Æ?' (U+0192)
 #.
-#: ../src/orca/chnames.py:563
 msgid "florin"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'â??' (U+2013)
 #.
-#: ../src/orca/chnames.py:567
 msgid "en dash"
 msgstr ""
 
 #. Translators: this is the spoken word for the left single quote: â??
 #. (U+2018)
 #.
-#: ../src/orca/chnames.py:572
 msgid "left single quote"
 msgstr ""
 
 #. Translators: this is the spoken word for the right single quote: â??
 #. (U+2019)
 #.
-#: ../src/orca/chnames.py:577
 msgid "right single quote"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'â??' (U+201c)
 #.
-#: ../src/orca/chnames.py:581
 msgid "left double quote"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'â??' (U+201d)
 #.
-#: ../src/orca/chnames.py:585
 msgid "right double quote"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'â? ' (U+2020)
 #.
-#: ../src/orca/chnames.py:589
 msgid "dagger"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'â?¡' (U+2021)
 #.
-#: ../src/orca/chnames.py:593
 msgid "double dagger"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'â?¢' (U+2022)
 #.
-#: ../src/orca/chnames.py:597
 msgid "bullet"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'â?£' (U+2023)
 #.
-#: ../src/orca/chnames.py:601
 msgid "triangular bullet"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'â?°' (U+2030)
 #.
-#: ../src/orca/chnames.py:605
 msgid "per mille"
 msgstr "promilli"
 
 #. Translators: this is the spoken word for the character 'â?²' (U+2032)
 #.
-#: ../src/orca/chnames.py:609
 msgid "prime"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'â?³' (U+2033)
 #.
-#: ../src/orca/chnames.py:613
 msgid "double prime"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'â??' (U+2043)
 #.
-#: ../src/orca/chnames.py:617
 msgid "hyphen bullet"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'â?¬' (U+20ac)
 #.
-#: ../src/orca/chnames.py:621
 msgid "euro"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'â?¢' (U+2122)
 #.
-#: ../src/orca/chnames.py:625
 msgid "trademark"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'â??' (U+2248)
 #.
-#: ../src/orca/chnames.py:629
 msgid "almost equal to"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'â? ' (U+2260)
 #.
-#: ../src/orca/chnames.py:633
 msgid "not equal to"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'â?¤' (U+2264)
 #.
-#: ../src/orca/chnames.py:637
 msgid "less than or equal to"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'â?¥' (U+2265)
 #.
-#: ../src/orca/chnames.py:641
 msgid "greater than or equal to"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'â??' (U+221a)
 #.
-#: ../src/orca/chnames.py:645
 msgid "square root"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'â??' (U+221b)
 #.
-#: ../src/orca/chnames.py:649
 msgid "cube root"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'â??' (U+221e)
 #.
-#: ../src/orca/chnames.py:653
 msgid "infinity"
 msgstr ""
 
@@ -1331,14 +1092,12 @@ 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:658 ../src/orca/chnames.py:721
 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:663
 msgid "white square"
 msgstr ""
 
@@ -1349,41 +1108,35 @@ 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:668 ../src/orca/chnames.py:727
 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:673
 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:678
 msgid "black circle"
 msgstr ""
 
 #. Translators: this is the spoken word for the character 'â?¦' (U+25e6)
 #.
-#: ../src/orca/chnames.py:682
 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:687
 msgid "check mark"
 msgstr ""
 
 #. 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:692
 msgid "heavy check mark"
 msgstr ""
 
@@ -1394,7 +1147,6 @@ msgstr ""
 #. the typed letter 'x'.  "Ballot x" might confuse the user.  Hence the
 #. use of "x-shaped bullet".
 #.
-#: ../src/orca/chnames.py:701
 msgid "x-shaped bullet"
 msgstr ""
 
@@ -1403,7 +1155,6 @@ msgstr ""
 #. 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:708
 msgid "right-pointing arrow"
 msgstr ""
 
@@ -1412,7 +1163,6 @@ 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:715
 msgid "right-pointing arrowhead"
 msgstr ""
 
@@ -1426,7 +1176,6 @@ msgstr ""
 #. {line,word,character}.  A left click means to generate
 #. a left mouse button click on the current item.
 #.
-#: ../src/orca/default.py:134
 msgid "Performs left click on current flat review item."
 msgstr ""
 
@@ -1440,7 +1189,6 @@ msgstr ""
 #. {line,word,character}.  A right click means to generate
 #. a right mouse button click on the current item.
 #.
-#: ../src/orca/default.py:149
 msgid "Performs right click on current flat review item."
 msgstr ""
 
@@ -1452,9 +1200,6 @@ msgstr ""
 #. be positioned at the point where the speech was
 #. interrupted.
 #.
-#: ../src/orca/default.py:162 ../src/orca/scripts/apps/acroread.py:114
-#: ../src/orca/scripts/apps/evolution/script.py:156
-#: ../src/orca/scripts/toolkits/Gecko/script.py:434
 msgid "Speaks entire document."
 msgstr ""
 
@@ -1465,7 +1210,6 @@ msgstr ""
 #. name of the current pushbutton with focus as well as
 #. its mnemonic.
 #.
-#: ../src/orca/default.py:174
 msgid "Performs the basic where am I operation."
 msgstr ""
 
@@ -1476,21 +1220,18 @@ msgstr ""
 #. name of the current pushbutton with focus as well as
 #. its mnemonic.
 #.
-#: ../src/orca/default.py:186
 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:194
 msgid "Speaks the title bar."
 msgstr ""
 
 #. Translators: This command will cause the window's
 #. status bar contents to be spoken.
 #.
-#: ../src/orca/default.py:202
 #, fuzzy
 msgid "Speaks the status bar."
 msgstr "olekuriba"
@@ -1500,7 +1241,6 @@ msgstr "olekuriba"
 #. that text.  For example, they may want to find the
 #. "OK" button.
 #.
-#: ../src/orca/default.py:212
 msgid "Opens the Orca Find dialog."
 msgstr ""
 
@@ -1510,7 +1250,6 @@ msgstr ""
 #. "OK" button.  This string is used for finding the
 #. next occurence of a string.
 #.
-#: ../src/orca/default.py:223
 msgid "Searches for the next instance of a string."
 msgstr ""
 
@@ -1520,7 +1259,6 @@ msgstr ""
 #. "OK" button.  This string is used for finding the
 #. previous occurence of a string.
 #.
-#: ../src/orca/default.py:234
 msgid "Searches for the previous instance of a string."
 msgstr ""
 
@@ -1530,7 +1268,6 @@ msgstr ""
 #. zones in the active window for the application that
 #. currently has focus.
 #.
-#: ../src/orca/default.py:245
 msgid "Paints and prints the visible zones in the active window."
 msgstr ""
 
@@ -1543,7 +1280,6 @@ msgstr ""
 #. the user to explore this text by the {previous,next}
 #. {line,word,character}.
 #.
-#: ../src/orca/default.py:259
 msgid "Enters and exits flat review mode."
 msgstr ""
 
@@ -1556,7 +1292,6 @@ msgstr ""
 #. the user to explore this text by the {previous,next}
 #. {line,word,character}.
 #.
-#: ../src/orca/default.py:273
 msgid "Moves flat review to the beginning of the previous line."
 msgstr ""
 
@@ -1570,7 +1305,6 @@ msgstr ""
 #. {line,word,character}.  The home position is the
 #. beginning of the content in the window.
 #.
-#: ../src/orca/default.py:288
 msgid "Moves flat review to the home position."
 msgstr ""
 
@@ -1584,7 +1318,6 @@ msgstr ""
 #. {line,word,character}.  This particular command will
 #. cause Orca to speak the current line.
 #.
-#: ../src/orca/default.py:303
 msgid "Speaks the current flat review line."
 msgstr ""
 
@@ -1598,7 +1331,6 @@ msgstr ""
 #. {line,word,character}. This particular command will
 #. cause Orca to spell the current line.
 #.
-#: ../src/orca/default.py:318
 msgid "Spells the current flat review line."
 msgstr ""
 
@@ -1613,7 +1345,6 @@ msgstr ""
 #. cause Orca to "phonetically spell" the current line,
 #. saying "Alpha" for "a", "Bravo" for "b" and so on.
 #.
-#: ../src/orca/default.py:334
 msgid "Phonetically spells the current flat review line."
 msgstr ""
 
@@ -1626,7 +1357,6 @@ msgstr ""
 #. the user to explore this text by the {previous,next}
 #. {line,word,character}.
 #.
-#: ../src/orca/default.py:348
 msgid "Moves flat review to the beginning of the next line."
 msgstr ""
 
@@ -1640,7 +1370,6 @@ msgstr ""
 #. {line,word,character}.  The end position is the last
 #. bit of information in the window.
 #.
-#: ../src/orca/default.py:363
 msgid "Moves flat review to the end position."
 msgstr ""
 
@@ -1655,7 +1384,6 @@ msgstr ""
 #. in the window until you reach the top (i.e., it will
 #. wrap across lines if necessary).
 #.
-#: ../src/orca/default.py:379
 msgid "Moves flat review to the previous item or word."
 msgstr ""
 
@@ -1670,7 +1398,6 @@ msgstr ""
 #. geographically above, as if you drew a vertical line
 #. in the window.
 #.
-#: ../src/orca/default.py:395
 msgid "Moves flat review to the word above the current word."
 msgstr ""
 
@@ -1684,7 +1411,6 @@ msgstr ""
 #. {line,word,character}.  This command will speak the
 #. current word or item.
 #.
-#: ../src/orca/default.py:410
 msgid "Speaks the current flat review item or word."
 msgstr ""
 
@@ -1698,7 +1424,6 @@ msgstr ""
 #. {line,word,character}.  This command will spell out
 #. the current word or item letter by letter.
 #.
-#: ../src/orca/default.py:425
 msgid "Spells the current flat review item or word."
 msgstr ""
 
@@ -1713,7 +1438,6 @@ msgstr ""
 #. the current word or item phonetically, saying "Alpha"
 #. for "a", "Bravo" for "b" and so on.
 #.
-#: ../src/orca/default.py:441
 msgid "Phonetically spells the current flat review item or word."
 msgstr ""
 
@@ -1729,7 +1453,6 @@ msgstr ""
 #. some other GUI widget.  The 'speaks' means it will
 #. speak the text associated with the object.
 #.
-#: ../src/orca/default.py:458
 msgid "Speaks the current flat review object."
 msgstr ""
 
@@ -1744,7 +1467,6 @@ msgstr ""
 #. in the window until you reach the end (i.e., it will
 #. wrap across lines if necessary).
 #.
-#: ../src/orca/default.py:474
 msgid "Moves flat review to the next item or word."
 msgstr ""
 
@@ -1759,7 +1481,6 @@ msgstr ""
 #. geographically below, as if you drew a vertical line
 #. downward on the screen.
 #.
-#: ../src/orca/default.py:490
 msgid "Moves flat review to the word below the current word."
 msgstr ""
 
@@ -1774,7 +1495,6 @@ msgstr ""
 #. in the window until you reach the top (i.e., it will
 #. wrap across lines if necessary).
 #.
-#: ../src/orca/default.py:506
 msgid "Moves flat review to the previous character."
 msgstr ""
 
@@ -1787,7 +1507,6 @@ msgstr ""
 #. the user to explore this text by the {previous,next}
 #. {line,word,character}.
 #.
-#: ../src/orca/default.py:520
 msgid "Moves flat review to the end of the line."
 msgstr ""
 
@@ -1804,7 +1523,6 @@ msgstr ""
 #. this case will be the spoken language form of the
 #. character currently being reviewed.
 #.
-#: ../src/orca/default.py:538
 msgid "Speaks the current flat review character."
 msgstr ""
 
@@ -1822,7 +1540,6 @@ msgstr ""
 #. character currently being reviewed, saying "Alpha"
 #. for "a", "Bravo" for "b" and so on.
 #.
-#: ../src/orca/default.py:557
 msgid "Phonetically speaks the current flat review character."
 msgstr ""
 
@@ -1837,7 +1554,6 @@ msgstr ""
 #. in the window until you reach the end (i.e., it will
 #. wrap across lines if necessary).
 #.
-#: ../src/orca/default.py:573
 msgid "Moves flat review to the next character."
 msgstr ""
 
@@ -1845,7 +1561,6 @@ 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:582
 msgid "Toggles whether to read just the current table cell or the whole row."
 msgstr ""
 
@@ -1853,7 +1568,6 @@ msgstr ""
 #. text attributes, such as bold, italic, font name,
 #. font size, etc.
 #.
-#: ../src/orca/default.py:592
 msgid "Reads the attributes associated with the current text character."
 msgstr ""
 
@@ -1863,7 +1577,6 @@ msgstr ""
 #. via speech and braille. This information will be
 #. helpful to script writers.
 #.
-#: ../src/orca/default.py:604
 msgid "Reports information on current script."
 msgstr ""
 
@@ -1876,7 +1589,6 @@ msgstr ""
 #. braille display so they can pan left and right over
 #. this line.
 #.
-#: ../src/orca/default.py:618
 msgid "Pans the braille display to the left."
 msgstr ""
 
@@ -1889,7 +1601,6 @@ msgstr ""
 #. braille display so they can pan left and right over
 #. this line.
 #.
-#: ../src/orca/default.py:633
 msgid "Pans the braille display to the right."
 msgstr ""
 
@@ -1903,7 +1614,6 @@ msgstr ""
 #. {line,word,character}.  The bottom left is the bottom
 #. left of the window currently being reviewed.
 #.
-#: ../src/orca/default.py:649
 msgid "Moves flat review to the bottom left."
 msgstr ""
 
@@ -1920,7 +1630,6 @@ msgstr ""
 #. feature used here will return the flat review to the
 #. object with focus.
 #.
-#: ../src/orca/default.py:667
 msgid "Returns to object with keyboard focus."
 msgstr ""
 
@@ -1931,21 +1640,18 @@ 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:679
 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:687
 msgid "Decreases the speech rate."
 msgstr ""
 
 #. Translators: the speech rate is how fast the speech
 #. synthesis engine will generate speech.
 #.
-#: ../src/orca/default.py:695
 msgid "Increases the speech rate."
 msgstr ""
 
@@ -1953,7 +1659,6 @@ msgstr ""
 #. pitch/frequency the speech synthesis engine will
 #. generate speech.
 #.
-#: ../src/orca/default.py:704
 msgid "Decreases the speech pitch."
 msgstr ""
 
@@ -1961,11 +1666,9 @@ msgstr ""
 #. pitch/frequency the speech synthesis engine will
 #. generate speech.
 #.
-#: ../src/orca/default.py:713
 msgid "Increases the speech pitch."
 msgstr ""
 
-#: ../src/orca/default.py:718
 msgid "Quits Orca"
 msgstr "Orca'st vÃ¤ljumine"
 
@@ -1973,7 +1676,6 @@ msgstr "Orca'st vÃ¤ljumine"
 #. the dialog that allows users to set their preferences
 #. for Orca.
 #.
-#: ../src/orca/default.py:727
 msgid "Displays the preferences configuration dialog."
 msgstr "Eelistuste mÃ¤Ã¤ramise dialoogi kuvamine."
 
@@ -1981,14 +1683,12 @@ msgstr "Eelistuste mÃ¤Ã¤ramise dialoogi kuvamine."
 #. dialog is the dialog that allows users to set their
 #. preferences for a specific application within Orca.
 #.
-#: ../src/orca/default.py:736
 msgid "Displays the application preferences configuration dialog."
 msgstr "Rakenduse eelistuste mÃ¤Ã¤ramise dialoogi kuvamine."
 
 #. Translators: Orca allows the user to turn speech synthesis
 #. on or off.  We call it 'silencing'.
 #.
-#: ../src/orca/default.py:744
 msgid "Toggles the silencing of speech."
 msgstr ""
 
@@ -1997,7 +1697,6 @@ msgstr ""
 #. that prints a list of all known applications currently
 #. running on the desktop, to stdout.
 #.
-#: ../src/orca/default.py:754
 msgid ""
 "Prints a debug listing of all known applications to the console where Orca "
 "is running."
@@ -2008,7 +1707,6 @@ msgstr ""
 #. that allows the user to adjust the level of debug
 #. information that Orca generates at run time.
 #.
-#: ../src/orca/default.py:765
 msgid "Cycles the debug level at run time."
 msgstr ""
 
@@ -2017,7 +1715,6 @@ msgstr ""
 #. that prints useful debugging information to the console,
 #. for the application that is currently running (has focus).
 #.
-#: ../src/orca/default.py:775
 msgid ""
 "Prints debug information about the currently active application to the "
 "console where Orca is running."
@@ -2031,7 +1728,6 @@ msgstr ""
 #. the components that are its descendants in the component
 #. tree).
 #.
-#: ../src/orca/default.py:789
 msgid "Prints debug information about the ancestry of the object with focus."
 msgstr ""
 
@@ -2042,7 +1738,6 @@ msgstr ""
 #. component hierarchy (i.e. all the components and all
 #. their descendants in the component tree).
 #.
-#: ../src/orca/default.py:802
 msgid "Prints debug information about the application with focus."
 msgstr ""
 
@@ -2050,7 +1745,6 @@ msgstr ""
 #. will not normally see. It describes a debug routine
 #. that will print Orca memory usage information.
 #.
-#: ../src/orca/default.py:811
 msgid "Prints memory usage information."
 msgstr ""
 
@@ -2058,35 +1752,30 @@ msgstr ""
 #. the relationship of the given bookmark to the current
 #. position
 #.
-#: ../src/orca/default.py:820
 msgid "Bookmark where am I with respect to current position."
 msgstr ""
 
 #. Translators: this command moves the current position to the
 #. location stored at the bookmark.
 #.
-#: ../src/orca/default.py:828
 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:836
 msgid "Add bookmark."
 msgstr ""
 
 #. Translators: this event handler saves all bookmarks for the
 #. current application to disk.
 #.
-#: ../src/orca/default.py:844
 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:852
 msgid "Go to next bookmark location."
 msgstr ""
 
@@ -2094,7 +1783,6 @@ msgstr ""
 #. registered bookmarks and takes the user to the previous
 #. bookmark location.
 #.
-#: ../src/orca/default.py:861
 msgid "Go to previous bookmark location."
 msgstr ""
 
@@ -2103,7 +1791,6 @@ msgstr ""
 #. to see, such as inverting the colors or applying a tint.
 #. This command toggles these enhancements on/off.
 #.
-#: ../src/orca/default.py:871
 msgid "Toggles color enhancements."
 msgstr ""
 
@@ -2113,21 +1800,18 @@ msgstr ""
 #. color, and surrounding it with crosshairs.  This command
 #. toggles these enhancements on/off.
 #.
-#: ../src/orca/default.py:882
 msgid "Toggles mouse enhancements."
 msgstr ""
 
 #. Translators: this command increases the magnification
 #. level.
 #.
-#: ../src/orca/default.py:890
 msgid "Increases the magnification level."
 msgstr ""
 
 #. Translators: this command decreases the magnification
 #. level.
 #.
-#: ../src/orca/default.py:898
 msgid "Decreases the magnification level."
 msgstr ""
 
@@ -2136,7 +1820,6 @@ msgstr ""
 #. but also all of the color and pointer customizations
 #. made through the magnifier.
 #.
-#: ../src/orca/default.py:908
 msgid "Toggles the magnifier."
 msgstr ""
 
@@ -2145,14 +1828,12 @@ msgstr ""
 #. screen.  The "position" here refers to location of the
 #. magnifier.
 #.
-#: ../src/orca/default.py:918
 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:926
 msgid "Toggle mouse review mode."
 msgstr ""
 
@@ -2163,7 +1844,6 @@ msgstr ""
 #. along to the current application, bypassing Orca's
 #. interception of it.
 #.
-#: ../src/orca/default.py:938
 msgid "Passes the next command on to the current application."
 msgstr ""
 
@@ -2176,24 +1856,12 @@ msgstr ""
 #. Translators: "blank" is a short word to mean the
 #. user has navigated to an empty line.
 #.
-#: ../src/orca/default.py:2133 ../src/orca/default.py:2445
-#: ../src/orca/default.py:4931 ../src/orca/default.py:5086
-#: ../src/orca/default.py:5094 ../src/orca/default.py:5202
-#: ../src/orca/default.py:5210
-#: ../src/orca/scripts/apps/evolution/script.py:531
-#: ../src/orca/scripts/apps/soffice/script.py:731
-#: ../src/orca/scripts/apps/soffice/script.py:1236
-#: ../src/orca/scripts/apps/soffice/script.py:2015
-#: ../src/orca/scripts/apps/soffice/speech_generator.py:275
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5157
-#: ../src/orca/structural_navigation.py:3281 ../src/orca/where_am_I.py:1625
 msgid "blank"
 msgstr "tÃ¼hi"
 
 #. Translators: this is the number of space characters on a line
 #. of text.
 #.
-#: ../src/orca/default.py:2213
 #, python-format
 msgid "%d space"
 msgid_plural "%d spaces"
@@ -2203,7 +1871,6 @@ msgstr[1] "%d tÃ¼hikut"
 #. Translators: this is the number of tab characters on a line
 #. of text.
 #.
-#: ../src/orca/default.py:2220
 #, python-format
 msgid "%d tab"
 msgid_plural "%d tabs"
@@ -2214,7 +1881,6 @@ msgstr[1] "%d tabulaatorit"
 #. so that we can tell which progress bar
 #. we are referring to.
 #.
-#: ../src/orca/default.py:2679
 #, python-format
 msgid "Progress bar %d."
 msgstr "Edenemisriba %d."
@@ -2228,8 +1894,6 @@ msgstr "Edenemisriba %d."
 #.
 #. Translators: this is the percentage value of a progress bar.
 #.
-#: ../src/orca/default.py:2687 ../src/orca/flat_review.py:443
-#: ../src/orca/speechgenerator.py:1097
 #, python-format
 msgid "%d percent."
 msgstr "%d protsenti."
@@ -2237,9 +1901,6 @@ msgstr "%d protsenti."
 #. Translators: this represents the depth of a node in a tree
 #. view (i.e., how many ancestors a node has).
 #.
-#: ../src/orca/default.py:2936
-#: ../src/orca/scripts/apps/pidgin/where_am_i.py:158
-#: ../src/orca/where_am_I.py:688 ../src/orca/where_am_I.py:753
 #, python-format
 msgid "tree level %d"
 msgstr ""
@@ -2249,9 +1910,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/default.py:2975
-msgctxt "tablecell"
-msgid " not selected"
+msgid "tablecell| not selected"
 msgstr "valimata"
 
 #. Translators: this object is now selected.
@@ -2265,13 +1924,7 @@ msgstr "valimata"
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/default.py:3869 ../src/orca/default.py:4213
-#: ../src/orca/default.py:7460
-#: ../src/orca/scripts/apps/soffice/where_am_i.py:161
-#: ../src/orca/speechgenerator.py:242 ../src/orca/where_am_I.py:569
-#: ../src/orca/where_am_I.py:990
-msgctxt "text"
-msgid "selected"
+msgid "text|selected"
 msgstr "valitud"
 
 #. Translators: this object is now unselected.
@@ -2286,16 +1939,13 @@ msgstr "valitud"
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/default.py:3877 ../src/orca/default.py:7468
-msgctxt "text"
-msgid "unselected"
+msgid "text|unselected"
 msgstr "valimata"
 
 #. 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:4270
 msgid "Speak row"
 msgstr ""
 
@@ -2303,13 +1953,11 @@ 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:4276
 msgid "Speak cell"
 msgstr ""
 
 #. Translators: bold as in the font sense.
 #.
-#: ../src/orca/default.py:4329 ../src/orca/where_am_I.py:1682
 msgid "bold"
 msgstr ""
 
@@ -2320,7 +1968,6 @@ msgstr ""
 #. application, so we leave things in plural form
 #. here.
 #.
-#: ../src/orca/default.py:4346
 #, python-format
 msgid "%s %s pixel"
 msgid_plural "%s %s pixels"
@@ -2335,10 +1982,6 @@ msgstr[1] ""
 #. Translators: this indicates that this piece of
 #. text is a hypertext link.
 #.
-#: ../src/orca/default.py:4424 ../src/orca/default.py:6331
-#: ../src/orca/rolenames.py:604
-#: ../src/orca/scripts/apps/soffice/script.py:1117
-#: ../src/orca/where_am_I.py:1704
 msgid "link"
 msgstr "viit"
 
@@ -2349,7 +1992,6 @@ msgstr "viit"
 #. along to the current application, bypassing Orca's
 #. interception of it.
 #.
-#: ../src/orca/default.py:4471
 msgid "Bypass mode enabled."
 msgstr ""
 
@@ -2361,7 +2003,6 @@ 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:4494
 msgid ""
 "Entering learn mode.  Press any key to hear its function.  To exit learn "
 "mode, press the escape key."
@@ -2376,14 +2017,12 @@ msgstr ""
 #. This text here is what is to be presented on the braille
 #. display.
 #.
-#: ../src/orca/default.py:4506
 msgid "Learn mode.  Press escape to exit."
 msgstr "Ã?ppimisreÅ¾iim.  VÃ¤ljumiseks vajuta escape."
 
 #. 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:4936 ../src/orca/default.py:5099
 msgid "white space"
 msgstr ""
 
@@ -2393,7 +2032,6 @@ msgstr ""
 #. "OK" button.  This message lets them know a string
 #. they were searching for was not found.
 #.
-#: ../src/orca/default.py:5331
 msgid "string not found"
 msgstr ""
 
@@ -2402,12 +2040,10 @@ msgstr ""
 #. thing it does is let them know what the misspelled word
 #. is.
 #.
-#: ../src/orca/default.py:6137
 #, python-format
 msgid "Misspelled word: %s"
 msgstr "Probleemne sÃµna: %s"
 
-#: ../src/orca/default.py:6145
 #, python-format
 msgid "Context is %s"
 msgstr ""
@@ -2417,7 +2053,6 @@ msgstr ""
 #. space characters".  The %d is the number and the %s
 #. is the spoken word for the character.
 #.
-#: ../src/orca/default.py:6283
 #, python-format
 msgid "%(count)d %(repeatChar)s character"
 msgid_plural "%(count)d %(repeatChar)s characters"
@@ -2428,7 +2063,6 @@ msgstr[1] ""
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7304
 msgid "line selected to end from previous cursor position"
 msgstr ""
 
@@ -2436,7 +2070,6 @@ msgstr ""
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7312
 msgid "line selected from start to previous cursor position"
 msgstr ""
 
@@ -2444,14 +2077,12 @@ msgstr ""
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7321
 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:7326
 msgid "page unselected from cursor position"
 msgstr ""
 
@@ -2459,14 +2090,12 @@ msgstr ""
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7335
 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:7340
 msgid "page unselected to cursor position"
 msgstr ""
 
@@ -2474,14 +2103,12 @@ msgstr ""
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7349
 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:7354
 msgid "line unselected down from cursor position"
 msgstr ""
 
@@ -2489,14 +2116,12 @@ msgstr ""
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7363
 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:7368
 msgid "line unselected up from cursor position"
 msgstr ""
 
@@ -2504,14 +2129,12 @@ msgstr ""
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7377
 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:7382
 msgid "document unselected to cursor position"
 msgstr ""
 
@@ -2519,21 +2142,18 @@ msgstr ""
 #. a document, Orca will speak information about what they
 #. have selected.
 #.
-#: ../src/orca/default.py:7391
 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:7396
 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:7413
 msgid "entire document selected"
 msgstr "kogu dokument on valitud"
 
@@ -2541,7 +2161,6 @@ msgstr "kogu dokument on valitud"
 #. provided by the separate emacspeak utility available at
 #. http://emacspeak.sourceforge.net/.
 #.
-#: ../src/orca/espeechfactory.py:98
 msgid "Emacspeak Speech Services"
 msgstr "Emacspeak kÃµneteenused"
 
@@ -2554,7 +2173,6 @@ msgstr "Emacspeak kÃµneteenused"
 #. direction is wrapping from the top of
 #. the window down to the bottom.
 #.
-#: ../src/orca/find.py:266
 msgid "Wrapping to Bottom"
 msgstr ""
 
@@ -2567,16 +2185,11 @@ msgstr ""
 #. direction is wrapping from the bottom of
 #. the window up to the top.
 #.
-#: ../src/orca/find.py:281
 msgid "Wrapping to Top"
 msgstr ""
 
 #. Translators: this represents the state of a checkbox.
 #.
-#: ../src/orca/flat_review.py:347
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:605
-#: ../src/orca/speechgenerator.py:423 ../src/orca/where_am_I.py:421
-#: ../src/orca/where_am_I.py:1389
 msgid "partially checked"
 msgstr "osaliselt mÃ¤rgitud"
 
@@ -2586,37 +2199,21 @@ msgstr "osaliselt mÃ¤rgitud"
 #.
 #. Translators: this represents the state of a checkbox.
 #.
-#: ../src/orca/flat_review.py:351
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:609
-#: ../src/orca/speechgenerator.py:427 ../src/orca/speechgenerator.py:970
-#: ../src/orca/where_am_I.py:425 ../src/orca/where_am_I.py:1393
 msgid "checked"
 msgstr "mÃ¤rgitud"
 
 #. Translators: this represents the state of a checkbox.
 #.
-#: ../src/orca/flat_review.py:355
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:613
-#: ../src/orca/speechgenerator.py:431 ../src/orca/where_am_I.py:429
-#: ../src/orca/where_am_I.py:1397
 msgid "not checked"
 msgstr "mÃ¤rkimata"
 
 #. Translators: the state of a toggle button.
 #.
-#: ../src/orca/flat_review.py:362
-#: ../src/orca/scripts/apps/planner/speech_generator.py:63
-#: ../src/orca/scripts/apps/planner/speech_generator.py:71
-#: ../src/orca/speechgenerator.py:1708 ../src/orca/where_am_I.py:886
 msgid "pressed"
 msgstr "vajutatud"
 
 #. Translators: the state of a toggle button.
 #.
-#: ../src/orca/flat_review.py:366
-#: ../src/orca/scripts/apps/planner/speech_generator.py:65
-#: ../src/orca/scripts/apps/planner/speech_generator.py:73
-#: ../src/orca/speechgenerator.py:1712 ../src/orca/where_am_I.py:890
 msgid "not pressed"
 msgstr "vajutamata"
 
@@ -2625,11 +2222,7 @@ msgstr "vajutamata"
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/flat_review.py:376
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:547
-#: ../src/orca/speechgenerator.py:1156 ../src/orca/where_am_I.py:225
-msgctxt "radiobutton"
-msgid "selected"
+msgid "radiobutton|selected"
 msgstr "valitud"
 
 #. Translators: this is in reference to a radio button being
@@ -2637,22 +2230,16 @@ msgstr "valitud"
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/flat_review.py:383
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:554
-#: ../src/orca/speechgenerator.py:1163 ../src/orca/where_am_I.py:232
-msgctxt "radiobutton"
-msgid "not selected"
+msgid "radiobutton|not selected"
 msgstr "valimata"
 
 #. Translators: The component orientation is horizontal.
 #.
-#: ../src/orca/flat_review.py:421
 msgid "horizontal"
 msgstr "rÃµhtne"
 
 #. Translators: The component orientation is vertical.
 #.
-#: ../src/orca/flat_review.py:425
 msgid "vertical"
 msgstr "pÃ¼stine"
 
@@ -2660,11 +2247,9 @@ msgstr "pÃ¼stine"
 #. speak and braille to tell the user that no component
 #. has keyboard focus.
 #.
-#: ../src/orca/focus_tracking_presenter.py:935
 msgid "No focus"
 msgstr ""
 
-#: ../src/orca/gnomespeechfactory.py:221
 msgid "GNOME Speech Services"
 msgstr "GNOME kÃµneteenused"
 
@@ -2674,7 +2259,6 @@ msgstr "GNOME kÃµneteenused"
 #. new string well.  For example, "Open..." turns into
 #. "Open dot dot dot".
 #.
-#: ../src/orca/gnomespeechfactory.py:769 ../src/orca/gnomespeechfactory.py:770
 msgid " dot dot dot"
 msgstr " punkt punkt punkt"
 
@@ -2685,15 +2269,12 @@ msgstr " punkt punkt punkt"
 #. odd characters, etc.), so we need to unfortunately
 #. build up the utterance in this manner.
 #.
-#: ../src/orca/gnomespeechfactory.py:841
 msgid "minus"
 msgstr "miinus"
 
 #. Translators: this is a short string saying that the speech
 #. synthesis engine is now speaking in a higher pitch.
 #.
-#: ../src/orca/gnomespeechfactory.py:998
-#: ../src/orca/speechdispatcherfactory.py:297
 msgid "higher."
 msgstr "kÃµrgem."
 
@@ -2701,8 +2282,6 @@ msgstr "kÃµrgem."
 #. synthesis engine is now speaking in a lower pitch.
 #.
 #. Translators: This string announces speech pitch change.
-#: ../src/orca/gnomespeechfactory.py:1029
-#: ../src/orca/speechdispatcherfactory.py:297
 msgid "lower."
 msgstr "madalam."
 
@@ -2710,8 +2289,6 @@ msgstr "madalam."
 #. synthesis engine is now speaking at a faster rate (words
 #. per minute).
 #.
-#: ../src/orca/gnomespeechfactory.py:1058
-#: ../src/orca/speechdispatcherfactory.py:287
 msgid "faster."
 msgstr "kiirem."
 
@@ -2720,215 +2297,179 @@ msgstr "kiirem."
 #. per minute).
 #.
 #. Translators: This string announces speech rate change.
-#: ../src/orca/gnomespeechfactory.py:1092
-#: ../src/orca/speechdispatcherfactory.py:287
 msgid "slower."
 msgstr "aeglasem."
 
 #. Translators: this is presented in a GUI to represent the
 #. "right alt" modifier.
 #.
-#: ../src/orca/keybindings.py:164
 msgid "Alt_R"
 msgstr ""
 
 #. Translators: this is presented in a GUI to represent the
 #. "super" modifier.
 #.
-#: ../src/orca/keybindings.py:169
 msgid "Super"
 msgstr ""
 
 #. Translators: this is presented in a GUI to represent the
 #. "meta 2" modifier.
 #.
-#: ../src/orca/keybindings.py:174
 msgid "Meta2"
 msgstr ""
 
 #. Translators: this is presented in a GUI to represent the
 #. "left alt" modifier.
 #.
-#: ../src/orca/keybindings.py:181
 msgid "Alt_L"
 msgstr ""
 
 #. Translators: this is presented in a GUI to represent the
 #. "control" modifier.
 #.
-#: ../src/orca/keybindings.py:186
 msgid "Ctrl"
 msgstr ""
 
 #. Translators: this is presented in a GUI to represent the
 #. "caps lock" modifier.
 #.
-#: ../src/orca/keybindings.py:191
 msgid "Caps_Lock"
 msgstr ""
 
 #. Translators: this is presented in a GUI to represent the
 #. "shift " modifier.
 #.
-#: ../src/orca/keybindings.py:196
 msgid "Shift"
 msgstr ""
 
 #. Translators: this is how someone would speak the name of the left shift key
 #.
-#: ../src/orca/keynames.py:41
 msgid "left shift"
 msgstr "vasak shift"
 
 #. Translators: this is how someone would speak the name of the left alt key
 #.
-#: ../src/orca/keynames.py:45
 msgid "left alt"
 msgstr "vasak alt"
 
 #. Translators: this is how someone would speak the name of the left ctrl key
 #.
-#: ../src/orca/keynames.py:49
 msgid "left control"
 msgstr "vasak control"
 
 #. Translators: this is how someone would speak the name of the right shift key
 #.
-#: ../src/orca/keynames.py:53
 msgid "right shift"
 msgstr "parem shift"
 
 #. Translators: this is how someone would speak the name of the right alt key
 #.
-#: ../src/orca/keynames.py:57
 msgid "right alt"
 msgstr "parem alt"
 
 #. Translators: this is how someone would speak the name of the right ctrl key
 #.
-#: ../src/orca/keynames.py:61
 msgid "right control"
 msgstr "parem control"
 
 #. Translators: this is how someone would speak the name of the left meta key
 #.
-#: ../src/orca/keynames.py:65
 msgid "left meta"
 msgstr "vasak meta"
 
 #. Translators: this is how someone would speak the name of the right meta key
 #.
-#: ../src/orca/keynames.py:69
 msgid "right meta"
 msgstr "parem meta"
 
 #. Translators: this is how someone would speak the name of the num lock key
 #.
-#: ../src/orca/keynames.py:73
 msgid "num lock"
 msgstr "num lock"
 
 #. Translators: this is how someone would speak the name of the caps lock key
 #.
-#: ../src/orca/keynames.py:77
 msgid "caps lock"
 msgstr "caps lock"
 
 #. Translators: this is how someone would speak the name of the scroll lock key
 #.
-#: ../src/orca/keynames.py:81
 msgid "scroll lock"
 msgstr "scroll lock"
 
 #. Translators: this is how someone would speak the name of the page up key
 #.
-#: ../src/orca/keynames.py:85 ../src/orca/keynames.py:89
-#: ../src/orca/keynames.py:93 ../src/orca/keynames.py:97
 msgid "page up"
 msgstr "page up"
 
 #. Translators: this is how someone would speak the name of the page down key
 #.
-#: ../src/orca/keynames.py:101 ../src/orca/keynames.py:105
-#: ../src/orca/keynames.py:109 ../src/orca/keynames.py:113
 msgid "page down"
 msgstr "page down"
 
 #. Translators: this is how someone would speak the name of the left tab key
 #.
-#: ../src/orca/keynames.py:121
 msgid "left tab"
 msgstr "vasak tab"
 
 #. Translators: this is how someone would speak the name of the F11 key
 #.
-#: ../src/orca/keynames.py:125
 msgid "F 11"
 msgstr "F 11"
 
 #. Translators: this is how someone would speak the name of the F12 key
 #.
-#: ../src/orca/keynames.py:129
 msgid "F 12"
 msgstr "F 12"
 
 #. Translators: this is how someone would speak the name of the backspace key
 #.
-#: ../src/orca/keynames.py:137
 #, fuzzy
 msgid "backspace"
 msgstr "tÃ¼hik"
 
 #. Translators: this is how someone would speak the name of the return key
 #.
-#: ../src/orca/keynames.py:141
 msgid "return"
 msgstr ""
 
 #. Translators: this is how someone would speak the name of the enter key
 #.
-#: ../src/orca/keynames.py:145
 #, fuzzy
 msgid "enter"
 msgstr "Ã?ldine"
 
 #. Translators: this is how someone would speak the name of the up arrow key
 #.
-#: ../src/orca/keynames.py:149 ../src/orca/keynames.py:153
 msgid "up"
 msgstr ""
 
 #. Translators: this is how someone would speak the name of the down arrow key
 #.
-#: ../src/orca/keynames.py:157 ../src/orca/keynames.py:161
 #, fuzzy
 msgid "down"
 msgstr "page down"
 
 #. Translators: this is how someone would speak the name of the left arrow key
 #.
-#: ../src/orca/keynames.py:165 ../src/orca/keynames.py:169
 #, fuzzy
 msgid "left"
 msgstr "vasak alt"
 
 #. Translators: this is how someone would speak the name of the right arrow key
 #.
-#: ../src/orca/keynames.py:173 ../src/orca/keynames.py:177
 #, fuzzy
 msgid "right"
 msgstr "parem alt"
 
 #. Translators: this is how someone would speak the name of the left super key
 #.
-#: ../src/orca/keynames.py:181
 #, fuzzy
 msgid "left super"
 msgstr "vasak sulg"
 
 #. Translators: this is how someone would speak the name of the right super key
 #.
-#: ../src/orca/keynames.py:185
 #, fuzzy
 msgid "right super"
 msgstr "parem sulg"
@@ -2937,120 +2478,101 @@ msgstr "parem sulg"
 #.
 #. Translators: spoken words for the rolename of a menu.
 #.
-#: ../src/orca/keynames.py:189 ../src/orca/rolenames.py:640
 msgid "menu"
 msgstr "menÃ¼Ã¼"
 
 #. Translators: this is how someone would speak the name of the ISO shift key
 #.
-#: ../src/orca/keynames.py:193
 msgid "ISO level 3 shift"
 msgstr ""
 
 #. Translators: this is how someone would speak the name of the help key
 #.
-#: ../src/orca/keynames.py:197
 msgid "help"
 msgstr ""
 
 #. Translators: this is how someone would speak the name of the multi key
 #.
-#: ../src/orca/keynames.py:201
 msgid "multi"
 msgstr ""
 
 #. Translators: this is how someone would speak the name of the mode switch key
 #.
-#: ../src/orca/keynames.py:205
 #, fuzzy
 msgid "mode switch"
 msgstr "MenÃ¼Ã¼Kirje"
 
 #. Translators: this is how someone would speak the name of the escape key
 #.
-#: ../src/orca/keynames.py:209
 msgid "escape"
 msgstr ""
 
 #. Translators: this is how someone would speak the name of the insert key
 #.
-#: ../src/orca/keynames.py:213 ../src/orca/keynames.py:217
 #, fuzzy
 msgid "insert"
 msgstr "Loetelu"
 
 #. Translators: this is how someone would speak the name of the delete key
 #.
-#: ../src/orca/keynames.py:221 ../src/orca/keynames.py:225
 #, fuzzy
 msgid "delete"
 msgstr "_Kustuta"
 
 #. Translators: this is how someone would speak the name of the home key
 #.
-#: ../src/orca/keynames.py:229 ../src/orca/keynames.py:233
 msgid "home"
 msgstr ""
 
 #. Translators: this is how someone would speak the name of the end key
 #.
-#: ../src/orca/keynames.py:237 ../src/orca/keynames.py:241
 #, fuzzy
 msgid "end"
 msgstr "sekundi jÃ¤rel"
 
 #. Translators: this is how someone would speak the name of the begin key
 #.
-#: ../src/orca/keynames.py:245
 msgid "begin"
 msgstr ""
 
 #. Translators:  sets the live region politeness level to polite
 #.
-#: ../src/orca/liveregions.py:265
 msgid "setting live region to polite"
 msgstr ""
 
 #. Translators:  sets the live region politeness level to assertive
 #.
-#: ../src/orca/liveregions.py:270
 msgid "setting live region to assertive"
 msgstr ""
 
 #. Translators:  sets the live region politeness level to rude
 #.
-#: ../src/orca/liveregions.py:275
 msgid "setting live region to rude"
 msgstr ""
 
 #. Translators:  sets the live region politeness level to off
 #.
-#: ../src/orca/liveregions.py:280
 msgid "setting live region to off"
 msgstr ""
 
 #. Tranlators: this tells the user that a cached message
 #. is not available.
 #.
-#: ../src/orca/liveregions.py:299
 msgid "no live message saved"
 msgstr ""
 
 #. Translators: This lets the user know that all live regions
 #. have been turned off.
-#: ../src/orca/liveregions.py:316
 msgid "All live regions set to off"
 msgstr ""
 
 #. Translators: This lets the user know that all live regions
 #. have been restored to their original politeness level.
-#: ../src/orca/liveregions.py:344
 msgid "live regions politeness levels restored"
 msgstr ""
 
 #. Translators: output the politeness level
 #.
-#: ../src/orca/liveregions.py:379
 #, python-format
 msgid "politeness level %s"
 msgstr ""
@@ -3059,7 +2581,6 @@ 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:1562
 msgid "Color enhancements disabled."
 msgstr ""
 
@@ -3067,7 +2588,6 @@ 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
 msgid "Color enhancements enabled."
 msgstr ""
 
@@ -3076,7 +2596,6 @@ msgstr ""
 #. easier to see, such as increasing its size, changing its
 #. color, and surrounding it with crosshairs.
 #.
-#: ../src/orca/mag.py:1592
 msgid "Mouse enhancements disabled."
 msgstr ""
 
@@ -3085,7 +2604,6 @@ msgstr ""
 #. easier to see, such as increasing its size, changing its
 #. color, and surrounding it with crosshairs.
 #.
-#: ../src/orca/mag.py:1625
 msgid "Mouse enhancements enabled."
 msgstr ""
 
@@ -3093,7 +2611,6 @@ msgstr ""
 #. magnifier.  In addition to screen magnification, the user's
 #. preferred colors and mouse customizations are loaded.
 #.
-#: ../src/orca/mag.py:1690
 msgid "Magnifier enabled."
 msgstr "Luup on lubatud."
 
@@ -3101,7 +2618,6 @@ msgstr "Luup on lubatud."
 #. magnifier, restoring the screen contents to their normal colors
 #. and sizes.
 #.
-#: ../src/orca/mag.py:1697
 msgid "Magnifier disabled."
 msgstr "Luup on keelatud."
 
@@ -3110,46 +2626,38 @@ msgstr "Luup on keelatud."
 #. Translators: this is an algorithm for magnifying pixels
 #. on the screen.
 #.
-#: ../src/orca/mag.py:1752 ../src/orca/orca_gui_prefs.py:1712
-#: ../src/orca/orca_gui_prefs.py:1738
 msgid "Full Screen"
 msgstr "TÃ¤isekraan"
 
 #. Translators: the user attempted to switch to full screen
 #. magnification, but his/her system doesn't support it.
 #.
-#: ../src/orca/mag.py:1757
 msgid "Full Screen mode unavailable"
 msgstr "TÃ¤isekraanireÅ¾iim pole saadaval"
 
 #. Translators: magnification will use the top half of the screen.
 #.
-#: ../src/orca/mag.py:1761 ../src/orca/orca_gui_prefs.py:1716
 msgid "Top Half"
 msgstr "Ekraani Ã¼lemisel poolel"
 
 #. Translators: magnification will use the bottom half of the screen.
 #.
-#: ../src/orca/mag.py:1765 ../src/orca/orca_gui_prefs.py:1720
 msgid "Bottom Half"
 msgstr "Ekraani alumisel poolel"
 
 #. Translators: magnification will use the left half of the screen.
 #.
-#: ../src/orca/mag.py:1769 ../src/orca/orca_gui_prefs.py:1724
 msgid "Left Half"
 msgstr "Ekraani vasakul poolel"
 
 #. Translators: magnification will use the right half of the screen.
 #.
-#: ../src/orca/mag.py:1773 ../src/orca/orca_gui_prefs.py:1728
 msgid "Right Half"
 msgstr "Ekraani paremal poolel"
 
 #. 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:1733
 msgid "Custom"
 msgstr "Kohandatud"
 
@@ -3169,18 +2677,15 @@ msgstr "Kohandatud"
 #. 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
 msgid "^[Yy1]"
 msgstr "^[YyJj1]"
 
 #. 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
 msgid "Speech is unavailable."
 msgstr "KÃµne pole saadaval."
 
-#: ../src/orca/orca_console_prefs.py:140
 msgid "Welcome to Orca setup."
 msgstr "Tere tulemast Orca sÃ¤tetesse."
 
@@ -3190,36 +2695,28 @@ msgstr "Tere tulemast Orca sÃ¤tetesse."
 #. another, emacspeak is another.  These all then provide
 #. wrappers around specific speech servers (engines).
 #.
-#: ../src/orca/orca_console_prefs.py:164
 msgid "Select desired speech system:"
 msgstr "Eelistatava kÃµnesÃ¼steemi valimine:"
 
 #. 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
 msgid "Enter choice: "
 msgstr "Sisesta valik:"
 
 #. 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
 msgid "Speech will not be used.\n"
 msgstr "KÃµne ei kasutata.\n"
 
 #. Translators: this means no working speech servers (speech
 #. synthesis engines) can be found.
 #.
-#: ../src/orca/orca_console_prefs.py:189
 msgid "No servers available.\n"
 msgstr "Servereid pole saadaval.\n"
 
 #. Translators: this is prompting for a numerical choice from a list
 #. of available speech synthesis engines.
 #.
-#: ../src/orca/orca_console_prefs.py:196
 msgid "Select desired speech server."
 msgstr ""
 
@@ -3227,7 +2724,6 @@ msgstr ""
 #. engine) is not working properly and no voices (e.g., male,
 #. female, child) are available.
 #.
-#: ../src/orca/orca_console_prefs.py:223
 msgid "No voices available.\n"
 msgstr "HÃ¤Ã¤li pole saadaval.\n"
 
@@ -3235,14 +2731,12 @@ msgstr "HÃ¤Ã¤li pole saadaval.\n"
 #. list of choices of speech synthesis voices (e.g., male,
 #. female, child).
 #.
-#: ../src/orca/orca_console_prefs.py:234
 msgid "Select desired voice:"
 msgstr "Eelistatava hÃ¤Ã¤le valimine:"
 
 #. 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
 msgid "Enable echo by word?  Enter y or n: "
 msgstr ""
 
@@ -3250,35 +2744,30 @@ msgstr ""
 #. 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
 msgid "Enable key echo?  Enter y or n: "
 msgstr ""
 
 #. Translators: this is in reference to key echo for
 #. normal text entry keys.
 #.
-#: ../src/orca/orca_console_prefs.py:318
 msgid "Enable alphanumeric and punctuation keys?  Enter y or n: "
 msgstr ""
 
 #. Translators: this is in reference to key echo for
 #. CTRL, ALT, Shift, Insert, and "Fn" on laptops.
 #.
-#: ../src/orca/orca_console_prefs.py:328
 msgid "Enable modifier keys?  Enter y or n: "
 msgstr ""
 
 #. Translators: this is in reference to key echo for
 #. Caps Lock, Num Lock, Scroll Lock, etc.
 #.
-#: ../src/orca/orca_console_prefs.py:338
 msgid "Enable locking keys?  Enter y or n: "
 msgstr ""
 
 #. Translators: this is in reference to key echo for
 #. the keys at the top of the keyboard.
 #.
-#: ../src/orca/orca_console_prefs.py:348
 msgid "Enable function keys?  Enter y or n: "
 msgstr ""
 
@@ -3286,7 +2775,6 @@ msgstr ""
 #. space, enter, escape, tab, backspace, delete, arrow
 #. keys, page up, page down, etc.
 #.
-#: ../src/orca/orca_console_prefs.py:359
 msgid "Enable action keys?  Enter y or n: "
 msgstr ""
 
@@ -3294,7 +2782,6 @@ 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:378
 msgid "Select desired keyboard layout."
 msgstr ""
 
@@ -3302,7 +2789,6 @@ 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
 msgid "1. Desktop"
 msgstr "1. TÃ¶Ã¶lauaarvuti"
 
@@ -3310,18 +2796,15 @@ msgstr "1. TÃ¶Ã¶lauaarvuti"
 #. 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
 msgid "2. Laptop"
 msgstr "2. SÃ¼learvuti"
 
-#: ../src/orca/orca_console_prefs.py:414
 msgid "Invalid choice. Selecting desktop keyboard layout.\n"
 msgstr ""
 
 #. 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
 msgid "Enable Braille?  Enter y or n: "
 msgstr ""
 
@@ -3330,39 +2813,30 @@ msgstr ""
 #. would be (or is being) shown on the external refreshable braille
 #. display.
 #.
-#: ../src/orca/orca_console_prefs.py:460
 msgid "Enable Braille Monitor?  Enter y or n: "
 msgstr ""
 
-#: ../src/orca/orca_console_prefs.py:469 ../src/orca/orca_gui_prefs.py:454
 msgid "Accessibility support for GNOME has just been enabled."
 msgstr ""
 
-#: ../src/orca/orca_console_prefs.py:475 ../src/orca/orca_gui_prefs.py:456
 msgid "You need to log out and log back in for the change to take effect."
 msgstr ""
 
-#: ../src/orca/orca_console_prefs.py:483
 msgid "Do you want to logout now?  Enter y or n: "
 msgstr ""
 
-#: ../src/orca/orca_console_prefs.py:489
 msgid "Setup complete. Logging out now."
 msgstr "Seadistamine on lÃµppenud.  NÃ¼Ã¼d logitakse vÃ¤lja."
 
-#: ../src/orca/orca_console_prefs.py:503
 msgid "Setup complete.  Press Return to continue."
 msgstr "Seadistamine on lÃµppenud.  JÃ¤tkamiseks vajuta Return."
 
-#: ../src/orca/orca-find.glade.h:1
 msgid "<b>Start from:</b>"
 msgstr ""
 
-#: ../src/orca/orca-find.glade.h:2 ../src/orca/orca_gui_find.py:147
 msgid "C_urrent location"
 msgstr ""
 
-#: ../src/orca/orca-find.glade.h:3
 msgid "Close"
 msgstr ""
 
@@ -3376,51 +2850,37 @@ 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/scripts/apps/gnome-search-tool.py:165
 msgid "Find"
 msgstr ""
 
-#: ../src/orca/orca-find.glade.h:5
 msgid "Match _entire word only"
 msgstr ""
 
-#: ../src/orca/orca-find.glade.h:6
 msgid "Orca Find Dialog"
 msgstr ""
 
-#: ../src/orca/orca-find.glade.h:7
 msgid "Search _backwards"
 msgstr ""
 
-#: ../src/orca/orca-find.glade.h:8
 #, fuzzy
 msgid "Search for:"
 msgstr "Eraldaja"
 
-#: ../src/orca/orca-find.glade.h:9
 msgid "Start from:"
 msgstr ""
 
-#: ../src/orca/orca-find.glade.h:10
 msgid "Top of window"
 msgstr ""
 
-#: ../src/orca/orca-find.glade.h:11
 msgid "_Match case"
 msgstr ""
 
-#: ../src/orca/orca-find.glade.h:12
 msgid "_Search for:"
 msgstr ""
 
-#: ../src/orca/orca-find.glade.h:13
 msgid "_Top of window"
 msgstr ""
 
-#: ../src/orca/orca-find.glade.h:14
 msgid "_Wrap around"
 msgstr ""
 
@@ -3429,7 +2889,6 @@ msgstr ""
 #. 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
 msgid "Centered"
 msgstr ""
 
@@ -3441,9 +2900,6 @@ msgstr ""
 #. 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:4169
-#: ../src/orca/orca_gui_prefs.py:4198 ../src/orca/orca_gui_prefs.py:4371
-#: ../src/orca/orca_gui_prefs.py:4438 ../src/orca/orca_gui_prefs.py:4461
 msgid "None"
 msgstr "Puudub"
 
@@ -3455,7 +2911,6 @@ msgstr "Puudub"
 #. the desktop, Orca positions the mouse 25% from the left edge
 #. of the magnified region.
 #.
-#: ../src/orca/orca_gui_prefs.py:91
 msgid "Proportional"
 msgstr "Proportsionaalne"
 
@@ -3464,7 +2919,6 @@ msgstr "Proportsionaalne"
 #. 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
 msgid "Push"
 msgstr ""
 
@@ -3473,7 +2927,6 @@ msgstr ""
 #. what action Orca will take when the user invokes an Orca-specific
 #. keyboard command.
 #.
-#: ../src/orca/orca_gui_prefs.py:194
 msgid "Function"
 msgstr "Funktsioon"
 
@@ -3481,7 +2934,6 @@ msgstr "Funktsioon"
 #. the cells in the column represent keyboard combinations
 #. the user can press to invoke Orca commands.
 #.
-#: ../src/orca/orca_gui_prefs.py:270
 msgid "Key Binding"
 msgstr "Kiirklahv"
 
@@ -3492,7 +2944,6 @@ msgstr "Kiirklahv"
 #. addition to the key bindings in the "Key Bindings"
 #. column.
 #.
-#: ../src/orca/orca_gui_prefs.py:349
 msgid "Alternate"
 msgstr ""
 
@@ -3500,28 +2951,24 @@ msgstr ""
 #. cells represent whether a key binding has been modified
 #. from the default key binding.
 #.
-#: ../src/orca/orca_gui_prefs.py:369
 msgid "Modified"
 msgstr ""
 
 #. Translators: this refers to the speech synthesis voice that Orca
 #. will use most of the time.
 #.
-#: ../src/orca/orca_gui_prefs.py:427 ../src/orca/orca_gui_prefs.py:476
 msgid "Default"
 msgstr "Vaikimisi"
 
 #. Translators: this refers to the speech synthesis voice that Orca
 #. will use to speak capitalized words and letters.
 #.
-#: ../src/orca/orca_gui_prefs.py:433 ../src/orca/orca_gui_prefs.py:482
 msgid "Uppercase"
 msgstr ""
 
 #. Translators: this refers to the speech synthesis voice that Orca
 #. will use to speak text associated with hyperlinks in HTML content.
 #.
-#: ../src/orca/orca_gui_prefs.py:439 ../src/orca/orca_gui_prefs.py:492
 msgid "Hyperlink"
 msgstr "HÃ¼perviit"
 
@@ -3530,7 +2977,6 @@ msgstr "HÃ¼perviit"
 #. Translators: Attribute here refers to text attributes such
 #. as bold, underline, family-name, etc.
 #.
-#: ../src/orca/orca_gui_prefs.py:1104
 msgid "Attribute Name"
 msgstr ""
 
@@ -3541,7 +2987,6 @@ msgstr ""
 #. will speak that attribute, if it is present, when the user
 #. presses Orca_Modifier+F.
 #.
-#: ../src/orca/orca_gui_prefs.py:1119
 msgid "Speak"
 msgstr ""
 
@@ -3552,7 +2997,6 @@ msgstr ""
 #. Orca will "underline" that attribute, if it is present, on
 #. the refreshable braille display.
 #.
-#: ../src/orca/orca_gui_prefs.py:1137
 msgid "Mark in braille"
 msgstr ""
 
@@ -3571,7 +3015,6 @@ 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:1163
 msgid "Present Unless"
 msgstr ""
 
@@ -3582,7 +3025,6 @@ msgstr ""
 #. or a particular word that is pronounced differently then the way
 #. that it looks.
 #.
-#: ../src/orca/orca_gui_prefs.py:1278
 msgid "Actual String"
 msgstr "Tegelik string"
 
@@ -3593,7 +3035,6 @@ msgstr "Tegelik string"
 #. For example: if the actual string was "MHz", then the replacement
 #. (spoken) string would be "megahertz".
 #.
-#: ../src/orca/orca_gui_prefs.py:1295
 msgid "Replacement String"
 msgstr "Asendusstring"
 
@@ -3601,7 +3042,6 @@ msgstr "Asendusstring"
 #. and triple "clicks" or key presses, similar to
 #. using a mouse.
 #.
-#: ../src/orca/orca_gui_prefs.py:2048
 msgid "(double click)"
 msgstr ""
 
@@ -3609,7 +3049,6 @@ msgstr ""
 #. and triple "clicks" or key presses, similar to
 #. using a mouse.
 #.
-#: ../src/orca/orca_gui_prefs.py:2054
 msgid "(triple click)"
 msgstr ""
 
@@ -3618,7 +3057,6 @@ msgstr ""
 #. The braille bindings are what determine the actions Orca will
 #. take when the user presses these buttons.
 #.
-#: ../src/orca/orca_gui_prefs.py:2158 ../src/orca/orca_gui_prefs.py:2252
 msgid "Braille Bindings"
 msgstr ""
 
@@ -3627,8 +3065,6 @@ 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:2613 ../src/orca/orca_gui_prefs.py:2654
-#: ../src/orca/orca_gui_prefs.py:2694 ../src/orca/orca-setup.glade.h:52
 msgid "Dot _7"
 msgstr ""
 
@@ -3636,8 +3072,6 @@ 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:2620 ../src/orca/orca_gui_prefs.py:2661
-#: ../src/orca/orca_gui_prefs.py:2701 ../src/orca/orca-setup.glade.h:53
 msgid "Dot _8"
 msgstr ""
 
@@ -3645,15 +3079,12 @@ msgstr ""
 #. two dots at the bottom of the braille cell will be
 #. used to 'underline' text of interest.
 #.
-#: ../src/orca/orca_gui_prefs.py:2627 ../src/orca/orca_gui_prefs.py:2668
-#: ../src/orca/orca_gui_prefs.py:2708 ../src/orca/orca-setup.glade.h:54
 msgid "Dots 7 an_d 8"
 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:2731 ../src/orca/orca-setup.glade.h:163
 msgid "_None"
 msgstr "_Puudub"
 
@@ -3662,7 +3093,6 @@ msgstr "_Puudub"
 #. spoken as a user reads a document, but less common symbols
 #. (such as #, @, $) will.
 #.
-#: ../src/orca/orca_gui_prefs.py:2739 ../src/orca/orca-setup.glade.h:126
 msgid "So_me"
 msgstr ""
 
@@ -3670,7 +3100,6 @@ msgstr ""
 #. punctuation symbols will be spoken as a user reads a
 #. document.
 #.
-#: ../src/orca/orca_gui_prefs.py:2746 ../src/orca/orca-setup.glade.h:88
 msgid "M_ost"
 msgstr ""
 
@@ -3678,7 +3107,6 @@ msgstr ""
 #. over an entire document, Orca will pause at the end of each
 #. line.
 #.
-#: ../src/orca/orca_gui_prefs.py:2767
 msgid "Line"
 msgstr ""
 
@@ -3686,7 +3114,6 @@ msgstr ""
 #. over an entire document, Orca will pause at the end of each
 #. sentence.
 #.
-#: ../src/orca/orca_gui_prefs.py:2773
 msgid "Sentence"
 msgstr ""
 
@@ -3694,8 +3121,6 @@ msgstr ""
 #. Orca provides about a particular object that receives
 #. focus.
 #.
-#: ../src/orca/orca_gui_prefs.py:2793 ../src/orca/orca_gui_prefs.py:2923
-#: ../src/orca/orca-setup.glade.h:31
 msgid "Brie_f"
 msgstr ""
 
@@ -3703,7 +3128,6 @@ msgstr ""
 #. 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:2817 ../src/orca/orca-setup.glade.h:130
 msgid "Speak current _cell"
 msgstr ""
 
@@ -3711,7 +3135,6 @@ msgstr ""
 #. a new key combination (e.g., Alt+Ctrl+g) to create a new
 #. key bindings.
 #.
-#: ../src/orca/orca_gui_prefs.py:3570
 msgid "enter new key"
 msgstr ""
 
@@ -3719,7 +3142,6 @@ msgstr ""
 #. Orca has deleted an existing key combination based upon
 #. their input.
 #.
-#: ../src/orca/orca_gui_prefs.py:3599
 msgid "Key binding deleted. Press enter to confirm."
 msgstr ""
 
@@ -3727,7 +3149,6 @@ msgstr ""
 #. 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:3623
 #, python-format
 msgid "The key entered is already bound to %s"
 msgstr ""
@@ -3736,7 +3157,6 @@ msgstr ""
 #. know Orca has recorded a new key combination (e.g., Alt+Ctrl+g)
 #. based upon their input.
 #.
-#: ../src/orca/orca_gui_prefs.py:3630
 #, python-format
 msgid "Key captured: %s. Press enter to confirm."
 msgstr ""
@@ -3745,7 +3165,6 @@ msgstr ""
 #. combination (e.g., Ctrl+Alt+f) the user just typed when
 #. creating a new key binding.
 #.
-#: ../src/orca/orca_gui_prefs.py:3669
 #, python-format
 msgid "The new key is: %s"
 msgstr ""
@@ -3754,22 +3173,18 @@ msgstr ""
 #. existing key combination (e.g., Ctrl+Alt+f) that was
 #. associated with a command has been deleted.
 #.
-#: ../src/orca/orca_gui_prefs.py:3677
 msgid "The keybinding has been removed."
 msgstr ""
 
 #. Translators: this refers to the keyboard layout (desktop
 #. or laptop).
 #.
-#: ../src/orca/orca_gui_prefs.py:3755 ../src/orca/orca-setup.glade.h:156
 msgid "_Desktop"
 msgstr "_TÃ¶Ã¶lauaarvuti"
 
 #. Translators: this is an algorithm for magnifying pixels
 #. on the screen.
 #.
-#: ../src/orca/orca_gui_prefs.py:4163 ../src/orca/orca_gui_prefs.py:4174
-#: ../src/orca/orca_gui_prefs.py:4196
 msgid "Bilinear"
 msgstr "Bilineaarne"
 
@@ -3778,7 +3193,6 @@ msgstr "Bilineaarne"
 #. 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:4379 ../src/orca/orca_gui_prefs.py:4469
 msgid "Saturate red"
 msgstr ""
 
@@ -3787,7 +3201,6 @@ msgstr ""
 #. pixels on the screen.  For example, an RGB value of
 #. (75, 100, 125) would become (75, 255, 125).
 #.
-#: ../src/orca/orca_gui_prefs.py:4387 ../src/orca/orca_gui_prefs.py:4477
 msgid "Saturate green"
 msgstr ""
 
@@ -3796,7 +3209,6 @@ msgstr ""
 #. pixels on the screen. For example, an RGB value of
 #. (75, 100, 125) would become (75, 100, 255).
 #.
-#: ../src/orca/orca_gui_prefs.py:4395 ../src/orca/orca_gui_prefs.py:4485
 msgid "Saturate blue"
 msgstr ""
 
@@ -3805,7 +3217,6 @@ msgstr ""
 #. 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:4403 ../src/orca/orca_gui_prefs.py:4493
 msgid "Desaturate red"
 msgstr ""
 
@@ -3814,7 +3225,6 @@ msgstr ""
 #. pixels on the screen. For example, an RGB value of
 #. (75, 100, 125) would become (75, 0, 125).
 #.
-#: ../src/orca/orca_gui_prefs.py:4411 ../src/orca/orca_gui_prefs.py:4501
 msgid "Desaturate green"
 msgstr ""
 
@@ -3823,7 +3233,6 @@ msgstr ""
 #. pixels on the screen. For example, an RGB value of
 #. (75, 100, 125) would become (75, 100, 0).
 #.
-#: ../src/orca/orca_gui_prefs.py:4419 ../src/orca/orca_gui_prefs.py:4509
 msgid "Desaturate blue"
 msgstr ""
 
@@ -3832,7 +3241,6 @@ msgstr ""
 #. example, an RGB value of (75, 100, 125) would become
 #. (125, 75, 100).
 #.
-#: ../src/orca/orca_gui_prefs.py:4427 ../src/orca/orca_gui_prefs.py:4517
 msgid "Positive hue shift"
 msgstr ""
 
@@ -3841,23 +3249,19 @@ msgstr ""
 #. example, an RGB value of (75, 100, 125) would become
 #. (100, 125, 75).
 #.
-#: ../src/orca/orca_gui_prefs.py:4435 ../src/orca/orca_gui_prefs.py:4525
 msgid "Negative hue shift"
 msgstr ""
 
 #. Translators: Orca Preferences is the configuration GUI for Orca.
 #.
-#: ../src/orca/orca_gui_prefs.py:4762
 msgid "Starting Orca Preferences."
 msgstr "Orca eelistuste kÃ¤ivitamine."
 
-#: ../src/orca/orca-mainwin.glade.h:1
 msgid "Orca Screen Reader / Magnifier"
 msgstr "Orca ekraanilugeja ja luup"
 
 #. 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
 msgid "Goodbye."
 msgstr ""
 
@@ -3870,21 +3274,18 @@ msgstr ""
 #. Exiting learn mode puts the user back in normal operating
 #. mode.
 #.
-#: ../src/orca/orca.py:353
 msgid "Exiting learn mode."
 msgstr "Ã?ppimisreÅ¾iimist vÃ¤ljumine."
 
 #. Translators: this is a spoken prompt letting the user know
 #. that speech synthesis has been turned back on.
 #.
-#: ../src/orca/orca.py:870
 msgid "Speech enabled."
 msgstr "KÃµne lubatud."
 
 #. Translators: this is a spoken prompt letting the user know
 #. that speech synthesis has been temporarily turned off.
 #.
-#: ../src/orca/orca.py:875
 msgid "Speech disabled."
 msgstr "KÃµne keelatud."
 
@@ -3892,18 +3293,15 @@ msgstr "KÃµne keelatud."
 #. preferences.  This is a spoken prompt to let the user
 #. know when the preferences has been reloaded.
 #.
-#: ../src/orca/orca.py:938
 msgid "Orca user settings reloaded."
 msgstr "Orca kasutajasÃ¤tted on uuesti laaditud."
 
-#: ../src/orca/orca.py:1350
 msgid "Usage: orca [OPTION...]"
 msgstr "Kasutamine: orca [VÃ?TI...]"
 
 #. Translators: this is the description of the command line option
 #. '-?, --help' that is used to display usage information.
 #.
-#: ../src/orca/orca.py:1356
 msgid "Show this help message"
 msgstr "Selle abiteabe nÃ¤itamine"
 
@@ -3911,7 +3309,6 @@ msgstr "Selle abiteabe nÃ¤itamine"
 #. the names of the applications known to the accessibility infrastructure
 #. to stdout and then exits.
 #.
-#: ../src/orca/orca.py:1365
 msgid "Print the known running applications"
 msgstr ""
 
@@ -3919,7 +3316,6 @@ msgstr ""
 #. '-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
 msgid "Set up user preferences"
 msgstr "Kasutajate eelistuste seadmine"
 
@@ -3929,7 +3325,6 @@ msgstr "Kasutajate eelistuste seadmine"
 #. startup. For this to happen properly, Orca will need to be run
 #. from a terminal window.
 #.
-#: ../src/orca/orca.py:1380
 msgid "Set up user preferences (text version)"
 msgstr "Kasutajate eelistuste seadmine (tekstiversioon)"
 
@@ -3937,7 +3332,6 @@ msgstr "Kasutajate eelistuste seadmine (tekstiversioon)"
 #. '-n, --no-setup' that means that Orca will startup without setting
 #. up any user preferences.
 #.
-#: ../src/orca/orca.py:1387
 msgid "Skip set up of user preferences"
 msgstr "Kasutaja eelistuste mÃ¤Ã¤ramise vahelejÃ¤tmine"
 
@@ -3947,7 +3341,6 @@ msgstr "Kasutaja eelistuste mÃ¤Ã¤ramise vahelejÃ¤tmine"
 #. '-u, --user-prefs-dir=dirname' that allows you to specify an alternate
 #. location for those user preferences.
 #.
-#: ../src/orca/orca.py:1396
 msgid "Use alternate directory for user preferences"
 msgstr "Kasutaja eelistuste jaoks alternatiivse kataloogi kasutamine"
 
@@ -3955,7 +3348,6 @@ msgstr "Kasutaja eelistuste jaoks alternatiivse kataloogi kasutamine"
 #. command line option, it will be automatically enabled as Orca is
 #. started.
 #.
-#: ../src/orca/orca.py:1409
 msgid "Force use of option"
 msgstr "Valiku jÃµuga pealesurumine"
 
@@ -3963,7 +3355,6 @@ msgstr "Valiku jÃµuga pealesurumine"
 #. command line option, it will be automatically disabled as Orca is
 #. started.
 #.
-#: ../src/orca/orca.py:1422
 msgid "Prevent use of option"
 msgstr "Valiku vÃ¤ltimine"
 
@@ -3972,36 +3363,30 @@ msgstr "Valiku vÃ¤ltimine"
 #. If this command line option is specified, the script will quit any
 #. instances of Orca that are already running.
 #.
-#: ../src/orca/orca.py:1430
 msgid "Quits Orca (if shell script used)"
 msgstr "Orca lÃµpetamine (kestprogrammi skripti kasutamise korral)"
 
 #. 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
 msgid ""
 "If Orca has not been previously set up by the user, Orca\n"
 "will automatically launch the preferences set up unless\n"
 "the -n or --no-setup option is used."
 msgstr ""
 
-#: ../src/orca/orca.py:1445
 msgid ""
 "WARNING: suspending Orca, e.g. by pressing Control-Z, from\n"
 "an AT-SPI enabled shell (such as gnome-terminal), can also\n"
 "suspend the desktop until Orca is killed."
 msgstr ""
 
-#: ../src/orca/orca.py:1450
 msgid "Report bugs to orca-list gnome org "
 msgstr "Vigadest palun teatada aadressil orca-list gnome org "
 
-#: ../src/orca/orca.py:1621
 msgid "Welcome to Orca."
 msgstr "Tere tulemast Orca'sse."
 
-#: ../src/orca/orca-quit.glade.h:1
 msgid ""
 "<b><big>Quit Orca?</big></b>\n"
 "\n"
@@ -4013,123 +3398,94 @@ msgstr ""
 "Sulgemise jÃ¤rel seiskuvad ka kÃµnevÃ¤ljund ja ekraaniluup.\n"
 "\n"
 
-#: ../src/orca/orca-setup.glade.h:2
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: ../src/orca/orca-setup.glade.h:3
 msgid ""
 "<b>Adjust selected\n"
 "attributes</b>"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:5
 msgid "<b>Border Settings</b>"
 msgstr "<b>Ã?Ã¤rise sÃ¤tted</b>"
 
-#: ../src/orca/orca-setup.glade.h:6
 msgid "<b>Braille Indicator</b>"
 msgstr "<b>Braille nÃ¤idik</b>"
 
-#: ../src/orca/orca-setup.glade.h:7
 msgid "<b>Brightness</b>"
 msgstr "<b>Heledus</b>"
 
-#: ../src/orca/orca-setup.glade.h:8
 msgid "<b>Color Settings</b>"
 msgstr "<b>VÃ¤rvuste sÃ¤tted</b>"
 
-#: ../src/orca/orca-setup.glade.h:9
 msgid "<b>Contracted Braille</b>"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:10
 msgid "<b>Contrast</b>"
 msgstr "<b>Kontrast</b>"
 
-#: ../src/orca/orca-setup.glade.h:11
 msgid "<b>Cross-hair Settings</b>"
 msgstr "<b>Sihiku sÃ¤tted</b>"
 
-#: ../src/orca/orca-setup.glade.h:12
 msgid "<b>Cursor Settings</b>"
 msgstr "<b>KursorisÃ¤tted</b>"
 
-#: ../src/orca/orca-setup.glade.h:13
 msgid "<b>Hyperlink Indicator</b>"
 msgstr "<b>HÃ¼perviida nÃ¤idik</b>"
 
-#: ../src/orca/orca-setup.glade.h:14
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Klaviatuuripaigutus</b>"
 
-#: ../src/orca/orca-setup.glade.h:15
 msgid "<b>Multi-monitor Settings</b>"
 msgstr "<b>Mitme monitori sÃ¤tted</b>"
 
-#: ../src/orca/orca-setup.glade.h:16
 msgid "<b>Pronunciation Dictionary</b>"
 msgstr "<b>HÃ¤Ã¤lduste sÃµnaraamat</b>"
 
-#: ../src/orca/orca-setup.glade.h:17
 msgid "<b>Punctuation Level</b>"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:18
 msgid "<b>Selection Indicator</b>"
 msgstr "<b>Valiku nÃ¤idik</b>"
 
-#: ../src/orca/orca-setup.glade.h:19
 msgid "<b>Table Row Speech</b>"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:20
 msgid "<b>Text attributes</b>"
 msgstr ""
 
 #. Translators:  In the context of magnifying the contents of the screen, "tracking" refers to whether or not an object (mouse pointer, the caret, or the widget with focus) is of interest.  Objects of interest must always be displayed.  "Alignment" refers to where on the screen objects of interest should be displayed.
-#: ../src/orca/orca-setup.glade.h:22
 msgid "<b>Tracking and Alignment Settings</b>"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:23
 msgid "<b>Verbosity</b>"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:24
 msgid "<b>Zoomer Settings</b>"
 msgstr "<b>Suurendusala sÃ¤tted</b>"
 
-#: ../src/orca/orca-setup.glade.h:25
 msgid "Advanced Settings"
 msgstr "Laiendatud sÃ¤tted"
 
-#: ../src/orca/orca-setup.glade.h:26
 msgid "Advanced _Settings..."
 msgstr "Laiendatud _sÃ¤tted..."
 
-#: ../src/orca/orca-setup.glade.h:27
 msgid "B_lue:"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:28
 msgid "Border color:"
 msgstr "Ã?Ã¤rise vÃ¤rvus:"
 
-#: ../src/orca/orca-setup.glade.h:29
 msgid "Border size:"
 msgstr "Ã?Ã¤rise paksus:"
 
-#: ../src/orca/orca-setup.glade.h:30
 msgid "Braille"
 msgstr "Braille"
 
-#: ../src/orca/orca-setup.glade.h:32
 msgid "Brightness:"
 msgstr "Heledus:"
 
-#: ../src/orca/orca-setup.glade.h:33
 msgid ""
 "Centered\n"
 "Proportional\n"
@@ -4137,127 +3493,98 @@ msgid ""
 "None"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:37
 msgid ""
 "Centered\n"
 "Push\n"
 "None"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:40
 msgid "Contraction _Table:"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:41
 msgid "Contrast:"
 msgstr "Kontrast:"
 
-#: ../src/orca/orca-setup.glade.h:42
 msgid "Cross-hair color:"
 msgstr "Sihiku vÃ¤rvus:"
 
-#: ../src/orca/orca-setup.glade.h:43
 msgid "Cross-hair si_ze:"
 msgstr "Sihiku s_uurus:"
 
-#: ../src/orca/orca-setup.glade.h:44
 msgid "Cursor color:"
 msgstr "Kursori vÃ¤rvus:"
 
-#: ../src/orca/orca-setup.glade.h:45
 msgid "Cursor size:"
 msgstr "Kursori suurus:"
 
-#: ../src/orca/orca-setup.glade.h:46
 msgid "Custom siz_e"
 msgstr "Kohandatud _suurus"
 
-#: ../src/orca/orca-setup.glade.h:47
 msgid ""
 "Default\n"
 "Uppercase\n"
 "Hyperlink"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:50
 msgid "Disable _end of line symbol"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:51
 msgid "Disable gksu _keyboard grab"
 msgstr ""
 
 #. 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
 msgid "Edge mar_gin:"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:57
 msgid "Enable Braille _monitor"
 msgstr "Braille _jÃ¤lgija on lubatud"
 
-#: ../src/orca/orca-setup.glade.h:58
 msgid "Enable Braille _support"
 msgstr "Braille _tugi on lubatud"
 
-#: ../src/orca/orca-setup.glade.h:59
 msgid "Enable _alphanumeric and punctuation keys"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:60
 msgid "Enable _function keys"
 msgstr "_Funktsiooniklahvid on lubatud"
 
-#: ../src/orca/orca-setup.glade.h:61
 msgid "Enable _key echo"
 msgstr "_Klahvi kaja on lubatud"
 
-#: ../src/orca/orca-setup.glade.h:62
 msgid "Enable _magnifier"
 msgstr "_Luup on lubatud"
 
-#: ../src/orca/orca-setup.glade.h:63
 msgid "Enable _modifier keys"
 msgstr "_Muuteklahvid on lubatud"
 
-#: ../src/orca/orca-setup.glade.h:64
 msgid "Enable _navigation keys"
 msgstr "_Navigatsiooniklahvid on lubatud"
 
-#: ../src/orca/orca-setup.glade.h:65
 msgid "Enable ac_tion keys"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:66
 msgid "Enable bor_der"
 msgstr "Ã?Ã¤r_is on lubatud"
 
-#: ../src/orca/orca-setup.glade.h:67
 msgid "Enable c_ursor"
 msgstr "_Kursor lubatud"
 
-#: ../src/orca/orca-setup.glade.h:68
 msgid "Enable cross-h_air"
 msgstr "Si_hik on lubatud"
 
-#: ../src/orca/orca-setup.glade.h:69
 msgid "Enable cross-hair cl_ip"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:70
 #, fuzzy
 msgid "Enable echo by _sentence"
 msgstr "_Klahvi kaja on lubatud"
 
-#: ../src/orca/orca-setup.glade.h:71
 msgid "Enable echo by _word"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:72
 msgid "Enable lockin_g keys"
 msgstr "_Klahvide lukustamine on lubatud"
 
-#: ../src/orca/orca-setup.glade.h:73
 msgid ""
 "Full Screen\n"
 "Top Half\n"
@@ -4273,69 +3600,54 @@ msgstr ""
 "Paremal poolel\n"
 "Kohandatud"
 
-#: ../src/orca/orca-setup.glade.h:79
 msgid "General"
 msgstr "Ã?ldine"
 
-#: ../src/orca/orca-setup.glade.h:80
 msgid "Gree_n:"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:81
 msgid "Hide s_ystem pointer"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:82
 msgid "In_vert colors"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:83
 msgid "Key Binding List"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:84
 msgid "Key Bindings"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:85
 msgid "Key Echo"
 msgstr "Klahvi kaja"
 
-#: ../src/orca/orca-setup.glade.h:86
 msgid ""
 "Line\n"
 "Sentence"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:89
 msgid "Magnifier"
 msgstr "Luup"
 
-#: ../src/orca/orca-setup.glade.h:90
 msgid "Mouse poi_nter:"
 msgstr ""
 
 #. 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
 msgid "Move _down one"
 msgstr ""
 
 #. 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
 msgid "Move _up one"
 msgstr ""
 
 #. 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
 msgid "Move to _bottom"
 msgstr ""
 
 #. 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
 msgid "Move to _top"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:99
 msgid ""
 "None\n"
 "Bilinear"
@@ -4343,7 +3655,6 @@ msgstr ""
 "Puudub\n"
 "Bilineaarne"
 
-#: ../src/orca/orca-setup.glade.h:101
 msgid ""
 "None\n"
 "Saturate red\n"
@@ -4356,244 +3667,186 @@ msgid ""
 "Negative hue shift"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:110
 #, fuzzy
 msgid "Orca Modifier Keys"
 msgstr "_Muuteklahvid on lubatud"
 
-#: ../src/orca/orca-setup.glade.h:111
 msgid "Orca Preferences"
 msgstr "Orca eelistused"
 
-#: ../src/orca/orca-setup.glade.h:112
 #, fuzzy
 msgid "Orca _Modifier Key(s):"
 msgstr "_Muuteklahvid on lubatud"
 
-#: ../src/orca/orca-setup.glade.h:113
 msgid "Pi_tch:"
 msgstr ""
 
 #. 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
 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
 msgid "Pointer follows zoomer"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:118
 msgid "Pronunciation"
 msgstr "HÃ¤Ã¤ldus"
 
-#: ../src/orca/orca-setup.glade.h:119
 msgid "Quit Orca _without confirmation"
 msgstr "Orca sulgetakse ilma _kinnitust kÃ¼simata"
 
-#: ../src/orca/orca-setup.glade.h:120
 msgid "R_ed:"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:121
 msgid "S_ource display:"
 msgstr ""
 
 #. 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
 msgid "Say All B_y:"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:124
 msgid "Scale _factor:"
 msgstr "Suu_rendusaste:"
 
-#: ../src/orca/orca-setup.glade.h:125
 msgid "Show Orca _main window"
 msgstr "Orca _peaaken on nÃ¤htaval"
 
-#: ../src/orca/orca-setup.glade.h:127
 msgid "Speak _indentation and justification"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:128
 msgid "Speak _none"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:129
 msgid "Speak blank lines"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:131
 msgid "Speak current ro_w"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:132
 msgid "Speak object under mo_use"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:133
 #, fuzzy
 msgid "Speak progress bar _updates"
 msgstr "edenemisriba"
 
-#: ../src/orca/orca-setup.glade.h:134
 msgid "Speak tutorial messages"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:135
 msgid "Speech"
 msgstr "KÃµne"
 
-#: ../src/orca/orca-setup.glade.h:136
 msgid "Speech _system:"
 msgstr "KÃµ_nesÃ¼steem:"
 
-#: ../src/orca/orca-setup.glade.h:137
 msgid "Speech synthesi_zer:"
 msgstr "KÃµnesÃ¼n_tesaator:"
 
-#: ../src/orca/orca-setup.glade.h:138
 msgid "Start Orca when you lo_gin"
 msgstr "Orca kÃ¤ivitatakse sisselo_gimisel"
 
-#: ../src/orca/orca-setup.glade.h:139
 msgid "Target displa_y:"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:140
 msgid "Te_xt cursor:"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:141
 msgid "Text Attributes"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:142
 msgid "Update interval:"
 msgstr "Uuendatakse iga"
 
-#: ../src/orca/orca-setup.glade.h:143
 msgid "Ver_bose"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:144
 msgid "Vo_lume:"
 msgstr "Va_ljus:"
 
-#: ../src/orca/orca-setup.glade.h:145
 msgid "Warning"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:146
 msgid ""
 "You already have an instance of an Orca preferences dialog open.\n"
 "\n"
 "Please close it before opening a new one."
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:149
 msgid "_Abbreviated role names"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:150
 msgid "_All"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:151
 msgid "_Blue:"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:152
 msgid "_Bottom:"
 msgstr "_All:"
 
-#: ../src/orca/orca-setup.glade.h:153
 msgid "_Color Filtering:"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:154
 msgid "_Control and menu item:"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:155
 msgid "_Delete"
 msgstr "_Kustuta"
 
-#: ../src/orca/orca-setup.glade.h:157
 msgid "_Enable Contracted Braille"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:158
 msgid "_Enable speech"
 msgstr "_KÃµne on lubatud"
 
-#: ../src/orca/orca-setup.glade.h:159
 msgid "_Green:"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:160
 msgid "_Laptop"
 msgstr "_SÃ¼learvuti"
 
-#: ../src/orca/orca-setup.glade.h:161
 msgid "_Left:"
 msgstr "_Vasakul:"
 
-#: ../src/orca/orca-setup.glade.h:162
 msgid "_New entry"
 msgstr "_Uus kirje"
 
-#: ../src/orca/orca-setup.glade.h:164
 msgid "_Person:"
 msgstr "_Isik:"
 
-#: ../src/orca/orca-setup.glade.h:165
 msgid "_Position:"
 msgstr "_Asukoht:"
 
-#: ../src/orca/orca-setup.glade.h:166
 msgid "_Present tooltips"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:167
 msgid "_Rate:"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:168
 msgid "_Red:"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:169
 msgid "_Reset"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:170
 msgid "_Right:"
 msgstr "_Paremal:"
 
-#: ../src/orca/orca-setup.glade.h:171
 msgid "_Smoothing:"
 msgstr "_Pehmendamine:"
 
-#: ../src/orca/orca-setup.glade.h:172
 msgid "_Speak all"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:173
 msgid "_Top:"
 msgstr "_Ã?leval:"
 
-#: ../src/orca/orca-setup.glade.h:174
 msgid "_Voice settings:"
 msgstr "_HÃ¤Ã¤le sÃ¤tted:"
 
-#: ../src/orca/orca-setup.glade.h:175
 msgid "pixels"
 msgstr ""
 
-#: ../src/orca/orca-setup.glade.h:176
 msgid "seconds"
 msgstr "sekundi jÃ¤rel"
 
@@ -4620,7 +3873,6 @@ msgstr "sekundi jÃ¤rel"
 #. interesting tidbits about local conventions in the sections
 #. "Additions in German, Danish and Norwegian" and "Variants".
 #.
-#: ../src/orca/phonnames.py:53
 msgid ""
 "a : alpha, b : bravo, c : charlie, d : delta, e : echo, f : foxtrot, g : "
 "golf, h : hotel, i : india, j : juliet, k : kilo, l : lima, m : mike, n : "
@@ -4631,42 +3883,36 @@ msgstr ""
 #. Translators: short braille for the rolename of an invalid GUI object.
 #. We strive to keep it under three characters to preserve real estate.
 #.
-#: ../src/orca/rolenames.py:164
 msgid "???"
 msgstr "???"
 
 #. Translators: long braille for the rolename of an invalid object.
 #. We typically make these 'camel' case.
 #.
-#: ../src/orca/rolenames.py:168
 msgid "Invalid"
 msgstr "Vigane"
 
 #. Translators: spoken words for the rolename of an invalid object.
 #.
-#: ../src/orca/rolenames.py:171
 msgid "invalid"
 msgstr "vigane"
 
 #. Translators: short braille for an accelerator (what you see in a menu).
 #. We strive to keep it under three characters to preserve real estate.
 #.
-#: ../src/orca/rolenames.py:178
 msgid "acc"
 msgstr ""
 
 #. Translators: long braille for an accelerator (what you see in a menu).
 #. We typically make these 'camel' case.
 #.
-#: ../src/orca/rolenames.py:182
 msgid "Accelerator"
-msgstr "Kiirendi"
+msgstr "Kiirklahv"
 
 #. Translators: spoken words for an accelerator (what you see in a menu).
 #.
-#: ../src/orca/rolenames.py:185
 msgid "accelerator"
-msgstr "kiirendi"
+msgstr "kiirklahv"
 
 #. Translators: short braille for the rolename of an alert dialog.
 #. NOTE for all the short braille words: they we strive to keep them
@@ -4674,7 +3920,6 @@ msgstr "kiirendi"
 #. display.  The letters are chosen to make them unique across all
 #. other rolenames, and they typically act like an abbreviation.
 #.
-#: ../src/orca/rolenames.py:195
 #, fuzzy
 msgid "alrt"
 msgstr "katus"
@@ -4685,7 +3930,6 @@ msgstr "katus"
 #. spaces between them and the first letter of each word is
 #. capitalized.
 #.
-#: ../src/orca/rolenames.py:202
 msgid "Alert"
 msgstr ""
 
@@ -4693,95 +3937,80 @@ msgstr ""
 #. NOTE for all the spoken words: these are the words one would use
 #. when speaking.
 #.
-#: ../src/orca/rolenames.py:207
 msgid "alert"
 msgstr ""
 
 #. Translators: short braille for the rolename of an animation widget.
 #.
-#: ../src/orca/rolenames.py:213
 #, fuzzy
 msgid "anim"
 msgstr "animatsioon"
 
 #. Translators: long braille for the rolename of an animation widget.
 #.
-#: ../src/orca/rolenames.py:216
 msgid "Animation"
 msgstr "Animatsioon"
 
 #. Translators: spoken words for the rolename of an animation widget.
 #.
-#: ../src/orca/rolenames.py:219
 msgid "animation"
 msgstr "animatsioon"
 
 #. Translators: short braille for the rolename of an arrow widget.
 #.
-#: ../src/orca/rolenames.py:225
 #, fuzzy
 msgid "arw"
 msgstr "nool"
 
 #. Translators: long braille for the rolename of an animation widget.
 #.
-#: ../src/orca/rolenames.py:228
 msgid "Arrow"
 msgstr "Nool"
 
 #. Translators: spoken words for the rolename of an animation widget.
 #.
-#: ../src/orca/rolenames.py:231
 msgid "arrow"
 msgstr "nool"
 
 #. Translators: short braille for the rolename of a calendar widget.
 #.
-#: ../src/orca/rolenames.py:237
 msgid "cal"
 msgstr ""
 
 #. Translators: long braille for the rolename of a calendar widget.
 #.
-#: ../src/orca/rolenames.py:240
 msgid "Calendar"
 msgstr "Kalender"
 
 #. Translators: spoken words for the rolename of a calendar widget.
 #.
-#: ../src/orca/rolenames.py:243
 msgid "calendar"
 msgstr "kalender"
 
 #. Translators: short braille for the rolename of a canvas widget.
 #.
-#: ../src/orca/rolenames.py:249
 msgid "cnv"
 msgstr ""
 
 #. Translators: long braille for the rolename of a canvas widget.
 #.
-#: ../src/orca/rolenames.py:252
 msgid "Canvas"
 msgstr ""
 
 #. Translators: spoken words for the rolename of a canvas widget.
 #.
-#: ../src/orca/rolenames.py:255
 msgid "canvas"
 msgstr ""
 
 #. Translators: short braille for the rolename of a caption (e.g.,
 #. table caption).
 #.
-#: ../src/orca/rolenames.py:262
 msgid "cptn"
 msgstr ""
 
 #. Translators: long braille for the rolename of a caption (e.g.,
 #. table caption).
 #.
-#: ../src/orca/rolenames.py:266
 #, fuzzy
 msgid "Caption"
 msgstr "rakendus"
@@ -4789,7 +4018,6 @@ msgstr "rakendus"
 #. Translators: spoken words for the rolename of a caption (e.g.,
 #. table caption).
 #.
-#: ../src/orca/rolenames.py:270
 #, fuzzy
 msgid "caption"
 msgstr "Rakendus"
@@ -4798,49 +4026,41 @@ msgstr "Rakendus"
 #.
 #. Translators: short braille for the rolename of a check menu item.
 #.
-#: ../src/orca/rolenames.py:276 ../src/orca/rolenames.py:288
 msgid "chk"
 msgstr ""
 
 #. Translators: long braille for the rolename of a checkbox.
 #.
-#: ../src/orca/rolenames.py:279
 msgid "CheckBox"
 msgstr "MÃ¤rkeRuut"
 
 #. Translators: spoken words for the rolename of a checkbox.
 #.
-#: ../src/orca/rolenames.py:282
 msgid "check box"
 msgstr "mÃ¤rkeruut"
 
 #. Translators: long braille for the rolename of a check menu item.
 #.
-#: ../src/orca/rolenames.py:291
 msgid "CheckItem"
 msgstr ""
 
 #. Translators: spoken words for the rolename of a check menu item.
 #.
-#: ../src/orca/rolenames.py:294
 msgid "check item"
 msgstr ""
 
 #. Translators: short braille for the rolename of a color chooser.
 #.
-#: ../src/orca/rolenames.py:300
 msgid "clrchsr"
 msgstr ""
 
 #. Translators: long braille for the rolename of a color chooser.
 #.
-#: ../src/orca/rolenames.py:303
 msgid "ColorChooser"
 msgstr "VÃ¤rviValija"
 
 #. Translators: spoken words for the rolename of a color chooser.
 #.
-#: ../src/orca/rolenames.py:306
 msgid "color chooser"
 msgstr "vÃ¤rvivalija"
 
@@ -4848,7 +4068,6 @@ msgstr "vÃ¤rvivalija"
 #.
 #. Translators: short braille for the rolename of a table column header.
 #.
-#: ../src/orca/rolenames.py:312 ../src/orca/rolenames.py:934
 msgid "colhdr"
 msgstr ""
 
@@ -4856,7 +4075,6 @@ msgstr ""
 #.
 #. Translators: long braille for the rolename of a table column header.
 #.
-#: ../src/orca/rolenames.py:315 ../src/orca/rolenames.py:937
 msgid "ColumnHeader"
 msgstr "VeeruPÃ¤is"
 
@@ -4864,43 +4082,36 @@ msgstr "VeeruPÃ¤is"
 #.
 #. Translators: spoken words for the rolename of a table column header.
 #.
-#: ../src/orca/rolenames.py:318 ../src/orca/rolenames.py:940
 msgid "column header"
 msgstr "veeru pÃ¤is"
 
 #. Translators: short braille for the rolename of a combo box.
 #.
-#: ../src/orca/rolenames.py:324
 msgid "cbo"
 msgstr ""
 
 #. Translators: long braille for the rolename of a combo box.
 #.
-#: ../src/orca/rolenames.py:327
 msgid "Combo"
 msgstr ""
 
 #. Translators: spoken words for the rolename of a combo box.
 #.
-#: ../src/orca/rolenames.py:330
 msgid "combo box"
 msgstr ""
 
 #. Translators: short braille for the rolename of a date editor.
 #.
-#: ../src/orca/rolenames.py:336
 msgid "dat"
 msgstr ""
 
 #. Translators: long braille for the rolename of a date editor.
 #.
-#: ../src/orca/rolenames.py:339
 msgid "DateEditor"
 msgstr "KuupÃ¤evaRedaktor"
 
 #. Translators: spoken words for the rolename of a date editor.
 #.
-#: ../src/orca/rolenames.py:342
 msgid "date editor"
 msgstr "kuupÃ¤evaredaktor"
 
@@ -4908,20 +4119,17 @@ msgstr "kuupÃ¤evaredaktor"
 #.
 #. Translators: short braille for the rolename of a icon.
 #.
-#: ../src/orca/rolenames.py:348 ../src/orca/rolenames.py:538
 #, fuzzy
 msgid "icn"
 msgstr "ikoon"
 
 #. Translators: long braille for the rolename of a desktop icon.
 #.
-#: ../src/orca/rolenames.py:351
 msgid "DesktopIcon"
 msgstr "TÃ¶Ã¶lauaIkoon"
 
 #. Translators: spoken words for the rolename of a desktop icon.
 #.
-#: ../src/orca/rolenames.py:354
 msgid "desktop icon"
 msgstr "tÃ¶Ã¶lauaikoon"
 
@@ -4929,19 +4137,16 @@ msgstr "tÃ¶Ã¶lauaikoon"
 #.
 #. Translators: short braille for the rolename of a frame.
 #.
-#: ../src/orca/rolenames.py:360 ../src/orca/rolenames.py:490
 msgid "frm"
 msgstr ""
 
 #. Translators: long braille for the rolename of a desktop frame.
 #.
-#: ../src/orca/rolenames.py:363
 msgid "DesktopFrame"
 msgstr ""
 
 #. Translators: spoken words for the rolename of a desktop frame.
 #.
-#: ../src/orca/rolenames.py:366
 msgid "desktop frame"
 msgstr ""
 
@@ -4952,56 +4157,46 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/rolenames.py:377
-msgctxt "shortbraille"
-msgid "dial"
+msgid "shortbraille|dial"
 msgstr ""
 
 #. Translators: long braille for the rolename of a dial.
 #.
-#: ../src/orca/rolenames.py:380
 msgid "Dial"
 msgstr ""
 
 #. Translators: spoken words for the rolename of a dial.
 #.
-#: ../src/orca/rolenames.py:383
 msgid "dial"
 msgstr ""
 
 #. Translators: short braille for the rolename of a dialog.
 #.
-#: ../src/orca/rolenames.py:389
 msgid "dlg"
 msgstr ""
 
 #. Translators: long braille for the rolename of a dialog.
 #.
-#: ../src/orca/rolenames.py:392
 msgid "Dialog"
 msgstr "Dialoog"
 
 #. Translators: spoken words for the rolename of a dialog.
 #.
-#: ../src/orca/rolenames.py:395
 msgid "dialog"
 msgstr "dialoog"
 
 #. Translators: short braille for the rolename of a directory pane.
 #.
-#: ../src/orca/rolenames.py:401
 msgid "dip"
 msgstr ""
 
 #. Translators: long braille for the rolename of a directory pane.
 #.
-#: ../src/orca/rolenames.py:404
 msgid "DirectoryPane"
 msgstr "KataloogiPaan"
 
 #. Translators: spoken words for the rolename of a directory pane.
 #.
-#: ../src/orca/rolenames.py:407
 msgid "directory pane"
 msgstr "kataloogipaan"
 
@@ -5009,93 +4204,78 @@ msgstr "kataloogipaan"
 #.
 #. Translators: short braille for the rolename of an html container.
 #.
-#: ../src/orca/rolenames.py:413 ../src/orca/rolenames.py:526
 msgid "html"
 msgstr "html"
 
 #. Translators: long braille for the rolename of an HTML document frame.
 #.
-#: ../src/orca/rolenames.py:416
 #, fuzzy
 msgid "HtmlPane"
 msgstr "HtmlKonteiner"
 
 #. Translators: spoken words for the rolename of an HTML document frame.
 #.
-#: ../src/orca/rolenames.py:419
 #, fuzzy
 msgid "html content"
 msgstr "h t m l konteiner"
 
 #. Translators: short braille for the rolename of a drawing area.
 #.
-#: ../src/orca/rolenames.py:425
 msgid "draw"
 msgstr ""
 
 #. Translators: long braille for the rolename of a drawing area.
 #.
-#: ../src/orca/rolenames.py:428
 msgid "DrawingArea"
 msgstr ""
 
 #. Translators: spoken words for the rolename of a drawing area.
 #.
-#: ../src/orca/rolenames.py:431
 msgid "drawing area"
 msgstr ""
 
 #. Translators: short braille for the rolename of a file chooser.
 #.
-#: ../src/orca/rolenames.py:437
 msgid "fchsr"
 msgstr ""
 
 #. Translators: long braille for the rolename of a file chooser.
 #.
-#: ../src/orca/rolenames.py:440
 msgid "FileChooser"
 msgstr "FailiValija"
 
 #. Translators: spoken words for the rolename of a file chooser.
 #.
-#: ../src/orca/rolenames.py:443
 msgid "file chooser"
 msgstr "failivalija"
 
 #. Translators: short braille for the rolename of a filler.
 #.
-#: ../src/orca/rolenames.py:449
 msgid "flr"
 msgstr ""
 
 #. Translators: long braille for the rolename of a filler.
 #.
-#: ../src/orca/rolenames.py:452
 msgid "Filler"
 msgstr ""
 
 #. Translators: spoken words for the rolename of a filler.
 #.
-#: ../src/orca/rolenames.py:455
 msgid "filler"
 msgstr ""
 
 #. Translators: short braille for the rolename of a font chooser.
 #.
-#: ../src/orca/rolenames.py:461
 msgid "fnt"
 msgstr ""
 
 #. Translators: long braille for the rolename of a font chooser.
 #.
-#: ../src/orca/rolenames.py:464
 msgid "FontChooser"
 msgstr "KirjatÃ¼Ã¼biValija"
 
 #. Translators: spoken words for the rolename of a font chooser.
 #.
-#: ../src/orca/rolenames.py:467
 msgid "font chooser"
 msgstr "kirjatÃ¼Ã¼bivalija"
 
@@ -5106,458 +4286,381 @@ msgstr "kirjatÃ¼Ã¼bivalija"
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/rolenames.py:478
-msgctxt "shortbraille"
-msgid "form"
+msgid "shortbraille|form"
 msgstr ""
 
 #. Translators: long braille for the rolename of a form.
 #.
-#: ../src/orca/rolenames.py:481
 msgid "Form"
 msgstr ""
 
 #. Translators: spoken words for the rolename of a form.
 #.
-#: ../src/orca/rolenames.py:484
 msgid "form"
 msgstr ""
 
 #. Translators: long braille for the rolename of a frame.
 #.
-#: ../src/orca/rolenames.py:493
 msgid "Frame"
 msgstr ""
 
 #. Translators: spoken words for the rolename of a frame.
 #.
-#: ../src/orca/rolenames.py:496
 msgid "frame"
 msgstr ""
 
 #. Translators: short braille for the rolename of a glass pane.
 #.
-#: ../src/orca/rolenames.py:502
 msgid "gpn"
 msgstr ""
 
 #. Translators: long braille for the rolename of a glass pane.
 #.
-#: ../src/orca/rolenames.py:505
 msgid "GlassPane"
 msgstr ""
 
 #. Translators: spoken words for the rolename of a glass pane.
 #.
-#: ../src/orca/rolenames.py:508
 msgid "glass pane"
 msgstr ""
 
 #. Translators: short braille for the rolename of a heading.
 #.
-#: ../src/orca/rolenames.py:514
 msgid "hdng"
 msgstr ""
 
 #. Translators: long braille for the rolename of a heading.
 #.
-#: ../src/orca/rolenames.py:517
 msgid "Heading"
 msgstr "PÃ¤is"
 
 #. Translators: spoken words for the rolename of a heading.
 #.
-#: ../src/orca/rolenames.py:520
 msgid "heading"
 msgstr "pÃ¤is"
 
 #. Translators: long braille for the rolename of an html container.
 #.
-#: ../src/orca/rolenames.py:529
 msgid "HtmlContainer"
 msgstr "HtmlKonteiner"
 
 #. Translators: spoken words for the rolename of an html container.
 #.
-#: ../src/orca/rolenames.py:532
 msgid "h t m l container"
 msgstr "h t m l konteiner"
 
 #. Translators: long braille for the rolename of a icon.
 #.
-#: ../src/orca/rolenames.py:541
 msgid "Icon"
 msgstr "Ikoon"
 
 #. Translators: spoken words for the rolename of a icon.
 #.
-#: ../src/orca/rolenames.py:544
 msgid "icon"
 msgstr "ikoon"
 
 #. Translators: short braille for the rolename of a image.
 #.
-#: ../src/orca/rolenames.py:550
 msgid "img"
 msgstr ""
 
 #. Translators: long braille for the rolename of a image.
 #.
-#: ../src/orca/rolenames.py:553
 msgid "Image"
 msgstr "Pilt"
 
 #. Translators: spoken words for the rolename of a image.
 #.
-#: ../src/orca/rolenames.py:556
 msgid "image"
 msgstr "pilt"
 
 #. Translators: short braille for the rolename of an internal frame.
 #.
-#: ../src/orca/rolenames.py:562
 msgid "ifrm"
 msgstr ""
 
 #. Translators: long braille for the rolename of an internal frame.
 #.
-#: ../src/orca/rolenames.py:565
 msgid "InternalFrame"
 msgstr ""
 
 #. Translators: spoken words for the rolename of an internal frame.
 #.
-#: ../src/orca/rolenames.py:568
 msgid "internal frame"
 msgstr ""
 
 #. Translators: short braille for the rolename of a label.
 #.
-#: ../src/orca/rolenames.py:574
 msgid "lbl"
 msgstr ""
 
 #. Translators: long braille for the rolename of a label.
 #.
-#: ../src/orca/rolenames.py:577
 msgid "Label"
 msgstr "Silt"
 
 #. Translators: spoken words for the rolename of a label.
 #.
-#: ../src/orca/rolenames.py:580
 msgid "label"
 msgstr "silt"
 
 #. Translators: short braille for the rolename of a layered pane.
 #.
-#: ../src/orca/rolenames.py:586
 msgid "lyrdpn"
 msgstr ""
 
 #. Translators: long braille for the rolename of a layered pane.
 #.
-#: ../src/orca/rolenames.py:589
 msgid "LayeredPane"
 msgstr "KihilinePaan"
 
 #. Translators: spoken words for the rolename of a layered pane.
 #.
-#: ../src/orca/rolenames.py:592
 msgid "layered pane"
 msgstr "kihiline paan"
 
 #. Translators: short braille for the rolename of a link.
 #.
-#: ../src/orca/rolenames.py:598
 msgid "lnk"
 msgstr ""
 
 #. Translators: long braille for the rolename of a link.
 #.
-#: ../src/orca/rolenames.py:601
 msgid "Link"
 msgstr ""
 
 #. Translators: short braille for the rolename of a list.
 #.
-#: ../src/orca/rolenames.py:610
 msgid "lst"
 msgstr ""
 
 #. Translators: long braille for the rolename of a list.
 #.
-#: ../src/orca/rolenames.py:613
 msgid "List"
 msgstr "Loetelu"
 
 #. Translators: spoken words for the rolename of a list.
 #.
-#: ../src/orca/rolenames.py:616
 msgid "list"
 msgstr "loetelu"
 
 #. Translators: short braille for the rolename of a list item.
 #.
-#: ../src/orca/rolenames.py:622
 msgid "lstitm"
 msgstr ""
 
 #. Translators: long braille for the rolename of a list item.
 #.
-#: ../src/orca/rolenames.py:625
 msgid "ListItem"
 msgstr ""
 
 #. Translators: spoken words for the rolename of a list item.
 #.
-#: ../src/orca/rolenames.py:628
 msgid "list item"
 msgstr ""
 
 #. Translators: short braille for the rolename of a menu.
 #.
-#: ../src/orca/rolenames.py:634
 msgid "mnu"
 msgstr ""
 
 #. Translators: long braille for the rolename of a menu.
 #.
-#: ../src/orca/rolenames.py:637
 msgid "Menu"
 msgstr "MenÃ¼Ã¼"
 
 #. Translators: short braille for the rolename of a menu bar.
 #.
-#: ../src/orca/rolenames.py:646
 msgid "mnubr"
 msgstr ""
 
 #. Translators: long braille for the rolename of a menu bar.
 #.
-#: ../src/orca/rolenames.py:649
 msgid "MenuBar"
 msgstr "MenÃ¼Ã¼Riba"
 
 #. Translators: spoken words for the rolename of a menu bar.
 #.
-#: ../src/orca/rolenames.py:652
 msgid "menu bar"
 msgstr "menÃ¼Ã¼riba"
 
 #. Translators: short braille for the rolename of a menu item.
 #.
-#: ../src/orca/rolenames.py:658
 msgid "mnuitm"
 msgstr ""
 
 #. Translators: long braille for the rolename of a menu item.
 #.
-#: ../src/orca/rolenames.py:661
 msgid "MenuItem"
 msgstr "MenÃ¼Ã¼Kirje"
 
 #. Translators: spoken words for the rolename of a menu item.
 #.
-#: ../src/orca/rolenames.py:664
 msgid "menu item"
 msgstr "MenÃ¼Ã¼Kirje"
 
 #. Translators: short braille for the rolename of an option pane.
 #.
-#: ../src/orca/rolenames.py:670
 msgid "optnpn"
 msgstr ""
 
 #. Translators: long braille for the rolename of an option pane.
 #.
-#: ../src/orca/rolenames.py:673
 msgid "OptionPane"
 msgstr ""
 
 #. Translators: spoken words for the rolename of an option pane.
 #.
-#: ../src/orca/rolenames.py:676
 msgid "option pane"
 msgstr ""
 
 #. Translators: short braille for the rolename of a page tab.
 #.
-#: ../src/orca/rolenames.py:682
 msgid "pgt"
 msgstr ""
 
 #. Translators: long braille for the rolename of a page tab.
 #.
-#: ../src/orca/rolenames.py:685
 msgid "Page"
 msgstr ""
 
 #. Translators: spoken words for the rolename of a page tab.
 #.
-#: ../src/orca/rolenames.py:688
 msgid "page"
 msgstr ""
 
 #. Translators: short braille for the rolename of a page tab list.
 #.
-#: ../src/orca/rolenames.py:694
 msgid "tblst"
 msgstr ""
 
 #. Translators: long braille for the rolename of a page tab list.
 #.
-#: ../src/orca/rolenames.py:697
 msgid "TabList"
 msgstr ""
 
 #. Translators: spoken words for the rolename of a page tab list.
 #.
-#: ../src/orca/rolenames.py:700
 msgid "tab list"
 msgstr ""
 
 #. Translators: short braille for the rolename of a panel.
 #.
-#: ../src/orca/rolenames.py:706
 msgid "pnl"
 msgstr ""
 
 #. Translators: long braille for the rolename of a panel.
 #.
-#: ../src/orca/rolenames.py:709
 msgid "Panel"
 msgstr "Paneel"
 
 #. Translators: spoken words for the rolename of a panel.
 #.
-#: ../src/orca/rolenames.py:712
 msgid "panel"
 msgstr "paneel"
 
 #. Translators: short braille for the rolename of a password field.
 #.
-#: ../src/orca/rolenames.py:718
 msgid "pwd"
 msgstr ""
 
 #. Translators: long braille for the rolename of a password field.
 #.
-#: ../src/orca/rolenames.py:721
 msgid "Password"
 msgstr "Parool"
 
 #. Translators: spoken words for the rolename of a password field.
 #.
-#: ../src/orca/rolenames.py:724
 msgid "password"
 msgstr "parool"
 
 #. Translators: short braille for the rolename of a popup menu.
 #.
-#: ../src/orca/rolenames.py:730
 msgid "popmnu"
 msgstr ""
 
 #. Translators: long braille for the rolename of a popup menu.
 #.
-#: ../src/orca/rolenames.py:733
 msgid "PopupMenu"
 msgstr "HÃ¼pikMenÃ¼Ã¼"
 
 #. Translators: spoken words for the rolename of a popup menu.
 #.
-#: ../src/orca/rolenames.py:736
 msgid "popup menu"
 msgstr "hÃ¼pikmenÃ¼Ã¼"
 
 #. Translators: short braille for the rolename of a progress bar.
 #.
-#: ../src/orca/rolenames.py:742
 msgid "pgbar"
 msgstr ""
 
 #. Translators: long braille for the rolename of a progress bar.
 #.
-#: ../src/orca/rolenames.py:745
 msgid "Progress"
 msgstr "Edenemine"
 
 #. Translators: spoken words for the rolename of a progress bar.
 #.
-#: ../src/orca/rolenames.py:748
 msgid "progress bar"
 msgstr "edenemisriba"
 
 #. Translators: short braille for the rolename of a push button.
 #.
-#: ../src/orca/rolenames.py:754
 msgid "btn"
 msgstr ""
 
 #. Translators: long braille for the rolename of a push button.
 #.
-#: ../src/orca/rolenames.py:757
 msgid "Button"
 msgstr "Nupp"
 
 #. Translators: spoken words for the rolename of a push button.
 #.
-#: ../src/orca/rolenames.py:760
 msgid "button"
 msgstr "nupp"
 
 #. Translators: short braille for the rolename of a radio button.
 #.
-#: ../src/orca/rolenames.py:766
 msgid "radio"
 msgstr ""
 
 #. Translators: long braille for the rolename of a radio button.
 #.
-#: ../src/orca/rolenames.py:769
 msgid "RadioButton"
 msgstr "RaadioNupp"
 
 #. Translators: spoken words for the rolename of a radio button.
 #.
-#: ../src/orca/rolenames.py:772
 msgid "radio button"
 msgstr "raadionupp"
 
 #. Translators: short braille for the rolename of a radio menu item.
 #.
-#: ../src/orca/rolenames.py:778
 msgid "rdmnuitm"
 msgstr ""
 
 #. Translators: long braille for the rolename of a radio menu item.
 #.
-#: ../src/orca/rolenames.py:781
 msgid "RadioItem"
 msgstr ""
 
 #. Translators: spoken words for the rolename of a radio menu item.
 #.
-#: ../src/orca/rolenames.py:784
 msgid "radio menu item"
 msgstr ""
 
 #. Translators: short braille for the rolename of a root pane.
 #.
-#: ../src/orca/rolenames.py:790
 msgid "rtpn"
 msgstr ""
 
 #. Translators: long braille for the rolename of a root pane.
 #.
-#: ../src/orca/rolenames.py:793
 msgid "RootPane"
 msgstr ""
 
 #. Translators: spoken words for the rolename of a root pane.
 #.
-#: ../src/orca/rolenames.py:796
 msgid "root pane"
 msgstr ""
 
@@ -5565,7 +4668,6 @@ msgstr ""
 #.
 #. Translators: short braille for the rolename of a table row header.
 #.
-#: ../src/orca/rolenames.py:802 ../src/orca/rolenames.py:946
 msgid "rwhdr"
 msgstr ""
 
@@ -5573,7 +4675,6 @@ msgstr ""
 #.
 #. Translators: long braille for the rolename of a table row header.
 #.
-#: ../src/orca/rolenames.py:805 ../src/orca/rolenames.py:949
 msgid "RowHeader"
 msgstr "ReaPÃ¤is"
 
@@ -5581,516 +4682,429 @@ msgstr "ReaPÃ¤is"
 #.
 #. Translators: spoken words for the rolename of a table row header.
 #.
-#: ../src/orca/rolenames.py:808 ../src/orca/rolenames.py:952
 msgid "row header"
 msgstr "rea pÃ¤is"
 
 #. Translators: short braille for the rolename of a scroll bar.
 #.
-#: ../src/orca/rolenames.py:814
 msgid "scbr"
 msgstr ""
 
 #. Translators: long braille for the rolename of a scroll bar.
 #.
-#: ../src/orca/rolenames.py:817
 msgid "ScrollBar"
 msgstr "KerimisRiba"
 
 #. Translators: spoken words for the rolename of a scroll bar.
 #.
-#: ../src/orca/rolenames.py:820
 msgid "scroll bar"
 msgstr "kerimisriba"
 
 #. Translators: short braille for the rolename of a scroll pane.
 #.
-#: ../src/orca/rolenames.py:826
 msgid "scpn"
 msgstr ""
 
 #. Translators: long braille for the rolename of a scroll pane.
 #.
-#: ../src/orca/rolenames.py:829
 msgid "ScrollPane"
 msgstr "KerimisPaan"
 
 #. Translators: spoken words for the rolename of a scroll pane.
 #.
-#: ../src/orca/rolenames.py:832
 msgid "scroll pane"
 msgstr "kerimispaan"
 
 #. Translators: short braille for the rolename of a section (e.g., in html).
 #.
-#: ../src/orca/rolenames.py:838
 msgid "sctn"
 msgstr ""
 
 #. Translators: long braille for the rolename of a section (e.g., in html).
 #.
-#: ../src/orca/rolenames.py:841
 msgid "Section"
 msgstr ""
 
 #. Translators: short braille for the rolename of a separator.
 #.
-#: ../src/orca/rolenames.py:850
 msgid "seprtr"
 msgstr ""
 
 #. Translators: long braille for the rolename of a separator.
 #.
-#: ../src/orca/rolenames.py:853
 msgid "Separator"
 msgstr "Eraldaja"
 
 #. Translators: spoken words for the rolename of a separator.
 #.
-#: ../src/orca/rolenames.py:856
 msgid "separator"
 msgstr "eraldaja"
 
 #. Translators: short braille for the rolename of a slider.
 #.
-#: ../src/orca/rolenames.py:862
 msgid "sldr"
 msgstr ""
 
 #. Translators: long braille for the rolename of a slider.
 #.
-#: ../src/orca/rolenames.py:865
 msgid "Slider"
 msgstr "Liugur"
 
 #. Translators: spoken words for the rolename of a slider.
 #.
-#: ../src/orca/rolenames.py:868
 msgid "slider"
 msgstr "liugur"
 
 #. Translators: short braille for the rolename of a split pane.
 #.
-#: ../src/orca/rolenames.py:874
 msgid "spltpn"
 msgstr ""
 
 #. Translators: long braille for the rolename of a split pane.
 #.
-#: ../src/orca/rolenames.py:877
 msgid "SplitPane"
 msgstr "PoolitamisPaan"
 
 #. Translators: spoken words for the rolename of a split pane.
 #.
-#: ../src/orca/rolenames.py:880
 msgid "split pane"
 msgstr "poolitamispaan"
 
 #. Translators: short braille for the rolename of a spin button.
 #.
-#: ../src/orca/rolenames.py:886
 msgid "spin"
 msgstr ""
 
 #. Translators: long braille for the rolename of a spin button.
 #.
-#: ../src/orca/rolenames.py:889
 msgid "SpinButton"
 msgstr ""
 
 #. Translators: spoken words for the rolename of a spin button.
 #.
-#: ../src/orca/rolenames.py:892
 msgid "spin button"
 msgstr ""
 
 #. Translators: short braille for the rolename of a statusbar.
 #.
-#: ../src/orca/rolenames.py:898
 msgid "statbr"
 msgstr ""
 
 #. Translators: long braille for the rolename of a statusbar.
 #.
-#: ../src/orca/rolenames.py:901
 msgid "StatusBar"
 msgstr "OlekuRiba"
 
 #. Translators: spoken words for the rolename of a statusbar.
 #.
-#: ../src/orca/rolenames.py:904
 msgid "status bar"
 msgstr "olekuriba"
 
 #. Translators: short braille for the rolename of a table.
 #.
-#: ../src/orca/rolenames.py:910
 msgid "tbl"
 msgstr ""
 
 #. Translators: long braille for the rolename of a table.
 #.
-#: ../src/orca/rolenames.py:913
 msgid "Table"
 msgstr "Tabel"
 
 #. Translators: spoken words for the rolename of a table.
 #.
-#: ../src/orca/rolenames.py:916
 msgid "table"
 msgstr "tabel"
 
 #. Translators: short braille for the rolename of a table cell.
 #.
-#: ../src/orca/rolenames.py:922
 #, fuzzy
 msgid "cll"
 msgstr "lahter"
 
 #. Translators: long braille for the rolename of a table cell.
 #.
-#: ../src/orca/rolenames.py:925
 msgid "Cell"
 msgstr "Lahter"
 
 #. Translators: spoken words for the rolename of a table cell.
 #.
-#: ../src/orca/rolenames.py:928
-#: ../src/orca/scripts/apps/soffice/where_am_i.py:65
-#: ../src/orca/scripts/apps/soffice/where_am_i.py:147
 msgid "cell"
 msgstr "lahter"
 
 #. Translators: short braille for the rolename of a tear off menu item.
 #.
-#: ../src/orca/rolenames.py:958
 msgid "tomnuitm"
 msgstr ""
 
 #. Translators: long braille for the rolename of a tear off menu item.
 #.
-#: ../src/orca/rolenames.py:961
 msgid "TearOffMenuItem"
 msgstr ""
 
 #. Translators: spoken words for the rolename of a tear off menu item.
 #.
-#: ../src/orca/rolenames.py:964
 msgid "tear off menu item"
 msgstr ""
 
 #. Translators: short braille for the rolename of a terminal.
 #.
-#: ../src/orca/rolenames.py:970
 msgid "term"
 msgstr "term"
 
 #. Translators: long braille for the rolename of a terminal.
 #.
-#: ../src/orca/rolenames.py:973
 msgid "Terminal"
 msgstr "Terminal"
 
 #. Translators: spoken words for the rolename of a terminal.
 #.
-#: ../src/orca/rolenames.py:976
 msgid "terminal"
 msgstr "terminal"
 
 #. Translators: short braille for the rolename of a text entry field.
 #.
-#: ../src/orca/rolenames.py:982
 msgid "txt"
 msgstr ""
 
 #. Translators: long braille for the rolename of a text entry field.
 #.
-#: ../src/orca/rolenames.py:985
 msgid "Text"
 msgstr "Tekst"
 
 #. Translators: spoken words for the rolename of a text entry field.
 #.
-#: ../src/orca/rolenames.py:988
 msgid "text"
 msgstr "tekst"
 
 #. Translators: short braille for the rolename of a toggle button.
 #.
-#: ../src/orca/rolenames.py:996
 msgid "tglbtn"
 msgstr ""
 
 #. Translators: long braille for the rolename of a toggle button.
 #.
-#: ../src/orca/rolenames.py:999
 msgid "ToggleButton"
 msgstr ""
 
 #. Translators: spoken words for the rolename of a toggle button.
 #.
-#: ../src/orca/rolenames.py:1002
 msgid "toggle button"
 msgstr ""
 
 #. Translators: short braille for the rolename of a toolbar.
 #.
-#: ../src/orca/rolenames.py:1008
 msgid "tbar"
 msgstr ""
 
 #. Translators: long braille for the rolename of a toolbar.
 #.
-#: ../src/orca/rolenames.py:1011
 msgid "ToolBar"
 msgstr "TÃ¶Ã¶riistaRiba"
 
 #. Translators: spoken words for the rolename of a toolbar.
 #.
-#: ../src/orca/rolenames.py:1014
 msgid "tool bar"
 msgstr "tÃ¶Ã¶riistariba"
 
 #. Translators: short braille for the rolename of a tooltip.
 #.
-#: ../src/orca/rolenames.py:1020
 msgid "tip"
 msgstr ""
 
 #. Translators: long braille for the rolename of a tooltip.
 #.
-#: ../src/orca/rolenames.py:1023
 msgid "ToolTip"
 msgstr "TÃ¶Ã¶riistaVihje"
 
 #. Translators: spoken words for the rolename of a tooltip.
 #.
-#: ../src/orca/rolenames.py:1026
 msgid "tool tip"
 msgstr "tÃ¶Ã¶riistavihje"
 
 #. Translators: short braille for the rolename of a tree.
 #.
-#: ../src/orca/rolenames.py:1032
 #, fuzzy
 msgid "tre"
 msgstr "puu"
 
 #. Translators: long braille for the rolename of a tree.
 #.
-#: ../src/orca/rolenames.py:1035
 msgid "Tree"
 msgstr "Puu"
 
 #. Translators: spoken words for the rolename of a tree.
 #.
-#: ../src/orca/rolenames.py:1038
 msgid "tree"
 msgstr "puu"
 
 #. Translators: short braille for the rolename of a tree table.
 #.
-#: ../src/orca/rolenames.py:1044
 msgid "trtbl"
 msgstr ""
 
 #. Translators: long braille for the rolename of a tree table.
 #.
-#: ../src/orca/rolenames.py:1047
 msgid "TreeTable"
 msgstr ""
 
 #. Translators: spoken words for the rolename of a tree table.
 #.
-#: ../src/orca/rolenames.py:1050
 msgid "tree table"
 msgstr ""
 
 #. Translators: short braille for when the rolename of an object is unknown.
 #.
-#: ../src/orca/rolenames.py:1056
 msgid "unk"
 msgstr ""
 
 #. Translators: long braille for when the rolename of an object is unknown.
 #.
-#: ../src/orca/rolenames.py:1059
 msgid "Unknown"
 msgstr "Tundmatu"
 
 #. Translators: spoken words for when the rolename of an object is unknown.
 #.
-#: ../src/orca/rolenames.py:1062
 msgid "unknown"
 msgstr "tundmatu"
 
 #. Translators: short braille for the rolename of a viewport.
 #.
-#: ../src/orca/rolenames.py:1068
 msgid "vwprt"
 msgstr ""
 
 #. Translators: long braille for the rolename of a viewport.
 #.
-#: ../src/orca/rolenames.py:1071
 msgid "Viewport"
 msgstr ""
 
 #. Translators: spoken words for the rolename of a viewport.
 #.
-#: ../src/orca/rolenames.py:1074
 msgid "viewport"
 msgstr ""
 
 #. Translators: short braille for the rolename of a window.
 #.
-#: ../src/orca/rolenames.py:1080
 msgid "wnd"
 msgstr ""
 
 #. Translators: long braille for the rolename of a window.
 #.
-#: ../src/orca/rolenames.py:1083
 msgid "Window"
 msgstr "Aken"
 
 #. Translators: spoken words for the rolename of a window.
 #.
-#: ../src/orca/rolenames.py:1086
 msgid "window"
 msgstr "aken"
 
 #. Translators: short braille for the rolename of a header.
 #.
-#: ../src/orca/rolenames.py:1092
 msgid "hdr"
 msgstr ""
 
 #. Translators: long braille for the rolename of a header.
 #.
-#: ../src/orca/rolenames.py:1095
 msgid "Header"
 msgstr "PÃ¤is"
 
 #. Translators: spoken words for the rolename of a header.
 #.
-#: ../src/orca/rolenames.py:1098
 msgid "header"
 msgstr "pÃ¤is"
 
 #. Translators: short braille for the rolename of a footer.
 #.
-#: ../src/orca/rolenames.py:1104
 msgid "ftr"
 msgstr ""
 
 #. Translators: long braille for the rolename of a footer.
 #.
-#: ../src/orca/rolenames.py:1107
 msgid "Footer"
 msgstr "Jalus"
 
 #. Translators: spoken words for the rolename of a footer.
 #.
-#: ../src/orca/rolenames.py:1110
 msgid "footer"
 msgstr "jalus"
 
 #. Translators: short braille for the rolename of a paragraph.
 #.
-#: ../src/orca/rolenames.py:1116
 msgid "para"
 msgstr ""
 
 #. Translators: long braille for the rolename of a paragraph.
 #.
-#: ../src/orca/rolenames.py:1119
 msgid "Paragraph"
 msgstr "LÃµik"
 
 #. Translators: spoken words for the rolename of a paragraph.
 #.
-#: ../src/orca/rolenames.py:1122
 msgid "paragraph"
 msgstr "lÃµik"
 
 #. Translators: short braille for the rolename of a application.
 #.
-#: ../src/orca/rolenames.py:1128
 msgid "app"
 msgstr ""
 
 #. Translators: long braille for the rolename of a application.
 #.
-#: ../src/orca/rolenames.py:1131
 msgid "Application"
 msgstr "Rakendus"
 
 #. Translators: spoken words for the rolename of a application.
 #.
-#: ../src/orca/rolenames.py:1134
 msgid "application"
 msgstr "rakendus"
 
 #. Translators: short braille for the rolename of a autocomplete.
 #.
-#: ../src/orca/rolenames.py:1140
 msgid "auto"
 msgstr ""
 
 #. Translators: long braille for the rolename of a autocomplete.
 #.
-#: ../src/orca/rolenames.py:1143
 msgid "AutoComplete"
 msgstr "AutomaatlÃµpetamine"
 
 #. Translators: spoken words for the rolename of a autocomplete.
 #.
-#: ../src/orca/rolenames.py:1146
 msgid "autocomplete"
 msgstr "automaatlÃµpetamine"
 
 #. Translators: short braille for the rolename of an editbar.
 #.
-#: ../src/orca/rolenames.py:1152
 msgid "edtbr"
 msgstr ""
 
 #. Translators: long braille for the rolename of an editbar.
 #.
-#: ../src/orca/rolenames.py:1155
 msgid "EditBar"
 msgstr "RedigeerimisRiba"
 
 #. Translators: spoken words for the rolename of an editbar.
 #.
-#: ../src/orca/rolenames.py:1158
 msgid "edit bar"
 msgstr "redigeerimisriba"
 
 #. Translators: short braille for the rolename of an embedded component.
 #.
-#: ../src/orca/rolenames.py:1164
 msgid "emb"
 msgstr ""
 
 #. Translators: long braille for the rolename of an embedded component.
 #.
-#: ../src/orca/rolenames.py:1167
 msgid "EmbeddedComponent"
 msgstr "PÃµimitudKomponent"
 
 #. Translators: spoken words for the rolename of an embedded component.
 #.
-#: ../src/orca/rolenames.py:1170
 msgid "embedded component"
 msgstr "pÃµimitudkomponent"
 
 #. Translators: short braille for the
 #. rolename of a document.
 #.
-#: ../src/orca/scripts/apps/acroread.py:72
 #, fuzzy
 msgid "doc"
 msgstr "punkt"
@@ -6098,36 +5112,29 @@ msgstr "punkt"
 #. Translators: long braille for the
 #. rolename of a document.
 #.
-#: ../src/orca/scripts/apps/acroread.py:76
 msgid "Document"
 msgstr ""
 
 #. Translators: spoken words for the
 #. rolename of a document.
 #.
-#: ../src/orca/scripts/apps/acroread.py:80
 msgid "document"
 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."
 msgstr ""
 
 #. We've left a table.  Announce this fact.
 #.
-#: ../src/orca/scripts/apps/acroread.py:283
-#: ../src/orca/scripts/apps/soffice/script.py:699
 msgid "leaving table."
 msgstr ""
 
 #. Translators: this represents the row and column we're
 #. on in a table.
 #.
-#: ../src/orca/scripts/apps/acroread.py:301
 #, python-format
 msgid "row %d, column %d"
 msgstr ""
@@ -6135,45 +5142,37 @@ msgstr ""
 #. 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
 #, python-format
 msgid "column %d"
 msgstr "veerg %d"
 
 #. Translators: short braille for the rolename of a calendar view.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:111
 msgid "calv"
 msgstr ""
 
 #. Translators: long braille for the rolename of a calendar view.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:114
 msgid "CalendarView"
 msgstr "KalendriVaade"
 
 #. Translators: spoken words for the rolename of a calendar view.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:117
 msgid "calendar view"
 msgstr "calendrivaade"
 
 #. Translators: short braille for the rolename of a calendar event.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:125
 msgid "cale"
 msgstr ""
 
 #. Translators: long braille for the rolename of a calendar event.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:128
 msgid "CalendarEvent"
 msgstr "KalendriSÃ¼ndmus"
 
 #. Translators: spoken words for the rolename of a calendar event.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:131
 msgid "calendar event"
 msgstr "kalendrisÃ¼ndmus"
 
@@ -6181,7 +5180,6 @@ msgstr "kalendrisÃ¼ndmus"
 #. the user know when new mail has arrived, even if Evolution
 #. doesn't have focus.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:165
 msgid "Toggle whether we present new mail if we are not the active script."
 msgstr ""
 
@@ -6189,7 +5187,6 @@ msgstr ""
 #. the user know when new mail has arrived, even if Evolution
 #. doesn't have focus.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:210
 msgid "present new mail if this script is not active."
 msgstr ""
 
@@ -6197,14 +5194,12 @@ msgstr ""
 #. the user know when new mail has arrived, even if Evolution
 #. doesn't have focus.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:217
 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:269
 #, python-format
 msgid "%s screen"
 msgstr ""
@@ -6219,15 +5214,12 @@ msgstr ""
 #. translated string here has to match what the translated
 #. string is for Evolution.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:305
 msgid "Please"
 msgstr "Palun"
 
-#: ../src/orca/scripts/apps/evolution/script.py:306
 msgid "Welcome"
 msgstr "Tere tulemast"
 
-#: ../src/orca/scripts/apps/evolution/script.py:307
 msgid "Congratulations"
 msgstr "Ã?nnitlused"
 
@@ -6236,8 +5228,6 @@ msgstr "Ã?nnitlused"
 #. list in Evolution.  The name needs to
 #. match what Evolution is using.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:825
-#: ../src/orca/scripts/apps/evolution/script.py:887
 msgid "Status"
 msgstr ""
 
@@ -6246,8 +5236,6 @@ msgstr ""
 #. list in Evolution.  The name needs to
 #. match what Evolution is using.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:834
-#: ../src/orca/scripts/apps/evolution/script.py:912
 msgid "Flagged"
 msgstr ""
 
@@ -6255,7 +5243,6 @@ msgstr ""
 #. indicate that an email message has not been
 #. marked as having been read.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:892
 msgid "unread"
 msgstr ""
 
@@ -6264,14 +5251,12 @@ msgstr ""
 #. list in Evolution.  The name needs to
 #. match what Evolution is using.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:901
 msgid "Attachment"
 msgstr ""
 
 #. Translators: this means there are no scheduled entries
 #. in the calendar.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:1075
 msgid "No appointments"
 msgstr ""
 
@@ -6279,7 +5264,6 @@ msgstr ""
 #. top of the mail view Insert Attachment dialog in Evolution.
 #. We give it a name.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:1152
 msgid "Directories button"
 msgstr ""
 
@@ -6289,17 +5273,12 @@ msgstr ""
 #. keying off stuff like this, but we're forced to do
 #. so in this case.
 #.
-#: ../src/orca/scripts/apps/evolution/script.py:1330
-#: ../src/orca/scripts/apps/evolution/script.py:1331
-#: ../src/orca/scripts/apps/evolution/script.py:1402
-#: ../src/orca/scripts/apps/evolution/script.py:1403
 msgid "Assistant"
 msgstr "Assistent"
 
 #. 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
 #, fuzzy
 msgid "Read"
 msgstr "ReaPÃ¤is"
@@ -6308,7 +5287,6 @@ msgstr "ReaPÃ¤is"
 #. obtain the display of the gcalctool calculator, which is
 #. the area where calculation results are presented.
 #.
-#: ../src/orca/scripts/apps/gcalctool/script.py:108
 msgid "Unable to get calculator display"
 msgstr ""
 
@@ -6317,11 +5295,9 @@ 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
 msgid "Change to:"
 msgstr "Milleks muuta:"
 
-#: ../src/orca/scripts/apps/gedit/script.py:229
 msgid "Misspelled word:"
 msgstr "Probleemne sÃµna:"
 
@@ -6333,15 +5309,12 @@ msgstr "Probleemne sÃµna:"
 #. 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
 msgid "Completed spell checking"
 msgstr ""
 
-#: ../src/orca/scripts/apps/gedit/script.py:263
 msgid "Spell checking is complete."
 msgstr ""
 
-#: ../src/orca/scripts/apps/gedit/script.py:265
 msgid "Press Tab and Return to terminate."
 msgstr ""
 
@@ -6355,12 +5328,6 @@ msgstr ""
 #. has to match what Thunderbird is using.  We hate keying
 #. off stuff like this, but we're forced to do so in this case.
 #.
-#: ../src/orca/scripts/apps/gedit/script.py:392
-#: ../src/orca/scripts/apps/gedit/script.py:475
-#: ../src/orca/scripts/apps/Thunderbird/script.py:152
-#: ../src/orca/scripts/apps/Thunderbird/script.py:282
-#: ../src/orca/scripts/apps/Thunderbird/script.py:501
-#: ../src/orca/scripts/apps/Thunderbird/speech_generator.py:81
 msgid "Check Spelling"
 msgstr "Ã?igekirjakontroll"
 
@@ -6381,22 +5348,18 @@ msgstr "Ã?igekirjakontroll"
 #. keying off stuff like this, but we're forced to do so in this
 #. case.
 #.
-#: ../src/orca/scripts/apps/gedit/script.py:502
 msgid "Phrase not found"
 msgstr ""
 
 #. Translators: this indicates a find command succeeded in
 #. finding something.
 #.
-#: ../src/orca/scripts/apps/gedit/script.py:568
 msgid "Phrase found."
 msgstr ""
 
-#: ../src/orca/scripts/apps/gnome-mud.py:119
 msgid "Read the latest n messages in the incoming messages text area."
 msgstr ""
 
-#: ../src/orca/scripts/apps/gnome-search-tool.py:100
 msgid "Searching."
 msgstr ""
 
@@ -6410,26 +5373,21 @@ msgstr ""
 #. is using.  We hate keying off stuff like this, but we're forced
 #. to do so in this case.
 #.
-#: ../src/orca/scripts/apps/gnome-search-tool.py:137
 msgid "Stop"
 msgstr ""
 
-#: ../src/orca/scripts/apps/gnome-search-tool.py:171
 msgid "Search complete."
 msgstr ""
 
-#: ../src/orca/scripts/apps/gnome-search-tool.py:179
 #, python-format
 msgid "%d file found"
 msgid_plural "%d files found"
 msgstr[0] "leiti %d fail"
 msgstr[1] "leiti %d faili"
 
-#: ../src/orca/scripts/apps/gnome-search-tool.py:184
 msgid "No files found."
 msgstr "Ã?htki faili ei leitud."
 
-#: ../src/orca/scripts/apps/liferea.py:117
 msgid "Work online / offline"
 msgstr ""
 
@@ -6439,11 +5397,9 @@ msgstr ""
 #. between workspaces.  The goal here is to find a match
 #. with that prefix.
 #.
-#: ../src/orca/scripts/apps/metacity.py:105
 msgid "Workspace "
 msgstr "TÃ¶Ã¶ala "
 
-#: ../src/orca/scripts/apps/metacity.py:105
 msgid "Desk "
 msgstr ""
 
@@ -6451,45 +5407,37 @@ msgstr ""
 #. be read by Orca.  This usually means the application is not
 #. friendly to the assistive technology infrastructure.
 #.
-#: ../src/orca/scripts/apps/metacity.py:112
 msgid "inaccessible"
 msgstr ""
 
 #. Translators: This denotes a notification to the user of some sort.
 #.
-#: ../src/orca/scripts/apps/notification-daemon.py:64
 #, python-format
 msgid "Notification %s"
 msgstr ""
 
-#: ../src/orca/scripts/apps/pidgin/script.py:192
 msgid ""
 "Toggle whether we prefix chat room messages with the name of the chat room."
 msgstr ""
 
-#: ../src/orca/scripts/apps/pidgin/script.py:198
 msgid "Toggle whether we announce when our buddies are typing."
 msgstr ""
 
-#: ../src/orca/scripts/apps/pidgin/script.py:203
 msgid "Toggle whether we provide chat room specific message histories."
 msgstr ""
 
-#: ../src/orca/scripts/apps/pidgin/script.py:211
 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
 msgid "_Speak Chat Room name"
 msgstr ""
 
 #. 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
 msgid "Announce when your _buddies are typing"
 msgstr ""
 
@@ -6498,7 +5446,6 @@ msgstr ""
 #. 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
 msgid "Provide chat room specific _message histories"
 msgstr ""
 
@@ -6506,7 +5453,6 @@ msgstr ""
 #. irrespective of whether the pidgin application currently has focus.
 #. This is the default behaviour.
 #.
-#: ../src/orca/scripts/apps/pidgin/script.py:331
 msgid "All cha_nnels"
 msgstr ""
 
@@ -6514,51 +5460,40 @@ msgstr ""
 #. that currently has focus, irrespective of whether the pidgin
 #. application has focus.
 #.
-#: ../src/orca/scripts/apps/pidgin/script.py:346
 msgid "A channel only if its _window is active"
 msgstr ""
 
-#: ../src/orca/scripts/apps/pidgin/script.py:359
 msgid "All channels when an_y Pidgin window is active"
 msgstr ""
 
 #. 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
 msgid "Speak messages from"
 msgstr ""
 
-#: ../src/orca/scripts/apps/pidgin/script.py:454
 msgid "speak chat room name."
 msgstr ""
 
-#: ../src/orca/scripts/apps/pidgin/script.py:458
 msgid "Do not speak chat room name."
 msgstr ""
 
-#: ../src/orca/scripts/apps/pidgin/script.py:473
 msgid "announce when your buddies are typing."
 msgstr ""
 
-#: ../src/orca/scripts/apps/pidgin/script.py:477
 msgid "Do not announce when your buddies are typing."
 msgstr ""
 
-#: ../src/orca/scripts/apps/pidgin/script.py:492
 msgid "Provide chat room specific message histories."
 msgstr ""
 
-#: ../src/orca/scripts/apps/pidgin/script.py:496
 msgid "Do not provide chat room specific message histories."
 msgstr ""
 
-#: ../src/orca/scripts/apps/pidgin/script.py:525
 #, fuzzy, python-format
 msgid "Message from chat room %s"
 msgstr "SÃµnum jututoast "
 
-#: ../src/orca/scripts/apps/pidgin/script.py:614
 #, python-format
 msgid "New chat tab %s"
 msgstr ""
@@ -6566,8 +5501,6 @@ msgstr ""
 #. 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:1493
 #, fuzzy, python-format
 msgid "%d item"
 msgid_plural "%d items"
@@ -6578,43 +5511,34 @@ msgstr[1] "MenÃ¼Ã¼Kirje"
 #.
 #. 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:653
 #, python-format
 msgid "row %d of %d"
 msgstr ""
 
-#: ../src/orca/scripts/apps/planner/braille_generator.py:72
-#: ../src/orca/scripts/apps/planner/speech_generator.py:59
 msgid "Display more options"
 msgstr "Kuva rohkem valikuid"
 
 #. Translators: this is the input line of a spreadsheet
 #. (i.e., the place where enter formulas)
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:199
 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
 msgid "Set the row to use as dynamic column headers when speaking calc cells."
 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:216
 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
 msgid ""
 "Set the column to use as dynamic row headers to use when speaking calc cells."
 msgstr ""
@@ -6622,7 +5546,6 @@ 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:233
 msgid "Clears the dynamic row headers"
 msgstr ""
 
@@ -6632,21 +5555,18 @@ 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
 msgid "Speak spread sheet cell coordinates"
 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
 msgid "empty"
 msgstr "tÃ¼hi"
 
 #. 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
 #, python-format
 msgid "Dynamic column header set for row %d"
 msgstr ""
@@ -6654,14 +5574,12 @@ 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:879
 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
 #, python-format
 msgid "Dynamic row header set for column %s"
 msgstr ""
@@ -6669,7 +5587,6 @@ 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:956
 msgid "Dynamic row header cleared."
 msgstr ""
 
@@ -6679,7 +5596,6 @@ 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
 msgid "Welcome to StarOffice"
 msgstr ""
 
@@ -6690,15 +5606,12 @@ msgstr ""
 #. 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
 msgid "Available fields"
 msgstr ""
 
-#: ../src/orca/scripts/apps/soffice/script.py:1345
 msgid "Note that the Scroll Down button has to be pressed numerous times."
 msgstr ""
 
-#: ../src/orca/scripts/apps/soffice/script.py:1361
 msgid "License Agreement Accept button now has focus."
 msgstr ""
 
@@ -6708,7 +5621,6 @@ 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:1390
 msgid "First name"
 msgstr "Eesnimi"
 
@@ -6716,7 +5628,6 @@ msgstr "Eesnimi"
 #. 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:1464
 msgid "Move to cell"
 msgstr ""
 
@@ -6727,7 +5638,6 @@ msgstr ""
 #. stuff like this, but we're forced to do so in this
 #. case.
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:1715
 msgid "Presentation Wizard"
 msgstr ""
 
@@ -6736,13 +5646,11 @@ msgstr ""
 #. has a formula
 #. (e.g., "=sum(a1:d1)")
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:1850
 msgid "has formula"
 msgstr ""
 
 #. Translators: this is the name of a cell in a spreadsheet.
 #.
-#: ../src/orca/scripts/apps/soffice/script.py:1903
 #, fuzzy, python-format
 msgid "Cell %s"
 msgstr "Lahter"
@@ -6753,8 +5661,6 @@ msgstr "Lahter"
 #. 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:830 ../src/orca/speechgenerator.py:1370
 msgid "0 items"
 msgstr "0 kirjet"
 
@@ -6763,9 +5669,6 @@ msgstr "0 kirjet"
 #. Translators: this represents the state of a locking modifier
 #. key (e.g., Caps Lock)
 #.
-#: ../src/orca/scripts/apps/soffice/speech_generator.py:362
-#: ../src/orca/scripts/apps/soffice/speech_generator.py:392
-#: ../src/orca/speechserver.py:208 ../src/orca/speech.py:188
 msgid "on"
 msgstr ""
 
@@ -6774,147 +5677,123 @@ msgstr ""
 #. Translators: this represents the state of a locking modifier
 #. key (e.g., Caps Lock)
 #.
-#: ../src/orca/scripts/apps/soffice/speech_generator.py:366
-#: ../src/orca/scripts/apps/soffice/speech_generator.py:396
-#: ../src/orca/speechserver.py:213 ../src/orca/speech.py:193
 msgid "off"
 msgstr ""
 
-#: ../src/orca/scripts/apps/soffice/where_am_i.py:99
 #, python-format
 msgid "row %d"
 msgstr "rida %d"
 
 #. Translators: this is the name of a panel in Thunderbird.
 #.
-#: ../src/orca/scripts/apps/Thunderbird/script.py:539
-#: ../src/orca/scripts/apps/Thunderbird/script.py:556
 #, python-format
 msgid "%s panel"
 msgstr "paneel %s"
 
 #. Translators: this announces that a bookmark has been entered
 #.
-#: ../src/orca/scripts/toolkits/Gecko/bookmarks.py:62
 msgid "entered bookmark"
 msgstr ""
 
 #. Translators: this is for navigating HTML content one
 #. character at a time.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:281
 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:289
 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:297
 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:305
 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:313
 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:321
 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:329
 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:337
 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:345
 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:353
 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:361
 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:369
 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:377
 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:385
 msgid "Monitor live regions."
 msgstr ""
 
 #. Translators: this is for reviewing up to nine stored
 #. previous live messages.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:393
 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:401
 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:409
 msgid "Goes to the next object."
 msgstr ""
 
@@ -6925,7 +5804,6 @@ msgstr ""
 #. the ability to switch between the Firefox mode and the
 #. Orca mode.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:421
 msgid "Switches between Gecko native and Orca caret navigation."
 msgstr ""
 
@@ -6936,7 +5814,6 @@ msgstr ""
 #. the ability to switch between the Firefox mode and the
 #. Orca mode.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:665
 msgid "Use _Orca Caret Navigation"
 msgstr ""
 
@@ -6944,7 +5821,6 @@ msgstr ""
 #. in a structural manner: go to previous/next header, list item,
 #. table, etc.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:678
 msgid "Use Orca _Structural Navigation"
 msgstr ""
 
@@ -6954,7 +5830,6 @@ msgstr ""
 #. above the current cursor position.  This option allows the user
 #. to decide the behavior they want.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:693
 msgid "_Position cursor at start of line when navigating vertically"
 msgstr ""
 
@@ -6962,7 +5837,6 @@ msgstr ""
 #. can optionally tell Orca to automatically start reading a
 #. page from beginning to end.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:706
 msgid "Automatically start speaking a page when it is first _loaded"
 msgstr ""
 
@@ -6970,14 +5844,12 @@ msgstr ""
 #. how to navigate HTML content (e.g., Orca caret navigation,
 #. positioning of caret, etc.).
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:718
 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:741
 msgid "Speak _cell coordinates"
 msgstr ""
 
@@ -6985,28 +5857,24 @@ msgstr ""
 #. 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:753
 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:764
 msgid "Announce cell _header"
 msgstr ""
 
 #. 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:775
 msgid "Skip _blank cells"
 msgstr ""
 
 #. 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:786
 msgid "Table Navigation"
 msgstr ""
 
@@ -7014,7 +5882,6 @@ msgstr ""
 #. 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:810
 msgid "Speak results during _find"
 msgstr ""
 
@@ -7023,7 +5890,6 @@ msgstr ""
 #. 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:823
 msgid "Onl_y speak changed lines during find"
 msgstr ""
 
@@ -7031,33 +5897,28 @@ msgstr ""
 #. 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:840
 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:865
 msgid "Find Options"
 msgstr ""
 
 #. Translators: this is in reference to loading a web page.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:1643
 msgid "Loading.  Please wait."
 msgstr ""
 
 #. Translators: this is in reference to loading a web page.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:1648
 #, python-format
 msgid "Finished loading %s."
 msgstr ""
 
 #. Translators: this is in reference to loading a web page.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:1654
 msgid "Finished loading."
 msgstr ""
 
@@ -7068,14 +5929,12 @@ msgstr ""
 #. heading level, where the single character is to indicate
 #. 'heading'.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:2165
 #, python-format
 msgid "h%d"
 msgstr ""
 
 #. Translators: this is the action name for the 'open' action.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5686
 #, fuzzy
 msgid "open"
 msgstr "HÃ¼pikMenÃ¼Ã¼"
@@ -7086,8 +5945,6 @@ msgstr "HÃ¼pikMenÃ¼Ã¼"
 #. 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:5759
-#: ../src/orca/structural_navigation.py:881
 msgid "Wrapping to bottom."
 msgstr ""
 
@@ -7097,29 +5954,21 @@ 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:5827
-#: ../src/orca/structural_navigation.py:889
 msgid "Wrapping to top."
 msgstr ""
 
 #. Translators: this announces to the user that live region
 #. support has been turned off.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5853
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5877
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5887
-#: ../src/orca/structural_navigation.py:396
 msgid "Live region support is off"
 msgstr ""
 
 #. Translators: this announces to the user that live region
 #. are being monitored.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5861
 msgid "Live regions monitoring on"
 msgstr ""
 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5868
 msgid "Live regions monitoring off"
 msgstr ""
 
@@ -7130,7 +5979,6 @@ msgstr ""
 #. the ability to switch between the Firefox mode and the
 #. Orca mode.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5903
 msgid "Gecko is controlling the caret."
 msgstr ""
 
@@ -7141,14 +5989,12 @@ msgstr ""
 #. the ability to switch between the Firefox mode and the
 #. Orca mode.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5915
 msgid "Orca is controlling the caret."
 msgstr ""
 
 #. Translators: this is in reference to a heading level
 #. in HTML (e.g., For <h3>, the level is 3).
 #.
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:90
 #, python-format
 msgid "level %d"
 msgstr ""
@@ -7156,28 +6002,23 @@ msgstr ""
 #. 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:372
 msgid "multi-select"
 msgstr ""
 
 #. Translators: this represents a list in HTML.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:376
-#: ../src/orca/structural_navigation.py:2775
 #, python-format
 msgid "List with %d item"
 msgid_plural "List with %d items"
 msgstr[0] "%d kirjega nimekiri"
 msgstr[1] "%d kirjega nimekiri"
 
-#: ../src/orca/scripts/toolkits/Gecko/where_am_i.py:126
 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:224
 #, python-format
 msgid "%d heading"
 msgid_plural "%d headings"
@@ -7187,7 +6028,6 @@ msgstr[1] ""
 #. Translators: Announces the number of forms in the
 #. web page that is currently being displayed.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/where_am_i.py:230
 #, python-format
 msgid "%d form"
 msgid_plural "%d forms"
@@ -7197,7 +6037,6 @@ msgstr[1] "%d vormi"
 #. 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:236
 #, python-format
 msgid "%d table"
 msgid_plural "%d tables"
@@ -7207,7 +6046,6 @@ msgstr[1] "%d tabelit"
 #. 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:242
 #, python-format
 msgid "%d visited link"
 msgid_plural "%d visited links"
@@ -7217,7 +6055,6 @@ msgstr[1] "%d kÃ¼lastatud viita"
 #. 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:248
 #, python-format
 msgid "%d unvisited link"
 msgid_plural "%d unvisited links"
@@ -7229,7 +6066,6 @@ msgstr[1] "%d kÃ¼lastamata viita"
 #. current position divided by the total number of objects on the
 #. page.
 #.
-#: ../src/orca/scripts/toolkits/Gecko/where_am_i.py:255
 #, python-format
 msgid "%d percent of document read"
 msgstr ""
@@ -7239,9 +6075,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/settings.py:646
-msgctxt "text"
-msgid "read only"
+msgid "text|read only"
 msgstr ""
 
 #. Translators: this is used to indicate the user is in a text
@@ -7250,9 +6084,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/settings.py:654
-msgctxt "text"
-msgid "rdonly"
+msgid "text|rdonly"
 msgstr ""
 
 #. Translators: the regular expression here represents a string to
@@ -7264,28 +6096,24 @@ 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:984
 msgid "[\\S\\s]*StarOffice[\\s\\S]*"
 msgstr ""
 
 #. Translators: see the regular expression note above.  This is for
 #. OpenOffice and StarOffice.
 #.
-#: ../src/orca/settings.py:989
 msgid "soffice.bin"
 msgstr "soffice.bin"
 
 #. Translators: see the regular expression note above.  This is for
 #. OpenOffice and StarOffice.
 #.
-#: ../src/orca/settings.py:994
 msgid "soffice"
 msgstr "soffice"
 
 #. Translators: see the regular expression note above.  This is for the
 #. Evolution mail application.
 #.
-#: ../src/orca/settings.py:999
 msgid "[Ee]volution"
 msgstr "[Ee]volution"
 
@@ -7293,7 +6121,6 @@ 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:1005
 msgid "Deer Park"
 msgstr "Deer Park"
 
@@ -7301,7 +6128,6 @@ 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:1011
 msgid "Bon Echo"
 msgstr "Bon Echo"
 
@@ -7309,7 +6135,6 @@ 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:1017
 msgid "Minefield"
 msgstr ""
 
@@ -7317,35 +6142,30 @@ msgstr ""
 #. version of Thunderbird, which chooses to now call itself by a different
 #. name.
 #.
-#: ../src/orca/settings.py:1023
 msgid "Shredder"
 msgstr ""
 
 #. Translators: see the regular expression note above.  This is for
 #. the Thunderbird e-mail application.
 #.
-#: ../src/orca/settings.py:1028
 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:1033
 msgid "bug-buddy"
 msgstr ""
 
 #. Translators: see the regular expression note above.  This is for
 #. the underlying terminal support in gnome-terminal.
 #.
-#: ../src/orca/settings.py:1038
 msgid "vte"
 msgstr ""
 
 #. Translators: see the regular expression note above.  This is for
 #. supporting gaim, which has recently be renamed to pidgin.
 #.
-#: ../src/orca/settings.py:1043
 msgid "gaim"
 msgstr "gaim"
 
@@ -7355,7 +6175,6 @@ msgstr "gaim"
 #. will be spoken and displayed in braille to indicate this state is
 #. present.
 #.
-#: ../src/orca/settings.py:1188 ../src/orca/settings.py:1196
 msgid "required"
 msgstr ""
 
@@ -7365,14 +6184,12 @@ msgstr ""
 #. will have a chance to select a particular speech engine by its real
 #. name, such as Festival, IBMTTS, etc.
 #.
-#: ../src/orca/speechdispatcherfactory.py:76
 msgid "Default Synthesizer"
 msgstr "Vaikimisi sÃ¼ntesaator"
 
 #. Translators: this is the name of a speech synthesis system
 #. called "Speech Dispatcher".
 #.
-#: ../src/orca/speechdispatcherfactory.py:89
 msgid "Speech Dispatcher"
 msgstr ""
 
@@ -7385,7 +6202,6 @@ msgstr ""
 #. the list will contain the names of all available "real"
 #. voices provided by the speech engine.
 #.
-#: ../src/orca/speechdispatcherfactory.py:171
 #, python-format
 msgid "%s default voice"
 msgstr ""
@@ -7393,7 +6209,6 @@ msgstr ""
 #. Translators: this tells the user how many unfocused
 #. alert and dialog windows that this application has.
 #.
-#: ../src/orca/speechgenerator.py:685 ../src/orca/where_am_I.py:1763
 #, python-format
 msgid "%d unfocused dialog"
 msgid_plural "%d unfocused dialogs"
@@ -7403,7 +6218,6 @@ msgstr[1] ""
 #. Translators: brief spoken words for the rolename of a tear off
 #. menu item.
 #.
-#: ../src/orca/speechgenerator.py:1657
 msgid "tear off"
 msgstr ""
 
@@ -7414,7 +6228,6 @@ msgstr ""
 #. This feature needs to be toggle-able so that it does not
 #. interfere with normal writing functions.
 #.
-#: ../src/orca/structural_navigation.py:595
 msgid "Toggles structural navigation keys."
 msgstr ""
 
@@ -7428,7 +6241,6 @@ msgstr ""
 #. toggles the structural navigation feature of Orca.
 #. It should be a brief informative message.
 #.
-#: ../src/orca/structural_navigation.py:649
 msgid "Structural navigation keys on."
 msgstr ""
 
@@ -7442,7 +6254,6 @@ msgstr ""
 #. toggles the structural navigation feature of Orca.
 #. It should be a brief informative message.
 #.
-#: ../src/orca/structural_navigation.py:661
 msgid "Structural navigation keys off."
 msgstr ""
 
@@ -7451,7 +6262,6 @@ msgstr ""
 #. table navigation command but is not in a table, Orca speaks
 #. this message.
 #.
-#: ../src/orca/structural_navigation.py:701
 msgid "Not in a table."
 msgstr ""
 
@@ -7461,7 +6271,6 @@ msgstr ""
 #. to move to the left of the current cell and is
 #. already in the first column.
 #.
-#: ../src/orca/structural_navigation.py:721
 msgid "Beginning of row."
 msgstr ""
 
@@ -7471,7 +6280,6 @@ msgstr ""
 #. to move to the right of the current cell and is
 #. already in the last column.
 #.
-#: ../src/orca/structural_navigation.py:730
 msgid "End of row."
 msgstr ""
 
@@ -7481,7 +6289,6 @@ msgstr ""
 #. to move to the cell above the current cell and is
 #. already in the first row.
 #.
-#: ../src/orca/structural_navigation.py:739
 msgid "Top of column."
 msgstr ""
 
@@ -7491,7 +6298,6 @@ msgstr ""
 #. to move to the cell below the current cell and is
 #. already in the last row.
 #.
-#: ../src/orca/structural_navigation.py:748
 msgid "Bottom of column."
 msgstr ""
 
@@ -7500,13 +6306,11 @@ msgstr ""
 #. In contrast, a non-uniform table is one in which at least
 #. one table cell occupies more than one row and/or column.
 #.
-#: ../src/orca/structural_navigation.py:1310
 msgid "Non-uniform"
 msgstr ""
 
 #. Translators: this represents the number of rows in a table.
 #.
-#: ../src/orca/structural_navigation.py:1317
 #, python-format
 msgid "Table with %d row"
 msgid_plural "Table with %d rows"
@@ -7515,7 +6319,6 @@ msgstr[1] ""
 
 #. Translators: this represents the number of cols in a table.
 #.
-#: ../src/orca/structural_navigation.py:1322
 #, python-format
 msgid "%d column"
 msgid_plural "%d columns"
@@ -7526,7 +6329,6 @@ msgstr[1] "%d veergu"
 #. 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:1470
 #, python-format
 msgid "Cell spans %d rows and %d columns"
 msgstr ""
@@ -7535,7 +6337,6 @@ msgstr ""
 #. 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:1477
 #, python-format
 msgid "Cell spans %d columns"
 msgstr ""
@@ -7544,7 +6345,6 @@ msgstr ""
 #. 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:1483
 #, python-format
 msgid "Cell spans %d rows"
 msgstr ""
@@ -7552,14 +6352,12 @@ 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:1832
 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:1837
 msgid "Goes to next anchor."
 msgstr ""
 
@@ -7568,21 +6366,18 @@ 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:1894
 msgid "No more anchors."
 msgstr "Rohkem ankruid ei ole."
 
 #. Translators: this is for navigating among blockquotes in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:1911
 msgid "Goes to previous blockquote."
 msgstr ""
 
 #. Translators: this is for navigating among blockquotes in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:1916
 msgid "Goes to next blockquote."
 msgstr ""
 
@@ -7590,21 +6385,18 @@ msgstr ""
 #. moving from blockquote to blockquote. This string is what
 #. Orca will say if there are no more blockquotes found.
 #.
-#: ../src/orca/structural_navigation.py:1976
 msgid "No more blockquotes."
 msgstr ""
 
 #. Translators: this is for navigating among buttons in a form
 #. within a document.
 #.
-#: ../src/orca/structural_navigation.py:1993
 msgid "Goes to previous button."
 msgstr ""
 
 #. Translators: this is for navigating among buttons in a form
 #. within a document.
 #.
-#: ../src/orca/structural_navigation.py:1998
 msgid "Goes to next button."
 msgstr ""
 
@@ -7613,21 +6405,18 @@ msgstr ""
 #. string is what Orca will say if there are no more buttons
 #. found.
 #.
-#: ../src/orca/structural_navigation.py:2055
 msgid "No more buttons."
 msgstr "Rohkem nuppe ei ole."
 
 #. Translators: this is for navigating among check boxes in a form
 #. within a document.
 #.
-#: ../src/orca/structural_navigation.py:2072
 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:2077
 msgid "Goes to next check box."
 msgstr ""
 
@@ -7636,7 +6425,6 @@ msgstr ""
 #. string is what Orca will say if there are no more check
 #. boxes found.
 #.
-#: ../src/orca/structural_navigation.py:2134
 msgid "No more check boxes."
 msgstr "Rohkem mÃ¤rkeruute ei ole."
 
@@ -7644,7 +6432,6 @@ msgstr "Rohkem mÃ¤rkeruute ei ole."
 #. 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:2152
 msgid "Goes to previous large object."
 msgstr ""
 
@@ -7652,7 +6439,6 @@ 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:2158
 msgid "Goes to next large object."
 msgstr ""
 
@@ -7662,21 +6448,18 @@ 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:2227
 msgid "No more large objects."
 msgstr "Suuri objekte rohkem ei ole."
 
 #. Translators: this is for navigating among combo boxes in a form
 #. within a document.
 #.
-#: ../src/orca/structural_navigation.py:2244
 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:2249
 msgid "Goes to next combo box."
 msgstr ""
 
@@ -7685,21 +6468,18 @@ msgstr ""
 #. string is what Orca will say if there are no more combo
 #. boxes found.
 #.
-#: ../src/orca/structural_navigation.py:2306
 msgid "No more combo boxes."
 msgstr "Rohkem valikukaste ei ole."
 
 #. Translators: this is for navigating among text entries in a form
 #. within a document.
 #.
-#: ../src/orca/structural_navigation.py:2323
 msgid "Goes to previous entry."
 msgstr ""
 
 #. Translators: this is for navigating among text entries
 #. in a form.
 #.
-#: ../src/orca/structural_navigation.py:2328
 msgid "Goes to next entry."
 msgstr ""
 
@@ -7708,21 +6488,18 @@ msgstr ""
 #. string is what Orca will say if there are no more entries
 #. found.
 #.
-#: ../src/orca/structural_navigation.py:2394
 msgid "No more entries."
 msgstr "Rohkem kirjeid ei ole."
 
 #. Translators: this is for navigating among fields in a form within
 #. a document.
 #.
-#: ../src/orca/structural_navigation.py:2411
 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:2418
 msgid "Goes to next form field."
 msgstr ""
 
@@ -7730,28 +6507,24 @@ 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:2488
 msgid "No more form fields."
 msgstr "Rohkem vormivÃ¤lju ei ole."
 
 #. Translators: this is for navigating in a document by heading.
 #. (e.g. <h1>)
 #.
-#: ../src/orca/structural_navigation.py:2505
 msgid "Goes to previous heading."
 msgstr ""
 
 #. Translators: this is for navigating in a document by heading.
 #. (e.g., <h1>)
 #.
-#: ../src/orca/structural_navigation.py:2510
 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:2520
 #, python-format
 msgid "Goes to previous heading at level %d."
 msgstr ""
@@ -7759,7 +6532,6 @@ 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:2527
 #, python-format
 msgid "Goes to next heading at level %d."
 msgstr ""
@@ -7769,7 +6541,6 @@ msgstr ""
 #. This string is what Orca will say if there are no more
 #. headings found.
 #.
-#: ../src/orca/structural_navigation.py:2599
 msgid "No more headings."
 msgstr "Rohkem pÃ¤iseid ei ole."
 
@@ -7778,7 +6549,6 @@ msgstr "Rohkem pÃ¤iseid ei ole."
 #. (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:2606
 #, python-format
 msgid "No more headings at level %d."
 msgstr "Rohkem %d. taseme pÃ¤iseid ei ole."
@@ -7788,7 +6558,6 @@ msgstr "Rohkem %d. taseme pÃ¤iseid ei ole."
 #. HTML tag attribute 'role' used to identify important part
 #. of webpage like banners, main context, search etc.
 #.
-#: ../src/orca/structural_navigation.py:2625
 msgid "Goes to previous landmark."
 msgstr ""
 
@@ -7797,7 +6566,6 @@ msgstr ""
 #. HTML tag attribute 'role' used to identify important part
 #. of webpage like banners, main context, search etc.
 #.
-#: ../src/orca/structural_navigation.py:2632
 msgid "Goes to next landmark."
 msgstr ""
 
@@ -7807,21 +6575,18 @@ msgstr ""
 #. of webpage like banners, main context, search etc.  This
 #. is an indication that one was not found.
 #.
-#: ../src/orca/structural_navigation.py:2694
 msgid "No landmark found."
 msgstr ""
 
 #. Translators: this is for navigating among bulleted/numbered
 #. lists in a document.
 #.
-#: ../src/orca/structural_navigation.py:2711
 msgid "Goes to previous list."
 msgstr ""
 
 #. Translators: this is for navigating among bulleted/numbered
 #. lists in a document.
 #.
-#: ../src/orca/structural_navigation.py:2716
 msgid "Goes to next list."
 msgstr ""
 
@@ -7830,7 +6595,6 @@ msgstr ""
 #. level of 2 represents a list item inside a list that's
 #. inside another list).
 #.
-#: ../src/orca/structural_navigation.py:2790
 #, python-format
 msgid "Nesting level %d"
 msgstr ""
@@ -7839,21 +6603,18 @@ msgstr ""
 #. 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:2799
 msgid "No more lists."
 msgstr "Rohkem loetelusid ei ole."
 
 #. Translators: this is for navigating among bulleted/numbered list
 #. items in a document.
 #.
-#: ../src/orca/structural_navigation.py:2816
 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:2821
 msgid "Goes to next list item."
 msgstr ""
 
@@ -7862,26 +6623,22 @@ msgstr ""
 #. numbered list item.  This string is what Orca will say
 #. if there are no more list items found.
 #.
-#: ../src/orca/structural_navigation.py:2884
 msgid "No more list items."
 msgstr "Rohkem loetelupunkte ei ole."
 
 #. Translators: this is for navigating between live regions
 #.
-#: ../src/orca/structural_navigation.py:2900
 msgid "Goes to previous live region."
 msgstr ""
 
 #. Translators: this is for navigating between live regions
 #.
-#: ../src/orca/structural_navigation.py:2904
 msgid "Goes to next live region."
 msgstr ""
 
 #. Translators: this is for navigating to the last live region
 #. to make an announcement.
 #.
-#: ../src/orca/structural_navigation.py:2909
 msgid "Goes to last live region."
 msgstr ""
 
@@ -7889,19 +6646,16 @@ msgstr ""
 #. 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:2958
 msgid "No more live regions."
 msgstr ""
 
 #. Translators: this is for navigating among paragraphs in a document.
 #.
-#: ../src/orca/structural_navigation.py:2974
 msgid "Goes to previous paragraph."
 msgstr ""
 
 #. Translators: this is for navigating among paragraphs in a document.
 #.
-#: ../src/orca/structural_navigation.py:2978
 msgid "Goes to next paragraph."
 msgstr ""
 
@@ -7909,21 +6663,18 @@ 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:3038
 msgid "No more paragraphs."
 msgstr "Rohkem lÃµike ei ole."
 
 #. Translators: this is for navigating among radio buttons in a
 #. form within a document.
 #.
-#: ../src/orca/structural_navigation.py:3055
 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:3060
 #, fuzzy
 msgid "Goes to next radio button."
 msgstr "raadionupp"
@@ -7933,19 +6684,16 @@ msgstr "raadionupp"
 #. This string is what Orca will say if there are no more
 #. radio buttons found.
 #.
-#: ../src/orca/structural_navigation.py:3117
 msgid "No more radio buttons."
 msgstr "Rohkem raadionuppe ei ole."
 
 #. Translators: this is for navigating among tables in a document.
 #.
-#: ../src/orca/structural_navigation.py:3133
 msgid "Goes to previous table."
 msgstr ""
 
 #. Translators: this is for navigating among tables in a document.
 #.
-#: ../src/orca/structural_navigation.py:3137
 msgid "Goes to next table."
 msgstr ""
 
@@ -7953,50 +6701,42 @@ msgstr ""
 #. from table to table.  This string is what Orca will say if there
 #. are no more tables found.
 #.
-#: ../src/orca/structural_navigation.py:3190
 msgid "No more tables."
 msgstr "Rohkem tabeleid ei ole."
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3206
 msgid "Goes left one cell."
 msgstr ""
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3210
 msgid "Goes right one cell."
 msgstr ""
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3214
 msgid "Goes up one cell."
 msgstr ""
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3218
 msgid "Goes down one cell."
 msgstr ""
 
 #. Translators: this is for navigating among table cells in a document.
 #.
-#: ../src/orca/structural_navigation.py:3222
 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:3226
 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:3288
 #, python-format
 msgid "Row %d, column %d."
 msgstr "Rida %d, veerg %d."
@@ -8004,14 +6744,12 @@ msgstr "Rida %d, veerg %d."
 #. Translators: this is for navigating among unvisited links in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:3309
 msgid "Goes to previous unvisited link."
 msgstr ""
 
 #. Translators: this is for navigating among unvisited links in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:3314
 msgid "Goes to next unvisited link."
 msgstr ""
 
@@ -8020,21 +6758,18 @@ msgstr ""
 #. is what Orca will say if there are no more unvisited links
 #. found.
 #.
-#: ../src/orca/structural_navigation.py:3373
 msgid "No more unvisited links."
 msgstr "KÃ¼lastamata viitasid rohkem ei ole."
 
 #. Translators: this is for navigating among visited links in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:3390
 msgid "Goes to previous visited link."
 msgstr ""
 
 #. Translators: this is for navigating among visited links in a
 #. document.
 #.
-#: ../src/orca/structural_navigation.py:3395
 msgid "Goes to next visited link."
 msgstr ""
 
@@ -8043,7 +6778,6 @@ msgstr ""
 #. what Orca will say if there are no more visited links
 #. found.
 #.
-#: ../src/orca/structural_navigation.py:3453
 msgid "No more visited links."
 msgstr "KÃ¼lastatud viitasid rohkem ei ole."
 
@@ -8054,9 +6788,7 @@ msgstr "KÃ¼lastatud viitasid rohkem ei ole."
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:63
-msgctxt "textattr"
-msgid "background color"
+msgid "textattr|background color"
 msgstr ""
 
 #. Translators: this attribute specifies whether to make the background
@@ -8068,9 +6800,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:74
-msgctxt "textattr"
-msgid "background full height"
+msgid "textattr|background full height"
 msgstr ""
 
 #. Translators: this attribute specifies whether a GdkBitmap is set for
@@ -8080,9 +6810,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:83
-msgctxt "textattr"
-msgid "background stipple"
+msgid "textattr|background stipple"
 msgstr ""
 
 #. Translators: this attribute specifies the direction of the text.
@@ -8092,9 +6820,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:92
-msgctxt "textattr"
-msgid "direction"
+msgid "textattr|direction"
 msgstr ""
 
 #. Translators: this attribute specifies whether the text is editable.
@@ -8104,9 +6830,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:101
-msgctxt "textattr"
-msgid "editable"
+msgid "textattr|editable"
 msgstr ""
 
 #. Translators: this attribute specifies the font family name of the text.
@@ -8115,9 +6839,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:109
-msgctxt "textattr"
-msgid "family name"
+msgid "textattr|family name"
 msgstr ""
 
 #. Translators: this attribute specifies the foreground color of the text.
@@ -8127,9 +6849,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:118
-msgctxt "textattr"
-msgid "foreground color"
+msgid "textattr|foreground color"
 msgstr ""
 
 #. Translators: this attribute specifies whether a GdkBitmap is set for
@@ -8139,9 +6859,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:127
-msgctxt "textattr"
-msgid "foreground stipple"
+msgid "textattr|foreground stipple"
 msgstr ""
 
 #. Translators: this attribute specifies the effect applied to the font
@@ -8152,9 +6870,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:137
-msgctxt "textattr"
-msgid "font effect"
+msgid "textattr|font effect"
 msgstr ""
 
 #. Translators: this attribute specifies the indentation of the text
@@ -8164,9 +6880,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:146
-msgctxt "textattr"
-msgid "indent"
+msgid "textattr|indent"
 msgstr ""
 
 #. Translators: this attribute specifies whether the text is invisible.
@@ -8176,9 +6890,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:155
-msgctxt "textattr"
-msgid "invisible"
+msgid "textattr|invisible"
 msgstr ""
 
 #. Translators: this attribute specifies how the justification of the text.
@@ -8188,9 +6900,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:164
-msgctxt "textattr"
-msgid "justification"
+msgid "textattr|justification"
 msgstr ""
 
 #. Translators: this attribute specifies the language that the text is
@@ -8200,9 +6910,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:173
-msgctxt "textattr"
-msgid "language"
+msgid "textattr|language"
 msgstr ""
 
 #. Translators: this attribute specifies the pixel width of the left margin.
@@ -8211,9 +6919,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:181
-msgctxt "textattr"
-msgid "left margin"
+msgid "textattr|left margin"
 msgstr ""
 
 #. Translators: this attribute specifies the height of the line of text.
@@ -8223,9 +6929,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:190
-msgctxt "textattr"
-msgid "line height"
+msgid "textattr|line height"
 msgstr ""
 
 #. Translators: this attribute refers to the named style which is associated
@@ -8238,9 +6942,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:202
-msgctxt "textattr"
-msgid "paragraph style"
+msgid "textattr|paragraph style"
 msgstr "lÃµigu laad"
 
 #. Translators: this attribute specifies the pixels of blank space to
@@ -8250,9 +6952,7 @@ msgstr "lÃµigu laad"
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:211
-msgctxt "textattr"
-msgid "pixels above lines"
+msgid "textattr|pixels above lines"
 msgstr ""
 
 #. Translators: this attribute specifies the pixels of blank space to
@@ -8262,9 +6962,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:220
-msgctxt "textattr"
-msgid "pixels below lines"
+msgid "textattr|pixels below lines"
 msgstr ""
 
 #. Translators: this attribute specifies the pixels of blank space to
@@ -8275,9 +6973,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:230
-msgctxt "textattr"
-msgid "pixels inside wrap"
+msgid "textattr|pixels inside wrap"
 msgstr ""
 
 #. Translators: this attribute specifies the pixel width of the right margin.
@@ -8286,9 +6982,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:238
-msgctxt "textattr"
-msgid "right margin"
+msgid "textattr|right margin"
 msgstr ""
 
 #. Translators: this attribute specifies the number of pixels that the
@@ -8298,9 +6992,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:247
-msgctxt "textattr"
-msgid "rise"
+msgid "textattr|rise"
 msgstr ""
 
 #. Translators: this attribute specifies the scale of the characters. The
@@ -8310,9 +7002,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:256
-msgctxt "textattr"
-msgid "scale"
+msgid "textattr|scale"
 msgstr ""
 
 #. Translators: this attribute specifies the size of the text.
@@ -8321,9 +7011,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:264
-msgctxt "textattr"
-msgid "size"
+msgid "textattr|size"
 msgstr ""
 
 #. Translators: this attribute specifies the stretch of he text, if set.
@@ -8335,9 +7023,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:275
-msgctxt "textattr"
-msgid "stretch"
+msgid "textattr|stretch"
 msgstr ""
 
 #. Translators: this attribute specifies whether the text is strike though
@@ -8348,9 +7034,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:285
-msgctxt "textattr"
-msgid "strike through"
+msgid "textattr|strike through"
 msgstr ""
 
 #. Translators: this attribute specifies the slant style of the text,
@@ -8360,9 +7044,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:294
-msgctxt "textattr"
-msgid "style"
+msgid "textattr|style"
 msgstr ""
 
 #. Translators: this attribute specifies the decoration of the text.
@@ -8372,9 +7054,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:303
-msgctxt "textattr"
-msgid "text decoration"
+msgid "textattr|text decoration"
 msgstr ""
 
 #. Translators: this attribute specifies the angle at which the text is
@@ -8386,9 +7066,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:314
-msgctxt "textattr"
-msgid "text rotation"
+msgid "textattr|text rotation"
 msgstr ""
 
 #. Translators: this attribute specifies the shadow effects applied to the text.
@@ -8398,9 +7076,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:323
-msgctxt "textattr"
-msgid "text shadow"
+msgid "textattr|text shadow"
 msgstr ""
 
 #. Translators: this attributes specifies whether the text is underlined.
@@ -8410,10 +7086,8 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:332
 #, fuzzy
-msgctxt "textattr"
-msgid "underline"
+msgid "textattr|underline"
 msgstr "allajoonitud"
 
 #. Translators: this attribute specifies the capitalization variant of
@@ -8423,9 +7097,7 @@ msgstr "allajoonitud"
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:341
-msgctxt "textattr"
-msgid "variant"
+msgid "textattr|variant"
 msgstr ""
 
 #. Translators: this attributes specifies what vertical alignment property
@@ -8435,9 +7107,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:350
-msgctxt "textattr"
-msgid "vertical align"
+msgid "textattr|vertical align"
 msgstr ""
 
 #. Translators: this attribute specifies the weight of the text.
@@ -8447,9 +7117,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:359
-msgctxt "textattr"
-msgid "weight"
+msgid "textattr|weight"
 msgstr ""
 
 #. Translators: this attribute specifies the wrap mode of the text, if any.
@@ -8459,9 +7127,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:368
-msgctxt "textattr"
-msgid "wrap mode"
+msgid "textattr|wrap mode"
 msgstr ""
 
 #. Translators: this attribute specifies the way the text is written.
@@ -8473,9 +7139,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:379
-msgctxt "textattr"
-msgid "writing mode"
+msgid "textattr|writing mode"
 msgstr ""
 
 #. The following are the known values of some of these text attributes.
@@ -8492,9 +7156,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:397
-msgctxt "textattr"
-msgid "true"
+msgid "textattr|true"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8505,9 +7167,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:407
-msgctxt "textattr"
-msgid "false"
+msgid "textattr|false"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8519,9 +7179,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:418
-msgctxt "textattr"
-msgid "none"
+msgid "textattr|none"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8531,9 +7189,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:427
-msgctxt "textattr"
-msgid "engrave"
+msgid "textattr|engrave"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8543,9 +7199,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:436
-msgctxt "textattr"
-msgid "emboss"
+msgid "textattr|emboss"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8555,9 +7209,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:445
-msgctxt "textattr"
-msgid "outline"
+msgid "textattr|outline"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8567,9 +7219,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:454
-msgctxt "textattr"
-msgid "overline"
+msgid "textattr|overline"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8579,9 +7229,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:463
-msgctxt "textattr"
-msgid "line through"
+msgid "textattr|line through"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8591,9 +7239,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:472
-msgctxt "textattr"
-msgid "blink"
+msgid "textattr|blink"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8603,9 +7249,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:481
-msgctxt "textattr"
-msgid "black"
+msgid "textattr|black"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8615,9 +7259,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:490
-msgctxt "textattr"
-msgid "single"
+msgid "textattr|single"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8627,9 +7269,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:499
-msgctxt "textattr"
-msgid "double"
+msgid "textattr|double"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8639,9 +7279,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:508
-msgctxt "textattr"
-msgid "low"
+msgid "textattr|low"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8651,9 +7289,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:517
-msgctxt "textattr"
-msgid "char"
+msgid "textattr|char"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8663,9 +7299,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:526
-msgctxt "textattr"
-msgid "word"
+msgid "textattr|word"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8675,9 +7309,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:535
-msgctxt "textattr"
-msgid "ltr"
+msgid "textattr|ltr"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8687,9 +7319,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:544
-msgctxt "textattr"
-msgid "rtl"
+msgid "textattr|rtl"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8699,10 +7329,8 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:553
 #, fuzzy
-msgctxt "textattr"
-msgid "left"
+msgid "textattr|left"
 msgstr "valitud"
 
 #. Translators: this is one of the text attribute values for the following
@@ -8712,9 +7340,7 @@ msgstr "valitud"
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:562
-msgctxt "textattr"
-msgid "right"
+msgid "textattr|right"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8724,9 +7350,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:571
-msgctxt "textattr"
-msgid "center"
+msgid "textattr|center"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8736,9 +7360,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:580
-msgctxt "textattr"
-msgid "fill"
+msgid "textattr|fill"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8748,9 +7370,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:589
-msgctxt "textattr"
-msgid "ultra condensed"
+msgid "textattr|ultra condensed"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8760,9 +7380,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:598
-msgctxt "textattr"
-msgid "extra condensed"
+msgid "textattr|extra condensed"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8772,9 +7390,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:607
-msgctxt "textattr"
-msgid "condensed"
+msgid "textattr|condensed"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8784,9 +7400,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:616
-msgctxt "textattr"
-msgid "semi condensed"
+msgid "textattr|semi condensed"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8796,9 +7410,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:625
-msgctxt "textattr"
-msgid "normal"
+msgid "textattr|normal"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8808,9 +7420,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:634
-msgctxt "textattr"
-msgid "semi expanded"
+msgid "textattr|semi expanded"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8820,10 +7430,8 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:643
 #, fuzzy
-msgctxt "textattr"
-msgid "expanded"
+msgid "textattr|expanded"
 msgstr "laiendatud"
 
 #. Translators: this is one of the text attribute values for the following
@@ -8833,9 +7441,7 @@ msgstr "laiendatud"
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:652
-msgctxt "textattr"
-msgid "extra expanded"
+msgid "textattr|extra expanded"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8845,9 +7451,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:661
-msgctxt "textattr"
-msgid "ultra expanded"
+msgid "textattr|ultra expanded"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8857,9 +7461,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:670
-msgctxt "textattr"
-msgid "small caps"
+msgid "textattr|small caps"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8869,9 +7471,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:679
-msgctxt "textattr"
-msgid "oblique"
+msgid "textattr|oblique"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8881,9 +7481,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:688
-msgctxt "textattr"
-msgid "italic"
+msgid "textattr|italic"
 msgstr "kursiiv"
 
 #. Translators: this is one of the text attribute values for the following
@@ -8893,9 +7491,7 @@ msgstr "kursiiv"
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:697
-msgctxt "textattr"
-msgid "Default"
+msgid "textattr|Default"
 msgstr "Vaikimisi"
 
 #. Translators: this is one of the text attribute values for the following
@@ -8905,9 +7501,7 @@ msgstr "Vaikimisi"
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:706
-msgctxt "textattr"
-msgid "Text body"
+msgid "textattr|Text body"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8917,9 +7511,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:715
-msgctxt "textattr"
-msgid "Heading"
+msgid "textattr|Heading"
 msgstr "PÃ¤is"
 
 #. Translators: this is one of the text attribute values for the following
@@ -8930,10 +7522,8 @@ msgstr "PÃ¤is"
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:725
 #, fuzzy
-msgctxt "textattr"
-msgid "baseline"
+msgid "textattr|baseline"
 msgstr "valitud"
 
 #. Translators: this is one of the text attribute values for the following
@@ -8943,9 +7533,7 @@ msgstr "valitud"
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:734
-msgctxt "textattr"
-msgid "sub"
+msgid "textattr|sub"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8955,9 +7543,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:743
-msgctxt "textattr"
-msgid "super"
+msgid "textattr|super"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8967,9 +7553,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:752
-msgctxt "textattr"
-msgid "top"
+msgid "textattr|top"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8979,9 +7563,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:761
-msgctxt "textattr"
-msgid "text-top"
+msgid "textattr|text-top"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -8991,9 +7573,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:770
-msgctxt "textattr"
-msgid "middle"
+msgid "textattr|middle"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -9003,9 +7583,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:779
-msgctxt "textattr"
-msgid "bottom"
+msgid "textattr|bottom"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -9015,9 +7593,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:788
-msgctxt "textattr"
-msgid "text-bottom"
+msgid "textattr|text-bottom"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -9028,9 +7604,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:798
-msgctxt "textattr"
-msgid "inherit"
+msgid "textattr|inherit"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -9040,9 +7614,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:807
-msgctxt "textattr"
-msgid "lr-tb"
+msgid "textattr|lr-tb"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -9052,9 +7624,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:816
-msgctxt "textattr"
-msgid "rl-tb"
+msgid "textattr|rl-tb"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -9064,9 +7634,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:825
-msgctxt "textattr"
-msgid "tb-rl"
+msgid "textattr|tb-rl"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -9076,9 +7644,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:834
-msgctxt "textattr"
-msgid "tb-lr"
+msgid "textattr|tb-lr"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -9088,9 +7654,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:843
-msgctxt "textattr"
-msgid "bt-rl"
+msgid "textattr|bt-rl"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -9100,9 +7664,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:852
-msgctxt "textattr"
-msgid "bt-lr"
+msgid "textattr|bt-lr"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -9112,9 +7674,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:861
-msgctxt "textattr"
-msgid "lr"
+msgid "textattr|lr"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -9124,9 +7684,7 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:870
-msgctxt "textattr"
-msgid "rl"
+msgid "textattr|rl"
 msgstr ""
 
 #. Translators: this is one of the text attribute values for the following
@@ -9136,26 +7694,21 @@ msgstr ""
 #.
 #. ONLY TRANSLATE THE PART AFTER THE PIPE CHARACTER |
 #.
-#: ../src/orca/text_attribute_names.py:879
-msgctxt "textattr"
-msgid "tb"
+msgid "textattr|tb"
 msgstr ""
 
 #. Translators: this is a tip for the user on how to toggle a checkbox.
-#: ../src/orca/tutorialgenerator.py:154
 msgid "Press space to toggle."
 msgstr ""
 
 #. Translators: this is a tip for the user on how to interact
 #. with a combobox.
-#: ../src/orca/tutorialgenerator.py:180
 msgid "Press space to expand, and use up and down to select an item."
 msgstr ""
 
 #. Translators: this is the tutorial string for when first landing
 #. on the desktop, giving tips on how to navigate.
 #. Also describing how to access the menues.
-#: ../src/orca/tutorialgenerator.py:211
 msgid ""
 "To move to items, use either the arrow keys, or type ahead searching. To get "
 "to the system menues press the alt+f1 key."
@@ -9163,12 +7716,10 @@ 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:217
 msgid "Press alt+f6 to give focus to child windows."
 msgstr ""
 
 #. Translators: this is the tutorial string when navigating lists.
-#: ../src/orca/tutorialgenerator.py:250
 msgid "Use up and down to select an item."
 msgstr ""
 
@@ -9176,7 +7727,6 @@ 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:279 ../src/orca/tutorialgenerator.py:427
 msgid "To collapse, press shift plus left."
 msgstr ""
 
@@ -9184,42 +7734,35 @@ msgstr ""
 #. '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:285 ../src/orca/tutorialgenerator.py:433
 msgid "To expand, press shift plus right."
 msgstr ""
 
 #. Translators: This is the tutorial string for when landing
 #. on text fields.
-#: ../src/orca/tutorialgenerator.py:317
 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:345
 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:370
 msgid "To activate press space."
 msgstr ""
 
 #. Translators: this is the tutorial string for when landing
 #. on a spin button.
-#: ../src/orca/tutorialgenerator.py:397
 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:584
 msgid "Use arrow keys to change."
 msgstr ""
 
 #. Translators: this is a tip for the user, how to navigate menues.
-#: ../src/orca/tutorialgenerator.py:608
 msgid ""
 "To navigate, press left or right arrow. To move through items press up or "
 "down arrow."
@@ -9227,13 +7770,11 @@ msgstr ""
 
 #. Translators: this is a tip for the user, how to
 #. navigate into sub menues.
-#: ../src/orca/tutorialgenerator.py:613
 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:645
 msgid ""
 "To decrease press left arrow, to increase press right arrow. To go to "
 "minimum press home, and for maximum press end."
@@ -9241,7 +7782,6 @@ msgstr ""
 
 #. Translators: this is the percentage value of a slider.
 #.
-#: ../src/orca/where_am_I.py:374
 #, python-format
 msgid "%s percent"
 msgstr "%s protsenti"
@@ -9249,32 +7789,27 @@ msgstr "%s protsenti"
 #. Translators: this is in reference to a radio button being
 #. selected or not.
 #.
-#: ../src/orca/where_am_I.py:437
 msgid "selected"
 msgstr "valitud"
 
 #. Translators: this is in reference to a radio button being
 #. selected or not.
 #.
-#: ../src/orca/where_am_I.py:442
 msgid "not selected"
 msgstr "valimata"
 
 #. Translators: "page" is the word for a page tab in a tab list.
 #.
-#: ../src/orca/where_am_I.py:482
 #, python-format
 msgid "%s page"
 msgstr ""
 
 #. Translators: this is in references to a column in a
 #. table.
-#: ../src/orca/where_am_I.py:648
 #, python-format
 msgid "column %d of %d"
 msgstr ""
 
-#: ../src/orca/where_am_I.py:783
 msgid "Icon panel"
 msgstr "Ikoonipaneel"
 
@@ -9282,27 +7817,22 @@ msgstr "Ikoonipaneel"
 #. protocols.
 #. Translators: this is the protocol of a link eg. http, mailto.
 #.
-#: ../src/orca/where_am_I.py:828
 #, python-format
 msgid "%s link"
 msgstr ""
 
-#: ../src/orca/where_am_I.py:838
 #, python-format
 msgid "%s link to %s"
 msgstr ""
 
 #. 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:848
 msgid "same page"
 msgstr ""
 
-#: ../src/orca/where_am_I.py:850 ../src/orca/where_am_I.py:858
 msgid "same site"
 msgstr ""
 
-#: ../src/orca/where_am_I.py:860
 msgid "different site"
 msgstr ""
 
@@ -9310,7 +7840,6 @@ msgstr ""
 #. 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:1021
 #, python-format
 msgid "%d of %d item selected"
 msgid_plural "%d of %d items selected"
@@ -9321,14 +7850,12 @@ msgstr[1] ""
 #. 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:1031
 #, python-format
 msgid "on item %d of %d"
 msgstr ""
 
 #. Translators: This is the size of a file in bytes
 #.
-#: ../src/orca/where_am_I.py:1064
 #, python-format
 msgid "%d byte"
 msgid_plural "%d bytes"
@@ -9337,21 +7864,18 @@ msgstr[1] ""
 
 #. Translators: This is the size of a file in kilobytes
 #.
-#: ../src/orca/where_am_I.py:1068
 #, python-format
 msgid "%.2f kilobytes"
 msgstr ""
 
 #. Translators: This is the size of a file in megabytes
 #.
-#: ../src/orca/where_am_I.py:1072
 #, python-format
 msgid "%.2f megabytes"
 msgstr ""
 
 #. Translators: this is an item in a list.
 #.
-#: ../src/orca/where_am_I.py:1205 ../src/orca/where_am_I.py:1249
 #, python-format
 msgid "item %d of %d"
 msgstr ""
@@ -9360,7 +7884,6 @@ msgstr ""
 #. that gets activated when Enter is pressed anywhere within that
 #. dialog box.
 #.
-#: ../src/orca/where_am_I.py:1905
 #, python-format
 msgid "Default button is %s"
 msgstr ""
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]