7074873 localized /etc/magic (/usr/lib/locale/<locale>/LC_MESSAGES/magic) needs to merge English update
authorasano
Fri, 26 Aug 2011 10:48:58 +0900
changeset 192 0789bb457ffd
parent 191 34edacada953
child 193 25e07604c0a8
7074873 localized /etc/magic (/usr/lib/locale/<locale>/LC_MESSAGES/magic) needs to merge English update
messages/on/cs_CZ/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic
messages/on/de_DE/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic
messages/on/en_US/usr/lib/locale/en_US/LC_MESSAGES/magic
messages/on/es_ES/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic
messages/on/fr_FR/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic
messages/on/it_IT/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic
messages/on/ja_JP/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic
messages/on/ko_KR/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic
messages/on/pt_BR/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic
messages/on/sv_SE/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic
messages/on/zh_CN/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic
messages/on/zh_TW/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic
--- a/messages/on/cs_CZ/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Wed Aug 24 17:53:18 2011 +0900
+++ b/messages/on/cs_CZ/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Fri Aug 26 10:48:58 2011 +0900
@@ -1,28 +1,7 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
 #
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
+# Copyright (c) 1988, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"@(#)magic	1.56	05/08/26 SMI"
+# 
 #
 # This file contains the dictionary of file format identifiers (magic strings)
 # used by file(1).  The fields of this file are as follows:
@@ -38,8 +17,9 @@
 # magic: it forces file(1) to continue scanning and matching additional lines.
 # The first line afterwards not so marked terminates the search.
 #
-# The entries for ELF are not needed anymore, as file(1) now uses the elf(3ELF)
-# routines to look at ELF files.  They remain, commented out, for reference.
+# The entries for ELF and current archives are not needed anymore, as file(1)
+# now uses the elf(3ELF) routines to look at ELF files.  They remain, commented
+# out, for reference.
 #
 #0	string		\177ELF		ELF
 #>4	byte		1		32-bit
@@ -86,7 +66,7 @@
 0	long		0100554		apl workspace
 0	short		017037		packed data
 0	string		<ar>		System V Release 1 ar archive
-0	string		!<arch>		current ar archive
+#0	string		!<arch>		current ar archive
 0	short		0407		pdp11/pre System V vax executable
 >8	ushort		>0		not stripped
 >15	ubyte		>0		- version %ld
@@ -290,6 +270,8 @@
 >10	string		-1.0		 1.0
 >10	string		-2.0		 2.0
 >10	string		-3.0		 3.0
+# Handle Microsoft PostScript files (CTRL-D%!)
+0	string		\004%!		PostScript document text
 # version ID follows, in the form PS-Adobe-nn
 0	string		Interpress/Xerox	Interpress document
 # version ID follows, in the form /n.n
@@ -299,13 +281,6 @@
 0	long		0x137A2947	NeWS font family
 8	long		0x137A2B45	X11/NeWS bitmap font
 8	long		0x137A2B48	X11/NeWS font family
-# snoop files are always big-endian
-# big-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x736e6f6f70000000	Snoop capture file
->8	long		>0		- version %ld
-# little-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x000000706f6f6e73	Snoop capture file
->11	long		>0		- version %ld
 0	short		0436		vfont definition
 0	string		<MakerFile	Frame Maker document
 0	string		<MIFFile	Frame Maker MIF file
@@ -503,11 +478,28 @@
 38	string		application/vnd.sun.xml.draw	StarOffice 7 Drawing
 38	string		application/vnd.sun.xml.impress	StarOffice 7 Presentation
 38	string		application/vnd.sun.xml.math	StarOffice 7 Formula
+38	string		application/vnd.oasis.opendocument.chart	OpenDocument Chart
+38	string		application/vnd.oasis.opendocument.database	OpenDocument Database
+38	string		application/vnd.sun.xml.base			OpenDocument Database
+38	string		application/vnd.oasis.opendocument.formula	OpenDocument Formula
+38	string		application/vnd.oasis.opendocument.image	OpenDocument Image
+38	string		application/vnd.oasis.opendocument.text-web	HTML Document Template
+38	string		application/vnd.oasis.opendocument.text-	OpenDocument
+>78	string		template						Text Template
+>78	string		master							Master Document
+38	string		application/vnd.oasis.opendocument.text		OpenDocument Text
+38	string		application/vnd.oasis.opendocument.graphics	OpenDocument Drawing
+>81	string		-template						Template
+38	string		application/vnd.oasis.opendocument.presentation	OpenDocument Presentation
+>85	string		-template						Template
+38	string		application/vnd.oasis.opendocument.spreadsheet	OpenDocument Spreadsheet
+>84	string		-template						Template
 0	string		PK\003\004	ZIP archive
 0	string		MZ		DOS executable (EXE)
 0	string		LZ		DOS built-in
 0	byte		0xe9		DOS executable (COM)
 0	byte		0xeb		DOS executable (COM)
+0	string		\013\023\010\000	ksh compiled shell script executable
 24	long		60012		ufsdump archive file
 0	string		TZif		zoneinfo timezone data file
 0	string		BZh		bzip2 compressed data
@@ -523,3 +515,82 @@
 >6	ushort		x		rev %u,
 >8	ushort		x		from esc v%u
 >10	ushort		x		rev %u
+0	string		_SM_		DMTF SMBIOS image
+>6	byte		x		version %u
+>7	byte		x		.%u
+0	byte		0x11		Solaris Audit File
+0	byte		0x78		Solaris Audit File 
+# ZFS send stream entries
+8	ullong		0x00000002f5bacbac	ZFS snapshot stream
+# little endian stream
+8	ullong		0xaccbbaf502000000	ZFS snapshot stream
+
+
+# Video files
+2	string		\001\272\041	MPEG Movie file
+0	string		\377\375	MPEG-1 Audio Layer 2
+0	string		\377\373	MPEG-1 Audio Layer 3
+0	string		\377\372	MPEG-1 Audio Layer 3
+0	string		\111\104\063	MPEG-1 Layer 3 with ID3v2
+
+# AVI and GVI files
+20	string	hdrlavih	RIFF Avi Video
+>36	ulong	>0		%u Max Bps,
+>64	ushort	x		%u X
+>68	ushort	x		%u,
+>48	ulong	x		%u frames
+
+20	string	goog		RIFF gvi
+>88	ulong	>0		%u Max Bps
+>116	ushort	x		%u X
+>120	ushort	x		%u,
+>100	ulong	x		%u frames
+
+# JPEG 2000 - jp2 image file.
+3	string		\014\152\120\040\040	JPEG 2000 Image file
+
+# iso 9660 CD-ROM image and El Torito Bootable standard
+32769	string		CD\0		ISO 9660 filesystem image
+>34823	string		EL\040TORITO	- El Torito
+
+# Palm Pilot files .pdb and .prc of some type.
+0x3c	string	TEXtREAd		Palm DOC file
+0x3c	string	SDocSilX		iSilo 3 Doc file for PalmPilot
+0x3c	string	applSil			iSilo Application file
+0x3c	string	appl			Palm Pilot Application
+0x3c	string	ToGoToGo		iSilo Doc file for Palm Pilot
+
+#SGI files with .rgb extention
+0	string	\001\332			SGI Image data,
+>2	byte	1			RLE,
+>2	byte	0			Verbatim,
+>5	ubyte	x			%u-D
+>7	ubyte	x			%u x
+>9	ubyte	x			%u, 
+>11	ubyte	x			%u channel(s)
+
+2048	string		PCD_IPI		Kodak Photo CD image pack file
+>0xe02	byte&0x03	0x00		, landscape mode
+>0xe02	byte&0x03	0x01		, portrait mode
+>0xe02	byte&0x03	0x02		, landscape mode
+>0xe02	byte&0x03	0x03		, portrait mode
+0	string		PCD_OPA		Kodak Photo CD overview pack file
+
+# MS Documents. Not much info available.
+0	string	\320\317\021\340\241\261\032\341	Microsoft
+>546	string	bjbj					Word
+>0	byte	<0					Document
+0	string	{\\rtf		Microsoft Rich Text Format Document
+
+# mp4 media format with different media files embedded in it
+4	string	ftyp		MPEG-4
+>8	string	isom		Base Media v1 [IS0 14496-12:2003]
+>8	string	iso2		Base Media v2 [ISO 14496-12:2005]
+>8	string	m4a\040		Apple iTunes AAC-LC (.M4A) Audio
+>8	string	m4v\040		Apple iTunes (.M4V) Video
+>8	string	qt		Apple QuickTime (.MOV/QT)
+>8	string	jp2		JPEG 2000 Image
+>8	string	jpm		JPEG 2000 Compound Image (.JPM) [ISO 15444-6]
+>8	string	jpx		JPEG 2000 w/ extensions (.JPX) [ISO 15444-2]
+>8	string	mp42		v2 [ISO 14496-14]
+4	string	moov		QuickTime MOV file
--- a/messages/on/de_DE/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Wed Aug 24 17:53:18 2011 +0900
+++ b/messages/on/de_DE/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Fri Aug 26 10:48:58 2011 +0900
@@ -1,31 +1,7 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at $(SRC)/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
 #
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at $(SRC)/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
+# Copyright (c) 1988, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)magic	1.54	06/03/19 SMI"
+# 
 #
 # This file contains the dictionary of file format identifiers (magic strings)
 # used by file(1).  The fields of this file are as follows:
@@ -41,8 +17,9 @@
 # magic: it forces file(1) to continue scanning and matching additional lines.
 # The first line afterwards not so marked terminates the search.
 #
-# The entries for ELF are not needed anymore, as file(1) now uses the elf(3ELF)
-# routines to look at ELF files.  They remain, commented out, for reference.
+# The entries for ELF and current archives are not needed anymore, as file(1)
+# now uses the elf(3ELF) routines to look at ELF files.  They remain, commented
+# out, for reference.
 #
 #0	string		\177ELF		ELF
 #>4	byte		1		32-bit
@@ -89,7 +66,7 @@
 0	long		0100554		apl-Arbeitsbereich
 0	short		017037		Gepackte Daten
 0	string		<ar>		ar-Archiv, System V Release 1
-0	string		!<arch>		Aktuelles ar-Archiv
+#0	string		!<arch>		Aktuelles ar-Archiv
 0	short		0407		VAX-Programm, pdp11/vor System V
 >8	ushort		>0		Nicht extrahiert
 >15	ubyte		>0		- Version %ld
@@ -293,6 +270,8 @@
 >10	string		-1.0		 1.0
 >10	string		-2.0		 2.0
 >10	string		-3.0		 3.0
+# Handle Microsoft PostScript files (CTRL-D%!)
+0	string		\004%!		PostScript document text
 # version ID follows, in the form PS-Adobe-nn
 0	string		Interpress/Xerox	Interpress-Dokument
 # version ID follows, in the form /n.n
@@ -302,13 +281,6 @@
 0	long		0x137A2947	NeWS-Schriftfamilie
 8	long		0x137A2B45	X11/NeWS-Bitmap-Schrift
 8	long		0x137A2B48	X11/NeWS-Schriftfamilie
-# snoop files are always big-endian
-# big-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x736e6f6f70000000	Snoop-Aufnahmedatei
->8	long		>0		- Version %ld
-# little-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x000000706f6f6e73	Snoop-Aufnahmedatei
->11	long		>0		- Version %ld
 0	short		0436		vfont-Definition
 0	string		<MakerFile	Frame Maker-Dokument
 0	string		<MIFFile	Frame Maker-MIF-Datei
@@ -506,11 +478,28 @@
 38	string		application/vnd.sun.xml.draw	StarOffice 7-Zeichnung
 38	string		application/vnd.sun.xml.impress	StarOffice 7-Präsentation
 38	string		application/vnd.sun.xml.math	StarOffice 7-Formel
+38	string		application/vnd.oasis.opendocument.chart	OpenDocument Chart
+38	string		application/vnd.oasis.opendocument.database	OpenDocument Database
+38	string		application/vnd.sun.xml.base			OpenDocument Database
+38	string		application/vnd.oasis.opendocument.formula	OpenDocument Formula
+38	string		application/vnd.oasis.opendocument.image	OpenDocument Image
+38	string		application/vnd.oasis.opendocument.text-web	HTML Document Template
+38	string		application/vnd.oasis.opendocument.text-	OpenDocument
+>78	string		template						Text Template
+>78	string		master							Master Document
+38	string		application/vnd.oasis.opendocument.text		OpenDocument Text
+38	string		application/vnd.oasis.opendocument.graphics	OpenDocument Drawing
+>81	string		-template						Template
+38	string		application/vnd.oasis.opendocument.presentation	OpenDocument Presentation
+>85	string		-template						Template
+38	string		application/vnd.oasis.opendocument.spreadsheet	OpenDocument Spreadsheet
+>84	string		-template						Template
 0	string		PK\003\004	ZIP-Archiv
 0	string		MZ		DOS-Programm (EXE)
 0	string		LZ		DOS-integriert
 0	byte		0xe9		DOS-Programm (COM)
 0	byte		0xeb		DOS-Programm (COM)
+0	string		\013\023\010\000	ksh compiled shell script executable
 24	long		60012		ufsdump-Archivdatei
 0	string		TZif		zoneinfo-Zeitzonen-Datendatei
 0	string		BZh		bzip2-komprimierte Daten
@@ -529,3 +518,79 @@
 0	string		_SM_		DMTF SMBIOS image
 >6	byte		x		Version %u
 >7	byte		x		.%u
+0	byte		0x11		Solaris Audit File
+0	byte		0x78		Solaris Audit File 
+# ZFS send Streameinträge
+8	ullong		0x00000002f5bacbac	ZFS Snapshot-Stream
+# Little-Endian-Stream
+8	ullong		0xaccbbaf502000000	ZFS Snapshot-Stream
+
+
+# Videodateien
+2	string		\001\272\041	MPEG Filmdatei
+0	string		\377\375	MPEG-1 Audio Layer 2
+0	string		\377\373	MPEG-1 Audio Layer 3
+0	string		\377\372	MPEG-1 Audio Layer 3
+0	string		\111\104\063	MPEG-1 Layer 3 mit ID3v2
+
+# AVI- und GVI-Dateien
+20	string	hdrlavih	RIFF Avi Video
+>36	ulong	>0		%u Max Bps,
+>64	ushort	x		%u X
+>68	ushort	x		%u,
+>48	ulong	x		%u frames
+
+20	string	goog		RIFF gvi
+>88	ulong	>0		%u Max Bps
+>116	ushort	x		%u X
+>120	ushort	x		%u,
+>100	ulong	x		%u frames
+
+# JPEG 2000 - jp2 Bilddatei.
+3	string		\014\152\120\040\040	JPEG 2000-Bilddatei
+
+# iso 9660 CD-ROM image and El Torito Bootable standard
+32769	string		CD\0		ISO 9660 Dateisystem-Abbild
+>34823	string		EL\040TORITO	- El Torito
+
+# Palm Pilot files .pdb and .prc of some type.
+0x3c	string	TEXtREAd		Palm DOC-Datei
+0x3c	string	SDocSilX		iSilo 3 Doc-Datei für PalmPilot
+0x3c	string	applSil			iSiloAnwendungsdatei
+0x3c	string	appl			Palm Pilot-Anwendung
+0x3c	string	ToGoToGo		iSilo Doc-Datei für Palm Pilot
+
+#SGI files with .rgb extention
+0	string	\001\332			SGI Bilddaten,
+>2	byte	1			RLE,
+>2	byte	0			Verbatim,
+>5	ubyte	x			%u-D
+>7	ubyte	x			%u x
+>9	ubyte	x			%u, 
+>11	ubyte	x			%u channel(s)
+
+2048	string		PCD_IPI		Kodak Photo CD image pack file
+>0xe02	byte&0x03	0x00		, landscape mode
+>0xe02	byte&0x03	0x01		, portrait mode
+>0xe02	byte&0x03	0x02		, landscape mode
+>0xe02	byte&0x03	0x03		, portrait mode
+0	string		PCD_OPA		Kodak Photo CD overview pack file
+
+# MS-Dokumente. Nicht viele Informationen verfügbar.
+0	string	\320\317\021\340\241\261\032\341	Microsoft
+>546	string	bjbj					Word-
+>0	byte	<0					Dokument
+0	string	{\\rtf		Microsoft Rich Text Format-Dokument
+
+# mp4 media format with different media files embedded in it
+4	string	ftyp		MPEG-4
+>8	string	isom		Base Media v1 [IS0 14496-12:2003]
+>8	string	iso2		Base Media v2 [ISO 14496-12:2005]
+>8	string	m4a\040		Apple iTunes AAC-LC (.M4A) Audio
+>8	string	m4v\040		Apple iTunes (.M4V) Video
+>8	string	qt		Apple QuickTime (.MOV/QT)
+>8	string	jp2		JPEG 2000-Bild
+>8	string	jpm		JPEG 2000 Compound Image (.JPM) [ISO 15444-6]
+>8	string	jpx		JPEG 2000 w/ Erweiterungen (.JPX) [ISO 15444-2]
+>8	string	mp42		v2 [ISO 14496-14]
+4	string	moov		QuickTime MOV-Datei
--- a/messages/on/en_US/usr/lib/locale/en_US/LC_MESSAGES/magic	Wed Aug 24 17:53:18 2011 +0900
+++ b/messages/on/en_US/usr/lib/locale/en_US/LC_MESSAGES/magic	Fri Aug 26 10:48:58 2011 +0900
@@ -1,27 +1,7 @@
-#
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
 #
-# You can obtain a copy of the license at $(SRC)/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
+# Copyright (c) 1988, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at $(SRC)/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"@(#)magic	1.57	07/01/03 SMI"
+# 
 #
 # This file contains the dictionary of file format identifiers (magic strings)
 # used by file(1).  The fields of this file are as follows:
@@ -37,8 +17,9 @@
 # magic: it forces file(1) to continue scanning and matching additional lines.
 # The first line afterwards not so marked terminates the search.
 #
-# The entries for ELF are not needed anymore, as file(1) now uses the elf(3ELF)
-# routines to look at ELF files.  They remain, commented out, for reference.
+# The entries for ELF and current archives are not needed anymore, as file(1)
+# now uses the elf(3ELF) routines to look at ELF files.  They remain, commented
+# out, for reference.
 #
 #0	string		\177ELF		ELF
 #>4	byte		1		32-bit
@@ -85,7 +66,7 @@
 0	long		0100554		apl workspace
 0	short		017037		packed data
 0	string		<ar>		System V Release 1 ar archive
-0	string		!<arch>		current ar archive
+#0	string		!<arch>		current ar archive
 0	short		0407		pdp11/pre System V vax executable
 >8	ushort		>0		not stripped
 >15	ubyte		>0		- version %ld
@@ -289,6 +270,8 @@
 >10	string		-1.0		 1.0
 >10	string		-2.0		 2.0
 >10	string		-3.0		 3.0
+# Handle Microsoft PostScript files (CTRL-D%!)
+0	string		\004%!		PostScript document text
 # version ID follows, in the form PS-Adobe-nn
 0	string		Interpress/Xerox	Interpress document
 # version ID follows, in the form /n.n
@@ -298,13 +281,6 @@
 0	long		0x137A2947	NeWS font family
 8	long		0x137A2B45	X11/NeWS bitmap font
 8	long		0x137A2B48	X11/NeWS font family
-# snoop files are always big-endian
-# big-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x736e6f6f70000000	Snoop capture file
->8	long		>0		- version %ld
-# little-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x000000706f6f6e73	Snoop capture file
->11	long		>0		- version %ld
 0	short		0436		vfont definition
 0	string		<MakerFile	Frame Maker document
 0	string		<MIFFile	Frame Maker MIF file
@@ -523,6 +499,7 @@
 0	string		LZ		DOS built-in
 0	byte		0xe9		DOS executable (COM)
 0	byte		0xeb		DOS executable (COM)
+0	string		\013\023\010\000	ksh compiled shell script executable
 24	long		60012		ufsdump archive file
 0	string		TZif		zoneinfo timezone data file
 0	string		BZh		bzip2 compressed data
@@ -543,3 +520,77 @@
 >7	byte		x		.%u
 0	byte		0x11		Solaris Audit File
 0	byte		0x78		Solaris Audit File 
+# ZFS send stream entries
+8	ullong		0x00000002f5bacbac	ZFS snapshot stream
+# little endian stream
+8	ullong		0xaccbbaf502000000	ZFS snapshot stream
+
+
+# Video files
+2	string		\001\272\041	MPEG Movie file
+0	string		\377\375	MPEG-1 Audio Layer 2
+0	string		\377\373	MPEG-1 Audio Layer 3
+0	string		\377\372	MPEG-1 Audio Layer 3
+0	string		\111\104\063	MPEG-1 Layer 3 with ID3v2
+
+# AVI and GVI files
+20	string	hdrlavih	RIFF Avi Video
+>36	ulong	>0		%u Max Bps,
+>64	ushort	x		%u X
+>68	ushort	x		%u,
+>48	ulong	x		%u frames
+
+20	string	goog		RIFF gvi
+>88	ulong	>0		%u Max Bps
+>116	ushort	x		%u X
+>120	ushort	x		%u,
+>100	ulong	x		%u frames
+
+# JPEG 2000 - jp2 image file.
+3	string		\014\152\120\040\040	JPEG 2000 Image file
+
+# iso 9660 CD-ROM image and El Torito Bootable standard
+32769	string		CD\0		ISO 9660 filesystem image
+>34823	string		EL\040TORITO	- El Torito
+
+# Palm Pilot files .pdb and .prc of some type.
+0x3c	string	TEXtREAd		Palm DOC file
+0x3c	string	SDocSilX		iSilo 3 Doc file for PalmPilot
+0x3c	string	applSil			iSilo Application file
+0x3c	string	appl			Palm Pilot Application
+0x3c	string	ToGoToGo		iSilo Doc file for Palm Pilot
+
+#SGI files with .rgb extention
+0	string	\001\332			SGI Image data,
+>2	byte	1			RLE,
+>2	byte	0			Verbatim,
+>5	ubyte	x			%u-D
+>7	ubyte	x			%u x
+>9	ubyte	x			%u, 
+>11	ubyte	x			%u channel(s)
+
+2048	string		PCD_IPI		Kodak Photo CD image pack file
+>0xe02	byte&0x03	0x00		, landscape mode
+>0xe02	byte&0x03	0x01		, portrait mode
+>0xe02	byte&0x03	0x02		, landscape mode
+>0xe02	byte&0x03	0x03		, portrait mode
+0	string		PCD_OPA		Kodak Photo CD overview pack file
+
+# MS Documents. Not much info available.
+0	string	\320\317\021\340\241\261\032\341	Microsoft
+>546	string	bjbj					Word
+>0	byte	<0					Document
+0	string	{\\rtf		Microsoft Rich Text Format Document
+
+# mp4 media format with different media files embedded in it
+4	string	ftyp		MPEG-4
+>8	string	isom		Base Media v1 [IS0 14496-12:2003]
+>8	string	iso2		Base Media v2 [ISO 14496-12:2005]
+>8	string	m4a\040		Apple iTunes AAC-LC (.M4A) Audio
+>8	string	m4v\040		Apple iTunes (.M4V) Video
+>8	string	qt		Apple QuickTime (.MOV/QT)
+>8	string	jp2		JPEG 2000 Image
+>8	string	jpm		JPEG 2000 Compound Image (.JPM) [ISO 15444-6]
+>8	string	jpx		JPEG 2000 w/ extensions (.JPX) [ISO 15444-2]
+>8	string	mp42		v2 [ISO 14496-14]
+4	string	moov		QuickTime MOV file
--- a/messages/on/es_ES/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Wed Aug 24 17:53:18 2011 +0900
+++ b/messages/on/es_ES/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Fri Aug 26 10:48:58 2011 +0900
@@ -1,31 +1,7 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at $(SRC)/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
 #
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at $(SRC)/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
+# Copyright (c) 1988, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)magic	1.54	06/03/19 SMI"
+# 
 #
 # This file contains the dictionary of file format identifiers (magic strings)
 # used by file(1).  The fields of this file are as follows:
@@ -41,8 +17,9 @@
 # magic: it forces file(1) to continue scanning and matching additional lines.
 # The first line afterwards not so marked terminates the search.
 #
-# The entries for ELF are not needed anymore, as file(1) now uses the elf(3ELF)
-# routines to look at ELF files.  They remain, commented out, for reference.
+# The entries for ELF and current archives are not needed anymore, as file(1)
+# now uses the elf(3ELF) routines to look at ELF files.  They remain, commented
+# out, for reference.
 #
 #0	string		\177ELF		ELF
 #>4	byte		1		32-bit
@@ -89,7 +66,7 @@
 0	long		0100554		área de trabajo apl
 0	short		017037		datos empaquetados
 0	string		<ar>		contenedor ar System V Release 1
-0	string		!<arch>		contenedor ar actual
+#0	string		!<arch>		contenedor ar actual
 0	short		0407		ejecutable vax pdp11/pre System V
 >8	ushort		>0		sin filtrar
 >15	ubyte		>0		- versión %ld
@@ -293,6 +270,8 @@
 >10	string		-1.0		 1.0
 >10	string		-2.0		 2.0
 >10	string		-3.0		 3.0
+# Handle Microsoft PostScript files (CTRL-D%!)
+0	string		\004%!		PostScript document text
 # version ID follows, in the form PS-Adobe-nn
 0	string		Interpress/Xerox	Documento de Interpress
 # version ID follows, in the form /n.n
@@ -302,13 +281,6 @@
 0	long		0x137A2947	Familia de tipos de letra de NeWS
 8	long		0x137A2B45	Tipo de letra bitmap de X11/NeWS
 8	long		0x137A2B48	Familia de tipos de letra de X11/NeWS
-# snoop files are always big-endian
-# big-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x736e6f6f70000000	Archivo de captura Snoop
->8	long		>0		- versión %ld
-# little-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x000000706f6f6e73	Archivo de captura Snoop
->11	long		>0		- versión %ld
 0	short		0436		Definición de vfont
 0	string		<MakerFile	Documento de Frame Maker
 0	string		<MIFFile	Archivo MIF de Frame Maker
@@ -506,11 +478,28 @@
 38	string		application/vnd.sun.xml.draw	Dibujo de StarOffice 7
 38	string		application/vnd.sun.xml.impress	Presentación de StarOffice 7
 38	string		application/vnd.sun.xml.math	Fórmula de StarOffice 7
+38	string		application/vnd.oasis.opendocument.chart	OpenDocument Chart
+38	string		application/vnd.oasis.opendocument.database	OpenDocument Database
+38	string		application/vnd.sun.xml.base			OpenDocument Database
+38	string		application/vnd.oasis.opendocument.formula	OpenDocument Formula
+38	string		application/vnd.oasis.opendocument.image	OpenDocument Image
+38	string		application/vnd.oasis.opendocument.text-web	HTML Document Template
+38	string		application/vnd.oasis.opendocument.text-	OpenDocument
+>78	string		template						Text Template
+>78	string		master							Master Document
+38	string		application/vnd.oasis.opendocument.text		OpenDocument Text
+38	string		application/vnd.oasis.opendocument.graphics	OpenDocument Drawing
+>81	string		-template						Template
+38	string		application/vnd.oasis.opendocument.presentation	OpenDocument Presentation
+>85	string		-template						Template
+38	string		application/vnd.oasis.opendocument.spreadsheet	OpenDocument Spreadsheet
+>84	string		-template						Template
 0	string		PK\003\004	Contenedor ZIP
 0	string		MZ		DOS ejecutable (EXE)
 0	string		LZ		DOS incorporado
 0	byte		0xe9		DOS ejecutable (COM)
 0	byte		0xeb		DOS ejecutable (COM)
+0	string		\013\023\010\000	ksh compiled shell script executable
 24	long		60012		Archivo de contenedor ufsdump
 0	string		TZif		archivo de datos de zona horaria zoneinfo
 0	string		BZh		datos comprimidos bzip2
@@ -529,3 +518,79 @@
 0	string		_SM_		Imagen de DMTF SMBIOS
 >6	byte		x		versión %u
 >7	byte		x		.%u
+0	byte		0x11		Solaris Audit File
+0	byte		0x78		Solaris Audit File 
+# ZFS send stream entries
+8	ullong		0x00000002f5bacbac	Flujo de instantánea ZFS
+# little endian stream
+8	ullong		0xaccbbaf502000000	Flujo de instantánea ZFS
+
+
+# Video files
+2	string		\001\272\041	Archivo de vídeo MPEG
+0	string		\377\375	Archivo de audio MPEG-1 capa 2
+0	string		\377\373	Archivo de audio MPEG-1 capa 3
+0	string		\377\372	Archivo de audio MPEG-1 capa 3
+0	string		\111\104\063	MPEG-1 capa 3 con ID3v2
+
+# AVI and GVI files
+20	string	hdrlavih	Vídeo Avi RIFF
+>36	ulong	>0		%u Bps máx.,
+>64	ushort	x		%u X
+>68	ushort	x		%u,
+>48	ulong	x		%u fotogramas
+
+20	string	goog		RIFF gvi
+>88	ulong	>0		%u Bps máx
+>116	ushort	x		%u X
+>120	ushort	x		%u,
+>100	ulong	x		%u fotogramas
+
+# JPEG 2000 - jp2 image file.
+3	string		\014\152\120\040\040	JPEG 2000 Image file
+
+# iso 9660 CD-ROM image and El Torito Bootable standard
+32769	string		CD\0		ISO 9660 filesystem image
+>34823	string		EL\040TORITO	- El Torito
+
+# Palm Pilot files .pdb and .prc of some type.
+0x3c	string	TEXtREAd		Archivo Palm DOC
+0x3c	string	SDocSilX		Archivo iSilo 3 Doc para PalmPilot
+0x3c	string	applSil			Archivo de aplicación iSilo
+0x3c	string	appl			Aplicación de Palm Pilot
+0x3c	string	ToGoToGo		Archivo iSilo Doc para Palm Pilot
+
+#SGI files with .rgb extention
+0	string	\001\332			Datos de imagen SGI,
+>2	byte	1			RLE,
+>2	byte	0			Verbatim,
+>5	ubyte	x			%u-D
+>7	ubyte	x			%u x
+>9	ubyte	x			%u, 
+>11	ubyte	x			%u canal(es)
+
+2048	string		PCD_IPI		Kodak Photo CD image pack file
+>0xe02	byte&0x03	0x00		, landscape mode
+>0xe02	byte&0x03	0x01		, portrait mode
+>0xe02	byte&0x03	0x02		, landscape mode
+>0xe02	byte&0x03	0x03		, portrait mode
+0	string		PCD_OPA		Kodak Photo CD overview pack file
+
+# MS Documents. No hay demasiada información disponible
+0	string	\320\317\021\340\241\261\032\341	Microsoft
+>546	string	bjbj					Documento de Word
+>0	byte	<0					
+0	string	{\\rtf		Documento Rich Text Format de Microsoft
+
+# mp4 media format with different media files embedded in it
+4	string	ftyp		MPEG-4
+>8	string	isom		Base Media v1 [IS0 14496-12:2003]
+>8	string	iso2		Base Media v2 [ISO 14496-12:2005]
+>8	string	m4a\040		Apple iTunes AAC-LC (.M4A) Audio
+>8	string	m4v\040		Apple iTunes (.M4V) Video
+>8	string	qt		Apple QuickTime (.MOV/QT)
+>8	string	jp2		Imagen JPEG 2000
+>8	string	jpm		Imagen compuesta JPEG 2000 (.JPM) [ISO 15444-6]
+>8	string	jpx		JPEG 2000 con extensiones (.JPX) [ISO 15444-2]
+>8	string	mp42		v2 [ISO 14496-14]
+4	string	moov		Archivo MOV de QuickTime
--- a/messages/on/fr_FR/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Wed Aug 24 17:53:18 2011 +0900
+++ b/messages/on/fr_FR/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Fri Aug 26 10:48:58 2011 +0900
@@ -1,31 +1,7 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at $(SRC)/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
 #
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at $(SRC)/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
+# Copyright (c) 1988, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)magic	1.54	06/03/19 SMI"
+# 
 #
 # This file contains the dictionary of file format identifiers (magic strings)
 # used by file(1).  The fields of this file are as follows:
@@ -41,8 +17,9 @@
 # magic: it forces file(1) to continue scanning and matching additional lines.
 # The first line afterwards not so marked terminates the search.
 #
-# The entries for ELF are not needed anymore, as file(1) now uses the elf(3ELF)
-# routines to look at ELF files.  They remain, commented out, for reference.
+# The entries for ELF and current archives are not needed anymore, as file(1)
+# now uses the elf(3ELF) routines to look at ELF files.  They remain, commented
+# out, for reference.
 #
 #0	string		\177ELF		ELF
 #>4	byte		1		32-bit
@@ -89,7 +66,7 @@
 0	long		0100554		espace de travail apl
 0	short		017037		données condensées
 0	string		<ar>		Système V version 1 archive ar
-0	string		!<arch>		archive ar courante
+#0	string		!<arch>		archive ar courante
 0	short		0407		pdp11/pre Système V exécutable vax
 >8	ushort		>0		non coupé
 >15	ubyte		>0		- version %ld
@@ -293,6 +270,8 @@
 >10	string		-1.0		 1.0
 >10	string		-2.0		 2.0
 >10	string		-3.0		 3.0
+# Handle Microsoft PostScript files (CTRL-D%!)
+0	string		\004%!		PostScript document text
 # version ID follows, in the form PS-Adobe-nn
 0	string		Interpress/Xerox	Document interpress
 # version ID follows, in the form /n.n
@@ -302,13 +281,6 @@
 0	long		0x137A2947	Famille de polices NeWS
 8	long		0x137A2B45	Police bitmap NeWs
 8	long		0x137A2B48	Famille de polices X11/NeWS
-# snoop files are always big-endian
-# big-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x736e6f6f70000000	Fichier de capture Snoop
->8	long		>0		- version %ld
-# little-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x000000706f6f6e73	Fichier de capture Snoop
->11	long		>0		- version %ld
 0	short		0436		Définition vfont 
 0	string		<MakerFile	Document FrameMaker
 0	string		<MIFFile	Fichier Frame Maker MIF
@@ -506,11 +478,28 @@
 38	string		application/vnd.sun.xml.draw	Dessin StarOffice 7
 38	string		application/vnd.sun.xml.impress	Présentation StarOffice 7
 38	string		application/vnd.sun.xml.math	Formule StarOffice 7
+38	string		application/vnd.oasis.opendocument.chart	OpenDocument Chart
+38	string		application/vnd.oasis.opendocument.database	OpenDocument Database
+38	string		application/vnd.sun.xml.base			OpenDocument Database
+38	string		application/vnd.oasis.opendocument.formula	OpenDocument Formula
+38	string		application/vnd.oasis.opendocument.image	OpenDocument Image
+38	string		application/vnd.oasis.opendocument.text-web	HTML Document Template
+38	string		application/vnd.oasis.opendocument.text-	OpenDocument
+>78	string		template						Text Template
+>78	string		master							Master Document
+38	string		application/vnd.oasis.opendocument.text		OpenDocument Text
+38	string		application/vnd.oasis.opendocument.graphics	OpenDocument Drawing
+>81	string		-template						Template
+38	string		application/vnd.oasis.opendocument.presentation	OpenDocument Presentation
+>85	string		-template						Template
+38	string		application/vnd.oasis.opendocument.spreadsheet	OpenDocument Spreadsheet
+>84	string		-template						Template
 0	string		PK\003\004	Archive ZIP
 0	string		MZ		Exécutable DOS (EXE)
 0	string		LZ		DOS incorporé
 0	byte		0xe9		Exécutable DOS (COM)
 0	byte		0xeb		Exécutable DOS (COM)
+0	string		\013\023\010\000	ksh compiled shell script executable
 24	long		60012		Fichier d'archive ufsdump
 0	string		TZif		Fichier de données de fuseau horaire zoneinfo
 0	string		BZh		Données compressées bzip2
@@ -529,3 +518,79 @@
 0	string		_SM_		Image SMBIOS (DMTF)
 >6	byte		x		version %u
 >7	byte		x		.%u
+0	byte		0x11		Solaris Audit File
+0	byte		0x78		Solaris Audit File 
+# ZFS send stream entries
+8	ullong		0x00000002f5bacbac	Flux d'instantané ZFS
+# little endian stream
+8	ullong		0xaccbbaf502000000	Flux d'instantané ZFS
+
+
+# Video files
+2	string		\001\272\041	Fichier vidéo MPEG
+0	string		\377\375	Couche audio MPEG-1 2
+0	string		\377\373	Couche audio MPEG-1 3
+0	string		\377\372	Couche audio MPEG-1 3
+0	string		\111\104\063	Couche MPEG-1 3 avec ID3v2
+
+# AVI and GVI files
+20	string	hdrlavih	Vidéo RIFF Avi
+>36	ulong	>0		%u Bps maximum,
+>64	ushort	x		%u X
+>68	ushort	x		%u,
+>48	ulong	x		%u images
+
+20	string	goog		RIFF gvi
+>88	ulong	>0		%u Bps maximum
+>116	ushort	x		%u X
+>120	ushort	x		%u,
+>100	ulong	x		%u images
+
+# JPEG 2000 - jp2 image file.
+3	string		\014\152\120\040\040	Fichier image JPEG 2000
+
+# iso 9660 CD-ROM image and El Torito Bootable standard
+32769	string		CD\0		Image de système de fichiers ISO 9660
+>34823	string		EL\040TORITO	- El Torito
+
+# Palm Pilot files .pdb and .prc of some type.
+0x3c	string	TEXtREAd		Fichier Palm DOC
+0x3c	string	SDocSilX		Document iSilo 3 pour PalmPilot
+0x3c	string	applSil			Fichier d'application iSilo
+0x3c	string	appl			Application Palm Pilot
+0x3c	string	ToGoToGo		Document iSilo pour Palm Pilot
+
+#SGI files with .rgb extention
+0	string	\001\332			Donnés d'image SGI,
+>2	byte	1			RLE,
+>2	byte	0			Verbatim,
+>5	ubyte	x			%u-D
+>7	ubyte	x			%u x
+>9	ubyte	x			%u, 
+>11	ubyte	x			%u canal/canaux
+
+2048	string		PCD_IPI		Kodak Photo CD image pack file
+>0xe02	byte&0x03	0x00		, landscape mode
+>0xe02	byte&0x03	0x01		, portrait mode
+>0xe02	byte&0x03	0x02		, landscape mode
+>0xe02	byte&0x03	0x03		, portrait mode
+0	string		PCD_OPA		Kodak Photo CD overview pack file
+
+# MS Documents. Peu d'informations disponibles.
+0	string	\320\317\021\340\241\261\032\341	Microsoft
+>546	string	bjbj					Mot
+>0	byte	<0					Document
+0	string	{\\rtf		Document Microsoft RTF
+
+# mp4 media format with different media files embedded in it
+4	string	ftyp		MPEG-4
+>8	string	isom		Base Media v1 [IS0 14496-12:2003]
+>8	string	iso2		Base Media v2 [ISO 14496-12:2005]
+>8	string	m4a\040		Fichier audio Apple iTunes AAC-LC (.M4A)
+>8	string	m4v\040		Fichier vidéo Apple iTunes (.M4V)
+>8	string	qt		Apple QuickTime (.MOV/QT)
+>8	string	jp2		Image JPEG 2000
+>8	string	jpm		Image composée JPEG 2000 (.JPM) [ISO 15444-6]
+>8	string	jpx		JPEG 2000 avec extensions (.JPX) [ISO 15444-2]
+>8	string	mp42		v2 [ISO 14496-14]
+4	string	moov		Fichier QuickTime MOV
--- a/messages/on/it_IT/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Wed Aug 24 17:53:18 2011 +0900
+++ b/messages/on/it_IT/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Fri Aug 26 10:48:58 2011 +0900
@@ -1,31 +1,7 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at $(SRC)/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
 #
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at $(SRC)/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
+# Copyright (c) 1988, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)magic	1.54	06/03/19 SMI"
+# 
 #
 # This file contains the dictionary of file format identifiers (magic strings)
 # used by file(1).  The fields of this file are as follows:
@@ -41,8 +17,9 @@
 # magic: it forces file(1) to continue scanning and matching additional lines.
 # The first line afterwards not so marked terminates the search.
 #
-# The entries for ELF are not needed anymore, as file(1) now uses the elf(3ELF)
-# routines to look at ELF files.  They remain, commented out, for reference.
+# The entries for ELF and current archives are not needed anymore, as file(1)
+# now uses the elf(3ELF) routines to look at ELF files.  They remain, commented
+# out, for reference.
 #
 #0	string		\177ELF		ELF
 #>4	byte		1		32-bit
@@ -89,7 +66,7 @@
 0	long		0100554		area di lavoro apl
 0	short		017037		dati compressi
 0	string		<ar>		archivio ar System V Release 1
-0	string		!<arch>		archivio ar corrente
+#0	string		!<arch>		archivio ar corrente
 0	short		0407		eseguibile vax pdp11/pre System V
 >8	ushort		>0		non stripped
 >15	ubyte		>0		- versione %ld
@@ -231,7 +208,7 @@
 >0x1e	short		&0x40		Large Text (testo grande)
 >0x1e	short		&0x20		Large Data (dati grandi)
 >0x1e	short		&0x120		Huge Objects Enabled (oggetti molto grandi abilitati)
-0	short		0x10b		file oggetto a.out formato caricam. domanda VAX
+0	short		0x10b		file oggetto a.out formato caricamento domanda VAX
 >0x10	long		>0		non stripped
 0	short		0x140		vecchio Microsoft 8086 x.out
 >0x3	byte		&0x4		separato
@@ -239,7 +216,7 @@
 >0	byte		&0x1		eseguibile
 >0	byte		^0x1		rilocabile
 >0x14	long		>0		non stripped
-0	long		0x10b		file oggetto a.out formato caricam. domanda VAX
+0	long		0x10b		file oggetto a.out formato caricamento domanda VAX
 >0x10	long		>0		non stripped
 0	long		0x140		vecchio Microsoft 8086 x.out
 >0x3	byte		&0x4		separato
@@ -293,6 +270,8 @@
 >10	string		-1.0		 1.0
 >10	string		-2.0		 2.0
 >10	string		-3.0		 3.0
+# Handle Microsoft PostScript files (CTRL-D%!)
+0	string		\004%!		PostScript document text
 # version ID follows, in the form PS-Adobe-nn
 0	string		Interpress/Xerox	documento Interpress
 # version ID follows, in the form /n.n
@@ -302,13 +281,6 @@
 0	long		0x137A2947	famiglia di font NeWS
 8	long		0x137A2B45	font bitmap X11/NeWS
 8	long		0x137A2B48	famiglia di font X11/NeWS
-# snoop files are always big-endian
-# big-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x736e6f6f70000000	file di cattura Snoop
->8	long		>0		- versione %ld
-# little-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x000000706f6f6e73	file di cattura Snoop
->11	long		>0		- versione %ld
 0	short		0436		definizione vfont
 0	string		<MakerFile	documento Frame Maker
 0	string		<MIFFile	file MIF di Frame Maker
@@ -506,11 +478,28 @@
 38	string		application/vnd.sun.xml.draw	Disegno di StarOffice 7
 38	string		application/vnd.sun.xml.impress	Presentazione di StarOffice 7
 38	string		application/vnd.sun.xml.math	Formula di StarOffice 7
+38	string		application/vnd.oasis.opendocument.chart	OpenDocument Chart
+38	string		application/vnd.oasis.opendocument.database	OpenDocument Database
+38	string		application/vnd.sun.xml.base			OpenDocument Database
+38	string		application/vnd.oasis.opendocument.formula	OpenDocument Formula
+38	string		application/vnd.oasis.opendocument.image	OpenDocument Image
+38	string		application/vnd.oasis.opendocument.text-web	HTML Document Template
+38	string		application/vnd.oasis.opendocument.text-	OpenDocument
+>78	string		template						Text Template
+>78	string		master							Master Document
+38	string		application/vnd.oasis.opendocument.text		OpenDocument Text
+38	string		application/vnd.oasis.opendocument.graphics	OpenDocument Drawing
+>81	string		-template						Template
+38	string		application/vnd.oasis.opendocument.presentation	OpenDocument Presentation
+>85	string		-template						Template
+38	string		application/vnd.oasis.opendocument.spreadsheet	OpenDocument Spreadsheet
+>84	string		-template						Template
 0	string		PK\003\004	archivio ZIP
 0	string		MZ		eseguibile DOS (EXE)
 0	string		LZ		incorporato DOS
 0	byte		0xe9		eseguibile DOS (COM)
 0	byte		0xeb		eseguibile DOS (COM)
+0	string		\013\023\010\000	ksh compiled shell script executable
 24	long		60012		file archivio ufsdump
 0	string		TZif		file di dati fuso orario zoneinfo
 0	string		BZh		dati compressi bzip2
@@ -523,9 +512,85 @@
 0	string		\177FCF		file di checkpoint fmd(1M)
 0	string		EFT\0		File albero degli errori,
 >4	ushort		x		v%u
->6	ushort		x		rev. %u,
+>6	ushort		x		rev %u,
 >8	ushort		x		da esc v%u
 >10	ushort		x		rev %u
 0	string		_SM_		immagine SMBIOS DMTF
 >6	byte		x		versione %u
 >7	byte		x		.%u
+0	byte		0x11		Solaris Audit File
+0	byte		0x78		Solaris Audit File 
+# ZFS send stream entries 
+8	ullong		0x00000002f5bacbac	stream di snapshot ZFS
+# little endian stream
+8	ullong		0xaccbbaf502000000	stream di snapshot ZFS
+
+
+# Video file
+2	string		\001\272\041	File di filmato MPEG 
+0	string		\377\375	Layer audio 2 MPEG-1
+0	string		\377\373	Layer audio 3 MPEG-1 
+0	string		\377\372	Layer audio 3 MPEG-1
+0	string		\111\104\063	Layer 3 MPEG-1 con ID3v2
+
+# AVI and GVI files
+20	string	hdrlavih	RIFF Avi Video
+>36	ulong	>0		%u Max Bps,
+>64	ubreve	x		%u X
+>68	ubreve	x		%u,
+>48	ulungo	x		%u frame
+
+20	string	goog		RIFF gvi
+>88	ulungo	>0		%u Max Bps
+>116	ubreve	x		%u X
+>120	ubreve	x		%u,
+>100	ulungo	x		%u frame
+
+# JPEG 2000 - jp2 image file.
+3	string		\014\152\120\040\040	File di immagine JPEG 2000
+
+# iso 9660 Immagine CD-ROM e standard El Torito avviabile
+32769	string		CD\0		Immagine filesystem ISO 9660 
+>34823	string		EL\040TORITO	- El Torito
+
+# File Palm Pilot .pdb e .prc di qualsiasi tipo.
+0x3c	string	TEXtREAd		File Palm DOC
+0x3c	string	SDocSilX		File iSilo 3 Doc per PalmPilot
+0x3c	string	applSil			File di applicazione iSilo
+0x3c	string	appl			Applicazione Palm Pilot
+0x3c	string	ToGoToGo		File iSilo Doc per Palm Pilot
+
+#File SGI con estensione .rgb
+0	string	\001\332			Dati immagine SGI,
+>2	byte	1			RLE,
+>2	byte	0			Verbatim,
+>5	ubyte	x			%u-D
+>7	ubyte	x			%u x
+>9	ubyte	x			%u, 
+>11	ubyte	x			%u canale/i
+
+2048	string		PCD_IPI		Kodak Photo CD image pack file
+>0xe02	byte&0x03	0x00		, landscape mode
+>0xe02	byte&0x03	0x01		, portrait mode
+>0xe02	byte&0x03	0x02		, landscape mode
+>0xe02	byte&0x03	0x03		, portrait mode
+0	string		PCD_OPA		Kodak Photo CD overview pack file
+
+# Documenti MS. Non sono disponibili molte informazioni.
+0	string	\320\317\021\340\241\261\032\341	Microsoft
+>546	string	bjbj					Word
+>0	byte	<0					Documento
+0	string	{\\rtf		Documento RTF Microsoft
+
+# formato multimediale mp4 con diversi file multimediali integrati 
+4	string	ftyp		MPEG-4
+>8	string	isom		Base Media v1 [IS0 14496-12:2003]
+>8	string	iso2		Base Media v2 [ISO 14496-12:2005]
+>8	string	m4a\040		Apple iTunes AAC-LC (.M4A) Audio
+>8	string	m4v\040		Apple iTunes (.M4V) Video
+>8	string	qt		Apple QuickTime (.MOV/QT)
+>8	string	jp2		JPEG 2000 Image
+>8	string	jpm		JPEG 2000 Compound Image (.JPM) [ISO 15444-6]
+>8	string	jpx		JPEG 2000 con estensioni (.JPX) [ISO 15444-2]
+>8	string	mp42		v2 [ISO 14496-14]
+4	string	moov		File QuickTime MOV
--- a/messages/on/ja_JP/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Wed Aug 24 17:53:18 2011 +0900
+++ b/messages/on/ja_JP/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Fri Aug 26 10:48:58 2011 +0900
@@ -1,31 +1,7 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at $(SRC)/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
 #
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at $(SRC)/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
+# Copyright (c) 1988, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)magic	1.54	06/03/19 SMI"
+# 
 #
 # This file contains the dictionary of file format identifiers (magic strings)
 # used by file(1).  The fields of this file are as follows:
@@ -41,8 +17,9 @@
 # magic: it forces file(1) to continue scanning and matching additional lines.
 # The first line afterwards not so marked terminates the search.
 #
-# The entries for ELF are not needed anymore, as file(1) now uses the elf(3ELF)
-# routines to look at ELF files.  They remain, commented out, for reference.
+# The entries for ELF and current archives are not needed anymore, as file(1)
+# now uses the elf(3ELF) routines to look at ELF files.  They remain, commented
+# out, for reference.
 #
 #0	string		\177ELF		ELF
 #>4	byte		1		32-bit
@@ -89,7 +66,7 @@
 0	long		0100554		apl workspace
 0	short		017037		圧縮されたデータ
 0	string		<ar>		System V リリース 1 ar アーカイブ
-0	string		!<arch>		ar アーカイブ
+#0	string		!<arch>		ar アーカイブ
 0	short		0407		pdp11/System V 以前の vax 実行可能形式
 >8	ushort		>0		[ストリップされていません]
 >15	ubyte		>0		- バージョン %ld
@@ -293,6 +270,8 @@
 >10	string		-1.0		 1.0
 >10	string		-2.0		 2.0
 >10	string		-3.0		 3.0
+# Handle Microsoft PostScript files (CTRL-D%!)
+0	string		\004%!		PostScript document text
 # version ID follows, in the form PS-Adobe-nn
 0	string		Interpress/Xerox	Interpress 文書
 # version ID follows, in the form /n.n
@@ -302,13 +281,6 @@
 0	long		0x137A2947	NeWS フォントファミリ
 8	long		0x137A2B45	X11/NeWS ビットマップフォント
 8	long		0x137A2B48	X11/NeWS フォントファミリ
-# snoop files are always big-endian
-# big-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x736e6f6f70000000	Snoop コマンドで保存したファイル
->8	long		>0		- バージョン %ld
-# little-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x000000706f6f6e73	Snoop コマンドで保存したファイル
->11	long		>0		- バージョン %ld
 0	short		0436		vfont 定義
 0	string		<MakerFile	Frame Maker 文書
 0	string		<MIFFile	Frame Maker MIF ファイル
@@ -506,11 +478,28 @@
 38	string		application/vnd.sun.xml.draw	StarSuite 7 図形描画
 38	string		application/vnd.sun.xml.impress	StarSuite 7 プレゼンテーション
 38	string		application/vnd.sun.xml.math	StarSuite 7 数式
+38	string		application/vnd.oasis.opendocument.chart	OpenDocument Chart
+38	string		application/vnd.oasis.opendocument.database	OpenDocument Database
+38	string		application/vnd.sun.xml.base			OpenDocument Database
+38	string		application/vnd.oasis.opendocument.formula	OpenDocument Formula
+38	string		application/vnd.oasis.opendocument.image	OpenDocument Image
+38	string		application/vnd.oasis.opendocument.text-web	HTML Document Template
+38	string		application/vnd.oasis.opendocument.text-	OpenDocument
+>78	string		template						Text Template
+>78	string		master							Master Document
+38	string		application/vnd.oasis.opendocument.text		OpenDocument Text
+38	string		application/vnd.oasis.opendocument.graphics	OpenDocument Drawing
+>81	string		-template						Template
+38	string		application/vnd.oasis.opendocument.presentation	OpenDocument Presentation
+>85	string		-template						Template
+38	string		application/vnd.oasis.opendocument.spreadsheet	OpenDocument Spreadsheet
+>84	string		-template						Template
 0	string		PK\003\004	ZIP archive
 0	string		MZ		DOS 実行可能形式 (EXE)
 0	string		LZ		DOS 組み込み
 0	byte		0xe9		DOS 実行可能形式 (COM)
 0	byte		0xeb		DOS 実行可能形式 (COM)
+0	string		\013\023\010\000	ksh compiled shell script executable
 24	long		60012		ufsdump アーカイブファイル
 0	string		TZif		zoneinfo timezone データファイル
 0	string		BZh		bzip2 圧縮データ
@@ -529,3 +518,79 @@
 0	string		_SM_		DMTF SMBIOS イメージ
 >6	byte		x		バージョン %u
 >7	byte		x		.%u
+0	byte		0x11		Solaris Audit File
+0	byte		0x78		Solaris Audit File 
+# ZFS send stream entries
+8	ullong		0x00000002f5bacbac	ZFS スナップショットストリーム
+# little endian stream
+8	ullong		0xaccbbaf502000000	ZFS スナップショットストリーム
+
+
+# Video files
+2	string		\001\272\041	MPEG ムービーファイル
+0	string		\377\375	MPEG-1 オーディオレイヤー 2
+0	string		\377\373	MPEG-1 オーディオレイヤー 3
+0	string		\377\372	MPEG-1 オーディオレイヤー 3
+0	string		\111\104\063	ID3v2 を含む MPEG-1 レイヤー 3
+
+# AVI and GVI files
+20	string	hdrlavih	RIFF Avi ビデオ
+>36	ulong	>0		%u 最大 Bps,
+>64	ushort	x		%u X
+>68	ushort	x		%u,
+>48	ulong	x		%u フレーム
+
+20	string	goog		RIFF gvi
+>88	ulong	>0		%u 最大 Bps
+>116	ushort	x		%u X
+>120	ushort	x		%u,
+>100	ulong	x		%u フレーム
+
+# JPEG 2000 - jp2 image file.
+3	string		\014\152\120\040\040	JPEG 2000 画像ファイル
+
+# iso 9660 CD-ROM image and El Torito Bootable standard
+32769	string		CD\0		ISO 9660 ファイルシステムイメージ
+>34823	string		EL\040TORITO	- El Torito
+
+# Palm Pilot files .pdb and .prc of some type.
+0x3c	string	TEXtREAd		Palm DOC ファイル
+0x3c	string	SDocSilX		PalmPilot 用の iSilo 3 Doc ファイル
+0x3c	string	applSil			iSilo アプリケーションファイル
+0x3c	string	appl			Palm Pilot アプリケーション
+0x3c	string	ToGoToGo		Palm Pilot 用の iSilo Doc ファイル
+
+#SGI files with .rgb extention
+0	string	\001\332			SGI 画像データ,
+>2	byte	1			RLE,
+>2	byte	0			Verbatim,
+>5	ubyte	x			%u-D
+>7	ubyte	x			%u x
+>9	ubyte	x			%u, 
+>11	ubyte	x			%u チャネル
+
+2048	string		PCD_IPI		Kodak Photo CD image pack file
+>0xe02	byte&0x03	0x00		, landscape mode
+>0xe02	byte&0x03	0x01		, portrait mode
+>0xe02	byte&0x03	0x02		, landscape mode
+>0xe02	byte&0x03	0x03		, portrait mode
+0	string		PCD_OPA		Kodak Photo CD overview pack file
+
+# MS Documents. 使用できる情報はあまり多くありません。
+0	string	\320\317\021\340\241\261\032\341	Microsoft
+>546	string	bjbj					Word
+>0	byte	<0					ドキュメント
+0	string	{\\rtf		Microsoft リッチテキスト形式ドキュメント
+
+# mp4 media format with different media files embedded in it
+4	string	ftyp		MPEG-4
+>8	string	isom		Base Media v1 [IS0 14496-12:2003]
+>8	string	iso2		Base Media v2 [ISO 14496-12:2005]
+>8	string	m4a\040		Apple iTunes AAC-LC (.M4A) オーディオ
+>8	string	m4v\040		Apple iTunes (.M4V) ビデオ
+>8	string	qt		Apple QuickTime (.MOV/QT)
+>8	string	jp2		JPEG 2000 画像
+>8	string	jpm		JPEG 2000 複合画像 (.JPM) [ISO 15444-6]
+>8	string	jpx		JPEG 2000拡張機能付き (.JPX) [ISO 15444-2]
+>8	string	mp42		v2 [ISO 14496-14]
+4	string	moov		QuickTime MOV ファイル
--- a/messages/on/ko_KR/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Wed Aug 24 17:53:18 2011 +0900
+++ b/messages/on/ko_KR/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Fri Aug 26 10:48:58 2011 +0900
@@ -1,31 +1,7 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at $(SRC)/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
 #
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at $(SRC)/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
+# Copyright (c) 1988, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)magic	1.54	06/03/19 SMI"
+# 
 #
 # This file contains the dictionary of file format identifiers (magic strings)
 # used by file(1).  The fields of this file are as follows:
@@ -41,8 +17,9 @@
 # magic: it forces file(1) to continue scanning and matching additional lines.
 # The first line afterwards not so marked terminates the search.
 #
-# The entries for ELF are not needed anymore, as file(1) now uses the elf(3ELF)
-# routines to look at ELF files.  They remain, commented out, for reference.
+# The entries for ELF and current archives are not needed anymore, as file(1)
+# now uses the elf(3ELF) routines to look at ELF files.  They remain, commented
+# out, for reference.
 #
 #0	string		\177ELF		ELF
 #>4	byte		1		32-bit
@@ -89,7 +66,7 @@
 0	long		0100554		apl 작업 공간
 0	short		017037		압축된 데이터
 0	string		<ar>		System V 릴리즈 1 ar 아카이브
-0	string		!<arch>		최신 ar 아카이브
+#0	string		!<arch>		최신 ar 아카이브
 0	short		0407		pdp11/pre System V vax 실행 가능
 >8	ushort		>0		스트립되지 않음
 >15	ubyte		>0		- 버전 %ld
@@ -293,6 +270,8 @@
 >10	string		-1.0		 1.0
 >10	string		-2.0		 2.0
 >10	string		-3.0		 3.0
+# Handle Microsoft PostScript files (CTRL-D%!)
+0	string		\004%!		PostScript document text
 # version ID follows, in the form PS-Adobe-nn
 0	string		Interpress/Xerox	Interpress 문서
 # version ID follows, in the form /n.n
@@ -302,13 +281,6 @@
 0	long		0x137A2947	NeWS 글꼴 패밀리
 8	long		0x137A2B45	X11/NeWS 비트맵 글꼴
 8	long		0x137A2B48	X11/NeWS 글꼴 패밀리
-# snoop files are always big-endian
-# big-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x736e6f6f70000000	Snoop 캡처 파일
->8	long		>0		- 버전 %ld
-# little-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x000000706f6f6e73	Snoop 캡처 파일
->11	long		>0		- 버전 %ld
 0	short		0436		vfont 정의
 0	string		<MakerFile	Frame Maker 문서
 0	string		<MIFFile	Frame Maker MIF 파일
@@ -506,11 +478,28 @@
 38	string		application/vnd.sun.xml.draw	StarSuite 7 도면
 38	string		application/vnd.sun.xml.impress	StarSuite 7 프레젠테이션
 38	string		application/vnd.sun.xml.math	StarSuite 7 수식
+38	string		application/vnd.oasis.opendocument.chart	OpenDocument Chart
+38	string		application/vnd.oasis.opendocument.database	OpenDocument Database
+38	string		application/vnd.sun.xml.base			OpenDocument Database
+38	string		application/vnd.oasis.opendocument.formula	OpenDocument Formula
+38	string		application/vnd.oasis.opendocument.image	OpenDocument Image
+38	string		application/vnd.oasis.opendocument.text-web	HTML Document Template
+38	string		application/vnd.oasis.opendocument.text-	OpenDocument
+>78	string		template						Text Template
+>78	string		master							Master Document
+38	string		application/vnd.oasis.opendocument.text		OpenDocument Text
+38	string		application/vnd.oasis.opendocument.graphics	OpenDocument Drawing
+>81	string		-template						Template
+38	string		application/vnd.oasis.opendocument.presentation	OpenDocument Presentation
+>85	string		-template						Template
+38	string		application/vnd.oasis.opendocument.spreadsheet	OpenDocument Spreadsheet
+>84	string		-template						Template
 0	string		PK\003\004	ZIP 아카이브
 0	string		MZ		DOS 실행 가능 (EXE)
 0	string		LZ		DOS 내장
 0	byte		0xe9		DOS 실행 가능 (COM)
 0	byte		0xeb		DOS 실행 가능 (COM)
+0	string		\013\023\010\000	ksh compiled shell script executable
 24	long		60012		ufsdump 아카이브 파일
 0	string		TZif		zoneinfo 시간대 데이터 파일
 0	string		BZh		bzip2 압축된 데이터
@@ -529,3 +518,79 @@
 0	string		_SM_		DMTF SMBIOS 이미지
 >6	byte		x		버전 %u
 >7	byte		x		.%u
+0	byte		0x11		Solaris Audit File
+0	byte		0x78		Solaris Audit File 
+# ZFS send stream entries
+8	ullong		0x00000002f5bacbac	ZFS 스냅샷 스트림
+# little endian stream
+8	ullong		0xaccbbaf502000000	ZFS 스냅샷 스트림
+
+
+# Video files
+2	string		\001\272\041	MPEG 동영상 파일
+0	string		\377\375	MPEG-1 오디오 레이어 2
+0	string		\377\373	MPEG-1 오디오 레이어 3
+0	string		\377\372	MPEG-1 오디오 레이어 3
+0	string		\111\104\063	MPEG-1 레이어 3(ID3v2 포함)
+
+# AVI and GVI files
+20	string	hdrlavih	RIFF Avi 비디오
+>36	ulong	>0		%u 최대 Bps,
+>64	ushort	x		%u X
+>68	ushort	x		%u,
+>48	ulong	x		%u개의 프레임
+
+20	string	goog		RIFF gvi
+>88	ulong	>0		%u 최대 Bps
+>116	ushort	x		%u X
+>120	ushort	x		%u,
+>100	ulong	x		%u개의 프레임
+
+# JPEG 2000 - jp2 image file.
+3	string		\014\152\120\040\040	JPEG 2000 이미지 파일
+
+# iso 9660 CD-ROM image and El Torito Bootable standard
+32769	string		CD\0		ISO 9660 파일 시스템 이미지
+>34823	string		EL\040TORITO	- El Torito
+
+# Palm Pilot files .pdb and .prc of some type.
+0x3c	string	TEXtREAd		Palm DOC 파일
+0x3c	string	SDocSilX		iSilo 3 문서 파일(PalmPilot용)
+0x3c	string	applSil			iSilo 응용 프로그램 파일
+0x3c	string	appl			Palm 파일럿 응용 프로그램
+0x3c	string	ToGoToGo		iSilo 문서 파일(Palm Pilot용)
+
+#SGI files with .rgb extention
+0	string	\001\332			SGI 이미지 데이터,
+>2	byte	1			RLE,
+>2	byte	0			축어적,
+>5	ubyte	x			%u-D
+>7	ubyte	x			%u x
+>9	ubyte	x			%u, 
+>11	ubyte	x			%u개의 채널
+
+2048	string		PCD_IPI		Kodak Photo CD image pack file
+>0xe02	byte&0x03	0x00		, landscape mode
+>0xe02	byte&0x03	0x01		, portrait mode
+>0xe02	byte&0x03	0x02		, landscape mode
+>0xe02	byte&0x03	0x03		, portrait mode
+0	string		PCD_OPA		Kodak Photo CD overview pack file
+
+# MS Documents. 사용할 수 있는 정보가 많지 않습니다.
+0	string	\320\317\021\340\241\261\032\341	Microsoft
+>546	string	bjbj					Word
+>0	byte	<0					문서
+0	string	{\\rtf		Microsoft 서식 있는 텍스트 형식 문서
+
+# mp4 media format with different media files embedded in it
+4	string	ftyp		MPEG-4
+>8	string	isom		기본 미디어 v1 [IS0 14496-12:2003]
+>8	string	iso2		기본 미디어 v2 [ISO 14496-12:2005]
+>8	string	m4a\040		Apple iTunes AAC-LC(.M4A) 오디오
+>8	string	m4v\040		Apple iTunes(.M4V) 비디오
+>8	string	qt		Apple QuickTime(.MOV/QT)
+>8	string	jp2		JPEG 2000 이미지
+>8	string	jpm		JPEG 2000 복합 이미지(.JPM) [ISO 15444-6]
+>8	string	jpx		JPEG 2000 확장자 포함(.JPX) [ISO 15444-2]
+>8	string	mp42		v2 [ISO 14496-14]
+4	string	moov		QuickTime MOV 파일
--- a/messages/on/pt_BR/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Wed Aug 24 17:53:18 2011 +0900
+++ b/messages/on/pt_BR/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Fri Aug 26 10:48:58 2011 +0900
@@ -1,27 +1,7 @@
-#
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
 #
-# You can obtain a copy of the license at $(SRC)/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
+# Copyright (c) 1988, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at $(SRC)/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"@(#)magic	1.57	07/01/03 SMI"
+# 
 #
 # This file contains the dictionary of file format identifiers (magic strings)
 # used by file(1).  The fields of this file are as follows:
@@ -37,8 +17,9 @@
 # magic: it forces file(1) to continue scanning and matching additional lines.
 # The first line afterwards not so marked terminates the search.
 #
-# The entries for ELF are not needed anymore, as file(1) now uses the elf(3ELF)
-# routines to look at ELF files.  They remain, commented out, for reference.
+# The entries for ELF and current archives are not needed anymore, as file(1)
+# now uses the elf(3ELF) routines to look at ELF files.  They remain, commented
+# out, for reference.
 #
 #0	string		\177ELF		ELF
 #>4	byte		1		32-bit
@@ -85,7 +66,7 @@
 0	long		0100554		apl workspace
 0	short		017037		packed data
 0	string		<ar>		System V Release 1 ar archive
-0	string		!<arch>		current ar archive
+#0	string		!<arch>		current ar archive
 0	short		0407		pdp11/pre System V vax executable
 >8	ushort		>0		not stripped
 >15	ubyte		>0		- version %ld
@@ -289,6 +270,8 @@
 >10	string		-1.0		 1.0
 >10	string		-2.0		 2.0
 >10	string		-3.0		 3.0
+# Handle Microsoft PostScript files (CTRL-D%!)
+0	string		\004%!		PostScript document text
 # version ID follows, in the form PS-Adobe-nn
 0	string		Interpress/Xerox	Interpress document
 # version ID follows, in the form /n.n
@@ -298,13 +281,6 @@
 0	long		0x137A2947	NeWS font family
 8	long		0x137A2B45	X11/NeWS bitmap font
 8	long		0x137A2B48	X11/NeWS font family
-# snoop files are always big-endian
-# big-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x736e6f6f70000000	Snoop capture file
->8	long		>0		- version %ld
-# little-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x000000706f6f6e73	Snoop capture file
->11	long		>0		- version %ld
 0	short		0436		vfont definition
 0	string		<MakerFile	Frame Maker document
 0	string		<MIFFile	Frame Maker MIF file
@@ -523,6 +499,7 @@
 0	string		LZ		DOS built-in
 0	byte		0xe9		DOS executable (COM)
 0	byte		0xeb		DOS executable (COM)
+0	string		\013\023\010\000	ksh compiled shell script executable
 24	long		60012		ufsdump archive file
 0	string		TZif		zoneinfo timezone data file
 0	string		BZh		bzip2 compressed data
@@ -543,3 +520,77 @@
 >7	byte		x		.%u
 0	byte		0x11		Solaris Audit File
 0	byte		0x78		Solaris Audit File 
+# ZFS send stream entries
+8	ullong		0x00000002f5bacbac	ZFS snapshot stream
+# little endian stream
+8	ullong		0xaccbbaf502000000	ZFS snapshot stream
+
+
+# Video files
+2	string		\001\272\041	MPEG Movie file
+0	string		\377\375	MPEG-1 Audio Layer 2
+0	string		\377\373	MPEG-1 Audio Layer 3
+0	string		\377\372	MPEG-1 Audio Layer 3
+0	string		\111\104\063	MPEG-1 Layer 3 with ID3v2
+
+# AVI and GVI files
+20	string	hdrlavih	RIFF Avi Video
+>36	ulong	>0		%u Max Bps,
+>64	ushort	x		%u X
+>68	ushort	x		%u,
+>48	ulong	x		%u frames
+
+20	string	goog		RIFF gvi
+>88	ulong	>0		%u Max Bps
+>116	ushort	x		%u X
+>120	ushort	x		%u,
+>100	ulong	x		%u frames
+
+# JPEG 2000 - jp2 image file.
+3	string		\014\152\120\040\040	JPEG 2000 Image file
+
+# iso 9660 CD-ROM image and El Torito Bootable standard
+32769	string		CD\0		ISO 9660 filesystem image
+>34823	string		EL\040TORITO	- El Torito
+
+# Palm Pilot files .pdb and .prc of some type.
+0x3c	string	TEXtREAd		Palm DOC file
+0x3c	string	SDocSilX		iSilo 3 Doc file for PalmPilot
+0x3c	string	applSil			iSilo Application file
+0x3c	string	appl			Palm Pilot Application
+0x3c	string	ToGoToGo		iSilo Doc file for Palm Pilot
+
+#SGI files with .rgb extention
+0	string	\001\332			SGI Image data,
+>2	byte	1			RLE,
+>2	byte	0			Verbatim,
+>5	ubyte	x			%u-D
+>7	ubyte	x			%u x
+>9	ubyte	x			%u, 
+>11	ubyte	x			%u channel(s)
+
+2048	string		PCD_IPI		Kodak Photo CD image pack file
+>0xe02	byte&0x03	0x00		, landscape mode
+>0xe02	byte&0x03	0x01		, portrait mode
+>0xe02	byte&0x03	0x02		, landscape mode
+>0xe02	byte&0x03	0x03		, portrait mode
+0	string		PCD_OPA		Kodak Photo CD overview pack file
+
+# MS Documents. Not much info available.
+0	string	\320\317\021\340\241\261\032\341	Microsoft
+>546	string	bjbj					Word
+>0	byte	<0					Document
+0	string	{\\rtf		Microsoft Rich Text Format Document
+
+# mp4 media format with different media files embedded in it
+4	string	ftyp		MPEG-4
+>8	string	isom		Base Media v1 [IS0 14496-12:2003]
+>8	string	iso2		Base Media v2 [ISO 14496-12:2005]
+>8	string	m4a\040		Apple iTunes AAC-LC (.M4A) Audio
+>8	string	m4v\040		Apple iTunes (.M4V) Video
+>8	string	qt		Apple QuickTime (.MOV/QT)
+>8	string	jp2		JPEG 2000 Image
+>8	string	jpm		JPEG 2000 Compound Image (.JPM) [ISO 15444-6]
+>8	string	jpx		JPEG 2000 w/ extensions (.JPX) [ISO 15444-2]
+>8	string	mp42		v2 [ISO 14496-14]
+4	string	moov		QuickTime MOV file
--- a/messages/on/sv_SE/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Wed Aug 24 17:53:18 2011 +0900
+++ b/messages/on/sv_SE/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Fri Aug 26 10:48:58 2011 +0900
@@ -1,31 +1,7 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at $(SRC)/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
 #
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at $(SRC)/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
+# Copyright (c) 1988, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)magic	1.54	06/03/19 SMI"
+# 
 #
 # This file contains the dictionary of file format identifiers (magic strings)
 # used by file(1).  The fields of this file are as follows:
@@ -41,8 +17,9 @@
 # magic: it forces file(1) to continue scanning and matching additional lines.
 # The first line afterwards not so marked terminates the search.
 #
-# The entries for ELF are not needed anymore, as file(1) now uses the elf(3ELF)
-# routines to look at ELF files.  They remain, commented out, for reference.
+# The entries for ELF and current archives are not needed anymore, as file(1)
+# now uses the elf(3ELF) routines to look at ELF files.  They remain, commented
+# out, for reference.
 #
 #0	string		\177ELF		ELF
 #>4	byte		1		32-bit
@@ -89,7 +66,7 @@
 0	long		0100554		apl-arbetsyta
 0	short		017037		packade data
 0	string		<ar>		ar-arkiv av typen System V Release 1
-0	string		!<arch>		aktuellt ar-arkiv
+#0	string		!<arch>		aktuellt ar-arkiv
 0	short		0407		vax-programfil av typen pdp11/pre System V
 >8	ushort		>0		inte städad
 >15	ubyte		>0		- version %ld
@@ -293,6 +270,8 @@
 >10	string		-1.0		 1.0
 >10	string		-2.0		 2.0
 >10	string		-3.0		 3.0
+# Handle Microsoft PostScript files (CTRL-D%!)
+0	string		\004%!		PostScript document text
 # version ID follows, in the form PS-Adobe-nn
 0	string		Interpress/Xerox	Interpress-dokument
 # version ID follows, in the form /n.n
@@ -302,13 +281,6 @@
 0	long		0x137A2947	teckensnittsfamiljen NeWS
 8	long		0x137A2B45	X11/NeWS-bitmappsteckensnitt
 8	long		0x137A2B48	teckensnittsfamiljen X11/NeWS
-# snoop files are always big-endian
-# big-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x736e6f6f70000000	Snoop-bildsekvensfil
->8	long		>0		- version %ld
-# little-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x000000706f6f6e73	Snoop-bildsekvensfil
->11	long		>0		- version %ld
 0	short		0436		vfont-definition
 0	string		<MakerFile	Frame Maker-dokument
 0	string		<MIFFile	Frame Maker MIF-fil
@@ -506,11 +478,28 @@
 38	string		application/vnd.sun.xml.draw	StarOffice 7 Drawing
 38	string		application/vnd.sun.xml.impress	StarOffice 7 Presentation
 38	string		application/vnd.sun.xml.math	StarOffice 7 Formula
+38	string		application/vnd.oasis.opendocument.chart	OpenDocument Chart
+38	string		application/vnd.oasis.opendocument.database	OpenDocument Database
+38	string		application/vnd.sun.xml.base			OpenDocument Database
+38	string		application/vnd.oasis.opendocument.formula	OpenDocument Formula
+38	string		application/vnd.oasis.opendocument.image	OpenDocument Image
+38	string		application/vnd.oasis.opendocument.text-web	HTML Document Template
+38	string		application/vnd.oasis.opendocument.text-	OpenDocument
+>78	string		template						Text Template
+>78	string		master							Master Document
+38	string		application/vnd.oasis.opendocument.text		OpenDocument Text
+38	string		application/vnd.oasis.opendocument.graphics	OpenDocument Drawing
+>81	string		-template						Template
+38	string		application/vnd.oasis.opendocument.presentation	OpenDocument Presentation
+>85	string		-template						Template
+38	string		application/vnd.oasis.opendocument.spreadsheet	OpenDocument Spreadsheet
+>84	string		-template						Template
 0	string		PK\003\004	ZIP-arkiv
 0	string		MZ		DOS-programfil (EXE)
 0	string		LZ		DOS-inbyggd
 0	byte		0xe9		DOS-programfil (COM)
 0	byte		0xeb		DOS-programfil (COM)
+0	string		\013\023\010\000	ksh compiled shell script executable
 24	long		60012		ufsdump-arkivfil
 0	string		TZif		datafil för tidszoner i zoneinfo
 0	string		BZh		bzip2-komprimerade data
@@ -529,3 +518,79 @@
 0	string		_SM_		DMTF SMBIOS image
 >6	byte		x		version %u
 >7	byte		x		.%u
+0	byte		0x11		Solaris Audit File
+0	byte		0x78		Solaris Audit File 
+# ZFS send stream entries
+8	ullong		0x00000002f5bacbac	ZFS snapshot stream
+# little endian stream
+8	ullong		0xaccbbaf502000000	ZFS snapshot stream
+
+
+# Video files
+2	string		\001\272\041	MPEG Movie file
+0	string		\377\375	MPEG-1 Audio Layer 2
+0	string		\377\373	MPEG-1 Audio Layer 3
+0	string		\377\372	MPEG-1 Audio Layer 3
+0	string		\111\104\063	MPEG-1 Layer 3 with ID3v2
+
+# AVI and GVI files
+20	string	hdrlavih	RIFF Avi Video
+>36	ulong	>0		%u Max Bps,
+>64	ushort	x		%u X
+>68	ushort	x		%u,
+>48	ulong	x		%u frames
+
+20	string	goog		RIFF gvi
+>88	ulong	>0		%u Max Bps
+>116	ushort	x		%u X
+>120	ushort	x		%u,
+>100	ulong	x		%u frames
+
+# JPEG 2000 - jp2 image file.
+3	string		\014\152\120\040\040	JPEG 2000 Image file
+
+# iso 9660 CD-ROM image and El Torito Bootable standard
+32769	string		CD\0		ISO 9660 filesystem image
+>34823	string		EL\040TORITO	- El Torito
+
+# Palm Pilot files .pdb and .prc of some type.
+0x3c	string	TEXtREAd		Palm DOC file
+0x3c	string	SDocSilX		iSilo 3 Doc file for PalmPilot
+0x3c	string	applSil			iSilo Application file
+0x3c	string	appl			Palm Pilot Application
+0x3c	string	ToGoToGo		iSilo Doc file for Palm Pilot
+
+#SGI files with .rgb extention
+0	string	\001\332			SGI Image data,
+>2	byte	1			RLE,
+>2	byte	0			Verbatim,
+>5	ubyte	x			%u-D
+>7	ubyte	x			%u x
+>9	ubyte	x			%u, 
+>11	ubyte	x			%u channel(s)
+
+2048	string		PCD_IPI		Kodak Photo CD image pack file
+>0xe02	byte&0x03	0x00		, landscape mode
+>0xe02	byte&0x03	0x01		, portrait mode
+>0xe02	byte&0x03	0x02		, landscape mode
+>0xe02	byte&0x03	0x03		, portrait mode
+0	string		PCD_OPA		Kodak Photo CD overview pack file
+
+# MS Documents. Not much info available.
+0	string	\320\317\021\340\241\261\032\341	Microsoft
+>546	string	bjbj					Word
+>0	byte	<0					Document
+0	string	{\\rtf		Microsoft Rich Text Format Document
+
+# mp4 media format with different media files embedded in it
+4	string	ftyp		MPEG-4
+>8	string	isom		Base Media v1 [IS0 14496-12:2003]
+>8	string	iso2		Base Media v2 [ISO 14496-12:2005]
+>8	string	m4a\040		Apple iTunes AAC-LC (.M4A) Audio
+>8	string	m4v\040		Apple iTunes (.M4V) Video
+>8	string	qt		Apple QuickTime (.MOV/QT)
+>8	string	jp2		JPEG 2000 Image
+>8	string	jpm		JPEG 2000 Compound Image (.JPM) [ISO 15444-6]
+>8	string	jpx		JPEG 2000 w/ extensions (.JPX) [ISO 15444-2]
+>8	string	mp42		v2 [ISO 14496-14]
+4	string	moov		QuickTime MOV file
--- a/messages/on/zh_CN/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Wed Aug 24 17:53:18 2011 +0900
+++ b/messages/on/zh_CN/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Fri Aug 26 10:48:58 2011 +0900
@@ -1,31 +1,7 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at $(SRC)/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
 #
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at $(SRC)/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
+# Copyright (c) 1988, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)magic	1.54	06/03/19 SMI"
+# 
 #
 # This file contains the dictionary of file format identifiers (magic strings)
 # used by file(1).  The fields of this file are as follows:
@@ -41,8 +17,9 @@
 # magic: it forces file(1) to continue scanning and matching additional lines.
 # The first line afterwards not so marked terminates the search.
 #
-# The entries for ELF are not needed anymore, as file(1) now uses the elf(3ELF)
-# routines to look at ELF files.  They remain, commented out, for reference.
+# The entries for ELF and current archives are not needed anymore, as file(1)
+# now uses the elf(3ELF) routines to look at ELF files.  They remain, commented
+# out, for reference.
 #
 #0	string		\177ELF		ELF
 #>4	byte		1		32-bit
@@ -89,7 +66,7 @@
 0	long		0100554		apl 工作区
 0	short		017037		包装数据
 0	string		<ar>		System V Release 1 ar 归档文件
-0	string		!<arch>		当前的 ar 归档文件
+#0	string		!<arch>		当前的 ar 归档文件
 0	short		0407		pdp11/pre System V vax 执行文件
 >8	ushort		>0		not stripped
 >15	ubyte		>0		- 版本 %ld
@@ -293,6 +270,8 @@
 >10	string		-1.0		 1.0
 >10	string		-2.0		 2.0
 >10	string		-3.0		 3.0
+# Handle Microsoft PostScript files (CTRL-D%!)
+0	string		\004%!		PostScript document text
 # version ID follows, in the form PS-Adobe-nn
 0	string		Interpress/Xerox	Interpress 文件
 # version ID follows, in the form /n.n
@@ -302,13 +281,6 @@
 0	long		0x137A2947	NeWS 字体系列
 8	long		0x137A2B45	X11/NeWS 位图字体
 8	long		0x137A2B48	X11/NeWS 字体系列
-# snoop files are always big-endian
-# big-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x736e6f6f70000000	Snoop 检索文件
->8	long		>0		- 版本 %ld
-# little-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x000000706f6f6e73	Snoop 检索文件
->11	long		>0		- 版本 %ld
 0	short		0436		vfont 定义
 0	string		<MakerFile	Frame Maker 文件
 0	string		<MIFFile	Frame Maker MIF 文件
@@ -325,11 +297,11 @@
 # big-endian entries
 #
 0	long		0x2e736e64	audio data:
->12	long		1		8-bit u-law,
->12	long		2		8-bit 直线的 PCM,
->12	long		3		16-bit 直线的 PCM,
->12	long		4		24-bit 直线的 PCM,
->12	long		5		32-bit 直线的 PCM,
+>12	long		1		8 位 u-law,
+>12	long		2		8 位直线的 PCM,
+>12	long		3		16 位直线的 PCM,
+>12	long		4		24 位直线的 PCM,
+>12	long		5		32 位直线的 PCM,
 >12	long		6		32 位浮点数,
 >12	long		7		64 位浮点数,
 >12	long		23		压缩 (4 位 G.721 ADPCM),
@@ -506,11 +478,28 @@
 38	string		application/vnd.sun.xml.draw	StarSuite 7 绘图
 38	string		application/vnd.sun.xml.impress	StarSuite 7 演示文稿
 38	string		application/vnd.sun.xml.math	StarSuite 7 公式
+38	string		application/vnd.oasis.opendocument.chart	OpenDocument Chart
+38	string		application/vnd.oasis.opendocument.database	OpenDocument Database
+38	string		application/vnd.sun.xml.base			OpenDocument Database
+38	string		application/vnd.oasis.opendocument.formula	OpenDocument Formula
+38	string		application/vnd.oasis.opendocument.image	OpenDocument Image
+38	string		application/vnd.oasis.opendocument.text-web	HTML Document Template
+38	string		application/vnd.oasis.opendocument.text-	OpenDocument
+>78	string		template						Text Template
+>78	string		master							Master Document
+38	string		application/vnd.oasis.opendocument.text		OpenDocument Text
+38	string		application/vnd.oasis.opendocument.graphics	OpenDocument Drawing
+>81	string		-template						Template
+38	string		application/vnd.oasis.opendocument.presentation	OpenDocument Presentation
+>85	string		-template						Template
+38	string		application/vnd.oasis.opendocument.spreadsheet	OpenDocument Spreadsheet
+>84	string		-template						Template
 0	string		PK\003\004	ZIP 归档文件
 0	string		MZ		DOS 执行文件 (EXE)
 0	string		LZ		DOS 内置
 0	byte		0xe9		DOS 执行文件 (COM)
 0	byte		0xeb		DOS 执行文件 (COM)
+0	string		\013\023\010\000	ksh compiled shell script executable
 24	long		60012		ufsdump 归档文件文件
 0	string		TZif		zoneinfo 时区数据文件
 0	string		BZh		bzip2 压缩数据
@@ -529,4 +518,79 @@
 0	string		_SM_		DMTF SMBIOS 映像
 >6	byte		x		版本 %u
 >7	byte		x		.%u
+0	byte		0x11		Solaris Audit File
+0	byte		0x78		Solaris Audit File 
+# ZFS send stream entries
+8	ullong		0x00000002f5bacbac	ZFS 快照流
+# little endian stream
+8	ullong		0xaccbbaf502000000	ZFS 快照流
 
+
+# Video files
+2	string		\001\272\041	MPEG 影片文件
+0	string		\377\375	MPEG-1 音频层 2
+0	string		\377\373	MPEG-1 音频层 3
+0	string		\377\372	MPEG-1 音频层 3
+0	string		\111\104\063	MPEG-1 层 3 (ID3v2)
+
+# AVI and GVI files
+20	string	hdrlavih	RIFF Avi 视频
+>36	ulong	>0		%u 最大 Bps,
+>64	ushort	x		%u X
+>68	ushort	x		%u,
+>48	ulong	x		%u 帧
+
+20	string	goog		RIFF gvi
+>88	ulong	>0		%u 最大 Bps
+>116	ushort	x		%u X
+>120	ushort	x		%u,
+>100	ulong	x		%u 帧
+
+# JPEG 2000 - jp2 image file.
+3	string		\014\152\120\040\040	JPEG 2000 图像文件
+
+# iso 9660 CD-ROM image and El Torito Bootable standard
+32769	string		CD\0		ISO 9660 文件系统映像
+>34823	string		EL\040TORITO	- El Torito
+
+# Palm Pilot files .pdb and .prc of some type.
+0x3c	string	TEXtREAd		Palm DOC 文件
+0x3c	string	SDocSilX		PalmPilot 的 iSilo 3 Doc 文件 
+0x3c	string	applSil			iSilo 应用程序文件
+0x3c	string	appl			Palm Pilot 应用程序
+0x3c	string	ToGoToGo		Palm Pilot 的 iSilo Doc 文件
+
+#SGI files with .rgb extention
+0	string	\001\332			SGI 图像数据,
+>2	byte	1			RLE,
+>2	byte	0			Verbatim,
+>5	ubyte	x			%u-D
+>7	ubyte	x			%u x
+>9	ubyte	x			%u, 
+>11	ubyte	x			%u 通道
+
+2048	string		PCD_IPI		Kodak Photo CD image pack file
+>0xe02	byte&0x03	0x00		, landscape mode
+>0xe02	byte&0x03	0x01		, portrait mode
+>0xe02	byte&0x03	0x02		, landscape mode
+>0xe02	byte&0x03	0x03		, portrait mode
+0	string		PCD_OPA		Kodak Photo CD overview pack file
+
+# MS Documents. 可用信息不多。
+0	string	\320\317\021\340\241\261\032\341	Microsoft
+>546	string	bjbj					Word
+>0	byte	<0					文档
+0	string	{\\rtf		Microsoft RTF 格式文档
+
+# mp4 media format with different media files embedded in it
+4	string	ftyp		MPEG-4
+>8	string	isom		基本介质 v1 [IS0 14496-12:2003]
+>8	string	iso2		基本介质 v2 [ISO 14496-12:2005]
+>8	string	m4a\040		Apple iTunes AAC-LC (.M4A) 音频
+>8	string	m4v\040		Apple iTunes (.M4V) 视频
+>8	string	qt		Apple QuickTime (.MOV/QT)
+>8	string	jp2		JPEG 2000 图像
+>8	string	jpm		JPEG 2000 复合图像 (.JPM) [ISO 15444-6]
+>8	string	jpx		JPEG 2000 w/ 扩展 (.JPX) [ISO 15444-2]
+>8	string	mp42		v2 [ISO 14496-14]
+4	string	moov		QuickTime MOV 文件
--- a/messages/on/zh_TW/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Wed Aug 24 17:53:18 2011 +0900
+++ b/messages/on/zh_TW/usr/lib/locale/__LOCALE__/LC_MESSAGES/magic	Fri Aug 26 10:48:58 2011 +0900
@@ -1,31 +1,7 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at $(SRC)/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
 #
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at $(SRC)/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
+# Copyright (c) 1988, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)magic	1.54	06/03/19 SMI"
+# 
 #
 # This file contains the dictionary of file format identifiers (magic strings)
 # used by file(1).  The fields of this file are as follows:
@@ -41,8 +17,9 @@
 # magic: it forces file(1) to continue scanning and matching additional lines.
 # The first line afterwards not so marked terminates the search.
 #
-# The entries for ELF are not needed anymore, as file(1) now uses the elf(3ELF)
-# routines to look at ELF files.  They remain, commented out, for reference.
+# The entries for ELF and current archives are not needed anymore, as file(1)
+# now uses the elf(3ELF) routines to look at ELF files.  They remain, commented
+# out, for reference.
 #
 #0	string		\177ELF		ELF
 #>4	byte		1		32-bit
@@ -76,244 +53,239 @@
 #>18	short		20		PowerPC
 #>20	long		1		Version 1
 #>36	long		1		MAU Required
-257	string		ustar		USTAR tar 歸檔
->156	byte		88		延伸格式
-0	short		070701		cpio 歸檔
-0	string		070701		ASCII cpio 歸檔
-0	short		070702		cpio 歸檔 - CRC 標頭
-0	string		070702		ASCII cpio 歸檔 - CRC 標頭
-0	short		070707		cpio 歸檔 - CHR (-c) 標頭
-0	string		070707		ASCII cpio 歸檔 - CHR (-c) 標頭
-0	long		0177555		obsolete ar 歸檔
-0	short		0177545		pdp11/pre System V ar 歸檔
-0	long		0100554		apl 工作區
-0	short		017037		包裝資料
-0	string		<ar>		System V Release 1 ar 歸檔
-0	string		!<arch>		目前的 ar 歸檔
-0	short		0407		pdp11/pre System V vax 執行檔
+257	string		ustar		USTAR tar archive
+>156	byte		88		extended format
+0	short		070701		cpio archive
+0	string		070701		ASCII cpio archive
+0	short		070702		cpio archive - CRC header
+0	string		070702		ASCII cpio archive - CRC header
+0	short		070707		cpio archive - CHR (-c) header
+0	string		070707		ASCII cpio archive - CHR (-c) header
+0	long		0177555		obsolete ar archive
+0	short		0177545		pdp11/pre System V ar archive
+0	long		0100554		apl workspace
+0	short		017037		packed data
+0	string		<ar>		System V Release 1 ar archive
+#0	string		!<arch>		current ar archive
+0	short		0407		pdp11/pre System V vax executable
 >8	ushort		>0		not stripped
->15	ubyte		>0		- 版本 %ld
+>15	ubyte		>0		- version %ld
 0	short		0401		unix-rt ldp
-0	short		0405		pdp11 套印格式
-0	short		0410		pdp11/pre System V vax 單純執行檔
+0	short		0405		pdp11 overlay
+0	short		0410		pdp11/pre System V vax pure executable
 >8	ushort		>0		not stripped
->15	ubyte		>0		- 版本 %ld
-0	short		0411		pdp11 個別的 I&D
+>15	ubyte		>0		- version %ld
+0	short		0411		pdp11 separate I&D
 >8	ushort		>0		not stripped
->15	ubyte		>0		- 版本 %ld
+>15	ubyte		>0		- version %ld
 0	short		015001		Compiled Terminfo Entry
 # little-endian entry
 0	short		0432		Compiled Terminfo Entry
-0	short		0433		Curses 螢幕影像
-0	short		0434		Curses 螢幕影像
-0	short		0437		pdp11 核心套印格式
-0	short		0570		vax 執行檔
+0	short		0433		Curses screen image
+0	short		0434		Curses screen image
+0	short		0437		pdp11 kernel overlay
+0	short		0570		vax executable
 >12	long		>0		not stripped
->22	ushort		>0		- 版本 %ld
-0	short		0575		vax 單純執行檔
+>22	ushort		>0		- version %ld
+0	short		0575		vax pure executable
 >12	long		>0		not stripped
->22	ushort		>0		- 版本 %ld
-0	short		0502		basic-16 執行檔
+>22	ushort		>0		- version %ld
+0	short		0502		basic-16 executable
 >12	long		>0		not stripped
->22	ushort		>0		- 版本 %ld
-0	short		0503		basic-16 執行檔 (TV)
+>22	ushort		>0		- version %ld
+0	short		0503		basic-16 executable (TV)
 >12	long		>0		not stripped
->22	ushort		>0		- 版本 %ld
-0	short		0510		x86 執行檔
+>22	ushort		>0		- version %ld
+0	short		0510		x86 executable
 >12	long		>0		not stripped
-0	short		0511		x86 執行檔 (TV)
+0	short		0511		x86 executable (TV)
 >12	long		>0		not stripped
-0	short		0550		3b20 執行檔
+0	short		0550		3b20 executable
 >12	long		>0		not stripped
->22	ushort		>0		- 版本 %ld
-0	short		0551		3b20 執行檔 (TV)
+>22	ushort		>0		- version %ld
+0	short		0551		3b20 executable (TV)
 >12	long		>0		not stripped
->22	ushort		>0		- 版本 %ld
-0	short		0560		WE32000 執行檔
+>22	ushort		>0		- version %ld
+0	short		0560		WE32000 executable
 >12	long		>0		not stripped
 >18	short		^00010000	- N/A on 3b2/300 w/paging
->18	short		&00020000	- 32100 是必需的
->18	short		&00040000	和 mau 硬體是必需的
->20	short		0443		(目標共用程式庫)
->20	short		0410		(交換的)
->20	short		0413		(分頁)
->22	ushort		>0		- 版本 %ld
-0	short		0561		WE32000 執行檔 (TV)
+>18	short		&00020000	- 32100 required
+>18	short		&00040000	and mau hardware required
+>20	short		0443		(target shared library)
+>20	short		0410		(swapped)
+>20	short		0413		(paged)
+>22	ushort		>0		- version %ld
+0	short		0561		WE32000 executable (TV)
 >12	long		>0		not stripped
->18	short		&00020000	- 32100 是必需的
->18	short		&00040000	和 mau 硬體是必需的
->22	ushort		>0		- 版本 %ld
-0	short		=0512		iAPX 286 可執行的小模型 (COFF)
+>18	short		&00020000	- 32100 required
+>18	short		&00040000	and mau hardware required
+>22	ushort		>0		- version %ld
+0	short		=0512		iAPX 286 executable small model (COFF)
 >12	long		>0		not stripped
->22	ushort		>0		- 版本 %ld
-0	short		=0522		iAPX 286 可執行的大模型 (COFF)
+>22	ushort		>0		- version %ld
+0	short		=0522		iAPX 286 executable large model (COFF)
 >12	long		>0		not stripped
->22	ushort		>0		- 版本 %ld
-0	short		0514		iAPX 386 執行檔 (COFF) (停用的)
+>22	ushort		>0		- version %ld
+0	short		0514		iAPX 386 executable (COFF) (deprecated)
 >12	long		>0		not stripped
->22	ushort		>0		- 版本 %ld
-0	short		0520		mc68k 執行檔
+>22	ushort		>0		- version %ld
+0	short		0520		mc68k executable
 >12	long		>0		not stripped
-0	short		0521		mc68k 執行檔 (共用)
+0	short		0521		mc68k executable (shared)
 >12	long		>0		not stripped
-0	short		0522		mc68k 執行檔 (共用的需求分頁)
+0	short		0522		mc68k executable (shared demand paged)
 >12	long		>0		not stripped
 # big-endian entries for pure executables
-2	short		0410		單純
->1	byte		0		sun2 執行檔
->1	byte		1		mc68010 執行檔
->1	byte		2		mc68020 執行檔
->1	byte		3		SPARC 執行檔
->0	ubyte		>077		動態連結
+2	short		0410		pure
+>1	byte		0		sun2 executable
+>1	byte		1		mc68010 executable
+>1	byte		2		mc68020 executable
+>1	byte		3		SPARC executable
+>0	ubyte		>077		dynamically linked
 # little-endian entries for pure executables
-2	short		04001		單純
->1	byte		0		sun2 執行檔
->1	byte		1		mc68010 執行檔
->1	byte		2		mc68020 執行檔
->1	byte		3		SPARC 執行檔
->0	ubyte		>077		動態連結
+2	short		04001		pure
+>1	byte		0		sun2 executable
+>1	byte		1		mc68010 executable
+>1	byte		2		mc68020 executable
+>1	byte		3		SPARC executable
+>0	ubyte		>077		dynamically linked
 # big-endian entries for impure executables
-2	short		0407		不純粹
->1	byte		0		sun2 執行檔
->1	byte		1		mc68010 執行檔
->1	byte		2		mc68020 執行檔
->1	byte		3		SPARC 執行檔
->0	ubyte		>077		動態連結
+2	short		0407		impure
+>1	byte		0		sun2 executable
+>1	byte		1		mc68010 executable
+>1	byte		2		mc68020 executable
+>1	byte		3		SPARC executable
+>0	ubyte		>077		dynamically linked
 # little-endian entries for impure executables
-2	short		03401		不純粹
->1	byte		0		sun2 執行檔
->1	byte		1		mc68010 執行檔
->1	byte		2		mc68020 執行檔
->1	byte		3		SPARC 執行檔
->0	ubyte		>077		動態連結
+2	short		03401		impure
+>1	byte		0		sun2 executable
+>1	byte		1		mc68010 executable
+>1	byte		2		mc68020 executable
+>1	byte		3		SPARC executable
+>0	ubyte		>077		dynamically linked
 # big-endian entries for Sun demand paged executables
-2	short		0413		Sun 需求分頁
->1	byte		0		sun2 執行檔
->1	byte		1		mc68010 執行檔
->1	byte		2		mc68020 執行檔
->1	byte		3		SPARC 執行檔
->0	ubyte		>077		動態連結
+2	short		0413		Sun demand paged
+>1	byte		0		sun2 executable
+>1	byte		1		mc68010 executable
+>1	byte		2		mc68020 executable
+>1	byte		3		SPARC executable
+>0	ubyte		>077		dynamically linked
 # little-endian entries for Sun demand paged executables
-2	short		05401		Sun 需求分頁
->1	byte		0		sun2 執行檔
->1	byte		1		mc68010 執行檔
->1	byte		2		mc68020 執行檔
->1	byte		3		SPARC 執行檔
->0	ubyte		>077		動態連結
-0	short		0x8001		Adobe PostScript Type 1 二進位字型 (PFB)
-0	short		0x0180		Adobe PostScript Type 1 二進位字型 (PFB)
-0	long		0x00010000	TrueType 字型檔版本 1.0 (TTF)
-0	long		0x00000100	TrueType 字型檔版本 1.0 (TTF)
-0	long		0xf00000ff	延伸的會計檔案
+2	short		05401		Sun demand paged
+>1	byte		0		sun2 executable
+>1	byte		1		mc68010 executable
+>1	byte		2		mc68020 executable
+>1	byte		3		SPARC executable
+>0	ubyte		>077		dynamically linked
+0	short		0x8001		Adobe PostScript Type 1 binary font (PFB)
+0	short		0x0180		Adobe PostScript Type 1 binary font (PFB)
+0	long		0x00010000	TrueType font file version 1.0 (TTF)
+0	long		0x00000100	TrueType font file version 1.0 (TTF)
+0	long		0xf00000ff	extended accounting file
 # little-endian entry
-0	long		0xff0000f0	延伸的會計檔案
-0	byte		0x80		8086 可重定位的 (Microsoft)
-0	byte		0xf0		MS-DOS 程式庫
+0	long		0xff0000f0	extended accounting file
+0	byte		0x80		8086 relocatable (Microsoft)
+0	byte		0xf0		MS-DOS library
 0	short		0xff65		x.out
->2	string		__.SYMDEF	歸檔
->0	byte		x		Microsoft a.out
-0	short		0x206		套印格式
->0x1e	short		&0x10		個別的
->0x1e	short		&0x2		單純
->0x1e	short		&0x4		單純
->0x1e	short		&0x800		獨立式
->0x1e	short		&0x400		fixed-stack
->0x1e	short		&0x8		交換的位元組
->0x1c	byte		&0x80		交換的文字
->0x1c	byte		&0x40		not-stripped
->0x10	long		>0		pre-SysV
->0x1e	short		^0xc000		86
->0x1c	byte		&0x4		286
->0x1c	byte		&0x9		386
->0x1c	byte		&0xa		執行檔
->0x1e	short		&0x1		目的檔
->0x1e	short		^0x1		Large Text
->0x1e	short		&0x40		Large Data
->0x1e	short		&0x20		Huge Objects Enabled
->0x1e	short		&0x120		VAX 需求載入格式 a.out 目的檔
-0	short		0x10b		not stripped
+>2	string		__.SYMDEF	randomized
+>0	byte		x		archive
+0	short		0x206		Microsoft a.out
+>0x1e	short		&0x10		overlay
+>0x1e	short		&0x2		separate
+>0x1e	short		&0x4		pure
+>0x1e	short		&0x800		segmented
+>0x1e	short		&0x400		standalone
+>0x1e	short		&0x8		fixed-stack
+>0x1c	byte		&0x80		byte-swapped
+>0x1c	byte		&0x40		word-swapped
+>0x10	long		>0		not-stripped
+>0x1e	short		^0xc000		pre-SysV
+>0x1c	byte		&0x4		86
+>0x1c	byte		&0x9		286
+>0x1c	byte		&0xa		386
+>0x1e	short		&0x1		executable
+>0x1e	short		^0x1		object file
+>0x1e	short		&0x40		Large Text
+>0x1e	short		&0x20		Large Data
+>0x1e	short		&0x120		Huge Objects Enabled
+0	short		0x10b		VAX demand load format a.out object file
 >0x10	long		>0		not stripped
-0	short		0x140		個別的
->0x3	byte		&0x4		單純
->0x3	byte		&0x2		單純
->0	byte		&0x1		目的檔
->0	byte		^0x1		not stripped
+0	short		0x140		old Microsoft 8086 x.out
+>0x3	byte		&0x4		separate
+>0x3	byte		&0x2		pure
+>0	byte		&0x1		executable
+>0	byte		^0x1		relocatable
 >0x14	long		>0		not stripped
-0	long		0x10b		not stripped
+0	long		0x10b		VAX demand load format a.out object file
 >0x10	long		>0		not stripped
-0	long		0x140		個別的
->0x3	byte		&0x4		單純
->0x3	byte		&0x2		單純
->0	byte		&0x1		目的檔
->0	byte		^0x1		not stripped
+0	long		0x140		old Microsoft 8086 x.out
+>0x3	byte		&0x4		separate
+>0x3	byte		&0x2		pure
+>0	byte		&0x1		executable
+>0	byte		^0x1		relocatable
 >0x14	long		>0		not stripped
-0	long		0xe807		單純目的檔 (z8000 a.out)
-0	long		0xe808		個別的目的檔 (z8000 a.out)
-0	long		0xe809		套印格式目的檔 (z8000 a.out)
-0	long		0xe805		Bell 5.0 執行檔
-0	long		0x178		Sun 唯讀文字執行檔
-2	short		0410		Sun 舊的執行檔
->2	short		0407		(SPARC)
->1	byte		3		(68020)
->1	byte		2		(68010)
->1	byte		1		(Sun2)
->1	byte		0		交換的位元組 cpio 歸檔
-0	short		0143561		PDP-11 單精準度 APL 工作區
-0	long		0101555		PDP-11 雙精度 APL 工作區
-0	long		0101554		VAX 單精準度 APL 工作區
-0	long		0101557		VAX 雙精度 APL 工作區
-0	long		0101556		old 包裝資料
-0	short		017437		包裝資料
-0	string		\037\036	包裝資料
-0	string		\377\037	壓縮資料
-0	string		\037\235	區塊壓縮
->2	byte&0x80	>0		%d 位元
->2	byte&0x1f	x		gzip 壓縮資料
-0	string		\037\213	- 抽取方法
->2	byte		8		, ascii
->3	byte		&0x1		, 繼續
->3	byte		&0x2		, 額外的欄位
->3	byte		&0x4		, 原始檔案名稱
->3	byte		&0x8		, 註釋
->3	byte		&0x10		, 加密
->3	byte		&0x20		, 最大的壓縮
->8	byte		2		, 最大的速度
->8	byte		4		歸檔隨機程式庫
-0	string		!<arch>\n__.SYMDEF	MMDF 信箱
-0	long		0x1010101	Interleaf ASCII 文件
-0	string		<!OPS		SunGKS
-24	string		SunGKS		Metafile
+0	long		0xe807		object file (z8000 a.out)
+0	long		0xe808		pure object file (z8000 a.out)
+0	long		0xe809		separate object file (z8000 a.out)
+0	long		0xe805		overlay object file (z8000 a.out)
+0	long		0x178		Bell 5.0 executable
+2	short		0410		Sun read-only text executable
+>2	short		0407		Sun old executable
+>1	byte		3		(SPARC)
+>1	byte		2		(68020)
+>1	byte		1		(68010)
+>1	byte		0		(Sun2)
+0	short		0143561		byte-swapped cpio archive
+0	long		0101555		PDP-11 single precision APL workspace
+0	long		0101554		PDP-11 double precision APL workspace
+0	long		0101557		VAX single precision APL workspace
+0	long		0101556		VAX double precision APL workspace
+0	short		017437		old packed data
+0	string		\037\036	packed data
+0	string		\377\037	compacted data
+0	string		\037\235	compressed data
+>2	byte&0x80	>0		block compressed
+>2	byte&0x1f	x		%d bits
+0	string		\037\213	gzip compressed data
+>2	byte		8		- deflate method
+>3	byte		&0x1		, ascii
+>3	byte		&0x2		, continuation
+>3	byte		&0x4		, extra field
+>3	byte		&0x8		, original file name
+>3	byte		&0x10		, comment
+>3	byte		&0x20		, encrypted
+>8	byte		2		, max compression
+>8	byte		4		, max speed
+0	string		!<arch>\n__.SYMDEF	archive random library
+0	long		0x1010101	MMDF mailbox
+0	string		<!OPS		Interleaf ASCII document
+24	string		SunGKS		SunGKS
 # version number follows, in the form m.n
->0	string		GKSM		GKS Metafile
-0	string		GKSM		Adobe PostScript ASCII 字型 (PFA)
+>0	string		GKSM		Metafile
+0	string		GKSM		GKS Metafile
 # version number follows, in the form <!OPS, Version n.n>
-0	string		%!PS-AdobeFont	PostScript 文件
-0	string		%!		Interpress 文件
+0	string		%!PS-AdobeFont	Adobe PostScript ASCII font (PFA)
+0	string		%!		PostScript document
 >2	string		PS-Adobe	 conforming to level
 >10	string		-1.0		 1.0
 >10	string		-2.0		 2.0
 >10	string		-3.0		 3.0
+# Handle Microsoft PostScript files (CTRL-D%!)
+0	string		\004%!		PostScript document text
 # version ID follows, in the form PS-Adobe-nn
-0	string		Interpress/Xerox	Adobe 字型尺寸
+0	string		Interpress/Xerox	Interpress document
 # version ID follows, in the form /n.n
-0	string		StartFontMetrics	Adobe 字型位元
-0	string		StartFont	NeWS 點陣圖字型
-0	long		0x137A2944	NeWS 字型家族
-0	long		0x137A2947	X11/NeWS 點陣圖字型
-8	long		0x137A2B45	X11/NeWS 字型家族
-8	long		0x137A2B48	Snoop 抓取檔案
-# snoop files are always big-endian
-# big-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x736e6f6f70000000	- 版本 %ld
->8	long		>0		- 版本 %ld
-# little-endian entries, with ullong equivalent of string "snoop"
-0	ullong		0x000000706f6f6e73	- 版本 %ld
->11	long		>0		- 版本 %ld
-0	short		0436		Frame Maker 文件
-0	string		<MakerFile	Frame Maker MIF 檔案
-0	string		<MIFFile	Frame Maker MML 檔案
-0	string		<MML		Frame Maker 書籍檔案
-0	string		<BookFile	audio data:
+0	string		StartFontMetrics	Adobe font metrics
+0	string		StartFont	Adobe font bits
+0	long		0x137A2944	NeWS bitmap font
+0	long		0x137A2947	NeWS font family
+8	long		0x137A2B45	X11/NeWS bitmap font
+8	long		0x137A2B48	X11/NeWS font family
+0	short		0436		vfont definition
+0	string		<MakerFile	Frame Maker document
+0	string		<MIFFile	Frame Maker MIF file
+0	string		<MML		Frame Maker MML file
+0	string		<BookFile	Frame Maker book file
 # Audio files are always big-endian so there are two sets of tables here.
 # The CPU endian architecture is determined via the ordering of the first 4 bytes
 # (the string ".snd"). The tables below have this value represented as a single
@@ -324,42 +296,42 @@
 #
 # big-endian entries
 #
-0	long		0x2e736e64	8-bit u-law,
->12	long		1		8-bit 直線的 PCM,
->12	long		2		16-bit 直線的 PCM,
->12	long		3		24-bit 直線的 PCM,
->12	long		4		32-bit 直線的 PCM,
->12	long		5		32 位元浮點數,
->12	long		6		64 位元浮點數,
->12	long		7		壓縮 (4 位元 G.721 ADPCM),
->12	long		23		壓縮 (8 位元 G.722 ADPCM),
->12	long		24		壓縮 (3 位元 G.723 ADPCM),
->12	long		25		壓縮 (5 位元 G.723 ADPCM),
->12	long		26		8 位元 A-law,
->12	long		27		mono,
->20	long		1		stereo,
->20	long		2		quad,
->20	long		4		%d Hz
->16	long		x		PEX Binary Archive
+0	long		0x2e736e64	audio data:
+>12	long		1		8-bit u-law,
+>12	long		2		8-bit linear PCM,
+>12	long		3		16-bit linear PCM,
+>12	long		4		24-bit linear PCM,
+>12	long		5		32-bit linear PCM,
+>12	long		6		32-bit floating point,
+>12	long		7		64-bit floating point,
+>12	long		23		compressed (4-bit G.721 ADPCM),
+>12	long		24		compressed (8-bit G.722 ADPCM),
+>12	long		25		compressed (3-bit G.723 ADPCM),
+>12	long		26		compressed (5-bit G.723 ADPCM),
+>12	long		27		8-bit A-law,
+>20	long		1		mono,
+>20	long		2		stereo,
+>20	long		4		quad,
+>16	long		x		%d Hz
 #
 # little-endian entries
 #
-0	long		0x646e732e	8-bit u-law,
->12	long		0x01000000	8-bit 直線的 PCM,
->12	long		0x02000000	16-bit 直線的 PCM,
->12	long		0x03000000	24-bit 直線的 PCM,
->12	long		0x04000000	32-bit 直線的 PCM,
->12	long		0x05000000	32 位元浮點數,
->12	long		0x06000000	64 位元浮點數,
->12	long		0x07000000	壓縮 (4 位元 G.721 ADPCM),
->12	long		0x17000000	壓縮 (8 位元 G.722 ADPCM),
->12	long		0x18000000	壓縮 (3 位元 G.723 ADPCM),
->12	long		0x19000000	壓縮 (5 位元 G.723 ADPCM),
->12	long		0x1a000000	8 位元 A-law,
->12	long		0x1b000000	mono,
->20	long		0x01000000	stereo,
->20	long		0x02000000	quad,
->20	long		0x04000000	%d Hz
+0	long		0x646e732e	audio data:
+>12	long		0x01000000	8-bit u-law,
+>12	long		0x02000000	8-bit linear PCM,
+>12	long		0x03000000	16-bit linear PCM,
+>12	long		0x04000000	24-bit linear PCM,
+>12	long		0x05000000	32-bit linear PCM,
+>12	long		0x06000000	32-bit floating point,
+>12	long		0x07000000	64-bit floating point,
+>12	long		0x17000000	compressed (4-bit G.721 ADPCM),
+>12	long		0x18000000	compressed (8-bit G.722 ADPCM),
+>12	long		0x19000000	compressed (3-bit G.723 ADPCM),
+>12	long		0x1a000000	compressed (5-bit G.723 ADPCM),
+>12	long		0x1b000000	8-bit A-law,
+>20	long		0x01000000	mono,
+>20	long		0x02000000	stereo,
+>20	long		0x04000000	quad,
 >16	long		0x401f0000	8000 Hz
 >16	long		0x80250000	9600 Hz
 >16	long		0x112b0000	11025 Hz
@@ -372,10 +344,10 @@
 >16	long		0x80bb0000	48000 Hz
 # .wav files are always little-endian
 # .wav big-endian entries, starting with long value for the string "RIFF"
-0	long		0x52494646	8-bit u-law,
+0	long		0x52494646	audio data:
 >34	short		0x0800		8-bit
 >34	short		0x1000		16-bit
->20	short		0x0100		線性 PCM,
+>20	short		0x0100		linear PCM,
 >20	short		0x0200		MS ADPCM,
 >20	short		0x0600		A-law,
 >20	short		0x0700		u-law,
@@ -383,10 +355,10 @@
 >22	short		0x0100		mono
 >22	short		0x0200		stereo
 # .wav little-endian entries, starting with long value for the string "RIFF"
-0	long		0x46464952	8-bit u-law,
+0	long		0x46464952	audio data:
 >34	short		0x0008		8-bit
 >34	short		0x0010		16-bit
->20	short		0x0001		線性 PCM,
+>20	short		0x0001		linear PCM,
 >20	short		0x0002		MS ADPCM,
 >20	short		0x0006		A-law,
 >20	short		0x0007		u-law,
@@ -395,89 +367,89 @@
 >22	short		0x0002		stereo
 # .aiff files are always big-endian
 # .aiff big-endian entries, starting with long value for the string "FORM"
-0	long		0x464f524d	8-bit u-law,
->26	short		0x0008		16-bit 直線的 PCM,
->26	short		0x0010		24-bit 直線的 PCM,
+0	long		0x464f524d	audio data:
+>26	short		0x0008		8-bit linear PCM,
+>26	short		0x0010		16-bit linear PCM,
 >20	short		0x0001		mono
 >20	short		0x0002		stereo
 # .aiff little-endian entries, starting with long value for the string "FORM"
-0	long		0x4d524f46	8-bit u-law,
->26	short		0x0800		16-bit 直線的 PCM,
->26	short		0x1000		24-bit 直線的 PCM,
+0	long		0x4d524f46	audio data:
+>26	short		0x0800		8-bit linear PCM,
+>26	short		0x1000		16-bit linear PCM,
 >20	short		0x0100		mono
 >20	short		0x0200		stereo
 # .mid files are always big-endian
 # .mid big-endian entries, starting with long value for the string "MThd"
-0	long		0x4d546864	MIDI 資料:
->8	short		x		類型 %u,
->10	short		x		%u 磁軌
+0	long		0x4d546864	MIDI data:
+>8	short		x		type %u,
+>10	short		x		%u track(s)
 # .mid little-endian entry (the string "MThd")
 # can't translate big-endian type and track information
-0	long		0x6468544d	MIDI 資料
+0	long		0x6468544d	MIDI data
 #
-0	short		0x1010		光域檔案,
+0	short		0x1010		PEX Binary Archive
 # rasterfiles are big-endian
 # big-endian rasterfile entries
-0	long		0x59a66a95	%ld x
+0	long		0x59a66a95	rasterfile,
 >4	long		>0		%ld x
 >8	long		>0		%ld x
->12	long		>0		舊式格式影像
->20	long		0		標準格式影像
->20	long		1		run-length 位元組編碼影像
->20	long		2		XRGB 或 RGB 格式影像
->20	long		3		tiff 格式影像
->20	long		4		iff  (TAAC 格式)影像
->20	long		5		試驗性格式影像
->20	long		0xffff		Interleaf 快速儲存文件
+>12	long		>0		%ld
+>20	long		0		old format image
+>20	long		1		standard format image
+>20	long		2		run-length byte encoded image
+>20	long		3		XRGB or RGB format image
+>20	long		4		tiff format image
+>20	long		5		iff (TAAC format) image 
+>20	long		0xffff		experimental format image
 # little-endian rasterfile entries
 # cannot translate resolution stored as big-endian longs
-0	long		0x956aa659	%ld x
->23	long		0		標準格式影像
->23	long		1		run-length 位元組編碼影像
->23	long		2		XRGB 或 RGB 格式影像
->23	long		3		tiff 格式影像
->23	long		4		iff  (TAAC 格式)影像
->23	long		5		試驗性格式影像
->20	long		0xffff		Interleaf 快速儲存文件
-0	long		0x884f5053	Aster*x
-0	long		0x2a535441	Words 文件
->7	long		0x574f5244		圖形
->7	long		0x47524150		試算表
->7	long		0x53505245		Macro
->7	long		0x4d414352		Aster*x 版本 2
-0	long		0x32323738	Words 文件
->29	byte		0x36			圖形
->29	byte		0x35			試算表
->29	byte		0x32			Macro
->29	byte		0x38			Aster*x 版本 2
-4	string		pgscriptver	IslandDraw 文件
-13	string		DrawFile	PBM ASCII 檔案
-0	string		P1		PGM ASCII 檔案
-0	string		P2		PPM ASCII 檔案
-0	string		P3		PBM 原始檔案
-0	string		P4		PGM 原始檔案
-0	string		P5		PPM 原始檔案
-0	string		P6		TIFF 檔案,大尾數法
-0	string		\115\115	TIFF 檔案,小尾數法
-0	string		\111\111	GIF 檔案, v87
-0	string		GIF87a		GIF 檔案, v89
-0	string		GIF89a		JPEG 檔案
-0	string		\377\330\377\340	JPEG 檔案
-0	string		\377\330\377\341	JPEG 檔案
-0	string		\377\330\377\356	IFF ILBM 檔案
-8	string		ILBM		Java 類別檔案
-0	string		\312\376\272\276	Kodak Color Management System, ICC Profile
-36	string		acsp	Adobe Portable Document Format (PDF) v1.0
-0	string		%PDF		Adobe 可攜式文件格式 (PDF) 
+0	long		0x956aa659	rasterfile,
+>23	long		0		old format image
+>23	long		1		standard format image
+>23	long		2		run-length byte encoded image
+>23	long		3		XRGB or RGB format image
+>23	long		4		tiff format image
+>23	long		5		iff (TAAC format) image 
+>20	long		0xffff		experimental format image
+0	long		0x884f5053	Interleaf fast-saved document
+0	long		0x2a535441	Aster*x
+>7	long		0x574f5244		Words Document
+>7	long		0x47524150		Graphic
+>7	long		0x53505245		Spreadsheet
+>7	long		0x4d414352		Macro
+0	long		0x32323738	Aster*x Version 2
+>29	byte		0x36			Words Document
+>29	byte		0x35			Graphic
+>29	byte		0x32			Spreadsheet
+>29	byte		0x38			Macro
+4	string		pgscriptver	IslandWrite document
+13	string		DrawFile	IslandDraw document
+0	string		P1		PBM ascii file
+0	string		P2		PGM ascii file
+0	string		P3		PPM ascii file
+0	string		P4		PBM raw file
+0	string		P5		PGM raw file
+0	string		P6		PPM raw file
+0	string		\115\115	TIFF file, big-endian
+0	string		\111\111	TIFF file, little-endian
+0	string		GIF87a		GIF file, v87
+0	string		GIF89a		GIF file, v89
+0	string		\377\330\377\340	JPEG file
+0	string		\377\330\377\341	JPEG file
+0	string		\377\330\377\356	JPG file
+8	string		ILBM		IFF ILBM file
+0	string		\312\376\272\276	java class file
+36	string		acsp	Kodak Color Management System, ICC Profile
+0	string		%PDF		Adobe Portable Document Format (PDF) 
 >4	string		-1.0		v1.0
 >4	string		-1.1		v1.1
 >4	string		-1.2		v1.2
 >4	string		-1.3		v1.3
 >4	string		-1.4		v1.4
 >4	string		-1.5		v1.5
-0	string		<html		html 文件
-0	string		<HTML		html 文件
-0	string		<Html		html 文件
+0	string		<html		html document
+0	string		<HTML		html document
+0	string		<Html		html document
 0	string		<!doctype HTML	html document
 0	string		<!doctype Html	html document
 0	string		<!doctype html	html document
@@ -487,45 +459,138 @@
 0	string		<!Doctype HTML	html document
 0	string		<!Doctype Html	html document
 0	string		<!Doctype html	html document
-0	string		<head		html 文件
-0	string		<HEAD		html 文件
-0	string		<Head		html 文件
-0	string		<title		html 文件
-0	string		<TITLE		html 文件
-0	string		<Title		html 文件
-0	string		<?xml		XML 文件
-0	string		<?XML		XML 文件
-0	string		<?Xml		XML 文件
-0	string		\0211PNG	PNG 影像資料
-0	string		.RMF		RealMedia 檔案
-0	string		FlAsH-aRcHiVe	Flash 歸檔
+0	string		<head		html document
+0	string		<HEAD		html document
+0	string		<Head		html document
+0	string		<title		html document
+0	string		<TITLE		html document
+0	string		<Title		html document
+0	string		<?xml		XML document
+0	string		<?XML		XML document
+0	string		<?Xml		XML document
+0	string		\0211PNG	PNG image data
+0	string		.RMF		RealMedia file
+0	string		FlAsH-aRcHiVe	Flash Archive
 >13	string		-1.0		 1.0
 >13	string		-2.0		 2.0
-38	string		application/vnd.sun.xml.writer	StarSuite 7 文字文件
-38	string		application/vnd.sun.xml.calc	StarSuite 7 工作表
-38	string		application/vnd.sun.xml.draw	StarSuite 7 繪圖
-38	string		application/vnd.sun.xml.impress	StarSuite 7 簡報
-38	string		application/vnd.sun.xml.math	StarSuite 7 公式
-0	string		PK\003\004	ZIP 歸檔
-0	string		MZ		DOS 執行檔 (EXE)
-0	string		LZ		DOS 內建
-0	byte		0xe9		DOS 執行檔 (COM)
-0	byte		0xeb		DOS 執行檔 (COM)
-24	long		60012		zoneinfo 時區資料檔
-0	string		TZif		bzip2 壓縮資料
-0	string		BZh		,區塊大小 = %c00k
+38	string		application/vnd.sun.xml.writer	StarOffice 7 Text Document
+38	string		application/vnd.sun.xml.calc	StarOffice 7 Spreadsheet
+38	string		application/vnd.sun.xml.draw	StarOffice 7 Drawing
+38	string		application/vnd.sun.xml.impress	StarOffice 7 Presentation
+38	string		application/vnd.sun.xml.math	StarOffice 7 Formula
+38	string		application/vnd.oasis.opendocument.chart	OpenDocument Chart
+38	string		application/vnd.oasis.opendocument.database	OpenDocument Database
+38	string		application/vnd.sun.xml.base			OpenDocument Database
+38	string		application/vnd.oasis.opendocument.formula	OpenDocument Formula
+38	string		application/vnd.oasis.opendocument.image	OpenDocument Image
+38	string		application/vnd.oasis.opendocument.text-web	HTML Document Template
+38	string		application/vnd.oasis.opendocument.text-	OpenDocument
+>78	string		template						Text Template
+>78	string		master							Master Document
+38	string		application/vnd.oasis.opendocument.text		OpenDocument Text
+38	string		application/vnd.oasis.opendocument.graphics	OpenDocument Drawing
+>81	string		-template						Template
+38	string		application/vnd.oasis.opendocument.presentation	OpenDocument Presentation
+>85	string		-template						Template
+38	string		application/vnd.oasis.opendocument.spreadsheet	OpenDocument Spreadsheet
+>84	string		-template						Template
+0	string		PK\003\004	ZIP archive
+0	string		MZ		DOS executable (EXE)
+0	string		LZ		DOS built-in
+0	byte		0xe9		DOS executable (COM)
+0	byte		0xeb		DOS executable (COM)
+0	string		\013\023\010\000	ksh compiled shell script executable
+24	long		60012		ufsdump archive file
+0	string		TZif		zoneinfo timezone data file
+0	string		BZh		bzip2 compressed data
 >3	byte		>47		, block size = %c00k
-0	string		SUNWcpch	Sun C 編譯器預先編譯標題
-0	string		SUNWCpch	Sun C++ 編譯器預先編譯標題
-0	string		\043\040PaCkAgE\040DaTaStReAm	套裝軟體資料流
-0	short		0xcff1		CTF 資料檔案
-0	string		\177DOF		DTrace DOF 資料檔案
-0	string		\177FCF		fmd(1M) 檢查點檔案
-0	string		EFT\0		錯誤樹狀檔案,
+0	string		SUNWcpch	Sun C compiler precompiled header
+0	string		SUNWCpch	Sun C++ compiler precompiled header
+0	string		\043\040PaCkAgE\040DaTaStReAm	package datastream
+0	short		0xcff1		CTF data file
+0	string		\177DOF		DTrace DOF data file
+0	string		\177FCF		fmd(1M) checkpoint file
+0	string		EFT\0		Fault tree file,
 >4	ushort		x		v%u
->6	ushort		x		修訂版 %u,
->8	ushort		x		位於 esc v%u
->10	ushort		x		修訂版 %u,
-0	string		_SM_		DMTF SMBIOS 影像
->6	byte		x		版本 %u
+>6	ushort		x		rev %u,
+>8	ushort		x		from esc v%u
+>10	ushort		x		rev %u
+0	string		_SM_		DMTF SMBIOS image
+>6	byte		x		version %u
 >7	byte		x		.%u
+0	byte		0x11		Solaris Audit File
+0	byte		0x78		Solaris Audit File 
+# ZFS send stream entries
+8	ullong		0x00000002f5bacbac	ZFS snapshot stream
+# little endian stream
+8	ullong		0xaccbbaf502000000	ZFS snapshot stream
+
+
+# Video files
+2	string		\001\272\041	MPEG Movie file
+0	string		\377\375	MPEG-1 Audio Layer 2
+0	string		\377\373	MPEG-1 Audio Layer 3
+0	string		\377\372	MPEG-1 Audio Layer 3
+0	string		\111\104\063	MPEG-1 Layer 3 with ID3v2
+
+# AVI and GVI files
+20	string	hdrlavih	RIFF Avi Video
+>36	ulong	>0		%u Max Bps,
+>64	ushort	x		%u X
+>68	ushort	x		%u,
+>48	ulong	x		%u frames
+
+20	string	goog		RIFF gvi
+>88	ulong	>0		%u Max Bps
+>116	ushort	x		%u X
+>120	ushort	x		%u,
+>100	ulong	x		%u frames
+
+# JPEG 2000 - jp2 image file.
+3	string		\014\152\120\040\040	JPEG 2000 Image file
+
+# iso 9660 CD-ROM image and El Torito Bootable standard
+32769	string		CD\0		ISO 9660 filesystem image
+>34823	string		EL\040TORITO	- El Torito
+
+# Palm Pilot files .pdb and .prc of some type.
+0x3c	string	TEXtREAd		Palm DOC file
+0x3c	string	SDocSilX		iSilo 3 Doc file for PalmPilot
+0x3c	string	applSil			iSilo Application file
+0x3c	string	appl			Palm Pilot Application
+0x3c	string	ToGoToGo		iSilo Doc file for Palm Pilot
+
+#SGI files with .rgb extention
+0	string	\001\332			SGI Image data,
+>2	byte	1			RLE,
+>2	byte	0			Verbatim,
+>5	ubyte	x			%u-D
+>7	ubyte	x			%u x
+>9	ubyte	x			%u, 
+>11	ubyte	x			%u channel(s)
+
+2048	string		PCD_IPI		Kodak Photo CD image pack file
+>0xe02	byte&0x03	0x00		, landscape mode
+>0xe02	byte&0x03	0x01		, portrait mode
+>0xe02	byte&0x03	0x02		, landscape mode
+>0xe02	byte&0x03	0x03		, portrait mode
+0	string		PCD_OPA		Kodak Photo CD overview pack file
+
+# MS Documents. Not much info available.
+0	string	\320\317\021\340\241\261\032\341	Microsoft
+>546	string	bjbj					Word
+>0	byte	<0					Document
+0	string	{\\rtf		Microsoft Rich Text Format Document
+
+# mp4 media format with different media files embedded in it
+4	string	ftyp		MPEG-4
+>8	string	isom		Base Media v1 [IS0 14496-12:2003]
+>8	string	iso2		Base Media v2 [ISO 14496-12:2005]
+>8	string	m4a\040		Apple iTunes AAC-LC (.M4A) Audio
+>8	string	m4v\040		Apple iTunes (.M4V) Video
+>8	string	qt		Apple QuickTime (.MOV/QT)
+>8	string	jp2		JPEG 2000 Image
+>8	string	jpm		JPEG 2000 Compound Image (.JPM) [ISO 15444-6]
+>8	string	jpx		JPEG 2000 w/ extensions (.JPX) [ISO 15444-2]
+>8	string	mp42		v2 [ISO 14496-14]
+4	string	moov		QuickTime MOV file