diff --git a/wicd/monitor.py b/wicd/monitor.py index 9cdaa45..f9724b0 100755 --- a/wicd/monitor.py +++ b/wicd/monitor.py @@ -260,7 +260,7 @@ class ConnectionStatus(object): info = [str(wifi_ip), str(wireless.GetCurrentNetwork(iwconfig)), str(self._get_printable_sig_strength()), str(wireless.GetCurrentNetworkID(iwconfig)), - wireless.GetCurrentGitrate(iwconfig)] + wireless.GetCurrentBitrate(iwconfig)] elif state == misc.WIRED: self.reconnect_tries = 0 info = [str(wired_ip)] diff --git a/wicd/translations.py b/wicd/translations.py index 489988f..c298791 100644 --- a/wicd/translations.py +++ b/wicd/translations.py @@ -81,9 +81,9 @@ language['wired_interface'] = _('Wired Interface') language['hidden_network'] = _('Hidden Network') language['hidden_network_essid'] = _('Hidden Network ESSID') language['connected_to_wireless'] = _('Connected to $A at $B (IP: $C)') -language['tray_connected_to_wireless'] = _('Wireless Network\n$A at $B\nSpeed: $C\nIP %D') +language['tray_connected_to_wireless'] = _('Wireless Network\n$A at $B\nSpeed: $C\nIP $D') language['connected_to_wired'] = _('Connected to wired network (IP: $A)') -language['tray_connected_to_wired'] = _('Wired Network\nIP: %A\n') +language['tray_connected_to_wired'] = _('Wired Network\nIP: $A') language['not_connected'] = _('Not connected') language['conn_info_wired'] = _('Wired\nIP: $A\nRX: $B KB/s\nTX: $C KB/s') language['conn_info_wireless'] = _('Wireless\nSSID: $A\nSpeed $B\nIP: $C\nStrength: $D\nRX: $E KB/s\nTX: $F KB/s') diff --git a/wicd/wicd-client.py b/wicd/wicd-client.py index 0b0037e..a94e1e9 100755 --- a/wicd/wicd-client.py +++ b/wicd/wicd-client.py @@ -146,7 +146,7 @@ class TrayIcon(object): self.cur_sndbytes = int(open(dev_dir + "tx_bytes", "r").read().strip()) except: self.cur_sndbytes = -1 - self.cur.rcvbytes = -1 + self.cur_rcvbytes = -1 class TrayConnectionInfo(object): """ Class for updating the tray icon status. """ @@ -176,7 +176,7 @@ class TrayIcon(object): def update_tooltip(self): if (self.network_type == "none"): - self.tr.set_tooltip(language['not_Connected']) + self.tr.set_tooltip(language['not_connected']) elif (self.network_type == "wireless"): self.tr.set_tooltip(language['tray_connected_to_wireless'] .replace('$A', self.network_name)