Index: ChangeLog
===================================================================
--- ChangeLog	(revision 2297)
+++ ChangeLog	(working copy)
@@ -1,13 +1,18 @@
+2007-04-18  Willie Walker <william.walker@sun.com>
+
+        * src/orca/orca.py: work on bug 412200 to unmark usage text and
+        command line options for translation per gnome-i18n discussion.
+        
 2007-04-18  Lynn MonSanto <lynn.monsanto@sun.com>
 
         * test/harness/runall.sh: Commented out the lines that compare 
-	the results file with the golden results file. I believe it 
-	is more useful to do the comparisons after runall.sh has 
-	completed. The runall.sh output just contains information about
-	the test executions, not including the results.
+        the results file with the golden results file. I believe it 
+        is more useful to do the comparisons after runall.sh has 
+        completed. The runall.sh output just contains information about
+        the test executions, not including the results.
 
-	(Draft) directions for running the Orca regression tests are
-	now in http://live.gnome.org/Orca/RegressionTesting
+        (Draft) directions for running the Orca regression tests are
+        now in http://live.gnome.org/Orca/RegressionTesting
 
 2007-04-18  Rich Burridge <rich.burridge@sun.com>
 
Index: src/orca/orca.py
===================================================================
--- src/orca/orca.py	(revision 2297)
+++ src/orca/orca.py	(working copy)
@@ -225,7 +225,7 @@
         #
         try:
             if registry.desktop.childCount == 0:
-                speech.speak(_("User logged out - shutting down."))
+                speech.speak(_("Goodbye."))
                 shutdown()
                 return
         except: # could be a CORBA.COMM_FAILURE
@@ -1180,21 +1180,21 @@
 
 def usage():
     """Prints out usage information."""
-    print _("Usage: orca [OPTION...]")
+    print "Usage: orca [OPTION...]"
     print
-    print _("-?, --help                   Show this help message")
-    print _("-v, --version                %s") % platform.version
-    print _("-s, --setup, --gui-setup     Set up user preferences")
-    print _("-t, --text-setup             Set up user preferences (text version)")
-    print _("-n, --no-setup               Skip set up of user preferences")
-    print _("-u, --user-prefs-dir=dirname Use alternate directory for user preferences")
-    print _("-e, --enable=[speech|braille|braille-monitor|magnifier|main-window] Force use of option")
-    print _("-d, --disable=[speech|braille|braille-monitor|magnifier|main-window] Prevent use of option")
-    print _("-q, --quit                   Quits Orca (if shell script used)")
+    print "-?, --help                   Show this help message"
+    print "-v, --version                %s" % platform.version
+    print "-s, --setup, --gui-setup     Set up user preferences"
+    print "-t, --text-setup             Set up user preferences (text version)"
+    print "-n, --no-setup               Skip set up of user preferences"
+    print "-u, --user-prefs-dir=dirname Use alternate directory for user preferences"
+    print "-e, --enable=[speech|braille|braille-monitor|magnifier|main-window] Force use of option"
+    print "-d, --disable=[speech|braille|braille-monitor|magnifier|main-window] Prevent use of option"
+    print "-q, --quit                   Quits Orca (if shell script used)"
     print
-    print _("If Orca has not been previously set up by the user, Orca\nwill automatically launch the preferences set up unless\nthe -n or --no-setup option is used.")
+    print "If Orca has not been previously set up by the user, Orca\nwill automatically launch the preferences set up unless\nthe -n or --no-setup option is used."
     print
-    print _("Report bugs to orca-list@gnome.org.")
+    print "Report bugs to orca-list@gnome.org."
     pass
 
 def main():
@@ -1223,7 +1223,6 @@
     #
     desktopRunning = False
     try:
-        import gtk
         if gtk.gdk.display_get_default():
             desktopRunning = True
     except:
