Merge branch '4.7' into qdoc-simplified

Conflicts:
	src/declarative/graphicsitems/qdeclarativeitem.cpp
	src/declarative/util/qdeclarativeanimation.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/translations/linguist_fr.ts b/translations/linguist_fr.ts
index c186adc..b54439f 100644
--- a/translations/linguist_fr.ts
+++ b/translations/linguist_fr.ts
@@ -1182,7 +1182,7 @@ All files (*)</source>
     </message>
     <message>
         <location line="+3"/>
-        <source>&lt;center&gt;&lt;img src=&quot;:/images/splash.png&quot;/&gt;&lt;/img&gt;&lt;p&gt;%1&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Qt Linguist is a tool for adding translations to Qt applications.&lt;/p&gt;&lt;p&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</source>
+        <source>&lt;center&gt;&lt;img src=&quot;:/images/splash.png&quot;/&gt;&lt;/img&gt;&lt;p&gt;%1&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Qt Linguist is a tool for adding translations to Qt applications.&lt;/p&gt;&lt;p&gt;Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>