diff --git a/runtime/defaults.vim b/runtime/defaults.vim
index f1d5cd1..f449c6e 100644
--- a/runtime/defaults.vim
+++ b/runtime/defaults.vim
@@ -120,7 +120,7 @@
     au!
     autocmd CmdwinEnter *
 	  \ echohl Todo | 
-	  \ echo 'You discovered the command-line window! You can close it with ":q".' |
+	  \ echo gettext('You discovered the command-line window! You can close it with ":q".') |
 	  \ echohl None
   augroup END
 
diff --git a/src/po/Makefile b/src/po/Makefile
index 9dfbc34..fbe474b 100644
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -204,10 +204,12 @@
 	vim.desktop.in
 
 PO_VIM_INPUTLIST = \
-	../../runtime/optwin.vim
+	../../runtime/optwin.vim \
+	../../runtime/defaults.vim
 
 PO_VIM_JSLIST = \
-	optwin.js
+	optwin.js \
+	defaults.js
 
 $(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST)
 	# Convert the Vim scripts to (what looks like) Javascript
diff --git a/src/po/tojavascript.vim b/src/po/tojavascript.vim
index 7868570..8b0dd73 100644
--- a/src/po/tojavascript.vim
+++ b/src/po/tojavascript.vim
@@ -8,8 +8,9 @@
 for name in argv()[1:]
   exe 'edit ' .. fnameescape(name)
 
-  " Strip comments
+  " Strip comments, also after :set commands.
   g/^\s*"/s/.*//
+  g/^\s*set .*"/s/.*//
 
   " Write as .js file, xgettext recognizes them
   exe 'w! ' .. fnamemodify(name, ":t:r") .. ".js"
diff --git a/src/version.c b/src/version.c
index c8daf71..3a7dcb8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1537,
+/**/
     1536,
 /**/
     1535,