Update docs for 2.2 release

7 files changed, 1234 insertions, 827 deletions

diff --git a/NEWS b/NEWS
index 4810674c..03160b86 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,8 @@ Enhancements and news features:
     * Add a short key ('F') and a command line option (--fs-free-space) to display FS free space instead of used space (issue #411)
     * Add a short key ('2') and a command line option (--disable-left-sidebar) to disable/enable the side bar (issue #429)
     * Add CPU times sort short key ('t') in the curse interface (issue #449)
+    * Refactor operating system detection for GNU/Linux operating system
+    * Code optimization
 
 Bugs corrected:
 
diff --git a/README.rst b/README.rst
index f2538529..e9003252 100644
--- a/README.rst
+++ b/README.rst
@@ -198,7 +198,6 @@ You can also detect and display all Glances servers available on your network or
 
     $ glances --browser
 
-
 And RTFM, always.
 
 Documentation
diff --git a/docs/glances-doc.html b/docs/glances-doc.html
index 32121e8c..26412c31 100644
--- a/docs/glances-doc.html
+++ b/docs/glances-doc.html
@@ -123,9 +123,9 @@ td.option-group {
 <div class="document" id="glances">
 <h1 class="title">Glances</h1>
 
-<p>This manual describes <em>Glances</em> version 2.1.2.</p>
+<p>This manual describes <em>Glances</em> version 2.2.</p>
 <p>Copyright © 2012-2014 Nicolas Hennion &lt;<a class="reference external" href="mailto:nicolas&#64;nicolargo.com">nicolas&#64;nicolargo.com</a>&gt;</p>
-<p>October 2014</p>
+<p>December 2014</p>
 <div class="contents topic" id="table-of-contents">
 <p class="topic-title first">Table of Contents</p>
 <ul class="simple">
@@ -202,10 +202,15 @@ another one, called <tt class="docutils literal">client</tt>, just run on the se
 <span class="generic output">client$ glances -c &#64;server</span>
 </pre>
 <p>where <tt class="docutils literal">&#64;server</tt> is the IP address or hostname of the server.</p>
+<p>Glances can centralize available Glances servers using the <tt class="docutils literal"><span class="pre">--browser</span></tt> option. The server list can be staticaly defined in the Glances configuration file (section [serverlist]). Glances can also detect and display all Glances servers available on you network (auto discover mode is based on the the Zeroconf protocol only available on GNU/Linux and Mac OS X):</p>
+<pre class="code console literal-block">
+<span class="generic output">client$ glances --browser</span>
+</pre>
+<p>It is possible to disable the auto discover mode <tt class="docutils literal"><span class="pre">--disable-autodiscover</span></tt>.</p>
 <p>In server mode, you can set the bind address <tt class="docutils literal"><span class="pre">-B</span> ADDRESS</tt> and listening
 TCP port <tt class="docutils literal"><span class="pre">-p</span> PORT</tt>.</p>
 <p>In client mode, you can set the TCP port of the server <tt class="docutils literal"><span class="pre">-p</span> PORT</tt>.</p>
-<p>You can also set a password to access to the server <tt class="docutils literal"><span class="pre">--password</span></tt>.</p>
+<p>You can set a password to access to the server <tt class="docutils literal"><span class="pre">--password</span></tt>.</p>
 <p>Default binding address is <tt class="docutils literal">0.0.0.0</tt> (Glances will listen on all the
 available network interfaces) and TCP port is <tt class="docutils literal">61209</tt>.</p>
 <p>In client/server mode, limits are set by the server side.</p>
@@ -216,12 +221,12 @@ client, the latter will try to grab stats using the <tt class="docutils literal"
 <pre class="code console literal-block">
 <span class="generic output">client$ glances -c &#64;snmpserver</span>
 </pre>
-<p>Note: Stats grabbed by SNMP request are limited.</p>
+<p>Note: Stats grabbed by SNMP request are limited (operating system dependent).</p>
 </div>
 <div class="section" id="web-server-mode">
 <h2><a class="toc-backref" href="#id9">Web Server Mode</a></h2>
 <p>If you want to remotely monitor a machine, called <tt class="docutils literal">server</tt>, from any
-device with a web browser, just run on the server:</p>
+device with a web browser, just run the server with the <tt class="docutils literal"><span class="pre">-w</span></tt> option:</p>
 <pre class="code console literal-block">
 <span class="generic output">server$ glances -w</span>
 </pre>
@@ -280,17 +285,29 @@ http://&#64;server:61208
 </tr>
 <tr><td>&nbsp;</td><td>disable sensors module</td></tr>
 <tr><td class="option-group" colspan="2">
-<kbd><span class="option">--disable-process</span></kbd></td>
+<kbd><span class="option">--disable-left-sidebar</span></kbd></td>
 </tr>
-<tr><td>&nbsp;</td><td>disable process module</td></tr>
+<tr><td>&nbsp;</td><td>disable left sidebar</td></tr>
 <tr><td class="option-group" colspan="2">
-<kbd><span class="option">--disable-process-extended</span></kbd></td>
+<kbd><span class="option">--disable-process</span></kbd></td>
 </tr>
-<tr><td>&nbsp;</td><td>disable extended stats on top process</td></tr>
+<tr><td>&nbsp;</td><td>disable process module</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--disable-log</span></kbd></td>
 <td>disable log module</td></tr>
 <tr><td class="option-group" colspan="2">
+<kbd><span class="option">--enable-process-extended</span></kbd></td>
+</tr>
+<tr><td>&nbsp;</td><td>enable extended stats on top process</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--enable-history</span></kbd></td>
+</tr>
+<tr><td>&nbsp;</td><td>enable the history mode</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--path-history <var>PATH_HISTORY</var></span></kbd></td>
+</tr>
+<tr><td>&nbsp;</td><td>Set the export path for graph history</td></tr>
+<tr><td class="option-group" colspan="2">
 <kbd><span class="option">--output-csv <var>OUTPUT_CSV</var></span></kbd></td>
 </tr>
 <tr><td>&nbsp;</td><td>export stats to a CSV file</td></tr>
@@ -302,6 +319,13 @@ hostname</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-s</span>, <span class="option">--server</span></kbd></td>
 <td>run Glances in server mode</td></tr>
+<tr><td class="option-group">
+<kbd><span class="option">--browser</span></kbd></td>
+<td>run the Glances client browser (list of Glances server)</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--disable-autodiscover</span></kbd></td>
+</tr>
+<tr><td>&nbsp;</td><td>disable autodiscover feature</td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">-p <var>PORT</var></span>, <span class="option">--port <var>PORT</var></span></kbd></td>
 </tr>
@@ -319,6 +343,10 @@ hostname</td></tr>
 <td>define a client/server password from the prompt or
 file</td></tr>
 <tr><td class="option-group" colspan="2">
+<kbd><span class="option">--disable-autodiscover</span></kbd></td>
+</tr>
+<tr><td>&nbsp;</td><td>Hide Glances server from the auto discover feature</td></tr>
+<tr><td class="option-group" colspan="2">
 <kbd><span class="option">--snmp-community <var>SNMP_COMMUNITY</var></span></kbd></td>
 </tr>
 <tr><td>&nbsp;</td><td>SNMP community</td></tr>
@@ -357,12 +385,23 @@ file</td></tr>
 <kbd><span class="option">--process-short-name</span></kbd></td>
 </tr>
 <tr><td>&nbsp;</td><td>force short name for processes name</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--hide-kernel-threads</span></kbd></td>
+</tr>
+<tr><td>&nbsp;</td><td>hide kernel threads in process list</td></tr>
+<tr><td class="option-group">
+<kbd><span class="option">--tree</span></kbd></td>
+<td>display processes as a tree</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-b</span>, <span class="option">--byte</span></kbd></td>
 <td>display network rate in byte per second</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-1</span>, <span class="option">--percpu</span></kbd></td>
 <td>start Glances in per CPU mode</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--fs-free-space</span></kbd></td>
+</tr>
+<tr><td>&nbsp;</td><td>display FS free space instead of used</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--theme-white</span></kbd></td>
 <td>optimize display for white background</td></tr>
@@ -400,6 +439,8 @@ Filter is a regular expression pattern:</p>
 <dd>Enable/disable top extended stats</dd>
 <dt><tt class="docutils literal">f</tt></dt>
 <dd>Show/hide file system stats</dd>
+<dt><tt class="docutils literal">F</tt></dt>
+<dd>Switch between FS used and free space</dd>
 <dt><tt class="docutils literal">g</tt></dt>
 <dd>Generate hraphs for current history</dd>
 <dt><tt class="docutils literal">h</tt></dt>
@@ -414,13 +455,15 @@ Filter is a regular expression pattern:</p>
 <dd>Show/hide network stats</dd>
 <dt><tt class="docutils literal">p</tt></dt>
 <dd>Sort processes by name</dd>
-<dt><tt class="docutils literal">q</tt></dt>
-<dd>Quit</dd>
+<dt><tt class="docutils literal">q</tt> or <tt class="docutils literal">ESC</tt></dt>
+<dd>Quit the current Glances session</dd>
 <dt><tt class="docutils literal">r</tt></dt>
 <dd>Reset history</dd>
 <dt><tt class="docutils literal">s</tt></dt>
 <dd>Show/hide sensors stats</dd>
 <dt><tt class="docutils literal">t</tt></dt>
+<dd>Sort process by CPU times (TIME+)</dd>
+<dt><tt class="docutils literal">T</tt></dt>
 <dd>View network I/O as combination</dd>
 <dt><tt class="docutils literal">u</tt></dt>
 <dd>View cumulative network I/O</dd>
@@ -432,9 +475,22 @@ Filter is a regular expression pattern:</p>
 <dd>Show/hide processes stats</dd>
 <dt><tt class="docutils literal">1</tt></dt>
 <dd>Switch between global CPU and per-CPU stats</dd>
+<dt><tt class="docutils literal">2</tt></dt>
+<dd>Enable/disable left sidebar</dd>
 <dt><tt class="docutils literal">/</tt></dt>
 <dd>Switch between short name / command line (processes name)</dd>
 </dl>
+<p>In the Glances client browser (accessible through the --browser command line argument):</p>
+<dl class="docutils">
+<dt><tt class="docutils literal">ENTER</tt></dt>
+<dd>Run Glances client to the selected server</dd>
+<dt><tt class="docutils literal">UP</tt></dt>
+<dd>Up in the servers list</dd>
+<dt><tt class="docutils literal">DOWN</tt></dt>
+<dd>Down in the servers list</dd>
+<dt><tt class="docutils literal">q</tt> or <tt class="docutils literal">ESC</tt></dt>
+<dd>Quit Glances</dd>
+</dl>
 </div>
 </div>
 <div class="section" id="configuration">
@@ -482,15 +538,15 @@ cp /usr/share/doc/glances/glances.conf $XDG_CONFIG_HOME/glances/</span>
 <p>Glances logs all its internal messages to a log file. By default, only
 INFO &amp; WARNING &amp; ERROR &amp;CRITICAL levels are logged, but DEBUG messages
 can ben logged using the -d option on the command line.</p>
-<p>By default, the configuration file is under:</p>
+<p>By default, the log file is under:</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field"><th class="field-name" colspan="2">Linux, *BSD and OS X:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body"><tt class="docutils literal">/tmp/glances.conf</tt></td>
+<tr class="field"><td>&nbsp;</td><td class="field-body"><tt class="docutils literal">/tmp/glances.log</tt></td>
 </tr>
-<tr class="field"><th class="field-name">Windows:</th><td class="field-body"><tt class="docutils literal"><span class="pre">%APPDATA%\Local\temp\glances.conf</span></tt></td>
+<tr class="field"><th class="field-name">Windows:</th><td class="field-body"><tt class="docutils literal"><span class="pre">%APPDATA%\Local\temp\glances.log</span></tt></td>
 </tr>
 </tbody>
 </table>
@@ -702,7 +758,7 @@ User cans switch to the process name by pressing on the <tt class="docutils lite
 <li>Openned threads, files and network sessions (TCP and UDP)</li>
 <li>IO nice level</li>
 </ul>
-<p>The extended stats feature could be disabled using the --disable-process-extended option (command line) or the <tt class="docutils literal">e</tt> key (curses interface).</p>
+<p>The extended stats feature could be enabled using the --enable-process-extended option (command line) or the <tt class="docutils literal">e</tt> key (curses interface).</p>
 <p><em>Note</em>: limit values can be overwritten in the configuration file under
 the <tt class="docutils literal">[process]</tt> section.</p>
 </div>
diff --git a/i18n/de/LC_MESSAGES/glances.po b/i18n/de/LC_MESSAGES/glances.po
index 5b44be7a..559bdeb5 100644
--- a/i18n/de/LC_MESSAGES/glances.po
+++ b/i18n/de/LC_MESSAGES/glances.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLANCES 2.0_RC4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-03 16:21+0200\n"
+"POT-Creation-Date: 2014-12-13 22:14+0100\n"
 "PO-Revision-Date: 2014-06-03 16:33+0100\n"
 "Last-Translator: David Tiersch <d.tiersch@gmail.com>\n"
 "Language-Team: German\n"
@@ -19,692 +19,929 @@ msgstr ""
 "X-Generator: Poedit 1.5.4\n"
 "X-Poedit-Basepath: ~/dev/glances\n"
 
-#: glances/__init__.py:105
-msgid "Error: The server version is not compatible with the client"
-msgstr "Fehler: Die Server-Version ist mit dem Client nicht kompatibel"
-
-#: glances/__init__.py:124
+#: glances/__init__.py:166
 #, python-brace-format
 msgid "Glances server is running on {0}:{1}"
 msgstr "Glances-Server läuft auf {0}:{1}"
 
-#: glances/core/glances_stats.py:264
+#: glances/plugins/glances_diskio.py:132
+msgid "DISK I/O"
+msgstr "DISK I/O"
+
+#: glances/plugins/glances_diskio.py:134
+msgid "R/s"
+msgstr "R/s"
+
+#: glances/plugins/glances_diskio.py:136
+msgid "W/s"
+msgstr "W/s"
+
+#: glances/plugins/glances_memswap.py:146
+msgid "SWAP"
+msgstr "SWAP"
+
+#: glances/plugins/glances_memswap.py:154 glances/plugins/glances_mem.py:185
+msgid "total:"
+msgstr "gesamt:"
+
+#: glances/plugins/glances_memswap.py:161 glances/plugins/glances_mem.py:198
+msgid "used:"
+msgstr "benutzt:"
+
+#: glances/plugins/glances_memswap.py:169 glances/plugins/glances_mem.py:212
+msgid "free:"
+msgstr "frei:"
+
+#: glances/plugins/glances_batpercent.py:96
+msgid "Battery (%)"
+msgstr "Batterie (%)"
+
+#: glances/plugins/glances_percpu.py:94
+msgid "PER CPU not available"
+msgstr "PRO-CPU nicht möglich"
+
+#: glances/plugins/glances_percpu.py:100
+msgid "PER CPU"
+msgstr "PRO CPU"
+
+#: glances/plugins/glances_percpu.py:110 glances/plugins/glances_cpu.py:159
+msgid "user:"
+msgstr "Benutzer:"
+
+#: glances/plugins/glances_percpu.py:118 glances/plugins/glances_cpu.py:178
+msgid "system:"
+msgstr "System:"
+
+#: glances/plugins/glances_percpu.py:126 glances/plugins/glances_cpu.py:164
+#: glances/plugins/glances_cpu.py:197
+msgid "idle:"
+msgstr "Inaktiv:"
+
+#: glances/plugins/glances_processcount.py:76
+msgid "PROCESSES DISABLED (press 'z' to display)"
+msgstr "PROZESS DEAKTIVIERT (drücke 'z' zum anzeigen)"
+
+#: glances/plugins/glances_processcount.py:85
+msgid "Processes filter:"
+msgstr ""
+
+#: glances/plugins/glances_processcount.py:87
 #, python-brace-format
-msgid "Error: Update {0} failed: {1}"
-msgstr "Fehler: Aktualisierung {0} ist fehlgeschlagen: {1}"
+msgid " {0} "
+msgstr ""
+
+#: glances/plugins/glances_processcount.py:89
+msgid "(press ENTER to edit)"
+msgstr ""
 
-#: glances/core/glances_client.py:62
+#: glances/plugins/glances_processcount.py:95
+msgid "TASKS "
+msgstr "PROZESSE "
+
+#: glances/plugins/glances_processcount.py:103
 #, python-brace-format
-msgid "Error: Couldn't create socket {0}: {1}"
-msgstr "Fehler: Konnte Socket {0} nicht erzeugen: {1}"
+msgid " ({0} thr),"
+msgstr " ({0} thr),"
 
-#: glances/core/glances_client.py:100
-msgid "Error: Connection to server failed: Bad password"
-msgstr "Fehler: Verbindung zum Server fehlgeschlagen: Falsches Passwort"
+#: glances/plugins/glances_processcount.py:108
+#, python-brace-format
+msgid " {0} run,"
+msgstr " {0} run,"
 
-#: glances/core/glances_client.py:102
+#: glances/plugins/glances_processcount.py:113
 #, python-brace-format
-msgid "Error: Connection to server failed: {0}"
-msgstr "Fehler: Verbindung zum Server fehlgeschlagen: {0}"
+msgid " {0} slp,"
+msgstr " {0} slp,"
 
-#: glances/core/glances_client.py:110
-msgid "Info: Connection to Glances server failed. Trying fallback to SNMP..."
-msgstr ""
-"Info: Verbindung zum Glances-Server fehlgeschlagen. Versuche Fallback zu "
-"SNMP..."
+#: glances/plugins/glances_processcount.py:116
+#, python-brace-format
+msgid " {0} oth "
+msgstr " {0} oth "
 
-#: glances/core/glances_client.py:118
-msgid "Error: Connection to SNMP server failed"
-msgstr "Fehler: Verbindung zum SNMP-Server fehlgeschlagen"
+#: glances/plugins/glances_processcount.py:121
+msgid "sorted automatically"
+msgstr "automatisch sortiert"
 
-#: glances/core/glances_client.py:147
+#: glances/plugins/glances_processcount.py:123
 #, python-brace-format
-msgid "Error: Unknown server mode: {0}"
-msgstr "Fehler: Unbekannter Servers-Modus: {0}"
+msgid " by {0}"
+msgstr " nach {0}"
 
-#: glances/core/glances_config.py:71
+#: glances/plugins/glances_processcount.py:126
 #, python-brace-format
-msgid "Error: Cannot decode configuration file '{0}': {1}"
-msgstr "Fehler: Kann Konfigurationsdatei '{0}' nicht lesen: {1}"
+msgid "sorted by {0}"
+msgstr "sortiert nach {0}"
 
-#: glances/core/glances_main.py:65
-msgid "display network rate in byte per second"
-msgstr "Netzwerkgeschwindigkeit anzeigen in Byte/Sekunde"
+#: glances/plugins/glances_fs.py:175
+msgid "FILE SYS"
+msgstr "DATEISYSTEM"
 
-#: glances/core/glances_main.py:67
-msgid "bind server to the given IPv4/IPv6 address or hostname"
-msgstr "Server auf gegebene IPv4/IPv6-Adresse oder Hostnamen festlegen"
+#: glances/plugins/glances_fs.py:178
+msgid "Free"
+msgstr ""
 
-#: glances/core/glances_main.py:69
-msgid "connect to a Glances server by IPv4/IPv6 address or hostname"
-msgstr "Zu einem Glances-Server mit IPv4/IPv6-Adresse oder Hostnamen verbinden"
+#: glances/plugins/glances_fs.py:180
+msgid "Used"
+msgstr "Belegt"
 
-#: glances/core/glances_main.py:71
-msgid "path to the configuration file"
-msgstr "Pfad zur Konfigurationsdatei"
+#: glances/plugins/glances_fs.py:182
+msgid "Total"
+msgstr "Gesamt"
 
-#: glances/core/glances_main.py:74
-msgid "disable bold mode in the terminal"
-msgstr "Fett-Modus im Terminal deaktivieren"
+#: glances/plugins/glances_uptime.py:89
+#, python-brace-format
+msgid "Uptime: {0}"
+msgstr "Betriebszeit: {0}"
 
-#: glances/core/glances_main.py:76
-msgid "disable disk I/O module"
-msgstr "Disk-I/O-Modul deaktivieren"
+#: glances/plugins/glances_sensors.py:133
+msgid "SENSORS"
+msgstr "SENSOREN"
 
-#: glances/core/glances_main.py:78
-msgid "disable filesystem module"
-msgstr "Dateisystem-Modul deaktivieren"
+#: glances/plugins/glances_sensors.py:136
+#: glances/plugins/glances_sensors.py:138
+msgid "°C"
+msgstr "°C"
 
-#: glances/core/glances_main.py:80
-msgid "disable network module"
-msgstr "Netzwerk-Modul deaktivieren"
+#: glances/plugins/glances_now.py:47
+msgid "%Y-%m-%d %H:%M:%S"
+msgstr "%d.%m.%Y %H:%M:%S"
 
-#: glances/core/glances_main.py:82
-msgid "disable sensors module"
-msgstr "Sensor-Modul deaktivieren"
+#: glances/plugins/glances_processlist.py:288
+msgid "CPU affinity: "
+msgstr ""
 
-#: glances/core/glances_main.py:84
-msgid "disable process module"
-msgstr "Prozess-Modul deaktivieren"
+#: glances/plugins/glances_processlist.py:288
+msgid " cores"
+msgstr ""
 
-#: glances/core/glances_main.py:86
-msgid "disable log module"
-msgstr "Log-Modul deaktivieren"
+#: glances/plugins/glances_processlist.py:293
+msgid "Memory info: "
+msgstr ""
 
-#: glances/core/glances_main.py:89
-msgid "export stats to a CSV file"
-msgstr "Exportiere Daten zu CSV-Datei"
+#: glances/plugins/glances_processlist.py:299
+msgid "swap "
+msgstr ""
 
-#: glances/core/glances_main.py:92
-#, python-brace-format
-msgid "define the client/server TCP port [default: {0}]"
-msgstr "Client-/Server-TCP-Port festlegen [default: {0}]"
+#: glances/plugins/glances_processlist.py:304
+msgid "threads "
+msgstr ""
 
-#: glances/core/glances_main.py:94
-msgid "define password from the command line"
-msgstr "Passwort auf Kommandozeile bestimmen"
+#: glances/plugins/glances_processlist.py:306
+msgid "files "
+msgstr ""
 
-#: glances/core/glances_main.py:96
-msgid "define a client/server password from the prompt or file"
-msgstr "Client-/Server-Passwort über Prompt oder Datei festlegen"
+#: glances/plugins/glances_processlist.py:308
+msgid "handles "
+msgstr ""
 
-#: glances/core/glances_main.py:98
-msgid "run Glances in server mode"
-msgstr "Glances im Server-Modus ausführen"
+#: glances/plugins/glances_processlist.py:310
+msgid "TCP "
+msgstr ""
 
-#: glances/core/glances_main.py:100
-msgid "SNMP community"
-msgstr "SNMP-Community"
+#: glances/plugins/glances_processlist.py:312
+msgid "UDP "
+msgstr ""
 
-#: glances/core/glances_main.py:102
-msgid "SNMP port"
-msgstr "SNMP-Port"
+#: glances/plugins/glances_processlist.py:315
+msgid "Open: "
+msgstr ""
 
-#: glances/core/glances_main.py:104
-msgid "SNMP version (1, 2c or 3)"
-msgstr "SNMP-Version (1, 2c oder 3)"
+#: glances/plugins/glances_processlist.py:320
+msgid "IO nice: "
+msgstr ""
 
-#: glances/core/glances_main.py:106
-msgid "SNMP username (only for SNMPv3)"
-msgstr "SNMP-Benutzername (nur für SNMPv3)"
+#: glances/plugins/glances_processlist.py:321
+msgid "Class is "
+msgstr ""
 
-#: glances/core/glances_main.py:108
-msgid "SNMP authentication key (only for SNMPv3)"
-msgstr "SNMP-Authentifizierungs-Schlüssel (nur für SNMPv3)"
+#: glances/plugins/glances_processlist.py:331
+#: glances/plugins/glances_processlist.py:336
+msgid "No specific I/O priority"
+msgstr ""
 
-#: glances/core/glances_main.py:110
-#, python-brace-format
-msgid "set refresh time in seconds [default: {0} sec]"
-msgstr "Aktualisierungszeit in Sekunden [default: {0} Sek]"
+#: glances/plugins/glances_processlist.py:348
+#, python-format
+msgid " (value %s/7)"
+msgstr ""
 
-#: glances/core/glances_main.py:112
-msgid "run Glances in web server mode"
-msgstr "Glances im Webserver-Modus starten"
+#: glances/plugins/glances_processlist.py:367
+#: glances/outputs/glances_curses.py:1012
+msgid "CPU%"
+msgstr "CPU %"
 
-#: glances/core/glances_main.py:115
-msgid "start Glances in per CPU mode"
-msgstr "Glances im pro-CPU-Modus starten"
+#: glances/plugins/glances_processlist.py:369
+#: glances/outputs/glances_curses.py:1013
+msgid "MEM%"
+msgstr "RAM%"
 
-#: glances/core/glances_main.py:145
-msgid "Define the password for the Glances server"
-msgstr "Passwort für Glances-Server festlegen"
+#: glances/plugins/glances_processlist.py:371
+msgid "VIRT"
+msgstr "VIRT"
 
-#: glances/core/glances_main.py:149
-msgid "Enter the Glances server password"
-msgstr "Passwort für Glances-Server eingeben"
+#: glances/plugins/glances_processlist.py:373
+msgid "RES"
+msgstr "RES"
 
-#: glances/core/glances_monitor_list.py:74
-#, python-brace-format
-msgid "Error: Cannot read monitored list: {0}"
-msgstr "Fehler: Kann Überwachungs-Liste nicht lesen: {0}"
+#: glances/plugins/glances_processlist.py:375
+msgid "PID"
+msgstr "PID"
 
-#: glances/core/glances_monitor_list.py:143
-msgid "Error: "
-msgstr "Fehler: "
+#: glances/plugins/glances_processlist.py:377
+msgid "USER"
+msgstr "BENUTZER"
 
-#: glances/core/glances_monitor_list.py:145
-msgid "Cannot execute command"
-msgstr "Kann Befehl nicht ausführen"
+#: glances/plugins/glances_processlist.py:379
+msgid "NI"
+msgstr "NI"
 
-#: glances/core/glances_password.py:111
-#, python-brace-format
-msgid "Info: Read password from file: {0}"
-msgstr "Info: Passwort gelesen aus Datei {0}"
+#: glances/plugins/glances_processlist.py:381
+msgid "S"
+msgstr "S"
 
-#: glances/core/glances_password.py:120
-msgid "Password: "
-msgstr "Passwort:"
+#: glances/plugins/glances_processlist.py:383
+msgid "TIME+"
+msgstr "ZEIT+"
 
-#: glances/core/glances_password.py:124
-msgid "Password (confirm): "
-msgstr "Passwort (wiederholen):"
+#: glances/plugins/glances_processlist.py:385
+msgid "IOR/s"
+msgstr "IOR/s"
 
-#: glances/core/glances_password.py:127
-msgid "Error: Sorry, but passwords did not match..."
-msgstr "Fehler: Passwörter stimmen nicht überein..."
+#: glances/plugins/glances_processlist.py:387
+msgid "IOW/s"
+msgstr "IOW/s"
 
-#: glances/core/glances_password.py:138
-msgid "Do you want to save the password? [Yes/No]: "
-msgstr "Willst du das Passwort speichern? [Ja/Nein]"
+#: glances/plugins/glances_processlist.py:389
+msgid "Command"
+msgstr "Befehl"
 
-#: glances/core/glances_password.py:139
-msgid "Y"
-msgstr "J"
+#: glances/plugins/glances_monitor.py:101
+msgid "RUNNING"
+msgstr "LAUFEND"
 
-#: glances/core/glances_password.py:154
-#, python-brace-format
-msgid "Warning: Cannot create Glances directory: {0}"
-msgstr "Warnung: Kann Glances-Ordner nicht erzeugen: {0}"
+#: glances/plugins/glances_monitor.py:101
+msgid "NOT RUNNING"
+msgstr "NICHT LAUFEND"
 
-#: glances/core/glances_server.py:115
-#, python-brace-format
-msgid "Error: Couldn't open socket: {0}"
-msgstr "Fehler: Kann Socket nicht öffnen: {0}"
+#: glances/plugins/glances_network.py:201
+msgid "NETWORK"
+msgstr "NETZWERK"
 
-#: glances/core/glances_server.py:205
-#, python-brace-format
-msgid "Error: Cannot start Glances server: {0}"
-msgstr "Fehler: Kann Glances-Server nicht starten: {0}"
+#: glances/plugins/glances_network.py:207
+msgid "Rx+Tx"
+msgstr "Rx+Tx"
 
-#: glances/outputs/glances_curses.py:61
-msgid "Error: Cannot init the curses library.\n"
-msgstr "Fehler: Kann curses-Bibliothek nicht initialisieren.\n"
+#: glances/plugins/glances_network.py:211
+msgid "Rx"
+msgstr "Rx"
 
-#: glances/outputs/glances_csv.py:48
-#, python-brace-format
-msgid "Error: Cannot create the CSV file: {0}"
-msgstr "Fehler: Kann CSV-Datei nicht erzeugen: {0}"
+#: glances/plugins/glances_network.py:213
+msgid "Tx"
+msgstr "Tx"
 
-#: glances/outputs/glances_csv.py:51
-#, python-brace-format
-msgid "Stats dumped to CSV file: {0}"
-msgstr "Daten nach CSV-Datei gespeichert: {0}"
+#: glances/plugins/glances_network.py:219
+msgid "Rx+Tx/s"
+msgstr "Rx+Tx/s"
 
-#: glances/plugins/glances_uptime.py:95
-#, python-brace-format
-msgid "Uptime: {0}"
-msgstr "Betriebszeit: {0}"
+#: glances/plugins/glances_network.py:222
+msgid "Rx/s"
+msgstr "Rx/s"
+
+#: glances/plugins/glances_network.py:224
+msgid "Tx/s"
+msgstr "Tx/s"
 
-#: glances/plugins/glances_alert.py:78
+#: glances/plugins/glances_alert.py:71
 msgid "No warning or critical alert detected"
 msgstr "Keine (kritische) Warnung entdeckt"
 
-#: glances/plugins/glances_alert.py:82
+#: glances/plugins/glances_alert.py:75
 msgid "Warning or critical alerts"
 msgstr "(Kritische) Warnungen"
 
-#: glances/plugins/glances_alert.py:86
+#: glances/plugins/glances_alert.py:79
 #, python-brace-format
 msgid " (lasts {0} entries)"
 msgstr " (letzte {0} Einträge)"
 
-#: glances/plugins/glances_alert.py:88
+#: glances/plugins/glances_alert.py:81
 msgid " (one entry)"
 msgstr " (ein Eintrag)"
 
-#: glances/plugins/glances_alert.py:102
+#: glances/plugins/glances_alert.py:95
 msgid " (ongoing)"
 msgstr "(laufend)"
 
-#: glances/plugins/glances_alert.py:108
+#: glances/plugins/glances_alert.py:101
 #, python-brace-format
 msgid "{0} on {1}"
 msgstr "{0} auf {1}"
 
-#: glances/plugins/glances_alert.py:117
+#: glances/plugins/glances_alert.py:110
 #, python-brace-format
 msgid " (Min:{0:.1f} Mean:{1:.1f} Max:{2:.1f})"
 msgstr " (Min:{0:.1f} Mittel:{1:.1f} Max:{2:.1f})"
 
-#: glances/plugins/glances_batpercent.py:107
-msgid "Battery (%)"
-msgstr "Batterie (%)"
-
-#: glances/plugins/glances_cpu.py:123
-msgid "CPU"
-msgstr "CPU"
-
-#: glances/plugins/glances_cpu.py:130
-msgid "nice:"
-msgstr "nice:"
-
-#: glances/plugins/glances_cpu.py:138 glances/plugins/glances_percpu.py:168
-msgid "user:"
-msgstr "Benutzer:"
-
-#: glances/plugins/glances_cpu.py:144
-msgid "irq:"
-msgstr "IRQ:"
-
-#: glances/plugins/glances_cpu.py:152 glances/plugins/glances_percpu.py:178
-msgid "system:"
-msgstr "System:"
-
-#: glances/plugins/glances_cpu.py:158
-msgid "iowait:"
-msgstr "IOWait:"
-
-#: glances/plugins/glances_cpu.py:166 glances/plugins/glances_percpu.py:188
-msgid "idle:"
-msgstr "Inaktiv:"
+#: glances/plugins/glances_system.py:158
+msgid "Connected to "
+msgstr "Verbunden mit "
 
-#: glances/plugins/glances_cpu.py:172
-msgid "steal:"
-msgstr "Steal:"
+#: glances/plugins/glances_system.py:161
+msgid "SNMP from "
+msgstr "SNMP von "
 
-#: glances/plugins/glances_diskio.py:134
-msgid "DISK I/O"
-msgstr "DISK I/O"
+#: glances/plugins/glances_system.py:164
+msgid "Disconnected from "
+msgstr "Getrennt von "
 
-#: glances/plugins/glances_diskio.py:136
-msgid "R/s"
-msgstr "R/s"
+#: glances/plugins/glances_mem.py:171
+msgid "MEM"
+msgstr "RAM"
 
-#: glances/plugins/glances_diskio.py:138
-msgid "W/s"
-msgstr "W/s"
+#: glances/plugins/glances_mem.py:178
+msgid "active:"
+msgstr "aktiv:"
 
-#: glances/plugins/glances_fs.py:142
-msgid "FILE SYS"
-msgstr "DATEISYSTEM"
+#: glances/plugins/glances_mem.py:191
+msgid "inactive:"
+msgstr "inaktiv:"
 
-#: glances/plugins/glances_fs.py:144
-msgid "Used"
-msgstr "Belegt"
+#: glances/plugins/glances_mem.py:205
+msgid "buffers:"
+msgstr "Puffer:"
 
-#: glances/plugins/glances_fs.py:146
-msgid "Total"
-msgstr "Gesamt"
+#: glances/plugins/glances_mem.py:218
+msgid "cached:"
+msgstr "cached:"
 
-#: glances/plugins/glances_help.py:68
+#: glances/plugins/glances_help.py:58
 #, python-brace-format
-msgid " with psutil {0}"
-msgstr " mit psutil {0}"
+msgid " with PSutil {0}"
+msgstr ""
 
-#: glances/plugins/glances_help.py:77
-msgid "a"
-msgstr "a"
+#: glances/plugins/glances_help.py:64
+msgid "Configuration file"
+msgstr ""
 
 #: glances/plugins/glances_help.py:77
 msgid "Sort processes automatically"
 msgstr "Prozesse automatisch sortieren"
 
 #: glances/plugins/glances_help.py:79
-msgid "b"
-msgstr "b"
-
-#: glances/plugins/glances_help.py:79
 msgid "Bytes or bits for network I/O"
 msgstr "Bytes oder Bits für Netzwerk I/O"
 
 #: glances/plugins/glances_help.py:82
-msgid "c"