summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/lang/english.lang6
-rw-r--r--apps/settings_list.c2
-rw-r--r--manual/appendix/config_file_options.tex3
-rw-r--r--manual/configure_rockbox/playback_options.tex2
4 files changed, 7 insertions, 6 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 6443d16ae9..5e0c325843 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -12459,12 +12459,12 @@
12459 desc: in Settings -> Playback Settings 12459 desc: in Settings -> Playback Settings
12460 user: core 12460 user: core
12461 <source> 12461 <source>
12462 *: "Prevent Skipping" 12462 *: "Prevent Track Skipping"
12463 </source> 12463 </source>
12464 <dest> 12464 <dest>
12465 *: "Prevent Skipping" 12465 *: "Prevent Track Skipping"
12466 </dest> 12466 </dest>
12467 <voice> 12467 <voice>
12468 *: "Prevent Skipping" 12468 *: "Prevent Track Skipping"
12469 </voice> 12469 </voice>
12470</phrase> 12470</phrase>
diff --git a/apps/settings_list.c b/apps/settings_list.c
index bb88786a2c..0485ec4ab3 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1467,7 +1467,7 @@ const struct settings_list settings[] = {
1467 "touchscreen mode", "point,grid", NULL, 2, 1467 "touchscreen mode", "point,grid", NULL, 2,
1468 ID2P(LANG_TOUCHSCREEN_POINT), ID2P(LANG_TOUCHSCREEN_GRID)), 1468 ID2P(LANG_TOUCHSCREEN_POINT), ID2P(LANG_TOUCHSCREEN_GRID)),
1469#endif 1469#endif
1470 OFFON_SETTING(0, prevent_skip, LANG_PREVENT_SKIPPING, false, "prevent skip", NULL), 1470 OFFON_SETTING(0, prevent_skip, LANG_PREVENT_SKIPPING, false, "prevent track skip", NULL),
1471}; 1471};
1472 1472
1473const int nb_settings = sizeof(settings)/sizeof(*settings); 1473const int nb_settings = sizeof(settings)/sizeof(*settings);
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 0ddca7534f..9f0ecd3632 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -130,7 +130,8 @@
130 } 130 }
131 skip length & track, 1s, 2s, 3s, 5s, 7s, 10s, 15s, 20s, 1min, 131 skip length & track, 1s, 2s, 3s, 5s, 7s, 10s, 15s, 20s, 1min,
132 90s, 2min, 3min, 5min, 10min, 15min & N/A\\ 132 90s, 2min, 3min, 5min, 10min, 15min & N/A\\
133 prevent skip & on, off & N/A\\ 133 prevent track skip
134 & on, off & N/A\\
134 start in screen & previous, root, files, db, wps, menu, 135 start in screen & previous, root, files, db, wps, menu,
135 \opt{recording}{recording, } 136 \opt{recording}{recording, }
136 \opt{radio}{radio, } 137 \opt{radio}{radio, }
diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex
index 50240c35f7..b6d50fc1ac 100644
--- a/manual/configure_rockbox/playback_options.tex
+++ b/manual/configure_rockbox/playback_options.tex
@@ -264,7 +264,7 @@ you to configure settings related to audio playback.
264 the \ActionWpsSkipPrev{} and \ActionWpsSkipNext{} buttons so that they skip 264 the \ActionWpsSkipPrev{} and \ActionWpsSkipNext{} buttons so that they skip
265 by a given time instead of skipping to a new track. 265 by a given time instead of skipping to a new track.
266 266
267\section{Prevent Skipping}\index{Prevent Skipping} 267\section{Prevent Track Skipping}\index{Prevent Track Skipping}
268 If this option is enabled, the ability to manually skip tracks is disabled 268 If this option is enabled, the ability to manually skip tracks is disabled
269 in order to avoid accidental track skips. It does not prevent changing tracks 269 in order to avoid accidental track skips. It does not prevent changing tracks
270 if a track ends, which can be achieved by combining this option with 270 if a track ends, which can be achieved by combining this option with