[GRASS-SVN] r31393 - in grass/trunk/gui/wxpython: gui_modules icons

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-05-17 12:46:35 -0400 (Sat, 17 May 2008)
New Revision: 31393

Modified:
   grass/trunk/gui/wxpython/gui_modules/mapdisp.py
   grass/trunk/gui/wxpython/gui_modules/toolbars.py
   grass/trunk/gui/wxpython/gui_modules/vdigit.py
   grass/trunk/gui/wxpython/icons/icon.py
Log:
wxGUI: cosmetics (typos, i18n, wording) [sync'ed with devbr6, r31392]

Modified: grass/trunk/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2008-05-17 16:43:59 UTC (rev 31392)
+++ grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2008-05-17 16:46:35 UTC (rev 31393)
@@ -2424,7 +2424,7 @@
             for toolRow in range(0, self.digittoolbar.numOfRows):
                 self._mgr.AddPane(self.digittoolbar.toolbar[toolRow],
                                   wx.aui.AuiPaneInfo().
-                                  Name("digittoolbar" + str(toolRow)).Caption(_("Digit Toolbar")).
+                                  Name("digittoolbar" + str(toolRow)).Caption(_("Vector digitizer toolbar")).
                                   ToolbarPane().Top().Row(toolRow + 1).
                                   LeftDockable(False).RightDockable(False).
                                   BottomDockable(False).TopDockable(True).

Modified: grass/trunk/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/toolbars.py	2008-05-17 16:43:59 UTC (rev 31392)
+++ grass/trunk/gui/wxpython/gui_modules/toolbars.py	2008-05-17 16:46:35 UTC (rev 31393)
@@ -610,39 +610,39 @@
         point = wx.GetMousePosition()
         toolMenu = wx.Menu()
         # Add items to the menu
-        copy = wx.MenuItem(toolMenu, wx.ID_ANY, 'Copy features from (background) vector map')
+        copy = wx.MenuItem(toolMenu, wx.ID_ANY, _('Copy features from (background) vector map'))
         toolMenu.AppendItem(copy)
         self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnCopy, copy)
 
-        flip = wx.MenuItem(toolMenu, wx.ID_ANY, 'Flip selected lines')
+        flip = wx.MenuItem(toolMenu, wx.ID_ANY, _('Flip selected lines/boundaries'))
         toolMenu.AppendItem(flip)
         self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnFlip, flip)
 
-        merge = wx.MenuItem(toolMenu, wx.ID_ANY, 'Merge selected lines')
+        merge = wx.MenuItem(toolMenu, wx.ID_ANY, _('Merge selected lines/boundaries'))
         toolMenu.AppendItem(merge)
         self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnMerge, merge)
 
-        breakL = wx.MenuItem(toolMenu, wx.ID_ANY, 'Break selected lines at intersection')
+        breakL = wx.MenuItem(toolMenu, wx.ID_ANY, _('Break selected lines/boundaries at intersection'))
         toolMenu.AppendItem(breakL)
         self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnBreak, breakL)
 
-        snap = wx.MenuItem(toolMenu, wx.ID_ANY, 'Snap selected lines (only to nodes)')
+        snap = wx.MenuItem(toolMenu, wx.ID_ANY, _('Snap selected lines/boundaries (only to nodes)'))
         toolMenu.AppendItem(snap)
         self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnSnap, snap)
 
-        connect = wx.MenuItem(toolMenu, wx.ID_ANY, 'Connect two selected lines')
+        connect = wx.MenuItem(toolMenu, wx.ID_ANY, _('Connect two selected lines/boundaries'))
         toolMenu.AppendItem(connect)
         self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnConnect, connect)
 
-        query = wx.MenuItem(toolMenu, wx.ID_ANY, 'Query tool')
+        query = wx.MenuItem(toolMenu, wx.ID_ANY, _('Query tool'))
         toolMenu.AppendItem(query)
         self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnQuery, query)
 
-        zbulk = wx.MenuItem(toolMenu, wx.ID_ANY, 'Z bulk-labeling of 3D lines')
+        zbulk = wx.MenuItem(toolMenu, wx.ID_ANY, _('Z bulk-labeling of 3D lines'))
         toolMenu.AppendItem(zbulk)
         self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnZBulk, zbulk)
 
-        typeconv = wx.MenuItem(toolMenu, wx.ID_ANY, 'Feature type conversion')
+        typeconv = wx.MenuItem(toolMenu, wx.ID_ANY, _('Feature type conversion'))
         toolMenu.AppendItem(typeconv)
         self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnTypeConversion, typeconv)
 

Modified: grass/trunk/gui/wxpython/gui_modules/vdigit.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/vdigit.py	2008-05-17 16:43:59 UTC (rev 31392)
+++ grass/trunk/gui/wxpython/gui_modules/vdigit.py	2008-05-17 16:46:35 UTC (rev 31393)
@@ -1636,7 +1636,7 @@
         flexSizer1.Add(self.snappingValue, proportion=0, flag=wx.ALIGN_CENTER | wx.FIXED_MINSIZE)
         flexSizer1.Add(self.snappingUnit, proportion=0, flag=wx.ALIGN_RIGHT | wx.FIXED_MINSIZE)
         # background map
-        text = wx.StaticText(parent=panel, id=wx.ID_ANY, label=_("Backgroud vector map"))
+        text = wx.StaticText(parent=panel, id=wx.ID_ANY, label=_("Background vector map"))
         self.backgroundMap = gselect.Select(parent=panel, id=wx.ID_ANY, size=(200,-1),
                                            type="vector")
         self.backgroundMap.SetValue(UserSettings.Get(group='vdigit', key="backgroundMap", subkey='value'))

Modified: grass/trunk/gui/wxpython/icons/icon.py
===================================================================
--- grass/trunk/gui/wxpython/icons/icon.py	2008-05-17 16:43:59 UTC (rev 31392)
+++ grass/trunk/gui/wxpython/icons/icon.py	2008-05-17 16:46:35 UTC (rev 31393)
@@ -362,7 +362,7 @@
                               label=_("Split line/boundary"),
                               desc=_("Left: Select; Middle: Unselect; Right: Confirm")),
     "digExit"    : MetaIcon (img=icons_img["quit"],
-                             label=_("Quit digitization tool")),
+                             label=_("Quit digitizing tool")),
     "digAdditionalTools" : MetaIcon (img=icons_img["digAdditionalTools"],
                                      label=_("Additional tools " \
                                                  "(copy, flip, connect, etc.)"),