FS#9580 by Thomas Martitz, split the two types of backlight fading into two seperate features and add correct description of the new one based on changing brightness

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

30 files changed, 183 insertions, 171 deletions

diff --git a/apps/features.txt b/apps/features.txt
index 0a01eb92c7..4f394d5eef 100644
--- a/apps/features.txt
+++ b/apps/features.txt
@@ -20,8 +20,10 @@ albumart
 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
diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang
index f598563faf..d7794cff01 100644
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
@@ -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>
diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang
index f4ccec9408..958cea7d1f 100644
--- a/apps/lang/catala.lang
+++ b/apps/lang/catala.lang
@@ -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>
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index dcaedd8ac0..5a2ec72560 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -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>
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang
index 3c5b3d9ecc..37528c79fa 100644
--- a/apps/lang/chinese-trad.lang
+++ b/apps/lang/chinese-trad.lang
@@ -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>
diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index db023d44e0..e4aa32e3ff 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -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>
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang
index c96c6b4046..28e53190fa 100644
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@@ -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>
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index fb3ef520ec..652bad9d70 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -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>
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index a7b5ef72ed..01ce91795c 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -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>
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index 8afa06239a..edca8813ca 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -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>
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang
index 2754970634..d17de6c49c 100644
--- a/apps/lang/finnish.lang
+++ b/apps/lang/finnish.lang
@@ -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>
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index 56d95ce9a4..6aa3e21a1e 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -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>
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index 032f648f17..971d86a16e 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -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>
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index b8e67ad51d..4783cd99a0 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -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>
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index 72b8a0c27a..e12839d52d 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -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>
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index f190c9bf95..0e0b243465 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -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>
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang
index f652efff67..8b156044f3 100644
--- a/apps/lang/magyar.lang
+++ b/apps/lang/magyar.lang
@@ -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>
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index faab19376a..972fff975e 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -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>
diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang
index bb0add89fd..4f672b8132 100644
--- a/apps/lang/norsk-nynorsk.lang
+++ b/apps/lang/norsk-nynorsk.lang
@@ -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>
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index ee366360fe..fbc4869725 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -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>
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index ee426df897..256ceeb085 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -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>
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang
index 82cec23368..4a516dfa4f 100644
--- a/apps/lang/portugues-brasileiro.lang
+++ b/apps/lang/portugues-brasileiro.lang
@@ -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>
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang
index 322dc115cb..bc1dd11bc8 100644
--- a/apps/lang/romaneste.lang
+++ b/apps/lang/romaneste.lang
@@ -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>
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index e489503d17..b0d059fd21 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -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>
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index ca75137b9a..0164b5622c 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -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>
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index 03312ecf3e..6659c6fdc3 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -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>
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang
index 103afdf1f5..3757db8a31 100644
--- a/apps/lang/tagalog.lang
+++ b/apps/lang/tagalog.lang
@@ -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>
diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang
index a8d1a6f407..2a3d631b60 100644
--- a/apps/lang/thai.lang
+++ b/apps/lang/thai.lang
@@ -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>
diff --git a/apps/lang/walon.lang b/apps/lang/walon.lang
index c657f4791f..cd3922ae88 100644
--- a/apps/lang/walon.lang
+++ b/apps/lang/walon.lang
@@ -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>
diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index 65e2ddfafa..b00dbb4522 100644
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -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