Support German translated help messages (translation is in progress)

Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765682

configure

@@ -9077,7 +9077,7 @@ RC_DIR="~/.$PACKAGE"
 $as_echo "#define RC_DIR \"\$RC_DIR\"" >>confdefs.h
 
 
-DOCDIRS="doc:en_English doc-jp:ja_Japanese"
+DOCDIRS="doc:en_English doc-jp:ja_Japanese doc-de:de_German"
 cat >>confdefs.h <<_ACEOF
 #define DOCDIRS "$DOCDIRS"
 _ACEOF

configure.ac

@@ -172,7 +172,7 @@ AC_SUBST(RC_DIR)
 RC_DIR="~/.$PACKAGE"
 AC_DEFINE(RC_DIR, "$RC_DIR")
 AC_SUBST(DOCDIRS)
-DOCDIRS="doc:en_English doc-jp:ja_Japanese"
+DOCDIRS="doc:en_English doc-jp:ja_Japanese doc-de:de_German"
 AC_DEFINE_UNQUOTED(DOCDIRS, "$DOCDIRS")
 
 AC_W3M_VERSION

doc-de/README.func

@@ -0,0 +1,145 @@
+ABORT		Quit w3m without confirmation
+ACCESSKEY	Pop up accesskey menu
+ADD_BOOKMARK	Add current page to bookmarks
+ALARM		Set alarm
+BACK		Back to previous buffer
+BEGIN		Go to the first line
+BOOKMARK	View bookmarks
+CENTER_H	Move to the center line
+CENTER_V	Move to the center column
+CHARSET 	Change the current document charset
+CLOSE_TAB	Close current tab
+CLOSE_TAB_MOUSE Close tab on mouse cursor (for mouse action)
+COMMAND 	Execute w3m command(s)
+COOKIE		View cookie list
+DEFAULT_CHARSET Change the default document charset
+DEFINE_KEY	Define a binding between a keystroke and a user command
+DELETE_PREVBUF	Delete previous buffer (mainly for local-CGI)
+DICT_WORD	Execute dictionary command (see README.dict)
+DICT_WORD_AT	Execute dictionary command for word at cursor
+DISPLAY_IMAGE	Restart loading and drawing of images
+DOWN		Scroll down one line
+DOWNLOAD	Save document (source) to file
+DOWNLOAD_LIST	Display download list panel
+EDIT		Edit current document
+EDIT_SCREEN	Edit currently rendered document
+END		Go to the last line
+EXEC_SHELL	Execute shell command
+EXIT		Quit w3m without confirmation
+EXTERN		Execute external browser
+EXTERN_LINK	View current link using external browser
+FRAME		Render frames
+GOTO		Go to URL
+GOTO_LINE	Go to specified line
+GOTO_LINK	Follow current link
+GOTO_RELATIVE	Go to relative URL
+HELP		View help
+HISTORY 	View browser history
+INFO		View info of current document
+INTERRUPT	Suspend w3m
+INIT_MAILCAP	Reread mailcap (mainly for local-CGI)
+ISEARCH 	Incremental search forward
+ISEARCH_BACK	Incremental search backward
+LEFT		Shift screen one column
+LINE_BEGIN	Go to the beginning of line
+LINE_END	Go to the end of line
+LINE_INFO	Show current line number
+LINK_BEGIN	Go to the first link
+LINK_END	Go to the last link
+LINK_MENU	Pop up link element menu
+LIST		Show all links and images
+LIST_MENU	Pop up link list menu and go to selected link
+LOAD		Load local file
+MAIN_MENU	Pop up menu
+MARK		Set/unset mark
+MARK_MID	Mark Message-ID-like strings as links
+MARK_URL	Mark URL-like strings as links
+MARK_WORD	Mark current word as link
+MENU		Pop up menu
+MENU_MOUSE	Pop up menu at mouse cursor (for mouse action)
+MOUSE_TOGGLE	Toggle mouse support
+MOVE_DOWN	Move cursor down (a half screen scroll at the end of screen)
+MOVE_DOWN1	Move cursor down (1 line scroll at the end of screen)
+MOVE_LEFT	Move cursor left (a half screen shift at the left edge)
+MOVE_LEFT1	Move cursor left (1 column shift at the left edge)
+MOVE_LIST_MENU	Pop up link list menu and move cursor to selected link
+MOVE_MOUSE	Move cursor to mouse cursor (for mouse action)
+MOVE_RIGHT	Move cursor right (a half screen shift at the right edge)
+MOVE_RIGHT1	Move cursor right (1 column shift at the right edge)
+MOVE_UP		Move cursor up (a half screen scroll at the top of screen)
+MOVE_UP1	Move cursor up (1 line scroll at the top of screen)
+MSGS		Display error messages
+NEW_TAB 	Open new tab
+NEXT		Move to next buffer
+NEXT_DOWN	Move downward to next link
+NEXT_LEFT	Move left to next link
+NEXT_LEFT_UP	Move left (or upward) to next link
+NEXT_LINK	Move to next link
+NEXT_MARK	Move to next word
+NEXT_PAGE	Move to next page
+NEXT_RIGHT	Move right to next link
+NEXT_RIGHT_DOWN	Move right (or downward) to next link
+NEXT_TAB	Move to next tab
+NEXT_UP		Move upward to next link
+NEXT_VISITED	Move to next visited link
+NEXT_WORD	Move to next word
+NOTHING 	Do nothing
+NULL		Do nothing
+OPTIONS 	Display option setting panel
+PEEK		Peek at current URL
+PEEK_IMG	Peek at image URL
+PEEK_LINK	Peek at link URL
+PIPE_BUF	Send rendered document to pipe
+PIPE_SHELL	Execute shell command and browse
+PREV		Move to previous buffer
+PREV_LINK	Move to previous link
+PREV_MARK	Move to previous mark
+PREV_PAGE	Move to previous page
+PREV_TAB	Move to previous tab
+PREV_VISITED	Move to previous visited link
+PREV_WORD	Move to previous word
+PRINT		Save buffer to file
+QUIT		Quit w3m
+READ_SHELL	Execute shell command and load
+REDO		Cancel the last undo
+REDRAW		Redraw screen
+REG_MARK	Set mark using regexp
+REINIT		Reload configuration files
+RELOAD		Reload buffer
+RESHAPE 	Re-render buffer
+RIGHT		Shift screen one column right
+SAVE		Save document (source) to file
+SAVE_IMAGE	Save image to file
+SAVE_LINK	Save link to file
+SAVE_SCREEN	Save buffer to file
+SEARCH		Search forward
+SEARCH_BACK	Search backward
+SEARCH_FORE	Search forward
+SEARCH_NEXT	Search next regexp
+SEARCH_PREV	Search previous regexp
+SELECT		Go to buffer selection panel
+SELECT_MENU	Pop up buffer selection menu
+SETENV		Set environment variable
+SET_OPTION	Set option
+SHELL		Execute shell command
+SHIFT_LEFT	Shift screen left
+SHIFT_RIGHT	Shift screen right
+SOURCE		View HTML source
+STOP_IMAGE	Stop loading and drawing of images
+SUBMIT		Submit form
+SUSPEND 	Suspend w3m
+TAB_GOTO	Open URL on new tab
+TAB_GOTO_RELATIVE	Open relative URL on new tab
+TAB_LEFT	Move current tab left
+TAB_LINK	Open current link on new tab
+TAB_MENU	Pop up tab selection menu
+TAB_MOUSE	Move to tab on mouse cursor (for mouse action)
+TAB_RIGHT	Move current tab right
+UNDO		Cancel the last cursor movement
+UP		Scroll up one line
+VERSION		Display version of w3m
+VIEW		View HTML source
+VIEW_BOOKMARK	View bookmarks
+VIEW_IMAGE	Bild anzeigen
+WHEREIS 	Search forward
+WRAP_TOGGLE	Toggle search wrap mode

scripts/Makefile.in

@@ -60,7 +60,7 @@ w3mhelp-funcname.pl: w3mhelp-funcname.pl.in ../funcname.tab $(top_srcdir)/doc/ke
 	@cat $(srcdir)/w3mhelp-funcname.pl.in >> w3mhelp-funcname.pl
 	@echo "done"
 
-w3mhelp-funcdesc-stamp: $(top_srcdir)/doc/README.func $(top_srcdir)/doc-jp/README.func w3mhelp-funcdesc.en.pl.in w3mhelp-funcdesc.ja.pl.in
+w3mhelp-funcdesc-stamp: $(top_srcdir)/doc/README.func $(top_srcdir)/doc-jp/README.func $(top_srcdir)/doc-de/README.func w3mhelp-funcdesc.en.pl.in w3mhelp-funcdesc.ja.pl.in w3mhelp-funcdesc.de.pl.in
 	@echo "generating w3mhelp-funcdesc*.pl..."
 	@for dirlang in $(DOCDIRS); do \
 	  dir=`expr "$$dirlang" : "\(.*\):.*"`; \

scripts/w3mhelp-funcdesc.de.pl.in

@@ -0,0 +1,66 @@
+# charset
+$charset = 'UTF-8';
+
+# Buffer selection mode
+
+%buf_funcdesc = (
+ 'BUF:PREV', 'Select previous buffer',
+ 'BUF:NEXT', 'Select next buffer',
+ 'BUF:DELETE', 'Delete current buffer',
+ 'BUF:GO', 'Go to the selected buffer',
+);
+
+%lineedit_funcdesc = (
+ 'LINEEDIT:FORWARD', 'Move cursor forward',
+ 'LINEEDIT:BACK', 'Move cursor backward',
+ 'LINEEDIT:BS',  'Delete previous character',
+ 'LINEEDIT:DEL', 'Delete current character',
+ 'LINEEDIT:KILL_AFTER', 'Kill everything after cursor',
+ 'LINEEDIT:KILL_BEFORE', 'Kill everything before cursor',
+ 'LINEEDIT:TOP', 'Move to the top of line',
+ 'LINEEDIT:BOTTOM', 'Move to the bottom of line',
+ 'LINEEDIT:PREV', 'Fetch the previous string from the history list',
+ 'LINEEDIT:NEXT', 'Fetch the next string from the history list',
+ 'LINEEDIT:EDITOR', 'Edit with external editor',
+ 'LINEEDIT:COMPLETE', 'Complete filename',
+ 'LINEEDIT:ACCEPT', 'Accept',
+);
+
+%menu_funcdesc = (
+ 'MENU:SELECT', 'Select item',
+ 'MENU:CLOSE', 'Close menu',
+ 'MENU:CANCEL', 'Back',
+ 'MENU:DOWN', 'Move to next item',
+ 'MENU:UP', 'Move to previous item',
+ 'MENU:LINE_UP', 'Scroll up one item',
+ 'MENU:LINE_DOWN', 'Scroll down one item',
+ 'MENU:TOP', 'Go to top item',
+ 'MENU:LAST', 'Go to last item',
+ 'MENU:NEXT', 'Go to next page',
+ 'MENU:PREV', 'Go to previous page',
+ 'MENU:SEARCH_FORE', 'Search foreward',
+ 'MENU:SEARCH_BACK', 'Search backward',
+ 'MENU:SEARCH_NEXT', 'Search next regexp',
+ 'MENU:SEARCH_PREV', 'Search previous regexp',
+ 'MENU:SUSPEND', 'Suspend',
+);
+
+%title = (
+ "Show keymap file", 'Show keymap file',
+ "Page/Cursor motion", 'Page/Cursor motion',
+ "Hyperlink operation", 'Hyperlink operation',
+ "File/Stream operation", 'File/Stream operation',
+ "Buffer operation", 'Buffer operation',
+ "Tab operation", 'Tab operation',
+ "Buffer selection mode", 'Buffer selection mode',
+ "Bookmark operation", 'Bookmark operation',
+ "Search", 'Search',
+ "Dictionary look-up", 'Dictionary look-up',
+ "Mark operation", 'Mark operation',
+ "Miscellany", 'Miscellany',
+ "User defined keymaps", 'User defined keymaps',
+ "Line-editing mode", 'Line-editing mode',
+ "Pop up menu", 'Pop up menu',
+);
+
+1;

scripts/w3mhelp.cgi.in

@@ -102,8 +102,7 @@ Content-Type: text/html; charset=$charset
 ******* 
 <A HREF="http://w3m.sourceforge.net/">w3m</A>
  (WWW-wo-Miru)  Version $version by 
-<A HREF="mailto:aito\@fw.ipsj.or.jp">A.ITO</A> ********<BR>
+<A HREF="mailto:aito\@fw.ipsj.or.jp">A.ITO</A> ********
-             ***** Key assign table *****
 </CENTER>
 
 HEADING
@@ -112,13 +111,13 @@ $q_version = $version;
 $q_version =~ s/[^A-Za-z0-9_\$\.\-]/sprintf('%%%02X', ord($&))/ge;
 $script = "<A HREF=\"$ENV{'SCRIPT_NAME'}?version=$q_version&amp;lang=";
 
-# doc:en_English doc-jp:ja_Japanese
+# doc:en_English doc-jp:ja_Japanese doc-de:de_German
 for $otherlang (@docdirs) {
     local(@d) = split(/[:_]/, $otherlang);
     
     if ($d[1] ne $lang) {
 	$d[1] =~ s/[^A-Za-z0-9_\$\.\-]/sprintf('%%%02X', ord($&))/ge;
-	print $script, $d[1], "\">$d[2] version</A>\n";
+	print $script, $d[1], "\">[$d[2]]</A>\n";
     }
 }