Imported Upstream version 5.2.4

1 files changed, 20 insertions, 20 deletions

diff --git a/src/xml/escp2/inks/picturemate_6.xml b/src/xml/escp2/inks/picturemate_6.xml
index 9ccb684..fa5068a 100644
--- a/src/xml/escp2/inks/picturemate_6.xml
+++ b/src/xml/escp2/inks/picturemate_6.xml
@@ -34,7 +34,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYKRB" text="Six Color Photo" InkID="OTHER">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -52,7 +52,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
      </sequence>
     </curve>
     </HueCurve>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
@@ -70,7 +70,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
      </sequence>
     </curve>
     </HueCurve>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
@@ -88,7 +88,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
      </sequence>
     </curve>
     </HueCurve>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -106,7 +106,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
      </sequence>
     </curve>
     </HueCurve>
-    <subchannel color="7">
+    <subchannel color="7" name="Red" text="Red" translate="text">
      <ChannelDensityParam name="RedDensity"/>
     </subchannel>
    </channel>
@@ -124,7 +124,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
      </sequence>
     </curve>
     </HueCurve>
-    <subchannel color="8" headOffset="1">
+    <subchannel color="8" headOffset="1" name="Blue" text="Blue" translate="text">
      <ChannelDensityParam name="BlueDensity"/>
     </subchannel>
    </channel>
@@ -134,22 +134,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Photo" InkID="CMYK">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -159,32 +159,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYKRB" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_red" index="4">
-    <subchannel color="7">
+    <subchannel color="7" name="Red" text="Red" translate="text">
      <ChannelDensityParam name="RedDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_blue" index="5">
-    <subchannel color="8" headOffset="1">
+    <subchannel color="8" headOffset="1" name="Blue" text="Blue" translate="text">
      <ChannelDensityParam name="BlueDensity"/>
     </subchannel>
    </channel>
@@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>