10 files changed, 22 insertions, 12 deletions
diff --git a/build/entities/common.ent b/build/entities/common.ent
index 2eda956da..ad5673368 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -23,6 +23,9 @@
 <!ENTITY enterkey "<keycap>Enter</keycap>">
 <!ENTITY MSG-YES "<userinput>Yes</userinput>">
 <!ENTITY MSG-NO "<userinput>No</userinput>">
+<!ENTITY BTN-CONT "<guibutton>Continue</guibutton>">
+<!ENTITY BTN-CANCEL "<guibutton>Cancel</guibutton>">
+<!ENTITY BTN-GOBACK "<guibutton>Go Back</guibutton>">
 
 <!-- notation used for 'megabytes' -->
 <!ENTITY notation-megabytes "MB">
diff --git a/build/entities/l10n/README b/build/entities/l10n/README
index 6513018e0..215b122d1 100644
--- a/build/entities/l10n/README
+++ b/build/entities/l10n/README
@@ -47,6 +47,9 @@ translations and to have it in place for the next release, Lenny.
 - enterkey
 - MSG-YES
 - MSG-NO
+- BTN-CONT
+- BTN-CANCEL
+- BTN-GOBACK
 
 Some other entities can be localized as well.
 
diff --git a/build/entities/l10n/nl.ent b/build/entities/l10n/nl.ent
index 51ad145e8..080383dc6 100644
--- a/build/entities/l10n/nl.ent
+++ b/build/entities/l10n/nl.ent
@@ -1,4 +1,7 @@
 <!ENTITY MSG-YES "<userinput>Ja</userinput>">
 <!ENTITY MSG-NO "<userinput>Nee</userinput>">
+<!ENTITY BTN-CONT "<guibutton>Volgende</guibutton>">
+<!ENTITY BTN-CANCEL "<guibutton>Annuleren</guibutton>">
+<!ENTITY BTN-GOBACK "<guibutton>Terug</guibutton>">
 
 <!ENTITY archive-mirror "ftp.nl.debian.org">
diff --git a/debian/changelog b/debian/changelog
index 6f34d44a4..a7bde97b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,9 @@ installation-guide (2007xxxx) UNRELEASED; urgency=low
     now loaded automatically.
   * Fix incorrect instruction for preseeding local repositories.
     Thanks to Rémi Demarthe. Closes: #420894.
+  * Add translatable entities for Continue, Cancel and Go Back buttons.
 
- -- Frans Pop <fjp@debian.org>  Wed, 25 Apr 2007 11:48:29 +0200
+ -- Frans Pop <fjp@debian.org>  Mon,  7 May 2007 17:25:28 +0200
 
 installation-guide (20070319) unstable; urgency=low
 
diff --git a/en/appendix/graphical.xml b/en/appendix/graphical.xml
index 1a0ee92e3..74bb5031f 100644
--- a/en/appendix/graphical.xml
+++ b/en/appendix/graphical.xml
@@ -88,8 +88,8 @@ need to know. To expand a collapsed list (used for example for the selection
 of countries within continents), you can use the <keycap>+</keycap> and
 <keycap>-</keycap> keys. For questions where more than one item can be
 selected (e.g. task selection), you first need to tab to the
-<guibutton>Continue</guibutton> button after making your selections; hitting
-enter will toggle a selection, not activate <guibutton>Continue</guibutton>.
+&BTN-CONT; button after making your selections; hitting
+enter will toggle a selection, not activate &BTN-CONT;.
 
 </para><para>
 
diff --git a/en/preparing/bios-setup/powerpc.xml b/en/preparing/bios-setup/powerpc.xml
index 6011e6900..0d554f3a6 100644
--- a/en/preparing/bios-setup/powerpc.xml
+++ b/en/preparing/bios-setup/powerpc.xml
@@ -46,7 +46,7 @@ patch is included in the <application>System Disk 2.3.1</application>
 utility, available from Apple at
 <ulink url="ftp://ftp.apple.com/developer/macosxserver/utilities/SystemDisk2.3.1.smi.bin"></ulink>.
 After unpacking the utility in MacOS, and launching it, select the
-<guibutton>Save button</guibutton> to have the firmware patches
+<guibutton>Save</guibutton> button to have the firmware patches
 installed to nvram.
 
 </para>
diff --git a/en/using-d-i/modules/pkgsel.xml b/en/using-d-i/modules/pkgsel.xml
index 6ef34d72c..240788b60 100644
--- a/en/using-d-i/modules/pkgsel.xml
+++ b/en/using-d-i/modules/pkgsel.xml
@@ -89,7 +89,7 @@ Web server: <classname>apache</classname>.
 </para></note>
 <para>
 
-Once you've selected your tasks, select <guibutton>OK</guibutton>. At this
+Once you've selected your tasks, select &BTN-CONT;. At this
 point, <command>aptitude</command> will install the packages that are part
 of the tasks you've selected.
 
diff --git a/en/using-d-i/modules/shell.xml b/en/using-d-i/modules/shell.xml
index 796744900..27d2e087e 100644
--- a/en/using-d-i/modules/shell.xml
+++ b/en/using-d-i/modules/shell.xml
@@ -26,8 +26,9 @@ at the same time.
 
 If you cannot switch consoles, there is also an <guimenuitem>Execute
 a Shell</guimenuitem> item on the main menu that can be used to start
-a shell. To get back to the installer itself, type
-<userinput>exit</userinput> to close the shell.
+a shell. You can get to the main menu from most dialogs by using the 
+&BTN-GOBACK; button one or more times. Type <userinput>exit</userinput>
+to close the shell and return to the installer.
 
 </para><para>
 
diff --git a/en/using-d-i/modules/x86/grub-installer.xml b/en/using-d-i/modules/x86/grub-installer.xml
index 814ad824b..03137a054 100644
--- a/en/using-d-i/modules/x86/grub-installer.xml
+++ b/en/using-d-i/modules/x86/grub-installer.xml
@@ -8,7 +8,7 @@
 
 The main &architecture; boot loader is called <quote>grub</quote>.
 Grub is a flexible and robust boot loader and a good default choice for
-newbies and old hands alike.
+new users and old hands alike.
 
 </para><para>
 
@@ -18,9 +18,8 @@ can install it elsewhere. See the grub manual for complete information.
 
 </para><para>
 
-If you do not want to install grub at all, use the Back button to get to
-the main menu, and from there select whatever bootloader you would like to
-use.
+If you do not want to install grub, use the &BTN-GOBACK; button to get to the
+main menu, and from there select whatever bootloader you would like to use.
 
 </para>
   </sect3>
diff --git a/en/using-d-i/using-d-i.xml b/en/using-d-i/using-d-i.xml
index 947391048..7e35f5dbe 100644
--- a/en/using-d-i/using-d-i.xml
+++ b/en/using-d-i/using-d-i.xml
@@ -127,7 +127,7 @@ to resolve the problem, and in that case the menu may appear.
 
 </para><para>
 
-You can get to the main menu by selecting the <quote>Back</quote> button
+You can get to the main menu by selecting the &BTN-GOBACK; button
 repeatedly to back all the way out of the currently running component.
 
 </para></listitem>