Merge from emacs-24; up to 117691

[gnu-emacs] / lisp / textmodes / po.el

diff --git a/lisp/textmodes/po.el b/lisp/textmodes/po.el
index 1f89cd8373f9af8ef802ca5e3a8828d058e0c4b6..88ef4dafb76d420cb3cf6f0b5c7b04b25dd96eb5 100644 (file)
--- a/lisp/textmodes/po.el
+++ b/lisp/textmodes/po.el
@@ -1,9 +1,8 @@
-;;; po.el --- basic support of PO translation files -*- coding: latin-1; -*-
+;;; po.el --- basic support of PO translation files -*- coding: utf-8; -*-
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1995-1998, 2000-2014 Free Software Foundation, Inc.
 
-;; Authors: François Pinard <pinard@iro.umontreal.ca>,
+;; Authors: François Pinard <pinard@iro.umontreal.ca>,
 ;;          Greg McGary <gkm@magilla.cichlid.com>,
 ;;          Bruno Haible <bruno@clisp.org>.
 ;; Keywords: i18n, files