# HG changeset patch
# User wpaul
# Date 1284404745 18000
# Node ID 0db329b41f7ddc61f34f8309395aa5b25e749c01
# Parent  a49d837532df65c0f28ffa91b29d26a31712aa4b
fixed up metadata editor branding/discovery/etc.

diff -r a49d837532df -r 0db329b41f7d metadataeditor/com.nokia.carbide.extensions.metadataeditor.discovery/images/AME_icon.png
Binary file metadataeditor/com.nokia.carbide.extensions.metadataeditor.discovery/images/AME_icon.png has changed
diff -r a49d837532df -r 0db329b41f7d metadataeditor/com.nokia.carbide.extensions.metadataeditor/feature.xml
--- a/metadataeditor/com.nokia.carbide.extensions.metadataeditor/feature.xml	Mon Sep 13 08:57:28 2010 -0500
+++ b/metadataeditor/com.nokia.carbide.extensions.metadataeditor/feature.xml	Mon Sep 13 14:05:45 2010 -0500
@@ -2,7 +2,7 @@
 <feature
       id="com.nokia.carbide.extensions.metadataeditor"
       label="Carbide.c++ Extensions - Metadata Editor"
-      version="1.1.2.qualifier"
+      version="1.1.3.qualifier"
       provider-name="Nokia"
       plugin="com.nokia.s60tools.metadataeditor">
 
@@ -11,25 +11,345 @@
    </description>
 
    <copyright>
-      Copyright (c) 2007 - 2009 Nokia Corporation and/or its subsidiary(-ies). 
+      Copyright (c) 2007 - 2009 Nokia Corporation and/or its subsidiary(-ies). 
       All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html.
    </copyright>
 
-
    <license url="license.txt">
-This component and the accompanying materials are made available
-under the terms of &quot;Eclipse Public License v1.0&quot;
-which accompanies this distribution, and is available
-at the URL &quot;http://www.eclipse.org/legal/epl-v10.html&quot;.
-
+      COPYRIGHT LICENSE
+NOKIA CORPORATION END-USER SOFTWARE AGREEMENT FOR
+CARBIDE.C++ AND ASSOCIATED ON-DEVICE APPLICATIONS
+This Software Agreement (&quot;Agreement&quot;) is between You (either
+an
+individual or an entity), the End User, and Nokia Corporation
+(&quot;Nokia&quot;). The Agreement authorizes You to use the Software specified
+in Clause 1 below, which may be stored on a CD-ROM, sent to You
+by
+electronic mail, or downloaded from Nokia&apos;s Web pages or Servers
+or
+from other sources under the terms and conditions set forth below.
+This is an agreement on end-user rights and not an agreement
+for sale.
+Nokia continues to own the copy of the Software and the physical
+media
+contained in the sales package and any other copy that You are
+authorized to make pursuant to this Agreement.
+Read this Agreement carefully before installing, downloading,
+or using
+the Software. By clicking on the &quot;I Accept&quot; button while installing,
+downloading, and/or using the Software, You agree to the terms
+and
+conditions of this Agreement. If You do not agree to all of the
+terms
+and conditions of this Agreement, promptly click the &quot;Decline&quot;
+or
+&quot;I Do Not Accept&quot; button, cancel the installation or downloading,
+or
+destroy or return the Software and accompanying documentation
+to
+Nokia. YOU AGREE THAT YOUR USE OF THE SOFTWARE ACKNOWLEDGES THAT
+YOU
+HAVE READ THIS AGREEMENT, UNDERSTAND IT, AND AGREE TO BE BOUND
+BY ITS
+TERMS AND CONDITIONS.
+1. SOFTWARE.
+As used in this Agreement, the term &quot;Software&quot; means, collectively:
+(i) the software product identified above (ii) all the contents
+of the
+disk(s), CD-ROM(s), electronic mail and its file attachments,
+or other
+media with which this Agreement is provided, including the object
+code
+form of the software delivered via a CD-ROM, electronic mail,
+or Web
+page (iii) digital images, stock photographs, clip art, or other
+artistic works (&quot;Stock Files&quot;) (iv) related explanatory written
+materials and any other possible documentation related thereto
+(&quot;Documentation&quot;); (v) fonts, and (vi) upgrades, modified versions,
+updates, additions, and copies of the Software (collectively
+&quot;Updates&quot;), if any, licensed to You by Nokia under this Agreement.
+2. END USER RIGHTS AND USE.
+Nokia grants to You non-exclusive, non-transferable end-user
+rights to
+install the Software on the local hard disk(s) or other permanent
+storage media of one computer and use the Software on a single
+computer or terminal at a time.
+You acknowledge that the use of the Software may require licenses
+to
+third party patents and that Nokia does not grant any licenses
+to such
+third party patents under this Agreement to the You.  Also, any
+and
+all standards related licenses with respect to Essential Patents
+(as
+defined below) are specifically excluded from the scope of this
+Agreement, and those licenses need to be acquired separately
+from
+Nokia or the respective right holders, as the case may be. &quot;Essential
+Patent&quot; means any patent claiming a feature necessarily and
+unavoidably required for compliance with industry standards (usually
+GSM, WCDMA or other similar mobile communications standard),
+to the
+limited extent only that infringement or use of such claims of
+a
+patent cannot be avoided in remaining compliant with industry
+standard
+either for technological reasons or for lack of commercially
+viable
+technical alternatives.
+No patent licenses to any patents of Nokia and/ or its Affiliates
+are
+granted under this Agreement.
+3. LIMITATIONS ON END USER RIGHTS.
+You may not copy, distribute, or make derivative works of the
+Software
+except as follows:
+(a) You may make one copy of the Software on magnetic media as
+an
+archival backup copy, provided Your archival backup copy is not
+installed or used on any computer. Any other copies You make
+of the
+Software are in violation of this Agreement.
+(b) You may not use, modify, translate, reproduce, or transfer
+the
+right to use the Software or copy the Software except as expressly
+provided in this Agreement.
+(c) You may not resell, sublicense, rent, lease, or lend the
+Software.
+(d) You may not reverse engineer, reverse compile, disassemble,
+or
+otherwise attempt to discover the source code of the Software
+(except
+to the extent that this restriction is expressly prohibited by
+law) or
+create derivative works based on the Software.
+(e) Unless stated otherwise in the Documentation, You shall not
+display, modify, reproduce, or distribute any of the Stock Files
+included with the Software. In the event that the Documentation
+allows
+You to display the Stock Files, You shall not distribute the
+Stock
+Files on a stand-alone basis, i.e., in circumstances in which
+the
+Stock Files constitute the primary value of the product being
+distributed. You should review the &quot;Readme&quot; files associated
+with the
+Stock Files that You use to ascertain what rights You have with
+respect to such materials. Stock Files may not be used in the
+production of libelous, defamatory, fraudulent, infringing, lewd,
+obscene, or pornographic material or in any otherwise illegal
+manner.
+You may not register or claim any rights in the Stock Files or
+derivative works thereof.
+(f) You agree that You shall only use the Software in a manner
+that
+complies with all applicable laws in the jurisdiction in which
+You use
+the Software, including, but not limited to, applicable restrictions
+concerning copyright and other intellectual property rights.
+4. INTELLECTUAL PROPERTY RIGHTS.
+The Software and all rights, without limitation including title
+and
+intellectual property rights therein, are owned by Nokia and/or
+its
+licensors and affiliates and are protected by international treaty
+provisions and all other applicable national laws of the country
+in
+which it is being used. The structure, organization, and code
+of the
+Software are the valuable trade secrets and confidential information
+of Nokia and/or its licensors and affiliates. You must not copy
+the
+Software, except as set forth in clause 3 (Limitations On End-User
+Rights). Any copies which You are permitted to make pursuant
+to this
+Agreement must contain the same copyright and other proprietary
+notices that appear on the Software.
+5. MULTIPLE ENVIRONMENT SOFTWARE / MULTIPLE LANGUAGE SOFTWARE
+/
+DUAL MEDIA SOFTWARE / MULTIPLE COPIES / UPDATES.
+If the Software supports multiple platforms or languages, if
+You
+receive the Software on multiple media, or if You otherwise receive
+multiple copies of the Software, the number of computers on which
+all
+versions of the Software are installed shall be one computer.
+You may
+not rent, lease, sublicense, lend, or transfer versions or copies
+of
+the Software You do not use. If the Software is an Update to
+a
+previous version of the Software, You must possess valid end-user
+rights to such a previous version in order to use the Update,
+and You
+may use the previous version for ninety (90) days after You receive
+the Update in order to assist You in the transition to the Update.
+After such time You no longer have a right to use the previous
+version, except for the sole purpose of enabling You to install
+the
+Update.
+6. COMMENCEMENT AND TERMINATION.
+This Agreement is effective from the first date You install the
+Software. You may terminate this Agreement at any time by permanently
+deleting, destroying, and returning, at Your own cost, the Software,
+all backup copies, and all related materials provided by Nokia.
+Your
+end-user rights automatically and immediately terminate without
+notice
+from Nokia if You fail to comply with any provision of this Agreement.
+In such an event, You must immediately delete, destroy, or return
+at
+Your own cost, the Software, all backup copies, and all related
+material to Nokia.
+7. YOU ACKNOWLEDGE THAT THE SOFTWARE IS PROVIDED &quot;AS IS&quot; WITHOUT
+WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, AND TO THE MAXIMUM
+EXTENT
+PERMITTED BY APPLICABLE LAW NEITHER NOKIA, ITS LICENSORS OR
+AFFILIATES, NOR THE COPYRIGHT HOLDERS MAKE ANY REPRESENTATIONS
+OR
+WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+THE
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+OR
+THAT THE SOFTWARE WILL NOT INFRINGE ANY THIRD PARTY PATENTS,
+COPYRIGHTS, TRADEMARKS, OR OTHER RIGHTS. THERE IS NO WARRANTY
+BY NOKIA
+OR BY ANY OTHER PARTY THAT THE FUNCTIONS CONTAINED IN THE SOFTWARE
+WILL MEET YOUR REQUIREMENTS OR THAT THE OPERATION OF THE SOFTWARE
+WILL
+BE UNINTERRUPTED OR ERROR-FREE. YOU ASSUME ALL RESPONSIBILITY
+AND RISK
+FOR THE SELECTION OF THE SOFTWARE TO ACHIEVE YOUR INTENDED RESULTS
+AND
+FOR THE INSTALLATION, USE, AND RESULTS OBTAINED FROM IT.
+8. NO OTHER OBLIGATIONS.
+This Agreement creates no obligations on the part of Nokia other
+than
+as specifically set forth herein.
+9. LIMITATION OF LIABILITY.
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT
+SHALL
+NOKIA, ITS EMPLOYEES OR LICENSORS OR AFFILIATES BE LIABLE FOR
+ANY LOST
+PROFITS, REVENUE, SALES, DATA, OR COSTS OF PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES, PROPERTY DAMAGE, PERSONAL INJURY, INTERRUPTION
+OF
+BUSINESS, LOSS OF BUSINESS INFORMATION, OR FOR ANY SPECIAL, DIRECT,
+INDIRECT, INCIDENTAL, ECONOMIC, COVER, PUNITIVE, SPECIAL, OR
+CONSEQUENTIAL DAMAGES, HOWEVER CAUSED AND WHETHER ARISING UNDER
+CONTRACT, TORT, NEGLIGENCE, OR OTHER THEORY OF LIABILITY ARISING
+OUT
+OF THE USE OF OR INABILITY TO USE THE SOFTWARE, EVEN IF NOKIA
+OR ITS
+LICENSORS OR AFFILIATES ARE ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES. BECAUSE SOME COUNTRIES/STATES/JURISDICTIONS DO NOT ALLOW
+THE
+EXCLUSION OF LIABILITY, BUT MAY ALLOW LIABILITY TO BE LIMITED,
+IN SUCH
+CASES, NOKIA, ITS EMPLOYEES OR LICENSORS OR AFFILIATES&apos; LIABILITY
+SHALL BE LIMITED TO U.S. $50.
+Nothing contained in this Agreement shall prejudice the statutory
+rights of any party dealing as a consumer.
+Nothing contained in this Agreement limits Nokia&apos;s liability
+to You in
+the event of death or personal injury resulting from Nokia&apos;s
+negligence. Nokia is acting on behalf of its employees and licensors
+or affiliates for the purpose of disclaiming, excluding, and/or
+restricting obligations, warranties, and liability as provided
+in this
+clause 9, but in no other respects and for no other purpose.
+10. INDEMNITY.
+You shall defend, indemnify and hold Nokia and its licensors
+harmless
+against any claims, damages, liabilities, losses, costs, suits
+or
+expenditures incurred by Nokia, its Affiliates, or licensors
+as a
+result of any infringement or alleged infringement of intellectual
+property rights of a third party caused by Your development or
+exploitation of the Software.
+11. TECHNICAL SUPPORT.
+Nokia has no obligation to furnish You with technical support
+unless
+separately agreed in writing between You and Nokia.
+12. EXPORT CONTROL.
+The Software, including technical data, includes cryptographic
+software subject to export controls under the U.S. Export
+Administration Regulations (&quot;EAR&quot;) and may be subject to import
+or
+export controls in other countries. The EAR prohibits the use
+of the
+Software and technical data by a Government End User, as defined
+hereafter, without a license from the U.S. government. A Government
+End User is defined in Part 772 of the EAR as &quot;any foreign central,
+regional, or local government department, agency, or other entity
+performing governmental functions; including governmental research
+institutions, governmental corporations, or their separate business
+units (as defined in part 772 of the EAR) which are engaged in
+the
+manufacture or distribution of items or services controlled on
+the
+Wassenaar Munitions List, and international governmental
+organizations. This term does not include: utilities
+(telecommunications companies and Internet service providers;
+banks
+and financial institutions; transportation; broadcast or
+entertainment; educational organizations; civil health and medical
+organizations; retail or wholesale firms; and manufacturing or
+industrial entities not engaged in the manufacture or distribution
+of
+items or services controlled on the Wassenaar Munitions List.)&quot;
+You
+agree to strictly comply with all applicable import and export
+regulations and acknowledge that You have the responsibility
+to obtain
+licenses to export, re-export, transfer, or import the Software.
+You
+further represent that You are not a Government End User as defined
+above, and You will not transfer the Software to any Government
+End
+User without a license.
+13. NOTICES.
+All notices and return of the Software and Documentation should
+be
+delivered to:
+NOKIA CORPORATION
+P.O. Box 100
+FIN-00045 NOKIA GROUP
+FINLAND
+14. APPLICABLE LAW AND GENERAL PROVISIONS.
+This Agreement is governed by the laws of Finland. All disputes
+arising from or relating to this Agreement shall be settled by
+a
+single arbitrator appointed by the Central Chamber of Commerce
+of
+Finland. The arbitration procedure shall take place in Helsinki,
+Finland in the English language. If any part of this Agreement
+is
+found void and unenforceable, it will not affect the validity
+of the
+balance of the Agreement, which shall remain valid and enforceable
+according to its terms. This Agreement may only be modified in
+writing
+signed by an authorized officer of Nokia.
+Nokia hereby reserves the right to change the terms of this Agreement
+at any time at Nokia&apos;s discretion.
+This is the entire agreement between Nokia and You relating to
+the
+Software, and it supersedes any prior representations, discussions,
+undertakings, end-user agreements, communications, or advertising
+relating to the Software.
+PLEASE SUBMIT ANY ACCOMPANYING REGISTRATION FORMS TO RECEIVE
+REGISTRATION BENEFITS WHERE APPLICABLE.
+15. SOURCE CODE
+Part of the graphics of the program are from Eclipse 3.1 platform
+and CDT project in Eclipse community, which are made available
+under 
+the terms of the Eclipse Public License v1.0.
+A copy of the EPL is provided at 
+http://www.eclipse.org/legal/epl-v10.html
    </license>
 
-   <url>
-      <update label="Carbide.c++ Update Site" url="http://tools.ext.nokia.com/updates/carbide22"/>
-      <discovery label="Carbide.c++ Update Site" url="http://tools.ext.nokia.com/updates/carbide203"/>
-   </url>         
-
-
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
@@ -38,7 +358,7 @@
       <import plugin="org.eclipse.ui.workbench.texteditor"/>
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.core.resources"/>
-      <import plugin="com.nokia.s60tools.util" version="1.1.10" match="greaterOrEqual"/>
+      <import feature="com.nokia.s60tools.extensions.framework"/>
    </requires>
 
    <plugin
diff -r a49d837532df -r 0db329b41f7d metadataeditor/com.nokia.carbide.extensions.metadataeditor/license.txt
--- a/metadataeditor/com.nokia.carbide.extensions.metadataeditor/license.txt	Mon Sep 13 08:57:28 2010 -0500
+++ b/metadataeditor/com.nokia.carbide.extensions.metadataeditor/license.txt	Mon Sep 13 14:05:45 2010 -0500
@@ -1,7 +1,285 @@
-Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
-All rights reserved.
+                      COPYRIGHT LICENSE
+
+      NOKIA CORPORATION END-USER SOFTWARE AGREEMENT FOR
+      CARBIDE.C++ AND ASSOCIATED ON-DEVICE APPLICATIONS
+
+This Software Agreement ("Agreement") is between You (either an
+individual or an entity), the End User, and Nokia Corporation
+("Nokia"). The Agreement authorizes You to use the Software specified
+in Clause 1 below, which may be stored on a CD-ROM, sent to You by
+electronic mail, or downloaded from Nokia's Web pages or Servers or
+from other sources under the terms and conditions set forth below.
+This is an agreement on end-user rights and not an agreement for sale.
+Nokia continues to own the copy of the Software and the physical media
+contained in the sales package and any other copy that You are
+authorized to make pursuant to this Agreement.
+
+Read this Agreement carefully before installing, downloading, or using
+the Software. By clicking on the "I Accept" button while installing,
+downloading, and/or using the Software, You agree to the terms and
+conditions of this Agreement. If You do not agree to all of the terms
+and conditions of this Agreement, promptly click the "Decline" or
+"I Do Not Accept" button, cancel the installation or downloading, or
+destroy or return the Software and accompanying documentation to
+Nokia. YOU AGREE THAT YOUR USE OF THE SOFTWARE ACKNOWLEDGES THAT YOU
+HAVE READ THIS AGREEMENT, UNDERSTAND IT, AND AGREE TO BE BOUND BY ITS
+TERMS AND CONDITIONS.
+
+
+1. SOFTWARE.
+
+As used in this Agreement, the term "Software" means, collectively:
+(i) the software product identified above (ii) all the contents of the
+disk(s), CD-ROM(s), electronic mail and its file attachments, or other
+media with which this Agreement is provided, including the object code
+form of the software delivered via a CD-ROM, electronic mail, or Web
+page (iii) digital images, stock photographs, clip art, or other
+artistic works ("Stock Files") (iv) related explanatory written
+materials and any other possible documentation related thereto
+("Documentation"); (v) fonts, and (vi) upgrades, modified versions,
+updates, additions, and copies of the Software (collectively
+"Updates"), if any, licensed to You by Nokia under this Agreement.
+
+
+2. END USER RIGHTS AND USE.
+
+Nokia grants to You non-exclusive, non-transferable end-user rights to
+install the Software on the local hard disk(s) or other permanent
+storage media of one computer and use the Software on a single
+computer or terminal at a time.
+
+You acknowledge that the use of the Software may require licenses to
+third party patents and that Nokia does not grant any licenses to such
+third party patents under this Agreement to the You.  Also, any and
+all standards related licenses with respect to Essential Patents (as
+defined below) are specifically excluded from the scope of this
+Agreement, and those licenses need to be acquired separately from
+Nokia or the respective right holders, as the case may be. "Essential
+Patent" means any patent claiming a feature necessarily and
+unavoidably required for compliance with industry standards (usually
+GSM, WCDMA or other similar mobile communications standard), to the
+limited extent only that infringement or use of such claims of a
+patent cannot be avoided in remaining compliant with industry standard
+either for technological reasons or for lack of commercially viable
+technical alternatives.
+
+No patent licenses to any patents of Nokia and/ or its Affiliates are
+granted under this Agreement.
+
+
+3. LIMITATIONS ON END USER RIGHTS.
+
+You may not copy, distribute, or make derivative works of the Software
+except as follows:
+
+(a) You may make one copy of the Software on magnetic media as an
+archival backup copy, provided Your archival backup copy is not
+installed or used on any computer. Any other copies You make of the
+Software are in violation of this Agreement.
+
+(b) You may not use, modify, translate, reproduce, or transfer the
+right to use the Software or copy the Software except as expressly
+provided in this Agreement.
+
+(c) You may not resell, sublicense, rent, lease, or lend the Software.
+
+(d) You may not reverse engineer, reverse compile, disassemble, or
+otherwise attempt to discover the source code of the Software (except
+to the extent that this restriction is expressly prohibited by law) or
+create derivative works based on the Software.
+
+(e) Unless stated otherwise in the Documentation, You shall not
+display, modify, reproduce, or distribute any of the Stock Files
+included with the Software. In the event that the Documentation allows
+You to display the Stock Files, You shall not distribute the Stock
+Files on a stand-alone basis, i.e., in circumstances in which the
+Stock Files constitute the primary value of the product being
+distributed. You should review the "Readme" files associated with the
+Stock Files that You use to ascertain what rights You have with
+respect to such materials. Stock Files may not be used in the
+production of libelous, defamatory, fraudulent, infringing, lewd,
+obscene, or pornographic material or in any otherwise illegal manner.
+You may not register or claim any rights in the Stock Files or
+derivative works thereof.
+
+(f) You agree that You shall only use the Software in a manner that
+complies with all applicable laws in the jurisdiction in which You use
+the Software, including, but not limited to, applicable restrictions
+concerning copyright and other intellectual property rights.
+
+
+4. INTELLECTUAL PROPERTY RIGHTS.
+
+The Software and all rights, without limitation including title and
+intellectual property rights therein, are owned by Nokia and/or its
+licensors and affiliates and are protected by international treaty
+provisions and all other applicable national laws of the country in
+which it is being used. The structure, organization, and code of the
+Software are the valuable trade secrets and confidential information
+of Nokia and/or its licensors and affiliates. You must not copy the
+Software, except as set forth in clause 3 (Limitations On End-User
+Rights). Any copies which You are permitted to make pursuant to this
+Agreement must contain the same copyright and other proprietary
+notices that appear on the Software.
+
+
+5. MULTIPLE ENVIRONMENT SOFTWARE / MULTIPLE LANGUAGE SOFTWARE /
+DUAL MEDIA SOFTWARE / MULTIPLE COPIES / UPDATES.
+
+If the Software supports multiple platforms or languages, if You
+receive the Software on multiple media, or if You otherwise receive
+multiple copies of the Software, the number of computers on which all
+versions of the Software are installed shall be one computer. You may
+not rent, lease, sublicense, lend, or transfer versions or copies of
+the Software You do not use. If the Software is an Update to a
+previous version of the Software, You must possess valid end-user
+rights to such a previous version in order to use the Update, and You
+may use the previous version for ninety (90) days after You receive
+the Update in order to assist You in the transition to the Update.
+After such time You no longer have a right to use the previous
+version, except for the sole purpose of enabling You to install the
+Update.
+
 
-This component and the accompanying materials are made available
-under the terms of "Eclipse Public License v1.0"
-which accompanies this distribution, and is available
-at the URL "http://www.eclipse.org/legal/epl-v10.html".
+6. COMMENCEMENT AND TERMINATION.
+
+This Agreement is effective from the first date You install the
+Software. You may terminate this Agreement at any time by permanently
+deleting, destroying, and returning, at Your own cost, the Software,
+all backup copies, and all related materials provided by Nokia. Your
+end-user rights automatically and immediately terminate without notice
+from Nokia if You fail to comply with any provision of this Agreement.
+In such an event, You must immediately delete, destroy, or return at
+Your own cost, the Software, all backup copies, and all related
+material to Nokia.
+
+
+7. YOU ACKNOWLEDGE THAT THE SOFTWARE IS PROVIDED "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, AND TO THE MAXIMUM EXTENT
+PERMITTED BY APPLICABLE LAW NEITHER NOKIA, ITS LICENSORS OR
+AFFILIATES, NOR THE COPYRIGHT HOLDERS MAKE ANY REPRESENTATIONS OR
+WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE OR
+THAT THE SOFTWARE WILL NOT INFRINGE ANY THIRD PARTY PATENTS,
+COPYRIGHTS, TRADEMARKS, OR OTHER RIGHTS. THERE IS NO WARRANTY BY NOKIA
+OR BY ANY OTHER PARTY THAT THE FUNCTIONS CONTAINED IN THE SOFTWARE
+WILL MEET YOUR REQUIREMENTS OR THAT THE OPERATION OF THE SOFTWARE WILL
+BE UNINTERRUPTED OR ERROR-FREE. YOU ASSUME ALL RESPONSIBILITY AND RISK
+FOR THE SELECTION OF THE SOFTWARE TO ACHIEVE YOUR INTENDED RESULTS AND
+FOR THE INSTALLATION, USE, AND RESULTS OBTAINED FROM IT.
+
+
+8. NO OTHER OBLIGATIONS.
+
+This Agreement creates no obligations on the part of Nokia other than
+as specifically set forth herein.
+
+
+9. LIMITATION OF LIABILITY.
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL
+NOKIA, ITS EMPLOYEES OR LICENSORS OR AFFILIATES BE LIABLE FOR ANY LOST
+PROFITS, REVENUE, SALES, DATA, OR COSTS OF PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES, PROPERTY DAMAGE, PERSONAL INJURY, INTERRUPTION OF
+BUSINESS, LOSS OF BUSINESS INFORMATION, OR FOR ANY SPECIAL, DIRECT,
+INDIRECT, INCIDENTAL, ECONOMIC, COVER, PUNITIVE, SPECIAL, OR
+CONSEQUENTIAL DAMAGES, HOWEVER CAUSED AND WHETHER ARISING UNDER
+CONTRACT, TORT, NEGLIGENCE, OR OTHER THEORY OF LIABILITY ARISING OUT
+OF THE USE OF OR INABILITY TO USE THE SOFTWARE, EVEN IF NOKIA OR ITS
+LICENSORS OR AFFILIATES ARE ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES. BECAUSE SOME COUNTRIES/STATES/JURISDICTIONS DO NOT ALLOW THE
+EXCLUSION OF LIABILITY, BUT MAY ALLOW LIABILITY TO BE LIMITED, IN SUCH
+CASES, NOKIA, ITS EMPLOYEES OR LICENSORS OR AFFILIATES' LIABILITY
+SHALL BE LIMITED TO U.S. $50.
+
+Nothing contained in this Agreement shall prejudice the statutory
+rights of any party dealing as a consumer.
+
+Nothing contained in this Agreement limits Nokia's liability to You in
+the event of death or personal injury resulting from Nokia's
+negligence. Nokia is acting on behalf of its employees and licensors
+or affiliates for the purpose of disclaiming, excluding, and/or
+restricting obligations, warranties, and liability as provided in this
+clause 9, but in no other respects and for no other purpose.
+
+
+10. INDEMNITY.
+
+You shall defend, indemnify and hold Nokia and its licensors harmless
+against any claims, damages, liabilities, losses, costs, suits or
+expenditures incurred by Nokia, its Affiliates, or licensors as a
+result of any infringement or alleged infringement of intellectual
+property rights of a third party caused by Your development or
+exploitation of the Software.
+
+
+11. TECHNICAL SUPPORT.
+
+Nokia has no obligation to furnish You with technical support unless
+separately agreed in writing between You and Nokia.
+
+
+12. EXPORT CONTROL.
+
+The Software, including technical data, includes cryptographic
+software subject to export controls under the U.S. Export
+Administration Regulations ("EAR") and may be subject to import or
+export controls in other countries. The EAR prohibits the use of the
+Software and technical data by a Government End User, as defined
+hereafter, without a license from the U.S. government. A Government
+End User is defined in Part 772 of the EAR as "any foreign central,
+regional, or local government department, agency, or other entity
+performing governmental functions; including governmental research
+institutions, governmental corporations, or their separate business
+units (as defined in part 772 of the EAR) which are engaged in the
+manufacture or distribution of items or services controlled on the
+Wassenaar Munitions List, and international governmental
+organizations. This term does not include: utilities
+(telecommunications companies and Internet service providers; banks
+and financial institutions; transportation; broadcast or
+entertainment; educational organizations; civil health and medical
+organizations; retail or wholesale firms; and manufacturing or
+industrial entities not engaged in the manufacture or distribution of
+items or services controlled on the Wassenaar Munitions List.)" You
+agree to strictly comply with all applicable import and export
+regulations and acknowledge that You have the responsibility to obtain
+licenses to export, re-export, transfer, or import the Software. You
+further represent that You are not a Government End User as defined
+above, and You will not transfer the Software to any Government End
+User without a license.
+
+
+13. NOTICES.
+
+All notices and return of the Software and Documentation should be
+delivered to:
+
+NOKIA CORPORATION
+P.O. Box 100
+FIN-00045 NOKIA GROUP
+FINLAND
+
+
+14. APPLICABLE LAW AND GENERAL PROVISIONS.
+
+This Agreement is governed by the laws of Finland. All disputes
+arising from or relating to this Agreement shall be settled by a
+single arbitrator appointed by the Central Chamber of Commerce of
+Finland. The arbitration procedure shall take place in Helsinki,
+Finland in the English language. If any part of this Agreement is
+found void and unenforceable, it will not affect the validity of the
+balance of the Agreement, which shall remain valid and enforceable
+according to its terms. This Agreement may only be modified in writing
+signed by an authorized officer of Nokia.
+
+Nokia hereby reserves the right to change the terms of this Agreement
+at any time at Nokia's discretion.
+
+This is the entire agreement between Nokia and You relating to the
+Software, and it supersedes any prior representations, discussions,
+undertakings, end-user agreements, communications, or advertising
+relating to the Software.
+
+PLEASE SUBMIT ANY ACCOMPANYING REGISTRATION FORMS TO RECEIVE
+REGISTRATION BENEFITS WHERE APPLICABLE.
+
diff -r a49d837532df -r 0db329b41f7d metadataeditor/com.nokia.s60tools.metadataeditor/about.html
--- a/metadataeditor/com.nokia.s60tools.metadataeditor/about.html	Mon Sep 13 08:57:28 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>Aug 24, 2007</p>	
-
-<h3>Copyright</h3>
-
-<p>
-
-Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
-<a href=”http://forum.nokia.com/carbide”>http://forum.nokia.com/carbide</a>.<br>
-
-This product includes software developed by Eclipse Project. 
-<a href=”http://www.eclipse.org”>http://www.eclipse.org</a>.
-
-<p>
-
-
-</body>
-</html>
diff -r a49d837532df -r 0db329b41f7d metadataeditor/com.nokia.s60tools.metadataeditor/about.ini
--- a/metadataeditor/com.nokia.s60tools.metadataeditor/about.ini	Mon Sep 13 08:57:28 2010 -0500
+++ b/metadataeditor/com.nokia.s60tools.metadataeditor/about.ini	Mon Sep 13 14:05:45 2010 -0500
@@ -30,7 +30,7 @@
 # Property "featureImage" contains path to feature image (32x32)
 # Not using this in here because we do not want the icon to
 # show on about dialog. Only using aboutText above.
-#featureImage=icons/metadata_editor_16.png
+featureImage=icons/metadata_editor_32.png
 
 # Property "aboutImage" contains path to product image (500x330 or 115x164)
 # needed for primary features only
diff -r a49d837532df -r 0db329b41f7d metadataeditor/com.nokia.s60tools.metadataeditor/about.mappings
--- a/metadataeditor/com.nokia.s60tools.metadataeditor/about.mappings	Mon Sep 13 08:57:28 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2007 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"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-# The following should contain the build version.
-# e.g. "0=20020612"
-0=1
diff -r a49d837532df -r 0db329b41f7d metadataeditor/com.nokia.s60tools.metadataeditor/about.properties
--- a/metadataeditor/com.nokia.s60tools.metadataeditor/about.properties	Mon Sep 13 08:57:28 2010 -0500
+++ b/metadataeditor/com.nokia.s60tools.metadataeditor/about.properties	Mon Sep 13 14:05:45 2010 -0500
@@ -1,24 +1,13 @@
-#
-# Copyright (c) 2007 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"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
+################################################################################
+# Copyright ©2009 Nokia Corporation. All rights reserved.	
+################################################################################
+# about.properties
+# contains externalized strings for about.ini
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# fill-ins are supplied by about.mappings
+# This file should be translated.
 
-productBlurb=Carbide.c++ Extensions - Metadata Editor \n\
+productBlurb=Carbide.c++ Extensions -Metadata Editor \n\
 \n\
-Version: 1.1.2\n\
-Build id: {0}\n\
-\n\
-\n\
-Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).\n\
-\n\
+Copyright (c) 2010 Nokia Corporation. All rights reserved.\n\
+Visit http://www.forum.nokia.com/