Update to user guide. A few new pages and many translations by Google Code-In students. ShowImage, MediaPlayer and WebPositive are not yet ready for translation. Thanks everyone.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40044 a95241bf-73f2-0310-859d-f6bbb57e9c96

docs/userguide/jp/applications/icon-o-matic.html

@@ -310,7 +310,7 @@ Of course you can move these indicators to change the gradient to your liking. Y
 <a id="i-o-m-tips" name="i-o-m-tips">Tips &amp; Tricks</a></h3>
 <p>A few things you should keep in mind when working with Icon-O-Matic and some general tips for its usage:</p>
 <ul>
-<li><p>Read the <a href="http://factory.haiku-os.org/documentation/icon_guidelines/">Icon Guidelines</a> to learn about important characteristics of Haiku icons, e.g. perspective, colors and shadows.</p></li>
+<li><p>Read the <a href="http://svn.haiku-os.org/haiku/haiku/trunk/docs/icon_guidelines/index.html">Icon Guidelines</a> to learn about important characteristics of Haiku icons, e.g. perspective, colors and shadows.</p></li>
 <li><p>You should always try to minimize your use of paths, those are the most expensive, file size wise. Re-use paths wherever possible and work with manipulated shapes and their transformers instead. Smart use of gradients can also save space.</p></li>
 <li><p>Wherever possible, you should activate Snap-to-Grid from the <span class="menu">Options</span> menu when editing paths. Path points that align with the 64x64 pixel grid use less storage space. You'll also get the crispest look if points are set on exact pixel borders. For example, it is important to align the most prominent outlines with the 16x16 grid.</p></li>
 <li><p>Check the preview to see if your icon still looks good in 16x16. You may want to use the <a href="#i-o-m-shape-lod">Level Of Detail</a> settings described in the Shapes section.</p></li>

docs/userguide/jp/applications/list-cli-apps.html

@@ -63,282 +63,282 @@ Here's a list of all commandline applications that are shipped with Haiku. Each
 <table summary="layout" border="0" cellpadding="2" cellspacing="0"> 
 <tr><td><tt>CortexAddOnHost</tt></td><td style="width:10px;"> </td><td>Starts service to monitor audio and video media add-ons in use. </td></tr>
 <tr><td><tt>ReadOnlyBootPrompt</tt></td><td> </td><td>Language setup. </td></tr>
-<tr><td><tt>[</tt></td><td> </td><td>Check file types and compare values. </td></tr>
+<tr><td><tt>[</tt></td><td> </td><td>Returns true/false after comparing items.</td></tr>
 <tr><td colspan="3"><a id="A" name="A"><h2><a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>A</h2></a></td></tr>
-<tr><td><tt>addattr</tt></td><td> </td><td>Writes an attribute to a node, taking the type into account and converting the values accordingly. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
-<tr><td><tt>alert</tt></td><td> </td><td>Show a message box. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
-<tr><td><tt>arp</tt></td><td> </td><td>Manipulate the system ARP cache. </td></tr>
-<tr><td><tt>awk</tt></td><td> </td><td>See gawk.</td></tr>
+<tr><td><tt>addattr</tt></td><td> </td><td>Writes an attribute to a file, taking the type into account and converting the values accordingly. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
+<tr><td><tt>alert</tt></td><td> </td><td>Shows a message box. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
+<tr><td><tt>arp</tt></td><td> </td><td>Manipulates the system ARP cache. </td></tr>
+<tr><td><tt>awk</tt></td><td> </td><td>See <tt>gawk</tt>.</td></tr>
 <tr><td><tt>base64</tt></td><td> </td><td>Base64 encode or decode to standard output. </td></tr>
-<tr><td><tt>basename</tt></td><td> </td><td>Strip directory and optionally suffix from filenames.</td></tr>
-<tr><td><tt>bash</tt></td><td> </td><td>Bourne-Again Shell</td></tr>
+<tr><td><tt>basename</tt></td><td> </td><td>Strips directory and optionally suffix from a /path/to/filename string.</td></tr>
+<tr><td><tt>bash</tt></td><td> </td><td>Bourne-again shell</td></tr>
 <tr><td><tt>bc</tt></td><td> </td><td>An arbitrary precision calculator language.</td></tr>
-<tr><td><tt>beep</tt></td><td> </td><td>Ring a bell. </td></tr>
-<tr><td><tt>bootman</tt></td><td> </td><td>Install or uninstall boot-menu. </td></tr>
-<tr><td><tt>bunzip2</tt></td><td> </td><td>See bzip2.</td></tr>
-<tr><td><tt>bzip2</tt></td><td> </td><td>Block-sorting file compressor.</td></tr>
+<tr><td><tt>beep</tt></td><td> </td><td>Rings a bell. </td></tr>
+<tr><td><tt>bootman</tt></td><td> </td><td>Installs or uninstalls a boot-menu. </td></tr>
+<tr><td><tt>bunzip2</tt></td><td> </td><td>See <tt>bzip2</tt>.</td></tr>
+<tr><td><tt>bzip2</tt></td><td> </td><td>File compressor</td></tr>
 <tr><td><tt>c++</tt></td><td> </td><td>C++-Compiler</td></tr>
-<tr><td><tt>cal</tt></td><td> </td><td>Display a calendar. </td></tr>
-<tr><td><tt>cat</tt></td><td> </td><td>Concatenate files and print on the standard output. </td></tr>
-<tr><td><tt>catattr</tt></td><td> </td><td>Show attributes of a node. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
+<tr><td><tt>cal</tt></td><td> </td><td>Displays a calendar. </td></tr>
+<tr><td><tt>cat</tt></td><td> </td><td>Concatenates files and prints to standard output. </td></tr>
+<tr><td><tt>catattr</tt></td><td> </td><td>Prints out the contents of an attribute of a file. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
 <tr><td><tt>cc</tt></td><td> </td><td>C-Compiler</td></tr>
-<tr><td><tt>checkfs</tt></td><td> </td><td>Check file system. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
-<tr><td><tt>checkitout</tt></td><td> </td><td>Wraps URL mime types around command line applications or other apps that don't handle them directly. </td></tr>
-<tr><td><tt>chgrp</tt></td><td> </td><td>Change group of files. </td></tr>
-<tr><td><tt>chmod</tt></td><td> </td><td>Change file mode bits. </td></tr>
-<tr><td><tt>chop</tt></td><td> </td><td>Split file into smaller files. </td></tr>
-<tr><td><tt>chown</tt></td><td> </td><td>Change the owner and group of files. </td></tr>
-<tr><td><tt>chroot</tt></td><td> </td><td>Run commands within specified root directory. </td></tr>
-<tr><td><tt>cksum</tt></td><td> </td><td>Print CRC checksum and byte counts of files. </td></tr>
-<tr><td><tt>clear</tt></td><td> </td><td>Clear the terminal window. </td></tr>
-<tr><td><tt>clockconfig</tt></td><td> </td><td>Configure clock. </td></tr>
-<tr><td><tt>cmp</tt></td><td> </td><td>Compare files byte by byte.</td></tr>
+<tr><td><tt>checkfs</tt></td><td> </td><td>Checks and repairs the file system. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
+<tr><td><tt>checkitout</tt></td><td> </td><td>Checks out sources simply with their repository's URL.</td></tr>
+<tr><td><tt>chgrp</tt></td><td> </td><td>Changes group ownership of files. </td></tr>
+<tr><td><tt>chmod</tt></td><td> </td><td>Changes permissions of files.</td></tr>
+<tr><td><tt>chop</tt></td><td> </td><td>Splits a file into smaller files. </td></tr>
+<tr><td><tt>chown</tt></td><td> </td><td>Changes the owner of files. </td></tr>
+<tr><td><tt>chroot</tt></td><td> </td><td>Runs a command within a specified root directory. </td></tr>
+<tr><td><tt>cksum</tt></td><td> </td><td>Prints out CRC checksum and byte count of files. </td></tr>
+<tr><td><tt>clear</tt></td><td> </td><td>Clears the terminal window. </td></tr>
+<tr><td><tt>clockconfig</tt></td><td> </td><td>Prints out the clock configuration.</td></tr>
+<tr><td><tt>cmp</tt></td><td> </td><td>Compares files byte by byte.</td></tr>
 <tr><td><tt>collectcatkeys </tt></td><td> </td><td>[Leftover from the move of locale-kit.]</td></tr>
-<tr><td><tt>comm</tt></td><td> </td><td>Compare sorted files line by line. </td></tr>
-<tr><td><tt>compress</tt></td><td> </td><td>Data compression program. </td></tr>
+<tr><td><tt>comm</tt></td><td> </td><td>Compares sorted files line by line. </td></tr>
+<tr><td><tt>compress</tt></td><td> </td><td>Data compression program</td></tr>
 <tr><td><tt>consoled</tt></td><td> </td><td>Console daemon </td></tr>
-<tr><td><tt>copyattr</tt></td><td> </td><td>Copies attributes from one or more files or directories, with all or a specified subset of their attributes, to another location. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
-<tr><td><tt>cp</tt></td><td> </td><td>Copy files and directories. </td></tr>
-<tr><td><tt>csplit</tt></td><td> </td><td>Output pieces of files separated by patterns to files and output byte counts of each piece to standard output.</td></tr>
-<tr><td><tt>ctags</tt></td><td> </td><td>Generate an index file for a variety of language objects found in files</td></tr>
-<tr><td><tt>cut</tt></td><td> </td><td>Remove sections from each line of files. </td></tr>
-<tr><td><tt>date</tt></td><td> </td><td>Display the current time in the given format or set the system date. </td></tr>
-<tr><td><tt>dc</tt></td><td> </td><td>Desk Calculator language.</td></tr>
-<tr><td><tt>dd</tt></td><td> </td><td>Copy a file, converting and formatting according operands. </td></tr>
-<tr><td><tt>desklink</tt></td><td> </td><td>Link items in Deskbar. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
-<tr><td><tt>df</tt></td><td> </td><td>Report file system disk space usage. </td></tr>
-<tr><td><tt>diff</tt></td><td> </td><td>Compare files line by line.</td></tr>
-<tr><td><tt>diff3</tt></td><td> </td><td>Compare three files line by line.</td></tr>
-<tr><td><tt>dircolors</tt></td><td> </td><td>Color setup for ls. </td></tr>
-<tr><td><tt>dirname</tt></td><td> </td><td>Print path with its trailing component removed. </td></tr>
-<tr><td><tt>draggers</tt></td><td> </td><td>Show/set draggers state. </td></tr>
-<tr><td><tt>driveinfo</tt></td><td> </td><td>Show hardware information. </td></tr>
-<tr><td><tt>dstcheck</tt></td><td> </td><td>Daylight Saving Time check. </td></tr>
-<tr><td><tt>du</tt></td><td> </td><td>Summarize disk usage of each file, recursively for directories. </td></tr>
+<tr><td><tt>copyattr</tt></td><td> </td><td>Copies all or a subset of attributes from one or more files to another or new file. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
+<tr><td><tt>cp</tt></td><td> </td><td>Copies files and directories. </td></tr>
+<tr><td><tt>csplit</tt></td><td> </td><td>Split a file into pieces separated by a specified pattern.</td></tr>
+<tr><td><tt>ctags</tt></td><td> </td><td>Generates an index file for a variety of language objects found in files</td></tr>
+<tr><td><tt>cut</tt></td><td> </td><td>Prints out sections from each line of a file.</td></tr>
+<tr><td><tt>date</tt></td><td> </td><td>Displays or sets the current time and date.</td></tr>
+<tr><td><tt>dc</tt></td><td> </td><td>Desk calculator language.</td></tr>
+<tr><td><tt>dd</tt></td><td> </td><td>Copies raw data, converting and formatting according operands. </td></tr>
+<tr><td><tt>desklink</tt></td><td> </td><td>Installs items in Deskbar. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
+<tr><td><tt>df</tt></td><td> </td><td>Reports free and used space of mounted volumes.</td></tr>
+<tr><td><tt>diff</tt></td><td> </td><td>Compares files line by line.</td></tr>
+<tr><td><tt>diff3</tt></td><td> </td><td>Compares three files line by line.</td></tr>
+<tr><td><tt>dircolors</tt></td><td> </td><td>Color setup for <tt>ls</tt>. </td></tr>
+<tr><td><tt>dirname</tt></td><td> </td><td>Strips the filename from a /path/to/filename string.</td></tr>
+<tr><td><tt>draggers</tt></td><td> </td><td>Shows/sets the dragger state of Replicants.</td></tr>
+<tr><td><tt>driveinfo</tt></td><td> </td><td>Shows hardware information. </td></tr>
+<tr><td><tt>dstcheck</tt></td><td> </td><td>Shows a message box used when switching to/from daylight saving time.</td></tr>
+<tr><td><tt>du</tt></td><td> </td><td>Summarizes disk usage of each file, recursively for directories. </td></tr>
 <tr><td><tt>dumpcatalog</tt></td><td> </td><td>[Leftover from the move of locale-kit.] </td></tr>
-<tr><td><tt>echo</tt></td><td> </td><td>Display a line of text.</td></tr>
-<tr><td><tt>egrep</tt></td><td> </td><td>See grep.</td></tr>
-<tr><td><tt>eject</tt></td><td> </td><td>Eject removable media. </td></tr>
-<tr><td><tt>env</tt></td><td> </td><td>Run a program in a modified environment. </td></tr>
+<tr><td><tt>echo</tt></td><td> </td><td>Displays a line of text.</td></tr>
+<tr><td><tt>egrep</tt></td><td> </td><td>See <tt>grep</tt>.</td></tr>
+<tr><td><tt>eject</tt></td><td> </td><td>Ejects removable media. </td></tr>
+<tr><td><tt>env</tt></td><td> </td><td>Runs a program in a modified environment. </td></tr>
 <tr><td><tt>error</tt></td><td> </td><td>Prints clear text error messages for given error numbers. </td></tr>
-<tr><td><tt>expand</tt></td><td> </td><td>Convert tabs in each file to spaces, writing to standard output. </td></tr>
-<tr><td><tt>expr</tt></td><td> </td><td>Print value of expression to standard output. </td></tr>
+<tr><td><tt>expand</tt></td><td> </td><td>Converts tabs to spaces.</td></tr>
+<tr><td><tt>expr</tt></td><td> </td><td>Prints the value of an expression.</td></tr>
 <tr><td colspan="3"><a id="F" name="F"><h2>F</h2></a></td></tr>
-<tr><td><tt>factor</tt></td><td> </td><td>Print the prime factors of each specified integer number. </td></tr>
-<tr><td><tt>false</tt></td><td> </td><td>Do nothing, unsuccessfully. </td></tr>
+<tr><td><tt>factor</tt></td><td> </td><td>Prints the prime factors of integer numbers.</td></tr>
+<tr><td><tt>false</tt></td><td> </td><td>Does nothing, indicates "unsuccessful" and returns the value "1".</td></tr>
 <tr><td><tt>fdinfo</tt></td><td> </td><td>Shows info about the used file descriptors in the system. </td></tr>
-<tr><td><tt>ffm</tt></td><td> </td><td>Set if focus follows mouse. </td></tr>
-<tr><td><tt>fgrep</tt></td><td> </td><td>See grep.</td></tr>
-<tr><td><tt>filepanel</tt></td><td> </td><td>Display a load/save file panel. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
-<tr><td><tt>find</tt></td><td> </td><td>Search for files in a directory hierarchy.</td></tr>
-<tr><td><tt>finddir</tt></td><td> </td><td>Find directory using a constant. </td></tr>
-<tr><td><tt>fmt</tt></td><td> </td><td>Reformat each paragraph in the listed files, writing to standard output. </td></tr>
-<tr><td><tt>fold</tt></td><td> </td><td>Wrap input lines in each file, writing to standard output. </td></tr>
-<tr><td><tt>fortune</tt></td><td> </td><td>Print a random, hopefully interesting, adage. </td></tr>
-<tr><td><tt>frcode</tt></td><td> </td><td>Called by updatedb to compress the list of file names using front-compression.</td></tr>
-<tr><td><tt>freetype-config</tt></td><td> </td><td>Get FreeType compilation and linking information.</td></tr>
-<tr><td><tt>ftp</tt></td><td> </td><td>Internet file transfer program. </td></tr>
+<tr><td><tt>ffm</tt></td><td> </td><td>Sets focus follows mouse. </td></tr>
+<tr><td><tt>fgrep</tt></td><td> </td><td>See <tt>grep</tt>.</td></tr>
+<tr><td><tt>filepanel</tt></td><td> </td><td>Displays a load/save file panel. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
+<tr><td><tt>find</tt></td><td> </td><td>Searches for files in a directory hierarchy.</td></tr>
+<tr><td><tt>finddir</tt></td><td> </td><td>Finds special directories defined by the system.</td></tr>
+<tr><td><tt>fmt</tt></td><td> </td><td>Reformats the paragraphs of a file.</td></tr>
+<tr><td><tt>fold</tt></td><td> </td><td>Wraps input lines of a file.</td></tr>
+<tr><td><tt>fortune</tt></td><td> </td><td>Prints a random, hopefully interesting, adage. </td></tr>
+<tr><td><tt>frcode</tt></td><td> </td><td>Called by updatedb to compress the list of file names.</td></tr>
+<tr><td><tt>freetype-config</tt></td><td> </td><td>Shows FreeType compilation and linking information.</td></tr>
+<tr><td><tt>ftp</tt></td><td> </td><td>File transfer program</td></tr>
 <tr><td><tt>ftpd</tt></td><td> </td><td>FTP daemon</td></tr>
-<tr><td><tt>funzip</tt></td><td> </td><td>Extracts to stdout the gzip file or first zip entry of stdin or the given file.</td></tr>
-<tr><td><tt>fwcontrol</tt></td><td> </td><td>FireWire control program. </td></tr>
+<tr><td><tt>funzip</tt></td><td> </td><td>Extracts the first item of an archive to standard output.</td></tr>
+<tr><td><tt>fwcontrol</tt></td><td> </td><td>FireWire control program</td></tr>
 <tr><td><tt>gawk</tt></td><td> </td><td>Pattern scanning and processing language. </td></tr>
-<tr><td><tt>gdb</tt></td><td> </td><td>GNU debugger. </td></tr>
-<tr><td><tt>getlimits</tt></td><td> </td><td>Output platform dependent limits in a format useful for shell scripts. </td></tr>
-<tr><td><tt>grep</tt></td><td> </td><td>Search for pattern.</td></tr>
-<tr><td><tt>groups</tt></td><td> </td><td>Print group memberships for each username. </td></tr>
-<tr><td><tt>gunzip</tt></td><td> </td><td>See gzip.</td></tr>
-<tr><td><tt>gzexe</tt></td><td> </td><td>Compress and decompress executables. </td></tr>
-<tr><td><tt>gzip</tt></td><td> </td><td>Compress files. </td></tr>
+<tr><td><tt>gdb</tt></td><td> </td><td>GNU debugger</td></tr>
+<tr><td><tt>getlimits</tt></td><td> </td><td>Prints platform dependent limits in a format useful for shell scripts. </td></tr>
+<tr><td><tt>grep</tt></td><td> </td><td>Search for a pattern.</td></tr>
+<tr><td><tt>groups</tt></td><td> </td><td>Prints group memberships for each username. </td></tr>
+<tr><td><tt>gunzip</tt></td><td> </td><td>See <tt>gzip</tt>.</td></tr>
+<tr><td><tt>gzexe</tt></td><td> </td><td>De/Compresses executables. </td></tr>
+<tr><td><tt>gzip</tt></td><td> </td><td>De/Compresses files. </td></tr>
 <tr><td><tt>hd</tt></td><td> </td><td>Hexdump</td></tr>
-<tr><td><tt>head</tt></td><td> </td><td>Print the first ten lines of each file to standard output. </td></tr>
-<tr><td><tt>hey</tt></td><td> </td><td>A small scripting utility.</td></tr>
-<tr><td><tt>hostname</tt></td><td> </td><td>Print or set the hostname of the current system. </td></tr>
-<tr><td><tt>id</tt></td><td> </td><td>Print user and group information. </td></tr>
-<tr><td><tt>ident</tt></td><td> </td><td>Identify RCS keyword in files. </td></tr>
-<tr><td><tt>ifconfig</tt></td><td> </td><td>Configure a network interface. </td></tr>
-<tr><td><tt>install</tt></td><td> </td><td>Copy files into destination locations. </td></tr>
-<tr><td><tt>install-wifi-firmwares.sh</tt></td><td> </td><td>Install firmware for various wireless network cards. </td></tr>
+<tr><td><tt>head</tt></td><td> </td><td>Prints the first lines of a file.</td></tr>
+<tr><td><tt>hey</tt></td><td> </td><td>A small tool for scripting GUI apps.</td></tr>
+<tr><td><tt>hostname</tt></td><td> </td><td>Prints or sets the hostname of the system. </td></tr>
+<tr><td><tt>id</tt></td><td> </td><td>Prints user and group information. </td></tr>
+<tr><td><tt>ident</tt></td><td> </td><td>Identifies RCS keywords in files. </td></tr>
+<tr><td><tt>ifconfig</tt></td><td> </td><td>Configures a network interface. </td></tr>
+<tr><td><tt>install</tt></td><td> </td><td>Copies files to a destination without disrupting the running system.</td></tr>
+<tr><td><tt>install-wifi-firmwares.sh</tt></td><td> </td><td>Installs firmware for various wireless network cards. </td></tr>
 <tr><td><tt>installoptionalpackage</tt></td><td> </td><td>Temporary solution for installing optional packages. </td></tr>
-<tr><td><tt>installsound</tt></td><td> </td><td>Install a new named sound event in the sounds preferences panel. </td></tr>
-<tr><td><tt>iroster</tt></td><td> </td><td>List input devices. </td></tr>
-<tr><td><tt>isvolume</tt></td><td> </td><td>Get volume information. </td></tr>
-<tr><td><tt>join</tt></td><td> </td><td>For each pair of input lines with identical jon fields, write a line to standard output. </td></tr>
+<tr><td><tt>installsound</tt></td><td> </td><td>Installs a new sound event in the Sounds preferences panel. </td></tr>
+<tr><td><tt>iroster</tt></td><td> </td><td>Lists input devices. </td></tr>
+<tr><td><tt>isvolume</tt></td><td> </td><td>Gets information about a mounted volume.</td></tr>
+<tr><td><tt>join</tt></td><td> </td><td>For each pair of input lines with identical join fields, write a line to standard output. </td></tr>
 <tr><td colspan="3"><a id="K" name="K"><h2><a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>K</h2></a></td></tr>
-<tr><td><tt>kernel_debugger</tt></td><td> </td><td>Enters the kernel debugger with the optional message. </td></tr>
-<tr><td><tt>keymap</tt></td><td> </td><td>Show and edit keymap. </td></tr>
-<tr><td><tt>kill</tt></td><td> </td><td>Send a signal to a process. </td></tr>
-<tr><td><tt>less</tt></td><td> </td><td>Show file with backward and forward movement. </td></tr>
-<tr><td><tt>lessecho</tt></td><td> </td><td>Echos its arguments on standard output. But any argument containing spaces is enclosed in quotes. </td></tr>
-<tr><td><tt>lesskey</tt></td><td> </td><td>Specify key binding for less. </td></tr>
-<tr><td><tt>link</tt></td><td> </td><td>Create a link to a file. </td></tr>
+<tr><td><tt>kernel_debugger</tt></td><td> </td><td>Enters the kernel debugger.</td></tr>
+<tr><td><tt>keymap</tt></td><td> </td><td>Loads or saves a keymap.</td></tr>
+<tr><td><tt>kill</tt></td><td> </td><td>Sends a signal to quit a process. </td></tr>
+<tr><td><tt>less</tt></td><td> </td><td>Views a file.</td></tr>
+<tr><td><tt>lessecho</tt></td><td> </td><td>Echos its arguments and expands metacharacters, such as * and ? in filenames.</td></tr>
+<tr><td><tt>lesskey</tt></td><td> </td><td>Specifies key binding for less. </td></tr>
+<tr><td><tt>link</tt></td><td> </td><td>Creates a link to a file. </td></tr>
 <tr><td><tt>linkcatkeys</tt></td><td> </td><td>[Leftover from the move of locale-kit.] </td></tr>
 <tr><td><tt>listarea</tt></td><td> </td><td>Lists area info for all currently running teams. </td></tr>
-<tr><td><tt>listattr</tt></td><td> </td><td>List file attributes. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
-<tr><td><tt>listdev</tt></td><td> </td><td>Display devices in a user friendly way. </td></tr>
+<tr><td><tt>listattr</tt></td><td> </td><td>Lists the attributes of a file. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
+<tr><td><tt>listdev</tt></td><td> </td><td>Lists all hardware devices.</td></tr>
 <tr><td><tt>listimage</tt></td><td> </td><td>Lists image info for all currently running teams. </td></tr>
 <tr><td><tt>listport</tt></td><td> </td><td>Lists all open ports in the system organized by team. </td></tr>
-<tr><td><tt>listres</tt></td><td> </td><td>List resources of files. </td></tr>
-<tr><td><tt>listsem</tt></td><td> </td><td>List the semaphores allocated by the specified team. </td></tr>
-<tr><td><tt>listusb</tt></td><td> </td><td>List USB devices. </td></tr>
-<tr><td><tt>ln</tt></td><td> </td><td>Make links between files.</td></tr>
-<tr><td><tt>locate</tt></td><td> </td><td>Locate a file. </td></tr>
-<tr><td><tt>logger</tt></td><td> </td><td>Send a message to the system logging facility. </td></tr>
-<tr><td><tt>login</tt></td><td> </td><td>Begin session on the system. </td></tr>
-<tr><td><tt>logname</tt></td><td> </td><td>Print the name of the current user. </td></tr>
-<tr><td><tt>ls</tt></td><td> </td><td>List directory content. </td></tr>
-<tr><td><tt>lsindex</tt></td><td> </td><td>Display the indexed attributes on the current volume/partition.  <a href="cli-apps.html">(Haiku specific)</a></td></tr>
-<tr><td><tt>mail2mbox</tt></td><td> </td><td>Convert BeOS e-mail files into Unix mailbox files. </td></tr>
-<tr><td><tt>make</tt></td><td> </td><td>GNU make utility to maintain groups of programs.</td></tr>
+<tr><td><tt>listres</tt></td><td> </td><td>Lists resources of files. </td></tr>
+<tr><td><tt>listsem</tt></td><td> </td><td>Lists the semaphores allocated by the specified team. </td></tr>
+<tr><td><tt>listusb</tt></td><td> </td><td>Lists USB devices. </td></tr>
+<tr><td><tt>ln</tt></td><td> </td><td>Creates a link to a file.</td></tr>
+<tr><td><tt>locate</tt></td><td> </td><td>Locates a file. </td></tr>
+<tr><td><tt>logger</tt></td><td> </td><td>Sends a message to the system log. </td></tr>
+<tr><td><tt>login</tt></td><td> </td><td>Starts a session on the system. </td></tr>
+<tr><td><tt>logname</tt></td><td> </td><td>Prints the name of the current user. </td></tr>
+<tr><td><tt>ls</tt></td><td> </td><td>Lists directory content. </td></tr>
+<tr><td><tt>lsindex</tt></td><td> </td><td>Displays the indexed attributes on the current volume/partition.  <a href="cli-apps.html">(Haiku specific)</a></td></tr>
+<tr><td><tt>mail2mbox</tt></td><td> </td><td>Converts BeOS e-mail files to Unix mailbox files. </td></tr>
+<tr><td><tt>make</tt></td><td> </td><td>GNU make utility</td></tr>
 <tr><td><tt>makebootable</tt></td><td> </td><td>Makes the specified BFS partitions/devices bootable by writing boot code into the first two sectors. </td></tr>
-<tr><td><tt>mbox2mail</tt></td><td> </td><td>Convert Unix mailbox files into e-mail files for use with BeOS.. </td></tr>
-<tr><td><tt>md5sum</tt></td><td> </td><td>Print or check MD5 checksums.</td></tr>
+<tr><td><tt>mbox2mail</tt></td><td> </td><td>Converts Unix mailbox files to BeOS e-mail files.</td></tr>
+<tr><td><tt>md5sum</tt></td><td> </td><td>Prints or checks MD5 checksums.</td></tr>
 <tr><td><tt>merge</tt></td><td> </td><td>Three-way file merge. </td></tr>
-<tr><td><tt>message</tt></td><td> </td><td>Print a message. </td></tr>
-<tr><td><tt>mimeset</tt></td><td> </td><td>Set mimetype of a file. </td></tr>
-<tr><td><tt>mkdepend</tt></td><td> </td><td>Makefile dependency generator.</td></tr>
-<tr><td><tt>mkdir</tt></td><td> </td><td>Create directory. </td></tr>
-<tr><td><tt>mkdos</tt></td><td> </td><td>Initialize FAT16 or FAT32 partitions. </td></tr>
-<tr><td><tt>mkfifo</tt></td><td> </td><td>Create named pipes with the given names. </td></tr>
-<tr><td><tt>mkfs</tt></td><td> </td><td>Build a file system. </td></tr>
-<tr><td><tt>mkindex</tt></td><td> </td><td>Create a new index of the specified attribute.  <a href="cli-apps.html">(Haiku specific)</a></td></tr>
-<tr><td><tt>mktemp</tt></td><td> </td><td>Create a temporary file or directory, safely and print its name.</td></tr>
-<tr><td><tt>modifiers</tt></td><td> </td><td>Asserts (un)pressed modifier keys. </td></tr>
-<tr><td><tt>more</tt></td><td> </td><td>See less. </td></tr>
-<tr><td><tt>mount</tt></td><td> </td><td>Mount a file system. </td></tr>
-<tr><td><tt>mount_nfs</tt></td><td> </td><td>Mount NFS partition. </td></tr>
-<tr><td><tt>mountvolume</tt></td><td> </td><td>Mounts a volume if given. Lists info about mounted and mountable volumes and mounts/unnmounts volumes. </td></tr>
-<tr><td><tt>mv</tt></td><td> </td><td>Move file. </td></tr>
-<tr><td><tt>netcat</tt></td><td> </td><td>Utility to do anything involving TCP or UDP.</td></tr>
-<tr><td><tt>netstat</tt></td><td> </td><td>Print network connections, routing tables, interface statistics, masquerade connections and multicast memberships. </td></tr>
-<tr><td><tt>nl</tt></td><td> </td><td>Write each file to standard output with line numbers added. </td></tr>
-<tr><td><tt>nohup</tt></td><td> </td><td>Run command ignoring hangup signals. </td></tr>
-<tr><td><tt>nproc</tt></td><td> </td><td>Print the number of processing units available to the current process which may be less than the number of online processors.</td></tr>
-<tr><td><tt>od</tt></td><td> </td><td>Write an unambiguous representation, octal bytes per default of files to standard output. </td></tr>
+<tr><td><tt>message</tt></td><td> </td><td>Prints a flattened BMessage file. </td></tr>
+<tr><td><tt>mimeset</tt></td><td> </td><td>Sets MIME type of a file. </td></tr>
+<tr><td><tt>mkdepend</tt></td><td> </td><td>Makefile dependency generator</td></tr>
+<tr><td><tt>mkdir</tt></td><td> </td><td>Creates a directory. </td></tr>
+<tr><td><tt>mkdos</tt></td><td> </td><td>Initializes FAT partitions. </td></tr>
+<tr><td><tt>mkfifo</tt></td><td> </td><td>Creates named pipes. </td></tr>
+<tr><td><tt>mkfs</tt></td><td> </td><td>Creates a file system.</td></tr>
+<tr><td><tt>mkindex</tt></td><td> </td><td>Creates a new index for an attribute.  <a href="cli-apps.html">(Haiku specific)</a></td></tr>
+<tr><td><tt>mktemp</tt></td><td> </td><td>Safely creates a temporary file or directory.</td></tr>
+<tr><td><tt>modifiers</tt></td><td> </td><td>Prints currently (un)pressed modifier keys. </td></tr>
+<tr><td><tt>more</tt></td><td> </td><td>See <tt>less</tt>. </td></tr>
+<tr><td><tt>mount</tt></td><td> </td><td>Mounts a file system. </td></tr>
+<tr><td><tt>mount_nfs</tt></td><td> </td><td>Mounts a NFS partition. </td></tr>
+<tr><td><tt>mountvolume</tt></td><td> </td><td>Mounts a volume by name.</td></tr>
+<tr><td><tt>mv</tt></td><td> </td><td>Moves/renames a file. </td></tr>
+<tr><td><tt>netcat</tt></td><td> </td><td>TCP and UDP utility.</td></tr>
+<tr><td><tt>netstat</tt></td><td> </td><td>Prints network connections, routing tables, interface statistics, masquerade connections and multicast memberships. </td></tr>
+<tr><td><tt>nl</tt></td><td> </td><td>Prints each file with line numbers added. </td></tr>
+<tr><td><tt>nohup</tt></td><td> </td><td>Runs a command ignoring hangup signals. </td></tr>
+<tr><td><tt>nproc</tt></td><td> </td><td>Prints the number of available processing units.</td></tr>
+<tr><td><tt>od</tt></td><td> </td><td>Writes an unambiguous representation of a file.</td></tr>
 <tr><td><tt>open</tt></td><td> </td><td>Launches an application/document from the shell. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
 <tr><td colspan="3"><a id="P" name="P"><h2><a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>P</h2></a></td></tr>
-<tr><td><tt>passwd</tt></td><td> </td><td>Change user password. </td></tr>
-<tr><td><tt>paste</tt></td><td> </td><td>Write lines consisting of the sequentially corresponding lines from each file, separated by tabs to standard output.</td></tr>
-<tr><td><tt>patch</tt></td><td> </td><td>Apply a diff file to an original. </td></tr>
-<tr><td><tt>pathchk</tt></td><td> </td><td>Diagnose invalid or unportable file names. </td></tr>
-<tr><td><tt>pc</tt></td><td> </td><td>Programmer's calculator. </td></tr>
-<tr><td><tt>ping</tt></td><td> </td><td>Send ICMP-echo-request to network host. </td></tr>
-<tr><td><tt>play</tt></td><td> </td><td>Play tracks from device. </td></tr>
-<tr><td><tt>playfile</tt></td><td> </td><td>Play tracks from a file. </td></tr>
-<tr><td><tt>playsound</tt></td><td> </td><td>Play a sound. </td></tr>
-<tr><td><tt>playwav</tt></td><td> </td><td>Play WAV file. </td></tr>
-<tr><td><tt>pr</tt></td><td> </td><td>Paginate or columnate files for printing. </td></tr>
-<tr><td><tt>printenv</tt></td><td> </td><td>Print the values of the specified environment variables. </td></tr>
-<tr><td><tt>printf</tt></td><td> </td><td>Format and print data. </td></tr>
-<tr><td><tt>prio</tt></td><td> </td><td>Change priority of a process. </td></tr>
+<tr><td><tt>passwd</tt></td><td> </td><td>Changes the user password. </td></tr>
+<tr><td><tt>paste</tt></td><td> </td><td>Prints lines consisting of the sequentially corresponding lines from each file, separated by tabs.</td></tr>
+<tr><td><tt>patch</tt></td><td> </td><td>Applies a diff file to an original. </td></tr>
+<tr><td><tt>pathchk</tt></td><td> </td><td>Diagnoses invalid or unportable file names. </td></tr>
+<tr><td><tt>pc</tt></td><td> </td><td>Programmer's calculator</td></tr>
+<tr><td><tt>ping</tt></td><td> </td><td>Sends ICMP-echo-request to network host. </td></tr>
+<tr><td><tt>play</tt></td><td> </td><td>Plays tracks from CD. </td></tr>
+<tr><td><tt>playfile</tt></td><td> </td><td>Plays an audio file. </td></tr>
+<tr><td><tt>playsound</tt></td><td> </td><td>Plays an audio file.</td></tr>
+<tr><td><tt>playwav</tt></td><td> </td><td>Plays a WAV file. </td></tr>
+<tr><td><tt>pr</tt></td><td> </td><td>Paginates or columnates files for printing. </td></tr>
+<tr><td><tt>printenv</tt></td><td> </td><td>Prints the value of an environment variable.</td></tr>
+<tr><td><tt>printf</tt></td><td> </td><td>Formats and prints data. </td></tr>
+<tr><td><tt>prio</tt></td><td> </td><td>Changes priority of a process. </td></tr>
 <tr><td><tt>profile</tt></td><td> </td><td>Profiles threads. </td></tr>
-<tr><td><tt>ps</tt></td><td> </td><td>List running processes. </td></tr>
-<tr><td><tt>ptx</tt></td><td> </td><td>Output a permuted index, including context, of the words in the input files.</td></tr>
-<tr><td><tt>pwd</tt></td><td> </td><td>Print current directory. </td></tr>
-<tr><td><tt>query</tt></td><td> </td><td>A shell utility for somewhat emulating the Tracker's "Find by formula" functionality.  <a href="cli-apps.html">(Haiku specific)</a></td></tr>
-<tr><td><tt>quit</tt></td><td> </td><td>Quit application. </td></tr>
-<tr><td><tt>rc</tt></td><td> </td><td>Resource compiler. </td></tr>
-<tr><td><tt>readlink</tt></td><td> </td><td>Print value of a symbolic link or canonical file name. </td></tr>
-<tr><td><tt>reindex</tt></td><td> </td><td>Put the attributes of existing files into newly created index of a volume/partition. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
-<tr><td><tt>release</tt></td><td> </td><td>Release a semaphore. </td></tr>
-<tr><td><tt>renice</tt></td><td> </td><td>Alter priority of running process. </td></tr>
-<tr><td><tt>rlog</tt></td><td> </td><td>Print log messages and other information about RCS files.</td></tr>
-<tr><td><tt>rm</tt></td><td> </td><td>Remove files  and directories. </td></tr>
-<tr><td><tt>rmattr</tt></td><td> </td><td>Remove an attribute from a file.  <a href="cli-apps.html">(Haiku specific)</a></td></tr>
-<tr><td><tt>rmdir</tt></td><td> </td><td>Remove directory.</td></tr>
-<tr><td><tt>rmindex</tt></td><td> </td><td>Remove an attribute from the index of a volume/partition. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
-<tr><td><tt>roster</tt></td><td> </td><td>Print information about teams. </td></tr>
-<tr><td><tt>route</tt></td><td> </td><td>List and manipulate network routes. </td></tr>
-<tr><td><tt>safemode</tt></td><td> </td><td>Print if running in safemode. </td></tr>
-<tr><td><tt>screen_blanker</tt></td><td> </td><td>Blank screen. </td></tr>
-<tr><td><tt>screenmode</tt></td><td> </td><td>Sets the specified screen mode. </td></tr>
-<tr><td><tt>sdiff</tt></td><td> </td><td>Side-by-side merge of file differences</td></tr>
-<tr><td><tt>seq</tt></td><td> </td><td>Print numbers from FIRST to LAST, in steps of INCREMENT. </td></tr>
-<tr><td><tt>setdecor</tt></td><td> </td><td>List and change decor. </td></tr>
-<tr><td><tt>setgcc</tt></td><td> </td><td>Prints or sets the current gcc version. </td></tr>
-<tr><td><tt>settype</tt></td><td> </td><td>Sets the MIME type, signature, and/or preferred application of one or more files. </td></tr>
-<tr><td><tt>setversion</tt></td><td> </td><td>Show version of file. </td></tr>
-<tr><td><tt>setvolume</tt></td><td> </td><td>Set the volume. </td></tr>
-<tr><td><tt>setwep</tt></td><td> </td><td>Provides WEP encryption. </td></tr>
-<tr><td><tt>sh</tt></td><td> </td><td>See bash. </td></tr>
-<tr><td><tt>sha1sum</tt></td><td> </td><td>Print or check SHA1 checksums. </td></tr>
-<tr><td><tt>shar</tt></td><td> </td><td>Makes so-called shell archives out of many files.</td></tr>
-<tr><td><tt>shred</tt></td><td> </td><td>Overwrite the specified files repeatedly. </td></tr>
-<tr><td><tt>shuf</tt></td><td> </td><td>Write a random permutation of the input lines to standard output. </td></tr>
-<tr><td><tt>shutdown</tt></td><td> </td><td>Shutdown the computer. </td></tr>
-<tr><td><tt>sleep</tt></td><td> </td><td>Pause for a specified number of seconds. </td></tr>
-<tr><td><tt>sort</tt></td><td> </td><td>Write sorted concatenation of all files to standard output. </td></tr>
-<tr><td><tt>spamdbm</tt></td><td> </td><td>Classify e-mail messages as spam and regular genuine messages. </td></tr>
-<tr><td><tt>split</tt></td><td> </td><td>Output fixed-size pieces of input files to files with prefixes. </td></tr>
-<tr><td><tt>stat</tt></td><td> </td><td>Display file or file system status. </td></tr>
+<tr><td><tt>ps</tt></td><td> </td><td>Lists running processes. </td></tr>
+<tr><td><tt>ptx</tt></td><td> </td><td>Outputs a permuted index, including context, of the words in the input files.</td></tr>
+<tr><td><tt>pwd</tt></td><td> </td><td>Prints current directory. </td></tr>
+<tr><td><tt>query</tt></td><td> </td><td>A shell utility emulating Tracker's "Find by formula" functionality.  <a href="cli-apps.html">(Haiku specific)</a></td></tr>
+<tr><td><tt>quit</tt></td><td> </td><td>Quits an application. </td></tr>
+<tr><td><tt>rc</tt></td><td> </td><td>Resource compiler</td></tr>
+<tr><td><tt>readlink</tt></td><td> </td><td>Prints the path to the destination of a symbolic link.</td></tr>
+<tr><td><tt>reindex</tt></td><td> </td><td>Puts attributes of existing files into newly created indexes. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
+<tr><td><tt>release</tt></td><td> </td><td>Releases a semaphore. </td></tr>
+<tr><td><tt>renice</tt></td><td> </td><td>Alters the priority of a running process. </td></tr>
+<tr><td><tt>rlog</tt></td><td> </td><td>Prints log messages and other information about RCS files.</td></tr>
+<tr><td><tt>rm</tt></td><td> </td><td>Removes files and directories. </td></tr>
+<tr><td><tt>rmattr</tt></td><td> </td><td>Removes an attribute from a file.  <a href="cli-apps.html">(Haiku specific)</a></td></tr>
+<tr><td><tt>rmdir</tt></td><td> </td><td>Removes directories.</td></tr>
+<tr><td><tt>rmindex</tt></td><td> </td><td>Removes the index for an attribute. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
+<tr><td><tt>roster</tt></td><td> </td><td>Prints information about running teams. </td></tr>
+<tr><td><tt>route</tt></td><td> </td><td>Lists and manipulates network routes. </td></tr>
+<tr><td><tt>safemode</tt></td><td> </td><td>Checks if the system is running in safemode. </td></tr>
+<tr><td><tt>screen_blanker</tt></td><td> </td><td>Starts the screen blanker.</td></tr>
+<tr><td><tt>screenmode</tt></td><td> </td><td>Show/sets the screen mode. </td></tr>
+<tr><td><tt>sdiff</tt></td><td> </td><td>Shows or merges differences of two files side-by-side.</td></tr>
+<tr><td><tt>seq</tt></td><td> </td><td>Prints a sequence of numbers.</td></tr>
+<tr><td><tt>setdecor</tt></td><td> </td><td>Shows/sets the decorator. </td></tr>
+<tr><td><tt>setgcc</tt></td><td> </td><td>Shows/sets the used gcc version. </td></tr>
+<tr><td><tt>settype</tt></td><td> </td><td>Sets the MIME type, signature and preferred application of a file. </td></tr>
+<tr><td><tt>setversion</tt></td><td> </td><td>Shows the version of a file.</td></tr>
+<tr><td><tt>setvolume</tt></td><td> </td><td>Sets the system sound volume. </td></tr>
+<tr><td><tt>setwep</tt></td><td> </td><td>Provides WEP encryption for wireless networks. </td></tr>
+<tr><td><tt>sh</tt></td><td> </td><td>See <tt>bash</tt>. </td></tr>
+<tr><td><tt>sha1sum</tt></td><td> </td><td>Prints or checks SHA1 checksums. </td></tr>
+<tr><td><tt>shar</tt></td><td> </td><td>Creates shell archives.</td></tr>
+<tr><td><tt>shred</tt></td><td> </td><td>Overwrites a file repeatedly. </td></tr>
+<tr><td><tt>shuf</tt></td><td> </td><td>Prints a random permutation of the input lines.</td></tr>
+<tr><td><tt>shutdown</tt></td><td> </td><td>Shuts down the computer. </td></tr>
+<tr><td><tt>sleep</tt></td><td> </td><td>Pauses for a specified number of seconds. </td></tr>
+<tr><td><tt>sort</tt></td><td> </td><td>Prints a sorted concatenation of all files.</td></tr>
+<tr><td><tt>spamdbm</tt></td><td> </td><td>Classifies e-mail messages as spam or genuine. </td></tr>
+<tr><td><tt>split</tt></td><td> </td><td>Outputs fixed-size pieces of input files to files with prefixes. </td></tr>
+<tr><td><tt>stat</tt></td><td> </td><td>Displays file or file system status. </td></tr>
 <tr><td><tt>strace</tt></td><td> </td><td>Traces the syscalls of a thread or a team. </td></tr>
-<tr><td><tt>stty</tt></td><td> </td><td>Print or change terminal characteristics. </td></tr>
-<tr><td><tt>su</tt></td><td> </td><td>Change the effective user id and group. </td></tr>
-<tr><td><tt>sum</tt></td><td> </td><td>Print checksum and block counts for each file. </td></tr>
-<tr><td><tt>sync</tt></td><td> </td><td>Force changed blocks to disk, update the super block. </td></tr>
-<tr><td><tt>sysinfo</tt></td><td> </td><td>Show system info. </td></tr>
+<tr><td><tt>stty</tt></td><td> </td><td>Shows/sets terminal characteristics. </td></tr>
+<tr><td><tt>su</tt></td><td> </td><td>Changes the effective user id and group. </td></tr>
+<tr><td><tt>sum</tt></td><td> </td><td>Prints checksum and block counts for each file. </td></tr>
+<tr><td><tt>sync</tt></td><td> </td><td>Forces changed blocks to disk, updates the super block. </td></tr>
+<tr><td><tt>sysinfo</tt></td><td> </td><td>Shows system info. </td></tr>
 <tr><td colspan="3"><a id="T" name="T"><h2><a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>T</h2></a></td></tr>
-<tr><td><tt>tac</tt></td><td> </td><td>Write each file to standard output, last line first. </td></tr>
-<tr><td><tt>tail</tt></td><td> </td><td>Print the last ten lines of each file to standard output. </td></tr>
-<tr><td><tt>tcpdump</tt></td><td> </td><td>Dump traffic on a network. </td></tr>
+<tr><td><tt>tac</tt></td><td> </td><td>Concatenates and prints files, last line first. </td></tr>
+<tr><td><tt>tail</tt></td><td> </td><td>Prints the last ten lines of a file.</td></tr>
+<tr><td><tt>tcpdump</tt></td><td> </td><td>Dumps traffic of a network. </td></tr>
 <tr><td><tt>tcptester</tt></td><td> </td><td>[deprecated] </td></tr>
-<tr><td><tt>tee</tt></td><td> </td><td>Copy standard input to each file and also to standard output. </td></tr>
+<tr><td><tt>tee</tt></td><td> </td><td>Writes or appends data from standard input to a file.</td></tr>
 <tr><td><tt>telnet</tt></td><td> </td><td>User interface to the telnet protocol. </td></tr>
-<tr><td><tt>telnetd</tt></td><td> </td><td>Telnet daemon. </td></tr>
-<tr><td><tt>test</tt></td><td> </td><td>Check file types and compare values. </td></tr>
-<tr><td><tt>timeout</tt></td><td> </td><td>Start command and kill it if still running after a specified number of seconds. </td></tr>
-<tr><td><tt>top</tt></td><td> </td><td>Display tasks. </td></tr>
-<tr><td><tt>touch</tt></td><td> </td><td>Change file timestamps. </td></tr>
-<tr><td><tt>tput</tt></td><td> </td><td>Initialize a terminal or query terminfo database. </td></tr>
-<tr><td><tt>tr</tt></td><td> </td><td>Translate, squeeze and/or delete characters from the standard input, writing to standard output.</td></tr>
-<tr><td><tt>traceroute</tt></td><td> </td><td>Print the route packets trace to network host.</td></tr>
-<tr><td><tt>translate</tt></td><td> </td><td>Translate app. </td></tr>
-<tr><td><tt>trash</tt></td><td> </td><td>Send files to trash or restore them. </td></tr>
-<tr><td><tt>true</tt></td><td> </td><td>Do nothing, successfully. </td></tr>
-<tr><td><tt>truncate</tt></td><td> </td><td>Shrink or extend the size of each file to the specified size. </td></tr>
-<tr><td><tt>tsort</tt></td><td> </td><td>Write totally ordered list consistent with the  partial ordering in file. </td></tr>
-<tr><td><tt>tty</tt></td><td> </td><td>Print the file name of the terminal connected to the standard output.</td></tr>
-<tr><td><tt>uname</tt></td><td> </td><td>Print certain system information. </td></tr>
-<tr><td><tt>unchop</tt></td><td> </td><td>Recreate a file previously split with chop. </td></tr>
-<tr><td><tt>unexpand</tt></td><td> </td><td>Convert blanks in each file to tabs, writing to standard output. </td></tr>
-<tr><td><tt>uniq</tt></td><td> </td><td>Filter adjacent matching lines from input writing to output. </td></tr>
-<tr><td><tt>unlink</tt></td><td> </td><td>Call the unlink function to remove the specified file. </td></tr>
-<tr><td><tt>unmount</tt></td><td> </td><td>Unmount partition. </td></tr>
-<tr><td><tt>unrar</tt></td><td> </td><td>Unrar file. </td></tr>
-<tr><td><tt>unshar</tt></td><td> </td><td>Unshar file. </td></tr>
-<tr><td><tt>untrash</tt></td><td> </td><td>See trash. </td></tr>
-<tr><td><tt>unzip</tt></td><td> </td><td>Unzip file. </td></tr>
-<tr><td><tt>unzipsfx</tt></td><td> </td><td>Extract files in list, except those specified.</td></tr>
-<tr><td><tt>updatedb</tt></td><td> </td><td>Update a database for locate. </td></tr>
-<tr><td><tt>uptime</tt></td><td> </td><td>Prints the current date and time, as well as the time elapsed since the system was started. </td></tr>
-<tr><td><tt>urlwrapper</tt></td><td> </td><td>Wrap URL mime types around command line or other apps that don't handle them directly. </td></tr>
-<tr><td><tt>useradd</tt></td><td> </td><td>Create new user. </td></tr>
-<tr><td><tt>uudecode</tt></td><td> </td><td>Create the specified file, decoding as you go. </td></tr>
-<tr><td><tt>uuencode</tt></td><td> </td><td>Encode a file so it can be mailed to a remote system. </td></tr>
-<tr><td><tt>vdir</tt></td><td> </td><td>List information about files. </td></tr>
+<tr><td><tt>telnetd</tt></td><td> </td><td>Telnet daemon</td></tr>
+<tr><td><tt>test</tt></td><td> </td><td>Returns true/false after comparing items.</td></tr>
+<tr><td><tt>timeout</tt></td><td> </td><td>Starts a command and kills it if it's still running after a specified number of seconds. </td></tr>
+<tr><td><tt>top</tt></td><td> </td><td>Displays running threads and CPU usage.</td></tr>
+<tr><td><tt>touch</tt></td><td> </td><td>Changes a file's timestamp. </td></tr>
+<tr><td><tt>tput</tt></td><td> </td><td>Initializes a terminal or query terminfo database. </td></tr>
+<tr><td><tt>tr</tt></td><td> </td><td>Translates, squeezes and/or deletes characters from standard input.</td></tr>
+<tr><td><tt>traceroute</tt></td><td> </td><td>Prints the route packets take through a network.</td></tr>
+<tr><td><tt>translate</tt></td><td> </td><td>Uses DataTranslators to convert file formats.</td></tr>
+<tr><td><tt>trash</tt></td><td> </td><td>Sends files to trash or restores them. </td></tr>
+<tr><td><tt>true</tt></td><td> </td><td>Does nothing, indicates "success" and returns the value "0".</td></tr>
+<tr><td><tt>truncate</tt></td><td> </td><td>Shrinks or extends the size of a file.</td></tr>
+<tr><td><tt>tsort</tt></td><td> </td><td>Does a topological sorting.</td></tr>
+<tr><td><tt>tty</tt></td><td> </td><td>Prints the file name of the terminal connected to standard input.</td></tr>
+<tr><td><tt>uname</tt></td><td> </td><td>Prints out system information. </td></tr>
+<tr><td><tt>unchop</tt></td><td> </td><td>Recreates a file previously split with <tt>chop</tt>. </td></tr>
+<tr><td><tt>unexpand</tt></td><td> </td><td>Converts spaces to tabs.</td></tr>
+<tr><td><tt>uniq</tt></td><td> </td><td>Filters adjacent matching lines from input, writing to output. </td></tr>
+<tr><td><tt>unlink</tt></td><td> </td><td>Calls the unlink function to remove the specified file. </td></tr>
+<tr><td><tt>unmount</tt></td><td> </td><td>Unmounts a volume.</td></tr>
+<tr><td><tt>unrar</tt></td><td> </td><td>Expands a rar archive.</td></tr>
+<tr><td><tt>unshar</tt></td><td> </td><td>Expands a shar archive.</td></tr>
+<tr><td><tt>untrash</tt></td><td> </td><td>See <tt>trash</tt>. </td></tr>
+<tr><td><tt>unzip</tt></td><td> </td><td>Expands a zip archive.</td></tr>
+<tr><td><tt>unzipsfx</tt></td><td> </td><td>Used to make existing zip archives self-extracting.</td></tr>
+<tr><td><tt>updatedb</tt></td><td> </td><td>Updates a localization database.</td></tr>
+<tr><td><tt>uptime</tt></td><td> </td><td>Prints date and time, as well as the time elapsed since the system was started. </td></tr>
+<tr><td><tt>urlwrapper</tt></td><td> </td><td>Wraps URL MIME types around command line or other apps that don't handle them directly. </td></tr>
+<tr><td><tt>useradd</tt></td><td> </td><td>Creates a new user. </td></tr>
+<tr><td><tt>uudecode</tt></td><td> </td><td>Decodes a uuencoded file.</td></tr>
+<tr><td><tt>uuencode</tt></td><td> </td><td>Uuencodes a file so it can be mailed to a remote system. </td></tr>
+<tr><td><tt>vdir</tt></td><td> </td><td>Lists information about files. </td></tr>
 <tr><td><tt>version</tt></td><td> </td><td>Returns the version of a file. </td></tr>
-<tr><td><tt>vmstat</tt></td><td> </td><td>Print system info. </td></tr>
-<tr><td><tt>waitfor</tt></td><td> </td><td>Wait for process events. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
-<tr><td><tt>watch</tt></td><td> </td><td>Execute a program periodically. </td></tr>
-<tr><td><tt>wc</tt></td><td> </td><td>Print newline, word and byte counts for each file. </td></tr>
-<tr><td><tt>wget</tt></td><td> </td><td>The non-interactive network downloader. </td></tr>
-<tr><td><tt>which</tt></td><td> </td><td>Locate a command. </td></tr>
-<tr><td><tt>whoami</tt></td><td> </td><td>Print user name associated with the current effective user ID. </td></tr>
-<tr><td><tt>xargs</tt></td><td> </td><td>Build and execute command lines from standard input. </td></tr>
-<tr><td><tt>xres</tt></td><td> </td><td>List and manipulate resources. </td></tr>
-<tr><td><tt>yes</tt></td><td> </td><td>Output a string repeatedly until killed. </td></tr>
-<tr><td><tt>zcat</tt></td><td> </td><td>See gzip.</td></tr>
-<tr><td><tt>zcmp</tt></td><td> </td><td>See zdiff. </td></tr>
-<tr><td><tt>zdiff</tt></td><td> </td><td>Compare compressed files. </td></tr>
-<tr><td><tt>zforce</tt></td><td> </td><td>Force a '.gz' extension on all gzip files. </td></tr>
-<tr><td><tt>zgrep</tt></td><td> </td><td>Search possibly compressed files for a regular expression. </td></tr>
-<tr><td><tt>zip</tt></td><td> </td><td>Add or replace zipfile entries from list. </td></tr>
-<tr><td><tt>zipcloak</tt></td><td> </td><td>Encrypt all unencrypted entries in a zip file. </td></tr>
-<tr><td><tt>zipgrep</tt></td><td> </td><td>Searches the given zip members for a string or pattern. </td></tr>
-<tr><td><tt>zipinfo</tt></td><td> </td><td>See unzip.</td></tr>
-<tr><td><tt>zipnote</tt></td><td> </td><td>Write the comments in zipfile to stdout. </td></tr>
-<tr><td><tt>zipsplit</tt></td><td> </td><td>Split a zip file into smaller pieces. </td></tr>
-<tr><td><tt>zmore</tt></td><td> </td><td>Like 'more' but operate on the uncompressed contents of any compressed files.</td></tr>
-<tr><td><tt>znew</tt></td><td> </td><td>Recompress .Z files into .gz (gzip) files</td></tr>
+<tr><td><tt>vmstat</tt></td><td> </td><td>Prints information about the virtual memory system.</td></tr>
+<tr><td><tt>waitfor</tt></td><td> </td><td>Waits until a certain thread appears. <a href="cli-apps.html">(Haiku specific)</a></td></tr>
+<tr><td><tt>watch</tt></td><td> </td><td>Executes a program periodically. </td></tr>
+<tr><td><tt>wc</tt></td><td> </td><td>Prints the number of paragraphs, words and characters (bytes) of a file. </td></tr>
+<tr><td><tt>wget</tt></td><td> </td><td>Tool for downloading via HTTP, HTTPS or FTP</td></tr>
+<tr><td><tt>which</tt></td><td> </td><td>Locates a command. </td></tr>
+<tr><td><tt>whoami</tt></td><td> </td><td>Prints user name associated with the current effective user ID. </td></tr>
+<tr><td><tt>xargs</tt></td><td> </td><td>Builds and executes command lines from standard input. </td></tr>
+<tr><td><tt>xres</tt></td><td> </td><td>Lists and manipulates resources. </td></tr>
+<tr><td><tt>yes</tt></td><td> </td><td>Prints out a string repeatedly until killed. </td></tr>
+<tr><td><tt>zcat</tt></td><td> </td><td>See <tt>gzip</tt>.</td></tr>
+<tr><td><tt>zcmp</tt></td><td> </td><td>See <tt>zdiff</tt>. </td></tr>
+<tr><td><tt>zdiff</tt></td><td> </td><td>Compares compressed files. </td></tr>
+<tr><td><tt>zforce</tt></td><td> </td><td>Forces a '.gz' extension on gzip files. </td></tr>
+<tr><td><tt>zgrep</tt></td><td> </td><td>Scan through possibly compressed files for a regular expression. </td></tr>
+<tr><td><tt>zip</tt></td><td> </td><td>Adds or replaces items in a zip archive.</td></tr>
+<tr><td><tt>zipcloak</tt></td><td> </td><td>Encrypts all unencrypted items in a zip archive. </td></tr>
+<tr><td><tt>zipgrep</tt></td><td> </td><td>Scans the given zip items for a string or pattern. </td></tr>
+<tr><td><tt>zipinfo</tt></td><td> </td><td>See <tt>unzip</tt>.</td></tr>
+<tr><td><tt>zipnote</tt></td><td> </td><td>Prints the comments in a zip archive.</td></tr>
+<tr><td><tt>zipsplit</tt></td><td> </td><td>Splits a zip archive into smaller pieces. </td></tr>
+<tr><td><tt>zmore</tt></td><td> </td><td>Like <tt>more</tt> but operates on the uncompressed contents of any compressed file.</td></tr>
+<tr><td><tt>znew</tt></td><td> </td><td>Recompresses .Z files into .gz (gzip) archives.</td></tr>
 </table>
 </div>
 </div>

docs/userguide/jp/applications/mediaplayer.html

@@ -4,11 +4,11 @@
 <head>
 <!-- 
  *
- * Copyright 2008, Haiku. All rights reserved.
+ * Copyright 2010, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
- *		Humdinger <[email protected]>
+ *		Szymon Barczak (Google Code-In student)
  *
 -->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
@@ -56,11 +56,54 @@
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/MediaPlayer</span></td></tr>
 </table>
 <p><br /></p>
-<p>ドキュメントはまだ存在しません。ドキュメントについて作業を行いたいときは、重複を避けるため<a href="http://www.freelists.org/list/haiku-doc">Documentation mailing list</a>でお知らせください。</p>
+<p>MediaPlayer is an application used for viewing multimedia files such as music or video files. It supports different formats.</p>
+
+<p><b>Interface</b></p>
+
+<p>MediaPlayer is easy-to-use because of its interface. There's no difference in interface while playing music or video.</p>
+
+<img src="../images/apps-images/mediaplayer.png" alt="mediaplayer.png" />
+
+<p>You can control playing media using a set of buttons - previous, play/pause, stop, next. Also, there is a progress bar, a volume controler and even an oscilloscope.</p>
+
+<div class="box-info">Once you play a video file, you can double right-click on the display to hide interface. Double left-click instead causes displaying video in full-screen mode.</div>
+
+<p><b>Playing media</b></p>
+
+<p>There are options especially useful while watching DVD video or other files which include different audio/video tracks or have subtitles included. You can change audio tracks from <span class="menu">Audio | Track</span> just as <span class="menu">Video | Track</span> for various video tracks. You can also make use of subtitles, MediaPlayer supports .srt format. All available subtitles are showed as options in <span class="menu">Video | Subtitles</span> menu. The player gets names for this positions from the filename, eg. videoclip.english.srt shows as "english" in the menu.</p>
+
+<img src="../images/apps-images/mediplayer-video_menu.png" alt="video-menu" />
+
+<p>You can change the scale by resizing the window or simply from the <span class="menu">Video</span> menu. There are 50%, 100%, 200%, 300% and 400% options. There is an option to change the player to full-screen mode or to change ratio of the display.</p>
+
+<p><b>Playlists</b></p>
+
+<p>MediaPlayer supports playlists. You can either select a few files in Tracker using <span class="key">ALT</span> and launched the application or add other files after launching the one using the drag and drop method. You can get to the playlist from menu - choose <span class="menu">MediaPlayer | Playlist</span> and the playlist window will pop-up.</p>
+
+<img src="../images/apps-images/mediaplayer-playlist.png" alt="playlist" />
+
+<p>You can save the current playlist or open one from the playlist window, of course. There is also a function that lets you to randomize your playlist. Use either <span class="menu">Edit | Randomize</span> menu position or <span class="key">ALT</span> <span class="key">R</span> shortcut. You can also both remove any file from playlist and remove it from playlist and put into Trash. This functions are available from <span class="menu">Edit</span> menu, too.</p>
+
+<p><b>Other options</b></p>
+
+<p>If you would like to rate a file, you can do this directly from MediaPlayer, too! Choose a rate from 1 to 10 from <span class="menu">Attributes | Rating</span> menu.</p>
+
+<p>MediaPlayer is also able to show you some information about the file you play. It is available from <span class="menu">MediaPlayer | File info... </span> menu.</p>
+
+<img src="../images/apps-images/mediplayer-settings.png" alt="settings" />
+
+<p>You can configure the application from <span class="menu">MediaPlayer | Settings</span>. There are some interesting options concerning looping playback, closing window when playback finishes, size and placement of subtitles or volume level while playing in the background.</p>
+
+<p><b>Shortcuts</b></p>
+
+<p>There are plenty of shortcuts for this application. <span class="key">SPACEBAR</span> is used to play/pause the playback. You can control the whole playback with one hand, because alternate keys are used - <span class="key">Z</span> to go to the previous track, <span class="key">X</span> to play, <span class="key">C</span> to pause and <span class="key">V</span> to go to the next track. Left/Right cursors are used to seek, they cause 10 seconds seeking while <span class="key">ALT</span> is pressed at the same time. Up and down cursors controls the volume and cause going to the previous/next track while <span class="key">ALT</span> is pressed.</p>
+
+<p><span class="key">ALT</span> <span class="key">F</span> activates full-screen mode, <span class="key">ALT</span> <span class="key">P</span> pops-up playlist window, <span class="key">ALT</span> <span class="key">I</span> shows file information, <span class="key">ALT</span> <span class="key">H</span> hides interface, <span class="key">ALT</span> <span class="key">A</span> causes MediaPlayer is always on top, <span class="key">ALT</span> <span class="key">S</span> moves you to the settings window and <span class="key">ALT</span> <span class="key">Q</span> quits the application.</p>
+
 
 </div>
 </div>
-<!--
+
 <div class="nav">
 <div class="inner"><span>
  «  <a href="mail.html">Mail</a> 
@@ -68,6 +111,6 @@
 ::  <a href="midiplayer.html">MidiPlayer</a>  »
 </span></div>
 </div>
--->
+
 </body>
 </html>

docs/userguide/jp/applications/showimage.html

@@ -4,11 +4,11 @@
 <head>
 <!-- 
  *
- * Copyright 2008, Haiku. All rights reserved.
+ * Copyright 2010, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
- *		Humdinger <[email protected]>
+ *		Szymon Barczak (Google Code-In student)
  *
 -->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
@@ -57,12 +57,47 @@ double-clicking a supported file.</i></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/ShowImage_settings</span></td></tr>
 </table>
 <p><br /></p>
-<p>ドキュメントはまだ存在しません。ドキュメントについて作業を行いたいときは、重複を避けるため<a href="http://www.freelists.org/list/haiku-doc">Documentation mailing list</a>でお知らせください。</p>
+<p>ShowImage is an application used for viewing images in various formats. Its funcionality is not limited only to viewing photos, it can also crop images, show slideshows, rotate and flip images.</p>
+
+<p>If you want to launch this application, simply double-click on some image on your computer.</p>
+
+<p><b>Browse photos</b></p>
+
+<p>You are not limited to viewing only the image you used to launch application. You can go both to previous or to next image from the folder using arrows on keybord. You can also zoom using either mouse scroll or shortcuts - <span class="key">ALT</span> <span class="key">+</span> for zooming in and <span class="key">ALT</span> <span class="key">-</span> for zooming out. High-quality zooming is set by default, but you can disable this function unchecking <span class="menu">View | High-quality zooming</span>. This function does very fast bilinear filtering.</p>
+
+<p>There is a possibility to simply zoom picture to the original size or to fit to the window size. Use <span class="menu">View</span> menu or shortcuts - <span class="key">ALT</span> <span class="key">1</span> to get back to the original size or <span class="key">ALT</span> <span class="key">0</span> to fit to the window size. From the same menu you can also enable stretching an image to the window.</p>
+
+<img src="../images/apps-images/showimage-tiff.png" alt="tiff" />
+
+<p>ShowImage does support multiple-page files, such as TIFF. It means you can turn pages while browsing any multiple-page image. Make use of <span class="menu">Browse</span> menu or use shortcuts (see screenshot above) for this function.</p>
+
+<p>To change mode to full-screen, simply choose <span class="key">ALT</span> <span class="key">ENTER</span> shortcut.</p>
+
+<p><b>Slide show</b></p>
+
+<p>You can run slideshow using menu, simply choose <span class="menu">View | Slide show</span>. There is an option for changing slide delay from 3 to 20 seconds. Default value is a 3 second delay, but you can change it from <span class="menu">View | Slide delay</span> menu.</p>
+
+<p><b>Flip and rotate images</b></p>
+
+<p>This function is also built-in. If you would like to rotate some image, choose proper position from <span class="menu">Image</span> menu or use shortcuts - <span class="key">ALT</span> <span class="key">R</span> will rorate your image clockwise and <span class="key">SHIFT</span> <span class="key">ALT</span> <span class="key">R</span> counterclockwise.</p>
+
+<p>You can also flip images. <span class="menu">Image | Flip left to right</span> will flip your image horizontally and <span class="menu">Image | Flip top to bottom</span> vertically.</p>
+
+<p><b>Set background</b></p>
+
+<p>You can set your desktop background directly from ShowImage. Just choose <span class="menu">Image | Use as background...</span> and Backgrounds preflet will pop-up.</p>
+
+<p><b>Drag and drop</b></p>
+
+<p>There is an option to select a piece of an image and create new image file from the selection. Simply press <span class="key">CTRL</span> or <span class="key">ALT</span> and select a fragment you would like to use as a new file and drag the selection to desktop. Also, you can change mode to selection mode, so you will be able to select parts of images using just a left mouse button. This option is available from <span class="menu">Edit | Selection Mode</span></p>
+
+<img src="../images/apps-images/showimage-drag_and_drop_selection.png" alt="showimage-drag_and_drop" />
+
+<div class="box-info">Once you use right mouse button to drag the selection, an image-format menu pops-up.</div>
 
 </div>
 </div>
 
-<!--
 <div class="nav">
 <div class="inner"><span>
  «  <a href="screenshot.html">Screenshot</a> 
@@ -70,6 +105,6 @@ double-clicking a supported file.</i></td></tr>
 ::  <a href="soundrecorder.html">SoundRecorder</a>  »
 </span></div>
 </div>
--->
+
 </body>
 </html>

docs/userguide/jp/applications/webpositive.html

@@ -8,7 +8,7 @@
  * Distributed under the terms of the MIT License.
  *
  * Authors:
- *		Omar Rizwan
+ *		Omar Rizwan (Google Code-In student)
  *		Humdinger <[email protected]>
  *
 -->

docs/userguide/jp/deskbar.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>
 
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>目次</td></tr>
@@ -75,7 +74,7 @@
 <li><p><b>About This System...</b> - システムについての基本的な情報と、Haikuプロジェクトのライセンスやクレジットを表示します。</p></li>
 
 <li><p><b>Find...</b> - <a href="queries.html">Query</a>ダイアログを開きます。</p></li>
-<li><p><b>Show Replicants</b> - Shows/hides the little <a href="gui.html#replicants">Replicant</a> widget you use to drag it around, remove or access its context menu.</p></li>
+<li><p><b>Show Replicants</b> - 小さなウィジェットである<a href="gui.html#replicants">レプリカント</a>の表示/非表示を切り替えます。ドラッグ操作、削除、コンテキストメニューへのアクセスができます。</p></li>
 <li><p><b>Mount</b> - デスクトップを右クリックして呼び出された際のオプションを提供します。 (<a href="tracker.html#mounting-volumes">Mounting Volumes</a>を参照)</p></li>
 <li><p><b>Deskbar Preferences...</b> - デスクバーを設定するためのパネルを開きます。(下を参照)</p></li>
 <li><p><b>Shutdown</b> - <span class="menu">Restart System</span>(再起動)か<span class="menu">Powe Off</span>(電源オフ)を選んで実行します。</p></li>
@@ -97,12 +96,12 @@
 <tr><td><span class="menu">Always on top</span></td><td> </td><td>デスクバーが常に最前面に来ます。</td></tr>
 <tr><td><span class="menu">Auto raise</span></td><td> </td><td>デスクバーにマウスポインターが触れると前面に来ます。</td></tr>
 </table></li>
-<li><p><b>Applications</b></p>
+<li><p><b>Applications(アプリケーション)</b></p>
 <table summary="layout" border="0" cellpadding="2" cellspacing="0">
-<tr><td><span class="menu">Sort running applications</span></td><td> </td><td>Sorts the list of running programs alphabetically.</td></tr>
-<tr><td><span class="menu">Tracker always first</span></td><td> </td><td>Even if you sort alphabetically, the Tracker entry always stays first in the list.</td></tr>
-<tr><td class="onelinetop"><span class="menu">Show application expander</span></td><td> </td><td>Provides a small widget to show/hide all windows of a program directly under its entry in the Deskbar.</td></tr>
-<tr><td><span class="menu">Expand new applications</span></td><td> </td><td>Newly launched programs have their windows automatically expanded under their entry in the Deskbar.</td></tr>
+<tr><td><span class="menu">Sort running applications</span></td><td> </td><td>実行中のアプリケーションの一覧をアルファベット順に並べ替えます。</td></tr>
+<tr><td><span class="menu">Tracker always first</span></td><td> </td><td>アルファベット順に並べ替えた後も、トラッカーの項目を常に一覧の先頭に配置します。</td></tr>
+<tr><td class="onelinetop"><span class="menu">Show application expander</span></td><td> </td><td>指定プログラムの全ウィンドウを表示/非表示にする、小さなウィジェットを提供します。</td></tr>
+<tr><td><span class="menu">Expand new applications</span></td><td> </td><td>新しく起動したプログラムのウィンドウを自動的に開きます。</td></tr>
 </table></li>
 <li><p><b>時計</b></p>
 <table summary="layout" border="0" cellpadding="2" cellspacing="0">
@@ -123,7 +122,7 @@
 <img src="images/deskbar-images/list-of-apps.png" alt="list-of-apps.png" />
 <p>デスクバーの項目をクリックし、サブメニューからウィンドウを選ぶことで、実行中のアプリケーションを選択することができます。右クリックでウィンドウや項目のアプリケーションを最小化、あるいは閉じることができます。</p>
 <p>デスクバーの設定でエキスパンダーを有効にしている場合、アプリケーションのウィンドウの一覧を展開/折りたたみできます。</p>
-<p>全てのアプリケーションのウィンドウの前には、状態の情報を示すシンボルが付いています。明るいシンボルはウィンドウが可視であること、暗いものは最小化されていることを意味します。シンボルの前に引かれている3本の線は、 ウィンドウが現在のワークスペースにないことを示しています。</p>
+<p>すべてのアプリケーションのウィンドウの前には、状態の情報を示すシンボルが付いています。明るいシンボルはウィンドウが可視であること、暗いものは最小化されていることを意味します。シンボルの前に引かれている3本の線は、 ウィンドウが現在のワークスペースにないことを示しています。</p>
 
 </div>
 </div>

docs/userguide/jp/desktop-applets.html

@@ -56,11 +56,11 @@
 	<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>
 	<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"><span style="color:silver">Is your connection up? [<i>still missing</i>]</span></td></tr>
+		<td valign="top">Is your connection up?</td></tr>
 	<tr><td><img src="../images/desktop-applets-images/powerstatus-icon_16.png" alt="icon" width="16" height="16" /></td><td><a href="desktop-applets/powerstatus.html">PowerStatus</a></td><td> </td>
-		<td valign="top"><span style="color:silver">Shows the state of charge of your notebook's battery.[<i>still missing</i>]</span></td></tr>
+		<td valign="top">Shows the state of charge of your notebook's battery.</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"><span style="color:silver">See and control every running app and service.[<i>still missing</i>]</span></td></tr>
+		<td valign="top">Monitor and control every running app and service.</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>
 </table>

docs/userguide/jp/desktop-applets/networkstatus.html

@@ -8,7 +8,7 @@
  * Distributed under the terms of the MIT License.
  *
  * Authors:
- *		Maciej Bałuta
+ *		Maciej Bałuta  (Google Code-In student)
  *		Humdinger <[email protected]>
  *
 -->
@@ -56,12 +56,12 @@
 <tr><td>場所:</td><td></td><td><span class="path">/boot/system/apps/NetworkStatus</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><i>none</i></td></tr>
 </table>
-<p>NetworkStatus shows the status of your network connections. If it's not yet running, launching the applet will ask if it should open in window mode or live in the Deskbar tray. In window mode you're able to resize the icon by resizing the window and use the <a href="../gui.html#replicants">Replicant</a> handle to drag it to the Desktop.<br />
-Wherever it's installed, it's operated via a right-click context menu.</p>
+<p>NetworkStatus shows the status of your network connections. If not yet running, launching the applet will ask if it should open in window mode or live in the Deskbar. In window mode you're able to resize the icon by resizing the window and use the <a href="../gui.html#replicants">Replicant</a> handle to drag it to the Desktop.<br />
+Wherever installed, it's operated via a right-click context menu.</p>
 <p><img src="../images/networkstatus-images/applet.png" alt="NetworkStatus applet" /><br />
-The first section contains network devices' names with their state. Below are wireless networks found by the first wireless adapter. You can <span class="menu">Open network preferences...</span> to change your <a href="../preferences/network.html">network configuration</a> or <span class="menu">Quit</span> the applet.</p>
-<p><img src="../images/networkstatus-images/status.png" alt="NetworkStatus - status of the interface" /><br />
-Clicking on a network device's name in the context menu shows its IP, broadcast and netmask addresses.</p>
+The first section contains all network devices' names and their state. Clicking on such an entry brings up a window showing its IP, broadcast and netmask address.<br />
+Below is a list of all wireless networks found by the first wireless adapter and an indicator of their signal strength.<br />
+Lastly, you can <span class="menu">Open network preferences...</span> to change your <a href="../preferences/network.html">network configuration</a> or <span class="menu">Quit</span> the applet.</p>
 
 <h2>Status icons</h2>
 <table summary="status icons" border="0" cellspacing="0" cellpadding="2">

docs/userguide/jp/desktop-applets/powerstatus.html

@@ -8,7 +8,7 @@
  * Distributed under the terms of the MIT License.
  *
  * Authors:
- *		Maciej Bałuta
+ *		Maciej Bałuta (Google Code-In student)
  *		Humdinger <[email protected]>
  *
 -->
@@ -57,18 +57,18 @@
 <tr><td>Location:</td><td></td><td><span class="path">/boot/system/apps/PowerStatus</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/PowerStatus settings</span></td></tr>
 </table>
-<p>PowerStatus shows information about battery level, so it's only useful on mobile computers. If it's not yet running, launching the applet will ask if it should open in window mode or live in the Deskbar tray. In window mode you're able to resize the icon by resizing the window and use the <a href="../gui.html#replicants">Replicant</a> handle to drag it to the Desktop.<br />
-Wherever it's installed, it's operated via a right-click context menu.</p>
+<p>PowerStatus shows information about the battery level, so it's only useful on mobile computers. If not yet running, launching the applet will ask if it should open in window mode or live in the Deskbar. In window mode you're able to resize the icon by resizing the window and use the <a href="../gui.html#replicants">Replicant</a> handle to drag it to the Desktop.<br />
+Wherever installed, it's operated via a right-click context menu.</p>
 <p>Note: PowerStatus requires a working ACPI support.</p>
 <img src="../images/powerstatus-images/applet.png" alt="PowerStatus applet" />
 <p>The context menu offers these options:</p>
 <table summary="options" border="0" cellspacing="0" cellpadding="2">
 	<tr><td><span class="menu">Show text label</span></td><td style="width:10px"></td><td>Shows battery level in percent or remaining time.</td></tr>
 	<tr><td><span class="menu">Show status icon</span></td><td></td><td>Shows icon of the applet.</td></tr>
-	<tr><td><span class="menu">Show percent</span>/<span class="menu">Show time</span></td><td></td><td>Switch between showing battery level in percent or remaining time (<span class="menu">Show text label</span> has to be active).</td></tr>
+	<tr><td class="onelinetop"><span class="menu">Show percent / time</span></td><td></td><td>Switch between showing battery level in percent or remaining time (<span class="menu">Show text label</span> has to be active).</td></tr>
 	<tr><td><span class="menu">Battery info...</span></td><td></td><td>Shows the extended battery info window.</td></tr>
 	<tr><td><span class="menu">About...</span></td><td></td><td>Shows the About window.</td></tr>
-	<tr><td><span class="menu">Quit</span></td><td></td><td>Quits the PowerStatus applet</td></tr>
+	<tr><td><span class="menu">Quit</span></td><td></td><td>Quits the PowerStatus applet.</td></tr>
 
 </table>
 <p>When <span class="menu">Show text label</span> is active, the battery level is shown in brackets while charging.</p>

docs/userguide/jp/desktop-applets/processcontroller.html

@@ -8,7 +8,7 @@
  * Distributed under the terms of the MIT License.
  *
  * Authors:
- *		Maciej Bałuta
+ *		Maciej Bałuta  (Google Code-In student)
  *		Humdinger <[email protected]>
  *
 -->
@@ -57,42 +57,40 @@
 <tr><td>設定ファイル:</td><td></td><td><i>none</i></td></tr>
 </table>
 
-<p><img src="../images/processcontroller-images/applet.png" alt="ProcessController applet" style="float:left;margin: 0 4em 0 0" />The primary task of ProcessController applet is to show CPU(s) activity and amount of used memory. It allows monitoring of individual processes, change their priority, and kill them if the program freezes. In multiprocessor environments it allows you to disable individual processors/cores. When <a href="../tracker.html"><span class="app">Tracker</span></a> or <a href="../deskbar.html"><span class="app">Deskbar</span></a> crashes you can run it again from ProcessController's menu.</p>
-<p>Indicators on the left shows each CPU usage, while the bar on the right shows the memory consumption. Remember that the number of indicators depends on the number of processors in the computer.</p>
-
-<p>If not yet running, launching ProcessController will ask if it should open in window mode or live in the Deskbar tray. In window mode you're able to resize the icon by resizing the window and use the <a href="../gui.html#replicants">Replicant</a> handle to drag it to the Desktop.<br />
+<p><img src="../images/processcontroller-images/applet.png" alt="ProcessController applet" style="float:left;margin: 0 1em 0 0" />The primary task of the ProcessController applet is to show the activity of your CPU(s) and the amount of used memory. It allows monitoring of individual teams, change their priority, and kill them if the program freezes. In multiprocessor environments it allows you to disable individual processors/cores. When Tracker or Deskbar crash you can restart them from ProcessController's menu.</p>
+<p>Indicators on the left show each CPU's usage, while the bar on the right shows the memory consumption. Remember that the number of indicators depend on the number of processors/cores in the computer.</p>
+<p>If not yet running, launching ProcessController asks if it should open in window mode or live in the Deskbar. In window mode you can resize the bar-display by resizing the window and then use the <a href="../gui.html#replicants">Replicant</a> handle to drag it to the Desktop.<br />
 Wherever it's installed, it's operated via a right-click context menu.<br />
-To remove the applet again from your tray, uncheck <span class="menu">Live in the Deskbar</span> in its context menu.</p>
+To remove the applet again from the Deskbar, uncheck <span class="menu">Live in the Deskbar</span> in its context menu.</p>
 <h2>Quit an application</h2>
-<div class="box-stop">Remember that closing an application can cause data loss and additionally the system may stop working reliably.</div>
 <img src="../images/processcontroller-images/quit.png" alt="ProcessController - Quit an application" />
-<p>To quit an application just choose it's name from the <span class="menu">Quit an application</span> menu. This is a clean way to close app, just like when you would click the close button. There are some teams that cannot be quitted this way, mostly system processes.</p>
+<p>To quit an application just choose its name from the <span class="menu">Quit an application</span> menu. This is a clean way to close app, just like  clicking its close button. Be careful not to quit system processes like servers or daemons, however. Your system may stop working reliably. </p>
 <h2>Memory usage</h2>
 <img src="../images/processcontroller-images/memory.png" alt="ProcessController - Memory usage" />
-<div class="box-warning">Memory usage monitoring can be very inaccurate.</div>
-<p>This menu allows you to monitor memory usage of different teams in your system. Next to the team's name there are two columns: first with memory amount reserved for write, while the second shows all memory including read-only space (shared libraries for example).</p>
-<p>The first row <span class="menu">System resources &amp; caches...</span> shows total amount of memory used by system and all applications. The length of the blue bar is based on total physical memory in your computer. The next rows show memory used by each process. Please note that the length of the bar is based only on the used part of memory.</p>
+<p>Monitoring memory usage can be rather inaccurate.</p>
+<p>This menu allows you to monitor memory usage of different teams in your system. Next to the team's name there are two columns: first with the amount reserved for writable memory, while the second shows all memory including read-only space (shared libraries for example).</p>
+<p>The first row <i>System resources &amp; caches...</i> shows the total amount of memory used by the system and all applications. The length of the blue bar is based on the total physical memory in your computer. The next rows show memory used by each process. Note that the length of the bar is based only on the used part of memory.</p>
 <table>
 	<tbody>
 		<tr><td style="width:20px;height:20px;background:#1414E7"></td><td style="width:10px"></td><td>Memory used only by given application (with write access)</td></tr>
 		<tr><td style="height:20px;background:#A4A4F5"></td><td></td><td>Memory including read-only space (can be shared with other applications)</td></tr>
 	</tbody>
 </table>
+
 <h2>Threads and CPU usage</h2>
+<p>This menu allows you to change thread priorities, kill teams or debug them.</p>
+<div class="box-stop">Changes via the commands in this menu reach deep into the system and can cause data loss and system instability. Keep that mouse hand steady!</div>
 <img src="../images/processcontroller-images/priority.png" alt="ProcessController - Priority" />
-<div class="box-stop">Everything in this menu can cause data loss and system instability.</div>
-<p>This menu allows you to change thread priorities, kill processes or debug them.<br />
-At the first level you see team names, when you click on it, you can kill the whole team. The dark-blue part of the bar is spent in kernel code, the light-blue part in user code, the green part in the idle thread(s). A bar completely filled with blue means that the team is using all processing power.<br />
-At the second level there are particular threads. By clicking them you can debug or kill them. A bar completely filled with blue means that the thread is using completely one processor/core.<br />
-The last level of the menu allows you to change a thread's priority.
-</p>
 <table>
-	<tbody>
-		<tr><td style="width:20px;height:20px;background:#1414E7"></td><td style="width:10px"></td><td>Kernel code</td></tr>
-		<tr><td style="height:20px;background:#A4A4F5"></td><td></td><td>User code</td></tr>
-		<tr><td style="height:20px;background:#6EBE6E"></td><td></td><td>Idle thread</td></tr>
-	</tbody>
+	<tr><td style="width:20px;height:20px;background:#1414E7"></td><td style="width:10px"></td><td>Kernel code</td></tr>
+	<tr><td style="height:20px;background:#A4A4F5"></td><td></td><td>User code</td></tr>
+	<tr><td style="height:20px;background:#6EBE6E"></td><td></td><td>Idle thread</td></tr>
 </table>
+<p>At the first level you see team names. By clicking on one, you can kill the whole team. The dark-blue part of the bar is time spent in kernel code, the light-blue part in user code, the green part in the idle thread(s). A bar completely filled with blue means that the team is using all processoring power.</p>
+<p>The second level shows particular threads of a team. By clicking on one, you can debug or kill it. A bar completely filled with blue means that the thread is pegging one processor/core.</p>
+<p>The last level of the menu allows you to change a thread's priority. Be careful with that! As a rule of thumb the priority of a thread should be inverse its CPU usage. That is, the more it tries to claim CPU time, the lower should be it's priority. In general, don't mess with an app's priorities; contact its author, that's his business.
+</p>
+
 </div>
 </div>
 

docs/userguide/jp/preferences/appearance.html

@@ -51,7 +51,7 @@
 
 <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>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/system/app_server/appearance</span></td></tr>
 </table>
@@ -100,8 +100,8 @@ Antialiasing type</h3>
 <p><br /></p>
 <p>設定パネルの下の部分に、次の2つのボタンがあります:</p>
 <table summary="layout" border="0" cellpadding="2" cellspacing="0">
-<tr><td><span class="button">Defaults</span></td><td> </td><td>すべての設定をデフォルト値に戻します。</td></tr>
-<tr><td><span class="button">Revert</span></td><td> </td><td>Appearance preferenceを起動したときの設定に戻します。</td></tr>
+<tr><td><span class="button">デフォルト</span></td><td> </td><td>すべての項目をデフォルト値に戻します。</td></tr>
+<tr><td><span class="button">元に戻す</span></td><td> </td><td>Appearance preferenceを起動したときの設定に戻します。</td></tr>
 </table>
 
 </div>

docs/userguide/jp/preferences/backgrounds.html

@@ -43,7 +43,7 @@
 <span>
  «  <a href="appearance.html">Appearance</a> 
 ::  <a href="../preferences.html" class="uplink">Preferences</a> 
-::  <a href="datatranslations.html">データ転換</a>  »
+::  <a href="datatranslations.html">DataTranslations</a>  »
 </span></div>
 </div>
 
@@ -52,7 +52,7 @@
 
 <h2><img src="../../images/prefs-images/backgrounds-icon_64.png" alt="backgrounds-icon_64.png" width="64" height="64" />Backgrounds</h2>
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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/Backgrounds</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/system/app_server/workspaces</span><br />
 <span class="path">~/config/settings/Backgrounds settings</span> - パネルのウィンドウの位置が保存されます。</td></tr>
@@ -73,8 +73,8 @@
 <p>アイコン・ラベルの文字が実際は黒になるのか白になるのかは、スポイト・ツールの設定に依存します。暗い色が指定されていれば文字は白色で表示されますし、明るい色が指定されていれば文字は黒色で表示されます。従って、背景に非常に明るい画像を指定する場合は、アイコン・ラベルを黒色にして読めるようにするために、スポイト・ツールでは明るい色を指定すべきです(あるいは、上のアウトライン・オプションを有効にすべきです)。<br />
 Backgrounds preferencesで指定された色は、<a href="../desktop-applets/workspaces.html">Workspacesアプレット</a>にも反映されます。このとき背景の画像については無視されます。</p>
 <table summary="layout" border="0" cellpadding="2" cellspacing="0">
-<tr><td><span class="button">Revert</span></td><td> </td><td>Backgrouds preferencesが起動された時点で有効だった設定に戻します。</td></tr>
-<tr><td><span class="button">Apply</span></td><td> </td><td>変更を適応します。</td></tr>
+<tr><td><span class="button">元に戻す</span></td><td> </td><td>Backgrouds preferencesが起動された時点で有効だった設定に戻します。</td></tr>
+<tr><td><span class="button">適用</span></td><td> </td><td>変更を適応します。</td></tr>
 </table>
 
 </div>
@@ -84,7 +84,7 @@ Backgrounds preferencesで指定された色は、<a href="../desktop-applets/wo
 <div class="inner"><span>
  «  <a href="appearance.html">Appearance</a> 
 ::  <a href="../preferences.html" class="uplink">Preferences</a> 
-::  <a href="datatranslations.html">データ転換</a>  »
+::  <a href="datatranslations.html">DataTranslations</a>  »
 </span></div>
 </div>
 

docs/userguide/jp/preferences/datatranslations.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>データ転換</title>
+	<title>DataTranslations</title>
 	<link rel="stylesheet" type="text/css" href="../../Haiku-doc.css" />
 </head>
 <body>
@@ -50,14 +50,14 @@
 <div id="content">
 <div>
 
-<h2><img src="../../images/prefs-images/datatranslations-icon_64.png" alt="datatranslations-icon_64.png" width="64" height="64" />データ転換</h2>
+<h2><img src="../../images/prefs-images/datatranslations-icon_64.png" alt="datatranslations-icon_64.png" width="64" height="64" />DataTranslations</h2>
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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/DataTranslations</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/*</span> - デフォルトの設定を変更すると、トランスレーターごとに設定ファイルが置かれます。<br />
 <span class="path">~/config/settings/system/DataTranslations settings</span> - パネルのウィンドウ位置を保存します。</td></tr>
 </table>
-<p>全てのアプリケーションが、トランスレーターのインストールされているファイル形式でファイルを開いたり保存したりできます。データ転換の設定でトランスレーターを設定します。</p>
+<p>すべてのアプリケーションが、トランスレーターのインストールされているファイル形式でファイルを開いたり保存したりできます。データ転換の設定でトランスレーターを設定します。</p>
 <p><br /></p>
 <img src="../images/prefs-images/datatranslations.png" alt="datatranslations.png" />
 <p>トランスレーターの設定項目は機能に応じそれぞれ異なっていますが、Infoボタンを押すとクレジットとインストール先のパスが表示されます。<br />

docs/userguide/jp/preferences/deskbar.html

@@ -9,6 +9,8 @@
  *
  * Authors:
  *		Humdinger <[email protected]>
+ * Translators:
+ *		Kentaro Ozeki
  *
 -->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
@@ -39,7 +41,7 @@
 <li><a href="../../en/preferences/deskbar.html"><img src="../../images/flags/gb.png" alt="" />English</a></li>
 </ul>
 <span>
- «  <a href="datatranslations.html">データ転換</a> 
+ «  <a href="datatranslations.html">DataTranslations</a> 
 ::  <a href="../preferences.html" class="uplink">Preferences</a> 
 ::  <a href="e-mail.html">E-Mail</a>  »
 </span></div>
@@ -47,17 +49,16 @@
 
 <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><img src="../../images/prefs-images/deskbar-icon_64.png" alt="deskbar-icon_64.png" width="64" height="64" />Deskbar</h1>
+<h1><img src="../../images/prefs-images/deskbar-icon_64.png" alt="deskbar-icon_64.png" width="64" height="64" />デスクバー</h1>
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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/Deskbar</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/Deskbar_settings</span><br />
 <span class="path">~/config/settings/Deskbar_security_code</span></td></tr>
 </table>
 <p><br /></p>
-<p>The Deskbar preference panel is also available from the Deskbar. Its settings are discussed in the topic on <a href="../deskbar.html#deskbar-prefs">Deskbar</a>.</p>
+<p>デスクバー設定パネルはデスクバーからも利用可能です。設定の詳細については<a href="../deskbar.html#deskbar-prefs">デスクバー</a>で取り上げています。</p>
 
 </div>
 </div>
@@ -65,7 +66,7 @@
 <!--
 <div class="nav">
 <div class="inner"><span>
-  «  <a href="datatranslations.html">データ転換</a> 
+  «  <a href="datatranslations.html">DataTranslations</a> 
 ::  <a href="../preferences.html" class="uplink">Preferences</a> 
 ::  <a href="e-mail.html">E-Mail</a>  »
 </span></div>

docs/userguide/jp/preferences/e-mail.html

@@ -54,8 +54,8 @@
 <tr class="heading"><td>目次</td></tr>
 <tr class="index"><td>
 	<a href="#creating">新しい電子メールアカウントの作成</a><br />
-	<a href="#incoming">受信する電子メールの設定</a><br />
-	<a href="#outgoing">送信する電子メールの設定</a><br />
+	<a href="#incoming">受信の設定</a><br />
+	<a href="#outgoing">送信の設定</a><br />
 	<a href="#filters">電子メールフィルタの設定</a><br />
 	<a href="#settings">Mailサービスの設定</a>
 </td></tr>
@@ -63,11 +63,11 @@
 
 <h2><img src="../../images/prefs-images/e-mail-icon_64.png" alt="e-mail-icon_64.png" width="64" height="64" />電子メール</h2>
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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/E-mail</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/Mail/*</span></td></tr>
 </table>
-<p>Haikuは、Mailサービス(mail_daemon)を通じ定期的に電子メールを取得して、メールごとに単一のテキストファイルに保存するシステムを提供します。システムはメールを解析して、差出人、宛先、題名、未読(既読)といった必要な全てのヘッダ情報で属性を設定します。処理は直接あるいは各アプリケーションから要求できます。また、このシステムは全てのデータと構成を保ちつつ電子メールクライアントを切り替えることを容易にします。<br />
+<p>Haikuは、Mailサービス(mail_daemon)を通じ定期的に電子メールを取得して、メールごとに単一のテキストファイルに保存するシステムを提供します。システムはメールを解析して、差出人、宛先、題名、未読(既読)といった必要なすべてのヘッダ情報で属性を設定します。処理は直接あるいは各アプリケーションから要求できます。また、このシステムはすべてのデータと構成を保ちつつ電子メールクライアントを切り替えることを容易にします。<br />
 構成は電子メール設定パネルで行います。</p>
 
 <h2>
@@ -78,11 +78,11 @@
 <img src="../images/prefs-images/e-mail-new-account.png" alt="e-mail-new-account.png" />
 <p>初めに、 <i>Account Type</i>(アカウントの種類)を設定します。 <span class="menu">Receive Mail Only</span>(受信のみ)、 <span class="menu">Send Mail Only</span>(送信のみ)、最もよく使われる <span class="menu">Send and Receive Mail</span>(送受信)があります。 次に、メールを取得する方法として<span class="menu">POP3</span>か<span class="menu">IMAP</span>を選びます。</p>
 <p>それから<i>E-mail Address</i>(電子メールアドレス)、 <i>Login Name</i>(ログイン名)、 <i>Password</i>(パスワード)を入力して、 Haiku内で用いられる<i>Account Name</i>(アカウント名)と<i>Real Name</i>(本名)も決めてください。</p>
-<p>メジャーな電子メールプロバイダを利用している場合、Haikuは既にサーバのIPアドレスのような技術項目を全て保持しているので、他の情報は自動的に記入されます。それ以外の場合は、このガイドに従って先の電子メールアカウントの項目を埋めてください。</p>
+<p>メジャーな電子メールプロバイダを利用している場合、Haikuは既にサーバのIPアドレスのような技術項目をすべて保持しているので、他の情報は自動的に記入されます。それ以外の場合は、このガイドに従って先の電子メールアカウントの項目を埋めてください。</p>
 
 <h2>
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
-<a id="incoming" name="incoming">受信する電子メールの設定</a></h2>
+<a id="incoming" name="incoming">受信の設定</a></h2>
 <p>どのように電子メールを受信するか設定するには、アカウント名の下にある<span class="menu">Incoming</span>をクリックします。</p>
 <img src="../images/prefs-images/e-mail-in.png" alt="e-mail-in.png" />
 <p>ポップアップメニューからプロバイダーが利用するプロトコルを選びます。<span class="menu">IMAP</span>と<span class="menu">POP3</span>がサポートされています。</p>
@@ -97,7 +97,7 @@
 
 <h2>
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
-<a id="outgoing" name="outgoing">送信する電子メールの設定</a></h2>
+<a id="outgoing" name="outgoing">送信の設定</a></h2>
 <p>どのように電子メールを送信するか設定するには、アカウント名の下にある<span class="menu">Outgoing</span>をクリックします。</p>
 <img src="../images/prefs-images/e-mail-out.png" alt="e-mail-out.png" />
 <p>受信メールと同様に、送信箱の<i>Location</i>(場所)を変更できます。(デフォルト: <span class="path">/boot/home/mail/out/</span>)</p>
@@ -114,9 +114,9 @@
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
 Spamフィルタ</h3>
 <img src="../images/prefs-images/e-mail-filter-spam.png" alt="e-mail-filter-spam.png" />
-<p>spamフィルタは不要なスパムの判定に統計的手法を利用します。メールには0から1の評価値が付与され、ユーザーはスパムと通常のメールとの境界値を決めることができます。<br />
+<p>スパムフィルタは不要なスパムの判定に統計的手法を利用します。メールには0から1の評価値が付与され、ユーザーはスパムと通常のメールとの境界値を決めることができます。<br />
 評価値を受信メールの題名の先頭に追加することが可能です。<br />
-また、spamフィルタは全ての受信メールから学習することができます。もちろん、誤ってスパム判定されている偽陽性のメールを訂正しなくてはいけません。<span class="app">Mail</span>(メール)アプリケーションについての説明で詳しく知ることができるでしょう。</p>
+また、スパムフィルタはすべての受信メールから学習することができます。もちろん、誤ってスパム判定されている偽陽性のメールを仕分けて、スパムフィルタに学習させなくてはいけません。<span class="app">Mail</span>(メール)アプリケーションについての説明で詳しく知ることができるでしょう。</p>
 <p><span class="menu">Match Header</span> (マッチヘッダ)フィルタと併用することで、検出されたスパムメールを自動的に整理できます。</p>
 
 <h3>
@@ -153,7 +153,7 @@ Spamフィルタ</h3>
 	<tr><td><span class="menu">Spam/Genuine Estimate</span>(評価値)</td><td> </td>
 		<td>これはスパムフィルタが電子メールに付加する評価の数値です。これは科学的な記法で表記され、例えば1.065e-12は1.065を10の12乗で割った0.000000000001065を意味します。</td></tr>
 </table>
-<p>2番目のテキストフィールドには検索パターンを入力します。ここでは<a href="http://en.wikipedia.org/wiki/Regular_expression" class="external free" title="Wikipedia: Regular expression" rel="nofollow">regular expression(正規表現)</a>が利用可能で、多少複雑になる場合があるものの高い柔軟性を提供しています。 リンク先を少し読めば、正規表現を利用する価値が充分にあり、また単純な検索パターンに関しては全く複雑にならないことが分かるでしょう。</p>
+<p>2番目のテキストフィールドには検索パターンを入力します。ここでは<a href="http://en.wikipedia.org/wiki/Regular_expression" class="external free" title="Wikipedia: Regular expression" rel="nofollow">regular expression(正規表現)</a>が利用可能で、多少複雑になる場合があるものの高い柔軟性を提供しています。 リンク先を少し読めば、正規表現を利用する価値が充分にあり、また単純な検索パターンに関してはまったく複雑にならないことが分かるでしょう。</p>
 <p>その下のポップアップメニューで、パターンが一致した際の処理を選択します。メールの移動や削除、"Read(既読)"などメールのステータス変更、返信に用いる電子メールアドレスの設定ができます。</p>
 
 <h3>
@@ -165,7 +165,7 @@ Spamフィルタ</h3>
 <h2>
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="settings" name="settings">Mailサービスの設定</a></h2>
-<p>受信及び送信メールサーバの設定が(おそらくフィルターの設定も)完了したので、実際の確認と取得の全てを行うMailサービスにジョブをどのように行うか知らせる必要があります。</p>
+<p>受信及び送信メールサーバの設定が(おそらくフィルターの設定も)完了したので、実際の確認と取得のすべてを行うMailサービスに、ジョブをどのように行うか知らせる必要があります。</p>
 <img src="../images/prefs-images/e-mail-settings.png" alt="e-mail-settings.png" />
 <p><i>Mail Checking</i>で アカウントのメールサーバに新着メールの問い合わせを行う間隔を指定します。<br />
 ダイヤルアップ接続を利用している場合、メールチェックのためだけに自動でダイヤルしてしまうのを防ぐため<span class="menu">Only When Dial-Up is Connected</span>と<span class="menu">Schedule Outgoing Mail When Dial-Up is Disconnected</span>を有効にするとよいでしょう。 </p>

docs/userguide/jp/preferences/filetypes.html

@@ -52,12 +52,12 @@
 
 <h2><img src="../../images/prefs-images/filetypes-icon_64.png" alt="filetypes-icon_64.png" width="64" height="64" />ファイルタイプ</h2>
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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/FileTypes</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/FileTypes settings</span><br />
 <span class="path">~/config/settings/beos_mime/*</span> - 全てのMIMEタイプをフォルダとして保存します。</td></tr>
 </table>
-<p>この設定パネルのほとんどを説明している、<a href="../filetypes.html">Filetypes</a>とワークショプの<a href="../workshop-filetypes+attributes.html">Filetypes, Attributes, Index and Queries</a>を参照してください。</p>
+<p>この設定パネルのほとんどを説明している、<a href="../filetypes.html">Filetypes</a>と<a href="../workshop-filetypes+attributes.html">Filetypes, Attributes, Index and Queries</a>ワークショップを参照してください。</p>
 
 </div>
 </div>

docs/userguide/jp/preferences/fonts.html

@@ -52,7 +52,7 @@
 
 <h2><img src="../../images/prefs-images/fonts-icon_64.png" alt="fonts-icon_64.png" width="64" height="64" />フォント</h2>
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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/Fonts</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/system/app_server/fonts</span><br />
 <span class="path">~/config/settings/Font_settings</span> - パネルのウィンドウ位置を保存</td></tr>
@@ -61,8 +61,8 @@
 <img src="../images/prefs-images/fonts.png" alt="fonts.png" />
 <p>Haikuは異なった目的のために3種類の標準フォントを定めています。ここでシステム全体で用いられるフォントのスタイル(通常・太字・固定幅)とサイズを設定します。加えて、メニューで使われるフォントの設定が別にあります。</p>
 <table summary="layout" border="0" cellpadding="2" cellspacing="0">
-<tr><td><span class="button">Defaults</span></td><td> </td><td>すべての設定をデフォルト値に戻します。</td></tr>
-<tr><td><span class="button">Revert</span></td><td> </td><td>フォント設定を開始した時点で有効だった設定に戻します。</td></tr>
+<tr><td><span class="button">デフォルト</span></td><td> </td><td>すべての項目をデフォルト値に戻します。</td></tr>
+<tr><td><span class="button">元に戻す</span></td><td> </td><td>フォント設定を開始した時点で有効だった設定に戻します。</td></tr>
 </table>
 
 <h2>

docs/userguide/jp/preferences/keyboard.html

@@ -52,7 +52,7 @@
 
 <h2><img src="../../images/prefs-images/keyboard-icon_64.png" alt="keyboard-icon_64.png" width="64" height="64" />キーボード</h2>
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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/Keyboard</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/Keyboard_settings</span></td></tr>
 </table>
@@ -60,8 +60,8 @@
 <img src="../images/prefs-images/keyboard.png" alt="keyboard.png" />
 <p>繰り返しの速度と、キーを押下してから繰り返しを始めるまでの間隔を設定します。下のテキストフィールドで設定をテストできます。</p>
 <table summary="layout" border="0" cellpadding="2" cellspacing="0">
-<tr><td><span class="button">Defaults</span></td><td> </td><td>すべての設定をデフォルト値に戻します。</td></tr>
-<tr><td><span class="button">Revert</span></td><td> </td><td>設定を、キーボードの設定を開始した時点で有効だった設定に戻します。</td></tr>
+<tr><td><span class="button">デフォルト</span></td><td> </td><td>すべての項目をデフォルト値に戻します。</td></tr>
+<tr><td><span class="button">元に戻す</span></td><td> </td><td>設定を、キーボードの設定を開始した時点で有効だった設定に戻します。</td></tr>
 </table>
 
 </div>

docs/userguide/jp/preferences/keymap.html

@@ -53,7 +53,7 @@
 
 <h2><img src="../../images/prefs-images/keymap-icon_64.png" alt="keymap-icon_64.png" width="64" height="64" />キーマップ</h2>
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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/Keymap</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/Keymap/*</span> - ユーザーが変更したキーマップの場所<br />
 <span class="path">~/config/settings/Key_map</span></td></tr>
@@ -72,7 +72,7 @@
 <p>左の一覧はシステムによって用意されたキーマップで、もし利用可能であれば、その下にユーザー定義のキーマップが列挙されます。画面キーボードでドラッグ&amp;ドロップしてキーマップを変更することができます。左クリックでドラッグするとキーのコピー、右クリックでドラッグするとキーの交換になります。<br />
 変更を終えたら、変更後の結果を<span class="menu">File | Save...</span>メニューから保存することができます。変更したキーマップは<span class="path">~/config/settings/Keymap/</span>に置かれている場合のみユーザー定義の一覧に表示されます。もしそうでなければ、<span class="menu">File | Open...</span>から手動で読込む必要があります。</p>
 <p>キーマップパネルと物理キーボードをより一致させるために、 <span class="menu">Layout</span>メニューからいくつかの異なった設定が利用できます。</p>
-<p>画面キーボードで使われるフォントは<span class="menu">Font</span>メニューで変更できます。フォントが全ての文字と記号を含むとは限らないということに注意してください。</p>
+<p>画面キーボードで使われるフォントは<span class="menu">Font</span>メニューで変更できます。フォントがすべての文字と記号を含むとは限らないということに注意してください。</p>
 <p>キーマップの設定を始めた時点の設定に戻すために<span class="button">Revert</span>ボタンもあります。 </p>
 
 <h2>

docs/userguide/jp/preferences/locale.html

@@ -55,7 +55,7 @@
 
 <h2><img src="../../images/prefs-images/locale-icon_64.png" alt="locale-icon_64.png" width="64" height="64" />ロケール</h2>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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/Locale</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/Locale settings</span></td></tr>
 </table>

docs/userguide/jp/preferences/media.html

@@ -52,7 +52,7 @@
 
 <h2><img src="../../images/prefs-images/media-icon_64.png" alt="media-icon_64.png" width="64" height="64" />メディア</h2>
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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/Media</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/Media/*</span><br />
 <span class="path">~/config/settings/System Audio Mixer</span><br />

docs/userguide/jp/preferences/mouse.html

@@ -52,7 +52,7 @@
 
 <h2><img src="../../images/prefs-images/mouse-icon_64.png" alt="mouse-icon_64.png" width="64" height="64" />マウス</h2>
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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/Mouse</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/Mouse_settings</span></td></tr>
 </table>
@@ -69,8 +69,8 @@
 </table>
 <p>すべての設定は即時に反映されます。</p>
 <table summary="layout" border="0" cellpadding="2" cellspacing="0">
-<tr><td><span class="button">Defaults</span></td><td> </td><td>すべての設定をデフォルト値に戻します。</td></tr>
-<tr><td><span class="button">Revert</span></td><td> </td><td>設定を、マウスの設定を始めた時点で有効だった設定に戻します。</td></tr>
+<tr><td><span class="button">デフォルト</span></td><td> </td><td>すべての項目をデフォルト値に戻します。</td></tr>
+<tr><td><span class="button">元に戻す</span></td><td> </td><td>設定を、マウスの設定を始めた時点で有効だった設定に戻します。</td></tr>
 </table>
 
 </div>

docs/userguide/jp/preferences/network.html

@@ -9,6 +9,8 @@
  *
  * Authors:
  *		Humdinger <[email protected]>
+ * Translators:
+ *		hiromu1996
  *
 -->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
@@ -47,21 +49,20 @@
 
 <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">
-<tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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/Network</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">/boot/common/settings/network/resolv.conf</span></td></tr>
 </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>ウィンドウの一番上のポップアップメニューを使って、どのネットワークアダプターを設定するか選択します。</p>
+<p>次の項目で、<acronym title="Dynamic Host Configuration Protocol">DHCP</acronym>を使って自動で設定するか、静的なIPアドレスを使用するかを指定します。DHCPを使用しないならIPアドレス, サブネットマスク, ゲートウェイとDNSサーバーのアドレスを入力する必要があります。</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">元に戻す</span></td><td> </td><td>Networkが起動された時点で有効だった設定に戻します。</td></tr>
+<tr><td><span class="button">適用</span></td><td> </td><td>変更を適用します。</td></tr>
 </table>
 
 </div>

docs/userguide/jp/preferences/printers.html

@@ -9,6 +9,8 @@
  *
  * Authors:
  *		Humdinger <[email protected]>
+ * Translators:
+ *		hiromu1996
  *
 -->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
@@ -47,11 +49,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>
 
 <h2><img src="../../images/prefs-images/printers-icon_64.png" alt="printers-icon_64.png" width="64" height="64" />Printers</h2>
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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/Printers</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/printers/*</span></td></tr>
 </table>

docs/userguide/jp/preferences/screen.html

@@ -9,6 +9,8 @@
  *
  * Authors:
  *		Humdinger <[email protected]>
+ * Translators:
+ *		hiromu1996
  *
 -->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
@@ -47,22 +49,21 @@
 
 <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/screen-icon_64.png" alt="screen-icon_64.png" width="64" height="64" />Screen</h2>
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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/Screen</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/system/app_server/workspaces</span><br />
-<span class="path">~/config/settings/kernel/drivers/vesa</span> - Only when running in VESA mode.<br />
-<span class="path">~/config/settings/Screen_data</span> - Stores the panel's window position.</td></tr>
+<span class="path">~/config/settings/kernel/drivers/vesa</span> - VESAモードのみで動作します<br />
+<span class="path">~/config/settings/Screen_data</span> - ここに設定が保存されます</td></tr>
 </table>
-<p>Each of your <a href="../workspaces.html">workspaces</a> can have its own resolution and color depth.</p>
+<p>それぞれの<a href="../workspaces.html">ワークスペース</a>で解像度と色深度を設定することができます。</p>
 <img src="../images/prefs-images/screen.png" alt="screen.png" />
-<p>The top menu specifies if your changes are applied only to the current or to all workspaces. Depending on your graphics card, the other two menus contain all supported resolution and depth settings.</p>
-<p>After clicking on <span class="button">Apply</span>, the graphics mode is changed and an alert appears, asking you to keep or cancel the changes. If you don't answer that alert, the graphics mode reverts after 12 seconds to the previous setting. Maybe you couldn't see the alert because your monitor didn't support the setting.</p>
-<p>To the left, you can set the number of workspaces and arrange them in columns and rows and open the <a href="backgrounds.html">Backgrounds</a> preferences.</p>
-<p><span class="button">Revert</span> brings back the setting that was active when you started the Screen preferences.</p>
+<p>1つ目の項目で設定をすべてのワークスペースに適用するのか、もしくは現在のワークスペースにのみ適用するのかを選択します。その下にグラフィックカードに対応した解像度と色深度が表示されます。</p>
+<p><span class="button">Apply</span>を押すと、グラフィックモードが変更されます。そして、警告が表示されて、変更を保存するか、破棄するかを問われます。12秒以内に返答しなければ、自動的に前の設定に戻ります。 もしモニタが設定に対応していなければ、警告は見えないでしょう。</p>
+<p>左側では、ワークスペースの列と行の数を変更できます。<span class="button">Set Background...</span>を押すと<a href="backgrounds.html">Backgrounds</a>が起動します。</p>
+<p><span class="button">Revert</span>を押すと、Screenが起動された時点で有効だった設定に戻します。</p>
 
 </div>
 </div>

docs/userguide/jp/preferences/screensaver.html

@@ -9,6 +9,8 @@
  *
  * Authors:
  *		Humdinger <[email protected]>
+ * Translators:
+ *		hiromu1996
  *
 -->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
@@ -47,15 +49,14 @@
 
 <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/screensaver-icon_64.png" alt="screensaver-icon_64.png" width="64" height="64" />ScreenSaver</h2>
 <table summary="layout" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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/Screensaver</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/ScreenSaver_settings</span></td></tr>
 </table>
 
-<p>The panel of the ScreenSaver preferences is split into two tabs:
+<p>この設定はFadeとModulesの2つのタブに分けられています。
 </p>
 
 <h2>
@@ -63,22 +64,21 @@
 <a name="fade" id="fade">Fade</a></h2>
 <img src="../images/prefs-images/screensaver-fade.png" alt="screensaver-fade.png" />
 <br />
-<p>The top checkbox enables/disables the screen saver.<br />
-With the slider below it, you control after how long an idle time the screen saver kicks in.
-</p>
-<p>The next two sliders are only usable after you activated their checkboxes:<br />
-One slider determines after how many minutes the screen is powered off.<br />
-The other, after how many minutes you need a password to unlock your machine.
-</p>
-<p>By clicking into different corners of the two screens at the bottom, you tell the system when to immediately start the screen saver or when to prevent it from kicking in when you rest the mouse in the indicated corner. Click in the middle of the screens to disable that feature again.
+<p>1つ目のチェックボックスでスクリーンセーバーを有効にするかを選択します。<br />
+その下のスライドバーでスクリーンセーバーが起動するまでの時間を変更できます。</p>
+<p>2つ目では一定時間経過後にディスプレイの電源を切るかを選択します。<br />
+チェックボックスが選択されているなら、横のスライドバーでディスプレイの電源が切られるまでの時間を設定できます。<br />
+3つ目ではパスワードロックをするかを選択できます。<br />
+パスワードロックが有効にされているなら、その横のスライドバーでパスワードロックをかけるまでの時間を設定できます。
 </p>
+<p>下部の画面のイラストをクリックすることで、どの角にマウスをおいたときにスクリーンセーバーを起動するかを設定できます。この機能を無効化したいときは、イラストの真ん中をクリックしてください。</p>
 
 <h2>
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
 <a name="modules" id="modules">Modules</a></h2>
 <img src="../images/prefs-images/screensaver-modules.png" alt="screensaver-modules.png" />
 <br />
-<p>The second tab shows a list of all installed screen saver modules and their individual settings. You can test your settings with the <span class="button">Test</span> button below the list and add modules with the <span class="button">Add...</span> button beside it. Other ways to install new screen savers is by a simple drag&amp;drop into the list. Of course, you can also copy/delete a module's file in its respective user folder, i.e. <span class="path">/boot/common/add-ons/screensavers/</span> or <span class="path">/boot/home/config/add-ons/screensavers/</span> (see topic <a href="../filesystem-layout.html">Filesystem layout</a>).
+<p>2つ目のタブには、インストールされたすべてのスクリーンセーバーのモジュールのリストとそれぞれの設定が表示されます。<span class="button">Test</span> ボタンで選択しているスクリーンセーバーを試すことができます。また、<span class="button">Add...</span>ボタンでモジュールの追加ができます。モジュールをリストにドラッグアンドドロップしても追加できます。もちろん、それぞれのユーザーのフォルダ(すなわち<span class="path">/boot/common/add-ons/screensavers/</span>、もしくは<span class="path">/boot/home/config/add-ons/screensavers/</span>)でモジュールのファイルのコピーや削除ができます。(<a href="../filesystem-layout.html">Filesystem layout</a>のトピックをご覧ください)
 </p>
 
 </div>

docs/userguide/jp/preferences/sounds.html

@@ -9,6 +9,8 @@
  *
  * Authors:
  *		Humdinger <[email protected]>
+ * Translators:
+ *		hiromu1996
  *
 -->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
@@ -47,22 +49,21 @@
 
 <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/sounds-icon_64.png" alt="sounds-icon_64.png" width="64" height="64" />Sounds</h2>
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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/Sounds</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/Media/MMediaFilesManager</span></td></tr>
 </table>
 <p><br /></p>
 <img src="../images/prefs-images/sounds.png" alt="sounds.png" />
-<p>You can assign sounds to certain events in the system. Just select the event from the list and choose a sound from the pop-up menu below.</p>
+<p>システムであるイベントが発生したときに再生されるサウンドを設定できます。リストからイベントを選択した後に、下のポップアップメニューでサウンドを選んでください。</p>
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
-<tr><td><span class="menu">None</span></td><td> </td><td>will silence an event.</td></tr>
-<tr><td><span class="menu">Other...</span></td><td> </td><td>will open a file panel to find a new sound that isn't yet in the menu.</td></tr></table>
-<p>You can use any format that's supported by the system. If <a href="../applications/mediaplayer.html">MediaPlayer</a> can deal with it, so can any other program.<br />
-You can "pre-hear" an event's sound by selecting it and using the <span class="button">Play</span> and <span class="button">Stop</span> buttons.</p>
+<tr><td><span class="menu">None</span></td><td> </td><td>サウンドは再生されません。</td></tr>
+<tr><td><span class="menu">Other...</span></td><td> </td><td>ファイルパネルからメニューにない新しいサウンドを選べます。</td></tr></table>
+<p><a href="../applications/mediaplayer.html">MediaPlayer</a>がサポートしている形式のサウンドを使用することができます。<br />
+<span class="button">Play</span>と<span class="button">Stop</span>のボタンでサウンドを試しに再生することができます。</p>
 
 </div>
 </div>

docs/userguide/jp/preferences/time.html

@@ -9,6 +9,8 @@
  *
  * Authors:
  *		Humdinger <[email protected]>
+ * Translators:
+ *		hiromu1996
  *
 -->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
@@ -47,35 +49,36 @@
 
 <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/time-icon_64.png" alt="time-icon_64.png" width="64" height="64" />Time</h2>
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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/Time</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/RTC_time_settings</span><br />
-<span class="path">~/config/settings/timezone</span> - A link to the current timezone in <span class="path">/boot/system/etc/timezones/*/*</span><br />
-<span class="path">~/config/settings/Time_settings</span> - Stores the panel's window position.<br /></td></tr>
+<span class="path">~/config/settings/timezone</span> - <span class="path">/boot/system/etc/timezones/*/*</span>にある現在使用しているタイムゾーンへのリンクです。<br />
+<span class="path">~/config/settings/Time_settings</span> - ここに設定が保存されます。<br /></td></tr>
 </table>
-<p>The panel of the Time preferences is split into two tabs:</p>
+<p>この設定はDate &amp; TimeとTimezoneの2つのタブに分けられています。</p>
 
 <h2>
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="date-time" name="date-time">Date &amp; Time</a></h2>
 <img src="../images/prefs-images/time-time.png" alt="time-time.png" />
-<p>On the left side, you can set the day of the month by simply clicking on it in the calendar. You change the month and year by clicking on it and using the up/down arrows to the right or the cursor keys on your keyboard.</p>
-<p>Similarly, you set the time. There are two modes for the clock:</p>
+<p>左側で年月日を設定します。<br />
+年・月・日のいずれかで選択した後に上下の矢印をクリックするか、カーソルキーを使うことで設定を変更できます。<br />
+カレンダーをクリックすることでも日付を設定することができます。</p>
+<p>同様に時刻を設定します。<span class="menu">Local Time</span>と<span class="menu">GMT</span>の2つのモードがあります。</p>
 <table summary="layout" border="0" cellpadding="2" cellspacing="0">
-<tr><td><span class="menu">Local Time</span></td><td> </td><td>to display your local time.</td></tr>
-<tr><td><span class="menu">GMT</span></td><td> </td><td>to display Greenwich Mean Time.</td></tr>
+<tr><td><span class="menu">Local Time</span></td><td> </td><td>ローカル時刻を設定できます。</td></tr>
+<tr><td><span class="menu">GMT</span></td><td> </td><td>世界標準時を設定できます。</td></tr>
 </table>
 
 <h2>
 <a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="timezone" name="timezone">Timezone</a></h2>
 <img src="../images/prefs-images/time-timezone.png" alt="time-timezone.png" />
-<p>Simply find and choose your location from the pop-up menu and the list of cities and press <span class="button">Set Time Zone</span> to set your zone.</p>
-<p><span class="button">Revert</span> brings back the settings that were active when you started the Time preferences.</p>
+<p>ポップアップメニューから国のある地域を、その下のリストから都市や地域を選択してから<span class="button">Set Time Zone</span>を押すと、タイムゾーンが設定されます。</p>
+<p><span class="button">Revert</span>を押すとTimeが起動された時点で有効だった設定に戻します。</p>
 
 </div>
 </div>

docs/userguide/jp/preferences/touchpad.html

@@ -9,6 +9,8 @@
  *
  * Authors:
  *		[Insert your name and address here]
+ * Translators:
+ *		hiromu1996
  *
 -->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
@@ -48,33 +50,32 @@
 
 <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/touchpad-icon_64.png" alt="touchpad-icon_64.png" width="64" height="64" />Touchpad</h2>
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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/Touchpad</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/Touchpad_settings</span></td></tr>
 </table>
 
-<p>This panel offers several touchpad related settings that are interesting when you're running on a notebook.</p>
+<p>ノートパソコンで使用している際に、タッチパネルに関連するいくつかの設定をすることができます。</p>
 
 <img src="../images/prefs-images/touchpad.png" alt="touchpad.png" />
 
-<p>By dragging the red vertical or horizontal lines on the touchpad representation, you set the scroll area (slightly reddish against the grey general touch area). Moving your finger on that part of the pad will move the scrollbars of a window accordingly.</p>
-<p>To the right are sliders to set the general scroll acceleration and the vertical and horizontal scrolling speed.<br />
-The acceleration setting decides how much quicker a list scrolls by if you swish over the scroll area very fast. The scrolling speeds control the general speed when using the scroll area in a "normal" way.</p>
-<p>Below the touchpad graphic are checkboxes to enable "Two finger scrolling" for vertical and horizontal scrolling. Move two fingers in parallel vertically or horizontally to move the scrollbars of a window. At least for me, it works best if with one finger from the left and one from the right hand.<br />
-If you feel comfortable using this feature, you can dispense with setting scroll areas and instead use the whole pad for normal navigation.</p>
-<p>At the bottom is another slider to set the tap click sensitivity. If your taps keep getting ignored, increase the sensitivity. If the system registers clicks all the time, while all you want is to move the mouse pointer, try decreasing it.</p>
+<p>赤の縦横の線を移動させることで、スクロール可能な領域(灰色の部分をタッチパッドとした際の赤い部分)を設定できます。設定した領域で指を動かすとスクロールされます。</p>
+<p>右側のスライドバーでは通常時のスクロール速度・水平方向のスクロール速度・垂直方向のスクロール速度を設定できます。<br />
+スクロール速度を変更することで、タッチパネル上で指を動かしたときにどれだけのスピードでスクロールされるかを変えられます。</p>
+<p>"2本指スクロール"を有効にするとタッチパッド上で2本の指を水平もしくは垂直の方向で平行にスライドさせると、その方向に画面上でもスクロールされるようになります。左手と右手の親指を使ってスクロールすると、反応しやすいです。<br />
+この設定を有効にすると、スクロール領域を設定しなくてもタッチパッド全体でスクロールすることができます。</p>
+<p>下のスライドバーでタップクリックの感度を調整できます。タップクリックを認識しにくいなら感度を上げれば、マウスポインタの移動をクリックとして認識してしまうなら感度を下げればよいでしょう。</p>
 <table summary="layout" border="0" cellpadding="2" cellspacing="0">
-<tr><td><span class="button">Defaults</span></td><td> </td><td>resets everything to default values.</td></tr>
-<tr><td><span class="button">Revert</span></td><td> </td><td>brings back the settings that were active when you started the Touchpad preferences.</td></tr>
+<tr><td><span class="button">デフォルト</span></td><td> </td><td>すべての項目をデフォルト値に戻します。</td></tr>
+<tr><td><span class="button">元に戻す</span></td><td> </td><td>Touchpadを起動した時点で有効だった設定に戻します。</td></tr>
 </table>
-<p>Here is a tip that's not related to the Touchpad preferences, but fits the general topic:<br />
-Did you know that you can do a drag and drop just by using the touchpad, i.e. not using the buttons? Just do a double click without lifting the finger after the second click. The picked up icon will stick to the mouse pointer and you can drag it around by moving your finger. Lifting your finger will drop the icon.</p>
-<p>If your finger reaches a border of the touchpad while dragging an icon, but the mouse pointer hasn't yet reached the screen edge, how can you keep on dragging your icon? As soon as you lift your finger, the icon would be dropped.<br />
-Depending on your hardware, there's a nifty feature: just leave your finger without lifting at the touchpad edge. The mouse pointer will keep on moving on auto-pilot.</p>
+<p>タッチパッドに関するTips:<br />
+ボタンを使用せずにタッチパッドだけでドラッグアンドドロップが出来ることをご存知ですか?<br />アイコンを一度クリックして指を離さずに少し待った後にもう一度クリックします。すると、マウスポインタに合わせてアイコンが移動するようになり、ドラッグできます。指を離すとドロップされます。</p>
+<p>もし、ドラッグをしているときに指がタッチパッドの境界線に達してしまった場合はどうすればよいでしょうか?<br />
+指を離すとドロップされてしまいます。しかし、ハードウェアによっては境界線に指を置いたままにしておくとマウスポインタが自動でその方向に進みます。</p>
 
 </div>
 </div>

docs/userguide/jp/preferences/tracker.html

@@ -9,6 +9,8 @@
  *
  * Authors:
  *		Humdinger <[email protected]>
+ * Translators:
+ *		hiromu1996
  *
 -->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
@@ -47,17 +49,16 @@
 
 <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/tracker-icon_64.png" alt="tracker-icon_64.png" width="64" height="64" />Tracker</h2>
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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/Tracker</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/Tracker/TrackerSettings</span></td></tr>
 </table>
 <p><br /></p>
-<p>The Tracker preference panel is also available from every Tracker window with the menu <span class="menu">Window | Preferences...</span>.<br />
-Its functions are discussed in the topic on <a href="../tracker.html#tracker-preferences">Tracker</a>.</p>
+<p>Trackerの設定パネルは、すべてのTrackerのウィンドウの<span class="menu">Window | Preferences...</span>から開くことができます。<br />
+機能については<a href="../tracker.html#tracker-preferences">Tracker</a>をご覧ください。</p>
 
 </div>
 </div>

docs/userguide/jp/preferences/virtualmemory.html

@@ -9,6 +9,8 @@
  *
  * Authors:
  *		Humdinger <[email protected]>
+ * Translators:
+ *		hiromu1996
  *
 -->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
@@ -46,23 +48,22 @@
 
 <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/virtualmemory-icon_64.png" alt="virtualmemory-icon_64.png" width="64" height="64" />VirtualMemory</h2>
 <table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
-<tr><td>Deskbarメニュー:</td><td style="width:15px;"></td><td><span class="menu">設定</span></td></tr>
+<tr><td>Deskbarメニュー:</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/VirtualMemory</span></td></tr>
 <tr><td>設定ファイル:</td><td></td><td><span class="path">~/config/settings/kernel/drivers/virtual_memory</span><br />
-<span class="path">~/config/settings/VM_data</span> - Stores the panel's window position.</td></tr>
+<span class="path">~/config/settings/VM_data</span> - ここに設定が保存されます。</td></tr>
 </table>
-<p>Virtual memory let's the system swap out memory to harddisk, if the RAM can be used more sensibly for other things. So, even if you have lots of RAM, providing virtual memory is never a bad idea.</p>
+<p>Virtual memoryを設定すると、メモリが不足している場合にハードディスクにスワッピングすることができます。<br />RAMが大量に使用できる場合は、Virtual memoryを設定する必要はないでしょう。</p>
 <img src="../images/prefs-images/virtualmemory.png" alt="virtualmemory.png" />
-<p>You can set the size to even more than your physical memory size if needed. With today's huge harddisks, assigning the physical memory size shouldn't be a problem. Still, you can quickly adjust the size if your free space ever runs low. In that case you should also have a look at <a href="../applications/diskusage.html">DiskUsage</a> to find out what's eating up your diskspace.</p>
-<p>Normally, the swap file's written to your boot partition. If you often run into disk thrashing due to the virtual memory system swapping memory in and out, you can try to use a separate harddisk for you swap file. Simply another partition on the same harddisk with your system/data won't help.<br />
-Upgrading your RAM is of course the most effective way to go...</p>
+<p>必要に応じて、物理メモリより大きいサイズを設定することができます。<br />一般的なサイズのハードディスクでは、物理メモリのサイズだけ割り当てても問題ないでしょう。<br />空き領域が少なくなってきたなら、すぐに割当量を調節することができます。その場合は<a href="../applications/diskusage.html">DiskUsage</a>でハードディスクの使用率を確認するといいでしょう。</p>
+<p>通常はブートパーティションにスワップファイルが書きこまれます。<br />スワップインやスワップアウトによってよくハードディスクがスラッシング状態に陥ってしまうなら、スワップファイル用に別のハードディスクを使うこともできます。ただし、同じディスクにパーティションをつくってそこをスワップに使用しても、状態は改善されません。<br />
+RAMの量を増やすのが1番有効な方法であることをお忘れなく。</p>
 <table summary="layout" border="0" cellpadding="2" cellspacing="0">
-<tr><td><span class="button">Defaults</span></td><td> </td><td>すべての設定をデフォルト値に戻します。</td></tr>
-<tr><td><span class="button">Revert</span></td><td> </td><td>brings back the settings that were active when you started the VirtualMemory preferences.</td></tr>
+<tr><td><span class="button">デフォルト</span></td><td> </td><td>すべての項目をデフォルト値に戻します。</td></tr>
+<tr><td><span class="button">元に戻す</span></td><td> </td><td>VirtualMemoryが起動された時点で有効だった設定に戻します。</td></tr>
 </table>
 
 </div>