FS#11250: Hotkey setting method changed to menu item vs button pres in context menu. Manuals updated to match.

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

4 files changed, 26 insertions, 324 deletions

diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index 05e2b75..4f7253e 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -13321,57 +13321,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SET_HOTKEY_QUESTION
-  desc: hotkey splash
-  user: core
-  <source>
-    *: none
-    hotkey: "Set Hotkey: %s?"
-  </source>
-  <dest>
-    *: none
-    hotkey: "Nastavit zkratkovou klávesu: %s?"
-  </dest>
-  <voice>
-    *: none
-    hotkey: "Nastavit zkratkovou klávesu?"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_HOTKEY_ASSIGNED
-  desc: Confirmation after the hotkey has been assigned
-  user: core
-  <source>
-    *: none
-    hotkey: "Assigned Hotkey: %s"
-  </source>
-  <dest>
-    *: none
-    hotkey: "Přiřazená zkratková klávesa: %s"
-  </dest>
-  <voice>
-    *: none
-    hotkey: "Přiřazená zkratková klávesa"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_HOTKEY_NOT_SET
-  desc: hotkey splash
-  user: core
-  <source>
-    *: none
-    hotkey: "Hotkey Not Set"
-  </source>
-  <dest>
-    *: none
-    hotkey: "Zkratková klávesa nenastavena"
-  </dest>
-  <voice>
-    *: none
-    hotkey: "Zkratková klávesa nenastavena"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_HOTKEY
   desc: hotkey menu
   user: core
@@ -13389,55 +13338,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VIEW_HOTKEY
-  desc: hotkey menu
-  user: core
-  <source>
-    *: none
-    hotkey: "View Hotkey Settings"
-  </source>
-  <dest>
-    *: none
-    hotkey: "Zobrazit nastavení zkratkové klávesy"
-  </dest>
-  <voice>
-    *: none
-    hotkey: "Zobrazit nastavení zkratkové klávesy"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_HOTKEY_VIEW_WPS
-  desc: hotkey info menu
-  user: core
-  <source>
-    *: none
-    hotkey: "WPS: %s"
-  </source>
-  <dest>
-    *: none
-    hotkey: "Přehrávací obrazovka: %s"
-  </dest>
-  <voice>
-    *: none
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_HOTKEY_VIEW_FILE_BROWSER
-  desc: hotkey info menu
-  user: core
-  <source>
-    *: none
-    hotkey: "Prohlížeč souborů: %s"
-  </source>
-  <dest>
-    *: none
-    hotkey: "Prohlížeč souborů: %s"
-  </dest>
-  <voice>
-    *: none
-  </voice>
-</phrase>
-<phrase>
   id: LANG_RESUME_REWIND
   desc: in playback settings menu
   user: core
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 64d2842..8303586 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -13396,53 +13396,53 @@
 </phrase>
 <phrase>
   id: LANG_SET_HOTKEY_QUESTION
-  desc: hotkey splash
+  desc: deprecated
   user: core
   <source>
     *: none
-    hotkey: "Set Hotkey: %s?"
+    hotkey: ""
   </source>
   <dest>
     *: none
-    hotkey: "Set Hotkey: %s?"
+    hotkey: ""
   </dest>
   <voice>
     *: none
-    hotkey: "Set Hotkey?"
+    hotkey: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_HOTKEY_ASSIGNED
-  desc: Confirmation after the hotkey has been assigned
+  desc: deprecated
   user: core
   <source>
     *: none
-    hotkey: "Assigned Hotkey: %s"
+    hotkey: ""
   </source>
   <dest>
     *: none
-    hotkey: "Assigned Hotkey: %s"
+    hotkey: ""
   </dest>
   <voice>
     *: none
-    hotkey: "Assigned Hotkey"
+    hotkey: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_HOTKEY_NOT_SET
-  desc: hotkey splash
+  desc: deprecated
   user: core
   <source>
     *: none
-    hotkey: "Hotkey Not Set"
+    hotkey: ""
   </source>
   <dest>
     *: none
-    hotkey: "Hotkey Not Set"
+    hotkey: ""
   </dest>
   <voice>
     *: none
-    hotkey: "Hotkey Not Set"
+    hotkey: ""
   </voice>
 </phrase>
 <phrase>
@@ -13464,51 +13464,53 @@
 </phrase>
 <phrase>
   id: LANG_VIEW_HOTKEY
-  desc: hotkey menu
+  desc: deprecated
   user: core
   <source>
     *: none
-    hotkey: "View Hotkey Settings"
+    hotkey: ""
   </source>
   <dest>
     *: none
-    hotkey: "View Hotkey Settings"
+    hotkey: ""
   </dest>
   <voice>
     *: none
-    hotkey: "View Hotkey Settings"
+    hotkey: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_HOTKEY_VIEW_WPS
-  desc: hotkey info menu
+  id: LANG_HOTKEY_WPS
+  desc: hotkey menu
   user: core
   <source>
     *: none
-    hotkey: "WPS: %s"
+    hotkey: "WPS Hotkey"
   </source>
   <dest>
     *: none
-    hotkey: "WPS: %s"
+    hotkey: "WPS Hotkey"
   </dest>
   <voice>
     *: none
+    hotkey: "WPS Hotkey"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_HOTKEY_VIEW_FILE_BROWSER
-  desc: hotkey info menu
+  id: LANG_HOTKEY_FILE_BROWSER
+  desc: hotkey menu
   user: core
   <source>
     *: none
-    hotkey: "File Browser: %s"
+    hotkey: "File Browser Hotkey"
   </source>
   <dest>
     *: none
-    hotkey: "File Browser: %s"
+    hotkey: "File Browser Hotkey"
   </dest>
   <voice>
     *: none
+    hotkey: "File Browser Hotkey"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index d52b6aa..65f4e57 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -13320,57 +13320,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SET_HOTKEY_QUESTION
-  desc: hotkey splash
-  user: core
-  <source>
-    *: none
-    hotkey: "Set Hotkey: %s?"
-  </source>
-  <dest>
-    *: none
-    hotkey: "Imposta Tasto Rapido: %s?"
-  </dest>
-  <voice>
-    *: none
-    hotkey: "Imposta Tasto Rapido?"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_HOTKEY_ASSIGNED
-  desc: Confirmation after the hotkey has been assigned
-  user: core
-  <source>
-    *: none
-    hotkey: "Assigned Hotkey: %s"
-  </source>
-  <dest>
-    *: none
-    hotkey: "Tasto Rapido Assegnato: %s"
-  </dest>
-  <voice>
-    *: none
-    hotkey: "Tasto Rapido Assegnato"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_HOTKEY_NOT_SET
-  desc: hotkey splash
-  user: core
-  <source>
-    *: none
-    hotkey: "Hotkey Not Set"
-  </source>
-  <dest>
-    *: none
-    hotkey: "Tasto Rapido Non Impostato"
-  </dest>
-  <voice>
-    *: none
-    hotkey: "Tasto Rapido Non Impostato"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_HOTKEY
   desc: hotkey menu
   user: core
@@ -13387,52 +13336,3 @@
     hotkey: "Tasto Rapido"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_VIEW_HOTKEY
-  desc: hotkey menu
-  user: core
-  <source>
-    *: none
-    hotkey: "View Hotkey Settings"
-  </source>
-  <dest>
-    *: none
-    hotkey: "Visualizza Impostazioni Tasto Rapido"
-  </dest>
-  <voice>
-    *: none
-    hotkey: "Visualizza Impostazioni Tasto Rapido"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_HOTKEY_VIEW_WPS
-  desc: hotkey info menu
-  user: core
-  <source>
-    *: none
-    hotkey: "WPS: %s"
-  </source>
-  <dest>
-    *: none
-    hotkey: "WPS: %s"
-  </dest>
-  <voice>
-    *: none
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_HOTKEY_VIEW_FILE_BROWSER
-  desc: hotkey info menu
-  user: core
-  <source>
-    *: none
-    hotkey: "File Browser: %s"
-  </source>
-  <dest>
-    *: none
-    hotkey: "Sfoglia File: %s"
-  </dest>
-  <voice>
-    *: none
-  </voice>
-</phrase>
diff --git a/apps/lang/slovak.lang b/apps/lang/slovak.lang
index 6bfeef5..e2c17f4 100644
--- a/apps/lang/slovak.lang
+++ b/apps/lang/slovak.lang
@@ -13319,40 +13319,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VIEW_HOTKEY
-  desc: hotkey menu
-  user: core
-  <source>
-    *: none
-    hotkey: "View Hotkey Settings"
-  </source>
-  <dest>
-    *: none
-    hotkey: "Zobraziť Nastavenia Horúceho Klávesu"
-  </dest>
-  <voice>
-    *: none
-    hotkey: "Zobraziť nastavenia horúceho klávesu"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_HOTKEY_ASSIGNED
-  desc: Confirmation after the hotkey has been assigned
-  user: core
-  <source>
-    *: none
-    hotkey: "Assigned Hotkey: %s"
-  </source>
-  <dest>
-    *: none
-    hotkey: "Priradená Skratka: %s"
-  </dest>
-  <voice>
-    *: none
-    hotkey: "Priradená skratka"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_HOTKEY
   desc: hotkey menu
   user: core
@@ -13370,72 +13336,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_HOTKEY_NOT_SET
-  desc: hotkey splash
-  user: core
-  <source>
-    *: none
-    hotkey: "Hotkey Not Set"
-  </source>
-  <dest>
-    *: none
-    hotkey: "Skratka Nieje Nastavená"
-  </dest>
-  <voice>
-    *: none
-    hotkey: "Skratka nieje nastavená"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SET_HOTKEY_QUESTION
-  desc: hotkey splash
-  user: core
-  <source>
-    *: none
-    hotkey: "Set Hotkey: %s?"
-  </source>
-  <dest>
-    *: none
-    hotkey: "Nastaviť skratku: %s?"
-  </dest>
-  <voice>
-    *: none
-    hotkey: "Nastaviť skratku?"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_HOTKEY_VIEW_FILE_BROWSER
-  desc: hotkey info menu
-  user: core
-  <source>
-    *: none
-    hotkey: "File Browser: %s"
-  </source>
-  <dest>
-    *: none
-    hotkey: "Prehliadač Súborov: %s"
-  </dest>
-  <voice>
-    *: none
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_HOTKEY_VIEW_WPS
-  desc: hotkey info menu
-  user: core
-  <source>
-    *: none
-    hotkey: "WPS: %s"
-  </source>
-  <dest>
-    *: none
-    hotkey: "WPS: %s"
-  </dest>
-  <voice>
-    *: none
-  </voice>
-</phrase>
-<phrase>
   id: LANG_RESUME_REWIND
   desc: in playback settings menu
   user: core