Change H10 button names to be more intuitive as discussed on IRC.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11923 a1c6a512-1295-4272-9138-f99709370657

8 files changed, 61 insertions, 43 deletions

diff --git a/manual/platform/h10.tex b/manual/platform/h10.tex
index ce650fcbc1..0478f1bbd1 100644
--- a/manual/platform/h10.tex
+++ b/manual/platform/h10.tex
@@ -20,11 +20,11 @@
 \newcommand{\firmwarefilename}{\fname{rockbox.h10}}
 \newcommand{\screenshotsize}{4cm}
 
-\newcommand{\ButtonLeft}{\btnfnt{Prev}}
-\newcommand{\ButtonRight}{\btnfnt{Next}}
-\newcommand{\ButtonRew}{\btnfnt{Rew}}
+\newcommand{\ButtonLeft}{\btnfnt{Cancel}}
+\newcommand{\ButtonRight}{\btnfnt{Select}}
+\newcommand{\ButtonRew}{\btnfnt{Prev}}
 \newcommand{\ButtonPlay}{\btnfnt{Play}}
-\newcommand{\ButtonFF}{\btnfnt{Ffwd}}
+\newcommand{\ButtonFF}{\btnfnt{Next}}
 \newcommand{\ButtonScrollUp}{\btnfnt{Scroll Up}}
 \newcommand{\ButtonScrollDown}{\btnfnt{Scroll Down}}
 \newcommand{\ButtonPower}{\btnfnt{Power}}
diff --git a/manual/platform/h10_5gb.tex b/manual/platform/h10_5gb.tex
index 80decb5aa9..f8b3d22420 100644
--- a/manual/platform/h10_5gb.tex
+++ b/manual/platform/h10_5gb.tex
@@ -20,11 +20,11 @@
 \newcommand{\firmwarefilename}{\fname{rockbox.h10}}
 \newcommand{\screenshotsize}{4cm}
 
-\newcommand{\ButtonLeft}{\btnfnt{Prev}}
-\newcommand{\ButtonRight}{\btnfnt{Next}}
-\newcommand{\ButtonRew}{\btnfnt{Rew}}
+\newcommand{\ButtonLeft}{\btnfnt{Cancel}}
+\newcommand{\ButtonRight}{\btnfnt{Select}}
+\newcommand{\ButtonRew}{\btnfnt{Prev}}
 \newcommand{\ButtonPlay}{\btnfnt{Play}}
-\newcommand{\ButtonFF}{\btnfnt{Ffwd}}
+\newcommand{\ButtonFF}{\btnfnt{Next}}
 \newcommand{\ButtonScrollUp}{\btnfnt{Scroll Up}}
 \newcommand{\ButtonScrollDown}{\btnfnt{Scroll Down}}
 \newcommand{\ButtonPower}{\btnfnt{Power}}
diff --git a/manual/rockbox_interface/images/h10-front.pdf b/manual/rockbox_interface/images/h10-front.pdf
index a3ab243827..85146ec0e3 100644
--- a/manual/rockbox_interface/images/h10-front.pdf
+++ b/manual/rockbox_interface/images/h10-front.pdf
diff --git a/manual/rockbox_interface/images/h10-front.png b/manual/rockbox_interface/images/h10-front.png
index c0a3dae419..5326d56660 100644
--- a/manual/rockbox_interface/images/h10-front.png
+++ b/manual/rockbox_interface/images/h10-front.png
diff --git a/manual/rockbox_interface/images/h10-front.svg b/manual/rockbox_interface/images/h10-front.svg
index 60dac0799d..7b5a5f89cf 100644
--- a/manual/rockbox_interface/images/h10-front.svg
+++ b/manual/rockbox_interface/images/h10-front.svg
@@ -6,7 +6,7 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xml:space="preserve"
    width="102mm"
@@ -18,26 +18,26 @@
    viewBox="0 0 10200 17000"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.44.1"
    sodipodi:docname="h10-front.svg"
-   sodipodi:docbase="/home/vmware/dev/pix"><metadata
+   sodipodi:docbase="/home/dom/projects/rockbox/clean-copy/manual/rockbox_interface/images"><metadata
    id="metadata422"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
          rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
    id="defs420" /><sodipodi:namedview
-   inkscape:window-height="584"
-   inkscape:window-width="872"
+   inkscape:window-height="642"
+   inkscape:window-width="900"
    inkscape:pageshadow="2"
    inkscape:pageopacity="0.0"
    borderopacity="1.0"
    bordercolor="#666666"
    pagecolor="#ffffff"
    id="base"
-   inkscape:zoom="0.6690327"
-   inkscape:cx="140.41191"
-   inkscape:cy="313.29599"
+   inkscape:zoom="0.94615512"
+   inkscape:cx="59.806846"
+   inkscape:cy="253.55337"
    inkscape:window-x="0"
-   inkscape:window-y="149"
+   inkscape:window-y="51"
    inkscape:current-layer="layer1" />
  <g
    id="Ebene_x0020_1">
@@ -1140,9 +1140,10 @@
      x="-3205.9556"
      y="4091.811">Power</tspan></text>
 
+
 <text
    xml:space="preserve"
-   style="font-size:790.222229px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:URW Palladio L"
+   style="font-size:790.222229px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:URW Palladio L"
    x="10640.836"
    y="3194.6616"
    id="text1730"
@@ -1150,7 +1151,8 @@
      sodipodi:role="line"
      id="tspan1732"
      x="10640.836"
-     y="3194.6616">Rew</tspan></text>
+     y="3194.6616">Prev</tspan></text>
+
 
 <text
    xml:space="preserve"
@@ -1164,9 +1166,10 @@
      x="10640.837"
      y="4966.3735">Play</tspan></text>
 
+
 <text
    xml:space="preserve"
-   style="font-size:790.222229px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:URW Palladio L"
+   style="font-size:790.222229px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:URW Palladio L"
    x="10598.652"
    y="6822.4536"
    id="text1738"
@@ -1174,11 +1177,12 @@
      sodipodi:role="line"
      id="tspan1740"
      x="10598.652"
-     y="6822.4536">Ffwd</tspan></text>
+     y="6822.4536">Next</tspan></text>
+
 
 <text
    xml:space="preserve"
-   style="font-size:790.222229px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:URW Palladio L"
+   style="font-size:790.222229px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:URW Palladio L"
    x="10640.836"
    y="8594.166"
    id="text1742"
@@ -1186,11 +1190,12 @@
      sodipodi:role="line"
      id="tspan1744"
      x="10640.836"
-     y="8594.166">Next</tspan></text>
+     y="8594.166">Select</tspan></text>
+
 
 <text
    xml:space="preserve"
-   style="font-size:790.222229px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:URW Palladio L"
+   style="font-size:790.222229px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:URW Palladio L"
    x="-3448.4934"
    y="8762.8994"
    id="text1746"
@@ -1198,7 +1203,8 @@
      sodipodi:role="line"
      id="tspan1748"
      x="-3448.4934"
-     y="8762.8994">Prev</tspan></text>
+     y="8762.8994">Cancel</tspan></text>
+
 
 <text
    xml:space="preserve"
@@ -1212,6 +1218,7 @@
      x="-3490.677"
      y="10618.979">Scroll Up</tspan></text>
 
+
 <text
    xml:space="preserve"
    style="font-size:790.222229px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:URW Palladio L"
@@ -1224,6 +1231,7 @@
      x="10556.469"
      y="14626.423">Scroll Down</tspan></text>
 
+
 <text
    xml:space="preserve"
    style="font-size:790.222229px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:URW Palladio L"
@@ -1236,6 +1244,7 @@
      x="1951.01"
      y="916.74597">Hold</tspan></text>
 
+
 <path
    style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:28.22222326;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
    d="M 4889.5352,13443.398 L 10254.385,14355.609"
diff --git a/manual/rockbox_interface/images/h10_5gb-front.pdf b/manual/rockbox_interface/images/h10_5gb-front.pdf
index af210c744d..9235b3a056 100644
--- a/manual/rockbox_interface/images/h10_5gb-front.pdf
+++ b/manual/rockbox_interface/images/h10_5gb-front.pdf
diff --git a/manual/rockbox_interface/images/h10_5gb-front.png b/manual/rockbox_interface/images/h10_5gb-front.png
index d7e0930715..272a8bab97 100644
--- a/manual/rockbox_interface/images/h10_5gb-front.png
+++ b/manual/rockbox_interface/images/h10_5gb-front.png
diff --git a/manual/rockbox_interface/images/h10_5gb-front.svg b/manual/rockbox_interface/images/h10_5gb-front.svg
index ea92910c05..a319a430db 100644
--- a/manual/rockbox_interface/images/h10_5gb-front.svg
+++ b/manual/rockbox_interface/images/h10_5gb-front.svg
@@ -6,7 +6,7 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xml:space="preserve"
    width="102mm"
@@ -18,26 +18,26 @@
    viewBox="0 0 10200 17000"
    id="svg3092"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docname="h10_5g-front.svg"
-   sodipodi:docbase="/home/vmware/dev/pix"><metadata
+   inkscape:version="0.44.1"
+   sodipodi:docname="h10_5gb-front.svg"
+   sodipodi:docbase="/home/dom/projects/rockbox/clean-copy/manual/rockbox_interface/images"><metadata
    id="metadata3506"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
          rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
    id="defs3504" /><sodipodi:namedview
-   inkscape:window-height="584"
-   inkscape:window-width="872"
+   inkscape:window-height="694"
+   inkscape:window-width="1022"
    inkscape:pageshadow="2"
    inkscape:pageopacity="0.0"
    borderopacity="1.0"
    bordercolor="#666666"
    pagecolor="#ffffff"
    id="base"
-   inkscape:zoom="0.6690327"
-   inkscape:cx="180.70866"
-   inkscape:cy="301.18109"
+   inkscape:zoom="0.70710678"
+   inkscape:cx="247.38375"
+   inkscape:cy="328.19419"
    inkscape:window-x="0"
-   inkscape:window-y="37"
+   inkscape:window-y="0"
    inkscape:current-layer="layer2" />
  <g
    id="Ebene_x0020_1">
@@ -1131,9 +1131,10 @@
      x="-3079.4048"
      y="3796.5256">Power</tspan></text>
 
+
 <text
    xml:space="preserve"
-   style="font-size:790.222229px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:URW Palladio L"
+   style="font-size:790.222229px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:URW Palladio L"
    x="10767.387"
    y="3110.2944"
    id="text1730"
@@ -1144,7 +1145,8 @@
      sodipodi:role="line"
      id="tspan1732"
      x="10767.387"
-     y="3110.2944">Rew</tspan></text>
+     y="3110.2944">Prev</tspan></text>
+
 
 <text
    xml:space="preserve"
@@ -1161,9 +1163,10 @@
      x="10767.388"
      y="4839.8228">Play</tspan></text>
 
+
 <text
    xml:space="preserve"
-   style="font-size:790.222229px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:URW Palladio L"
+   style="font-size:790.222229px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:URW Palladio L"
    x="10809.57"
    y="6653.7192"
    id="text1738"
@@ -1174,11 +1177,12 @@
      sodipodi:role="line"
      id="tspan1740"
      x="10809.57"
-     y="6653.7192">Ffwd</tspan></text>
+     y="6653.7192">Next</tspan></text>
+
 
 <text
    xml:space="preserve"
-   style="font-size:790.222229px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:URW Palladio L"
+   style="font-size:790.222229px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:URW Palladio L"
    x="10767.387"
    y="8298.8809"
    id="text1742"
@@ -1189,11 +1193,12 @@
      sodipodi:role="line"
      id="tspan1744"
      x="10767.387"
-     y="8298.8809">Next</tspan></text>
+     y="8298.8809">Select</tspan></text>
+
 
 <text
    xml:space="preserve"
-   style="font-size:790.222229px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:URW Palladio L"
+   style="font-size:790.222229px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:URW Palladio L"
    x="-3321.9426"
    y="8467.6143"
    id="text1746"
@@ -1204,7 +1209,8 @@
      sodipodi:role="line"
      id="tspan1748"
      x="-3321.9426"
-     y="8467.6143">Prev</tspan></text>
+     y="8467.6143">Cancel</tspan></text>
+
 
 <text
    xml:space="preserve"
@@ -1221,6 +1227,7 @@
      x="-3364.1262"
      y="10618.979">Scroll Up</tspan></text>
 
+
 <text
    xml:space="preserve"
    style="font-size:790.222229px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:URW Palladio L"
@@ -1236,6 +1243,7 @@
      x="10725.203"
      y="15048.26">Scroll Down</tspan></text>
 
+
 <text
    xml:space="preserve"
    style="font-size:790.222229px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:URW Palladio L"
@@ -1251,6 +1259,7 @@
      x="2752.4988"
      y="579.27704">Hold</tspan></text>
 
+
 <path
    style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:28.22222326;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
    d="M 5058.2697,13865.235 L 10423.12,14777.446"