diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index 302341b615..0383f7b290 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -252,19 +252,19 @@
   <source>
     *: "PLAY = Yes"
     h100,h120,h300: "NAVI = Yes"
-    ipod*,x5,m5,gigabeatf,e200,c200,h10,h10_5gb,mrobe100: "SELECT = Yes"
+    ipod*,x5,m5,gigabeat*,e200,c200,h10,h10_5gb,mrobe100: "SELECT = Yes"
     player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Да"
     h100,h120,h300: "NAVI = Да"
-    ipod*,x5,m5,gigabeatf,e200,c200,h10,h10_5gb,mrobe100: "SELECT = Да"
+    ipod*,x5,m5,gigabeat*,e200,c200,h10,h10_5gb,mrobe100: "SELECT = Да"
     player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
     h100,h120,h300: ""
-    ipod*,x5,m5,gigabeatf,e200,c200,h10,h10_5gb,mrobe100: ""
+    ipod*,x5,m5,gigabeat*,e200,c200,h10,h10_5gb,mrobe100: ""
     player: ""
   </voice>
 </phrase>
@@ -2360,21 +2360,21 @@
     *: "Building database... %d found (OFF to return)"
     h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5,gigabeatf,mrobe100: "Building database... %d found (LEFT to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
     h10,h10_5gb,e200,c200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Креирам базу података... %d пронађено (OFF за повратак)"
     h100,h120,h300: "Креирам базу података... %d пронађено (STOP за повратак)"
     ipod*: "Креирам базу података... %d пронађено (PREV за повратак)"
-    x5,m5,gigabeatf,mrobe100: "Креирам базу података... %d пронађено (LEFT за повратак)"
+    x5,m5,gigabeat*,mrobe100: "Креирам базу података... %d пронађено (LEFT за повратак)"
     h10,h10_5gb,e200,c200: "Креирам базу података... %d пронађено (PREV за повратак)"
   </dest>
   <voice>
     *: "улази за базу података"
     h100,h120,h300: ""
     ipod*: ""
-    x5,m5,gigabeatf,mrobe100: ""
+    x5,m5,gigabeat*,mrobe100: ""
     h10,h10_5gb,e200,c200: ""
   </voice>
 </phrase>
@@ -3851,15 +3851,15 @@
   user:
   <source>
     *: none
-    gigabeatf: "Button Light Brightness"
+    gigabeatf,mrobe100: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf: "Јачина светла за тастере"
+    gigabeatf,mrobe100: "Јачина светла за тастере"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Јачина светла за тастере"
+    gigabeatf,mrobe100: "Јачина светла за тастере"
   </voice>
 </phrase>
 <phrase>
@@ -4124,19 +4124,19 @@
     *: none
     rtc: "ON = Set"
     h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200,c200,gigabeatf,mrobe100: "SELECT = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200,c200,gigabeat*,mrobe100: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Постави"
     h100,h120,h300: "NAVI = Постави"
-    ipod*,x5,m5,h10,h10_5gb,e200,c200,gigabeatf,mrobe100: "SELECT = Постави"
+    ipod*,x5,m5,h10,h10_5gb,e200,c200,gigabeat*,mrobe100: "SELECT = Постави"
   </dest>
   <voice>
     *: none
     rtc: ""
     h100,h120,h300: ""
-    ipod*,x5,m5,h10,h10_5gb,e200,c200,gigabeatf,mrobe100: ""
+    ipod*,x5,m5,h10,h10_5gb,e200,c200,gigabeat*,mrobe100: ""
   </voice>
 </phrase>
 <phrase>
@@ -4152,6 +4152,7 @@
     h10,h10_5gb: "PREV = Revert"
     gigabeatf: "A = Revert"
     mrobe100: "DISPLAY = Revert"
+    gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
@@ -4162,6 +4163,7 @@
     h10,h10_5gb: "PREV = Врати на старо"
     gigabeatf: "A = Врати на старо"
     mrobe100: "DISPLAY = Врати на старо"
+    gigabeats: "BACK = Врати на старо"
   </dest>
   <voice>
     *: none
@@ -4172,6 +4174,7 @@
     h10,h10_5gb: ""
     gigabeatf: ""
     mrobe100: ""
+    gigabeats: ""
   </voice>
 </phrase>
 <phrase>
@@ -4695,12 +4698,14 @@
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Постави OFF=Одустани"
     ipod*: "SELECT=Постави MENU=Одустани"
     h10,h10_5gb: "SELECT=Постави PREV=Одустани"
+    gigabeats: "SELECT=Постави POWER=Одустани"
   </dest>
   <voice>
     *: none
@@ -11553,3 +11558,115 @@
     swcodec: "Клик тастера се понавља"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_ENABLE_STUDY_MODE
+  desc: WPS context menu
+  user:
+  <source>
+    *: "Enable Study Mode"
+  </source>
+  <dest>
+    *: "Активирај мод учења"
+  </dest>
+  <voice>
+    *: "Активирај мод учења"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACCESSORY_SUPPLY
+  desc: in system settings menu
+  user:
+  <source>
+    *: "Accessory Power Supply"
+  </source>
+  <dest>
+    *: "Напајање додатних уређаја"
+  </dest>
+  <voice>
+    *: "Напајање додатних уређаја"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_STUDY_MODE
+  desc: playback settings menu
+  user:
+  <source>
+    *: "Study Mode"
+  </source>
+  <dest>
+    *: "Мод учења"
+  </dest>
+  <voice>
+    *: "Мод учења"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_STUDY_HOP_STEP
+  desc: playback settings menu
+  user:
+  <source>
+    *: "Study Increment"
+  </source>
+  <dest>
+    *: "Корак учења"
+  </dest>
+  <voice>
+    *: "Корак учења"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_QUICKSCREEN
+  desc: spoken only, Announces entering the "quick screen"
+  user:
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Quick screen"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISABLE_STUDY_MODE
+  desc: WPS context menu
+  user:
+  <source>
+    *: "Disable Study Mode"
+  </source>
+  <dest>
+    *: "Искључи мод учења"
+  </dest>
+  <voice>
+    *: "Искључи мод учења"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_UNKNOWN
+  desc: generic string for unknown states, such as an unset clock
+  user:
+  <source>
+    *: "Unknown"
+  </source>
+  <dest>
+    *: "Непознато"
+  </dest>
+  <voice>
+    *: "Непознато"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_OK
+  desc: spoken only, On exiting a context, specifically the quick screen
+  user:
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "OK"
+  </voice>
+</phrase>