diff --git a/zenmap/radialnet/gui/NodeNotebook.py b/zenmap/radialnet/gui/NodeNotebook.py index bdf25df3e..4d8b7dc67 100644 --- a/zenmap/radialnet/gui/NodeNotebook.py +++ b/zenmap/radialnet/gui/NodeNotebook.py @@ -81,7 +81,7 @@ SERVICE_COLORS = {'open': '#ffd5d5', # noqa 'closed|filtered': '#d5ffd5'} # noqa UNKNOWN_SERVICE_COLOR = '#d5d5d5' -TRACE_HEADER = [_('TTL'), _('RTT'), _('IP'), _('Hostname')] +TRACE_HEADER = ['TTL', 'RTT', 'IP', _('Hostname')] TRACE_TEXT = _( "Traceroute on port %s/%s totalized %d known hops.") @@ -581,8 +581,8 @@ class SystemPage(BWScrolledWindow): table.attach(BWSectionLabel(_('Class')), 1, 2, 0, 1) table.attach(BWSectionLabel(_('Values')), 2, 3, 0, 1) - table.attach(BWSectionLabel(_('TCP *')), 0, 1, 1, 2) - table.attach(BWSectionLabel(_('IP ID')), 0, 1, 2, 3) + table.attach(BWSectionLabel('TCP *'), 0, 1, 1, 2) + table.attach(BWSectionLabel('IP ID'), 0, 1, 2, 3) table.attach(BWSectionLabel(_('TCP Timestamp')), 0, 1, 3, 4) tcp = sequences.get('tcp') diff --git a/zenmap/radialnet/gui/SaveDialog.py b/zenmap/radialnet/gui/SaveDialog.py index 47db1916e..763550c46 100644 --- a/zenmap/radialnet/gui/SaveDialog.py +++ b/zenmap/radialnet/gui/SaveDialog.py @@ -71,10 +71,10 @@ from zenmapGUI.higwidgets.higdialogs import HIGAlertDialog TYPES = ((_("By extension"), None, None), - (_("PDF"), RadialNet.FILE_TYPE_PDF, ".pdf"), - (_("PNG"), RadialNet.FILE_TYPE_PNG, ".png"), - (_("PostScript"), RadialNet.FILE_TYPE_PS, ".ps"), - (_("SVG"), RadialNet.FILE_TYPE_SVG, ".svg")) + ("PDF", RadialNet.FILE_TYPE_PDF, ".pdf"), + ("PNG", RadialNet.FILE_TYPE_PNG, ".png"), + ("PostScript", RadialNet.FILE_TYPE_PS, ".ps"), + ("SVG", RadialNet.FILE_TYPE_SVG, ".svg")) # Build a reverse index of extensions to file types, for the "By extension" # file type. EXTENSIONS = {} diff --git a/zenmap/zenmapCore/NmapParser.py b/zenmap/zenmapCore/NmapParser.py index 3f6b44edb..581157ac5 100644 --- a/zenmap/zenmapCore/NmapParser.py +++ b/zenmap/zenmapCore/NmapParser.py @@ -354,7 +354,7 @@ class HostInfo(object): _("Unknown version")), "service_product": p.get("service_product", ""), "service_extrainfo": p.get("service_extrainfo", ""), - "port_state": p.get("port_state", _("Unknown")), + "port_state": p.get("port_state", _("unknown")), "protocol": p.get("protocol", "") }) return services diff --git a/zenmap/zenmapGUI/About.py b/zenmap/zenmapGUI/About.py index 0994f9f78..06803b9e2 100644 --- a/zenmap/zenmapGUI/About.py +++ b/zenmap/zenmapGUI/About.py @@ -250,13 +250,13 @@ class UmitCredits(HIGWindow): self.notebook.append_page( self.design_scroll, Gtk.Label.new(_("Design"))) self.notebook.append_page( - self.soc2007_scroll, Gtk.Label.new(_("SoC 2007"))) + self.soc2007_scroll, Gtk.Label.new("SoC 2007")) self.notebook.append_page( self.contributors_scroll, Gtk.Label.new(_("Contributors"))) self.notebook.append_page( self.translation_scroll, Gtk.Label.new(_("Translation"))) self.notebook.append_page( - self.nokia_scroll, Gtk.Label.new(_("Maemo"))) + self.nokia_scroll, Gtk.Label.new("Maemo")) self.written_by_scroll.add(self.written_by_text) self.written_by_text.set_wrap_mode(Gtk.WrapMode.NONE) diff --git a/zenmap/zenmapGUI/NmapOutputProperties.py b/zenmap/zenmapGUI/NmapOutputProperties.py index a5fa6a8b5..d621051ec 100644 --- a/zenmap/zenmapGUI/NmapOutputProperties.py +++ b/zenmap/zenmapGUI/NmapOutputProperties.py @@ -113,7 +113,7 @@ class NmapOutputProperties(HIGDialog): "80/tcp filtered http"], "date": [_("date"), "2006-05-26 11:14 BRT"], "hostname": [_("hostname"), "scanme.nmap.org"], - "ip": [_("ip"), "127.0.0.1"]} + "ip": ["ip", "127.0.0.1"]} for p in self.property_names: settings = self.nmap_highlight.__getattribute__(p) diff --git a/zenmap/zenmapGUI/ScanHostDetailsPage.py b/zenmap/zenmapGUI/ScanHostDetailsPage.py index a63a5fd39..dcd99ddb5 100644 --- a/zenmap/zenmapGUI/ScanHostDetailsPage.py +++ b/zenmap/zenmapGUI/ScanHostDetailsPage.py @@ -162,13 +162,13 @@ class HostDetails(HIGVBox): self.info_lastboot_label = HIGEntryLabel(na) # Addresses expander - self.ipv4_label = HIGEntryLabel(_('IPv4:')) + self.ipv4_label = HIGEntryLabel('IPv4:') self.info_ipv4_label = HIGEntryLabel(na) - self.ipv6_label = HIGEntryLabel(_('IPv6:')) + self.ipv6_label = HIGEntryLabel('IPv6:') self.info_ipv6_label = HIGEntryLabel(na) - self.mac_label = HIGEntryLabel(_('MAC:')) + self.mac_label = HIGEntryLabel('MAC:') self.info_mac_label = HIGEntryLabel(na) self.vendor_label = HIGEntryLabel(_('Vendor:')) diff --git a/zenmap/zenmapGUI/ScanOpenPortsPage.py b/zenmap/zenmapGUI/ScanOpenPortsPage.py index 98f2e0d42..08fcf67e3 100644 --- a/zenmap/zenmapGUI/ScanOpenPortsPage.py +++ b/zenmap/zenmapGUI/ScanOpenPortsPage.py @@ -398,7 +398,7 @@ class HostOpenPorts(HIGVBox): p["host"].get_hostname(), int(p.get('portid', "0")), p.get('protocol', ""), - p.get('port_state', _("Unknown")), + p.get('port_state', _("unknown")), get_version_string(p) ] )