[nvda-addons] commit/windows7magnifier: Dominic Canare: more translation fixes, reconciled .po files

  • From: commits-noreply@xxxxxxxxxxxxx
  • To: nvda-addons@xxxxxxxxxxxxx
  • Date: Wed, 15 May 2013 17:11:02 -0000

1 new commit in windows7magnifier:

https://bitbucket.org/nvdaaddonteam/windows7magnifier/commits/c45649dd6de9/
Changeset:   c45649dd6de9
Branch:      master
User:        Dominic Canare
Date:        2013-05-15 18:46:40
Summary:     more translation fixes, reconciled .po files

Affected #:  4 files

diff --git a/addon/globalPlugins/Windows7Magnifier/__init__.py 
b/addon/globalPlugins/Windows7Magnifier/__init__.py
index 79a2596..9eb2b08 100644
--- a/addon/globalPlugins/Windows7Magnifier/__init__.py
+++ b/addon/globalPlugins/Windows7Magnifier/__init__.py
@@ -225,14 +225,15 @@ class GlobalPlugin(globalPluginHandler.GlobalPlugin):
                if not self.isMagnifierRunning():
                        ui.message(_("Launching magnifier"))
                        
-                       # Force 64-bit version on 64-bit OS
                        winDir = os.path.expandvars("%WINDIR%")
-                       if os.path.isfile(winDir + "\\Sysnative\\Magnify.exe"):
+                       try:
+                               # Force 64-bit version on 64-bit OS
                                exe = winDir + u"\\Sysnative\\Magnify.exe"
-                       else:
+                               shellapi.ShellExecute(None, None, exe, 
subprocess.list2cmdline([exe]), None, 0)
+                       except:
+                               # Fallback
                                exe = winDir + u"\\System32\\Magnify.exe"
-
-                       shellapi.ShellExecute(None, None, exe, 
subprocess.list2cmdline([exe]), None, 0)
+                               shellapi.ShellExecute(None, None, exe, 
subprocess.list2cmdline([exe]), None, 0)
 
                if block or applyConfig:
                        self._waitForMagnifierWindow()
@@ -656,8 +657,9 @@ class MagnifierSettingsDialog(gui.SettingsDialog):
                self.settingsSizer = settingsSizer
                
                # modes dropdown and label
-               self.modes = [_("Fullscreen"), _("Docked"), _("Lens")]
-               self.modeSelector = wx.Choice(self, wx.NewId(), 
name=_("&Mode"), choices=self.modes)
+               self.modes = ["Fullscreen", "Docked", "Lens"]
+               self.modeDescriptions = [_("Fullscreen"), _("Docked"), 
_("Lens")]
+               self.modeSelector = wx.Choice(self, wx.NewId(), 
name=_("&Mode"), choices=self.modeDescriptions)
                
self.modeSelector.SetSelection(self.modes.index(Windows7MagnifierConfig.conf["magnifier"]["mode"]))
                modeSizer = wx.BoxSizer(wx.HORIZONTAL)
                modeSizer.Add(wx.StaticText(self, -1, label=_("Mode") + ":"), 
border=5, flag=wx.RIGHT|wx.ALIGN_CENTER)
@@ -689,7 +691,7 @@ class MagnifierSettingsDialog(gui.SettingsDialog):
                                settingsSizer.Add(wx.StaticLine(self), 0, 
wx.ALL|wx.EXPAND, 5)                          
                                continue
                        name = boxArg[0]
-                       box = wx.CheckBox(self, wx.NewId(), label=_(boxArg[1]))
+                       box = wx.CheckBox(self, wx.NewId(), label=boxArg[1])
 
                        self.checkBoxes[name] = box
                        
box.SetValue(Windows7MagnifierConfig.conf["magnifier"][name])
@@ -739,12 +741,7 @@ class MagnifierSettingsDialog(gui.SettingsDialog):
                        for name,box in self.checkBoxes.items():
                                Windows7MagnifierConfig.conf["magnifier"][name] 
= box.IsChecked()
                        
-                       # The mode saved in the config file should not be 
translated
-                       # It should be consistent across languages
-                       for mode in ["Fullscreen", "Docked", "Lens"]:
-                               if self.getMode() == _(mode):
-                                       
Windows7MagnifierConfig.conf["magnifier"]["mode"] = mode
-
+                       Windows7MagnifierConfig.conf["magnifier"]["mode"] = 
self.getMode()
                        
Windows7MagnifierConfig.conf["magnifier"]["lensSizeHorizontal"] = 
self.lensControls[0].GetValue()
                        
Windows7MagnifierConfig.conf["magnifier"]["lensSizeVertical"] = 
self.lensControls[1].GetValue()
 

diff --git a/addon/locale/es/LC_MESSAGES/nvda.po 
b/addon/locale/es/LC_MESSAGES/nvda.po
index 4fbec64..03640a6 100644
--- a/addon/locale/es/LC_MESSAGES/nvda.po
+++ b/addon/locale/es/LC_MESSAGES/nvda.po
@@ -11,115 +11,105 @@ msgstr ""
 "PO-Revision-Date: 2013-05-09 19:59+0100\n"
 "Last-Translator: Noelia Ruiz Martínez <nrm1977@xxxxxxxxx>\n"
 "Language-Team: \n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "X-Generator: Poedit 1.5.5\n"
 "X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
 
-# This is case sensitive and MUST MATCH the magnifier options dialog
-# title in this language
-msgid "Magnifier Options"
-msgstr "Opciones de la lupa"
-
-#: addon\globalPlugins\Windows7Magnifier.py:102
-#: addon\globalPlugins\Windows7Magnifier.py:104
+#. Translators: Menu Option
 msgid "M&agnifier settings..."
 msgstr "Configuración de l&a Lupa..."
 
-#: addon\globalPlugins\Windows7Magnifier.py:104
+#. Translators: Menu Option
 msgid "Magnifier settings"
-msgstr "Configuración de l&a Lupa..."
+msgstr "Configuración de la Lupa"
+
+#. Translators: Message to indicate the magnifier is being launched
+msgid "Launching magnifier"
+msgstr "Iniciando Lupa"
 
-#: addon\globalPlugins\Windows7Magnifier.py:129
+#. Translators: Message to indicate the magnifier has been launched
 msgid "Magnifier launched"
 msgstr "Lupa iniciada"
 
-#: addon\globalPlugins\Windows7Magnifier.py:655
+#. Translators: Message to indicate the magnifier is being closed
+msgid "Closing magnifier"
+msgstr "Cerrando Lupa"
+
+#. Translators: Error message to indicate that at least one tracking option 
must be supplied
+msgid "You must select at least one 'Follow' option"
+msgstr "Debes escoger, al menos, una de las siguientes opciones"
+
+#. Translators: Window name of the Magnifier Options window. This is case 
sensitive and MUST match the (Windows) Magnifier Options dialog name exactly.
+msgid "Magnifier Options"
+msgstr "Opciones de la lupa"
+
+#. Translators: Title for Options Dialog
 msgid "NVDA Magnifier Addon Options"
 msgstr "Opciones para el complemento Lupa en NVDA"
 
-#: addon\globalPlugins\Windows7Magnifier.py:666
+#. Translators: Option label
 msgid "&Mode"
 msgstr "&Modo"
 
-#: addon\globalPlugins\Windows7Magnifier.py:669
+#. Translators: Option label
 msgid "Mode"
-msgstr "&Modo"
+msgstr "Modo"
 
-#: addon\globalPlugins\Windows7Magnifier.py:715
-msgid "Lens &width"
-msgstr "A&nchura de lente"
+#. Translators: Option label
+msgid "&Start the magnifier when NVDA starts"
+msgstr "&Cargar la Lupa cuando se inicie NVDA"
 
-#: addon\globalPlugins\Windows7Magnifier.py:715
-msgid "Lens h&eight"
-msgstr "A&ltura de lente"
+#. Translators: Option label
+msgid "&Close the magnifier when NVDA is terminated"
+msgstr "&Descargar la Lupa cuando se inicie NVDA"
 
-#. Add-on description
-#. TRANSLATORS: Summary for this add-on to be shown on installation and add-on 
information.
-#: buildVars.py:13
-msgid "Windows 7 Magnifier integration for the NVDA GUI"
-msgstr "Incorporación de la Lupa de Windows 7 a la interfaz gráfica de NVDA"
+#. Translators: Option label
+msgid "&Hide the magnifier control window"
+msgstr "Oc&ultar la ventana para el control de la Lupa"
 
-#. Add-on description
-#. Translators: Long description to be shown for this add-on on installation 
and add-on information
-#: buildVars.py:16
-msgid "This addon integrates configuration options into the standard NVDA GUI. 
To access, select \"Preferences\", \"Magnifier Options\" from the NVDA GUI"
-msgstr "Este complemento incorpora opciones de configuración en la interfaz 
estándar de NVDA. Para acceder, ve a Preferencias, Opciones de la Lupa, desde 
el menú de NVDA"
+#. Translators: Option label
+msgid "Mute NVDA when the magnifier control window has focus (requires reload)"
+msgstr "&Silenciar NVDA cuando la ventana para el control de la Lupa tenga el 
foco"
 
-#~ msgid "Larger"
-#~ msgstr "Más grande"
+#. Translators: Option label
+msgid "&Invert colors"
+msgstr "In&vertir colores"
 
-#~ msgid "Smaller"
-#~ msgstr "Más pequeño"
+#. Translators: Option label
+msgid "Follow the mouse &pointer"
+msgstr "Seguir al &puntero del ratón"
 
-#~ msgid "Launching magnifier"
-#~ msgstr "Iniciando Lupa"
+#. Translators: Option label
+msgid "Follow the &keyboard focus"
+msgstr "Seguir al &foco del teclado"
 
-#~ msgid "Closing magnifier"
-#~ msgstr "Cerrando Lupa"
+#. Translators: Option label
+msgid "Follow the &text insertion point"
+msgstr "Seguir al punto de inserción de &texto"
 
-#~ msgid "Magnifier"
-#~ msgstr "Lupa"
-
-#~ msgid "Screen Magnifier Fullscreen Window"
-#~ msgstr "Vista de Lupa: Pantalla completa"
-
-#~ msgid "Screen Magnifier Lens Window"
-#~ msgstr "Vista de Lupa: Lente"
-
-#~ msgid "Screen Magnifier Window"
-#~ msgstr "Vista de Lupa"
-
-#~ msgid "Please wait while settings are applied"
-#~ msgstr "Por favor, espera mientras se aplican las opciones"
-
-#~ msgid "You must select at least one 'Follow' option"
-#~ msgstr "Debes escoger, al menos, una de las siguientes opciones"
-
-#~ msgid "&Start the magnifier when NVDA starts"
-#~ msgstr "&Cargar la Lupa cuando se inicie NVDA"
-
-#~ msgid "&Close the magnifier when NVDA starts"
-#~ msgstr "&Descargar la Lupa cuando se inicie NVDA"
-
-#~ msgid "&Hide the magnifier control window"
-#~ msgstr "Oc&ultar la ventana para el control de la Lupa"
+#. Translators: Option label
+msgid "Lens &width"
+msgstr "A&nchura de lente"
 
-#~ msgid ""
-#~ "Mute NVDA when the magnifier control window has focus (requires reload)"
-#~ msgstr ""
-#~ "&Silenciar NVDA cuando la ventana para el control de la Lupa tenga el foco"
+#. Translators: Option Label
+msgid "Lens h&eight"
+msgstr "A&ltura de lente"
 
-#~ msgid "&Invert colors"
-#~ msgstr "In&vertir colores"
+#. Translators: Message to indicate that settings have been applied
+msgid "Settings applied"
+msgstr ""
 
-#~ msgid "Follow the mouse &pointer"
-#~ msgstr "Seguir al &puntero del ratón"
+#. Translators: Fullscreen Mode option
+msgid "Fullscreen"
+msgstr ""
 
-#~ msgid "Follow the &keyboard focus"
-#~ msgstr "Seguir al &foco del teclado"
+#. Translators: Lens Mode
+msgid "Lens"
+msgstr ""
 
-#~ msgid "Follow the &text insertion point"
-#~ msgstr "Seguir al punto de inserción de &texto"
+#. Translators: Docked Mode option
+msgid "Docked"
+msgstr ""

diff --git a/addon/locale/ne/LC_MESSAGES/nvda.po 
b/addon/locale/ne/LC_MESSAGES/nvda.po
index 33e111c..958c23d 100644
--- a/addon/locale/ne/LC_MESSAGES/nvda.po
+++ b/addon/locale/ne/LC_MESSAGES/nvda.po
@@ -18,18 +18,14 @@ msgstr ""
 "X-Generator: Poedit 1.5.5\n"
 "X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
 
-#. Translators: Aural feedback when zooming in
-msgid "Larger"
-msgstr "केही ठूलो"
-
-#. Translators: Aural feedback when zooming out
-msgid "Smaller"
-msgstr "केही सानो"
-
 #. Translators: Menu Option
 msgid "M&agnifier settings..."
 msgstr "&दृष्टीवर्धकको अनुकूलता..."
 
+#. Translators: Menu Option
+msgid "Magnifier settings"
+msgstr "दृष्टीवर्धकको अनुकूलता"
+
 #. Translators: Message to indicate the magnifier is being launched
 msgid "Launching magnifier"
 msgstr "दृष्टीवर्धक सक्रिय  हुदैछ ।"
@@ -42,31 +38,11 @@ msgstr "दृष्टीवर्धक सक्रिय भयो ।"
 msgid "Closing magnifier"
 msgstr "दृष्टीवर्धक बन्द हुदैछ ।"
 
-#. Translators: Name of Magnifier Window
-msgid "Magnifier"
-msgstr "दृष्टीवर्धन"
-
-#. Translators: Window name of Magnifier rendering window when in Fullscreen 
mode
-msgid "Screen Magnifier Fullscreen Window"
-msgstr "पर्दा दृष्टीवर्धक- सम्पूर्ण पर्दा"
-
-#. Translators: Window name of Magnifier rendering window when in Lens mode
-msgid "Screen Magnifier Lens Window"
-msgstr "पर्दा दृष्टीवर्धक - लेन्स सञ्झ्याल"
-
-#. Translators: Window name of Magnifier rendering window when in Docked mode
-msgid "Screen Magnifier Window"
-msgstr "पर्दा दृष्टीवर्धक सन्झ्याल"
-
-#. Translators: Message to indicate that settings are being applied
-msgid "Please wait while settings are applied"
-msgstr "पर्खनु होस् है, अनुकूलता कार्यान्वयन हुदैछ ।"
-
 #. Translators: Error message to indicate that at least one tracking option 
must be supplied
 msgid "You must select at least one 'Follow' option"
 msgstr "तपाइले कम्तिमा एउटा विकल्पलाई रोज्नु पर्ने हुन्छ ।।"
 
-#. Translators: Window name of the Magnifier Options window
+#. Translators: Window name of the Magnifier Options window. This is case 
sensitive and MUST match the (Windows) Magnifier Options dialog name exactly.
 msgid "Magnifier Options"
 msgstr "दृष्टीवर्धकका विकल्पहरू"
 
@@ -79,11 +55,15 @@ msgid "&Mode"
 msgstr "&स्वरूप"
 
 #. Translators: Option label
+msgid "Mode"
+msgstr "स्वरूप"
+
+#. Translators: Option label
 msgid "&Start the magnifier when NVDA starts"
 msgstr "नेत्रवाणी सँगै दृष्टीवर्धक &सुरु होस् । "
 
 #. Translators: Option label
-msgid "&Close the magnifier when NVDA starts"
+msgid "&Close the magnifier when NVDA is terminated"
 msgstr "नेत्रवाणी &बन्द भए पछी दृष्टीवर्धक सुरु होस्।"
 
 #. Translators: Option label
@@ -92,9 +72,7 @@ msgstr "दृष्टीवर्धक नियन्त्रण सन्
 
 #. Translators: Option label
 msgid "Mute NVDA when the magnifier control window has focus (requires reload)"
-msgstr ""
-"दृष्टीवर्धक नियन्त्रण सन्झ्यालमा  केन्द्रीत् हुँदा नेत्रवाणीलाई मौन राख (पुनः 
प्रारम्भ गर्नु "
-"पर्छ ) ।"
+msgstr "दृष्टीवर्धक नियन्त्रण सन्झ्यालमा  केन्द्रीत् हुँदा नेत्रवाणीलाई मौन 
राख (पुनः प्रारम्भ गर्नु पर्छ ) ।"
 
 #. Translators: Option label
 msgid "&Invert colors"
@@ -119,3 +97,19 @@ msgstr "लेन्सको &चौडाइ ।"
 #. Translators: Option Label
 msgid "Lens h&eight"
 msgstr "लेन्सको &उचाई ।"
+
+#. Translators: Message to indicate that settings have been applied
+msgid "Settings applied"
+msgstr ""
+
+#. Translators: Fullscreen Mode option
+msgid "Fullscreen"
+msgstr ""
+
+#. Translators: Lens Mode
+msgid "Lens"
+msgstr ""
+
+#. Translators: Docked Mode option
+msgid "Docked"
+msgstr ""

diff --git a/buildVars.py b/buildVars.py
index 09c6cd2..9eee40b 100644
--- a/buildVars.py
+++ b/buildVars.py
@@ -15,7 +15,7 @@ addon_info = {
        # Translators: Long description to be shown for this add-on on 
installation and add-on information
        "addon-description" : _("""This addon integrates configuration options 
into the standard NVDA GUI. To access, select "Preferences", "Magnifier 
Options" from the NVDA GUI"""),
        # version
-       "addon-version" : "1.0.3",
+       "addon-version" : "1.0.4",
        # Author(s)
        "addon-author" : "Dominic Canare <mail@xxxxxxxxxxxxxxxx>",
        # URL for the add-on documentation support

Repository URL: https://bitbucket.org/nvdaaddonteam/windows7magnifier/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
----------------------------------------------------------------

NVDA add-ons Central: A list for discussing NVDA add-ons

To post a message, send an email to nvda-addons@xxxxxxxxxxxxx.

To unsubscribe, send an email with the subject line of "unsubscribe" (without 
quotes) to nvda-addons-request@xxxxxxxxxxxxx.

If you have questions for list moderators, please send a message to 
nvda-addons-moderators@xxxxxxxxxxxxx.

Other related posts: