Update copyright and license descriptions

microsoft · Oct 21, 2013 · 1b31587 · 1b31587
1 parent 11f6e5d
commit 1b31587
Show file tree

Hide file tree

Showing 31 changed files with 329 additions and 193 deletions.
diff --git a/Licence.txt b/Licence.txt
diff --git a/License.txt b/License.txt
@@ -0,0 +1,40 @@
+Copyright � 2013 Nokia Corporation. All rights reserved.
+
+Nokia, Nokia Developer, and HERE are trademarks and/or registered trademarks of
+Nokia Corporation. Other product and company names mentioned herein may be
+trademarks or trade names of their respective owners.
+
+License
+Subject to the conditions below, you may use, copy, modify and/or merge copies
+of this software and associated content and documentation files (the �Software�)
+to test, develop, publish, distribute, sub-license and/or sell new software
+derived from or incorporating the Software, solely in connection with Nokia
+devices. Some of the documentation, content and/or software maybe licensed under
+open source software or other licenses. To the extent such documentation,
+content and/or software are included, licenses and/or other terms and conditions
+shall apply in addition and/or instead of this notice. The exact terms of the
+licenses, disclaimers, acknowledgements and notices are reproduced in the
+materials provided, or in other obvious locations. No other license to any other
+intellectual property rights is granted herein.
+
+This file, unmodified, shall be included with all copies or substantial portions
+of the Software that are distributed in source code form.
+
+The Software cannot constitute the primary value of any new software derived
+from or incorporating the Software.
+
+Any person dealing with the Software shall not misrepresent the source of the
+Software.
+
+Disclaimer
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, QUALITY AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES (INCLUDING,
+WITHOUT LIMITATION, DIRECT, SPECIAL, INDIRECT, PUNITIVE, CONSEQUENTIAL,
+EXEMPLARY AND/ OR INCIDENTAL DAMAGES) OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Nokia Corporation retains the right to make changes to this document at any
+time, without notice.
diff --git a/MusicExplorer/AboutPage.xaml b/MusicExplorer/AboutPage.xaml
@@ -1,9 +1,12 @@
 <!--
- Copyright © 2013 Nokia Corporation. All rights reserved.
- Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
- Other product and company names mentioned herein may be trademarks
- or trade names of their respective owners. 
- See LICENSE.TXT for license information.
+ Copyright (c) 2013 Nokia Corporation. All rights reserved.
+
+ Nokia, Nokia Connecting People, Nokia Developer, and HERE are trademarks
+ and/or registered trademarks of Nokia Corporation. Other product and company
+ names mentioned herein may be trademarks or trade names of their respective
+ owners.
+
+ See the license text file delivered with this project for more information.
 -->
 
 <phone:PhoneApplicationPage

diff --git a/MusicExplorer/AboutPage.xaml.cs b/MusicExplorer/AboutPage.xaml.cs
@@ -1,9 +1,12 @@
-/*
- * Copyright © 2013 Nokia Corporation. All rights reserved.
- * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
- * Other product and company names mentioned herein may be trademarks
- * or trade names of their respective owners. 
- * See LICENSE.TXT for license information.
+/**
+ * Copyright (c) 2013 Nokia Corporation. All rights reserved.
+ *
+ * Nokia, Nokia Connecting People, Nokia Developer, and HERE are trademarks
+ * and/or registered trademarks of Nokia Corporation. Other product and company
+ * names mentioned herein may be trademarks or trade names of their respective
+ * owners.
+ *
+ * See the license text file delivered with this project for more information.
  */
 
 using Microsoft.Phone.Controls;

diff --git a/MusicExplorer/App.xaml b/MusicExplorer/App.xaml
@@ -1,9 +1,12 @@
 <!--
- Copyright © 2013 Nokia Corporation. All rights reserved.
- Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
- Other product and company names mentioned herein may be trademarks
- or trade names of their respective owners. 
- See LICENSE.TXT for license information.
+ Copyright (c) 2013 Nokia Corporation. All rights reserved.
+
+ Nokia, Nokia Connecting People, Nokia Developer, and HERE are trademarks
+ and/or registered trademarks of Nokia Corporation. Other product and company
+ names mentioned herein may be trademarks or trade names of their respective
+ owners.
+
+ See the license text file delivered with this project for more information.
 -->
 
 <Application 

diff --git a/MusicExplorer/App.xaml.cs b/MusicExplorer/App.xaml.cs
@@ -1,9 +1,12 @@
-/*
- * Copyright © 2013 Nokia Corporation. All rights reserved.
- * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
- * Other product and company names mentioned herein may be trademarks
- * or trade names of their respective owners. 
- * See LICENSE.TXT for license information.
+/**
+ * Copyright (c) 2013 Nokia Corporation. All rights reserved.
+ *
+ * Nokia, Nokia Connecting People, Nokia Developer, and HERE are trademarks
+ * and/or registered trademarks of Nokia Corporation. Other product and company
+ * names mentioned herein may be trademarks or trade names of their respective
+ * owners.
+ *
+ * See the license text file delivered with this project for more information.
  */
 
 using System;

diff --git a/MusicExplorer/ArtistPivotPage.xaml b/MusicExplorer/ArtistPivotPage.xaml
@@ -1,9 +1,12 @@
 <!--
- Copyright © 2013 Nokia Corporation. All rights reserved.
- Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
- Other product and company names mentioned herein may be trademarks
- or trade names of their respective owners. 
- See LICENSE.TXT for license information.
+ Copyright (c) 2013 Nokia Corporation. All rights reserved.
+
+ Nokia, Nokia Connecting People, Nokia Developer, and HERE are trademarks
+ and/or registered trademarks of Nokia Corporation. Other product and company
+ names mentioned herein may be trademarks or trade names of their respective
+ owners.
+
+ See the license text file delivered with this project for more information.
 -->
 
 <phone:PhoneApplicationPage

diff --git a/MusicExplorer/ArtistPivotPage.xaml.cs b/MusicExplorer/ArtistPivotPage.xaml.cs
@@ -1,9 +1,12 @@
-/*
- * Copyright © 2013 Nokia Corporation. All rights reserved.
- * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
- * Other product and company names mentioned herein may be trademarks
- * or trade names of their respective owners. 
- * See LICENSE.TXT for license information.
+/**
+ * Copyright (c) 2013 Nokia Corporation. All rights reserved.
+ *
+ * Nokia, Nokia Connecting People, Nokia Developer, and HERE are trademarks
+ * and/or registered trademarks of Nokia Corporation. Other product and company
+ * names mentioned herein may be trademarks or trade names of their respective
+ * owners.
+ *
+ * See the license text file delivered with this project for more information.
  */
 
 using Microsoft.Phone.Controls;

diff --git a/MusicExplorer/CountryCodes.cs b/MusicExplorer/CountryCodes.cs
@@ -1,9 +1,12 @@
-/*
- * Copyright © 2013 Nokia Corporation. All rights reserved.
- * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
- * Other product and company names mentioned herein may be trademarks
- * or trade names of their respective owners. 
- * See LICENSE.TXT for license information.
+/**
+ * Copyright (c) 2013 Nokia Corporation. All rights reserved.
+ *
+ * Nokia, Nokia Connecting People, Nokia Developer, and HERE are trademarks
+ * and/or registered trademarks of Nokia Corporation. Other product and company
+ * names mentioned herein may be trademarks or trade names of their respective
+ * owners.
+ *
+ * See the license text file delivered with this project for more information.
  */
 
 using System;

diff --git a/MusicExplorer/FlipableItem.xaml b/MusicExplorer/FlipableItem.xaml
@@ -1,9 +1,12 @@
 <!--
- Copyright © 2013 Nokia Corporation. All rights reserved.
- Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
- Other product and company names mentioned herein may be trademarks
- or trade names of their respective owners. 
- See LICENSE.TXT for license information.
+ Copyright (c) 2013 Nokia Corporation. All rights reserved.
+
+ Nokia, Nokia Connecting People, Nokia Developer, and HERE are trademarks
+ and/or registered trademarks of Nokia Corporation. Other product and company
+ names mentioned herein may be trademarks or trade names of their respective
+ owners.
+
+ See the license text file delivered with this project for more information.
 -->
 
 <UserControl x:Class="MusicExplorer.FlipableItem"

diff --git a/MusicExplorer/FlipableItem.xaml.cs b/MusicExplorer/FlipableItem.xaml.cs
@@ -1,9 +1,12 @@
-/*
- * Copyright © 2013 Nokia Corporation. All rights reserved.
- * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
- * Other product and company names mentioned herein may be trademarks
- * or trade names of their respective owners. 
- * See LICENSE.TXT for license information.
+/**
+ * Copyright (c) 2013 Nokia Corporation. All rights reserved.
+ *
+ * Nokia, Nokia Connecting People, Nokia Developer, and HERE are trademarks
+ * and/or registered trademarks of Nokia Corporation. Other product and company
+ * names mentioned herein may be trademarks or trade names of their respective
+ * owners.
+ *
+ * See the license text file delivered with this project for more information.
  */
 
 using Microsoft.Phone.Controls;

diff --git a/MusicExplorer/LocalizedStrings.cs b/MusicExplorer/LocalizedStrings.cs
@@ -1,9 +1,12 @@
-/*
- * Copyright © 2013 Nokia Corporation. All rights reserved.
- * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
- * Other product and company names mentioned herein may be trademarks
- * or trade names of their respective owners. 
- * See LICENSE.TXT for license information.
+/**
+ * Copyright (c) 2013 Nokia Corporation. All rights reserved.
+ *
+ * Nokia, Nokia Connecting People, Nokia Developer, and HERE are trademarks
+ * and/or registered trademarks of Nokia Corporation. Other product and company
+ * names mentioned herein may be trademarks or trade names of their respective
+ * owners.
+ *
+ * See the license text file delivered with this project for more information.
  */
 
 using MusicExplorer.Resources;

diff --git a/MusicExplorer/MainPage.xaml b/MusicExplorer/MainPage.xaml
@@ -1,9 +1,12 @@
 <!--
- Copyright © 2013 Nokia Corporation. All rights reserved.
- Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
- Other product and company names mentioned herein may be trademarks
- or trade names of their respective owners. 
- See LICENSE.TXT for license information.
+ Copyright (c) 2013 Nokia Corporation. All rights reserved.
+
+ Nokia, Nokia Connecting People, Nokia Developer, and HERE are trademarks
+ and/or registered trademarks of Nokia Corporation. Other product and company
+ names mentioned herein may be trademarks or trade names of their respective
+ owners.
+
+ See the license text file delivered with this project for more information.
 -->
 
 <phone:PhoneApplicationPage

diff --git a/MusicExplorer/MainPage.xaml.cs b/MusicExplorer/MainPage.xaml.cs
@@ -1,9 +1,12 @@
-/*
- * Copyright © 2013 Nokia Corporation. All rights reserved.
- * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
- * Other product and company names mentioned herein may be trademarks
- * or trade names of their respective owners. 
- * See LICENSE.TXT for license information.
+/**
+ * Copyright (c) 2013 Nokia Corporation. All rights reserved.
+ *
+ * Nokia, Nokia Connecting People, Nokia Developer, and HERE are trademarks
+ * and/or registered trademarks of Nokia Corporation. Other product and company
+ * names mentioned herein may be trademarks or trade names of their respective
+ * owners.
+ *
+ * See the license text file delivered with this project for more information.
  */
 
 using Microsoft.Phone.Controls;

diff --git a/MusicExplorer/MixesPage.xaml b/MusicExplorer/MixesPage.xaml
@@ -1,9 +1,12 @@
 <!--
- Copyright © 2013 Nokia Corporation. All rights reserved.
- Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
- Other product and company names mentioned herein may be trademarks
- or trade names of their respective owners. 
- See LICENSE.TXT for license information.
+ Copyright (c) 2013 Nokia Corporation. All rights reserved.
+
+ Nokia, Nokia Connecting People, Nokia Developer, and HERE are trademarks
+ and/or registered trademarks of Nokia Corporation. Other product and company
+ names mentioned herein may be trademarks or trade names of their respective
+ owners.
+
+ See the license text file delivered with this project for more information.
 -->
 
 <phone:PhoneApplicationPage

diff --git a/MusicExplorer/MixesPage.xaml.cs b/MusicExplorer/MixesPage.xaml.cs
@@ -1,9 +1,12 @@
-/*
- * Copyright © 2013 Nokia Corporation. All rights reserved.
- * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
- * Other product and company names mentioned herein may be trademarks
- * or trade names of their respective owners. 
- * See LICENSE.TXT for license information.
+/**
+ * Copyright (c) 2013 Nokia Corporation. All rights reserved.
+ *
+ * Nokia, Nokia Connecting People, Nokia Developer, and HERE are trademarks
+ * and/or registered trademarks of Nokia Corporation. Other product and company
+ * names mentioned herein may be trademarks or trade names of their respective
+ * owners.
+ *
+ * See the license text file delivered with this project for more information.
  */
 
 using System;

diff --git a/MusicExplorer/Models/ArtistModel.cs b/MusicExplorer/Models/ArtistModel.cs
@@ -1,9 +1,12 @@
-/*
- * Copyright © 2013 Nokia Corporation. All rights reserved.
- * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
- * Other product and company names mentioned herein may be trademarks
- * or trade names of their respective owners. 
- * See LICENSE.TXT for license information.
+/**
+ * Copyright (c) 2013 Nokia Corporation. All rights reserved.
+ *
+ * Nokia, Nokia Connecting People, Nokia Developer, and HERE are trademarks
+ * and/or registered trademarks of Nokia Corporation. Other product and company
+ * names mentioned herein may be trademarks or trade names of their respective
+ * owners.
+ *
+ * See the license text file delivered with this project for more information.
  */
 
 using System;

diff --git a/MusicExplorer/Models/GenreModel.cs b/MusicExplorer/Models/GenreModel.cs
@@ -1,9 +1,12 @@
-/*
- * Copyright © 2013 Nokia Corporation. All rights reserved.
- * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
- * Other product and company names mentioned herein may be trademarks
- * or trade names of their respective owners. 
- * See LICENSE.TXT for license information.
+/**
+ * Copyright (c) 2013 Nokia Corporation. All rights reserved.
+ *
+ * Nokia, Nokia Connecting People, Nokia Developer, and HERE are trademarks
+ * and/or registered trademarks of Nokia Corporation. Other product and company
+ * names mentioned herein may be trademarks or trade names of their respective
+ * owners.
+ *
+ * See the license text file delivered with this project for more information.
  */
 
 using System;

diff --git a/MusicExplorer/Models/MainViewModel.cs b/MusicExplorer/Models/MainViewModel.cs
@@ -1,9 +1,12 @@
-/*
- * Copyright © 2013 Nokia Corporation. All rights reserved.
- * Nokia and Nokia Connecting People are registered trademarks of Nokia Corporation. 
- * Other product and company names mentioned herein may be trademarks
- * or trade names of their respective owners. 
- * See LICENSE.TXT for license information.
+/**
+ * Copyright (c) 2013 Nokia Corporation. All rights reserved.
+ *
+ * Nokia, Nokia Connecting People, Nokia Developer, and HERE are trademarks
+ * and/or registered trademarks of Nokia Corporation. Other product and company
+ * names mentioned herein may be trademarks or trade names of their respective
+ * owners.
+ *
+ * See the license text file delivered with this project for more information.
  */
 
 using Microsoft.Xna.Framework.Media;