Index: src/orca/keynames.py
===================================================================
--- src/orca/keynames.py	(revision 2253)
+++ src/orca/keynames.py	(working copy)
@@ -1,6 +1,6 @@
 # Orca
 #
-# Copyright 2006 Sun Microsystems Inc.
+# Copyright 2006-2007 Sun Microsystems Inc.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -23,7 +23,7 @@
 __id__        = "$Id$"
 __version__   = "$Revision$"
 __date__      = "$Date$"
-__copyright__ = "Copyright (c) 2006 Sun Microsystems Inc."
+__copyright__ = "Copyright (c) 2006-2007 Sun Microsystems Inc."
 __license__   = "LGPL"
 
 import chnames
@@ -35,22 +35,69 @@
 # phrase used to describe the key.
 #
 __keynames = {}
+
+# Translators: this is how someone would speak the name of the left shift key
+#
 __keynames["Shift_L"]      = _("left shift")
+
+# Translators: this is how someone would speak the name of the left alt key
+#
 __keynames["Alt_L"]        = _("left alt")
+
+# Translators: this is how someone would speak the name of the left ctrl key
+#
 __keynames["Control_L"]    = _("left control")
-__keynames["Shift_L"]      = _("left shift")
+
+# Translators: this is how someone would speak the name of the right shift key
+#
 __keynames["Shift_R"]      = _("right shift")
+
+# Translators: this is how someone would speak the name of the right alt key
+#
 __keynames["Alt_R"]        = _("right alt")
+
+# Translators: this is how someone would speak the name of the right ctrl key
+#
 __keynames["Control_R"]    = _("right control")
+
+# Translators: this is how someone would speak the name of the left meta key
+#
 __keynames["Meta_L"]       = _("left meta")
+
+# Translators: this is how someone would speak the name of the right meta key
+#
 __keynames["Meta_R"]       = _("right meta")
+
+# Translators: this is how someone would speak the name of the num lock key
+#
 __keynames["Num_Lock"]     = _("num lock")
+
+# Translators: this is how someone would speak the name of the caps lock key
+#
 __keynames["Caps_Lock"]    = _("caps lock")
+
+# Translators: this is how someone would speak the name of the scroll lock key
+#
 __keynames["Scroll_Lock"]  = _("scroll lock")
+
+# Translators: this is how someone would speak the name of the page up key
+#
 __keynames["Page_Up"]      = _("page up")
+
+# Translators: this is how someone would speak the name of the page down key
+#
 __keynames["Page_Down"]    = _("page down")
+
+# Translators: this is how someone would speak the name of the left tab key
+#
 __keynames["ISO_Left_Tab"] = _("left tab")
+
+# Translators: this is how someone would speak the name of the F11 key
+#
 __keynames["SunF36"]       = _("F 11")
+
+# Translators: this is how someone would speak the name of the F12 key
+#
 __keynames["SunF37"]       = _("F 12")
 
 def getKeyName(key):
Index: src/orca/orca.py
===================================================================
--- src/orca/orca.py	(revision 2253)
+++ src/orca/orca.py	(working copy)
@@ -63,8 +63,6 @@
 import settings
 import speech
 
-import threading
-
 from input_event import BrailleEvent
 from input_event import KeyboardEvent
 from input_event import MouseButtonEvent
@@ -574,7 +572,7 @@
                 return
 
             modifiers = event.modifiers
-            if event_string == _("Caps_Lock"):
+            if event_string == "Caps_Lock":
                 if modifiers & (1 << atspi.Accessibility.MODIFIER_SHIFTLOCK):
                     lockState = _(" off")
                 else:
Index: src/orca/keybindings.py
===================================================================
--- src/orca/keybindings.py	(revision 2253)
+++ src/orca/keybindings.py	(working copy)
@@ -1,6 +1,6 @@
 # Orca
 #
-# Copyright 2005-2006 Sun Microsystems Inc.
+# Copyright 2005-2007 Sun Microsystems Inc.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -23,7 +23,7 @@
 __id__        = "$Id$"
 __version__   = "$Revision$"
 __date__      = "$Date$"
-__copyright__ = "Copyright (c) 2005-2006 Sun Microsystems Inc."
+__copyright__ = "Copyright (c) 2005-2007 Sun Microsystems Inc."
 __license__   = "LGPL"
 
 try:
@@ -108,20 +108,41 @@
     #if mods & (1 << atspi.Accessibility.MODIFIER_NUMLOCK):
     #    text += _("Num_Lock") + "+"
     if mods & 128:
+        # Translators: this is presented in a GUI to represent the
+        # "right alt" modifier.
+        #
         text += _("Alt_R") + "+"
     if mods & (1 << atspi.Accessibility.MODIFIER_META3):
+        # Translators: this is presented in a GUI to represent the
+        # "super" modifier.
+        #
         text += _("Super") + "+"
     if mods & (1 << atspi.Accessibility.MODIFIER_META2):
+        # Translators: this is presented in a GUI to represent the
+        # "meta 2" modifier.
+        #
         text += _("Meta2") + "+"
     #if mods & (1 << atspi.Accessibility.MODIFIER_META):
     #    text += _("Meta") + "+"
     if mods & (1 << atspi.Accessibility.MODIFIER_ALT):
+        # Translators: this is presented in a GUI to represent the
+        # "left alt" modifier.
+        #
         text += _("Alt_L") + "+"
     if mods & (1 << atspi.Accessibility.MODIFIER_CONTROL):
+        # Translators: this is presented in a GUI to represent the
+        # "control" modifier.
+        #
         text += _("Ctrl") + "+"
     if mods & (1 << atspi.Accessibility.MODIFIER_SHIFTLOCK):
+        # Translators: this is presented in a GUI to represent the
+        # "caps lock" modifier.
+        #
         text += _("Caps_Lock") + "+"
     if mods & (1 << atspi.Accessibility.MODIFIER_SHIFT):
+        # Translators: this is presented in a GUI to represent the
+        # "shift " modifier.
+        #
         text += _("Shift") + "+"
     return text
 
Index: src/orca/orca_gui_prefs.py
===================================================================
--- src/orca/orca_gui_prefs.py	(revision 2253)
+++ src/orca/orca_gui_prefs.py	(working copy)
@@ -1162,9 +1162,10 @@
 
         self.kbindings = keybindings.KeyBindings()
 
+        iterOrca = self._createNode(_("Orca"))
+
         # KeyBindings from the default script, in default.py (Orca's default)
         #
-        iterOrca = self._createNode(_("Orca"))
         defScript = default.Script(None)
         self.kbindingsDef = defScript.getKeyBindings()
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 2253)
+++ ChangeLog	(working copy)
@@ -1,3 +1,11 @@
+2007-04-05  Willie Walker <william.walker@sun.com>
+
+	* src/orca/keynames.py, src/orca/orca.py, src/orca/keybindings.py,
+	src/orca/orca_gui_prefs.py: more work on bug 412200 to add
+	documentation where needed and to unflag some things for
+	translation.  This completes work on keynames.py and
+	keybindings.py.  The next beast is orca_console_prefs.py.
+	
 2007-04-04  Rich Burridge <rich.burridge@sun.com>
 
         * src/orca/scripts/StarOffice.py:
