diff --git a/MANIFEST.in b/MANIFEST.in
index 27d31b7d..826d9633 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,4 +7,4 @@ include screenshot.png
recursive-include doc *.png
recursive-include man *.1
recursive-include i18n *.mo
-recursive-include glances *.html *.css *.png
+recursive-include glances *.html *.css *.png *.conf
diff --git a/README b/README
index 948fdcc7..eb1426bd 100644
--- a/README
+++ b/README
@@ -172,7 +172,7 @@ When Glances is running, you can press:
* 'e' enable the sensors module (PySensors library is needed; Linux-only)
* 'f' disable or enable the file system stats
* 'h' to display a help message with the keys you can press and the limits
-* 'i' sort the processes list by CPU IO (need root account on some OS)
+* 'i' sort the processes list by IO rate (need root account on some OS)
* 'l' disable or enable the logs
* 'm' sort the processes list by process MEM
* 'n' disable or enable the network interfaces stats
@@ -240,7 +240,6 @@ If average load is > 5*Core, then status is set to "CRITICAL".
### Memory
-
Glances uses two columns: one for the RAM and another one for the SWAP.

@@ -353,7 +352,7 @@ The number of processes in the list is adapted to the screen size.
Z - Zombie or "hung" process
* TIME+: Cumulative CPU time used
-* IO_R and IO_W: Per process IO read and write
+* IO_R and IO_W: Per process IO read and write rate (in byte per second)
* NAME: Process name or command line
### Logs
diff --git a/README.md b/README.md
index 31556c82..eb1426bd 100644
--- a/README.md
+++ b/README.md
@@ -136,8 +136,11 @@ In server mode, you can set the bind address (-B ADDRESS) and listenning TCP por
In client mode, you can set the TCP port of the server (-p port).
-Default binding address is 0.0.0.0 (Glancess will listen on all the networks interfaces).
- TCP port is 61209.
+Default binding address is 0.0.0.0 (Glances will listen on all the networks interfaces) and TCP port is 61209.
+
+In client/server mode, limits are set by the server side.
+
+The version 1.6 introduces a optionnal password to access to the server (-P password).
## User guide
@@ -169,7 +172,7 @@ When Glances is running, you can press:
* 'e' enable the sensors module (PySensors library is needed; Linux-only)
* 'f' disable or enable the file system stats
* 'h' to display a help message with the keys you can press and the limits
-* 'i' sort the processes list by CPU IO (need root account on some OS)
+* 'i' sort the processes list by IO rate (need root account on some OS)
* 'l' disable or enable the logs
* 'm' sort the processes list by process MEM
* 'n' disable or enable the network interfaces stats
@@ -237,7 +240,6 @@ If average load is > 5*Core, then status is set to "CRITICAL".
### Memory
-
Glances uses two columns: one for the RAM and another one for the SWAP.

@@ -350,7 +352,7 @@ The number of processes in the list is adapted to the screen size.
Z - Zombie or "hung" process
* TIME+: Cumulative CPU time used
-* IO_R and IO_W: Per process IO read and write
+* IO_R and IO_W: Per process IO read and write rate (in byte per second)
* NAME: Process name or command line
### Logs
diff --git a/TODO b/TODO
index 106dc006..3693bd08 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,2 @@
-- Need a packeger to maintain the PPA (https://launchpad.net/glances)
-- Need a packager for Windows OS (Server mode only)
+- Need a packager/installer for Windows OS (Server mode only)
- Need translators contributions (Chines, Japon, ...)
diff --git a/glances/glances.py b/glances/glances.py
index e6e0dc83..9e2aa614 100755
--- a/glances/glances.py
+++ b/glances/glances.py
@@ -19,7 +19,7 @@
# along with this program. If not, see .
__appname__ = 'glances'
-__version__ = "1.6b"
+__version__ = "1.6"
__author__ = "Nicolas Hennion "
__licence__ = "LGPL"
diff --git a/i18n/es/LC_MESSAGES/glances.mo b/i18n/es/LC_MESSAGES/glances.mo
index f4c30294..d21d12e1 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 5a607d30..4c68e557 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: 2013-01-11 19:59+0100\n"
+"POT-Creation-Date: 2013-01-26 10:40+0100\n"
"PO-Revision-Date: 2012-01-12 19:07+0100\n"
"Last-Translator: Sebastián Moreno \n"
"Language-Team: Spanish\n"
@@ -17,57 +17,57 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: glances/glances.py:76
+#: glances/glances.py:87
msgid "Curses module not found. Glances cannot start."
msgstr ""
-#: glances/glances.py:83
+#: glances/glances.py:94
msgid "PsUtil module not found. Glances cannot start."
msgstr ""
-#: glances/glances.py:88
+#: glances/glances.py:99
#, python-format
msgid "PsUtil version %s detected."
msgstr ""
-#: glances/glances.py:89
+#: glances/glances.py:100
msgid "PsUtil 0.4.1 or higher is needed. Glances cannot start."
msgstr ""
-#: glances/glances.py:1319
+#: glances/glances.py:1303
msgid "Error: Cannot init the curses library.\n"
msgstr ""
-#: glances/glances.py:1777
+#: glances/glances.py:1779
msgid "{0} {1} with {2} {3} on {4}"
msgstr ""
-#: glances/glances.py:1782
+#: glances/glances.py:1784
msgid "{0} {1} {2} on {3}"
msgstr ""
-#: glances/glances.py:1831
+#: glances/glances.py:1832
msgid "PerCPU"
msgstr ""
-#: glances/glances.py:1837 glances/glances.py:1892 glances/glances.py:2166
-#: glances/glances.py:2258 glances/glances.py:2545
+#: glances/glances.py:1838 glances/glances.py:1892 glances/glances.py:2159
+#: glances/glances.py:2251 glances/glances.py:2535
msgid "Compute data..."
msgstr ""
-#: glances/glances.py:1841 glances/glances.py:1902
+#: glances/glances.py:1842 glances/glances.py:1902
msgid "user:"
msgstr ""
-#: glances/glances.py:1843 glances/glances.py:1911
+#: glances/glances.py:1844 glances/glances.py:1911
msgid "system:"
msgstr ""
-#: glances/glances.py:1846 glances/glances.py:1939
+#: glances/glances.py:1847 glances/glances.py:1939
msgid "iowait:"
msgstr ""
-#: glances/glances.py:1849 glances/glances.py:1918
+#: glances/glances.py:1850 glances/glances.py:1918
msgid "idle:"
msgstr ""
@@ -107,167 +107,167 @@ msgstr ""
msgid "Mem"
msgstr "Mem"
-#: glances/glances.py:2032 glances/glances.py:2121
+#: glances/glances.py:2032 glances/glances.py:2114
msgid "total:"
msgstr ""
-#: glances/glances.py:2041 glances/glances.py:2131
+#: glances/glances.py:2041 glances/glances.py:2124
msgid "used:"
msgstr ""
-#: glances/glances.py:2049 glances/glances.py:2140
+#: glances/glances.py:2049 glances/glances.py:2133
msgid "free:"
msgstr ""
-#: glances/glances.py:2063
+#: glances/glances.py:2062
msgid "active:"
msgstr ""
-#: glances/glances.py:2073
+#: glances/glances.py:2070
msgid "inactive:"
msgstr ""
-#: glances/glances.py:2083
+#: glances/glances.py:2080
msgid "buffers:"
msgstr ""
-#: glances/glances.py:2093
+#: glances/glances.py:2088
msgid "cached:"
msgstr ""
-#: glances/glances.py:2108
+#: glances/glances.py:2102
msgid "Swap"
msgstr "Intercambio"
-#: glances/glances.py:2156
+#: glances/glances.py:2149
msgid "Network"
msgstr ""
-#: glances/glances.py:2159
+#: glances/glances.py:2152
msgid "Rx/s"
msgstr ""
-#: glances/glances.py:2161
+#: glances/glances.py:2154
msgid "Tx/s"
msgstr ""
-#: glances/glances.py:2218
+#: glances/glances.py:2211
msgid "Sensors"
msgstr ""
-#: glances/glances.py:2221
+#: glances/glances.py:2214
msgid "°C"
msgstr ""
-#: glances/glances.py:2247
+#: glances/glances.py:2240
msgid "Disk I/O"
msgstr "Lectura/Escritura a disco"
-#: glances/glances.py:2251
+#: glances/glances.py:2244
msgid "In/s"
msgstr ""
-#: glances/glances.py:2253
+#: glances/glances.py:2246
msgid "Out/s"
msgstr ""
-#: glances/glances.py:2294
+#: glances/glances.py:2287
msgid "Mount"
msgstr "Montaje"
-#: glances/glances.py:2298
+#: glances/glances.py:2291
msgid "Used"
msgstr "Usado"
-#: glances/glances.py:2300
+#: glances/glances.py:2293
msgid "Total"
msgstr "Total"
-#: glances/glances.py:2342
+#: glances/glances.py:2335
msgid "WARNING|CRITICAL logs for CPU|LOAD|MEM"
msgstr ""
-#: glances/glances.py:2344
+#: glances/glances.py:2337
msgid " (lasts "
msgstr ""
-#: glances/glances.py:2345
+#: glances/glances.py:2338
msgid " entries)"
msgstr ""
-#: glances/glances.py:2347
+#: glances/glances.py:2340
msgid " (one entry)"
msgstr ""
-#: glances/glances.py:2421
+#: glances/glances.py:2411
msgid "Processes"
msgstr ""
-#: glances/glances.py:2432
+#: glances/glances.py:2422
msgid "running"
msgstr ""
-#: glances/glances.py:2434
+#: glances/glances.py:2424
msgid "sleeping"
msgstr ""
-#: glances/glances.py:2436
+#: glances/glances.py:2426
msgid "other"
msgstr ""
-#: glances/glances.py:2442
+#: glances/glances.py:2432
msgid "sorted automatically"
msgstr ""
-#: glances/glances.py:2444
+#: glances/glances.py:2434
msgid "sorted by "
msgstr ""
-#: glances/glances.py:2477
+#: glances/glances.py:2467
msgid "VIRT"
msgstr ""
-#: glances/glances.py:2481
+#: glances/glances.py:2471
msgid "RES"
msgstr ""
-#: glances/glances.py:2485
+#: glances/glances.py:2475
msgid "CPU%"
msgstr ""
-#: glances/glances.py:2490
+#: glances/glances.py:2480
msgid "MEM%"
msgstr ""
-#: glances/glances.py:2498
+#: glances/glances.py:2488
msgid "PID"
msgstr ""
-#: glances/glances.py:2504
+#: glances/glances.py:2494
msgid "USER"
msgstr ""
-#: glances/glances.py:2510
+#: glances/glances.py:2500
msgid "NI"
msgstr ""
-#: glances/glances.py:2516
+#: glances/glances.py:2506
msgid "S"
msgstr ""
-#: glances/glances.py:2522
+#: glances/glances.py:2512
msgid "TIME+"
msgstr ""
-#: glances/glances.py:2528
-msgid "IOr/s"
+#: glances/glances.py:2518
+msgid "IO_R/s"
msgstr ""
-#: glances/glances.py:2533
-msgid "IOw/s"
+#: glances/glances.py:2523
+msgid "IO_W/s"
msgstr ""
-#: glances/glances.py:2539
+#: glances/glances.py:2529
msgid "NAME"
msgstr ""
@@ -311,319 +311,347 @@ msgstr "CRÍTICA "
msgid "CPU user % "
msgstr ""
-#: glances/glances.py:2747
+#: glances/glances.py:2746
msgid "CPU system % "
msgstr ""
-#: glances/glances.py:2757
+#: glances/glances.py:2755
msgid "CPU IOwait % "
msgstr ""
-#: glances/glances.py:2767
+#: glances/glances.py:2764
msgid "Load "
msgstr ""
-#: glances/glances.py:2777
+#: glances/glances.py:2773
msgid "RAM Memory % "
msgstr ""
-#: glances/glances.py:2787
+#: glances/glances.py:2782
msgid "Swap memory %"
msgstr ""
-#: glances/glances.py:2797
+#: glances/glances.py:2791
msgid "Temp °C "
msgstr ""
-#: glances/glances.py:2807
+#: glances/glances.py:2800
msgid "Filesystem % "
msgstr ""
-#: glances/glances.py:2817
+#: glances/glances.py:2809
msgid "CPU Process %"
msgstr ""
-#: glances/glances.py:2827
+#: glances/glances.py:2818
msgid "MEM Process %"
msgstr ""
-#: glances/glances.py:2841
+#: glances/glances.py:2831
msgid "a"
msgstr ""
-#: glances/glances.py:2841
+#: glances/glances.py:2831
msgid "Sort processes automatically"
msgstr ""
-#: glances/glances.py:2848
+#: glances/glances.py:2838
msgid "c"
msgstr ""
-#: glances/glances.py:2848
+#: glances/glances.py:2838
msgid "Sort processes by CPU%"
msgstr ""
-#: glances/glances.py:2855
+#: glances/glances.py:2845
msgid "m"
msgstr ""
-#: glances/glances.py:2855
+#: glances/glances.py:2845
msgid "Sort processes by MEM%"
msgstr ""
-#: glances/glances.py:2860
+#: glances/glances.py:2850
msgid "p"
msgstr ""
-#: glances/glances.py:2860
+#: glances/glances.py:2850
msgid "Sort processes by name"
msgstr ""
-#: glances/glances.py:2865
+#: glances/glances.py:2855
msgid "i"
msgstr ""
-#: glances/glances.py:2865
+#: glances/glances.py:2855
msgid "Sort processes by IO Rate"
msgstr ""
-#: glances/glances.py:2870
+#: glances/glances.py:2860
msgid "d"
msgstr ""
-#: glances/glances.py:2870
+#: glances/glances.py:2860
msgid "Show/hide disk I/O stats"
msgstr ""
-#: glances/glances.py:2876
+#: glances/glances.py:2866
msgid "f"
msgstr ""
-#: glances/glances.py:2876
+#: glances/glances.py:2866
msgid "Show/hide file system stats"
msgstr ""
-#: glances/glances.py:2882
+#: glances/glances.py:2872
msgid "n"
msgstr ""
-#: glances/glances.py:2882
+#: glances/glances.py:2872
msgid "Show/hide network stats"
msgstr ""
-#: glances/glances.py:2888
+#: glances/glances.py:2878
msgid "s"
msgstr ""
-#: glances/glances.py:2888
+#: glances/glances.py:2878
msgid "Show/hide sensors stats"
msgstr ""
-#: glances/glances.py:2894
+#: glances/glances.py:2884
msgid "l"
msgstr ""
-#: glances/glances.py:2894
+#: glances/glances.py:2884
msgid "Show/hide log messages"
msgstr ""
-#: glances/glances.py:2904
+#: glances/glances.py:2894
msgid "b"
msgstr ""
-#: glances/glances.py:2904
+#: glances/glances.py:2894
msgid "Bit/s or Byte/s for network IO"
msgstr ""
-#: glances/glances.py:2912
+#: glances/glances.py:2902
msgid "w"
msgstr ""
-#: glances/glances.py:2912
+#: glances/glances.py:2902
msgid "Delete warning logs"
msgstr ""
-#: glances/glances.py:2917
+#: glances/glances.py:2907
msgid "x"
msgstr ""
-#: glances/glances.py:2917
+#: glances/glances.py:2907
msgid "Delete warning and critical logs"
msgstr ""
-#: glances/glances.py:2922
+#: glances/glances.py:2912
msgid "1"
msgstr ""
-#: glances/glances.py:2922
+#: glances/glances.py:2912
msgid "Global CPU or Per Core stats"
msgstr ""
-#: glances/glances.py:2927
+#: glances/glances.py:2917
msgid "h"
msgstr ""
-#: glances/glances.py:2927
+#: glances/glances.py:2917
msgid "Show/hide this help message"
msgstr ""
-#: glances/glances.py:2932
+#: glances/glances.py:2922
msgid "q"
msgstr ""
-#: glances/glances.py:2932
+#: glances/glances.py:2922
msgid "Quit (Esc and Ctrl-C also work)"
msgstr ""
-#: glances/glances.py:2942 glances/glances.py:3228
+#: glances/glances.py:2931 glances/glances.py:3262
msgid "%Y-%m-%d %H:%M:%S"
msgstr "%d.%m.%Y %H:%M:%S"
-#: glances/glances.py:3261
+#: glances/glances.py:3316
msgid "Error: creating client socket"
msgstr ""
-#: glances/glances.py:3269
-msgid "Error: Connection to server failed"
+#: glances/glances.py:3325
+msgid "Error: Connection to server failed. Bad password."
msgstr ""
-#: glances/glances.py:3289
+#: glances/glances.py:3328
+msgid "Error: Connection to server failed. Unknown error."
+msgstr ""
+
+#: glances/glances.py:3333
+msgid "Error: Connection to server failed. Can not get the server version."
+msgstr ""
+
+#: glances/glances.py:3360
msgid "Glances version"
msgstr ""
-#: glances/glances.py:3294
+#: glances/glances.py:3360
+msgid " with PsUtil "
+msgstr ""
+
+#: glances/glances.py:3365
msgid "Usage: glances [opt]"
msgstr ""
-#: glances/glances.py:3295
+#: glances/glances.py:3366
msgid " with opt:"
msgstr ""
-#: glances/glances.py:3296
+#: glances/glances.py:3367
msgid "\t-b\t\tDisplay network rate in Byte per second"
msgstr ""
-#: glances/glances.py:3297
+#: glances/glances.py:3368
msgid "\t-B @IP|host\tBind server to the given IP or host NAME"
msgstr ""
-#: glances/glances.py:3298
+#: glances/glances.py:3369
msgid "\t-c @IP|host\tConnect to a Glances server"
msgstr ""
-#: glances/glances.py:3299
+#: glances/glances.py:3370
#, python-format
msgid "\t-C file\t\tPath to the configuration file (default: %s)"
msgstr ""
-#: glances/glances.py:3301
+#: glances/glances.py:3372
msgid "\t-d\t\tDisable disk I/O module"
msgstr ""
-#: glances/glances.py:3302
+#: glances/glances.py:3373
msgid "\t-e\t\tEnable the sensors module (Linux-only)"
msgstr ""
-#: glances/glances.py:3303
+#: glances/glances.py:3374
msgid "\t-f file\t\tSet the output folder (HTML) or file (CSV)"
msgstr ""
-#: glances/glances.py:3304
+#: glances/glances.py:3375
msgid "\t-h\t\tDisplay the syntax and exit"
msgstr ""
-#: glances/glances.py:3305
+#: glances/glances.py:3376
msgid "\t-m\t\tDisable mount module"
msgstr ""
-#: glances/glances.py:3306
+#: glances/glances.py:3377
msgid "\t-n\t\tDisable network module"
msgstr ""
-#: glances/glances.py:3307
+#: glances/glances.py:3378
msgid "\t-o output\tDefine additional output (available: HTML or CSV)"
msgstr ""
-#: glances/glances.py:3308
+#: glances/glances.py:3379
#, python-format
msgid "\t-p PORT\t\tDefine the client or server TCP port (default: %d)"
msgstr ""
-#: glances/glances.py:3310
+#: glances/glances.py:3381
+msgid "\t-P password\tClient/server password"
+msgstr ""
+
+#: glances/glances.py:3382
msgid "\t-s\t\tRun Glances in server mode"
msgstr ""
-#: glances/glances.py:3311
+#: glances/glances.py:3383
#, python-format
msgid "\t-t sec\t\tSet the refresh time in seconds (default: %d)"
msgstr ""
-#: glances/glances.py:3313
+#: glances/glances.py:3385
msgid "\t-v\t\tDisplay the version and exit"
msgstr ""
-#: glances/glances.py:3396
+#: glances/glances.py:3473
+msgid "Error: -P flag need an argument (password)"
+msgstr ""
+
+#: glances/glances.py:3480
msgid "Error: -B flag need an argument (bind IP address)"
msgstr ""
-#: glances/glances.py:3404
+#: glances/glances.py:3488
msgid "Error: -c flag need an argument (server IP address/name)"
msgstr ""
-#: glances/glances.py:3415
+#: glances/glances.py:3499
#, python-format
msgid "Error: Unknown output %s"
msgstr ""
-#: glances/glances.py:3421
+#: glances/glances.py:3505
msgid "Error: PySensors library not found"
msgstr ""
-#: glances/glances.py:3426
+#: glances/glances.py:3510
msgid "Error: Sensors module is only available on Linux"
msgstr ""
-#: glances/glances.py:3434
+#: glances/glances.py:3518
msgid "Error: Refresh time should be a positive integer"
msgstr ""
-#: glances/glances.py:3453
+#: glances/glances.py:3538
msgid "Error: Can not use both -s and -c flag"
msgstr ""
-#: glances/glances.py:3456
+#: glances/glances.py:3541
msgid "Error: Can not use both -s and -o flag"
msgstr ""
-#: glances/glances.py:3461
+#: glances/glances.py:3546
msgid "Error: Can not use both -c and -o flag"
msgstr ""
-#: glances/glances.py:3466
+#: glances/glances.py:3549
+msgid "Error: Can not use both -c and -C flag"
+msgstr ""
+
+#: glances/glances.py:3550
+msgid " Limits are set based on the server ones"
+msgstr ""
+
+#: glances/glances.py:3555
msgid "Error: Need Jinja2 library to export into HTML"
msgstr ""
-#: glances/glances.py:3467
+#: glances/glances.py:3556
msgid "Try to install the python-jinja2 package"
msgstr ""
-#: glances/glances.py:3472
+#: glances/glances.py:3561
msgid "Error: HTML export (-o html) needoutput folder definition (-f )"
msgstr ""
-#: glances/glances.py:3478
+#: glances/glances.py:3567
msgid "Error: Need CSV library to export into CSV"
msgstr ""
-#: glances/glances.py:3483
+#: glances/glances.py:3572
msgid "Error: CSV export (-o csv) need output file definition (-f )"
msgstr ""
-#: glances/glances.py:3505
+#: glances/glances.py:3594
msgid "Glances server is running on"
msgstr ""
-#: glances/glances.py:3518
+#: glances/glances.py:3613
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 da57942e..7d6fe77e 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 9ccb8031..ba54e728 100644
--- a/i18n/fr/LC_MESSAGES/glances.po
+++ b/i18n/fr/LC_MESSAGES/glances.po
@@ -6,9 +6,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GLANCES 1.5\n"
+"Project-Id-Version: GLANCES 1.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-11 19:59+0100\n"
+"POT-Creation-Date: 2013-01-26 10:40+0100\n"
"PO-Revision-Date: 2012-01-06 15:23+0100\n"
"Last-Translator: Peter Fontaine \n"
"Language-Team: French\n"
@@ -18,57 +18,57 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: glances/glances.py:76
+#: glances/glances.py:87
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:83
+#: glances/glances.py:94
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:88
+#: glances/glances.py:99
#, python-format
msgid "PsUtil version %s detected."
msgstr "PsUtil version %s détecté"
-#: glances/glances.py:89
+#: glances/glances.py:100
msgid "PsUtil 0.4.1 or higher is needed. Glances cannot start."
msgstr "PsUtil 0.4.1 ou supérieur nécessaire. Glances ne peut pas démarrer"
-#: glances/glances.py:1319
+#: glances/glances.py:1303
msgid "Error: Cannot init the curses library.\n"
msgstr "Erreur d'initialisation de la librairie Curses.\n"
-#: glances/glances.py:1777
+#: glances/glances.py:1779
msgid "{0} {1} with {2} {3} on {4}"
msgstr "{0} {1} avec {2} {3} sur {4}"
-#: glances/glances.py:1782
+#: glances/glances.py:1784
msgid "{0} {1} {2} on {3}"
msgstr "{0} {1} {2} sur {3}"
-#: glances/glances.py:1831
+#: glances/glances.py:1832
msgid "PerCPU"
msgstr "Par CPU"
-#: glances/glances.py:1837 glances/glances.py:1892 glances/glances.py:2166
-#: glances/glances.py:2258 glances/glances.py:2545
+#: glances/glances.py:1838 glances/glances.py:1892 glances/glances.py:2159
+#: glances/glances.py:2251 glances/glances.py:2535
msgid "Compute data..."
msgstr "Calcul des données..."
-#: glances/glances.py:1841 glances/glances.py:1902
+#: glances/glances.py:1842 glances/glances.py:1902
msgid "user:"
msgstr ""
-#: glances/glances.py:1843 glances/glances.py:1911
+#: glances/glances.py:1844 glances/glances.py:1911
msgid "system:"
msgstr ""
-#: glances/glances.py:1846 glances/glances.py:1939
+#: glances/glances.py:1847 glances/glances.py:1939
msgid "iowait:"
msgstr ""
-#: glances/glances.py:1849 glances/glances.py:1918
+#: glances/glances.py:1850 glances/glances.py:1918
msgid "idle:"
msgstr ""
@@ -86,7 +86,7 @@ msgstr ""
#: glances/glances.py:1971
msgid "Load"
-msgstr "Load"
+msgstr ""
#: glances/glances.py:1975
msgid "-core"
@@ -108,167 +108,167 @@ msgstr ""
msgid "Mem"
msgstr ""
-#: glances/glances.py:2032 glances/glances.py:2121
+#: glances/glances.py:2032 glances/glances.py:2114
msgid "total:"
msgstr ""
-#: glances/glances.py:2041 glances/glances.py:2131
+#: glances/glances.py:2041 glances/glances.py:2124
msgid "used:"
msgstr "util:"
-#: glances/glances.py:2049 glances/glances.py:2140
+#: glances/glances.py:2049 glances/glances.py:2133
msgid "free:"
msgstr "libre:"
-#: glances/glances.py:2063
+#: glances/glances.py:2062
msgid "active:"
msgstr "actif:"
-#: glances/glances.py:2073
+#: glances/glances.py:2070
msgid "inactive:"
msgstr "inactif:"
-#: glances/glances.py:2083
+#: glances/glances.py:2080
msgid "buffers:"
msgstr ""
-#: glances/glances.py:2093
+#: glances/glances.py:2088
msgid "cached:"
-msgstr "cacher:"
+msgstr "cache:"
-#: glances/glances.py:2108
+#: glances/glances.py:2102
msgid "Swap"
msgstr ""
-#: glances/glances.py:2156
+#: glances/glances.py:2149
msgid "Network"
msgstr "Reseau"
-#: glances/glances.py:2159
+#: glances/glances.py:2152
msgid "Rx/s"
msgstr ""
-#: glances/glances.py:2161
+#: glances/glances.py:2154
msgid "Tx/s"
msgstr ""
-#: glances/glances.py:2218
+#: glances/glances.py:2211
msgid "Sensors"
msgstr "Capteurs"
-#: glances/glances.py:2221
+#: glances/glances.py:2214
msgid "°C"
msgstr ""
-#: glances/glances.py:2247
+#: glances/glances.py:2240
msgid "Disk I/O"
msgstr "IO Disque"
-#: glances/glances.py:2251
+#: glances/glances.py:2244
msgid "In/s"
msgstr ""
-#: glances/glances.py:2253
+#: glances/glances.py:2246
msgid "Out/s"
msgstr ""
-#: glances/glances.py:2294
+#: glances/glances.py:2287
msgid "Mount"
msgstr ""
-#: glances/glances.py:2298
+#: glances/glances.py:2291
msgid "Used"
msgstr "Util"
-#: glances/glances.py:2300
+#: glances/glances.py:2293
msgid "Total"
msgstr ""
-#: glances/glances.py:2342
+#: glances/glances.py:2335
msgid "WARNING|CRITICAL logs for CPU|LOAD|MEM"
msgstr "Alertes WARNING|CRITICAL pour CPU|CHARGE|MEM"
-#: glances/glances.py:2344
+#: glances/glances.py:2337
msgid " (lasts "
msgstr " (dernières "
-#: glances/glances.py:2345
+#: glances/glances.py:2338
msgid " entries)"
msgstr " entrées)"
-#: glances/glances.py:2347
+#: glances/glances.py:2340
msgid " (one entry)"
msgstr " (une entrée)"
-#: glances/glances.py:2421
+#: glances/glances.py:2411
msgid "Processes"
msgstr "Processus"
-#: glances/glances.py:2432
+#: glances/glances.py:2422
msgid "running"
msgstr ""
-#: glances/glances.py:2434
+#: glances/glances.py:2424
msgid "sleeping"
msgstr ""
-#: glances/glances.py:2436
+#: glances/glances.py:2426
msgid "other"
msgstr ""
-#: glances/glances.py:2442
+#: glances/glances.py:2432
msgid "sorted automatically"
msgstr "triés automatiquement"
-#: glances/glances.py:2444
+#: glances/glances.py:2434
msgid "sorted by "
msgstr "triés par "
-#: glances/glances.py:2477
+#: glances/glances.py:2467
msgid "VIRT"
msgstr ""
-#: glances/glances.py:2481
+#: glances/glances.py:2471
msgid "RES"
msgstr ""
-#: glances/glances.py:2485
+#: glances/glances.py:2475
msgid "CPU%"
msgstr ""
-#: glances/glances.py:2490
+#: glances/glances.py:2480
msgid "MEM%"
msgstr ""
-#: glances/glances.py:2498
+#: glances/glances.py:2488
msgid "PID"
msgstr ""
-#: glances/glances.py:2504
+#: glances/glances.py:2494
msgid "USER"
msgstr "UTILISATEUR"
-#: glances/glances.py:2510
+#: glances/glances.py:2500
msgid "NI"
msgstr ""
-#: glances/glances.py:2516
+#: glances/glances.py:2506
msgid "S"
msgstr ""
-#: glances/glances.py:2522
+#: glances/glances.py:2512
msgid "TIME+"
msgstr ""
-#: glances/glances.py:2528
-msgid "IOr/s"
+#: glances/glances.py:2518
+msgid "IO_R/s"
msgstr ""
-#: glances/glances.py:2533
-msgid "IOw/s"
+#: glances/glances.py:2523
+msgid "IO_W/s"
msgstr ""
-#: glances/glances.py:2539
+#: glances/glances.py:2529
msgid "NAME"
msgstr "NOM"
@@ -312,330 +312,361 @@ msgstr ""
msgid "CPU user % "
msgstr ""
-#: glances/glances.py:2747
+#: glances/glances.py:2746
msgid "CPU system % "
msgstr ""
-#: glances/glances.py:2757
+#: glances/glances.py:2755
msgid "CPU IOwait % "
msgstr ""
-#: glances/glances.py:2767
+#: glances/glances.py:2764
msgid "Load "
msgstr ""
-#: glances/glances.py:2777
+#: glances/glances.py:2773
msgid "RAM Memory % "
msgstr ""
-#: glances/glances.py:2787
+#: glances/glances.py:2782
msgid "Swap memory %"
msgstr ""
-#: glances/glances.py:2797
+#: glances/glances.py:2791
msgid "Temp °C "
msgstr ""
-#: glances/glances.py:2807
+#: glances/glances.py:2800
msgid "Filesystem % "
msgstr ""
-#: glances/glances.py:2817
+#: glances/glances.py:2809
msgid "CPU Process %"
msgstr ""
-#: glances/glances.py:2827
+#: glances/glances.py:2818
msgid "MEM Process %"
msgstr ""
-#: glances/glances.py:2841
+#: glances/glances.py:2831
msgid "a"
msgstr ""
-#: glances/glances.py:2841
+#: glances/glances.py:2831
msgid "Sort processes automatically"
msgstr "Classer automatiquement les processus"
-#: glances/glances.py:2848
+#: glances/glances.py:2838
msgid "c"
msgstr ""
-#: glances/glances.py:2848
+#: glances/glances.py:2838
msgid "Sort processes by CPU%"
msgstr "Classer les processus par CPU%"
-#: glances/glances.py:2855
+#: glances/glances.py:2845
msgid "m"
msgstr ""
-#: glances/glances.py:2855
+#: glances/glances.py:2845
msgid "Sort processes by MEM%"
msgstr "Classer les processus par MEM%"
-#: glances/glances.py:2860
+#: glances/glances.py:2850
msgid "p"
msgstr ""
-#: glances/glances.py:2860
+#: glances/glances.py:2850
msgid "Sort processes by name"
msgstr "Classer les processus par ordre alphabetique"
-#: glances/glances.py:2865
+#: glances/glances.py:2855
msgid "i"
msgstr ""
-#: glances/glances.py:2865
+#: glances/glances.py:2855
msgid "Sort processes by IO Rate"
msgstr "Classer les processus par débit IO"
-#: glances/glances.py:2870
+#: glances/glances.py:2860
msgid "d"
msgstr ""
-#: glances/glances.py:2870
+#: glances/glances.py:2860
msgid "Show/hide disk I/O stats"
msgstr "Montrer/cacher les IO disques"
-#: glances/glances.py:2876
+#: glances/glances.py:2866
msgid "f"
msgstr ""
-#: glances/glances.py:2876
+#: glances/glances.py:2866
msgid "Show/hide file system stats"
msgstr "Montrer/cacher les statistiques sur les montages"
-#: glances/glances.py:2882
+#: glances/glances.py:2872
msgid "n"
msgstr ""
-#: glances/glances.py:2882
+#: glances/glances.py:2872
msgid "Show/hide network stats"
msgstr "Montrer/cacher IO réseau"
-#: glances/glances.py:2888
+#: glances/glances.py:2878
msgid "s"
msgstr ""
-#: glances/glances.py:2888
+#: glances/glances.py:2878
msgid "Show/hide sensors stats"
msgstr ""
-#: glances/glances.py:2894
+#: glances/glances.py:2884
msgid "l"
msgstr ""
-#: glances/glances.py:2894
+#: glances/glances.py:2884
msgid "Show/hide log messages"
msgstr "Montrer ou cacher les logs"
-#: glances/glances.py:2904
+#: glances/glances.py:2894
msgid "b"
msgstr ""
-#: glances/glances.py:2904
+#: glances/glances.py:2894
msgid "Bit/s or Byte/s for network IO"
msgstr "Bit/s ou Octet/s pour le réseau"
-#: glances/glances.py:2912
+#: glances/glances.py:2902
msgid "w"
msgstr ""
-#: glances/glances.py:2912
+#: glances/glances.py:2902
msgid "Delete warning logs"
msgstr "Suppression des alertes warning"
-#: glances/glances.py:2917
+#: glances/glances.py:2907
msgid "x"
msgstr ""
-#: glances/glances.py:2917
+#: glances/glances.py:2907
msgid "Delete warning and critical logs"
msgstr "Supression de toutes les alertes"
-#: glances/glances.py:2922
+#: glances/glances.py:2912
msgid "1"
msgstr ""
-#: glances/glances.py:2922
+#: glances/glances.py:2912
msgid "Global CPU or Per Core stats"
msgstr "CPU globale ou par CPU"
-#: glances/glances.py:2927
+#: glances/glances.py:2917
msgid "h"
msgstr ""
-#: glances/glances.py:2927
+#: glances/glances.py:2917
msgid "Show/hide this help message"
msgstr "Afficher l'aide en ligne"
-#: glances/glances.py:2932
+#: glances/glances.py:2922
msgid "q"
msgstr ""
-#: glances/glances.py:2932
+#: glances/glances.py:2922
msgid "Quit (Esc and Ctrl-C also work)"
msgstr "Quitter Glances (ESC ou Ctrl-C marche aussi...)"
-#: glances/glances.py:2942 glances/glances.py:3228
+#: glances/glances.py:2931 glances/glances.py:3262
msgid "%Y-%m-%d %H:%M:%S"
msgstr "%d/%m/%Y %H:%M:%S"
-#: glances/glances.py:3261
+#: glances/glances.py:3316
msgid "Error: creating client socket"
msgstr "Erreur: Impossible de créer la socket cliente"
-#: glances/glances.py:3269
-msgid "Error: Connection to server failed"
-msgstr "Erreur: Impossible de se connecter au serveur"
+#: glances/glances.py:3325
+msgid "Error: Connection to server failed. Bad password."
+msgstr ""
-#: glances/glances.py:3289
+#: glances/glances.py:3328
+msgid "Error: Connection to server failed. Unknown error."
+msgstr ""
+
+#: glances/glances.py:3333
+msgid "Error: Connection to server failed. Can not get the server version."
+msgstr ""
+
+#: glances/glances.py:3360
msgid "Glances version"
msgstr ""
-#: glances/glances.py:3294
+#: glances/glances.py:3360
+msgid " with PsUtil "
+msgstr " avec PsUtil "
+
+#: glances/glances.py:3365
msgid "Usage: glances [opt]"
msgstr "Usage: glances [options]"
-#: glances/glances.py:3295
+#: glances/glances.py:3366
msgid " with opt:"
msgstr " avec les options:"
-#: glances/glances.py:3296
+#: glances/glances.py:3367
msgid "\t-b\t\tDisplay network rate in Byte per second"
msgstr "\t-b\t\tAffichage des débits réseau en Octet par seconde"
-#: glances/glances.py:3297
+#: glances/glances.py:3368
msgid "\t-B @IP|host\tBind server to the given IP or host NAME"
msgstr ""
"\t-B @IP|host\tMettre le serveur en écoute sur une adresse IP ou hostname"
-#: glances/glances.py:3298
+#: glances/glances.py:3369
msgid "\t-c @IP|host\tConnect to a Glances server"
msgstr "\t-c @IP|host\tLancer Glances en mode client (adresse IP du serveur)"
-#: glances/glances.py:3299
+#: glances/glances.py:3370
#, python-format
msgid "\t-C file\t\tPath to the configuration file (default: %s)"
msgstr "\t-C file\t\tChemin vers le fichier de conf (par défaut %s)"
-#: glances/glances.py:3301
+#: glances/glances.py:3372
msgid "\t-d\t\tDisable disk I/O module"
msgstr "\t-d\t\tDéscativer le module disk I/O"
-#: glances/glances.py:3302
+#: glances/glances.py:3373
msgid "\t-e\t\tEnable the sensors module (Linux-only)"
msgstr "\t-e\t\tActiver le module capteur (seulement sous Linux)"
-#: glances/glances.py:3303
+#: glances/glances.py:3374
msgid "\t-f file\t\tSet the output folder (HTML) or file (CSV)"
msgstr ""
"\t-f file\t\tConfigurer le répertoire (HTML) ou le fichier (CSV) de sortie"
-#: glances/glances.py:3304
+#: glances/glances.py:3375
msgid "\t-h\t\tDisplay the syntax and exit"
msgstr "\t-h\t\tAfficher la syntaxe puis sortir"
-#: glances/glances.py:3305
+#: glances/glances.py:3376
msgid "\t-m\t\tDisable mount module"
msgstr "\t-m\t\tDésactiver le module file system"
-#: glances/glances.py:3306
+#: glances/glances.py:3377
msgid "\t-n\t\tDisable network module"
msgstr "\t-n\t\tDéscativer le module réseau"
-#: glances/glances.py:3307
+#: glances/glances.py:3378
msgid "\t-o output\tDefine additional output (available: HTML or CSV)"
msgstr "\t-o output\tDéfinir le mode de sortie supplémentaire (HTML ou CSV)"
-#: glances/glances.py:3308
+#: glances/glances.py:3379
#, python-format
msgid "\t-p PORT\t\tDefine the client or server TCP port (default: %d)"
msgstr ""
"\t-p PORT\t\tDéfinir le port TCP utilisé pour le mode client/serveur "
"(defaut: %d)"
-#: glances/glances.py:3310
+#: glances/glances.py:3381
+msgid "\t-P password\tClient/server password"
+msgstr "\t-P motdepasse\tMot de passe pour le mode client/serveur"
+
+#: glances/glances.py:3382
msgid "\t-s\t\tRun Glances in server mode"
msgstr "\t-s\t\tLancer Glances en mode serveur"
-#: glances/glances.py:3311
+#: glances/glances.py:3383
#, python-format
msgid "\t-t sec\t\tSet the refresh time in seconds (default: %d)"
msgstr "\t-t sec\t\tDéfinir le temps de rafraichissement (defaut: %d)"
-#: glances/glances.py:3313
+#: glances/glances.py:3385
msgid "\t-v\t\tDisplay the version and exit"
msgstr "\t-v\t\tAfficher la version et sortir"
-#: glances/glances.py:3396
+#: glances/glances.py:3473
+msgid "Error: -P flag need an argument (password)"
+msgstr "Erreur: Le flag -P doit avoir un argument (mot de passe)"
+
+#: glances/glances.py:3480
msgid "Error: -B flag need an argument (bind IP address)"
msgstr "Erreur: L'option -B nécessite un argument (bind IP address)"
-#: glances/glances.py:3404
+#: glances/glances.py:3488
msgid "Error: -c flag need an argument (server IP address/name)"
msgstr "Erreur: L'option -c nécessite un argument (server IP address/name)"
-#: glances/glances.py:3415
+#: glances/glances.py:3499
#, python-format
msgid "Error: Unknown output %s"
msgstr "Erreur: Mode de sortie demandée inconnue (%s)"
-#: glances/glances.py:3421
+#: glances/glances.py:3505
msgid "Error: PySensors library not found"
msgstr "Erreur: Librairie PySensors introuvable"
-#: glances/glances.py:3426
+#: glances/glances.py:3510
msgid "Error: Sensors module is only available on Linux"
msgstr "Erreur: Le module Sensors est seulement disponible sous GNU/Linux"
-#: glances/glances.py:3434
+#: glances/glances.py:3518
msgid "Error: Refresh time should be a positive integer"
msgstr "Erreur: Le temps de rafraichissement doit être > 0"
-#: glances/glances.py:3453
+#: glances/glances.py:3538
msgid "Error: Can not use both -s and -c flag"
msgstr "Erreur: Impossible d'utiliser en même temps les options -s et -c"
-#: glances/glances.py:3456
+#: glances/glances.py:3541
msgid "Error: Can not use both -s and -o flag"
msgstr "Erreur: Impossible d'utiliser en même temps les options -s et -o"
-#: glances/glances.py:3461
+#: glances/glances.py:3546
msgid "Error: Can not use both -c and -o flag"
msgstr "Erreur: Impossible d'utiliser en même temps les options -c et -o"
-#: glances/glances.py:3466
+#: glances/glances.py:3549
+msgid "Error: Can not use both -c and -C flag"
+msgstr "Erreur: Impossible d'utiliser en même temps les options -c et -C"
+
+#: glances/glances.py:3550
+msgid " Limits are set based on the server ones"
+msgstr ""
+
+#: glances/glances.py:3555
msgid "Error: Need Jinja2 library to export into HTML"
msgstr "Erreur: La librairie Jinja2 est introuvable"
-#: glances/glances.py:3467
+#: glances/glances.py:3556
msgid "Try to install the python-jinja2 package"
msgstr "Essayer d'installer le package python-jinja2"
-#: glances/glances.py:3472
+#: glances/glances.py:3561
msgid "Error: HTML export (-o html) needoutput folder definition (-f )"
msgstr ""
"Erreur: L'export HTML (-o html) nécessite la configuration du répertoire de "
"sortie (-f )"
-#: glances/glances.py:3478
+#: glances/glances.py:3567
msgid "Error: Need CSV library to export into CSV"
msgstr "Erreur: La librairie CSV est introuvable"
-#: glances/glances.py:3483
+#: glances/glances.py:3572
msgid "Error: CSV export (-o csv) need output file definition (-f )"
msgstr ""
"Erreur: L'export CVS (-o cvs) nécessite la configuration du fichier de "
"sortie (-f )"
-#: glances/glances.py:3505
+#: glances/glances.py:3594
msgid "Glances server is running on"
-msgstr "Le serveur Glances est lancé"
+msgstr "Le serveur Glances est lance"
-#: glances/glances.py:3518
+#: glances/glances.py:3613
msgid "Error: The server version is not compatible"
msgstr "Erreur: La version du serveur Glances n'est pas compatible"
+#~ msgid "Error: Connection to server failed"
+#~ msgstr "Erreur: Impossible de se connecter au serveur"
+
#~ msgid "Captions: "
#~ msgstr "Alertes: "
diff --git a/i18n/glances.pot b/i18n/glances.pot
index d8976ebe..284ce3b8 100644
--- a/i18n/glances.pot
+++ b/i18n/glances.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-11 19:59+0100\n"
+"POT-Creation-Date: 2013-01-26 10:44+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,57 +17,57 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: glances/glances.py:76
+#: glances/glances.py:87
msgid "Curses module not found. Glances cannot start."
msgstr ""
-#: glances/glances.py:83
+#: glances/glances.py:94
msgid "PsUtil module not found. Glances cannot start."
msgstr ""
-#: glances/glances.py:88
+#: glances/glances.py:99
#, python-format
msgid "PsUtil version %s detected."
msgstr ""
-#: glances/glances.py:89
+#: glances/glances.py:100
msgid "PsUtil 0.4.1 or higher is needed. Glances cannot start."
msgstr ""
-#: glances/glances.py:1319
+#: glances/glances.py:1303
msgid "Error: Cannot init the curses library.\n"
msgstr ""
-#: glances/glances.py:1777
+#: glances/glances.py:1779
msgid "{0} {1} with {2} {3} on {4}"
msgstr ""
-#: glances/glances.py:1782
+#: glances/glances.py:1784
msgid "{0} {1} {2} on {3}"
msgstr ""
-#: glances/glances.py:1831
+#: glances/glances.py:1832
msgid "PerCPU"
msgstr ""
-#: glances/glances.py:1837 glances/glances.py:1892 glances/glances.py:2166
-#: glances/glances.py:2258 glances/glances.py:2545
+#: glances/glances.py:1838 glances/glances.py:1892 glances/glances.py:2159
+#: glances/glances.py:2251 glances/glances.py:2535
msgid "Compute data..."
msgstr ""
-#: glances/glances.py:1841 glances/glances.py:1902
+#: glances/glances.py:1842 glances/glances.py:1902
msgid "user:"
msgstr ""
-#: glances/glances.py:1843 glances/glances.py:1911
+#: glances/glances.py:1844 glances/glances.py:1911
msgid "system:"
msgstr ""
-#: glances/glances.py:1846 glances/glances.py:1939
+#: glances/glances.py:1847 glances/glances.py:1939
msgid "iowait:"
msgstr ""
-#: glances/glances.py:1849 glances/glances.py:1918
+#: glances/glances.py:1850 glances/glances.py:1918
msgid "idle:"
msgstr ""
@@ -107,167 +107,167 @@ msgstr ""
msgid "Mem"
msgstr ""
-#: glances/glances.py:2032 glances/glances.py:2121
+#: glances/glances.py:2032 glances/glances.py:2114
msgid "total:"
msgstr ""
-#: glances/glances.py:2041 glances/glances.py:2131
+#: glances/glances.py:2041 glances/glances.py:2124
msgid "used:"
msgstr ""
-#: glances/glances.py:2049 glances/glances.py:2140
+#: glances/glances.py:2049 glances/glances.py:2133
msgid "free:"
msgstr ""
-#: glances/glances.py:2063
+#: glances/glances.py:2062
msgid "active:"
msgstr ""
-#: glances/glances.py:2073
+#: glances/glances.py:2070
msgid "inactive:"
msgstr ""
-#: glances/glances.py:2083
+#: glances/glances.py:2080
msgid "buffers:"
msgstr ""
-#: glances/glances.py:2093
+#: glances/glances.py:2088
msgid "cached:"
msgstr ""
-#: glances/glances.py:2108
+#: glances/glances.py:2102
msgid "Swap"
msgstr ""
-#: glances/glances.py:2156
+#: glances/glances.py:2149
msgid "Network"
msgstr ""
-#: glances/glances.py:2159
+#: glances/glances.py:2152
msgid "Rx/s"
msgstr ""
-#: glances/glances.py:2161
+#: glances/glances.py:2154
msgid "Tx/s"
msgstr ""
-#: glances/glances.py:2218
+#: glances/glances.py:2211
msgid "Sensors"
msgstr ""
-#: glances/glances.py:2221
+#: glances/glances.py:2214
msgid "°C"
msgstr ""
-#: glances/glances.py:2247
+#: glances/glances.py:2240
msgid "Disk I/O"
msgstr ""
-#: glances/glances.py:2251
+#: glances/glances.py:2244
msgid "In/s"
msgstr ""
-#: glances/glances.py:2253
+#: glances/glances.py:2246
msgid "Out/s"
msgstr ""
-#: glances/glances.py:2294
+#: glances/glances.py:2287
msgid "Mount"
msgstr ""
-#: glances/glances.py:2298
+#: glances/glances.py:2291
msgid "Used"
msgstr ""
-#: glances/glances.py:2300
+#: glances/glances.py:2293
msgid "Total"
msgstr ""
-#: glances/glances.py:2342
+#: glances/glances.py:2335
msgid "WARNING|CRITICAL logs for CPU|LOAD|MEM"
msgstr ""
-#: glances/glances.py:2344
+#: glances/glances.py:2337
msgid " (lasts "
msgstr ""
-#: glances/glances.py:2345
+#: glances/glances.py:2338
msgid " entries)"
msgstr ""
-#: glances/glances.py:2347
+#: glances/glances.py:2340
msgid " (one entry)"
msgstr ""
-#: glances/glances.py:2421
+#: glances/glances.py:2411
msgid "Processes"
msgstr ""
-#: glances/glances.py:2432
+#: glances/glances.py:2422
msgid "running"
msgstr ""
-#: glances/glances.py:2434
+#: glances/glances.py:2424
msgid "sleeping"
msgstr ""
-#: glances/glances.py:2436
+#: glances/glances.py:2426
msgid "other"
msgstr ""
-#: glances/glances.py:2442
+#: glances/glances.py:2432
msgid "sorted automatically"
msgstr ""
-#: glances/glances.py:2444
+#: glances/glances.py:2434
msgid "sorted by "
msgstr ""
-#: glances/glances.py:2477
+#: glances/glances.py:2467
msgid "VIRT"
msgstr ""
-#: glances/glances.py:2481
+#: glances/glances.py:2471
msgid "RES"
msgstr ""
-#: glances/glances.py:2485
+#: glances/glances.py:2475
msgid "CPU%"
msgstr ""
-#: glances/glances.py:2490
+#: glances/glances.py:2480
msgid "MEM%"
msgstr ""
-#: glances/glances.py:2498
+#: glances/glances.py:2488
msgid "PID"
msgstr ""
-#: glances/glances.py:2504
+#: glances/glances.py:2494
msgid "USER"
msgstr ""
-#: glances/glances.py:2510
+#: glances/glances.py:2500
msgid "NI"
msgstr ""
-#: glances/glances.py:2516
+#: glances/glances.py:2506
msgid "S"
msgstr ""
-#: glances/glances.py:2522
+#: glances/glances.py:2512
msgid "TIME+"
msgstr ""
-#: glances/glances.py:2528
-msgid "IOr/s"
+#: glances/glances.py:2518
+msgid "IO_R/s"
msgstr ""
-#: glances/glances.py:2533
-msgid "IOw/s"
+#: glances/glances.py:2523
+msgid "IO_W/s"
msgstr ""
-#: glances/glances.py:2539
+#: glances/glances.py:2529
msgid "NAME"
msgstr ""
@@ -311,318 +311,346 @@ msgstr ""
msgid "CPU user % "
msgstr ""
-#: glances/glances.py:2747
+#: glances/glances.py:2746
msgid "CPU system % "
msgstr ""
-#: glances/glances.py:2757
+#: glances/glances.py:2755
msgid "CPU IOwait % "
msgstr ""
-#: glances/glances.py:2767
+#: glances/glances.py:2764
msgid "Load "
msgstr ""
-#: glances/glances.py:2777
+#: glances/glances.py:2773
msgid "RAM Memory % "
msgstr ""
-#: glances/glances.py:2787
+#: glances/glances.py:2782
msgid "Swap memory %"
msgstr ""
-#: glances/glances.py:2797
+#: glances/glances.py:2791
msgid "Temp °C "
msgstr ""
-#: glances/glances.py:2807
+#: glances/glances.py:2800
msgid "Filesystem % "
msgstr ""
-#: glances/glances.py:2817
+#: glances/glances.py:2809
msgid "CPU Process %"
msgstr ""
-#: glances/glances.py:2827
+#: glances/glances.py:2818
msgid "MEM Process %"
msgstr ""
-#: glances/glances.py:2841
+#: glances/glances.py:2831
msgid "a"
msgstr ""
-#: glances/glances.py:2841
+#: glances/glances.py:2831
msgid "Sort processes automatically"
msgstr ""
-#: glances/glances.py:2848
+#: glances/glances.py:2838
msgid "c"
msgstr ""
-#: glances/glances.py:2848
+#: glances/glances.py:2838
msgid "Sort processes by CPU%"
msgstr ""
-#: glances/glances.py:2855
+#: glances/glances.py:2845
msgid "m"
msgstr ""
-#: glances/glances.py:2855
+#: glances/glances.py:2845
msgid "Sort processes by MEM%"
msgstr ""
-#: glances/glances.py:2860
+#: glances/glances.py:2850
msgid "p"
msgstr ""
-#: glances/glances.py:2860
+#: glances/glances.py:2850
msgid "Sort processes by name"
msgstr ""
-#: glances/glances.py:2865
+#: glances/glances.py:2855
msgid "i"
msgstr ""
-#: glances/glances.py:2865
+#: glances/glances.py:2855
msgid "Sort processes by IO Rate"
msgstr ""
-#: glances/glances.py:2870
+#: glances/glances.py:2860
msgid "d"
msgstr ""
-#: glances/glances.py:2870
+#: glances/glances.py:2860
msgid "Show/hide disk I/O stats"
msgstr ""
-#: glances/glances.py:2876
+#: glances/glances.py:2866
msgid "f"
msgstr ""
-#: glances/glances.py:2876
+#: glances/glances.py:2866
msgid "Show/hide file system stats"
msgstr ""
-#: glances/glances.py:2882
+#: glances/glances.py:2872
msgid "n"
msgstr ""
-#: glances/glances.py:2882
+#: glances/glances.py:2872
msgid "Show/hide network stats"
msgstr ""
-#: glances/glances.py:2888
+#: glances/glances.py:2878
msgid "s"
msgstr ""
-#: glances/glances.py:2888
+#: glances/glances.py:2878
msgid "Show/hide sensors stats"
msgstr ""
-#: glances/glances.py:2894
+#: glances/glances.py:2884
msgid "l"
msgstr ""
-#: glances/glances.py:2894
+#: glances/glances.py:2884
msgid "Show/hide log messages"
msgstr ""
-#: glances/glances.py:2904
+#: glances/glances.py:2894
msgid "b"
msgstr ""
-#: glances/glances.py:2904
+#: glances/glances.py:2894
msgid "Bit/s or Byte/s for network IO"
msgstr ""
-#: glances/glances.py:2912
+#: glances/glances.py:2902
msgid "w"
msgstr ""
-#: glances/glances.py:2912
+#: glances/glances.py:2902
msgid "Delete warning logs"
msgstr ""
-#: glances/glances.py:2917
+#: glances/glances.py:2907
msgid "x"
msgstr ""
-#: glances/glances.py:2917
+#: glances/glances.py:2907
msgid "Delete warning and critical logs"
msgstr ""
-#: glances/glances.py:2922
+#: glances/glances.py:2912
msgid "1"
msgstr ""
-#: glances/glances.py:2922
+#: glances/glances.py:2912
msgid "Global CPU or Per Core stats"
msgstr ""
-#: glances/glances.py:2927
+#: glances/glances.py:2917
msgid "h"
msgstr ""
-#: glances/glances.py:2927
+#: glances/glances.py:2917
msgid "Show/hide this help message"
msgstr ""
-#: glances/glances.py:2932
+#: glances/glances.py:2922
msgid "q"
msgstr ""
-#: glances/glances.py:2932
+#: glances/glances.py:2922
msgid "Quit (Esc and Ctrl-C also work)"
msgstr ""
-#: glances/glances.py:2942 glances/glances.py:3228
+#: glances/glances.py:2931 glances/glances.py:3262
msgid "%Y-%m-%d %H:%M:%S"
msgstr ""
-#: glances/glances.py:3261
+#: glances/glances.py:3316
msgid "Error: creating client socket"
msgstr ""
-#: glances/glances.py:3269
-msgid "Error: Connection to server failed"
+#: glances/glances.py:3325
+msgid "Error: Connection to server failed. Bad password."
msgstr ""
-#: glances/glances.py:3289
+#: glances/glances.py:3328
+msgid "Error: Connection to server failed. Unknown error."
+msgstr ""
+
+#: glances/glances.py:3333
+msgid "Error: Connection to server failed. Can not get the server version."
+msgstr ""
+
+#: glances/glances.py:3360
msgid "Glances version"
msgstr ""
-#: glances/glances.py:3294
+#: glances/glances.py:3360
+msgid " with PsUtil "
+msgstr ""
+
+#: glances/glances.py:3365
msgid "Usage: glances [opt]"
msgstr ""
-#: glances/glances.py:3295
+#: glances/glances.py:3366
msgid " with opt:"
msgstr ""
-#: glances/glances.py:3296
+#: glances/glances.py:3367
msgid "\t-b\t\tDisplay network rate in Byte per second"
msgstr ""
-#: glances/glances.py:3297
+#: glances/glances.py:3368
msgid "\t-B @IP|host\tBind server to the given IP or host NAME"
msgstr ""
-#: glances/glances.py:3298
+#: glances/glances.py:3369
msgid "\t-c @IP|host\tConnect to a Glances server"
msgstr ""
-#: glances/glances.py:3299
+#: glances/glances.py:3370
#, python-format
msgid "\t-C file\t\tPath to the configuration file (default: %s)"
msgstr ""
-#: glances/glances.py:3301
+#: glances/glances.py:3372
msgid "\t-d\t\tDisable disk I/O module"
msgstr ""
-#: glances/glances.py:3302
+#: glances/glances.py:3373
msgid "\t-e\t\tEnable the sensors module (Linux-only)"
msgstr ""
-#: glances/glances.py:3303
+#: glances/glances.py:3374
msgid "\t-f file\t\tSet the output folder (HTML) or file (CSV)"
msgstr ""
-#: glances/glances.py:3304
+#: glances/glances.py:3375
msgid "\t-h\t\tDisplay the syntax and exit"
msgstr ""
-#: glances/glances.py:3305
+#: glances/glances.py:3376
msgid "\t-m\t\tDisable mount module"
msgstr ""
-#: glances/glances.py:3306
+#: glances/glances.py:3377
msgid "\t-n\t\tDisable network module"
msgstr ""
-#: glances/glances.py:3307
+#: glances/glances.py:3378
msgid "\t-o output\tDefine additional output (available: HTML or CSV)"
msgstr ""
-#: glances/glances.py:3308
+#: glances/glances.py:3379
#, python-format
msgid "\t-p PORT\t\tDefine the client or server TCP port (default: %d)"
msgstr ""
-#: glances/glances.py:3310
+#: glances/glances.py:3381
+msgid "\t-P password\tClient/server password"
+msgstr ""
+
+#: glances/glances.py:3382
msgid "\t-s\t\tRun Glances in server mode"
msgstr ""
-#: glances/glances.py:3311
+#: glances/glances.py:3383
#, python-format
msgid "\t-t sec\t\tSet the refresh time in seconds (default: %d)"
msgstr ""
-#: glances/glances.py:3313
+#: glances/glances.py:3385
msgid "\t-v\t\tDisplay the version and exit"
msgstr ""
-#: glances/glances.py:3396
+#: glances/glances.py:3473
+msgid "Error: -P flag need an argument (password)"
+msgstr ""
+
+#: glances/glances.py:3480
msgid "Error: -B flag need an argument (bind IP address)"
msgstr ""
-#: glances/glances.py:3404
+#: glances/glances.py:3488
msgid "Error: -c flag need an argument (server IP address/name)"
msgstr ""
-#: glances/glances.py:3415
+#: glances/glances.py:3499
#, python-format
msgid "Error: Unknown output %s"
msgstr ""
-#: glances/glances.py:3421
+#: glances/glances.py:3505
msgid "Error: PySensors library not found"
msgstr ""
-#: glances/glances.py:3426
+#: glances/glances.py:3510
msgid "Error: Sensors module is only available on Linux"
msgstr ""
-#: glances/glances.py:3434
+#: glances/glances.py:3518
msgid "Error: Refresh time should be a positive integer"
msgstr ""
-#: glances/glances.py:3453
+#: glances/glances.py:3538
msgid "Error: Can not use both -s and -c flag"
msgstr ""
-#: glances/glances.py:3456
+#: glances/glances.py:3541
msgid "Error: Can not use both -s and -o flag"
msgstr ""
-#: glances/glances.py:3461
+#: glances/glances.py:3546
msgid "Error: Can not use both -c and -o flag"
msgstr ""
-#: glances/glances.py:3466
+#: glances/glances.py:3549
+msgid "Error: Can not use both -c and -C flag"
+msgstr ""
+
+#: glances/glances.py:3550
+msgid " Limits are set based on the server ones"
+msgstr ""
+
+#: glances/glances.py:3555
msgid "Error: Need Jinja2 library to export into HTML"
msgstr ""
-#: glances/glances.py:3467
+#: glances/glances.py:3556
msgid "Try to install the python-jinja2 package"
msgstr ""
-#: glances/glances.py:3472
+#: glances/glances.py:3561
msgid "Error: HTML export (-o html) needoutput folder definition (-f )"
msgstr ""
-#: glances/glances.py:3478
+#: glances/glances.py:3567
msgid "Error: Need CSV library to export into CSV"
msgstr ""
-#: glances/glances.py:3483
+#: glances/glances.py:3572
msgid "Error: CSV export (-o csv) need output file definition (-f )"
msgstr ""
-#: glances/glances.py:3505
+#: glances/glances.py:3594
msgid "Glances server is running on"
msgstr ""
-#: glances/glances.py:3518
+#: glances/glances.py:3613
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 724c059e..f0915371 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 2055e6e2..a3acc26c 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: 2013-01-11 19:59+0100\n"
+"POT-Creation-Date: 2013-01-26 10:40+0100\n"
"PO-Revision-Date: 2012-09-07 01:21+0100\n"
"Last-Translator: Domenico Luciani \n"
"Language-Team: Italian\n"
@@ -17,57 +17,57 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: glances/glances.py:76
+#: glances/glances.py:87
msgid "Curses module not found. Glances cannot start."
msgstr ""
-#: glances/glances.py:83
+#: glances/glances.py:94
msgid "PsUtil module not found. Glances cannot start."
msgstr ""
-#: glances/glances.py:88
+#: glances/glances.py:99
#, python-format
msgid "PsUtil version %s detected."
msgstr ""
-#: glances/glances.py:89
+#: glances/glances.py:100
msgid "PsUtil 0.4.1 or higher is needed. Glances cannot start."
msgstr ""
-#: glances/glances.py:1319
+#: glances/glances.py:1303
msgid "Error: Cannot init the curses library.\n"
msgstr ""
-#: glances/glances.py:1777
+#: glances/glances.py:1779
msgid "{0} {1} with {2} {3} on {4}"
msgstr ""
-#: glances/glances.py:1782
+#: glances/glances.py:1784
msgid "{0} {1} {2} on {3}"
msgstr ""
-#: glances/glances.py:1831
+#: glances/glances.py:1832
msgid "PerCPU"
msgstr ""
-#: glances/glances.py:1837 glances/glances.py:1892 glances/glances.py:2166
-#: glances/glances.py:2258 glances/glances.py:2545
+#: glances/glances.py:1838 glances/glances.py:1892 glances/glances.py:2159
+#: glances/glances.py:2251 glances/glances.py:2535
msgid "Compute data..."
msgstr ""
-#: glances/glances.py:1841 glances/glances.py:1902
+#: glances/glances.py:1842 glances/glances.py:1902
msgid "user:"
msgstr ""
-#: glances/glances.py:1843 glances/glances.py:1911
+#: glances/glances.py:1844 glances/glances.py:1911
msgid "system:"
msgstr ""
-#: glances/glances.py:1846 glances/glances.py:1939
+#: glances/glances.py:1847 glances/glances.py:1939
msgid "iowait:"
msgstr ""
-#: glances/glances.py:1849 glances/glances.py:1918
+#: glances/glances.py:1850 glances/glances.py:1918
msgid "idle:"
msgstr ""
@@ -107,167 +107,167 @@ msgstr ""
msgid "Mem"
msgstr ""
-#: glances/glances.py:2032 glances/glances.py:2121
+#: glances/glances.py:2032 glances/glances.py:2114
msgid "total:"
msgstr ""
-#: glances/glances.py:2041 glances/glances.py:2131
+#: glances/glances.py:2041 glances/glances.py:2124
msgid "used:"
msgstr ""
-#: glances/glances.py:2049 glances/glances.py:2140
+#: glances/glances.py:2049 glances/glances.py:2133
msgid "free:"
msgstr ""
-#: glances/glances.py:2063
+#: glances/glances.py:2062
msgid "active:"
msgstr ""
-#: glances/glances.py:2073
+#: glances/glances.py:2070
msgid "inactive:"
msgstr ""
-#: glances/glances.py:2083
+#: glances/glances.py:2080
msgid "buffers:"
msgstr ""
-#: glances/glances.py:2093
+#: glances/glances.py:2088
msgid "cached:"
msgstr ""
-#: glances/glances.py:2108
+#: glances/glances.py:2102
msgid "Swap"
msgstr ""
-#: glances/glances.py:2156
+#: glances/glances.py:2149
msgid "Network"
msgstr ""
-#: glances/glances.py:2159
+#: glances/glances.py:2152
msgid "Rx/s"
msgstr ""
-#: glances/glances.py:2161
+#: glances/glances.py:2154
msgid "Tx/s"
msgstr ""
-#: glances/glances.py:2218
+#: glances/glances.py:2211
msgid "Sensors"
msgstr ""
-#: glances/glances.py:2221
+#: glances/glances.py:2214
msgid "°C"
msgstr ""
-#: glances/glances.py:2247
+#: glances/glances.py:2240
msgid "Disk I/O"
msgstr "I/O Disco"
-#: glances/glances.py:2251
+#: glances/glances.py:2244
msgid "In/s"
msgstr ""
-#: glances/glances.py:2253
+#: glances/glances.py:2246
msgid "Out/s"
msgstr ""
-#: glances/glances.py:2294
+#: glances/glances.py:2287
msgid "Mount"
msgstr "Monta"
-#: glances/glances.py:2298
+#: glances/glances.py:2291
msgid "Used"
msgstr "Usato"
-#: glances/glances.py:2300
+#: glances/glances.py:2293
msgid "Total"
msgstr "Totale"
-#: glances/glances.py:2342
+#: glances/glances.py:2335
msgid "WARNING|CRITICAL logs for CPU|LOAD|MEM"
msgstr ""
-#: glances/glances.py:2344
+#: glances/glances.py:2337
msgid " (lasts "
msgstr ""
-#: glances/glances.py:2345
+#: glances/glances.py:2338
msgid " entries)"
msgstr ""
-#: glances/glances.py:2347
+#: glances/glances.py:2340
msgid " (one entry)"
msgstr ""
-#: glances/glances.py:2421
+#: glances/glances.py:2411
msgid "Processes"
msgstr ""
-#: glances/glances.py:2432
+#: glances/glances.py:2422
msgid "running"
msgstr ""
-#: glances/glances.py:2434
+#: glances/glances.py:2424
msgid "sleeping"
msgstr ""
-#: glances/glances.py:2436
+#: glances/glances.py:2426
msgid "other"
msgstr ""
-#: glances/glances.py:2442
+#: glances/glances.py:2432
msgid "sorted automatically"
msgstr ""
-#: glances/glances.py:2444
+#: glances/glances.py:2434
msgid "sorted by "
msgstr ""
-#: glances/glances.py:2477
+#: glances/glances.py:2467
msgid "VIRT"
msgstr ""
-#: glances/glances.py:2481
+#: glances/glances.py:2471
msgid "RES"
msgstr ""
-#: glances/glances.py:2485
+#: glances/glances.py:2475
msgid "CPU%"
msgstr ""
-#: glances/glances.py:2490
+#: glances/glances.py:2480
msgid "MEM%"
msgstr ""
-#: glances/glances.py:2498
+#: glances/glances.py:2488
msgid "PID"
msgstr ""
-#: glances/glances.py:2504
+#: glances/glances.py:2494
msgid "USER"
msgstr ""
-#: glances/glances.py:2510
+#: glances/glances.py:2500
msgid "NI"
msgstr ""
-#: glances/glances.py:2516
+#: glances/glances.py:2506
msgid "S"
msgstr ""
-#: glances/glances.py:2522
+#: glances/glances.py:2512
msgid "TIME+"
msgstr ""
-#: glances/glances.py:2528
-msgid "IOr/s"
+#: glances/glances.py:2518
+msgid "IO_R/s"
msgstr ""
-#: glances/glances.py:2533
-msgid "IOw/s"
+#: glances/glances.py:2523
+msgid "IO_W/s"
msgstr ""
-#: glances/glances.py:2539
+#: glances/glances.py:2529
msgid "NAME"
msgstr ""
@@ -311,319 +311,347 @@ msgstr "CRITICO "
msgid "CPU user % "
msgstr ""
-#: glances/glances.py:2747
+#: glances/glances.py:2746
msgid "CPU system % "
msgstr ""
-#: glances/glances.py:2757
+#: glances/glances.py:2755
msgid "CPU IOwait % "
msgstr ""
-#: glances/glances.py:2767
+#: glances/glances.py:2764
msgid "Load "
msgstr ""
-#: glances/glances.py:2777
+#: glances/glances.py:2773
msgid "RAM Memory % "
msgstr ""
-#: glances/glances.py:2787
+#: glances/glances.py:2782
msgid "Swap memory %"
msgstr ""
-#: glances/glances.py:2797
+#: glances/glances.py:2791
msgid "Temp °C "
msgstr ""
-#: glances/glances.py:2807
+#: glances/glances.py:2800
msgid "Filesystem % "
msgstr ""
-#: glances/glances.py:2817
+#: glances/glances.py:2809
msgid "CPU Process %"
msgstr ""
-#: glances/glances.py:2827
+#: glances/glances.py:2818
msgid "MEM Process %"
msgstr ""
-#: glances/glances.py:2841
+#: glances/glances.py:2831
msgid "a"
msgstr ""
-#: glances/glances.py:2841
+#: glances/glances.py:2831
msgid "Sort processes automatically"
msgstr ""
-#: glances/glances.py:2848
+#: glances/glances.py:2838
msgid "c"
msgstr ""
-#: glances/glances.py:2848
+#: glances/glances.py:2838
msgid "Sort processes by CPU%"
msgstr ""
-#: glances/glances.py:2855
+#: glances/glances.py:2845
msgid "m"
msgstr ""
-#: glances/glances.py:2855
+#: glances/glances.py:2845
msgid "Sort processes by MEM%"
msgstr ""
-#: glances/glances.py:2860
+#: glances/glances.py:2850
msgid "p"
msgstr ""
-#: glances/glances.py:2860
+#: glances/glances.py:2850
msgid "Sort processes by name"
msgstr ""
-#: glances/glances.py:2865
+#: glances/glances.py:2855
msgid "i"
msgstr ""
-#: glances/glances.py:2865
+#: glances/glances.py:2855
msgid "Sort processes by IO Rate"
msgstr ""
-#: glances/glances.py:2870
+#: glances/glances.py:2860
msgid "d"
msgstr ""
-#: glances/glances.py:2870
+#: glances/glances.py:2860
msgid "Show/hide disk I/O stats"
msgstr ""
-#: glances/glances.py:2876
+#: glances/glances.py:2866
msgid "f"
msgstr ""
-#: glances/glances.py:2876
+#: glances/glances.py:2866
msgid "Show/hide file system stats"
msgstr ""
-#: glances/glances.py:2882
+#: glances/glances.py:2872
msgid "n"
msgstr ""
-#: glances/glances.py:2882
+#: glances/glances.py:2872
msgid "Show/hide network stats"
msgstr ""
-#: glances/glances.py:2888
+#: glances/glances.py:2878
msgid "s"
msgstr ""
-#: glances/glances.py:2888
+#: glances/glances.py:2878
msgid "Show/hide sensors stats"
msgstr ""
-#: glances/glances.py:2894
+#: glances/glances.py:2884
msgid "l"
msgstr ""
-#: glances/glances.py:2894
+#: glances/glances.py:2884
msgid "Show/hide log messages"
msgstr ""
-#: glances/glances.py:2904
+#: glances/glances.py:2894
msgid "b"
msgstr ""
-#: glances/glances.py:2904
+#: glances/glances.py:2894
msgid "Bit/s or Byte/s for network IO"
msgstr ""
-#: glances/glances.py:2912
+#: glances/glances.py:2902
msgid "w"
msgstr ""
-#: glances/glances.py:2912
+#: glances/glances.py:2902
msgid "Delete warning logs"
msgstr ""
-#: glances/glances.py:2917
+#: glances/glances.py:2907
msgid "x"
msgstr ""
-#: glances/glances.py:2917
+#: glances/glances.py:2907
msgid "Delete warning and critical logs"
msgstr ""
-#: glances/glances.py:2922
+#: glances/glances.py:2912
msgid "1"
msgstr ""
-#: glances/glances.py:2922
+#: glances/glances.py:2912
msgid "Global CPU or Per Core stats"
msgstr ""
-#: glances/glances.py:2927
+#: glances/glances.py:2917
msgid "h"
msgstr ""
-#: glances/glances.py:2927
+#: glances/glances.py:2917
msgid "Show/hide this help message"
msgstr ""
-#: glances/glances.py:2932
+#: glances/glances.py:2922
msgid "q"
msgstr ""
-#: glances/glances.py:2932
+#: glances/glances.py:2922
msgid "Quit (Esc and Ctrl-C also work)"
msgstr ""
-#: glances/glances.py:2942 glances/glances.py:3228
+#: glances/glances.py:2931 glances/glances.py:3262
msgid "%Y-%m-%d %H:%M:%S"
msgstr "%d.%m.%Y %H:%M:%S"
-#: glances/glances.py:3261
+#: glances/glances.py:3316
msgid "Error: creating client socket"
msgstr ""
-#: glances/glances.py:3269
-msgid "Error: Connection to server failed"
+#: glances/glances.py:3325
+msgid "Error: Connection to server failed. Bad password."
msgstr ""
-#: glances/glances.py:3289
+#: glances/glances.py:3328
+msgid "Error: Connection to server failed. Unknown error."
+msgstr ""
+
+#: glances/glances.py:3333
+msgid "Error: Connection to server failed. Can not get the server version."
+msgstr ""
+
+#: glances/glances.py:3360
msgid "Glances version"
msgstr ""
-#: glances/glances.py:3294
+#: glances/glances.py:3360
+msgid " with PsUtil "
+msgstr ""
+
+#: glances/glances.py:3365
msgid "Usage: glances [opt]"
msgstr ""
-#: glances/glances.py:3295
+#: glances/glances.py:3366
msgid " with opt:"
msgstr ""
-#: glances/glances.py:3296
+#: glances/glances.py:3367
msgid "\t-b\t\tDisplay network rate in Byte per second"
msgstr ""
-#: glances/glances.py:3297
+#: glances/glances.py:3368
msgid "\t-B @IP|host\tBind server to the given IP or host NAME"
msgstr ""
-#: glances/glances.py:3298
+#: glances/glances.py:3369
msgid "\t-c @IP|host\tConnect to a Glances server"
msgstr ""
-#: glances/glances.py:3299
+#: glances/glances.py:3370
#, python-format
msgid "\t-C file\t\tPath to the configuration file (default: %s)"
msgstr ""
-#: glances/glances.py:3301
+#: glances/glances.py:3372
msgid "\t-d\t\tDisable disk I/O module"
msgstr ""
-#: glances/glances.py:3302
+#: glances/glances.py:3373
msgid "\t-e\t\tEnable the sensors module (Linux-only)"
msgstr ""
-#: glances/glances.py:3303
+#: glances/glances.py:3374
msgid "\t-f file\t\tSet the output folder (HTML) or file (CSV)"
msgstr ""
-#: glances/glances.py:3304
+#: glances/glances.py:3375
msgid "\t-h\t\tDisplay the syntax and exit"
msgstr ""
-#: glances/glances.py:3305
+#: glances/glances.py:3376
msgid "\t-m\t\tDisable mount module"
msgstr ""
-#: glances/glances.py:3306
+#: glances/glances.py:3377
msgid "\t-n\t\tDisable network module"
msgstr ""
-#: glances/glances.py:3307
+#: glances/glances.py:3378
msgid "\t-o output\tDefine additional output (available: HTML or CSV)"
msgstr ""
-#: glances/glances.py:3308
+#: glances/glances.py:3379
#, python-format
msgid "\t-p PORT\t\tDefine the client or server TCP port (default: %d)"
msgstr ""
-#: glances/glances.py:3310
+#: glances/glances.py:3381
+msgid "\t-P password\tClient/server password"
+msgstr ""
+
+#: glances/glances.py:3382
msgid "\t-s\t\tRun Glances in server mode"
msgstr ""
-#: glances/glances.py:3311
+#: glances/glances.py:3383
#, python-format
msgid "\t-t sec\t\tSet the refresh time in seconds (default: %d)"
msgstr ""
-#: glances/glances.py:3313
+#: glances/glances.py:3385
msgid "\t-v\t\tDisplay the version and exit"
msgstr ""
-#: glances/glances.py:3396
+#: glances/glances.py:3473
+msgid "Error: -P flag need an argument (password)"
+msgstr ""
+
+#: glances/glances.py:3480
msgid "Error: -B flag need an argument (bind IP address)"
msgstr ""
-#: glances/glances.py:3404
+#: glances/glances.py:3488
msgid "Error: -c flag need an argument (server IP address/name)"
msgstr ""
-#: glances/glances.py:3415
+#: glances/glances.py:3499
#, python-format
msgid "Error: Unknown output %s"
msgstr ""
-#: glances/glances.py:3421
+#: glances/glances.py:3505
msgid "Error: PySensors library not found"
msgstr ""
-#: glances/glances.py:3426
+#: glances/glances.py:3510
msgid "Error: Sensors module is only available on Linux"
msgstr ""
-#: glances/glances.py:3434
+#: glances/glances.py:3518
msgid "Error: Refresh time should be a positive integer"
msgstr ""
-#: glances/glances.py:3453
+#: glances/glances.py:3538
msgid "Error: Can not use both -s and -c flag"
msgstr ""
-#: glances/glances.py:3456
+#: glances/glances.py:3541
msgid "Error: Can not use both -s and -o flag"
msgstr ""
-#: glances/glances.py:3461
+#: glances/glances.py:3546
msgid "Error: Can not use both -c and -o flag"
msgstr ""
-#: glances/glances.py:3466
+#: glances/glances.py:3549
+msgid "Error: Can not use both -c and -C flag"
+msgstr ""
+
+#: glances/glances.py:3550
+msgid " Limits are set based on the server ones"
+msgstr ""
+
+#: glances/glances.py:3555
msgid "Error: Need Jinja2 library to export into HTML"
msgstr ""
-#: glances/glances.py:3467
+#: glances/glances.py:3556
msgid "Try to install the python-jinja2 package"
msgstr ""
-#: glances/glances.py:3472
+#: glances/glances.py:3561
msgid "Error: HTML export (-o html) needoutput folder definition (-f )"
msgstr ""
-#: glances/glances.py:3478
+#: glances/glances.py:3567
msgid "Error: Need CSV library to export into CSV"
msgstr ""
-#: glances/glances.py:3483
+#: glances/glances.py:3572
msgid "Error: CSV export (-o csv) need output file definition (-f )"
msgstr ""
-#: glances/glances.py:3505
+#: glances/glances.py:3594
msgid "Glances server is running on"
msgstr ""
-#: glances/glances.py:3518
+#: glances/glances.py:3613
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 3fa00c53..e80d87fb 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 0726dcbb..8c069b13 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: 2013-01-11 19:59+0100\n"
+"POT-Creation-Date: 2013-01-26 10:40+0100\n"
"PO-Revision-Date: 2012-09-20 01:53-0300\n"
"Last-Translator: Rafael Beraldo \n"
"Language-Team: Brazilian Portuguese\n"
@@ -17,57 +17,57 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: glances/glances.py:76
+#: glances/glances.py:87
msgid "Curses module not found. Glances cannot start."
msgstr ""
-#: glances/glances.py:83
+#: glances/glances.py:94
msgid "PsUtil module not found. Glances cannot start."
msgstr ""
-#: glances/glances.py:88
+#: glances/glances.py:99
#, python-format
msgid "PsUtil version %s detected."
msgstr ""
-#: glances/glances.py:89
+#: glances/glances.py:100
msgid "PsUtil 0.4.1 or higher is needed. Glances cannot start."
msgstr ""
-#: glances/glances.py:1319
+#: glances/glances.py:1303
msgid "Error: Cannot init the curses library.\n"
msgstr ""
-#: glances/glances.py:1777
+#: glances/glances.py:1779
msgid "{0} {1} with {2} {3} on {4}"
msgstr ""
-#: glances/glances.py:1782
+#: glances/glances.py:1784
msgid "{0} {1} {2} on {3}"
msgstr ""
-#: glances/glances.py:1831
+#: glances/glances.py:1832
msgid "PerCPU"
msgstr ""
-#: glances/glances.py:1837 glances/glances.py:1892 glances/glances.py:2166
-#: glances/glances.py:2258 glances/glances.py:2545
+#: glances/glances.py:1838 glances/glances.py:1892 glances/glances.py:2159
+#: glances/glances.py:2251 glances/glances.py:2535
msgid "Compute data..."
msgstr ""
-#: glances/glances.py:1841 glances/glances.py:1902
+#: glances/glances.py:1842 glances/glances.py:1902
msgid "user:"
msgstr ""
-#: glances/glances.py:1843 glances/glances.py:1911
+#: glances/glances.py:1844 glances/glances.py:1911
msgid "system:"
msgstr ""
-#: glances/glances.py:1846 glances/glances.py:1939
+#: glances/glances.py:1847 glances/glances.py:1939
msgid "iowait:"
msgstr ""
-#: glances/glances.py:1849 glances/glances.py:1918
+#: glances/glances.py:1850 glances/glances.py:1918
msgid "idle:"
msgstr ""
@@ -107,167 +107,167 @@ msgstr ""
msgid "Mem"
msgstr "Mem"
-#: glances/glances.py:2032 glances/glances.py:2121
+#: glances/glances.py:2032 glances/glances.py:2114
msgid "total:"
msgstr ""
-#: glances/glances.py:2041 glances/glances.py:2131
+#: glances/glances.py:2041 glances/glances.py:2124
msgid "used:"
msgstr ""
-#: glances/glances.py:2049 glances/glances.py:2140
+#: glances/glances.py:2049 glances/glances.py:2133
msgid "free:"
msgstr ""
-#: glances/glances.py:2063
+#: glances/glances.py:2062
msgid "active:"
msgstr ""
-#: glances/glances.py:2073
+#: glances/glances.py:2070
msgid "inactive:"
msgstr ""
-#: glances/glances.py:2083
+#: glances/glances.py:2080
msgid "buffers:"
msgstr ""
-#: glances/glances.py:2093
+#: glances/glances.py:2088
msgid "cached:"
msgstr ""
-#: glances/glances.py:2108
+#: glances/glances.py:2102
msgid "Swap"
msgstr "Swap"
-#: glances/glances.py:2156
+#: glances/glances.py:2149
msgid "Network"
msgstr ""
-#: glances/glances.py:2159
+#: glances/glances.py:2152
msgid "Rx/s"
msgstr ""
-#: glances/glances.py:2161
+#: glances/glances.py:2154
msgid "Tx/s"
msgstr ""
-#: glances/glances.py:2218
+#: glances/glances.py:2211
msgid "Sensors"
msgstr ""
-#: glances/glances.py:2221
+#: glances/glances.py:2214
msgid "°C"
msgstr ""
-#: glances/glances.py:2247
+#: glances/glances.py:2240
msgid "Disk I/O"
msgstr "I/O do Disco"
-#: glances/glances.py:2251
+#: glances/glances.py:2244
msgid "In/s"
msgstr ""
-#: glances/glances.py:2253
+#: glances/glances.py:2246
msgid "Out/s"
msgstr ""
-#: glances/glances.py:2294
+#: glances/glances.py:2287
msgid "Mount"
msgstr "Partições"
-#: glances/glances.py:2298
+#: glances/glances.py:2291
msgid "Used"
msgstr "Usado"
-#: glances/glances.py:2300
+#: glances/glances.py:2293
msgid "Total"
msgstr "Total"
-#: glances/glances.py:2342
+#: glances/glances.py:2335
msgid "WARNING|CRITICAL logs for CPU|LOAD|MEM"
msgstr ""
-#: glances/glances.py:2344
+#: glances/glances.py:2337
msgid " (lasts "
msgstr ""
-#: glances/glances.py:2345
+#: glances/glances.py:2338
msgid " entries)"
msgstr ""
-#: glances/glances.py:2347
+#: glances/glances.py:2340
msgid " (one entry)"
msgstr ""
-#: glances/glances.py:2421
+#: glances/glances.py:2411
msgid "Processes"
msgstr ""
-#: glances/glances.py:2432
+#: glances/glances.py:2422
msgid "running"
msgstr ""
-#: glances/glances.py:2434
+#: glances/glances.py:2424
msgid "sleeping"
msgstr ""
-#: glances/glances.py:2436
+#: glances/glances.py:2426
msgid "other"
msgstr ""
-#: glances/glances.py:2442
+#: glances/glances.py:2432
msgid "sorted automatically"
msgstr ""
-#: glances/glances.py:2444
+#: glances/glances.py:2434
msgid "sorted by "
msgstr ""
-#: glances/glances.py:2477
+#: glances/glances.py:2467
msgid "VIRT"
msgstr ""
-#: glances/glances.py:2481
+#: glances/glances.py:2471
msgid "RES"
msgstr ""
-#: glances/glances.py:2485
+#: glances/glances.py:2475
msgid "CPU%"
msgstr ""
-#: glances/glances.py:2490
+#: glances/glances.py:2480
msgid "MEM%"
msgstr ""
-#: glances/glances.py:2498
+#: glances/glances.py:2488
msgid "PID"
msgstr ""
-#: glances/glances.py:2504
+#: glances/glances.py:2494
msgid "USER"
msgstr ""
-#: glances/glances.py:2510
+#: glances/glances.py:2500
msgid "NI"
msgstr ""
-#: glances/glances.py:2516
+#: glances/glances.py:2506
msgid "S"
msgstr ""
-#: glances/glances.py:2522
+#: glances/glances.py:2512
msgid "TIME+"
msgstr ""
-#: glances/glances.py:2528
-msgid "IOr/s"
+#: glances/glances.py:2518
+msgid "IO_R/s"
msgstr ""
-#: glances/glances.py:2533
-msgid "IOw/s"
+#: glances/glances.py:2523
+msgid "IO_W/s"
msgstr ""
-#: glances/glances.py:2539
+#: glances/glances.py:2529
msgid "NAME"
msgstr ""
@@ -311,319 +311,347 @@ msgstr "CRÍTICO"
msgid "CPU user % "
msgstr ""
-#: glances/glances.py:2747
+#: glances/glances.py:2746
msgid "CPU system % "
msgstr ""
-#: glances/glances.py:2757
+#: glances/glances.py:2755
msgid "CPU IOwait % "
msgstr ""
-#: glances/glances.py:2767
+#: glances/glances.py:2764
msgid "Load "
msgstr ""
-#: glances/glances.py:2777
+#: glances/glances.py:2773
msgid "RAM Memory % "
msgstr ""
-#: glances/glances.py:2787
+#: glances/glances.py:2782
msgid "Swap memory %"
msgstr ""
-#: glances/glances.py:2797
+#: glances/glances.py:2791
msgid "Temp °C "
msgstr ""
-#: glances/glances.py:2807
+#: glances/glances.py:2800
msgid "Filesystem % "
msgstr ""
-#: glances/glances.py:2817
+#: glances/glances.py:2809
msgid "CPU Process %"
msgstr ""
-#: glances/glances.py:2827
+#: glances/glances.py:2818
msgid "MEM Process %"
msgstr ""
-#: glances/glances.py:2841
+#: glances/glances.py:2831
msgid "a"
msgstr ""
-#: glances/glances.py:2841
+#: glances/glances.py:2831
msgid "Sort processes automatically"
msgstr ""
-#: glances/glances.py:2848
+#: glances/glances.py:2838
msgid "c"
msgstr ""
-#: glances/glances.py:2848
+#: glances/glances.py:2838
msgid "Sort processes by CPU%"
msgstr ""
-#: glances/glances.py:2855
+#: glances/glances.py:2845
msgid "m"
msgstr ""
-#: glances/glances.py:2855
+#: glances/glances.py:2845
msgid "Sort processes by MEM%"
msgstr ""
-#: glances/glances.py:2860
+#: glances/glances.py:2850
msgid "p"
msgstr ""
-#: glances/glances.py:2860
+#: glances/glances.py:2850
msgid "Sort processes by name"
msgstr ""
-#: glances/glances.py:2865
+#: glances/glances.py:2855
msgid "i"
msgstr ""
-#: glances/glances.py:2865
+#: glances/glances.py:2855
msgid "Sort processes by IO Rate"
msgstr ""
-#: glances/glances.py:2870
+#: glances/glances.py:2860
msgid "d"
msgstr ""
-#: glances/glances.py:2870
+#: glances/glances.py:2860
msgid "Show/hide disk I/O stats"
msgstr ""
-#: glances/glances.py:2876
+#: glances/glances.py:2866
msgid "f"
msgstr ""
-#: glances/glances.py:2876
+#: glances/glances.py:2866
msgid "Show/hide file system stats"
msgstr ""
-#: glances/glances.py:2882
+#: glances/glances.py:2872
msgid "n"
msgstr ""
-#: glances/glances.py:2882
+#: glances/glances.py:2872
msgid "Show/hide network stats"
msgstr ""
-#: glances/glances.py:2888
+#: glances/glances.py:2878
msgid "s"
msgstr ""
-#: glances/glances.py:2888
+#: glances/glances.py:2878
msgid "Show/hide sensors stats"
msgstr ""
-#: glances/glances.py:2894
+#: glances/glances.py:2884
msgid "l"
msgstr ""
-#: glances/glances.py:2894
+#: glances/glances.py:2884
msgid "Show/hide log messages"
msgstr ""
-#: glances/glances.py:2904
+#: glances/glances.py:2894
msgid "b"
msgstr ""
-#: glances/glances.py:2904
+#: glances/glances.py:2894
msgid "Bit/s or Byte/s for network IO"
msgstr ""
-#: glances/glances.py:2912
+#: glances/glances.py:2902
msgid "w"
msgstr ""
-#: glances/glances.py:2912
+#: glances/glances.py:2902
msgid "Delete warning logs"
msgstr ""
-#: glances/glances.py:2917
+#: glances/glances.py:2907
msgid "x"
msgstr ""
-#: glances/glances.py:2917
+#: glances/glances.py:2907
msgid "Delete warning and critical logs"
msgstr ""
-#: glances/glances.py:2922
+#: glances/glances.py:2912
msgid "1"
msgstr ""
-#: glances/glances.py:2922
+#: glances/glances.py:2912
msgid "Global CPU or Per Core stats"
msgstr ""
-#: glances/glances.py:2927
+#: glances/glances.py:2917
msgid "h"
msgstr ""
-#: glances/glances.py:2927
+#: glances/glances.py:2917
msgid "Show/hide this help message"
msgstr ""
-#: glances/glances.py:2932
+#: glances/glances.py:2922
msgid "q"
msgstr ""
-#: glances/glances.py:2932
+#: glances/glances.py:2922
msgid "Quit (Esc and Ctrl-C also work)"
msgstr ""
-#: glances/glances.py:2942 glances/glances.py:3228
+#: glances/glances.py:2931 glances/glances.py:3262
msgid "%Y-%m-%d %H:%M:%S"
msgstr "%d-%m-%Y %H:%M:%S"
-#: glances/glances.py:3261
+#: glances/glances.py:3316
msgid "Error: creating client socket"
msgstr ""
-#: glances/glances.py:3269
-msgid "Error: Connection to server failed"
+#: glances/glances.py:3325
+msgid "Error: Connection to server failed. Bad password."
msgstr ""
-#: glances/glances.py:3289
+#: glances/glances.py:3328
+msgid "Error: Connection to server failed. Unknown error."
+msgstr ""
+
+#: glances/glances.py:3333
+msgid "Error: Connection to server failed. Can not get the server version."
+msgstr ""
+
+#: glances/glances.py:3360
msgid "Glances version"
msgstr ""
-#: glances/glances.py:3294
+#: glances/glances.py:3360
+msgid " with PsUtil "
+msgstr ""
+
+#: glances/glances.py:3365
msgid "Usage: glances [opt]"
msgstr ""
-#: glances/glances.py:3295
+#: glances/glances.py:3366
msgid " with opt:"
msgstr ""
-#: glances/glances.py:3296
+#: glances/glances.py:3367
msgid "\t-b\t\tDisplay network rate in Byte per second"
msgstr ""
-#: glances/glances.py:3297
+#: glances/glances.py:3368
msgid "\t-B @IP|host\tBind server to the given IP or host NAME"
msgstr ""
-#: glances/glances.py:3298
+#: glances/glances.py:3369
msgid "\t-c @IP|host\tConnect to a Glances server"
msgstr ""
-#: glances/glances.py:3299
+#: glances/glances.py:3370
#, python-format
msgid "\t-C file\t\tPath to the configuration file (default: %s)"
msgstr ""
-#: glances/glances.py:3301
+#: glances/glances.py:3372
msgid "\t-d\t\tDisable disk I/O module"
msgstr ""
-#: glances/glances.py:3302
+#: glances/glances.py:3373
msgid "\t-e\t\tEnable the sensors module (Linux-only)"
msgstr ""
-#: glances/glances.py:3303
+#: glances/glances.py:3374
msgid "\t-f file\t\tSet the output folder (HTML) or file (CSV)"
msgstr ""
-#: glances/glances.py:3304
+#: glances/glances.py:3375
msgid "\t-h\t\tDisplay the syntax and exit"
msgstr ""
-#: glances/glances.py:3305
+#: glances/glances.py:3376
msgid "\t-m\t\tDisable mount module"
msgstr ""
-#: glances/glances.py:3306
+#: glances/glances.py:3377
msgid "\t-n\t\tDisable network module"
msgstr ""
-#: glances/glances.py:3307
+#: glances/glances.py:3378
msgid "\t-o output\tDefine additional output (available: HTML or CSV)"
msgstr ""
-#: glances/glances.py:3308
+#: glances/glances.py:3379
#, python-format
msgid "\t-p PORT\t\tDefine the client or server TCP port (default: %d)"
msgstr ""
-#: glances/glances.py:3310
+#: glances/glances.py:3381
+msgid "\t-P password\tClient/server password"
+msgstr ""
+
+#: glances/glances.py:3382
msgid "\t-s\t\tRun Glances in server mode"
msgstr ""
-#: glances/glances.py:3311
+#: glances/glances.py:3383
#, python-format
msgid "\t-t sec\t\tSet the refresh time in seconds (default: %d)"
msgstr ""
-#: glances/glances.py:3313
+#: glances/glances.py:3385
msgid "\t-v\t\tDisplay the version and exit"
msgstr ""
-#: glances/glances.py:3396
+#: glances/glances.py:3473
+msgid "Error: -P flag need an argument (password)"
+msgstr ""
+
+#: glances/glances.py:3480
msgid "Error: -B flag need an argument (bind IP address)"
msgstr ""
-#: glances/glances.py:3404
+#: glances/glances.py:3488
msgid "Error: -c flag need an argument (server IP address/name)"
msgstr ""
-#: glances/glances.py:3415
+#: glances/glances.py:3499
#, python-format
msgid "Error: Unknown output %s"
msgstr ""
-#: glances/glances.py:3421
+#: glances/glances.py:3505
msgid "Error: PySensors library not found"
msgstr ""
-#: glances/glances.py:3426
+#: glances/glances.py:3510
msgid "Error: Sensors module is only available on Linux"
msgstr ""
-#: glances/glances.py:3434
+#: glances/glances.py:3518
msgid "Error: Refresh time should be a positive integer"
msgstr ""
-#: glances/glances.py:3453
+#: glances/glances.py:3538
msgid "Error: Can not use both -s and -c flag"
msgstr ""
-#: glances/glances.py:3456
+#: glances/glances.py:3541
msgid "Error: Can not use both -s and -o flag"
msgstr ""
-#: glances/glances.py:3461
+#: glances/glances.py:3546
msgid "Error: Can not use both -c and -o flag"
msgstr ""
-#: glances/glances.py:3466
+#: glances/glances.py:3549
+msgid "Error: Can not use both -c and -C flag"
+msgstr ""
+
+#: glances/glances.py:3550
+msgid " Limits are set based on the server ones"
+msgstr ""
+
+#: glances/glances.py:3555
msgid "Error: Need Jinja2 library to export into HTML"
msgstr ""
-#: glances/glances.py:3467
+#: glances/glances.py:3556
msgid "Try to install the python-jinja2 package"
msgstr ""
-#: glances/glances.py:3472
+#: glances/glances.py:3561
msgid "Error: HTML export (-o html) needoutput folder definition (-f )"
msgstr ""
-#: glances/glances.py:3478
+#: glances/glances.py:3567
msgid "Error: Need CSV library to export into CSV"
msgstr ""
-#: glances/glances.py:3483
+#: glances/glances.py:3572
msgid "Error: CSV export (-o csv) need output file definition (-f )"
msgstr ""
-#: glances/glances.py:3505
+#: glances/glances.py:3594
msgid "Glances server is running on"
msgstr ""
-#: glances/glances.py:3518
+#: glances/glances.py:3613
msgid "Error: The server version is not compatible"
msgstr ""
diff --git a/man/glances.1 b/man/glances.1
index 1e81787f..506a6d5b 100644
--- a/man/glances.1
+++ b/man/glances.1
@@ -1,13 +1,14 @@
-.TH glances 1 "December, 2012" "version 1.5.2" "USER COMMANDS"
+.TH glances 1 "January, 2013" "version 1.6" "USER COMMANDS"
.SH NAME
glances \- CLI curses based monitoring tool
.SH SYNOPSIS
.B glances
-[\-bdehmnsv] [\-t refresh] [\-B bind] [\-c server] [\-p port] [\-o output] [\-f file]
+[\-bdehmnsv] [\-C conffile] [\-t refresh] [\-B bind] [\-c server] [\-p port] [\-P password] [\-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
-displayed information depending on the terminal size.
+in a minimum of space, ideally to fit in a classical 80x24 terminal or higher to have additionnal information.
+Glances can adapt dynamicaly the displayed information depending on the terminal size.
+It can also work in a client/server mode (for remote monitoring).
.PP
This tool is written in Python and uses PsUtil to fetch the statistical values from key elements.
.PP
@@ -24,6 +25,8 @@ When Glances is running, you can use the following keys:
'f' Show/hide file system stats
.PP
'h' Show/hide the help message
+.PP
+ 'i' Sort processes by IO rate
.PP
'l' Show/hide log messages
.PP
@@ -57,6 +60,9 @@ Bind server to the given IP or host NAME
\-c server
Connect to a Glances server (IP address or hostname)
.TP
+\-C conffile
+Use a configuration file (default is /etc/glances/glances.conf)
+.TP
\-d
Disable disk I/O module
.TP
@@ -81,6 +87,9 @@ Define additional output (available: HTML or CSV)
\-p port
Define the client or server TCP port (default: 61209)
.TP
+\-P password
+Define the client or server password (default: no password)
+.TP
\-s
Run Glances in server mode
.TP
@@ -100,4 +109,4 @@ glances returns a zero exit status if it succeeds to print/grab information.
.PP
It returns 2 if it fails to parse its options (missing arguments, invalid value, etc).
.SH AUTHOR
-Glances is written by Nicolargo (contact@nicolargo.com).
+Glances is written by Nicolas Hennion aka Nicolargo (contact@nicolargo.com).
diff --git a/screenshot.png b/screenshot.png
index 539187b9..5b8f6bb4 100644
Binary files a/screenshot.png and b/screenshot.png differ
diff --git a/setup.py b/setup.py
index fd96cd77..a4c82902 100755
--- a/setup.py
+++ b/setup.py
@@ -25,8 +25,8 @@ for mo in glob('i18n/*/LC_MESSAGES/*.mo'):
setup(
name='Glances',
- version='1.6b',
- download_url='https://s3.amazonaws.com/glances/glances-1.6b.tar.gz',
+ version='1.6',
+ download_url='https://s3.amazonaws.com/glances/glances-1.6.tar.gz',
url='https://github.com/nicolargo/glances',
description='CLI curses-based monitoring tool',
author='Nicolas Hennion',