--- a/charconvfw/Charconv/ongoing/Group/BASIC_SNM.MK	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/BASIC_SNM.MK	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 # Copyright (c) 2000-2004 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/charconvfw/Charconv/ongoing/Group/BIG5.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/BIG5.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000-2004 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/BIG5_SHARED.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/BIG5_SHARED.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/CHARCONV.BAT	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/CHARCONV.BAT	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 rem All rights reserved.
 rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
+rem under the terms of the License "Eclipse Public License v1.0"
 rem which accompanies this distribution, and is available
 rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
 rem

--- a/charconvfw/Charconv/ongoing/Group/CHARCONV.IBY	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/CHARCONV.IBY	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000-2004 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/CHARCONV.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/CHARCONV.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 1997-2004 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/CHARCONV.PL	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/CHARCONV.PL	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 # Copyright (c) 2000 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/charconvfw/Charconv/ongoing/Group/CHARCONV_CHINESE_SIMPLFIED.IBY	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/CHARCONV_CHINESE_SIMPLFIED.IBY	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000-2004 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/CHARCONV_CHINESE_TRADITIONAL.IBY	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/CHARCONV_CHINESE_TRADITIONAL.IBY	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/CHARCONV_JAPANESE.IBY	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/CHARCONV_JAPANESE.IBY	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000-2005 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/CNVTOOL.BAT	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/CNVTOOL.BAT	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 rem All rights reserved.
 rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
+rem under the terms of the License "Eclipse Public License v1.0"
 rem which accompanies this distribution, and is available
 rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
 rem

--- a/charconvfw/Charconv/ongoing/Group/CNVTOOL.PL	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/CNVTOOL.PL	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 # Copyright (c) 1997-2000 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/charconvfw/Charconv/ongoing/Group/CONVNAMES.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/CONVNAMES.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/CONVTOOL.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/CONVTOOL.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 1997-1999 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/CONVUTILS.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/CONVUTILS.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/CharConvTests.bat	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/CharConvTests.bat	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 rem All rights reserved.
 rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
+rem under the terms of the License "Eclipse Public License v1.0"
 rem which accompanies this distribution, and is available
 rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
 rem

--- a/charconvfw/Charconv/ongoing/Group/CharconvTests.iby	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/CharconvTests.iby	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000-2008 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/CharconvTests_Variant.IBY	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/CharconvTests_Variant.IBY	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000-2008 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/Charconv_ISO8859X.iby	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/Charconv_ISO8859X.iby	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 8859 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/Charconv_all_plugins.iby	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/Charconv_all_plugins.iby	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/CnvPictographShared.mmp	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/CnvPictographShared.mmp	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/CnvShiftJisDirectmap.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/CnvShiftJisDirectmap.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2022 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/EUCJP_PACKED.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/EUCJP_PACKED.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000-2004 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/GB12345.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/GB12345.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 1234 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/GB2312.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/GB2312.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2312 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/GB2312_SHARED.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/GB2312_SHARED.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2312 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/GBK.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/GBK.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 1997-2004 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/GBK_SHARED.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/GBK_SHARED.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/GENERATE_CPP.MK	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/GENERATE_CPP.MK	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 # Copyright (c) 2000 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/charconvfw/Charconv/ongoing/Group/HZ.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/HZ.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000-2004 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/ISO2022JP.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/ISO2022JP.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2022 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/ISO2022JP1.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/ISO2022JP1.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2022 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/ISO885910.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/ISO885910.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 8859 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/ISO885913.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/ISO885913.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 8859 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/ISO885914.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/ISO885914.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 8859 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/ISO885915.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/ISO885915.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 8859 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/ISO88592.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/ISO88592.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 8859 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/ISO88593.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/ISO88593.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 8859 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/ISO88594.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/ISO88594.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 8859 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/ISO88595.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/ISO88595.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 8859 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/ISO88596.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/ISO88596.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 8859 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/ISO88597.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/ISO88597.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 8859 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/ISO88598.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/ISO88598.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 8859 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/ISO88599.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/ISO88599.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 8859 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/J5.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/J5.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/J5_DOCOMO.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/J5_DOCOMO.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/JIS.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/JIS.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000-2004 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/JISBASE_SHARED.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/JISBASE_SHARED.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/JISX0201.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/JISX0201.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 0201 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/JISX0208.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/JISX0208.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 0208 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/JISX0212.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/JISX0212.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 0212 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/PARSER.PM	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/PARSER.PM	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 # Copyright (c) 1997-2000 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/charconvfw/Charconv/ongoing/Group/RUNTESTS.BAT	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/RUNTESTS.BAT	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 rem All rights reserved.
 rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
+rem under the terms of the License "Eclipse Public License v1.0"
 rem which accompanies this distribution, and is available
 rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
 rem

--- a/charconvfw/Charconv/ongoing/Group/SHIFTJIS.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/SHIFTJIS.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000-2004 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/SHIFTJIS_DOCOMO.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/SHIFTJIS_DOCOMO.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000-2005 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/SHIFTJIS_DOCOMO_SHARED.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/SHIFTJIS_DOCOMO_SHARED.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/SHIFTJIS_SHARED.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/SHIFTJIS_SHARED.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000-2005 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/SNMTOOL.BAT	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/SNMTOOL.BAT	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 rem All rights reserved.
 rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
+rem under the terms of the License "Eclipse Public License v1.0"
 rem which accompanies this distribution, and is available
 rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
 rem

--- a/charconvfw/Charconv/ongoing/Group/SNMTOOL.PL	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/SNMTOOL.PL	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 # Copyright (c) 1997-2000 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/charconvfw/Charconv/ongoing/Group/UCS2.MMP	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/UCS2.MMP	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2003-2004 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/UTF.PM	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/UTF.PM	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 # Copyright (c) 2000 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/charconvfw/Charconv/ongoing/Group/WRITER.PM	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/WRITER.PM	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 # Copyright (c) 1997-2000 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/charconvfw/Charconv/ongoing/Group/bld.inf	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/bld.inf	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 1999-2004 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/charconv_gsm7_turkish.iby	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/charconv_gsm7_turkish.iby	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/charconv_gsm7_turkish_Variant.iby	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/charconv_gsm7_turkish_Variant.iby	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/gsm7_turkish_single.mmp	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/gsm7_turkish_single.mmp	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/turkish_locking_gsm7ext.mmp	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/turkish_locking_gsm7ext.mmp	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Group/turkish_locking_single.mmp	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Group/turkish_locking_single.mmp	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Include/CHARCONV_TLS.H	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Include/CHARCONV_TLS.H	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 1997-2005 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Include/CnvPictographShared.h	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Include/CnvPictographShared.h	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Include/CnvShiftJisDirectmap.h	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Include/CnvShiftJisDirectmap.h	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2022 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Include/J5.H	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Include/J5.H	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Include/JISBASE.H	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Include/JISBASE.H	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/charconvfw/Charconv/ongoing/Include/PictographObserver.h	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Include/PictographObserver.h	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -12,7 +12,6 @@
 * Contributors:
 *
 * Description:        This header file defines functions for conversion of pictograph.
-
 *
 */
 
@@ -24,140 +23,70 @@
 
 
 
-
-
-
 #ifndef PICTOGRAPHOBSERVER_H
-
 #define PICTOGRAPHOBSERVER_H
-
 #include <e32def.h>
-
 #include <e32std.h>
-
 #include <convutils.h>
 
 
-
-
-
 enum TOriginalCharset
-
     {
-
     ECharsetShiftJis,
-
     ECharsetEucJp,
-
     ECharsetOthers
-
     };
 
 
-
-
-
 _LIT(KLitPictographConverterPath, "z:\\system\\libs\\");
-
 _LIT(KLitPictographConverter, "CnvPictographShared.dll");
 
 
 
-
-
-
-
-/**
-
-* It sets parameters to SCharacterSet array.
-
-* It called in ConvertFromUnicode().
-
-* It makes possible that pictograph conversion is called from other
-
-* conversion plug-ins.
-
-* @since 2.6
-
-* @param aArrayOfCharacterSets The conversion table array
-
-*/
-
-IMPORT_C void SetCharacterSetsForPictograph(
-
-    RArray<CnvUtilities::SCharacterSet>& aArrayOfCharacterSets);
-
-
-
 /**
-
 * It sets parameters to SCharacterSet array.
-
 * It called in ConvertFromUnicode().
-
 * It makes possible that pictograph conversion is called from other
-
 * conversion plug-ins.
-
 * @since 2.6
-
 * @param aArrayOfCharacterSets The conversion table array
-
-* @param aOriginalCharset The character set
-
 */
-
 IMPORT_C void SetCharacterSetsForPictograph(
-
-    RArray<CnvUtilities::SCharacterSet>& aArrayOfCharacterSets,
-
-    TOriginalCharset aOriginalCharset);
-
-
+    RArray<CnvUtilities::SCharacterSet>& aArrayOfCharacterSets);
 
 /**
-
-* It sets parameters to SMethod array.
-
-* It called in ConvertToUnicode().
-
+* It sets parameters to SCharacterSet array.
+* It called in ConvertFromUnicode().
 * It makes possible that pictograph conversion is called from other
-
 * conversion plug-ins.
-
 * @since 2.6
-
-* @param aArrayOfMethods The conversion table array
-
+* @param aArrayOfCharacterSets The conversion table array
 * @param aOriginalCharset The character set
+*/
+IMPORT_C void SetCharacterSetsForPictograph(
+    RArray<CnvUtilities::SCharacterSet>& aArrayOfCharacterSets,
+    TOriginalCharset aOriginalCharset);
 
+/**
+* It sets parameters to SMethod array.
+* It called in ConvertToUnicode().
+* It makes possible that pictograph conversion is called from other
+* conversion plug-ins.
+* @since 2.6
+* @param aArrayOfMethods The conversion table array
+* @param aOriginalCharset The character set
 */
-
 IMPORT_C void SetMethodsForPictograph(
-
     RArray<CnvUtilities::SMethod>& aArrayOfMethods, TOriginalCharset aOriginalCharset);
 
-
-
 /**
-
 * It sets parameters to SState array.
-
 * It called in ConvertToUnicode().
-
 * It makes possible that pictograph conversion is called from other
-
 * conversion plug-ins.
-
 * @since 2.6
-
 * @param aArrayOfMethods The conversion table array
-
 */
-
 IMPORT_C void SetStatesForPictograph(RArray<CnvUtilities::SState>& aArrayOfStates);
 
-
-
 #endif // PICTOGRAPHOBSERVER_H
-

--- a/charconvfw/Charconv/ongoing/Include/SHIFTJIS2.H	Tue Feb 02 02:02:46 2010 +0200
+++ b/charconvfw/Charconv/ongoing/Include/SHIFTJIS2.H	Fri Apr 16 16:55:07 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2000 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *