[digikam-doc] digikam: apply new patch from Wolfgang about proff-reading handbook

Thu Aug 25 21:01:58 UTC 2016

Git commit e8e563fdc5fa701affa7a8d639295acc7502a577 by Gilles Caulier.
Committed on 25/08/2016 at 21:01.
Pushed by cgilles into branch 'master'.

apply new patch from Wolfgang about proff-reading handbook

M  +5    -5    digikam/intro-fileformats.docbook
M  +6    -6    digikam/intro-firstrun.docbook
M  +-    --    digikam/intro-scanprogress.png

http://commits.kde.org/digikam-doc/e8e563fdc5fa701affa7a8d639295acc7502a577

diff --git a/digikam/intro-fileformats.docbook b/digikam/intro-fileformats.docbook
index 91d13e2..d011f43 100644
--- a/digikam/intro-fileformats.docbook
+++ b/digikam/intro-fileformats.docbook
@@ -36,9 +36,9 @@
 
         <sect3> <title>JPEG</title>
             <para>
-            JPEG is a compressed format, that trades some of the image quality to keep file sizes small. In fact, most cameras save their images in this format unless you specify otherwise. A JPEG image is stored using lossy compression and you can vary the amount of compression. This allows you to choose between lower compression and higher image quality or greater compression and poorer quality. The only reason to choose higher compression is because it creates smaller file so you can store more images, and it's easier to send them by e-mail, or post them on the Web. Most cameras give you two or three choices equivalent to good, better, best although the names vary.
+            JPEG is a compressed format, that trades some of the image quality to keep file sizes small. In fact, most cameras save their images in this format unless you specify otherwise. A JPEG image is stored using lossy compression and you can vary the amount of compression. This allows you to choose between lower compression and higher image quality or greater compression and poorer quality. The only reason to choose higher compression is because it creates smaller file so you can store more images, and it's easier to send them by e-mail or post them on the Web. Most cameras give you two or three choices equivalent to good, better, best although the names vary.
             </para>
-
+            
             <para>
             JPEG 2000 is supported as well. It provides for the same compression ratio the better (smoother) results compared to JPEG. The 2000 version has the option of being lossless if so specified in the settings.
             </para>
@@ -56,7 +56,7 @@
         <sect3> <title>PNG</title>
 
             <para>
-            PNG is an image format that was developed as a replacement for a number of older, in the 1990's widely used, image file formats. It is a lossless format like TIFF but it is much more compact and saves disk space. Although your camera is unlikely to support PNG, some people like to convert their photographs to PNG as soon as they get them on their computer. Unlike JPEG, PNG images do not lose quality every time you re-encode them after modification. &digikam; fully supports PNG images and the Batch Processing Images Plugin can convert a batch of images from any supported format to PNG in one step. See the <link linkend="using-setup">Configuration</link> section for information about using plugins with &digikam;.
+            PNG is an image format that was developed as a replacement for a number of older, in the 1990's widely used, image file formats. It is a lossless format like TIFF but it is much more compact and saves disk space. Although your camera is unlikely to support PNG, some people like to convert their photographs to PNG as soon as they get them on their computer. Unlike JPEG, PNG images do not lose quality every time you re-encode them after modification. &digikam; fully supports PNG images and the Batch Queue Manager can convert a batch of images from any supported format to PNG (and other formats) in one step.
             </para>
 
             <para>
@@ -84,7 +84,7 @@
             </para>
 
             <para>
-                &digikam; supports RAW image loading only; relying on the <ulink url="http://www.libraw.org">Libraw library</ulink> which is included in &digikam; core and supports over 800 RAW file formats. All supported cameras are listed at the bottom of <ulink url="http://www.cybercom.net/~dcoffin/dcraw"> Dave Coffin's</ulink> web page. The table below shows a short list of camera RAW files supported by &digikam;:
+                &digikam; supports RAW image loading only, relying on the <ulink url="http://www.libraw.org">Libraw library</ulink> which is included in &digikam; core and supports over 800 RAW file formats. All supported cameras are listed at the bottom of <ulink url="http://www.cybercom.net/~dcoffin/dcraw"> Dave Coffin's</ulink> web page. The table below shows a short list of camera RAW files supported by &digikam;:
 
             <informaltable><tgroup cols="2">
 
@@ -240,7 +240,7 @@
         <para>
         Many digital cameras support taking of short movie clips. These clips are usually stored in AVI or MP4 format. &digikam; understands these formats and will generate thumbnails for the movie files. However, &digikam; is not a movie editing application and it does not have any built-in movie viewing or editing capabilities. If you double click on a movie file &digikam; you can preview video or choose a viewing application through your desktop settings.
         </para>
-
+    
     </sect2>
 
 </sect1>
diff --git a/digikam/intro-firstrun.docbook b/digikam/intro-firstrun.docbook
index e722be2..601a7cf 100644
--- a/digikam/intro-firstrun.docbook
+++ b/digikam/intro-firstrun.docbook
@@ -43,7 +43,7 @@
             </para>
 
             <para>
-                If you don't know what is a RAW file or if your camera don't support RAW files, you should keep the default setting and skip this step.
+                If you don't know what is a RAW file or if your camera doesn't support RAW files, you should keep the default setting and skip this step.
             </para>
 
             <para>
@@ -87,7 +87,7 @@
             </para>
 
             <para>
-                Tooltips are a fast and easy way to display important information about a photograph, they popup as the mouse moves over a thumbnail. Select "Use tooltips" if you want to display them.
+                Tooltips are a fast and easy way to display important information about a photograph, they popup as the mouse hovers over a thumbnail. Select "Use tooltips" if you want to display them.
             </para>
 
             <para>
@@ -127,19 +127,19 @@
             </note>
 
             <para>
-                As &digikam; uses your folders on your hard disk directly, other applications like file managers can remove any albums outside a &digikam; session. In this case &digikam; will tell you at the next session if all albums that have been removed from the &digikam; photographs root path shall be deleted from albums database. If you want to move folders around and do not want to do that in &digikam;, we suggest you do that while &digikam; is running, so the database will be kept in sync and you do not lose any metadata.
+                As &digikam; uses your folders on your hard disk directly, other applications like file managers can remove any albums outside a &digikam; session. In this case &digikam; will ask you at the next session whether all albums that have been removed from the &digikam; photographs root path shall be deleted from albums database. If you want to move folders around and don't want to do that in &digikam;, we suggest you do that while &digikam; is running, so the database will be kept in sync and you do not lose any metadata.
             </para>
 
             <para>
-                When you use an existing folder of photographs, as the Album Library folder, you will notice that the Albums in the Album list do not have photographs as their icons. You can change that by dragging any photograph in the Album onto the folder icon in the left sidebar and use this as the Album icon. See the <link linkend="using-myalbumsview">Album</link> section for details of how to change the Album icon.
+                When you use an existing folder of photographs, as the Album Library folder, you will notice that the Albums in the Album list do not have photographs as their icons. You can change that by dragging any photograph in the Album onto the folder icon in the left sidebar and use this as the Album icon. See the  <link linkend="using-myalbumsview">Album</link> section for details of how to change the Album icon.
             </para>
 
             <para>
-                &digikam; use a dedicated database to store thumbnails with an optimized wavelets compression algorithm (PGF)  thumbnail folders. There is no way of hiding non-standard thumbnail folders from the <quote>Albums</quote> list. If you want to keep them you could create an Album Collection that just contains all the thumbnail Folders and then view your Albums in By Collection order. See the <link linkend="using-myalbumsview">Album</link> section for more about Album Collections.
+                &digikam; uses a dedicated database to store thumbnails with an optimized wavelets compression algorithm (PGF)  thumbnail folders. There is no way of hiding non-standard thumbnail folders from the <quote>Albums</quote> list. If you want to keep them you could create an Album Category that just contains all the thumbnail Folders and then view your Albums in  <menuchoice><guimenu>View</guimenu><guimenuitem>Sort Albums</guimenuitem><guimenuitem>By Category</guimenuitem></menuchoice> order. See the <link linkend="using-myalbumsview">Album</link> section for more about Album Categories.
             </para>
 
             <para>
-                Once you have configured the Album Library Folder you can set up &digikam; to work with your digital camera. Then learn how to use <link linkend="using-myalbumsview">Albums</link> and <link linkend="using-mytagsview">Tags</link> to arrange your photograph Albums.
+                Once you have configured the Album Library Folder you can set up &digikam; to work with your digital camera and then learn how to use <link linkend="using-myalbumsview">Albums</link> and <link linkend="using-mytagsview">Tags</link> to arrange your photograph Albums.
             </para>
             
         </sect3>
diff --git a/digikam/intro-scanprogress.png b/digikam/intro-scanprogress.png
index ccabd4e..12e92c6 100644
Binary files a/digikam/intro-scanprogress.png and b/digikam/intro-scanprogress.png differ
