1 ############################################################################### |
1 ############################################################################### |
2 # Copyright 2009 Sun Microsystems, Inc. All rights reserved. |
2 # Copyright 2009 Sun Microsystems, Inc. All rights reserved. |
3 # Use subject to license terms. |
3 # Use is subject to license terms. |
4 # |
4 # |
5 # Permission is hereby granted, free of charge, to any person obtaining a |
5 # Permission is hereby granted, free of charge, to any person obtaining a |
6 # copy of this software and associated documentation files (the |
6 # copy of this software and associated documentation files (the "Software"), |
7 # "Software"), to deal in the Software without restriction, including |
7 # to deal in the Software without restriction, including without limitation |
8 # without limitation the rights to use, copy, modify, merge, publish, |
8 # the rights to use, copy, modify, merge, publish, distribute, sublicense, |
9 # distribute, and/or sell copies of the Software, and to permit persons |
9 # and/or sell copies of the Software, and to permit persons to whom the |
10 # to whom the Software is furnished to do so, provided that the above |
10 # Software is furnished to do so, subject to the following conditions: |
11 # copyright notice(s) and this permission notice appear in all copies of |
11 # |
12 # the Software and that both the above copyright notice(s) and this |
12 # The above copyright notice and this permission notice (including the next |
13 # permission notice appear in supporting documentation. |
13 # paragraph) shall be included in all copies or substantial portions of the |
14 # |
14 # Software. |
15 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS |
15 # |
16 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
16 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
17 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT |
17 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
18 # OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR |
18 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
19 # HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL |
19 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
20 # INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING |
20 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
21 # FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, |
21 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
22 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION |
22 # DEALINGS IN THE SOFTWARE. |
23 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
|
24 # |
|
25 # Except as contained in this notice, the name of a copyright holder |
|
26 # shall not be used in advertising or otherwise to promote the sale, use |
|
27 # or other dealings in this Software without prior written authorization |
|
28 # of the copyright holder. |
|
29 # |
23 # |
30 |
24 |
31 diff -urp -x '*~' -x '*.orig' nls/zh_CN.UTF-8/XI18N_OBJS nls/zh_CN.UTF-8/XI18N_OBJS |
25 diff -urp -x '*~' -x '*.orig' nls/zh_CN.UTF-8/XI18N_OBJS nls/zh_CN.UTF-8/XI18N_OBJS |
32 --- nls/zh_CN.UTF-8/XI18N_OBJS 2008-10-07 10:18:18.000000000 -0700 |
26 --- nls/zh_CN.UTF-8/XI18N_OBJS 2008-10-07 10:18:18.000000000 -0700 |
33 +++ nls/zh_CN.UTF-8/XI18N_OBJS 2009-04-08 00:27:19.563966000 -0700 |
27 +++ nls/zh_CN.UTF-8/XI18N_OBJS 2009-04-08 00:27:19.563966000 -0700 |