[orca] Remove more magnifier-related cruft, update a couple of translator notes.
- From: Joanmarie Diggs <joanied src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [orca] Remove more magnifier-related cruft, update a couple of translator notes.
- Date: Mon, 5 Sep 2011 23:19:30 +0000 (UTC)
commit 8b337ac39344ffcd84f4a3ecd823d3e0d68d559f
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date: Mon Sep 5 19:16:15 2011 -0400
Remove more magnifier-related cruft, update a couple of translator notes.
orca-autostart.desktop.in | 2 +-
orca.desktop.in | 6 ++--
src/orca/orca-setup.ui | 84 +-------------------------------------------
src/orca/orca.py | 13 +++----
4 files changed, 11 insertions(+), 94 deletions(-)
---
diff --git a/orca-autostart.desktop.in b/orca-autostart.desktop.in
index 522cbc2..c27c434 100644
--- a/orca-autostart.desktop.in
+++ b/orca-autostart.desktop.in
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Orca screen reader
-Exec=orca --no-setup --disable main-window --disable splash-window --disable magnifier --enable speech --enable braille
+Exec=orca --no-setup --disable main-window --disable splash-window --enable speech --enable braille
NoDisplay=true
AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-reader-enabled
X-GNOME-AutoRestart=true
diff --git a/orca.desktop.in b/orca.desktop.in
index d0eea9e..6786459 100644
--- a/orca.desktop.in
+++ b/orca.desktop.in
@@ -1,8 +1,8 @@
[Desktop Entry]
_Name=Orca
-_GenericName=Screen Reader and Magnifier
-_X-GNOME-FullName=Orca Screen Reader and Magnifier
-_Comment=Present on-screen information as speech or braille, or magnify the screen
+_GenericName=Screen Reader
+_X-GNOME-FullName=Orca Screen Reader
+_Comment=Provide access to graphical desktop environments via synthesized speech and/or refreshable braille
Exec=orca --replace
Icon=orca
Terminal=false
diff --git a/src/orca/orca-setup.ui b/src/orca/orca-setup.ui
index 1796e43..b58064f 100644
--- a/src/orca/orca-setup.ui
+++ b/src/orca/orca-setup.ui
@@ -143,86 +143,6 @@
</row>
</data>
</object>
- <object class="GtkListStore" id="model3">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Full Screen</col>
- </row>
- <row>
- <col id="0" translatable="yes">Top Half</col>
- </row>
- <row>
- <col id="0" translatable="yes">Bottom Half</col>
- </row>
- <row>
- <col id="0" translatable="yes">Left Half</col>
- </row>
- <row>
- <col id="0" translatable="yes">Right Half</col>
- </row>
- <row>
- <col id="0" translatable="yes">Custom</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="model4">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Centered</col>
- </row>
- <row>
- <col id="0" translatable="yes">Push</col>
- </row>
- <row>
- <col id="0" translatable="yes">None</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="model5">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Centered</col>
- </row>
- <row>
- <col id="0" translatable="yes">Push</col>
- </row>
- <row>
- <col id="0" translatable="yes">None</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="model6">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Centered</col>
- </row>
- <row>
- <col id="0" translatable="yes">Proportional</col>
- </row>
- <row>
- <col id="0" translatable="yes">Push</col>
- </row>
- <row>
- <col id="0" translatable="yes">None</col>
- </row>
- </data>
- </object>
<object class="GtkListStore" id="model7">
<columns>
<!-- column-name gchararray -->
@@ -1113,7 +1033,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Voice Type:</property>
+ <property name="label" translatable="yes" comments="Translators: Having multiple 'voice types' in Orca makes it possible for the user to more quickly identify properties of text non-visually, such as the fact that text is written in capital letters or is a link; or that text is actually visible on the screen as opposed to an Orca-specific message. The available 'voice types' in Orca include 'default', 'uppercase', 'hyperlink', and 'system' -- each of which can be configured by the user to sound the way he/she finds most helpful. This string is displayed in the label for the combo box in which the user selects a voice type to configure.">_Voice type:</property>
<property name="use_underline">True</property>
<property name="justify">right</property>
</object>
@@ -1132,7 +1052,7 @@
<object class="GtkLabel" id="voiceTypeSettingsLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Voice Type Settings</b></property>
+ <property name="label" translatable="yes" comments="Translators: Having multiple 'voice types' in Orca makes it possible for the user to more quickly identify properties of text non-visually, such as the fact that text is written in capital letters or is a link; or that text is actually visible on the screen as opposed to an Orca-specific message. The available 'voice types' in Orca include 'default', 'uppercase', 'hyperlink', and 'system' -- each of which can be configured by the user to sound the way he/she finds most helpful. This string is displayed in the label for the group of all of the controls associated with configuring a particular voice type."><b>Voice Type Settings</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/src/orca/orca.py b/src/orca/orca.py
index c7d6fa4..0b1760d 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -1,7 +1,7 @@
# Orca
#
# Copyright 2004-2009 Sun Microsystems Inc.
-# Copyright 2010 Joanmarie Diggs, Mesar Hameed
+# Copyright 2010-2011 The Orca Team
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,7 @@ __id__ = "$Id$"
__version__ = "$Revision$"
__date__ = "$Date$"
__copyright__ = "Copyright (c) 2004-2009 Sun Microsystems Inc." \
- "Copyright (c) 2010 Joanmarie Diggs, Mesar Hameed."
+ "Copyright (c) 2010-2011 The Orca Team"
__license__ = "LGPL"
import getopt
@@ -104,7 +104,6 @@ class Options:
self.canEnable = {'speech':'enableSpeech',
'braille':'enableBraille',
'braille-monitor':'enableBrailleMonitor',
- 'magnifier':'enableMagnifier',
'main-window':'showMainWindow',
'splash-window':'showSplashWindow'}
@@ -353,13 +352,13 @@ class Options:
returns False."""
if self.cannotEnable:
- valid = "\nspeech, braille, braille-monitor, magnifier, " \
+ valid = "\nspeech, braille, braille-monitor, " \
"main-window, splash-window"
# Translators: This message is displayed when the user
# tries to enable or disable a feature via an argument,
# but specified an invalid feature. Valid features are:
- # speech, braille, braille-monitor, magnifier, main-window,
- # and splash-window. These items are not localized and are
+ # speech, braille, braille-monitor, main-window, and
+ # splash-window. These items are not localized and are
# presented in a list after this message.
#
msg = _("The following items can be enabled or disabled:")
@@ -445,7 +444,6 @@ class Options:
+ "speech" + "|" \
+ "braille" + "|" \
+ "braille-monitor" + "|" \
- + "magnifier" + "|" \
+ "main-window" + "|" \
+ "splash-window" + "] ")
@@ -459,7 +457,6 @@ class Options:
+ "speech" + "|" \
+ "braille" + "|" \
+ "braille-monitor" + "|" \
- + "magnifier" + "|" \
+ "main-window" + "|" \
+ "splash-window" + "] ")
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
