Index: stable/9/share/i18n/esdb/MISC/MISC.alias
===================================================================
--- stable/9/share/i18n/esdb/MISC/MISC.alias	(revision 295378)
+++ stable/9/share/i18n/esdb/MISC/MISC.alias	(revision 295379)
@@ -1,38 +1,38 @@
 # $FreeBSD$ 
 # $NetBSD: esdb.alias.MISC.src,v 1.16 2007/03/13 16:34:40 tnozaki Exp $
 
 ATARIST			atari
 
 HP-ROMAN8		cshproman8
 HP-ROMAN8		roman8
 HP-ROMAN8		r8
 
 HZ			hz-gb-2312
 HZ			hz-gb2312
 
 JISX0201-KANA		cshalfwidthkatakana
 JISX0201-KANA		jis_x0201
 JISX0201-KANA		jisx0201
 JISX0201-KANA		jisx0201-1976
 JISX0201-KANA		x0201
 
 JISX0208:1990		csiso87jisx0208
 JISX0208:1990		iso-ir-87
 JISX0208:1990		jis_c6226-1983
 JISX0208:1990		jis_x0208
 JISX0208:1990		jis_x0208-1983
 JISX0208:1990		jis_x0208-1990
 JISX0208:1990		jis_x0208:1990
 JISX0208:1990		jis0208
 JISX0208:1990		jisx0208-1990
 JISX0208:1990		x0208
 
 JOHAB			cp1361
 
-SHIFT_JIS		csshiftjis
-SHIFT_JIS		ms_kanji
-SHIFT_JIS		sjis
+Shift_JIS		csshiftjis
+Shift_JIS		ms_kanji
+Shift_JIS		sjis
 
-SHIFT_JIS-2004		shift_jisx0213
+Shift_JIS-2004		shift_jisx0213
 
 TDS565			iso-ir-230
Index: stable/9/share/i18n/esdb
===================================================================
--- stable/9/share/i18n/esdb	(revision 295378)
+++ stable/9/share/i18n/esdb	(revision 295379)

Property changes on: stable/9/share/i18n/esdb
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,8 ##
   Merged /head/share/i18n/esdb:r226702,226785,227006,228761,228993,229067,229997,230127,230587,231544,231564,233422,233713,234313,234782,235122,235613,236338-236339,236346-236347,236365,236593,236620,236622-236623,236637,236640,236977,237494,237574,240468,240966,241501,241882,242633,242658,242998,244039,244704,244714-244715,247527,248370,249373,250012,250459,250553,250661,251810,252206,255384-255386,255413,255736,255765,255861,257344,257658,259939,260219,260542,260595,260597,260605,261118,261124,261330,261597-261599,261719,261832-261834,262398,262417,262439,262454-262455,262478,263291-263292,263778,265236-265237,265703,265829,266587,270519,271992,272475,273405,275557,275588-275589,277666,279776,279980,280262-280263,280849,280915-280916,281015-281016,281923-281924,282097,282408,282415,282577,283542,284864,284915,285169-285170,285435,287821,288180,288273,293014,295234
   Merged /projects/building-blocks/share/i18n/esdb:r275556,275558
   Merged /projects/largeSMP/share/i18n/esdb:r221273-222812,222815-223757
   Merged /stable/10/share/i18n/esdb:r265922,276991,278554,278556,278569,278710,278713,278717,279505-279506,280419,281968,289963,289974,290246,290385,290879,291754
   Merged /projects/head_mfi/share/i18n/esdb:r233621
   Merged /vendor/resolver/dist/share/i18n/esdb:r1540-186085
   Merged /projects/clang380-import/share/i18n/esdb:r293006
   Merged /projects/quota64/share/i18n/esdb:r184125-207707