[Title]UX : modify license

[Desc.]
* Modify 'License Agreement'
* Change text of button 'I accept the terms of this agreement' to 'I agree'

Change-Id: I9466ba5033a1a90056089bb0119ab1879ac93a46

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/page/LicensePage.java b/InstallManager_java/src/org/tizen/installmanager/ui/page/LicensePage.java
index 66d45af..704c9e7 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/page/LicensePage.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/LicensePage.java
@@ -68,7 +68,7 @@ public class LicensePage extends PageTemplate {
                btnAccept = new Button(customComposite, SWT.CHECK);
                btnAccept.setBounds(7, 275, 428, 22);
                btnAccept.setSelection(false);
-               btnAccept.setText("I accept the terms of this agreement.");
+               btnAccept.setText("I agree.");
                btnAccept.setBackground(InstallManagerWindow.getBackgroundColor());
 
                String txt = PathUtil.readAllTextFromResource("/res/COPYING");

diff --git a/InstallManager_java/src/res/COPYING b/InstallManager_java/src/res/COPYING
index 74375c3..d9a5b66 100644 (file)
--- a/InstallManager_java/src/res/COPYING
+++ b/InstallManager_java/src/res/COPYING
@@ -1,12 +1,33 @@
                                                         
 Tizen SDK
                                                         
-Tizen SDK contains software portions licensed under various open source licenses as well as proprietary components.  All open source software portions (“Open Source Software”) are licensed under the open source licenses that accompany such Open Source Software.  
+Tizen SDK contains software portions licensed under various open source
+licenses as well as proprietary components.  All open source software
+portions (“Open Source Software”) are licensed under the open source
+licenses that accompany such Open Source Software.
 
-The licenses governing the Open Source Software are available at: http://developer.tizen.org/download/tizen_sdk_opensource_license.html
+The licenses governing the Open Source Software are available at:
+https://developer.tizen.org/tizen-sdk-opensource-license
 
-Except for the Open Source Software contained in Tizen SDK, all other software portions contained in Tizen SDK are governed by the terms and conditions of the Tizen Software Development Kit License Agreement, available at: http://developer.tizen.org/download/samsung_sdk_license.html
+Except for the Open Source Software and proprietary components
+contributed from companies other than Samsung, contained in Tizen SDK,
+all other software portions contained in Tizen SDK are governed by the
+terms and conditions of the Samsung Tizen SDK License
+Agreement, available at:
+https://developer.tizen.org/tizen-sdk-license. The
+licenses of all proprietary components contributed from companies other
+than Samsung will be either displayed as part of their respective
+installers or accessed inside installation package archive of each
+component.
 
-You may access and download Tizen SDK Open Source Software at: http://developer.tizen.org/download/tizenopensdk.tar.gz
+You may access and download Tizen SDK Open Source Software at:
+http://developer.tizen.org/download/tizenopensdk.tar.gz
 
-BY CLICKING THE "I AGREE" BUTTON OR BY USING ANY PART OF TIZEN SDK, YOU AGREE (ON BEHALF OF YOURSELF AND/OR YOUR COMPANY) TO THE OPEN SOURCE SOFTWARE LICENSE TERMS AND THE TIZEN SOFTWARE DEVELOPMENT KIT LICENSE AGREEMENT. If you do not agree with the Open Source Software license terms or the TIZEN SOFTWARE DEVELOPMENT KIT LICENSE AGREEMENT, you may not download or use Tizen SDK.
\ No newline at end of file
+BY CLICKING THE "I AGREE" BUTTON OR BY USING ANY PART OF TIZEN SDK, YOU
+AGREE (ON BEHALF OF YOURSELF AND/OR YOUR COMPANY) TO THE OPEN SOURCE
+SOFTWARE LICENSE TERMS, THE SAMSUNG TIZEN SDK LICENSE
+AGREEMENT AND THE LICENSES OF ALL PROPRIETARY COMPONENTS CONTRIBUTED FROM
+COMPANIES OTHER THAN SAMSUNG. If you do not agree with the Open Source
+Software license terms or the SAMSUNG TIZEN SDK LICENSE
+AGREEMENT or THE LICENSES OF ALL PROPRIETARY COMPONENTS CONTRIBUTED FROM
+COMPANIES OTHER THAN SAMSUNG, you may not download or use Tizen SDK.
\ No newline at end of file