diff --git a/README b/README index 07e40070..5db23e71 100644 --- a/README +++ b/README @@ -32,7 +32,7 @@ Pre-requisites (information for packagers): * python-setuptools (for the installation via setup.py) * python-psutil 0.4.1+ (replace the old libstatgrab's lib) * python-jinja2 2.0+ (optional for HTML export) -* pysensors (Python lib for sensors stats) +* pysensors (Python library for sensors stats) ### From package manager (very easy way) @@ -50,7 +50,7 @@ You first need to install pypi on your system. For example on Debian/Ubuntu: Then install the latest Glances version: $ sudo pip install Glances - + Note: if you are behind an HTTP Proxy, you should use $ sudo pip install --proxy=user:password@url:port Glances @@ -81,7 +81,7 @@ If you have the following error: Error: Failed executing: pip install glances==1.X --install-option=--prefix=/usr/local/XXX/glances/1.X (.rb:) This link will help resolve the above errors: https://github.com/mxcl/homebrew/wiki/bug-fixing-checklist - + Try to runs: $ pip install glances==1.X --install-option=--prefix=/usr/local/XXX/glances/1.X @@ -89,7 +89,7 @@ Try to runs: ### Concerning Windows operating system -Windows operating system only support the Glances in server mode. So if you ran Glances on Windows, it will be automaticaly running in server mode. +Windows operating system only support the Glances in server mode. So if you ran Glances on Windows, it will be automaticaly running in server mode. To install Glances on you system: @@ -103,7 +103,7 @@ I need contributors to package Glances for Windows (for exemple using [PyInstall Get the latest version (form GitHub): - $ rm -rf /tmp/nicolargo-glances-* + $ rm -rf /tmp/nicolargo-glances-* $ wget -O /tmp/glances-last.tgz https://github.com/nicolargo/glances/tarball/master Glances use a standard GNU style installer (for a Debian like system): @@ -122,7 +122,7 @@ Glances use a standard GNU style installer (for a Debian like system): If you want to monitor your local machine, just run: $ glances - + ### In client/server mode If you want to remotely monitor a machine (called server) from another one (called client). @@ -130,7 +130,7 @@ If you want to remotely monitor a machine (called server) from another one (call Run this command on the server: server$ glances -s - + and this one on the client: client$ glances -c @server @@ -165,7 +165,7 @@ When Glances is running, you can press: * 'b' switch between bit/s or byte/s for network IO * 'c' sort the processes list by CPU consumption * 'd' disable or enable the disk IO stats -* 'e' enable the sensors module (PySensors lib is needed) +* 'e' enable the sensors module (PySensors library is needed; Linux-only) * 'f' disable or enable the file system stats * 'l' disable or enable the logs * 'm' sort the processes list by process MEM @@ -204,7 +204,7 @@ time. The total CPU usage is displayed on the first line. ![screenshot](https://github.com/nicolargo/glances/raw/master/doc/percpu.png) -If horizontal space is available, per core CPU infomations are displayed. +If horizontal space is available, per core CPU infomations are displayed. Color code used: @@ -225,7 +225,7 @@ average sum of the number of processes waiting in the run-queue plus the number currently executing over 1, 5, and 15 minute time periods." Glances gets the number of CPU cores to adapt the alerts. With Glances, -alerts on average load are only set on 5 and 15 mins. The first line +alerts on average load are only set on 5 and 15 mins. The first line also display the number of CPU core. If average load is < O.7*Core, then status is set to "OK". @@ -276,11 +276,11 @@ If bit rate is > 90%, then status is set to "CRITICAL". For example, on a 100 Mbps Ethernet interface, the warning status is set if the bit rate is higher than 70 Mbps. -### Sensors (optional) +### Sensors (optional; only available on Linux) ![screenshot](https://github.com/nicolargo/glances/raw/master/doc/sensors.png) -Optinaly, Glances displays the sensors informations (lm-sensors). +Optionally, Glances displays the sensors informations (lm-sensors). You should enable this module using the following command line: @@ -391,6 +391,7 @@ Glances localization files exist for: * English (default langage) * French +* Italian * Spanish * Portugal diff --git a/README.md b/README.md index 2659f1aa..5db23e71 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ Pre-requisites (information for packagers): * python-setuptools (for the installation via setup.py) * python-psutil 0.4.1+ (replace the old libstatgrab's lib) * python-jinja2 2.0+ (optional for HTML export) +* pysensors (Python library for sensors stats) ### From package manager (very easy way) @@ -49,7 +50,7 @@ You first need to install pypi on your system. For example on Debian/Ubuntu: Then install the latest Glances version: $ sudo pip install Glances - + Note: if you are behind an HTTP Proxy, you should use $ sudo pip install --proxy=user:password@url:port Glances @@ -80,7 +81,7 @@ If you have the following error: Error: Failed executing: pip install glances==1.X --install-option=--prefix=/usr/local/XXX/glances/1.X (.rb:) This link will help resolve the above errors: https://github.com/mxcl/homebrew/wiki/bug-fixing-checklist - + Try to runs: $ pip install glances==1.X --install-option=--prefix=/usr/local/XXX/glances/1.X @@ -88,7 +89,7 @@ Try to runs: ### Concerning Windows operating system -Windows operating system only support the Glances in server mode. So if you ran Glances on Windows, it will be automaticaly running in server mode. +Windows operating system only support the Glances in server mode. So if you ran Glances on Windows, it will be automaticaly running in server mode. To install Glances on you system: @@ -102,7 +103,7 @@ I need contributors to package Glances for Windows (for exemple using [PyInstall Get the latest version (form GitHub): - $ rm -rf /tmp/nicolargo-glances-* + $ rm -rf /tmp/nicolargo-glances-* $ wget -O /tmp/glances-last.tgz https://github.com/nicolargo/glances/tarball/master Glances use a standard GNU style installer (for a Debian like system): @@ -121,7 +122,7 @@ Glances use a standard GNU style installer (for a Debian like system): If you want to monitor your local machine, just run: $ glances - + ### In client/server mode If you want to remotely monitor a machine (called server) from another one (called client). @@ -129,7 +130,7 @@ If you want to remotely monitor a machine (called server) from another one (call Run this command on the server: server$ glances -s - + and this one on the client: client$ glances -c @server @@ -164,6 +165,7 @@ When Glances is running, you can press: * 'b' switch between bit/s or byte/s for network IO * 'c' sort the processes list by CPU consumption * 'd' disable or enable the disk IO stats +* 'e' enable the sensors module (PySensors library is needed; Linux-only) * 'f' disable or enable the file system stats * 'l' disable or enable the logs * 'm' sort the processes list by process MEM @@ -202,7 +204,7 @@ time. The total CPU usage is displayed on the first line. ![screenshot](https://github.com/nicolargo/glances/raw/master/doc/percpu.png) -If horizontal space is available, per core CPU infomations are displayed. +If horizontal space is available, per core CPU infomations are displayed. Color code used: @@ -223,7 +225,7 @@ average sum of the number of processes waiting in the run-queue plus the number currently executing over 1, 5, and 15 minute time periods." Glances gets the number of CPU cores to adapt the alerts. With Glances, -alerts on average load are only set on 5 and 15 mins. The first line +alerts on average load are only set on 5 and 15 mins. The first line also display the number of CPU core. If average load is < O.7*Core, then status is set to "OK". @@ -274,6 +276,18 @@ If bit rate is > 90%, then status is set to "CRITICAL". For example, on a 100 Mbps Ethernet interface, the warning status is set if the bit rate is higher than 70 Mbps. +### Sensors (optional; only available on Linux) + +![screenshot](https://github.com/nicolargo/glances/raw/master/doc/sensors.png) + +Optionally, Glances displays the sensors informations (lm-sensors). + +You should enable this module using the following command line: + + glances -e + +There is no alert on this information. + ### Disk I/O ![screenshot](https://github.com/nicolargo/glances/raw/master/doc/diskio.png) @@ -377,6 +391,7 @@ Glances localization files exist for: * English (default langage) * French +* Italian * Spanish * Portugal diff --git a/glances/glances.py b/glances/glances.py index cd644d98..1a34ee91 100755 --- a/glances/glances.py +++ b/glances/glances.py @@ -1,22 +1,22 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # # Glances is a simple textual monitoring tool # -# Copyright (C) Nicolargo 2012 +# Copyright (C) 2012 Nicolargo # -# Glances is distributed -# under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation, either version 3 of the License, or +# Glances is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# Glances is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the GNU Lesser General Public License for more details. +# Glances is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see ."; -# +# along with this program. If not, see . __appname__ = 'glances' __version__ = "1.5.2b" @@ -57,7 +57,8 @@ except ImportError: # For Python v3.x from xmlrpc.client import ServerProxy -if platform.system() != 'Windows': +is_Windows = sys.platform.startswith('win') +if not is_Windows: # Only import curses for non Windows OS # Curses did not exist on Windows OS (shame on it) try: @@ -88,6 +89,7 @@ except Exception: else: psutil_get_cpu_percent_tag = True +is_Linux = sys.platform.startswith('linux') try: # get_io_counter method only available with PsUtil 0.2.1+ psutil.Process(os.getpid()).get_io_counters() @@ -95,7 +97,7 @@ except Exception: psutil_get_io_counter_tag = False else: # get_io_counter only available on Linux - if sys.platform.startswith("linux"): + if is_Linux: psutil_get_io_counter_tag = True else: psutil_get_io_counter_tag = False @@ -142,18 +144,22 @@ except Exception: else: psutil_network_io_tag = True -try: - # Sensors (optionnal) - import sensors -except ImportError: +# Sensors (optional; only available on Linux) +if is_Linux: + try: + import sensors + except ImportError: + sensors_lib_tag = False + sensors_tag = False + else: + sensors_lib_tag = True + sensors_tag = True +else: sensors_lib_tag = False sensors_tag = False -else: - sensors_lib_tag = True - sensors_tag = True try: - # HTML output (optionnal) + # HTML output (optional) import jinja2 except ImportError: html_lib_tag = False @@ -161,7 +167,7 @@ else: html_lib_tag = True try: - # CSV output (optionnal) + # CSV output (optional) import csv except ImportError: cvs_lib_tag = False @@ -260,8 +266,7 @@ class glancesLogs: * item_type is matching """ for i in range(self.len()): - if (self.logs_list[i][1] < 0 and - self.logs_list[i][3] == item_type): + if self.logs_list[i][1] < 0 and self.logs_list[i][3] == item_type: return i return -1 @@ -281,20 +286,20 @@ class glancesLogs: """ # Add Top process sort depending on alert type - if (item_type.startswith("MEM")): + if item_type.startswith("MEM"): # MEM sortby = 'memory_percent' else: # CPU* and LOAD sortby = 'cpu_percent' - topprocess = sorted(proc_list, key=lambda process: process[sortby], reverse=True) + topprocess = sorted(proc_list, key=lambda process: process[sortby], + reverse=True) # Add or update the log item_index = self.__itemexist__(item_type) if item_index < 0: # Item did not exist, add if WARNING or CRITICAL - if (item_state == "WARNING" or - item_state == "CRITICAL"): + if item_state == "WARNING" or item_state == "CRITICAL": # Time is stored in Epoch format # Epoch -> DMYHMS = datetime.fromtimestamp(epoch) item = [] @@ -313,8 +318,7 @@ class glancesLogs: self.logs_list.pop() else: # Item exist, update - if (item_state == "OK" or - item_state == "CAREFUL"): + if item_state == "OK" or item_state == "CAREFUL": # Close the item self.logs_list[item_index][1] = time.mktime( datetime.now().timetuple()) @@ -353,8 +357,7 @@ class glancesLogs: clean_logs_list = [] while (self.len() > 0): item = self.logs_list.pop() - if ((item[1] < 0) - or (not critical and item[2] == "CRITICAL")): + if item[1] < 0 or (not critical and item[2] == "CRITICAL"): clean_logs_list.insert(0, item) # The list is now the clean one self.logs_list = clean_logs_list @@ -421,7 +424,7 @@ class glancesGrabFs: class glancesGrabSensors: """ - Get Sensors stats using the PySensors lib + Get sensors stats using the PySensors library """ def __init__(self): @@ -442,15 +445,15 @@ class glancesGrabSensors: # Reset the list self.sensors_list = [] - # Open the current mounted FS + # grab only temperature stats if self.initok: for chip in sensors.iter_detected_chips(): for feature in chip: sensors_current = {} - sensors_current['label'] = chip.prefix + " " + feature.label - sensors_current['label'] = sensors_current['label'][-20:] - sensors_current['value'] = feature.get_value() - self.sensors_list.append(sensors_current) + if feature.name.startswith('temp'): + sensors_current['label'] = feature.label[:20] + sensors_current['value'] = int(feature.get_value()) + self.sensors_list.append(sensors_current) def get(self): self.__update__() @@ -471,7 +474,7 @@ class GlancesGrabProcesses: Get process (proc) statistics """ procstat = {} - + procstat['memory_info'] = proc.get_memory_info() if psutil_get_cpu_percent_tag: @@ -489,7 +492,7 @@ class GlancesGrabProcesses: procstat['pid'] = proc.pid try: procstat['username'] = proc.username - except psutil.AccessDenied, err: + except psutil.AccessDenied: procstat['username'] = "?" pass @@ -497,7 +500,7 @@ class GlancesGrabProcesses: # Deprecated in PsUtil 0.5.0+ try: procstat['nice'] = proc.get_nice() - except psutil.AccessDenied, err: + except psutil.AccessDenied: procstat['nice'] = 0 pass elif hasattr(proc, 'nice'): @@ -511,7 +514,6 @@ class GlancesGrabProcesses: return procstat - def update(self): self.processlist = [] self.processcount = {'total': 0, 'running': 0, 'sleeping': 0} @@ -527,11 +529,9 @@ class GlancesGrabProcesses: self.processcount[str(proc.status)] = 1 self.processcount['total'] += 1 - def getcount(self): return self.processcount - def getlist(self): return self.processlist @@ -554,7 +554,7 @@ class GlancesStats: except Exception: self.glancesgrabfs = {} - # Init the sensors stats (optionnal) + # Init the sensors stats (optional) if sensors_tag: try: self.glancesgrabsensors = glancesGrabSensors() @@ -587,7 +587,6 @@ class GlancesStats: self.host['os_version'] = " ".join(os_version[::2]) else: self.host['os_version'] = "" - def __update__(self, input_stats): """ @@ -600,10 +599,14 @@ class GlancesStats: cputime.system + cputime.idle) # Only available on some OS - if hasattr(cputime, 'nice'): cputime_total += cputime.nice - if hasattr(cputime, 'iowait'): cputime_total += cputime.iowait - if hasattr(cputime, 'irq'): cputime_total += cputime.irq - if hasattr(cputime, 'softirq'): cputime_total += cputime.softirq + if hasattr(cputime, 'nice'): + cputime_total += cputime.nice + if hasattr(cputime, 'iowait'): + cputime_total += cputime.iowait + if hasattr(cputime, 'irq'): + cputime_total += cputime.irq + if hasattr(cputime, 'softirq'): + cputime_total += cputime.softirq if not hasattr(self, 'cputime_old'): self.cputime_old = cputime self.cputime_total_old = cputime_total @@ -732,8 +735,8 @@ class GlancesStats: phymem = psutil.phymem_usage() # buffers and cached (Linux, BSD) - buffers = getattr(psutil, 'phymem_buffers', lambda: 0)() - cached = getattr(psutil, 'cached_phymem', lambda: 0)() + buffers = getattr(psutil, 'phymem_buffers', 0)() + cached = getattr(psutil, 'cached_phymem', 0)() # phymem free and usage total = phymem.total @@ -784,7 +787,7 @@ class GlancesStats: self.network_old = self.network_new # SENSORS - if (sensors_tag): + if sensors_tag: self.sensors = self.glancesgrabsensors.get() # DISK I/O @@ -926,7 +929,7 @@ class GlancesStats: # Auto selection # If global MEM > 70% sort by MEM usage # else sort by CPU usage - if (self.mem['total'] != 0): + if self.mem['total'] != 0: memtotal = (self.mem['used'] * 100) / self.mem['total'] if memtotal > limits.getSTDWarning(): sortedby = 'memory_percent' @@ -951,7 +954,6 @@ class GlancesStatsServer(GlancesStats): self._init_host() self.all_stats["host"] = self.host - def __update__(self, input_stats): """ Update the stats @@ -1276,8 +1278,7 @@ class glancesScreen: self.pressedkey = self.term_window.getch() # Actions... - if (self.pressedkey == 27 or - self.pressedkey == 113): + if self.pressedkey == 27 or self.pressedkey == 113: # 'ESC'|'q' > Quit end() elif self.pressedkey == 49: @@ -1314,7 +1315,7 @@ class glancesScreen: # 'p' > Sort processes by name self.setProcessSortedBy('name') elif self.pressedkey == 115: - # 's' > Show/Hide Sensors stats + # 's' > Show/hide sensors stats (Linux-only) self.sensors_tag = not self.sensors_tag elif self.pressedkey == 119: # 'w' > Delete finished warning logs @@ -1448,7 +1449,7 @@ class glancesScreen: offset_x = 16 else: offset_x = 0 - + # Log if cpu: try: @@ -1551,7 +1552,7 @@ class glancesScreen: # display extended CPU stats when space is available if screen_y > self.cpu_y + 5 and tag_extendedcpu: - + y = 1 if 'nice' in cpu: # nice @@ -1590,15 +1591,15 @@ class glancesScreen: return 0 screen_x = self.screen.getmaxyx()[1] screen_y = self.screen.getmaxyx()[0] - + loadblocksize = 15 - + #~ test = max(0, (screen_x - (self.load_x + offset_x + loadblocksize))) #~ self.term_window.addnstr(1, test, str(test), 3) - + if (screen_y > self.load_y + 5 and screen_x > self.load_x + offset_x + loadblocksize): - + self.term_window.addnstr(self.load_y, self.load_x + offset_x, _("Load"), 4, self.title_color if self.hascolors else @@ -1632,7 +1633,7 @@ class glancesScreen: self.load_x + offset_x + 8, format(load['min15'], '>5.2f'), 5, self.__colors_list[alert]) - + # return the x offset to display mem return offset_x @@ -1651,7 +1652,7 @@ class glancesScreen: if (screen_y > self.mem_y + 5 and screen_x > self.mem_x + offset_x + memblocksize - extblocksize): - + # RAM self.term_window.addnstr(self.mem_y, self.mem_x + offset_x, _("Mem"), 8, @@ -1686,9 +1687,8 @@ class glancesScreen: self.mem_y + 3, self.mem_x + offset_x + 7, format(self.__autoUnit(mem['free']), '>5'), 5) - if (screen_x > self.mem_x + offset_x + memblocksize): - # Display extended informations if space is available - + # Display extended informations if space is available + if screen_x > self.mem_x + offset_x + memblocksize: # active and inactive (only available for psutil >= 0.6) if psutil_mem_vm: y = 0 @@ -1735,7 +1735,7 @@ class glancesScreen: else: # If space is NOT available then mind the gap... offset_x -= extblocksize - + # Swap self.term_window.addnstr(self.mem_y, self.mem_x + offset_x + 32, _("Swap"), 4, @@ -1783,8 +1783,7 @@ class glancesScreen: return 0 screen_x = self.screen.getmaxyx()[1] screen_y = self.screen.getmaxyx()[0] - if (screen_y > self.network_y + 3 and - screen_x > self.network_x + 28): + if screen_y > self.network_y + 3 and screen_x > self.network_x + 28: self.term_window.addnstr(self.network_y, self.network_x, _("Network"), 7, self.title_color if self.hascolors else curses.A_UNDERLINE) @@ -1834,7 +1833,7 @@ class glancesScreen: def displaySensors(self, sensors, offset_y=0): """ - Display the Sensors stats + Display the sensors stats (Linux-only) Return the number of sensors stats """ if not self.sensors_tag or not sensors: @@ -1842,14 +1841,13 @@ class glancesScreen: screen_x = self.screen.getmaxyx()[1] screen_y = self.screen.getmaxyx()[0] self.sensors_y = offset_y - if (screen_y > self.sensors_y + 3 and - screen_x > self.sensors_x + 28): + if screen_y > self.sensors_y + 3 and screen_x > self.sensors_x + 28: # Sensors header self.term_window.addnstr(self.sensors_y, self.sensors_x, - _("Sensors"), 8, self.title_color + _("Sensors"), 7, self.title_color if self.hascolors else curses.A_UNDERLINE) - self.term_window.addnstr(self.sensors_y, self.sensors_x + 22, - _("C"), 3) + self.term_window.addnstr(self.sensors_y, self.sensors_x + 21, + format(_("°C"), '>3'), 3) # Adapt the maximum interface to the screen ret = 2 @@ -1859,8 +1857,8 @@ class glancesScreen: self.sensors_y + 1 + i, self.sensors_x, sensors[i]['label'] + ':', 21) self.term_window.addnstr( - self.sensors_y + 1 + i, self.sensors_x + 22, - format(int(sensors[i]['value'])), 3) + self.sensors_y + 1 + i, self.sensors_x + 20, + format(sensors[i]['value'], '>3'), 3) ret = ret + 1 return ret return 0 @@ -1872,8 +1870,7 @@ class glancesScreen: screen_x = self.screen.getmaxyx()[1] screen_y = self.screen.getmaxyx()[0] self.diskio_y = offset_y - if (screen_y > self.diskio_y + 3 and - screen_x > self.diskio_x + 28): + if screen_y > self.diskio_y + 3 and screen_x > self.diskio_x + 28: self.term_window.addnstr(self.diskio_y, self.diskio_x, _("Disk I/O"), 8, self.title_color if self.hascolors else @@ -1921,8 +1918,7 @@ class glancesScreen: screen_x = self.screen.getmaxyx()[1] screen_y = self.screen.getmaxyx()[0] self.fs_y = offset_y - if (screen_y > self.fs_y + 3 and - screen_x > self.fs_x + 28): + if screen_y > self.fs_y + 3 and screen_x > self.fs_x + 28: self.term_window.addnstr(self.fs_y, self.fs_x, _("Mount"), 5, self.title_color if self.hascolors else curses.A_UNDERLINE) @@ -1968,14 +1964,13 @@ class glancesScreen: screen_x = self.screen.getmaxyx()[1] screen_y = self.screen.getmaxyx()[0] self.log_y = offset_y - if (screen_y > self.log_y + 3 and - screen_x > self.log_x + 79): + if screen_y > self.log_y + 3 and screen_x > self.log_x + 79: self.log_y = max(offset_y, screen_y - 3 - min(offset_y - 3, screen_y - self.log_y, logs.len())) logtodisplay_count = min(screen_y - self.log_y - 3, logs.len()) logmsg = _("WARNING|CRITICAL logs for CPU|LOAD|MEM") - if (logtodisplay_count > 1): + if logtodisplay_count > 1: logmsg += (_(" (lasts ") + str(logtodisplay_count) + _(" entries)")) else: @@ -1989,7 +1984,7 @@ class glancesScreen: log = logs.get() for logcount in range(0, logtodisplay_count): logmsg = " " + str(datetime.fromtimestamp(log[logcount][0])) - if (log[logcount][1] > 0): + if log[logcount][1] > 0: logmark = ' ' logmsg += (" > " + str(datetime.fromtimestamp(log[logcount][1]))) @@ -2036,8 +2031,7 @@ class glancesScreen: process_x = self.process_x # Processes summary - if (screen_y > self.process_y + 4 and - screen_x > process_x + 48): + if screen_y > self.process_y + 4 and screen_x > process_x + 48: self.term_window.addnstr(self.process_y, process_x, _("Processes"), 9, self.title_color if self.hascolors else curses.A_UNDERLINE) @@ -2056,9 +2050,7 @@ class glancesScreen: _("other")), 42) # Processes detail - if (screen_y > self.process_y + 4 and - screen_x > process_x + 49): - + if screen_y > self.process_y + 4 and screen_x > process_x + 49: tag_pid = False tag_uid = False tag_nice = False @@ -2275,21 +2267,21 @@ class glancesScreen: # Caption screen_x = self.screen.getmaxyx()[1] screen_y = self.screen.getmaxyx()[0] - if (client_tag): - if (cs_status.lower() == "connected"): + if client_tag: + if cs_status.lower() == "connected": msg_client = _("Connected to") + " " + format(server_ip) msg_client_style = self.default_color2 if self.hascolors else curses.A_UNDERLINE - elif (cs_status.lower() == "disconnected"): + elif cs_status.lower() == "disconnected": msg_client = _("Disconnected from") + " " + format(server_ip) msg_client_style = self.ifCRITICAL_color2 if self.hascolors else curses.A_UNDERLINE msg_help = _("Press 'h' for help") - if (client_tag): + if client_tag: if (screen_y > self.caption_y and screen_x > self.caption_x + len(msg_client)): self.term_window.addnstr(max(self.caption_y, screen_y - 1), self.caption_x, msg_client, len(msg_client), msg_client_style) - if (screen_x > self.caption_x + len(msg_client) + 3 + len(msg_help)): + if screen_x > self.caption_x + len(msg_client) + 3 + len(msg_help): self.term_window.addnstr(max(self.caption_y, screen_y - 1), self.caption_x + len(msg_client), ' | ' + msg_help, 3 + len(msg_help)) @@ -2308,8 +2300,7 @@ class glancesScreen: return 0 screen_x = self.screen.getmaxyx()[1] screen_y = self.screen.getmaxyx()[0] - if (screen_y > self.help_y + 23 and - screen_x > self.help_x + 79): + if screen_y > self.help_y + 23 and screen_x > self.help_x + 79: # Console 80x24 is mandatory to display the help message self.erase() @@ -2387,7 +2378,7 @@ class glancesScreen: self.term_window.addnstr( self.help_y + 13, self.help_x, "{0:^{width}} {1}".format( - _("s"), _("Show/hide sensors stats"), width=width), + _("s"), _("Show/hide sensors stats (Linux-only)"), width=width), 79, self.ifCRITICAL_color2 if not psutil_network_io_tag else 0) self.term_window.addnstr( self.help_y + 14, self.help_x, @@ -2421,8 +2412,7 @@ class glancesScreen: return 0 screen_x = self.screen.getmaxyx()[1] screen_y = self.screen.getmaxyx()[0] - if (screen_y > self.now_y and - screen_x > self.now_x): + if screen_y > self.now_y and screen_x > self.now_x: now_msg = now.strftime(_("%Y-%m-%d %H:%M:%S")) self.term_window.addnstr( max(self.now_y, screen_y - 1), @@ -2599,8 +2589,7 @@ class glancesCsv: load = stats.getLoad() self.__csvfile.writerow(["load", load['min1'], load['min5'], load['min15']]) - if (stats.getMem() and - stats.getMemSwap()): + if stats.getMem() and stats.getMemSwap(): # Update CSV with the MEM stats mem = stats.getMem() self.__csvfile.writerow(["mem", mem['total'], mem['used'], @@ -2751,7 +2740,7 @@ def printSyntax(): print(_("\t-B IP|NAME\tBind server to the given IP or host NAME")) print(_("\t-c @IP|host\tConnect to a Glances server")) print(_("\t-d\t\tDisable disk I/O module")) - print(_("\t-e\t\tEnable the sensors module")) + print(_("\t-e\t\tEnable the sensors module (Linux-only)")) print(_("\t-f file\t\tSet the output folder (HTML) or file (CSV)")) print(_("\t-h\t\tDisplay the syntax and exit")) print(_("\t-m\t\tDisable mount module")) @@ -2808,8 +2797,8 @@ def main(): html_tag = False csv_tag = False client_tag = False - if os.name == "nt": - # Force server mode for Windows operating system + if is_Windows: + # Force server mode for Windows OS server_tag = True else: server_tag = False @@ -2866,11 +2855,14 @@ def main(): printSyntax() sys.exit(2) elif opt in ("-e", "--sensors"): - if not sensors_lib_tag: - print(_("Error: PySensors lib not found")) - sys.exit(2) + if is_Linux: + if not sensors_lib_tag: + print(_("Error: PySensors library not found")) + sys.exit(2) + else: + sensors_tag = True else: - sensors_tag = True + print(_("Error: Sensors module is only available on Linux")) elif opt in ("-f", "--file"): output_file = arg output_folder = arg diff --git a/glances/unitest.py b/glances/unitest.py index 1ec24454..48449551 100755 --- a/glances/unitest.py +++ b/glances/unitest.py @@ -1,37 +1,39 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # # Glances unitary test # # Syntax: # ./unitest.py +# or +# ./unitest.py -v # -# or ./unitest.py -v +# Copyright (C) 2012 Nicolargo # -# Copyright (C) Nicolargo 2012 -# -# under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation, either version 3 of the License, or +# Glances is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# Glances is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the GNU Lesser General Public License for more details. +# Glances is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see ."; -# +# along with this program. If not, see . import unittest import glances import multiprocessing -import time +# import time + class TestGlancesStat(unittest.TestCase): def setUp(self): self.stats = glances.GlancesStats() - self.stats.update() + self.stats.update() def test_Glances_getSystem(self): self.stats.update() diff --git a/i18n/es/LC_MESSAGES/glances.mo b/i18n/es/LC_MESSAGES/glances.mo index e6a922d5..d62b71de 100644 Binary files a/i18n/es/LC_MESSAGES/glances.mo and b/i18n/es/LC_MESSAGES/glances.mo differ diff --git a/i18n/es/LC_MESSAGES/glances.po b/i18n/es/LC_MESSAGES/glances.po index 0a6dec05..2e63bee9 100644 --- a/i18n/es/LC_MESSAGES/glances.po +++ b/i18n/es/LC_MESSAGES/glances.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GLANCES 1.3.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-03 15:00+0100\n" +"POT-Creation-Date: 2012-12-14 01:52+0100\n" "PO-Revision-Date: 2012-01-12 19:07+0100\n" "Last-Translator: Sebastián Moreno \n" "Language-Team: Spanish\n" @@ -17,105 +17,105 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: glances/glances.py:67 +#: glances/glances.py:68 msgid "Curses module not found. Glances cannot start." msgstr "" -#: glances/glances.py:74 +#: glances/glances.py:75 msgid "PsUtil module not found. Glances cannot start." msgstr "" -#: glances/glances.py:79 +#: glances/glances.py:80 #, python-format msgid "PsUtil version %s detected." msgstr "" -#: glances/glances.py:80 +#: glances/glances.py:81 msgid "PsUtil 0.4.1 or higher is needed. Glances cannot start." msgstr "" -#: glances/glances.py:1092 +#: glances/glances.py:1062 msgid "Error: Cannot init the curses library.\n" msgstr "" -#: glances/glances.py:1447 +#: glances/glances.py:1414 msgid "{0} {1} with {2} {3} on {4}" msgstr "" -#: glances/glances.py:1452 +#: glances/glances.py:1419 msgid "{0} {1} {2} on {3}" msgstr "" -#: glances/glances.py:1487 +#: glances/glances.py:1463 msgid "PerCPU" msgstr "" -#: glances/glances.py:1493 glances/glances.py:1538 glances/glances.py:1785 -#: glances/glances.py:1875 glances/glances.py:2140 +#: glances/glances.py:1469 glances/glances.py:1515 glances/glances.py:1795 +#: glances/glances.py:1883 glances/glances.py:2143 msgid "Compute data..." msgstr "" -#: glances/glances.py:1497 glances/glances.py:1547 +#: glances/glances.py:1473 glances/glances.py:1525 msgid "user:" msgstr "" -#: glances/glances.py:1499 glances/glances.py:1556 +#: glances/glances.py:1475 glances/glances.py:1536 msgid "system:" msgstr "" -#: glances/glances.py:1501 glances/glances.py:1564 +#: glances/glances.py:1477 glances/glances.py:1545 msgid "idle:" msgstr "" -#: glances/glances.py:1532 +#: glances/glances.py:1509 msgid "CPU" msgstr "" -#: glances/glances.py:1572 +#: glances/glances.py:1557 msgid "nice:" msgstr "" -#: glances/glances.py:1583 +#: glances/glances.py:1566 msgid "iowait:" msgstr "" -#: glances/glances.py:1595 +#: glances/glances.py:1576 msgid "irq:" msgstr "" -#: glances/glances.py:1616 +#: glances/glances.py:1601 msgid "Load" msgstr "Carga" -#: glances/glances.py:1620 +#: glances/glances.py:1605 msgid "-core" msgstr "" -#: glances/glances.py:1624 +#: glances/glances.py:1609 msgid "1 min:" msgstr "1 minuto:" -#: glances/glances.py:1631 +#: glances/glances.py:1616 msgid "5 min:" msgstr "" -#: glances/glances.py:1641 +#: glances/glances.py:1626 msgid "15 min:" msgstr "" -#: glances/glances.py:1659 +#: glances/glances.py:1655 msgid "Mem" msgstr "Mem" -#: glances/glances.py:1669 glances/glances.py:1739 +#: glances/glances.py:1665 glances/glances.py:1750 msgid "total:" msgstr "" -#: glances/glances.py:1678 glances/glances.py:1749 +#: glances/glances.py:1674 glances/glances.py:1760 msgid "used:" msgstr "" -#: glances/glances.py:1686 glances/glances.py:1758 +#: glances/glances.py:1682 glances/glances.py:1769 msgid "free:" msgstr "" @@ -123,454 +123,458 @@ msgstr "" msgid "active:" msgstr "" -#: glances/glances.py:1704 +#: glances/glances.py:1706 msgid "inactive:" msgstr "" -#: glances/glances.py:1712 +#: glances/glances.py:1716 msgid "buffers:" msgstr "" -#: glances/glances.py:1720 +#: glances/glances.py:1726 msgid "cached:" msgstr "" -#: glances/glances.py:1727 +#: glances/glances.py:1738 msgid "Swap" msgstr "Intercambio" -#: glances/glances.py:1775 +#: glances/glances.py:1785 msgid "Network" msgstr "" -#: glances/glances.py:1778 +#: glances/glances.py:1788 msgid "Rx/s" msgstr "" -#: glances/glances.py:1780 +#: glances/glances.py:1790 msgid "Tx/s" msgstr "" -#: glances/glances.py:1835 +#: glances/glances.py:1844 msgid "Sensors" msgstr "" -#: glances/glances.py:1838 -msgid "C" +#: glances/glances.py:1847 +msgid "°C" msgstr "" -#: glances/glances.py:1864 +#: glances/glances.py:1872 msgid "Disk I/O" msgstr "Lectura/Escritura a disco" -#: glances/glances.py:1868 +#: glances/glances.py:1876 msgid "In/s" msgstr "" -#: glances/glances.py:1870 +#: glances/glances.py:1878 msgid "Out/s" msgstr "" -#: glances/glances.py:1912 +#: glances/glances.py:1919 msgid "Mount" msgstr "Montaje" -#: glances/glances.py:1916 +#: glances/glances.py:1923 msgid "Used" msgstr "Usado" -#: glances/glances.py:1918 +#: glances/glances.py:1925 msgid "Total" msgstr "Total" -#: glances/glances.py:1963 +#: glances/glances.py:1969 msgid "WARNING|CRITICAL logs for CPU|LOAD|MEM" msgstr "" -#: glances/glances.py:1965 +#: glances/glances.py:1971 msgid " (lasts " msgstr "" -#: glances/glances.py:1966 +#: glances/glances.py:1972 msgid " entries)" msgstr "" -#: glances/glances.py:1968 +#: glances/glances.py:1974 msgid " (one entry)" msgstr "" -#: glances/glances.py:2027 +#: glances/glances.py:2032 msgid "Processes" msgstr "" -#: glances/glances.py:2038 +#: glances/glances.py:2043 msgid "running" msgstr "" -#: glances/glances.py:2040 +#: glances/glances.py:2045 msgid "sleeping" msgstr "" -#: glances/glances.py:2042 +#: glances/glances.py:2047 msgid "other" msgstr "" -#: glances/glances.py:2074 +#: glances/glances.py:2077 msgid "VIRT" msgstr "" -#: glances/glances.py:2078 +#: glances/glances.py:2081 msgid "RES" msgstr "" -#: glances/glances.py:2082 +#: glances/glances.py:2085 msgid "CPU%" msgstr "" -#: glances/glances.py:2087 +#: glances/glances.py:2090 msgid "MEM%" msgstr "" -#: glances/glances.py:2095 +#: glances/glances.py:2098 msgid "PID" msgstr "" -#: glances/glances.py:2101 +#: glances/glances.py:2104 msgid "USER" msgstr "" -#: glances/glances.py:2107 +#: glances/glances.py:2110 msgid "NI" msgstr "" -#: glances/glances.py:2113 +#: glances/glances.py:2116 msgid "S" msgstr "" -#: glances/glances.py:2119 +#: glances/glances.py:2122 msgid "TIME+" msgstr "" -#: glances/glances.py:2125 +#: glances/glances.py:2128 msgid "IO_R" msgstr "" -#: glances/glances.py:2129 +#: glances/glances.py:2132 msgid "IO_W" msgstr "" -#: glances/glances.py:2134 +#: glances/glances.py:2137 msgid "NAME" msgstr "" -#: glances/glances.py:2221 glances/glances.py:2224 +#: glances/glances.py:2224 glances/glances.py:2227 msgid "A_DENY" msgstr "" -#: glances/glances.py:2266 +#: glances/glances.py:2269 msgid "Connected to" msgstr "" -#: glances/glances.py:2269 +#: glances/glances.py:2272 msgid "Disconnected from" msgstr "" -#: glances/glances.py:2271 +#: glances/glances.py:2274 msgid "Press 'h' for help" msgstr "" -#: glances/glances.py:2303 +#: glances/glances.py:2307 msgid "Glances {0} with PsUtil {1}" msgstr "" -#: glances/glances.py:2309 +#: glances/glances.py:2313 msgid "Glances {0}" msgstr "" -#: glances/glances.py:2313 +#: glances/glances.py:2317 msgid "Captions: " msgstr "" -#: glances/glances.py:2315 +#: glances/glances.py:2319 msgid " OK " msgstr " BUENO " -#: glances/glances.py:2317 +#: glances/glances.py:2321 msgid "CAREFUL " msgstr " CUIDADO " -#: glances/glances.py:2319 +#: glances/glances.py:2323 msgid "WARNING " msgstr " ATENCIÓN " -#: glances/glances.py:2321 +#: glances/glances.py:2325 msgid "CRITICAL" msgstr "CRÍTICA " -#: glances/glances.py:2327 +#: glances/glances.py:2331 msgid "Key" msgstr "" -#: glances/glances.py:2327 +#: glances/glances.py:2331 msgid "Function" msgstr "" -#: glances/glances.py:2332 +#: glances/glances.py:2336 msgid "a" msgstr "" -#: glances/glances.py:2332 +#: glances/glances.py:2336 msgid "Sort processes automatically" msgstr "" -#: glances/glances.py:2338 +#: glances/glances.py:2342 msgid "b" msgstr "" -#: glances/glances.py:2338 +#: glances/glances.py:2342 msgid "Switch between bit/s or Byte/s for network IO" msgstr "" -#: glances/glances.py:2345 +#: glances/glances.py:2349 msgid "c" msgstr "" -#: glances/glances.py:2345 +#: glances/glances.py:2349 msgid "Sort processes by CPU%" msgstr "" -#: glances/glances.py:2351 +#: glances/glances.py:2355 msgid "m" msgstr "" -#: glances/glances.py:2351 +#: glances/glances.py:2355 msgid "Sort processes by MEM%" msgstr "" -#: glances/glances.py:2355 +#: glances/glances.py:2359 msgid "p" msgstr "" -#: glances/glances.py:2355 +#: glances/glances.py:2359 msgid "Sort processes by name" msgstr "" -#: glances/glances.py:2359 +#: glances/glances.py:2363 msgid "d" msgstr "" -#: glances/glances.py:2359 +#: glances/glances.py:2363 msgid "Show/hide disk I/O stats" msgstr "" -#: glances/glances.py:2364 +#: glances/glances.py:2368 msgid "f" msgstr "" -#: glances/glances.py:2364 +#: glances/glances.py:2368 msgid "Show/hide file system stats" msgstr "" -#: glances/glances.py:2369 +#: glances/glances.py:2373 msgid "n" msgstr "" -#: glances/glances.py:2369 +#: glances/glances.py:2373 msgid "Show/hide network stats" msgstr "" -#: glances/glances.py:2374 +#: glances/glances.py:2378 msgid "s" msgstr "" -#: glances/glances.py:2374 -msgid "Show/hide sensors stats" +#: glances/glances.py:2378 +msgid "Show/hide sensors stats (Linux-only)" msgstr "" -#: glances/glances.py:2379 +#: glances/glances.py:2383 msgid "l" msgstr "" -#: glances/glances.py:2379 +#: glances/glances.py:2383 msgid "Show/hide log messages" msgstr "" -#: glances/glances.py:2383 +#: glances/glances.py:2387 msgid "w" msgstr "" -#: glances/glances.py:2383 +#: glances/glances.py:2387 msgid "Delete finished warning logs messages" msgstr "" -#: glances/glances.py:2387 +#: glances/glances.py:2391 msgid "x" msgstr "" -#: glances/glances.py:2387 +#: glances/glances.py:2391 msgid "Delete finished warning and critical logs" msgstr "" -#: glances/glances.py:2391 +#: glances/glances.py:2395 msgid "1" msgstr "" -#: glances/glances.py:2391 +#: glances/glances.py:2395 msgid "Switch between global CPU and per core stats" msgstr "" -#: glances/glances.py:2395 +#: glances/glances.py:2399 msgid "h" msgstr "" -#: glances/glances.py:2395 +#: glances/glances.py:2399 msgid "Show/hide this help message" msgstr "" -#: glances/glances.py:2399 +#: glances/glances.py:2403 msgid "q" msgstr "" -#: glances/glances.py:2399 +#: glances/glances.py:2403 msgid "Quit (Esc and Ctrl-C also work)" msgstr "" -#: glances/glances.py:2410 +#: glances/glances.py:2413 msgid "%Y-%m-%d %H:%M:%S" msgstr "%d.%m.%Y %H:%M:%S" -#: glances/glances.py:2689 +#: glances/glances.py:2702 msgid "Error: creating client socket" msgstr "" -#: glances/glances.py:2697 +#: glances/glances.py:2710 msgid "Error: Connection to server failed" msgstr "" -#: glances/glances.py:2716 +#: glances/glances.py:2729 msgid "Glances version" msgstr "" -#: glances/glances.py:2721 +#: glances/glances.py:2734 msgid "Usage: glances [-f file] [-o output] [-t sec] [-h] [-v]" msgstr "" -#: glances/glances.py:2723 +#: glances/glances.py:2736 msgid "\t-b\t\tDisplay network rate in Byte per second" msgstr "" -#: glances/glances.py:2724 +#: glances/glances.py:2737 msgid "\t-B IP|NAME\tBind server to the given IP or host NAME" msgstr "" -#: glances/glances.py:2725 +#: glances/glances.py:2738 msgid "\t-c @IP|host\tConnect to a Glances server" msgstr "" -#: glances/glances.py:2726 +#: glances/glances.py:2739 msgid "\t-d\t\tDisable disk I/O module" msgstr "" -#: glances/glances.py:2727 -msgid "\t-e\t\tEnable the sensors module" +#: glances/glances.py:2740 +msgid "\t-e\t\tEnable the sensors module (Linux-only)" msgstr "" -#: glances/glances.py:2728 +#: glances/glances.py:2741 msgid "\t-f file\t\tSet the output folder (HTML) or file (CSV)" msgstr "" -#: glances/glances.py:2729 +#: glances/glances.py:2742 msgid "\t-h\t\tDisplay the syntax and exit" msgstr "" -#: glances/glances.py:2730 +#: glances/glances.py:2743 msgid "\t-m\t\tDisable mount module" msgstr "" -#: glances/glances.py:2731 +#: glances/glances.py:2744 msgid "\t-n\t\tDisable network module" msgstr "" -#: glances/glances.py:2732 +#: glances/glances.py:2745 msgid "\t-o output\tDefine additional output (available: HTML or CSV)" msgstr "" -#: glances/glances.py:2733 +#: glances/glances.py:2746 #, python-format msgid "\t-p PORT\t\tDefine the client or server TCP port (default: %d)" msgstr "" -#: glances/glances.py:2735 +#: glances/glances.py:2748 msgid "\t-s\t\tRun Glances in server mode" msgstr "" -#: glances/glances.py:2736 +#: glances/glances.py:2749 #, python-format msgid "\t-t sec\t\tSet the refresh time in seconds (default: %d)" msgstr "" -#: glances/glances.py:2738 +#: glances/glances.py:2751 msgid "\t-v\t\tDisplay the version and exit" msgstr "" -#: glances/glances.py:2819 +#: glances/glances.py:2832 msgid "Error: -B flag need an argument (bind IP address)" msgstr "" -#: glances/glances.py:2827 +#: glances/glances.py:2840 msgid "Error: -c flag need an argument (server IP address/name" msgstr "" -#: glances/glances.py:2838 +#: glances/glances.py:2851 #, python-format msgid "Error: Unknown output %s" msgstr "" -#: glances/glances.py:2843 -msgid "Error: PySensors lib not found" +#: glances/glances.py:2857 +msgid "Error: PySensors library not found" msgstr "" -#: glances/glances.py:2854 +#: glances/glances.py:2862 +msgid "Error: Sensors module is only available on Linux" +msgstr "" + +#: glances/glances.py:2870 msgid "Error: Refresh time should be a positive integer" msgstr "" -#: glances/glances.py:2871 +#: glances/glances.py:2887 msgid "Error: Can not use both -s and -c flag" msgstr "" -#: glances/glances.py:2874 +#: glances/glances.py:2890 msgid "Error: Can not use both -s and -o flag" msgstr "" -#: glances/glances.py:2879 +#: glances/glances.py:2895 msgid "Error: Can not use both -c and -o flag" msgstr "" -#: glances/glances.py:2884 +#: glances/glances.py:2900 msgid "Error: Need Jinja2 library to export into HTML" msgstr "" -#: glances/glances.py:2885 +#: glances/glances.py:2901 msgid "Try to install the python-jinja2 package" msgstr "" -#: glances/glances.py:2890 +#: glances/glances.py:2906 msgid "Error: HTML export (-o html) needoutput folder definition (-f )" msgstr "" -#: glances/glances.py:2896 +#: glances/glances.py:2912 msgid "Error: Need CSV library to export into CSV" msgstr "" -#: glances/glances.py:2901 +#: glances/glances.py:2917 msgid "Error: CSV export (-o csv) need output file definition (-f )" msgstr "" -#: glances/glances.py:2923 +#: glances/glances.py:2939 msgid "Glances server is running on" msgstr "" -#: glances/glances.py:2936 +#: glances/glances.py:2952 msgid "Error: The server version is not compatible" msgstr "" diff --git a/i18n/fr/LC_MESSAGES/glances.mo b/i18n/fr/LC_MESSAGES/glances.mo index 1f97f1c6..14f8caa7 100644 Binary files a/i18n/fr/LC_MESSAGES/glances.mo and b/i18n/fr/LC_MESSAGES/glances.mo differ diff --git a/i18n/fr/LC_MESSAGES/glances.po b/i18n/fr/LC_MESSAGES/glances.po index 52ab5a78..26f69ca7 100644 --- a/i18n/fr/LC_MESSAGES/glances.po +++ b/i18n/fr/LC_MESSAGES/glances.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GLANCES 1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-03 15:00+0100\n" +"POT-Creation-Date: 2012-12-14 01:52+0100\n" "PO-Revision-Date: 2012-01-06 15:23+0100\n" "Last-Translator: Peter Fontaine \n" "Language-Team: French\n" @@ -18,105 +18,105 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: glances/glances.py:67 +#: glances/glances.py:68 msgid "Curses module not found. Glances cannot start." msgstr "Le module Curses n'a pas été trouvé. Glances ne peut pas démarrer" -#: glances/glances.py:74 +#: glances/glances.py:75 msgid "PsUtil module not found. Glances cannot start." msgstr "Le module PsUtil n'a pas été trouvé. Glances ne peut pas démarrer" -#: glances/glances.py:79 +#: glances/glances.py:80 #, python-format msgid "PsUtil version %s detected." msgstr "" -#: glances/glances.py:80 +#: glances/glances.py:81 msgid "PsUtil 0.4.1 or higher is needed. Glances cannot start." msgstr "" -#: glances/glances.py:1092 +#: glances/glances.py:1062 msgid "Error: Cannot init the curses library.\n" msgstr " Erreur d'initailisation de la librairie Curses.\n" -#: glances/glances.py:1447 +#: glances/glances.py:1414 msgid "{0} {1} with {2} {3} on {4}" msgstr "{0} {1} avec {2} {3} sur {4}" -#: glances/glances.py:1452 +#: glances/glances.py:1419 msgid "{0} {1} {2} on {3}" msgstr "{0} {1} {2} sur {3}" -#: glances/glances.py:1487 +#: glances/glances.py:1463 msgid "PerCPU" msgstr "Par CPU" -#: glances/glances.py:1493 glances/glances.py:1538 glances/glances.py:1785 -#: glances/glances.py:1875 glances/glances.py:2140 +#: glances/glances.py:1469 glances/glances.py:1515 glances/glances.py:1795 +#: glances/glances.py:1883 glances/glances.py:2143 msgid "Compute data..." msgstr "Calcul des données" -#: glances/glances.py:1497 glances/glances.py:1547 +#: glances/glances.py:1473 glances/glances.py:1525 msgid "user:" msgstr "" -#: glances/glances.py:1499 glances/glances.py:1556 +#: glances/glances.py:1475 glances/glances.py:1536 msgid "system:" msgstr "" -#: glances/glances.py:1501 glances/glances.py:1564 +#: glances/glances.py:1477 glances/glances.py:1545 msgid "idle:" msgstr "" -#: glances/glances.py:1532 +#: glances/glances.py:1509 msgid "CPU" msgstr "" -#: glances/glances.py:1572 +#: glances/glances.py:1557 msgid "nice:" msgstr "" -#: glances/glances.py:1583 +#: glances/glances.py:1566 msgid "iowait:" msgstr "" -#: glances/glances.py:1595 +#: glances/glances.py:1576 msgid "irq:" msgstr "" -#: glances/glances.py:1616 +#: glances/glances.py:1601 msgid "Load" msgstr "Charge" -#: glances/glances.py:1620 +#: glances/glances.py:1605 msgid "-core" msgstr "" -#: glances/glances.py:1624 +#: glances/glances.py:1609 msgid "1 min:" msgstr "" -#: glances/glances.py:1631 +#: glances/glances.py:1616 msgid "5 min:" msgstr "" -#: glances/glances.py:1641 +#: glances/glances.py:1626 msgid "15 min:" msgstr "" -#: glances/glances.py:1659 +#: glances/glances.py:1655 msgid "Mem" msgstr "" -#: glances/glances.py:1669 glances/glances.py:1739 +#: glances/glances.py:1665 glances/glances.py:1750 msgid "total:" msgstr "" -#: glances/glances.py:1678 glances/glances.py:1749 +#: glances/glances.py:1674 glances/glances.py:1760 msgid "used:" msgstr "" -#: glances/glances.py:1686 glances/glances.py:1758 +#: glances/glances.py:1682 glances/glances.py:1769 msgid "free:" msgstr "" @@ -124,454 +124,458 @@ msgstr "" msgid "active:" msgstr "" -#: glances/glances.py:1704 +#: glances/glances.py:1706 msgid "inactive:" msgstr "" -#: glances/glances.py:1712 +#: glances/glances.py:1716 msgid "buffers:" msgstr "" -#: glances/glances.py:1720 +#: glances/glances.py:1726 msgid "cached:" msgstr "" -#: glances/glances.py:1727 +#: glances/glances.py:1738 msgid "Swap" msgstr "" -#: glances/glances.py:1775 +#: glances/glances.py:1785 msgid "Network" msgstr "" -#: glances/glances.py:1778 +#: glances/glances.py:1788 msgid "Rx/s" msgstr "" -#: glances/glances.py:1780 +#: glances/glances.py:1790 msgid "Tx/s" msgstr "" -#: glances/glances.py:1835 +#: glances/glances.py:1844 msgid "Sensors" msgstr "" -#: glances/glances.py:1838 -msgid "C" +#: glances/glances.py:1847 +msgid "°C" msgstr "" -#: glances/glances.py:1864 +#: glances/glances.py:1872 msgid "Disk I/O" msgstr "IO Disque" -#: glances/glances.py:1868 +#: glances/glances.py:1876 msgid "In/s" msgstr "" -#: glances/glances.py:1870 +#: glances/glances.py:1878 msgid "Out/s" msgstr "" -#: glances/glances.py:1912 +#: glances/glances.py:1919 msgid "Mount" msgstr "Montage" -#: glances/glances.py:1916 +#: glances/glances.py:1923 msgid "Used" msgstr "Utilisé" -#: glances/glances.py:1918 +#: glances/glances.py:1925 msgid "Total" msgstr "" -#: glances/glances.py:1963 +#: glances/glances.py:1969 msgid "WARNING|CRITICAL logs for CPU|LOAD|MEM" msgstr "Alertes WARNING|CRITICAL pout CPU|CHARGE|MEM" -#: glances/glances.py:1965 +#: glances/glances.py:1971 msgid " (lasts " msgstr " (dernières " -#: glances/glances.py:1966 +#: glances/glances.py:1972 msgid " entries)" msgstr " entrées)" -#: glances/glances.py:1968 +#: glances/glances.py:1974 msgid " (one entry)" msgstr " (une entrée)" -#: glances/glances.py:2027 +#: glances/glances.py:2032 msgid "Processes" msgstr "Processus" -#: glances/glances.py:2038 +#: glances/glances.py:2043 msgid "running" msgstr "" -#: glances/glances.py:2040 +#: glances/glances.py:2045 msgid "sleeping" msgstr "" -#: glances/glances.py:2042 +#: glances/glances.py:2047 msgid "other" msgstr "" -#: glances/glances.py:2074 +#: glances/glances.py:2077 msgid "VIRT" msgstr "" -#: glances/glances.py:2078 +#: glances/glances.py:2081 msgid "RES" msgstr "" -#: glances/glances.py:2082 +#: glances/glances.py:2085 msgid "CPU%" msgstr "" -#: glances/glances.py:2087 +#: glances/glances.py:2090 msgid "MEM%" msgstr "" -#: glances/glances.py:2095 +#: glances/glances.py:2098 msgid "PID" msgstr "" -#: glances/glances.py:2101 +#: glances/glances.py:2104 msgid "USER" msgstr "" -#: glances/glances.py:2107 +#: glances/glances.py:2110 msgid "NI" msgstr "" -#: glances/glances.py:2113 +#: glances/glances.py:2116 msgid "S" msgstr "" -#: glances/glances.py:2119 +#: glances/glances.py:2122 msgid "TIME+" msgstr "" -#: glances/glances.py:2125 +#: glances/glances.py:2128 msgid "IO_R" msgstr "" -#: glances/glances.py:2129 +#: glances/glances.py:2132 msgid "IO_W" msgstr "" -#: glances/glances.py:2134 +#: glances/glances.py:2137 msgid "NAME" msgstr "" -#: glances/glances.py:2221 glances/glances.py:2224 +#: glances/glances.py:2224 glances/glances.py:2227 msgid "A_DENY" msgstr "" -#: glances/glances.py:2266 +#: glances/glances.py:2269 msgid "Connected to" msgstr "Connecté à" -#: glances/glances.py:2269 +#: glances/glances.py:2272 msgid "Disconnected from" msgstr "Deconnecté de" -#: glances/glances.py:2271 +#: glances/glances.py:2274 msgid "Press 'h' for help" msgstr "'h' pour l'aide en ligne" -#: glances/glances.py:2303 +#: glances/glances.py:2307 msgid "Glances {0} with PsUtil {1}" msgstr "Glances {0} avec PsUtil {1}" -#: glances/glances.py:2309 +#: glances/glances.py:2313 msgid "Glances {0}" msgstr "" -#: glances/glances.py:2313 +#: glances/glances.py:2317 msgid "Captions: " msgstr "Alertes: " -#: glances/glances.py:2315 +#: glances/glances.py:2319 msgid " OK " msgstr "" -#: glances/glances.py:2317 +#: glances/glances.py:2321 msgid "CAREFUL " msgstr "" -#: glances/glances.py:2319 +#: glances/glances.py:2323 msgid "WARNING " msgstr "" -#: glances/glances.py:2321 +#: glances/glances.py:2325 msgid "CRITICAL" msgstr "" -#: glances/glances.py:2327 +#: glances/glances.py:2331 msgid "Key" msgstr "Touches" -#: glances/glances.py:2327 +#: glances/glances.py:2331 msgid "Function" msgstr "Fonction" -#: glances/glances.py:2332 +#: glances/glances.py:2336 msgid "a" msgstr "" -#: glances/glances.py:2332 +#: glances/glances.py:2336 msgid "Sort processes automatically" msgstr "Classer automatiquement les processus" -#: glances/glances.py:2338 +#: glances/glances.py:2342 msgid "b" msgstr "" -#: glances/glances.py:2338 +#: glances/glances.py:2342 msgid "Switch between bit/s or Byte/s for network IO" msgstr "" -#: glances/glances.py:2345 +#: glances/glances.py:2349 msgid "c" msgstr "" -#: glances/glances.py:2345 +#: glances/glances.py:2349 msgid "Sort processes by CPU%" msgstr "Classer les processus par CPU%" -#: glances/glances.py:2351 +#: glances/glances.py:2355 msgid "m" msgstr "" -#: glances/glances.py:2351 +#: glances/glances.py:2355 msgid "Sort processes by MEM%" msgstr "Classer les processus par MEM%" -#: glances/glances.py:2355 +#: glances/glances.py:2359 msgid "p" msgstr "" -#: glances/glances.py:2355 +#: glances/glances.py:2359 msgid "Sort processes by name" msgstr "Classer les processus par ordre alphabetique" -#: glances/glances.py:2359 +#: glances/glances.py:2363 msgid "d" msgstr "" -#: glances/glances.py:2359 +#: glances/glances.py:2363 msgid "Show/hide disk I/O stats" msgstr "Montrer/cacher les IO disques" -#: glances/glances.py:2364 +#: glances/glances.py:2368 msgid "f" msgstr "" -#: glances/glances.py:2364 +#: glances/glances.py:2368 msgid "Show/hide file system stats" msgstr "Montrer/cacher les statistiques sur les montages" -#: glances/glances.py:2369 +#: glances/glances.py:2373 msgid "n" msgstr "" -#: glances/glances.py:2369 +#: glances/glances.py:2373 msgid "Show/hide network stats" msgstr "Montrer/cacher IO réseau" -#: glances/glances.py:2374 +#: glances/glances.py:2378 msgid "s" msgstr "" -#: glances/glances.py:2374 -msgid "Show/hide sensors stats" +#: glances/glances.py:2378 +msgid "Show/hide sensors stats (Linux-only)" msgstr "" -#: glances/glances.py:2379 +#: glances/glances.py:2383 msgid "l" msgstr "" -#: glances/glances.py:2379 +#: glances/glances.py:2383 msgid "Show/hide log messages" msgstr "Montrer ou cacher les logs" -#: glances/glances.py:2383 +#: glances/glances.py:2387 msgid "w" msgstr "" -#: glances/glances.py:2383 +#: glances/glances.py:2387 msgid "Delete finished warning logs messages" msgstr "Supprimer les alertes WARNING finies" -#: glances/glances.py:2387 +#: glances/glances.py:2391 msgid "x" msgstr "" -#: glances/glances.py:2387 +#: glances/glances.py:2391 msgid "Delete finished warning and critical logs" msgstr "Supprimer toutes les alertes finies" -#: glances/glances.py:2391 +#: glances/glances.py:2395 msgid "1" msgstr "" -#: glances/glances.py:2391 +#: glances/glances.py:2395 msgid "Switch between global CPU and per core stats" msgstr "Afficher le détail par CPU" -#: glances/glances.py:2395 +#: glances/glances.py:2399 msgid "h" msgstr "" -#: glances/glances.py:2395 +#: glances/glances.py:2399 msgid "Show/hide this help message" msgstr "Afficher l'aide en ligne" -#: glances/glances.py:2399 +#: glances/glances.py:2403 msgid "q" msgstr "" -#: glances/glances.py:2399 +#: glances/glances.py:2403 msgid "Quit (Esc and Ctrl-C also work)" msgstr "Quitter Glances (ESC ou Ctrl-C marche aussi...)" -#: glances/glances.py:2410 +#: glances/glances.py:2413 msgid "%Y-%m-%d %H:%M:%S" msgstr "%d/%m/%Y %H:%M:%S" -#: glances/glances.py:2689 +#: glances/glances.py:2702 msgid "Error: creating client socket" msgstr "Erreur: Impossible de créer la socket cliente" -#: glances/glances.py:2697 +#: glances/glances.py:2710 msgid "Error: Connection to server failed" msgstr "Erreur: Impossible de se connecter au serveur" -#: glances/glances.py:2716 +#: glances/glances.py:2729 msgid "Glances version" msgstr "" -#: glances/glances.py:2721 +#: glances/glances.py:2734 msgid "Usage: glances [-f file] [-o output] [-t sec] [-h] [-v]" msgstr "" -#: glances/glances.py:2723 +#: glances/glances.py:2736 msgid "\t-b\t\tDisplay network rate in Byte per second" msgstr "" -#: glances/glances.py:2724 +#: glances/glances.py:2737 msgid "\t-B IP|NAME\tBind server to the given IP or host NAME" msgstr "" -#: glances/glances.py:2725 +#: glances/glances.py:2738 msgid "\t-c @IP|host\tConnect to a Glances server" msgstr "" -#: glances/glances.py:2726 +#: glances/glances.py:2739 msgid "\t-d\t\tDisable disk I/O module" msgstr "" -#: glances/glances.py:2727 -msgid "\t-e\t\tEnable the sensors module" +#: glances/glances.py:2740 +msgid "\t-e\t\tEnable the sensors module (Linux-only)" msgstr "" -#: glances/glances.py:2728 +#: glances/glances.py:2741 msgid "\t-f file\t\tSet the output folder (HTML) or file (CSV)" msgstr "" -#: glances/glances.py:2729 +#: glances/glances.py:2742 msgid "\t-h\t\tDisplay the syntax and exit" msgstr "" -#: glances/glances.py:2730 +#: glances/glances.py:2743 msgid "\t-m\t\tDisable mount module" msgstr "" -#: glances/glances.py:2731 +#: glances/glances.py:2744 msgid "\t-n\t\tDisable network module" msgstr "" -#: glances/glances.py:2732 +#: glances/glances.py:2745 msgid "\t-o output\tDefine additional output (available: HTML or CSV)" msgstr "" -#: glances/glances.py:2733 +#: glances/glances.py:2746 #, python-format msgid "\t-p PORT\t\tDefine the client or server TCP port (default: %d)" msgstr "" -#: glances/glances.py:2735 +#: glances/glances.py:2748 msgid "\t-s\t\tRun Glances in server mode" msgstr "" -#: glances/glances.py:2736 +#: glances/glances.py:2749 #, python-format msgid "\t-t sec\t\tSet the refresh time in seconds (default: %d)" msgstr "" -#: glances/glances.py:2738 +#: glances/glances.py:2751 msgid "\t-v\t\tDisplay the version and exit" msgstr "" -#: glances/glances.py:2819 +#: glances/glances.py:2832 msgid "Error: -B flag need an argument (bind IP address)" msgstr "" -#: glances/glances.py:2827 +#: glances/glances.py:2840 msgid "Error: -c flag need an argument (server IP address/name" msgstr "" -#: glances/glances.py:2838 +#: glances/glances.py:2851 #, python-format msgid "Error: Unknown output %s" msgstr "" -#: glances/glances.py:2843 -msgid "Error: PySensors lib not found" +#: glances/glances.py:2857 +msgid "Error: PySensors library not found" msgstr "" -#: glances/glances.py:2854 +#: glances/glances.py:2862 +msgid "Error: Sensors module is only available on Linux" +msgstr "" + +#: glances/glances.py:2870 msgid "Error: Refresh time should be a positive integer" msgstr "" -#: glances/glances.py:2871 +#: glances/glances.py:2887 msgid "Error: Can not use both -s and -c flag" msgstr "" -#: glances/glances.py:2874 +#: glances/glances.py:2890 msgid "Error: Can not use both -s and -o flag" msgstr "" -#: glances/glances.py:2879 +#: glances/glances.py:2895 msgid "Error: Can not use both -c and -o flag" msgstr "" -#: glances/glances.py:2884 +#: glances/glances.py:2900 msgid "Error: Need Jinja2 library to export into HTML" msgstr "" -#: glances/glances.py:2885 +#: glances/glances.py:2901 msgid "Try to install the python-jinja2 package" msgstr "" -#: glances/glances.py:2890 +#: glances/glances.py:2906 msgid "Error: HTML export (-o html) needoutput folder definition (-f )" msgstr "" -#: glances/glances.py:2896 +#: glances/glances.py:2912 msgid "Error: Need CSV library to export into CSV" msgstr "" -#: glances/glances.py:2901 +#: glances/glances.py:2917 msgid "Error: CSV export (-o csv) need output file definition (-f )" msgstr "" -#: glances/glances.py:2923 +#: glances/glances.py:2939 msgid "Glances server is running on" msgstr "Le serveur Glances est lancé" -#: glances/glances.py:2936 +#: glances/glances.py:2952 msgid "Error: The server version is not compatible" msgstr "" "Erreur: La version de Glances sur le serveur est incompatible avec celle du " diff --git a/i18n/glances.pot b/i18n/glances.pot index 42db49cb..78c9769f 100644 --- a/i18n/glances.pot +++ b/i18n/glances.pot @@ -8,114 +8,114 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-03 15:00+0100\n" +"POT-Creation-Date: 2012-12-14 01:52+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: glances/glances.py:67 +#: glances/glances.py:68 msgid "Curses module not found. Glances cannot start." msgstr "" -#: glances/glances.py:74 +#: glances/glances.py:75 msgid "PsUtil module not found. Glances cannot start." msgstr "" -#: glances/glances.py:79 +#: glances/glances.py:80 #, python-format msgid "PsUtil version %s detected." msgstr "" -#: glances/glances.py:80 +#: glances/glances.py:81 msgid "PsUtil 0.4.1 or higher is needed. Glances cannot start." msgstr "" -#: glances/glances.py:1092 +#: glances/glances.py:1062 msgid "Error: Cannot init the curses library.\n" msgstr "" -#: glances/glances.py:1447 +#: glances/glances.py:1414 msgid "{0} {1} with {2} {3} on {4}" msgstr "" -#: glances/glances.py:1452 +#: glances/glances.py:1419 msgid "{0} {1} {2} on {3}" msgstr "" -#: glances/glances.py:1487 +#: glances/glances.py:1463 msgid "PerCPU" msgstr "" -#: glances/glances.py:1493 glances/glances.py:1538 glances/glances.py:1785 -#: glances/glances.py:1875 glances/glances.py:2140 +#: glances/glances.py:1469 glances/glances.py:1515 glances/glances.py:1795 +#: glances/glances.py:1883 glances/glances.py:2143 msgid "Compute data..." msgstr "" -#: glances/glances.py:1497 glances/glances.py:1547 +#: glances/glances.py:1473 glances/glances.py:1525 msgid "user:" msgstr "" -#: glances/glances.py:1499 glances/glances.py:1556 +#: glances/glances.py:1475 glances/glances.py:1536 msgid "system:" msgstr "" -#: glances/glances.py:1501 glances/glances.py:1564 +#: glances/glances.py:1477 glances/glances.py:1545 msgid "idle:" msgstr "" -#: glances/glances.py:1532 +#: glances/glances.py:1509 msgid "CPU" msgstr "" -#: glances/glances.py:1572 +#: glances/glances.py:1557 msgid "nice:" msgstr "" -#: glances/glances.py:1583 +#: glances/glances.py:1566 msgid "iowait:" msgstr "" -#: glances/glances.py:1595 +#: glances/glances.py:1576 msgid "irq:" msgstr "" -#: glances/glances.py:1616 +#: glances/glances.py:1601 msgid "Load" msgstr "" -#: glances/glances.py:1620 +#: glances/glances.py:1605 msgid "-core" msgstr "" -#: glances/glances.py:1624 +#: glances/glances.py:1609 msgid "1 min:" msgstr "" -#: glances/glances.py:1631 +#: glances/glances.py:1616 msgid "5 min:" msgstr "" -#: glances/glances.py:1641 +#: glances/glances.py:1626 msgid "15 min:" msgstr "" -#: glances/glances.py:1659 +#: glances/glances.py:1655 msgid "Mem" msgstr "" -#: glances/glances.py:1669 glances/glances.py:1739 +#: glances/glances.py:1665 glances/glances.py:1750 msgid "total:" msgstr "" -#: glances/glances.py:1678 glances/glances.py:1749 +#: glances/glances.py:1674 glances/glances.py:1760 msgid "used:" msgstr "" -#: glances/glances.py:1686 glances/glances.py:1758 +#: glances/glances.py:1682 glances/glances.py:1769 msgid "free:" msgstr "" @@ -123,453 +123,457 @@ msgstr "" msgid "active:" msgstr "" -#: glances/glances.py:1704 +#: glances/glances.py:1706 msgid "inactive:" msgstr "" -#: glances/glances.py:1712 +#: glances/glances.py:1716 msgid "buffers:" msgstr "" -#: glances/glances.py:1720 +#: glances/glances.py:1726 msgid "cached:" msgstr "" -#: glances/glances.py:1727 +#: glances/glances.py:1738 msgid "Swap" msgstr "" -#: glances/glances.py:1775 +#: glances/glances.py:1785 msgid "Network" msgstr "" -#: glances/glances.py:1778 +#: glances/glances.py:1788 msgid "Rx/s" msgstr "" -#: glances/glances.py:1780 +#: glances/glances.py:1790 msgid "Tx/s" msgstr "" -#: glances/glances.py:1835 +#: glances/glances.py:1844 msgid "Sensors" msgstr "" -#: glances/glances.py:1838 -msgid "C" +#: glances/glances.py:1847 +msgid "°C" msgstr "" -#: glances/glances.py:1864 +#: glances/glances.py:1872 msgid "Disk I/O" msgstr "" -#: glances/glances.py:1868 +#: glances/glances.py:1876 msgid "In/s" msgstr "" -#: glances/glances.py:1870 +#: glances/glances.py:1878 msgid "Out/s" msgstr "" -#: glances/glances.py:1912 +#: glances/glances.py:1919 msgid "Mount" msgstr "" -#: glances/glances.py:1916 +#: glances/glances.py:1923 msgid "Used" msgstr "" -#: glances/glances.py:1918 +#: glances/glances.py:1925 msgid "Total" msgstr "" -#: glances/glances.py:1963 +#: glances/glances.py:1969 msgid "WARNING|CRITICAL logs for CPU|LOAD|MEM" msgstr "" -#: glances/glances.py:1965 +#: glances/glances.py:1971 msgid " (lasts " msgstr "" -#: glances/glances.py:1966 +#: glances/glances.py:1972 msgid " entries)" msgstr "" -#: glances/glances.py:1968 +#: glances/glances.py:1974 msgid " (one entry)" msgstr "" -#: glances/glances.py:2027 +#: glances/glances.py:2032 msgid "Processes" msgstr "" -#: glances/glances.py:2038 +#: glances/glances.py:2043 msgid "running" msgstr "" -#: glances/glances.py:2040 +#: glances/glances.py:2045 msgid "sleeping" msgstr "" -#: glances/glances.py:2042 +#: glances/glances.py:2047 msgid "other" msgstr "" -#: glances/glances.py:2074 +#: glances/glances.py:2077 msgid "VIRT" msgstr "" -#: glances/glances.py:2078 +#: glances/glances.py:2081 msgid "RES" msgstr "" -#: glances/glances.py:2082 +#: glances/glances.py:2085 msgid "CPU%" msgstr "" -#: glances/glances.py:2087 +#: glances/glances.py:2090 msgid "MEM%" msgstr "" -#: glances/glances.py:2095 +#: glances/glances.py:2098 msgid "PID" msgstr "" -#: glances/glances.py:2101 +#: glances/glances.py:2104 msgid "USER" msgstr "" -#: glances/glances.py:2107 +#: glances/glances.py:2110 msgid "NI" msgstr "" -#: glances/glances.py:2113 +#: glances/glances.py:2116 msgid "S" msgstr "" -#: glances/glances.py:2119 +#: glances/glances.py:2122 msgid "TIME+" msgstr "" -#: glances/glances.py:2125 +#: glances/glances.py:2128 msgid "IO_R" msgstr "" -#: glances/glances.py:2129 +#: glances/glances.py:2132 msgid "IO_W" msgstr "" -#: glances/glances.py:2134 +#: glances/glances.py:2137 msgid "NAME" msgstr "" -#: glances/glances.py:2221 glances/glances.py:2224 +#: glances/glances.py:2224 glances/glances.py:2227 msgid "A_DENY" msgstr "" -#: glances/glances.py:2266 +#: glances/glances.py:2269 msgid "Connected to" msgstr "" -#: glances/glances.py:2269 +#: glances/glances.py:2272 msgid "Disconnected from" msgstr "" -#: glances/glances.py:2271 +#: glances/glances.py:2274 msgid "Press 'h' for help" msgstr "" -#: glances/glances.py:2303 +#: glances/glances.py:2307 msgid "Glances {0} with PsUtil {1}" msgstr "" -#: glances/glances.py:2309 +#: glances/glances.py:2313 msgid "Glances {0}" msgstr "" -#: glances/glances.py:2313 +#: glances/glances.py:2317 msgid "Captions: " msgstr "" -#: glances/glances.py:2315 +#: glances/glances.py:2319 msgid " OK " msgstr "" -#: glances/glances.py:2317 +#: glances/glances.py:2321 msgid "CAREFUL " msgstr "" -#: glances/glances.py:2319 +#: glances/glances.py:2323 msgid "WARNING " msgstr "" -#: glances/glances.py:2321 +#: glances/glances.py:2325 msgid "CRITICAL" msgstr "" -#: glances/glances.py:2327 +#: glances/glances.py:2331 msgid "Key" msgstr "" -#: glances/glances.py:2327 +#: glances/glances.py:2331 msgid "Function" msgstr "" -#: glances/glances.py:2332 +#: glances/glances.py:2336 msgid "a" msgstr "" -#: glances/glances.py:2332 +#: glances/glances.py:2336 msgid "Sort processes automatically" msgstr "" -#: glances/glances.py:2338 +#: glances/glances.py:2342 msgid "b" msgstr "" -#: glances/glances.py:2338 +#: glances/glances.py:2342 msgid "Switch between bit/s or Byte/s for network IO" msgstr "" -#: glances/glances.py:2345 +#: glances/glances.py:2349 msgid "c" msgstr "" -#: glances/glances.py:2345 +#: glances/glances.py:2349 msgid "Sort processes by CPU%" msgstr "" -#: glances/glances.py:2351 +#: glances/glances.py:2355 msgid "m" msgstr "" -#: glances/glances.py:2351 +#: glances/glances.py:2355 msgid "Sort processes by MEM%" msgstr "" -#: glances/glances.py:2355 +#: glances/glances.py:2359 msgid "p" msgstr "" -#: glances/glances.py:2355 +#: glances/glances.py:2359 msgid "Sort processes by name" msgstr "" -#: glances/glances.py:2359 +#: glances/glances.py:2363 msgid "d" msgstr "" -#: glances/glances.py:2359 +#: glances/glances.py:2363 msgid "Show/hide disk I/O stats" msgstr "" -#: glances/glances.py:2364 +#: glances/glances.py:2368 msgid "f" msgstr "" -#: glances/glances.py:2364 +#: glances/glances.py:2368 msgid "Show/hide file system stats" msgstr "" -#: glances/glances.py:2369 +#: glances/glances.py:2373 msgid "n" msgstr "" -#: glances/glances.py:2369 +#: glances/glances.py:2373 msgid "Show/hide network stats" msgstr "" -#: glances/glances.py:2374 +#: glances/glances.py:2378 msgid "s" msgstr "" -#: glances/glances.py:2374 -msgid "Show/hide sensors stats" +#: glances/glances.py:2378 +msgid "Show/hide sensors stats (Linux-only)" msgstr "" -#: glances/glances.py:2379 +#: glances/glances.py:2383 msgid "l" msgstr "" -#: glances/glances.py:2379 +#: glances/glances.py:2383 msgid "Show/hide log messages" msgstr "" -#: glances/glances.py:2383 +#: glances/glances.py:2387 msgid "w" msgstr "" -#: glances/glances.py:2383 +#: glances/glances.py:2387 msgid "Delete finished warning logs messages" msgstr "" -#: glances/glances.py:2387 +#: glances/glances.py:2391 msgid "x" msgstr "" -#: glances/glances.py:2387 +#: glances/glances.py:2391 msgid "Delete finished warning and critical logs" msgstr "" -#: glances/glances.py:2391 +#: glances/glances.py:2395 msgid "1" msgstr "" -#: glances/glances.py:2391 +#: glances/glances.py:2395 msgid "Switch between global CPU and per core stats" msgstr "" -#: glances/glances.py:2395 +#: glances/glances.py:2399 msgid "h" msgstr "" -#: glances/glances.py:2395 +#: glances/glances.py:2399 msgid "Show/hide this help message" msgstr "" -#: glances/glances.py:2399 +#: glances/glances.py:2403 msgid "q" msgstr "" -#: glances/glances.py:2399 +#: glances/glances.py:2403 msgid "Quit (Esc and Ctrl-C also work)" msgstr "" -#: glances/glances.py:2410 +#: glances/glances.py:2413 msgid "%Y-%m-%d %H:%M:%S" msgstr "" -#: glances/glances.py:2689 +#: glances/glances.py:2702 msgid "Error: creating client socket" msgstr "" -#: glances/glances.py:2697 +#: glances/glances.py:2710 msgid "Error: Connection to server failed" msgstr "" -#: glances/glances.py:2716 +#: glances/glances.py:2729 msgid "Glances version" msgstr "" -#: glances/glances.py:2721 +#: glances/glances.py:2734 msgid "Usage: glances [-f file] [-o output] [-t sec] [-h] [-v]" msgstr "" -#: glances/glances.py:2723 +#: glances/glances.py:2736 msgid "\t-b\t\tDisplay network rate in Byte per second" msgstr "" -#: glances/glances.py:2724 +#: glances/glances.py:2737 msgid "\t-B IP|NAME\tBind server to the given IP or host NAME" msgstr "" -#: glances/glances.py:2725 +#: glances/glances.py:2738 msgid "\t-c @IP|host\tConnect to a Glances server" msgstr "" -#: glances/glances.py:2726 +#: glances/glances.py:2739 msgid "\t-d\t\tDisable disk I/O module" msgstr "" -#: glances/glances.py:2727 -msgid "\t-e\t\tEnable the sensors module" +#: glances/glances.py:2740 +msgid "\t-e\t\tEnable the sensors module (Linux-only)" msgstr "" -#: glances/glances.py:2728 +#: glances/glances.py:2741 msgid "\t-f file\t\tSet the output folder (HTML) or file (CSV)" msgstr "" -#: glances/glances.py:2729 +#: glances/glances.py:2742 msgid "\t-h\t\tDisplay the syntax and exit" msgstr "" -#: glances/glances.py:2730 +#: glances/glances.py:2743 msgid "\t-m\t\tDisable mount module" msgstr "" -#: glances/glances.py:2731 +#: glances/glances.py:2744 msgid "\t-n\t\tDisable network module" msgstr "" -#: glances/glances.py:2732 +#: glances/glances.py:2745 msgid "\t-o output\tDefine additional output (available: HTML or CSV)" msgstr "" -#: glances/glances.py:2733 +#: glances/glances.py:2746 #, python-format msgid "\t-p PORT\t\tDefine the client or server TCP port (default: %d)" msgstr "" -#: glances/glances.py:2735 +#: glances/glances.py:2748 msgid "\t-s\t\tRun Glances in server mode" msgstr "" -#: glances/glances.py:2736 +#: glances/glances.py:2749 #, python-format msgid "\t-t sec\t\tSet the refresh time in seconds (default: %d)" msgstr "" -#: glances/glances.py:2738 +#: glances/glances.py:2751 msgid "\t-v\t\tDisplay the version and exit" msgstr "" -#: glances/glances.py:2819 +#: glances/glances.py:2832 msgid "Error: -B flag need an argument (bind IP address)" msgstr "" -#: glances/glances.py:2827 +#: glances/glances.py:2840 msgid "Error: -c flag need an argument (server IP address/name" msgstr "" -#: glances/glances.py:2838 +#: glances/glances.py:2851 #, python-format msgid "Error: Unknown output %s" msgstr "" -#: glances/glances.py:2843 -msgid "Error: PySensors lib not found" +#: glances/glances.py:2857 +msgid "Error: PySensors library not found" msgstr "" -#: glances/glances.py:2854 +#: glances/glances.py:2862 +msgid "Error: Sensors module is only available on Linux" +msgstr "" + +#: glances/glances.py:2870 msgid "Error: Refresh time should be a positive integer" msgstr "" -#: glances/glances.py:2871 +#: glances/glances.py:2887 msgid "Error: Can not use both -s and -c flag" msgstr "" -#: glances/glances.py:2874 +#: glances/glances.py:2890 msgid "Error: Can not use both -s and -o flag" msgstr "" -#: glances/glances.py:2879 +#: glances/glances.py:2895 msgid "Error: Can not use both -c and -o flag" msgstr "" -#: glances/glances.py:2884 +#: glances/glances.py:2900 msgid "Error: Need Jinja2 library to export into HTML" msgstr "" -#: glances/glances.py:2885 +#: glances/glances.py:2901 msgid "Try to install the python-jinja2 package" msgstr "" -#: glances/glances.py:2890 +#: glances/glances.py:2906 msgid "Error: HTML export (-o html) needoutput folder definition (-f )" msgstr "" -#: glances/glances.py:2896 +#: glances/glances.py:2912 msgid "Error: Need CSV library to export into CSV" msgstr "" -#: glances/glances.py:2901 +#: glances/glances.py:2917 msgid "Error: CSV export (-o csv) need output file definition (-f )" msgstr "" -#: glances/glances.py:2923 +#: glances/glances.py:2939 msgid "Glances server is running on" msgstr "" -#: glances/glances.py:2936 +#: glances/glances.py:2952 msgid "Error: The server version is not compatible" msgstr "" diff --git a/i18n/it/LC_MESSAGES/glances.mo b/i18n/it/LC_MESSAGES/glances.mo index ba257928..dc391943 100644 Binary files a/i18n/it/LC_MESSAGES/glances.mo and b/i18n/it/LC_MESSAGES/glances.mo differ diff --git a/i18n/it/LC_MESSAGES/glances.po b/i18n/it/LC_MESSAGES/glances.po index 86557834..c508c7fc 100644 --- a/i18n/it/LC_MESSAGES/glances.po +++ b/i18n/it/LC_MESSAGES/glances.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GLANCES 1.4.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-03 15:00+0100\n" +"POT-Creation-Date: 2012-12-14 01:52+0100\n" "PO-Revision-Date: 2012-09-07 01:21+0100\n" "Last-Translator: Domenico Luciani \n" "Language-Team: Italian\n" @@ -17,105 +17,105 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: glances/glances.py:67 +#: glances/glances.py:68 msgid "Curses module not found. Glances cannot start." msgstr "" -#: glances/glances.py:74 +#: glances/glances.py:75 msgid "PsUtil module not found. Glances cannot start." msgstr "" -#: glances/glances.py:79 +#: glances/glances.py:80 #, python-format msgid "PsUtil version %s detected." msgstr "" -#: glances/glances.py:80 +#: glances/glances.py:81 msgid "PsUtil 0.4.1 or higher is needed. Glances cannot start." msgstr "" -#: glances/glances.py:1092 +#: glances/glances.py:1062 msgid "Error: Cannot init the curses library.\n" msgstr "" -#: glances/glances.py:1447 +#: glances/glances.py:1414 msgid "{0} {1} with {2} {3} on {4}" msgstr "" -#: glances/glances.py:1452 +#: glances/glances.py:1419 msgid "{0} {1} {2} on {3}" msgstr "" -#: glances/glances.py:1487 +#: glances/glances.py:1463 msgid "PerCPU" msgstr "" -#: glances/glances.py:1493 glances/glances.py:1538 glances/glances.py:1785 -#: glances/glances.py:1875 glances/glances.py:2140 +#: glances/glances.py:1469 glances/glances.py:1515 glances/glances.py:1795 +#: glances/glances.py:1883 glances/glances.py:2143 msgid "Compute data..." msgstr "" -#: glances/glances.py:1497 glances/glances.py:1547 +#: glances/glances.py:1473 glances/glances.py:1525 msgid "user:" msgstr "" -#: glances/glances.py:1499 glances/glances.py:1556 +#: glances/glances.py:1475 glances/glances.py:1536 msgid "system:" msgstr "" -#: glances/glances.py:1501 glances/glances.py:1564 +#: glances/glances.py:1477 glances/glances.py:1545 msgid "idle:" msgstr "" -#: glances/glances.py:1532 +#: glances/glances.py:1509 msgid "CPU" msgstr "" -#: glances/glances.py:1572 +#: glances/glances.py:1557 msgid "nice:" msgstr "" -#: glances/glances.py:1583 +#: glances/glances.py:1566 msgid "iowait:" msgstr "" -#: glances/glances.py:1595 +#: glances/glances.py:1576 msgid "irq:" msgstr "" -#: glances/glances.py:1616 +#: glances/glances.py:1601 msgid "Load" msgstr "Carica" -#: glances/glances.py:1620 +#: glances/glances.py:1605 msgid "-core" msgstr "" -#: glances/glances.py:1624 +#: glances/glances.py:1609 msgid "1 min:" msgstr "1 minuto:" -#: glances/glances.py:1631 +#: glances/glances.py:1616 msgid "5 min:" msgstr "" -#: glances/glances.py:1641 +#: glances/glances.py:1626 msgid "15 min:" msgstr "" -#: glances/glances.py:1659 +#: glances/glances.py:1655 msgid "Mem" msgstr "" -#: glances/glances.py:1669 glances/glances.py:1739 +#: glances/glances.py:1665 glances/glances.py:1750 msgid "total:" msgstr "" -#: glances/glances.py:1678 glances/glances.py:1749 +#: glances/glances.py:1674 glances/glances.py:1760 msgid "used:" msgstr "" -#: glances/glances.py:1686 glances/glances.py:1758 +#: glances/glances.py:1682 glances/glances.py:1769 msgid "free:" msgstr "" @@ -123,454 +123,458 @@ msgstr "" msgid "active:" msgstr "" -#: glances/glances.py:1704 +#: glances/glances.py:1706 msgid "inactive:" msgstr "" -#: glances/glances.py:1712 +#: glances/glances.py:1716 msgid "buffers:" msgstr "" -#: glances/glances.py:1720 +#: glances/glances.py:1726 msgid "cached:" msgstr "" -#: glances/glances.py:1727 +#: glances/glances.py:1738 msgid "Swap" msgstr "" -#: glances/glances.py:1775 +#: glances/glances.py:1785 msgid "Network" msgstr "" -#: glances/glances.py:1778 +#: glances/glances.py:1788 msgid "Rx/s" msgstr "" -#: glances/glances.py:1780 +#: glances/glances.py:1790 msgid "Tx/s" msgstr "" -#: glances/glances.py:1835 +#: glances/glances.py:1844 msgid "Sensors" msgstr "" -#: glances/glances.py:1838 -msgid "C" +#: glances/glances.py:1847 +msgid "°C" msgstr "" -#: glances/glances.py:1864 +#: glances/glances.py:1872 msgid "Disk I/O" msgstr "I/O Disco" -#: glances/glances.py:1868 +#: glances/glances.py:1876 msgid "In/s" msgstr "" -#: glances/glances.py:1870 +#: glances/glances.py:1878 msgid "Out/s" msgstr "" -#: glances/glances.py:1912 +#: glances/glances.py:1919 msgid "Mount" msgstr "Monta" -#: glances/glances.py:1916 +#: glances/glances.py:1923 msgid "Used" msgstr "Usato" -#: glances/glances.py:1918 +#: glances/glances.py:1925 msgid "Total" msgstr "Totale" -#: glances/glances.py:1963 +#: glances/glances.py:1969 msgid "WARNING|CRITICAL logs for CPU|LOAD|MEM" msgstr "" -#: glances/glances.py:1965 +#: glances/glances.py:1971 msgid " (lasts " msgstr "" -#: glances/glances.py:1966 +#: glances/glances.py:1972 msgid " entries)" msgstr "" -#: glances/glances.py:1968 +#: glances/glances.py:1974 msgid " (one entry)" msgstr "" -#: glances/glances.py:2027 +#: glances/glances.py:2032 msgid "Processes" msgstr "" -#: glances/glances.py:2038 +#: glances/glances.py:2043 msgid "running" msgstr "" -#: glances/glances.py:2040 +#: glances/glances.py:2045 msgid "sleeping" msgstr "" -#: glances/glances.py:2042 +#: glances/glances.py:2047 msgid "other" msgstr "" -#: glances/glances.py:2074 +#: glances/glances.py:2077 msgid "VIRT" msgstr "" -#: glances/glances.py:2078 +#: glances/glances.py:2081 msgid "RES" msgstr "" -#: glances/glances.py:2082 +#: glances/glances.py:2085 msgid "CPU%" msgstr "" -#: glances/glances.py:2087 +#: glances/glances.py:2090 msgid "MEM%" msgstr "" -#: glances/glances.py:2095 +#: glances/glances.py:2098 msgid "PID" msgstr "" -#: glances/glances.py:2101 +#: glances/glances.py:2104 msgid "USER" msgstr "" -#: glances/glances.py:2107 +#: glances/glances.py:2110 msgid "NI" msgstr "" -#: glances/glances.py:2113 +#: glances/glances.py:2116 msgid "S" msgstr "" -#: glances/glances.py:2119 +#: glances/glances.py:2122 msgid "TIME+" msgstr "" -#: glances/glances.py:2125 +#: glances/glances.py:2128 msgid "IO_R" msgstr "" -#: glances/glances.py:2129 +#: glances/glances.py:2132 msgid "IO_W" msgstr "" -#: glances/glances.py:2134 +#: glances/glances.py:2137 msgid "NAME" msgstr "" -#: glances/glances.py:2221 glances/glances.py:2224 +#: glances/glances.py:2224 glances/glances.py:2227 msgid "A_DENY" msgstr "" -#: glances/glances.py:2266 +#: glances/glances.py:2269 msgid "Connected to" msgstr "" -#: glances/glances.py:2269 +#: glances/glances.py:2272 msgid "Disconnected from" msgstr "" -#: glances/glances.py:2271 +#: glances/glances.py:2274 msgid "Press 'h' for help" msgstr "" -#: glances/glances.py:2303 +#: glances/glances.py:2307 msgid "Glances {0} with PsUtil {1}" msgstr "" -#: glances/glances.py:2309 +#: glances/glances.py:2313 msgid "Glances {0}" msgstr "" -#: glances/glances.py:2313 +#: glances/glances.py:2317 msgid "Captions: " msgstr "" -#: glances/glances.py:2315 +#: glances/glances.py:2319 msgid " OK " msgstr " OK " -#: glances/glances.py:2317 +#: glances/glances.py:2321 msgid "CAREFUL " msgstr " ATTENZIONE " -#: glances/glances.py:2319 +#: glances/glances.py:2323 msgid "WARNING " msgstr " ALLARME " -#: glances/glances.py:2321 +#: glances/glances.py:2325 msgid "CRITICAL" msgstr "CRITICO " -#: glances/glances.py:2327 +#: glances/glances.py:2331 msgid "Key" msgstr "" -#: glances/glances.py:2327 +#: glances/glances.py:2331 msgid "Function" msgstr "" -#: glances/glances.py:2332 +#: glances/glances.py:2336 msgid "a" msgstr "" -#: glances/glances.py:2332 +#: glances/glances.py:2336 msgid "Sort processes automatically" msgstr "" -#: glances/glances.py:2338 +#: glances/glances.py:2342 msgid "b" msgstr "" -#: glances/glances.py:2338 +#: glances/glances.py:2342 msgid "Switch between bit/s or Byte/s for network IO" msgstr "" -#: glances/glances.py:2345 +#: glances/glances.py:2349 msgid "c" msgstr "" -#: glances/glances.py:2345 +#: glances/glances.py:2349 msgid "Sort processes by CPU%" msgstr "" -#: glances/glances.py:2351 +#: glances/glances.py:2355 msgid "m" msgstr "" -#: glances/glances.py:2351 +#: glances/glances.py:2355 msgid "Sort processes by MEM%" msgstr "" -#: glances/glances.py:2355 +#: glances/glances.py:2359 msgid "p" msgstr "" -#: glances/glances.py:2355 +#: glances/glances.py:2359 msgid "Sort processes by name" msgstr "" -#: glances/glances.py:2359 +#: glances/glances.py:2363 msgid "d" msgstr "" -#: glances/glances.py:2359 +#: glances/glances.py:2363 msgid "Show/hide disk I/O stats" msgstr "" -#: glances/glances.py:2364 +#: glances/glances.py:2368 msgid "f" msgstr "" -#: glances/glances.py:2364 +#: glances/glances.py:2368 msgid "Show/hide file system stats" msgstr "" -#: glances/glances.py:2369 +#: glances/glances.py:2373 msgid "n" msgstr "" -#: glances/glances.py:2369 +#: glances/glances.py:2373 msgid "Show/hide network stats" msgstr "" -#: glances/glances.py:2374 +#: glances/glances.py:2378 msgid "s" msgstr "" -#: glances/glances.py:2374 -msgid "Show/hide sensors stats" +#: glances/glances.py:2378 +msgid "Show/hide sensors stats (Linux-only)" msgstr "" -#: glances/glances.py:2379 +#: glances/glances.py:2383 msgid "l" msgstr "" -#: glances/glances.py:2379 +#: glances/glances.py:2383 msgid "Show/hide log messages" msgstr "" -#: glances/glances.py:2383 +#: glances/glances.py:2387 msgid "w" msgstr "" -#: glances/glances.py:2383 +#: glances/glances.py:2387 msgid "Delete finished warning logs messages" msgstr "" -#: glances/glances.py:2387 +#: glances/glances.py:2391 msgid "x" msgstr "" -#: glances/glances.py:2387 +#: glances/glances.py:2391 msgid "Delete finished warning and critical logs" msgstr "" -#: glances/glances.py:2391 +#: glances/glances.py:2395 msgid "1" msgstr "" -#: glances/glances.py:2391 +#: glances/glances.py:2395 msgid "Switch between global CPU and per core stats" msgstr "" -#: glances/glances.py:2395 +#: glances/glances.py:2399 msgid "h" msgstr "" -#: glances/glances.py:2395 +#: glances/glances.py:2399 msgid "Show/hide this help message" msgstr "" -#: glances/glances.py:2399 +#: glances/glances.py:2403 msgid "q" msgstr "" -#: glances/glances.py:2399 +#: glances/glances.py:2403 msgid "Quit (Esc and Ctrl-C also work)" msgstr "" -#: glances/glances.py:2410 +#: glances/glances.py:2413 msgid "%Y-%m-%d %H:%M:%S" msgstr "%d.%m.%Y %H:%M:%S" -#: glances/glances.py:2689 +#: glances/glances.py:2702 msgid "Error: creating client socket" msgstr "" -#: glances/glances.py:2697 +#: glances/glances.py:2710 msgid "Error: Connection to server failed" msgstr "" -#: glances/glances.py:2716 +#: glances/glances.py:2729 msgid "Glances version" msgstr "" -#: glances/glances.py:2721 +#: glances/glances.py:2734 msgid "Usage: glances [-f file] [-o output] [-t sec] [-h] [-v]" msgstr "" -#: glances/glances.py:2723 +#: glances/glances.py:2736 msgid "\t-b\t\tDisplay network rate in Byte per second" msgstr "" -#: glances/glances.py:2724 +#: glances/glances.py:2737 msgid "\t-B IP|NAME\tBind server to the given IP or host NAME" msgstr "" -#: glances/glances.py:2725 +#: glances/glances.py:2738 msgid "\t-c @IP|host\tConnect to a Glances server" msgstr "" -#: glances/glances.py:2726 +#: glances/glances.py:2739 msgid "\t-d\t\tDisable disk I/O module" msgstr "" -#: glances/glances.py:2727 -msgid "\t-e\t\tEnable the sensors module" +#: glances/glances.py:2740 +msgid "\t-e\t\tEnable the sensors module (Linux-only)" msgstr "" -#: glances/glances.py:2728 +#: glances/glances.py:2741 msgid "\t-f file\t\tSet the output folder (HTML) or file (CSV)" msgstr "" -#: glances/glances.py:2729 +#: glances/glances.py:2742 msgid "\t-h\t\tDisplay the syntax and exit" msgstr "" -#: glances/glances.py:2730 +#: glances/glances.py:2743 msgid "\t-m\t\tDisable mount module" msgstr "" -#: glances/glances.py:2731 +#: glances/glances.py:2744 msgid "\t-n\t\tDisable network module" msgstr "" -#: glances/glances.py:2732 +#: glances/glances.py:2745 msgid "\t-o output\tDefine additional output (available: HTML or CSV)" msgstr "" -#: glances/glances.py:2733 +#: glances/glances.py:2746 #, python-format msgid "\t-p PORT\t\tDefine the client or server TCP port (default: %d)" msgstr "" -#: glances/glances.py:2735 +#: glances/glances.py:2748 msgid "\t-s\t\tRun Glances in server mode" msgstr "" -#: glances/glances.py:2736 +#: glances/glances.py:2749 #, python-format msgid "\t-t sec\t\tSet the refresh time in seconds (default: %d)" msgstr "" -#: glances/glances.py:2738 +#: glances/glances.py:2751 msgid "\t-v\t\tDisplay the version and exit" msgstr "" -#: glances/glances.py:2819 +#: glances/glances.py:2832 msgid "Error: -B flag need an argument (bind IP address)" msgstr "" -#: glances/glances.py:2827 +#: glances/glances.py:2840 msgid "Error: -c flag need an argument (server IP address/name" msgstr "" -#: glances/glances.py:2838 +#: glances/glances.py:2851 #, python-format msgid "Error: Unknown output %s" msgstr "" -#: glances/glances.py:2843 -msgid "Error: PySensors lib not found" +#: glances/glances.py:2857 +msgid "Error: PySensors library not found" msgstr "" -#: glances/glances.py:2854 +#: glances/glances.py:2862 +msgid "Error: Sensors module is only available on Linux" +msgstr "" + +#: glances/glances.py:2870 msgid "Error: Refresh time should be a positive integer" msgstr "" -#: glances/glances.py:2871 +#: glances/glances.py:2887 msgid "Error: Can not use both -s and -c flag" msgstr "" -#: glances/glances.py:2874 +#: glances/glances.py:2890 msgid "Error: Can not use both -s and -o flag" msgstr "" -#: glances/glances.py:2879 +#: glances/glances.py:2895 msgid "Error: Can not use both -c and -o flag" msgstr "" -#: glances/glances.py:2884 +#: glances/glances.py:2900 msgid "Error: Need Jinja2 library to export into HTML" msgstr "" -#: glances/glances.py:2885 +#: glances/glances.py:2901 msgid "Try to install the python-jinja2 package" msgstr "" -#: glances/glances.py:2890 +#: glances/glances.py:2906 msgid "Error: HTML export (-o html) needoutput folder definition (-f )" msgstr "" -#: glances/glances.py:2896 +#: glances/glances.py:2912 msgid "Error: Need CSV library to export into CSV" msgstr "" -#: glances/glances.py:2901 +#: glances/glances.py:2917 msgid "Error: CSV export (-o csv) need output file definition (-f )" msgstr "" -#: glances/glances.py:2923 +#: glances/glances.py:2939 msgid "Glances server is running on" msgstr "" -#: glances/glances.py:2936 +#: glances/glances.py:2952 msgid "Error: The server version is not compatible" msgstr "" diff --git a/i18n/pt_BR/LC_MESSAGES/glances.mo b/i18n/pt_BR/LC_MESSAGES/glances.mo index 4fa4055b..9e854b06 100644 Binary files a/i18n/pt_BR/LC_MESSAGES/glances.mo and b/i18n/pt_BR/LC_MESSAGES/glances.mo differ diff --git a/i18n/pt_BR/LC_MESSAGES/glances.po b/i18n/pt_BR/LC_MESSAGES/glances.po index ac2be783..6b5a6f1d 100644 --- a/i18n/pt_BR/LC_MESSAGES/glances.po +++ b/i18n/pt_BR/LC_MESSAGES/glances.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Glances 1.4.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-03 15:00+0100\n" +"POT-Creation-Date: 2012-12-14 01:52+0100\n" "PO-Revision-Date: 2012-09-20 01:53-0300\n" "Last-Translator: Rafael Beraldo \n" "Language-Team: Brazilian Portuguese\n" @@ -17,105 +17,105 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: glances/glances.py:67 +#: glances/glances.py:68 msgid "Curses module not found. Glances cannot start." msgstr "" -#: glances/glances.py:74 +#: glances/glances.py:75 msgid "PsUtil module not found. Glances cannot start." msgstr "" -#: glances/glances.py:79 +#: glances/glances.py:80 #, python-format msgid "PsUtil version %s detected." msgstr "" -#: glances/glances.py:80 +#: glances/glances.py:81 msgid "PsUtil 0.4.1 or higher is needed. Glances cannot start." msgstr "" -#: glances/glances.py:1092 +#: glances/glances.py:1062 msgid "Error: Cannot init the curses library.\n" msgstr "" -#: glances/glances.py:1447 +#: glances/glances.py:1414 msgid "{0} {1} with {2} {3} on {4}" msgstr "" -#: glances/glances.py:1452 +#: glances/glances.py:1419 msgid "{0} {1} {2} on {3}" msgstr "" -#: glances/glances.py:1487 +#: glances/glances.py:1463 msgid "PerCPU" msgstr "" -#: glances/glances.py:1493 glances/glances.py:1538 glances/glances.py:1785 -#: glances/glances.py:1875 glances/glances.py:2140 +#: glances/glances.py:1469 glances/glances.py:1515 glances/glances.py:1795 +#: glances/glances.py:1883 glances/glances.py:2143 msgid "Compute data..." msgstr "" -#: glances/glances.py:1497 glances/glances.py:1547 +#: glances/glances.py:1473 glances/glances.py:1525 msgid "user:" msgstr "" -#: glances/glances.py:1499 glances/glances.py:1556 +#: glances/glances.py:1475 glances/glances.py:1536 msgid "system:" msgstr "" -#: glances/glances.py:1501 glances/glances.py:1564 +#: glances/glances.py:1477 glances/glances.py:1545 msgid "idle:" msgstr "" -#: glances/glances.py:1532 +#: glances/glances.py:1509 msgid "CPU" msgstr "" -#: glances/glances.py:1572 +#: glances/glances.py:1557 msgid "nice:" msgstr "" -#: glances/glances.py:1583 +#: glances/glances.py:1566 msgid "iowait:" msgstr "" -#: glances/glances.py:1595 +#: glances/glances.py:1576 msgid "irq:" msgstr "" -#: glances/glances.py:1616 +#: glances/glances.py:1601 msgid "Load" msgstr "Carga" -#: glances/glances.py:1620 +#: glances/glances.py:1605 msgid "-core" msgstr "" -#: glances/glances.py:1624 +#: glances/glances.py:1609 msgid "1 min:" msgstr "1 min:" -#: glances/glances.py:1631 +#: glances/glances.py:1616 msgid "5 min:" msgstr "" -#: glances/glances.py:1641 +#: glances/glances.py:1626 msgid "15 min:" msgstr "" -#: glances/glances.py:1659 +#: glances/glances.py:1655 msgid "Mem" msgstr "Mem" -#: glances/glances.py:1669 glances/glances.py:1739 +#: glances/glances.py:1665 glances/glances.py:1750 msgid "total:" msgstr "" -#: glances/glances.py:1678 glances/glances.py:1749 +#: glances/glances.py:1674 glances/glances.py:1760 msgid "used:" msgstr "" -#: glances/glances.py:1686 glances/glances.py:1758 +#: glances/glances.py:1682 glances/glances.py:1769 msgid "free:" msgstr "" @@ -123,454 +123,458 @@ msgstr "" msgid "active:" msgstr "" -#: glances/glances.py:1704 +#: glances/glances.py:1706 msgid "inactive:" msgstr "" -#: glances/glances.py:1712 +#: glances/glances.py:1716 msgid "buffers:" msgstr "" -#: glances/glances.py:1720 +#: glances/glances.py:1726 msgid "cached:" msgstr "" -#: glances/glances.py:1727 +#: glances/glances.py:1738 msgid "Swap" msgstr "Swap" -#: glances/glances.py:1775 +#: glances/glances.py:1785 msgid "Network" msgstr "" -#: glances/glances.py:1778 +#: glances/glances.py:1788 msgid "Rx/s" msgstr "" -#: glances/glances.py:1780 +#: glances/glances.py:1790 msgid "Tx/s" msgstr "" -#: glances/glances.py:1835 +#: glances/glances.py:1844 msgid "Sensors" msgstr "" -#: glances/glances.py:1838 -msgid "C" +#: glances/glances.py:1847 +msgid "°C" msgstr "" -#: glances/glances.py:1864 +#: glances/glances.py:1872 msgid "Disk I/O" msgstr "I/O do Disco" -#: glances/glances.py:1868 +#: glances/glances.py:1876 msgid "In/s" msgstr "" -#: glances/glances.py:1870 +#: glances/glances.py:1878 msgid "Out/s" msgstr "" -#: glances/glances.py:1912 +#: glances/glances.py:1919 msgid "Mount" msgstr "Partições" -#: glances/glances.py:1916 +#: glances/glances.py:1923 msgid "Used" msgstr "Usado" -#: glances/glances.py:1918 +#: glances/glances.py:1925 msgid "Total" msgstr "Total" -#: glances/glances.py:1963 +#: glances/glances.py:1969 msgid "WARNING|CRITICAL logs for CPU|LOAD|MEM" msgstr "" -#: glances/glances.py:1965 +#: glances/glances.py:1971 msgid " (lasts " msgstr "" -#: glances/glances.py:1966 +#: glances/glances.py:1972 msgid " entries)" msgstr "" -#: glances/glances.py:1968 +#: glances/glances.py:1974 msgid " (one entry)" msgstr "" -#: glances/glances.py:2027 +#: glances/glances.py:2032 msgid "Processes" msgstr "" -#: glances/glances.py:2038 +#: glances/glances.py:2043 msgid "running" msgstr "" -#: glances/glances.py:2040 +#: glances/glances.py:2045 msgid "sleeping" msgstr "" -#: glances/glances.py:2042 +#: glances/glances.py:2047 msgid "other" msgstr "" -#: glances/glances.py:2074 +#: glances/glances.py:2077 msgid "VIRT" msgstr "" -#: glances/glances.py:2078 +#: glances/glances.py:2081 msgid "RES" msgstr "" -#: glances/glances.py:2082 +#: glances/glances.py:2085 msgid "CPU%" msgstr "" -#: glances/glances.py:2087 +#: glances/glances.py:2090 msgid "MEM%" msgstr "" -#: glances/glances.py:2095 +#: glances/glances.py:2098 msgid "PID" msgstr "" -#: glances/glances.py:2101 +#: glances/glances.py:2104 msgid "USER" msgstr "" -#: glances/glances.py:2107 +#: glances/glances.py:2110 msgid "NI" msgstr "" -#: glances/glances.py:2113 +#: glances/glances.py:2116 msgid "S" msgstr "" -#: glances/glances.py:2119 +#: glances/glances.py:2122 msgid "TIME+" msgstr "" -#: glances/glances.py:2125 +#: glances/glances.py:2128 msgid "IO_R" msgstr "" -#: glances/glances.py:2129 +#: glances/glances.py:2132 msgid "IO_W" msgstr "" -#: glances/glances.py:2134 +#: glances/glances.py:2137 msgid "NAME" msgstr "" -#: glances/glances.py:2221 glances/glances.py:2224 +#: glances/glances.py:2224 glances/glances.py:2227 msgid "A_DENY" msgstr "" -#: glances/glances.py:2266 +#: glances/glances.py:2269 msgid "Connected to" msgstr "" -#: glances/glances.py:2269 +#: glances/glances.py:2272 msgid "Disconnected from" msgstr "" -#: glances/glances.py:2271 +#: glances/glances.py:2274 msgid "Press 'h' for help" msgstr "" -#: glances/glances.py:2303 +#: glances/glances.py:2307 msgid "Glances {0} with PsUtil {1}" msgstr "" -#: glances/glances.py:2309 +#: glances/glances.py:2313 msgid "Glances {0}" msgstr "" -#: glances/glances.py:2313 +#: glances/glances.py:2317 msgid "Captions: " msgstr "" -#: glances/glances.py:2315 +#: glances/glances.py:2319 msgid " OK " msgstr " OK " -#: glances/glances.py:2317 +#: glances/glances.py:2321 msgid "CAREFUL " msgstr "CUIDADO " -#: glances/glances.py:2319 +#: glances/glances.py:2323 msgid "WARNING " msgstr "AVISO" -#: glances/glances.py:2321 +#: glances/glances.py:2325 msgid "CRITICAL" msgstr "CRÍTICO" -#: glances/glances.py:2327 +#: glances/glances.py:2331 msgid "Key" msgstr "" -#: glances/glances.py:2327 +#: glances/glances.py:2331 msgid "Function" msgstr "" -#: glances/glances.py:2332 +#: glances/glances.py:2336 msgid "a" msgstr "" -#: glances/glances.py:2332 +#: glances/glances.py:2336 msgid "Sort processes automatically" msgstr "" -#: glances/glances.py:2338 +#: glances/glances.py:2342 msgid "b" msgstr "" -#: glances/glances.py:2338 +#: glances/glances.py:2342 msgid "Switch between bit/s or Byte/s for network IO" msgstr "" -#: glances/glances.py:2345 +#: glances/glances.py:2349 msgid "c" msgstr "" -#: glances/glances.py:2345 +#: glances/glances.py:2349 msgid "Sort processes by CPU%" msgstr "" -#: glances/glances.py:2351 +#: glances/glances.py:2355 msgid "m" msgstr "" -#: glances/glances.py:2351 +#: glances/glances.py:2355 msgid "Sort processes by MEM%" msgstr "" -#: glances/glances.py:2355 +#: glances/glances.py:2359 msgid "p" msgstr "" -#: glances/glances.py:2355 +#: glances/glances.py:2359 msgid "Sort processes by name" msgstr "" -#: glances/glances.py:2359 +#: glances/glances.py:2363 msgid "d" msgstr "" -#: glances/glances.py:2359 +#: glances/glances.py:2363 msgid "Show/hide disk I/O stats" msgstr "" -#: glances/glances.py:2364 +#: glances/glances.py:2368 msgid "f" msgstr "" -#: glances/glances.py:2364 +#: glances/glances.py:2368 msgid "Show/hide file system stats" msgstr "" -#: glances/glances.py:2369 +#: glances/glances.py:2373 msgid "n" msgstr "" -#: glances/glances.py:2369 +#: glances/glances.py:2373 msgid "Show/hide network stats" msgstr "" -#: glances/glances.py:2374 +#: glances/glances.py:2378 msgid "s" msgstr "" -#: glances/glances.py:2374 -msgid "Show/hide sensors stats" +#: glances/glances.py:2378 +msgid "Show/hide sensors stats (Linux-only)" msgstr "" -#: glances/glances.py:2379 +#: glances/glances.py:2383 msgid "l" msgstr "" -#: glances/glances.py:2379 +#: glances/glances.py:2383 msgid "Show/hide log messages" msgstr "" -#: glances/glances.py:2383 +#: glances/glances.py:2387 msgid "w" msgstr "" -#: glances/glances.py:2383 +#: glances/glances.py:2387 msgid "Delete finished warning logs messages" msgstr "" -#: glances/glances.py:2387 +#: glances/glances.py:2391 msgid "x" msgstr "" -#: glances/glances.py:2387 +#: glances/glances.py:2391 msgid "Delete finished warning and critical logs" msgstr "" -#: glances/glances.py:2391 +#: glances/glances.py:2395 msgid "1" msgstr "" -#: glances/glances.py:2391 +#: glances/glances.py:2395 msgid "Switch between global CPU and per core stats" msgstr "" -#: glances/glances.py:2395 +#: glances/glances.py:2399 msgid "h" msgstr "" -#: glances/glances.py:2395 +#: glances/glances.py:2399 msgid "Show/hide this help message" msgstr "" -#: glances/glances.py:2399 +#: glances/glances.py:2403 msgid "q" msgstr "" -#: glances/glances.py:2399 +#: glances/glances.py:2403 msgid "Quit (Esc and Ctrl-C also work)" msgstr "" -#: glances/glances.py:2410 +#: glances/glances.py:2413 msgid "%Y-%m-%d %H:%M:%S" msgstr "%d-%m-%Y %H:%M:%S" -#: glances/glances.py:2689 +#: glances/glances.py:2702 msgid "Error: creating client socket" msgstr "" -#: glances/glances.py:2697 +#: glances/glances.py:2710 msgid "Error: Connection to server failed" msgstr "" -#: glances/glances.py:2716 +#: glances/glances.py:2729 msgid "Glances version" msgstr "" -#: glances/glances.py:2721 +#: glances/glances.py:2734 msgid "Usage: glances [-f file] [-o output] [-t sec] [-h] [-v]" msgstr "" -#: glances/glances.py:2723 +#: glances/glances.py:2736 msgid "\t-b\t\tDisplay network rate in Byte per second" msgstr "" -#: glances/glances.py:2724 +#: glances/glances.py:2737 msgid "\t-B IP|NAME\tBind server to the given IP or host NAME" msgstr "" -#: glances/glances.py:2725 +#: glances/glances.py:2738 msgid "\t-c @IP|host\tConnect to a Glances server" msgstr "" -#: glances/glances.py:2726 +#: glances/glances.py:2739 msgid "\t-d\t\tDisable disk I/O module" msgstr "" -#: glances/glances.py:2727 -msgid "\t-e\t\tEnable the sensors module" +#: glances/glances.py:2740 +msgid "\t-e\t\tEnable the sensors module (Linux-only)" msgstr "" -#: glances/glances.py:2728 +#: glances/glances.py:2741 msgid "\t-f file\t\tSet the output folder (HTML) or file (CSV)" msgstr "" -#: glances/glances.py:2729 +#: glances/glances.py:2742 msgid "\t-h\t\tDisplay the syntax and exit" msgstr "" -#: glances/glances.py:2730 +#: glances/glances.py:2743 msgid "\t-m\t\tDisable mount module" msgstr "" -#: glances/glances.py:2731 +#: glances/glances.py:2744 msgid "\t-n\t\tDisable network module" msgstr "" -#: glances/glances.py:2732 +#: glances/glances.py:2745 msgid "\t-o output\tDefine additional output (available: HTML or CSV)" msgstr "" -#: glances/glances.py:2733 +#: glances/glances.py:2746 #, python-format msgid "\t-p PORT\t\tDefine the client or server TCP port (default: %d)" msgstr "" -#: glances/glances.py:2735 +#: glances/glances.py:2748 msgid "\t-s\t\tRun Glances in server mode" msgstr "" -#: glances/glances.py:2736 +#: glances/glances.py:2749 #, python-format msgid "\t-t sec\t\tSet the refresh time in seconds (default: %d)" msgstr "" -#: glances/glances.py:2738 +#: glances/glances.py:2751 msgid "\t-v\t\tDisplay the version and exit" msgstr "" -#: glances/glances.py:2819 +#: glances/glances.py:2832 msgid "Error: -B flag need an argument (bind IP address)" msgstr "" -#: glances/glances.py:2827 +#: glances/glances.py:2840 msgid "Error: -c flag need an argument (server IP address/name" msgstr "" -#: glances/glances.py:2838 +#: glances/glances.py:2851 #, python-format msgid "Error: Unknown output %s" msgstr "" -#: glances/glances.py:2843 -msgid "Error: PySensors lib not found" +#: glances/glances.py:2857 +msgid "Error: PySensors library not found" msgstr "" -#: glances/glances.py:2854 +#: glances/glances.py:2862 +msgid "Error: Sensors module is only available on Linux" +msgstr "" + +#: glances/glances.py:2870 msgid "Error: Refresh time should be a positive integer" msgstr "" -#: glances/glances.py:2871 +#: glances/glances.py:2887 msgid "Error: Can not use both -s and -c flag" msgstr "" -#: glances/glances.py:2874 +#: glances/glances.py:2890 msgid "Error: Can not use both -s and -o flag" msgstr "" -#: glances/glances.py:2879 +#: glances/glances.py:2895 msgid "Error: Can not use both -c and -o flag" msgstr "" -#: glances/glances.py:2884 +#: glances/glances.py:2900 msgid "Error: Need Jinja2 library to export into HTML" msgstr "" -#: glances/glances.py:2885 +#: glances/glances.py:2901 msgid "Try to install the python-jinja2 package" msgstr "" -#: glances/glances.py:2890 +#: glances/glances.py:2906 msgid "Error: HTML export (-o html) needoutput folder definition (-f )" msgstr "" -#: glances/glances.py:2896 +#: glances/glances.py:2912 msgid "Error: Need CSV library to export into CSV" msgstr "" -#: glances/glances.py:2901 +#: glances/glances.py:2917 msgid "Error: CSV export (-o csv) need output file definition (-f )" msgstr "" -#: glances/glances.py:2923 +#: glances/glances.py:2939 msgid "Glances server is running on" msgstr "" -#: glances/glances.py:2936 +#: glances/glances.py:2952 msgid "Error: The server version is not compatible" msgstr "" diff --git a/man/glances.1 b/man/glances.1 index 7ae0a3c9..1e81787f 100644 --- a/man/glances.1 +++ b/man/glances.1 @@ -1,9 +1,9 @@ -.TH glances 1 "November, 2012" "version 1.5" "USER COMMANDS" +.TH glances 1 "December, 2012" "version 1.5.2" "USER COMMANDS" .SH NAME glances \- CLI curses based monitoring tool .SH SYNOPSIS .B glances -[\-bdhmnsv] [\-t refresh] [\-B bind] [\-c server] [\-p port] [\-o output] [\-f file] +[\-bdehmnsv] [\-t refresh] [\-B bind] [\-c server] [\-p port] [\-o output] [\-f file] .SH DESCRIPTION Glances is a free (LGPL) curses-based monitoring tool which aims to present a maximum of information in a minimum of space, ideally to fit in a classical 80x24 terminal. Glances can adapt dynamicaly the @@ -11,33 +11,35 @@ displayed information depending on the terminal size. .PP This tool is written in Python and uses PsUtil to fetch the statistical values from key elements. .PP -You can use the following keys to sort the processesi list: +When Glances is running, you can use the following keys: .PP - 'a' to set the automatic mode. The process list is sorted automatically + 'a' Automatic mode. The process list is sorted automatically .PP - 'b' to switch between bit/s or byte/s for network IO + 'b' Switch between bit/s or Byte/s for network IO .PP - 'c' the processes list is sorted by CPU consomption + 'c' Sort processes by CPU% .PP - 'd' Disable or enable the disk IO stats + 'd' Show/hide disk IO stats .PP - 'f' Disable or enable the file system stats + 'f' Show/hide file system stats .PP - 'h' Hide or show the help message + 'h' Show/hide the help message .PP - 'l' Hide or show the logs + 'l' Show/hide log messages .PP - 'm' the processes list is sorted by process size + 'm' Sort processes by MEM% .PP - 'n' Disable or enable the network interfaces stats + 'n' Show/hide network stats .PP - 'p' The processes list is sorted by process name + 'p' Sort processes by name +.PP + 's' Show/hide sensors stats (Linux-only) .PP 'w' Delete finished warning logs messages .PP 'x' Delete finished warning and critical logs .PP - 'q' Exit + 'q' Quit .PP '1' Switch between global CPU and per core stats .PP @@ -58,6 +60,9 @@ Connect to a Glances server (IP address or hostname) \-d Disable disk I/O module .TP +\-e +Enable the sensors module (Linux-only) +.TP \-f file Set the output folder (HTML) or file (CSV) .TP @@ -80,7 +85,7 @@ Define the client or server TCP port (default: 61209) Run Glances in server mode .TP \-t sec -Set the refresh time in seconds (default: 2) +Set the refresh time in seconds (default: 3) .TP \-v Display the version and exit