[cheese] Some serious word smithing and general clean up.



commit 4cc3c1acdf84592e8aedba74d2918387b4cd70c7
Author: Og B. Maciel <ogmaciel gnome org>
Date:   Mon Sep 14 22:59:49 2009 -0400

    Some serious word smithing and general clean up.

 help/C/cheese.xml |  225 +++++++++++++++++++++++++++--------------------------
 1 files changed, 116 insertions(+), 109 deletions(-)
---
diff --git a/help/C/cheese.xml b/help/C/cheese.xml
index 6bbfe79..62c0fe6 100644
--- a/help/C/cheese.xml
+++ b/help/C/cheese.xml
@@ -236,16 +236,16 @@
   </figure>
 
   <para>
-    &app; defaults to photo mode, and needs to be changed to another mode like
-		video or burst mode if desired.
+    &app; uses the photo mode by defaults, but you can change this to use the video 
+    or burst mode if desired.
   </para>
 
   <section id="using-effects">
     <title>Effects</title>
     <para>
       To apply effects to the input of your webcam, click
-      the button labelled <guibutton>Effects</guibutton>. When you go to the
-      effects window, you will see a window similar to the image below
+      the button labelled <guibutton>Effects</guibutton>. When you then go to
+      the effects window, you will see a window similar to the image below.
       <figure>
         <title>&app; effects screenshot</title>
         <screenshot>
@@ -260,32 +260,33 @@
     </para>
 
     <para>
-      You are able to select numerous effects to apply to your photo. To apply
-      an effect, just click on the effect you want. The button will appear highlighted.
-      Selecting multiple effects will apply all the effects to
-      your image (for example, if you apply <guibutton>Hulk</guibutton> and
-      <guibutton>Vertical Flip</guibutton>, the
-      input from the webcam will be altered to have a green shade and be up side down).
-      To disable all effects, just click on the
+      You can apply some really cool effects to your photos too! Just choose 
+      from the several different effects available and click its corresponding
+      button to apply it to your photo. Selecting multiple effects will apply 
+      all the effects to your image. For example, if you select 
+      <guibutton>Hulk</guibutton> and <guibutton>Vertical Flip</guibutton>, 
+      the input from the webcam will be altered to have a green shade and be 
+      upside down. To disable all effects, just click on the 
       <guibutton>No Effect</guibutton> button.
     </para>
 		
 		<para>
-			To return to the preview of your webcam just push the button labelled <guibutton>Effects</guibutton> again,
-			this will toggle the Effects menu and the normal view reappears.
+			To return to the preview of your webcam, just push the button 
+            labelled <guibutton>Effects</guibutton> again. This will toggle 
+            the Effects menu and bring you back to the normal view.
 		</para>
   </section>
 
   <section id="using-photomode">
     <title>Photo Mode</title>
     <para>
-      Photo mode is the default mode that &app; opens in. When not in photo mode,
-      click the button that shows the icon of a single photo or select in the menu:
+      Photo mode is the default mode for &app;. When not in photo mode,
+      click the button that shows the icon of a single photo or select it from the menu:
       <menuchoice><guimenu>Cheese</guimenu><guimenuitem>Photo</guimenuitem></menuchoice>
       to change to photo mode.
       Photo mode will take a single photo every time the button labelled
       <guibutton>Take a photo</guibutton> or the <keycap>Spacebar</keycap>
-      is pressed, and will save to disk.
+      key is pressed, and will save to disk.
     </para>
   </section>
 
@@ -293,9 +294,10 @@
     <title>Video Mode</title>
     <para>
       Video mode is a mode that allows you to take short videos using the webcam.
-      When not in video mode, click the button that shows the icon of a film roll or select in the menu:
+      When not in video mode, click the button that shows the icon of a film roll 
+      or select it from the menu:
       <menuchoice><guimenu>Cheese</guimenu><guimenuitem>Video</guimenuitem></menuchoice> to
-      change to video mode. Video mode will start recording a video every time the
+      change to video mode. Video mode will start recording a video every time 
       the button labelled <guibutton>Start Recording</guibutton> or the
       <keycap>Spacebar</keycap> is pressed. The video will stop
       recording and save to disk when the button labelled <guibutton>Stop
@@ -303,32 +305,35 @@
     </para>
 
     <para>
-      The video mode does look any different to the screenshot of photo mode,
+      The video mode does not look much different from the photo mode,
       except that the button labelled <guibutton>Take a photo</guibutton> will
-      be either <guibutton>Start Recording</guibutton>
-      or <guibutton>Stop Recording</guibutton>,
-      and the button with the film roll icon is pushed in, whereas the other mode buttons (photo and burst) are not.
+      say  <guibutton>Start Recording</guibutton> or <guibutton>Stop Recording</guibutton>,
+      and the button with the film roll icon is pushed in, whereas the other 
+      mode buttons (photo and burst) are not.
     </para>
 	</section>
 	
 	<section id="using-burstmode">
     <title>Burst Mode</title>
     <para>
-      In burst mode you can take more pictures in a row. It works exactly like the photo mode, except that it
-			takes a series of pictures. When you are not in burst mode, click the button that shows the icon of several pictures in a row
-			or select in the menu: <menuchoice><guimenu>Cheese</guimenu><guimenuitem>Burst</guimenuitem></menuchoice> to
-      change to burst mode. Burst mode will start to take a series of pictures in a distance of some seconds
-			when the button labelled <guibutton>Take multiple Photos</guibutton> or the <keycap>Spacebar</keycap> is pressed.
-			The delay and amount of pictures to take can be set in the preferences dialog, for more information please
-			see <xref linkend="preferences"/>.
+      In burst mode you can take more pictures in a row. It works exactly like 
+      the photo mode, except that it takes a series of pictures. When you are 
+      not in burst mode, click the button that shows the icon of several 
+      pictures in a row or select it from the menu: <menuchoice><guimenu>Cheese</guimenu><guimenuitem>Burst</guimenuitem></menuchoice> to
+      change to burst mode. Burst mode will start to take a series of 
+      pictures with an interval of some seconds in between photos when the 
+      button labelled <guibutton>Take Multiple Photos</guibutton> or the 
+      <keycap>Spacebar</keycap> key is pressed.
+      The delay and amount of pictures to take can be set in the preferences 
+      dialog. For more information please see <xref linkend="preferences"/>.
     </para>
 
     <note>
       <para>
-        You can use all modes in Fullscreen. To do this, just click
-        <menuchoice><guimenu>Cheese</guimenu><guimenuitem>Fullscreen</guimenuitem></menuchoice> to
-        enter Fullscreen mode, or press <keycap>F11</keycap>. To exit Fullscreen
-        mode, press <keycap>Esc</keycap> or <keycap>F11</keycap>.
+        All modes can be used in fullscreen. To do this, click the 
+        <menuchoice><guimenu>Cheese</guimenu><guimenuitem>Fullscreen</guimenuitem></menuchoice> menu to
+        enter fullscreen mode, or press the <keycap>F11</keycap> key. To exit fullscreen
+        mode, press the <keycap>Esc</keycap> or the <keycap>F11</keycap> keys.
       </para>
     </note>
 		
@@ -351,46 +356,47 @@
   <section id="takingaphoto">
     <title>Taking a photo</title>
     <para>
-      To take a photo in &app;, be sure to be in â??Photoâ?? mode. 
+      To take a photo with &app;, be sure to be in the â??Photoâ?? mode.
     </para>
 
     <para>
-      To take a photo, apply the effects that you wish by clicking the button
-      labelled <guibutton>Effects</guibutton>, click on the effects desired as
-      described in <xref linkend="using-effects"/> and press the effects button
-			again to get back to the normal view. You should now have the effects that
-      you clicked on applied to the webcam input.
+      It's easy to take photos with special effects. Just click the button
+      labelled <guibutton>Effects</guibutton>, and click on the effects desired as
+      described in <xref linkend="using-effects"/>. You should now have the effects that
+      you chose applied to the webcam input. Press the effects button again to 
+      get back to the normal view.
     </para>
 
     <para>
-      To take the photo, press the button labelled <guibutton>Take a photo</guibutton>
-      or press the <keycap>spacebar</keycap>. Alternatively you can also use the webcam capture button,
-			if your webcam has one. You will then
-      see &application; count down from 3 or instantly take the photo, depending on your settings. When the photo is taken, your entire screen
+      To take a photo, press the button labelled <guibutton>Take a photo</guibutton>
+      or press the <keycap>spacebar</keycap> key. Alternatively, you can also use 
+      the webcam capture button, if your webcam has one. You will then
+      see &application; count down from 3 or instantly take the photo, 
+      depending on your settings. When the photo is taken, your entire screen
       will flash white, and the photo that was just taken will appear in the photo
-      stream at the bottom of the program window. To abort the countdown you can use the
-			<keycap>Esc</keycap> key.
+      stream at the bottom of the program's window. To abort the countdown you can use the
+      <keycap>Esc</keycap> key.
     </para>
   </section>
 
   <section id="recordingavideo">
-    <title>Taking a video</title>
+    <title>Recording a video</title>
     <para>
-      To take a video in &app;, make sure that the <guibutton>Video</guibutton>
+      To record a video in &app;, make sure that the <guibutton>Video</guibutton>
       button has been pressed.
     </para>
 
     <para>
       To start recording a video, press the button labelled <guibutton>Start
-      Recording</guibutton> or press the <keycap>spacebar</keycap>. Alternatively you can also use the webcam capture button,
-			if your webcam has one.
+      Recording</guibutton> or press the <keycap>Spacebar</keycap> key. Alternatively,
+      you can also use the webcam capture button, if your webcam has one.
       To stop recording just press the same button, now labelled <guibutton>Stop
-      Recording</guibutton>, again and the recording will be stopped and saved.
+      Recording</guibutton>, and the recording will stop and the video saved.
     </para>
 
     <note>
       <para>
-        If your video appears to be jerky or have a low
+        If your video appears to be jerky or has a low
         frame rate (only updating the picture every few seconds), it does not mean that the recording
         has a similar frame rate. In many cases, the recorded file will have a better frame rate.
       </para>
@@ -400,15 +406,15 @@
 	<section id="takingburst">
     <title>Taking a series of pictures in burst mode</title>
     <para>
-      To take more than one picture over some time you can use burst mode.
-			Burst mode can be set up in the preferences dialog where you can set the
-			amount of pictures you want to take when starting burst mode and the delay between them.
+      To take more than one picture over some time you can use the burst mode.
+			Burst mode can be set up in the preferences dialog where you can also set the
+			amount of pictures you want to take and the delay in seconds between them.
 			You can find more information about that in <xref linkend="preferences"/>.
     </para>
 
     <para>
-      To start the burst mode, press the button labelled <guibutton>Take multiple Photos</guibutton>
-			or press the <keycap>spacebar</keycap>. Alternatively you can also use the webcam capture button,
+      To start the burst mode, press the button labelled <guibutton>Take Multiple Photos</guibutton>
+			or press the <keycap>Spacebar</keycap> key. Alternatively, you can also use the webcam capture button,
 			if your webcam has one. To stop the burst capture you can use the
 			<keycap>Esc</keycap> key.
     </para>
@@ -422,9 +428,9 @@
     <title>The preferences dialog</title>
     <para>
       The preferences dialog allows you to set up some webcam specific parameters and
-			burst mode specific parameters. If you have more than one webcam or video device attached
-			the preferences dialog allows you to choose which one you would like to use for cheese and
-			what resolution the image should have. With the sliders you can play around with the
+			parameters specific to the burst mode. If you have more than one webcam or video device attached
+			to your system, the preferences dialog allows you to choose which one you would like to use for Cheese and
+			what resolution the image should have. Use the sliders to play around with the
 			brithness, contrast, saturation and hue values to find the best for your webcam.
     </para>
 		
@@ -441,24 +447,24 @@
 
     <para>
       The parameters for the burst mode can be set in the preferences dialog as well. You only
-			have to adjust the values for the number of photos you wish to take and the delay that should be
-			between the single photos.
+			have to adjust the values for the number of photos you wish to take and the delay 
+            in seconds between each picture taken.
     </para>
   </section>
 	
 	<section id="gconf">
 		<title>GConf settings</title>
 		<para>
-			It's possible to define where &app; should store the media (photos and videos). These
-			settings are stored in GConf. You can change the settings with <command>gconf-editor</command>,
-			there you have to select /apps/cheese in the tree on the left. Now you can set the <guilabel>video_path</guilabel> and
-      <guilabel>photo_path</guilabel> to a location you prefer. There you can set also other parameters
+			It's possible to define where &app; stores the captured media (photos and videos). These
+			settings are stored in GConf. You can change the settings with the <command>gconf-editor</command>,
+			application. There you have to select /apps/cheese in the tree on the left. Then you can set the <guilabel>video_path</guilabel> and
+      <guilabel>photo_path</guilabel> to the location you prefer. There you can also set other parameters
 			for &app;, but you should use the preferences dialog for a controlled access.
     </para>
 		
 		<warning>
-      <para>Attention: Be careful with the settings in GConf, if you are not completely sure about what
-			you are doing you should ask someone who knows!</para>
+      <para>Attention: Be careful while using GConf to change your settings! If you are not completely sure about what
+			you are doing, you should ask someone who knows!</para>
     </warning>
 	</section>
 </section>
@@ -469,7 +475,7 @@
     <title>Viewing a photo or video</title>
     <para>
       To view a video or photo that has been taken, locate it in the photo stream and
-      double click on it. Alternatively, you can right click on it and select <guimenuitem>Open</guimenuitem>.
+      double click it. Alternatively, you can right click on it and select <guimenuitem>Open</guimenuitem>.
       This will then open the file in the default application for that file type.
     </para>
   </section>
@@ -477,11 +483,11 @@
   <section id="saving">
     <title>Saving photos and videos to an alternate location</title>
     <para>
-      To save a photo to an alternate place on your hard drive where you can easily
+      To save a photo to an alternate place on your system where you can easily
       find them, find the photo or video that you wish to save in the photo stream, right
       click on it and select <guimenuitem>Save As</guimenuitem> from the pop-up menu. This will bring up a
-      standard <guilabel>Save File</guilabel> dialog that will allow you to rename the photo if desired
-      and save to any location you wish.
+      standard <guilabel>Save File</guilabel> dialog that will allow you to save it to a new location
+      as well as rename it if you so wish to do.
     </para>
   </section>
 
@@ -490,19 +496,20 @@
     <para>
       To delete a photo from the photo stream, locate the photo you wish to delete in
       the photo stream, left click on it once and press the <keycap>delete</keycap> button on your
-      keyboard. Alternatively, you can right click on it and click <guimenuitem>Delete</guimenuitem>.
+      keyboard. Alternatively, you can right click on it and select <guimenuitem>Delete</guimenuitem>
+      from the pop-up menu.
     </para>
 
     <para>
-      You will be prompted if you wish to delete it from the photo stream. To confirm,
+      You will be asked if you wish to delete it from the photo stream. To confirm,
       press the button labelled <guibutton>Move to Trash</guibutton>.
     </para>
 
     <note>
       <para>
-        This will only move the image to the "trash", as well as remove from
+        This will move the image to the "trash", as well as remove from
         your photo stream. This will not remove the photo from your computer. To remove
-        it from your trash, you will need to empty your trash.
+        it from your system, you will need to empty your trash.
       </para>
     </note>
   </section>
@@ -511,24 +518,24 @@
     <title>Send a photo by e-mail</title>
     <para>
       Photos can be directly emailed from &app;. You will need to have the default mail
-      client set up with an email account, otherwise you will need to set one up. To email
-      a photo, locate the photo you wish to email in the photo stream, right click on
+      client set up with an email account. To email
+      a photo, locate the photo in the photo stream, right click on
       it and select <guimenuitem>Send by Mail</guimenuitem>.
     </para>
 
     <para>
       This will open the default mail client (for example, Evolution) and a new email
-      message with the photo as an attachment.
+      message will be created with the photo you selected as an attachment.
     </para>
   </section>
 
   <section id="account-photo">
     <title>Set as Account Photo</title>
     <para>
-      To set a photo as your account photo (which can be viewed from
+      To set a photo as your account photo (which can be viewed from the 
       <menuchoice><guimenu>System</guimenu><guimenuitem>Preferences</guimenuitem>
-      <guimenuitem>About Me</guimenuitem></menuchoice>, and which will also appear if the login window displays a list of
-      user names with photos), locate the photo that you wish to set in &app;, right click
+      <guimenuitem>About Me</guimenuitem></menuchoice> menu, and the login window with a list of
+      user names with photos), locate the photo that you wish to use in &app;, right click
       on it and select <guimenuitem>Set as Account Photo</guimenuitem>.
     </para>
   </section>
@@ -536,9 +543,9 @@
   <section id="fspot">
     <title>Export a photo to F-Spot</title>
     <para>
-      To export a photo to F-Sport, locate the photo that you wish to export in your photo
-      stream, right click on it and select <guimenuitem>Export to F-Spot</guimenuitem>. You will then be prompted from
-      F-Spot if you wish to import the photos that are sent to it.
+      To export a photo to F-Sport, locate the photo in your photo
+      stream, right click on it and select <guimenuitem>Export to F-Spot</guimenuitem>. You will then be prompted by
+      F-Spot if you wish to import the photos that are being sent to it.
     </para>
 
     <note>
@@ -579,14 +586,14 @@
     <title>The video is sluggish/has a slow response. What can I do?</title>
     <para>
       You may have set "<literal>ximagesink</literal>" (<guilabel>X Window System (No Xv)</guilabel>) as video-output.
-      This means, that your cpu is doing all the work. Change it to "<literal>xvimagesink</literal>"
+      This means that your cpu is doing all the work. Change it to "<literal>xvimagesink</literal>"
       (<guilabel>X Window System (X11/XShm/Xv)</guilabel>) in order to let your graphics card do the work.
     </para>
 
     <para>
-      To change the settings, run <command>gstreamer-properties</command>,
-      click the <guilabel>Video</guilabel> tab
-      and change the appropriate settings.
+      To change this setting, run the <command>gstreamer-properties</command>
+      command, click the <guilabel>Video</guilabel> tab
+      and change the appropriate setting.
     </para>
   </section>
 
@@ -599,7 +606,7 @@
     </para>
 
     <para>
-      To change the settings, run <command>gstreamer-properties</command>,
+      To change this setting, run the <command>gstreamer-properties</command> command, 
       click the <guilabel>Video</guilabel> tab
       and select custom from the drop down menu.
     </para>
@@ -608,9 +615,9 @@
   <section id="faq-work-gstreamer">
     <title>My webcam works with gstreamer, but does not work with &application;. What's wrong?</title>
     <para>
-      Using <command>gstreamer-properties</command> mentioned in the above question, try changing from
+      Using the <command>gstreamer-properties</command> mentioned in the above question, try changing from
       <guilabel>xvimagesink</guilabel> to <guilabel>ximagesink</guilabel> or vice-versa.
-      If this still does not work run <command>cheese --verbose</command> on
+      If this still does not work, run <command>cheese --verbose</command> on
       the command line and copy the logging into a bug report in our 
       <ulink url="http://bugzilla.gnome.org/browse.cgi?product=cheese"; type="http">
       bug tracker</ulink>.
@@ -631,21 +638,21 @@
   <section id="faq-store">
     <title>Where does &application; store my photos and videos?</title>
     <para>
-      &app; stores your Pictures in a folder called Webcam inside the
+      &app; stores your pictures in a folder called Webcam inside the
       XDG-Directory set for Pictures (in most distributions its ~/Pictures/Webcam).
       The same applies for Videos: ~/Videos/Webcam. XDG is a standard to
-      declare default folders in your system, you can find more information
+      declare default folders in your system. You can find more information
       about XDG <ulink url="http://standards.freedesktop.org/basedir-spec/basedir-spec-0.6.html"; type="http">here</ulink>.
     </para>  
-    
+
     <para>
       If the XDG-Path is not set on your System, cheese has a fallback solution: it
-      will store your both your pictures and your videos in ~/.gnome2/cheese/media. This is the default
+      will store both your pictures and videos in ~/.gnome2/cheese/media. This is the default
       directory for your media if you have an older version of &application;.
     </para>
     
     <para>
-      How to set an alternate path ist described in <xref linkend="gconf"/>.
+      How to set an alternate path is described in <xref linkend="gconf"/>.
     </para>
     
     <warning>
@@ -678,30 +685,30 @@
     <para>
       "When I launch &app;, I get the message 'No Camera Found' but I have my webcam plugged into my computer".
 
-      There are many situations this can happen in, and the exact problem that is causing this needs to be isolated.
-      If possible, try each of the following to try and get your webcam working.
-        1. Plug your webcam into another computer. If it works there, then it is a problem with
+      There are many situations that can cause this, and the exact problem that is causing it needs to be isolated.
+      If possible, try each of the following to try and get your webcam working:
+        1. Plug your webcam into another computer. If it works there, then it is a problem 
            with the connection to your computer, or the operating system if it was a different
            one on the other computer. Check the ports on your computer (try another one) and
-           consult support personel for your particular operating system.
-        2. See if your camera is being detected by your computer, on Linux, open up the terminal or console and type
+           consult support for your particular operating system.
+        2. See if your camera is being detected by your computer. On Linux, open up the terminal or console and type
            "dmesg" before you plug in your webcam. Notice the most recent entries, and then plug in your webcam. Type
            "dmesg" again and see if the most recent entries differ. If the message mentions a USB device being detected,
            and your webcam is the only USB device that has been changed, then your computer is detecting your webcam
            fine. If not, then test to see if the webcam is working on another computer. This may only work with USB
            webcams.
         3. As &app; uses the gstreamer backend, it is most likely because gstreamer is not detecting the webcam (or
-           gstreamer has become corrupt). Please contact support personel for the particular operating system that
+           gstreamer has become corrupt). Please contact support for the particular operating system that
            you are running with as many details as possible. For Ubuntu, please use the <ulink url="http://ubuntuforums.org/"; type="http">Ubuntu Forums</ulink>.
     </para>
   </section>
 
   <section id="faq-supported-webcams">
-    <title>Which cameras are supported</title>
+    <title>Which cameras are supported?</title>
     <para>
       &app; uses gstreamer for video grabbing. So in principle &app; supports 
-      any camera that works with GStreamer. In principle that should be any camera
-      which support video4linux or video4linux2.
+      any camera that works with GStreamer. That should be any camera
+      which supports video4linux or video4linux2.
     </para>
   </section>
 </section>
@@ -709,15 +716,15 @@
 <section id="about">
   <title>About</title>
   <para>
-    &app; was initially written by daniel g. siegel <email>dgsiegel gnome org</email>.
-    as a Google Summer of Code project. Later Jaap A. Haitsma <email>jaap haitsma org</email> and also 
-    others joined daniel in improving &app;.
+    &app; was initially written by Daniel G. Siegel <email>dgsiegel gnome org</email>.
+    as a Google Summer of Code project. Later, Jaap A. Haitsma <email>jaap haitsma org</email> and 
+    others joined Daniel to improve it.
     To find more information about &app;, please visit the
     <ulink url="http://projects.gnome.org/cheese"; type="http">
     &application; web page</ulink>.
   </para>
   <para>
-    To report a bug or make a suggestion regarding this application you can file
+    To report a bug or make a suggestion regarding this application, you can file
     a bug in our 
     <ulink url="http://bugzilla.gnome.org/browse.cgi?product=cheese"; type="http">
     bug tracker</ulink>.



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]