GNOME.org
 

[gimp-help-2] Be consistent, color is now used everywhere.

commit f6002cd4bd1cc75d98b425aee09749c28454aebb
Author: Andrew Pitonyak <andrew pitonyak org>
Date:   Mon Jun 29 22:54:03 2009 -0400

    Be consistent, color is now used everywhere.
    
    Continued making general changes working through the toolbox.

 src/concepts/basic-setup.xml       |   26 ++++++++++++++++----------
 src/concepts/concepts.xml          |    2 +-
 src/concepts/toolbox.xml           |   35 ++++++++++++++++++-----------------
 src/dialogs/color-dialog.xml       |    4 ++--
 src/filters/distort/newsprint.xml  |    6 +++---
 src/filters/light_effects/nova.xml |    2 +-
 src/glossary/glossary.xml          |    6 +++---
 src/tutorial/quickies.xml          |   16 ++++++++--------
 8 files changed, 52 insertions(+), 45 deletions(-)
---
diff --git a/src/concepts/basic-setup.xml b/src/concepts/basic-setup.xml
index 25f7575..8a40c5b 100644
--- a/src/concepts/basic-setup.xml
+++ b/src/concepts/basic-setup.xml
@@ -40,8 +40,16 @@
     <listitem>
       <para>
         <emphasis>The Main Toolbox:</emphasis>
-        This is the heart of GIMP. It contains a set of icon buttons
-        used to select tools, and more.
+        Contains a set of icon buttons used to select tools.
+        May also contain the foreground and background colors;
+        brush, pattern, and Gradient; and an icon of the active image.
+        Use 
+        <menuchoice>
+        <guimenu>Edit</guimenu>
+        <guisubmenu>Preferences</guisubmenu>
+        <guisubmenu>Toolbox</guisubmenu>
+      </menuchoice>
+      to enable, or disable the extra items.
       </para>
     </listitem>
     <listitem>
@@ -109,6 +117,7 @@
         <guimenu>Windows</guimenu>
         <guisubmenu>Recently Closed Docks</guisubmenu>
       </menuchoice>
+      ; the Windows menu command is only available while an image is open.
       To add, close, or detach a tab from a dock, click
       <guiicon>
         <inlinemediaobject>
@@ -123,14 +132,11 @@
     </para>
   </note>
   <para>
-    Unlike some other programs, GIMP does not give you the option of putting
-    all your controls and image displays into a single comprehensive
-    window. The GIMP developers have always felt that this is a poor way of
-    working, because it forces the program to do the work of a
-    dedicated window manager. Not
-    only would this waste programmer time, it is almost impossible to
-    do in a way that works correctly across all of the operating systems
-    on which GIMP runs.
+    GIMP does not support placing all controls and images into a single
+    comprehensive window. The consensus in the GIMP community, is that
+    multiple windows offers a better user experience&mdash;and a
+    single window is difficult to do in a way that works correctly
+    across all of the operating systems on which GIMP runs.
   </para>
   <para>
     Earlier versions of GIMP (up to GIMP 1.2.5) used many dialogs:
diff --git a/src/concepts/concepts.xml b/src/concepts/concepts.xml
index 5d64bb0..8373a0b 100644
--- a/src/concepts/concepts.xml
+++ b/src/concepts/concepts.xml
@@ -105,7 +105,7 @@
           meaning of this value depends on the type of channel, e.g. in the
           <acronym>RGB</acronym> color model the value in the
           <emphasis>R</emphasis>-channel means the amount of red which is
-          added to the colour of the different pixels, in the selection
+          added to the color of the different pixels, in the selection
           channel, the value denotes how strongly the pixels are
           selected, and in the alpha channel the values denote how
           transparent the corresponding pixels are.
diff --git a/src/concepts/toolbox.xml b/src/concepts/toolbox.xml
index f592194..570fd1c 100644
--- a/src/concepts/toolbox.xml
+++ b/src/concepts/toolbox.xml
@@ -34,10 +34,11 @@
   </para>
   <tip>
     <para>
-      In the Toolbox, as in most parts of GIMP, moving the mouse on top
-      of something and letting it rest for a moment will usually bring
-      up a "tooltip" message that may help you understand what the thing
-      is or what you can do with it.  Also, in many cases you can press
+      In the Toolbox, as in most parts of GIMP, moving the mouse over
+      something and letting it rest for a moment, usually displays
+      a <quote>tooltip</quote> that describes the thing. Short cut keys
+      are also frequently shown in the tooltip.
+      In many cases, you can hover the mouse over an item and press
       the <keycap>F1</keycap> key to get help about the thing that is
       underneath the mouse.
     </para>
@@ -47,7 +48,7 @@
       <para>
         <emphasis>Tool icons:</emphasis> These icons are buttons which
         activate tools for a wide variety of purposes: selecting parts of
-        images, painting on them, transforming them, etc.  The
+        images, painting an image, transforming an image, etc.  The
         <link linkend="gimp-toolbox-introduction">Toolbox Introduction</link>
         section gives an overview of how to work with tools, and each tool is
         described systematically in the
@@ -81,13 +82,12 @@
     <listitem>
       <para>
         <emphasis>Active Image:</emphasis> In <acronym>GIMP</acronym>, you
-        can work with many images at once, but at any given moment, one of
-        them is the <quote>active image</quote>. Here you find a small
-        iconic representation of the active image. Clicking on it brings up
-        a dialog with a list of all the currently open images, allowing you
-        to make a different one active if you want to. (Clicking on the
-        window where the image is displayed will accomplish the same thing,
-        though.)
+        can work with many images at once, but at any given moment, only one
+        image is the <quote>active image</quote>. Here you find a small
+        iconic representation of the active image. Click the icon to display
+        a dialog with a list of the currently open images, click an
+        image in the dialog to make it active. You can also click an
+        image window to make it the active image.
       </para>
       <note>
         <para>
@@ -103,17 +103,18 @@
       At every start, GIMP selects a tool (the brush), a color, a brush and
       a pattern by default, always the same. If you want GIMP to select the
       last tool, color, brush and pattern you used when quitting your
-      previous session, check the <guilabel>Save input device settings on
-      exit</guilabel> in
+      previous session, check the
+      <guilabel>Save input device settings on exit</guilabel> in
       <link linkend="gimp-prefs-input-devices">Preferences/Input
       Devices</link>.
     </para>
   </note>
   <tip>
     <para>
-      You can get rid of the <quote>Wilber's eyes</quote> (replacing the old
-      Toolbox menu) from the Toolbox by adding the following line to your
-      <filename>gimprc</filename> file:
+      The Toolbox window displays <quote>Wilber's eyes</quote> along the top
+      of the dialog. You can get rid of the <quote>Wilber's eyes</quote>
+      by adding the following line to your <filename>gimprc</filename>
+      file:
       <code>(toolbox-wilber&nbsp;no)</code>.
       It only affects the toolbox. The eyes in the Image window are only
       visible when you do not have an open image.
diff --git a/src/dialogs/color-dialog.xml b/src/dialogs/color-dialog.xml
index 2268073..d5b81c8 100644
--- a/src/dialogs/color-dialog.xml
+++ b/src/dialogs/color-dialog.xml
@@ -306,11 +306,11 @@
     </variablelist>
     <para>
       Right up you find a symbol, consisting of two arrows, with which you can
-      exchange the foreground and background colour. At the bottom left of the
+      exchange the foreground and background color. At the bottom left of the
       dialog, just below the foreground color block, you find a switching
       surface with two small, one black and the other white, partially
       overlapping squares. If you click on these, the front and background
-      colour are put back to black and white respectively.
+      color are put back to black and white respectively.
     </para>
   </sect3>
 </sect2>
diff --git a/src/filters/distort/newsprint.xml b/src/filters/distort/newsprint.xml
index 798308f..d51de2b 100644
--- a/src/filters/distort/newsprint.xml
+++ b/src/filters/distort/newsprint.xml
@@ -47,7 +47,7 @@
     <para>
       This filter halftones the image using a clustered-dot dither. Halftoning
       is the process of rendering an image with multiple levels of grey or
-      colour (i.e. a continuous tone image) on a device with fewer tones;
+      color (i.e. a continuous tone image) on a device with fewer tones;
       often a bi-level device such as a printer or typesetter.
     </para>
     <para>
@@ -173,7 +173,7 @@
                   wish to operate in.  In <emphasis>RGB</emphasis> mode, no
                   colorspace conversion is performed. In
                   <emphasis>CMYK</emphasis>, the image is first
-                  internally converted to CMYK, then each colour channel is
+                  internally converted to CMYK, then each color channel is
                   separately halftoned, before finally being
                   recombined back to an RGB image.
                   In <emphasis>Intensity</emphasis> mode, the
@@ -234,7 +234,7 @@
         <listitem>
           <para>
             Proper halftoning does not need antialiasing: the aim is to
-            reduce the colour depth after all!  However, since this
+            reduce the color depth after all!  However, since this
             plugin is mainly for special effects, the results are
             displayed on screen rather than by a black/white printer.
             So it is often useful to apply a little anti-aliasing to
diff --git a/src/filters/light_effects/nova.xml b/src/filters/light_effects/nova.xml
index 5616141..56c7372 100644
--- a/src/filters/light_effects/nova.xml
+++ b/src/filters/light_effects/nova.xml
@@ -154,7 +154,7 @@
         <term>Random Hue</term>
         <listitem>
           <para>
-            Colours rays at random. (0-360) value seems to be a range in
+            Color rays at random. (0-360) value seems to be a range in
             HSV color circle.
           </para>
         </listitem>
diff --git a/src/glossary/glossary.xml b/src/glossary/glossary.xml
index 4fa9f03..f4d58e8 100644
--- a/src/glossary/glossary.xml
+++ b/src/glossary/glossary.xml
@@ -183,11 +183,11 @@
             format as it would be stored in the display's video memory or
             maybe as a device independent bitmap. A bitmap is characterised by
             the width and height of the image in pixels and the number of bits
-            per pixel which determines the number of shades of grey or colours
-            it can represent. A bitmap representing a coloured image (a
+            per pixel which determines the number of shades of grey or colors
+            it can represent. A bitmap representing a colored image (a
             <quote>pixmap</quote>) will usually have pixels with between one
             and eight bits for each of the red, green, and blue components,
-            though other colour encodings are also used. The green component
+            though other color encodings are also used. The green component
             sometimes has more bits than the other two to cater for the human
             eye's greater discrimination in this component.
           </para></blockquote>
diff --git a/src/tutorial/quickies.xml b/src/tutorial/quickies.xml
index 6389038..ef035eb 100644
--- a/src/tutorial/quickies.xml
+++ b/src/tutorial/quickies.xml
@@ -507,7 +507,7 @@
     <para>
       As with anything else, images come in different kinds and serve
       different purposes. Sometimes, a small size is important (for web sites)
-      and at other times, retaining a high colour depth in all its glory (a
+      and at other times, retaining a high color depth in all its glory (a
       family portrait) is what you want. GIMP can handle all of this, and
       more, primarily by converting between three fundamental modes, as seen
       in this menu. In order to switch your image to one of these modes, you
@@ -524,7 +524,7 @@
       </mediaobject>
     </figure>
     <para><emphasis>RGB</emphasis>
-      - This is the default mode, used for high quality rich colour images.
+      - This is the default mode, used for high quality rich color images.
       This is also the mode to do most of your image work with including
       scaling, cropping and even flipping as it gives the computer more
       information to work with. This extra information also makes RGB Mode the
@@ -536,7 +536,7 @@
       B-&gt;Blue. Each of these in turn can have an intensity value of 0-255. So,
       at every pixel, what you see is an additive combination of these three
       components. All these combinations result in a way to represent millions
-      of colours.
+      of colors.
     </para>
 <!--
     <para>
@@ -549,11 +549,11 @@
 -->
     <para><emphasis>Indexed</emphasis>
       - This is the mode usually used when file size is of concern, or when
-      you are working with images with few colours. It involves using a fixed
-      number of colours, 256 or less, at each point to represent the colour at
+      you are working with images with few colors. It involves using a fixed
+      number of colors, 256 or less, at each point to represent the color at
       that point. The defaults to attempting to figure out an "optimum
       palette" to best represent your image. Try it, you can undo it if you
-      don't like the results, or use a custom palette or more colours.
+      don't like the results, or use a custom palette or more colors.
     </para>
     <figure>
       <title>
@@ -569,7 +569,7 @@
     </figure>
     <para>
       As you might expect, since the information needed to represent the
-      colour at each pixel is less, the file size is a lot smaller. However,
+      color at each pixel is less, the file size is a lot smaller. However,
       sometimes, there will be options in the various menus that seem to have
       been "greyed" out for no apparent reason. This usually means the filter
       or option cannot be applied when your image is in its current mode.
@@ -589,7 +589,7 @@
       </mediaobject>
     </figure>
     <para><emphasis>Grayscale</emphasis>
-      - In case you want to convert your brilliant colour image to something
+      - In case you want to convert your brilliant color image to something
       that's black and white (with a lot of shades of grey), this is one of
       the easiest ways in which to do it. Some photos do look a lot fancier
       when displayed in grayscale. Again, if you're interested in some detail,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]