r18350 by craig - #11501: Add new docs
scribus-commit
scribus-commit at lists.scribus.net
Thu Jul 4 19:17:53 UTC 2013
Author: craig
Date: Thu Jul 4 19:17:53 2013
New Revision: 18350
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18350
Log:
#11501: Add new docs
Added:
branches/Version14x/Scribus/scribus/doc/de/color7a.html
branches/Version14x/Scribus/scribus/doc/de/color7b.html
branches/Version14x/Scribus/scribus/doc/de/color7c.html
branches/Version14x/Scribus/scribus/doc/de/images/CH_1.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/CH_2.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/CH_3.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/CH_4.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/CH_5.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/CH_6.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/CH_7.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/CH_8.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE1.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE10.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE11.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE12.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE13.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE14.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE15.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE16.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE17.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE18.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE19.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE2.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE20.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE21.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE22.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE23.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE24.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE25.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE26.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE27.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE28.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE29.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE3.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE30.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE31.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE32.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE33.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE4.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE5.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE6.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE7.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE8.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE9.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE_a.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE_b.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE_c.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE_colour_select.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE_ex1.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE_ex2.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE_ex3.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE_ex4.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE_ex5.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE_ex6.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE_ex7.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE_ex8.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/GG_CE_ex9.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/galaxy_gauge.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/galaxy_harmonizer1.png (with props)
branches/Version14x/Scribus/scribus/doc/de/images/galaxy_harmonizer2.png (with props)
branches/Version14x/Scribus/scribus/doc/en/color7a.html
branches/Version14x/Scribus/scribus/doc/en/color7b.html
branches/Version14x/Scribus/scribus/doc/en/color7c.html
branches/Version14x/Scribus/scribus/doc/en/images/CH_1.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/CH_2.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/CH_3.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/CH_4.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/CH_5.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/CH_6.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/CH_7.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/CH_8.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE1.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE10.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE11.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE12.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE13.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE14.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE15.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE16.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE17.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE18.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE19.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE2.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE20.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE21.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE22.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE23.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE24.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE25.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE26.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE27.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE28.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE29.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE3.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE30.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE31.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE32.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE33.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE4.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE5.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE6.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE7.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE8.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE9.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE_a.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE_b.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE_c.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE_colour_select.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE_ex1.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE_ex2.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE_ex3.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE_ex4.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE_ex5.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE_ex6.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE_ex7.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE_ex8.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/GG_CE_ex9.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/galaxy_gauge.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/galaxy_harmonizer1.png (with props)
branches/Version14x/Scribus/scribus/doc/en/images/galaxy_harmonizer2.png (with props)
Modified:
branches/Version14x/Scribus/scribus/doc/de/color3.html
branches/Version14x/Scribus/scribus/doc/de/color4.html
branches/Version14x/Scribus/scribus/doc/de/doccopyright.html
branches/Version14x/Scribus/scribus/doc/de/menu.xml
branches/Version14x/Scribus/scribus/doc/en/color3.html
branches/Version14x/Scribus/scribus/doc/en/color4.html
branches/Version14x/Scribus/scribus/doc/en/doccopyright.html
branches/Version14x/Scribus/scribus/doc/en/menu.xml
Modified: branches/Version14x/Scribus/scribus/doc/de/color3.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18350&path=/branches/Version14x/Scribus/scribus/doc/de/color3.html
==============================================================================
--- branches/Version14x/Scribus/scribus/doc/de/color3.html (original)
+++ branches/Version14x/Scribus/scribus/doc/de/color3.html Thu Jul 4 19:17:53 2013
@@ -25,12 +25,40 @@
</tr>
<tr valign=top>
<td><b>Scribus Basic</b></td>
- <td>A set of primary CMYK and RGB colors, as well as three variants of black, namely “Cool Black,” “Rich Black” and “Warm Black.” The latter consist of a mix of C, M, Y and K colors instead of just 100% K (K=Black) and the values are the result of intensive discussions between the Scribus Team and commercial printers. The “Rich Black” variants may not meet every printer’s needs, but they can serve as a basis when it comes to printing a rich black.</td>
+ <td>A set of primary CMYK and RGB colors, as well as three variants of black, namely “Cool Black”, “Rich Black” and “Warm Black”. The latter consist of a mix of C, M, Y and K colors instead of just 100% K (K=Black) and the values are the result of intensive discussions between the Scribus Team and commercial printers. The “Rich Black” variants may not meet every printer’s needs, but they can serve as a basis when it comes to printing a rich black. More “Rich Black” versions are available in the <a href="color7a.html">Galaxy Gauge™ Neutrals and Rich Blacks</a> palette.</td>
<td>9</td>
<td>RGB and CMYK</td>
<td>No</td>
</tr>
- <tr valign=top>
+ <tr valign=top>
+ <td><b>All Color</b></td>
+ <td>A collection of a wide range of RGB colors as traditionally available in image editing software like Photoshop.</td>
+ <td>734</td>
+ <td>RGB</td>
+ <td>No</td>
+ </tr>
+ <tr valign=top>
+ <td><b>Android TM</b></td>
+ <td>The default color scheme used for <a href="http://developer.android.com/design/downloads/index.html">Android™</a> development and useful in Android-related publications.</td>
+ <td>18</td>
+ <td>RGB</td>
+ <td>No</td>
+ </tr>
+ <tr valign=top>
+ <td><b>Classic Kit</b></td>
+ <td>A color set that tries to mimic the colors used in traditional art.</td>
+ <td>78</td>
+ <td>RGB</td>
+ <td>No</td>
+ </tr>
+ <tr valign=top>
+ <td><b>Creative Commons 2013</b></td>
+ <td>The color scheme used by <a href="http://wiki.creativecommons.org/Colors">Creative Commons</a> on their website and publications.</td>
+ <td>42</td>
+ <td>RGB</td>
+ <td>No</td>
+ </tr>
+<!-- <tr valign=top>
<td><b>Fedora RGB</b></td>
<td>A set of named RGB colors that are mandatory for publications of the <a href="http://fedoraproject.org/wiki/Logo/UsageGuidelines">Fedora Linux distribution</a>. </td>
<td>50</td>
@@ -43,11 +71,25 @@
<td>50</td>
<td>CMYK</td>
<td>No</td>
- </tr>
+ </tr> -->
<tr valign=top>
<td><b>Gnome</b></td>
<td>A set of named RGB colors that are mandatory for <a href="http://developer.gnome.org/hig-book/3.0/design-color.html.en">Gnome</a> desktop applications. </td>
<td>32</td>
+ <td>RGB</td>
+ <td>No</td>
+ </tr>
+ <tr valign=top>
+ <td><b>Inkscape</b></td>
+ <td>The default RGB color set of <a href="http://inkscape.org">Inkscape</a>. </td>
+ <td>431</td>
+ <td>RGB</td>
+ <td>No</td>
+ </tr>
+ <tr valign=top>
+ <td><b>LaTeX-Beamer</b></td>
+ <td>The default RGB color set of the <a href="http://latex-beamer.sourceforge.net/">LaTeX Beamer</a> class used in LaTeX presentations. </td>
+ <td>136</td>
<td>RGB</td>
<td>No</td>
</tr>
@@ -63,6 +105,13 @@
<td>A set of CMYK colors based on the “CMYK” palette found in <a href="http://en.openoffice.org">OpenOffice.org</a>.</td>
<td>94</td>
<td>CMYK</td>
+ <td>No</td>
+ </tr>
+ <tr valign=top>
+ <td><b>OpenOffice dot org Galaxy</b></td>
+ <td>A set of RGB colors used in <a href="http://en.openoffice.org">OpenOffice.org</a> since version 3.x.</td>
+ <td>53</td>
+ <td>RGB</td>
<td>No</td>
</tr>
<tr valign=top>
@@ -83,6 +132,13 @@
<td><b>Scribus Splash</b> </td>
<td>The CMYK version of the colors used in the Scribus logo and the splashscreen. Its main purpose is to guarantee a consistent use of colors in Scribus-related publications.</td>
<td>19</td>
+ <td>CMYK</td>
+ <td>No</td>
+ </tr>
+<tr valign=top>
+ <td><b>Shades of K</b> </td>
+ <td>A color palette with different degrees of shades of process color black (K), ranging from 1% to 99% K.</td>
+ <td>100</td>
<td>CMYK</td>
<td>No</td>
</tr>
@@ -137,5 +193,7 @@
<td>No</td>
</tr>
</table>
+<br>
+<br>
</body>
</html>
Modified: branches/Version14x/Scribus/scribus/doc/de/color4.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18350&path=/branches/Version14x/Scribus/scribus/doc/de/color4.html
==============================================================================
--- branches/Version14x/Scribus/scribus/doc/de/color4.html (original)
+++ branches/Version14x/Scribus/scribus/doc/de/color4.html Thu Jul 4 19:17:53 2013
@@ -6,7 +6,7 @@
<body>
<h2>Color Palettes in Scribus (2): National/Government Standards</h2>
<p>In some countries the national standard bodies or governments themselves created standardized color sets, i.e., color standards that bidders/tenderers in calls for tenders must comply with. While some of these standards have niche applications, like military vessels or cables, others are considered to be “general purpose” color standards. The Scribus Team has collected and will continue to collect as many of those standards as possible, at least if they aren’t defined as a subset of other color “standards” like Pantone®. We hope that this feature will facilitate the use of Scribus in government agencies.</p>
-<p>To use one of the standards reliably, you are advised to contact the respective government agency or standards organization, as they are selling reference materials like color fans or color chips. In many cases, the reference materials can also be bought from vendors of printing accessories. <b>The colors in the Scribus palettes are only approximations!</b></p><br>
+<p>To use one of the standards reliably, you are advised to contact the respective government agency or standards organization, as they may be selling reference materials like color fans or color chips. In many cases, the reference materials can also be bought from vendors of printing accessories. <b>The colors in some Scribus palettes are only approximations!</b></p><br>
<table border="1">
<tbody>
<tr>
@@ -50,6 +50,30 @@
<td>Yes</td>
</tr>
<tr>
+ <td>Bundesregierung (3 versions)</td>
+ <td>Germany</td>
+ <td><a href="http://styleguide.bundesregierung.de/Webs/SG/DE/PrintMedien/Basiselemente/Farben/farben_node.html?__site=SG">Bundesregierung</a></td>
+ <td>10</td>
+ <td>CMYK/RGB</td>
+ <td>No/Yes</td>
+ </tr>
+ <tr>
+ <td>Federal Identity Program</td>
+ <td>Canada</td>
+ <td><a href="http://www.canada.gc.ca/home.html">Government of Canada</a></td>
+ <td>8</td>
+ <td>CMYK</td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>Government UK</td>
+ <td>United Kingdom</td>
+ <td><a href="https://www.gov.uk">HM Government</a></td>
+ <td>39</td>
+ <td>RGB</td>
+ <td>No</td>
+ </tr>
+ <tr>
<td>JIS 8721</td>
<td>Japan</td>
<td><a href="http://www.jsa.or.jp/default_english.asp">Japanese Standards Association</a></td>
@@ -74,6 +98,14 @@
<td>Yes</td>
</tr>
<tr>
+ <td>Rijksoverheid (2 versions)</td>
+ <td>The Netherlands</td>
+ <td><a href="http://www.rijkshuisstijl.nl">Rijksoverheid</a></td>
+ <td>16</td>
+ <td>CMYK</td>
+ <td>No</td>
+ </tr>
+ <tr>
<td>US FS 595</td>
<td>United States</td>
<td><a href="http://www.gsa.gov">General Services Administration</a></td>
Modified: branches/Version14x/Scribus/scribus/doc/de/doccopyright.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18350&path=/branches/Version14x/Scribus/scribus/doc/de/doccopyright.html
==============================================================================
--- branches/Version14x/Scribus/scribus/doc/de/doccopyright.html (original)
+++ branches/Version14x/Scribus/scribus/doc/de/doccopyright.html Thu Jul 4 19:17:53 2013
@@ -6,11 +6,11 @@
<body>
<h2>Copyright Notice and Publication License</h2>
-<p>This copyright notice concerns the online and packaged version of the Scribus Online Help, written by the Scribus team composed of Franz Schmid, Peter Linnell, Craig Bradney, Jean Ghali, Hermann Kraus, Riku Leino, Oleksandr Moskalenko, Craig Ringer, Christoph Schäfer, Petr Vaněk, Andreas Vox and Jain Basil with major contributions from Gregory Pittman and addtional documentation by Maciej Hanski.
+<p>This copyright notice concerns the online and packaged version of the Scribus Online Help, written by the Scribus Team, composed of Franz Schmid, Peter Linnell, Craig Bradney, Jean Ghali, Hermann Kraus, Riku Leino, Oleksandr Moskalenko, Craig Ringer, Christoph Schäfer, Petr Vaněk, Andreas Vox and Jain Basil with major contributions from Gregory Pittman and additional documentation by Maciej Hanski.</p>
+<p>Documentation in the Scribus Online Help related to the Galaxy Gauge™ color matching system has been contributed by and is copyrighted by Scientific Illustration Services, Inc., and is also distributed under the license below.</p>
-<p>The “PDF Forms” section is licensed under the Free Documentation License. The FDL applies ONLY to this section of the documentation.</p>
-<p>The Scribus Online Help (excluding the aforementioned “PDF Form” page) is distributed under the Open Publication License guidelines described at <a href="http://www.opencontent.org">www.opencontent.org</a>.</p>
+<p>The Scribus Online Help is distributed under the Open Publication License guidelines described at <a href="http://www.opencontent.org">www.opencontent.org</a>.</p>
<p>The following is the text of the license as it applies to this work:</p>
@@ -20,7 +20,7 @@
<p>Proper form for an incorporation by reference is as follows:
-<p>Copyright © 2003–2011 the Scribus team composed of Franz Schmid, Peter Linnell, Craig Bradney, Jean Ghali, Hermann Kraus, Riku Leino, Oleksandr Moskalenko, Craig Ringer, Christoph Schäfer, Petr Vaněk, Andreas Vox and Jain Basil, as well as Gregory Pittman. The material may be distributed only subject to the terms and conditions set forth in the Open Publication License, v1.0 or later (the latest version is presently available at <a href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</a>).
+<p>Copyright © 2003–2013 the Scribus Team composed of Franz Schmid, Peter Linnell, Craig Bradney, Jean Ghali, Hermann Kraus, Riku Leino, Oleksandr Moskalenko, Craig Ringer, Christoph Schäfer, Petr Vaněk, Andreas Vox and Jain Basil, as well as Gregory Pittman and Maciej Hanski. Copyright © 2013 Scientific Illustration Services, Inc. for the documentation related to the Galaxy Gauge™ color matching system. The material may be distributed only subject to the terms and conditions set forth in the Open Publication License, v1.0 or later (the latest version is presently available at <a href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</a>).
<p>The reference must be immediately followed with the elected options (see section VI).
@@ -28,7 +28,7 @@
<h3>II. COPYRIGHT</h3>
-<p>The copyright is owned by Franz Schmid, Peter Linnell, Craig Bradney, Jean Ghali, Hermann Kraus, Riku Leino, Oleksandr Moskalenko, Craig Ringer, Christoph Schäfer, Petr Vaněk, Andreas Vox and Jain Basil, as well as Gregory Pittman.</p>
+<p>The copyright is owned by Franz Schmid, Peter Linnell, Craig Bradney, Jean Ghali, Hermann Kraus, Riku Leino, Oleksandr Moskalenko, Craig Ringer, Christoph Schäfer, Petr Vaněk, Andreas Vox and Jain Basil, as well as Gregory Pittman and Maciej Hanski. The copyright for documentation related to the Galaxy Gauge™ color matching system is owned by Scientific Illustration Services, Inc.</p>
<h3>III. SCOPE OF LICENSE</h3>
@@ -65,19 +65,32 @@
<h3>VI. ELECTED OPTIONS</h3>
<p>1) Distribution of the work or derivative of the work in any standard (paper) book form is prohibited unless prior permission is obtained from the copyright holder. Other forms of distribution including CD-ROM, electronic, and magnetic media are permitted.</p>
-
+<h3>===================</h3>
<ul>
-<li>Adobe, Adobe Reader, Adobe Acrobat, Adobe Illustrator, Adobe InDesign, Adobe PageMaker, Adobe Photoshop, and PostScript are trademarks of Adobe corporation in the United States, other countries, or both.</li>
+<li>Adobe, Adobe Reader, Adobe Acrobat, Adobe Illustrator, Adobe InCopy, Adobe InDesign, Adobe PageMaker, Adobe Photoshop, and PostScript are trademarks of Adobe corporation in the United States, other countries, or both.</li>
+<li>Apache OpenOffice and OpenOffice.org are trademarks of the Apache Software Foundation in the United States, other countries, or both.</li>
<li>Apple, Mac, Mac OS, Mac OS X, Macintosh, and TrueType are trademarks of Apple corporation in the United States, other countries, or both.</li>
<li>CorelDraw is a registered trademark of Corel corporation in the United States, other countries, or both.</li>
+<li>eComStation is a trademark of Serenity Systems International in the United States, other countries, or both.</li>
+<li>Galaxy Gauge, Galaxy Color Map, Galaxy Color Harmonizer, Galaxy Emotional Color Tool, Galaxy Pocket Color, Pixel Wrench, Galaxy Pocket Pixel, Galaxy Font I.D., and Color Zil are trademarks of Scientific Illustration Services corporation in the United States, other countries, or both.</li>
<li>Ghostscript is a registered trademark of Artifex, Inc. in the United States, other countries, or both.</li>
-<li>Java, StarOffice, and OpenOffice.org are registered trademarks of Oracle America in the United States, other countries, or both.</li>
+<li>GiveLife Color System is a registered trademark of Maria Josefa Fernandez Lopez and Gabriel Vaño Orquin in the Kingdom of Spain, other countries, or both.</li>
+<li>Gnome/GNOME is a registered trademark of The GNOME Foundation in the United States, other countries, or both.</li>
+<li>Haiku is a registered trademark of Haiku, Inc. in the United States, other countries, or both.</li>
+<li>HKS is a registered trademark of HKS Warenzeichenverband e.V. in Germany, other countries, or both.</li>
+<li>Inkscape is a registered trademark of Software Freedom Conservancy in the United States, other countries, or both.</li>
+<li>Java and StarOffice are registered trademarks of Oracle America in the United States, other countries, or both.</li>
+<li>KDE is a registered trademark of KDE e.V. in Germany, other countries, or both.</li>
+<li>LibreOffice is a registered trademark of The Document Foundation in the United States, other countries, or both.</li>
<li>Linux is a registered trademark of Linus Torvalds in the United States, other countries, or both.</li>
-<li>Microsoft, Windows, Windows NT, Windows 2000, Windows XP, Windows Vista, Windows 7, Visual Studio, Microsoft Word, Microsoft PowerPoint, and OpenType are trademarks of Microsoft corporation in the United States, other countries, or both.</li>
-<li>Novell and OpenSUSE are trademarks of Novell in the United States, other countries, or both.</li>
+<li>Microsoft, Windows, Windows NT, Windows 2000, Windows XP, Windows Vista, Windows 7, Windows 8, Visual Studio, Microsoft Word, Microsoft PowerPoint, Microsoft Publisher and OpenType are trademarks of Microsoft corporation in the United States, other countries, or both.</li>
+<li>Novell, OpenSUSE, SUSE, SLED, and SLES are trademarks of Novell in the United States, other countries, or both.</li>
<li>OS/2 is a registered trademark of International Business Machines corporation in the United States, other countries, or both.</li>
+<li>PC-BSD is a registered trademark of the PC-BSD Project in the United States, other countries, or both.</li>
<li>QuarkXPress is a registered trademark of Quark, Inc. in the United States, other countries, or both.</li>
+<li>Qt is a registered trademark of Digia PLC in Finland, other countries, or both.</li>
<li>Red Hat and Fedora are trademarks of Red Hat corporation in the United States, other countries, or both.</li>
+<li>Resene is a registered trademark in New Zealand, other countries, or both.</li>
<li>UNIX and Motif are registered trademarks of The Open Group in the United States, other countries, or both.</li>
<li>All other company, product, or service names may be trademarks or service marks of others and are the property of their respective owners.</li></ul>
</body>
Modified: branches/Version14x/Scribus/scribus/doc/de/menu.xml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18350&path=/branches/Version14x/Scribus/scribus/doc/de/menu.xml
==============================================================================
--- branches/Version14x/Scribus/scribus/doc/de/menu.xml (original)
+++ branches/Version14x/Scribus/scribus/doc/de/menu.xml Thu Jul 4 19:17:53 2013
@@ -56,6 +56,9 @@
<submenuitem text="Resene-Farbpaletten" file="color5.html" />
<submenuitem text="dtp-studio-Farbpaletten" file="color6.html" />
<submenuitem text="GiveLife-Farbpaletten" file="color7.html" />
+ <submenuitem text="Galaxy-Gauge-Farbpaletten" file="color7a.html" />
+ <submenuitem text="Galaxy Color Harmonizer" file="color7b.html" />
+ <submenuitem text="Galaxy Color Emotions" file="color7c.html" />
<submenuitem text="Spezielle Farbpaletten" file="color8.html" />
<submenuitem text="Was ist mit Pantone, HKS usw.?" file="color10.html" />
</submenuitem>
Modified: branches/Version14x/Scribus/scribus/doc/en/color3.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18350&path=/branches/Version14x/Scribus/scribus/doc/en/color3.html
==============================================================================
--- branches/Version14x/Scribus/scribus/doc/en/color3.html (original)
+++ branches/Version14x/Scribus/scribus/doc/en/color3.html Thu Jul 4 19:17:53 2013
@@ -25,12 +25,40 @@
</tr>
<tr valign=top>
<td><b>Scribus Basic</b></td>
- <td>A set of primary CMYK and RGB colors, as well as three variants of black, namely “Cool Black,” “Rich Black” and “Warm Black.” The latter consist of a mix of C, M, Y and K colors instead of just 100% K (K=Black) and the values are the result of intensive discussions between the Scribus Team and commercial printers. The “Rich Black” variants may not meet every printer’s needs, but they can serve as a basis when it comes to printing a rich black.</td>
+ <td>A set of primary CMYK and RGB colors, as well as three variants of black, namely “Cool Black”, “Rich Black” and “Warm Black”. The latter consist of a mix of C, M, Y and K colors instead of just 100% K (K=Black) and the values are the result of intensive discussions between the Scribus Team and commercial printers. The “Rich Black” variants may not meet every printer’s needs, but they can serve as a basis when it comes to printing a rich black. More “Rich Black” versions are available in the <a href="color7a.html">Galaxy Gauge™ Neutrals and Rich Blacks</a> palette.</td>
<td>9</td>
<td>RGB and CMYK</td>
<td>No</td>
</tr>
- <tr valign=top>
+ <tr valign=top>
+ <td><b>All Color</b></td>
+ <td>A collection of a wide range of RGB colors as traditionally available in image editing software like Photoshop.</td>
+ <td>734</td>
+ <td>RGB</td>
+ <td>No</td>
+ </tr>
+ <tr valign=top>
+ <td><b>Android TM</b></td>
+ <td>The default color scheme used for <a href="http://developer.android.com/design/downloads/index.html">Android™</a> development and useful in Android-related publications.</td>
+ <td>18</td>
+ <td>RGB</td>
+ <td>No</td>
+ </tr>
+ <tr valign=top>
+ <td><b>Classic Kit</b></td>
+ <td>A color set that tries to mimic the colors used in traditional art.</td>
+ <td>78</td>
+ <td>RGB</td>
+ <td>No</td>
+ </tr>
+ <tr valign=top>
+ <td><b>Creative Commons 2013</b></td>
+ <td>The color scheme used by <a href="http://wiki.creativecommons.org/Colors">Creative Commons</a> on their website and publications.</td>
+ <td>42</td>
+ <td>RGB</td>
+ <td>No</td>
+ </tr>
+<!-- <tr valign=top>
<td><b>Fedora RGB</b></td>
<td>A set of named RGB colors that are mandatory for publications of the <a href="http://fedoraproject.org/wiki/Logo/UsageGuidelines">Fedora Linux distribution</a>. </td>
<td>50</td>
@@ -43,11 +71,25 @@
<td>50</td>
<td>CMYK</td>
<td>No</td>
- </tr>
+ </tr> -->
<tr valign=top>
<td><b>Gnome</b></td>
<td>A set of named RGB colors that are mandatory for <a href="http://developer.gnome.org/hig-book/3.0/design-color.html.en">Gnome</a> desktop applications. </td>
<td>32</td>
+ <td>RGB</td>
+ <td>No</td>
+ </tr>
+ <tr valign=top>
+ <td><b>Inkscape</b></td>
+ <td>The default RGB color set of <a href="http://inkscape.org">Inkscape</a>. </td>
+ <td>431</td>
+ <td>RGB</td>
+ <td>No</td>
+ </tr>
+ <tr valign=top>
+ <td><b>LaTeX-Beamer</b></td>
+ <td>The default RGB color set of the <a href="http://latex-beamer.sourceforge.net/">LaTeX Beamer</a> class used in LaTeX presentations. </td>
+ <td>136</td>
<td>RGB</td>
<td>No</td>
</tr>
@@ -63,6 +105,13 @@
<td>A set of CMYK colors based on the “CMYK” palette found in <a href="http://en.openoffice.org">OpenOffice.org</a>.</td>
<td>94</td>
<td>CMYK</td>
+ <td>No</td>
+ </tr>
+ <tr valign=top>
+ <td><b>OpenOffice dot org Galaxy</b></td>
+ <td>A set of RGB colors used in <a href="http://en.openoffice.org">OpenOffice.org</a> since version 3.x.</td>
+ <td>53</td>
+ <td>RGB</td>
<td>No</td>
</tr>
<tr valign=top>
@@ -83,6 +132,13 @@
<td><b>Scribus Splash</b> </td>
<td>The CMYK version of the colors used in the Scribus logo and the splashscreen. Its main purpose is to guarantee a consistent use of colors in Scribus-related publications.</td>
<td>19</td>
+ <td>CMYK</td>
+ <td>No</td>
+ </tr>
+<tr valign=top>
+ <td><b>Shades of K</b> </td>
+ <td>A color palette with different degrees of shades of process color black (K), ranging from 1% to 99% K.</td>
+ <td>100</td>
<td>CMYK</td>
<td>No</td>
</tr>
@@ -137,5 +193,7 @@
<td>No</td>
</tr>
</table>
+<br>
+<br>
</body>
</html>
Modified: branches/Version14x/Scribus/scribus/doc/en/color4.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18350&path=/branches/Version14x/Scribus/scribus/doc/en/color4.html
==============================================================================
--- branches/Version14x/Scribus/scribus/doc/en/color4.html (original)
+++ branches/Version14x/Scribus/scribus/doc/en/color4.html Thu Jul 4 19:17:53 2013
@@ -6,7 +6,7 @@
<body>
<h2>Color Palettes in Scribus (2): National/Government Standards</h2>
<p>In some countries the national standard bodies or governments themselves created standardized color sets, i.e., color standards that bidders/tenderers in calls for tenders must comply with. While some of these standards have niche applications, like military vessels or cables, others are considered to be “general purpose” color standards. The Scribus Team has collected and will continue to collect as many of those standards as possible, at least if they aren’t defined as a subset of other color “standards” like Pantone®. We hope that this feature will facilitate the use of Scribus in government agencies.</p>
-<p>To use one of the standards reliably, you are advised to contact the respective government agency or standards organization, as they are selling reference materials like color fans or color chips. In many cases, the reference materials can also be bought from vendors of printing accessories. <b>The colors in the Scribus palettes are only approximations!</b></p><br>
+<p>To use one of the standards reliably, you are advised to contact the respective government agency or standards organization, as they may be selling reference materials like color fans or color chips. In many cases, the reference materials can also be bought from vendors of printing accessories. <b>The colors in some Scribus palettes are only approximations!</b></p><br>
<table border="1">
<tbody>
<tr>
@@ -50,6 +50,30 @@
<td>Yes</td>
</tr>
<tr>
+ <td>Bundesregierung (3 versions)</td>
+ <td>Germany</td>
+ <td><a href="http://styleguide.bundesregierung.de/Webs/SG/DE/PrintMedien/Basiselemente/Farben/farben_node.html?__site=SG">Bundesregierung</a></td>
+ <td>10</td>
+ <td>CMYK/RGB</td>
+ <td>No/Yes</td>
+ </tr>
+ <tr>
+ <td>Federal Identity Program</td>
+ <td>Canada</td>
+ <td><a href="http://www.canada.gc.ca/home.html">Government of Canada</a></td>
+ <td>8</td>
+ <td>CMYK</td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>Government UK</td>
+ <td>United Kingdom</td>
+ <td><a href="https://www.gov.uk">HM Government</a></td>
+ <td>39</td>
+ <td>RGB</td>
+ <td>No</td>
+ </tr>
+ <tr>
<td>JIS 8721</td>
<td>Japan</td>
<td><a href="http://www.jsa.or.jp/default_english.asp">Japanese Standards Association</a></td>
@@ -74,6 +98,14 @@
<td>Yes</td>
</tr>
<tr>
+ <td>Rijksoverheid (2 versions)</td>
+ <td>The Netherlands</td>
+ <td><a href="http://www.rijkshuisstijl.nl">Rijksoverheid</a></td>
+ <td>16</td>
+ <td>CMYK</td>
+ <td>No</td>
+ </tr>
+ <tr>
<td>US FS 595</td>
<td>United States</td>
<td><a href="http://www.gsa.gov">General Services Administration</a></td>
Modified: branches/Version14x/Scribus/scribus/doc/en/doccopyright.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18350&path=/branches/Version14x/Scribus/scribus/doc/en/doccopyright.html
==============================================================================
--- branches/Version14x/Scribus/scribus/doc/en/doccopyright.html (original)
+++ branches/Version14x/Scribus/scribus/doc/en/doccopyright.html Thu Jul 4 19:17:53 2013
@@ -6,11 +6,11 @@
<body>
<h2>Copyright Notice and Publication License</h2>
-<p>This copyright notice concerns the online and packaged version of the Scribus Online Help, written by the Scribus team composed of Franz Schmid, Peter Linnell, Craig Bradney, Jean Ghali, Hermann Kraus, Riku Leino, Oleksandr Moskalenko, Craig Ringer, Christoph Schäfer, Petr Vaněk, Andreas Vox and Jain Basil with major contributions from Gregory Pittman and addtional documentation by Maciej Hanski.
+<p>This copyright notice concerns the online and packaged version of the Scribus Online Help, written by the Scribus Team, composed of Franz Schmid, Peter Linnell, Craig Bradney, Jean Ghali, Hermann Kraus, Riku Leino, Oleksandr Moskalenko, Craig Ringer, Christoph Schäfer, Petr Vaněk, Andreas Vox and Jain Basil with major contributions from Gregory Pittman and additional documentation by Maciej Hanski.</p>
+<p>Documentation in the Scribus Online Help related to the Galaxy Gauge™ color matching system has been contributed by and is copyrighted by Scientific Illustration Services, Inc., and is also distributed under the license below.</p>
-<p>The “PDF Forms” section is licensed under the Free Documentation License. The FDL applies ONLY to this section of the documentation.</p>
-<p>The Scribus Online Help (excluding the aforementioned “PDF Form” page) is distributed under the Open Publication License guidelines described at <a href="http://www.opencontent.org">www.opencontent.org</a>.</p>
+<p>The Scribus Online Help is distributed under the Open Publication License guidelines described at <a href="http://www.opencontent.org">www.opencontent.org</a>.</p>
<p>The following is the text of the license as it applies to this work:</p>
@@ -20,7 +20,7 @@
<p>Proper form for an incorporation by reference is as follows:
-<p>Copyright © 2003–2011 the Scribus team composed of Franz Schmid, Peter Linnell, Craig Bradney, Jean Ghali, Hermann Kraus, Riku Leino, Oleksandr Moskalenko, Craig Ringer, Christoph Schäfer, Petr Vaněk, Andreas Vox and Jain Basil, as well as Gregory Pittman. The material may be distributed only subject to the terms and conditions set forth in the Open Publication License, v1.0 or later (the latest version is presently available at <a href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</a>).
+<p>Copyright © 2003–2013 the Scribus Team composed of Franz Schmid, Peter Linnell, Craig Bradney, Jean Ghali, Hermann Kraus, Riku Leino, Oleksandr Moskalenko, Craig Ringer, Christoph Schäfer, Petr Vaněk, Andreas Vox and Jain Basil, as well as Gregory Pittman and Maciej Hanski. Copyright © 2013 Scientific Illustration Services, Inc. for the documentation related to the Galaxy Gauge™ color matching system. The material may be distributed only subject to the terms and conditions set forth in the Open Publication License, v1.0 or later (the latest version is presently available at <a href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</a>).
<p>The reference must be immediately followed with the elected options (see section VI).
@@ -28,7 +28,7 @@
<h3>II. COPYRIGHT</h3>
-<p>The copyright is owned by Franz Schmid, Peter Linnell, Craig Bradney, Jean Ghali, Hermann Kraus, Riku Leino, Oleksandr Moskalenko, Craig Ringer, Christoph Schäfer, Petr Vaněk, Andreas Vox and Jain Basil, as well as Gregory Pittman.</p>
+<p>The copyright is owned by Franz Schmid, Peter Linnell, Craig Bradney, Jean Ghali, Hermann Kraus, Riku Leino, Oleksandr Moskalenko, Craig Ringer, Christoph Schäfer, Petr Vaněk, Andreas Vox and Jain Basil, as well as Gregory Pittman and Maciej Hanski. The copyright for documentation related to the Galaxy Gauge™ color matching system is owned by Scientific Illustration Services, Inc.</p>
<h3>III. SCOPE OF LICENSE</h3>
@@ -67,17 +67,30 @@
<p>1) Distribution of the work or derivative of the work in any standard (paper) book form is prohibited unless prior permission is obtained from the copyright holder. Other forms of distribution including CD-ROM, electronic, and magnetic media are permitted.</p>
<h3>===================</h3>
<ul>
-<li>Adobe, Adobe Reader, Adobe Acrobat, Adobe Illustrator, Adobe InDesign, Adobe PageMaker, Adobe Photoshop, and PostScript are trademarks of Adobe corporation in the United States, other countries, or both.</li>
+<li>Adobe, Adobe Reader, Adobe Acrobat, Adobe Illustrator, Adobe InCopy, Adobe InDesign, Adobe PageMaker, Adobe Photoshop, and PostScript are trademarks of Adobe corporation in the United States, other countries, or both.</li>
+<li>Apache OpenOffice and OpenOffice.org are trademarks of the Apache Software Foundation in the United States, other countries, or both.</li>
<li>Apple, Mac, Mac OS, Mac OS X, Macintosh, and TrueType are trademarks of Apple corporation in the United States, other countries, or both.</li>
<li>CorelDraw is a registered trademark of Corel corporation in the United States, other countries, or both.</li>
+<li>eComStation is a trademark of Serenity Systems International in the United States, other countries, or both.</li>
+<li>Galaxy Gauge, Galaxy Color Map, Galaxy Color Harmonizer, Galaxy Emotional Color Tool, Galaxy Pocket Color, Pixel Wrench, Galaxy Pocket Pixel, Galaxy Font I.D., and Color Zil are trademarks of Scientific Illustration Services corporation in the United States, other countries, or both.</li>
<li>Ghostscript is a registered trademark of Artifex, Inc. in the United States, other countries, or both.</li>
-<li>Java, StarOffice, and OpenOffice.org are registered trademarks of Oracle America in the United States, other countries, or both.</li>
+<li>GiveLife Color System is a registered trademark of Maria Josefa Fernandez Lopez and Gabriel Vaño Orquin in the Kingdom of Spain, other countries, or both.</li>
+<li>Gnome/GNOME is a registered trademark of The GNOME Foundation in the United States, other countries, or both.</li>
+<li>Haiku is a registered trademark of Haiku, Inc. in the United States, other countries, or both.</li>
+<li>HKS is a registered trademark of HKS Warenzeichenverband e.V. in Germany, other countries, or both.</li>
+<li>Inkscape is a registered trademark of Software Freedom Conservancy in the United States, other countries, or both.</li>
+<li>Java and StarOffice are registered trademarks of Oracle America in the United States, other countries, or both.</li>
+<li>KDE is a registered trademark of KDE e.V. in Germany, other countries, or both.</li>
+<li>LibreOffice is a registered trademark of The Document Foundation in the United States, other countries, or both.</li>
<li>Linux is a registered trademark of Linus Torvalds in the United States, other countries, or both.</li>
-<li>Microsoft, Windows, Windows NT, Windows 2000, Windows XP, Windows Vista, Windows 7, Visual Studio, Microsoft Word, Microsoft PowerPoint, and OpenType are trademarks of Microsoft corporation in the United States, other countries, or both.</li>
-<li>Novell and OpenSUSE are trademarks of Novell in the United States, other countries, or both.</li>
+<li>Microsoft, Windows, Windows NT, Windows 2000, Windows XP, Windows Vista, Windows 7, Windows 8, Visual Studio, Microsoft Word, Microsoft PowerPoint, Microsoft Publisher and OpenType are trademarks of Microsoft corporation in the United States, other countries, or both.</li>
+<li>Novell, OpenSUSE, SUSE, SLED, and SLES are trademarks of Novell in the United States, other countries, or both.</li>
<li>OS/2 is a registered trademark of International Business Machines corporation in the United States, other countries, or both.</li>
+<li>PC-BSD is a registered trademark of the PC-BSD Project in the United States, other countries, or both.</li>
<li>QuarkXPress is a registered trademark of Quark, Inc. in the United States, other countries, or both.</li>
+<li>Qt is a registered trademark of Digia PLC in Finland, other countries, or both.</li>
<li>Red Hat and Fedora are trademarks of Red Hat corporation in the United States, other countries, or both.</li>
+<li>Resene is a registered trademark in New Zealand, other countries, or both.</li>
<li>UNIX and Motif are registered trademarks of The Open Group in the United States, other countries, or both.</li>
<li>All other company, product, or service names may be trademarks or service marks of others and are the property of their respective owners.</li></ul>
</body>
Modified: branches/Version14x/Scribus/scribus/doc/en/menu.xml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18350&path=/branches/Version14x/Scribus/scribus/doc/en/menu.xml
==============================================================================
--- branches/Version14x/Scribus/scribus/doc/en/menu.xml (original)
+++ branches/Version14x/Scribus/scribus/doc/en/menu.xml Thu Jul 4 19:17:53 2013
@@ -56,6 +56,9 @@
<submenuitem text="Resene Color Sets" file="color5.html" />
<submenuitem text="dtp studio Color Sets" file="color6.html" />
<submenuitem text="GiveLife Color System" file="color7.html" />
+ <submenuitem text="Galaxy Gauge Color System" file="color7a.html" />
+ <submenuitem text="Galaxy Color Harmonizer" file="color7b.html" />
+ <submenuitem text="Galaxy Color Emotions" file="color7c.html" />
<submenuitem text="Special Purpose Colors" file="color8.html" />
<submenuitem text="What about Pantone, HKS and others?" file="color10.html" />
</submenuitem>
More information about the scribus-commit
mailing list