Index: apps/lang/english.lang
===================================================================
--- apps/lang/english.lang (revision 23624)
+++ apps/lang/english.lang (working copy)
@@ -13244,3 +13244,45 @@
crossfade: "Automatic Track Change Only"
+
+ id: LANG_NEXT_TRACK
+ desc: Shown in Cabbie theme
+ user: core
+
+ *: "Next Track"
+
+
+ *: "Next Track"
+
+
+ *: "Next Track"
+
+
+
+ id: LANG_NEXT
+ desc: Shown in Cabbie theme
+ user: core
+
+ *: "Next"
+
+
+ *: "Next"
+
+
+ *: "Next"
+
+
+
+ id: LANG_OF
+ desc: Shown in Cabbie theme
+ user: core
+
+ *: "of"
+
+
+ *: "of"
+
+
+ *: "of"
+
+
Index: wps/cabbiev2.132x80x16.wps
===================================================================
--- wps/cabbiev2.132x80x16.wps (revision 23624)
+++ wps/cabbiev2.132x80x16.wps (working copy)
@@ -25,11 +25,11 @@
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?d2<%d2|(root)>>
%s%al%?id<%id|%?d1<%d1|(root)>>
-%s%alNext: %?It<%It|%Fn>
+%s%al%Sx|Next|: %?It<%It|%Fn>
#NowPlaying - no aa
%Vl|b|0|10|-|48|1|-|-|
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?d2<%d2|(root)>>
%s%ac%?id<%id|%?d1<%d1|(root)>>
-%s%acNext: %?It<%It|%Fn>
+%s%ac%Sx|Next|: %?It<%It|%Fn>
Index: wps/cabbiev2.128x64x1.clip.wps
===================================================================
--- wps/cabbiev2.128x64x1.clip.wps (revision 23624)
+++ wps/cabbiev2.128x64x1.clip.wps (working copy)
@@ -8,7 +8,7 @@
%V|0|0|128|16|1|
%pb|pb-128x64x1.bmp|2|1|124|4|
%x|a|pbbackground-128x64x1.bmp|1|0|
-%pp of %pe%ar%pc
+%pp %Sx|of| %pe%ar%pc
# tag info viewport
%V|0|18|128|25|1|
Index: wps/DancePuffDuo.176x220x1.wps
===================================================================
--- wps/DancePuffDuo.176x220x1.wps (revision 23624)
+++ wps/DancePuffDuo.176x220x1.wps (working copy)
@@ -22,7 +22,7 @@
%t0.2%xdGc%xdFa%ac%pc/%pt;%t0.2%xdGd%xdFb%ac%pc/%pt;%t0.2%xdGc%xdFa%ac%pc/%pt;%t0.2%xdGd%xdFb%ac%pc/%pt;%t0.2%xdGa%xdFc%ac%pc/%pt;%t0.2%xdGb%xdFd%ac%pc/%pt;%t0.2%xdGa%xdFc%ac%pc/%pt;%t0.2%xdGb%xdFd%ac%pc/%pt
%pb
-%ac%sNext Song:
+%ac%s%Sx|Next Track|:
%ac%s%?In<%In. |>%?It<%It|%Fn>
%ac%s%?Ia<%Ia|%D2>
%ac%s%?Id<%Id|%D1>
Index: wps/iAmp.128x64x1.wps
===================================================================
--- wps/iAmp.128x64x1.wps (revision 23624)
+++ wps/iAmp.128x64x1.wps (working copy)
@@ -7,7 +7,7 @@
%s%?it<%?in<%in. >%it|%fn>
%pb
%xl|A|codec.bmp|102|48|21|
-%pc/%pt %ar%pp of %pe%t5;%pc/%pt%?fc<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk|%xdAl|%xdAm|%xdAn|%xdAo|%xdAp|%xdAq|%xdAr|%xdAs|%xdAt|%xdAu>%t3;%pc/%pt %ar%?fv<[VBR]|%fbkbps>%t3
+%pc/%pt %ar%pp %Sx|of| %pe%t5;%pc/%pt%?fc<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk|%xdAl|%xdAm|%xdAn|%xdAo|%xdAp|%xdAq|%xdAr|%xdAs|%xdAt|%xdAu>%t3;%pc/%pt %ar%?fv<[VBR]|%fbkbps>%t3
%xl|B|battery-small.bmp|0|0|6|
%?bp<%xdBa|%?bl<%xdBb|%xdBc|%xdBd|%xdBe|%xdBf>>
%xl|C|volume.bmp|24|0|9|
Index: wps/iCatcher.128x96x1.wps
===================================================================
--- wps/iCatcher.128x96x1.wps (revision 23624)
+++ wps/iCatcher.128x96x1.wps (working copy)
@@ -8,7 +8,7 @@
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
%pb|-|11|-|106|4|
-%s%acNext: %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx|Next|: %?It<%It|%?Fn<%Fn|?>>
%xl|A|battery-s.bmp|109|3|5|
%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
Index: wps/iCatcher.138x110x2.wps
===================================================================
--- wps/iCatcher.138x110x2.wps (revision 23624)
+++ wps/iCatcher.138x110x2.wps (working copy)
@@ -12,7 +12,7 @@
%al %fbKbps
%pb|-|10|-|118|4|
-%s%acNext: %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx|Next|: %?It<%It|%?Fn<%Fn|?>>
%xl|A|battery-g.bmp|116|8|5|
%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
Index: wps/iCatcher.160x128x2.wps
===================================================================
--- wps/iCatcher.160x128x2.wps (revision 23624)
+++ wps/iCatcher.160x128x2.wps (working copy)
@@ -13,7 +13,7 @@
%al %fbKbps
%pb|-|10|-|140|4|
-%s%acNext: %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx|Next|: %?It<%It|%?Fn<%Fn|?>>
%xl|A|battery-g.bmp|135|8|5|
%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
Index: wps/cabbiev2.320x240x16.mrobe500.wps
===================================================================
--- wps/cabbiev2.320x240x16.mrobe500.wps (revision 23624)
+++ wps/cabbiev2.320x240x16.mrobe500.wps (working copy)
@@ -35,7 +35,7 @@
%s%al%?id<%id|%?d1<%d1|(root)>>
#%s%al%iy
-%s%alNext Track:
+%s%al%Sx|Next Track|:
%s%al%?It<%It|%Fn>
%s%al%Ia
@@ -45,14 +45,14 @@
%s%ac%?id<%id|%?d1<%d1|(root)>>
%s%ac%iy
-%acNext Track:
+%ac%Sx|Next Track|:
%s%ac%?It<%It|%Fn>
%s%ac%Ia
%V|0|180|-|20|1|-|-|
#touch the X of X regions to let the playlist viewer pop up
%T|130|0|60|20|playlist|
-%al %pc%ac%pp of %pe%ar%pr
+%al %pc%ac%pp %Sx|of| %pe%ar%pr
#viewport for the touch icons
%xl|G|browser-320x240x16.bmp|5|5|
Index: wps/cabbiev2.112x64x1.wps
===================================================================
--- wps/cabbiev2.112x64x1.wps (revision 23624)
+++ wps/cabbiev2.112x64x1.wps (working copy)
@@ -13,7 +13,7 @@
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?d2<%d2|(root)>>
%s%ac%?id<%id|%?d1<%d1|(root)>>
-%t5%ac%s%?Fn|%ac%pp of %pe>;%t5%ac%s%?Fn|%ac%pp of %pe>
+%t5%ac%s%?Fn<%Sx|Next|: %?It<%It|%Fn>|%ac%pp %Sx|of| %pe>;%t5%ac%s%?Fn<%Sx|Next|: %?Ia<%Ia|%Fn>|%ac%pp %Sx|of| %pe>
%pb|pb-112x64x1.bmp|1|42|110|4|
%pc%ar%pr
#Bottom status bar
Index: wps/cabbiev2.320x240x16.wps
===================================================================
--- wps/cabbiev2.320x240x16.wps (revision 23624)
+++ wps/cabbiev2.320x240x16.wps (working copy)
@@ -27,7 +27,7 @@
%s%al%?id<%id|%?d1<%d1|(root)>>
%s%al%iy
-%s%alNext Track:
+%s%al%Sx|Next Track|:
%s%al%?It<%It|%Fn>
%s%al%Ia
@@ -37,10 +37,10 @@
%s%ac%?id<%id|%?d1<%d1|(root)>>
%s%ac%iy
-%acNext Track:
+%ac%Sx|Next Track|:
%s%ac%?It<%It|%Fn>
%s%ac%Ia
%V|0|180|-|20|1|-|-|
-%al %pc%ac%pp of %pe%ar%pr
+%al %pc%ac%pp %Sx|of| %pe%ar%pr
Index: wps/cabbiev2.240x320x16.wps
===================================================================
--- wps/cabbiev2.240x320x16.wps (revision 23624)
+++ wps/cabbiev2.240x320x16.wps (working copy)
@@ -23,13 +23,13 @@
%?C<|%ac%?fv<(vbr) |>%fb kbit/s %fc>
%?C<|>
%?C<%s%ac%?it<%it|%fn>|>
-%?C<%s%ac%?ia<%ia|%?d2<%d2|(root)>>|%acNext Track:>
+%?C<%s%ac%?ia<%ia|%?d2<%d2|(root)>>|%ac%Sx|Next Track|:>
%?C<%s%ac%?id<%id|%?d1<%d1|(root)>>|%ac%s%?It<%It|%Fn>>
%?C<|%s%ac%?Ia<%Ia|%?D2<%D2|(root)>>>
-%?C<%s%acNext: %?Ia<%Ia|%?D2<%D2|(root)>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D1<%D1|(root)>>>
+%?C<%s%ac%Sx|Next|: %?Ia<%Ia|%?D2<%D2|(root)>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D1<%D1|(root)>>>
- %pc%ac%pp of %pe%ar%pr
+ %pc%ac%pp %Sx|of| %pe%ar%pr
%?mh<%xdAa|%xdAb>
%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
Index: wps/boxes.320x240x16.wps
===================================================================
--- wps/boxes.320x240x16.wps (revision 23624)
+++ wps/boxes.320x240x16.wps (working copy)
@@ -18,7 +18,7 @@
%ac%s%?ia<%ia|%?d2<%d2|(Unknown Artist)>>
%ac%s%?id<%id|%?d1<%d1|(Unknown Album)>>
-%acTrack %pp of %pe
+%acTrack %pp %Sx|of| %pe
%ac%pc / %pt (-%pr)
%fbk
Index: wps/cabbiev2.128x64x1.wps
===================================================================
--- wps/cabbiev2.128x64x1.wps (revision 23624)
+++ wps/cabbiev2.128x64x1.wps (working copy)
@@ -23,7 +23,7 @@
%xl|D|shuffle-128x64x1.bmp|67|13|
%xl|E|repeat-128x64x1.bmp|93|12|4|
%xl|F|playmode-128x64x1.bmp|113|12|5|
-%pp of %pe%ar%pc
+%pp %Sx|of| %pe%ar%pc
# status bar
%?mh<%xdAa|%xdAb>
Index: wps/iCatcher.240x320x16.wps
===================================================================
--- wps/iCatcher.240x320x16.wps (revision 23624)
+++ wps/iCatcher.240x320x16.wps (working copy)
@@ -15,7 +15,7 @@
%al %fbKbps
%pb|-|11|-|218|7|
-%s%acNext: %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx|Next|: %?It<%It|%?Fn<%Fn|?>>
%xl|A|battery-b.bmp|204|12|5|
%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
Index: wps/iCatcher.320x240x16.wps
===================================================================
--- wps/iCatcher.320x240x16.wps (revision 23624)
+++ wps/iCatcher.320x240x16.wps (working copy)
@@ -11,7 +11,7 @@
%al %fbKbps
%pb|-|11|-|298|7|
-%s%acNext: %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx|Next|: %?It<%It|%?Fn<%Fn|?>>
%xl|A|battery-b.bmp|284|12|5|
%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
Index: wps/cabbiev2.220x176x16.wps
===================================================================
--- wps/cabbiev2.220x176x16.wps (revision 23624)
+++ wps/cabbiev2.220x176x16.wps (working copy)
@@ -26,7 +26,7 @@
%s%al%?ia<%ia|%?d2<%d2|(root)>>
%s%al%?id<%id|%?d1<%d1|(root)>>
-%s%alNext Track:
+%s%al%Sx|Next Track|:
%s%al%?It<%It|%Fn>
%Vl|b|0|30|-|90|1|-|-|
@@ -34,9 +34,9 @@
%s%ac%?ia<%ia|%?d2<%d2|(root)>>
%s%ac%?id<%id|%?d1<%d1|(root)>>
-%acNext Track:
+%ac%Sx|Next Track|:
%s%ac%?It<%It|%Fn>
%V|0|130|-|20|1|-|-|
-%al %pc%ac%pp of %pe%ar%pr
+%al %pc%ac%pp %Sx|of| %pe%ar%pr
Index: wps/cabbiev2.176x220x16.wps
===================================================================
--- wps/cabbiev2.176x220x16.wps (revision 23624)
+++ wps/cabbiev2.176x220x16.wps (working copy)
@@ -18,7 +18,7 @@
%?C<|%s%ac%?id<%id|%?d1<%d1|(root)>>>
%?C<|%s%ac%?iy<%iy|>>
-%?C<|%s%acNext Song:>
+%?C<|%s%ac%Sx|Next Track|:>
%?C<|%s%ac%?It<%It|%Fn>>
%?C<|%s%ac%?Ia<%Ia|>>
@@ -26,7 +26,7 @@
%?C<%s%ac%?ia<%ia|%?d2<%d2|(root)>>|>
%?C<%s%ac%?id<%id|%?d1<%d1|(root)>>|>
-%al %pc%ac%pp of %pe%ar%pr
+%al %pc%ac%pp %Sx|of| %pe%ar%pr
%?mh<%xdAa|%xdAb>
%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
Index: wps/UniCatcher.240x320x16.wps
===================================================================
--- wps/UniCatcher.240x320x16.wps (revision 23624)
+++ wps/UniCatcher.240x320x16.wps (working copy)
@@ -18,7 +18,7 @@
%al %fbKbps
%pb|-|11|-|218|7|
-%s%acNext: %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx|Next|: %?It<%It|%?Fn<%Fn|?>>
%xl|A|battery-b.bmp|204|12|5|
%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
Index: wps/UniCatcher.320x240x16.wps
===================================================================
--- wps/UniCatcher.320x240x16.wps (revision 23624)
+++ wps/UniCatcher.320x240x16.wps (working copy)
@@ -13,7 +13,7 @@
%al %fbKbps
%pb|-|11|-|298|7|
-%s%acNext: %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx|Next|: %?It<%It|%?Fn<%Fn|?>>
%xl|A|battery-b.bmp|284|12|5|
%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
Index: wps/boxes.220x176x16.wps
===================================================================
--- wps/boxes.220x176x16.wps (revision 23624)
+++ wps/boxes.220x176x16.wps (working copy)
@@ -20,7 +20,7 @@
%ac%s%?it<%it|%fn>
%ac%t5%s%?ia<%ia|%?d2<%d2|(Unknown Artist)>>;%ac%t5%s%?id<%id|%?d1<%d1|(Unknown Album)>>
-%ac%t5%pc / %pt;%ac%t5Track %pp of %pe
+%ac%t5%pc / %pt;%ac%t5Track %pp %Sx|of| %pe
Index: wps/iCatcher.176x220x16.wps
===================================================================
--- wps/iCatcher.176x220x16.wps (revision 23624)
+++ wps/iCatcher.176x220x16.wps (working copy)
@@ -17,7 +17,7 @@
%al %fbKbps
%pb|-|10|-|156|4|
-%s%acNext: %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx|Next|: %?It<%It|%?Fn<%Fn|?>>
%xl|A|battery.bmp|151|8|5|
%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
Index: wps/iCatcher.220x176x16.wps
===================================================================
--- wps/iCatcher.220x176x16.wps (revision 23624)
+++ wps/iCatcher.220x176x16.wps (working copy)
@@ -11,7 +11,7 @@
%al %fbKbps
%pb|-|11|-|198|6|
-%s%acNext: %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx|Next|: %?It<%It|%?Fn<%Fn|?>>
%xl|A|battery.bmp|194|9|5|
%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
Index: wps/cabbiev2.138x110x2.wps
===================================================================
--- wps/cabbiev2.138x110x2.wps (revision 23624)
+++ wps/cabbiev2.138x110x2.wps (working copy)
@@ -25,15 +25,15 @@
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?d2<%d2|(root)>>
%s%al%?id<%id|%?d1<%d1|(root)>>
-%s%alNext Track:
+%s%al%Sx|Next Track|:
%s%al%?It<%It|%Fn>
%Vl|b|0|10|-|60|1|-|-|
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?d2<%d2|(root)>>
%s%ac%?id<%id|%?d1<%d1|(root)>>
-%s%acNext Track:
+%s%ac%Sx|Next Track|:
%s%ac%?It<%It|%Fn>
%V|0|82|-|13|1|-|-|
-%al %pc%ac%pp of %pe%ar%pr
+%al %pc%ac%pp %Sx|of| %pe%ar%pr
Index: wps/UniCatcher.176x220x16.wps
===================================================================
--- wps/UniCatcher.176x220x16.wps (revision 23624)
+++ wps/UniCatcher.176x220x16.wps (working copy)
@@ -12,7 +12,7 @@
%al %fbKbps
%pb|-|10|-|156|4|
-%s%acNext: %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx|Next|: %?It<%It|%?Fn<%Fn|?>>
%xl|A|battery.bmp|151|8|5|
%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
Index: wps/UniCatcher.220x176x16.wps
===================================================================
--- wps/UniCatcher.220x176x16.wps (revision 23624)
+++ wps/UniCatcher.220x176x16.wps (working copy)
@@ -10,7 +10,7 @@
%al %fbKbps
%pb|-|11|-|198|6|
-%s%acNext: %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx|Next|: %?It<%It|%?Fn<%Fn|?>>
%xl|A|battery.bmp|194|9|5|
%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
Index: wps/ipodVOL.160x128x1.wps
===================================================================
--- wps/ipodVOL.160x128x1.wps (revision 23624)
+++ wps/ipodVOL.160x128x1.wps (working copy)
@@ -6,7 +6,7 @@
%wd
%ac%?mp%?mp<|%?ps< (S)|>>
-%al%pp of %pe
+%al%pp %Sx|of| %pe
%s%ac%?it<%it|%fn>
%s%t3%ac%?ia<%ia|%d2>
Index: wps/cabbiev2.160x128x1.wps
===================================================================
--- wps/cabbiev2.160x128x1.wps (revision 23624)
+++ wps/cabbiev2.160x128x1.wps (working copy)
@@ -16,10 +16,10 @@
%s%ac%?ia<%ia|%?d2<%d2|(root)>>
%s%ac%?id<%id|%?d1<%d1|(root)>>
-%s%acNext Track:
+%s%ac%Sx|Next Track|:
%s%ac%?It<%It|%Fn>
-%al %pc%ac%pp of %pe%ar%pr
+%al %pc%ac%pp %Sx|of| %pe%ar%pr
%?mh<%xdAa|%xdAb>
%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
Index: wps/cabbiev2.160x128x2.wps
===================================================================
--- wps/cabbiev2.160x128x2.wps (revision 23624)
+++ wps/cabbiev2.160x128x2.wps (working copy)
@@ -26,7 +26,7 @@
%s%al%?ia<%ia|%?d2<%d2|(root)>>
%s%al%?id<%id|%?d1<%d1|(root)>>
-%s%alNext Track:
+%s%al%Sx|Next Track|:
%s%al%?It<%It|%Fn>
%Vl|b|0|10|-|75|1|-|-|
@@ -34,9 +34,9 @@
%s%ac%?ia<%ia|%?d2<%d2|(root)>>
%s%ac%?id<%id|%?d1<%d1|(root)>>
-%s%acNext Track:
+%s%ac%Sx|Next Track|:
%s%ac%?It<%It|%Fn>
%V|0|96|-|10|1|-|-|
-%al %pc%ac%pp of %pe%ar%pr
+%al %pc%ac%pp %Sx|of| %pe%ar%pr
Index: wps/iAmp.160x128x1.wps
===================================================================
--- wps/iAmp.160x128x1.wps (revision 23624)
+++ wps/iAmp.160x128x1.wps (working copy)
@@ -12,7 +12,7 @@
%ac%s%?id<"%id"%?iy< (%iy)>%t8|%t0>;%?ic<%ac%s%ic%t6|%t0>;%s%ac%fb kbps%?fv< VBR>, %ff Hz%t6
%pb
-%pc/%pt %ar%pp of %pe
+%pc/%pt %ar%pp %Sx|of| %pe
%xl|A|codec.bmp|68|87|22|
%?fc<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk|%xdAl|%xdAm|%xdAn|%xdAo|%xdAp|%xdAq|%xdAr|%xdAs|%xdAt|%xdAu|%xdAv>
%xl|B|battery.bmp|1|1|6|
Index: wps/cabbiev2.240x400x16.wps
===================================================================
--- wps/cabbiev2.240x400x16.wps (revision 23624)
+++ wps/cabbiev2.240x400x16.wps (working copy)
@@ -24,13 +24,13 @@
%?C<|%ac%?fv<(vbr) |>%fb kbit/s %fc>
%?C<|>
%?C<%s%ac%?it<%it|%fn>|>
-%?C<%s%ac%?ia<%ia|%?d2<%d2|(root)>>|%acNext Track:>
+%?C<%s%ac%?ia<%ia|%?d2<%d2|(root)>>|%ac%Sx|Next Track|:>
%?C<%s%ac%?id<%id|%?d1<%d1|(root)>>|%ac%s%?It<%It|%Fn>>
%?C<|%s%ac%?Ia<%Ia|%?D2<%D2|(root)>>>
-%?C<%s%acNext: %?Ia<%Ia|%?D2<%D2|(root)>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D1<%D1|(root)>>>
+%?C<%s%ac%Sx|Next|: %?Ia<%Ia|%?D2<%D2|(root)>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D1<%D1|(root)>>>
- %pc%ac%pp of %pe%ar%pr
+ %pc%ac%pp %Sx|of| %pe%ar%pr
%?C<%C>
Index: wps/cabbiev2.160x128x16.wps
===================================================================
--- wps/cabbiev2.160x128x16.wps (revision 23624)
+++ wps/cabbiev2.160x128x16.wps (working copy)
@@ -25,7 +25,7 @@
%s%al%?ia<%ia|%?d2<%d2|(root)>>
%s%al%?id<%id|%?d1<%d1|(root)>>
-Next Track:
+%Sx|Next Track|:
%s%?It<%It|%Fn>
# NowPlaying - no AA
@@ -34,9 +34,9 @@
%s%ac%?ia<%ia|%?d2<%d2|(root)>>
%s%ac%?id<%id|%?d1<%d1|(root)>>
-Next Track:
+%Sx|Next Track|:
%s%?It<%It|%Fn>
%V|0|96|-|10|1|-|-|
-%al %pc%ac%pc%ac%pp of %pe%ar%pr%ar%pr
+%al %pc%ac%pc%ac%pp %Sx|of| %pe%ar%pr%ar%pr
Index: wps/cabbiev2.176x132x16.wps
===================================================================
--- wps/cabbiev2.176x132x16.wps (revision 23624)
+++ wps/cabbiev2.176x132x16.wps (working copy)
@@ -26,7 +26,7 @@
%s%al%?ia<%ia|%?d2<%d2|(root)>>
%s%al%?id<%id|%?d1<%d1|(root)>>
-%s%alNext Track:
+%s%al%Sx|Next Track|:
%s%al%?It<%It|%Fn>
%Vl|b|0|12|-|74|1|-|-|
@@ -34,8 +34,8 @@
%s%ac%?ia<%ia|%?d2<%d2|(root)>>
%s%ac%?id<%id|%?d1<%d1|(root)>>
-%acNext Track:
+%ac%Sx|Next Track|:
%s%ac%?It<%It|%Fn>
%V|0|96|-|12|1|-|-|
-%al %pc%ac%pc%ac%pp of %pe%ar%pr%ar%pr
+%al %pc%ac%pc%ac%pp %Sx|of| %pe%ar%pr%ar%pr
Index: wps/cabbiev2.128x96x2.wps
===================================================================
--- wps/cabbiev2.128x96x2.wps (revision 23624)
+++ wps/cabbiev2.128x96x2.wps (working copy)
@@ -20,6 +20,6 @@
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?d2<%d2|(root)>>
%s%ac%?id<%id|%?d1<%d1|(root)>>
-%sNext: %ac%It
+%s%Sx|Next|: %ac%It
-%al %pc%ac%pp of %pe%ar%pr
+%al %pc%ac%pp %Sx|of| %pe%ar%pr
Index: wps/cabbiev2.128x128x16.wps
===================================================================
--- wps/cabbiev2.128x128x16.wps (revision 23624)
+++ wps/cabbiev2.128x128x16.wps (working copy)
@@ -38,7 +38,7 @@
#next and playlist
%V|0|70|-|18|1|-|-|
-%s%acNext:%?It<%It|%Fn>
+%s%ac%Sx|Next|:%?It<%It|%Fn>
-%al %pc%ac%pp of %pe%ar%pr
+%al %pc%ac%pp %Sx|of| %pe%ar%pr
Index: wps/boxes.176x132x16.wps
===================================================================
--- wps/boxes.176x132x16.wps (revision 23624)
+++ wps/boxes.176x132x16.wps (working copy)
@@ -17,7 +17,7 @@
%ac%s%?it<%it|%fn>
%ac%t5%s%?ia<%ia|%?d2<%d2|(Unknown Artist)>>;%ac%t5%s%?id<%id|%?d1<%d1|(Unknown Album)>>
-%ac%t5%pc / %pt;%ac%t5Track %pp of %pe
+%ac%t5%pc / %pt;%ac%t5Track %pp %Sx|of| %pe
%fbk
Index: wps/iCatcher.160x128x16.wps
===================================================================
--- wps/iCatcher.160x128x16.wps (revision 23624)
+++ wps/iCatcher.160x128x16.wps (working copy)
@@ -13,7 +13,7 @@
%al %fbKbps
%pb|-|10|-|140|4|
-%s%acNext: %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx|Next|: %?It<%It|%?Fn<%Fn|?>>
%xl|A|battery.bmp|135|8|5|
%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
Index: wps/iCatcher.176x132x16.wps
===================================================================
--- wps/iCatcher.176x132x16.wps (revision 23624)
+++ wps/iCatcher.176x132x16.wps (working copy)
@@ -13,7 +13,7 @@
%al %fbKbps
%pb|-|10|-|156|4|
-%s%acNext: %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx|Next|: %?It<%It|%?Fn<%Fn|?>>
%xl|A|battery.bmp|151|8|5|
%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
Index: wps/iCatcher.128x128x16.wps
===================================================================
--- wps/iCatcher.128x128x16.wps (revision 23624)
+++ wps/iCatcher.128x128x16.wps (working copy)
@@ -13,7 +13,7 @@
%al %fbKbps
%pb|-|11|-|106|4|
-%s%acNext: %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx|Next|: %?It<%It|%?Fn<%Fn|?>>
%xl|A|battery-sc.bmp|111|5|5|
%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
Index: wps/boxes.160x128x1.wps
===================================================================
--- wps/boxes.160x128x1.wps (revision 23624)
+++ wps/boxes.160x128x1.wps (working copy)
@@ -17,7 +17,7 @@
%ac%s%?it<%it|%fn>
%ac%t5%s%?ia<%ia|%?d2<%d2|(Unknown Artist)>>;%ac%t5%s%?id<%id|%?d1<%d1|(Unknown Album)>>
-%ac%t5%pc / %pt;%ac%t5Track %pp of %pe
+%ac%t5%pc / %pt;%ac%t5Track %pp %Sx|of| %pe
%fbk
Index: wps/iCatcher.132x80x16.wps
===================================================================
--- wps/iCatcher.132x80x16.wps (revision 23624)
+++ wps/iCatcher.132x80x16.wps (working copy)
@@ -8,7 +8,7 @@
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
%pb|-|11|-|106|4|
-%s%acNext: %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx|Next|: %?It<%It|%?Fn<%Fn|?>>
%xl|A|battery-sc.bmp|115|5|5|
%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
Index: wps/boxes.112x64x1.wps
===================================================================
--- wps/boxes.112x64x1.wps (revision 23624)
+++ wps/boxes.112x64x1.wps (working copy)
@@ -8,7 +8,7 @@
%ac%t5%s%?it<%it|%fn>;%ac%t5%s%?ia<%ia|%?d2<%d2|(Unknown Artist)>>
-%ac%t5%pc / %pt;%ac%t5Track %pp of %pe
+%ac%t5%pc / %pt;%ac%t5Track %pp %Sx|of| %pe
%pb
%ac%t5%s%?It<%It|%Fn>;%ac%t5%s%?Ia<%Ia|%D2>
Index: wps/iCatcher.112x64x1.wps
===================================================================
--- wps/iCatcher.112x64x1.wps (revision 23624)
+++ wps/iCatcher.112x64x1.wps (working copy)
@@ -6,7 +6,7 @@
%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
%pb|-|11|-|90|3|
-%t6%s%ac%?Fm|%fbKbps %fc>;%t6%s%ac%?Fm|%fbKbps %fc>
+%t6%s%ac%?Fm<%Sx|Next|: %?It<%It|%Fn>|%fbKbps %fc>;%t6%s%ac%?Fm<%Sx|Next|: %?It<%It|%Fn>|%fbKbps %fc>
%xl|A|battery-s.bmp|93|3|5|
%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
Index: wps/boxes.128x64x1.wps
===================================================================
--- wps/boxes.128x64x1.wps (revision 23624)
+++ wps/boxes.128x64x1.wps (working copy)
@@ -10,7 +10,7 @@
%ac%t5%s%?it<%it|%fn>;%ac%t5%s%?ia<%ia|%?d2<%d2|(Unknown Artist)>>
-%ac%t5%pc / %pt;%ac%t5Track %pp of %pe
+%ac%t5%pc / %pt;%ac%t5Track %pp %Sx|of| %pe
%pb
%ac%t5%s%?It<%It|%Fn>;%ac%t5%s%?Ia<%Ia|%D2>