Git commit 3c4b32f316e4c5dc619ac1c5cbc0a411ff710528 by Yuri Chornoivan.
Committed on 01/09/2016 at 16:21.
Pushed by yurchor into branch 'master'.

Fix minor typos, conform 'metadata' spelling

M  +1    -1    digikam/using-bqm.docbook
M  +1    -1    digikam/using-camera-basis.docbook
M  +2    -2    digikam/using-camera-processing.docbook
M  +2    -2    digikam/using-mainwindow.docbook
M  +1    -1    digikam/using-setup-metadata-intro.docbook
M  +1    -1    digikam/using-setup-metadata-rotation-ac.docbook

http://commits.kde.org/digikam-doc/3c4b32f316e4c5dc619ac1c5cbc0a411ff710528

diff --git a/digikam/using-bqm.docbook b/digikam/using-bqm.docbook
index d3b9332..a80611f 100644
--- a/digikam/using-bqm.docbook
+++ b/digikam/using-bqm.docbook
@@ -73,7 +73,7 @@
             </para></tip>
 
             <note><para>
-            If you choose <guilabel>JPEG</guilabel>, or 
<guilabel>TIFF</guilabel>, or <guilabel>PNG</guilabel> as the <guilabel>Save 
Format</guilabel> then the meta-data included in RAW file will be included in 
the target
+            If you choose <guilabel>JPEG</guilabel>, or 
<guilabel>TIFF</guilabel>, or <guilabel>PNG</guilabel> as the <guilabel>Save 
Format</guilabel> then the metadata included in RAW file will be included in 
the target
             files as Exif information.
             </para></note>
 
diff --git a/digikam/using-camera-basis.docbook 
b/digikam/using-camera-basis.docbook
index e33952c..84c46e8 100644
--- a/digikam/using-camera-basis.docbook
+++ b/digikam/using-camera-basis.docbook
@@ -25,7 +25,7 @@
         </para>
 
         <para>
-            The Metadata tab displays an internal picture's metadata like 
EXIF, Makernotes, GPS, &etc; This information is the same as  <link 
linkend="using-sidebar-metadata">sidebar Meta-Data</link> from the &digikam; 
main interface or image editor. Note, all these metadata can be unavailable 
with some digital cameras.
+            The Metadata tab displays an internal picture's metadata like 
EXIF, Makernotes, GPS, &etc; This information is the same as  <link 
linkend="using-sidebar-metadata">sidebar Metadata</link> from the &digikam; 
main interface or image editor. Note, all these metadata can be unavailable 
with some digital cameras.
         </para>
 
     </sect3>
diff --git a/digikam/using-camera-processing.docbook 
b/digikam/using-camera-processing.docbook
index 62f64f9..b2ca5ae 100644
--- a/digikam/using-camera-processing.docbook
+++ b/digikam/using-camera-processing.docbook
@@ -5,7 +5,7 @@
     <title>Automatic Rotation</title>
 
         <para>
-            &digikam; can use any information about the orientation of the 
camera at the moment the photograph was taken for automatic rotation of the 
photograph when it is downloaded. Not all cameras include this information. See 
the <link linkend="using-sidebar-metadata">sidebar Meta-Data</link> section for 
more detail about information that your camera may have embedded in your 
photographs.
+            &digikam; can use any information about the orientation of the 
camera at the moment the photograph was taken for automatic rotation of the 
photograph when it is downloaded. Not all cameras include this information. See 
the <link linkend="using-sidebar-metadata">sidebar Metadata</link> section for 
more detail about information that your camera may have embedded in your 
photographs.
         </para>
 
         <example>
@@ -30,7 +30,7 @@
     <title>Automatic Destination Albums Creation</title>
 
         <para>
-            If your camera provides information about the date of the 
photograph's taking, &digikam; can use this to automatically create subalbums 
in the destination Album when it is downloaded. Subalbums names will be based 
on image dates. All images which have the same date will be downloaded into the 
same subalbum. Not all cameras include this information. See the <link 
linkend="using-sidebar-metadata"> sidebar Meta-Data</link> section for more 
detail about information your camera may have embedded in your photographs.
+            If your camera provides information about the date of the 
photograph's taking, &digikam; can use this to automatically create subalbums 
in the destination Album when it is downloaded. Subalbums names will be based 
on image dates. All images which have the same date will be downloaded into the 
same subalbum. Not all cameras include this information. See the <link 
linkend="using-sidebar-metadata">sidebar Metadata</link> section for more 
detail about information your camera may have embedded in your photographs.
         </para>
 
         <example>
diff --git a/digikam/using-mainwindow.docbook b/digikam/using-mainwindow.docbook
index d64c5e2..148c068 100644
--- a/digikam/using-mainwindow.docbook
+++ b/digikam/using-mainwindow.docbook
@@ -289,7 +289,7 @@
             </para>
 
             <para>
-            Note that there can be a problem with meta-data embedded in 
photographs when they are edited by other image manipulation applications. Some 
applications do not retain the photograph's meta-data when you save a modified 
image. This means that if you modify a photograph using one of these programs 
you will lose information such as orientation, aperture &etc; that are stored 
in the EXIF and IPTC tags.
+            Note that there can be a problem with metadata embedded in 
photographs when they are edited by other image manipulation applications. Some 
applications do not retain the photograph's metadata when you save a modified 
image. This means that if you modify a photograph using one of these programs 
you will lose information such as orientation, aperture &etc; that are stored 
in the EXIF and IPTC tags.
             </para>
 
         </sect3>
@@ -306,7 +306,7 @@
             </para>
 
             <para>
-            Many digital cameras now have an orientation sensor. This sensor 
can detect how you hold the camera while taking an image. It stores this 
orientation information inside the image. This meta data is stored in an 
embedded meta-data section called EXIF. The cameras could rotate the image 
themselves right away, but they have limited processing power, so they leave 
this job to an application like &digikam;. If the camera is storing the 
orientation, then &digikam; can use it to automatically rotate your photographs 
so that they are the correct way up when you display them. &digikam; will 
rotate the image on disk according to this orientation information.
+            Many digital cameras now have an orientation sensor. This sensor 
can detect how you hold the camera while taking an image. It stores this 
orientation information inside the image. This meta data is stored in an 
embedded metadata section called EXIF. The cameras could rotate the image 
themselves right away, but they have limited processing power, so they leave 
this job to an application like &digikam;. If the camera is storing the 
orientation, then &digikam; can use it to automatically rotate your photographs 
so that they are the correct way up when you display them. &digikam; will 
rotate the image on disk according to this orientation information.
             </para>
 
             <para>
diff --git a/digikam/using-setup-metadata-intro.docbook 
b/digikam/using-setup-metadata-intro.docbook
index eb9a658..bc7a607 100644
--- a/digikam/using-setup-metadata-intro.docbook
+++ b/digikam/using-setup-metadata-intro.docbook
@@ -2,7 +2,7 @@
     <title>Introduction</title>
 
     <para>
-        Image files can have some meta-data embedded into the image file 
format. This meta-data can be stored in a number of standard formats as JPEG, 
TIFF, PNG, JPEG2000, PGF, and RAW files. Meta-data can be read and write in the 
<ulink url="https://en.wikipedia.org/wiki/Exif";>EXIF</ulink>, <ulink 
url="https://en.wikipedia.org/wiki/IPTC_Information_Interchange_Model";>IPTC</ulink>,
 and <ulink 
url="https://en.wikipedia.org/wiki/Extensible_Metadata_Platform";>XMP</ulink> 
format if they are present in the file.
+        Image files can have some metadata embedded into the image file 
format. This metadata can be stored in a number of standard formats as JPEG, 
TIFF, PNG, JPEG2000, PGF, and RAW files. Metadata can be read and written in 
the <ulink url="https://en.wikipedia.org/wiki/Exif";>EXIF</ulink>, <ulink 
url="https://en.wikipedia.org/wiki/IPTC_Information_Interchange_Model";>IPTC</ulink>,
 and <ulink 
url="https://en.wikipedia.org/wiki/Extensible_Metadata_Platform";>XMP</ulink> 
format if they are present in the file.
     </para>
 
 </sect3>
diff --git a/digikam/using-setup-metadata-rotation-ac.docbook 
b/digikam/using-setup-metadata-rotation-ac.docbook
index a4d82db..965c2e7 100644
--- a/digikam/using-setup-metadata-rotation-ac.docbook
+++ b/digikam/using-setup-metadata-rotation-ac.docbook
@@ -12,7 +12,7 @@
     </para>
 
     <para>
-        <guilabel>Set orientation tag to normal after rotate/flip</guilabel> : 
the Auto Rotate option automatically corrects the orientation of images taken 
with digital cameras that have an orientation sensor. The camera adds an 
orientation tag to the image's EXIF meta-data. &digikam; can read this tag to 
adjust the image accordingly. If you manually rotate an image, this meta-data 
will be incorrect. This option will set the orientation tag to "Normal" after 
an adjustment, assuming that you rotated it to the correct orientation. Switch 
this off if you don't want &digikam; to make changes to the orientation tag, 
when you rotate or flip the image.
+        <guilabel>Set orientation tag to normal after rotate/flip</guilabel> : 
the Auto Rotate option automatically corrects the orientation of images taken 
with digital cameras that have an orientation sensor. The camera adds an 
orientation tag to the image's EXIF metadata. &digikam; can read this tag to 
adjust the image accordingly. If you manually rotate an image, this metadata 
will be incorrect. This option will set the orientation tag to "Normal" after 
an adjustment, assuming that you rotated it to the correct orientation. Switch 
this off if you don't want &digikam; to make changes to the orientation tag, 
when you rotate or flip the image.
     </para>
 
 </sect4>

Reply via email to