Git commit b9994288f58638297eff8bb4d22e0e9be3691875 by Burkhard L?ck.
Committed on 28/05/2013 at 18:20.
Pushed by lueck into branch 'master'.

proofread + update to 4.11, thanks for the bug report
BUG:320383

M  +-    --    doc/gradient.png
M  +18   -77   doc/index.docbook
M  +-    --    doc/quick-1.png
D  +-    --    doc/quick-2.png
M  +-    --    doc/quick-3.png
M  +-    --    doc/quick-4.png
M  +-    --    doc/screenshot1.png
M  +-    --    doc/screenshot2.png
M  +-    --    doc/screenshot5.png
M  +-    --    doc/screenshot6.png
D  +-    --    doc/sidebar2.png

http://commits.kde.org/kalzium/b9994288f58638297eff8bb4d22e0e9be3691875

diff --git a/doc/gradient.png b/doc/gradient.png
index 2971bad..80c12b9 100644
Binary files a/doc/gradient.png and b/doc/gradient.png differ
diff --git a/doc/index.docbook b/doc/index.docbook
index 2a6dd09..b4a402d 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -42,8 +42,8 @@
 
                 <legalnotice>&FDLNotice;</legalnotice>
 
-                <date>2012-09-04</date>
-                <releaseinfo>2.4.00 (&kde; 4.9)</releaseinfo>
+                <date>2013-05-28</date>
+                <releaseinfo>2.4.00 (&kde; 4.11)</releaseinfo>
 
                 <abstract>
                         <para>&kalzium; is a program which shows you the 
Periodic Table of
@@ -114,7 +114,7 @@
                 <screenshot>
                         <screeninfo>Information dialog</screeninfo>
                         <mediaobject>
-                                <imageobject><imagedata fileref="quick-2.png" 
format="PNG" /></imageobject>
+                                <imageobject><imagedata 
fileref="infodialog_data_overview.png" format="PNG" /></imageobject>
                                 <textobject><phrase>Information 
dialog</phrase></textobject>
                         </mediaobject>
                 </screenshot>
@@ -496,7 +496,7 @@
                                   The Molecular Editor allows you to view and 
edit molecules using <ulink 
url="http://avogadro.openmolecules.net/wiki/Main_Page";>Avogadro</ulink> 
libraries.
                                 </para>
                                 <para>
-                                  Using control panel on the left you can 
change the view parameters, edit molecule, or measure molecules. There are 
three tabs on this panel: <guilabel>Display</guilabel>, 
<guilabel>Edit</guilabel>, and <guilabel>Measure</guilabel>. The buttons along 
the bottom of the window can be used to <guibutton>Save molecule</guibutton>, 
<guibutton>Download New Molecules</guibutton>, <guibutton>Load 
Molecule</guibutton>, and <guibutton>Close</guibutton> the window.
+                                  Using control panel on the left you can 
change the view parameters, edit molecule, or measure molecules. There are 
three tabs on this panel: <guilabel>Display</guilabel>, 
<guilabel>Edit</guilabel>, and <guilabel>Measure</guilabel>. The buttons along 
the bottom of the window can be used to <guibutton>Save molecule</guibutton>, 
<guibutton>Download New Molecules</guibutton>, <guibutton>Load 
Molecule</guibutton>, and <guibutton>Close</guibutton> the window. The files 
downloaded files will be saved in your <filename 
class="directory">Documents</filename> folder from where you can load them into 
the editor.
                                   <!-- The downloaded from kde-apps data will 
be saved in <filename 
class="directory">$KDEHOME/share/apps/kalzium/molecules</filename>, they should 
be renamed to <filename><replaceable>molecule_name</replaceable>.cml</filename> 
manually. <envar>$KDEHOME</envar> is usually a hidden folder in your Home 
folder called <filename class="directory">.kde</filename> or <filename 
class="directory">.kde4</filename>
                                   "$KDEHOME" is not always defined eg not in 
kubuntu 11.04
                                   <filename class="directory">`kde4-config - 
-localprefix`/share/apps/kvtml</filename>
@@ -890,24 +890,6 @@
                                         </screenshot>
                                 </sect3>
 
-                                <sect3 id="calculate">
-                                        <title>Calculate</title>
-
-                                        <para>The 
<guilabel>Calculate</guilabel> tab is the last in the sidebar. It allows you to 
calculate molecules weights.</para>
-                                        <para>You are first presented with the 
following icons and text:</para>
-                                        <screenshot>
-                                                <mediaobject>
-                                                        <imageobject>
-                                                                <imagedata 
fileref="sidebar2.png" format="PNG"/>
-                                                        </imageobject>
-                                                        <textobject>
-                                                                
<phrase>Calculate</phrase>
-                                                        </textobject>
-                                                        
<caption><para>Calculate</para>
-                                                        </caption>
-                                                </mediaobject>
-                                        </screenshot>
-                                </sect3>
                         </sect2>
                 </sect1>
         </chapter>
@@ -960,9 +942,10 @@
                         </mediaobject>
                 </screenshot>
                 <para>In the <guilabel>Units</guilabel> tab, you can
-                        choose the units for temperature and energy. You can 
select if you prefer kJ/mol by default or
-                        you can choose eV. The Temperature is in Kelvin by 
default but you can
-                        change to degrees Celsius or degrees Fahrenheit.
+                        choose the units for temperature and energy. You can 
select if you prefer electronvolts (eV), kilojoule 
+       per mole (kJ/mol) or joule per mole (J/mol) by default. 
+       For lenght set picometers (pm), nanometers (nm) or ?ngstr?m (?) as 
default.
+       The emperature is in Kelvin by default but you can change to Celsius 
(?C), Fahrenheit (?F) and R?aumur (?R?).
                 </para>
                 <screenshot>
                         <screeninfo>Configure &kalzium; Dialog</screeninfo>
@@ -1322,57 +1305,15 @@
 
                         </sect2>
 
-                        <sect2>
-                                <title>The Settings Menu</title>
-
-                                <variablelist>
-                                        <varlistentry>
-                                                <term><menuchoice>
-                                                                
<guimenu>Settings</guimenu>
-                                                                
<guimenuitem>Show Toolbar</guimenuitem>
-                                                </menuchoice></term>
-                                                
<listitem><para><action>Toggle</action> the Main Toolbar.</para></listitem>
-                                        </varlistentry>
-                                        <varlistentry>
-                                                <term><menuchoice>
-                                                                
<guimenu>Settings</guimenu>
-                                                                
<guimenuitem>Show Statusbar</guimenuitem>
-                                                </menuchoice></term>
-                                                
<listitem><para><action>Toggle</action> the Status bar.</para></listitem>
-                                        </varlistentry>
-                                        <varlistentry>
-                                                <term><menuchoice>
-                                                                
<guimenu>Settings</guimenu>
-                                                                
<guimenuitem>Configure Shortcuts...</guimenuitem>
-                                                </menuchoice></term>
-                                                
<listitem><para><action>Configure</action> the keyboard keys you use to access 
the different actions.</para>
-                                                </listitem>
-                                        </varlistentry>
-                                        <varlistentry>
-                                                <term><menuchoice>
-                                                                
<guimenu>Settings</guimenu>
-                                                                
<guimenuitem>Configure Toolbars...</guimenuitem>
-                                                </menuchoice></term>
-                                                
<listitem><para><action>Configure</action> the items you want to put in the 
toolbar.
-                                                </para></listitem>
-                                        </varlistentry>
-                                        <varlistentry>
-                                                <term><menuchoice>
-                                                                
<guimenu>Settings</guimenu>
-                                                                
<guimenuitem>Configure &kalzium;...</guimenuitem>
-                                                </menuchoice></term>
-                                                
<listitem><para><action>Display</action> the &kalzium; settings dialog.
-                                                </para></listitem>
-                                        </varlistentry>
-
-                                </variablelist>
-
-                        </sect2>
-
-                        <sect2>
-                                <title>The Help Menu</title>
-                                &help.menu.documentation;
-                        </sect2>
+<sect2>
+<title>The Settings and Help Menu</title> 
+<para>
+&kalzium; has the common &kde; <guimenu>Settings</guimenu> and 
<guimenu>Help</guimenu>
+menu items, for more information read the sections about the <ulink 
url="help:/fundamentals/ui.html#menus-settings"
+>Settings Menu</ulink> and <ulink 
url="help:/fundamentals/ui.html#menus-help">Help Menu</ulink>
+of the &kde; Fundamentals.
+</para>
+</sect2>
                 </sect1>
         </chapter>
 
@@ -1489,6 +1430,6 @@
  sgml-indent-step:0
  sgml-indent-data:nil
  End:
-
+kate: space-indent on; indent-width 2; tab-width 2; indent-mode none;
  // vim:ts=2:sw=2:tw=78:noet:noai
  -->
diff --git a/doc/quick-1.png b/doc/quick-1.png
index 63b34ec..36c9f86 100644
Binary files a/doc/quick-1.png and b/doc/quick-1.png differ
diff --git a/doc/quick-2.png b/doc/quick-2.png
deleted file mode 100644
index c35e69d..0000000
Binary files a/doc/quick-2.png and /dev/null differ
diff --git a/doc/quick-3.png b/doc/quick-3.png
index 464fbdb..a83a0f7 100644
Binary files a/doc/quick-3.png and b/doc/quick-3.png differ
diff --git a/doc/quick-4.png b/doc/quick-4.png
index 9f514a6..235dc58 100644
Binary files a/doc/quick-4.png and b/doc/quick-4.png differ
diff --git a/doc/screenshot1.png b/doc/screenshot1.png
index 703365a..eb69af3 100644
Binary files a/doc/screenshot1.png and b/doc/screenshot1.png differ
diff --git a/doc/screenshot2.png b/doc/screenshot2.png
index 1455014..1cb8cea 100644
Binary files a/doc/screenshot2.png and b/doc/screenshot2.png differ
diff --git a/doc/screenshot5.png b/doc/screenshot5.png
index c883c07..ea32218 100644
Binary files a/doc/screenshot5.png and b/doc/screenshot5.png differ
diff --git a/doc/screenshot6.png b/doc/screenshot6.png
index 47823ae..85a7810 100644
Binary files a/doc/screenshot6.png and b/doc/screenshot6.png differ
diff --git a/doc/sidebar2.png b/doc/sidebar2.png
deleted file mode 100644
index 6ddbc01..0000000
Binary files a/doc/sidebar2.png and /dev/null differ

Reply via email to