From f1a7b4b1b4deb69126b5164da24d514ce3f2fb06 Mon Sep 17 00:00:00 2001 From: Buschel Date: Sat, 20 Mar 2010 15:35:12 +0000 Subject: [PATCH] Use consistent wording for line-in and -out. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25258 a1c6a512-1295-4272-9138-f99709370657 --- apps/lang/english.lang | 6 +++--- manual/configure_rockbox/sound_settings.tex | 2 +- manual/configure_rockbox/system_options.tex | 8 ++++---- manual/rockbox_interface/main.tex | 14 +++++++------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 3c847cff8..60bf9902c 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -13383,14 +13383,14 @@ user: core *: none - lineout_poweroff: "Line-out" + lineout_poweroff: "Line Out" *: none - lineout_poweroff: "Line-out" + lineout_poweroff: "Line Out" *: none - lineout_poweroff: "Line-out" + lineout_poweroff: "Line Out" diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex index a22468e0b..bbfbd5b97 100644 --- a/manual/configure_rockbox/sound_settings.tex +++ b/manual/configure_rockbox/sound_settings.tex @@ -27,7 +27,7 @@ change to customise your listening experience. -74 dB to a maximum of +6 db.}% \opt{gigabeats}{minimum of -90 dB to a maximum of +6 dB.}% \opt{gigabeatf}{minimum of -74 dB to a maximum of +6 dB.}% - \opt{ipodvideo}{\\Remark: Lowering the volume below -57 dB will also affect the lineout + \opt{ipodvideo}{\\Remark: Lowering the volume below -57 dB will also affect the line-out and the recording gain.} \section{Bass} diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex index 64ec0f048..d2eb992b8 100644 --- a/manual/configure_rockbox/system_options.tex +++ b/manual/configure_rockbox/system_options.tex @@ -119,7 +119,7 @@ This sub menu relates to limits in the Rockbox operating system. % TODO: this needs to be rewritten in another style, it lets you mix sound from another source into the music \opt{player}{ - \subsection{Line In} This option activates the line in port on \dap, which is + \subsection{Line In} This option activates the line-in port on \dap, which is off by default. This is useful for such applications as: \begin{itemize} \item Game boy $\rightarrow$ \dap $\rightarrow$ human @@ -162,9 +162,9 @@ this option \setting{On}. If it is not required, then turning this setting } \opt{lineout_poweroff}{ -\subsection{Lineout} -This option turns the \dap{}'s lineout \setting{On} and \setting{Off}. On some -devices an enabled lineout will consume some power even if not used. If it is +\subsection{Line Out} +This option turns the \dap{}'s line-out \setting{On} and \setting{Off}. On some +devices an enabled line-out will consume some power even if not used. If it is not required, then turning this setting \setting{Off} will save battery and therefore result in better runtime. } diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex index 7769ac8e2..92ecb6850 100644 --- a/manual/rockbox_interface/main.tex +++ b/manual/rockbox_interface/main.tex @@ -59,7 +59,7 @@ detail in the following paragraph. On the left side is the \ButtonRec{} button. Above that is the internal microphone. On the top panel of the \dap{}, from left to right, you can find the - following: headphone mini jack plug, remote port, Optical line-in, Optical Line-out. + following: headphone mini jack plug, remote port, Optical line-in, Optical line-out. On the bottom panel of the \dap{}, from left to right, you can find the following: power jack, reset switch, and USB port. In the event that your @@ -75,7 +75,7 @@ detail in the following paragraph. the \ButtonUp{}, \ButtonDown{}, \ButtonLeft{}, and \ButtonRight{} buttons. On the top panel of the \dap{}, from left to right, you can find the - following: headphone mini jack plug, remote port, Line-in, Line-out. + following: headphone mini jack plug, remote port, line-in, line-out. On the left hand side of the \dap{} is the internal microphone. Just underneath this is a small hole, the reset switch. In the event that your \dap{} hard locks, @@ -202,7 +202,7 @@ detail in the following paragraph. On the curved top, from left to right, are the headphone jack, the \ButtonOff{} button,% - \opt{recording}{ and the line in jack}. + \opt{recording}{ and the line-in jack}. Apart from the already mentioned MMC slot, you will find the USB connector on the \daps{} right side. Below the LCD, at approximately the center of the \dap{}, there is the main button pad of the \dap{}. The centre of the button pad dips inward @@ -415,8 +415,8 @@ detail in the following paragraph. button on the right contains, clockwise from the top, the \ButtonPlay{}, the \ButtonRight{}, the \ButtonStop{}, and the \ButtonLeft{} buttons. - On the top on the \dap{} is the headphone jack on the left and the Line-Out - jack on the right. On the bottom of the \dap{} is the Line-In jack on the left, + On the top on the \dap{} is the headphone jack on the left and the line-out + jack on the right. On the bottom of the \dap{} is the line-in jack on the left, the DC-In jack on the right, and the USB connector in the centre. } % @@ -437,8 +437,8 @@ detail in the following paragraph. of three rectangular buttons the following buttons can be found (from left to right): \ButtonFOne{}, \ButtonFTwo{} and \ButtonFThree{}. - On the top of the \dap{} is the headphone jack on the left and the Line-Out jack on - the right. On the bottom of the \dap{} is the Line-In jack on the left, the + On the top of the \dap{} is the headphone jack on the left and the line-out jack on + the right. On the bottom of the \dap{} is the line-in jack on the left, the DC-In jack on the right, and the USB connector in the centre. } \opt{recorderv2fm}{ -- 2.11.4.GIT