More copyright changes to Digia Plc in translations and tools

Change-Id: Idb88b4e72548dfa641c6b8ce78a661fa61757ad0
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

12 files changed, 112 insertions, 112 deletions

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 116b43a..be28762 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -524,8 +524,8 @@ void Configure::parseCmdLine()
             dictionary[ "BUILDDEV" ] = "yes";
         else if (configCmdLine.at(i) == "-nokia-developer") {
             cout << "Detected -nokia-developer option" << endl;
-            cout << "Nokia employees and agents are allowed to use this software under" << endl;
-            cout << "the authority of Nokia Corporation and/or its subsidiary(-ies)" << endl;
+            cout << "Digia employees and agents are allowed to use this software under" << endl;
+            cout << "the authority of Digia Plc and/or its subsidiary(-ies)" << endl;
             dictionary[ "BUILDNOKIA" ] = "yes";
             dictionary[ "BUILDDEV" ] = "yes";
             dictionary["LICENSE_CONFIRMED"] = "yes";
diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp
index eaedb9b..53b7b43 100644
--- a/tools/configure/tools.cpp
+++ b/tools/configure/tools.cpp
@@ -59,7 +59,7 @@ void Tools::checkLicense(QMap<QString,QString> &dictionary, QMap<QString,QString
                          const QString &path)
 {
     if (dictionary[ "BUILDNOKIA" ] == "yes") {
-        dictionary["EDITION"] = "NokiaInternalBuild";
+        dictionary["EDITION"] = "DigiaInternalBuild";
         dictionary["LICENSE_FILE"] = ""; // No License for nokia developers
         dictionary["QT_EDITION"] = "QT_EDITION_OPENSOURCE";
         return; // No license key checking in internal builds
@@ -206,7 +206,7 @@ void Tools::checkLicense(QMap<QString,QString> &dictionary, QMap<QString,QString
 
     if (dictionary.value("DONE") == "error") {
         cout << "You are not licensed for the " << dictionary["PLATFORM NAME"] << " platform." << endl << endl;
-        cout << "Please contact qt-info@nokia.com to upgrade your license" << endl;
+        cout << "Please contact http://www.qt-project.org/legal to upgrade your license" << endl;
         cout << "to include the " << dictionary["PLATFORM NAME"] << " platform, or install the" << endl;
         cout << "Qt Open Source Edition if you intend to develop free software." << endl;
         return;
diff --git a/tools/designer/src/designer/Info_mac.plist b/tools/designer/src/designer/Info_mac.plist
index f19176f..8cfaced 100644
--- a/tools/designer/src/designer/Info_mac.plist
+++ b/tools/designer/src/designer/Info_mac.plist
@@ -2,34 +2,34 @@
 <!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
 <plist version="0.9">
 <dict>
-	<key>CFBundleIconFile</key>
-	<string>@ICON@</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
+        <key>CFBundleIconFile</key>
+        <string>@ICON@</string>
+        <key>CFBundlePackageType</key>
+        <string>APPL</string>
         <key>CFBundleGetInfoString</key>
-	<string>Created by Qt/QMake</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.trolltech.Designer</string>
-	<key>CFBundleSignature</key>
-	<string>ttxt</string>
-	<key>CFBundleExecutable</key>
-	<string>@EXECUTABLE@</string>
-	<key>CFBundleDocumentTypes</key>
+        <string>Created by Qt/QMake</string>
+        <key>CFBundleIdentifier</key>
+        <string>com.trolltech.Designer</string>
+        <key>CFBundleSignature</key>
+        <string>ttxt</string>
+        <key>CFBundleExecutable</key>
+        <string>@EXECUTABLE@</string>
+        <key>CFBundleDocumentTypes</key>
         <array>
                 <dict>
                         <key>CFBundleTypeExtensions</key>
                         <array>
                                 <string>ui</string>
                         </array>
-			<key>CFBundleTypeIconFile</key>
-			<string>uifile.icns</string>
+                        <key>CFBundleTypeIconFile</key>
+                        <string>uifile.icns</string>
                         <key>CFBundleTypeRole</key>
                         <string>Editor</string>
                         <key>LSIsAppleDefaultForType</key>
                         <true/>
                 </dict>
         </array>
-	<key>NOTE</key>
-	<string>Qt/Designer by Nokia Corporation and/or its subsidiary(-ies)</string>
+        <key>NOTE</key>
+        <string>Qt/Designer by Digia Plc and/or its subsidiary(-ies)</string>
 </dict>
 </plist>
diff --git a/tools/doxygen/config/footer.html b/tools/doxygen/config/footer.html
index 8f2bb98..3b796d6 100644
--- a/tools/doxygen/config/footer.html
+++ b/tools/doxygen/config/footer.html
@@ -1,6 +1,6 @@
 <p /><address><hr /><div align="center">
 <table width="100%" cellspacing="0" border="0"><tr class="address">
-<td width="30%">Copyright &copy; 2012 Nokia Corporation and/or its subsidiary(-ies).</td>
+<td width="30%">Copyright &copy; 2012 Digia Plc and/or its subsidiary(-ies).</td>
 <td width="40%" align="center"><a href="trademarks.html">Trademarks</a></td>
 <td width="30%" align="right"><div align="right">Qt $projectnumber</div></td>
 </tr></table></div></address>
diff --git a/tools/linguist/linguist/mainwindow.ui b/tools/linguist/linguist/mainwindow.ui
index f55422d..db16055 100644
--- a/tools/linguist/linguist/mainwindow.ui
+++ b/tools/linguist/linguist/mainwindow.ui
@@ -679,7 +679,7 @@
     <string>About Qt</string>
    </property>
    <property name="whatsThis">
-    <string>Display information about the Qt toolkit by Nokia.</string>
+    <string>Display information about the Qt toolkit by Digia.</string>
    </property>
    <property name="menuRole">
     <enum>QAction::AboutQtRole</enum>
diff --git a/tools/linguist/lrelease/lrelease.1 b/tools/linguist/lrelease/lrelease.1
index f71c501..b4598a4 100644
--- a/tools/linguist/lrelease/lrelease.1
+++ b/tools/linguist/lrelease/lrelease.1
@@ -1,4 +1,4 @@
-.TH lrelease 1 "18 October 2001" "Nokia Corporation and/or its subsidiary(-ies)" \" -*- nroff -*-
+.TH lrelease 1 "18 October 2001" "Digia Plc and/or its subsidiary(-ies)" \" -*- nroff -*-
 .\"
 .\" Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 .\" Contact: http://www.qt-project.org/legal
diff --git a/tools/linguist/lupdate/lupdate.1 b/tools/linguist/lupdate/lupdate.1
index cb35bd6..90d51df 100644
--- a/tools/linguist/lupdate/lupdate.1
+++ b/tools/linguist/lupdate/lupdate.1
@@ -1,4 +1,4 @@
-.TH lupdate 1 "18 October 2001" "Nokia Corporation and/or its subsidiary(-ies)" \" -*- nroff -*-
+.TH lupdate 1 "18 October 2001" "Digia Plc and/or its subsidiary(-ies)" \" -*- nroff -*-
 .\"
 .\" Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 .\" Contact: http://www.qt-project.org/legal
diff --git a/tools/linguist/qdoc.conf b/tools/linguist/qdoc.conf
index 31d44d5..ec0ba7a 100644
--- a/tools/linguist/qdoc.conf
+++ b/tools/linguist/qdoc.conf
@@ -1,15 +1,15 @@
-SOURCEDIRS	= $QTDIR/tools/linguist/doc
+SOURCEDIRS      = $QTDIR/tools/linguist/doc
 DOCDIRS         = $QTDIR/tools/linguist/doc
 EXAMPLEDIRS     = $QTDIR/tools/linguist/tutorial
-OUTPUTDIR	= $QTDIR/tools/linguist/doc/html
-BASE		= file:$QTDIR/tools/linguist/doc/html/
-COMPANY		= Nokia Corporation and/or its subsidiary(-ies)
-PRODUCT		= Qt Linguist
-VERSIONSYM	= QT_VERSION_STR
-DEFINE		= QT_QDOC QT_.*_SUPPORT _WS_.*_
-FALSE		= 0 1
-INTERNAL	= no
-STYLE		= "h3.fn,span.fn { margin-left: 1cm; text-indent: -1cm; }
+OUTPUTDIR       = $QTDIR/tools/linguist/doc/html
+BASE            = file:$QTDIR/tools/linguist/doc/html/
+COMPANY         = Digia Plc and/or its subsidiary(-ies)
+PRODUCT         = Qt Linguist
+VERSIONSYM      = QT_VERSION_STR
+DEFINE          = QT_QDOC QT_.*_SUPPORT _WS_.*_
+FALSE           = 0 1
+INTERNAL        = no
+STYLE           = "h3.fn,span.fn { margin-left: 1cm; text-indent: -1cm; }
 a:link { color: #af4f00; text-decoration: none }
 a:visited { color: #8f2f00; text-decoration: none }
 body { background: #ffffff; color: black; }"
diff --git a/tools/qdoc3/doc/config/scripts/functions.js b/tools/qdoc3/doc/config/scripts/functions.js
index af204d8..c966e40 100644
--- a/tools/qdoc3/doc/config/scripts/functions.js
+++ b/tools/qdoc3/doc/config/scripts/functions.js
@@ -75,7 +75,7 @@ var qturl = "";
 
 // Process data sent back from the server. The data is structured as a XML.
 /*
-XML structure handled by function processNokiaData()
+XML structure handled by function processDigiaData()
 <page> - container for each page returned
 <pageWords/> - contains keywords
 <pageTitle/> - contains page title/header content 
@@ -85,7 +85,7 @@ XML structure handled by function processNokiaData()
 */
 
 
-function processNokiaData(response){
+function processDigiaData(response){
 /* fetch the responce from the server using page as the root element */
 	var propertyTags = response.getElementsByTagName('page');
 	/* reset counters */	
@@ -238,7 +238,7 @@ function CheckEmptyAndLoadList()
 				$('.searching').remove(); 
 				$('#pageType').removeClass('loading');
 
-                processNokiaData(response);
+                processDigiaData(response);
 
  }     
               });
diff --git a/tools/qdoc3/doc/config/scripts/narrow.js b/tools/qdoc3/doc/config/scripts/narrow.js
index a5e8b97..7b48208 100644
--- a/tools/qdoc3/doc/config/scripts/narrow.js
+++ b/tools/qdoc3/doc/config/scripts/narrow.js
@@ -58,76 +58,76 @@ var narrowInit = function() {
 
 /* Executes on doc ready */
 $(document).ready(function(){
-	/* check if body has the narrow class */
-	if ($('body').hasClass('narrow')) {
-		/* run narrowInit */
-		narrowInit();
-	}
- 
-	/* messure window width and add class if it is smaller than 600 px */
-	if($(window).width()<600) {
-		$('body').addClass('narrow');
-		/* if the search box contains */
-		if ($("#narrowsearch").length == 0) {
-			/* run narrowInit */
-			narrowInit();
-		}
-	  }
-	  else { /* if the window is wider than 600 px, narrow is removed */
-		$('body').removeClass('narrow');
-		if ($("#narrowsearch").length == 0) {
-		}
-	}
+        /* check if body has the narrow class */
+        if ($('body').hasClass('narrow')) {
+                /* run narrowInit */
+                narrowInit();
+        }
+
+        /* messure window width and add class if it is smaller than 600 px */
+        if ($(window).width()<600) {
+                $('body').addClass('narrow');
+                /* if the search box contains */
+                if ($("#narrowsearch").length == 0) {
+                        /* run narrowInit */
+                        narrowInit();
+                }
+        }
+        else { /* if the window is wider than 600 px, narrow is removed */
+                $('body').removeClass('narrow');
+                if ($("#narrowsearch").length == 0) {
+                }
+        }
 });
 /* binding resize event to this funciton */
 $(window).bind('resize', function () {
-	/*  if the window is wider than 600 px, narrow class is added */
-	if($(window).width()<600) {
-		$('body').addClass('narrow');
-		if ($("#narrowsearch").length == 0) {
-		  narrowInit();
-		}
-	}
-	else {
-		/* else we remove the narrow class */
-		$('body').removeClass('narrow');
-  }
+        /*  if the window is wider than 600 px, narrow class is added */
+        if ($(window).width()<600) {
+                $('body').addClass('narrow');
+                if ($("#narrowsearch").length == 0) {
+                narrowInit();
+                }
+        }
+        else {
+                /* else we remove the narrow class */
+                $('body').removeClass('narrow');
+        }
 });
 
-	$('#narrowsearch').keyup(function () {
-		/* extract the search box content */
-	  var searchString = $('#narrowsearch').val();
-	  /* if the string is less than three characters */
-	  if ((searchString == null) || (searchString.length < 3)) {
-			/* remove classes and elements*/
-			$('#narrowsearch').removeClass('loading');
-			$('.searching').remove(); 
-			/*  run CheckEmptyAndLoadList */
-			CheckEmptyAndLoadList();
-			
-			$('.report').remove();
-			return;
-	   }
-	   /* if timer checks out */
-		if (this.timer) clearTimeout(this.timer);
-		this.timer = setTimeout(function () {
-			/* add loading image by adding loading class */
-			$('#narrowsearch').addClass('loading');
-			$('.searching').remove(); 
+        $('#narrowsearch').keyup(function () {
+        /* extract the search box content */
+        var searchString = $('#narrowsearch').val();
+        /* if the string is less than three characters */
+        if ((searchString == null) || (searchString.length < 3)) {
+                /* remove classes and elements*/
+                $('#narrowsearch').removeClass('loading');
+                $('.searching').remove();
+                /*  run CheckEmptyAndLoadList */
+                CheckEmptyAndLoadList();
+
+                $('.report').remove();
+                return;
+        }
+        /* if timer checks out */
+        if (this.timer) clearTimeout(this.timer);
+                this.timer = setTimeout(function () {
+                        /* add loading image by adding loading class */
+                        $('#narrowsearch').addClass('loading');
+                        $('.searching').remove();
 
-			/* run the actual search */
-		   $.ajax({
-			contentType: "application/x-www-form-urlencoded",
-			url: 'http://' + location.host + '/nokiasearch/GetDataServlet',
-			data: 'searchString='+searchString,
-			dataType:'xml',
-			type: 'post',	 
-			success: function (response, textStatus) {
-				/* on success remove loading img */
-				$('.searching').remove(); 
-				$('#narrowsearch').removeClass('loading');
-				processNokiaData(response);
-			}     
-		  });
-		}, 500); /* timer set to 500 ms */
-	});
\ No newline at end of file
+                        /* run the actual search */
+                $.ajax({
+                        contentType: "application/x-www-form-urlencoded",
+                        url: 'http://' + location.host + '/nokiasearch/GetDataServlet',
+                        data: 'searchString='+searchString,
+                        dataType:'xml',
+                        type: 'post',
+                        success: function (response, textStatus) {
+                                /* on success remove loading img */
+                                $('.searching').remove();
+                                $('#narrowsearch').removeClass('loading');
+                                processDigiaData(response);
+                        }
+                });
+        }, 500); /* timer set to 500 ms */
+});
diff --git a/tools/qdoc3/doc/qdoc-manual.qdoc b/tools/qdoc3/doc/qdoc-manual.qdoc
index 3b8e30f..f021307 100644
--- a/tools/qdoc3/doc/qdoc-manual.qdoc
+++ b/tools/qdoc3/doc/qdoc-manual.qdoc
@@ -3723,11 +3723,11 @@
         \l{GNU Lesser General Public License (LGPL)} or the
         \l{Qt Commercial Edition}{Qt Commercial License Agreement}, but rather under
         specific licenses from the original authors. Some pieces of code were developed
-        by Nokia and others originated from third parties.
+        by Digia and others originated from third parties.
         This page lists the licenses used, names the authors, and links
         to the places where it is used.
 
-        Nokia gratefully acknowledges these and other contributions
+        Digia gratefully acknowledges these and other contributions
         to Qt. We recommend that programs that use Qt also acknowledge
         these contributions, and quote these license statements in an
         appendix to the documentation.
@@ -4080,10 +4080,10 @@
        <shortdesc>the QWidget class is the base class of all user interface objects.</shortdesc>
        <prolog>
            <author>Qt Development Frameworks</author>
-           <publisher>Nokia</publisher>
+           <publisher>Digia</publisher>
            <copyright>
                <copyryear year="2011"/>
-               <copyrholder>Nokia</copyrholder>
+               <copyrholder>Digia</copyrholder>
            </copyright>
            <permissions view="all"/>
            <metadata>
@@ -7019,9 +7019,9 @@
     \code
     dita.metadata.default.author      = Qt Development Frameworks
     dita.metadata.default.permissions = all
-    dita.metadata.default.publisher   = Nokia
+    dita.metadata.default.publisher   = Digia
     dita.metadata.default.copyryear = 2011
-    dita.metadata.default.copyrholder = Nokia
+    dita.metadata.default.copyrholder = Digia
     dita.metadata.default.audience = programmer
     \endcode
 
diff --git a/tools/qdoc3/test/qt-project.qdocconf b/tools/qdoc3/test/qt-project.qdocconf
index a7b763e..0b83065 100644
--- a/tools/qdoc3/test/qt-project.qdocconf
+++ b/tools/qdoc3/test/qt-project.qdocconf
@@ -37,9 +37,9 @@ qhp.Qt.subprojects.examples.selectors = fake:example
 
 dita.metadata.default.author      = Qt Development Frameworks
 dita.metadata.default.permissions = all
-dita.metadata.default.publisher   = Nokia
+dita.metadata.default.publisher   = Digia
 dita.metadata.default.copyryear = 2012
-dita.metadata.default.copyrholder = Nokia
+dita.metadata.default.copyrholder = Digia
 dita.metadata.default.audience = programmer
 
 language                = Cpp