Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix obsolete URL's.

2 files changed, 6 insertions, 6 deletions

diff --git a/dist/changes-4.5.4 b/dist/changes-4.5.4
index abaf4f0..ac91edb 100644
--- a/dist/changes-4.5.4
+++ b/dist/changes-4.5.4
@@ -9,12 +9,12 @@ The Qt version 4.5 series is binary compatible with the 4.4.x series.
 Applications compiled for 4.4 will continue to run with 4.5.
 
 Some of the changes listed in this file include issue tracking numbers
-corresponding to tasks in the Task Tracker:
+corresponding to tasks in the Qt Bug Tracker, the (now obsolete) Task
+Tracker, or the Merge Request queue of the public source repository.
 
-  http://www.qtsoftware.com/developer/task-tracker
-
-Each of these identifiers can be entered in the task tracker to obtain more
-information about a particular change.
+Qt Bug Tracker: http://bugreports.qt.nokia.com
+Task Tracker:   http://qt.nokia.com/developer/task-tracker
+Merge Request:  http://qt.gitorious.org
 
 ****************************************************************************
 *                           General                                        *
diff --git a/translations/qtconfig_ru.ts b/translations/qtconfig_ru.ts
index 334a801..7be0f04 100644
--- a/translations/qtconfig_ru.ts
+++ b/translations/qtconfig_ru.ts
@@ -892,7 +892,7 @@ p, li { white-space: pre-wrap; }
 <a href="http://www.kde.org">http://www.kde.org</a>
 &lt;/p&gt;</source>
         <translation>&lt;p&gt;
-&lt;a href=&quot;http://qtsoftware.com&quot;&gt;http://qtsoftware.com&lt;/a&gt;
+&lt;a href=&quot;http://qt.nokia.com&quot;&gt;http://qt.nokia.com&lt;/a&gt;
 &lt;/p&gt;
 &lt;p&gt;
 &lt;a href=&quot;http://www.kde.org&quot;&gt;http://www.kde.org&lt;/a&gt;