--- a/runtime/syntax/po.vim
+++ b/runtime/syntax/po.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	po (gettext)
-" Maintainer:	Nam SungHyun <namsh@kldp.org>
-" Last Change:	2001 Apr 26
+" Maintainer:	Dwayne Bailey <dwayne@translate.org.za>
+" Last Change:	2004 Nov 13
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -11,16 +11,62 @@ elseif exists("b:current_syntax")
   finish
 endif
 
-syn match  poComment	"^#.*$"
-syn match  poSources	"^#:.*$"
-syn match  poStatement	"^\(domain\|msgid\|msgstr\)"
+syn sync minlines=10
+
+" Identifiers
+syn match  poStatementMsgidplural "^msgid_plural" contained
+syn match  poPluralCaseN "[0-9]" contained
+syn match  poStatementMsgstr "^msgstr\(\[[0-9]\]\)" contains=poPluralCaseN
+
+" Simple HTML and XML highlighting
+syn match  poHtml "<[^<>]\+>" contains=poHtmlTranslatables
+syn match  poHtmlNot +"<[^<]\+>"+ms=s+1,me=e-1
+syn region poHtmlTranslatables start=+alt=\\"+ms=e-1 end=+\\"+ contained
+
+" Translation blocks
+syn region     poMsgID	matchgroup=poStatementMsgid start=+^msgid "+rs=e-1 matchgroup=poStringID end=+^msgstr\(\|\[[\]0\[]\]\) "+me=s-1 contains=poStringID,poStatementMsgidplural,poStatementMsgid
+syn region     poMsgSTR	matchgroup=poStatementMsgstr start=+^msgstr\(\|\[[\]0\[]\]\) "+rs=e-1 matchgroup=poStringSTR end=+\n\n+me=s-1 contains=poStringSTR,poStatementMsgstr
+syn region poStringID	start=+"+ skip=+\\\\\|\\"+ end=+"+ contained 
+                            \ contains=poSpecial,poFormat,poCommentKDE,poPluralKDE,poKDEdesktopFile,poHtml,poAccelerator,poHtmlNot,poVariable
+syn region poStringSTR	start=+"+ skip=+\\\\\|\\"+ end=+"+ contained 
+                            \ contains=poSpecial,poFormat,poHeaderItem,poCommentKDEError,poHeaderUndefined,poPluralKDEError,poMsguniqError,poKDEdesktopFile,poHtml,poAccelerator,poHtmlNot,poVariable
+
+" Header and Copyright
+syn match     poHeaderItem "\(Project-Id-Version\|Report-Msgid-Bugs-To\|POT-Creation-Date\|PO-Revision-Date\|Last-Translator\|Language-Team\|MIME-Version\|Content-Type\|Content-Transfer-Encoding\|Plural-Forms\|X-Generator\): " contained
+syn match     poHeaderUndefined "\(PACKAGE VERSION\|YEAR-MO-DA HO:MI+ZONE\|FULL NAME <EMAIL@ADDRESS>\|LANGUAGE <LL@li.org>\|text/plain; charset=CHARSET\|ENCODING\)" contained
+syn match     poCopyrightUnset "SOME DESCRIPTIVE TITLE\|FIRST AUTHOR <EMAIL@ADDRESS>, YEAR\|Copyright (C) YEAR Free Software Foundation, Inc\|YEAR THE PACKAGE\'S COPYRIGHT HOLDER\|PACKAGE" contained
+
+" Translation comment block including: translator comment, automatic coments, flags and locations
+syn match     poComment "^#.*$"
+syn keyword   poFlagFuzzy fuzzy contained
+syn match     poCommentTranslator "^# .*$" contains=poCopyrightUnset
+syn match     poCommentAutomatic "^#\..*$" 
+syn match     poCommentSources	"^#:.*$"
+syn match     poCommentFlags "^#,.*$" contains=poFlagFuzzy
+
+" Translations (also includes header fields as they appear in a translation msgstr)
+syn region poCommentKDE	  start=+"_: +ms=s+1 end="\\n" end="\"\n^msgstr"me=s-1 contained
+syn region poCommentKDEError  start=+"\(\|\s\+\)_:+ms=s+1 end="\\n" end=+"\n\n+me=s-1 contained
+syn match  poPluralKDE   +"_n: +ms=s+1 contained
+syn region poPluralKDEError   start=+"\(\|\s\+\)_n:+ms=s+1 end="\"\n\n"me=s-1 contained
 syn match  poSpecial	contained "\\\(x\x\+\|\o\{1,3}\|.\|$\)"
 syn match  poFormat	"%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlL]\|ll\)\=\([diuoxXfeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained
 syn match  poFormat	"%%" contained
-syn region poString	start=+"+ skip=+\\\\\|\\"+ end=+"+
-			\ contains=poSpecial,poFormat
-syn region poFuzzy       start=+^#,\sfuzzy+ end=+^$+
-syn match  poUntranslated +^msgstr\s""\n\n+
+
+" msguniq and msgcat conflicts
+syn region poMsguniqError matchgroup=poMsguniqErrorMarkers  start="#-#-#-#-#"  end='#\("\n"\|\)-\("\n"\|\)#\("\n"\|\)-\("\n"\|\)#\("\n"\|\)-\("\n"\|\)#\("\n"\|\)-\("\n"\|\)#\("\n"\|\)\\n' contained
+
+" Obsolete messages
+syn match poObsolete "^#\~.*$" 
+
+" KDE Name= handling
+syn match poKDEdesktopFile "\"\(Name\|Comment\|GenericName\|Description\|Keywords\|About\)="ms=s+1,me=e-1
+
+" Accelerator keys - this messes up if the preceding or following char is a multibyte unicode char
+syn match poAccelerator  contained "[^&_~][&_~]\(\a\|\d\)[^:]"ms=s+1,me=e-1 
+
+" Variables simple
+syn match poVariable contained "%\d"
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -33,14 +79,41 @@ if version >= 508 || !exists("did_po_syn
     command -nargs=+ HiLink hi def link <args>
   endif
 
-  HiLink poComment	Comment
-  HiLink poSources	PreProc
-  HiLink poStatement	Statement
-  HiLink poSpecial	Special
-  HiLink poFormat	poSpecial
-  HiLink poString	String
-  HiLink poFuzzy	Todo
-  HiLink poUntranslated	Todo
+  HiLink poCommentSources    PreProc
+  HiLink poComment	     Comment
+  HiLink poCommentAutomatic  Comment
+  HiLink poCommentTranslator Comment
+  HiLink poCommentFlags      Special
+  HiLink poCopyrightUnset    Todo
+  HiLink poFlagFuzzy         Todo
+  HiLink poObsolete         Comment
+
+  HiLink poStatementMsgid   Statement
+  HiLink poStatementMsgstr  Statement
+  HiLink poStatementMsgidplural  Statement
+  HiLink poPluralCaseN      Constant
+
+  HiLink poStringID	    String
+  HiLink poStringSTR	    String
+  HiLink poCommentKDE       Comment
+  HiLink poCommentKDEError  Error
+  HiLink poPluralKDE        Comment
+  HiLink poPluralKDEError   Error
+  HiLink poHeaderItem       Identifier
+  HiLink poHeaderUndefined  Todo
+  HiLink poKDEdesktopFile   Identifier
+
+  HiLink poHtml              Identifier
+  HiLink poHtmlNot           String
+  HiLink poHtmlTranslatables String
+
+  HiLink poFormat	    poSpecial
+  HiLink poSpecial	    Special
+  HiLink poAccelerator       Special
+  HiLink poVariable          Special
+
+  HiLink poMsguniqError        Special
+  HiLink poMsguniqErrorMarkers Comment
 
   delcommand HiLink
 endif