Update of the user guide and its translations.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37659 a95241bf-73f2-0310-859d-f6bbb57e9c96
2024-11-23 15:18:25 +01:00 · 2010-07-21 15:52:50 +00:00 · 2010-07-21 15:52:50 +00:00 · 16b5862d49
commit 16b5862d49
parent 530892030b
70 changed files with 601 additions and 420 deletions
--- a/userguide/de/applications/screenshot.html
+++ b/userguide/de/applications/screenshot.html
@ -4,7 +4,7 @@
 <head>
 <!-- 
 *
- * Copyright 2009, Haiku. All rights reserved.
+ * Copyright 2009-2010, Haiku. All rights reserved.
 * Distributed under the terms of the MIT License.
 *
 * Authors:
@ -42,7 +42,7 @@
 </ul>
 <span>
 «  <a href="poorman.html">PoorMan</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">Anwendungen</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="showimage.html">Showimage</a>  »
 </span></div>
 </div>
@ -53,34 +53,46 @@
 <h2><img src="../../images/apps-images/screenshot-icon_64.png" alt="screenshot-icon_64.png" width="64" height="64" />Screenshot</h2>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
 <tr><td>Deskbar:</td><td style="width:15px;"></td><td><span class="menu">Applications</span></td></tr>
-<tr><td>Ort:</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span></td></tr>
+<tr><td>Ort:</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span><br />
+<span class="path">/bin/screenshot</span></td></tr>
 <tr><td>Einstellungen:</td><td></td><td><span class="path">~/config/settings/screenshot</span></td></tr>
 </table>
 <p><br /></p>
-<p>Anders als bei normalen Screenshots, die durch die <span class="key">Druck</span> Taste als PNG unter <span class="path">/boot/home/</span> gespeichert werden, bietet diese Anwendungen einige nützliche Optionen.</p>
+<p>Bildschirmfotos können entweder mittels der <span class="key">DRUCK</span> Taste oder durch Start der Screenshot Anwendung geschossen werden.</p>
 <p><img id="sreenshot" src="../images/apps-images/screenshot.png" alt="screenshot.png" /></p>
-<p>Startet man Screenshot, wird der aktuelle Bildschirminhalt wie üblich aufgenommen. In dessen Hauptfenster können jedoch vor dem Speichern des Bilds noch Dateiname, Format und Speicherort bestimmt werden.</p>
-<p>Der <span class="button">Options</span> Dialog bietet weitere Einstellungen:</p>
-<p><img id="sreenshot-options" src="../images/apps-images/screenshot-options.png" alt="screenshot-options.png" /></p>
-<p>Neben dem Offensichtlichen - Wechsel zwischen Aufnahme des gesamten Bildschirminhalts oder nur des aktiven Fensters, mit oder ohne Fensterrahmen und Mauszeiger - lässt sich eine Aufnahmeverzögerung festlegen. Diese Verzögerung kommt natürlich erst zum tragen, wenn mit <span class="button">Take Screenshot</span> eine neue Aufnahme ausgelöst wird.</p>
-
+<p>Im Screenshot Fenster kann man sich entscheiden, ob man den gesamten Bildschirminhalt oder nur das aktuelle Fenster aufnehmen will und ob dabei auch der Fensterrahmen bzw. der Mauszeiger mitgenommen werden soll. Außerdem lässt sich eine Verzögerung einstellen, nach der ein Screenshot erstellt wird.</p>
+<p>Darunter kann Name, Format und Speicherort festgelegt werden, mit dem der Screenshot gespeichert wird wenn auf <span class="button">Save</span> geklickt wird. Anstatt eine Datei auf die Platte zu bannen, kann man per <span class="button">Copy to clipboard</span> auch einfach nur die Ablage benutzen und das Bild von dort direkt in eine andere Anwendung einfügen. <span class="button">New screenshot</span> schießt ein neues Bildschirmfoto.</p>
+<p>Die folgenden Tastaturkürzel sind möglich, da alle Einstellungen für den nächsten Screenshot beibehalten werden:</p>
+<table summary="shortcuts" border="0" cellspacing="0" cellpadding="4">
+<tr><td><span class="key">DRUCK</span></td><td style="width:15px;"></td><td>Schießt ein Bildschirmfoto ohne Verzögerung und öffnet das Screenshot Fenster.</td></tr>
+<tr><td class="onelinetop"><span class="key">SHIFT</span> <span class="key">DRUCK</span></td><td></td><td>Schießt ein Bildschirmfoto "heimlich" (ohne das Screenshot Fenster zu öffnen), aber mit allen beim letzten Mal getroffenen Einstellungen.</td></tr>
+<tr><td><span class="key">STRG</span> <span class="key">DRUCK</span></td><td></td><td>Schießt auch ein "heimliches" Bildschirmfoto mit den letzten Einstellungen, speichert es jedoch nicht ab, sondern kopiert es nur in die Ablage.</td></tr>
+</table>
 <h2>
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
 Screenshots aus dem Terminal</h2>
-<p>Die Screenshot Anwendung kann auch vom Terminal oder einem Skript aus benutzt werden.<br />
-<span class="cli">Screenshot --help</span> zeigt die vertrauten Optionen als Parameter:</p>
+<p>Eine spezielle <span class="cli">screenshot</span> Anwendung ist für den Einsatz im Terminal oder einem Skript gedacht.<br />
+<span class="cli">screenshot --help</span> zeigt die vertrauten Optionen als Parameter:</p>

-<pre class="terminal">~&gt; Screenshot --help
+<pre class="terminal">~&gt; screenshot --help
+
+screenshot [OPTION] [FILE] Erstellt einen Screenshot vom aktuellen Bildschirminhalt
+
+FILE ist der optionale Ausgabepfad und Dateiname, der im "silent" Modus benutzt wird.
+Existiert bereits eine Datei mit diesen Namen, wird sie ohne Warnung überschrieben. Wird
+FILE nicht angegeben, wird der Screenshot mit dem Standardnamen im Home Verzeichnis
+des Benutzers gespeichert.

-Screenshot [OPTION]... Erstellt einen Screenshot vom aktuellen Bildschirminhalt
 OPTION
-  -o, --options         Zeigt zuerst das Einstellungsfenster
  -m, --mouse           Nimmt den Mauszeiger mit auf
  -b, --border          Nimmt den Fensterrahmen mit auf
  -w, --window          Aufnahme des aktiven Fensters statt des gesamten Bildschirminhalts
  -d, --delay=seconds   Aufnahmeverzögerung [in Sekunden]
  -s, --silent          Macht den Screenshot, ohne das Anwendungsfenster zu öffnen
-                        hebt --options auf, speichert ein PNG ins HOME Verzeichnis
+  -f, --format=image    Legt das Bildformat fest
+                        [bmp], [gif], [jpg], [png], [ppm], [tga], [tif]
+  -c, --clipboard       Kopiert den Screenshot in die System-Ablage ohne das
+                        Anwendungsfenster zu öffnen

 Achtung: OPTION -b, --border funktioniert nur zusammen mit -w, --window</pre>

@ -90,7 +102,7 @@ Achtung: OPTION -b, --border funktioniert nur zusammen mit -w, --window</pre>
 <div class="nav">
 <div class="inner"><span>
 «  <a href="poorman.html">PoorMan</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">Anwendungen</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="showimage.html">Showimage</a>  »
 </span></div>
 </div>
--- a/userguide/de/images/apps-images/screenshot-options.png
+++ b/userguide/de/images/apps-images/screenshot-options.png
--- a/userguide/de/images/apps-images/screenshot.png
+++ b/userguide/de/images/apps-images/screenshot.png
--- a/userguide/de/keyboard-shortcuts.html
+++ b/userguide/de/keyboard-shortcuts.html
@ -77,6 +77,9 @@
 <tr><td><span class="key">STRG</span> <span class="key">ALT</span> <span class="key">F</span></td><td></td><td>Holt das aktive Fenster in den Vordergrund (nur sinnvoll mit der Mauseinstellung <a href="preferences/mouse.html">Focus Follows Mouse</a>).</td></tr>
 <tr><td><span class="key">STRG</span> <span class="key">ALT</span> <span class="key">B</span></td><td></td><td>Schickt das aktive Fenster in den Hintergrund.</td></tr>
 <tr><td><span class="key">ALT</span> <span class="key">Q</span></td><td></td><td>Beendet eine Anwendung.</td></tr>
+<tr><td><span class="key">DRUCK</span></td><td style="width:15px;"></td><td>Schießt ein Bildschirmfoto ohne Verzögerung und öffnet das  <a href="applications/screenshot.html">Screenshot</a> Fenster.</td></tr>
+<tr><td class="onelinetop"><span class="key">SHIFT</span> <span class="key">DRUCK</span></td><td></td><td>Schießt ein Bildschirmfoto "heimlich" (ohne das Screenshot Fenster zu öffnen), aber mit allen beim letzten Mal getroffenen Einstellungen.</td></tr>
+<tr><td><span class="key">STRG</span> <span class="key">DRUCK</span></td><td></td><td>Schießt auch ein "heimliches" Bildschirmfoto mit den letzten Einstellungen, speichert es jedoch nicht ab, sondern kopiert es nur in die Ablage.</td></tr>
 </table>

 <h2>
--- a/userguide/en/applications/screenshot.html
+++ b/userguide/en/applications/screenshot.html
@ -4,7 +4,7 @@
 <head>
 <!-- 
 *
- * Copyright 2009, Haiku. All rights reserved.
+ * Copyright 2009-2010, Haiku. All rights reserved.
 * Distributed under the terms of the MIT License.
 *
 * Authors:
@ -51,35 +51,47 @@
 <h2><img src="../../images/apps-images/screenshot-icon_64.png" alt="screenshot-icon_64.png" width="64" height="64" />Screenshot</h2>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
 <tr><td>Deskbar:</td><td style="width:15px;"></td><td><span class="menu">Applications</span></td></tr>
-<tr><td>Location:</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span></td></tr>
+<tr><td>Location:</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span><br />
+<span class="path">/bin/screenshot</span></td></tr>
 <tr><td>Settings:</td><td></td><td><span class="path">~/config/settings/screenshot</span></td></tr>
 </table>
 <p><br /></p>
-<p>Besides normal screenshots taken via <span class="key">PRINT</span>, which puts a PNG of the current screen into <span class="path">/boot/home/</span>, this application provides some useful options.</p>
+<p>Screenshots are taken by either starting the Screenshot application or by pressing the <span class="key">PRINT</span> key,</p>
 <p><img id="sreenshot" src="../images/apps-images/screenshot.png" alt="screenshot.png" /></p>
-<p>Starting Screenshot will take a screenshot as usual, but offers from its main window controls to set filename, format and folder before saving the image.</p>
-<p>The <span class="button">Options</span> dialog has a few more settings:</p>
-<p><img id="sreenshot-options" src="../images/apps-images/screenshot-options.png" alt="screenshot-options.png" /></p>
-<p>Besides the obvious, toggle between taking the whole screen or just the active window, including the window border and the mouse pointer, you can enter a delay before a screenshot is taken. Of course, this delay takes only effect if you take a new shot by pressing <span class="button">Take Screenshot</span>.</p>
-
+<p>In the Screenshot panel you can toggle between taking the whole screen or just the active window and decide if the window border and mouse pointer should be included. You can also enter a delay before a screenshot is taken.</p>
+<p>Below that you set the name, format and location for the screenshot that will be used when you click <span class="button">Save</span>. Instead of saving the file to disk you can also decide to <span class="button">Copy to clipboard</span> to be able to paste the shot directly into another application, or take a <span class="button">New screenshot</span>.</p>
+<p>All settings are remembered the next time you take a screenshot, enabling these convenient keyboard shortcuts:</p>
+<table summary="shortcuts" border="0" cellspacing="0" cellpadding="4">
+<tr><td><span class="key">PRINT</span></td><td style="width:15px;"></td><td>Takes a screenshot with zero delay and launches the Screenshot panel.</td></tr>
+<tr><td class="onelinetop"><span class="key">SHIFT</span> <span class="key">PRINT</span></td><td></td><td>Takes a screenshot silently (without opening the panel), while still respecting the last used settings.</td></tr>
+<tr><td><span class="key">CTRL</span> <span class="key">PRINT</span></td><td></td><td>Also takes a screenshot silently with the saved settings, but instead of saving it as a file, it's just copied to the clipboard.</td></tr>
+</table>
 <h2>
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
 Taking a screenshot from Terminal</h2>
-<p>The Screenshot application is also usable from Terminal or a script.<br />
-<span class="cli">Screenshot --help</span> shows the familiar options as parameters:</p>
+<p>There's a special <span class="cli">screenshot</span> application to be used from Terminal or a script.<br />
+<span class="cli">screenshot --help</span> shows the familiar options as parameters:</p>

-<pre class="terminal">~&gt; Screenshot --help
+<pre class="terminal">~&gt; screenshot --help

-Screenshot [OPTION]... Creates a bitmap of the current screen
+screenshot [OPTIONS] [FILE]  Creates a bitmap of the current screen

-OPTION
-  -o, --options         Show options window first
+FILE is the optional output path / filename used in silent mode. An exisiting
+file with the same name will be overwritten without warning. If FILE is not
+given the screenshot will be saved to a file with the default filename in the
+user's home directory.
+
+OPTIONS
  -m, --mouse-pointer   Include the mouse pointer
  -b, --border          Include the window border
  -w, --window          Capture the active window instead of the entire screen
-  -d, --delay=seconds   Take screenshot after specified delay [in seconds]
-  -s, --silent          Saves the screenshot without showing the app window
-                        overrides --options, saves to home folder as png
+  -d, --delay=seconds   Take screenshot after the specified delay [in seconds]
+  -s, --silent          Saves the screenshot without showing the application
+                        window
+  -f, --format=image    Give the image format you like to save as
+                        [bmp], [gif], [jpg], [png], [ppm], [tga], [tif]
+  -c, --clipboard       Copies the screenshot to the system clipboard without
+                        showing the application window

 Note: OPTION -b, --border takes only effect when used with -w, --window
 </pre>
--- a/userguide/en/images/apps-images/screenshot-options.png
+++ b/userguide/en/images/apps-images/screenshot-options.png
--- a/userguide/en/images/apps-images/screenshot.png
+++ b/userguide/en/images/apps-images/screenshot.png
--- a/userguide/en/keyboard-shortcuts.html
+++ b/userguide/en/keyboard-shortcuts.html
@ -73,6 +73,9 @@
 <tr><td><span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">F</span></td><td></td><td>Pulls the active window to the front (only applicable with the mouse setting <a href="preferences/mouse.html">Focus Follows Mouse</a>).</td></tr>
 <tr><td><span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">B</span></td><td></td><td>Sends the active window to the back. </td></tr>
 <tr><td><span class="key">ALT</span> <span class="key">Q</span></td><td></td><td>Quits an application.</td></tr>
+<tr><td><span class="key">PRINT</span></td><td style="width:15px;"></td><td>Takes a screenshot with zero delay and launches the <a href="applications/screenshot.html">Screenshot</a> panel.</td></tr>
+<tr><td class="onelinetop"><span class="key">SHIFT</span> <span class="key">PRINT</span></td><td></td><td>Takes a screenshot silently (without opening the panel), while still respecting the last used settings.</td></tr>
+<tr><td><span class="key">CTRL</span> <span class="key">PRINT</span></td><td></td><td>Also takes a screenshot silently with the saved settings, but instead of saving it as a file, it's just copied to the clipboard.</td></tr>
 </table>

 <h2>
--- a/userguide/es/applications/screenshot.html
+++ b/userguide/es/applications/screenshot.html
@ -4,7 +4,7 @@
 <head>
 <!-- 
 *
- * Copyright 2009, Haiku. All rights reserved.
+ * Copyright 2009-2010, Haiku. All rights reserved.
 * Distributed under the terms of the MIT License.
 *
 * Authors:
@ -22,7 +22,7 @@
 <body>

 <div id="banner">
-<div><span>Guía del usuario</span></div>
+<div><span>User guide</span></div>
 </div>

 <div class="nav">
@ -42,46 +42,59 @@
 </ul>
 <span>
 «  <a href="poorman.html">PoorMan</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">Aplicaciones</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="showimage.html">Showimage</a>  »
 </span></div>
 </div>

 <div id="content">
 <div>
+<div class="box-info">The translation of this page isn't yet complete. Until it is, unfinished parts use the English original.</div>

 <h2><img src="../../images/apps-images/screenshot-icon_64.png" alt="screenshot-icon_64.png" width="64" height="64" />Screenshot</h2>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
 <tr><td>Deskbar:</td><td style="width:15px;"></td><td><span class="menu">Aplicaciones</span></td></tr>
-<tr><td>Ubicación:</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span></td></tr>
+<tr><td>Ubicación:</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span><br />
+<span class="path">/bin/screenshot</span></td></tr>
 <tr><td>Configuración:</td><td></td><td><span class="path">~/config/settings/screenshot</span></td></tr>
 </table>
 <p><br /></p>
-<p>Además de las capturas de pantalla tomadas mediante la tecla <span class="key">Impr Pant</span>, que coloca un PNG de la pantalla actual dentro de <span class="path">/boot/home/</span>, esta aplicación proporciona algunas opciones útiles.</p>
+<p>Screenshots are taken by either starting the Screenshot application or by pressing the <span class="key">PRINT</span> key,</p>
 <p><img id="sreenshot" src="../images/apps-images/screenshot.png" alt="screenshot.png" /></p>
-<p>Al iniciar Screenshot se tomará una captura de pantalla como siempre, pero su ventana principal ofrece controles para selecionar el nombre de archivo, formato y carpeta dónde salvar la imagen.</p>
-<p>El diálogo <span class="button">Opciones</span> tiene unas cuantas selecciones adicionales:</p>
-<p><img id="sreenshot-options" src="../images/apps-images/screenshot-options.png" alt="screenshot-options.png" /></p>
-<p>Además de lo obvio, cambiar entre tomar toda la pantalla o sólo la ventana activa, inluyendo la ventana activa, incluir los bordes de las ventanas y el puntero del ratón, puede ingresar una demora antes que se tome la captura de pantalla. Por supuesto, esta demora sólo tiene efecto si toma una nueva captura al presionar <span class="button">Take Screenshot</span> (Tomar captura de pantalla).</p>
-
+<p>In the Screenshot panel you can toggle between taking the whole screen or just the active window and decide if the window border and mouse pointer should be included. You can also enter a delay before a screenshot is taken.</p>
+<p>Below that you set the name, format and location for the screenshot that will be used when you click <span class="button">Save</span>. Instead of saving the file to disk you can also decide to <span class="button">Copy to clipboard</span> to be able to paste the shot directly into another application, or take a <span class="button">New screenshot</span>.</p>
+<p>All settings are remembered the next time you take a screenshot, enabling these convenient keyboard shortcuts:</p>
+<table summary="shortcuts" border="0" cellspacing="0" cellpadding="4">
+<tr><td><span class="key">PRINT</span></td><td style="width:15px;"></td><td>Takes a screenshot with zero delay and launches the Screenshot panel.</td></tr>
+<tr><td class="onelinetop"><span class="key">SHIFT</span> <span class="key">PRINT</span></td><td></td><td>Takes a screenshot silently (without opening the panel), while still respecting the last used settings.</td></tr>
+<tr><td><span class="key">CTRL</span> <span class="key">PRINT</span></td><td></td><td>Also takes a screenshot silently with the saved settings, but instead of saving it as a file, it's just copied to the clipboard.</td></tr>
+</table>
 <h2>
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
 Tomar una captura de pantalla desde la Terminal</h2>
-<p>La aplicación de captura de pantalla también se puede usar desde la Terminal o un script.<br />
-<span class="cli">Screenshot --help</span> muestra las opciones familiares como parámetros:</p>
+<p>There's a special <span class="cli">screenshot</span> application to be used from Terminal or a script.<br />
+<span class="cli">screenshot --help</span> shows the familiar options as parameters:</p>

-<pre class="terminal">~&gt; Screenshot --help
+<pre class="terminal">~&gt; screenshot --help

-Screenshot [OPTION]... Creates a bitmap of the current screen
+screenshot [OPTIONS] [FILE]  Creates a bitmap of the current screen

-OPTION
-  -o, --options         Show options window first
+FILE is the optional output path / filename used in silent mode. An exisiting
+file with the same name will be overwritten without warning. If FILE is not
+given the screenshot will be saved to a file with the default filename in the
+user's home directory.
+
+OPTIONS
  -m, --mouse-pointer   Include the mouse pointer
  -b, --border          Include the window border
  -w, --window          Capture the active window instead of the entire screen
-  -d, --delay=seconds   Take screenshot after specified delay [in seconds]
-  -s, --silent          Saves the screenshot without showing the app window
-                        overrides --options, saves to home folder as png
+  -d, --delay=seconds   Take screenshot after the specified delay [in seconds]
+  -s, --silent          Saves the screenshot without showing the application
+                        window
+  -f, --format=image    Give the image format you like to save as
+                        [bmp], [gif], [jpg], [png], [ppm], [tga], [tif]
+  -c, --clipboard       Copies the screenshot to the system clipboard without
+                        showing the application window

 Note: OPTION -b, --border takes only effect when used with -w, --window
 </pre>
@ -92,7 +105,7 @@ Note: OPTION -b, --border takes only effect when used with -w, --window
 <div class="nav">
 <div class="inner"><span>
 «  <a href="poorman.html">PoorMan</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">Aplicaciones</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="showimage.html">Showimage</a>  »
 </span></div>
 </div>
--- a/userguide/es/images/apps-images/screenshot-options.png
+++ b/userguide/es/images/apps-images/screenshot-options.png
--- a/userguide/es/images/apps-images/screenshot.png
+++ b/userguide/es/images/apps-images/screenshot.png
--- a/userguide/es/keyboard-shortcuts.html
+++ b/userguide/es/keyboard-shortcuts.html
@ -22,7 +22,7 @@
 <body>

 <div id="banner">
-<div><span>Guía del usuario</span></div>
+<div><span>User guide</span></div>
 </div>

 <div class="nav">
@ -41,14 +41,15 @@
 <li><a href="../en/keyboard-shortcuts.html"><img src="../images/flags/gb.png" alt="" />English</a></li>
 </ul>
 <span>
- «  <a href="tracker-add-ons.html">Agregados de Tracker</a> 
-::  <a href="contents.html" class="uplink">Contenidos</a> 
-::  <a href="deskbar.html">Deskbar (Barra de Escritorio)</a>  »
+ «  <a href="tracker-add-ons.html">Tracker Add-Ons</a> 
+::  <a href="contents.html" class="uplink">Contents</a> 
+::  <a href="deskbar.html">Deskbar</a>  »
 </span></div>
 </div>

 <div id="content">
 <div>
+<div class="box-info">The translation of this page isn't yet complete. Until it is, unfinished parts use the English original.</div>

 <h1>Atajos y combinaciones de teclado</h1>

@ -75,6 +76,9 @@
 <tr><td><span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">F</span></td><td></td><td>Jala la ventana activa al frente (sólo aplica cuando está activa la preferencia del ratón <a href="preferences/mouse.html">El foco sigue al ratón</a>).</td></tr>
 <tr><td><span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">B</span></td><td></td><td>Envía la ventana activa al fondo.</td></tr>
 <tr><td><span class="key">ALT</span> <span class="key">Q</span></td><td></td><td>Cierra una aplicación.</td></tr>
+<tr><td><span class="key">PRINT</span></td><td style="width:15px;"></td><td>Takes a screenshot with zero delay and launches the <a href="applications/screenshot.html">Screenshot</a> panel.</td></tr>
+<tr><td class="onelinetop"><span class="key">SHIFT</span> <span class="key">PRINT</span></td><td></td><td>Takes a screenshot silently (without opening the panel), while still respecting the last used settings.</td></tr>
+<tr><td><span class="key">CTRL</span> <span class="key">PRINT</span></td><td></td><td>Also takes a screenshot silently with the saved settings, but instead of saving it as a file, it's just copied to the clipboard.</td></tr>
 </table>

 <h2>
@ -126,9 +130,9 @@ Las letras que escribió aparecen en la parte inferior izquierda, donde normalme

 <div class="nav">
 <div class="inner"><span>
- «  <a href="tracker-add-ons.html">Agregados de Tracker</a> 
-::  <a href="contents.html" class="uplink">Contenidos</a> 
-::  <a href="deskbar.html">Deskbar (Barra de Escritorio)</a>  »
+ «  <a href="tracker-add-ons.html">Tracker Add-Ons</a> 
+::  <a href="contents.html" class="uplink">Contents</a> 
+::  <a href="deskbar.html">Deskbar</a>  »
 </span></div>
 </div>

--- a/userguide/fr/applications/screenshot.html
+++ b/userguide/fr/applications/screenshot.html
@ -4,7 +4,7 @@
 <head>
 <!-- 
 *
- * Copyright 2009, Haiku. All rights reserved.
+ * Copyright 2009-2010, Haiku. All rights reserved.
 * Distributed under the terms of the MIT License.
 *
 * Authors:
@ -23,7 +23,7 @@
 <body>

 <div id="banner">
-<div><span>Guide de l’utilisateur</span></div>
+<div><span>User guide</span></div>
 </div>

 <div class="nav">
@ -50,39 +50,52 @@

 <div id="content">
 <div>
+<div class="box-info">The translation of this page isn't yet complete. Until it is, unfinished parts use the English original.</div>

 <h2><img src="../../images/apps-images/screenshot-icon_64.png" alt="screenshot-icon_64.png" width="64" height="64" />Screenshot</h2>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
 <tr><td>Deskbar :</td><td style="width:15px;"></td><td><span class="menu">Applications</span></td></tr>
-<tr><td>Localisation :</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span></td></tr>
+<tr><td>Localisation :</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span><br />
+<span class="path">/bin/screenshot</span></td></tr>
 <tr><td>Réglages :</td><td></td><td><span class="path">~/config/settings/screenshot</span></td></tr>
 </table>
 <p><br /></p>
-<p>En plus de la copie d’écran classique <i>via</i> la touche <span class="key">IMPR ÉCRAN</span>, qui crée une image PNG de l’écran dans <span class="path">/boot/home/</span>, cette application fournit quelques options supplémentaires.</p>
+<p>Vous pouvez effectuer une copie d'écran à partir de l'application Screenshot, ou en utilisant la touche <span class="key">IMPR</span>,</p>
 <p><img id="sreenshot" src="../images/apps-images/screenshot.png" alt="screenshot.png" /></p>
-<p>Démarrer Screenshot fera une capture d'écran comme d'habitude, mais vous permettra de contrôler depuis la fenêtre principale, le nom, le format et le dossier du fichier avant d'enregistrer l'image.</p>
-<p>La boite de dialogue <span class="button">Options</span> contient quelques paramètres de plus :</p>
-<p><img id="sreenshot-options" src="../images/apps-images/screenshot-options.png" alt="screenshot-options.png" /></p>
-<p>En plus de permettre le choix entre une capture de l’écran entier (<span class="menu">Capture entire screen</span>) ou de la fenêtre active (<span class="menu">Capture active window</span>), d’inclure ou non la bordure de la fenêtre dans ce second cas (<span class="menu">Include window border</span>), cette fenêtre vous permet aussi d’entrer un délai avant la capture. Bien sûr, ce délai n’est effectif que si la capture est prise en pressant le bouton <span class="button">Take Screenshot</span>.</p>
-
+<p>dans le fenêtre Screenshot, vous pouvez choisir entre de prendre tout l'écran ou seulement la fenêtre active, et de conserver la bordure de la fenêtre ainsi que le pointeur de la souris.
+vous pouvez aussi entrer un délai avant le prendre le cliché.</p>
+<p>Below that you set the name, format and location for the screenshot that will be used when you click <span class="button">Save</span>. Instead of saving the file to disk you can also decide to <span class="button">Copy to clipboard</span> to be able to paste the shot directly into another application, or take a <span class="button">New screenshot</span>.</p>
+<p>All settings are remembered the next time you take a screenshot, enabling these convenient keyboard shortcuts:</p>
+<table summary="shortcuts" border="0" cellspacing="0" cellpadding="4">
+<tr><td><span class="key">IMPR</span></td><td style="width:15px;"></td><td>Capture l'écran sans délai et affiche la fenêtre Screenshot.</td></tr>
+<tr><td class="onelinetop"><span class="key">MAJ</span> <span class="key">IMPR</span></td><td></td><td>Capture l'écran en silence (sans ouvrir de fenêtre), tout en respectant les derniers réglages utilisés.</td></tr>
+<tr><td><span class="key">CTRL</span> <span class="key">IMPR</span></td><td></td><td>Prend aussi une capture d'écran en silence avec les derniers réglages enregistrés, mais au lieu d'écrire l'image dans un fichier, celle-ci est juste copiée dans le presse-papiers.</td></tr>
+</table>
 <h2>
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>Effectuer un capture d'écran depuis le Terminal</h2>
-<p>L'application Screenshot est aussi utilisable depuis le Terminal ou depuis un script.<br />
-<span class="cli">Screenshot --help</span> 
-affiche les options en paramètres :</p>
+<p>Il existe aussi une commande <span class="cli">screenshot</span>, qui peut-être utilisée dans le Terminal ou dans un script.<br />
+<span class="cli">screenshot --help</span> affiche les options qui peuvent être passées en paramètres :</p>

-<pre class="terminal">~&gt; Screenshot --help
+<pre class="terminal">~&gt; screenshot --help

-Screenshot [OPTION]... Creates a bitmap of the current screen
+screenshot [OPTIONS] [FILE]  Creates a bitmap of the current screen

-OPTION
-  -o, --options         Show options window first
+FILE is the optional output path / filename used in silent mode. An exisiting
+file with the same name will be overwritten without warning. If FILE is not
+given the screenshot will be saved to a file with the default filename in the
+user's home directory.
+
+OPTIONS
  -m, --mouse-pointer   Include the mouse pointer
  -b, --border          Include the window border
  -w, --window          Capture the active window instead of the entire screen
-  -d, --delay=seconds   Take screenshot after specified delay [in seconds]
-  -s, --silent          Saves the screenshot without showing the app window
-                        overrides --options, saves to home folder as png
+  -d, --delay=seconds   Take screenshot after the specified delay [in seconds]
+  -s, --silent          Saves the screenshot without showing the application
+                        window
+  -f, --format=image    Give the image format you like to save as
+                        [bmp], [gif], [jpg], [png], [ppm], [tga], [tif]
+  -c, --clipboard       Copies the screenshot to the system clipboard without
+                        showing the application window

 Note: OPTION -b, --border takes only effect when used with -w, --window
 </pre>
--- a/userguide/fr/images/apps-images/screenshot-options.png
+++ b/userguide/fr/images/apps-images/screenshot-options.png
--- a/userguide/fr/keyboard-shortcuts.html
+++ b/userguide/fr/keyboard-shortcuts.html
@ -23,7 +23,7 @@
 <body>

 <div id="banner">
-<div><span>Guide de l’utilisateur</span></div>
+<div><span>User guide</span></div>
 </div>

 <div class="nav">
@ -42,8 +42,8 @@
 <li><a href="../en/keyboard-shortcuts.html"><img src="../images/flags/gb.png" alt="" />English</a></li>
 </ul>
 <span>
- «  <a href="tracker-add-ons.html">Extensions du Tracker</a> 
-::  <a href="contents.html" class="uplink">Sommaire</a> 
+ «  <a href="tracker-add-ons.html">Tracker Add-Ons</a> 
+::  <a href="contents.html" class="uplink">Contents</a> 
 ::  <a href="deskbar.html">Deskbar</a>  »
 </span></div>
 </div>
@ -76,6 +76,9 @@
 <tr><td><span class="key">CTRL</span> <span class="key">CMD</span> <span class="key">F</span></td><td></td><td>Place la fenêtre active (qui a le focus) au premier plan (utilisable uniquement avec l’option « <a href="preferences/mouse.html">Focus Follows Mouse</a> »).</td></tr>
 <tr><td><span class="key">CTRL</span> <span class="key">CMD</span> <span class="key">B</span></td><td></td><td>Envoie la fenêtre active en arrière-plan.</td></tr>
 <tr><td><span class="key">CMD</span> <span class="key">Q</span></td><td></td><td>Quitte une application.</td></tr>
+<tr><td><span class="key">IMPR</span></td><td style="width:15px;"></td><td>Capture l'écran sans aucun délai, et affiche la fenêtre <a href="applications/screenshot.html">Screenshot</a>.</td></tr>
+<tr><td class="onelinetop"><span class="key">MAJ</span> <span class="key">IMPR</span></td><td></td><td>Capture l'écran en silence (sans ouvrir de fenêtre), tout en respectant les derniers réglages utilisés.</td></tr>
+<tr><td><span class="key">CTRL</span> <span class="key">IMPR</span></td><td></td><td>Prend aussi une capture d'écran en silence avec les derniers réglages enregistrés, mais au lieu d'écrire l'image dans un fichier, celle-ci est juste copiée dans le presse-papiers.</td></tr>
 </table>

 <h2>
@ -127,8 +130,8 @@ Les lettres que vous tapez apparaîtront en bas à gauche de la fenêtre, là ou

 <div class="nav">
 <div class="inner"><span>
- «  <a href="tracker-add-ons.html">Extensions du Tracker</a> 
-::  <a href="contents.html" class="uplink">Sommaire</a> 
+ «  <a href="tracker-add-ons.html">Tracker Add-Ons</a> 
+::  <a href="contents.html" class="uplink">Contents</a> 
 ::  <a href="deskbar.html">Deskbar</a>  »
 </span></div>
 </div>
--- a/userguide/it/applications/screenshot.html
+++ b/userguide/it/applications/screenshot.html
@ -4,7 +4,7 @@
 <head>
 <!-- 
 *
- * Copyright 2009, Haiku. All rights reserved.
+ * Copyright 2009-2010, Haiku. All rights reserved.
 * Distributed under the terms of the MIT License.
 *
 * Authors:
@ -20,7 +20,7 @@
 <body>

 <div id="banner">
-<div><span>Guida dell'utente</span></div>
+<div><span>User guide</span></div>
 </div>

 <div class="nav">
@ -47,40 +47,52 @@

 <div id="content">
 <div>
-<div class="box-info">La traduzione di questa pagina non è stata completata. Per questo motivo le parti non tradotte sono visibili in inglese.</div>
+<div class="box-info">The translation of this page isn't yet complete. Until it is, unfinished parts use the English original.</div>

 <h2><img src="../../images/apps-images/screenshot-icon_64.png" alt="screenshot-icon_64.png" width="64" height="64" />Screenshot</h2>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
 <tr><td>Deskbar:</td><td style="width:15px;"></td><td><span class="menu">Applications</span></td></tr>
-<tr><td>Posizione:</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span></td></tr>
+<tr><td>Posizione:</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span><br />
+<span class="path">/bin/screenshot</span></td></tr>
 <tr><td>Impostazioni:</td><td></td><td><span class="path">~/config/settings/screenshot</span></td></tr>
 </table>
 <p><br /></p>
-<p>Besides normal screenshots taken via <span class="key">PRINT</span>, which puts a PNG of the current screen into <span class="path">/boot/home/</span>, this application provides some useful options.</p>
+<p>Screenshots are taken by either starting the Screenshot application or by pressing the <span class="key">PRINT</span> key,</p>
 <p><img id="sreenshot" src="../images/apps-images/screenshot.png" alt="screenshot.png" /></p>
-<p>Starting Screenshot will take a screenshot as usual, but offers from its main window controls to set filename, format and folder before saving the image.</p>
-<p>The <span class="button">Options</span> dialog has a few more settings:</p>
-<p><img id="sreenshot-options" src="../images/apps-images/screenshot-options.png" alt="screenshot-options.png" /></p>
-<p>Besides the obvious, toggle between taking the whole screen or just the active window, including the window border and the mouse pointer, you can enter a delay before a screenshot is taken. Of course, this delay takes only effect if you take a new shot by pressing <span class="button">Take Screenshot</span>.</p>
-
+<p>In the Screenshot panel you can toggle between taking the whole screen or just the active window and decide if the window border and mouse pointer should be included. You can also enter a delay before a screenshot is taken.</p>
+<p>Below that you set the name, format and location for the screenshot that will be used when you click <span class="button">Save</span>. Instead of saving the file to disk you can also decide to <span class="button">Copy to clipboard</span> to be able to paste the shot directly into another application, or take a <span class="button">New screenshot</span>.</p>
+<p>All settings are remembered the next time you take a screenshot, enabling these convenient keyboard shortcuts:</p>
+<table summary="shortcuts" border="0" cellspacing="0" cellpadding="4">
+<tr><td><span class="key">PRINT</span></td><td style="width:15px;"></td><td>Takes a screenshot with zero delay and launches the Screenshot panel.</td></tr>
+<tr><td class="onelinetop"><span class="key">SHIFT</span> <span class="key">PRINT</span></td><td></td><td>Takes a screenshot silently (without opening the panel), while still respecting the last used settings.</td></tr>
+<tr><td><span class="key">CTRL</span> <span class="key">PRINT</span></td><td></td><td>Also takes a screenshot silently with the saved settings, but instead of saving it as a file, it's just copied to the clipboard.</td></tr>
+</table>
 <h2>
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
 Taking a screenshot from Terminal</h2>
-<p>The Screenshot application is also usable from Terminal or a script.<br />
-<span class="cli">Screenshot --help</span> shows the familiar options as parameters:</p>
+<p>There's a special <span class="cli">screenshot</span> application to be used from Terminal or a script.<br />
+<span class="cli">screenshot --help</span> shows the familiar options as parameters:</p>

-<pre class="terminal">~&gt; Screenshot --help
+<pre class="terminal">~&gt; screenshot --help

-Screenshot [OPTION]... Creates a bitmap of the current screen
+screenshot [OPTIONS] [FILE]  Creates a bitmap of the current screen

-OPTION
-  -o, --options         Show options window first
+FILE is the optional output path / filename used in silent mode. An exisiting
+file with the same name will be overwritten without warning. If FILE is not
+given the screenshot will be saved to a file with the default filename in the
+user's home directory.
+
+OPTIONS
  -m, --mouse-pointer   Include the mouse pointer
  -b, --border          Include the window border
  -w, --window          Capture the active window instead of the entire screen
-  -d, --delay=seconds   Take screenshot after specified delay [in seconds]
-  -s, --silent          Saves the screenshot without showing the app window
-                        overrides --options, saves to home folder as png
+  -d, --delay=seconds   Take screenshot after the specified delay [in seconds]
+  -s, --silent          Saves the screenshot without showing the application
+                        window
+  -f, --format=image    Give the image format you like to save as
+                        [bmp], [gif], [jpg], [png], [ppm], [tga], [tif]
+  -c, --clipboard       Copies the screenshot to the system clipboard without
+                        showing the application window

 Note: OPTION -b, --border takes only effect when used with -w, --window
 </pre>
--- a/userguide/it/images/apps-images/screenshot-options.png
+++ b/userguide/it/images/apps-images/screenshot-options.png
--- a/userguide/it/images/apps-images/screenshot.png
+++ b/userguide/it/images/apps-images/screenshot.png
--- a/userguide/it/keyboard-shortcuts.html
+++ b/userguide/it/keyboard-shortcuts.html
@ -20,7 +20,7 @@
 <body>

 <div id="banner">
-<div><span>Guida dell'utente</span></div>
+<div><span>User guide</span></div>
 </div>

 <div class="nav">
@ -40,14 +40,14 @@
 </ul>
 <span>
 «  <a href="tracker-add-ons.html">Tracker Add-Ons</a> 
-::  <a href="contents.html" class="uplink">Contenuti</a> 
+::  <a href="contents.html" class="uplink">Contents</a> 
 ::  <a href="deskbar.html">Deskbar</a>  »
 </span></div>
 </div>

 <div id="content">
 <div>
-<div class="box-info">La traduzione di questa pagina non è stata completata. Per questo motivo le parti non tradotte sono visibili in inglese.</div>
+<div class="box-info">The translation of this page isn't yet complete. Until it is, unfinished parts use the English original.</div>

 <h1>Shortcuts and key combinations</h1>

@ -74,6 +74,9 @@
 <tr><td><span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">F</span></td><td></td><td>Pulls the active window to the front (only applicable with the mouse setting <a href="preferences/mouse.html">Focus Follows Mouse</a>).</td></tr>
 <tr><td><span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">B</span></td><td></td><td>Sends the active window to the back. </td></tr>
 <tr><td><span class="key">ALT</span> <span class="key">Q</span></td><td></td><td>Quits an application.</td></tr>
+<tr><td><span class="key">PRINT</span></td><td style="width:15px;"></td><td>Takes a screenshot with zero delay and launches the <a href="applications/screenshot.html">Screenshot</a> panel.</td></tr>
+<tr><td class="onelinetop"><span class="key">SHIFT</span> <span class="key">PRINT</span></td><td></td><td>Takes a screenshot silently (without opening the panel), while still respecting the last used settings.</td></tr>
+<tr><td><span class="key">CTRL</span> <span class="key">PRINT</span></td><td></td><td>Also takes a screenshot silently with the saved settings, but instead of saving it as a file, it's just copied to the clipboard.</td></tr>
 </table>

 <h2>
@ -127,7 +130,7 @@ The letters you type appear at the bottom-left, where normally the number of ite
 <div class="nav">
 <div class="inner"><span>
 «  <a href="tracker-add-ons.html">Tracker Add-Ons</a> 
-::  <a href="contents.html" class="uplink">Contenuti</a> 
+::  <a href="contents.html" class="uplink">Contents</a> 
 ::  <a href="deskbar.html">Deskbar</a>  »
 </span></div>
 </div>
--- a/userguide/jp/applications/screenshot.html
+++ b/userguide/jp/applications/screenshot.html
@ -4,7 +4,7 @@
 <head>
 <!-- 
 *
- * Copyright 2009, Haiku. All rights reserved.
+ * Copyright 2009-2010, Haiku. All rights reserved.
 * Distributed under the terms of the MIT License.
 *
 * Authors:
@ -40,7 +40,7 @@
 </ul>
 <span>
 «  <a href="poorman.html">PoorMan</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">アプリケーション</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="showimage.html">Showimage</a>  »
 </span></div>
 </div>
@ -52,35 +52,47 @@
 <h2><img src="../../images/apps-images/screenshot-icon_64.png" alt="screenshot-icon_64.png" width="64" height="64" />Screenshot</h2>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
 <tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">Applications</span></td></tr>
-<tr><td>場所:</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span></td></tr>
+<tr><td>場所:</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span><br />
+<span class="path">/bin/screenshot</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/screenshot</span></td></tr>
 </table>
 <p><br /></p>
-<p>Besides normal screenshots taken via <span class="key">PRINT</span>, which puts a PNG of the current screen into <span class="path">/boot/home/</span>, this application provides some useful options.</p>
+<p>Screenshots are taken by either starting the Screenshot application or by pressing the <span class="key">PRINT</span> key,</p>
 <p><img id="sreenshot" src="../images/apps-images/screenshot.png" alt="screenshot.png" /></p>
-<p>Starting Screenshot will take a screenshot as usual, but offers from its main window controls to set filename, format and folder before saving the image.</p>
-<p>The <span class="button">Options</span> dialog has a few more settings:</p>
-<p><img id="sreenshot-options" src="../images/apps-images/screenshot-options.png" alt="screenshot-options.png" /></p>
-<p>Besides the obvious, toggle between taking the whole screen or just the active window, including the window border and the mouse pointer, you can enter a delay before a screenshot is taken. Of course, this delay takes only effect if you take a new shot by pressing <span class="button">Take Screenshot</span>.</p>
-
+<p>In the Screenshot panel you can toggle between taking the whole screen or just the active window and decide if the window border and mouse pointer should be included. You can also enter a delay before a screenshot is taken.</p>
+<p>Below that you set the name, format and location for the screenshot that will be used when you click <span class="button">Save</span>. Instead of saving the file to disk you can also decide to <span class="button">Copy to clipboard</span> to be able to paste the shot directly into another application, or take a <span class="button">New screenshot</span>.</p>
+<p>All settings are remembered the next time you take a screenshot, enabling these convenient keyboard shortcuts:</p>
+<table summary="shortcuts" border="0" cellspacing="0" cellpadding="4">
+<tr><td><span class="key">PRINT</span></td><td style="width:15px;"></td><td>Takes a screenshot with zero delay and launches the Screenshot panel.</td></tr>
+<tr><td class="onelinetop"><span class="key">SHIFT</span> <span class="key">PRINT</span></td><td></td><td>Takes a screenshot silently (without opening the panel), while still respecting the last used settings.</td></tr>
+<tr><td><span class="key">CTRL</span> <span class="key">PRINT</span></td><td></td><td>Also takes a screenshot silently with the saved settings, but instead of saving it as a file, it's just copied to the clipboard.</td></tr>
+</table>
 <h2>
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
 Taking a screenshot from Terminal</h2>
-<p>The Screenshot application is also usable from Terminal or a script.<br />
-<span class="cli">Screenshot --help</span> shows the familiar options as parameters:</p>
+<p>There's a special <span class="cli">screenshot</span> application to be used from Terminal or a script.<br />
+<span class="cli">screenshot --help</span> shows the familiar options as parameters:</p>

-<pre class="terminal">~&gt; Screenshot --help
+<pre class="terminal">~&gt; screenshot --help

-Screenshot [OPTION]... Creates a bitmap of the current screen
+screenshot [OPTIONS] [FILE]  Creates a bitmap of the current screen

-OPTION
-  -o, --options         Show options window first
+FILE is the optional output path / filename used in silent mode. An exisiting
+file with the same name will be overwritten without warning. If FILE is not
+given the screenshot will be saved to a file with the default filename in the
+user's home directory.
+
+OPTIONS
  -m, --mouse-pointer   Include the mouse pointer
  -b, --border          Include the window border
  -w, --window          Capture the active window instead of the entire screen
-  -d, --delay=seconds   Take screenshot after specified delay [in seconds]
-  -s, --silent          Saves the screenshot without showing the app window
-                        overrides --options, saves to home folder as png
+  -d, --delay=seconds   Take screenshot after the specified delay [in seconds]
+  -s, --silent          Saves the screenshot without showing the application
+                        window
+  -f, --format=image    Give the image format you like to save as
+                        [bmp], [gif], [jpg], [png], [ppm], [tga], [tif]
+  -c, --clipboard       Copies the screenshot to the system clipboard without
+                        showing the application window

 Note: OPTION -b, --border takes only effect when used with -w, --window
 </pre>
@ -91,7 +103,7 @@ Note: OPTION -b, --border takes only effect when used with -w, --window
 <div class="nav">
 <div class="inner"><span>
 «  <a href="poorman.html">PoorMan</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">アプリケーション</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="showimage.html">Showimage</a>  »
 </span></div>
 </div>
--- a/userguide/jp/images/apps-images/screenshot-options.png
+++ b/userguide/jp/images/apps-images/screenshot-options.png
--- a/userguide/jp/images/apps-images/screenshot.png
+++ b/userguide/jp/images/apps-images/screenshot.png
--- a/userguide/jp/keyboard-shortcuts.html
+++ b/userguide/jp/keyboard-shortcuts.html
@ -74,6 +74,9 @@
 <tr><td><span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">F</span></td><td></td><td>Pulls the active window to the front (only applicable with the mouse setting <a href="preferences/mouse.html">Focus Follows Mouse</a>).</td></tr>
 <tr><td><span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">B</span></td><td></td><td>Sends the active window to the back. </td></tr>
 <tr><td><span class="key">ALT</span> <span class="key">Q</span></td><td></td><td>Quits an application.</td></tr>
+<tr><td><span class="key">PRINT</span></td><td style="width:15px;"></td><td>Takes a screenshot with zero delay and launches the <a href="applications/screenshot.html">Screenshot</a> panel.</td></tr>
+<tr><td class="onelinetop"><span class="key">SHIFT</span> <span class="key">PRINT</span></td><td></td><td>Takes a screenshot silently (without opening the panel), while still respecting the last used settings.</td></tr>
+<tr><td><span class="key">CTRL</span> <span class="key">PRINT</span></td><td></td><td>Also takes a screenshot silently with the saved settings, but instead of saving it as a file, it's just copied to the clipboard.</td></tr>
 </table>

 <h2>
--- a/userguide/pt_PT/applications/codycam.html
+++ b/userguide/pt_PT/applications/codycam.html
@ -9,6 +9,8 @@
 *
 * Authors:
 *		Humdinger <humdingerb@gmail.com>
+ * Translators:
+ *		Vasco Costa
 *
 -->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
@ -47,7 +49,6 @@

 <div id="content">
 <div>
-<div class="box-info">The translation of this page isn't yet complete. Until it is, unfinished parts use the English original.</div>

 <h2><img src="../../images/apps-images/codycam-icon_64.png" alt="codycam-icon_64.png" width="64" height="64" />CodyCam</h2>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
@ -56,10 +57,10 @@
 <tr><td>Definições:</td><td></td><td><span class="path">~/config/settings/codycam</span></td></tr>
 </table>
 <p><br /></p>
-<p>With CodyCam you take pictures at a specified interval from a connected webcam or any other video-in device and save it via FTP.</p>
+<p>Com a aplicação CodyCam pode tirar fotografias com intervalos regulares a partir de uma câmara web ou qualquer outro dispositivo de entrada de video e guardar via FTP.</p>
 <img src="../images/apps-images/codycam.png" alt="My very temporarily installed cam in Dartmoor National Park." />
-<p>To the left under the preview, you set the filename that'll be suffixed with an increasing number for every picture taken. Beneath that you decide on the file format and the rate the pictures are taken.</p>
-<p>To the right you choose either FTP or sFTP (if SSH is available) and enter the needed data to save the images on a server.</p>
+<p>À esquerda por baixo da pré-visualização, define o nome do ficheiro ao qual será acrescentado um sufixo numérico que aumenta a cada fotografia tirada. Em baixo escolhe o formato do ficheiro e a cadência com que as fotografias são tiradas.</p>
+<p>À direita pode optar por FTP ou sFTP (caso esteja disponível SSH) e introduzir os dados necessários para guardar as imagens num servidor.</p>

 </div>
 </div>
--- a/userguide/pt_PT/applications/installer.html
+++ b/userguide/pt_PT/applications/installer.html
@ -53,7 +53,7 @@
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
 <tr><td>Deskbar:</td><td style="width:15px;"></td><td><span class="menu">Applications</span></td></tr>
 <tr><td>Localização:</td><td></td><td><span class="path">/boot/system/apps/Installer</span></td></tr>
-<tr><td>Definições:</td><td></td><td><i>none</i></td></tr>
+<tr><td>Definições:</td><td></td><td><i>nenhuma</i></td></tr>
 </table>
 <p><br /></p>
 <p>The Installer is used to copy Haiku onto another volume.<br />
--- a/userguide/pt_PT/applications/mail.html
+++ b/userguide/pt_PT/applications/mail.html
@ -57,7 +57,7 @@
 <tr><td>Definições:</td><td></td><td><span class="path">~/config/settings/Mail/BeMail Settings</span></td></tr>
 </table>
 <p><br /></p>
-<p>Ainda não há documentação. Se estiver interessado em contribuir, por favor informe na <a href="http://www.freelists.org/list/haiku-doc">lista de correio da Documentação</a> a fim de evitar duplicação.</p>
+<p>Ainda não há documentação. Se deseja contribuir, por favor anuncie-o na <a href="http://www.freelists.org/list/haiku-doc">lista de correio de Documentação</a> para evitar duplicação.</p>

 </div>
 </div>
--- a/userguide/pt_PT/applications/mediaplayer.html
+++ b/userguide/pt_PT/applications/mediaplayer.html
@ -57,7 +57,7 @@
 <tr><td>Definições:</td><td></td><td><span class="path">~/config/settings/MediaPlayer</span></td></tr>
 </table>
 <p><br /></p>
-<p>Ainda não há documentação. Se estiver interessado em contribuir, por favor informe na <a href="http://www.freelists.org/list/haiku-doc">lista de correio da Documentação</a> a fim de evitar duplicação.</p>
+<p>Ainda não há documentação. Se deseja contribuir, por favor anuncie-o na <a href="http://www.freelists.org/list/haiku-doc">lista de correio de Documentação</a> para evitar duplicação.</p>

 </div>
 </div>
--- a/userguide/pt_PT/applications/midiplayer.html
+++ b/userguide/pt_PT/applications/midiplayer.html
@ -57,7 +57,7 @@
 <tr><td>Definições:</td><td></td><td><span class="path">~/config/settings/MidiPlayerSettings</span></td></tr>
 </table>
 <p><br /></p>
-<p>Ainda não há documentação. Se estiver interessado em contribuir, por favor informe na <a href="http://www.freelists.org/list/haiku-doc">lista de correio da Documentação</a> a fim de evitar duplicação.</p>
+<p>Ainda não há documentação. Se deseja contribuir, por favor anuncie-o na <a href="http://www.freelists.org/list/haiku-doc">lista de correio de Documentação</a> para evitar duplicação.</p>

 </div>
 </div>
--- a/userguide/pt_PT/applications/packageinstaller.html
+++ b/userguide/pt_PT/applications/packageinstaller.html
@ -49,17 +49,15 @@

 <div id="content">
 <div>
-<div class="box-info">The translation of this page isn't yet complete. Until it is, unfinished parts use the English original.</div>

 <h2><img src="../../images/apps-images/packageinstaller-icon_64.png" alt="packageinstaller-icon_64.png" width="64" height="64" />PackageInstaller</h2>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbar:</td><td style="width:15px;"></td><td><i>No entry, normally launched via
-double-clicking a supported file.</i></td></tr>
+<tr><td>Deskbar:</td><td style="width:15px;"></td><td><i>Sem entrada, normalmente iniciado fazendo duplo clique num ficheiro suportado.</i></td></tr>
 <tr><td>Localização:</td><td></td><td><span class="path">/boot/system/apps/PackageInstaller</span></td></tr>
-<tr><td>Definições:</td><td></td><td><i>none</i></td></tr>
+<tr><td>Definições:</td><td></td><td><i>nenhuma</i></td></tr>
 </table>
 <p><br /></p>
-<p>Ainda não há documentação. Se estiver interessado em contribuir, por favor informe na <a href="http://www.freelists.org/list/haiku-doc">lista de correio da Documentação</a> a fim de evitar duplicação.</p>
+<p>Ainda não há documentação. Se deseja contribuir, por favor anuncie-o na <a href="http://www.freelists.org/list/haiku-doc">lista de correio de Documentação</a> para evitar duplicação.</p>

 </div>
 </div>
--- a/userguide/pt_PT/applications/screenshot.html
+++ b/userguide/pt_PT/applications/screenshot.html
@ -4,7 +4,7 @@
 <head>
 <!-- 
 *
- * Copyright 2009, Haiku. All rights reserved.
+ * Copyright 2009-2010, Haiku. All rights reserved.
 * Distributed under the terms of the MIT License.
 *
 * Authors:
@ -52,35 +52,47 @@
 <h2><img src="../../images/apps-images/screenshot-icon_64.png" alt="screenshot-icon_64.png" width="64" height="64" />Screenshot</h2>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
 <tr><td>Deskbar:</td><td style="width:15px;"></td><td><span class="menu">Applications</span></td></tr>
-<tr><td>Localização:</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span></td></tr>
+<tr><td>Localização:</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span><br />
+<span class="path">/bin/screenshot</span></td></tr>
 <tr><td>Definições:</td><td></td><td><span class="path">~/config/settings/screenshot</span></td></tr>
 </table>
 <p><br /></p>
-<p>Besides normal screenshots taken via <span class="key">PRINT</span>, which puts a PNG of the current screen into <span class="path">/boot/home/</span>, this application provides some useful options.</p>
+<p>Screenshots are taken by either starting the Screenshot application or by pressing the <span class="key">PRINT</span> key,</p>
 <p><img id="sreenshot" src="../images/apps-images/screenshot.png" alt="screenshot.png" /></p>
-<p>Starting Screenshot will take a screenshot as usual, but offers from its main window controls to set filename, format and folder before saving the image.</p>
-<p>The <span class="button">Options</span> dialog has a few more settings:</p>
-<p><img id="sreenshot-options" src="../images/apps-images/screenshot-options.png" alt="screenshot-options.png" /></p>
-<p>Besides the obvious, toggle between taking the whole screen or just the active window, including the window border and the mouse pointer, you can enter a delay before a screenshot is taken. Of course, this delay takes only effect if you take a new shot by pressing <span class="button">Take Screenshot</span>.</p>
-
+<p>In the Screenshot panel you can toggle between taking the whole screen or just the active window and decide if the window border and mouse pointer should be included. You can also enter a delay before a screenshot is taken.</p>
+<p>Below that you set the name, format and location for the screenshot that will be used when you click <span class="button">Save</span>. Instead of saving the file to disk you can also decide to <span class="button">Copy to clipboard</span> to be able to paste the shot directly into another application, or take a <span class="button">New screenshot</span>.</p>
+<p>All settings are remembered the next time you take a screenshot, enabling these convenient keyboard shortcuts:</p>
+<table summary="shortcuts" border="0" cellspacing="0" cellpadding="4">
+<tr><td><span class="key">PRINT</span></td><td style="width:15px;"></td><td>Takes a screenshot with zero delay and launches the Screenshot panel.</td></tr>
+<tr><td class="onelinetop"><span class="key">SHIFT</span> <span class="key">PRINT</span></td><td></td><td>Takes a screenshot silently (without opening the panel), while still respecting the last used settings.</td></tr>
+<tr><td><span class="key">CTRL</span> <span class="key">PRINT</span></td><td></td><td>Also takes a screenshot silently with the saved settings, but instead of saving it as a file, it's just copied to the clipboard.</td></tr>
+</table>
 <h2>
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
 Taking a screenshot from Terminal</h2>
-<p>The Screenshot application is also usable from Terminal or a script.<br />
-<span class="cli">Screenshot --help</span> shows the familiar options as parameters:</p>
+<p>There's a special <span class="cli">screenshot</span> application to be used from Terminal or a script.<br />
+<span class="cli">screenshot --help</span> shows the familiar options as parameters:</p>

-<pre class="terminal">~&gt; Screenshot --help
+<pre class="terminal">~&gt; screenshot --help

-Screenshot [OPTION]... Creates a bitmap of the current screen
+screenshot [OPTIONS] [FILE]  Creates a bitmap of the current screen

-OPTION
-  -o, --options         Show options window first
+FILE is the optional output path / filename used in silent mode. An exisiting
+file with the same name will be overwritten without warning. If FILE is not
+given the screenshot will be saved to a file with the default filename in the
+user's home directory.
+
+OPTIONS
  -m, --mouse-pointer   Include the mouse pointer
  -b, --border          Include the window border
  -w, --window          Capture the active window instead of the entire screen
-  -d, --delay=seconds   Take screenshot after specified delay [in seconds]
-  -s, --silent          Saves the screenshot without showing the app window
-                        overrides --options, saves to home folder as png
+  -d, --delay=seconds   Take screenshot after the specified delay [in seconds]
+  -s, --silent          Saves the screenshot without showing the application
+                        window
+  -f, --format=image    Give the image format you like to save as
+                        [bmp], [gif], [jpg], [png], [ppm], [tga], [tif]
+  -c, --clipboard       Copies the screenshot to the system clipboard without
+                        showing the application window

 Note: OPTION -b, --border takes only effect when used with -w, --window
 </pre>
--- a/userguide/pt_PT/applications/showimage.html
+++ b/userguide/pt_PT/applications/showimage.html
@ -51,13 +51,12 @@

 <h2><img src="../../images/apps-images/showimage-icon_64.png" alt="showimage-icon_64.png" width="64" height="64" />ShowImage</h2>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbar:</td><td style="width:15px;"></td><td><i>No entry, normally launched via
-double-clicking a supported file.</i></td></tr>
+<tr><td>Deskbar:</td><td style="width:15px;"></td><td><i>Sem entrada, normalmente iniciado fazendo duplo clique num ficheiro suportado.</i></td></tr>
 <tr><td>Localização:</td><td></td><td><span class="path">/boot/system/apps/ShowImage</span></td></tr>
 <tr><td>Definições:</td><td></td><td><span class="path">~/config/settings/ShowImage_settings</span></td></tr>
 </table>
 <p><br /></p>
-<p>Ainda não há documentação. Se estiver interessado em contribuir, por favor informe na <a href="http://www.freelists.org/list/haiku-doc">lista de correio da Documentação</a> a fim de evitar duplicação.</p>
+<p>Ainda não há documentação. Se deseja contribuir, por favor anuncie-o na <a href="http://www.freelists.org/list/haiku-doc">lista de correio de Documentação</a> para evitar duplicação.</p>

 </div>
 </div>
--- a/userguide/pt_PT/applications/soundrecorder.html
+++ b/userguide/pt_PT/applications/soundrecorder.html
@ -57,7 +57,7 @@
 <tr><td>Definições:</td><td></td><td><span class="path">~/config/settings/???</span></td></tr>
 </table>
 <p><br /></p>
-<p>Ainda não há documentação. Se estiver interessado em contribuir, por favor informe na <a href="http://www.freelists.org/list/haiku-doc">lista de correio da Documentação</a> a fim de evitar duplicação.</p>
+<p>Ainda não há documentação. Se deseja contribuir, por favor anuncie-o na <a href="http://www.freelists.org/list/haiku-doc">lista de correio de Documentação</a> para evitar duplicação.</p>

 </div>
 </div>
--- a/userguide/pt_PT/applications/stylededit.html
+++ b/userguide/pt_PT/applications/stylededit.html
@ -53,7 +53,7 @@
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
 <tr><td>Deskbar:</td><td style="width:15px;"></td><td><span class="menu">Applications</span></td></tr>
 <tr><td>Localização:</td><td></td><td><span class="path">/boot/system/apps/StyledEdit</span></td></tr>
-<tr><td>Definições:</td><td></td><td><i>none</i></td></tr>
+<tr><td>Definições:</td><td></td><td><i>nenhuma</i></td></tr>
 </table>
 <p><br /></p>
 <p>StyledEdit is Haiku's simple text editor. Although it saves files in plain text format, additional attributes are written in order to have limited formatting capabilities when viewed with StyledEdit.</p>
--- a/userguide/pt_PT/applications/textsearch.html
+++ b/userguide/pt_PT/applications/textsearch.html
@ -56,7 +56,7 @@
 <tr><td>Definições:</td><td></td><td><span class="path">~/config/settings/TextSearch</span></td></tr>
 </table>
 <p><br /></p>
-<p>Ainda não há documentação. Se estiver interessado em contribuir, por favor informe na <a href="http://www.freelists.org/list/haiku-doc">lista de correio da Documentação</a> a fim de evitar duplicação.</p>
+<p>Ainda não há documentação. Se deseja contribuir, por favor anuncie-o na <a href="http://www.freelists.org/list/haiku-doc">lista de correio de Documentação</a> para evitar duplicação.</p>

 </div>
 </div>
--- a/userguide/pt_PT/applications/tv.html
+++ b/userguide/pt_PT/applications/tv.html
@ -57,7 +57,7 @@
 <tr><td>Definições:</td><td></td><td><span class="path">~/config/settings/???</span></td></tr>
 </table>
 <p><br /></p>
-<p>Ainda não há documentação. Se estiver interessado em contribuir, por favor informe na <a href="http://www.freelists.org/list/haiku-doc">lista de correio da Documentação</a> a fim de evitar duplicação.</p>
+<p>Ainda não há documentação. Se deseja contribuir, por favor anuncie-o na <a href="http://www.freelists.org/list/haiku-doc">lista de correio de Documentação</a> para evitar duplicação.</p>

 </div>
 </div>
--- a/userguide/pt_PT/contents.html
+++ b/userguide/pt_PT/contents.html
@ -9,12 +9,14 @@
 *
 * Authors:
 *		Humdinger <humdingerb@gmail.com>
+ * Translators:
+ *		Vasco Costa
 *
 -->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<meta http-equiv="Content-Style-Type" content="text/css" />
 	<meta name="robots" content="all" />
-	<title>Haiku User Guide - Contents</title>
+	<title>Guia do Utilizador do Haiku - Conteúdos</title>
 	<link rel="stylesheet" type="text/css" href="../Haiku-doc.css" />
 </head>
 <body>
@ -45,11 +47,10 @@

 <div id="content">
 <div>
-<div class="box-info">The translation of this page isn't yet complete. Until it is, unfinished parts use the English original.</div>

-<h1>Welcome to the Haiku User Guide</h1>
+<h1>Bem-vindo ao Guia do Utilizador do Haiku</h1>

-<p>Below, you'll find the documentation of the most important aspects of Haiku. Naturally, completing and extending the documentation is a continuing process (see the <a href="http://www.haiku-os.org/docs/userguide/en/contents.html">online version</a> for updated pages and translations). If you find errors, would like to suggest topics or maybe even contribute yourself, please get in touch on the <a href="http://www.freelists.org/list/haiku-doc">documentation mailing list</a>. If you're interested in helping with translations, you'll find information on that at the <a href="http://dev.haiku-os.org/wiki/i18n/UserGuide">i18n user guide wiki</a>.</p>
+<p>Em baixo, encontra documentação acerca dos aspectos mais importantes do Haiku. Naturalmente, completar e expandir a documentação é um processo contínuo (veja a <a href="http://www.haiku-os.org/docs/userguide/en/contents.html">versão online</a> para obter páginas e traduções actualizadas). Se encontrar erros, desejar sugerir temas ou até mesmo contribuir, por favor contacte-nos através da <a href="http://www.freelists.org/list/haiku-doc">lista de correio da documentção</a>. Se estiver interessado em ajudar nas traduções, encontrará informação relevante na <a href="http://dev.haiku-os.org/wiki/i18n/UserGuide">wiki do Guia do Utilizador i18n</a>.</p>
 <p><br /></p>
 <table summary="contents" border="1" rules="rows" frame="void" cellpadding="10" cellspacing="0" style="border: dotted thin #e0e0e0">
 <!-- Excluded until it's further fleshed out
@ -62,90 +63,90 @@
 		<li><a href="installation.html#transfer-data">Transfering data to/from a Haiku installation</a></li></ul></td>
 		<td valign="top">Step by step guides covering Haiku installation during the (pre-) alpha release phase.</td></tr>
 -->
-	<tr><td valign="top"><a href="bootloader.html">Boot Loader</a></td>
-		<td valign="top">Set safe boot options to solve configuration problems.</td></tr>
-	<tr><td valign="top"><a href="filesystem-layout.html">Filesystem layout</a><ul>
-		<li><a href="filesystem-layout.html#system">The system folder</a></li>
-		<li><a href="filesystem-layout.html#common">The common folder</a></li>
-		<li><a href="filesystem-layout.html#home">The home folder</a></li></ul></td>
-		<td valign="top">Understand the filesystem hierarchy and get familiar with important file locations and folders.</td></tr>
-	<tr><td valign="top"><a href="gui.html">Haiku's GUI</a><ul>
-		<li><a href="gui.html#open-save-panel">Open and save panels</a><br />
-		<a href="gui.html#open-save-shortcuts">- Keyboard shortcuts</a><br />
-		<a href="gui.html#favorites-recent">- Favorites and recent folders</a></li>
+	<tr><td valign="top"><a href="bootloader.html">Carregador de Arranque</a></td>
+		<td valign="top">Defina opções de arranque seguras para resolver problemas de configuração.</td></tr>
+	<tr><td valign="top"><a href="filesystem-layout.html">Estrutura do sistema de ficheiros</a><ul>
+		<li><a href="filesystem-layout.html#system">A pasta system</a></li>
+		<li><a href="filesystem-layout.html#common">A pasta common</a></li>
+		<li><a href="filesystem-layout.html#home">A pasta home</a></li></ul></td>
+		<td valign="top">Compreenda a hierarquia do sistema de ficheiros e conheça as localizações de ficheiros e pastas importantes.</td></tr>
+	<tr><td valign="top"><a href="gui.html">A interface gráfica do Haiku</a><ul>
+		<li><a href="gui.html#open-save-panel">Abrir e guardar paineis</a><br />
+		<a href="gui.html#open-save-shortcuts">- Atalhos</a><br />
+		<a href="gui.html#favorites-recent">- Favoritos e pasta mais usadas</a></li>
 		<li><a href="gui.html#replicants">Replicants</a></li></ul></td>
-		<td valign="top">Learn about the basic elements of the graphical user interface.</td></tr>
-	<tr><td valign="top"><a href="workspaces.html">Workspaces</a><ul>
-		<li><a href="workspaces.html#applet">The Workspaces Applet</a></li>
-		<li><a href="workspaces.html#switching">Switching workspaces</a></li>
-		<li><a href="workspaces.html#moving">Moving windows between workspaces</a></li>
-		<li><a href="workspaces.html#special">Special functionality</a></li></ul></td>
-		<td valign="top">Use virtual desktops for an uncluttered work environment.</td></tr>
+		<td valign="top">Aprenda sobre os elementos básicos da interface gráfica.</td></tr>
+	<tr><td valign="top"><a href="workspaces.html">Áreas de Trabalho</a><ul>
+		<li><a href="workspaces.html#applet">A Miniaplicação Workspaces</a></li>
+		<li><a href="workspaces.html#switching">Alternar entre áreas de trabalho</a></li>
+		<li><a href="workspaces.html#moving">Mover janelas entre áreas de trabalho</a></li>
+		<li><a href="workspaces.html#special">Funcionalidades especiais</a></li></ul></td>
+		<td valign="top">Utilize ambientes de trabalho virtuais para manter a organização.</td></tr>
 	<tr><td valign="top"><a href="twitcher.html">Twitcher</a></td>
-		<td valign="top">Switch between running applications.</td></tr>
+		<td valign="top">Alterne entre aplicações em execução.</td></tr>
 	<tr><td valign="top"><a href="teammonitor.html">Team Monitor</a></td>
-		<td valign="top">Kill unresponsive applications or system components.</td></tr>
+		<td valign="top">Termine aplicações ou componentes do sistema que deixaram de responder.</td></tr>
 	<tr><td valign="top"><a href="tracker.html">Tracker</a><ul>
-		<li><a href="tracker.html#mounting-volumes">Mounting volumes</a></li>
-		<li><a href="tracker.html#navigating">Navigating</a></li>
-		<li><a href="tracker.html#appearance">Appearance</a></li>
-		<li><a href="tracker.html#tracker-preferences">Tracker preferences</a></li>
-		<li><a href="tracker.html#working-with-files">Working with files</a></li>
-		<li><a href="tracker.html#transaction-status">Transaction status</a></li>
-		<li><a href="tracker-add-ons.html">Tracker Add-Ons</a></li></ul></td>
-		<td valign="top">Learn all about navigating, working with files and folders and how to configure Haiku's file manager.</td></tr>
-	<tr><td valign="top"><a href="keyboard-shortcuts.html">Shortcuts and key combinations</a><ul>
-		<li><a href="keyboard-shortcuts.html#general">General shortcuts</a></li>
-		<li><a href="keyboard-shortcuts.html#tracker-navigation">Shortcuts for Tracker navigation</a></li>
-		<li><a href="keyboard-shortcuts.html#terminal">Shortcuts in Terminal</a></li>
-		<li><a href="keyboard-shortcuts.html#other-combos">Other key combinations</a></li></ul></td>
-		<td valign="top">The most common shortcuts to speed up your workflow.</td></tr>
+		<li><a href="tracker.html#mounting-volumes">Montar volumes</a></li>
+		<li><a href="tracker.html#navigating">Navegação</a></li>
+		<li><a href="tracker.html#appearance">Aparência</a></li>
+		<li><a href="tracker.html#tracker-preferences">Preferências do Tracker</a></li>
+		<li><a href="tracker.html#working-with-files">Trabalhar com ficheiros</a></li>
+		<li><a href="tracker.html#transaction-status">Estado da transação</a></li>
+		<li><a href="tracker-add-ons.html">Extensões do Tracker</a></li></ul></td>
+		<td valign="top">Aprenda tudo sobre navegação, trabalhar com ficheiros e pastas e como configurar o gestor de ficheiros do Haiku.</td></tr>
+	<tr><td valign="top"><a href="keyboard-shortcuts.html">Atalhos e combinações de teclas</a><ul>
+		<li><a href="keyboard-shortcuts.html#general">Atalhos gerais</a></li>
+		<li><a href="keyboard-shortcuts.html#tracker-navigation">Atalhos de navegação do Tracker</a></li>
+		<li><a href="keyboard-shortcuts.html#terminal">Atalhos no Terminal</a></li>
+		<li><a href="keyboard-shortcuts.html#other-combos">Outras combinações de teclas</a></li></ul></td>
+		<td valign="top">Os atalhos mais comuns para agilizar o seu fluxo de trabalho.</td></tr>
 	<tr><td valign="top"><a href="deskbar.html">Deskbar</a><ul>
-		<li><a href="deskbar.html#deskbar-menu">The Deskbar Menu</a></li>
-		<li><a href="deskbar.html#tray">The Tray</a></li>
-		<li><a href="deskbar.html#list-of-apps">The list of running programs</a></li></ul></td>
-		<td valign="top">Use and configure Haiku's version of the "Start" menu and taskbar.</td></tr>
-	<tr><td valign="top"><a href="filetypes.html">Filetypes</a><ul>
-		<li><a href="filetypes.html#filetype">The File Type</a></li>
-		<li><a href="filetypes.html#preferred-app">The Preferred Application</a></li>
-		<li><a href="filetypes.html#icon">The Icon</a></li>
-		<li><a href="filetypes.html#settings-apps">Special settings for applications</a></li>
-		<li><a href="filetypes.html#filetypes-preferences">Global settings with the Filetypes Preferences</a></li></ul></td>
-		<td valign="top">Set default applications, change file types and create your own.</td></tr>
-	<tr><td valign="top"><a href="attributes.html">Attributes</a><ul>
-		<li><a href="attributes.html#attributes-tracker">Attributes in Tracker</a></li>
-		<li><a href="attributes.html#attributes-terminal">Attributes in Terminal</a></li></ul></td>
-		<td valign="top">One of Haiku's main features lets you manage and add any kind of data to any file.</td></tr>		
-	<tr><td valign="top"><a href="index.html">Index</a></td>
-		<td>Use indexing to be able to search for attributes.</td></tr>
-	<tr><td valign="top"><a href="queries.html">Queries</a><ul>
-		<li><a href="queries.html#find-window">The Find window</a></li>
-		<li><a href="queries.html#basic-query">Basic queries - "by Name"</a></li>
-		<li><a href="queries.html#adv-query">Advanced queries - "by Attribute"</a></li>
-		<li><a href="queries.html#more-adv-query">Even more advanced queries - "by Formula"</a></li>
-		<li><a href="queries.html#result-window">The result window</a></li>
-		<li><a href="queries.html#query-template">Query Templates</a></li>
+		<li><a href="deskbar.html#deskbar-menu">O Menu da Deskbar</a></li>
+		<li><a href="deskbar.html#tray">O Tabuleiro</a></li>
+		<li><a href="deskbar.html#list-of-apps">A lista de programas em execução</a></li></ul></td>
+		<td valign="top">Utilize e configure o equivalente do Haiku ao menu "Iniciar" e barra de tarefas.</td></tr>
+	<tr><td valign="top"><a href="filetypes.html">Tipos de Ficheiros</a><ul>
+		<li><a href="filetypes.html#filetype">O Tipo de Ficheiro</a></li>
+		<li><a href="filetypes.html#preferred-app">A Aplicação Preferida</a></li>
+		<li><a href="filetypes.html#icon">O Ícone</a></li>
+		<li><a href="filetypes.html#settings-apps">Definições especiais para aplicações</a></li>
+		<li><a href="filetypes.html#filetypes-preferences">Definições globais com as Preferências dos Tipos de Ficheiros</a></li></ul></td>
+		<td valign="top">Defina as aplicações predefinidas, altere os tipos de ficheiro e crie os seus próprios tipos de ficheiro.</td></tr>
+	<tr><td valign="top"><a href="attributes.html">Atributos</a><ul>
+		<li><a href="attributes.html#attributes-tracker">Atributos no Tracker</a></li>
+		<li><a href="attributes.html#attributes-terminal">Atributos no Terminal</a></li></ul></td>
+		<td valign="top">Uma das funcionalidades principais do Haiku deixa-o gerir e adicionar qualquer tipo de dados a qualquer ficheiro.</td></tr>		
+	<tr><td valign="top"><a href="index.html">Indexação</a></td>
+		<td>Utilize a indexação de forma a poder procurar por atributos.</td></tr>
+	<tr><td valign="top"><a href="queries.html">Consultas</a><ul>
+		<li><a href="queries.html#find-window">A janela de pesquisa</a></li>
+		<li><a href="queries.html#basic-query">Consultas básicas - "por nome"</a></li>
+		<li><a href="queries.html#adv-query">Consultas avançadas - "por atributo"</a></li>
+		<li><a href="queries.html#more-adv-query">Consultas ainda mais avançadas - "por fórmula"</a></li>
+		<li><a href="queries.html#result-window">A janela de resultados</a></li>
+		<li><a href="queries.html#query-template">Modelos de consulta</a></li>
 </ul></td>
-		<td valign="top">Use Haiku's lightning fast queries to quickly find what you're looking for.</td></tr>
-	<tr><td valign="top"><a href="workshop-filetypes+attributes.html">Workshop: Filetypes, Attributes, Index and Queries</a></td>
-		<td valign="top">Learn to use some of Haiku's key features by organizing your DVDs.</td></tr>
-	<tr><td valign="top"><a href="applications.html">Applications</a><ul>
-		<li><a href="applications.html#install">Installing applications</a></li>
-		<li><a href="applications.html#uninstall">Uninstalling applications</a></li>
-		<li><a href="applications.html#list-of-apps">Haiku's applications</a></li>
-		<li><a href="applications.html#cli-apps">Haiku's commandline applications</a></li>
-		<li><a href="applications.html#list-of-bundled-apps">Bundled applications</a></li></ul></td>
-		<td>Learn how to un/install applications in general and how work with the ones that come with Haiku.</td></tr>
-	<tr><td valign="top"><a href="desktop-applets.html">Desktop Applets</a></td>
-		<td>Simple tools to install on your Desktop and Deskbar.</td></tr>
-	<tr><td valign="top"><a href="preferences.html">Preferences</a></td>
-		<td>Configuring and setting up your system.</td></tr>
+		<td valign="top">Utilize as consultas ultra-rápidas do Haiku para rapidamente encontrar o que procura.</td></tr>
+	<tr><td valign="top"><a href="workshop-filetypes+attributes.html">Workshop: Tipos de ficheiro, Atributos, Indexação e Consultas</a></td>
+		<td valign="top">Aprenda a utilizar algumas das funcionalidades principais do Haiku organizando os seus DVDs.</td></tr>
+	<tr><td valign="top"><a href="applications.html">Aplicações</a><ul>
+		<li><a href="applications.html#install">Instalar aplicações</a></li>
+		<li><a href="applications.html#uninstall">Desinstalar aplicações</a></li>
+		<li><a href="applications.html#list-of-apps">Aplicações do Haiku</a></li>
+		<li><a href="applications.html#cli-apps">Aplicações da linha de comandos do Haiku</a></li>
+		<li><a href="applications.html#list-of-bundled-apps">Aplicações adicionais</a></li></ul></td>
+		<td>Aprenda como instalar/desinstalar aplicações e como trabalhar com aquelas que vêm instaladas com o Haiku.</td></tr>
+	<tr><td valign="top"><a href="desktop-applets.html">Miniaplicações do Ambiente de Trabalho</a></td>
+		<td>Ferramentas simples para instalar no seu Ambiente de Trabalho e Deskbar.</td></tr>
+	<tr><td valign="top"><a href="preferences.html">Preferências</a></td>
+		<td>Configure o sistema.</td></tr>
 <!--
 	<tr><td valign="top"><a href="demos.html">Demos</a></td>
 		<td>Games and demo applications.</td></tr>
 -->
-	<tr><td valign="top"><a href="bash-scripting.html">Bash and Scripting</a></td>
-		<td>Learn of some interesting scripts used by the system and about online resources for working in the shell and scripting.</td></tr>
+	<tr><td valign="top"><a href="bash-scripting.html">Bash e Scripting</a></td>
+		<td>Descubra alguns scripts interessantes utilizados pelo sistema e recursos online para trabalhar com a shell e scripting.</td></tr>
 </table>

 </div>
--- a/userguide/pt_PT/desktop-applets/networkstatus.html
+++ b/userguide/pt_PT/desktop-applets/networkstatus.html
@ -54,9 +54,9 @@
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
 <tr><td>Deskbar:</td><td style="width:15px;"></td><td><span class="menu">Desktop Applets</span></td></tr>
 <tr><td>Localização:</td><td></td><td><span class="path">/boot/system/apps/NetworkStatus</span></td></tr>
-<tr><td>Definições:</td><td></td><td><i>none</i></td></tr>
+<tr><td>Definições:</td><td></td><td><i>nenhuma</i></td></tr>
 </table>
-<p>Ainda não há documentação. Se estiver interessado em contribuir, por favor informe na <a href="http://www.freelists.org/list/haiku-doc">lista de correio da Documentação</a> a fim de evitar duplicação.</p>
+<p>Ainda não há documentação. Se deseja contribuir, por favor anuncie-o na <a href="http://www.freelists.org/list/haiku-doc">lista de correio de Documentação</a> para evitar duplicação.</p>

 </div>
 </div>
--- a/userguide/pt_PT/desktop-applets/processcontroller.html
+++ b/userguide/pt_PT/desktop-applets/processcontroller.html
@ -54,9 +54,9 @@
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
 <tr><td>Deskbar:</td><td style="width:15px;"></td><td><span class="menu">Desktop Applets</span></td></tr>
 <tr><td>Localização:</td><td></td><td><span class="path">/boot/system/apps/ProcessController</span></td></tr>
-<tr><td>Definições:</td><td></td><td><i>none</i></td></tr>
+<tr><td>Definições:</td><td></td><td><i>nenhuma</i></td></tr>
 </table>
-<p>Ainda não há documentação. Se estiver interessado em contribuir, por favor informe na <a href="http://www.freelists.org/list/haiku-doc">lista de correio da Documentação</a> a fim de evitar duplicação.</p>
+<p>Ainda não há documentação. Se deseja contribuir, por favor anuncie-o na <a href="http://www.freelists.org/list/haiku-doc">lista de correio de Documentação</a> para evitar duplicação.</p>
 </div>
 </div>

--- a/userguide/pt_PT/images/apps-images/screenshot-options.png
+++ b/userguide/pt_PT/images/apps-images/screenshot-options.png
--- a/userguide/pt_PT/images/apps-images/screenshot.png
+++ b/userguide/pt_PT/images/apps-images/screenshot.png
--- a/userguide/pt_PT/keyboard-shortcuts.html
+++ b/userguide/pt_PT/keyboard-shortcuts.html
@ -74,6 +74,9 @@
 <tr><td><span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">F</span></td><td></td><td>Pulls the active window to the front (only applicable with the mouse setting <a href="preferences/mouse.html">Focus Follows Mouse</a>).</td></tr>
 <tr><td><span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">B</span></td><td></td><td>Sends the active window to the back. </td></tr>
 <tr><td><span class="key">ALT</span> <span class="key">Q</span></td><td></td><td>Quits an application.</td></tr>
+<tr><td><span class="key">PRINT</span></td><td style="width:15px;"></td><td>Takes a screenshot with zero delay and launches the <a href="applications/screenshot.html">Screenshot</a> panel.</td></tr>
+<tr><td class="onelinetop"><span class="key">SHIFT</span> <span class="key">PRINT</span></td><td></td><td>Takes a screenshot silently (without opening the panel), while still respecting the last used settings.</td></tr>
+<tr><td><span class="key">CTRL</span> <span class="key">PRINT</span></td><td></td><td>Also takes a screenshot silently with the saved settings, but instead of saving it as a file, it's just copied to the clipboard.</td></tr>
 </table>

 <h2>
--- a/userguide/pt_PT/preferences/locale.html
+++ b/userguide/pt_PT/preferences/locale.html
@ -60,7 +60,7 @@
 <tr><td>Definições:</td><td></td><td><span class="path">~/config/settings/Locale settings</span></td></tr>
 </table>
 <p><br /></p>
-<p>Ainda não há documentação. Se estiver interessado em contribuir, por favor informe na <a href="http://www.freelists.org/list/haiku-doc">lista de correio da Documentação</a> a fim de evitar duplicação.</p>
+<p>Ainda não há documentação. Se deseja contribuir, por favor anuncie-o na <a href="http://www.freelists.org/list/haiku-doc">lista de correio de Documentação</a> para evitar duplicação.</p>

 </div>
 </div>
--- a/userguide/pt_PT/preferences/media.html
+++ b/userguide/pt_PT/preferences/media.html
@ -58,7 +58,7 @@
 <span class="path">~/config/settings/System Audio Mixer</span><br />
 <span class="path">~/config/settings/MediaPrefs Settings</span> - Stores the panel's window position.</td></tr>
 </table>
-<p>Ainda não há documentação. Se estiver interessado em contribuir, por favor informe na <a href="http://www.freelists.org/list/haiku-doc">lista de correio da Documentação</a> a fim de evitar duplicação.</p>
+<p>Ainda não há documentação. Se deseja contribuir, por favor anuncie-o na <a href="http://www.freelists.org/list/haiku-doc">lista de correio de Documentação</a> para evitar duplicação.</p>

 </div>
 </div>
--- a/userguide/pt_PT/preferences/network.html
+++ b/userguide/pt_PT/preferences/network.html
@ -49,7 +49,6 @@

 <div id="content">
 <div>
-<div class="box-info">The translation of this page isn't yet complete. Until it is, unfinished parts use the English original.</div>

 <h2><img src="../../images/prefs-images/network-icon_64.png" alt="network-icon_64.png" width="64" height="64" />Network</h2>
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
@ -59,11 +58,11 @@
 </table>
 <p><br /></p>
 <img src="../images/prefs-images/network.png" alt="network.png" />
-<p>At the top, you choose which network adapter to configure.</p>
-<p>Then you specify if you get your network automatically (via <acronym title="Dynamic Host Configuration Protocol">DHCP</acronym>) or if you're using static addresses. If it's the latter, you'll have to fill out IP Address, Netmask, Gateway and DNS Servers yourself. Otherwise the panel will show the addresses currently set with DHCP.</p>
+<p>Na parte superior, selecciona a placa de rede que vai configurar.</p>
+<p>Em seguida especifica se obtém os parâmetros de rede automaticamente (via <acronym title="Dynamic Host Configuration Protocol">DHCP</acronym>) ou se utiliza endereços estáticos. Caso utilize endereços estáticos, há que preencher os campos IP Address, Netmask, Gateway e DNS Servers manualmente. Caso contrário o painel mostra os endereços obtidos via DHCP.</p>
 <table summary="layout" border="0" cellpadding="2" cellspacing="0">
-<tr><td><span class="button">Revert</span></td><td> </td><td>brings back the settings that were active when you started the Network preferences.</td></tr>
-<tr><td><span class="button">Apply</span></td><td> </td><td>sets the entered configuration.</td></tr>
+<tr><td><span class="button">Revert</span></td><td> </td><td>reverte as definições que estavam activas quando iniciou as preferências de rede.</td></tr>
+<tr><td><span class="button">Apply</span></td><td> </td><td>aplica a configuração introduzida.</td></tr>
 </table>

 </div>
--- a/userguide/pt_PT/preferences/printers.html
+++ b/userguide/pt_PT/preferences/printers.html
@ -56,7 +56,7 @@
 <tr><td>Localização:</td><td></td><td><span class="path">/boot/system/preferences/Printers</span></td></tr>
 <tr><td>Definições:</td><td></td><td><span class="path">~/config/settings/printers/*</span></td></tr>
 </table>
-<p>Ainda não há documentação. Se estiver interessado em contribuir, por favor informe na <a href="http://www.freelists.org/list/haiku-doc">lista de correio da Documentação</a> a fim de evitar duplicação.</p>
+<p>Ainda não há documentação. Se deseja contribuir, por favor anuncie-o na <a href="http://www.freelists.org/list/haiku-doc">lista de correio de Documentação</a> para evitar duplicação.</p>

 </div>
 </div>
--- a/userguide/ru/applications/screenshot.html
+++ b/userguide/ru/applications/screenshot.html
@ -4,7 +4,7 @@
 <head>
 <!-- 
 *
- * Copyright 2009, Haiku. All rights reserved.
+ * Copyright 2009-2010, Haiku. All rights reserved.
 * Distributed under the terms of the MIT License.
 *
 * Authors:
@ -22,7 +22,7 @@
 <body>

 <div id="banner">
-<div><span>Руководство пользователя</span></div>
+<div><span>User guide</span></div>
 </div>

 <div class="nav">
@ -42,47 +42,61 @@
 </ul>
 <span>
 «  <a href="poorman.html">PoorMan</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">Приложения</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="showimage.html">Showimage</a>  »
 </span></div>
 </div>

 <div id="content">
 <div>
+<div class="box-info">The translation of this page isn't yet complete. Until it is, unfinished parts use the English original.</div>

 <h2><img src="../../images/apps-images/screenshot-icon_64.png" alt="screenshot-icon_64.png" width="64" height="64" />Screenshot</h2>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
 <tr><td>Расположение в Deskbar:</td><td style="width:15px;"></td><td><span class="menu">Приложения (Applications)</span></td></tr>
-<tr><td>Расположение в Tracker:</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span></td></tr>
+<tr><td>Расположение в Tracker:</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span><br />
+<span class="path">/bin/screenshot</span></td></tr>
 <tr><td>Настройки хранятся по адресу:</td><td></td><td><span class="path">~/config/settings/screenshot</span></td></tr>
 </table>
 <p><br /></p>
-<p>Помимо получения обычных скриншотов через клавишу <span class="key">Print Screen</span>, которая помещает изображение текущего экрана в PNG формате в папку <span class="path">/boot/home</span>, это приложение содержит и ряд других полезных настроек.</p>
+<p>Screenshots are taken by either starting the Screenshot application or by pressing the <span class="key">PRINT</span> key,</p>
 <p><img id="sreenshot" src="../images/apps-images/screenshot.png" alt="screenshot.png" /></p>
-<p>Запуск приложения Screenshot приведёт к снятию обычного скриншота, а также предоставит возможность настроить в своём окне имя сохраняемого файла, формат изображения и место сохранения.</p>
-<p>В диалоговом окне <span class="button">Опции (Options)</span> присутствует несколько параметров:</p>
-<p><img id="sreenshot-options" src="../images/apps-images/screenshot-options.png" alt="screenshot-options.png" /></p>
-<p>Помимо очевидных опций - захвата всего экрана (<span class="menu">Capture entire screen</span>), либо только активного окна (<span class="menu">Capture active window</span>), включая его грани (<span class="menu">Include window border</span>) и курсор мыши (<span class="menu">Include mouse pointer</span>),  также имеется возможность ввести задержку перед снятием скриншота. Эта задержка будет задействована, только если вы снимаете новый скриншот, нажимая кнопку <span class="button">Take Screenshot</span>.</p>
-
+<p>In the Screenshot panel you can toggle between taking the whole screen or just the active window and decide if the window border and mouse pointer should be included. You can also enter a delay before a screenshot is taken.</p>
+<p>Below that you set the name, format and location for the screenshot that will be used when you click <span class="button">Save</span>. Instead of saving the file to disk you can also decide to <span class="button">Copy to clipboard</span> to be able to paste the shot directly into another application, or take a <span class="button">New screenshot</span>.</p>
+<p>All settings are remembered the next time you take a screenshot, enabling these convenient keyboard shortcuts:</p>
+<table summary="shortcuts" border="0" cellspacing="0" cellpadding="4">
+<tr><td><span class="key">PRINT</span></td><td style="width:15px;"></td><td>Takes a screenshot with zero delay and launches the Screenshot panel.</td></tr>
+<tr><td class="onelinetop"><span class="key">SHIFT</span> <span class="key">PRINT</span></td><td></td><td>Takes a screenshot silently (without opening the panel), while still respecting the last used settings.</td></tr>
+<tr><td><span class="key">CTRL</span> <span class="key">PRINT</span></td><td></td><td>Also takes a screenshot silently with the saved settings, but instead of saving it as a file, it's just copied to the clipboard.</td></tr>
+</table>
 <h2>
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
 Снятие скриншота из Terminal</h2>
-<p>Приложение Screenshot также можно использовать из Terminal или через скрипт.<br />
-<span class="cli">Screenshot --help</span> выведет справку о доступных параметрах:</p>
+<p>There's a special <span class="cli">screenshot</span> application to be used from Terminal or a script.<br />
+<span class="cli">screenshot --help</span> shows the familiar options as parameters:</p>

-<pre class="terminal">~&gt; Screenshot --help
+<pre class="terminal">~&gt; screenshot --help

-Screenshot [OPTION]... Создает изображение текущего экрана.
+screenshot [OPTIONS] [FILE]  Creates a bitmap of the current screen

-Опция:
-  -o, --options         При запуске сразу откроется окно параметров
-  -m, --mouse-pointer   Включает в снимок курсор мыши
-  -b, --border          Включает в снимок грани окна
-  -w, --window          Делает снимок только активного окна, а не всего экрана
-  -d, --delay=seconds   Делает скриншот с указанной задержкой  [в секундах]
-  -s, --silent          Сохраняет скриншот, игнорируя настройки, выставленные в окне параметров и сохраняет его в домашнюю папку в PNG формате.
+FILE is the optional output path / filename used in silent mode. An exisiting
+file with the same name will be overwritten without warning. If FILE is not
+given the screenshot will be saved to a file with the default filename in the
+user's home directory.

-Примечание: Опция -b, --border сработает только совместно с опцией -w, --window
+OPTIONS
+  -m, --mouse-pointer   Include the mouse pointer
+  -b, --border          Include the window border
+  -w, --window          Capture the active window instead of the entire screen
+  -d, --delay=seconds   Take screenshot after the specified delay [in seconds]
+  -s, --silent          Saves the screenshot without showing the application
+                        window
+  -f, --format=image    Give the image format you like to save as
+                        [bmp], [gif], [jpg], [png], [ppm], [tga], [tif]
+  -c, --clipboard       Copies the screenshot to the system clipboard without
+                        showing the application window
+
+Note: OPTION -b, --border takes only effect when used with -w, --window
 </pre>

 </div>
@ -91,7 +105,7 @@ Screenshot [OPTION]... Создает изображение текущего э
 <div class="nav">
 <div class="inner"><span>
 «  <a href="poorman.html">PoorMan</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">Приложения</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="showimage.html">Showimage</a>  »
 </span></div>
 </div>
--- a/userguide/ru/applications/terminal.html
+++ b/userguide/ru/applications/terminal.html
@ -25,7 +25,7 @@
 <body>

 <div id="banner">
-<div><span>Руководство пользователя</span></div>
+<div><span>User guide</span></div>
 </div>

 <div class="nav">
@ -45,7 +45,7 @@
 </ul>
 <span>
 «  <a href="stylededit.html">StyledEdit</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">Приложения</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="textsearch.html">TextSearch</a>  »
 </span></div>
 </div>
@ -63,7 +63,7 @@
 </table>
 <p><br /></p>
 <p>Terminal - интерфейс Haiku к командной оболочке bash (Bourne Again Shell)</p>
-<p>Пожалуйста обратитесь к странице <a href="../bash-scripting.html">Scripting</a> для просмотра ссылок на онлайн уроки по работе с командной оболочкой shel, а также обратитесь к теме <a href="cli-apps.html">Haiku-приложения для командной строки</a>. Здесь же мы сконцентрируемся непосредственно на приложении Terminal.</p>
+<p>Пожалуйста обратитесь к странице <a href="../bash-scripting.html">Scripting</a> для просмотра ссылок на онлайн уроки по работе с командной оболочкой shell, а также обратитесь к теме <a href="cli-apps.html">Haiku-приложения для командной строки</a>. Здесь же мы сконцентрируемся непосредственно на приложении Terminal.</p>

 <h3>
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
@ -123,7 +123,7 @@
 <div class="nav">
 <div class="inner"><span>
 «  <a href="stylededit.html">StyledEdit</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">Приложения</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="textsearch.html">TextSearch</a>  »
 </span></div>
 </div>
--- a/userguide/ru/images/apps-images/screenshot-options.png
+++ b/userguide/ru/images/apps-images/screenshot-options.png
--- a/userguide/ru/images/apps-images/screenshot.png
+++ b/userguide/ru/images/apps-images/screenshot.png
--- a/userguide/ru/keyboard-shortcuts.html
+++ b/userguide/ru/keyboard-shortcuts.html
@ -23,7 +23,7 @@
 <body>

 <div id="banner">
-<div><span>Руководство пользователя</span></div>
+<div><span>User guide</span></div>
 </div>

 <div class="nav">
@ -42,14 +42,15 @@
 <li><a href="../en/keyboard-shortcuts.html"><img src="../images/flags/gb.png" alt="" />English</a></li>
 </ul>
 <span>
- «  <a href="tracker-add-ons.html">Дополнения для Tracker (Tracker add-ons)</a> 
-::  <a href="contents.html" class="uplink">Содержание</a> 
+ «  <a href="tracker-add-ons.html">Tracker Add-Ons</a> 
+::  <a href="contents.html" class="uplink">Contents</a> 
 ::  <a href="deskbar.html">Deskbar</a>  »
 </span></div>
 </div>

 <div id="content">
 <div>
+<div class="box-info">The translation of this page isn't yet complete. Until it is, unfinished parts use the English original.</div>

 <h1>Горячие клавиши</h1>

@ -76,6 +77,9 @@
 <tr><td><span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">F</span></td><td></td><td>Поднять активное окно на передний план (работает только при включенной опции  <a href="preferences/mouse.html">фокус следует за мышью </a>).</td></tr>
 <tr><td><span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">B</span></td><td></td><td>Отправить активное окно на задний план.</td></tr>
 <tr><td><span class="key">ALT</span> <span class="key">Q</span></td><td></td><td>Закрыть активное приложение.</td></tr>
+<tr><td><span class="key">PRINT</span></td><td style="width:15px;"></td><td>Takes a screenshot with zero delay and launches the <a href="applications/screenshot.html">Screenshot</a> panel.</td></tr>
+<tr><td class="onelinetop"><span class="key">SHIFT</span> <span class="key">PRINT</span></td><td></td><td>Takes a screenshot silently (without opening the panel), while still respecting the last used settings.</td></tr>
+<tr><td><span class="key">CTRL</span> <span class="key">PRINT</span></td><td></td><td>Also takes a screenshot silently with the saved settings, but instead of saving it as a file, it's just copied to the clipboard.</td></tr>
 </table>

 <h2>
@ -128,8 +132,8 @@

 <div class="nav">
 <div class="inner"><span>
- «  <a href="tracker-add-ons.html">Дополнения для Tracker (Tracker add-ons)</a> 
-::  <a href="contents.html" class="uplink">Содержание</a> 
+ «  <a href="tracker-add-ons.html">Tracker Add-Ons</a> 
+::  <a href="contents.html" class="uplink">Contents</a> 
 ::  <a href="deskbar.html">Deskbar</a>  »
 </span></div>
 </div>
--- a/userguide/sv_SE/applications/screenshot.html
+++ b/userguide/sv_SE/applications/screenshot.html
@ -4,7 +4,7 @@
 <head>
 <!-- 
 *
- * Copyright 2009, Haiku. All rights reserved.
+ * Copyright 2009-2010, Haiku. All rights reserved.
 * Distributed under the terms of the MIT License.
 *
 * Authors:
@ -40,7 +40,7 @@
 </ul>
 <span>
 «  <a href="poorman.html">PoorMan</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">Applikationer</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="showimage.html">Showimage</a>  »
 </span></div>
 </div>
@ -52,35 +52,47 @@
 <h2><img src="../../images/apps-images/screenshot-icon_64.png" alt="screenshot-icon_64.png" width="64" height="64" />Screenshot</h2>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
 <tr><td>Deskbar:</td><td style="width:15px;"></td><td><span class="menu">Applications</span></td></tr>
-<tr><td>Plats:</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span></td></tr>
+<tr><td>Plats:</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span><br />
+<span class="path">/bin/screenshot</span></td></tr>
 <tr><td>Inställningar:</td><td></td><td><span class="path">~/config/settings/screenshot</span></td></tr>
 </table>
 <p><br /></p>
-<p>Besides normal screenshots taken via <span class="key">PRINT</span>, which puts a PNG of the current screen into <span class="path">/boot/home/</span>, this application provides some useful options.</p>
+<p>Screenshots are taken by either starting the Screenshot application or by pressing the <span class="key">PRINT</span> key,</p>
 <p><img id="sreenshot" src="../images/apps-images/screenshot.png" alt="screenshot.png" /></p>
-<p>Starting Screenshot will take a screenshot as usual, but offers from its main window controls to set filename, format and folder before saving the image.</p>
-<p>The <span class="button">Options</span> dialog has a few more settings:</p>
-<p><img id="sreenshot-options" src="../images/apps-images/screenshot-options.png" alt="screenshot-options.png" /></p>
-<p>Besides the obvious, toggle between taking the whole screen or just the active window, including the window border and the mouse pointer, you can enter a delay before a screenshot is taken. Of course, this delay takes only effect if you take a new shot by pressing <span class="button">Take Screenshot</span>.</p>
-
+<p>In the Screenshot panel you can toggle between taking the whole screen or just the active window and decide if the window border and mouse pointer should be included. You can also enter a delay before a screenshot is taken.</p>
+<p>Below that you set the name, format and location for the screenshot that will be used when you click <span class="button">Save</span>. Instead of saving the file to disk you can also decide to <span class="button">Copy to clipboard</span> to be able to paste the shot directly into another application, or take a <span class="button">New screenshot</span>.</p>
+<p>All settings are remembered the next time you take a screenshot, enabling these convenient keyboard shortcuts:</p>
+<table summary="shortcuts" border="0" cellspacing="0" cellpadding="4">
+<tr><td><span class="key">PRINT</span></td><td style="width:15px;"></td><td>Takes a screenshot with zero delay and launches the Screenshot panel.</td></tr>
+<tr><td class="onelinetop"><span class="key">SHIFT</span> <span class="key">PRINT</span></td><td></td><td>Takes a screenshot silently (without opening the panel), while still respecting the last used settings.</td></tr>
+<tr><td><span class="key">CTRL</span> <span class="key">PRINT</span></td><td></td><td>Also takes a screenshot silently with the saved settings, but instead of saving it as a file, it's just copied to the clipboard.</td></tr>
+</table>
 <h2>
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
 Taking a screenshot from Terminal</h2>
-<p>The Screenshot application is also usable from Terminal or a script.<br />
-<span class="cli">Screenshot --help</span> shows the familiar options as parameters:</p>
+<p>There's a special <span class="cli">screenshot</span> application to be used from Terminal or a script.<br />
+<span class="cli">screenshot --help</span> shows the familiar options as parameters:</p>

-<pre class="terminal">~&gt; Screenshot --help
+<pre class="terminal">~&gt; screenshot --help

-Screenshot [OPTION]... Creates a bitmap of the current screen
+screenshot [OPTIONS] [FILE]  Creates a bitmap of the current screen

-OPTION
-  -o, --options         Show options window first
+FILE is the optional output path / filename used in silent mode. An exisiting
+file with the same name will be overwritten without warning. If FILE is not
+given the screenshot will be saved to a file with the default filename in the
+user's home directory.
+
+OPTIONS
  -m, --mouse-pointer   Include the mouse pointer
  -b, --border          Include the window border
  -w, --window          Capture the active window instead of the entire screen
-  -d, --delay=seconds   Take screenshot after specified delay [in seconds]
-  -s, --silent          Saves the screenshot without showing the app window
-                        overrides --options, saves to home folder as png
+  -d, --delay=seconds   Take screenshot after the specified delay [in seconds]
+  -s, --silent          Saves the screenshot without showing the application
+                        window
+  -f, --format=image    Give the image format you like to save as
+                        [bmp], [gif], [jpg], [png], [ppm], [tga], [tif]
+  -c, --clipboard       Copies the screenshot to the system clipboard without
+                        showing the application window

 Note: OPTION -b, --border takes only effect when used with -w, --window
 </pre>
@ -91,7 +103,7 @@ Note: OPTION -b, --border takes only effect when used with -w, --window
 <div class="nav">
 <div class="inner"><span>
 «  <a href="poorman.html">PoorMan</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">Applikationer</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="showimage.html">Showimage</a>  »
 </span></div>
 </div>
--- a/userguide/sv_SE/attributes.html
+++ b/userguide/sv_SE/attributes.html
@ -9,12 +9,14 @@
 *
 * Authors:
 *		Humdinger <humdingerb@gmail.com>
+ * Translators:
+ *		Victor Widell
 *
 -->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<meta http-equiv="Content-Style-Type" content="text/css" />
 	<meta name="robots" content="all" />
-	<title>Attributes</title>
+	<title>Attribut</title>
 	<link rel="stylesheet" type="text/css" href="../Haiku-doc.css" />
 </head>
 <body>
@ -49,7 +51,7 @@
 <div>
 <div class="box-info">The translation of this page isn't yet complete. Until it is, unfinished parts use the English original.</div>

-<h1>Attributes</h1>
+<h1>Attribut</h1>

 <p>Attributes are data fields that belong to a file but aren't part of that file, e.g. they are not computed into the file size and can be copied or changed without touching the file itself. The system uses these attributes to store e.g. file size, file type or date of the last modification. This is similar to other operating systems and their filesystems.</p>
 <p>What's different is that you can add any kind of attribute to any file and display it or make it editable in a Tracker window. You just have to define the kind of attribute you want to add to a file type (e.g. string, integer or time) and give it a name and description.</p>
@ -61,7 +63,7 @@

 <h2>
 <a href="#"><img src="../images/up.png" style="border:none;float:right" alt="index" /></a>
-<a id="attributes-tracker" name="attributes-tracker">Attributes in Tracker</a></h2>
+<a id="attributes-tracker" name="attributes-tracker">Attribut i Tracker</a></h2>
 <p>Attributes are displayed quite similar to a database or spreadsheet. Using Tracker you can choose which attributes to display (columns) and sort file listings (rows) accordingly.</p>
 <p>To do this, open a Tracker window, click on the <span class="menu">Attributes</span> menu, and select the attributes you want to display. Alternatively, simply right-click onto a column heading and mark the items in the context menu. You can rearrange the columns by a simple drag&amp;drop of the column heading. Moving a column out of a window, is a fast way to get rid of columns you don't need.</p>
 <p>Double-click on the line between two attributes in the heading to automatically resize a column to its optimal width.</p>
@ -70,7 +72,7 @@

 <h2>
 <a href="#"><img src="../images/up.png" style="border:none;float:right" alt="index" /></a>
-<a id="attributes-terminal" name="attributes-terminal">Attributes in Terminal</a></h2>
+<a id="attributes-terminal" name="attributes-terminal">Attribut i Terminal</a></h2>
 <p>If you prefer to use the commandline or plan to work with many files using scripting, there are several commands for controlling attributes from Terminal.</p>
 <h3>
 <a href="#"><img src="../images/up.png" style="border:none;float:right" alt="index" /></a>
--- a/userguide/sv_SE/images/apps-images/screenshot-options.png
+++ b/userguide/sv_SE/images/apps-images/screenshot-options.png
--- a/userguide/sv_SE/images/apps-images/screenshot.png
+++ b/userguide/sv_SE/images/apps-images/screenshot.png
--- a/userguide/sv_SE/keyboard-shortcuts.html
+++ b/userguide/sv_SE/keyboard-shortcuts.html
@ -39,7 +39,7 @@
 <li><a href="../en/keyboard-shortcuts.html"><img src="../images/flags/gb.png" alt="" />English</a></li>
 </ul>
 <span>
- «  <a href="tracker-add-ons.html">Tracker-tillägg</a> 
+ «  <a href="tracker-add-ons.html">Tracker Add-Ons</a> 
 ::  <a href="contents.html" class="uplink">Contents</a> 
 ::  <a href="deskbar.html">Deskbar</a>  »
 </span></div>
@ -74,6 +74,9 @@
 <tr><td><span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">F</span></td><td></td><td>Pulls the active window to the front (only applicable with the mouse setting <a href="preferences/mouse.html">Focus Follows Mouse</a>).</td></tr>
 <tr><td><span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">B</span></td><td></td><td>Sends the active window to the back. </td></tr>
 <tr><td><span class="key">ALT</span> <span class="key">Q</span></td><td></td><td>Quits an application.</td></tr>
+<tr><td><span class="key">PRINT</span></td><td style="width:15px;"></td><td>Takes a screenshot with zero delay and launches the <a href="applications/screenshot.html">Screenshot</a> panel.</td></tr>
+<tr><td class="onelinetop"><span class="key">SHIFT</span> <span class="key">PRINT</span></td><td></td><td>Takes a screenshot silently (without opening the panel), while still respecting the last used settings.</td></tr>
+<tr><td><span class="key">CTRL</span> <span class="key">PRINT</span></td><td></td><td>Also takes a screenshot silently with the saved settings, but instead of saving it as a file, it's just copied to the clipboard.</td></tr>
 </table>

 <h2>
@ -126,7 +129,7 @@ The letters you type appear at the bottom-left, where normally the number of ite

 <div class="nav">
 <div class="inner"><span>
- «  <a href="tracker-add-ons.html">Tracker-tillägg</a> 
+ «  <a href="tracker-add-ons.html">Tracker Add-Ons</a> 
 ::  <a href="contents.html" class="uplink">Contents</a> 
 ::  <a href="deskbar.html">Deskbar</a>  »
 </span></div>
--- a/userguide/uk/applications/screenshot.html
+++ b/userguide/uk/applications/screenshot.html
@ -4,7 +4,7 @@
 <head>
 <!-- 
 *
- * Copyright 2009, Haiku. All rights reserved.
+ * Copyright 2009-2010, Haiku. All rights reserved.
 * Distributed under the terms of the MIT License.
 *
 * Authors:
@ -40,7 +40,7 @@
 </ul>
 <span>
 «  <a href="poorman.html">PoorMan</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">Додатки (Applications)</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="showimage.html">Showimage</a>  »
 </span></div>
 </div>
@ -52,35 +52,47 @@
 <h2><img src="../../images/apps-images/screenshot-icon_64.png" alt="screenshot-icon_64.png" width="64" height="64" />Screenshot</h2>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
 <tr><td>Розташування в Deskbar:</td><td style="width:15px;"></td><td><span class="menu">Додатки(Applications)</span></td></tr>
-<tr><td>Розташування в Tracker:</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span></td></tr>
+<tr><td>Розташування в Tracker:</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span><br />
+<span class="path">/bin/screenshot</span></td></tr>
 <tr><td>Настройки розташовані за адресою:</td><td></td><td><span class="path">~/config/settings/screenshot</span></td></tr>
 </table>
 <p><br /></p>
-<p>Besides normal screenshots taken via <span class="key">PRINT</span>, which puts a PNG of the current screen into <span class="path">/boot/home/</span>, this application provides some useful options.</p>
+<p>Screenshots are taken by either starting the Screenshot application or by pressing the <span class="key">PRINT</span> key,</p>
 <p><img id="sreenshot" src="../images/apps-images/screenshot.png" alt="screenshot.png" /></p>
-<p>Starting Screenshot will take a screenshot as usual, but offers from its main window controls to set filename, format and folder before saving the image.</p>
-<p>The <span class="button">Options</span> dialog has a few more settings:</p>
-<p><img id="sreenshot-options" src="../images/apps-images/screenshot-options.png" alt="screenshot-options.png" /></p>
-<p>Besides the obvious, toggle between taking the whole screen or just the active window, including the window border and the mouse pointer, you can enter a delay before a screenshot is taken. Of course, this delay takes only effect if you take a new shot by pressing <span class="button">Take Screenshot</span>.</p>
-
+<p>In the Screenshot panel you can toggle between taking the whole screen or just the active window and decide if the window border and mouse pointer should be included. You can also enter a delay before a screenshot is taken.</p>
+<p>Below that you set the name, format and location for the screenshot that will be used when you click <span class="button">Save</span>. Instead of saving the file to disk you can also decide to <span class="button">Copy to clipboard</span> to be able to paste the shot directly into another application, or take a <span class="button">New screenshot</span>.</p>
+<p>All settings are remembered the next time you take a screenshot, enabling these convenient keyboard shortcuts:</p>
+<table summary="shortcuts" border="0" cellspacing="0" cellpadding="4">
+<tr><td><span class="key">PRINT</span></td><td style="width:15px;"></td><td>Takes a screenshot with zero delay and launches the Screenshot panel.</td></tr>
+<tr><td class="onelinetop"><span class="key">SHIFT</span> <span class="key">PRINT</span></td><td></td><td>Takes a screenshot silently (without opening the panel), while still respecting the last used settings.</td></tr>
+<tr><td><span class="key">CTRL</span> <span class="key">PRINT</span></td><td></td><td>Also takes a screenshot silently with the saved settings, but instead of saving it as a file, it's just copied to the clipboard.</td></tr>
+</table>
 <h2>
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
 Taking a screenshot from Terminal</h2>
-<p>The Screenshot application is also usable from Terminal or a script.<br />
-<span class="cli">Screenshot --help</span> shows the familiar options as parameters:</p>
+<p>There's a special <span class="cli">screenshot</span> application to be used from Terminal or a script.<br />
+<span class="cli">screenshot --help</span> shows the familiar options as parameters:</p>

-<pre class="terminal">~&gt; Screenshot --help
+<pre class="terminal">~&gt; screenshot --help

-Screenshot [OPTION]... Creates a bitmap of the current screen
+screenshot [OPTIONS] [FILE]  Creates a bitmap of the current screen

-OPTION
-  -o, --options         Show options window first
+FILE is the optional output path / filename used in silent mode. An exisiting
+file with the same name will be overwritten without warning. If FILE is not
+given the screenshot will be saved to a file with the default filename in the
+user's home directory.
+
+OPTIONS
  -m, --mouse-pointer   Include the mouse pointer
  -b, --border          Include the window border
  -w, --window          Capture the active window instead of the entire screen
-  -d, --delay=seconds   Take screenshot after specified delay [in seconds]
-  -s, --silent          Saves the screenshot without showing the app window
-                        overrides --options, saves to home folder as png
+  -d, --delay=seconds   Take screenshot after the specified delay [in seconds]
+  -s, --silent          Saves the screenshot without showing the application
+                        window
+  -f, --format=image    Give the image format you like to save as
+                        [bmp], [gif], [jpg], [png], [ppm], [tga], [tif]
+  -c, --clipboard       Copies the screenshot to the system clipboard without
+                        showing the application window

 Note: OPTION -b, --border takes only effect when used with -w, --window
 </pre>
@ -91,7 +103,7 @@ Note: OPTION -b, --border takes only effect when used with -w, --window
 <div class="nav">
 <div class="inner"><span>
 «  <a href="poorman.html">PoorMan</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">Додатки (Applications)</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="showimage.html">Showimage</a>  »
 </span></div>
 </div>
--- a/userguide/uk/images/apps-images/screenshot-options.png
+++ b/userguide/uk/images/apps-images/screenshot-options.png
--- a/userguide/uk/images/apps-images/screenshot.png
+++ b/userguide/uk/images/apps-images/screenshot.png
--- a/userguide/uk/keyboard-shortcuts.html
+++ b/userguide/uk/keyboard-shortcuts.html
@ -74,6 +74,9 @@
 <tr><td><span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">F</span></td><td></td><td>Pulls the active window to the front (only applicable with the mouse setting <a href="preferences/mouse.html">Focus Follows Mouse</a>).</td></tr>
 <tr><td><span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">B</span></td><td></td><td>Sends the active window to the back. </td></tr>
 <tr><td><span class="key">ALT</span> <span class="key">Q</span></td><td></td><td>Quits an application.</td></tr>
+<tr><td><span class="key">PRINT</span></td><td style="width:15px;"></td><td>Takes a screenshot with zero delay and launches the <a href="applications/screenshot.html">Screenshot</a> panel.</td></tr>
+<tr><td class="onelinetop"><span class="key">SHIFT</span> <span class="key">PRINT</span></td><td></td><td>Takes a screenshot silently (without opening the panel), while still respecting the last used settings.</td></tr>
+<tr><td><span class="key">CTRL</span> <span class="key">PRINT</span></td><td></td><td>Also takes a screenshot silently with the saved settings, but instead of saving it as a file, it's just copied to the clipboard.</td></tr>
 </table>

 <h2>
--- a/userguide/zh_CN/applications/activitymonitor.html
+++ b/userguide/zh_CN/applications/activitymonitor.html
@ -16,7 +16,7 @@
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<meta http-equiv="Content-Style-Type" content="text/css" />
 	<meta name="robots" content="all" />
-	<title>ActivityMonitor</title>
+	<title>ActivityMonitor（系统监视器）</title>
 	<link rel="stylesheet" type="text/css" href="../../Haiku-doc.css" />
 </head>
 <body>
@ -41,7 +41,7 @@
 <li><a href="../../en/applications/activitymonitor.html"><img src="../../images/flags/gb.png" alt="" />English</a></li>
 </ul>
 <span>
-    <a href="../applications.html#list-of-apps" class="uplink">应用程序</a> 
+    <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="cdplayer.html">CDPlayer</a>  »
 </span></div>
 </div>
@ -50,7 +50,7 @@
 <div>
 <div class="box-info">The translation of this page isn't yet complete. Until it is, unfinished parts use the English original.</div>

-<h2><img src="../../images/apps-images/activitymonitor-icon_64.png" alt="activitymonitor-icon_64.png" width="64" height="64" />ActivityMonitor（资源监视器）</h2>
+<h2><img src="../../images/apps-images/activitymonitor-icon_64.png" alt="activitymonitor-icon_64.png" width="64" height="64" />ActivityMonitor（系统监视器）</h2>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
 <tr><td>桌面栏：</td><td style="width:15px;"></td><td><span class="menu">Applications</span></td></tr>
 <tr><td>位置：</td><td></td><td><span class="path">/boot/system/apps/ActivityMonitor</span></td></tr>
@ -72,7 +72,7 @@

 <div class="nav">
 <div class="inner"><span>
-    <a href="../applications.html#list-of-apps" class="uplink">应用程序</a> 
+    <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="cdplayer.html">CDPlayer</a>  »
 </span></div>
 </div>
--- a/userguide/zh_CN/applications/cli-apps.html
+++ b/userguide/zh_CN/applications/cli-apps.html
@ -61,46 +61,47 @@
 <h3><a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="cli-attributes" name="cli-attributes">关于文件属性的命令： <span class="cli">listattr</span>, <span class="cli">catattr</span>, <span class="cli">addattr</span>, <span class="cli">rmattr</span>, <span class="cli">copyattr</span></a></h3>
 <p>这些命令用于显示，读取，添加和删除文件的属性；需要注意的是，这些元数据仅仅可用于BFS格式的磁盘和分区，而且移动文件到其他的文件系统将会把其相关的属性移除！<br />
-上面的命令在 <a href="../attributes.html#attributes-terminal">Attributes in Terminal</a> 会有相关的描述。</p>
+上面的命令在 <a href="../attributes.html#attributes-terminal">终端中的属性</a> 会有相关的描述。</p>

 <h3><a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="cli-index" name="cli-index">关于文件索引的命令：<span class="cli">lsindex</span>, <span class="cli">mkindex</span>, <span class="cli">reindex</span>, <span class="cli">rmindex</span></a></h3>
-<p>利用这些命令，您可以 list, make, reindex and remove attributes to BFS' index. 每个卷都有自己的索引，所以在不同的卷之间拷贝文件时尤其要注意。<br />上述这些命令在 <a href="../index.html">Index</a> 主题中会有详细的描述。</p>
+<p>利用这些命令，您可以对BFS的索引属性进行排序，新建，重新索引和删除等操作。由于每个卷都有自己独立的索引，所以在不同的卷之间拷贝文件时尤其要注意。<br />上述这些命令在 <a href="../index.html">索引</a> 主题中会有详细的描述。</p>

 <h3><a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="cli-scripting" name="cli-scripting">有用的脚本命令</a></h3>
-<p>下面是一些非常有用的命令行工具，尤其适用于撰写脚本（详情请参阅 <a href="../bash-scripting.html">Bash and Scripting</a>）。</p>
+<p>下面是一些非常有用的命令行工具，尤其适用于撰写脚本（详情请参阅 <a href="../bash-scripting.html">Bash和脚本</a>）。</p>
 <table summary="scripting cli tools" border="0" cellpadding="2" cellspacing="0"> 
 	<tr><td><p><span class="cli">alert</span></p></td><td style="width:10px;"> </td>
-		<td valign="top"><p><span class="cli">alert</span> conjures up the typical alert window with a pre-defined icon, explanatory text and up to three buttons. It will return the title of the pressed button and an exit status (starting with 0). For example, this is made of the line:</p>
+		<td valign="top"><p><span class="cli">alert</span> 该命令将会打开一个带有预定义图标，说明注记和三个按钮的典型警示窗口，并且在终端中返回已选中按钮的标题和退出状态（以0开始）。例如，下面就是一个例子：</p>
 <pre class="terminal">alert --idea "FantasticApp(tm) installed successfully!
 Would you like a link to it?" "On Desktop" "In Deskbar" "No thanks"</pre>
 <p><img src="../images/apps-images/cli-alert.png" alt="cli-alert.png" /></p>
 </td></tr>
 <tr><td><p><span class="cli">filepanel</span></p></td><td style="width:10px;"> </td>
-		<td valign="top"><p><span class="cli">filepanel</span> displays a load or save file panel and lets the user choose a file or location. As a return value you'll get the chosen file or folder's path. There are several parameters available, for example to set a starting directory, a window title, a default name when saving or restrictions to the allowed types of files. This is an example of</p>
+		<td valign="top"><p><span class="cli">filepanel</span> 显示一个装载或者保存文件的面板，并且让用户选择相应的文件和位置。同时您将会获取到一个文件或者文件的路径作为返回值。并且还有几个参数可供使用，例如，设置起始目录，窗体的标题，默认保存的文件名。下面是一个例子：</p>
 <pre class="terminal">filepanel -s -t "Save your logfile" -d ~/config/settings -n Fantastic.log</pre>
 <p><img src="../images/apps-images/cli-filepanel.png" alt="cli-alert.png" /></p>
 </td></tr>
 <tr><td><p><span class="cli">waitfor</span></p></td><td style="width:10px;"> </td>
-		<td valign="top"><p><span class="cli">waitfor</span> is a nice way to wait for a particular application or thread to be started or to have ended.</p>
+		<td valign="top"><p><span class="cli">waitfor</span> 是一个用于等待特殊的程序或者进程启动或者终止的非常好的方式。</p>
 </td></tr>
 <tr><td><p><span class="cli">query</span></p></td><td style="width:10px;"> </td>
-		<td valign="top"><p><span class="cli">query</span> is the commandline version of the Find panel. In fact, a quick way to generate the search term is to build a query in the Find panel, switch to <span class="menu">by formula</span>, add double quotes (<tt>"</tt>) in front and back and paste the whole string after your <span class="cli">query</span> command in Terminal or your script.</p>
+		<td valign="top"><p><span class="cli">query</span> 是查询面板的命令行版本。实际上，一个创建搜索项目的快速方式是在搜索面板创建一个查询，选择 <span class="menu">by formula</span> ，在查询词的前后添加双引号（<tt>"</tt>），然后在终端或者脚本中的 <span class="cli">query</span> 命令之后粘贴所要查找的整个查询词。</p>
 </td></tr></table>

 <h3><a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
-<a id="cli-other" name="cli-other">Other commands</a></h3>
+<a id="cli-other" name="cli-other">其他命令</a></h3>

 <table summary="scripting cli tools" border="0" cellpadding="2" cellspacing="0"> 
 	<tr><td><p><span class="cli">checkfs</span></p></td><td style="width:10px;"> </td>
-		<td><p><span class="cli">checkfs</span> is an important tool to check for errors in your file system. Simply add the volume or device name and it'll run through every file and correct inconsistencies where possible.</p>
+		<td><p><span class="cli">checkfs</span> 是一个非常重要的工具，主要用于检查文件系统中的错误。只需在该命令之后添加磁卷或者设备名，它就会遍历所有的文件，然后修复所有可能出现不一致的地方。</p>
 </td></tr>
 <tr><td><p><span class="cli">open</span></p></td><td style="width:10px;"> </td>
-		<td valign="top"><p><span class="cli">open</span> is a very handy little tool. With it you open any file with its preferred application, or start a specific application by its signature without the need to know its exact path. It also works with URLs and even with the "virtual" directories <tt>.</tt> for the current directory and <tt>..</tt> for the parent, opening the folder in Tracker.</p>
+		<td valign="top"><p><span class="cli">open</span> 是一个非常小巧的工具。通过它，您可以以默认的程序打开任何文件，或者利用程序的签名还打开该程序而无需知道它的路径。它也可以用于打开网页，甚至“虚拟” 的目录， <tt>.</tt> 用于当前目录或者 <tt>..</tt> 用于上层目录，并且可以在 Tracker 中打开相应的文件夹。</p>
 </td></tr>
 <tr><td><p><span class="cli">desklink</span></p></td><td style="width:10px;"> </td>
-		<td valign="top"><p><span class="cli">desklink</span> can install an icon for any file, folder, query or application in the Deskbar tray. It also offers the option to provide a context menu when right-clicking an icon to execute special actions. As an example, try this to add <span class="app">Screenshot</span> with various options (the "<tt>\</tt>" in the first line is just for the line break in Terminal):</p>
+		<td valign="top"><p><span class="cli">desklink</span> 可以为桌面栏托盘的任何文件，文件夹，查询或者程序安装图标。它也可以为相应的图标提供一个右键菜单。例如，尝试下面的脚本为 <span class="app">Screenshot</span> 添加不同的选项 （在第一行中的"<tt>\</tt>" 用于在终端中进行换行）：
+</p>
 <pre class="terminal">desklink "cmd=Active window (2s):/boot/system/apps/Screenshot --window --border --delay 2" \
 "cmd=Remove replicant:desklink --remove=Screenshot" /boot/system/apps/Screenshot
 </pre>
@ -112,7 +113,7 @@ Would you like a link to it?" "On Desktop" "In Deskbar" "No thanks"</pre>

 <div class="nav">
 <div class="inner"><span>
-<a href="../applications.html#cli-apps" class="uplink">应用程序</a> 
+<a href="../applications.html#cli-apps" class="uplink">Applications</a> 
 </span></div>
 </div>

--- a/userguide/zh_CN/applications/diskprobe.html
+++ b/userguide/zh_CN/applications/diskprobe.html
@ -9,12 +9,14 @@
 *
 * Authors:
 *		Humdinger <humdingerb@gmail.com>
+ * Translators:
+ *		Pengphei Han
 *
 -->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<meta http-equiv="Content-Style-Type" content="text/css" />
 	<meta name="robots" content="all" />
-	<title>DiskProbe</title>
+	<title>DiskProbe（磁盘扫描器）</title>
 	<link rel="stylesheet" type="text/css" href="../../Haiku-doc.css" />
 </head>
 <body>
@ -40,7 +42,7 @@
 </ul>
 <span>
  «  <a href="deskcalc.html">DeskCalc</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">应用程序</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="diskusage.html">DriveUsage</a>  »
 </span></div>
 </div>
@ -49,7 +51,7 @@
 <div>
 <div class="box-info">The translation of this page isn't yet complete. Until it is, unfinished parts use the English original.</div>

-<h2><img src="../../images/apps-images/diskprobe-icon_64.png" alt="diskprobe-icon_64.png" width="64" height="64" />DiskProbe</h2>
+<h2><img src="../../images/apps-images/diskprobe-icon_64.png" alt="diskprobe-icon_64.png" width="64" height="64" />DiskProbe（磁盘扫描器）</h2>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
 <tr><td>桌面栏：</td><td style="width:15px;"></td><td><span class="menu">Applications</span></td></tr>
 <tr><td>位置：</td><td></td><td><span class="path">/boot/system/apps/DiskProbe</span></td></tr>
@ -57,24 +59,24 @@
 </td><td></td><td><span class="path">~/config/settings/DiskProbe_data</span></td></tr>
 </table>
 <p><br /></p>
-<p>DiskProbe is a HEX editor to view and alter data of a file or on a device on a byte-level. It's a very low-level tool and has therefore the potential to really mess things up if you're not careful!</p>
-<div class="box-warning">Always work with the backup of a file and be extra careful when working directly on a device.</div>
-<p>When starting DiskProbe you'll first be asked for the file or the device to work on. After that you are presented with this interface:</p>
+<p>磁盘扫描器是一个十六进制的编辑器，用于在字节级上查看和修改文件或者硬件设备上的数据。它是一个低级的工具，当然如果不仔细操作的话，可能会造成错误。</p>
+<div class="box-warning">该工具主要用于处理文件的备份，但是在直接用于处理硬件设备时需要倍加谨慎小心。</div>
+<p>在启动磁盘扫描器时，您需要给出所要处理的文件或者硬件。 之后，软件将会呈现以下界面：</p>
 <p><img id="diskprobe" src="../images/apps-images/diskprobe.png" alt="diskprobe.png" /></p>
-<p>The main view shows always one block of data, the size of which can be adjusted with <span class="menu">View | BlockSize</span>. To the left is the offset to the start of the block, in the middle the data as HEX values and to the right the same as ASCII symbols.<br />
-You can move from block to block with the slider above or with <span class="key">ALT</span> <span class="key">←</span> and <span class="key">ALT</span> <span class="key">→</span> and switch between the HEX and ASCII columns with <span class="key">TAB</span>.</p>
-<p><span class="menu">Block | Selection</span> will not only show the selection with different endianess (and in HEX or decimal, set by <span class="menu">View | Base</span>), it will also interprete the selection as a block offset that you can jump to. It will be grayed out if the position is outside of the file/device.<br />
-This is a handy feature mostly when looking at file systems, as they often contain pointers to other blocks.</p>
-<p>If the file you're probing includes attributes, the <span class="menu">Attributes</span> menu can be used to open any of them in a new DiskProbe window. Here's the copyright attribute of the <span class="app">AboutSystem</span> application:
-</p><p><img id="diskprobe-attribute" src="../images/apps-images/diskprobe-about-attr.png" alt="diskprobe-about-attr.png" /></p>
-<p>Depending on the kind of attribute, you'll get a different editor tab besides the always present <i>Raw Editor</i>. For example, there are editors for strings and MIME types or an icon viewer for the vectoricon attribute.</p>
+<p>主视图总是展示一个数据块，而数据块的大小可以通过 <span class="menu">View | BlockSize</span> 予以调整。在数据块的左端是数据块起始处的偏移量，而中部则是十六进制的数据，右端是数据的ASCII字符形式。
+<br />
+你可以通过使用主视图上部的滑动条或者组合键 <span class="key">ALT</span> <span class="key">←</span> 和 <span class="key">ALT</span> <span class="key">→</span> 来查看数据块，使用 <span class="key">TAB</span> 键来在不同的十六进制和ASCII数据列之间转换。</p>
+<p><span class="menu">Block | Selection</span> 不仅显示了存储方式的选择（以十六进制或者十进制的方式，这可以通过 <span class="menu">View | Base</span>来进行设置）,它也指明了你所跳转到的当前数据块的偏移量。如果您所查看的数据行超出了文件或者硬件的范围，它将会明显的灰暗化。<br />
+在查看文件系统时，这将会是一个非常好用的特性，因为在文件系统中包含了许多指向其他数据块的指针。</p>
+<p>如果您所查看的文件包含相关的属性，那么e <span class="menu">Attributes</span> 菜单可以打开一个新的磁盘扫描器窗口。下面就是 <span class="app">AboutSystem</span> 应用程序的版权属性在打开后的窗口：</p><p><img id="diskprobe-attribute" src="../images/apps-images/diskprobe-about-attr.png" alt="diskprobe-about-attr.png" /></p>
+<p>依据属性的类别，除了总是呈现的 <i>Raw Editor</i>，它还会呈现出其他不同的编辑器。例如，字符和MIME类型的编辑器或者用于矢量图标属性的图标查看器</p>
 </div>
 </div>

 <div class="nav">
 <div class="inner"><span>
  «  <a href="deskcalc.html">DeskCalc</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">应用程序</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="diskusage.html">DriveUsage</a>  »
 </span></div>
 </div>
--- a/userguide/zh_CN/applications/diskusage.html
+++ b/userguide/zh_CN/applications/diskusage.html
@ -9,12 +9,14 @@
 *
 * Authors:
 *		Humdinger <humdingerb@gmail.com>
+ * Translators:
+ *		Pengphei Han
 *
 -->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<meta http-equiv="Content-Style-Type" content="text/css" />
 	<meta name="robots" content="all" />
-	<title>DiskUsage</title>
+	<title>DiskUsage（磁盘查看器）</title>
 	<link rel="stylesheet" type="text/css" href="../../Haiku-doc.css" />
 </head>
 <body>
@ -39,9 +41,9 @@
 <li><a href="../../en/applications/diskusage.html"><img src="../../images/flags/gb.png" alt="" />English</a></li>
 </ul>
 <span>
- «  <a href="diskprobe.html">DiskProbe</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">应用程序</a> 
-::  <a href="drivesetup.html">DriveSetup</a>  »
+ «  <a href="diskprobe.html">DiskProbe（磁盘扫描器）</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
+::  <a href="drivesetup.html">DriveSetup（磁盘管理器）</a>  »
 </span></div>
 </div>

@ -49,7 +51,7 @@
 <div>
 <div class="box-info">The translation of this page isn't yet complete. Until it is, unfinished parts use the English original.</div>

-<h2><img src="../../images/apps-images/diskusage-icon_64.png" alt="diskusage-icon_64.png" width="64" height="64" />DiskUsage</h2>
+<h2><img src="../../images/apps-images/diskusage-icon_64.png" alt="diskusage-icon_64.png" width="64" height="64" />DiskUsage（磁盘查看器）</h2>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
 <tr><td>桌面栏：</td><td style="width:15px;"></td><td><span class="menu">Applications</span></td></tr>
 <tr><td>位置：</td><td></td><td><span class="path">/boot/system/apps/DiskUsage</span></td></tr>
@ -57,30 +59,31 @@
 </td><td></td><td><span class="path">~/config/settings/DiskUsage</span></td></tr>
 </table>
 <p><br /></p>
-<p>DiskUsage shows graphically how the space on your volumes is utilized.<br />
-A useful tool to answer the question, "<i>Where has all my disk space gone?</i>".</p>
+<p>磁盘查看器以图形的形式显示了您的磁盘卷的空间利用情况。<br />
+一个非常好用的工具，它回答了下面的问题，“<i>我的磁盘空间哪儿去了啊？</i>”。</p>
 <p><img id="diskusage" src="../images/apps-images/diskusage.png" alt="diskusage.png" /></p>
-<p>The concentric circles represent different levels in the file system hierarchy. Above, the circle in the center represents the <span class="path">/boot/home/</span> folder. Each segment of the ring immediately outside that circle is a file or folder under <span class="path">/boot/home/</span>. Every segment farther outside brings you one level deeper in the file hierarchy. You may have to resize the window to accommodate very deep folders.</p>
-<p>Above the graphic is a pop-up menu that lets you switch between all mounted volumes. Before the disk usage of a volume can be displayed, it has to be scanned. As this can take a while for larger disks, you can examine another volume while that scan is done in the background.</p>
+<p>不同层次的同心圆代表了文件系统中的不同等级。 在上图中，圆环中心代表了 <span class="path">/boot/home/</span> 文件夹。而圆环外的每个图块都代表了 <span class="path">/boot/home/</span> 文件夹下的一个文件或者文件夹。而更外层的图块则代表了更深一层等级的文件层次。当然，您可能需要调节窗口的大小来容纳深层地的文件夹。</p>
+<p>在图形的上方是一个弹出式菜单，它用于在所有挂载的磁卷之间进行转换。在显示磁卷的利用情况之前，该磁卷需要进行一次完全的扫描。对于大一点的磁卷，这可能需要比较长的时间，但是在此期间，您可以检查其他磁卷的利用情况，而磁卷的扫描将在后台运行。</p>
 <div class="box-info"><ul>
-<li>If the graphical representation of a file or folder comprises less than about 2° of a circle, it is excluded from the display.</li>
-<li>The number of files that's reported for a folder includes files in subfolders too. A folder counts as a file.</li>
-<li>DiskUsage ignores symbolic links.</li>
+<li>如果代表一个文件或者文件夹的扇形图块的角度小于圆环的2° ，那么它在图形中将无法显示出来。
+</li>
+<li>一个文件夹中文件的数量包括了其子文件夹中的文件。当然一个文件夹也看做为一个文件。</li>
+<li>磁盘查看器会忽略符号链接。</li>
 </ul></div>
-<p>As you move the mouse over a segment, information about that file or folder appears in the status bar at the bottom.</p>
-<p>Right-clicking a segment offers a context menu to <span class="menu">Get Info</span>, <span class="menu">Open</span> (with Tracker), <span class="menu">Open With</span> another suitable application or <span class="menu">Rescan</span> that particular folder.<br />
-Left-clicking a segment makes that file/folder the center circle.<br />
-Left-clicking the center circle moves you up one level.</p>
-<p>You can drag files and folders from DiskUsage to other applications or to the Desktop or other Tracker windows for copying. Vice versa, dropped volumes and folders on DiskUsage's window will zoom directly to them, making them the new center circle.</p>
+<p>在您的鼠标移动到一个图块上时，关于该文件或者文件夹的信息将会呈现在底部的状态栏里。</p>
+<p>右键点击一个图块将会显示一个右键菜单 <span class="menu">Get Info</span>, <span class="menu">Open</span> （ 在Tracker 中打开），<span class="menu">Open With</span> 其他的应用程序或者 <span class="menu">Rescan（浏览）</span> 此文件夹爱<br />
+左键点击一个图块将会使其所代表的文件或者文件夹位于圆环的中央<br />
+左键点击中央的圆环将会使您到达上一级的文件夹。</p>
+<p>您可以从磁盘查看器中拖拽文件或者文件夹到其他的程序，桌面或者其他的Tracker窗口完成复制。反之，如果把磁卷或者文件夹拖拽至磁盘查看器窗口将会把他们放置在圆环的中央进行显示。</p>

 </div>
 </div>

 <div class="nav">
 <div class="inner"><span>
- «  <a href="diskprobe.html">DiskProbe</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">应用程序</a> 
-::  <a href="drivesetup.html">DriveSetup</a>  »
+ «  <a href="diskprobe.html">DiskProbe（磁盘扫描器）</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
+::  <a href="drivesetup.html">DriveSetup（磁盘管理器）</a>  »
 </span></div>
 </div>

--- a/userguide/zh_CN/applications/drivesetup.html
+++ b/userguide/zh_CN/applications/drivesetup.html
@ -9,12 +9,14 @@
 *
 * Authors:
 *		Humdinger <humdingerb@gmail.com>
+ * Translators:
+ *		Pengphei Han
 *
 -->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<meta http-equiv="Content-Style-Type" content="text/css" />
 	<meta name="robots" content="all" />
-	<title>DriveSetup</title>
+	<title>DriveSetup（磁盘管理器）</title>
 	<link rel="stylesheet" type="text/css" href="../../Haiku-doc.css" />
 </head>
 <body>
@ -39,8 +41,8 @@
 <li><a href="../../en/applications/drivesetup.html"><img src="../../images/flags/gb.png" alt="" />English</a></li>
 </ul>
 <span>
- «  <a href="diskusage.html">DiskUsage</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">应用程序</a> 
+ «  <a href="diskusage.html">DiskUsage（磁盘查看器）</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="expander.html">Expander</a>  »
 </span></div>
 </div>
@ -49,7 +51,7 @@
 <div>
 <div class="box-info">The translation of this page isn't yet complete. Until it is, unfinished parts use the English original.</div>

-<h2><img src="../../images/apps-images/drivesetup-icon_64.png" alt="drivesetup-icon_64.png" width="64" height="64" />DriveSetup</h2>
+<h2><img src="../../images/apps-images/drivesetup-icon_64.png" alt="drivesetup-icon_64.png" width="64" height="64" />磁盘管理器</h2>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
 <tr><td>桌面栏：</td><td style="width:15px;"></td><td><span class="menu">Applications</span></td></tr>
 <tr><td>位置：</td><td></td><td><span class="path">/boot/system/apps/DriveSetup</span></td></tr>
@ -57,7 +59,7 @@
 </td><td></td><td><span class="path">~/config/settings/DriveSetup</span></td></tr>
 </table>
 <p><br /></p>
-<p>DriveSetup is a tool to create, delete and initialize partitions. At this time it can't resize or move existing partitions, so that you'll either need an unpartitioned volume (perhaps an external USB drive or another harddisk) or do the initial setup with a tool like the <a href="http://gparted.sourceforge.net/livecd.php">GParted LiveCD</a> to provide the space for another partition.</p>
+<p>磁盘管理器是一个用于磁盘分区的创建，删除，和格式化的工具。同时，它不能够移动和编辑已经存在的分区，所以您需要一个未格式化的磁卷（可能是一个USB磁盘或者硬盘）或者利用初始化工具，例如， <a href="http://gparted.sourceforge.net/livecd.php">GParted LiveCD</a> 来提供分区空间。</p>
 <img src="../images/apps-images/drivesetup.png" alt="drivesetup.png" />
 <p>At the top is a graphical representation of all partitions inside the device chosen in the list below it. Besides a maximum of 4 primary partitions, each of those can contain a number of extended/logical partitions. You may have to expand such a list with the +/- widget that appears in that case in front of that device to see the details of every logical partition.</p>
 <p>You can select a partition from the list and mount and unmount them with the commands in the <span class="menu">Partition</span> menu or by pressing <span class="key">ALT</span> <span class="key">M</span> or <span class="key">ALT</span> <span class="key">U</span>.</p>
@ -66,7 +68,7 @@ Which brings us to this:</p>
 <div class="box-stop">Dealing with creating/deleting/initializing partitions is very dangerous business. Always check twice to be sure you're working with the right one and always keep an up-to-date backup of your data in case something goes wrong!</div>
 <h2>
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
-<a id="creating" name="creating">Creating a new partition</a></h2>
+<a id="creating" name="creating">创建分区</a></h2>
 <div class="box-info">If you plan to use the entire drive as one partition, e.g. a USB stick or a Compact Flash card, you can skip the creation of a partition and proceed right to <a href="#initializing">Initializing</a>.</div>
 <p>When you found unformatted space on a drive, like the above <tt>&lt;empty&gt;</tt>, you can create a new partition in this space with <span class="menu">Partition | Create...</span>(<span class="key">ALT</span> <span class="key">C</span>).</p>
 <img src="../images/apps-images/drivesetup-create.png" alt="drivesetup-create.png" />
@ -75,7 +77,7 @@ Which brings us to this:</p>
 <p>Before you can use, or even mount the newly created partition, it has to be initialized with a filesystem.</p>
 <h2>
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
-<a id="initializing" name="initializing">Initializing a partition</a></h2>
+<a id="initializing" name="initializing">格式化分区</a></h2>
 <p>Only unmounted partitions can be initialized by using the <span class="menu">Partition | Initialize</span> menu.</p>
 <img src="../images/apps-images/drivesetup-initialize.png" alt="drivesetup-initialize.png" />
 <p>Here you set the name for the partition and it's blocksize. 2048 bytes per block are recommended, but you can choose larger or smaller sizes if you have these very specific needs.<br />
@ -86,8 +88,8 @@ Initializing will destroy all data on that partition!</p>

 <div class="nav">
 <div class="inner"><span>
- «  <a href="diskusage.html">DiskUsage</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">应用程序</a> 
+ «  <a href="diskusage.html">DiskUsage（磁盘查看器）</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="expander.html">Expander</a>  »
 </span></div>
 </div>
--- a/userguide/zh_CN/applications/screenshot.html
+++ b/userguide/zh_CN/applications/screenshot.html
@ -4,7 +4,7 @@
 <head>
 <!-- 
 *
- * Copyright 2009, Haiku. All rights reserved.
+ * Copyright 2009-2010, Haiku. All rights reserved.
 * Distributed under the terms of the MIT License.
 *
 * Authors:
@ -40,7 +40,7 @@
 </ul>
 <span>
 «  <a href="poorman.html">PoorMan</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">应用程序</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="showimage.html">Showimage</a>  »
 </span></div>
 </div>
@ -52,36 +52,48 @@
 <h2><img src="../../images/apps-images/screenshot-icon_64.png" alt="screenshot-icon_64.png" width="64" height="64" />Screenshot</h2>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
 <tr><td>桌面栏：</td><td style="width:15px;"></td><td><span class="menu">Applications</span></td></tr>
-<tr><td>位置：</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span></td></tr>
+<tr><td>位置：</td><td></td><td><span class="path">/boot/system/apps/Screenshot</span><br />
+<span class="path">/bin/screenshot</span></td></tr>
 <tr><td>设置：
 </td><td></td><td><span class="path">~/config/settings/screenshot</span></td></tr>
 </table>
 <p><br /></p>
-<p>Besides normal screenshots taken via <span class="key">PRINT</span>, which puts a PNG of the current screen into <span class="path">/boot/home/</span>, this application provides some useful options.</p>
+<p>Screenshots are taken by either starting the Screenshot application or by pressing the <span class="key">PRINT</span> key,</p>
 <p><img id="sreenshot" src="../images/apps-images/screenshot.png" alt="screenshot.png" /></p>
-<p>Starting Screenshot will take a screenshot as usual, but offers from its main window controls to set filename, format and folder before saving the image.</p>
-<p>The <span class="button">Options</span> dialog has a few more settings:</p>
-<p><img id="sreenshot-options" src="../images/apps-images/screenshot-options.png" alt="screenshot-options.png" /></p>
-<p>Besides the obvious, toggle between taking the whole screen or just the active window, including the window border and the mouse pointer, you can enter a delay before a screenshot is taken. Of course, this delay takes only effect if you take a new shot by pressing <span class="button">Take Screenshot</span>.</p>
-
+<p>In the Screenshot panel you can toggle between taking the whole screen or just the active window and decide if the window border and mouse pointer should be included. You can also enter a delay before a screenshot is taken.</p>
+<p>Below that you set the name, format and location for the screenshot that will be used when you click <span class="button">Save</span>. Instead of saving the file to disk you can also decide to <span class="button">Copy to clipboard</span> to be able to paste the shot directly into another application, or take a <span class="button">New screenshot</span>.</p>
+<p>All settings are remembered the next time you take a screenshot, enabling these convenient keyboard shortcuts:</p>
+<table summary="shortcuts" border="0" cellspacing="0" cellpadding="4">
+<tr><td><span class="key">PRINT</span></td><td style="width:15px;"></td><td>Takes a screenshot with zero delay and launches the Screenshot panel.</td></tr>
+<tr><td class="onelinetop"><span class="key">SHIFT</span> <span class="key">PRINT</span></td><td></td><td>Takes a screenshot silently (without opening the panel), while still respecting the last used settings.</td></tr>
+<tr><td><span class="key">CTRL</span> <span class="key">PRINT</span></td><td></td><td>Also takes a screenshot silently with the saved settings, but instead of saving it as a file, it's just copied to the clipboard.</td></tr>
+</table>
 <h2>
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
 Taking a screenshot from Terminal</h2>
-<p>The Screenshot application is also usable from Terminal or a script.<br />
-<span class="cli">Screenshot --help</span> shows the familiar options as parameters:</p>
+<p>There's a special <span class="cli">screenshot</span> application to be used from Terminal or a script.<br />
+<span class="cli">screenshot --help</span> shows the familiar options as parameters:</p>

-<pre class="terminal">~&gt; Screenshot --help
+<pre class="terminal">~&gt; screenshot --help

-Screenshot [OPTION]... Creates a bitmap of the current screen
+screenshot [OPTIONS] [FILE]  Creates a bitmap of the current screen

-OPTION
-  -o, --options         Show options window first
+FILE is the optional output path / filename used in silent mode. An exisiting
+file with the same name will be overwritten without warning. If FILE is not
+given the screenshot will be saved to a file with the default filename in the
+user's home directory.
+
+OPTIONS
  -m, --mouse-pointer   Include the mouse pointer
  -b, --border          Include the window border
  -w, --window          Capture the active window instead of the entire screen
-  -d, --delay=seconds   Take screenshot after specified delay [in seconds]
-  -s, --silent          Saves the screenshot without showing the app window
-                        overrides --options, saves to home folder as png
+  -d, --delay=seconds   Take screenshot after the specified delay [in seconds]
+  -s, --silent          Saves the screenshot without showing the application
+                        window
+  -f, --format=image    Give the image format you like to save as
+                        [bmp], [gif], [jpg], [png], [ppm], [tga], [tif]
+  -c, --clipboard       Copies the screenshot to the system clipboard without
+                        showing the application window

 Note: OPTION -b, --border takes only effect when used with -w, --window
 </pre>
@ -92,7 +104,7 @@ Note: OPTION -b, --border takes only effect when used with -w, --window
 <div class="nav">
 <div class="inner"><span>
 «  <a href="poorman.html">PoorMan</a> 
-::  <a href="../applications.html#list-of-apps" class="uplink">应用程序</a> 
+::  <a href="../applications.html#list-of-apps" class="uplink">Applications</a> 
 ::  <a href="showimage.html">Showimage</a>  »
 </span></div>
 </div>
--- a/userguide/zh_CN/desktop-applets.html
+++ b/userguide/zh_CN/desktop-applets.html
@ -9,12 +9,14 @@
 *
 * Authors:
 *		Humdinger <humdingerb@gmail.com>
+ * Translators:
+ *		Pengphei Han
 *
 -->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<meta http-equiv="Content-Style-Type" content="text/css" />
 	<meta name="robots" content="all" />
-	<title>Desktop Applets</title>
+	<title>Desktop Applets（桌面小程序）</title>
 	<link rel="stylesheet" type="text/css" href="../Haiku-doc.css" />
 </head>
 <body>
@ -39,7 +41,7 @@
 <li><a href="../en/desktop-applets.html"><img src="../images/flags/gb.png" alt="" />English</a></li>
 </ul>
 <span>
- «  <a href="applications.html">应用程序</a> 
+ «  <a href="applications.html">Applications</a> 
 ::  <a href="contents.html" class="uplink">Contents</a> 
 ::  <a href="preferences.html">Preferences</a>  »
 </span></div>
@ -49,18 +51,18 @@
 <div>
 <div class="box-info">The translation of this page isn't yet complete. Until it is, unfinished parts use the English original.</div>

-<h1>Desktop Applets</h1>
+<h1>Desktop Applets（桌面小程序）</h1>

-<p>Haiku provides a few useful tools that can be installed on the Desktop or the Deskbar via their Replicants.</p>
+<p>Haiku提供了一些有用的工具，它们可以安装在桌面上，或者通过它们的复制控件安装到桌面栏。</p>
 <table summary="desktop-applets" border="0" cellpadding="2" cellspacing="0"> 
 	<tr><td style="width:24px;"><img src="../images/desktop-applets-images/launchbox-icon_16.png" alt="icon" width="16" height="16" /></td><td><a href="desktop-applets/launchbox.html">LaunchBox</a></td><td style="width:10px;"> </td>
-		<td valign="top">Shortcuts to your favorite applications.</td></tr>
+		<td valign="top">用于存放您最喜爱程序的快捷方式。</td></tr>
 	<tr><td><img src="../images/desktop-applets-images/networkstatus-icon_16.png" alt="icon" width="16" height="16" /></td><td><a href="desktop-applets/networkstatus.html">NetworkStatus</a></td><td> </td>
-		<td valign="top">Is your connection up?</td></tr>
+		<td valign="top">用于显示您的网络连接情况。</td></tr>
 	<tr><td><img src="../images/desktop-applets-images/processcontroller-icon_16.png" alt="icon" width="16" height="16" /></td><td><a href="desktop-applets/processcontroller.html">ProcessController</a></td><td> </td>
-		<td valign="top">See and control every running app and service.</td></tr>
+		<td valign="top">查看和控制所有正在运行的应用程序和服务。</td></tr>
 	<tr><td><img src="../images/desktop-applets-images/workspaces-icon_16.png" alt="icon" width="16" height="16" /></td><td><a href="desktop-applets/workspaces.html">Workspaces</a></td><td> </td>
-		<td valign="top">A miniature version of all workspaces.</td></tr>
+		<td valign="top">所有工作区的缩略版本。</td></tr>
 </table>

 </div>
@ -69,7 +71,7 @@
 <!--
 <div class="nav">
 <div class="inner"><span>
- «  <a href="applications.html">应用程序</a> 
+ «  <a href="applications.html">Applications</a> 
 ::  <a href="contents.html" class="uplink">Contents</a> 
 ::  <a href="preferences.html">Preferences</a>  »
 </span></div>
--- a/userguide/zh_CN/images/apps-images/screenshot-options.png
+++ b/userguide/zh_CN/images/apps-images/screenshot-options.png
--- a/userguide/zh_CN/images/apps-images/screenshot.png
+++ b/userguide/zh_CN/images/apps-images/screenshot.png
--- a/userguide/zh_CN/keyboard-shortcuts.html
+++ b/userguide/zh_CN/keyboard-shortcuts.html
@ -41,7 +41,7 @@
 <span>
 «  <a href="tracker-add-ons.html">Tracker Add-Ons</a> 
 ::  <a href="contents.html" class="uplink">Contents</a> 
-::  <a href="deskbar.html">Deskbar（桌面栏）</a>  »
+::  <a href="deskbar.html">Deskbar</a>  »
 </span></div>
 </div>

@ -74,6 +74,9 @@
 <tr><td><span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">F</span></td><td></td><td>Pulls the active window to the front (only applicable with the mouse setting <a href="preferences/mouse.html">Focus Follows Mouse</a>).</td></tr>
 <tr><td><span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">B</span></td><td></td><td>Sends the active window to the back. </td></tr>
 <tr><td><span class="key">ALT</span> <span class="key">Q</span></td><td></td><td>Quits an application.</td></tr>
+<tr><td><span class="key">PRINT</span></td><td style="width:15px;"></td><td>Takes a screenshot with zero delay and launches the <a href="applications/screenshot.html">Screenshot</a> panel.</td></tr>
+<tr><td class="onelinetop"><span class="key">SHIFT</span> <span class="key">PRINT</span></td><td></td><td>Takes a screenshot silently (without opening the panel), while still respecting the last used settings.</td></tr>
+<tr><td><span class="key">CTRL</span> <span class="key">PRINT</span></td><td></td><td>Also takes a screenshot silently with the saved settings, but instead of saving it as a file, it's just copied to the clipboard.</td></tr>
 </table>

 <h2>
@ -128,7 +131,7 @@ The letters you type appear at the bottom-left, where normally the number of ite
 <div class="inner"><span>
 «  <a href="tracker-add-ons.html">Tracker Add-Ons</a> 
 ::  <a href="contents.html" class="uplink">Contents</a> 
-::  <a href="deskbar.html">Deskbar（桌面栏）</a>  »
+::  <a href="deskbar.html">Deskbar</a>  »
 </span></div>
 </div>

--- a/userguide/zh_CN/preferences/appearance.html
+++ b/userguide/zh_CN/preferences/appearance.html
@ -16,7 +16,7 @@
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<meta http-equiv="Content-Style-Type" content="text/css" />
 	<meta name="robots" content="all" />
-	<title>Appearance</title>
+	<title>Appearance（外观设置）</title>
 	<link rel="stylesheet" type="text/css" href="../../Haiku-doc.css" />
 </head>
 <body>
@ -50,7 +50,7 @@
 <div>
 <div class="box-info">The translation of this page isn't yet complete. Until it is, unfinished parts use the English original.</div>

-<h2><img src="../../images/prefs-images/appearance-icon_64.png" alt="appearance-icon_64.png" width="64" height="64" />Appearance（外观）</h2>
+<h2><img src="../../images/prefs-images/appearance-icon_64.png" alt="appearance-icon_64.png" width="64" height="64" />Appearance（外观设置）</h2>
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
 <tr><td>桌面栏：</td><td style="width:15px;"></td><td><span class="menu">Preferences</span></td></tr>
 <tr><td>位置：</td><td></td><td><span class="path">/boot/system/preferences/Appearance</span></td></tr>