Index: main.kbd.in
===================================================================
RCS file: /cvs/gnome/gok/main.kbd.in,v
retrieving revision 1.2
diff -u -r1.2 main.kbd.in
--- main.kbd.in	29 Apr 2004 16:54:17 -0000	1.2
+++ main.kbd.in	31 Aug 2004 17:56:07 -0000
@@ -6,6 +6,7 @@
 		<_GOK:label>Menus</_GOK:label>
 	</GOK:key>
 	<GOK:key left="0" right="2" top="0" bottom="1" type="branchCompose" target="Keyboard">
+		<!-- Translators: one word meaning: to enter text. -->
 		<_GOK:label>Compose</_GOK:label>
 	</GOK:key>
 	<GOK:key left="2" right="4" top="0" bottom="1" type="branchModal" target="move-resize">
@@ -24,9 +25,11 @@
 		<_GOK:label>GOK</_GOK:label>
 	</GOK:key>
 	<GOK:key left="4" right="6" top="2" bottom="3" type="branchGUI">
+		<!-- Translators: short version User Interface Grab, used to grab GUI buttons etc. -->
 		<_GOK:label>UI Grab</_GOK:label>
 	</GOK:key>
 	<GOK:key left="0" right="2" top="1" bottom="2" type="branch" target="launcher">
+		<!-- Translators: launcher, as in launching/running programs -->
 		<_GOK:label>Launcher</_GOK:label>
 	</GOK:key>
 </GOK:keyboard>
Index: mouse.kbd.in
===================================================================
RCS file: /cvs/gnome/gok/mouse.kbd.in,v
retrieving revision 1.1
diff -u -r1.1 mouse.kbd.in
--- mouse.kbd.in	10 Nov 2003 21:17:54 -0000	1.1
+++ mouse.kbd.in	31 Aug 2004 17:56:07 -0000
@@ -3,9 +3,11 @@
 
 <GOK:keyboard name="mouse" commandprediction="no" wordcompletion="no" expand="sometimes">
 	<GOK:key left="0" right="1" top="0" bottom="1" type="branchBack">
+		<!-- Translators: short label for go back. -->
 		<_GOK:label>back</_GOK:label>
 	</GOK:key>
 	<GOK:key left="1" right="2" top="0" bottom="1" type="mousebutton" action="latch">
+		<!-- Translators: verb. -->
 		<_GOK:label>Latch</_GOK:label>
 	</GOK:key>
 	<GOK:key left="2" right="4" top="0" bottom="1" type="pointer">
@@ -15,37 +17,42 @@
 		<_GOK:label>Repeat</_GOK:label>
 	</GOK:key>
 	<GOK:key left="0" right="1" top="1" bottom="2" type="mouse" dir="northwest">
-		<_GOK:label>NW</_GOK:label>
+		<GOK:image source="NW.png" type="fixed:20,20"/>
 	</GOK:key>
 	<GOK:key left="1" right="3" top="1" bottom="2" type="mouse" dir="north">
-		<_GOK:label>N</_GOK:label>
+		<!-- Translators: this describes the direction the mouse pointer will move. -->
+		<_GOK:label>Up</_GOK:label>
 	</GOK:key>
 	<GOK:key left="3" right="4" top="1" bottom="2" type="mouse" dir="northeast">
-		<_GOK:label>NE</_GOK:label>
+		<GOK:image source="NE.png" type="fixed:20,20" align="right"/>
 	</GOK:key>
 	<GOK:key left="4" right="6" top="1" bottom="2" type="mousebutton" action="button1">
 		<_GOK:label>Button 1</_GOK:label>
 	</GOK:key>
 	<GOK:key left="0" right="1" top="2" bottom="3" type="mouse" dir="west">
-		<_GOK:label>W</_GOK:label>
+		<!-- Translators: this describes the direction the mouse pointer will move. -->
+		<_GOK:label>Left</_GOK:label>
 	</GOK:key>
 	<GOK:key left="1" right="3" top="2" bottom="3" type="mousebutton" action="double1">
+		<!-- Translators: short label for Double Click. -->
 		<_GOK:label>Dbl Click</_GOK:label>
 	</GOK:key>
 	<GOK:key left="3" right="4" top="2" bottom="3" type="mouse" dir="east">
-		<_GOK:label>E</_GOK:label>
+		<!-- Translators: this describes the direction the mouse pointer will move. -->
+		<_GOK:label>Right</_GOK:label>
 	</GOK:key>
 	<GOK:key left="4" right="6" top="2" bottom="3" type="mousebutton" action="button2">
 		<_GOK:label>Button 2</_GOK:label>
 	</GOK:key>
 	<GOK:key left="0" right="1" top="3" bottom="4" type="mouse" dir="southwest">
-		<_GOK:label>SW</_GOK:label>
+		<GOK:image source="SW.png" type="fixed:20,20"/>
 	</GOK:key>
 	<GOK:key left="1" right="3" top="3" bottom="4" type="mouse" dir="south">
-		<_GOK:label>S</_GOK:label>
+		<!-- Translators: this describes the direction the mouse pointer will move. -->
+		<_GOK:label>Down</_GOK:label>
 	</GOK:key>
 	<GOK:key left="3" right="4" top="3" bottom="4" type="mouse" dir="southeast">
-		<_GOK:label>SE</_GOK:label>
+		<GOK:image source="SE.png" type="fixed:20,20" align="right"/>
 	</GOK:key>
 	<GOK:key left="4" right="6" top="3" bottom="4" type="mousebutton" action="button3">
 		<_GOK:label>Button 3</_GOK:label>
Index: move-resize.kbd.in
===================================================================
RCS file: /cvs/gnome/gok/move-resize.kbd.in,v
retrieving revision 1.1
diff -u -r1.1 move-resize.kbd.in
--- move-resize.kbd.in	10 Nov 2003 21:17:54 -0000	1.1
+++ move-resize.kbd.in	31 Aug 2004 17:56:07 -0000
@@ -3,12 +3,15 @@
 
 <GOK:keyboard name="move-resize" commandprediction="no" wordcompletion="no" expand="sometimes">
 	<GOK:key left="0" right="1" top="0" bottom="1" type="branchBack">
+		<!-- Translators: short label for go back. -->
 		<_GOK:label>back</_GOK:label>
 	</GOK:key>
 	<GOK:key left="1" right="3" top="0" bottom="1" type="dock" dir="north">
+		<!-- Translators: dock is used as a verb. -->
 		<_GOK:label>Dock Top</_GOK:label>
 	</GOK:key>
 	<GOK:key left="3" right="5" top="0" bottom="1" type="dock" dir="south">
+		<!-- Translators: dock is used as a verb. -->
 		<_GOK:label>Dock Bottom</_GOK:label>
 	</GOK:key>
 	<GOK:key left="5" right="6" top="0" bottom="1" type="move-resize" dir="fillwidth">
@@ -19,6 +22,7 @@
 		<GOK:image source="NW.png" type="fixed:20,20"/>
 	</GOK:key>
 	<GOK:key left="1" right="3" top="1" bottom="2" type="move-resize" dir="north">
+		<!-- Translators: this describes the direction gok will move. -->
 		<_GOK:label>Up</_GOK:label>
 	</GOK:key>
 	<GOK:key left="3" right="4" top="1" bottom="2" type="move-resize" dir="northeast">
@@ -29,12 +33,14 @@
 	</GOK:key>
 
 	<GOK:key left="0" right="1" top="2" bottom="3" type="move-resize" dir="west">
+		<!-- Translators: this describes the direction gok will move. -->
 		<_GOK:label>Left</_GOK:label>
 	</GOK:key>
 	<GOK:key left="1" right="3" top="2" bottom="3" type="dock" dir="none">
 		<_GOK:label>Float</_GOK:label>
 	</GOK:key>
 	<GOK:key left="3" right="4" top="2" bottom="3" type="move-resize" dir="east">
+		<!-- Translators: this describes the direction gok will move. -->
 		<_GOK:label>Right</_GOK:label>
 	</GOK:key>
 	<GOK:key left="4" right="6" top="2" bottom="3" type="move-resize" dir="wider">
@@ -45,12 +51,14 @@
 		<GOK:image source="SW.png" type="fixed:20,20"/>
 	</GOK:key>
 	<GOK:key left="1" right="3" top="3" bottom="4" type="move-resize" dir="south">
+		<!-- Translators: this describes the direction gok will move. -->
 		<_GOK:label>Down</_GOK:label>
 	</GOK:key>
 	<GOK:key left="3" right="4" top="3" bottom="4" type="move-resize" dir="southeast">
 		<GOK:image source="SE.png" type="fixed:20,20" align="right"/>
 	</GOK:key>
 	<GOK:key left="4" right="6" top="3" bottom="4" type="move-resize" dir="shorter">
+		<!-- Translators: shorter as in height. -->
 		<_GOK:label>Shorter</_GOK:label>
 	</GOK:key>
 
Index: numberpad.kbd.in
===================================================================
RCS file: /cvs/gnome/gok/numberpad.kbd.in,v
retrieving revision 1.2
diff -u -r1.2 numberpad.kbd.in
--- numberpad.kbd.in	20 Jun 2004 19:19:17 -0000	1.2
+++ numberpad.kbd.in	31 Aug 2004 17:56:07 -0000
@@ -3,6 +3,7 @@
  
 <GOK:keyboard name="numberpad" wordcompletion="no"> 
 	<GOK:key left="0" right="1" top="0" bottom="1" type="branchBack"> 
+		<!-- Translators: short label for go back. -->
 		<_GOK:label>back</_GOK:label> 
 	</GOK:key> 
 	<GOK:key left="1" right="2" top="0" bottom="1" type="normal"> 
@@ -38,6 +39,7 @@
 	</GOK:key> 
 	<GOK:key left="3" right="4" top="1" bottom="2" type="normal" fontsizegroup="1"> 
 		<GOK:label level="1">9</GOK:label> 
+		<!-- Translators: short label of Page Up. -->
 		<_GOK:label>PgUp</_GOK:label>
 		<GOK:output type="keysym">KP_Page_Up</GOK:output> 
 	</GOK:key> 
@@ -80,6 +82,7 @@
 	</GOK:key> 
 	<GOK:key left="3" right="4" top="3" bottom="4" type="normal" fontsizegroup="1"> 
 		<GOK:label level="1">3</GOK:label> 
+		<!-- Translators: short label of Page Down. -->
 		<_GOK:label>PgDn</_GOK:label>
 		<GOK:output type="keysym">KP_Page_Down</GOK:output> 
 	</GOK:key> 
@@ -102,4 +105,4 @@
 		<GOK:output type="keysym">KP_Decimal</GOK:output> 
 	</GOK:key> 
 </GOK:keyboard> 
-</GOK:GokFile> 
+</GOK:GokFile>
Index: quit.kbd.in
===================================================================
RCS file: /cvs/gnome/gok/quit.kbd.in,v
retrieving revision 1.1
diff -u -r1.1 quit.kbd.in
--- quit.kbd.in	10 Nov 2003 21:17:54 -0000	1.1
+++ quit.kbd.in	31 Aug 2004 17:56:07 -0000
@@ -3,10 +3,12 @@
 
 <GOK:keyboard name="quit" commandprediction="no" wordcompletion="no">
 	<GOK:key left="0" right="2" top="0" bottom="1" type="branchBack">
+		<!-- Translators: short label for go back. -->
 		<_GOK:label>back</_GOK:label>
 	</GOK:key>
 	<GOK:key left="2" right="5" top="0" bottom="1" type="normal">
 		<GOK:output type="internal">quit</GOK:output>
+		<!-- Translators: short phrase to confirm that user wants to quit. -->
 		<_GOK:label>Really Quit!</_GOK:label>
 		<GOK:image source="gtk-quit" type="stock"  />
 	</GOK:key>
Index: text-operations.kbd.in
===================================================================
RCS file: /cvs/gnome/gok/text-operations.kbd.in,v
retrieving revision 1.1
diff -u -r1.1 text-operations.kbd.in
--- text-operations.kbd.in	10 Nov 2003 21:17:54 -0000	1.1
+++ text-operations.kbd.in	31 Aug 2004 17:56:07 -0000
@@ -3,12 +3,15 @@
 
 <GOK:keyboard name="text-operations" commandprediction="no" wordcompletion="no" expand="sometimes">
 	<GOK:key left="0" right="1" top="0" bottom="1" type="branchBack">
+		<!-- Translators: short label for go back. -->
 		<GOK:label>back</GOK:label>
 	</GOK:key>
 	<GOK:key left="1" right="2" top="0" bottom="1" type="navigate" detail="char-">
+		<!-- Translators: short label for move one letter to the left. -->
 		<GOK:label>c -</GOK:label>
 	</GOK:key>
 	<GOK:key left="2" right="4" top="0" bottom="1" type="navigate" detail="char+">
+		<!-- Translators: short label for move one letter to the right. -->
 		<GOK:label>c +</GOK:label>
 	</GOK:key>
 	<GOK:key left="4" right="6" top="0" bottom="1" modifiertype="toggle" type="select-toggle">
@@ -18,9 +21,11 @@
 		<GOK:label>Repeat Next</GOK:label>
 	</GOK:key>
 	<GOK:key left="0" right="2" top="1" bottom="2" type="navigate" detail="word-">
+		<!-- Translators: short label for move one word to the left. -->
 		<GOK:label>word -</GOK:label>
 	</GOK:key>
 	<GOK:key left="2" right="4" top="1" bottom="2" type="navigate" detail="word+">
+		<!-- Translators: short label for move one word to the right. -->
 		<GOK:label>word +</GOK:label>
 	</GOK:key>
 	<GOK:key left="4" right="6" top="1" bottom="2" type="select" detail="word">
@@ -33,27 +38,34 @@
 		<GOK:label>copy</GOK:label>
 	</GOK:key>
 	<GOK:key left="0" right="2" top="2" bottom="3" type="navigate" detail="line-">
+		<!-- Translators: short label for move one line up. -->
 		<GOK:label>line -</GOK:label>
 	</GOK:key>
 	<GOK:key left="2" right="4" top="2" bottom="3" type="navigate" detail="line+">
+		<!-- Translators: short label for move one line down. -->
 		<GOK:label>line +</GOK:label>
 	</GOK:key>
 	<GOK:key left="4" right="6" top="2" bottom="3" type="select" detail="sent">
+		<!-- Translators: short label for sentence. -->
 		<GOK:label>sent.</GOK:label>
 	</GOK:key>
 	<GOK:key left="6" right="7" top="2" bottom="4" type="edit" detail="paste">
 		<GOK:label>paste</GOK:label>
 	</GOK:key>
 	<GOK:key left="7" right="8" top="3" bottom="4" type="branch" target="Keyboard">
+		<!-- Translators: short label for insert. -->
 		<GOK:label>ins</GOK:label>
 	</GOK:key>
 	<GOK:key left="0" right="2" top="3" bottom="4" type="navigate" detail="sent-">
+		<!-- Translators: short label for move one sentence back. -->
 		<GOK:label>sent. -</GOK:label>
 	</GOK:key>
 	<GOK:key left="2" right="4" top="3" bottom="4" type="navigate" detail="sent+">
+		<!-- Translators: short label for move one sentence forward. -->
 		<GOK:label>sent. +</GOK:label>
 	</GOK:key>
 	<GOK:key left="4" right="6" top="3" bottom="4" type="select" detail="all">
+		<!-- Translators: short label for all text. -->
 		<GOK:label>all</GOK:label>
 	</GOK:key>
 </GOK:keyboard>
Index: valuator.kbd.in
===================================================================
RCS file: /cvs/gnome/gok/valuator.kbd.in,v
retrieving revision 1.1
diff -u -r1.1 valuator.kbd.in
--- valuator.kbd.in	22 Apr 2004 13:57:30 -0000	1.1
+++ valuator.kbd.in	31 Aug 2004 17:56:07 -0000
@@ -3,6 +3,7 @@
 
 <GOK:keyboard name="valuator" commandprediction="no" wordcompletion="no" expand="sometimes">
 	<GOK:key left="0" right="2" top="0" bottom="1" type="branchBack">
+		<!-- Translators: short label for go back. -->
 		<_GOK:label>back</_GOK:label>
 	</GOK:key>
         <GOK:key left="2" right="4" top="0" bottom="1" type="repeat-next">
Index: po/POTFILES.in
===================================================================
RCS file: /cvs/gnome/gok/po/POTFILES.in,v
retrieving revision 1.27
diff -u -r1.27 POTFILES.in
--- po/POTFILES.in	20 Jul 2004 17:51:31 -0000	1.27
+++ po/POTFILES.in	31 Aug 2004 17:56:08 -0000
@@ -36,6 +36,7 @@
 [type: gettext/xml] main.kbd.in
 [type: gettext/xml] mouse.kbd.in
 [type: gettext/xml] move-resize.kbd.in
+[type: gettext/xml] numberpad.kbd.in
 [type: gettext/xml] quit.kbd.in
 [type: gettext/xml] text-operations.kbd.in
 [type: gettext/xml] valuator.kbd.in
Index: po/README-TRANSLATORS
===================================================================
RCS file: /cvs/gnome/gok/po/README-TRANSLATORS,v
retrieving revision 1.1
diff -u -r1.1 README-TRANSLATORS
--- po/README-TRANSLATORS	1 Jul 2003 19:17:18 -0000	1.1
+++ po/README-TRANSLATORS	31 Aug 2004 17:56:09 -0000
@@ -13,14 +13,17 @@
 
 Translated KBD files
 
-*.xml.in -> *.kbd
+*.kbd.in -> *.kbd
 
-These files will be marked for translation in the normal way (they aren't yet).  
-We'd like to patch intltool so that the merge operation gives us multiple 
-files, one per locale, but haven't found an intltool hacker to do this for us yet.
-The main reason we would prefer multiple files is because the *.kbd files are
+These files will be marked for translation in the normal way.  
+The merge operation gives us multiple files, one per locale.
+The main reason we prefer multiple files is because the *.kbd files are
 at least potentially human-readable and user-editable.
 
+IMPORTANT: the translations for the short strings in the kbd.in files, should
+be kept short.  Ideally they should not exceed the length of the original.  If 
+they are too long there is a risk that part of the translation will not be readable.
+
 --------
 Some *.kbd files such as "Keyboard.kbd" are not included in POTFILES.in.  
 This is intentional, since some KBD files are not suited for string-based 
@@ -65,9 +68,9 @@
 keys so that most-frequently-used characters are easiest/fastest to insert, for 
 scanning access methods.)
 
-Note that at the moment GOK isn't smart enough to scan right-to-left in RTL locales, 
-but we will fix that :-) Our intention is that in RTL locales, '0' will mean
-the right-hand side, thus the back key should be at "left=1, right=0".
+Note that at the moment GOK can scan right-to-left in RTL locales.  (NOTE: Our original 
+intention was that in RTL locales, '0' will mean the right-hand side, thus the back key should 
+be at "left=1, right=0", but this is NOT the case)
 
 ========
 
