FS#10783 - WPS translation

- Use the %Sx skin tag in WPS to translate 'Next Track', 'Next', and 'of' (X of Y tracks)
- New conditional skin token 'Sr' which checks whether the currently loaded language is an RTL language (Hebrew/Arabic). It uses lang_is_rtl().
- Added Hebrew translation


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

49 files changed, 159 insertions, 66 deletions

diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 0e21ec0c81..e0dedd5d48 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -362,6 +362,7 @@ static const struct wps_tag all_tags[] = {
                                                     parse_setting_and_lang },    
     { WPS_TOKEN_TRANSLATEDSTRING,         "Sx",  WPS_REFRESH_STATIC,
                                                     parse_setting_and_lang },
+    { WPS_TOKEN_LANG_IS_RTL ,             "Sr",  WPS_REFRESH_STATIC, NULL },
                                                     
     { WPS_TOKEN_LASTTOUCH,                "Tl",  WPS_REFRESH_DYNAMIC, parse_timeout },
     { WPS_TOKEN_CURRENT_SCREEN,           "cs",  WPS_REFRESH_DYNAMIC, NULL },
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index d4adfa8c85..9622e127a7 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -59,6 +59,7 @@
 #include "recording.h"
 #include "pcm_record.h"
 #endif
+#include "language.h"
 
 static char* get_codectype(const struct mp3entry* id3)
 {
@@ -1174,6 +1175,9 @@ const char *get_token_value(struct gui_wps *gwps,
             return buf;
         }
 
+        case WPS_TOKEN_LANG_IS_RTL:
+            return lang_is_rtl() ? "r" : NULL;
+
         default:
             return NULL;
     }
diff --git a/apps/gui/skin_engine/skin_tokens.h b/apps/gui/skin_engine/skin_tokens.h
index 27594db27f..a59074fdd7 100644
--- a/apps/gui/skin_engine/skin_tokens.h
+++ b/apps/gui/skin_engine/skin_tokens.h
@@ -202,6 +202,7 @@ enum wps_token_type {
     /* Setting option */
     WPS_TOKEN_SETTING,
     WPS_TOKEN_CURRENT_SCREEN,
+    WPS_TOKEN_LANG_IS_RTL,
     
     /* Recording Tokens */
   TOKEN_MARKER_RECORDING,
diff --git a/apps/gui/skin_engine/wps_debug.c b/apps/gui/skin_engine/wps_debug.c
index 7d485f2c50..a0bf970e0d 100644
--- a/apps/gui/skin_engine/wps_debug.c
+++ b/apps/gui/skin_engine/wps_debug.c
@@ -490,6 +490,9 @@ static char *get_token_desc(struct wps_token *token, char *buf,
             snprintf(buf, bufsize, "Setting value: '%s'",
                  settings[token->value.i].cfg_name);
             break;
+        case WPS_TOKEN_LANG_IS_RTL:
+            snprintf(buf, bufsize, "lang: is_rtl?");
+            break;
         default:
             for(i=1; i<sizeof(tokens)/sizeof(*token); i++)
             {
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 94bc191b8e..1a814e0879 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -13244,3 +13244,45 @@
     crossfade: "Automatic Track Change Only"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_NEXT_TRACK
+  desc: Shown in WPS
+  user: core
+  <source>
+    *: "Next Track:"
+  </source>
+  <dest>
+    *: "Next Track:"
+  </dest>
+  <voice>
+    *: "Next Track:"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NEXT
+  desc: Shown in WPS (short form of Next Track)
+  user: core
+  <source>
+    *: "Next:"
+  </source>
+  <dest>
+    *: "Next:"
+  </dest>
+  <voice>
+    *: "Next:"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_OF
+  desc: Shown in WPS: X of Y (tracks)
+  user: core
+  <source>
+    *: "of"
+  </source>
+  <dest>
+    *: "of"
+  </dest>
+  <voice>
+    *: "of"
+  </voice>
+</phrase>
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index 9d1de158c5..cd827dfe0f 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -13179,3 +13179,45 @@
     crossfade: "רק בהחלפה אוטומטית של שיר"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_NEXT_TRACK
+  desc: Shown in Cabbie theme
+  user: core
+  <source>
+    *: "Next Track:"
+  </source>
+  <dest>
+    *: ":השיר הבא"
+  </dest>
+  <voice>
+    *: ":השיר הבא"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NEXT
+  desc: Shown in Cabbie theme
+  user: core
+  <source>
+    *: "Next:"
+  </source>
+  <dest>
+    *: ":הבא"
+  </dest>
+  <voice>
+    *: ":הבא"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_OF
+  desc: Shown in Cabbie theme
+  user: core
+  <source>
+    *: "of"
+  </source>
+  <dest>
+    *: "מתוך"
+  </dest>
+  <voice>
+    *: "מתוך"
+  </voice>
+</phrase>
diff --git a/wps/DancePuffDuo.176x220x1.wps b/wps/DancePuffDuo.176x220x1.wps
index c1d262b770..1c394c2a1b 100644
--- a/wps/DancePuffDuo.176x220x1.wps
+++ b/wps/DancePuffDuo.176x220x1.wps
@@ -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 Track:
+%ac%s%Sx|Next Track:|
 %ac%s%?In<%In. |>%?It<%It|%Fn>
 %ac%s%?Ia<%Ia|%D2>
 %ac%s%?Id<%Id|%D1>
diff --git a/wps/UniCatcher.176x220x16.wps b/wps/UniCatcher.176x220x16.wps
index 9d60ff5ae7..9f441aa181 100644
--- a/wps/UniCatcher.176x220x16.wps
+++ b/wps/UniCatcher.176x220x16.wps
@@ -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>>
diff --git a/wps/UniCatcher.220x176x16.wps b/wps/UniCatcher.220x176x16.wps
index 44ceda9fb5..6054503224 100644
--- a/wps/UniCatcher.220x176x16.wps
+++ b/wps/UniCatcher.220x176x16.wps
@@ -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>>
diff --git a/wps/UniCatcher.240x320x16.wps b/wps/UniCatcher.240x320x16.wps
index 17e3bcc256..16b3606f04 100644
--- a/wps/UniCatcher.240x320x16.wps
+++ b/wps/UniCatcher.240x320x16.wps
@@ -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>>
diff --git a/wps/UniCatcher.320x240x16.wps b/wps/UniCatcher.320x240x16.wps
index f36d11ea07..7edcd67300 100644
--- a/wps/UniCatcher.320x240x16.wps
+++ b/wps/UniCatcher.320x240x16.wps
@@ -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>>
diff --git a/wps/boxes.112x64x1.wps b/wps/boxes.112x64x1.wps
index dbd63c4846..e7ad7e50d7 100644
--- a/wps/boxes.112x64x1.wps
+++ b/wps/boxes.112x64x1.wps
@@ -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 %?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>
 %pb
 
 %ac%t5%s%?It<%It|%Fn>;%ac%t5%s%?Ia<%Ia|%D2>
diff --git a/wps/boxes.128x64x1.wps b/wps/boxes.128x64x1.wps
index 76e339e02c..dbbc80d99f 100644
--- a/wps/boxes.128x64x1.wps
+++ b/wps/boxes.128x64x1.wps
@@ -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 %?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>
 %pb
 
 %ac%t5%s%?It<%It|%Fn>;%ac%t5%s%?Ia<%Ia|%D2>
diff --git a/wps/boxes.160x128x1.wps b/wps/boxes.160x128x1.wps
index dc2ca7b286..d0b19228da 100644
--- a/wps/boxes.160x128x1.wps
+++ b/wps/boxes.160x128x1.wps
@@ -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 %?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>
 
  %fbk
 
diff --git a/wps/boxes.176x132x16.wps b/wps/boxes.176x132x16.wps
index a159aa3bab..26fcf0505d 100644
--- a/wps/boxes.176x132x16.wps
+++ b/wps/boxes.176x132x16.wps
@@ -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 %?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>
 
  %fbk
 
diff --git a/wps/boxes.220x176x16.wps b/wps/boxes.220x176x16.wps
index 4b6fdd6f3c..a5aac8508e 100644
--- a/wps/boxes.220x176x16.wps
+++ b/wps/boxes.220x176x16.wps
@@ -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 %?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>
 
 
 
diff --git a/wps/boxes.320x240x16.wps b/wps/boxes.320x240x16.wps
index 3d4cf37cbe..68aa9dfd60 100644
--- a/wps/boxes.320x240x16.wps
+++ b/wps/boxes.320x240x16.wps
@@ -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 %?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>
 %ac%pc / %pt (-%pr)
 
  %fbk
diff --git a/wps/cabbiev2.112x64x1.wps b/wps/cabbiev2.112x64x1.wps
index bf981b1197..4f8078c2b3 100644
--- a/wps/cabbiev2.112x64x1.wps
+++ b/wps/cabbiev2.112x64x1.wps
@@ -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<Next: %?It<%It|%Fn>|%ac%pp of %pe>;%t5%ac%s%?Fn<Next: %?Ia<%Ia|%Fn>|%ac%pp of %pe>
+%t5%ac%s%?Fn<%Sx|Next:| %?It<%It|%Fn>|%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>>;%t5%ac%s%?Fn<%Sx|Next:| %?Ia<%Ia|%Fn>|%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>>
 %pb|pb-112x64x1.bmp|1|42|110|4|
 %pc%ar%pr
 #Bottom status bar
diff --git a/wps/cabbiev2.128x128x16.wps b/wps/cabbiev2.128x128x16.wps
index 50ebd53b11..ee8f20a157 100644
--- a/wps/cabbiev2.128x128x16.wps
+++ b/wps/cabbiev2.128x128x16.wps
@@ -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%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr 
 
diff --git a/wps/cabbiev2.128x64x1.clip.wps b/wps/cabbiev2.128x64x1.clip.wps
index e9a8f97fda..c39137dd26 100644
--- a/wps/cabbiev2.128x64x1.clip.wps
+++ b/wps/cabbiev2.128x64x1.clip.wps
@@ -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
+%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pc
 
 # tag info viewport
 %V|0|18|128|25|1|
diff --git a/wps/cabbiev2.128x64x1.wps b/wps/cabbiev2.128x64x1.wps
index ca7cccbef7..13c5436607 100644
--- a/wps/cabbiev2.128x64x1.wps
+++ b/wps/cabbiev2.128x64x1.wps
@@ -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
+%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pc
 
 # status bar
 %?mh<%xdAa|%xdAb>
diff --git a/wps/cabbiev2.128x96x2.wps b/wps/cabbiev2.128x96x2.wps
index c3e4337ff0..70ecf2d5b5 100644
--- a/wps/cabbiev2.128x96x2.wps
+++ b/wps/cabbiev2.128x96x2.wps
@@ -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%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr 
diff --git a/wps/cabbiev2.132x80x16.wps b/wps/cabbiev2.132x80x16.wps
index f9bf447595..279d3144b0 100644
--- a/wps/cabbiev2.132x80x16.wps
+++ b/wps/cabbiev2.132x80x16.wps
@@ -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>
diff --git a/wps/cabbiev2.138x110x2.wps b/wps/cabbiev2.138x110x2.wps
index e354ba8e4b..ac19ce8118 100644
--- a/wps/cabbiev2.138x110x2.wps
+++ b/wps/cabbiev2.138x110x2.wps
@@ -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%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr 
diff --git a/wps/cabbiev2.160x128x1.wps b/wps/cabbiev2.160x128x1.wps
index 643ddd136c..d367a0ca59 100644
--- a/wps/cabbiev2.160x128x1.wps
+++ b/wps/cabbiev2.160x128x1.wps
@@ -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%?Sr<%pe %Sx|of| %pp|%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>
diff --git a/wps/cabbiev2.160x128x16.wps b/wps/cabbiev2.160x128x16.wps
index 11e890b8ec..23b5467c1a 100644
--- a/wps/cabbiev2.160x128x16.wps
+++ b/wps/cabbiev2.160x128x16.wps
@@ -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 @@ Next Track:
 %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%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr%ar%pr  
 
diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps
index eb2aca2b56..75fd298066 100644
--- a/wps/cabbiev2.160x128x2.wps
+++ b/wps/cabbiev2.160x128x2.wps
@@ -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%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr 
 
diff --git a/wps/cabbiev2.176x132x16.wps b/wps/cabbiev2.176x132x16.wps
index d12f1ac410..8ba0350ea1 100644
--- a/wps/cabbiev2.176x132x16.wps
+++ b/wps/cabbiev2.176x132x16.wps
@@ -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%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr%ar%pr   
diff --git a/wps/cabbiev2.176x220x16.wps b/wps/cabbiev2.176x220x16.wps
index ef53435061..b53ed80f86 100644
--- a/wps/cabbiev2.176x220x16.wps
+++ b/wps/cabbiev2.176x220x16.wps
@@ -18,7 +18,7 @@
 %?C<|%s%ac%?id<%id|%?d1<%d1|(root)>>>
 %?C<|%s%ac%?iy<%iy|>>
 
-%?C<|%s%acNext Track:>
+%?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%?Sr<%pe %Sx|of| %pp|%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>
diff --git a/wps/cabbiev2.220x176x16.wps b/wps/cabbiev2.220x176x16.wps
index 3784bcf200..5230d2dee1 100644
--- a/wps/cabbiev2.220x176x16.wps
+++ b/wps/cabbiev2.220x176x16.wps
@@ -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%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr   
diff --git a/wps/cabbiev2.240x320x16.wps b/wps/cabbiev2.240x320x16.wps
index 207052b1d6..4d906b5b7a 100644
--- a/wps/cabbiev2.240x320x16.wps
+++ b/wps/cabbiev2.240x320x16.wps
@@ -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%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr     
 
 %?mh<%xdAa|%xdAb>
 %?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
diff --git a/wps/cabbiev2.240x400x16.wps b/wps/cabbiev2.240x400x16.wps
index b05a6e12b8..1a8975c58d 100644
--- a/wps/cabbiev2.240x400x16.wps
+++ b/wps/cabbiev2.240x400x16.wps
@@ -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%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr     
 
 %?C<%C>
 
diff --git a/wps/cabbiev2.320x240x16.mrobe500.wps b/wps/cabbiev2.320x240x16.mrobe500.wps
index 0fca34b056..f06f3ad73b 100644
--- a/wps/cabbiev2.320x240x16.mrobe500.wps
+++ b/wps/cabbiev2.320x240x16.mrobe500.wps
@@ -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%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr   
 
 #viewport for the touch icons
 %xl|G|browser-320x240x16.bmp|5|5|
diff --git a/wps/cabbiev2.320x240x16.wps b/wps/cabbiev2.320x240x16.wps
index d745021e73..5727ae7ee8 100644
--- a/wps/cabbiev2.320x240x16.wps
+++ b/wps/cabbiev2.320x240x16.wps
@@ -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%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr   
 
diff --git a/wps/iAmp.128x64x1.wps b/wps/iAmp.128x64x1.wps
index cba73d42ee..8aec2cbe47 100644
--- a/wps/iAmp.128x64x1.wps
+++ b/wps/iAmp.128x64x1.wps
@@ -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%?Sr<%pe %Sx|of| %pp|%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|
diff --git a/wps/iAmp.160x128x1.wps b/wps/iAmp.160x128x1.wps
index e835c489cc..130f0e3ff8 100644
--- a/wps/iAmp.160x128x1.wps
+++ b/wps/iAmp.160x128x1.wps
@@ -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%?Sr<%pe %Sx|of| %pp|%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|
diff --git a/wps/iCatcher.112x64x1.wps b/wps/iCatcher.112x64x1.wps
index 1f54a1193b..3f1ebc3e06 100644
--- a/wps/iCatcher.112x64x1.wps
+++ b/wps/iCatcher.112x64x1.wps
@@ -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<Next: %?It<%It|%Fn>|%fbKbps %fc>;%t6%s%ac%?Fm<Next: %?It<%It|%Fn>|%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>>
diff --git a/wps/iCatcher.128x128x16.wps b/wps/iCatcher.128x128x16.wps
index 9f24f09cce..3b14cdf0a7 100644
--- a/wps/iCatcher.128x128x16.wps
+++ b/wps/iCatcher.128x128x16.wps
@@ -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>>
diff --git a/wps/iCatcher.128x96x1.wps b/wps/iCatcher.128x96x1.wps
index 1222642adf..4a9acb9cae 100644
--- a/wps/iCatcher.128x96x1.wps
+++ b/wps/iCatcher.128x96x1.wps
@@ -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>>
diff --git a/wps/iCatcher.132x80x16.wps b/wps/iCatcher.132x80x16.wps
index bc730a2c2f..9cff56775e 100644
--- a/wps/iCatcher.132x80x16.wps
+++ b/wps/iCatcher.132x80x16.wps
@@ -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>>
diff --git a/wps/iCatcher.138x110x2.wps b/wps/iCatcher.138x110x2.wps
index c4a64acc92..267d726015 100644
--- a/wps/iCatcher.138x110x2.wps
+++ b/wps/iCatcher.138x110x2.wps
@@ -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>>
diff --git a/wps/iCatcher.160x128x16.wps b/wps/iCatcher.160x128x16.wps
index 8604ba39b0..7baea2395d 100644
--- a/wps/iCatcher.160x128x16.wps
+++ b/wps/iCatcher.160x128x16.wps
@@ -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>>
diff --git a/wps/iCatcher.160x128x2.wps b/wps/iCatcher.160x128x2.wps
index 1405dc3ad6..310c6ab3ff 100644
--- a/wps/iCatcher.160x128x2.wps
+++ b/wps/iCatcher.160x128x2.wps
@@ -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>>
diff --git a/wps/iCatcher.176x132x16.wps b/wps/iCatcher.176x132x16.wps
index b6bd62a699..ab7ed3d91b 100644
--- a/wps/iCatcher.176x132x16.wps
+++ b/wps/iCatcher.176x132x16.wps
@@ -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>>
diff --git a/wps/iCatcher.176x220x16.wps b/wps/iCatcher.176x220x16.wps
index 18a634a867..8370b0a97f 100644
--- a/wps/iCatcher.176x220x16.wps
+++ b/wps/iCatcher.176x220x16.wps
@@ -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>>
diff --git a/wps/iCatcher.220x176x16.wps b/wps/iCatcher.220x176x16.wps
index dea2c1a3d9..b58455f82d 100644
--- a/wps/iCatcher.220x176x16.wps
+++ b/wps/iCatcher.220x176x16.wps
@@ -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>>
diff --git a/wps/iCatcher.240x320x16.wps b/wps/iCatcher.240x320x16.wps
index b2774d46dd..fc1e730c4c 100644
--- a/wps/iCatcher.240x320x16.wps
+++ b/wps/iCatcher.240x320x16.wps
@@ -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>>
diff --git a/wps/iCatcher.320x240x16.wps b/wps/iCatcher.320x240x16.wps
index 59d9d49925..1eb2e23712 100644
--- a/wps/iCatcher.320x240x16.wps
+++ b/wps/iCatcher.320x240x16.wps
@@ -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>>
diff --git a/wps/ipodVOL.160x128x1.wps b/wps/ipodVOL.160x128x1.wps
index 626dd9b404..4d56a12299 100644
--- a/wps/ipodVOL.160x128x1.wps
+++ b/wps/ipodVOL.160x128x1.wps
@@ -6,7 +6,7 @@
 %wd
 %ac%?mp<Now Stopped|Now Playing|Now Paused|Now Playing|Now Playing>%?mp<|%?ps< (S)|>>
 
-%al%pp of %pe 
+%al%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe> 
 
 %s%ac%?it<%it|%fn>
 %s%t3%ac%?ia<%ia|%d2>