Index: gettext/gettext-tools/misc/po-mode.el
===================================================================
--- gettext.orig/gettext-tools/misc/po-mode.el	2008-08-29 00:11:38.000000000 +0900
+++ gettext/gettext-tools/misc/po-mode.el	2008-08-29 00:11:55.000000000 +0900
@@ -1780,7 +1780,7 @@
     (po-previous-entry-with-regexp po-any-msgstr-block-regexp t)
     (po-find-span-of-entry)
     (while (not (eq po-entry-type 'translated))
-      (po-previous-entry-with-regexp po-untranslated-regexp t)
+      (po-previous-entry-with-regexp po-any-msgstr-block-regexp t)
       (po-find-span-of-entry))))
 
 ;; Auto-selection feature.