Git commit 1d2fc522421ec8b6d3a17aace76266dbbdccc241 by Gilles Caulier. Committed on 24/08/2016 at 11:22. Pushed by cgilles into branch 'master'.
rename png M +1 -1 digikam/annexes-credits.docbook M +2 -2 digikam/editor-enhance.docbook R +- -- digikam/editor-refocus.png [from: digikam/editorrefocus.png - 100% similarity] M +1 -1 digikam/editor-transform.docbook M +1 -1 digikam/index.docbook R +- -- digikam/logo-cimg.png [from: digikam/cimg-logo.png - 100% similarity] R +- -- digikam/logo-digikam.png [from: digikam/digikamlogo.png - 100% similarity] M +5 -6 digikam/using-sidebar.docbook M +1 -1 showfoto/index.docbook R +- -- showfoto/logo-showfoto.png [from: showfoto/showfotologo.png - 100% similarity] http://commits.kde.org/digikam-doc/1d2fc522421ec8b6d3a17aace76266dbbdccc241 diff --git a/digikam/annexes-credits.docbook b/digikam/annexes-credits.docbook index 66c4c31..ae844a5 100644 --- a/digikam/annexes-credits.docbook +++ b/digikam/annexes-credits.docbook @@ -3,7 +3,7 @@ <para> <inlinemediaobject> - <imageobject><imagedata fileref="&path;digikamlogo.png" format="PNG"/></imageobject> + <imageobject><imagedata fileref="&path;logo-digikam.png" format="PNG"/></imageobject> <textobject> <phrase>&digikam; logo</phrase> </textobject> </inlinemediaobject> diff --git a/digikam/editor-enhance.docbook b/digikam/editor-enhance.docbook index 16568cc..578e68e 100644 --- a/digikam/editor-enhance.docbook +++ b/digikam/editor-enhance.docbook @@ -387,7 +387,7 @@ <ulink url="http://cimg.sourceforge.net"; > <inlinemediaobject> <imageobject> - <imagedata fileref="&path;cimg-logo.png" format="PNG" /> + <imagedata fileref="&path;logo-cimg.png" format="PNG" /> </imageobject> <textobject> <phrase>cimglogo</phrase> @@ -682,7 +682,7 @@ You can see below a full description of all parameters. In most cases only <guil <ulink url="http://cimg.sourceforge.net"; > <inlinemediaobject> <imageobject> - <imagedata fileref="&path;cimg-logo.png" format="PNG" /> + <imagedata fileref="&path;logo-cimg.png" format="PNG" /> </imageobject> <textobject> <phrase>cimglogo</phrase> diff --git a/digikam/editorrefocus.png b/digikam/editor-refocus.png similarity index 100% rename from digikam/editorrefocus.png rename to digikam/editor-refocus.png diff --git a/digikam/editor-transform.docbook b/digikam/editor-transform.docbook index 273b7db..48b0d53 100644 --- a/digikam/editor-transform.docbook +++ b/digikam/editor-transform.docbook @@ -25,7 +25,7 @@ <para> <ulink url="http://cimg.sourceforge.net";><inlinemediaobject> -<imageobject><imagedata fileref="&path;cimg-logo.png" format="PNG"/></imageobject> +<imageobject><imagedata fileref="&path;logo-cimg.png" format="PNG"/></imageobject> <textobject><phrase>cimglogo</phrase></textobject> </inlinemediaobject></ulink> </para> diff --git a/digikam/index.docbook b/digikam/index.docbook index b3eadf7..892039f 100644 --- a/digikam/index.docbook +++ b/digikam/index.docbook @@ -79,7 +79,7 @@ <para> <inlinemediaobject> - <imageobject><imagedata fileref="&path;digikamlogo.png" format="PNG"/></imageobject> + <imageobject><imagedata fileref="&path;logo-digikam.png" format="PNG"/></imageobject> <textobject> <phrase>&digikam; logo</phrase> </textobject> </inlinemediaobject> </para> diff --git a/digikam/cimg-logo.png b/digikam/logo-cimg.png similarity index 100% rename from digikam/cimg-logo.png rename to digikam/logo-cimg.png diff --git a/digikam/digikamlogo.png b/digikam/logo-digikam.png similarity index 100% rename from digikam/digikamlogo.png rename to digikam/logo-digikam.png diff --git a/digikam/using-sidebar.docbook b/digikam/using-sidebar.docbook index 2b25660..d25461f 100644 --- a/digikam/using-sidebar.docbook +++ b/digikam/using-sidebar.docbook @@ -17,9 +17,9 @@ <listitem><para><link linkend="using-sidebarcolors">Colors</link> : Histograms and embedded ICC profiles</para></listitem> - <listitem><para><link linkend="using-sidebargeolocation">Geolocation</link> : Marble widget shows GPS location</para></listitem> + <listitem><para><link linkend="using-sidebargeolocation">Maps</link> : Marble widget shows GPS location</para></listitem> - <listitem><para><link linkend="using-sidebarcaptions">Comments & Tags</link> : Comments, Date & Time setting, Rating, Tags</para></listitem> + <listitem><para><link linkend="using-sidebarcaptions">Captions</link> : Comments, Date & Time setting, Rating, Tags</para></listitem> <listitem><para><link linkend="using-sidebarfilters">Tag Filters</link> : Tag filters applied to main window selection</para></listitem> @@ -53,7 +53,7 @@ </sect2> - <sect2 id="using-sidebarmetadata"> <title>The Metadata Tabs</title> + <sect2 id="using-sidebarmetadata"> <title>Metadata</title> <para>Metadata are data about the images or files, like technical data of camera setting during shooting, author info, copyrights, keywords, captions, and coordinates of location.</para> <para> @@ -390,7 +390,7 @@ </sect2> - <sect2 id="using-sidebargeolocation"> <title>The Geolocation Tab</title> + <sect2 id="using-sidebargeolocation"> <title>Maps</title> <para>This tab is based on the marble widget to display a rough map of orientation. You can zoom in and out with the mousewheel by either scrolling it or hold and drag it. Pan by holding down the left mouse button.</para> <example> <title>The Geolocation tab</title> @@ -414,7 +414,7 @@ </sect2> <sect2 id="using-sidebarcaptions"> - <title>Comments & Tags</title> + <title>Captions</title> <para> This sidebar tab serves to apply and edit image attributes like captions, rating, date and tags. The attributes are stored in the associated database, in the IPTC and EXIF data fields and become part of the image. All attributes are accessible in one sidebar view as shown in the screenshot below. During image reading the order of priority is a) database b) IPTC and c) EXIF. So if there is a discrepancy between any of the three, this priority will take effect and a synchronization will take place. This sidebar has a first-previous-next-last arrow navigator field on top if shown in the main application. </para> @@ -506,7 +506,6 @@ </sect2> - <sect2 id="using-sidebarfilters"> <title>Tag Filters</title> <para> diff --git a/showfoto/index.docbook b/showfoto/index.docbook index a81d25e..ce22295 100644 --- a/showfoto/index.docbook +++ b/showfoto/index.docbook @@ -49,7 +49,7 @@ <para> <inlinemediaobject> - <imageobject><imagedata fileref="showfotologo.png" format="PNG"/></imageobject> + <imageobject><imagedata fileref="logo-showfoto.png" format="PNG"/></imageobject> <textobject> <phrase>&showfoto; logo</phrase> </textobject> </inlinemediaobject> </para> diff --git a/showfoto/showfotologo.png b/showfoto/logo-showfoto.png similarity index 100% rename from showfoto/showfotologo.png rename to showfoto/logo-showfoto.png
