Index: apps/lang/deutsch.lang
===================================================================
--- apps/lang/deutsch.lang	(Revision 19226)
+++ apps/lang/deutsch.lang	(Arbeitskopie)
@@ -2697,15 +2697,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Beleuchtung einblenden"
+    backlight_fade*: "Beleuchtung einblenden"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Beleuchtung einblenden"
+    backlight_fade*: "Beleuchtung einblenden"
   </voice>
 </phrase>
 <phrase>
@@ -2714,15 +2714,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Beleuchtung ausblenden"
+    backlight_fade*: "Beleuchtung ausblenden"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Beleuchtung ausblenden"
+    backlight_fade*: "Beleuchtung ausblenden"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/dansk.lang
===================================================================
--- apps/lang/dansk.lang	(Revision 19226)
+++ apps/lang/dansk.lang	(Arbeitskopie)
@@ -2517,15 +2517,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Tænd lys langsomt"
+    backlight_fade*: "Tænd lys langsomt"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Tænd lys langsomt"
+    backlight_fade*: "Tænd lys langsomt"
   </voice>
 </phrase>
 <phrase>
@@ -2534,15 +2534,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Dæmp lys"
+    backlight_fade*: "Dæmp lys"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Dæmp lys"
+    backlight_fade*: "Dæmp lys"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/polski.lang
===================================================================
--- apps/lang/polski.lang	(Revision 19226)
+++ apps/lang/polski.lang	(Arbeitskopie)
@@ -2688,15 +2688,15 @@
   user: 
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Płynne wejście podświetlenia"
+    backlight_fade*: "Płynne wejście podświetlenia"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Płynne wejście podświetlenia"
+    backlight_fade*: "Płynne wejście podświetlenia"
   </voice>
 </phrase>
 <phrase>
@@ -2705,15 +2705,15 @@
   user: 
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Płynne wyjście podświetlenia"
+    backlight_fade*: "Płynne wyjście podświetlenia"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Płynne wyjście podświetlenia"
+    backlight_fade*: "Płynne wyjście podświetlenia"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/bulgarian.lang
===================================================================
--- apps/lang/bulgarian.lang	(Revision 19226)
+++ apps/lang/bulgarian.lang	(Arbeitskopie)
@@ -4116,15 +4116,15 @@
   user: 
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Постепенна подсведка при вкл"
+    backlight_fade*: "Постепенна подсведка при вкл"
   </dest>
   <voice>
     *: ""
-    backlight_fade: ""
+    backlight_fade*: ""
   </voice>
 </phrase>
 <phrase>
@@ -5284,15 +5284,15 @@
   user: 
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Постепенно угасване на подсветката"
+    backlight_fade*: "Постепенно угасване на подсветката"
   </dest>
   <voice>
     *: ""
-    backlight_fade: ""
+    backlight_fade*: ""
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/chinese-trad.lang
===================================================================
--- apps/lang/chinese-trad.lang	(Revision 19226)
+++ apps/lang/chinese-trad.lang	(Arbeitskopie)
@@ -2961,15 +2961,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "背光淡入"
+    backlight_fade*: "背光淡入"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </voice>
 </phrase>
 <phrase>
@@ -2978,15 +2978,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "背光淡出"
+    backlight_fade*: "背光淡出"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/svenska.lang
===================================================================
--- apps/lang/svenska.lang	(Revision 19226)
+++ apps/lang/svenska.lang	(Arbeitskopie)
@@ -2699,15 +2699,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Tona in belysning"
+    backlight_fade*: "Tona in belysning"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Tona in belysning"
+    backlight_fade*: "Tona in belysning"
   </voice>
 </phrase>
 <phrase>
@@ -2716,15 +2716,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Tona ut belysning"
+    backlight_fade*: "Tona ut belysning"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Tona ut belysning"
+    backlight_fade*: "Tona ut belysning"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/hebrew.lang
===================================================================
--- apps/lang/hebrew.lang	(Revision 19226)
+++ apps/lang/hebrew.lang	(Arbeitskopie)
@@ -2679,15 +2679,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "הגברה הדרגתית של תאורת המסך"
+    backlight_fade*: "הגברה הדרגתית של תאורת המסך"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </voice>
 </phrase>
 <phrase>
@@ -2696,15 +2696,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "עמעום תאורת המסך"
+    backlight_fade*: "עמעום תאורת המסך"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/nederlands.lang
===================================================================
--- apps/lang/nederlands.lang	(Revision 19226)
+++ apps/lang/nederlands.lang	(Arbeitskopie)
@@ -2962,15 +2962,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Verlichting invloeien"
+    backlight_fade*: "Verlichting invloeien"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Verlichting invloeien"
+    backlight_fade*: "Verlichting invloeien"
   </voice>
 </phrase>
 <phrase>
@@ -2979,15 +2979,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Verlichting uitvloeien"
+    backlight_fade*: "Verlichting uitvloeien"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Verlichting uitvloeien"
+    backlight_fade*: "Verlichting uitvloeien"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/magyar.lang
===================================================================
--- apps/lang/magyar.lang	(Revision 19226)
+++ apps/lang/magyar.lang	(Arbeitskopie)
@@ -2674,15 +2674,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade:"Világítás beúsztatása"
+    backlight_fade*:"Világítás beúsztatása"
   </dest>
   <voice>
     *: none
-    backlight_fade:"Backlight fade in"
+    backlight_fade*:"Backlight fade in"
   </voice>
 </phrase>
 <phrase>
@@ -2691,15 +2691,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade:"Világítás kiúsztatása"
+    backlight_fade*:"Világítás kiúsztatása"
   </dest>
   <voice>
     *: none
-    backlight_fade:"Backlight fade out"
+    backlight_fade*:"Backlight fade out"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/walon.lang
===================================================================
--- apps/lang/walon.lang	(Revision 19226)
+++ apps/lang/walon.lang	(Arbeitskopie)
@@ -2703,15 +2703,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Erî-clårté å cmince do fondou"
+    backlight_fade*: "Erî-clårté å cmince do fondou"
   </dest>
   <voice>
     *: none
-    backlight_fade: "erî-clårté å cmince do fondou"
+    backlight_fade*: "erî-clårté å cmince do fondou"
   </voice>
 </phrase>
 <phrase>
@@ -2720,15 +2720,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Erî-clårté sol fondou do coron"
+    backlight_fade*: "Erî-clårté sol fondou do coron"
   </dest>
   <voice>
     *: none
-    backlight_fade: "erî-clårté sol fondou do coron"
+    backlight_fade*: "erî-clårté sol fondou do coron"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/russian.lang
===================================================================
--- apps/lang/russian.lang	(Revision 19226)
+++ apps/lang/russian.lang	(Arbeitskopie)
@@ -2786,15 +2786,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Нарастание подсветки"
+    backlight_fade*: "Нарастание подсветки"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Нарастание подсветки"
+    backlight_fade*: "Нарастание подсветки"
   </voice>
 </phrase>
 <phrase>
@@ -2803,15 +2803,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Затухание подсветки"
+    backlight_fade*: "Затухание подсветки"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Затухание подсветки"
+    backlight_fade*: "Затухание подсветки"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/thai.lang
===================================================================
--- apps/lang/thai.lang	(Revision 19226)
+++ apps/lang/thai.lang	(Arbeitskopie)
@@ -2682,15 +2682,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "ไฟพื้นหลังค่อยๆ สว่าง"
+    backlight_fade*: "ไฟพื้นหลังค่อยๆ สว่าง"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </voice>
 </phrase>
 <phrase>
@@ -2699,15 +2699,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "ไฟพื้นหลังค่อยๆ ดับ"
+    backlight_fade*: "ไฟพื้นหลังค่อยๆ ดับ"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/catala.lang
===================================================================
--- apps/lang/catala.lang	(Revision 19226)
+++ apps/lang/catala.lang	(Arbeitskopie)
@@ -2677,15 +2677,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Il·luminació progressiva"
+    backlight_fade*: "Il·luminació progressiva"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Il·luminació progressiva"
+    backlight_fade*: "Il·luminació progressiva"
   </voice>
 </phrase>
 <phrase>
@@ -2694,15 +2694,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Apagat progresiu de il·lum."
+    backlight_fade*: "Apagat progresiu de il·lum."
   </dest>
   <voice>
     *: none
-    backlight_fade: "Apagat progresiu de il·lum."
+    backlight_fade*: "Apagat progresiu de il·lum."
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/francais.lang
===================================================================
--- apps/lang/francais.lang	(Revision 19226)
+++ apps/lang/francais.lang	(Arbeitskopie)
@@ -2727,15 +2727,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Allumage progressif du rétro-éclairage"
+    backlight_fade*: "Allumage progressif du rétro-éclairage"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Allumage progressif du rétro-éclairage"
+    backlight_fade*: "Allumage progressif du rétro-éclairage"
   </voice>
 </phrase>
 <phrase>
@@ -2744,15 +2744,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Extinction progressive du rétro-éclairage"
+    backlight_fade*: "Extinction progressive du rétro-éclairage"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Extinction progressive du rétro-éclairage"
+    backlight_fade*: "Extinction progressive du rétro-éclairage"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/japanese.lang
===================================================================
--- apps/lang/japanese.lang	(Revision 19226)
+++ apps/lang/japanese.lang	(Arbeitskopie)
@@ -2681,15 +2681,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "バックライト点灯時間"
+    backlight_fade*: "バックライト点灯時間"
   </dest>
   <voice>
     *: none
-    backlight_fade: "バックライト点灯時間"
+    backlight_fade*: "バックライト点灯時間"
   </voice>
 </phrase>
 <phrase>
@@ -2698,15 +2698,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "バックライト消灯時間"
+    backlight_fade*: "バックライト消灯時間"
   </dest>
   <voice>
     *: none
-    backlight_fade: "バックライト消灯時間"
+    backlight_fade*: "バックライト消灯時間"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/english.lang
===================================================================
--- apps/lang/english.lang	(Revision 19226)
+++ apps/lang/english.lang	(Arbeitskopie)
@@ -2771,15 +2771,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </voice>
 </phrase>
 <phrase>
@@ -2788,15 +2788,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/czech.lang
===================================================================
--- apps/lang/czech.lang	(Revision 19226)
+++ apps/lang/czech.lang	(Arbeitskopie)
@@ -2683,15 +2683,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Plynule zapínat podsvícení"
+    backlight_fade*: "Plynule zapínat podsvícení"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Plynule zapínat podsvícení"
+    backlight_fade*: "Plynule zapínat podsvícení"
   </voice>
 </phrase>
 <phrase>
@@ -2700,15 +2700,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Plynule vypínat podsvícení"
+    backlight_fade*: "Plynule vypínat podsvícení"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Plynule vypínat podsvícení"
+    backlight_fade*: "Plynule vypínat podsvícení"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/norsk.lang
===================================================================
--- apps/lang/norsk.lang	(Revision 19226)
+++ apps/lang/norsk.lang	(Arbeitskopie)
@@ -2521,15 +2521,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Ton inn skjermlys"
+    backlight_fade*: "Ton inn skjermlys"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Ton inn skjermlys"
+    backlight_fade*: "Ton inn skjermlys"
   </voice>
 </phrase>
 <phrase>
@@ -2538,15 +2538,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Ton ut skjermlys"
+    backlight_fade*: "Ton ut skjermlys"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Ton ut skjermlys"
+    backlight_fade*: "Ton ut skjermlys"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/finnish.lang
===================================================================
--- apps/lang/finnish.lang	(Revision 19226)
+++ apps/lang/finnish.lang	(Arbeitskopie)
@@ -2962,15 +2962,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Taustavalon sisäänhäivytys"
+    backlight_fade*: "Taustavalon sisäänhäivytys"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Taustavalon sisäänhäivytys"
+    backlight_fade*: "Taustavalon sisäänhäivytys"
   </voice>
 </phrase>
 <phrase>
@@ -2979,15 +2979,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Taustavalon poishäivytys"
+    backlight_fade*: "Taustavalon poishäivytys"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Taustavalon poishäivytys"
+    backlight_fade*: "Taustavalon poishäivytys"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/italiano.lang
===================================================================
--- apps/lang/italiano.lang	(Revision 19226)
+++ apps/lang/italiano.lang	(Arbeitskopie)
@@ -2700,15 +2700,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Accensione retroilluminazione"
+    backlight_fade*: "Accensione retroilluminazione"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Accensione retroilluminazione"
+    backlight_fade*: "Accensione retroilluminazione"
   </voice>
 </phrase>
 <phrase>
@@ -2717,15 +2717,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Spegnimento retroilluminazione"
+    backlight_fade*: "Spegnimento retroilluminazione"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Spegnimento retroilluminazione"
+    backlight_fade*: "Spegnimento retroilluminazione"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/espanol.lang
===================================================================
--- apps/lang/espanol.lang	(Revision 19226)
+++ apps/lang/espanol.lang	(Arbeitskopie)
@@ -6691,15 +6691,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Fundido de entrada de iluminación"
+    backlight_fade*: "Fundido de entrada de iluminación"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Fundido de entrada de iluminación"
+    backlight_fade*: "Fundido de entrada de iluminación"
   </voice>
 </phrase>
 <phrase>
@@ -7075,15 +7075,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Fundido de salida de iluminación"
+    backlight_fade*: "Fundido de salida de iluminación"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Fundido de salida de iluminación"
+    backlight_fade*: "Fundido de salida de iluminación"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/srpski.lang
===================================================================
--- apps/lang/srpski.lang	(Revision 19226)
+++ apps/lang/srpski.lang	(Arbeitskopie)
@@ -2688,15 +2688,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Fade In позадинског осветљења"
+    backlight_fade*: "Fade In позадинског осветљења"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Fade In позадинског осветљења"
+    backlight_fade*: "Fade In позадинског осветљења"
   </voice>
 </phrase>
 <phrase>
@@ -2705,15 +2705,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Fade Out позадинског осветљења"
+    backlight_fade*: "Fade Out позадинског осветљења"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Fade Out позадинског осветљења"
+    backlight_fade*: "Fade Out позадинског осветљења"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/tagalog.lang
===================================================================
--- apps/lang/tagalog.lang	(Revision 19226)
+++ apps/lang/tagalog.lang	(Arbeitskopie)
@@ -2688,15 +2688,15 @@
  user:
  <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
  </source>
  <dest>
     *: none
-    backlight_fade: "Magilaw sa likod pagpapalit"
+    backlight_fade*: "Magilaw sa likod pagpapalit"
  </dest>
  <voice>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
  </voice>
 </phrase>
 <phrase>
@@ -2705,15 +2705,15 @@
  user:
  <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
  </source>
  <dest>
     *: none
-    backlight_fade: "Magilaw sa likod pagpapalit"
+    backlight_fade*: "Magilaw sa likod pagpapalit"
  </dest>
  <voice>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
  </voice>
 </phrase>
 <phrase>
Index: apps/lang/chinese-simp.lang
===================================================================
--- apps/lang/chinese-simp.lang	(Revision 19226)
+++ apps/lang/chinese-simp.lang	(Arbeitskopie)
@@ -2962,15 +2962,15 @@
   user: 
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "背光淡入"
+    backlight_fade*: "背光淡入"
   </dest>
   <voice>
     *: none
-    backlight_fade: "背光淡入"
+    backlight_fade*: "背光淡入"
   </voice>
 </phrase>
 <phrase>
@@ -2979,15 +2979,15 @@
   user: 
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "背光淡出"
+    backlight_fade*: "背光淡出"
   </dest>
   <voice>
     *: none
-    backlight_fade: "背光淡出"
+    backlight_fade*: "背光淡出"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/portugues-brasileiro.lang
===================================================================
--- apps/lang/portugues-brasileiro.lang	(Revision 19226)
+++ apps/lang/portugues-brasileiro.lang	(Arbeitskopie)
@@ -2698,15 +2698,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Aumentar Progressivamente Intensidade da Luz de Fundo"
+    backlight_fade*: "Aumentar Progressivamente Intensidade da Luz de Fundo"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Aumentar Progressivamente Intensidade da Luz de Fundo"
+    backlight_fade*: "Aumentar Progressivamente Intensidade da Luz de Fundo"
   </voice>
 </phrase>
 <phrase>
@@ -2715,15 +2715,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Diminuir Progressivamente Intensidade da Luz de Fundo"
+    backlight_fade*: "Diminuir Progressivamente Intensidade da Luz de Fundo"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Diminuir Progressivamente Intensidade da Luz de Fundo"
+    backlight_fade*: "Diminuir Progressivamente Intensidade da Luz de Fundo"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/norsk-nynorsk.lang
===================================================================
--- apps/lang/norsk-nynorsk.lang	(Revision 19226)
+++ apps/lang/norsk-nynorsk.lang	(Arbeitskopie)
@@ -2911,15 +2911,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Lysinntoning"
+    backlight_fade*: "Lysinntoning"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Lysinntoning"
+    backlight_fade*: "Lysinntoning"
   </voice>
 </phrase>
 <phrase>
@@ -2928,15 +2928,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Lysuttoning"
+    backlight_fade*: "Lysuttoning"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Lysuttoning"
+    backlight_fade*: "Lysuttoning"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/greek.lang
===================================================================
--- apps/lang/greek.lang	(Revision 19226)
+++ apps/lang/greek.lang	(Arbeitskopie)
@@ -2685,15 +2685,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Σταδιακή ενεργοποίηση φωτισμού"
+    backlight_fade*: "Σταδιακή ενεργοποίηση φωτισμού"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Σταδιακή ενεργοποίηση φωτισμού"
+    backlight_fade*: "Σταδιακή ενεργοποίηση φωτισμού"
   </voice>
 </phrase>
 <phrase>
@@ -2702,15 +2702,15 @@
   user:
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Σταδιακή απενεργοποίηση φωτισμού"
+    backlight_fade*: "Σταδιακή απενεργοποίηση φωτισμού"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Σταδιακή απενεργοποίηση φωτισμού"
+    backlight_fade*: "Σταδιακή απενεργοποίηση φωτισμού"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/romaneste.lang
===================================================================
--- apps/lang/romaneste.lang	(Revision 19226)
+++ apps/lang/romaneste.lang	(Arbeitskopie)
@@ -4358,15 +4358,15 @@
   user: 
   <source>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </source>
   <dest>
     *: none
-    backlight_fade: "Filare iluminare aprindere"
+    backlight_fade*: "Filare iluminare aprindere"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Backlight Fade In"
+    backlight_fade*: "Backlight Fade In"
   </voice>
 </phrase>
 <phrase>
@@ -5543,15 +5543,15 @@
   user: 
   <source>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </source>
   <dest>
     *: none
-    backlight_fade: "Filare iluminare stingere"
+    backlight_fade*: "Filare iluminare stingere"
   </dest>
   <voice>
     *: none
-    backlight_fade: "Backlight Fade Out"
+    backlight_fade*: "Backlight Fade Out"
   </voice>
 </phrase>
 <phrase>
Index: apps/features.txt
===================================================================
--- apps/features.txt	(Revision 19226)
+++ apps/features.txt	(Arbeitskopie)
@@ -20,8 +20,10 @@
 backlight_brightness
 #endif
 
-#if defined(HAVE_BACKLIGHT_PWM_FADING) || defined(USE_BACKLIGHT_SW_FADING)
-backlight_fade
+#if defined(HAVE_BACKLIGHT_PWM_FADING)
+backlight_fade_pwm
+#elif defined(USE_BACKLIGHT_SW_FADING)
+backlight_fade_sw
 #endif
 
 #if BATTERY_TYPES_COUNT > 1
Index: manual/configure_rockbox/display_options.tex
===================================================================
--- manual/configure_rockbox/display_options.tex	(Revision 19226)
+++ manual/configure_rockbox/display_options.tex	(Arbeitskopie)
@@ -28,7 +28,7 @@
       beginning so that the display can be read to see song information. The
       amount of time is determined by the value of the backlight timeout
       setting, but is no less than 5 seconds.
-      \opt{backlight_fade}{
+      \opt{backlight_fade_pwm}{
         \item[Backlight Fade In:]
         The amount of time that the backlight will take to fade from off to on
         after a button is pressed. If set to \setting{Off} the backlight will
@@ -41,6 +41,16 @@
         fade out. Other valid values: \setting{500ms}, \setting{1s},
         \setting{2s}, \setting{3s}, \setting{4s}, \setting{5s} or \setting{10s}.
       }
+      \opt{backlight_fade_sw}{
+        \item[Backlight Fade In:]
+        This options turns on smooth backlight fading when the backlight is
+        activated. The fading time is dependent on the brightness level you
+        have chosen. If it is turned off, the backlight will turn on immediately.
+        \item[Backlight Fade Out:]
+        This options turns on smooth backlight fading when the backlight is
+        deactivated. The fading time is dependent on the brightness level you
+        have chosen. If it is turned off, the backlight will turn off immediately.
+      }
       \item[First Keypress Enables Backlight Only:]
       With this option enabled the first keypress while the backlight is turned
       off will only turn the backlight on without having any other effect. When