Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

123 files changed, 2995 insertions, 5919 deletions

diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc
index 7416341..53a0c55 100644
--- a/doc/src/declarative/animation.qdoc
+++ b/doc/src/declarative/animation.qdoc
@@ -156,11 +156,13 @@ The \l {PropertyAnimation::}{to} property is also required to specify the new
 \section2 Standalone Animations
 
 Animations can also be created as ordinary QML objects that are not bound to
-any particular objects and properties. An example:
+any particular objects and properties. Here is an example, using a 
+PropertyAnimation object. The animation is explicitly started when the 
+\l Rectangle is clicked:
 
 \snippet doc/src/snippets/declarative/animation-standalone.qml 0
 
-A standalone animation is not running by default and must be started explicitly
+A standalone animation object is not running by default and must be started explicitly
 using the \l {Animation::}{running} property or \l {Animation::}{start()} and
 \l {Animation::}{stop()} methods. Since the animation is not bound to a
 particular object or property, it must define the \l
@@ -183,10 +185,13 @@ object and add it to an item's \l {Item::}{transitions} property. An example:
 
 \snippet doc/src/snippets/declarative/animation-transitions.qml 0
 
-When the \l Rectangle changes to the \e moved state, its \c x and \c y property
-values are changed by the PropertyChanges object, and the PropertyAnimation
-defined within the \l Transition is triggered on these properties. The
-animation will not be applied at any time other than during the state change.
+The PropertyChanges object in the \e moved state defines that when the
+\l Rectangle is in this state, its position should be changed
+to (50, 50). When the \l Rectangle changes to the \e moved state, the 
+\l Transition will be triggered, and the transition's \l PropertyAnimation will
+animate the changes in the \c x and \c y properties to their new values.
+The animation will not be applied at any time other than during the state 
+change.
 
 Notice the example does not set any \l {PropertyAnimation::}{from} and \l
 {PropertyAnimation::}{to} values for the PropertyAnimation. As a convenience,
@@ -234,7 +239,7 @@ and rotation changes.
 
 A ColorAnimation allows color values for the \l {ColorAnimation::}{from} 
 and \l {ColorAnimation::}{to} properties. The
-following animates the rectangle's \l {Rectangle::color} property:
+following animates the rectangle's \l {Rectangle::}{color} property:
 
 \snippet doc/src/snippets/declarative/animation-elements.qml color
 
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index ce35f26..ed8b734 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -33,7 +33,7 @@
 dynamic, custom user interfaces.
 
 Qt Quick provides a declarative framework for building highly dynamic,
-custom user interfaces from a rich set of \l {QML Elements}{QML elements}.
+custom user interfaces from a rich set of \l{QML Elements}{QML elements}.
 Qt Quick helps programmers and designers collaborate to
 build the fluid user interfaces that are becoming common in portable
 consumer devices, such as mobile phones, media players, set-top boxes
@@ -41,72 +41,74 @@ and netbooks. Qt Quick consists of the QtDeclarative C++ module, QML, and
 the integration of both of these into the Qt Creator IDE. Using the QtDeclarative
 C++ module, you can load and interact with QML files from your Qt application.
 
-QML provides mechanisms to declaratively build an object tree using
-\l {QML Elements}{QML elements}. QML improves the integration between 
-\l {http://www.ecma-international.org/publications/standards/Ecma-262.htm}{JavaScript}
-and Qt's existing QObject based type
-system, adds support for automatic \l {Property Binding}{property
-bindings} and provides \l {Network Transparency}{network transparency}
-at the language level.
+QML is an extension to \l{About JavaScript}{JavaScript}, that provides
+a mechanism to declaratively build an object tree of
+\l{QML Elements}{QML elements}.  QML improves the integration between
+JavaScript and Qt's existing QObject-based type system, adds support for
+automatic \l{Property Binding}{property bindings} and provides
+\l{Network Transparency}{network transparency} at the language level.
 
-The \l {QML Elements}{QML elements} are a sophisticated set of
+The \l{QML Elements}{QML elements} are a sophisticated set of
 graphical and behavioral building blocks.  These different elements
-are combined together in \l {QML Documents}{QML documents} to build
+are combined together in \l{QML Documents}{QML documents} to build
 components ranging in complexity from simple buttons and sliders, to
-complete internet-enabled applications like a \l
-{http://www.flickr.com}{Flickr} photo browser.
+complete Internet-enabled applications like a photo browser for the
+popular \l{http://www.flickr.com}{Flickr} photo-sharing site.
 
-Qt Quick builds on \l {QML for Qt programmers}{Qt's existing
-strengths}.  QML can be be used to incrementally extend an existing
-application or to build completely new applications.  QML is fully \l
-{Extending QML in C++}{extensible from C++} through the QtDeclarative Module.
+Qt Quick builds on \l{QML for Qt programmers}{Qt's existing strengths}.
+QML can be be used to incrementally extend an existing application or
+to build completely new applications.  QML is fully
+\l{Extending QML in C++}{extensible from C++} through the QtDeclarative
+Module.
 
 \section1 Getting Started
 
 \list
-\o \l {Introduction to the QML language}
-\o \l {QML Tutorial}{Tutorial: 'Hello World'}
-\o \l {QML Advanced Tutorial}{Tutorial: 'Same Game'}
-\o \l {QML Examples and Demos}
-\o \l {QML for Qt programmers}
+\o \l{Introduction to the QML language}
+\o \l{QML Tutorial}{Tutorial: 'Hello World'}
+\o \l{QML Advanced Tutorial}{Tutorial: 'Same Game'}
+\o \l{QML Examples and Demos}
+\o \l{QML for Qt Programmers}
+\o \l{Getting Started Programming with QML}
+\o \l{Beginning Qt Quick}
 \endlist
 
 \section1 Core QML Features
 \list
-\o \l {QML Documents}
-\o \l {Property Binding}
-\o \l {Network Transparency}
-\o \l {QML Scope}
-\o \l {Integrating JavaScript}
-\o \l {Data Models}
-\o \l {anchor-layout.html}{Anchor-based Layout}
-\o \l {qdeclarativestates.html}{States}
-\o \l {qdeclarativeanimation.html}{Animation}
-\o \l {qdeclarativefocus.html}{Keyboard Focus}
-\o \l {qdeclarativemodules.html}{Modules}
-\o \l {Extending types from QML}
-\o \l {qdeclarativedynamicobjects.html}{Dynamic Object Creation}
+\o \l{QML Documents}
+\o \l{Property Binding}
+\o \l{Network Transparency}
+\o \l{QML Scope}
+\o \l{Integrating JavaScript}
+\o \l{Data Models}
+\o \l{Anchor-based Layout in QML}
+\o \l{QML States}
+\o \l{QML Animation}
+\o \l{Keyboard Focus in QML}
+\o \l{QML Modules}
+\o \l{Extending types from QML}
+\o \l{Dynamic Object Management in QML}
+\o \l{Qt Declarative UI Runtime}
 \endlist
 
 \section1 Using QML with C++
 \list
-\o \l {qmlruntime.html}{The Qt Declarative Runtime}
-\o \l {Using QML in C++ Applications}
-\o \l {Integrating QML with existing Qt UI code}
-\o \l {Tutorial: Writing QML extensions with C++}
-\o \l {Extending QML in C++}
+\o \l{Using QML in C++ Applications}
+\o \l{Integrating QML with existing Qt UI code}
+\o \l{Tutorial: Writing QML extensions with C++}
+\o \l{Extending QML in C++}
 \endlist
 
 \section1 Reference
 \list
-\o \l {QML Elements}
-\o \l {QML Global Object}
-\o \l {QML Internationalization}
-\o \l {QML Security}
-\o \l {QtDeclarative Module}
-\o \l {Debugging QML}
-\o \l {QML Viewer}
-\o \l {QML Performance}
-\o \l {QML Coding Conventions}
+\o \l{QML Elements}
+\o \l{QML Global Object}
+\o \l{QML Internationalization}
+\o \l{QML Security}
+\o \l{QtDeclarative Module}
+\o \l{Debugging QML}
+\o \l{QML Viewer}
+\o \l{QML Performance}
+\o \l{QML Coding Conventions}
 \endlist
 */
diff --git a/doc/src/declarative/dynamicobjects.qdoc b/doc/src/declarative/dynamicobjects.qdoc
index 997f601..e735bce 100644
--- a/doc/src/declarative/dynamicobjects.qdoc
+++ b/doc/src/declarative/dynamicobjects.qdoc
@@ -27,7 +27,7 @@
 
 /*!
 \page qdeclarativedynamicobjects.html
-\title Dynamic Object Management
+\title Dynamic Object Management in QML
 
 QML provides a number of ways to dynamically create and manage QML objects. 
 The \l{Loader}, \l{Repeater}, \l{ListView}, \l{GridView} and \l{PathView} elements
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index c008404..94abe10 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -26,113 +26,151 @@
 ****************************************************************************/
 
 /*!
-\page qdeclarativeelements.html
-\target elements
-\title QML Elements
-
-The following table lists the QML elements provided by the \l {QtDeclarative}{Qt Declarative} module.
-
-\table 
-\header \o {2,1} \bold {Basic Visual Items}
-\row \o \l {Item} \o Basic item element inherited by all visual items in QML
-\row \o \l {Rectangle} \o Basic visual rectangle element
-\row \o \l {Gradient} \o Defines a gradient between two or more colors
-\row \o \l {GradientStop} \o Defines a color used in a \l {Gradient}
-\row \o \l {Image} \o Allows the use of bitmaps to a scene
-\row \o \l {BorderImage} (Item-specific) \o Defines an image as a border
-\row \o \l {AnimatedImage} \o For playing animations stored as a series of frames
-\row \o \l {Text} \o Allows the use of formatted text in a scene
-\row \o \l {TextInput} \o Displays an editable line of text
-\row \o \l {IntValidator} \o Validator for integer values
-\row \o \l {DoubleValidator} \o Validator for non-integer values
-\row \o \l {RegExpValidator} \o Validator for string regular expressions
-\row \o \l {TextEdit} \o Displays multiple lines of editable formatted text
-
-\header \o {2,1} \bold {Basic Interaction Items}
-\row \o \l {MouseArea} \o Handles mouse interactions
-\row \o \l {FocusScope} \o For keyboard focus handling 
-\row \o \l {Flickable} \o Provides a surface that can be "flicked"  
-\row \o \l {Flipable} \o Provides a surface that produces flipping effects
-\row \o \l {GestureArea} (experimental) \o Enables simple gesture handling
- 
-\header \o {2,1} \bold {States}
-\row \o \l {State} \o Defines sets of configurations of objects and properties
-\row \o \l {PropertyChanges} \o Describes property changes within a state
-\row \o \l {StateGroup} \o Contains a set of states and state transitions
-\row \o \l {StateChangeScript} \o Allows script binding in a state
-\row \o \l {ParentChange} (Item-specific) \o Re-parent an Item in a state change
-\row \o \l {AnchorChanges} \o Change the anchors of an item in a state
-
-\header \o {2,1} \bold {Animation and Transitions}
-\row \o \l {Behavior} \o Specifies a default animation for property changes
-\row \o \l {SequentialAnimation} \o Runs animations sequentially
-\row \o \l {ParallelAnimation} \o Runs animations in parallel
-\row \o \l {PropertyAnimation} \o Animates property changes
-\row \o \l {NumberAnimation} \o Animates properties of type qreal
-\row \o \l {Vector3dAnimation} \o Animates properties of type QVector3d
-\row \o \l {ColorAnimation} \o Animates color changes
-\row \o \l {RotationAnimation} \o Animates rotations
-\row \o \l {ParentAnimation} \o Animates parent changes
-\row \o \l {AnchorAnimation} \o Animates anchor changes
-\row \o \l {PauseAnimation} \o Pauses an animation 
-\row \o \l {SmoothedAnimation} \o Allows a property to smoothly track a value
-\row \o \l {SpringAnimation} \o Allows a property to track a value in a spring-like motion
-\row \o \l {PropertyAction} \o Sets immediate property changes during animation
-\row \o \l {ScriptAction} \o Runs scripts during an animation
-\row \o \l {Transition} \o Animates transitions during state changes
-
-\header \o {2,1} \bold {Working with Data}
-\row \o \l {Binding} \o Binds any value to any property
-\row \o \l {ListModel} \o Defines a list of data
-\row \o \l {ListElement} \o Defines a data item in a \l {ListModel}
-\row \o \l {VisualItemModel} \o Contains items that already defines its own visual delegate
-\row \o \l {VisualDataModel} \o Encapsulates a model and a delegate
-\row \o \l {Package} \o Collection that enables sharing of items within different views
-\row \o \l {XmlListModel} \o Specifies a model using XPath expressions 
-\row \o \l {XmlRole}  \o Specifies a role for an \l {XmlListModel}
-
-\header \o {2,1} \bold {Views}
-\row \o \l {ListView} \o Provides a list visualization of a model
-\row \o \l {GridView} \o Provides a grid visualization of a model
-\row \o \l {PathView} \o Visualizes a model's contents along a path
-\row \o \l {Path} \o Defines a path used by \l {PathView}
-\row \o \l {PathLine}  \o Defines a line in \l {Path}
-\row \o \l {PathQuad}  \o Defines a quadratic Bezier curve in a \l {Path}
-\row \o \l {PathCubic}  \o Defines a cubic Bezier curve in a \l {Path}
-\row \o \l {PathAttribute}  \o Allows the setting of attributes along a \l {Path}
-\row \o \l {PathPercent}  \o Modifies the item distribution along a \l {Path}
-\row \o \l {WebView} \o Allows the addition of web content to a canvas
-
-\header \o {2,1} \bold {Positioners}
-\row \o \l {Column} \o Arranges its children vertically
-\row \o \l {Row} \o Arranges its children horizontally
-\row \o \l {Grid} \o Positions its children in a grid
-\row \o \l {Flow} \o Positions its children with wrapping support
-
-\header \o {2,1} \bold {Utility}
-\row \o \l {Connections} \o Explicitly connects signals and signal handlers
-\row \o \l {Component} \o Encapsulate QML items as a component
-\row \o \l {Timer} \o Provides timed triggers 
-\row \o \l {QML:QtObject} {QtObject} \o Basic element containing only the objectName property
-\row \o \l {QML:Qt} {Qt} \o The QML global Qt object provides useful enums and functions from Qt.
-\row \o \l {WorkerScript} \o Enables the use of threads in QML
-\row \o \l {Loader} \o Controls the loading of items or components
-\row \o \l {Repeater} \o Uses a model to create multiples of components
-\row \o \l {SystemPalette} \o Provides access to the Qt palettes
-\row \o \l {FontLoader} \o Loads fonts by name or URL
-\row \o \l {LayoutItem} \o Allows declarative UI elements inside Qt's Graphics View layouts 
-
-\header \o {2,1} \bold {Transforms}
-\row \o \l {Scale} \o Assigns item scaling behaviors
-\row \o \l {Rotation} \o Assigns item rotation behaviors
-\row \o \l {Translate} \o Assigns item translation behaviors
-
-\header \o {2,1} \bold {Effects}
-\row \o \l {Particles} (experimental) \o Generates and animates particles
-\row \o \l {ParticleMotionLinear} \o Adds linear motion behavior to \l {Particles}
-\row \o \l {ParticleMotionGravity} \o Adds gravitational motion to \l {Particles}
-\row \o \l {ParticleMotionWander} \o Adds varied motions to \l {Particles}
-\endtable
+  \page qdeclarativeelements.html
+  \target elements
+  \title QML Elements
 
+  This is a dictionary of all the QML elements available in the \l
+  {QtDeclarative} {Qt Declarative} module. 
+
+  To see the QML elements listed by
+  functional area, \l{Groups Of Related QML Elements} {look here}.
+
+  \generatelist qmlclasses
+
+*/
+
+
+/*!
+    \group qml-groups
+    \title Groups Of Related QML Elements
+
+    \brief If you know what kind of QML element you want (Basic Visual, 
+    Interaction, Animation, etc), look here.
+
+    This is a list of functional groups of QML elements.
+
+    \generatelist{related}
+
+*/
+
+/*!
+    \group qml-basic-visual-elements
+    \title Basic QML Visual Elements
+    \ingroup qml-groups
+
+    \brief Elements for constructing basic visual items.
+
+    \generatelist{related}
+
+*/
+
+/*!
+    \group qml-basic-interaction-elements
+    \title Basic QML Interaction Elements
+    \ingroup qml-groups
+
+    \brief Elements for handling basic interactions.
+
+    \generatelist{related}
+
+*/
+
+/*!
+    \group qml-state-elements
+    \title QML State Elements
+    \ingroup qml-groups
+
+    \brief Elements for handling state changes.
+
+    \generatelist{related}
+
+*/
+
+/*!
+    \group qml-event-elements
+    \title QML Event Elements
+    \ingroup qml-groups
+
+    \brief Elements for handling events.
+
+    \generatelist{related}
+
+*/
+
+/*!
+    \group qml-animation-transition
+    \title QML Animation and Transition Elements
+    \ingroup qml-groups
+
+    \brief Elements for handling animations and transitions.
+
+    \generatelist{related}
+
+*/
+
+/*!
+    \group qml-working-with-data
+    \title Working With Data in QML
+    \ingroup qml-groups
+
+    \brief Elements for working with data.
+
+    \generatelist{related}
+
+*/
+
+/*!
+    \group qml-view-elements
+    \title QML View Elements
+    \ingroup qml-groups
+
+    \brief Elements for handling views.
+
+    \generatelist{related}
+
+*/
+
+/*!
+    \group qml-positioning-elements
+    \title QML Positioning Elements
+    \ingroup qml-groups
+
+    \brief Elements for positioning items.
+
+    \generatelist{related}
+
+*/
+
+/*!
+    \group qml-utility-elements
+    \title QML Utility Elements
+    \ingroup qml-groups
+
+    \brief Elements for handling misc operations.
+
+    \generatelist{related}
+
+*/
+
+/*!
+    \group qml-transform-elements
+    \title QML Transform Elements
+    \ingroup qml-groups
+
+    \brief Elements for handling transformations.
+
+    \generatelist{related}
+
+*/
+
+/*!
+    \group qml-particle-elements
+    \title QML Particle Elements
+    \ingroup qml-groups
+
+    \brief Elements for handling particle effects.
+
+    \generatelist{related}
 
 */
diff --git a/doc/src/declarative/qml-intro.qdoc b/doc/src/declarative/qml-intro.qdoc
index fbab001..69dd500 100644
--- a/doc/src/declarative/qml-intro.qdoc
+++ b/doc/src/declarative/qml-intro.qdoc
@@ -28,14 +28,11 @@
 
 
 /*!
-
-\page  qml-intro.html
+\page qml-intro.html
 \title Beginning Qt Quick
 
-
 \section1 Overview
 
-
 QML is a high level, scripted language. Its commands, more correctly \e elements,
 leverage the power and efficiency of the Qt libraries to make easy to use
 commands that perform intuitive functions. Draw a rectangle, display an image at
@@ -61,12 +58,7 @@ would be a property.
 
 The basic syntax of an \l {QML Elements}{element} is
 
-    \code
-    SomeElement {
-        id: myObject
-        ... some other things here ...
-    }
-    \endcode
+\snippet doc/src/snippets/declarative/qml-intro/basic-syntax.qml basic syntax
 
 Here we are defining a new object. We specify its 'type' first as SomeElement.
 Then within matching braces { ... } we specify the various parts of our 
@@ -90,61 +82,38 @@ want a rectangle that is 500 pixels by 400 pixels in the x and y directions
 
 We can implement this \l Rectangle with these properties this way
 
-    \code
-    import Qt 4.7
-
-    // This is a comment. And below myRectangle is defined.
-    Rectangle {
-        id: myRectangle
-        width: 500
-        height: 400
-    }
-    \endcode
+\quotefile doc/src/snippets/declarative/qml-intro/rectangle.qml
 
 This is a valid QML script. To run it, copy it and save it to a file, say
-myexample.qml, and on the command line run the command
+myexample.qml, and on the command line run the following command:
 
-    \code
-    qmlviewer myexample.qml
-    \endcode
+\code
+qmlviewer myexample.qml
+\endcode
 
 On Mac OS X, open the "QMLViewer" application instead and open the
 \c myexample.qml file, or run it from the command line:
 
-    \code
-    QMLViewer.app/Contents/MacOS/QMLViewer myexample.qml
-    \endcode
-    
+\code
+QMLViewer.app/Contents/MacOS/QMLViewer myexample.qml
+\endcode
 
 It will create a very boring rectangle in its own window.
 
 
-
 \section1 Hello World!
 
 We can now add some color and text to make a Hello World QML program.
 
-\l Rectangle has the property \l {Rectangle::color}{color} to produce a
+\l Rectangle has the property \l{Rectangle::color}{color} to produce a
 background color.
 
 Text is handled by a different element called \l Text. We need to create a
-\l Text object inside the \l Rectangle and set its \l {Text::text}{text}
-property to "Hello World!". So to set the text to 'Hello world' and the
+\l Text object inside the \l Rectangle and set its \l{Text::}{text}
+property to "Hello World!". So to set the text to "Hello world" and the
 background colour to light gray,
 
-    \code
-    import Qt 4.7
-    
-    Rectangle {
-        id: myRectangle
-        width: 500
-        height: 400
-
-        Text { text: "Hello World!" }
-
-        color: "lightgray"
-    }
-    \endcode
+\quotefile doc/src/snippets/declarative/qml-intro/hello-world1.qml
 
 
 \section1 Hello World Again
@@ -158,12 +127,7 @@ position belongs to the \l Text element so we set the position inside its
 definition. Note that we separate different QML statements on the same line
 with a semi-colon, or we could have simply put each statement on a new line
 
-    \code
-    Text {
-        text: "<h2>Hello World</h2>"; color: "darkgreen"
-        x: 100; y:100
-    }
-    \endcode
+\snippet doc/src/snippets/declarative/qml-intro/hello-world2.qml updated text
 
 Not only did we reposition the text, but the text was altered by adding
 HTML tags to change the font size. The text color was also changed from the
@@ -174,13 +138,7 @@ We could also have used a hexadecimal string for the RGB (red-green-blue, as
 #rrggbb) values of the color similar to the method used in HTML. For
 example, mostly blue with a green tint,
 
-    \code
-    Text {
-        text: "<h1>Hello world again</h1>"
-        color: "#002288"
-        x: 100; y: 100
-    }
-    \endcode
+\snippet doc/src/snippets/declarative/qml-intro/hello-world3.qml updated text
 
 All of these changes occurred within the \l Text object which is the scope
 of these property changes.
@@ -198,11 +156,7 @@ source of the image, the path to the file, is a URL. Therefore the file can
 be local: \e {mydir/myimage1.png}. Or it can be remote:
 \e {"http://www.example.com/images/myimage1.png"}.
 
-    \code
-    Image {
-        source: "images/qt-logo.png"
-    }
-    \endcode
+\snippet doc/src/snippets/declarative/qml-intro/hello-world4.qml added an image
 
 This displays the image, as we would expect, at the top left of the window.
 The position of the default x = 0, y = 0 coordinate. The example here uses
@@ -213,44 +167,12 @@ Let us reposition the image and enlarge it. Place it at the same 'x' offset
 as the "Hello world again" text, but put it another 50 pixels below the
 text, also make it 150 by 150 pixels in size,
 
-    \code
-    Image {
-        source: "images/qt-logo.png"
-        x: 100; y: 150
-        width: 150; height: 150
-    }
-    \endcode
+\snippet doc/src/snippets/declarative/qml-intro/hello-world5.qml positioning the image
 
 Adding the Hello World example, with the text and the image example we can
 write a simple piece of QML that starts to look a bit better.
 
-    \code
-    import Qt 4.7
-
-    Rectangle {
-        id: myRectangle
-        width: 500
-        height: 400
-        
-        // A light gray background
-        color: "lightgray"
-
-        // Position and color some text
-        Text {
-            text: "<h1>Hello world again</h1>"
-            color: "darkgreen"
-            x: 100; y: 100
-        }
-
-        // Using the opportunity to resize the image.
-        Image {
-            source: "images/qt-logo.png"
-            x: 100; y: 150
-            width: 150; height: 150
-        }
-
-    }
-    \endcode
+\quotefile doc/src/snippets/declarative/qml-intro/hello-world5.qml
 
 The result is still quite simple
 
@@ -281,22 +203,7 @@ If we want to position an image at the bottom of the rectangle it is
 inside. I have to specify that the bottom of the image is also at the
 bottom of the rectangle
 
-    \code
-    import Qt 4.7
-
-    Rectangle {
-        id: myWin
-        width: 500
-        height: 400
-
-        Image {
-            id: image1
-            source: "images/qt-logo.png"
-            width: 150; height: 150
-            anchors.bottom: myWin.bottom
-        }
-    }
-    \endcode
+\quotefile doc/src/snippets/declarative/qml-intro/anchors1.qml
 
 This places the logo at the bottom left of the window.
 
@@ -315,25 +222,7 @@ the bottomMargin property is used. So the new actions for the script are
 
 Encoded into QML the script becomes
 
-    \code
-    import Qt 4.7
-
-    Rectangle {
-        id: myWin
-        width: 500
-        height: 400
-
-        Image {
-            id: image1
-            source: "images/qt-logo.png"
-            width: 150; height: 150
-            anchors.bottom: myWin.bottom
-            anchors.horizontalCenter: myWin.horizontalCenter
-            anchors.bottomMargin: 10
-        }
-    }
-    \endcode
-
+\quotefile doc/src/snippets/declarative/qml-intro/anchors2.qml
 
 Run this and resize the window. You will see that now the position of the
 image adjusts during the resize.
@@ -344,14 +233,7 @@ You can also add another object say a block of descriptive text and place
 it above or below the image or to the side. This code places some text just
 above the image
 
-    \code
-    Text {
-        text: "<h2>The Qt Logo</h2>"
-        anchors.bottom: image1.top
-        anchors.horizontalCenter: myWin.horizontalCenter
-        anchors.bottomMargin: 15
-    }
-    \endcode
+\snippet doc/src/snippets/declarative/qml-intro/anchors3.qml adding some text
 
 \image qml-intro-anchors3.png
 
@@ -359,17 +241,15 @@ above the image
 referencing these properties from another object we use the property
 directly, instead of saying:
 
-    \code
-    myRectangle.anchors.top  // Wrong
-    \endcode
+\qml
+myRectangle.anchors.top  // Wrong
+\endqml
 
 we use
 
-    \code
-    myRectangle.top         // Correct
-    \endcode
-
-
+\qml
+myRectangle.top         // Correct
+\endqml
 
 
 \section1 Transformations
@@ -391,9 +271,9 @@ Rotation of text was also suggested. It could also be useful to scale the
 text. We can do both. The \l {Item::transform}{transform} property is a
 \e list of \l Transform elements, so using the list syntax
 
-    \code
-    myList: [ listElement1, listElement2, ... } ]
-    \endcode
+\qml
+myList: [ listElement1, listElement2, ... } ]
+\endqml
 
 we can produce a list of transformations.
 
@@ -402,46 +282,7 @@ vertically by a factor of 1.5 and by 1.2 horizontally.
 
 Using the example above as the basis for this we have,
 
-    \code
-    import Qt 4.7
-
-    Rectangle {
-        id: myWin
-        width: 500
-        height: 400
-
-        Image {
-            id: image1
-            source: "images/qt-logo.png"
-            width: 150; height: 150
-            anchors.bottom: myWin.bottom
-            anchors.horizontalCenter: myWin.horizontalCenter
-            anchors.bottomMargin: 10
-
-            transform: Rotation {
-                origin.x: 75; origin.y: 75
-                axis{ x: 0; y: 0; z:1 }  angle: -90
-            }
-
-        }
-        
-        Text {
-            text: "<h2>The Qt Logo -- taking it easy</h2>"
-            anchors.bottom: image1.top
-            anchors.horizontalCenter: myWin.horizontalCenter
-            anchors.bottomMargin: 15
-
-            transform: [
-                Scale { xScale: 1.5; yScale: 1.2 } ,
-            
-                Rotation {
-                    origin.x: 75; origin.y: 75
-                    axis{ x: 0; y: 0; z:1 }  angle: -45
-                }
-            ]
-        }
-    }
-    \endcode
+\quotefile doc/src/snippets/declarative/qml-intro/transformations1.qml
 
 The code block in \c image1 starting with \c transform specifies that the
 \l {Item::transform}{transform} property will be a Rotation through -90
@@ -479,30 +320,7 @@ from \l Item. The rotation property is a real number that specifies the
 angle in a clockwise direction for the rotation of the object. Here is the
 code for our animated rotating image.
 
-    \code
-    import Qt 4.7
-
-    Rectangle {
-        id: mainRec
-        width:  600
-        height: 400
-
-        Image {
-            id: image1
-            source: "images/qt-logo.png"
-            x: 200; y: 100
-            width: 100; height: 100
-            
-            // Animate a rotation
-            transformOrigin: Item.Center
-            NumberAnimation on rotation {
-                from: 0; to: 360
-                duration: 2000
-                loops: Animation.Infinite
-            }
-        }
-    }
-    \endcode
+\quotefile doc/src/snippets/declarative/number-animation1.qml
 
 The \c {transformOrigin: Item.Center} is redundant since this is the default
 axis of rotation anyway. But if you change \c Center to \c BottomRight you
@@ -515,32 +333,7 @@ combination. For example, if the task had been to animate the rotation
 about the y-axis passing through the center of the image then the following
 code would do it.
 
-    \code
-    import Qt 4.7
-
-    Rectangle {
-        id: mainRec
-        width:  600
-        height: 400
-
-        Image {
-            id: image1
-            source: "images/qt-logo.png"
-            x: 200; y: 100
-            width: 100; height: 100
-
-            // Animate a rotation
-            transform: Rotation {
-                origin.x: 50; origin.y: 50; axis {x:0; y:1; z:0} angle:0
-                NumberAnimation on angle  {
-                    from: 0; to: 360;
-                    duration: 3000;
-                    loops: Animation.Infinite
-                }
-            }
-        }
-    }
-    \endcode
+\quotefile doc/src/snippets/declarative/number-animation2.qml
 
 Here there is a rectangle 600 by 400 pixels. Placed within that rectangle
 is an image 100 by 100 pixels. It is rotated about the center of the image
@@ -569,31 +362,7 @@ will be animating the position and the size of the image.
 
 First create two images
 
-    \code
-    import Qt 4.7
-
-    Rectangle {
-        id: mainRec
-        width:  600
-        height: 400
-        z: 0
-
-        Image {
-            id: image1
-            source: "images/qt-logo.png"
-            x: 20; y: 20 ; z: 1
-            width: 100; height: 100
-        }
-
-        Image {
-            id: image2
-            source: "images/qt-logo.png"
-            width: 100; height: 100
-            x: (mainRec.width - 100)/2; y: (mainRec.height - 100)/2
-            z: 2
-        }
-    }
-    \endcode
+\quotefile doc/src/snippets/declarative/sequential-animation1.qml
 
 We will add to 'image1' a SequentialAnimation from x = 20 to the target of
 x = 450. The 'from' values will be used because we will be repeating the
@@ -606,14 +375,7 @@ between the x values and over a given duration. After the NumberAnimation
 there will be a PauseAnimation that will pause the animation for 500
 milliseconds (half a second) simply for the visual effect.
 
-    \code
-    SequentialAnimation on x {
-        loops: Animation.Infinite
-        NumberAnimation { from: 20; to: 450; easing.type: "InOutQuad";
-duration: 2000 }
-        PauseAnimation { duration: 500 }
-    }
-    \endcode
+\snippet doc/src/snippets/declarative/sequential-animation2.qml adding a sequential animation
 
 A similar block of code is written for the animation of the 'y' value of
 the position.
@@ -628,54 +390,7 @@ and image1 to 1 and image2 to 2 then image2 will be in the foreground and
 image1 in the background. When image1 passes image2 it will pass behind it.
 The completed code looks like
 
-    \code
-    Rectangle {
-        id: mainRec
-        width:  600
-        height: 400
-        z: 0
-
-        Image {
-            id: image2
-            source: "images/qt-logo.png"
-            width: 100; height: 100
-            x: (mainRec.width - 100)/2; y: (mainRec.height - 100)/2
-            z: 2
-        }
-
-        Image {
-            id: image1
-            source: "images/qt-logo.png"
-            x: 20; y: 20 ; z: 1
-            width: 100; height: 100
-
-            SequentialAnimation on x {
-                loops: Animation.Infinite
-                NumberAnimation {
-                    from: 20; to: 450
-                    easing.type: "InOutQuad"; duration: 2000
-                }
-                PauseAnimation { duration: 500 }
-            }
-            
-            SequentialAnimation on y {
-                loops: Animation.Infinite
-                NumberAnimation {
-                    from: 20; to: 250
-                    easing.type: "InOutQuad"; duration: 2000
-                }
-                PauseAnimation { duration: 500 }
-            }
-
-            SequentialAnimation on scale {
-                loops: Animation.Infinite
-                NumberAnimation { from: 1; to: 0.5; duration: 1000 }
-                NumberAnimation { from: 0.5; to: 1; duration: 1000 }
-                PauseAnimation { duration: 500 }
-            }
-        }
-    }
-    \endcode
+\quotefile doc/src/snippets/declarative/sequential-animation3.qml
 
 The \c {easing.type} has many options, expressed as a string. It specifies the
 kind of equation that describes the acceleration of the property value, not
@@ -756,60 +471,7 @@ will be the default state. We will just go to 'night' by clicking and
 holding the left mouse button down, releasing the mouse button will reverse
 the process
 
-    \code
-    import Qt 4.7
-
-    Rectangle {
-        id: mainRectangle
-        width:  600
-        height: 400
-        color: "black"
-
-        Rectangle {
-            id: sky
-            width: 600
-            height: 200
-            y: 0
-            color: "lightblue"
-        }
-
-        Rectangle {
-            id: ground
-            width: 600; height: 200
-            y: 200
-            color: "green"
-        }
-
-        MouseArea {
-            id: mousearea
-            anchors.fill: mainRectangle
-        }
-
-        states: [ State {
-                name: "night"
-                when: mousearea.pressed == true
-                PropertyChanges { target: sky; color: "darkblue" }
-                PropertyChanges { target: ground; color: "black" }
-            },
-            State {
-                name: "daylight"
-                when: mousearea.pressed == false
-                PropertyChanges { target: sky; color: "lightblue" }
-                PropertyChanges { target: ground; color: "green" }
-            }
-        ]
-
-        transitions: [ Transition {
-                from: "daylight"; to: "night"
-                ColorAnimation { duration: 1000 }
-            },
-            Transition {
-                from: "night"; to: "daylight"
-                ColorAnimation { duration: 500 }
-            }
-        ]
-    }
-    \endcode
+\quotefile doc/src/snippets/declarative/states1.qml
 
 Several new things appear in this sample. Firstly, we use a \l MouseArea
 element to detect mouse clicks in the \e mainRectangle. Secondly, we use
diff --git a/doc/src/declarative/qtprogrammers.qdoc b/doc/src/declarative/qtprogrammers.qdoc
index 68d56bf..c0639db 100644
--- a/doc/src/declarative/qtprogrammers.qdoc
+++ b/doc/src/declarative/qtprogrammers.qdoc
@@ -26,10 +26,9 @@
 ****************************************************************************/
 
 /*!
-
 \page qtprogrammers.html
 \target qtprogrammers
-\title QML for Qt programmers
+\title QML for Qt Programmers
 
 \section1 Overview
 
diff --git a/doc/src/examples/simpletreemodel.qdoc b/doc/src/examples/simpletreemodel.qdoc
index 88aa27a..7d1f8fe 100644
--- a/doc/src/examples/simpletreemodel.qdoc
+++ b/doc/src/examples/simpletreemodel.qdoc
@@ -41,10 +41,9 @@
     of the data to simplify and standardize the way it is accessed.
     Simple models represent data as a table of items, and allow views
     to access this data via an
-    \l{Model/View Programming#model-indexes} {index-based}
-    system. More generally, models can be used to represent data in
-    the form of a tree structure by allowing each item to act as a
-    parent to a table of child items.
+    \l{Model/View Programming#Models}{index-based} system. More generally,
+    models can be used to represent data in the form of a tree structure
+    by allowing each item to act as a parent to a table of child items.
 
     Before attempting to implement a tree model, it is worth considering whether
     the data is supplied by an external source, or whether it is going to be
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index e901124c..61620f5 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -428,3 +428,18 @@
     \externalpage http://developer.symbian.org/wiki/index.php/Deploying_a_Qt_Application
     \title Deploying a Qt Application article
 */
+
+/*!
+    \externalpage http://www.ecma-international.org/publications/standards/Ecma-262.htm
+    \title ECMAScript Language Specification
+*/
+
+/*!
+    \externalpage https://developer.mozilla.org/en/JavaScript
+    \title JavaScript
+*/
+
+/*!
+    \externalpage https://developer.mozilla.org/en/JavaScript/About_JavaScript
+    \title About JavaScript
+*/
diff --git a/doc/src/getting-started/demos.qdoc b/doc/src/getting-started/demos.qdoc
index 4003988..f52fc92 100644
--- a/doc/src/getting-started/demos.qdoc
+++ b/doc/src/getting-started/demos.qdoc
@@ -46,7 +46,7 @@
     \o \inlineimage qtdemo-small.png
     \o If you run the \l{Examples and Demos Launcher}, you'll see many of Qt's
     widgets in action.
-	
+
     The \l{Qt Widget Gallery} also provides overviews of selected Qt
     widgets in each of the styles used on various supported platforms.
     \endtable
@@ -134,15 +134,23 @@
     \section1 QtWebKit
 
     \list
-    \o \l{Web Browser} demonstrates how Qt's \l{WebKit in Qt}{WebKit module}
-        can be used to implement a small Web browser.
+    \o \l{Web Browser} demonstrates how Qt's \l{QtWebKit} module can be used to
+       implement a small Web browser.
+    \endlist
+
+    \section1 Multimedia
+
+    \list
+    \o \l{demos/spectrum}{Spectrum Analyser} shows how the \l{QtMultimedia}
+       module can be used to manipulate audio as it is played.
     \endlist
 
     \section1 Phonon
 
     \list
-    \o \l{demos/qmediaplayer}{Media Player} demonstrates how the \l{Phonon Module} can be
-    used to implement a basic media player application.
+    \o \l{demos/qmediaplayer}{Media Player} demonstrates how the
+    \l{Phonon Module}{Phonon module} can be used to implement a basic media player
+    application.
     \endlist
 
     \note The Phonon demos are currently not available for the MinGW platform.
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 1bf86e5..708c44e 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -343,8 +343,8 @@
 /*!
     \page examples-draganddrop.html
     \ingroup all-examples
-    \title Drag &amp; Drop Examples
-    \brief How to access your platform's native darg &amp; drop functionality
+    \title Drag and Drop Examples
+    \brief How to access your platform's native drag and drop functionality.
 
     \image draganddrop-examples.png
 
diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc
index 6c85776..885e6ce 100644
--- a/doc/src/getting-started/gettingstartedqml.qdoc
+++ b/doc/src/getting-started/gettingstartedqml.qdoc
@@ -26,1026 +26,1025 @@
 ****************************************************************************/
 
 /*!
-    \page qml-textEditor.html
-
-    \title Getting Started programming with QML
-	\ingroup gettingStarted
-	
-	Welcome to the world of QML - the declarative UI language. In this Getting
-	Started guide, we create a simple text editor application using QML.
-	After reading this guide, you should be ready to start developing your own
-	applications using QML and Qt C++.
-
-	\example tutorials/gettingStarted/gsQml
-	
-	\section1 QML to Build User Interfaces
-
-	Here we are building is a simple text editor that con load, save,
-	and perform some text manipulation. This guide consists of two parts. The
-	first part involves designing the application layout and behaviors using
-	declarative language in QML. For the second part, file loading and saving is
-	implemented using Qt C++.
-	Using \l {The Meta-Object System}{Qt's Meta-Object System}, we can expose C++
-	functions as properties that QML elements can use. By utilizing QML and Qt C++,
-	we can efficiently decouple the interface logic from the application logic.
-	
-	\image qml-texteditor5_editmenu.png
-	
-	To run the QML example code, we merely provide the included \l{QML Viewer}{qmlviewer}
-	tool with the QML file as the argument. The C++ portion of this tutorial assumes
-	that the reader possesses basic knowledge of Qt's compilation procedures.
-	
-	\omit
-	Tutorial chapters:
-	\list 1
-		\o \l {Defining a Button and a Menu}{Defining a Button and a Menu}
-		\o \l {Implementing a Menu Bar}{Implementing a Menu Bar}
-		\o \l {Building a Text Editor}{Building a Text Editor}
-		\o \l {Decorating the Text Editor}{Decorating the Text Editor}
-		\o \l {Extending QML using Qt C++}{Extending QML using Qt C++}
-	\endlist
-	\endomit
-
-	\section1 Defining a Button and a Menu
-
-	\section2 Basic Component - a Button
-		
-	We start our text editor by building a button. Functionally, a button has a mouse
-	sensitive area and a label. Buttons perform actions when a user presses the button.
-	
-	In QML, the basic visual item is the \l {Rectangle}{Rectangle} element. The 
-	\c Rectangle element has properties to control the element's appearance and location. 
-	
-	\code
-		import Qt  4.7
-		Rectangle {
-			id: simplebutton
-			color: "grey"
-			width: 150; height: 75
-			
-			Text{
-				id: buttonLabel
-				anchors.centerIn: parent
-				text: "button label"	
-			}
-		}
-	\endcode
-	
-	First, the \c { import Qt 4.7 } allows the qmlviewer tool to import the QML elements
-	we will later use. This line must exist for every QML file. Notice that the version
-	of Qt modules is included in the import statement.
-	
-	This simple rectangle has a unique identifier, \c simplebutton, which is bound to the
-	id property. The \c Rectangle element's properties are bound to values by listing the
-	property, followed by a colon, then the value. In the code sample, the color \c grey
-	is bound to the the Rectangle's \c color property. Similarly, we bind the \c width
-	and \c height of the Rectangle.
-	
-	The \l {Text}{Text} element is a non-editable text field. We name this \c Text element
-	\c buttonLabel. To set the string content of the Text field, we bind a value to the
-	\c text property. The label is contained within the Rectangle and in order to center
-	it in the middle, we assign the \c anchors of the Text element to its parent, which
-	is called \c simplebutton. Anchors may bind to other items' anchors, allowing layout
-	assignments simpler. 
-	
-	We save this code as \c SimpleButton.qml. Running qmlviewer with the file as the
-	argument will display the grey rectangle with a text label.
-	
-	\image qml-texteditor1_simplebutton.png
-	
-	To implement the button click functionality, we can use QML's event handling. QML's event
-	handling is very similar to \l {Signals & Slots}{Qt's signal and slot} mechanism. Signals
-	are emitted and the connected slot is called.
-	
-	\code
-		Rectangle{
-			id:simplebutton
-			...
-
-			MouseArea{ 
-				id: buttonMouseArea
-				
-				anchors.fill: parent //anchor all sides of the mouse area to the rectangle's anchors
-						//onClicked handles valid mouse button clicks
-				onClicked: console.log(buttonLabel.text + " clicked" )
-			}
-		}
-	\endcode
-	
-	We include a \l{MouseArea} element in our simplebutton. \c MouseArea elements describe
-	the interactive area where mouse movements are detected. For our button, we anchor the
-	whole MouseArea to its parent, which is \c simplebutton. The \c anchors.fill syntax is
-	one way of accessing a specific property called \c fill inside a group of properties
-	called \c anchors. QML uses \l {Anchor-based Layout in QML}{anchor based layouts} where
-	items can anchor to another item, creating robust layouts.
-	
-	The \c MouseArea has many signal handlers that are called during mouse movements within
-	the specfied \c MouseArea boundaries. One of them is \c onClicked and it is called
-	whenever the acceptable mouse button is clicked, the left click being the default. We
-	can bind actions to the onClicked handler. In our example, \c console.log() outputs text
-	whenever the mouse area is clicked. The function \c console.log() is a useful tool for
-	debugging purposes and for outputting text. 
-	
-	The code in \c SimpleButton.qml is sufficient to display a button on the screen and
-	output text whenever it is clicked with a mouse.
-	
-	\code
-		Rectangle {
-			id:Button
-			...
-
-			property color buttonColor: "lightblue"	
-			property color onHoverColor: "gold"
-			property color borderColor: "white"
-			
-			signal buttonClick()
-			onButtonClick: {
-				console.log(buttonLabel.text + " clicked" )
-			}
-
-			MouseArea{ 
-				onClicked: buttonClick()	
-				hoverEnabled: true
-				onEntered: parent.border.color = onHoverColor
-				onExited:  parent.border.color = borderColor
-			}
-
-			//determines the color of the button by using the conditional operator
-			color: buttonMouseArea.pressed ? Qt.darker(buttonColor, 1.5) : buttonColor
-		}
-	\endcode
-	
-	A fully functioning button is in \c Button.qml. The code snippets in this article
-	have some code omitted, denoted by ellipses because they were either introduced
-	earlier in the previous sections or irrelevant to the current code discussion.
-	
-	Custom properties are declared using the \c {property type name} syntax. In the
-	code, the property \c buttonColor, of type \c color, is declared and bound to
-	the value \c{"lightblue"}. The \c buttonColor is later used in a conditional
-	operation to determine the buttons's fill color. Note that property value
-	assignment is possible using the \c= equals sign, in addition to value binding
-	using the \c : colon character. Custom properties allow internal items to be
-	accessible outside of the Rectangle's scope. There are basic
-	\l{QML Basic Types}{QML types} such as \c int, \c string, \c real, as well as
-	a type called \c variant.
-	
-	By binding the \c onEntered and \c onExited signal handlers to colors, the
-	button's border will turn yellow when the mouse hovers above the button and
-	reverts the color when the mouse exits the mouse area.
-	
-	A \c buttonClick() signal is declared in \c Button.qml by placing the \c signal
-	keyword in front of the signal name. All signals have their handlers automatically
-	created, their names starting with \c on. As a result, the \c onButtonClick is
-	\c buttonClick's handler. The \c onButtonClick is then assigned an action to
-	perform. In our button example, the \c onClicked mouse handler will simply call
-	\c onButtonClick, which displays a text. The \c onButtonClick enables outside
-	objects to access the \c {Button}'s mouse area easily. For example, items may
-	have more than one \c MouseArea declarations and a \c buttonClick signal can
-	make the distinction between the several \c MouseArea signal handlers better.
-	
-	We now have the basic knowledge to implement items in QML that can handle
-	basic mouse movements. We created a \c Text label inside a \c Rectangle,
-	customized its properties, and implemented behaviors that respond to mouse
-	movements. This idea of creating elements within elements is repeated
-	throughout the text editor application.
-	
-	This button is not useful unless used as a component to perform an action.
-	In the next section, we will soon create a menu containing several of these
-	buttons.
-	
-	\image qml-texteditor1_button.png
-	
-	\section2 Creating a Menu Page
-	
-	Up to this stage, we covered how to create elements and assign behaviors inside
-	a single QML file. In this section, we will cover how to import QML elements and how
-	to reuse some of the created components to build other components.
-	
-	Menus display the contents of a list, each item having the ability to perform an action.
-	In QML, we can create a menu in several ways. First, we will create a menu containing
-	buttons which will eventually perform different actions. The menu code is in
-	\c FileMenu.qml.
-
-	\code
-		import Qt 4.7				\\import the main Qt QML module
-		import �folderName�			\\import the contents of the folder	
-		import �Button.qml�			\\import a QML file
-		import �NewButton.qml� as ButtonModule	\\import a QML file and give it a name
-		import �script.js� as Script		\\import a Javascript file and name it as Script
-	\endcode
-
-	To use the \c Button element in \c FileMenu.qml, we need to import \c Button.qml.
-	The syntax shown above, shows how to use the \c import keyword. However, the
-	\c {import Button.qml} is not necessary; qmlviewer will import all the contents
-	of the current directory. We can directly create a \c Button element by declaring
-	\c Button{}, similar to a \c Rectangle{} declaration.
-
-	\code
-	In FileMenu.qml:
-
-		Row{
-			anchors.centerIn: parent
-			spacing: parent.width/6
-		
-			Button{
-				id: loadButton
-				buttonColor: "lightgrey"
-				label: "Load"
-			}
-			Button{
-				buttonColor: "grey"
-				id: saveButton
-				label: "Save"
-			}
-			Button{
-				id: exitButton
-				label: "Exit"
-				buttonColor: "darkgrey"
-
-				onButtonClick: Qt.quit() 
-			}
-		}
-	\endcode
-
-	In \c FileMenu.qml, we declare three \c Button elements. They are declared
-	inside a \l {Row}{Row} element, a positioner that will position its children
-	along a vertical row. The \c Button declaration resides in Button.qml,
-	which is the same as the \c Button.qml we used in the previous section.
-	New property bindings can be declared within the newly created buttons,
-	effectively overwriting the properties set in \c Button.qml. The button
-	called \c exitButton will quit and close the window when it is clicked.
-	Note that the signal handler \c onButtonClick in \c Button.qml will be
-	called in addition to the \c onButtonClick handler in \c exitButton.
-
-	\image qml-texteditor1_filemenu.png
-
-	The \c Row declaration is declared in a \c Rectangle, creating a rectangle
-	container for the row of buttons. This additional rectangle creates an indirect
-	way of organizing the row of buttons inside a menu.
-
-	The declaration of the edit menu is very similar at this stage. The menu has
-	buttons that have the labels: \c Copy, \c Paste, and \c {Select All}.
-
-	\image qml-texteditor1_editmenu.png      
-
-	Armed with our knowledge of importing and customizing previously made
-	components, we may now combine these menu pages to create a menu bar,
-	consisting of buttons to select the menu, and look at how we may structure
-	data using QML.
-
-	\section1 Implementing a Menu Bar
-
-	Our text editor application will need a way to display menus using a menu bar.
-	The menu bar will switch the different menus and the user can choose which menu
-	to display. Menu switching implies that the menus need more structure than
-	merely displaying them in a row. QML uses models and views to structure data
-	and display the structured data.
-
-	\section2  Using Data Models and Views
-
-	QML has different \l {Data Models}{data views} that display
-	\l {Data Models}{data models}. Our menu bar will display the menus in a list,
-	with a header that displays a row of menu names. The list of menus are declared
-	inside a \c VisualItemModel. The \l{VisualItemModel}{\c VisualItemModel}
-	element contains items that already have views such as \c Rectangle elements
-	and imported UI elements. Other model types such as the \l {ListModel}{\c ListModel}
-	element need a delegate to display their data.
-
-	We declare two visual items in the \c menuListModel, the \c FileMenu and the
-	\c EditMenu. We customize the two menus and display them using a
-	\l {ListView}{ListView}. The \c MenuBar.qml file contains the QML declarations
-	and a simple edit menu is defined in \c EditMenu.qml.
-
-	\code
-		VisualItemModel{
-			id: menuListModel
-			FileMenu{
-				width: menuListView.width
-				height: menuBar.height
-				color: fileColor
-			}
-			EditMenu{
-				color: editColor
-				width:  menuListView.width
-				height: menuBar.height
-			}
-		}
-	\endcode
-
-	The \l {ListView}{ListView} element will display a model according to a delegate.
-	The delegate may declare the model items to display in a \c Row element or display
-	the items in a grid. Our \c menuListModel already has visible items, therefore,
-	we do not need to declare a delegate.
-
-	\code
-		ListView{
-			id: menuListView
-			
-			//Anchors are set to react to window anchors
-			anchors.fill:parent
-			anchors.bottom: parent.bottom
-			width:parent.width
-			height: parent.height
-
-			//the model contains the data
-			model: menuListModel
-
-			//control the movement of the menu switching
-			snapMode: ListView.SnapOneItem
-			orientation: ListView.Horizontal
-			boundsBehavior: Flickable.StopAtBounds 
-			flickDeceleration: 5000
-			highlightFollowsCurrentItem: true
-			highlightMoveDuration:240
-			highlightRangeMode: ListView.StrictlyEnforceRange
-		}
-	\endcode
-
-	Additionally, \c ListView inherits from \l {Flickable}{\c Flickable}, making
-	the list respond to mouse drags and other gestures. The last portion of the
-	code above sets \c Flickable properties to create the desired flicking movement
-	to our view. In particular,the property \c highlightMoveDuration changes the
-	duration of the flick transition. A higher \c highlightMoveDuration value
-	results in slower menu switching. 
-
-	The \c ListView maintains the model items through an \c index and each visual
-	item in the model is accessible through the \c index, in the order of the
-	declaration. Changing the \c currentIndex effectively changes the highlighted
-	item in the \c ListView. The header of our menu bar exemplify this effect.
-	There are two buttons in a row, both changing the current menu when clicked.
-	The \c fileButton changes the current menu to the file menu when clicked,
-	the \c index being \c 0 because \c FileMenu is declared first in the
-	\c menuListModel. Similarly, the \c editButton will change the current
-	menu to the \c EditMenu when clicked.
-
-	The \c labelList rectangle has \c z value of \c 1, denoting that it is displayed
-	at the front of the menu bar. Items with higher \c z values are displayed in front
-	of items with lower \c z values. The default \c z value is \c 0.
-
-	\code
-		Rectangle{
-			id: labelList
-			...
-			z: 1
-			Row{
-				anchors.centerIn: parent
-				spacing:40
-				Button{
-					label: "File"
-					id: fileButton
-					...
-					onButtonClick: menuListView.currentIndex = 0
-				}
-				Button{
-					id: editButton
-					label: "Edit"
-					...
-					onButtonClick:	menuListView.currentIndex = 1	
-				}
-			}
-		}
-	\endcode
-
-	The menu bar we just created can be flicked to access the menus or by clicking
-	on the menu names at the top. Switching menu screens feel intuitive and responsive.
-
-	\image qml-texteditor2_menubar.png 
-
-	\section1 Building a Text Editor
-
-	\section2 Declaring a TextArea
-
-	Our text editor is not a text editor if it didn't contain an editable text area.
-	QML's \l {TextEdit}{TextEdit} element allows the declaration of a multi-line
-	editable text area. \l {TextEdit}{TextEdit} is different from a \l {Text}{Text}
-	element, which doesn't allow the user to directly edit the text.
-
-	\code
-		TextEdit{
-			id: textEditor 
-			anchors.fill:parent
-			width:parent.width; height:parent.height
-			color:"midnightblue"
-			focus: true
-
-			wrapMode: TextEdit.Wrap
-		
-			onCursorRectangleChanged: flickArea.ensureVisible(cursorRectangle)
-		}
-	\endcode
-
-	The editor has its font color property set and set to wrap the text. The
-	\c TextEdit area is inside a flickable area that will scroll the text if the
-	text cursor is outside the visible area. The function \c ensureVisible() will
-	check if the cursor rectangle is outside the visible boundaries and move the
-	text area accordingly. QML uses Javascript syntax for its scripts, and as previously
-	mentioned, Javascript files can be imported and used within a QML file.
-
-	\code
-		function ensureVisible(r){
-			if (contentX >= r.x)
-				contentX = r.x;
-			else if (contentX+width <= r.x+r.width)
-				contentX = r.x+r.width-width;
-			if (contentY >= r.y)
-				contentY = r.y;
-			else if (contentY+height <= r.y+r.height)
-				contentY = r.y+r.height-height;
-		}
-	\endcode
-		
-	\section1 Combining Components for the Text Editor
-
-	We are now ready to create the layout of our text editor using QML. The text
-	editor has two components, the menu bar we created and the text area. QML allows
-	us to reuse components, therefore making our code simpler, by importing components
-	and customizing when necessary. Our text editor splits the window into two;
-	one-third of the screen is dedicated to the menu bar and two-thirds of the screen
-	displays the text area. The menu bar is displayed in front of any other elements.
-
-	\code
-		Rectangle{
-
-			id: screen
-			width: 1000; height: 1000
-
-			//the screen is partitioned into the MenuBar and TextArea. 1/3 of the screen is assigned to the MenuBar
-			property int partition: height/3
-			
-			MenuBar{
-				id:menuBar
-				height: partition
-				width:parent.width
-				z: 1
-			}
-
-			TextArea{
-				id:textArea
-				anchors.bottom:parent.bottom
-				y: partition
-				color: "white"
-				height: partition*2
-				width:parent.width
-			}
-		}
-	\endcode
-
-	By importing reusable components, our \c TextEditor code looks much simpler.
-	We can then customize the main application, without worrying about properties
-	that already have defined behaviors. Using this approach, application layouts
-	and UI components can be created easily.
-
-	\image qml-texteditor3_texteditor.png 
-
-	\section1 Decorating the Text Editor
-	\section2 Implementing a Drawer Interface
-
-	Our text editor looks simple and we need to decorate it. Using QML, we can declare
-	transitions and animate our text editor. Our menu bar is occupying one-third of the
-	screen and it would be nice to have it only appear when we want it. 
-
-	We can add a drawer interface, that will contract or expand the menu bar when clicked.
-	In our implementation, we have a thin rectangle that responds to mouse clicks. The
-	\c drawer, as well as the application, has two sates: the "drawer is open" state and
-	the "drawer is closed" state. The \c drawer item is a strip of rectangle with a small
-	height. There is a nested \l {Image}{Image} element declaring that an arrow icon will
-	be centered inside the drawer. The drawer assigns a state to the whole application,
-	with the identifier \c screen, whenever a user clicks the mouse area.
-
-	\code
-		Rectangle{
-			id:drawer
-			height:15
-		
-			Image{
-				id: arrowIcon
-				source: "images/arrow.png"
-				anchors.horizontalCenter: parent.horizontalCenter
-			}
-			
-			MouseArea{
-				id: drawerMouseArea
-				anchors.fill:parent
-				onClicked:{
-					if (screen.state == "DRAWER_CLOSED"){
-						screen.state = "DRAWER_OPEN"
-					}
-					else if (screen.state == "DRAWER_OPEN"){
-						screen.state = "DRAWER_CLOSED"
-					}
-				}
-				...
-			}
-		}
-	\endcode
-
-	A state is simply a collection of configurations and it is declared in a
-	\l{State}{State} element. A list of states can be listed and bound to the
-	\c states property. In our application, the two states are called
-	\c DRAWER_CLOSED and \c DRAWER_OPEN. Item configurations are declared in
-	\l {PropertyChanges}{PropertyChanges} elements. In the \c DRAWER_OPEN state,
-	there are four items that will receive property changes. The first target,
-	\c menuBar, will change its \c y property to \c 0. Similarly, the \c textArea
-	will lower to a new position when the state is \c DRAWER_OPEN. The \c textArea,
-	the \c drawer, and the drawer's icon will undergo property changes to meet the
-	current state.
-
-	\code
-
-		states:[
-			State{
-				name: "DRAWER_OPEN"
-				PropertyChanges { target: menuBar; y:0}
-				PropertyChanges { target: textArea; y: partition + drawer.height}
-				PropertyChanges { target: drawer; y: partition}
-				PropertyChanges { target: arrowIcon; rotation: 180} 
-			},
-			State{
-				name: "DRAWER_CLOSED"
-				PropertyChanges { target: menuBar; y:-partition}
-				PropertyChanges { target: textArea; y: drawer.height; height: screen.height - drawer.height}
-				PropertyChanges { target: drawer; y: 0}
-				PropertyChanges { target: arrowIcon; rotation: 0} 
-			}
-
-		]
-
-	\endcode
-
-	State changes are abrupt and needs smoother transitions. Transitions between states
-	are defined using the \l {Transition}{Transition} element, which can then bind to
-	the item's \c transitions property. Our text editor has a state transition whenever
-	the state changes to either \c DRAWER_OPEN or \c DRAWER_CLOSED. Importantly, the
-	transition needs a \c from and a \c to state but for our transitions, we can use
-	the wild card \c * symbol to denote that the transition applies to all state changes. 
-
-	During transitions, we can assign animations to the property changes. Our
-	\c menuBar switches position from \c {y:0} to \c {y:-partition} and we can animate
-	this transition using the \l {NumberAnimation}{NumberAnimation} element. We declare
-	that the targets' properties will animate for a certain duration of time and using
-	a certain easing curve. An easing curve controls the animation rates and
-	interpolation behavior during state transitions. The easing curve we chose is
-	\l{PropertyAnimation::easing.type}{Easing.OutQuint}, which slows the movement near
-	the end of the animation. Pleae read \l {qdeclarativeanimation.html}{QML's Animation}
-	article.
-
-	\code
-		transitions: [
-			Transition{
-				to: "*"
-				NumberAnimation { target: textArea; properties: "y, height"; duration: 100; easing.type: Easing.OutQuint }
-				NumberAnimation { target: menuBar; properties: "y"; duration: 100;easing.type: Easing.OutQuint }
-				NumberAnimation { target: drawer; properties: "y"; duration: 100;easing.type: Easing.OutQuint }
-			}
-		]
-	\endcode
-
-	Another way of animating property changes is by declaring a \l {Behavior}{Behavior}
-	element. A transition only works during state changes and \c Behavior can set an
-	animation for a general property change. In the text editor, the arrow has a
-	\c NumberAnimation animating its \c rotation property whenever the property changes.
-
-	\code
-	In TextEditor.qml:
-
-		Behavior{
-			NumberAnimation{property: "rotation";easing.type: Easing.OutExpo }
-		}	
-	\endcode
-
-	Going back to our components with knowledge of states and animations, we can improve
-	the appearances of the components. In \c Button.qml, we can add \c color and \c scale
-	property changes when the button is clicked. Color types are animated using
-	\l {ColorAnimation}{ColorAnimation} and numbers are animated using
-	\l {NumberAnimation}{NumberAnimation}. The \c {on propertyName} syntax displayed below
-	is helpful when targeting a single property.
-
-	\code
-	In Button.qml:
-		...
-		
-		color: buttonMouseArea.pressed ? Qt.darker(buttonColor, 1.5) : buttonColor
-		Behavior on color { ColorAnimation{ duration: 55} }
-		
-		scale: buttonMouseArea.pressed ? 1.1 : 1.00
-		Behavior on scale { NumberAnimation{ duration: 55} }
-	\endcode
-
-	Additionally, we can enhance the appearances of our QML components by adding color
-	effects such as gradients and opacity effects. Declaring a \l {Gradient}{Gradient}
-	element will override the \c color property of the element. You may declare a color
-	in the gradient using the \l {GradientStop}{GradientStop} element. The gradient is
-	positioned using a scale, between \c 0.0 and \c 1.0.
-
-	\code
-	In MenuBar.qml
-		gradient: Gradient {
-			GradientStop { position: 0.0; color: "#8C8F8C" }
-			GradientStop { position: 0.17; color: "#6A6D6A" }
-			GradientStop { position: 0.98;color: "#3F3F3F" }
-			GradientStop { position: 1.0; color: "#0e1B20" }
-		}
-	\endcode
-
-	This gradient is used by the menu bar to display a gradient simulating depth.
-	The first color starts at \c 0.0 and the last color is at \c 1.0.
-
-
-	\section2 Where to Go from Here
-
-		We are finished building the user interface of a very simple text editor.
-		Going forward, the user interface is complete, and we can implement the
-		application logic using regular Qt and C++. QML works nicely as a prototyping
-		tool, separating the application logic away from the UI design. 
-
-	\image qml-texteditor4_texteditor.png  
-	
-	\section1 Extending QML using Qt C++
-
-	Now that we have our text editor layout, we may now implement the text editor
-	functionalities in C++. Using QML with C++ enables us to create our application
-	logic using Qt. We can create a QML context in a C++ application using the
-	\l {Using QML in C++ Applications}{Qt's Declarative} classes and display the QML
-	elements using a Graphics Scene. Alternatively, we can export our C++ code into
-	a plugin that the \l {QML Viewer}{qmlviewer} tool can read. For our application,
-	we shall implement the load and save functions in C++ and export it as a plugin.
-	This way, we only need to load the QML file directly instead of running an executable.
-
-	\section2 Exposing C++ Classes to QML 
-
-	We will be implementing file loading and saving using Qt and C++. C++ classes
-	and functions can be used in QML by registering them. The class also needs to be
-	compiled as a Qt plugin and the QML file will need to know where the plugin is located.
-
-	For our application, we need to create the following items:
-	\list 1
-	\o \c Directory class that will handle directory related operations
-	\o \c File class which is a QObject, simulating the list of files in a directory
-	\o plugin class that will register the class to the QML context
-	\o Qt project file that will compile the plugin
-	\o A \c qmldir file telling the qmlviewer tool where to find the plugin
-	\endlist
-
-	\section2 Building a Qt Plugin
-
-		To build a plugin, we need to set the following in a Qt project file. First,
-		the necessary sources, headers, and Qt modules need to be added into our
-		project file. All the C++ code and project files are in the \c filedialog
-		directory.
-
-	\code
-	In cppPlugins.pro:
-
-		TEMPLATE = lib
-		CONFIG += qt plugin
-		QT += declarative
-
-		DESTDIR +=  ../plugins
-		OBJECTS_DIR = tmp
-		MOC_DIR = tmp
-
-		TARGET = FileDialog
-			
-		HEADERS += 	directory.h \
-				file.h \
-				dialogPlugin.h
-		
-		SOURCES +=	directory.cpp \
-				file.cpp \
-				dialogPlugin.cpp
-	\endcode
-
-	In particular, we compile Qt with the \c declarative module and configure it as a
-	\c plugin, needing a \c lib template. We shall put the compiled plugin into the
-	parent's \c plugins directory.
-
-
-	\section2 Registering a Class into QML
-
-	\code
-	In dialogPlugin.h:
-
-		#include <QtDeclarative/QDeclarativeExtensionPlugin>
-
-		class DialogPlugin : public QDeclarativeExtensionPlugin
-		{
-			Q_OBJECT
-
-			public:
-			void registerTypes(const char *uri);
-		
-		};
-		
-	\endcode
-
-		Our plugin class, \c DialogPlugin is a subclass of \l
-		{QDeclarativeExtensionPlugin}{QDeclarativeExtensionPlugin}. We
-		need to implement the inherited function, \l
-		{QDeclarativeExtensionPlugin::registerTypes()}{registerTypes}. The
-		\c dialogPlugin.cpp file looks like this:
-		
-	\code
-	DialogPlugin.cpp:
-
-		#include "dialogPlugin.h"
-		#include "directory.h"
-		#include "file.h"
-		#include <QtDeclarative/qdeclarative.h>
-		
-		void DialogPlugin::registerTypes(const char *uri){
-			
-			qmlRegisterType<Directory>(uri, 1, 0, "Directory");
-			qmlRegisterType<File>(uri, 1, 0,"File");
-		}
-
-		Q_EXPORT_PLUGIN2(FileDialog, DialogPlugin);
-	\endcode
-		
-	The \l {QDeclarativeExtensionPlugin::registerTypes()}{registerTypes}
-	function registers our File and Directory classes into QML. This function
-	needs the class name for its template, a major version number, a minor version
-	number, and a name for our classes.
-
-	We need to export the plugin using the \l {Q_EXPORT_PLUGIN2}{Q_EXPORT_PLUGIN2}
-	macro. Note that in our \c dialogPlugin.h file, we have the \l {Q_OBJECT}{Q_OBJECT}
-	macro at the top of our class. As well, we need to run \c qmake on the project
-	file to generate the necessary meta-object code.
-
-
-	\section2 Creating QML Properties in a C++ class
-
-		We can create QML elements and properties using C++ and
-		\l {The Meta-Object System}{Qt's Meta-Object System}. We can implement
-		properties using slots and signals, making Qt aware of these properties.
-		These properties can then be used in QML.
-
-	For the text editor, we need to be able to load and save files. Typically,
-	these features are contained in a file dialog. Fortunately, we can use
-	\l {QDir}{QDir}, \l {QFile}{QFile}, and \l {QTextStream}{QTextStream} to
-	implement directory reading and input/output streams.
-		
-	\code
-		class Directory : public QObject{
-
-			Q_OBJECT
-			
-			Q_PROPERTY(int filesCount READ filesCount CONSTANT)
-			Q_PROPERTY(QString filename READ filename WRITE setFilename NOTIFY filenameChanged)
-			Q_PROPERTY(QString fileContent READ fileContent WRITE setFileContent NOTIFY fileContentChanged)
-			Q_PROPERTY(QDeclarativeListProperty<File> files READ files CONSTANT )
-
-			...
-	\endcode
-
-	The \c Directory class uses Qt's Meta-Object System to register properties it
-	needs to accomplish file handling. The \c Directory class is exported as a plugin
-	and is useable in QML as the \c Directory element. Each of the listed properties
-	using the \l {Q_PROPERTY()}{Q_PROPERTY} macro is a QML property.
-		
-	The \l {Q_PROPERTY()} {Q_PROPERTY} declares a property as well as its read and
-	write functions into Qt's Meta-Object System. For example, the \c filename
-	property, of type \l {QString}{QString}, is readable using the \c filename()
-	function and writable using the function \c setFilename(). Additionally, there
-	is a signal associated to the filename property called \c filenameChanged(),
-	which is emitted whenever the property changes. The read and write functions
-	are declared as \c public in the header file.
-
-	Similarly, we have the other properties declared according to their uses. The
-	\c filesCount property indicates the number of files in a directory. The filename
-	property is set to the currently selected file's name and the loaded/saved file
-	content is stored in \c fileContent property. 
-
-	\code
-		Q_PROPERTY(QDeclarativeListProperty<File> files READ files CONSTANT )
-	\endcode
-
-	The \c files list property is a list of all the filtered files in a directory.
-	The \c Directory class is implemented to filter out invalid text files; only
-	files with a \c .txt extension are valid. Further, \l {QList}{QLists} can be
-	used in QML files by declaring them as a \c QDeclarativeListProperty in C++.
-	The templated object needs to inherit from a \l {QObject}{QObject}, therefore,
-	the \c File class must also inherit from \c QObject. In the \c Directory class,
-	the list of \c File objects is stored in a \c QList called \c m_fileList.
-
-	\code
-		class File : public QObject{
-		
-			Q_OBJECT
-			Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
-			
-			...
-		};
-	\endcode
-
-	The properties can then be used in QML as part of the \c Directory element's
-	properties. Note that we do not have to create an identifier \c id property
-	in our C++ code.
-
-	\code
-		Directory{
-			id: directory
-			
-			filesCount
-			filename
-			fileContent
-			files
-			
-			files[0].name
-		}
-
-	\endcode
-
-	Because QML uses Javascript's syntax and structure, we can iterate through
-	the list of files and retrieve its properties. To retrieve the first file's
-	name property, we can call \c { files[0].name }.
-
-	Regular C++ functions are also accessible from QML. The file loading and saving
-	functions are implemented in C++ and declared using the
-	\l {Q_INVOKABLE}{Q_INVOKABLE} macro. Alternatively, we can declare the functions
-	as a \c slot and the functions will be accessible from QML. 
-
-	\code
-	In Directory.h: 
-
-		Q_INVOKABLE void saveFile();
-		Q_INVOKABLE void loadFile();
-	\endcode
-
-	The \c Directory class also has to notify other objects whenever the directory
-	contents change. This feature is performed using a \c signal. As previously
-	mentioned, QML signals have a corresponding handler with their names prepended
-	with \c on. The signal is called \c directoryChanged and it is emitted whenever
-	there is a directory refresh. The refresh simply reloads the directory contents
-	and updates the list of valid files in the directory. QML items can then be
-	notified by attaching an action to the \c onDirectoryChanged signal handler.
-
-	The \c list properties need to be explored further. This is because list
-	properties use callbacks to access and modify the list contents. The list
-	property is of type \c QDeclarativeListProperty<File>. Whenever the list
-	is accessed, the accessor function needs to return a
-	\c QDeclarativeListProperty<File>. The template type, \c File, needs to be a
-	\c QObject derivative. Further, to create the
-	\l {QDeclarativeListProperty}{QDeclarativeListProperty}, the list's accessor
-	and modifiers need to be passed to the consructor as function pointers. The list,
-	a \c QList in our case,  also needs to be a list of \c File pointers.
-
-	The constructor of \l {QDeclarativeListProperty}{QDeclarativeListProperty}
-	constructor and the \c Directory implementation:
-	\code
-		QDeclarativeListProperty  ( QObject * object, void * data, AppendFunction append, CountFunction count = 0, AtFunction at = 0, ClearFunction clear = 0 )
-		QDeclarativeListProperty<File>( this, &m_fileList, &appendFiles, &filesSize, &fileAt,  &clearFilesPtr );
-	\endcode
-
-	The constructor passes pointers to functions that will append the list, count
-	the list, retrieve the item using an index, and empty the list. Only the append
-	function is mandatory. Note that the function pointers must match the definition
-	of \l {QDeclarativeListProperty::AppendFunction}{AppendFunction}, 
-	\l {QDeclarativeListProperty::CountFunction}{CountFunction}, 
-	\l {QDeclarativeListProperty::AtFunction}{AtFunction}, or 
-	\l {QDeclarativeListProperty::ClearFunction}{ClearFunction}.
-
-	\code
-		void appendFiles(QDeclarativeListProperty<File> * property, File * file)
-		File* fileAt(QDeclarativeListProperty<File> * property, int index)
-		int filesSize(QDeclarativeListProperty<File> * property)
-		void clearFilesPtr(QDeclarativeListProperty<File> *property)
-	\endcode
-
-	To simplify our file dialog, the \c Directory class filters out invalid text
-	files, which are files that do not have a \c .txt extension. If a file name
-	doesn't have the \c .txt extension, then it won't be seen in our file dialog.
-	Also, the implementation makes sure that saved files have a \c .txt extension in
-	the file name. \c Directory uses \l {QTextStream}{QTextStream} to read the file
-	and to output the file contents to a file.
-
-	With our \c Directory element, we can retrieve the files as a list, know how many
-	text files is in the application directory, get the file's name and content as a
-	string, and be notified whenever there are changes in the directory contents.
-
-	To build the plugin, run \c qmake on the \c cppPlugins.pro project file, then run
-	\c make to build and transfer the plugin to the \c plugins directory.
-
-
-	\section2 Importing a Plugin in QML
-		
-		The qmlviewer tool imports files that are in the same directory as the
-		application. We can also create a \c qmldir file containing the locations of
-		QML files we wish to import. The \c qmldir file can also store locations of
-		plugins and other resources.
-
-	\code
-	In qmldir: 
-
-		Button ./Button.qml
-		FileDialog ./FileDialog.qml
-		TextArea ./TextArea.qml
-		TextEditor ./TextEditor.qml
-		EditMenu ./EditMenu.qml
-
-		plugin FileDialog plugins
-	\endcode
-
-	The plugin we just created is called \c FileDialog, as indicated by the
-	\c TARGET field in the project file. The compiled plugin is in the \c plugins directory. 
-
-
-	\section2 Integrating a File Dialog into the File Menu
-
-		Our \c FileMenu needs to display the \c FileDialog element, containing a list of
-		the text files in a directory thus allowing the user to select the file by
-		clicking on the list. We also need to assign the save, load, and new buttons
-		to their respective actions. The FileMenu contains an editable text input to
-		allow the user to type a file name using the keyboard.
-
-	The \c Directory element is used in the \c FileMenu.qml file and it notifies the
-	\c FileDialog element that the directory refreshed its contents. This notification
-	is performed in the signal handler, \c onDirectoryChanged.
-
-	\code 
-	In FileMenu.qml:
-
-		Directory{
-			id:directory
-			filename: textInput.text
-			onDirectoryChanged: fileDialog.notifyRefresh()
-		}
-	\endcode
-
-	Keeping with the simplicity of our application, the file dialog will always be
-	visible and will not display invalid text files, which do not have a \c .txt
-	extension to their filenames. 
-
-	\code
-	In FileDialog.qml:
-		
-		signal notifyRefresh()
-		onNotifyRefresh: dirView.model = directory.files
-	\endcode
-
-	The \c FileDialog element will display the contents of a directory by reading its
-	list property called \c files. The files are used as the model of a
-	\l {GridView}{GridView} element, which displays data items in a grid according
-	to a delegate. The delegate handles the appearance of the model and our file
-	dialog will simply create a grid with text centered in the middle. Clicking on
-	the file name will result in the appearance of a rectangle to highlight the file
-	name. The \c FileDialog is notified whenever the \c notifyRefresh signal is emitted,
-	reloading the files in the directory.
-
-	\code
-	In FileMenu.qml:
-
-		Button{
-			id: newButton
-			label: "New"
-			onButtonClick:{
-				textArea.textContent = ""
-			}
-		}
-		Button{
-			id: loadButton
-			label: "Load"
-			onButtonClick:{
-				directory.filename = textInput.text
-				directory.loadFile()
-				textArea.textContent = directory.fileContent
-			}
-		}
-		Button{
-			id: saveButton
-			label: "Save"
-			onButtonClick:{
-				directory.fileContent = textArea.textContent
-				directory.filename = textInput.text
-				directory.saveFile()
-			}
-		}
-		Button{
-			id: exitButton
-			label: "Exit"
-			onButtonClick:{
-				Qt.quit()
-			}
-		}
-	\endcode
-
-	Our \c FileMenu can now connect to their respective actions. The \c saveButton
-	will transfer the text from the \c TextEdit onto the directory's \c fileContent
-	property, then copy its file name from the editable text input. Finally, the button
-	calls the \c saveFile() function, saving the file. The \c sloadButton has a similar
-	execution. Also, the \c New action will empty the contents of the \c TextEdit. 
-
-	Further, the \c EditMenu buttons are connected to the \c TextEdit functions to copy,
-	paste, and select all the text in the text editor. 
-
-	\image qml-texteditor5_filemenu.png
-
-	\section1 Text Editor Completion
-
-	\image qml-texteditor5_newfile.png
-
-		The application can function as a simple text editor, able to accept text
-		and save the text into a file. The text editor can also load from a file and
-		perform text manipulation. 
-		
-		
-*/
\ No newline at end of file
+    \page gettingstartedqml.html
+    \title Getting Started Programming with QML
+    \ingroup gettingStarted
+
+    Welcome to the world of QML, the declarative UI language. In this Getting
+    Started guide, we will create a simple text editor application using QML.
+    After reading this guide, you should be ready to develop your own applications
+    using QML and Qt C++.
+
+    \section1 QML to Build User Interfaces
+
+    The application we are building is a simple text editor that will load, save,
+    and perform some text manipulation. This guide will consist of two parts. The
+    first part will involve designing the application layout and behaviors using
+    declarative language in QML. For the second part, file loading and saving will
+    be implemented using Qt C++. Using
+    \l {The Meta-Object System}{Qt's Meta-Object System}, we can expose C++ functions
+    as properties that QML elements can use. Utilizing QML and Qt C++, we can
+    efficiently decouple the interface logic from the application logic.
+
+    \image qml-texteditor5_editmenu.png
+
+    To run the QML example code, merely provide the included \l{QML Viewer}{qmlviewer}
+    tool with the QML file as the argument. The C++ portion of this tutorial assumes
+    that the reader possesses basic knowledge of Qt's compilation procedures.
+
+    Tutorial chapters:
+    \list 1
+        \o \l {Defining a Button and a Menu}{Defining a Button and a Menu}
+        \o \l {Implementing a Menu Bar}{Implementing a Menu Bar}
+        \o \l {Building a Text Editor}{Building a Text Editor}
+        \o \l {Decorating the Text Editor}{Decorating the Text Editor}
+        \o \l {Extending QML using Qt C++}{Extending QML using Qt C++}
+    \endlist
+
+    \section1 Defining a Button and a Menu
+
+    \section2 Basic Component - a Button
+
+    We start our text editor by building a button. Functionally, a button has a mouse
+    sensitive area and a label. Buttons perform actions when a user presses the button.
+
+    In QML, the basic visual item is the \l {Rectangle}{Rectangle} element. The 
+    \c Rectangle element has properties to control the element's appearance and location. 
+
+    \code
+        import Qt 4.7
+        Rectangle {
+            id: simplebutton
+            color: "grey"
+            width: 150; height: 75
+
+            Text{
+                id: buttonLabel
+                anchors.centerIn: parent
+                text: "button label"    
+            }
+        }
+    \endcode
+
+    First, the \c { import Qt 4.7 } allows the qmlviewer tool to import the QML elements
+    we will later use. This line must exist for every QML file. Notice that the version
+    of Qt modules is included in the import statement.
+
+    This simple rectangle has a unique identifier, \c simplebutton, which is bound to the
+    id property. The \c Rectangle element's properties are bound to values by listing the
+    property, followed by a colon, then the value. In the code sample, the color \c grey
+    is bound to the the Rectangle's \c color property. Similarly, we bind the \c width
+    and \c height of the Rectangle.
+
+    The \l {Text}{Text} element is a non-editable text field. We name this \c Text element
+    \c buttonLabel. To set the string content of the Text field, we bind a value to the
+    \c text property. The label is contained within the Rectangle and in order to center
+    it in the middle, we assign the \c anchors of the Text element to its parent, which
+    is called \c simplebutton. Anchors may bind to other items' anchors, allowing layout
+    assignments simpler. 
+
+    We shall save this code as \c SimpleButton.qml. Running qmlviewer with the file as the
+    argument will display the grey rectangle with a text label.
+
+    \image qml-texteditor1_simplebutton.png
+
+    To implement the button click functionality, we can use QML's event handling. QML's event
+    handling is very similar to \l {Signals & Slots}{Qt's signal and slot} mechanism. Signals
+    are emitted and the connected slot is called.
+
+    \code
+        Rectangle{
+            id:simplebutton
+            ...
+
+            MouseArea{ 
+                id: buttonMouseArea
+
+                anchors.fill: parent //anchor all sides of the mouse area to the rectangle's anchors
+                        //onClicked handles valid mouse button clicks
+                onClicked: console.log(buttonLabel.text + " clicked" )
+            }
+        }
+    \endcode
+
+    We include a \l{MouseArea} element in our simplebutton. \c MouseArea elements describe
+    the interactive area where mouse movements are detected. For our button, we anchor the
+    whole MouseArea to its parent, which is \c simplebutton. The \c anchors.fill syntax is
+    one way of accessing a specific property called \c fill inside a group of properties
+    called \c anchors. QML uses \l {Anchor-based Layout in QML}{anchor based layouts} where
+    items can anchor to another item, creating robust layouts.
+
+    The \c MouseArea has many signal handlers that are called during mouse movements within
+    the specfied \c MouseArea boundaries. One of them is \c onClicked and it is called
+    whenever the acceptable mouse button is clicked, the left click being the default. We
+    can bind actions to the onClicked handler. In our example, \c console.log() outputs text
+    whenever the mouse area is clicked. The function \c console.log() is a useful tool for
+    debugging purposes and for outputting text. 
+
+    The code in \c SimpleButton.qml is sufficient to display a button on the screen and
+    output text whenever it is clicked with a mouse.
+
+    \code
+        Rectangle {
+            id:Button
+            ...
+
+            property color buttonColor: "lightblue"    
+            property color onHoverColor: "gold"
+            property color borderColor: "white"
+
+            signal buttonClick()
+            onButtonClick: {
+                console.log(buttonLabel.text + " clicked" )
+            }
+
+            MouseArea{ 
+                onClicked: buttonClick()    
+                hoverEnabled: true
+                onEntered: parent.border.color = onHoverColor
+                onExited:  parent.border.color = borderColor
+            }
+
+            //determines the color of the button by using the conditional operator
+            color: buttonMouseArea.pressed ? Qt.darker(buttonColor, 1.5) : buttonColor
+        }
+    \endcode
+
+    A fully functioning button is in \c Button.qml. The code snippets in this article
+    have some code omitted, denoted by ellipses because they were either introduced
+    earlier in the previous sections or irrelevant to the current code discussion.
+
+    Custom properties are declared using the \c {property type name} syntax. In the
+    code, the property \c buttonColor, of type \c color, is declared and bound to
+    the value \c{"lightblue"}. The \c buttonColor is later used in a conditional
+    operation to determine the buttons's fill color. Note that property value
+    assignment is possible using the \c= equals sign, in addition to value binding
+    using the \c : colon character. Custom properties allow internal items to be
+    accessible outside of the Rectangle's scope. There are basic
+    \l{QML Basic Types}{QML types} such as \c int, \c string, \c real, as well as
+    a type called \c variant.
+
+    By binding the \c onEntered and \c onExited signal handlers to colors, the
+    button's border will turn yellow when the mouse hovers above the button and
+    reverts the color when the mouse exits the mouse area.
+
+    A \c buttonClick() signal is declared in \c Button.qml by placing the \c signal
+    keyword in front of the signal name. All signals have their handlers automatically
+    created, their names starting with \c on. As a result, the \c onButtonClick is
+    \c buttonClick's handler. The \c onButtonClick is then assigned an action to
+    perform. In our button example, the \c onClicked mouse handler will simply call
+    \c onButtonClick, which displays a text. The \c onButtonClick enables outside
+    objects to access the \c {Button}'s mouse area easily. For example, items may
+    have more than one \c MouseArea declarations and a \c buttonClick signal can
+    make the distinction between the several \c MouseArea signal handlers better.
+
+    We now have the basic knowledge to implement items in QML that can handle
+    basic mouse movements. We created a \c Text label inside a \c Rectangle,
+    customized its properties, and implemented behaviors that respond to mouse
+    movements. This idea of creating elements within elements is repeated
+    throughout the text editor application.
+
+    This button is not useful unless used as a component to perform an action.
+    In the next section, we will soon create a menu containing several of these
+    buttons.
+
+    \image qml-texteditor1_button.png
+
+    \section2 Creating a Menu Page
+
+    Up to this stage, we covered how to create elements and assign behaviors inside
+    a single QML file. In this section, we will cover how to import QML elements and how
+    to reuse some of the created components to build other components.
+
+    Menus display the contents of a list, each item having the ability to perform an action.
+    In QML, we can create a menu in several ways. First, we will create a menu containing
+    buttons which will eventually perform different actions. The menu code is in
+    \c FileMenu.qml.
+
+    \code
+        import Qt 4.7                \\import the main Qt QML module
+        import "folderName"            \\import the contents of the folder    
+        import "Button.qml"            \\import a QML file
+        import "NewButton.qml" as ButtonModule    \\import a QML file and give it a name
+        import "script.js" as Script        \\import a Javascript file and name it as Script
+    \endcode
+
+    To use the \c Button element in \c FileMenu.qml, we need to import \c Button.qml.
+    The syntax shown above, shows how to use the \c import keyword. However, the
+    \c {import Button.qml} is not necessary; qmlviewer will import all the contents
+    of the current directory. We can directly create a \c Button element by declaring
+    \c Button{}, similar to a \c Rectangle{} declaration.
+
+    \code
+    In FileMenu.qml:
+
+        Row{
+            anchors.centerIn: parent
+            spacing: parent.width/6
+
+            Button{
+                id: loadButton
+                buttonColor: "lightgrey"
+                label: "Load"
+            }
+            Button{
+                buttonColor: "grey"
+                id: saveButton
+                label: "Save"
+            }
+            Button{
+                id: exitButton
+                label: "Exit"
+                buttonColor: "darkgrey"
+
+                onButtonClick: Qt.quit() 
+            }
+        }
+    \endcode
+
+    In \c FileMenu.qml, we declare three \c Button elements. They are declared
+    inside a \l {Row}{Row} element, a positioner that will position its children
+    along a vertical row. The \c Button declaration resides in Button.qml,
+    which is the same as the \c Button.qml we used in the previous section.
+    New property bindings can be declared within the newly created buttons,
+    effectively overwriting the properties set in \c Button.qml. The button
+    called \c exitButton will quit and close the window when it is clicked.
+    Note that the signal handler \c onButtonClick in \c Button.qml will be
+    called in addition to the \c onButtonClick handler in \c exitButton.
+
+    \image qml-texteditor1_filemenu.png
+
+    The \c Row declaration is declared in a \c Rectangle, creating a rectangle
+    container for the row of buttons. This additional rectangle creates an indirect
+    way of organizing the row of buttons inside a menu.
+
+    The declaration of the edit menu is very similar at this stage. The menu has
+    buttons that have the labels: \c Copy, \c Paste, and \c {Select All}.
+
+    \image qml-texteditor1_editmenu.png      
+
+    Armed with our knowledge of importing and customizing previously made
+    components, we may now combine these menu pages to create a menu bar,
+    consisting of buttons to select the menu, and look at how we may structure
+    data using QML.
+
+    \section1 Implementing a Menu Bar
+
+    Our text editor application will need a way to display menus using a menu bar.
+    The menu bar will switch the different menus and the user can choose which menu
+    to display. Menu switching implies that the menus need more structure than
+    merely displaying them in a row. QML uses models and views to structure data
+    and display the structured data.
+
+    \section2  Using Data Models and Views
+
+    QML has different \l {Data Models}{data views} that display
+    \l {Data Models}{data models}. Our menu bar will display the menus in a list,
+    with a header that displays a row of menu names. The list of menus are declared
+    inside a \c VisualItemModel. The \l{VisualItemModel}{\c VisualItemModel}
+    element contains items that already have views such as \c Rectangle elements
+    and imported UI elements. Other model types such as the \l{ListModel}{\c ListModel}
+    element need a delegate to display their data.
+
+    We declare two visual items in the \c menuListModel, the \c FileMenu and the
+    \c EditMenu. We customize the two menus and display them using a
+    \l {ListView}{ListView}. The \c MenuBar.qml file contains the QML declarations
+    and a simple edit menu is defined in \c EditMenu.qml.
+
+    \code
+        VisualItemModel{
+            id: menuListModel
+            FileMenu{
+                width: menuListView.width
+                height: menuBar.height
+                color: fileColor
+            }
+            EditMenu{
+                color: editColor
+                width:  menuListView.width
+                height: menuBar.height
+            }
+        }
+    \endcode
+
+    The \l {ListView}{ListView} element will display a model according to a delegate.
+    The delegate may declare the model items to display in a \c Row element or display
+    the items in a grid. Our \c menuListModel already has visible items, therefore,
+    we do not need to declare a delegate.
+
+    \code
+        ListView{
+            id: menuListView
+
+            //Anchors are set to react to window anchors
+            anchors.fill:parent
+            anchors.bottom: parent.bottom
+            width:parent.width
+            height: parent.height
+
+            //the model contains the data
+            model: menuListModel
+
+            //control the movement of the menu switching
+            snapMode: ListView.SnapOneItem
+            orientation: ListView.Horizontal
+            boundsBehavior: Flickable.StopAtBounds 
+            flickDeceleration: 5000
+            highlightFollowsCurrentItem: true
+            highlightMoveDuration:240
+            highlightRangeMode: ListView.StrictlyEnforceRange
+        }
+    \endcode
+
+    Additionally, \c ListView inherits from \l{Flickable}{\c Flickable}, making
+    the list respond to mouse drags and other gestures. The last portion of the
+    code above sets \c Flickable properties to create the desired flicking movement
+    to our view. In particular,the property \c highlightMoveDuration changes the
+    duration of the flick transition. A higher \c highlightMoveDuration value
+    results in slower menu switching. 
+
+    The \c ListView maintains the model items through an \c index and each visual
+    item in the model is accessible through the \c index, in the order of the
+    declaration. Changing the \c currentIndex effectively changes the highlighted
+    item in the \c ListView. The header of our menu bar exemplify this effect.
+    There are two buttons in a row, both changing the current menu when clicked.
+    The \c fileButton changes the current menu to the file menu when clicked,
+    the \c index being \c 0 because \c FileMenu is declared first in the
+    \c menuListModel. Similarly, the \c editButton will change the current
+    menu to the \c EditMenu when clicked.
+
+    The \c labelList rectangle has \c z value of \c 1, denoting that it is displayed
+    at the front of the menu bar. Items with higher \c z values are displayed in front
+    of items with lower \c z values. The default \c z value is \c 0.
+
+    \code
+        Rectangle{
+            id: labelList
+            ...
+            z: 1
+            Row{
+                anchors.centerIn: parent
+                spacing:40
+                Button{
+                    label: "File"
+                    id: fileButton
+                    ...
+                    onButtonClick: menuListView.currentIndex = 0
+                }
+                Button{
+                    id: editButton
+                    label: "Edit"
+                    ...
+                    onButtonClick:    menuListView.currentIndex = 1    
+                }
+            }
+        }
+    \endcode
+
+    The menu bar we just created can be flicked to access the menus or by clicking
+    on the menu names at the top. Switching menu screens feel intuitive and responsive.
+
+    \image qml-texteditor2_menubar.png 
+
+    */
+
+    /*!
+    \page qml-textEditor3.html
+    \title Building a Text Editor
+
+    \section1 Declaring a TextArea
+
+    Our text editor is not a text editor if it didn't contain an editable text area.
+    QML's \l {TextEdit}{TextEdit} element allows the declaration of a multi-line
+    editable text area. \l {TextEdit}{TextEdit} is different from a \l {Text}{Text}
+    element, which doesn't allow the user to directly edit the text.
+
+    \code
+        TextEdit{
+            id: textEditor 
+            anchors.fill:parent
+            width:parent.width; height:parent.height
+            color:"midnightblue"
+            focus: true
+
+            wrapMode: TextEdit.Wrap
+        
+            onCursorRectangleChanged: flickArea.ensureVisible(cursorRectangle)
+        }
+    \endcode
+
+    The editor has its font color property set and set to wrap the text. The
+    \c TextEdit area is inside a flickable area that will scroll the text if the
+    text cursor is outside the visible area. The function \c ensureVisible() will
+    check if the cursor rectangle is outside the visible boundaries and move the
+    text area accordingly. QML uses Javascript syntax for its scripts, and as previously
+    mentioned, Javascript files can be imported and used within a QML file.
+
+    \code
+        function ensureVisible(r){
+            if (contentX >= r.x)
+                contentX = r.x;
+            else if (contentX+width <= r.x+r.width)
+                contentX = r.x+r.width-width;
+            if (contentY >= r.y)
+                contentY = r.y;
+            else if (contentY+height <= r.y+r.height)
+                contentY = r.y+r.height-height;
+        }
+    \endcode
+        
+    \section1 Combining Components for the Text Editor
+
+    We are now ready to create the layout of our text editor using QML. The text
+    editor has two components, the menu bar we created and the text area. QML allows
+    us to reuse components, therefore making our code simpler, by importing components
+    and customizing when necessary. Our text editor splits the window into two;
+    one-third of the screen is dedicated to the menu bar and two-thirds of the screen
+    displays the text area. The menu bar is displayed in front of any other elements.
+
+    \code
+        Rectangle{
+
+            id: screen
+            width: 1000; height: 1000
+
+            //the screen is partitioned into the MenuBar and TextArea. 1/3 of the screen is assigned to the MenuBar
+            property int partition: height/3
+            
+            MenuBar{
+                id:menuBar
+                height: partition
+                width:parent.width
+                z: 1
+            }
+
+            TextArea{
+                id:textArea
+                anchors.bottom:parent.bottom
+                y: partition
+                color: "white"
+                height: partition*2
+                width:parent.width
+            }
+        }
+    \endcode
+
+    By importing reusable components, our \c TextEditor code looks much simpler.
+    We can then customize the main application, without worrying about properties
+    that already have defined behaviors. Using this approach, application layouts
+    and UI components can be created easily.
+
+    \image qml-texteditor3_texteditor.png 
+
+    */
+
+    /*!
+    \page qml-textEditor4
+    \title Decorating the Text Editor
+    \section1 Implementing a Drawer Interface
+
+    Our text editor looks simple and we need to decorate it. Using QML, we can declare
+    transitions and animate our text editor. Our menu bar is occupying one-third of the
+    screen and it would be nice to have it only appear when we want it. 
+
+    We can add a drawer interface, that will contract or expand the menu bar when clicked.
+    In our implementation, we have a thin rectangle that responds to mouse clicks. The
+    \c drawer, as well as the application, has two sates: the "drawer is open" state and
+    the "drawer is closed" state. The \c drawer item is a strip of rectangle with a small
+    height. There is a nested \l {Image}{Image} element declaring that an arrow icon will
+    be centered inside the drawer. The drawer assigns a state to the whole application,
+    with the identifier \c screen, whenever a user clicks the mouse area.
+
+    \code
+        Rectangle{
+            id:drawer
+            height:15
+
+            Image{
+                id: arrowIcon
+                source: "images/arrow.png"
+                anchors.horizontalCenter: parent.horizontalCenter
+            }
+
+            MouseArea{
+                id: drawerMouseArea
+                anchors.fill:parent
+                onClicked:{
+                    if (screen.state == "DRAWER_CLOSED"){
+                        screen.state = "DRAWER_OPEN"
+                    }
+                    else if (screen.state == "DRAWER_OPEN"){
+                        screen.state = "DRAWER_CLOSED"
+                    }
+                }
+                ...
+            }
+        }
+    \endcode
+
+    A state is simply a collection of configurations and it is declared in a
+    \l{State}{State} element. A list of states can be listed and bound to the
+    \c states property. In our application, the two states are called
+    \c DRAWER_CLOSED and \c DRAWER_OPEN. Item configurations are declared in
+    \l {PropertyChanges}{PropertyChanges} elements. In the \c DRAWER_OPEN state,
+    there are four items that will receive property changes. The first target,
+    \c menuBar, will change its \c y property to \c 0. Similarly, the \c textArea
+    will lower to a new position when the state is \c DRAWER_OPEN. The \c textArea,
+    the \c drawer, and the drawer's icon will undergo property changes to meet the
+    current state.
+
+    \code
+
+        states:[
+            State{
+                name: "DRAWER_OPEN"
+                PropertyChanges { target: menuBar; y:0}
+                PropertyChanges { target: textArea; y: partition + drawer.height}
+                PropertyChanges { target: drawer; y: partition}
+                PropertyChanges { target: arrowIcon; rotation: 180} 
+            },
+            State{
+                name: "DRAWER_CLOSED"
+                PropertyChanges { target: menuBar; y:-partition}
+                PropertyChanges { target: textArea; y: drawer.height; height: screen.height - drawer.height}
+                PropertyChanges { target: drawer; y: 0}
+                PropertyChanges { target: arrowIcon; rotation: 0} 
+            }
+
+        ]
+
+    \endcode
+
+    State changes are abrupt and needs smoother transitions. Transitions between states
+    are defined using the \l {Transition}{Transition} element, which can then bind to
+    the item's \c transitions property. Our text editor has a state transition whenever
+    the state changes to either \c DRAWER_OPEN or \c DRAWER_CLOSED. Importantly, the
+    transition needs a \c from and a \c to state but for our transitions, we can use
+    the wild card \c * symbol to denote that the transition applies to all state changes. 
+
+    During transitions, we can assign animations to the property changes. Our
+    \c menuBar switches position from \c {y:0} to \c {y:-partition} and we can animate
+    this transition using the \l {NumberAnimation}{NumberAnimation} element. We declare
+    that the targets' properties will animate for a certain duration of time and using
+    a certain easing curve. An easing curve controls the animation rates and
+    interpolation behavior during state transitions. The easing curve we chose is
+    \l{PropertyAnimation::easing.type}{Easing.OutQuint}, which slows the movement near
+    the end of the animation. Pleae read \l {qdeclarativeanimation.html}{QML's Animation}
+    article.
+
+    \code
+        transitions: [
+            Transition{
+                to: "*"
+                NumberAnimation { target: textArea; properties: "y, height"; duration: 100; easing.type: Easing.OutQuint }
+                NumberAnimation { target: menuBar; properties: "y"; duration: 100;easing.type: Easing.OutQuint }
+                NumberAnimation { target: drawer; properties: "y"; duration: 100;easing.type: Easing.OutQuint }
+            }
+        ]
+    \endcode
+
+    Another way of animating property changes is by declaring a \l {Behavior}{Behavior}
+    element. A transition only works during state changes and \c Behavior can set an
+    animation for a general property change. In the text editor, the arrow has a
+    \c NumberAnimation animating its \c rotation property whenever the property changes.
+
+    \code
+    In TextEditor.qml:
+
+        Behavior{
+            NumberAnimation{property: "rotation";easing.type: Easing.OutExpo }
+        }    
+    \endcode
+
+    Going back to our components with knowledge of states and animations, we can improve
+    the appearances of the components. In \c Button.qml, we can add \c color and \c scale
+    property changes when the button is clicked. Color types are animated using
+    \l {ColorAnimation}{ColorAnimation} and numbers are animated using
+    \l {NumberAnimation}{NumberAnimation}. The \c {on propertyName} syntax displayed below
+    is helpful when targeting a single property.
+
+    \code
+    In Button.qml:
+        ...
+
+        color: buttonMouseArea.pressed ? Qt.darker(buttonColor, 1.5) : buttonColor
+        Behavior on color { ColorAnimation{ duration: 55} }
+
+        scale: buttonMouseArea.pressed ? 1.1 : 1.00
+        Behavior on scale { NumberAnimation{ duration: 55} }
+    \endcode
+
+    Additionally, we can enhance the appearances of our QML components by adding color
+    effects such as gradients and opacity effects. Declaring a \l {Gradient}{Gradient}
+    element will override the \c color property of the element. You may declare a color
+    in the gradient using the \l {GradientStop}{GradientStop} element. The gradient is
+    positioned using a scale, between \c 0.0 and \c 1.0.
+
+    \code
+    In MenuBar.qml
+        gradient: Gradient {
+            GradientStop { position: 0.0; color: "#8C8F8C" }
+            GradientStop { position: 0.17; color: "#6A6D6A" }
+            GradientStop { position: 0.98;color: "#3F3F3F" }
+            GradientStop { position: 1.0; color: "#0e1B20" }
+        }
+    \endcode
+
+    This gradient is used by the menu bar to display a gradient simulating depth.
+    The first color starts at \c 0.0 and the last color is at \c 1.0.
+
+
+    \section2 Where to Go from Here
+
+        We are finished building the user interface of a very simple text editor.
+        Going forward, the user interface is complete, and we can implement the
+        application logic using regular Qt and C++. QML works nicely as a prototyping
+        tool, separating the application logic away from the UI design. 
+
+    \image qml-texteditor4_texteditor.png  
+
+    \section1 Extending QML using Qt C++
+
+    Now that we have our text editor layout, we may now implement the text editor
+    functionalities in C++. Using QML with C++ enables us to create our application
+    logic using Qt. We can create a QML context in a C++ application using the
+    \l {Using QML in C++ Applications}{Qt's Declarative} classes and display the QML
+    elements using a Graphics Scene. Alternatively, we can export our C++ code into
+    a plugin that the \l {QML Viewer}{qmlviewer} tool can read. For our application,
+    we shall implement the load and save functions in C++ and export it as a plugin.
+    This way, we only need to load the QML file directly instead of running an executable.
+
+    \section2 Exposing C++ Classes to QML 
+
+    We will be implementing file loading and saving using Qt and C++. C++ classes
+    and functions can be used in QML by registering them. The class also needs to be
+    compiled as a Qt plugin and the QML file will need to know where the plugin is located.
+
+    For our application, we need to create the following items:
+    \list 1
+    \o \c Directory class that will handle directory related operations
+    \o \c File class which is a QObject, simulating the list of files in a directory
+    \o plugin class that will register the class to the QML context
+    \o Qt project file that will compile the plugin
+    \o A \c qmldir file telling the qmlviewer tool where to find the plugin
+    \endlist
+
+    \section2 Building a Qt Plugin
+
+        To build a plugin, we need to set the following in a Qt project file. First,
+        the necessary sources, headers, and Qt modules need to be added into our
+        project file. All the C++ code and project files are in the \c filedialog
+        directory.
+
+    \code
+    In cppPlugins.pro:
+
+        TEMPLATE = lib
+        CONFIG += qt plugin
+        QT += declarative
+
+        DESTDIR +=  ../plugins
+        OBJECTS_DIR = tmp
+        MOC_DIR = tmp
+
+        TARGET = FileDialog
+
+        HEADERS +=     directory.h \
+                file.h \
+                dialogPlugin.h
+
+        SOURCES +=    directory.cpp \
+                file.cpp \
+                dialogPlugin.cpp
+    \endcode
+
+    In particular, we compile Qt with the \c declarative module and configure it as a
+    \c plugin, needing a \c lib template. We shall put the compiled plugin into the
+    parent's \c plugins directory.
+
+
+    \section2 Registering a Class into QML
+
+    \code
+    In dialogPlugin.h:
+
+        #include <QtDeclarative/QDeclarativeExtensionPlugin>
+
+        class DialogPlugin : public QDeclarativeExtensionPlugin
+        {
+            Q_OBJECT
+
+            public:
+            void registerTypes(const char *uri);
+
+        };
+
+    \endcode
+
+    Our plugin class, \c DialogPlugin is a subclass of \l{QDeclarativeExtensionPlugin}.
+    We need to implement the inherited function, \l {QDeclarativeExtensionPlugin::}{registerTypes()}.
+    The \c dialogPlugin.cpp file looks like this:
+
+    \code
+    DialogPlugin.cpp:
+
+        #include "dialogPlugin.h"
+        #include "directory.h"
+        #include "file.h"
+        #include <QtDeclarative/qdeclarative.h>
+
+        void DialogPlugin::registerTypes(const char *uri){
+
+            qmlRegisterType<Directory>(uri, 1, 0, "Directory");
+            qmlRegisterType<File>(uri, 1, 0,"File");
+        }
+
+        Q_EXPORT_PLUGIN2(FileDialog, DialogPlugin);
+    \endcode
+
+    The \l{QDeclarativeExtensionPlugin::}{registerTypes()} function registers
+    our File and Directory classes into QML. This function needs the class name
+    for its template, a major version number, a minor version number, and a name
+    for our classes.
+
+    We need to export the plugin using the \l {Q_EXPORT_PLUGIN2}{Q_EXPORT_PLUGIN2}
+    macro. Note that in our \c dialogPlugin.h file, we have the \l {Q_OBJECT}{Q_OBJECT}
+    macro at the top of our class. As well, we need to run \c qmake on the project
+    file to generate the necessary meta-object code.
+
+
+    \section2 Creating QML Properties in a C++ class
+
+        We can create QML elements and properties using C++ and
+        \l {The Meta-Object System}{Qt's Meta-Object System}. We can implement
+        properties using slots and signals, making Qt aware of these properties.
+        These properties can then be used in QML.
+
+    For the text editor, we need to be able to load and save files. Typically,
+    these features are contained in a file dialog. Fortunately, we can use
+    \l {QDir}{QDir}, \l {QFile}{QFile}, and \l {QTextStream}{QTextStream} to
+    implement directory reading and input/output streams.
+
+    \code
+        class Directory : public QObject{
+
+            Q_OBJECT
+
+            Q_PROPERTY(int filesCount READ filesCount CONSTANT)
+            Q_PROPERTY(QString filename READ filename WRITE setFilename NOTIFY filenameChanged)
+            Q_PROPERTY(QString fileContent READ fileContent WRITE setFileContent NOTIFY fileContentChanged)
+            Q_PROPERTY(QDeclarativeListProperty<File> files READ files CONSTANT )
+
+            ...
+    \endcode
+
+    The \c Directory class uses Qt's Meta-Object System to register properties it
+    needs to accomplish file handling. The \c Directory class is exported as a plugin
+    and is useable in QML as the \c Directory element. Each of the listed properties
+    using the \l {Q_PROPERTY()}{Q_PROPERTY} macro is a QML property.
+
+    The \l {Q_PROPERTY()} {Q_PROPERTY} declares a property as well as its read and
+    write functions into Qt's Meta-Object System. For example, the \c filename
+    property, of type \l {QString}{QString}, is readable using the \c filename()
+    function and writable using the function \c setFilename(). Additionally, there
+    is a signal associated to the filename property called \c filenameChanged(),
+    which is emitted whenever the property changes. The read and write functions
+    are declared as \c public in the header file.
+
+    Similarly, we have the other properties declared according to their uses. The
+    \c filesCount property indicates the number of files in a directory. The filename
+    property is set to the currently selected file's name and the loaded/saved file
+    content is stored in \c fileContent property. 
+
+    \code
+        Q_PROPERTY(QDeclarativeListProperty<File> files READ files CONSTANT )
+    \endcode
+
+    The \c files list property is a list of all the filtered files in a directory.
+    The \c Directory class is implemented to filter out invalid text files; only
+    files with a \c .txt extension are valid. Further, \l {QLists}{QLists} can be
+    used in QML files by declaring them as a \c QDeclarativeListProperty in C++.
+    The templated object needs to inherit from a \l {QObject}{QObject}, therefore,
+    the \c File class must also inherit from \c QObject. In the \c Directory class,
+    the list of \c File objects is stored in a \c QList called \c m_fileList.
+
+    \code
+        class File : public QObject{
+
+            Q_OBJECT
+            Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+
+            ...
+        };
+    \endcode
+
+    The properties can then be used in QML as part of the \c Directory element's
+    properties. Note that we do not have to create an identifier \c id property
+    in our C++ code.
+
+    \code
+        Directory{
+            id: directory
+
+            filesCount
+            filename
+            fileContent
+            files
+
+            files[0].name
+        }
+
+    \endcode
+
+    Because QML uses Javascript's syntax and structure, we can iterate through
+    the list of files and retrieve its properties. To retrieve the first file's
+    name property, we can call \c { files[0].name }.
+
+    Regular C++ functions are also accessible from QML. The file loading and saving
+    functions are implemented in C++ and declared using the
+    \l {Q_INVOKABLE}{Q_INVOKABLE} macro. Alternatively, we can declare the functions
+    as a \c slot and the functions will be accessible from QML. 
+
+    \code
+    In Directory.h: 
+
+        Q_INVOKABLE void saveFile();
+        Q_INVOKABLE void loadFile();
+    \endcode
+
+    The \c Directory class also has to notify other objects whenever the directory
+    contents change. This feature is performed using a \c signal. As previously
+    mentioned, QML signals have a corresponding handler with their names prepended
+    with \c on. The signal is called \c directoryChanged and it is emitted whenever
+    there is a directory refresh. The refresh simply reloads the directory contents
+    and updates the list of valid files in the directory. QML items can then be
+    notified by attaching an action to the \c onDirectoryChanged signal handler.
+
+    The \c list properties need to be explored further. This is because list
+    properties use callbacks to access and modify the list contents. The list
+    property is of type \c QDeclarativeListProperty<File>. Whenever the list
+    is accessed, the accessor function needs to return a
+    \c QDeclarativeListProperty<File>. The template type, \c File, needs to be a
+    \c QObject derivative. Further, to create the
+    \l {QDeclarativeListProperty}{QDeclarativeListProperty}, the list's accessor
+    and modifiers need to be passed to the consructor as function pointers. The list,
+    a \c QList in our case,  also needs to be a list of \c File pointers.
+
+    The constructor of \l {QDeclarativeListProperty}{QDeclarativeListProperty}
+    constructor and the \c Directory implementation:
+    \code
+        QDeclarativeListProperty  ( QObject * object, void * data, AppendFunction append, CountFunction count = 0, AtFunction at = 0, ClearFunction clear = 0 )
+        QDeclarativeListProperty<File>( this, &m_fileList, &appendFiles, &filesSize, &fileAt,  &clearFilesPtr );
+    \endcode
+
+    The constructor passes pointers to functions that will append the list, count
+    the list, retrieve the item using an index, and empty the list. Only the append
+    function is mandatory. Note that the function pointers must match the definition
+    of \l {QDeclarativeListProperty::AppendFunction}{AppendFunction}, 
+    \l {QDeclarativeListProperty::CountFunction}{CountFunction}, 
+    \l {QDeclarativeListProperty::AtFunction}{AtFunction}, or 
+    \l {QDeclarativeListProperty::ClearFunction}{ClearFunction}.
+
+    \code
+        void appendFiles(QDeclarativeListProperty<File> * property, File * file)
+        File* fileAt(QDeclarativeListProperty<File> * property, int index)
+        int filesSize(QDeclarativeListProperty<File> * property)
+        void clearFilesPtr(QDeclarativeListProperty<File> *property)
+    \endcode
+
+    To simplify our file dialog, the \c Directory class filters out invalid text
+    files, which are files that do not have a \c .txt extension. If a file name
+    doesn't have the \c .txt extension, then it won't be seen in our file dialog.
+    Also, the implementation makes sure that saved files have a \c .txt extension in
+    the file name. \c Directory uses \l {QTextStream}{QTextStream} to read the file
+    and to output the file contents to a file.
+
+    With our \c Directory element, we can retrieve the files as a list, know how many
+    text files is in the application directory, get the file's name and content as a
+    string, and be notified whenever there are changes in the directory contents.
+
+    To build the plugin, run \c qmake on the \c cppPlugins.pro project file, then run
+    \c make to build and transfer the plugin to the \c plugins directory.
+
+
+    \section2 Importing a Plugin in QML
+
+        The qmlviewer tool imports files that are in the same directory as the
+        application. We can also create a \c qmldir file containing the locations of
+        QML files we wish to import. The \c qmldir file can also store locations of
+        plugins and other resources.
+
+    \code
+    In qmldir: 
+
+        Button ./Button.qml
+        FileDialog ./FileDialog.qml
+        TextArea ./TextArea.qml
+        TextEditor ./TextEditor.qml
+        EditMenu ./EditMenu.qml
+
+        plugin FileDialog plugins
+    \endcode
+
+    The plugin we just created is called \c FileDialog, as indicated by the
+    \c TARGET field in the project file. The compiled plugin is in the \c plugins directory. 
+
+
+    \section2 Integrating a File Dialog into the File Menu
+
+        Our \c FileMenu needs to display the \c FileDialog element, containing a list of
+        the text files in a directory thus allowing the user to select the file by
+        clicking on the list. We also need to assign the save, load, and new buttons
+        to their respective actions. The FileMenu contains an editable text input to
+        allow the user to type a file name using the keyboard.
+
+    The \c Directory element is used in the \c FileMenu.qml file and it notifies the
+    \c FileDialog element that the directory refreshed its contents. This notification
+    is performed in the signal handler, \c onDirectoryChanged.
+
+    \code 
+    In FileMenu.qml:
+
+        Directory{
+            id:directory
+            filename: textInput.text
+            onDirectoryChanged: fileDialog.notifyRefresh()
+        }
+    \endcode
+
+    Keeping with the simplicity of our application, the file dialog will always be
+    visible and will not display invalid text files, which do not have a \c .txt
+    extension to their filenames. 
+
+    \code
+    In FileDialog.qml:
+
+        signal notifyRefresh()
+        onNotifyRefresh: dirView.model = directory.files
+    \endcode
+
+    The \c FileDialog element will display the contents of a directory by reading its
+    list property called \c files. The files are used as the model of a
+    \l {GridView}{GridView} element, which displays data items in a grid according
+    to a delegate. The delegate handles the appearance of the model and our file
+    dialog will simply create a grid with text centered in the middle. Clicking on
+    the file name will result in the appearance of a rectangle to highlight the file
+    name. The \c FileDialog is notified whenever the \c notifyRefresh signal is emitted,
+    reloading the files in the directory.
+
+    \code
+    In FileMenu.qml:
+
+        Button{
+            id: newButton
+            label: "New"
+            onButtonClick:{
+                textArea.textContent = ""
+            }
+        }
+        Button{
+            id: loadButton
+            label: "Load"
+            onButtonClick:{
+                directory.filename = textInput.text
+                directory.loadFile()
+                textArea.textContent = directory.fileContent
+            }
+        }
+        Button{
+            id: saveButton
+            label: "Save"
+            onButtonClick:{
+                directory.fileContent = textArea.textContent
+                directory.filename = textInput.text
+                directory.saveFile()
+            }
+        }
+        Button{
+            id: exitButton
+            label: "Exit"
+            onButtonClick:{
+                Qt.quit()
+            }
+        }
+    \endcode
+
+    Our \c FileMenu can now connect to their respective actions. The \c saveButton
+    will transfer the text from the \c TextEdit onto the directory's \c fileContent
+    property, then copy its file name from the editable text input. Finally, the button
+    calls the \c saveFile() function, saving the file. The \c sloadButton has a similar
+    execution. Also, the \c New action will empty the contents of the \c TextEdit. 
+
+    Further, the \c EditMenu buttons are connected to the \c TextEdit functions to copy,
+    paste, and select all the text in the text editor. 
+
+    \image qml-texteditor5_filemenu.png
+
+    \section1 Text Editor Completion
+
+    \image qml-texteditor5_newfile.png
+
+    The application can function as a simple text editor, able to accept text
+    and save the text into a file. The text editor can also load from a file and
+    perform text manipulation.
+*/
diff --git a/doc/src/getting-started/gettingstartedqt.qdoc b/doc/src/getting-started/gettingstartedqt.qdoc
index 1b3770f..25d0ccd 100644
--- a/doc/src/getting-started/gettingstartedqt.qdoc
+++ b/doc/src/getting-started/gettingstartedqt.qdoc
@@ -28,8 +28,8 @@
 /*!
     \page gettingstartedqt.html
 
-    \title Getting Started programming with Qt
-	\ingroup gettingStarted
+    \title Getting Started Programming with Qt
+        \ingroup gettingStarted
 
     Welcome to the world of Qt--the cross-platform GUI toolkit. In
     this getting started guide, we teach basic Qt knowledge by
@@ -85,7 +85,7 @@
     other widgets), it is possible to show a single widget in its own
     window. Widgets are not visible by default; the function
     \l{QWidget::}{show()} makes the widget visible.
- 
+
     Line 11 makes the QApplication enter its event loop. When a Qt
     application is running, events are generated and sent to the
     widgets of the application. Examples of events are mouse presses
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 38586ef..2272cf8 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -65,11 +65,11 @@
               </div>
               <div class="sectionlist  tricol">
                 <ul>
-                    <li><a href="qt-basic-concepts.html">Basic Qt Architecture</a></li>
-                    <li><a href="qt-gui-concepts.html">UI Components</a></li>
-                    <li><a href="developing-with-qt.html">Cross-platform &amp; Platform-specific Development</a></li>
-                    <li><a href="technology-apis.html">Qt &amp; standard technologies </a></li>
-                    <li><a href="best-practices.html">Qt How-to's &amp; best practices</a></li>
+                    <li><a href="qt-basic-concepts.html">Basic Concepts</a></li>
+                    <li><a href="qt-gui-concepts.html">GUI Components</a></li>
+                    <li><a href="developing-with-qt.html">Cross-platform and Platform-specific</a></li>
+                    <li><a href="technology-apis.html">Qt APIs for standard technologies </a></li>
+                    <li><a href="best-practices.html">How-To Guides and Best Practices</a></li>
                 </ul>
               </div>
               <div class="sectionlist">
@@ -77,7 +77,6 @@
                     <li><a href="qtquick.html">Qt Quick</a></li>
                     <li><a href="qdeclarativeintroduction.html">Introduction to QML</a></li>
                     <li><a href="qdeclarativeelements.html">QML Elements</a></li>
-                    <li><a href="qt-gui-concepts.html">UI components</a></li>
                     <li><a href="model-view-programming.html">Model/View Programming</a></li>
                     <li><a href="qt-network.html">Network Programming</a></li>
                     <li><a href="qt-graphics.html">Graphics and Printing</a></li>
@@ -102,13 +101,12 @@
                   <li><a href="assistant-manual.html">Qt Assistant</a></li>
                   <li><a href="qmake-manual.html">Qt qmake</a></li>
                   <li><a href="http://doc.qt.nokia.com/qtsimulator-1.0/simulator-description.html">Qt Simulator</a></li>
-                  <li><a href="http://qt.nokia.com/developer/eclipse-integration">Integration</a> and <a href="http://qt.nokia.com/products/appdev">add-ins</a></li>
+                  <li><a href="http://qt.nokia.com/developer/eclipse-integration">Eclipse Integration</a></li>
+                  <li><a href="http://qt.nokia.com/products/appdev">Add-On Products and Services</a></li>
                   <li><a href="qvfb.html">Virtual Framebuffer</a></li>
                 </ul>
               </div>
             </div>
           </div>
     \endraw
-
-
 */
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index 88ef2a8..a88b326 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -455,10 +455,10 @@
 
     \image quick_screens.png
 
-    Qt 4.7 introduces Quick, the Qt UI Creation Kit. that enables the creation
-    of dynamic user interfaces, easier and more effective than possible
-    with existing UI technologies. This UI Creation Kit consist of three
-    technologies:
+    Qt 4.7 introduces \l{Qt Quick}, the Qt UI Creation Kit. that enables
+    the creation of dynamic user interfaces, easier and more effective
+    than possible with existing UI technologies. This UI Creation Kit
+    consists of three technologies:
 
     \list
     \i QML is a declarative language oriented on JavaScript that utilizes
diff --git a/doc/src/snippets/declarative/propertyaction.qml b/doc/src/snippets/declarative/propertyaction.qml
new file mode 100644
index 0000000..1a15469
--- /dev/null
+++ b/doc/src/snippets/declarative/propertyaction.qml
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import Qt 4.7
+
+Row {
+
+//![transition]
+Item {
+    width: 400; height: 400
+
+    Rectangle {
+        id: rect
+        width: 200; height: 100
+        color: "red"
+
+        states: State {
+            name: "rotated"
+            PropertyChanges { target: rect; rotation: 180; transformOrigin: Item.BottomRight }
+        }
+
+        transitions: Transition {
+            RotationAnimation { duration: 1000; direction: RotationAnimation.Counterclockwise }
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: rect.state = "rotated"
+        }
+    }
+}
+//![transition]
+
+Item {
+    width: 300; height: 300
+
+    Image { id: img; source: "pics/qt.png" }
+
+//![standalone]
+SequentialAnimation {
+    PropertyAction { target: img; property: "smooth"; value: "true" }
+    NumberAnimation { target: img; property: "width"; to: 300; duration: 1000 }
+    PropertyAction { target: img; property: "smooth"; value: "false" }
+}
+//![standalone]
+}
+
+}
+
diff --git a/doc/src/snippets/declarative/propertychanges.qml b/doc/src/snippets/declarative/propertychanges.qml
new file mode 100644
index 0000000..9f119bf
--- /dev/null
+++ b/doc/src/snippets/declarative/propertychanges.qml
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+//![import]
+import Qt 4.7
+//![import]
+
+Column {
+
+//![0]
+Item {
+    id: container
+    width: 300; height: 300
+
+    Rectangle {
+        id: rect
+        width: 100; height: 100
+        color: "red"
+
+        MouseArea { 
+           id: mouseArea
+           anchors.fill: parent 
+        }
+
+        states: State {
+           name: "resized"; when: mouseArea.pressed
+           PropertyChanges { target: rect; color: "blue"; height: container.height }
+        }
+    }
+}
+//![0]
+
+//![reset]
+Rectangle {
+    width: 300; height: 200
+
+    Text {
+        id: myText
+        width: 50
+        wrapMode: Text.WordWrap
+        text: "a text string that is longer than 50 pixels"
+
+        states: State {
+            name: "widerText"
+            PropertyChanges { target: myText; width: undefined }
+        }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: myText.state = "widerText"
+    }
+}
+//![reset]
+}
diff --git a/doc/src/snippets/declarative/rotationanimation.qml b/doc/src/snippets/declarative/rotationanimation.qml
index c81395a..b56cb3f 100644
--- a/doc/src/snippets/declarative/rotationanimation.qml
+++ b/doc/src/snippets/declarative/rotationanimation.qml
@@ -52,7 +52,8 @@ Item {
         smooth: true
 
         states: State { 
-            name: "rotated"; PropertyChanges { target: rect; rotation: 180 } 
+            name: "rotated"
+            PropertyChanges { target: rect; rotation: 180 } 
         }
 
         transitions: Transition {
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 190c60a..6f2bdce 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -388,9 +388,9 @@
     .shortCut-topleft-inactive
     {
         padding-left: 3px;
+        padding-right: 3px;
         background: transparent url( ../images/sprites-combined.png) no-repeat 0px -58px;
         height: 20px;
-        width: 47px;
     }
     .shortCut-topleft-inactive span
     {
diff --git a/doc/src/zh_CN/bughowto.qdoc b/doc/src/zh_CN/bughowto.qdoc
new file mode 100644
index 0000000..05c8403
--- /dev/null
+++ b/doc/src/zh_CN/bughowto.qdoc
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
+**
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of this
+** file.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page bughowto.html
+    \title 如何报告 Bug
+    \brief 关于报告 Qt 中 bug 方法的信息。
+
+    如果您认为您已经发现了 Qt 的一个 bug，我们非常高兴听到这个消息，因为在此之后我们可以修复它。
+
+    在报告 bug 之前，请检查 Qt 网站中的 \l{FAQs}{FAQ}、\l{Platform Notes}{平台备注}和 \l{Qt Bug Tracker}{Qt Bug 跟踪器}确认这个问题是否已知。
+
+    如果您还没有 \l{Qt Bug Tracker}{Qt Bug 跟踪器}的帐号，您要做的第一件事情就是注册一个。一旦您完成了这一步，您就可以提交并且跟踪您的 bug 报告，而且在您提交之后，公众就可以看到它们。
+
+    请在您的 bug 报告中包含以下信息：
+
+    \list 1
+    \o 您的编译器的名称和版本号
+    \o 您的操作系统的名称和版本号
+    \o 您所使用的 Qt 的版本号，以及它在被编译的时候所使用的配置选项
+    \o 关于如何重复这个问题的可靠并且清晰的描述
+    \endlist
+   
+    如果可能，请提供一个使用 QtTest 模块编写的测试程序，因为这样做可以加快我们重现您的这个问题的进程，并且可以让开发人员更有效率的确认这个问题。
+
+    另外，如果您的问题只是在运行时可见，请尽量创建一个可以运行并且显示这个问题的小测试程序。通常，您可以在众多 Qt 实例中选择一个进行少量修改就可以实现这一目的。
+
+    如果您已经实现了一个 bug 修复并且希望直接贡献这个修复，那么您需要通过\l{Public Qt Repository}{公共 Qt 代码仓库}来实现。
+*/
diff --git a/examples/declarative/modelviews/package/view.qml b/examples/declarative/modelviews/package/view.qml
index 152881a..26230ef 100644
--- a/examples/declarative/modelviews/package/view.qml
+++ b/examples/declarative/modelviews/package/view.qml
@@ -40,7 +40,8 @@
 
 import Qt 4.7
 
-Item {
+Rectangle {
+    color: "white"
     width: 400
     height: 200
 
diff --git a/examples/declarative/sqllocalstorage/hello.qml b/examples/declarative/sqllocalstorage/hello.qml
index 421a74c..19b7378 100644
--- a/examples/declarative/sqllocalstorage/hello.qml
+++ b/examples/declarative/sqllocalstorage/hello.qml
@@ -40,32 +40,38 @@
 //![0]
 import Qt 4.7
 
-Text {
-    text: "?"
+Rectangle {
+    color: "white"
+    width: 200
+    height: 100
+    
+    Text {
+        text: "?"
+        anchors.horizontalCenter: parent.horizontalCenter
+        function findGreetings() {
+            var db = openDatabaseSync("QDeclarativeExampleDB", "1.0", "The Example QML SQL!", 1000000);
 
-    function findGreetings() {
-        var db = openDatabaseSync("QDeclarativeExampleDB", "1.0", "The Example QML SQL!", 1000000);
+            db.transaction(
+                function(tx) {
+                    // Create the database if it doesn't already exist
+                    tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
 
-        db.transaction(
-            function(tx) {
-                // Create the database if it doesn't already exist
-                tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
+                    // Add (another) greeting row
+                    tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
 
-                // Add (another) greeting row
-                tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+                    // Show all added greetings
+                    var rs = tx.executeSql('SELECT * FROM Greeting');
 
-                // Show all added greetings
-                var rs = tx.executeSql('SELECT * FROM Greeting');
-
-                var r = ""
-                for(var i = 0; i < rs.rows.length; i++) {
-                    r += rs.rows.item(i).salutation + ", " + rs.rows.item(i).salutee + "\n"
+                    var r = ""
+                    for(var i = 0; i < rs.rows.length; i++) {
+                        r += rs.rows.item(i).salutation + ", " + rs.rows.item(i).salutee + "\n"
+                    }
+                    text = r
                 }
-                text = r
-            }
-        )
-    }
+            )
+        }
 
-    Component.onCompleted: findGreetings()
+        Component.onCompleted: findGreetings()
+    }
 }
 //![0]
diff --git a/examples/declarative/threading/threadedlistmodel/timedisplay.qml b/examples/declarative/threading/threadedlistmodel/timedisplay.qml
index 997f7a0..d807955 100644
--- a/examples/declarative/threading/threadedlistmodel/timedisplay.qml
+++ b/examples/declarative/threading/threadedlistmodel/timedisplay.qml
@@ -41,31 +41,35 @@
 // ![0]
 import Qt 4.7
 
-ListView {
+Rectangle {
+    color: "white"
     width: 200
     height: 300
 
-    model: listModel
-    delegate: Component {
-        Text { text: time }
-    }
+    ListView {
+        anchors.fill: parent
+        model: listModel
+        delegate: Component {
+            Text { text: time }
+        }
 
-    ListModel { id: listModel }
+        ListModel { id: listModel }
 
-    WorkerScript {
-        id: worker
-        source: "dataloader.js"
-    }
+        WorkerScript {
+            id: worker
+            source: "dataloader.js"
+        }
 
-    Timer {
-        id: timer
-        interval: 2000; repeat: true
-        running: true
-        triggeredOnStart: true
+        Timer {
+            id: timer
+            interval: 2000; repeat: true
+            running: true
+            triggeredOnStart: true
 
-        onTriggered: {
-            var msg = {'action': 'appendCurrentTime', 'model': listModel};
-            worker.sendMessage(msg);
+            onTriggered: {
+                var msg = {'action': 'appendCurrentTime', 'model': listModel};
+                worker.sendMessage(msg);
+            }
         }
     }
 }
diff --git a/examples/declarative/ui-components/dialcontrol/content/Dial.qml b/examples/declarative/ui-components/dialcontrol/content/Dial.qml
index b5074a64..3ffa09a 100644
--- a/examples/declarative/ui-components/dialcontrol/content/Dial.qml
+++ b/examples/declarative/ui-components/dialcontrol/content/Dial.qml
@@ -68,6 +68,7 @@ Item {
         transform: Rotation {
             id: needleRotation
             origin.x: 5; origin.y: 65
+            //! [needle angle]
             angle: Math.min(Math.max(-130, root.value*2.6 - 130), 133)
             Behavior on angle {
                 SpringAnimation {
@@ -75,6 +76,7 @@ Item {
                     damping: .15
                 }
             }
+            //! [needle angle]
         }
     }
 //! [needle]
diff --git a/examples/declarative/ui-components/dialcontrol/dialcontrol.qml b/examples/declarative/ui-components/dialcontrol/dialcontrol.qml
index 95df68c..46cc3e6 100644
--- a/examples/declarative/ui-components/dialcontrol/dialcontrol.qml
+++ b/examples/declarative/ui-components/dialcontrol/dialcontrol.qml
@@ -38,8 +38,10 @@
 **
 ****************************************************************************/
 
+//! [imports]
 import Qt 4.7
 import "content"
+//! [imports]
 
 //! [0]
 Rectangle {
@@ -87,4 +89,4 @@ Rectangle {
         }
     }
 }
-//! [0]
\ No newline at end of file
+//! [0]
diff --git a/mkspecs/features/sis_targets.prf b/mkspecs/features/sis_targets.prf
index 99f5910..abdf2d4 100644
--- a/mkspecs/features/sis_targets.prf
+++ b/mkspecs/features/sis_targets.prf
@@ -11,7 +11,6 @@ else:!equals(DEPLOYMENT, default_deployment) {
 
 equals(GENERATE_SIS_TARGETS, true) {
     symbian-abld|symbian-sbsv2 {
-        sis_destdir =
         make_cache_name = .make.cache
         sis_target.target = sis
         sis_target.commands = $(if $(wildcard $$basename(TARGET)_template.pkg), \
@@ -50,7 +49,7 @@ equals(GENERATE_SIS_TARGETS, true) {
         ok_unsigned_sis_target.target = ok_unsigned_sis
         ok_unsigned_sis_target.commands = createpackage.bat $(QT_SIS_OPTIONS) -o $$basename(TARGET)_template.pkg $(QT_SIS_TARGET)
 
-        target_sis_target.target = $${sis_destdir}$${TARGET}.sis
+        target_sis_target.target = $$basename(TARGET).sis
         target_sis_target.commands = $(MAKE) -f $(MAKEFILE) sis
 
         installer_sis_target.target = installer_sis
@@ -59,7 +58,7 @@ equals(GENERATE_SIS_TARGETS, true) {
                                         , \
                                             $(MAKE) -f $(MAKEFILE) fail_sis_nopkg \
                                         )
-        installer_sis_target.depends = $${sis_destdir}$${TARGET}.sis
+        installer_sis_target.depends = $$basename(TARGET).sis
 
         ok_installer_sis_target.target = ok_installer_sis
         ok_installer_sis_target.commands = createpackage.bat $(QT_SIS_OPTIONS) $$basename(TARGET)_installer.pkg - \
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 45a96f5..851e587 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -471,9 +471,9 @@ MakefileGenerator::init()
                          subs.at(i).toLatin1().constData());
                 continue;
             }
-            QFile in(fileFixify(subs.at(i))), out(fileInfo(subs.at(i)).fileName());
-            if(out.fileName().endsWith(".in"))
-                out.setFileName(out.fileName().left(out.fileName().length()-3));
+            QFile in(fileFixify(subs.at(i)));
+            QFile out(fileFixify(subs.at(i).left(subs.at(i).length()-3),
+                                 qmake_getpwd(), Option::output_dir));
             if(in.open(QFile::ReadOnly)) {
                 QString contents;
                 QStack<int> state;
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
index 382e012..776a646 100644
--- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp
+++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
@@ -353,7 +353,11 @@ void initProjectDeploySymbian(QMakeProject* project,
             CopyItem &item = i.next();
             QFileInfo fromItem(item.from);
             QFileInfo toItem(item.to);
-            if (fromItem == toItem)
+#if defined(Q_OS_WIN)
+            if (0 == fromItem.absoluteFilePath().compare(toItem.absoluteFilePath(), Qt::CaseInsensitive))
+#else
+            if (0 == fromItem.absoluteFilePath().compare(toItem.absoluteFilePath()))
+#endif
                 i.remove();
         }
     }
diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
index 9dcba60..c1ca23d 100644
--- a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
@@ -139,6 +139,7 @@ void GraphicsWebView::mouseMoveEvent(QGraphicsSceneMouseEvent* event)
 
 /*!
     \qmlclass WebView QDeclarativeWebView
+    \ingroup qml-view-elements
     \since 4.7
     \brief The WebView item allows you to add web content to a canvas.
     \inherits Item
diff --git a/src/corelib/io/qprocess_symbian.cpp b/src/corelib/io/qprocess_symbian.cpp
index af657b2..003e781 100644
--- a/src/corelib/io/qprocess_symbian.cpp
+++ b/src/corelib/io/qprocess_symbian.cpp
@@ -375,10 +375,9 @@ QProcessActive::QProcessActive()
     // Nothing to do
 }
 
-// Called from ProcessManagerThread
+// Called from main thread
 QProcessActive::~QProcessActive()
 {
-    Cancel();
     process = NULL;
     pproc = NULL;
 }
@@ -482,10 +481,9 @@ QProcessManagerMediator::QProcessManagerMediator()
     // Nothing to do
 }
 
-// Called from ProcessManagerThread
+// Called from main thread
 QProcessManagerMediator::~QProcessManagerMediator()
 {
-    Cancel();
     processManagerThread.Close();
     currentCommand = ENoCommand;
     currentObserver = NULL;
@@ -648,25 +646,36 @@ QProcessManager::QProcessManager()
 QProcessManager::~QProcessManager()
 {
     QPROCESS_DEBUG_PRINT("QProcessManager::~QProcessManager()");
-    // Cancel death listening for all child processes
-    if (mediator) {
-        QMap<int, QProcessActive *>::Iterator it = children.begin();
-        while (it != children.end()) {
-            // Remove all monitors
-            QProcessActive *active = it.value();
-            mediator->remove(active);
-
-            QPROCESS_DEBUG_PRINT("QProcessManager::~QProcessManager() removed listening for a process");
-            ++it;
+
+    // Check if manager thread is still alive. If this destructor is ran as part of global
+    // static cleanup, manager thread will most likely be terminated by kernel at this point,
+    // so trying to delete QProcessActives and QProcessMediators will panic as they
+    // will still be active. They can also no longer be canceled as the thread is already gone.
+    // In case manager thread has already died, we simply do nothing and let the deletion of
+    // the main heap at process exit take care of stray objects.
+
+    if (managerThread.Handle() && managerThread.ExitType() == EExitPending) {
+        // Cancel death listening for all child processes
+        if (mediator) {
+            QMap<int, QProcessActive *>::Iterator it = children.begin();
+            while (it != children.end()) {
+                // Remove all monitors
+                QProcessActive *active = it.value();
+                mediator->remove(active);
+
+                QPROCESS_DEBUG_PRINT("QProcessManager::~QProcessManager() removed listening for a process");
+                ++it;
+            }
+
+            // Terminate process manager thread.
+            mediator->terminate();
+            delete mediator;
         }
 
-        // Terminate process manager thread.
-        mediator->terminate();
-        delete mediator;
+        qDeleteAll(children.values());
+        children.clear();
     }
 
-    qDeleteAll(children.values());
-    children.clear();
     managerThread.Close();
     managerMutex.Close();
 }
diff --git a/src/declarative/debugger/qdeclarativedebug.cpp b/src/declarative/debugger/qdeclarativedebug.cpp
index b950aef..154df51 100644
--- a/src/declarative/debugger/qdeclarativedebug.cpp
+++ b/src/declarative/debugger/qdeclarativedebug.cpp
@@ -507,7 +507,7 @@ QDeclarativeDebugObjectQuery *QDeclarativeEngineDebug::queryObject(const QDeclar
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
         ds << QByteArray("FETCH_OBJECT") << queryId << object.debugId() 
-           << false;
+           << false << true;
         d->client->sendMessage(message);
     } else {
         query->m_state = QDeclarativeDebugQuery::Error;
@@ -530,7 +530,7 @@ QDeclarativeDebugObjectQuery *QDeclarativeEngineDebug::queryObjectRecursive(cons
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
         ds << QByteArray("FETCH_OBJECT") << queryId << object.debugId() 
-           << true;
+           << true << true;
         d->client->sendMessage(message);
     } else {
         query->m_state = QDeclarativeDebugQuery::Error;
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
index d8527d3..e0a2149 100644
--- a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
@@ -62,7 +62,8 @@ QT_BEGIN_NAMESPACE
     \qmlclass AnimatedImage QDeclarativeAnimatedImage
     \inherits Image
     \since 4.7
-
+    \ingroup basic-visual-elements
+    
     The AnimatedImage element provides for playing animations stored as images containing a series of frames,
     such as GIF files. 
     
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
index 4881248..e0c7fc2 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -56,6 +56,7 @@ QT_BEGIN_NAMESPACE
     \brief The BorderImage element provides an image that can be used as a border.
     \inherits Item
     \since 4.7
+    \ingroup qm-basic-visual-elements
 
     A BorderImage breaks an image into 9 sections, as shown below:
 
diff --git a/src/declarative/graphicsitems/qdeclarativeevents.cpp b/src/declarative/graphicsitems/qdeclarativeevents.cpp
index 81ec6e1..0a35a3f 100644
--- a/src/declarative/graphicsitems/qdeclarativeevents.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeevents.cpp
@@ -45,6 +45,8 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmlclass KeyEvent QDeclarativeKeyEvent
     \since 4.7
+    \ingroup qml-event-elements
+    
     \brief The KeyEvent object provides information about a key event.
 
     For example, the following changes the Item's state property when the Enter
@@ -115,6 +117,8 @@ Item {
 /*!
     \qmlclass MouseEvent QDeclarativeMouseEvent
     \since 4.7
+    \ingroup qml-event-elements
+    
     \brief The MouseEvent object provides information about a mouse event.
 
     The position of the mouse can be found via the x and y properties.
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 9bcadd2..7fee44e 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -345,6 +345,8 @@ void QDeclarativeFlickablePrivate::updateBeginningEnd()
 /*!
     \qmlclass Flickable QDeclarativeFlickable
     \since 4.7
+    \ingroup qml-basic-interaction-elements
+
     \brief The Flickable item provides a surface that can be "flicked".
     \inherits Item
 
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
index b266273..6ce0fa6 100644
--- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
@@ -70,6 +70,8 @@ public:
 /*!
     \qmlclass Flipable QDeclarativeFlipable
     \since 4.7
+    \ingroup qml-basic-interaction-elements
+
     \brief The Flipable item provides a surface that can be flipped.
     \inherits Item
 
diff --git a/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp b/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp
index bd60e25..5c7959a 100644
--- a/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp
@@ -51,6 +51,8 @@ QT_BEGIN_NAMESPACE
 /*!
    \qmlclass FocusPanel QDeclarativeFocusPanel
     \since 4.7
+    \ingroup qml-basic-interaction-elements
+
    \brief The FocusPanel item explicitly creates a focus panel.
    \inherits Item
 
diff --git a/src/declarative/graphicsitems/qdeclarativefocusscope.cpp b/src/declarative/graphicsitems/qdeclarativefocusscope.cpp
index e8e6fa2..4498275 100644
--- a/src/declarative/graphicsitems/qdeclarativefocusscope.cpp
+++ b/src/declarative/graphicsitems/qdeclarativefocusscope.cpp
@@ -48,6 +48,8 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmlclass FocusScope QDeclarativeFocusScope
     \since 4.7
+    \ingroup qml-basic-interaction-elements
+
     \brief The FocusScope object explicitly creates a focus scope.
     \inherits Item
 
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 68a4c64..d67e69a 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -1056,6 +1056,8 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
 /*!
     \qmlclass GridView QDeclarativeGridView
     \since 4.7
+    \ingroup qml-view-elements
+
     \inherits Flickable
     \brief The GridView item provides a grid view of items provided by a model.
 
diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp
index 37736cc..47a410c 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp
@@ -51,6 +51,8 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmlclass Image QDeclarativeImage
     \since 4.7
+    \ingroup qml-vasic-visual-elements
+
     \brief The Image element allows you to add bitmaps to a scene.
     \inherits Item
 
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index cc7c673..0f16a79 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -69,6 +69,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Transform QGraphicsTransform
+    \ingroup qml-transform-elements
     \since 4.7
     \brief The Transform elements provide a way of building advanced transformations on Items.
 
@@ -90,6 +91,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Translate QDeclarativeTranslate
+    \ingroup qml-transform-elements
     \since 4.7
     \brief The Translate object provides a way to move an Item without changing its x or y properties.
 
@@ -131,6 +133,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Scale QGraphicsScale
+    \ingroup qml-transform-elements
     \since 4.7
     \brief The Scale element provides a way to scale an Item.
 
@@ -172,6 +175,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Rotation QGraphicsRotation
+    \ingroup qml-transform-elements
     \since 4.7
     \brief The Rotation object provides a way to rotate an Item.
 
@@ -419,6 +423,7 @@ void QDeclarativeItemKeyFilter::componentComplete()
 
 /*!
     \qmlclass KeyNavigation QDeclarativeKeyNavigationAttached
+    \ingroup qml-basic-interaction-elements
     \since 4.7
     \brief The KeyNavigation attached property supports key navigation by arrow keys.
 
@@ -725,6 +730,7 @@ void QDeclarativeKeyNavigationAttached::keyReleased(QKeyEvent *event, bool post)
 
 /*!
     \qmlclass Keys QDeclarativeKeysAttached
+    \ingroup qml-basic-interaction-elements
     \since 4.7
     \brief The Keys attached property provides key handling to Items.
 
@@ -1310,6 +1316,7 @@ QDeclarativeKeysAttached *QDeclarativeKeysAttached::qmlAttachedProperties(QObjec
 
 /*!
     \qmlclass Item QDeclarativeItem
+    \ingroup qml-basic-visual-elements
     \since 4.7
     \brief The Item is the most basic of all visual items in QML.
 
diff --git a/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp b/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp
index 38d5f59..8509473 100644
--- a/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp
@@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass LayoutItem QDeclarativeLayoutItem
+    \ingroup qml-utility-elements
     \since 4.7
     \brief The LayoutItem element allows declarative UI elements to be placed inside Qt's Graphics View layouts.
 
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index e1dd1c0..ec1b6cf 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1357,6 +1357,7 @@ void QDeclarativeListViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
 
 /*!
     \qmlclass ListView QDeclarativeListView
+    \ingroup qml-view-elements
     \since 4.7
     \inherits Flickable
     \brief The ListView item provides a list view of items provided by a model.
diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp
index d28181e..4c6268f 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp
@@ -108,6 +108,7 @@ void QDeclarativeLoaderPrivate::initResize()
 
 /*!
     \qmlclass Loader QDeclarativeLoader
+    \ingroup qml-utility-elements
     \since 4.7
     \inherits Item
 
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index dcdb9f6..2823888 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -180,6 +180,7 @@ QDeclarativeMouseAreaPrivate::~QDeclarativeMouseAreaPrivate()
 
 /*!
     \qmlclass MouseArea QDeclarativeMouseArea
+    \ingroup qml-basic-interaction-elements
     \since 4.7
     \brief The MouseArea item enables simple mouse handling.
     \inherits Item
diff --git a/src/declarative/graphicsitems/qdeclarativepath.cpp b/src/declarative/graphicsitems/qdeclarativepath.cpp
index c48011d3..62e03e7 100644
--- a/src/declarative/graphicsitems/qdeclarativepath.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepath.cpp
@@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass PathElement QDeclarativePathElement
+    \ingroup qml-view-elements
     \since 4.7
     \brief PathElement is the base path type.
 
@@ -67,6 +68,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Path QDeclarativePath
+    \ingroup qml-view-elements
     \since 4.7
     \brief A Path object defines a path for use by \l PathView.
 
@@ -497,6 +499,7 @@ void QDeclarativeCurve::setY(qreal y)
 
 /*!
     \qmlclass PathAttribute QDeclarativePathAttribute
+    \ingroup qml-view-elements
     \since 4.7
     \brief The PathAttribute allows setting an attribute at a given position in a Path.
 
@@ -587,6 +590,7 @@ void QDeclarativePathAttribute::setValue(qreal value)
 
 /*!
     \qmlclass PathLine QDeclarativePathLine
+    \ingroup qml-view-elements
     \since 4.7
     \brief The PathLine defines a straight line.
 
@@ -627,6 +631,7 @@ void QDeclarativePathLine::addToPath(QPainterPath &path)
 
 /*!
     \qmlclass PathQuad QDeclarativePathQuad
+    \ingroup qml-view-elements
     \since 4.7
     \brief The PathQuad defines a quadratic Bezier curve with a control point.
 
@@ -713,6 +718,7 @@ void QDeclarativePathQuad::addToPath(QPainterPath &path)
 
 /*!
    \qmlclass PathCubic QDeclarativePathCubic
+    \ingroup qml-view-elements
     \since 4.7
    \brief The PathCubic defines a cubic Bezier curve with two control points.
 
@@ -828,6 +834,7 @@ void QDeclarativePathCubic::addToPath(QPainterPath &path)
 
 /*!
     \qmlclass PathPercent QDeclarativePathPercent
+    \ingroup qml-view-elements
     \since 4.7
     \brief The PathPercent manipulates the way a path is interpreted.
 
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index 380c6ad..535fb90 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -326,6 +326,7 @@ void QDeclarativePathViewPrivate::regenerate()
 
 /*!
     \qmlclass PathView QDeclarativePathView
+    \ingroup qml-view-elements
     \since 4.7
     \brief The PathView element lays out model-provided items on a path.
     \inherits Item
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
index 1a5c42d..4ceb5d9 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
@@ -330,6 +330,7 @@ static inline bool isInvisible(QGraphicsObject *child)
 
 /*!
   \qmlclass Column QDeclarativeColumn
+    \ingroup qml-positioning-elements
     \since 4.7
   \brief The Column item arranges its children vertically.
   \inherits Item
@@ -495,6 +496,7 @@ void QDeclarativeColumn::reportConflictingAnchors()
 
 /*!
   \qmlclass Row QDeclarativeRow
+    \ingroup qml-positioning-elements
   \since 4.7
   \brief The Row item arranges its children horizontally.
   \inherits Item
@@ -633,6 +635,7 @@ void QDeclarativeRow::reportConflictingAnchors()
 
 /*!
   \qmlclass Grid QDeclarativeGrid
+    \ingroup qml-positioning-elements
   \since 4.7
   \brief The Grid item positions its children in a grid.
   \inherits Item
@@ -927,6 +930,7 @@ void QDeclarativeGrid::reportConflictingAnchors()
 
 /*!
   \qmlclass Flow QDeclarativeFlow
+    \ingroup qml-positioning-elements
   \since 4.7
   \brief The Flow item arranges its children side by side, wrapping as necessary.
   \inherits Item
diff --git a/src/declarative/graphicsitems/qdeclarativerectangle.cpp b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
index c49be46..5990c2d 100644
--- a/src/declarative/graphicsitems/qdeclarativerectangle.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
@@ -84,6 +84,7 @@ void QDeclarativePen::setWidth(int w)
 
 /*!
     \qmlclass GradientStop QDeclarativeGradientStop
+    \ingroup qml-basic-visual-elements
   \since 4.7
     \brief The GradientStop item defines the color at a position in a Gradient
 
@@ -105,6 +106,7 @@ void QDeclarativeGradientStop::updateGradient()
 
 /*!
     \qmlclass Gradient QDeclarativeGradient
+    \ingroup qml-basic-visual-elements
   \since 4.7
     \brief The Gradient item defines a gradient fill.
 
@@ -152,6 +154,7 @@ void QDeclarativeGradient::doUpdate()
 
 /*!
     \qmlclass Rectangle QDeclarativeRectangle
+    \ingroup qml-basic-visual-elements
   \since 4.7
     \brief The Rectangle item allows you to add rectangles to a scene.
     \inherits Item
diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
index b4b6c02..4a951a2 100644
--- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
@@ -62,6 +62,7 @@ QDeclarativeRepeaterPrivate::~QDeclarativeRepeaterPrivate()
 
 /*!
     \qmlclass Repeater QDeclarativeRepeater
+    \ingroup qml-utility-elements
     \since 4.7
     \inherits Item
 
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index ab2be9c..fcd112e 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -162,7 +162,8 @@ QSet<QUrl> QTextDocumentWithImageResources::errors;
 
 /*!
     \qmlclass Text QDeclarativeText
-  \since 4.7
+    \ingroup qml-basic-visual-elements
+    \since 4.7
     \brief The Text item allows you to add formatted text to a scene.
     \inherits Item
 
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index 8117676..b8e8726 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -61,6 +61,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass TextEdit QDeclarativeTextEdit
+    \ingroup qml-basic-visual-elements
     \since 4.7
     \brief The TextEdit item displays multiple lines of editable formatted text.
     \inherits Item
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 90f5a70..b4f36f4 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -57,6 +57,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass TextInput QDeclarativeTextInput
+    \ingroup qml-basic-visual-elements
     \since 4.7
     \brief The TextInput item displays an editable line of text.
     \inherits Item
@@ -276,8 +277,10 @@ void QDeclarativeTextInput::setSelectionColor(const QColor &color)
     QPalette p = d->control->palette();
     p.setColor(QPalette::Highlight, d->selectionColor);
     d->control->setPalette(p);
-    clearCache();
-    update();
+    if (d->control->hasSelectedText()) {
+        clearCache();
+        update();
+    }
     emit selectionColorChanged(color);
 }
 
@@ -302,8 +305,10 @@ void QDeclarativeTextInput::setSelectedTextColor(const QColor &color)
     QPalette p = d->control->palette();
     p.setColor(QPalette::HighlightedText, d->selectedTextColor);
     d->control->setPalette(p);
-    clearCache();
-    update();
+    if (d->control->hasSelectedText()) {
+        clearCache();
+        update();
+    }
     emit selectedTextColorChanged(color);
 }
 
@@ -561,6 +566,7 @@ void QDeclarativeTextInput::setAutoScroll(bool b)
 
 /*!
     \qmlclass IntValidator QIntValidator
+    \ingroup qml-basic-visual-elements
 
     This element provides a validator for integer values.
 */
@@ -579,6 +585,7 @@ void QDeclarativeTextInput::setAutoScroll(bool b)
 
 /*!
     \qmlclass DoubleValidator QDoubleValidator
+    \ingroup qml-basic-visual-elements
 
     This element provides a validator for non-integer numbers.
 */
@@ -617,6 +624,7 @@ void QDeclarativeTextInput::setAutoScroll(bool b)
 
 /*!
     \qmlclass RegExpValidator QRegExpValidator
+    \ingroup qml-basic-visual-elements
 
     This element provides a validator, which counts as valid any string which
     matches a specified regular expression.
@@ -1229,8 +1237,12 @@ void QDeclarativeTextInput::setPasswordCharacter(const QString &str)
     Q_D(QDeclarativeTextInput);
     if(str.length() < 1)
         return;
-    emit passwordCharacterChanged();
     d->control->setPasswordCharacter(str.constData()[0]);
+    EchoMode echoMode_ = echoMode();
+    if (echoMode_ == Password || echoMode_ == PasswordEchoOnEdit) {
+        updateSize();
+    }
+    emit passwordCharacterChanged();
 }
 
 /*!
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index a489b5a..764676a 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -128,6 +128,7 @@ public:
 
 /*!
     \qmlclass VisualItemModel QDeclarativeVisualItemModel
+    \ingroup qml-working-with-data
   \since 4.7
     \brief The VisualItemModel allows items to be provided to a view.
 
@@ -644,6 +645,7 @@ QDeclarativeVisualDataModelData *QDeclarativeVisualDataModelPrivate::data(QObjec
 
 /*!
     \qmlclass VisualDataModel QDeclarativeVisualDataModel
+    \ingroup qml-working-with-data
     \brief The VisualDataModel encapsulates a model and delegate
 
     A VisualDataModel encapsulates a model and the delegate that will
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index 5f4a063..15cef16 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -104,6 +104,7 @@ class QByteArray;
 
 /*!
     \qmlclass Component QDeclarativeComponent
+    \ingroup qml-utility-elements
     \since 4.7
     \brief The Component element encapsulates a QML component definition.
 
@@ -599,7 +600,7 @@ QDeclarativeComponent::QDeclarativeComponent(QDeclarativeComponentPrivate &dd, Q
     property, or else the object will not be visible.
 
     Dynamically created instances can be deleted with the \c destroy() method.
-    See \l {Dynamic Object Management} for more information.
+    See \l {Dynamic Object Management in QML} for more information.
 */
 
 /*!
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index de79e4d..513fc65 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -114,6 +114,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
   \qmlclass QtObject QObject
+  \ingroup qml-utility-elements
   \since 4.7
   \brief The QtObject element is the most basic element in QML.
 
@@ -185,6 +186,7 @@ void QDeclarativeEnginePrivate::defineModule()
 
 /*!
 \qmlclass QML:Qt QDeclarativeEnginePrivate
+  \ingroup qml-utility-elements
 \brief The QML global Qt object provides useful enums and functions from Qt.
 
 \keyword QmlGlobalQtObject
@@ -241,7 +243,7 @@ The format specification is described at \l{QML:Qt::formatDateTime}{Qt.formatDat
 
 \section1 Dynamic Object Creation
 The following functions on the global object allow you to dynamically create QML
-items from files or strings. See \l{Dynamic Object Management} for an overview
+items from files or strings. See \l{Dynamic Object Management in QML} for an overview
 of their use.
 
 \list
@@ -1119,7 +1121,7 @@ For example:
 
 \snippet doc/src/snippets/declarative/createComponent-simple.qml 0
 
-See \l {Dynamic Object Management} for more information on using this function.
+See \l {Dynamic Object Management in QML} for more information on using this function.
 
 To create a QML object from an arbitrary string of QML (instead of a file),
 use \l{QML:Qt::createQmlObject()}{Qt.createQmlObject()}.
@@ -1171,7 +1173,7 @@ Note that this function returns immediately, and therefore may not work if
 the \a qml string loads new components (that is, external QML files that have not yet been loaded).
 If this is the case, consider using \l{QML:Qt::createComponent()}{Qt.createComponent()} instead.
 
-See \l {Dynamic Object Management} for more information on using this function.
+See \l {Dynamic Object Management in QML} for more information on using this function.
 */
 
 QScriptValue QDeclarativeEnginePrivate::createQmlObject(QScriptContext *ctxt, QScriptEngine *engine)
diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp
index 1837366..ed98e3c 100644
--- a/src/declarative/qml/qdeclarativeenginedebug.cpp
+++ b/src/declarative/qml/qdeclarativeenginedebug.cpp
@@ -182,7 +182,7 @@ QVariant QDeclarativeEngineDebugServer::valueContents(const QVariant &value) con
 }
 
 void QDeclarativeEngineDebugServer::buildObjectDump(QDataStream &message, 
-                                           QObject *object, bool recur)
+                                           QObject *object, bool recur, bool dumpProperties)
 {
     message << objectData(object);
 
@@ -209,6 +209,8 @@ void QDeclarativeEngineDebugServer::buildObjectDump(QDataStream &message,
             continue;
         QDeclarativeBoundSignal *signal = QDeclarativeBoundSignal::cast(child);
         if (signal) {
+            if (!dumpProperties)
+                continue;
             QDeclarativeObjectProperty prop;
             prop.type = QDeclarativeObjectProperty::SignalProperty;
             prop.hasNotifySignal = false;
@@ -229,12 +231,17 @@ void QDeclarativeEngineDebugServer::buildObjectDump(QDataStream &message,
             fakeProperties << prop;
         } else {
             if (recur)
-                buildObjectDump(message, child, recur);
+                buildObjectDump(message, child, recur, dumpProperties);
             else
                 message << objectData(child);
         }
     }
 
+    if (!dumpProperties) {
+        message << 0;
+        return;
+    }
+
     message << (object->metaObject()->propertyCount() + fakeProperties.count());
 
     for (int ii = 0; ii < object->metaObject()->propertyCount(); ++ii) 
@@ -372,8 +379,9 @@ void QDeclarativeEngineDebugServer::messageReceived(const QByteArray &message)
         int queryId;
         int objectId;
         bool recurse;
+        bool dumpProperties = true;
 
-        ds >> queryId >> objectId >> recurse;
+        ds >> queryId >> objectId >> recurse >> dumpProperties;
 
         QObject *object = QDeclarativeDebugService::objectForId(objectId);
 
@@ -382,7 +390,7 @@ void QDeclarativeEngineDebugServer::messageReceived(const QByteArray &message)
         rs << QByteArray("FETCH_OBJECT_R") << queryId;
 
         if (object) 
-            buildObjectDump(rs, object, recurse);
+            buildObjectDump(rs, object, recurse, dumpProperties);
 
         sendMessage(reply);
     } else if (type == "WATCH_OBJECT") {
diff --git a/src/declarative/qml/qdeclarativeenginedebug_p.h b/src/declarative/qml/qdeclarativeenginedebug_p.h
index ea35b40..aa450f3 100644
--- a/src/declarative/qml/qdeclarativeenginedebug_p.h
+++ b/src/declarative/qml/qdeclarativeenginedebug_p.h
@@ -103,7 +103,7 @@ private Q_SLOTS:
 
 private:
     void buildObjectList(QDataStream &, QDeclarativeContext *);
-    void buildObjectDump(QDataStream &, QObject *, bool);
+    void buildObjectDump(QDataStream &, QObject *, bool, bool);
     QDeclarativeObjectData objectData(QObject *);
     QDeclarativeObjectProperty propertyData(QObject *, int);
     QVariant valueContents(const QVariant &defaultValue) const;
diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp
index aec84a6..789116e 100644
--- a/src/declarative/qml/qdeclarativeworkerscript.cpp
+++ b/src/declarative/qml/qdeclarativeworkerscript.cpp
@@ -514,6 +514,7 @@ void QDeclarativeWorkerScriptEngine::run()
 
 /*!
     \qmlclass WorkerScript QDeclarativeWorkerScript
+  \ingroup qml-utility-elements
     \brief The WorkerScript element enables the use of threads in QML.
 
     Use WorkerScript to run operations in a new thread.
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 2fca09d..4e9e8d5 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -74,6 +74,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Animation QDeclarativeAbstractAnimation
+  \ingroup qml-animation-transition
     \since 4.7
     \brief The Animation element is the base of all QML animations.
 
@@ -554,6 +555,7 @@ void QDeclarativeAbstractAnimation::timelineComplete()
 
 /*!
     \qmlclass PauseAnimation QDeclarativePauseAnimation
+  \ingroup qml-animation-transition
     \since 4.7
     \inherits Animation
     \brief The PauseAnimation element provides a pause for an animation.
@@ -630,6 +632,7 @@ QAbstractAnimation *QDeclarativePauseAnimation::qtAnimation()
 
 /*!
     \qmlclass ColorAnimation QDeclarativeColorAnimation
+  \ingroup qml-animation-transition
     \since 4.7
     \inherits PropertyAnimation
     \brief The ColorAnimation element animates changes in color values.
@@ -691,9 +694,12 @@ QDeclarativeColorAnimation::~QDeclarativeColorAnimation()
     }
     \endqml
 
-    If this value is not set and the ColorAnimation is defined within
-    a \l Transition, it defaults to the value defined in the starting 
-    state of the \l Transition.
+    If the ColorAnimation is defined within a \l Transition or \l Behavior,
+    this value defaults to the value defined in the starting state of the
+    \l Transition, or the current value of the property at the moment the 
+    \l Behavior is triggered.
+
+    \sa {QML Animation}
 */
 QColor QDeclarativeColorAnimation::from() const
 {
@@ -711,9 +717,12 @@ void QDeclarativeColorAnimation::setFrom(const QColor &f)
 
     This property holds the color value at which the animation should end.
 
-    If this value is not set and the ColorAnimation is defined within
-    a \l Transition or \l Behavior, it defaults to the value defined in the end 
-    state of the \l Transition or \l Behavior.
+    If the ColorAnimation is defined within a \l Transition or \l Behavior,
+    this value defaults to the value defined in the end state of the
+    \l Transition, or the value of the property change that triggered the
+    \l Behavior.
+
+    \sa {QML Animation}
 */
 QColor QDeclarativeColorAnimation::to() const
 {
@@ -730,6 +739,7 @@ void QDeclarativeColorAnimation::setTo(const QColor &t)
 
 /*!
     \qmlclass ScriptAction QDeclarativeScriptAction
+  \ingroup qml-animation-transition
     \since 4.7
     \inherits Animation
     \brief The ScriptAction element allows scripts to be run during an animation.
@@ -878,33 +888,50 @@ QAbstractAnimation *QDeclarativeScriptAction::qtAnimation()
 
 /*!
     \qmlclass PropertyAction QDeclarativePropertyAction
+  \ingroup qml-animation-transition
     \since 4.7
     \inherits Animation
     \brief The PropertyAction element allows immediate property changes during animation.
 
-    PropertyAction is used to specify an immediate property change
-    during an animation. The property change is not animated.
+    PropertyAction is used to specify an immediate property change during an 
+    animation. The property change is not animated.
 
-    For example, to explicitly set \c {theImage.smooth = true} during a \l Transition:
-    \code
-    transitions: Transition {
-        ...
-        PropertyAction { target: theImage; property: "smooth"; value: true }
-        ...
-    }
-    \endcode
+    It is useful for setting non-animated property values during an animation.
 
-    Or, to set \c theWebView.url to the value set for the destination state:
-    \code
+    For example, here is a SequentialAnimation that sets the image's
+    \l {Image::}{smooth} property to \c true, animates the width of the image,
+    then sets \l {Image::}{smooth} back to \c false:
+
+    \snippet doc/src/snippets/declarative/propertyaction.qml standalone
+
+    PropertyAction is also useful for setting the exact point at which a property 
+    change should occur during a \l Transition. For example, if PropertyChanges 
+    was used in a \l State to rotate an item around a particular 
+    \l {Item::}{transformOrigin}, it might be implemented like this:
+
+    \snippet doc/src/snippets/declarative/propertyaction.qml transition
+
+    However, with this code, the \c transformOrigin is not set until \e after
+    the animation, as a \l State is taken to define the values at the \e end of
+    a transition. The animation would rotate at the default \c transformOrigin,
+    then jump to \c Item.BottomRight. To fix this, insert a PropertyChanges 
+    before the RotationAnimation begins:
+
+    \qml
     transitions: Transition {
-        ...
-        PropertyAction { target: theWebView; property: "url" }
-        ...
+        SequentialAnimation {
+            PropertyAction { target: rect; property: "transformOrigin" }
+            RotationAnimation { ... }
+        }
     }
-    \endcode
-
+    \endqml
+    
+    This immediately sets the \c transformOrigin property to the value defined
+    in the end state of the \l Transition (i.e. the value defined in the 
+    PropertyChanges object) so that the rotation animation begins with the
+    correct transform origin.
 
-    \sa QtDeclarative
+    \sa {QML Animation}, QtDeclarative
 */
 /*!
     \internal
@@ -1009,7 +1036,11 @@ QDeclarativeListProperty<QObject> QDeclarativePropertyAction::exclude()
 /*!
     \qmlproperty any PropertyAction::value
     This property holds the value to be set on the property.
-    If not set, then the value defined for the end state of the transition.
+
+    If the PropertyAction is defined within a \l Transition or \l Behavior,
+    this value defaults to the value defined in the end state of the
+    \l Transition, or the value of the property change that triggered the
+    \l Behavior.
 */
 QVariant QDeclarativePropertyAction::value() const
 {
@@ -1129,6 +1160,7 @@ void QDeclarativePropertyAction::transition(QDeclarativeStateActions &actions,
 
 /*!
     \qmlclass NumberAnimation QDeclarativeNumberAnimation
+  \ingroup qml-animation-transition
     \since 4.7
     \inherits PropertyAnimation
     \brief The NumberAnimation element animates changes in qreal-type values.
@@ -1184,7 +1216,7 @@ void QDeclarativeNumberAnimation::init()
 
 /*!
     \qmlproperty real NumberAnimation::from
-    This property holds the starting number value.
+    This property holds the starting value for the animation.
 
     For example, the following animation is not applied until the \c x value
     has reached 100:
@@ -1199,9 +1231,12 @@ void QDeclarativeNumberAnimation::init()
     }
     \endqml
 
-    If this value is not set and the NumberAnimation is defined within
-    a \l Transition, it defaults to the value defined in the start 
-    state of the \l Transition.
+    If the NumberAnimation is defined within a \l Transition or \l Behavior,
+    this value defaults to the value defined in the starting state of the
+    \l Transition, or the current value of the property at the moment the 
+    \l Behavior is triggered.
+
+    \sa {QML Animation}
 */
 
 qreal QDeclarativeNumberAnimation::from() const
@@ -1217,11 +1252,14 @@ void QDeclarativeNumberAnimation::setFrom(qreal f)
 
 /*!
     \qmlproperty real NumberAnimation::to
-    This property holds the ending number value.
+    This property holds the end value for the animation.
 
-    If this value is not set and the NumberAnimation is defined within
-    a \l Transition or \l Behavior, it defaults to the value defined in the end 
-    state of the \l Transition or \l Behavior.
+    If the NumberAnimation is defined within a \l Transition or \l Behavior,
+    this value defaults to the value defined in the end state of the
+    \l Transition, or the value of the property change that triggered the
+    \l Behavior.
+
+    \sa {QML Animation}
 */
 qreal QDeclarativeNumberAnimation::to() const
 {
@@ -1238,6 +1276,7 @@ void QDeclarativeNumberAnimation::setTo(qreal t)
 
 /*!
     \qmlclass Vector3dAnimation QDeclarativeVector3dAnimation
+  \ingroup qml-animation-transition
     \since 4.7
     \inherits PropertyAnimation
     \brief The Vector3dAnimation element animates changes in QVector3d values.
@@ -1273,10 +1312,14 @@ QDeclarativeVector3dAnimation::~QDeclarativeVector3dAnimation()
 
 /*!
     \qmlproperty real Vector3dAnimation::from
-    This property holds the starting value.
+    This property holds the starting value for the animation.
+
+    If the Vector3dAnimation is defined within a \l Transition or \l Behavior,
+    this value defaults to the value defined in the starting state of the
+    \l Transition, or the current value of the property at the moment the 
+    \l Behavior is triggered.
 
-    If this value is not set, it defaults to the value defined in the start 
-    state of the \l Transition.
+    \sa {QML Animation}
 */
 QVector3D QDeclarativeVector3dAnimation::from() const
 {
@@ -1291,10 +1334,14 @@ void QDeclarativeVector3dAnimation::setFrom(QVector3D f)
 
 /*!
     \qmlproperty real Vector3dAnimation::to
-    This property holds the ending value.
+    This property holds the end value for the animation.
 
-    If this value is not set, it defaults to the value defined in the end 
-    state of the \l Transition or \l Behavior.
+    If the Vector3dAnimation is defined within a \l Transition or \l Behavior,
+    this value defaults to the value defined in the end state of the
+    \l Transition, or the value of the property change that triggered the
+    \l Behavior.
+
+    \sa {QML Animation}
 */
 QVector3D QDeclarativeVector3dAnimation::to() const
 {
@@ -1311,6 +1358,7 @@ void QDeclarativeVector3dAnimation::setTo(QVector3D t)
 
 /*!
     \qmlclass RotationAnimation QDeclarativeRotationAnimation
+  \ingroup qml-animation-transition
     \since 4.7
     \inherits PropertyAnimation
     \brief The RotationAnimation element animates changes in rotation values.
@@ -1335,6 +1383,12 @@ void QDeclarativeVector3dAnimation::setTo(QVector3D t)
     your own properties via \l {PropertyAnimation::properties}{properties} or 
     \l {PropertyAnimation::property}{property}.
 
+    Also, note the \l Rectangle will be rotated around its default
+    \l {Item::}{transformOrigin} (which is \c Item.Center). To use a different
+    transform origin, set the origin in the PropertyChanges object and apply
+    the change at the start of the animation using PropertyAction. See the
+    PropertyAction documentation for more details.
+
     Like any other animation element, a RotationAnimation can be applied in a
     number of ways, including transitions, behaviors and property value 
     sources. The \l {QML Animation} documentation shows a variety of methods
@@ -1400,7 +1454,7 @@ QDeclarativeRotationAnimation::~QDeclarativeRotationAnimation()
 
 /*!
     \qmlproperty real RotationAnimation::from
-    This property holds the starting number value.
+    This property holds the starting value for the animation.
 
     For example, the following animation is not applied until the \c angle value
     has reached 100:
@@ -1415,8 +1469,12 @@ QDeclarativeRotationAnimation::~QDeclarativeRotationAnimation()
     }
     \endqml
 
-    If this value is not set, it defaults to the value defined in the start 
-    state of the \l Transition.
+    If the RotationAnimation is defined within a \l Transition or \l Behavior,
+    this value defaults to the value defined in the starting state of the
+    \l Transition, or the current value of the property at the moment the 
+    \l Behavior is triggered.
+
+    \sa {QML Animation}
 */
 qreal QDeclarativeRotationAnimation::from() const
 {
@@ -1431,10 +1489,14 @@ void QDeclarativeRotationAnimation::setFrom(qreal f)
 
 /*!
     \qmlproperty real RotationAnimation::to
-    This property holds the ending value.
+    This property holds the end value for the animation..
+
+    If the RotationAnimation is defined within a \l Transition or \l Behavior,
+    this value defaults to the value defined in the end state of the
+    \l Transition, or the value of the property change that triggered the
+    \l Behavior.
 
-    If this value is not set, it defaults to the value defined in the end 
-    state of the \l Transition or \l Behavior.
+    \sa {QML Animation}
 */
 qreal QDeclarativeRotationAnimation::to() const
 {
@@ -1540,6 +1602,7 @@ QDeclarativeListProperty<QDeclarativeAbstractAnimation> QDeclarativeAnimationGro
 
 /*!
     \qmlclass SequentialAnimation QDeclarativeSequentialAnimation
+  \ingroup qml-animation-transition
     \since 4.7
     \inherits Animation
     \brief The SequentialAnimation element allows animations to be run sequentially.
@@ -1613,6 +1676,7 @@ void QDeclarativeSequentialAnimation::transition(QDeclarativeStateActions &actio
 
 /*!
     \qmlclass ParallelAnimation QDeclarativeParallelAnimation
+  \ingroup qml-animation-transition
     \since 4.7
     \inherits Animation
     \brief The ParallelAnimation element allows animations to be run in parallel.
@@ -1731,6 +1795,7 @@ void QDeclarativePropertyAnimationPrivate::convertVariant(QVariant &variant, int
 
 /*!
     \qmlclass PropertyAnimation QDeclarativePropertyAnimation
+  \ingroup qml-animation-transition
     \since 4.7
     \inherits Animation
     \brief The PropertyAnimation element animates changes in property values.
@@ -1843,8 +1908,14 @@ void QDeclarativePropertyAnimation::setDuration(int duration)
 
 /*!
     \qmlproperty real PropertyAnimation::from
-    This property holds the starting value.
-    If not set, then the value defined in the start state of the transition.
+    This property holds the starting value for the animation.
+
+    If the PropertyAnimation is defined within a \l Transition or \l Behavior,
+    this value defaults to the value defined in the starting state of the
+    \l Transition, or the current value of the property at the moment the 
+    \l Behavior is triggered.
+
+    \sa {QML Animation}
 */
 QVariant QDeclarativePropertyAnimation::from() const
 {
@@ -1864,8 +1935,14 @@ void QDeclarativePropertyAnimation::setFrom(const QVariant &f)
 
 /*!
     \qmlproperty real PropertyAnimation::to
-    This property holds the ending value.
-    If not set, then the value defined in the end state of the transition or \l Behavior.
+    This property holds the end value for the animation.
+
+    If the PropertyAnimation is defined within a \l Transition or \l Behavior,
+    this value defaults to the value defined in the end state of the
+    \l Transition, or the value of the property change that triggered the
+    \l Behavior.
+
+    \sa {QML Animation}
 */
 QVariant QDeclarativePropertyAnimation::to() const
 {
@@ -2400,6 +2477,7 @@ void QDeclarativePropertyAnimation::transition(QDeclarativeStateActions &actions
 
 /*!
     \qmlclass ParentAnimation QDeclarativeParentAnimation
+  \ingroup qml-animation-transition
     \since 4.7
     \inherits Animation
     \brief The ParentAnimation element animates changes in parent values.
@@ -2490,7 +2568,10 @@ void QDeclarativeParentAnimation::setTarget(QDeclarativeItem *target)
     \qmlproperty Item ParentAnimation::newParent
     The new parent to animate to.
 
-    If not set, then the parent defined in the end state of the transition.
+    If the ParentAnimation is defined within a \l Transition or \l Behavior,
+    this value defaults to the value defined in the end state of the
+    \l Transition, or the value of the property change that triggered the
+    \l Behavior.
 */
 QDeclarativeItem *QDeclarativeParentAnimation::newParent() const
 {
@@ -2759,6 +2840,7 @@ QAbstractAnimation *QDeclarativeParentAnimation::qtAnimation()
 
 /*!
     \qmlclass AnchorAnimation QDeclarativeAnchorAnimation
+  \ingroup qml-animation-transition
     \since 4.7
     \inherits Animation
     \brief The AnchorAnimation element animates changes in anchor values.
diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp
index 1e7f81a..f1b6f9a 100644
--- a/src/declarative/util/qdeclarativebehavior.cpp
+++ b/src/declarative/util/qdeclarativebehavior.cpp
@@ -72,6 +72,7 @@ public:
 
 /*!
     \qmlclass Behavior QDeclarativeBehavior
+  \ingroup qml-animation-transition
     \since 4.7
     \brief The Behavior element allows you to specify a default animation for a property change.
 
diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/declarative/util/qdeclarativebind.cpp
index 5fab631..86d08f5 100644
--- a/src/declarative/util/qdeclarativebind.cpp
+++ b/src/declarative/util/qdeclarativebind.cpp
@@ -72,6 +72,7 @@ public:
 
 /*!
     \qmlclass Binding QDeclarativeBind
+  \ingroup qml-working-with-data
     \since 4.7
     \brief The Binding element allows arbitrary property bindings to be created.
 
diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp
index b364821..293928e 100644
--- a/src/declarative/util/qdeclarativeconnections.cpp
+++ b/src/declarative/util/qdeclarativeconnections.cpp
@@ -71,6 +71,7 @@ public:
 
 /*!
     \qmlclass Connections QDeclarativeConnections
+  \ingroup qml-utility-elements
   \since 4.7
     \brief A Connections element describes generalized connections to signals.
 
diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp
index 83bdb17..291583c 100644
--- a/src/declarative/util/qdeclarativefontloader.cpp
+++ b/src/declarative/util/qdeclarativefontloader.cpp
@@ -78,6 +78,7 @@ public:
 
 /*!
     \qmlclass FontLoader QDeclarativeFontLoader
+  \ingroup qml-utility-elements
     \since 4.7
     \brief The FontLoader element allows fonts to be loaded by name or URL.
 
diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index 20fe3a9..1f66f0f 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -68,6 +68,7 @@ QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListM
 
 /*!
     \qmlclass ListModel QDeclarativeListModel
+    \ingroup qml-working-with-data
     \since 4.7
     \brief The ListModel element defines a free-form list data source.
 
@@ -129,7 +130,7 @@ QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListM
 
     \snippet examples/declarative/threading/threadedlistmodel/dataloader.js 0
 
-    The application's \tt Timer object periodically sends a message to the
+working-with-data
     worker script by calling \l WorkerScript::sendMessage(). When this message
     is received, \l {WorkerScript::onMessage}{WorkerScript.onMessage()} is invoked in
     \tt dataloader.js, which appends the current time to the list model.
@@ -769,6 +770,7 @@ bool QDeclarativeListModelParser::definesEmptyList(const QString &s)
 
 /*!
     \qmlclass ListElement
+    \ingroup qml-working-with-data
     \since 4.7
     \brief The ListElement element defines a data item in a ListModel.
 
diff --git a/src/declarative/util/qdeclarativepackage.cpp b/src/declarative/util/qdeclarativepackage.cpp
index 1a4f2a7..a5ec9b3 100644
--- a/src/declarative/util/qdeclarativepackage.cpp
+++ b/src/declarative/util/qdeclarativepackage.cpp
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Package QDeclarativePackage
+    \ingroup qml-working-with-data
     \brief Package provides a collection of named items.
 
     The Package class is used in conjunction with
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index 12c6353..c28ada3 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -61,51 +61,34 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass PropertyChanges QDeclarativePropertyChanges
+    \ingroup qml-state-elements
     \since 4.7
     \brief The PropertyChanges element describes new property bindings or values for a state.
 
-    PropertyChanges provides a state change that modifies the properties of an item.
+    PropertyChanges is used to define the property values or bindings in a 
+    \l State. This enables an item's property values to be changed when it
+    \l {QML States}{changes between states}.
 
-    Here is a property change that modifies the text and color of a \l Text element
-    when it is clicked:
+    To create a PropertyChanges object, specify the \l target item whose 
+    properties are to be modified, and define the new property values or
+    bindings. For example:
     
-    \qml
-    Text {
-        id: myText
-        width: 100; height: 100
-        text: "Hello"
-        color: "blue"
-
-        states: State {
-            name: "myState"
-
-            PropertyChanges {
-                target: myText
-                text: "Goodbye"
-                color: "red"
-            }
-        }
-
-        MouseArea { anchors.fill: parent; onClicked: myText.state = 'myState' }
-    }
-    \endqml
-
-    By default, PropertyChanges will establish new bindings where appropriate.
-    For example, the following creates a new binding for myItem's \c height property.
-
-    \qml
-    PropertyChanges {
-        target: myItem
-        height: parent.height
-    }
-    \endqml
-
-    If you don't want a binding to be established (and instead just want to assign
-    the value of the binding at the time the state is entered),
-    you should set the PropertyChange's \l{PropertyChanges::explicit}{explicit}
+    \snippet doc/src/snippets/declarative/propertychanges.qml import 
+    \codeline
+    \snippet doc/src/snippets/declarative/propertychanges.qml 0
+
+    When the mouse is pressed, the \l Rectangle changes to the \e resized
+    state. In this state, the PropertyChanges object sets the rectangle's 
+    color to blue and the \c height value to that of \c container.height.
+
+    Note this automatically binds \c rect.height to \c container.height 
+    in the \e resized state. If a property binding should not be
+    established, and the height should just be set to the value of
+    \c container.height at the time of the state change, set the \l explicit
     property to \c true.
-    
-    State-specific script for signal handlers can also be specified:
+   
+    A PropertyChanges object can also override the default signal handler
+    for an object to implement a signal handler specific to the new state:
 
     \qml
     PropertyChanges {
@@ -114,36 +97,31 @@ QT_BEGIN_NAMESPACE
     }
     \endqml
 
-    You can reset a property in a state change by assigning \c undefined. In the following
-    example we reset \c theText's width when we enter state1. This will give the text its
-    natural width (which is the whole string on one line).
+    \note PropertyChanges can be used to change anchor margins, but not other anchor
+    values; use AnchorChanges for this instead. Similarly, to change an \l Item's
+    \l {Item::}{parent} value, use ParentChanges instead.
 
-    \qml
-    import Qt 4.7
-
-    Rectangle {
-        width: 640
-        height: 480
-        Text {
-            id: theText
-            width: 50
-            wrapMode: Text.WordWrap
-            text: "a text string that is longer than 50 pixels"
-        }
 
-        states: State {
-            name: "state1"
-            PropertyChanges {
-                target: theText
-                width: undefined
-            }
-        }
-    }
-    \endqml
+    \section2 Resetting property values
 
-    Anchor margins should be changed with PropertyChanges, but other anchor changes or changes to
-    an Item's parent should be done using the associated change elements
-    (ParentChange and AnchorChanges, respectively).
+    The \c undefined value can be used to reset the property value for a state.
+    In the following example, when \c theText changes to the \e widerText
+    state, its \c width property is reset, giving the text its natural width
+    and displaying the whole string on a single line.
+
+    \snippet doc/src/snippets/declarative/propertychanges.qml reset
+
+
+    \section2 Immediate property changes in transitions
+
+    When \l Transitions are used to animate state changes, they animate 
+    properties from their values in the current state to those defined in the
+    new state (as defined by PropertyChanges objects). However, 
+    it is sometimes desirable to set a property value \e immediately during a 
+    \l Transition, without animation; in these cases, the PropertyAction 
+    element can be used to force an immediate property change.
+
+    See the PropertyAction documentation for more details.
 
     \sa {declarative/animation/states}{states example}, {qmlstate}{States}, QtDeclarative
 */
@@ -396,12 +374,12 @@ void QDeclarativePropertyChanges::setObject(QObject *o)
 
 /*!
     \qmlproperty bool PropertyChanges::restoreEntryValues
-    
-    Whether or not the previous values should be restored when
-    leaving the state. By default, restoreEntryValues is true.
 
-    By setting restoreEntryValues to false, you can create a temporary state
-    that has permanent effects on property values.
+    This property holds whether the previous values should be restored when
+    leaving the state. 
+
+    The default value is \c true. Setting this value to \c false creates a
+    temporary state that has permanent effects on property values.
 */
 bool QDeclarativePropertyChanges::restoreEntryValues() const
 {
diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp
index 30e1491..b2f02e6 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation.cpp
+++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp
@@ -249,6 +249,7 @@ void QSmoothedAnimation::init()
 
 /*!
     \qmlclass SmoothedAnimation QDeclarativeSmoothedAnimation
+    \ingroup qml-animation-transition
     \since 4.7
     \inherits NumberAnimation
     \brief The SmoothedAnimation element allows a property to smoothly track a value.
diff --git a/src/declarative/util/qdeclarativespringanimation.cpp b/src/declarative/util/qdeclarativespringanimation.cpp
index 6f4ac51..fce4097 100644
--- a/src/declarative/util/qdeclarativespringanimation.cpp
+++ b/src/declarative/util/qdeclarativespringanimation.cpp
@@ -228,6 +228,7 @@ void QDeclarativeSpringAnimationPrivate::updateMode()
 
 /*!
     \qmlclass SpringAnimation QDeclarativeSpringAnimation
+    \ingroup qml-animation-transition
     \inherits Animation
     \since 4.7
 
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp
index 028bacb..6e17cf2 100644
--- a/src/declarative/util/qdeclarativestate.cpp
+++ b/src/declarative/util/qdeclarativestate.cpp
@@ -133,6 +133,7 @@ QDeclarativeStateOperation::QDeclarativeStateOperation(QObjectPrivate &dd, QObje
 
 /*!
     \qmlclass State QDeclarativeState
+    \ingroup qml-state-elements
     \since 4.7
     \brief The State element defines configurations of objects and properties.
 
diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp
index 1c1e964..fc90baa 100644
--- a/src/declarative/util/qdeclarativestategroup.cpp
+++ b/src/declarative/util/qdeclarativestategroup.cpp
@@ -88,6 +88,7 @@ public:
 
 /*!
    \qmlclass StateGroup QDeclarativeStateGroup
+    \ingroup qml-state-elements
    \since 4.7
    \brief The StateGroup element provides state support for non-Item elements.
 
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index 2291c16..6e6f0cb 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -161,6 +161,7 @@ void QDeclarativeParentChangePrivate::doChange(QDeclarativeItem *targetParent, Q
 /*!
     \preliminary
     \qmlclass ParentChange QDeclarativeParentChange
+    \ingroup qml-state-elements
     \brief The ParentChange element allows you to reparent an Item in a state change.
 
     ParentChange reparents an item while preserving its visual appearance (position, size,
@@ -589,6 +590,7 @@ public:
 
 /*!
     \qmlclass StateChangeScript QDeclarativeStateChangeScript
+    \ingroup qml-state-elements
     \brief The StateChangeScript element allows you to run a script in a state.
 
     A StateChangeScript is run upon entering a state. You can optionally use
@@ -693,6 +695,7 @@ QString QDeclarativeStateChangeScript::typeName() const
 
 /*!
     \qmlclass AnchorChanges QDeclarativeAnchorChanges
+    \ingroup qml-state-elements
     \brief The AnchorChanges element allows you to change the anchors of an item in a state.
 
     The AnchorChanges element is used to modify the anchors of an item in a \l State.
diff --git a/src/declarative/util/qdeclarativesystempalette.cpp b/src/declarative/util/qdeclarativesystempalette.cpp
index c334859..7b80736 100644
--- a/src/declarative/util/qdeclarativesystempalette.cpp
+++ b/src/declarative/util/qdeclarativesystempalette.cpp
@@ -58,6 +58,7 @@ public:
 
 /*!
     \qmlclass SystemPalette QDeclarativeSystemPalette
+    \ingroup qml-utility-elements
     \since 4.7
     \brief The SystemPalette element provides access to the Qt palettes.
 
diff --git a/src/declarative/util/qdeclarativetimer.cpp b/src/declarative/util/qdeclarativetimer.cpp
index 838a8f3..56320e6 100644
--- a/src/declarative/util/qdeclarativetimer.cpp
+++ b/src/declarative/util/qdeclarativetimer.cpp
@@ -70,6 +70,7 @@ public:
 
 /*!
     \qmlclass Timer QDeclarativeTimer
+    \ingroup qml-utility-elements
     \since 4.7
     \brief The Timer item triggers a handler at a specified interval.
 
diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp
index aa1426c..21d7ded 100644
--- a/src/declarative/util/qdeclarativetransition.cpp
+++ b/src/declarative/util/qdeclarativetransition.cpp
@@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Transition QDeclarativeTransition
+    \ingroup qml-animation-transition
     \since 4.7
     \brief The Transition element defines animated transitions that occur on state changes.
 
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index 8bd829e..7b3d4a8 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -72,6 +72,7 @@ typedef QPair<int, int> QDeclarativeXmlListRange;
 
 /*!
     \qmlclass XmlRole QDeclarativeXmlListModelRole
+    \ingroup qml-working-with-data
   \since 4.7
     \brief The XmlRole element allows you to specify a role for an XmlListModel.
 
@@ -505,6 +506,7 @@ void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListProperty<QDecla
 
 /*!
     \qmlclass XmlListModel QDeclarativeXmlListModel
+    \ingroup qml-working-with-data
   \since 4.7
     \brief The XmlListModel element is used to specify a model using XPath expressions.
 
diff --git a/src/gui/egl/qegl_x11.cpp b/src/gui/egl/qegl_x11.cpp
index fea6e8d..15cc109 100644
--- a/src/gui/egl/qegl_x11.cpp
+++ b/src/gui/egl/qegl_x11.cpp
@@ -165,7 +165,7 @@ VisualID QEgl::getCompatibleVisualId(EGLConfig config)
         if (chosenVisualInfo) {
             // Skip size checks if implementation supports non-matching visual
             // and config (http://bugreports.qt.nokia.com/browse/QTBUG-9444).
-            if (QEgl::hasExtension("EGL_NV_post_convert_replication"))
+            if (QEgl::hasExtension("EGL_NV_post_convert_rounding"))
                 return visualId;
 
             int visualRedSize = countBits(chosenVisualInfo->red_mask);
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index 97499f3..4ffd284 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -2270,9 +2270,11 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event)
             } else {
                 d->selectionModel->setCurrentIndex(newCurrent, command);
                 d->pressedPosition = visualRect(newCurrent).center() + d->offset();
-                // We copy the same behaviour as for mousePressEvent().
-                QRect rect(d->pressedPosition - d->offset(), QSize(1, 1));
-                setSelection(rect, command);
+                if (newCurrent.isValid()) {
+                    // We copy the same behaviour as for mousePressEvent().
+                    QRect rect(d->pressedPosition - d->offset(), QSize(1, 1));
+                    setSelection(rect, command);
+                }
             }
             event->accept();
             return;
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index e64ebb1..670bf34 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -135,6 +135,38 @@ void QS60Data::setStatusPaneAndButtonGroupVisibility(bool statusPaneVisible, boo
 }
 #endif
 
+void QS60Data::controlVisibilityChanged(CCoeControl *control, bool visible)
+{
+    if (QWidgetPrivate::mapper && QWidgetPrivate::mapper->contains(control)) {
+        QWidget *const widget = QWidgetPrivate::mapper->value(control);
+        QWidget *const window = widget->window();
+        if (QTLWExtra *topData = qt_widget_private(window)->maybeTopData()) {
+            QWidgetBackingStoreTracker &backingStore = topData->backingStore;
+            if (visible) {
+                if (backingStore.data()) {
+                    backingStore.registerWidget(widget);
+                } else {
+#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
+                    S60->wsSession().SendEffectCommand(ETfxCmdRestoreLayer);
+#endif
+                    backingStore.create(window);
+                    backingStore.registerWidget(widget);
+                    qt_widget_private(widget)->invalidateBuffer(widget->rect());
+                    widget->repaint();
+                }
+            } else {
+#ifdef  SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
+                S60->wsSession().SendEffectCommand(ETfxCmdDeallocateLayer);
+#endif
+                backingStore.unregisterWidget(widget);
+                // In order to ensure that any resources used by the window surface
+                // are immediately freed, we flush the WSERV command buffer.
+                S60->wsSession().Flush();
+            }
+        }
+    }
+}
+
 bool qt_nograb()                                // application no-grab option
 {
 #if defined(QT_DEBUG)
@@ -1475,6 +1507,8 @@ void qt_init(QApplicationPrivate * /* priv */, int)
             S60->avkonComponentsSupportTransparency = (value==1) ? true : false;
         }
     }
+    delete repository;
+    repository = 0;
 #endif
 
 #ifdef QT_KEYPAD_NAVIGATION
@@ -1920,35 +1954,10 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent
             if (callSymbianEventFilters(symbianEvent))
                 return 1;
             const TWsVisibilityChangedEvent *visChangedEvent = event->VisibilityChanged();
-            QWidget *w = QWidgetPrivate::mapper->value(control);
-            QWidget *const window = w->window();
-            if (!window->d_func()->maybeTopData())
-                break;
-            QRefCountedWidgetBackingStore &backingStore = window->d_func()->maybeTopData()->backingStore;
-            if (visChangedEvent->iFlags & TWsVisibilityChangedEvent::ENotVisible) {
-#ifdef  SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
-                S60->wsSession().SendEffectCommand(ETfxCmdDeallocateLayer);
-#endif
-                // Decrement backing store reference count
-                backingStore.deref();
-                // In order to ensure that any resources used by the window surface
-                // are immediately freed, we flush the WSERV command buffer.
-                S60->wsSession().Flush();
-            } else if (visChangedEvent->iFlags & TWsVisibilityChangedEvent::EPartiallyVisible) {
-                if (backingStore.data()) {
-                    // Increment backing store reference count
-                    backingStore.ref();
-                } else {
-#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
-                    S60->wsSession().SendEffectCommand(ETfxCmdRestoreLayer);
-#endif
-                    // Create backing store with an initial reference count of 1
-                    backingStore.create(window);
-                    backingStore.ref();
-                    w->d_func()->invalidateBuffer(w->rect());
-                    w->repaint();
-                }
-            }
+            if (visChangedEvent->iFlags & TWsVisibilityChangedEvent::ENotVisible)
+                S60->controlVisibilityChanged(control, false);
+            else if (visChangedEvent->iFlags & TWsVisibilityChangedEvent::EPartiallyVisible)
+                S60->controlVisibilityChanged(control, true);
             return 1;
         }
         break;
diff --git a/src/gui/kernel/qgesturemanager.cpp b/src/gui/kernel/qgesturemanager.cpp
index fe9dd8a..e768a21 100644
--- a/src/gui/kernel/qgesturemanager.cpp
+++ b/src/gui/kernel/qgesturemanager.cpp
@@ -129,7 +129,12 @@ Qt::GestureType QGestureManager::registerGestureRecognizer(QGestureRecognizer *r
 void QGestureManager::unregisterGestureRecognizer(Qt::GestureType type)
 {
     QList<QGestureRecognizer *> list = m_recognizers.values(type);
-    m_recognizers.remove(type);
+    while (QGestureRecognizer *recognizer = m_recognizers.take(type)) {
+        if (!m_obsoleteGestures.contains(recognizer)) {
+            // inserting even an empty QSet will cause the recognizer to be deleted on destruction of the manager
+            m_obsoleteGestures.insert(recognizer, QSet<QGesture *>());
+        }
+    }
     foreach (QGesture *g, m_gestureToRecognizer.keys()) {
         QGestureRecognizer *recognizer = m_gestureToRecognizer.value(g);
         if (list.contains(recognizer)) {
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h
index a18ea07..ad6a99a 100644
--- a/src/gui/kernel/qt_s60_p.h
+++ b/src/gui/kernel/qt_s60_p.h
@@ -164,6 +164,7 @@ public:
     static inline CEikButtonGroupContainer* buttonGroupContainer();
     static void setStatusPaneAndButtonGroupVisibility(bool statusPaneVisible, bool buttonGroupVisible);
 #endif
+    static void controlVisibilityChanged(CCoeControl *control, bool visible);
 
 #ifdef Q_OS_SYMBIAN
     TTrapHandler *s60InstalledTrapHandler;
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index aaa29a1..dad4848 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -162,47 +162,76 @@ static inline bool hasBackingStoreSupport()
 extern bool qt_sendSpontaneousEvent(QObject*, QEvent*); // qapplication.cpp
 extern QDesktopWidget *qt_desktopWidget; // qapplication.cpp
 
+/*!
+    \internal
+    \class QWidgetBackingStoreTracker
+    \brief Class which allows tracking of which widgets are using a given backing store
 
-QRefCountedWidgetBackingStore::QRefCountedWidgetBackingStore()
+    QWidgetBackingStoreTracker is a thin wrapper around a QWidgetBackingStore pointer,
+    which maintains a list of the QWidgets which are currently using the backing
+    store.  This list is modified via the registerWidget and unregisterWidget functions.
+ */
+
+QWidgetBackingStoreTracker::QWidgetBackingStoreTracker()
     :   m_ptr(0)
-    ,   m_count(0)
 {
 
 }
 
-QRefCountedWidgetBackingStore::~QRefCountedWidgetBackingStore()
+QWidgetBackingStoreTracker::~QWidgetBackingStoreTracker()
 {
     delete m_ptr;
 }
 
-void QRefCountedWidgetBackingStore::create(QWidget *widget)
+/*!
+    \internal
+    Destroy the contained QWidgetBackingStore, if not null, and clear the list of
+    widgets using the backing store, then create a new QWidgetBackingStore, providing
+    the QWidget.
+ */
+void QWidgetBackingStoreTracker::create(QWidget *widget)
 {
     destroy();
     m_ptr = new QWidgetBackingStore(widget);
-    m_count = 0;
 }
 
-void QRefCountedWidgetBackingStore::destroy()
+/*!
+    \internal
+    Destroy the contained QWidgetBackingStore, if not null, and clear the list of
+    widgets using the backing store.
+ */
+void QWidgetBackingStoreTracker::destroy()
 {
     delete m_ptr;
     m_ptr = 0;
-    m_count = 0;
+    m_widgets.clear();
 }
 
-void QRefCountedWidgetBackingStore::ref()
+/*!
+    \internal
+    Add the widget to the list of widgets currently using the backing store.
+    If the widget was already in the list, this function is a no-op.
+ */
+void QWidgetBackingStoreTracker::registerWidget(QWidget *w)
 {
     Q_ASSERT(m_ptr);
-    ++m_count;
+    Q_ASSERT(w->internalWinId());
+    Q_ASSERT(qt_widget_private(w)->maybeBackingStore() == m_ptr);
+    m_widgets.insert(w);
 }
 
-void QRefCountedWidgetBackingStore::deref()
+/*!
+    \internal
+    Remove the widget from the list of widgets currently using the backing store.
+    If the widget was in the list, and removing it causes the list to be empty,
+    the backing store is deleted.
+    If the widget was not in the list, this function is a no-op.
+ */
+void QWidgetBackingStoreTracker::unregisterWidget(QWidget *w)
 {
-    if (m_count) {
-        Q_ASSERT(m_ptr);
-        if (0 == --m_count) {
-            delete m_ptr;
-            m_ptr = 0;
-        }
+    if (m_widgets.remove(w) && m_widgets.isEmpty()) {
+        delete m_ptr;
+        m_ptr = 0;
     }
 }
 
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 8ae6a99..1979c84 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -2796,10 +2796,14 @@ void QWidgetPrivate::setSubWindowStacking(bool set)
 
     if (QWidget *parent = q->parentWidget()) {
         if (parent->testAttribute(Qt::WA_WState_Created)) {
-            if (set)
-                [qt_mac_window_for(parent) addChildWindow:qt_mac_window_for(q) ordered:NSWindowAbove];
-            else
+            if (set) {
+                if (parent->isVisible()) {
+                    NSWindow *childwin = qt_mac_window_for(q);
+                    [qt_mac_window_for(parent) addChildWindow:childwin ordered:NSWindowAbove];
+                }
+            } else {
                 [qt_mac_window_for(parent) removeChildWindow:qt_mac_window_for(q)];
+            }
         }
     }
 
@@ -2807,10 +2811,12 @@ void QWidgetPrivate::setSubWindowStacking(bool set)
     for (int i=0; i<widgets.size(); ++i) {
         QWidget *child = widgets.at(i);
         if (child->isWindow() && child->testAttribute(Qt::WA_WState_Created) && child->isVisibleTo(q)) {
-            if (set)
-                [qt_mac_window_for(q) addChildWindow:qt_mac_window_for(child) ordered:NSWindowAbove];
-            else
+            if (set) {
+                NSWindow *childwin = qt_mac_window_for(child);
+                [qt_mac_window_for(q) addChildWindow:childwin ordered:NSWindowAbove];
+            } else {
                 [qt_mac_window_for(q) removeChildWindow:qt_mac_window_for(child)];
+            }
         }
     }
 }
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 587d7fb..4a79dc7 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -110,17 +110,18 @@ class QWidgetItemV2;
 
 class QStyle;
 
-class Q_AUTOTEST_EXPORT QRefCountedWidgetBackingStore
+class Q_AUTOTEST_EXPORT QWidgetBackingStoreTracker
 {
+
 public:
-    QRefCountedWidgetBackingStore();
-    ~QRefCountedWidgetBackingStore();
+    QWidgetBackingStoreTracker();
+    ~QWidgetBackingStoreTracker();
 
     void create(QWidget *tlw);
     void destroy();
 
-    void ref();
-    void deref();
+    void registerWidget(QWidget *w);
+    void unregisterWidget(QWidget *w);
 
     inline QWidgetBackingStore* data()
     {
@@ -143,11 +144,11 @@ public:
     }
 
 private:
-    Q_DISABLE_COPY(QRefCountedWidgetBackingStore)
+    Q_DISABLE_COPY(QWidgetBackingStoreTracker)
 
 private:
     QWidgetBackingStore* m_ptr;
-    int m_count;
+    QSet<QWidget *> m_widgets;
 };
 
 struct QTLWExtra {
@@ -156,7 +157,7 @@ struct QTLWExtra {
     // Regular pointers (keep them together to avoid gaps on 64 bits architectures).
     QIcon *icon; // widget icon
     QPixmap *iconPixmap;
-    QRefCountedWidgetBackingStore backingStore;
+    QWidgetBackingStoreTracker backingStore;
     QWindowSurface *windowSurface;
     QPainter *sharedPainter;
 
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index 56349ad..319f330 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -684,6 +684,12 @@ void QWidgetPrivate::setParent_sys(QWidget *parent, Qt::WindowFlags f)
     QSymbianControl *old_winid = static_cast<QSymbianControl *>(wasCreated ? data.winid : 0);
     if ((q->windowType() == Qt::Desktop))
         old_winid = 0;
+
+    // old_winid may not have received a 'not visible' visibility
+    // changed event before being destroyed; make sure that it is
+    // removed from the backing store's list of visible windows.
+    S60->controlVisibilityChanged(old_winid, false);
+
     setWinId(0);
 
     // hide and reparent our own window away. Otherwise we might get
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index dfa4a48..793d380 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -212,6 +212,7 @@ if(mmx|3dnow|sse|sse2|iwmmxt) {
     SSE3DNOW_SOURCES += painting/qdrawhelper_sse3dnow.cpp
     SSE_SOURCES += painting/qdrawhelper_sse.cpp
     SSE2_SOURCES += painting/qdrawhelper_sse2.cpp
+    SSSE3_SOURCES += painting/qdrawhelper_ssse3.cpp
     IWMMXT_SOURCES += painting/qdrawhelper_iwmmxt.cpp
 }
 
diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp
index 83751ed..ac9b994 100644
--- a/src/gui/painting/qbackingstore.cpp
+++ b/src/gui/painting/qbackingstore.cpp
@@ -352,7 +352,7 @@ void QWidgetBackingStore::beginPaint(QRegion &toClean, QWidget *widget, QWindowS
     // Always flush repainted areas.
     dirtyOnScreen += toClean;
 
-#ifdef Q_WS_QWS
+#if defined(Q_WS_QWS) && !defined(Q_BACKINGSTORE_SUBSURFACES)
     toClean.translate(tlwOffset);
 #endif
 
@@ -1294,7 +1294,12 @@ void QWidgetBackingStore::sync()
 #ifdef Q_BACKINGSTORE_SUBSURFACES
         QWindowSurface *subSurface = w->windowSurface();
         BeginPaintInfo beginPaintInfo;
-        beginPaint(toBePainted, w, subSurface, &beginPaintInfo, false);
+
+        QPoint off = w->mapTo(tlw, QPoint());
+        toBePainted.translate(off);
+        beginPaint(toBePainted, w, subSurface, &beginPaintInfo, true);
+        toBePainted.translate(-off);
+
         if (beginPaintInfo.nothingToPaint)
             continue;
 
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index 1ff3d7b..276da93 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -7840,6 +7840,17 @@ void qInitDrawhelperAsm()
             qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_sse2;
             qBlendFunctions[QImage::Format_RGB32][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_sse2;
             qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_sse2;
+
+#if defined(QT_HAVE_SSSE3)
+            if (features & SSSE3) {
+                extern void qt_blend_argb32_on_argb32_ssse3(uchar *destPixels, int dbpl,
+                                                            const uchar *srcPixels, int sbpl,
+                                                            int w, int h,
+                                                            int const_alpha);
+                qBlendFunctions[QImage::Format_RGB32][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_ssse3;
+                qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_ssse3;
+            }
+#endif // QT_HAVE_SSSE3
         } else
 #endif
         {
diff --git a/src/gui/painting/qdrawhelper_ssse3.cpp b/src/gui/painting/qdrawhelper_ssse3.cpp
new file mode 100644
index 0000000..9c02009
--- /dev/null
+++ b/src/gui/painting/qdrawhelper_ssse3.cpp
@@ -0,0 +1,253 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#ifdef QT_HAVE_SSSE3
+
+#include <private/qsimd_p.h>
+#include <private/qdrawhelper_x86_p.h>
+#include <private/qdrawingprimitive_sse2_p.h>
+
+QT_BEGIN_NAMESPACE
+
+inline static void blend_pixel(quint32 &dst, const quint32 src)
+{
+    if (src >= 0xff000000)
+        dst = src;
+    else if (src != 0)
+        dst = src + BYTE_MUL(dst, qAlpha(~src));
+}
+
+
+/* The instruction palignr uses direct arguments, so we have to generate the code fo the different
+   shift (4, 8, 12). Checking the alignment inside the loop is unfortunatelly way too slow.
+ */
+#define BLENDING_LOOP(palignrOffset, length)\
+    for (; x < length-3; x += 4) { \
+        const __m128i srcVectorLastLoaded = _mm_load_si128((__m128i *)&src[x - minusOffsetToAlignSrcOn16Bytes + 4]);\
+        const __m128i srcVector = _mm_alignr_epi8(srcVectorLastLoaded, srcVectorPrevLoaded, palignrOffset); \
+        const __m128i srcVectorAlpha = _mm_and_si128(srcVector, alphaMask); \
+        if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, alphaMask)) == 0xffff) { \
+            _mm_store_si128((__m128i *)&dst[x], srcVector); \
+        } else if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, nullVector)) != 0xffff) { \
+            __m128i alphaChannel = _mm_shuffle_epi8(srcVector, alphaShuffleMask); \
+            alphaChannel = _mm_sub_epi16(one, alphaChannel); \
+            const __m128i dstVector = _mm_load_si128((__m128i *)&dst[x]); \
+            __m128i destMultipliedByOneMinusAlpha; \
+            BYTE_MUL_SSE2(destMultipliedByOneMinusAlpha, dstVector, alphaChannel, colorMask, half); \
+            const __m128i result = _mm_add_epi8(srcVector, destMultipliedByOneMinusAlpha); \
+            _mm_store_si128((__m128i *)&dst[x], result); \
+        } \
+        srcVectorPrevLoaded = srcVectorLastLoaded;\
+    }
+
+
+#define BLEND_SOURCE_OVER_ARGB32_FIRST_ROW_SSSE3(dst, src, length, nullVector, half, one, colorMask, alphaMask) { \
+    int x = 0; \
+\
+    /* First, get dst aligned. */ \
+    const int offsetToAlignOn16Bytes = (4 - ((reinterpret_cast<quintptr>(dst) >> 2) & 0x3)) & 0x3;\
+    const int prologLength = qMin(length, offsetToAlignOn16Bytes);\
+\
+    for (; x < prologLength; ++x) {\
+        blend_pixel(dst[x], src[x]); \
+    } \
+\
+    const int minusOffsetToAlignSrcOn16Bytes = (reinterpret_cast<quintptr>(&(src[x])) >> 2) & 0x3;\
+\
+    if (!minusOffsetToAlignSrcOn16Bytes) {\
+        /* src is aligned, usual algorithm but with aligned operations.\
+           See the SSE2 version for more documentation on the algorithm itself. */\
+        const __m128i alphaShuffleMask = _mm_set_epi8(0xff,15,0xff,15,0xff,11,0xff,11,0xff,7,0xff,7,0xff,3,0xff,3);\
+        for (; x < length-3; x += 4) { \
+            const __m128i srcVector = _mm_load_si128((__m128i *)&src[x]); \
+            const __m128i srcVectorAlpha = _mm_and_si128(srcVector, alphaMask); \
+            if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, alphaMask)) == 0xffff) { \
+                _mm_store_si128((__m128i *)&dst[x], srcVector); \
+            } else if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, nullVector)) != 0xffff) { \
+                __m128i alphaChannel = _mm_shuffle_epi8(srcVector, alphaShuffleMask); \
+                alphaChannel = _mm_sub_epi16(one, alphaChannel); \
+                const __m128i dstVector = _mm_load_si128((__m128i *)&dst[x]); \
+                __m128i destMultipliedByOneMinusAlpha; \
+                BYTE_MUL_SSE2(destMultipliedByOneMinusAlpha, dstVector, alphaChannel, colorMask, half); \
+                const __m128i result = _mm_add_epi8(srcVector, destMultipliedByOneMinusAlpha); \
+                _mm_store_si128((__m128i *)&dst[x], result); \
+            } \
+        } /* end for() */\
+    } else if ((length - x) >= 8) {\
+        /* We are at the first line, so "x - minusOffsetToAlignSrcOn16Bytes" could go before src, and\
+           generate an invalid access. */\
+\
+        /* We use two vectors to extract the src: prevLoaded for the first pixels, lastLoaded for the current pixels. */\
+        __m128i srcVectorPrevLoaded;\
+        if (minusOffsetToAlignSrcOn16Bytes > prologLength) {\
+            /* We go forward 4 pixels to avoid reading before src. */\
+            for (; x < prologLength + 4; ++x)\
+                blend_pixel(dst[x], src[x]); \
+        }\
+        srcVectorPrevLoaded = _mm_load_si128((__m128i *)&src[x - minusOffsetToAlignSrcOn16Bytes]);\
+        const int palignrOffset = minusOffsetToAlignSrcOn16Bytes << 2;\
+\
+        const __m128i alphaShuffleMask = _mm_set_epi8(0xff,15,0xff,15,0xff,11,0xff,11,0xff,7,0xff,7,0xff,3,0xff,3);\
+        switch (palignrOffset) {\
+        case 4:\
+            BLENDING_LOOP(4, length)\
+            break;\
+        case 8:\
+            BLENDING_LOOP(8, length)\
+            break;\
+        case 12:\
+            BLENDING_LOOP(12, length)\
+            break;\
+        }\
+    }\
+    for (; x < length; ++x) \
+        blend_pixel(dst[x], src[x]); \
+}
+
+// Basically blend src over dst with the const alpha defined as constAlphaVector.
+// nullVector, half, one, colorMask are constant accross the whole image/texture, and should be defined as:
+//const __m128i nullVector = _mm_set1_epi32(0);
+//const __m128i half = _mm_set1_epi16(0x80);
+//const __m128i one = _mm_set1_epi16(0xff);
+//const __m128i colorMask = _mm_set1_epi32(0x00ff00ff);
+//const __m128i alphaMask = _mm_set1_epi32(0xff000000);
+//
+// The computation being done is:
+// result = s + d * (1-alpha)
+// with shortcuts if fully opaque or fully transparent.
+#define BLEND_SOURCE_OVER_ARGB32_MAIN_SSSE3(dst, src, length, nullVector, half, one, colorMask, alphaMask) { \
+    int x = 0; \
+\
+    /* First, get dst aligned. */ \
+    ALIGNMENT_PROLOGUE_16BYTES(dst, x, length) { \
+        blend_pixel(dst[x], src[x]); \
+    } \
+\
+    const int minusOffsetToAlignSrcOn16Bytes = (reinterpret_cast<quintptr>(&(src[x])) >> 2) & 0x3;\
+\
+    if (!minusOffsetToAlignSrcOn16Bytes) {\
+        /* src is aligned, usual algorithm but with aligned operations.\
+           See the SSE2 version for more documentation on the algorithm itself. */\
+        const __m128i alphaShuffleMask = _mm_set_epi8(0xff,15,0xff,15,0xff,11,0xff,11,0xff,7,0xff,7,0xff,3,0xff,3);\
+        for (; x < length-3; x += 4) { \
+            const __m128i srcVector = _mm_load_si128((__m128i *)&src[x]); \
+            const __m128i srcVectorAlpha = _mm_and_si128(srcVector, alphaMask); \
+            if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, alphaMask)) == 0xffff) { \
+                _mm_store_si128((__m128i *)&dst[x], srcVector); \
+            } else if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, nullVector)) != 0xffff) { \
+                __m128i alphaChannel = _mm_shuffle_epi8(srcVector, alphaShuffleMask); \
+                alphaChannel = _mm_sub_epi16(one, alphaChannel); \
+                const __m128i dstVector = _mm_load_si128((__m128i *)&dst[x]); \
+                __m128i destMultipliedByOneMinusAlpha; \
+                BYTE_MUL_SSE2(destMultipliedByOneMinusAlpha, dstVector, alphaChannel, colorMask, half); \
+                const __m128i result = _mm_add_epi8(srcVector, destMultipliedByOneMinusAlpha); \
+                _mm_store_si128((__m128i *)&dst[x], result); \
+            } \
+        } /* end for() */\
+    } else if ((length - x) >= 8) {\
+        /* We use two vectors to extract the src: prevLoaded for the first pixels, lastLoaded for the current pixels. */\
+        __m128i srcVectorPrevLoaded = _mm_load_si128((__m128i *)&src[x - minusOffsetToAlignSrcOn16Bytes]);\
+        const int palignrOffset = minusOffsetToAlignSrcOn16Bytes << 2;\
+\
+        const __m128i alphaShuffleMask = _mm_set_epi8(0xff,15,0xff,15,0xff,11,0xff,11,0xff,7,0xff,7,0xff,3,0xff,3);\
+        switch (palignrOffset) {\
+        case 4:\
+            BLENDING_LOOP(4, length)\
+            break;\
+        case 8:\
+            BLENDING_LOOP(8, length)\
+            break;\
+        case 12:\
+            BLENDING_LOOP(12, length)\
+            break;\
+        }\
+    }\
+    for (; x < length; ++x) \
+        blend_pixel(dst[x], src[x]); \
+}
+
+void qt_blend_argb32_on_argb32_ssse3(uchar *destPixels, int dbpl,
+                                     const uchar *srcPixels, int sbpl,
+                                     int w, int h,
+                                     int const_alpha)
+{
+    const quint32 *src = (const quint32 *) srcPixels;
+    quint32 *dst = (quint32 *) destPixels;
+    if (const_alpha == 256) {
+        const __m128i alphaMask = _mm_set1_epi32(0xff000000);
+        const __m128i nullVector = _mm_setzero_si128();
+        const __m128i half = _mm_set1_epi16(0x80);
+        const __m128i one = _mm_set1_epi16(0xff);
+        const __m128i colorMask = _mm_set1_epi32(0x00ff00ff);
+
+        // We have to unrol the first row in order to deal with the load on unaligned data
+        // prior to the src pointer.
+        BLEND_SOURCE_OVER_ARGB32_FIRST_ROW_SSSE3(dst, src, w, nullVector, half, one, colorMask, alphaMask);
+        dst = (quint32 *)(((uchar *) dst) + dbpl);
+        src = (const quint32 *)(((const uchar *) src) + sbpl);
+
+        for (int y = 1; y < h; ++y) {
+            BLEND_SOURCE_OVER_ARGB32_MAIN_SSSE3(dst, src, w, nullVector, half, one, colorMask, alphaMask);
+            dst = (quint32 *)(((uchar *) dst) + dbpl);
+            src = (const quint32 *)(((const uchar *) src) + sbpl);
+        }
+    } else if (const_alpha != 0) {
+        // dest = (s + d * sia) * ca + d * cia
+        //      = s * ca + d * (sia * ca + cia)
+        //      = s * ca + d * (1 - sa*ca)
+        const_alpha = (const_alpha * 255) >> 8;
+        const __m128i nullVector = _mm_setzero_si128();
+        const __m128i half = _mm_set1_epi16(0x80);
+        const __m128i one = _mm_set1_epi16(0xff);
+        const __m128i colorMask = _mm_set1_epi32(0x00ff00ff);
+        const __m128i constAlphaVector = _mm_set1_epi16(const_alpha);
+        for (int y = 0; y < h; ++y) {
+            BLEND_SOURCE_OVER_ARGB32_WITH_CONST_ALPHA_SSE2(dst, src, w, nullVector, half, one, colorMask, constAlphaVector)
+            dst = (quint32 *)(((uchar *) dst) + dbpl);
+            src = (const quint32 *)(((const uchar *) src) + sbpl);
+        }
+    }
+}
+
+QT_END_NAMESPACE
+
+#endif // QT_HAVE_SSSE3
diff --git a/src/gui/painting/qgrayraster.c b/src/gui/painting/qgrayraster.c
index 5e7c67a..94039fb 100644
--- a/src/gui/painting/qgrayraster.c
+++ b/src/gui/painting/qgrayraster.c
@@ -956,53 +956,49 @@
                               const QT_FT_Vector*  control2,
                               const QT_FT_Vector*  to )
   {
-    TPos        dx, dy, da, db;
     int         top, level;
     int*        levels;
     QT_FT_Vector*  arc;
+    int         mid_x = ( DOWNSCALE( ras.x ) + to->x +
+                          3 * (control1->x + control2->x ) ) / 8;
+    int         mid_y = ( DOWNSCALE( ras.y ) + to->y +
+                          3 * (control1->y + control2->y ) ) / 8;
+    TPos        dx = DOWNSCALE( ras.x ) + to->x - ( mid_x << 1 );
+    TPos        dy = DOWNSCALE( ras.y ) + to->y - ( mid_y << 1 );
 
 
-    dx = DOWNSCALE( ras.x ) + to->x - ( control1->x << 1 );
     if ( dx < 0 )
       dx = -dx;
-    dy = DOWNSCALE( ras.y ) + to->y - ( control1->y << 1 );
     if ( dy < 0 )
       dy = -dy;
     if ( dx < dy )
       dx = dy;
-    da = dx;
-
-    dx = DOWNSCALE( ras.x ) + to->x - 3 * ( control1->x + control2->x );
-    if ( dx < 0 )
-      dx = -dx;
-    dy = DOWNSCALE( ras.y ) + to->y - 3 * ( control1->x + control2->y );
-    if ( dy < 0 )
-      dy = -dy;
-    if ( dx < dy )
-      dx = dy;
-    db = dx;
 
     level = 1;
-    da    = da / ras.cubic_level;
-    db    = db / ras.conic_level;
-    while ( da > 0 || db > 0 )
+    dx /= ras.cubic_level;
+    while ( dx > 0 )
     {
-      da >>= 2;
-      db >>= 3;
+      dx >>= 2;
       level++;
     }
 
     if ( level <= 1 )
     {
-      TPos   to_x, to_y, mid_x, mid_y;
+      TPos   to_x, to_y;
 
 
       to_x  = UPSCALE( to->x );
       to_y  = UPSCALE( to->y );
+
+      /* Recalculation of midpoint is needed only if */
+      /* UPSCALE and DOWNSCALE have any effect.      */
+
+#if ( PIXEL_BITS != 6 )
       mid_x = ( ras.x + to_x +
                 3 * UPSCALE( control1->x + control2->x ) ) / 8;
       mid_y = ( ras.y + to_y +
                 3 * UPSCALE( control1->y + control2->y ) ) / 8;
+#endif
 
       gray_render_line( RAS_VAR_ mid_x, mid_y );
       gray_render_line( RAS_VAR_ to_x, to_y );
@@ -1359,10 +1355,6 @@
   /* <Input>                                                               */
   /*    outline        :: A pointer to the source target.                  */
   /*                                                                       */
-  /*    func_interface :: A table of `emitters', i.e,. function pointers   */
-  /*                      called during decomposition to indicate path     */
-  /*                      operations.                                      */
-  /*                                                                       */
   /*    user           :: A typeless pointer which is passed to each       */
   /*                      emitter during the decomposition.  It can be     */
   /*                      used to store the state during the               */
@@ -1373,15 +1365,10 @@
   /*                                                                       */
   static
   int  QT_FT_Outline_Decompose( const QT_FT_Outline*        outline,
-                             const QT_FT_Outline_Funcs*  func_interface,
                              void*                    user )
   {
 #undef SCALED
-#if 0
-#define SCALED( x )  ( ( (x) << shift ) - delta )
-#else
 #define SCALED( x )  (x)
-#endif
 
     QT_FT_Vector   v_last;
     QT_FT_Vector   v_control;
@@ -1396,12 +1383,6 @@
     int   error;
     char  tag;       /* current point's state           */
 
-#if 0
-    int   shift = func_interface->shift;
-    TPos  delta = func_interface->delta;
-#endif
-
-
     first = 0;
 
     for ( n = 0; n < outline->n_contours; n++ )
@@ -1455,7 +1436,7 @@
         tags--;
       }
 
-      error = func_interface->move_to( &v_start, user );
+      error = gray_move_to( &v_start, user );
       if ( error )
         goto Exit;
 
@@ -1475,7 +1456,7 @@
             vec.x = SCALED( point->x );
             vec.y = SCALED( point->y );
 
-            error = func_interface->line_to( &vec, user );
+            error = gray_line_to( &vec, user );
             if ( error )
               goto Exit;
             continue;
@@ -1502,7 +1483,7 @@
 
               if ( tag == QT_FT_CURVE_TAG_ON )
               {
-                error = func_interface->conic_to( &v_control, &vec,
+                error = gray_conic_to( &v_control, &vec,
                                                   user );
                 if ( error )
                   goto Exit;
@@ -1515,7 +1496,7 @@
               v_middle.x = ( v_control.x + vec.x ) / 2;
               v_middle.y = ( v_control.y + vec.y ) / 2;
 
-              error = func_interface->conic_to( &v_control, &v_middle,
+              error = gray_conic_to( &v_control, &v_middle,
                                                 user );
               if ( error )
                 goto Exit;
@@ -1524,7 +1505,7 @@
               goto Do_Conic;
             }
 
-            error = func_interface->conic_to( &v_control, &v_start,
+            error = gray_conic_to( &v_control, &v_start,
                                               user );
             goto Close;
           }
@@ -1555,20 +1536,20 @@
               vec.x = SCALED( point->x );
               vec.y = SCALED( point->y );
 
-              error = func_interface->cubic_to( &vec1, &vec2, &vec, user );
+              error = gray_cubic_to( &vec1, &vec2, &vec, user );
               if ( error )
                 goto Exit;
               continue;
             }
 
-            error = func_interface->cubic_to( &vec1, &vec2, &v_start, user );
+            error = gray_cubic_to( &vec1, &vec2, &v_start, user );
             goto Close;
           }
         }
       }
 
       /* close the contour with a line segment */
-      error = func_interface->line_to( &v_start, user );
+      error = gray_line_to( &v_start, user );
 
    Close:
       if ( error )
@@ -1596,22 +1577,11 @@
   static int
   gray_convert_glyph_inner( RAS_ARG )
   {
-    static
-    const QT_FT_Outline_Funcs  func_interface =
-    {
-      (QT_FT_Outline_MoveTo_Func) gray_move_to,
-      (QT_FT_Outline_LineTo_Func) gray_line_to,
-      (QT_FT_Outline_ConicTo_Func)gray_conic_to,
-      (QT_FT_Outline_CubicTo_Func)gray_cubic_to,
-      0,
-      0
-    };
-
     volatile int  error = 0;
 
     if ( qt_ft_setjmp( ras.jump_buffer ) == 0 )
     {
-      error = QT_FT_Outline_Decompose( &ras.outline, &func_interface, &ras );
+      error = QT_FT_Outline_Decompose( &ras.outline, &ras );
       gray_record_cell( RAS_VAR );
     }
     else
diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/painting/qpaintengine_x11.cpp
index e521e01..5307142 100644
--- a/src/gui/painting/qpaintengine_x11.cpp
+++ b/src/gui/painting/qpaintengine_x11.cpp
@@ -1516,8 +1516,8 @@ void QX11PaintEnginePrivate::fillPolygon_translated(const QPointF *polygonPoints
     for (int i = 0; i < pointCount; ++i) {
         translated_points[i] = polygonPoints[i] + offset;
 
-        translated_points[i].rx() = qRound(translated_points[i].x()) + offs;
-        translated_points[i].ry() = qRound(translated_points[i].y()) + offs;
+        translated_points[i].rx() = qFloor(translated_points[i].x()) + offs;
+        translated_points[i].ry() = qFloor(translated_points[i].y()) + offs;
     }
 
     fillPolygon_dev(translated_points.data(), pointCount, gcMode, mode);
@@ -1754,8 +1754,8 @@ void QX11PaintEnginePrivate::fillPath(const QPainterPath &path, QX11PaintEngineP
         for (int j = 0; j < polys.at(i).size(); ++j) {
             translated_points[j] = polys.at(i).at(j);
             if (!X11->use_xrender || !(render_hints & QPainter::Antialiasing)) {
-                translated_points[j].rx() = qRound(translated_points[j].rx() + aliasedCoordinateDelta) + offs;
-                translated_points[j].ry() = qRound(translated_points[j].ry() + aliasedCoordinateDelta) + offs;
+                translated_points[j].rx() = qFloor(translated_points[j].rx() + aliasedCoordinateDelta) + offs;
+                translated_points[j].ry() = qFloor(translated_points[j].ry() + aliasedCoordinateDelta) + offs;
             }
         }
 
diff --git a/src/gui/painting/qwindowsurface_qws.cpp b/src/gui/painting/qwindowsurface_qws.cpp
index a816ed2..170668b 100644
--- a/src/gui/painting/qwindowsurface_qws.cpp
+++ b/src/gui/painting/qwindowsurface_qws.cpp
@@ -882,7 +882,11 @@ void QWSMemorySurface::beginPaint(const QRegion &rgn)
         const QVector<QRect> rects = rgn.rects();
         const QColor blank = Qt::transparent;
         for (QVector<QRect>::const_iterator it = rects.begin(); it != rects.end(); ++it) {
-            p.fillRect(*it, blank);
+            QRect r = *it;
+#ifdef Q_BACKINGSTORE_SUBSURFACES
+            r.translate(painterOffset());
+#endif
+            p.fillRect(r, blank);
         }
     }
     QWSWindowSurface::beginPaint(rgn);
diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp
index 5fb3384..d25fb05 100644
--- a/src/gui/text/qtextobject.cpp
+++ b/src/gui/text/qtextobject.cpp
@@ -1156,6 +1156,10 @@ Qt::LayoutDirection QTextBlock::textDirection() const
     if (dir != Qt::LayoutDirectionAuto)
         return dir;
 
+    dir = p->defaultTextOption.textDirection();
+    if (dir != Qt::LayoutDirectionAuto)
+        return dir;
+
     const QString buffer = p->buffer();
 
     const int pos = position();
diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp
index 04d6de9..e718212 100644
--- a/src/gui/util/qcompleter.cpp
+++ b/src/gui/util/qcompleter.cpp
@@ -921,10 +921,12 @@ void QCompleterPrivate::showPopup(const QRect& rect)
 void QCompleterPrivate::_q_fileSystemModelDirectoryLoaded(const QString &path)
 {
     Q_Q(QCompleter);
+#ifndef QT_NO_LINEEDIT
     QLineEdit *lineEdit = qobject_cast<QLineEdit *>(widget);
     //the path given by QFileSystemModel does not end with /
     if (lineEdit && !lineEdit->text().isEmpty() && !q->completionPrefix().isEmpty() && q->completionPrefix() != path + QLatin1Char('/'))
         q->complete();
+#endif
 }
 
 /*!
diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
index 2f4d1df..6c38911 100644
--- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
@@ -94,6 +94,7 @@ public:
 
 /*!
     \qmlclass FolderListModel QDeclarativeFolderListModel
+    \ingroup qml-working-with-data
     \brief The FolderListModel provides a model of the contents of a folder in a filesystem.
 
     FolderListModel provides access to the local filesystem.  The \e folder property
diff --git a/src/imports/gestures/qdeclarativegesturearea.cpp b/src/imports/gestures/qdeclarativegesturearea.cpp
index ed936d5..500c6bf 100644
--- a/src/imports/gestures/qdeclarativegesturearea.cpp
+++ b/src/imports/gestures/qdeclarativegesturearea.cpp
@@ -79,6 +79,8 @@ public:
 
 /*!
     \qmlclass GestureArea QDeclarativeGestureArea
+    \ingroup qml-basic-interaction-elements
+
     \brief The GestureArea item enables simple gesture handling.
     \inherits Item
 
diff --git a/src/imports/particles/qdeclarativeparticles.cpp b/src/imports/particles/qdeclarativeparticles.cpp
index b842109..5cd9c0c 100644
--- a/src/imports/particles/qdeclarativeparticles.cpp
+++ b/src/imports/particles/qdeclarativeparticles.cpp
@@ -154,6 +154,7 @@ void QDeclarativeParticleMotion::destroy(QDeclarativeParticle &particle)
 
 /*!
     \qmlclass ParticleMotionLinear QDeclarativeParticleMotionLinear
+    \ingroup qml-particle-elements
     \since 4.7
     \brief The ParticleMotionLinear object moves particles linearly.
 
@@ -180,6 +181,7 @@ void QDeclarativeParticleMotionLinear::advance(QDeclarativeParticle &p, int inte
 
 /*!
     \qmlclass ParticleMotionGravity QDeclarativeParticleMotionGravity
+    \ingroup qml-particle-elements
     \since 4.7
     \brief The ParticleMotionGravity object moves particles towards a point.
 
@@ -271,6 +273,7 @@ void QDeclarativeParticleMotionGravity::advance(QDeclarativeParticle &p, int int
 
 /*!
     \qmlclass ParticleMotionWander QDeclarativeParticleMotionWander
+    \ingroup qml-particle-elements
     \since 4.7
     \brief The ParticleMotionWander object moves particles in a somewhat random fashion.
 
@@ -634,6 +637,7 @@ void QDeclarativeParticlesPrivate::updateOpacity(QDeclarativeParticle &p, int ag
 
 /*!
     \qmlclass Particles QDeclarativeParticles
+    \ingroup qml-particle-elements
     \since 4.7
     \brief The Particles object generates and moves particles.
     \inherits Item
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 4daa866..74bde36 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -1688,6 +1688,10 @@ void QGLContextPrivate::init(QPaintDevice *dev, const QGLFormat &format)
     workaround_needsFullClearOnEveryFrame = false;
     workaround_brokenFBOReadBack = false;
     workaroundsCached = false;
+
+    workaround_brokenTextureFromPixmap = false;
+    workaround_brokenTextureFromPixmap_init = false;
+
     for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
         vertexAttributeArraysEnabledState[i] = false;
 }
@@ -2570,11 +2574,27 @@ QGLTexture *QGLContextPrivate::bindTexture(const QPixmap &pixmap, GLenum target,
         && xinfo && xinfo->screen() == pixmap.x11Info().screen()
         && target == GL_TEXTURE_2D)
     {
-        texture = bindTextureFromNativePixmap(const_cast<QPixmap*>(&pixmap), key, options);
-        if (texture) {
-            texture->options |= QGLContext::MemoryManagedBindOption;
-            texture->boundPixmap = pd;
-            boundPixmaps.insert(pd, QPixmap(pixmap));
+        if (!workaround_brokenTextureFromPixmap_init) {
+            workaround_brokenTextureFromPixmap_init = true;
+
+            const QByteArray versionString(reinterpret_cast<const char*>(glGetString(GL_VERSION)));
+            const int pos = versionString.indexOf("NVIDIA ");
+
+            if (pos >= 0) {
+                const QByteArray nvidiaVersionString = versionString.mid(pos + strlen("NVIDIA "));
+
+                if (nvidiaVersionString.startsWith("195") || nvidiaVersionString.startsWith("256"))
+                    workaround_brokenTextureFromPixmap = true;
+            }
+        }
+
+        if (!workaround_brokenTextureFromPixmap) {
+            texture = bindTextureFromNativePixmap(const_cast<QPixmap*>(&pixmap), key, options);
+            if (texture) {
+                texture->options |= QGLContext::MemoryManagedBindOption;
+                texture->boundPixmap = pd;
+                boundPixmaps.insert(pd, QPixmap(pixmap));
+            }
         }
     }
 #endif
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index 32feacd..ca0d3fa 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -393,6 +393,9 @@ public:
     uint workaround_brokenFBOReadBack : 1;
     uint workaroundsCached : 1;
 
+    uint workaround_brokenTextureFromPixmap : 1;
+    uint workaround_brokenTextureFromPixmap_init : 1;
+
     QPaintDevice *paintDevice;
     QColor transpColor;
     QGLContext *q_ptr;
diff --git a/src/plugins/bearer/connman/qconnmanservice_linux.cpp b/src/plugins/bearer/connman/qconnmanservice_linux.cpp
index eb88317..b15589e 100644
--- a/src/plugins/bearer/connman/qconnmanservice_linux.cpp
+++ b/src/plugins/bearer/connman/qconnmanservice_linux.cpp
@@ -1053,7 +1053,9 @@ bool QConnmanDeviceInterface::setProperty(const QString &name, const QDBusVarian
 {
 
 //    QList<QVariant> args;
+#ifndef QT_NO_TEXTSTREAM
     qWarning() << __FUNCTION__ << name << value.variant();
+#endif
 //    args << qVariantFromValue(name);
 //    args << qVariantFromValue(value);
 
diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def
index 480d9ff..bc6d0aa 100644
--- a/src/s60installs/bwins/QtDeclarativeu.def
+++ b/src/s60installs/bwins/QtDeclarativeu.def
@@ -1684,4 +1684,5 @@ EXPORTS
 	?rootContext@QDeclarativeView@@QBEPAVQDeclarativeContext@@XZ @ 1683 NONAME ; class QDeclarativeContext * QDeclarativeView::rootContext(void) const
 	?rootContext@QDeclarativeEngine@@QBEPAVQDeclarativeContext@@XZ @ 1684 NONAME ; class QDeclarativeContext * QDeclarativeEngine::rootContext(void) const
 	?qmlregister@QDeclarativePrivate@@YAHW4RegistrationType@1@PAX@Z @ 1685 NONAME ; int QDeclarativePrivate::qmlregister(enum QDeclarativePrivate::RegistrationType, void *)
+	?hasValue@QDeclarativeOpenMetaObject@@QBE_NH@Z @ 1686 NONAME ; bool QDeclarativeOpenMetaObject::hasValue(int) const
 
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index 90c0878..21a2122 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -4148,7 +4148,7 @@ EXPORTS
 	?ensureSceneTransformRecursive@QGraphicsItemPrivate@@QAEXPAPAVQGraphicsItem@@@Z @ 4147 NONAME ; void QGraphicsItemPrivate::ensureSceneTransformRecursive(class QGraphicsItem * *)
 	?ensureSequentialSiblingIndex@QGraphicsItemPrivate@@QAEXXZ @ 4148 NONAME ; void QGraphicsItemPrivate::ensureSequentialSiblingIndex(void)
 	?ensureSortedChildren@QGraphicsItemPrivate@@QAEXXZ @ 4149 NONAME ; void QGraphicsItemPrivate::ensureSortedChildren(void)
-	?ensureSpace@QTextEngine@@QBEXH@Z @ 4150 NONAME ; void QTextEngine::ensureSpace(int) const
+	?ensureSpace@QTextEngine@@QBEXH@Z @ 4150 NONAME ABSENT ; void QTextEngine::ensureSpace(int) const
 	?ensureVisible@QGraphicsItem@@QAEXABVQRectF@@HH@Z @ 4151 NONAME ; void QGraphicsItem::ensureVisible(class QRectF const &, int, int)
 	?ensureVisible@QGraphicsItem@@QAEXMMMMHH@Z @ 4152 NONAME ; void QGraphicsItem::ensureVisible(float, float, float, float, int, int)
 	?ensureVisible@QGraphicsView@@QAEXABVQRectF@@HH@Z @ 4153 NONAME ; void QGraphicsView::ensureVisible(class QRectF const &, int, int)
@@ -12886,4 +12886,6 @@ EXPORTS
 	?zScaleChanged@QGraphicsScale@@IAEXXZ @ 12885 NONAME ; void QGraphicsScale::zScaleChanged(void)
 	?xScaleChanged@QGraphicsScale@@IAEXXZ @ 12886 NONAME ; void QGraphicsScale::xScaleChanged(void)
 	?yScaleChanged@QGraphicsScale@@IAEXXZ @ 12887 NONAME ; void QGraphicsScale::yScaleChanged(void)
+	?_q_aboutToQuit@QApplicationPrivate@@QAEXXZ @ 12888 NONAME ; void QApplicationPrivate::_q_aboutToQuit(void)
+	?ensureSpace@QTextEngine@@QBE_NH@Z @ 12889 NONAME ; bool QTextEngine::ensureSpace(int) const
 
diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def
index 9a3cefa..723f2ae 100644
--- a/src/s60installs/eabi/QtDeclarativeu.def
+++ b/src/s60installs/eabi/QtDeclarativeu.def
@@ -1714,4 +1714,5 @@ EXPORTS
 	_ZNK16QDeclarativeView6engineEv @ 1713 NONAME
 	_ZNK18QDeclarativeEngine11rootContextEv @ 1714 NONAME
 	_ZN19QDeclarativePrivate11qmlregisterENS_16RegistrationTypeEPv @ 1715 NONAME
+	_ZNK26QDeclarativeOpenMetaObject8hasValueEi @ 1716 NONAME
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index d8e86bf..c4ad848 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -12091,4 +12091,5 @@ EXPORTS
 	_ZN14QGraphicsScale13xScaleChangedEv @ 12090 NONAME
 	_ZN14QGraphicsScale13yScaleChangedEv @ 12091 NONAME
 	_ZN14QGraphicsScale13zScaleChangedEv @ 12092 NONAME
+	_ZN19QApplicationPrivate14_q_aboutToQuitEv @ 12093 NONAME
 
diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index a5c2dda..7450d35 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -98,6 +98,7 @@ private slots:
     void validators();
     void inputMethods();
 
+    void passwordCharacter();
     void cursorDelegate();
     void navigation();
     void copyAndPaste();
@@ -768,6 +769,21 @@ void tst_qdeclarativetextinput::copyAndPaste() {
 #endif
 }
 
+void tst_qdeclarativetextinput::passwordCharacter()
+{
+    QString componentStr = "import Qt 4.7\nTextInput { text: \"Hello world!\"; font.family: \"Helvetica\"; echoMode: TextInput.Password }";
+    QDeclarativeComponent textInputComponent(&engine);
+    textInputComponent.setData(componentStr.toLatin1(), QUrl());
+    QDeclarativeTextInput *textInput = qobject_cast<QDeclarativeTextInput*>(textInputComponent.create());
+    QVERIFY(textInput != 0);
+
+    textInput->setPasswordCharacter("X");
+    QSize contentsSize = textInput->contentsSize();
+    textInput->setPasswordCharacter(".");
+    // QTBUG-12383 content is updated and redrawn
+    QVERIFY(contentsSize != textInput->contentsSize());
+}
+
 void tst_qdeclarativetextinput::cursorDelegate()
 {
     QDeclarativeView* view = createView(SRCDIR "/data/cursorTest.qml");
diff --git a/tests/auto/macnativeevents/tst_macnativeevents.cpp b/tests/auto/macnativeevents/tst_macnativeevents.cpp
index ffd0596..d582417 100644
--- a/tests/auto/macnativeevents/tst_macnativeevents.cpp
+++ b/tests/auto/macnativeevents/tst_macnativeevents.cpp
@@ -67,6 +67,11 @@ private slots:
     void testDragWindow();
     void testMouseEnter();
     void testChildDialogInFrontOfModalParent();
+#ifdef QT_MAC_USE_COCOA
+    void testChildWindowInFrontOfParentWindow();
+//    void testChildToolWindowInFrontOfChildNormalWindow();
+    void testChildWindowInFrontOfStaysOnTopParentWindow();
+#endif
     void testKeyPressOnToplevel();
 };
 
@@ -308,6 +313,82 @@ void tst_MacNativeEvents::testChildDialogInFrontOfModalParent()
     QVERIFY(!child.isVisible());
 }
 
+#ifdef QT_MAC_USE_COCOA
+void tst_MacNativeEvents::testChildWindowInFrontOfParentWindow()
+{
+    // Test that a child window always stacks in front of its parent window.
+    // Do this by first click on the parent, then on the child window button.
+    QWidget parent;
+    QPushButton child("a button", &parent);
+    child.setWindowFlags(Qt::Window);
+    connect(&child, SIGNAL(clicked()), &child, SLOT(close()));
+    parent.show();
+    child.show();
+
+    QPoint parent_p = parent.geometry().bottomLeft() + QPoint(20, -20);
+    QPoint child_p = child.geometry().center();
+
+    NativeEventList native;
+    native.append(new QNativeMouseButtonEvent(parent_p, Qt::LeftButton, 1, Qt::NoModifier));
+    native.append(new QNativeMouseButtonEvent(parent_p, Qt::LeftButton, 0, Qt::NoModifier));
+    native.append(new QNativeMouseButtonEvent(child_p, Qt::LeftButton, 1, Qt::NoModifier));
+    native.append(new QNativeMouseButtonEvent(child_p, Qt::LeftButton, 0, Qt::NoModifier));
+
+    native.play();
+    QTest::qWait(100);
+    QVERIFY(!child.isVisible());
+}
+
+/* This test can be enabled once setStackingOrder has been fixed in qwidget_mac.mm
+void tst_MacNativeEvents::testChildToolWindowInFrontOfChildNormalWindow()
+{
+    // Test that a child tool window always stacks in front of normal sibling windows.
+    // Do this by first click on the sibling, then on the tool window button.
+    QWidget parent;
+    QWidget normalChild(&parent, Qt::Window);
+    QPushButton toolChild("a button", &parent);
+    toolChild.setWindowFlags(Qt::Tool);
+    connect(&toolChild, SIGNAL(clicked()), &toolChild, SLOT(close()));
+    parent.show();
+    normalChild.show();
+    toolChild.show();
+
+    QPoint normalChild_p = normalChild.geometry().bottomLeft() + QPoint(20, -20);
+    QPoint toolChild_p = toolChild.geometry().center();
+
+    NativeEventList native;
+    native.append(new QNativeMouseButtonEvent(normalChild_p, Qt::LeftButton, 1, Qt::NoModifier));
+    native.append(new QNativeMouseButtonEvent(normalChild_p, Qt::LeftButton, 0, Qt::NoModifier));
+    native.append(new QNativeMouseButtonEvent(toolChild_p, Qt::LeftButton, 1, Qt::NoModifier));
+    native.append(new QNativeMouseButtonEvent(toolChild_p, Qt::LeftButton, 0, Qt::NoModifier));
+
+    native.play();
+    QTest::qWait(100);
+    QVERIFY(!toolChild.isVisible());
+}
+*/
+void tst_MacNativeEvents::testChildWindowInFrontOfStaysOnTopParentWindow()
+{
+    // Test that a child window stacks on top of a stays-on-top parent.
+    QWidget parent(0, Qt::WindowStaysOnTopHint);
+    QPushButton button("close", &parent);
+    button.setWindowFlags(Qt::Window);
+    connect(&button, SIGNAL(clicked()), &button, SLOT(close()));
+    parent.show();
+    button.show();
+    QPoint inside = button.geometry().center();
+
+    // Post a click on the button to close the child dialog:
+    NativeEventList native;
+    native.append(new QNativeMouseButtonEvent(inside, Qt::LeftButton, 1, Qt::NoModifier));
+    native.append(new QNativeMouseButtonEvent(inside, Qt::LeftButton, 0, Qt::NoModifier));
+
+    native.play();
+    QTest::qWait(100);
+    QVERIFY(!button.isVisible());
+}
+#endif
+
 void tst_MacNativeEvents::testKeyPressOnToplevel()
 {
     // Check that we receive keyevents for
diff --git a/tests/auto/qdatastream/tst_qdatastream.cpp b/tests/auto/qdatastream/tst_qdatastream.cpp
index 31e12fe..c03bc71 100644
--- a/tests/auto/qdatastream/tst_qdatastream.cpp
+++ b/tests/auto/qdatastream/tst_qdatastream.cpp
@@ -1820,7 +1820,7 @@ void tst_QDataStream::stream_QPixmap()
 #ifdef Q_OS_WINCE
     QSKIP("Test depends on more memory than available on Qt/CE", SkipAll);
 #endif
-    STREAM_IMPL(QIcon);
+    STREAM_IMPL(QPixmap);
 }
 
 void tst_QDataStream::stream_QIcon_data()
diff --git a/tests/auto/qmake/testdata/substitutes/sub/test2.in b/tests/auto/qmake/testdata/substitutes/sub/test2.in
new file mode 100644
index 0000000..78a6069
--- /dev/null
+++ b/tests/auto/qmake/testdata/substitutes/sub/test2.in
@@ -0,0 +1 @@
+heya
diff --git a/tests/auto/qmake/testdata/substitutes/test.in b/tests/auto/qmake/testdata/substitutes/test.in
new file mode 100644
index 0000000..2fa05e0
--- /dev/null
+++ b/tests/auto/qmake/testdata/substitutes/test.in
@@ -0,0 +1,2 @@
+test
+tst
diff --git a/tests/auto/qmake/testdata/substitutes/test.pro b/tests/auto/qmake/testdata/substitutes/test.pro
new file mode 100644
index 0000000..5bce312
--- /dev/null
+++ b/tests/auto/qmake/testdata/substitutes/test.pro
@@ -0,0 +1,2 @@
+QMAKE_SUBSTITUTES += test.in
+# doesn't work for the time being: sub/test2.in
diff --git a/tests/auto/qmake/testdata/substitutes_build/README b/tests/auto/qmake/testdata/substitutes_build/README
new file mode 100644
index 0000000..81dc596
--- /dev/null
+++ b/tests/auto/qmake/testdata/substitutes_build/README
@@ -0,0 +1 @@
+Placeholder file to ensure this directory exists
diff --git a/tests/auto/qmake/tst_qmake.cpp b/tests/auto/qmake/tst_qmake.cpp
index 5efe714..1a3f843 100644
--- a/tests/auto/qmake/tst_qmake.cpp
+++ b/tests/auto/qmake/tst_qmake.cpp
@@ -90,6 +90,7 @@ private slots:
     void bundle_spaces();
 #endif
     void includefunction();
+    void substitutes();
 
 private:
     TestCompiler test_compiler;
@@ -477,6 +478,21 @@ void tst_qmake::includefunction()
     QVERIFY(test_compiler.commandOutput().contains(warningMsg));
 }
 
+void tst_qmake::substitutes()
+{
+    QString workDir = base_path + "/testdata/substitutes";
+    QVERIFY( test_compiler.qmake( workDir, "test" ));
+    QVERIFY( test_compiler.exists( workDir, "test", Plain, "" ));
+    //QVERIFY( test_compiler.exists( workDir, "sub/test2", Plain, "" ));
+    QVERIFY( test_compiler.makeDistClean( workDir ));
+
+    QString buildDir = base_path + "/testdata/substitutes_build";
+    QVERIFY( test_compiler.qmake( workDir, "test", buildDir ));
+    QVERIFY( test_compiler.exists( buildDir, "test", Plain, "" ));
+    //QVERIFY( test_compiler.exists( buildDir, "sub/test2", Plain, "" ));
+    QVERIFY( test_compiler.makeDistClean( buildDir ));
+}
+
 QTEST_MAIN(tst_qmake)
 #include "tst_qmake.moc"
 
diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp
index 75a4c62..7e2e800 100644
--- a/tests/auto/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/qtreeview/tst_qtreeview.cpp
@@ -239,6 +239,7 @@ private slots:
     void doubleClickedWithSpans();
     void taskQTBUG_6450_selectAllWith1stColumnHidden();
     void taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaint();
+    void taskQTBUG_11466_keyboardNavigationRegression();
 };
 
 class QtTestModel: public QAbstractItemModel
@@ -3785,5 +3786,129 @@ void tst_QTreeView::keyboardNavigationWithDisabled()
     QCOMPARE(view.currentIndex(), model.index(6, 0));
 }
 
+class Model_11466 : public QAbstractItemModel
+{
+    Q_OBJECT
+public:
+    Model_11466(QObject *parent) :
+        m_block(false)
+    {
+        // set up the model to have two top level items and a few others
+        m_selectionModel = new QItemSelectionModel(this, this); // owned by this
+
+        connect(m_selectionModel, SIGNAL(currentChanged(const QModelIndex &,const QModelIndex &)),
+                this, SLOT(slotCurrentChanged(const QModelIndex &,const QModelIndex &)));
+    };
+
+    int rowCount(const QModelIndex &parent) const
+    {
+        if (parent.isValid())
+            return (parent.internalId() == 0) ? 4 : 0;
+        return 2; // two top level items
+    }
+
+    int columnCount(const QModelIndex &parent) const
+    {
+        return 2;
+    }
+
+    QVariant data(const QModelIndex &index, int role) const
+    {
+        if (role == Qt::DisplayRole && index.isValid()) {
+            qint64 parentRowPlusOne = index.internalId();
+            QString str;
+            QTextStream stream(&str);
+            if (parentRowPlusOne > 0)
+                stream << parentRowPlusOne << " -> " << index.row() << " : " << index.column();
+            else
+                stream << index.row() << " : " << index.column();
+            return QVariant(str);
+        }
+        return QVariant();
+    }
+
+    QModelIndex parent(const QModelIndex &index) const
+    {
+        if (index.isValid()) {
+            qint64 parentRowPlusOne = index.internalId();
+            if (parentRowPlusOne > 0) {
+                int row = static_cast<int>(parentRowPlusOne - 1);
+                return createIndex(row, 0, (quint32)0);
+            }
+        }
+        return QModelIndex();
+    }
+
+    void bindView(QTreeView *view)
+    {
+        // sets the view to this model with a shared selection model
+        QItemSelectionModel *oldModel = view->selectionModel();
+        if (oldModel != m_selectionModel)
+            delete oldModel;
+        view->setModel(this); // this creates a new selection model for the view, but we dont want it either ...
+        oldModel = view->selectionModel();
+        view->setSelectionModel(m_selectionModel);
+        delete oldModel;
+    }
+
+    QModelIndex index(int row, int column, const QModelIndex &parent) const
+    {
+        return createIndex(row, column, parent.isValid() ? (quint32)(parent.row() + 1) : (quint32)0);
+    }
+
+public slots:
+    void slotCurrentChanged(const QModelIndex &current,const QModelIndex &)
+    {
+        if (m_block)
+            return;
+
+        if (current.isValid()) {
+            int selectedRow = current.row();
+            quint32 parentRowPlusOne = static_cast<quint32>(current.internalId());
+
+            for (int i = 0; i < 2; ++i) {
+                // announce the removal of all non top level items
+                beginRemoveRows(createIndex(i, 0, 0), 0, 3);
+                // nothing to actually do for the removal
+                endRemoveRows();
+
+                // put them back in again
+                beginInsertRows(createIndex(i, 0, 0), 0, 3);
+                // nothing to actually do for the insertion
+                endInsertRows();
+            }
+            // reselect the current item ...
+            QModelIndex selectedIndex = createIndex(selectedRow, 0, parentRowPlusOne);
+
+            m_block = true; // recursion block
+            m_selectionModel->select(selectedIndex, QItemSelectionModel::ClearAndSelect|QItemSelectionModel::Current|QItemSelectionModel::Rows);
+            m_selectionModel->setCurrentIndex(selectedIndex, QItemSelectionModel::NoUpdate);
+            m_block = false;
+        } else {
+            m_selectionModel->clear();
+        }
+    }
+
+private:
+    bool m_block;
+    QItemSelectionModel *m_selectionModel;
+};
+
+void tst_QTreeView::taskQTBUG_11466_keyboardNavigationRegression()
+{
+    QTreeView treeView;
+    treeView.setSelectionBehavior(QAbstractItemView::SelectRows);
+    treeView.setSelectionMode(QAbstractItemView::SingleSelection);
+    Model_11466 model(&treeView);
+    model.bindView(&treeView);
+    treeView.expandAll();
+    treeView.show();
+    QTest::qWaitForWindowShown(&treeView);
+
+    QTest::keyPress(treeView.viewport(), Qt::Key_Down);
+    QTest::qWait(10);
+    QTRY_COMPARE(treeView.currentIndex(), treeView.selectionModel()->selection().indexes().first());
+}
+
 QTEST_MAIN(tst_QTreeView)
 #include "tst_qtreeview.moc"
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index f722f89..ef05b91 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -9742,7 +9742,6 @@ void tst_QWidget::destroyBackingStoreWhenHidden()
     QVERIFY(0 != backingStore(child));
 
     // Parent is obscured, therefore its backing store should be destroyed
-    QEXPECT_FAIL("", "QTBUG-12406", Continue);
     QVERIFY(0 == backingStore(parent));
 
     // Disable full screen
@@ -9758,6 +9757,80 @@ void tst_QWidget::destroyBackingStoreWhenHidden()
     QVERIFY(0 != backingStore(parent));
     QVERIFY(0 == backingStore(child));
     }
+
+    // 6. Partial reveal followed by full reveal
+    {
+    QWidget upper;
+    upper.setAutoFillBackground(true);
+    upper.setPalette(Qt::red);
+    upper.setGeometry(50, 50, 100, 100);
+
+    QWidget lower;
+    lower.setAutoFillBackground(true);
+    lower.setPalette(Qt::green);
+    lower.setGeometry(50, 50, 100, 100);
+
+    lower.show();
+    QTest::qWaitForWindowShown(&lower);
+    upper.show();
+    QTest::qWaitForWindowShown(&upper);
+    upper.raise();
+
+    QVERIFY(0 != backingStore(upper));
+    QVERIFY(0 == backingStore(lower));
+
+    // Check that upper obscures lower
+    QVERIFY(lower.visibleRegion().subtracted(upper.visibleRegion()).isEmpty());
+
+    // Partially reveal lower
+    upper.move(100, 100);
+
+    // Completely reveal lower
+    upper.hide();
+
+    // Hide lower widget - this should cause its backing store to be deleted
+    lower.hide();
+
+    // Check that backing store was deleted
+    WAIT_AND_VERIFY(0 == backingStore(lower));
+    }
+
+    // 7. Reparenting of visible native child widget
+    {
+    QWidget parent1;
+    parent1.setAutoFillBackground(true);
+    parent1.setPalette(Qt::green);
+    parent1.setGeometry(50, 50, 100, 100);
+
+    QWidget *child = new QWidget(&parent1);
+    child->winId();
+    child->setAutoFillBackground(true);
+    child->setPalette(Qt::red);
+    child->setGeometry(10, 10, 30, 30);
+
+    QWidget parent2;
+    parent2.setAutoFillBackground(true);
+    parent2.setPalette(Qt::blue);
+    parent2.setGeometry(150, 150, 100, 100);
+
+    parent1.show();
+    QTest::qWaitForWindowShown(&parent1);
+    QVERIFY(0 != backingStore(parent1));
+
+    parent2.show();
+    QTest::qWaitForWindowShown(&parent2);
+    QVERIFY(0 != backingStore(parent2));
+
+    child->setParent(&parent2);
+    child->setGeometry(10, 10, 30, 30);
+    child->show();
+
+    parent1.hide();
+    WAIT_AND_VERIFY(0 == backingStore(parent1));
+
+    parent2.hide();
+    WAIT_AND_VERIFY(0 == backingStore(parent2));
+    }
 }
 
 #undef WAIT_AND_VERIFY
diff --git a/tests/benchmarks/README b/tests/benchmarks/README
new file mode 100644
index 0000000..d437299
--- /dev/null
+++ b/tests/benchmarks/README
@@ -0,0 +1,81 @@
+The most reliable way of running benchmarks is to do it in an otherwise idle
+system. On a busy system, the results will vary according to the other tasks
+demanding attention in the system.
+
+We have managed to obtain quite reliable results by doing the following on 
+Linux (and you need root):
+
+ - switching the scheduler to a Real-Time mode
+ - setting the processor affinity to one single processor
+ - disabling the other thread of the same core
+
+This should work rather well for CPU-intensive tasks. A task that is in Real-
+Time mode will simply not be preempted by the OS. But if you make OS syscalls, 
+especially I/O ones, your task will be de-scheduled. Note that this includes 
+page faults, so if you can, make sure your benchmark's warmup code paths touch 
+most of the data.
+
+To do this you need a tool called schedtool (package schedtool), from 
+http://freequaos.host.sk/schedtool/
+
+From this point on, we are using CPU0 for all tasks:
+
+If you have a Hyperthreaded multi-core processor (Core-i5 and Core-i7), you 
+have to disable the other thread of the same core as CPU0. To discover which 
+one it is:
+
+$ cat /sys/devices/system/cpu/cpu0/topology/thread_siblings_list
+
+This will print something like 0,4, meaning that CPUs 0 and 4 are sibling 
+threads on the same core. So we'll turn CPU 4 off:
+
+(as root)
+# echo 0 > /sys/devices/system/cpu/cpu4/online
+
+To turn it back on, echo 1 into the same file.
+
+To run a task on CPU 0 exclusively, using FIFO RT priority 10, you run the 
+following:
+
+(as root)
+# schedtool -F -p 10 -a 1 -e ./taskname
+
+For example:
+# schedtool -F -p 10 -a 1 -e ./tst_bench_qstring -tickcounter
+
+Warning: if your task livelocks or takes far too long to complete, your system 
+may be unusable for a long time, especially if you don't have other cores to 
+run stuff on. To prevent that, run it before schedtool and time it.
+
+You can also limit the CPU time that the task is allowed to take. Run in the 
+same shell as you'll run schedtool:
+
+$ ulimit -s 300
+To limit to 300 seconds (5 minutes)
+
+If your task runs away, it will get a SIGXCPU after consuming 5 minutes of CPU 
+time (5 minutes running at 100%).
+
+If your app is multithreaded, you may want to give it more CPUs, like CPU0 and 
+CPU1 with -a 3  (it's a bitmask).
+
+For best results, you should disable ALL other cores and threads of the same 
+processor. The new Core-i7 have one processor with 4 cores, 
+each core can run 2 threads; the older Mac Pros have two processors with 4 
+cores each. So on those Mac Pros, you'd disable cores 1, 2 and 3, while on the 
+Core-i7, you'll need to disable all other CPUs.
+
+However, disabling just the sibling thread seems to produce very reliable 
+results for me already, with variance often below 0.5% (even though there are 
+some measurable spikes).
+
+Other things to try:
+
+Running the benchmark with highest priority, i.e. "sudo nice -19" 
+usually produces stable results on some machines. If the benchmark also 
+involves displaying something on the screen (on X11), running it with 
+"-sync" is a must. Though, in that case the "real" cost is not correct, 
+but it is useful to discover regressions.
+
+Also; not many people know about ionice (1)
+      ionice - get/set program io scheduling class and priority
diff --git a/tests/benchmarks/gui/image/blendbench/main.cpp b/tests/benchmarks/gui/image/blendbench/main.cpp
index f53654b..d420d6c 100644
--- a/tests/benchmarks/gui/image/blendbench/main.cpp
+++ b/tests/benchmarks/gui/image/blendbench/main.cpp
@@ -106,6 +106,9 @@ private slots:
 
     void blendBenchAlpha_data();
     void blendBenchAlpha();
+
+    void unalignedBlendArgb32_data();
+    void unalignedBlendArgb32();
 };
 
 void BlendBench::blendBench_data()
@@ -179,6 +182,46 @@ void BlendBench::blendBenchAlpha()
     }
 }
 
+void BlendBench::unalignedBlendArgb32_data()
+{
+    // The performance of blending can depend of the alignment of the data
+    // on 16 bytes. Some SIMD instruction set have significantly better
+    // memory access when the memory is aligned on 16 bytes boundary.
+
+    // offset in 32 bits words
+    QTest::addColumn<int>("offset");
+    QTest::newRow("aligned on 16 bytes") << 0;
+    QTest::newRow("unaligned by 4 bytes") << 1;
+    QTest::newRow("unaligned by 8 bytes") << 2;
+    QTest::newRow("unaligned by 12 bytes") << 3;
+}
+
+void BlendBench::unalignedBlendArgb32()
+{
+    const int dimension = 1024;
+
+    // We use dst aligned by design. We don't want to test all the combination of alignemnt for src and dst.
+    // Moreover, it make sense for us to align dst in the implementation because it is accessed more often.
+    uchar *dstMemory = static_cast<uchar*>(qMallocAligned((dimension * dimension * sizeof(quint32)), 16));
+    QImage destination(dstMemory, dimension, dimension, QImage::Format_ARGB32_Premultiplied);
+    destination.fill(0x12345678); // avoid special cases of alpha
+
+    uchar *srcMemory = static_cast<uchar*>(qMallocAligned((dimension * dimension * sizeof(quint32)) + 16, 16));
+    QFETCH(int, offset);
+    srcMemory += (offset * sizeof(quint32));
+
+    QImage src(srcMemory, dimension, dimension, QImage::Format_ARGB32_Premultiplied);
+    src.fill(0x87654321);
+
+    QPainter painter(&destination);
+    QBENCHMARK {
+        painter.drawImage(QPoint(), src);
+    }
+
+    qFreeAligned(srcMemory);
+    qFreeAligned(dstMemory);
+}
+
 QTEST_MAIN(BlendBench)
 
 #include "main.moc"
diff --git a/tools/assistant/tools/assistant/main.cpp b/tools/assistant/tools/assistant/main.cpp
index 51ea9f9..02507ae 100644
--- a/tools/assistant/tools/assistant/main.cpp
+++ b/tools/assistant/tools/assistant/main.cpp
@@ -355,7 +355,7 @@ int main(int argc, char *argv[])
     QHelpEngineCore cachedCollection(cachedCollectionFile);
     if (!cachedCollection.setupData()) {
         cmd.showMessage(QCoreApplication::translate("Assistant",
-                            "Error reading collection file '%1': %2").
+                            "Error reading collection file '%1': %2.").
                         arg(cachedCollectionFile).
                         arg(cachedCollection.error()), true);
         return EXIT_FAILURE;
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index 7892025..a83a321 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -544,6 +544,7 @@ void DitaXmlGenerator::generateTree(const Tree *tree, CodeMarker *marker)
     funcIndex.clear();
     legaleseTexts.clear();
     serviceClasses.clear();
+    qmlClasses.clear();
     findAllClasses(tree->root());
     findAllFunctions(tree->root());
     findAllLegaleseTexts(tree->root());
@@ -751,6 +752,9 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
         else if (atom->string() == "classes") {
             generateCompactList(relative, marker, nonCompatClasses, true);
         }
+        else if (atom->string() == "qmlclasses") {
+            generateCompactList(relative, marker, qmlClasses, true);
+        }
         else if (atom->string().contains("classesbymodule")) {
             QString arg = atom->string().trimmed();
             QString moduleName = atom->string().mid(atom->string().indexOf(
@@ -3675,6 +3679,12 @@ void DitaXmlGenerator::findAllClasses(const InnerNode *node)
                 if (!serviceName.isEmpty())
                     serviceClasses.insert(serviceName, *c);
             }
+            else if ((*c)->type() == Node::Fake &&
+                     (*c)->subType() == Node::QmlClass &&
+                     !(*c)->doc().isEmpty()) {
+                QString qmlClassName = (*c)->name();
+                qmlClasses.insert(qmlClassName,*c);
+            }
             else if ((*c)->isInnerNode()) {
                 findAllClasses(static_cast<InnerNode *>(*c));
             }
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 4603a40..8215ddc 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -376,6 +376,7 @@ void HtmlGenerator::generateTree(const Tree *tree, CodeMarker *marker)
     funcIndex.clear();
     legaleseTexts.clear();
     serviceClasses.clear();
+    qmlClasses.clear();
     findAllClasses(tree->root());
     findAllFunctions(tree->root());
     findAllLegaleseTexts(tree->root());
@@ -611,6 +612,9 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         else if (atom->string() == "classes") {
             generateCompactList(relative, marker, nonCompatClasses, true);
         }
+        else if (atom->string() == "qmlclasses") {
+            generateCompactList(relative, marker, qmlClasses, true);
+        }
         else if (atom->string().contains("classesbymodule")) {
             QString arg = atom->string().trimmed();
             QString moduleName = atom->string().mid(atom->string().indexOf(
@@ -3707,6 +3711,12 @@ void HtmlGenerator::findAllClasses(const InnerNode *node)
                 if (!serviceName.isEmpty())
                     serviceClasses.insert(serviceName, *c);
             }
+            else if ((*c)->type() == Node::Fake &&
+                     (*c)->subType() == Node::QmlClass &&
+                     !(*c)->doc().isEmpty()) {
+                QString qmlClassName = (*c)->name();
+                qmlClasses.insert(qmlClassName,*c);
+            }
             else if ((*c)->isInnerNode()) {
                 findAllClasses(static_cast<InnerNode *>(*c));
             }
@@ -4412,57 +4422,98 @@ bool HtmlGenerator::generatePageElement(QXmlStreamWriter& writer,
         return true;
     if (node->access() == Node::Private)
         return false;
-    if (!node->isInnerNode())
-        return false;
 
+    QString t;
+    QString url = PageGenerator::fileName(node);
     QString title;
     QString rawTitle;
     QString fullTitle;
-    const InnerNode* inner = static_cast<const InnerNode*>(node);
-        
-    writer.writeStartElement("page");
+    QStringList pageWords;
     QXmlStreamAttributes attributes;
-    QString t;
+
+    writer.writeStartElement("page");
     t.setNum(id++);
-    switch (node->type()) {
-    case Node::Fake:
-        {
-            const FakeNode* fake = static_cast<const FakeNode*>(node);
-            title = fake->fullTitle();
-            break;
-        }
-    case Node::Class:
-        {
-            title = node->name() + " Class Reference";
+
+    if (node->isInnerNode()) {
+        const InnerNode* inner = static_cast<const InnerNode*>(node);
+        switch (node->type()) {
+        case Node::Fake:
+            {
+                const FakeNode* fake = static_cast<const FakeNode*>(node);
+                title = fake->fullTitle();
+                pageWords << title;
+                break;
+            }
+        case Node::Class:
+            {
+                title = node->name() + " Class Reference";
+                pageWords << node->name() << "class" << "reference";
+                break;
+            }
+        case Node::Namespace:
+            {
+                rawTitle = marker->plainName(inner);
+                fullTitle = marker->plainFullName(inner);
+                title = rawTitle + " Namespace Reference";
+                pageWords << rawTitle << "namespace" << "reference";
+                break;
+            }
+        default:
+            title = node->name();
+            pageWords << title;
             break;
         }
-    case Node::Namespace:
-        {
-            rawTitle = marker->plainName(inner);
-            fullTitle = marker->plainFullName(inner);
-            title = rawTitle + " Namespace Reference";
+
+        if (!inner->pageKeywords().isEmpty())
+            pageWords << inner->pageKeywords();
+    }
+    else {
+        switch (node->type()) {
+        case Node::Enum:
+            {
+                title = node->name() + " Enum Reference";
+                pageWords << node->name() << "enum" << "type";
+                url += "#" + node->name() + "-enum";
+                break;
+            }
+        case Node::Function:
+            {
+                title = node->name() + " Function Reference";
+                pageWords << node->name() << "function";
+                url += "#" + node->name();
+                break;
+            }
+        case Node::Property:
+            {
+                title = node->name() + " Property Reference";
+                pageWords << node->name() << "property";
+                url += "#" + node->name() + "-prop";
+                break;
+            }
+        case Node::Typedef:
+            {
+                title = node->name() + " Type Reference";
+                pageWords << node->name() << "typedef" << "type";
+                url += "#" + node->name();
+                break;
+            }
+        default:
+            title = node->name();
+            pageWords << title;
             break;
         }
-    default:
-        title = node->name();
-        break;
     }
+
     writer.writeAttribute("id",t);
     writer.writeStartElement("pageWords");
-    writer.writeCharacters(title);
-    if (!inner->pageKeywords().isEmpty()) {
-        const QStringList& w = inner->pageKeywords();
-        for (int i = 0; i < w.size(); ++i) {
-            writer.writeCharacters(" ");
-            writer.writeCharacters(w.at(i).toLocal8Bit().constData());
-        }
-    }
+    writer.writeCharacters(pageWords.join(" "));
+
     writer.writeEndElement();
     writer.writeStartElement("pageTitle");
     writer.writeCharacters(title);
     writer.writeEndElement();
     writer.writeStartElement("pageUrl");
-    writer.writeCharacters(PageGenerator::fileName(node));
+    writer.writeCharacters(url);
     writer.writeEndElement();
     writer.writeStartElement("pageType");
     switch (node->pageType()) {
diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h
index eab10c6..d885ada 100644
--- a/tools/qdoc3/htmlgenerator.h
+++ b/tools/qdoc3/htmlgenerator.h
@@ -330,6 +330,7 @@ class HtmlGenerator : public PageGenerator
     NodeMap obsoleteClasses;
     NodeMap namespaceIndex;
     NodeMap serviceClasses;
+    NodeMap qmlClasses;
     QMap<QString, NodeMap > funcIndex;
     QMap<Text, const Node *> legaleseTexts;
     NewSinceMaps newSinceMaps;
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp
index 259641e..41f90d5 100644
--- a/tools/qdoc3/node.cpp
+++ b/tools/qdoc3/node.cpp
@@ -652,8 +652,14 @@ NodeList InnerNode::overloads(const QString &funcName) const
 InnerNode::InnerNode(Type type, InnerNode *parent, const QString& name)
     : Node(type, parent, name)
 {
-    if (type == Class)
+    switch (type) {
+    case Class:
+    case Namespace:
         setPageType(ApiPage);
+        break;
+    default:
+        break;
+    }
 }
 
 /*!
@@ -845,6 +851,19 @@ bool LeafNode::isInnerNode() const
 LeafNode::LeafNode(Type type, InnerNode *parent, const QString& name)
     : Node(type, parent, name)
 {
+    switch (type) {
+    case Enum:
+    case Function:
+    case Typedef:
+    case Variable:
+    case QmlProperty:
+    case QmlSignal:
+    case QmlMethod:
+        setPageType(ApiPage);
+        break;
+    default:
+        break;
+    }
 }
 
 /*!
@@ -1600,7 +1619,7 @@ QmlPropertyNode::QmlPropertyNode(QmlPropGroupNode *parent,
       des(Trool_Default),
       att(attached)
 {
-    // nothing.
+    setPageType(ApiPage);
 }
 
 /*!
diff --git a/translations/check-ts.xq b/translations/check-ts.xq
index 2d6404c..1062e90 100644
--- a/translations/check-ts.xq
+++ b/translations/check-ts.xq
@@ -1,3 +1,3 @@
 for $file in tokenize($files, codepoints-to-string(10))
-    let $fresh := doc($file)/TS/context/message[not (translation/@type = 'obsolete')]
+    let $fresh := doc($file)/TS/context[not (name = 'QtXmlPatterns')]/message[not (translation/@type = 'obsolete')]
     return concat($file, ":", count($fresh/translation[not (@type = 'unfinished')]) * 100 idiv count($fresh))
diff --git a/translations/designer_pl.ts b/translations/designer_pl.ts
index cadcc2b..59b5baf 100644
--- a/translations/designer_pl.ts
+++ b/translations/designer_pl.ts
@@ -4,27 +4,22 @@
 <context>
     <name>AbstractFindWidget</name>
     <message>
-        <location filename="../tools/shared/findwidget/abstractfindwidget.cpp" line="+127"/>
         <source>&amp;Previous</source>
         <translation>&amp;Poprzednie</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;Next</source>
         <translation>&amp;Następne</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>&amp;Case sensitive</source>
         <translation>Uwzględniaj &amp;wielkość liter</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Whole &amp;words</source>
         <translation>&amp;Całe słowa</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>&lt;img src=&quot;:/trolltech/shared/images/wrap.png&quot;&gt;&amp;nbsp;Search wrapped</source>
         <translation>&lt;img src=&quot;:/trolltech/shared/images/wrap.png&quot;&gt;&amp;nbsp;Przeszukano od początku</translation>
     </message>
@@ -32,17 +27,14 @@
 <context>
     <name>AddLinkDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/addlinkdialog.ui"/>
         <source>Insert Link</source>
         <translation>Wstaw odsyłacz</translation>
     </message>
     <message>
-        <location/>
         <source>Title:</source>
         <translation>Tytuł:</translation>
     </message>
     <message>
-        <location/>
         <source>URL:</source>
         <translation>Adres URL:</translation>
     </message>
@@ -50,7 +42,6 @@
 <context>
     <name>AppFontDialog</name>
     <message>
-        <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="+418"/>
         <source>Additional Fonts</source>
         <translation>Dodatkowe czcionki</translation>
     </message>
@@ -58,37 +49,30 @@
 <context>
     <name>AppFontManager</name>
     <message>
-        <location line="-267"/>
         <source>&apos;%1&apos; is not a file.</source>
         <translation>&apos;%1&apos; nie jest plikiem.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>The font file &apos;%1&apos; does not have read permissions.</source>
         <translation>Plik z czcionką &apos;%1&apos; nie ma praw do odczytu.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>The font file &apos;%1&apos; is already loaded.</source>
         <translation>Plik z czcionką &apos;%1&apos; jest już wczytany.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>The font file &apos;%1&apos; could not be loaded.</source>
         <translation>Nie można wczytać pliku z czcionką %1.</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>&apos;%1&apos; is not a valid font id.</source>
         <translation>&apos;%1&apos; nie jest poprawnym identyfikatorem czcionki.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>There is no loaded font matching the id &apos;%1&apos;.</source>
         <translation>Brak wczytanej czcionki o identyfikatorze &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>The font &apos;%1&apos; (%2) could not be unloaded.</source>
         <translation>Nie można usunąć czcionki &apos;%1&apos; (%2).</translation>
     </message>
@@ -96,52 +80,42 @@
 <context>
     <name>AppFontWidget</name>
     <message>
-        <location line="+26"/>
         <source>Fonts</source>
         <translation>Czcionki</translation>
     </message>
     <message>
-        <location line="+58"/>
         <source>Add font files</source>
         <translation>Dodaj pliki z czcionkami</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Remove current font file</source>
         <translation>Usuń bieżący plik z czcionką</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Remove all font files</source>
         <translation>Usuń wszystkie pliki z czcionkami</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Add Font Files</source>
         <translation>Dodaj pliki z czcionkami</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Font files (*.ttf)</source>
         <translation>Pliki z czcionkami (*.ttf)</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Error Adding Fonts</source>
         <translation>Błąd podczas dodawania czcionek</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Error Removing Fonts</source>
         <translation>Błąd podczas usuwania czcionek</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>Remove Fonts</source>
         <translation>Unuń czcionki</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Would you like to remove all fonts?</source>
         <translation>Czy chcesz usunąć wszystkie czcionki?</translation>
     </message>
@@ -149,12 +123,10 @@
 <context>
     <name>AppearanceOptionsWidget</name>
     <message>
-        <location filename="../tools/designer/src/designer/qdesigner_appearanceoptions.ui"/>
         <source>Form</source>
         <translation>Formularz</translation>
     </message>
     <message>
-        <location/>
         <source>User Interface Mode</source>
         <translation>Tryb interfejsu użytkownika</translation>
     </message>
@@ -162,17 +134,14 @@
 <context>
     <name>AssistantClient</name>
     <message>
-        <location filename="../tools/designer/src/designer/assistantclient.cpp" line="+100"/>
         <source>Unable to send request: Assistant is not responding.</source>
         <translation>Nie można wysłac komendy. Asystent nie odpowiada.</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>The binary &apos;%1&apos; does not exist.</source>
         <translation>Plik binarny &apos;%1&apos; nie istnieje.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Unable to launch assistant (%1).</source>
         <translation>Nie można uruchomić asystenta (%1).</translation>
     </message>
@@ -180,92 +149,74 @@
 <context>
     <name>BrushPropertyManager</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="+52"/>
         <source>No brush</source>
         <translation>Brak szczotki</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Solid</source>
         <translation>Jednolity</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 1</source>
         <translation>Gęstość 1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 2</source>
         <translation>Gęstość 2</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 3</source>
         <translation>Gęstość 3</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 4</source>
         <translation>Gęstość 4</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 5</source>
         <translation>Gęstość 5</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 6</source>
         <translation>Gęstość 6</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 7</source>
         <translation>Gęstość 7</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Horizontal</source>
         <translation>Poziomo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Vertical</source>
         <translation>Pionowo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Cross</source>
         <translation>Krzyżyk</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Backward diagonal</source>
         <translation>Linie pochylone w prawo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Forward diagonal</source>
         <translation>Linie pochylone w lewo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Crossing diagonal</source>
         <translation>Linie krzyżujące się</translation>
     </message>
     <message>
-        <location line="+93"/>
         <source>Style</source>
         <translation>Styl</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Color</source>
         <translation>Kolor</translation>
     </message>
     <message>
-        <location line="+105"/>
         <source>[%1, %2]</source>
         <translation>[%1, %2]</translation>
     </message>
@@ -273,360 +224,277 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor.cpp" line="+208"/>
-        <location line="+258"/>
         <source>Change signal</source>
         <translation>Zmień sygnał</translation>
     </message>
     <message>
-        <location line="-256"/>
-        <location line="+268"/>
         <source>Change slot</source>
         <translation>Zmień slot</translation>
     </message>
     <message>
-        <location line="-220"/>
         <source>Change signal-slot connection</source>
         <translation>Zmień połączenie sygnału ze slotem</translation>
     </message>
     <message>
-        <location line="+234"/>
         <source>Change sender</source>
         <translation>Zmień nadawcę</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Change receiver</source>
         <translation>Zmień odbiorcę</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/connectionedit.cpp" line="+143"/>
         <source>Add connection</source>
         <translation>Dodaj połączenie</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>Adjust connection</source>
         <translation>Dopasuj połączenie</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Delete connections</source>
         <translation>Usuń połączenia</translation>
     </message>
     <message>
-        <location line="+58"/>
         <source>Change source</source>
         <translation>Zmień źródło</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Change target</source>
         <translation>Zmień przeznaczenie</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="+149"/>
         <source>Insert &apos;%1&apos;</source>
         <translation>Wstaw &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+167"/>
         <source>Raise &apos;%1&apos;</source>
         <translation>Przenieś na wierzch &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Lower &apos;%1&apos;</source>
         <translation>Przenieś na spód &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+113"/>
         <source>Delete &apos;%1&apos;</source>
         <translation>Usuń &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+119"/>
         <source>Reparent &apos;%1&apos;</source>
         <translation>Zmień rodzica &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>Promote to custom widget</source>
         <translation>Zastąp widżet</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>Demote from custom widget</source>
         <translation>Przywróć do oryginalnego widżetu</translation>
     </message>
     <message>
-        <location line="+79"/>
         <source>Lay out using grid</source>
         <translation>Rozmieść używając siatki</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lay out vertically</source>
         <translation>Rozmieść w pionie</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lay out horizontally</source>
         <translation>Rozmieść w poziomie</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Break layout</source>
         <translation>Usuń rozmieszczenie</translation>
     </message>
     <message>
-        <location line="+240"/>
-        <location line="+235"/>
-        <location line="+78"/>
         <source>Move Page</source>
         <translation>Przenieś stronę</translation>
     </message>
     <message>
-        <location line="-279"/>
-        <location line="+123"/>
-        <location line="+188"/>
-        <location line="+666"/>
         <source>Delete Page</source>
         <translation>Usuń stronę</translation>
     </message>
     <message>
-        <location line="-939"/>
-        <location line="+123"/>
         <source>Page</source>
         <translation>Strona</translation>
     </message>
     <message>
-        <location line="+860"/>
         <source>page</source>
         <translation>strona</translation>
     </message>
     <message>
-        <location line="-978"/>
-        <location line="+123"/>
-        <location line="+186"/>
-        <location line="+667"/>
         <source>Insert Page</source>
         <translation>Wstaw stronę</translation>
     </message>
     <message>
-        <location line="-647"/>
         <source>Change Tab order</source>
         <translation>Zmień kolejność tabulacji</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Create Menu Bar</source>
         <translation>Utwórz pasek menu</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Delete Menu Bar</source>
         <translation>Usuń pasek menu</translation>
     </message>
     <message>
-        <location line="+47"/>
         <source>Create Status Bar</source>
         <translation>Utwórz pasek stanu</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>Delete Status Bar</source>
         <translation>Usuń pasek stanu</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Add Tool Bar</source>
         <translation>Dodaj pasek narzędzi</translation>
     </message>
     <message>
-        <location line="+59"/>
         <source>Add Dock Window</source>
         <translation>Dodaj okno dokowalne</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>Adjust Size of &apos;%1&apos;</source>
         <translation>Dopasuj rozmiar &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>Change Form Layout Item Geometry</source>
         <translation>Zmień geometrię elementu w formularzu</translation>
     </message>
     <message>
-        <location line="+95"/>
         <source>Change Layout Item Geometry</source>
         <translation>Zmień geometrię elementu w rozmieszczeniu</translation>
     </message>
     <message>
-        <location line="+576"/>
         <source>Change Table Contents</source>
         <translation>Zmień zawartość tabeli</translation>
     </message>
     <message>
-        <location line="+107"/>
         <source>Change Tree Contents</source>
         <translation>Zmień zawartość drzewa</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location line="+146"/>
         <source>Add action</source>
         <translation>Dodaj akcję</translation>
     </message>
     <message>
-        <location line="-120"/>
-        <location line="+126"/>
         <source>Remove action</source>
         <translation>Usuń akcję</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>Add menu</source>
         <translation>Dodaj menu</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Remove menu</source>
         <translation>Usuń menu</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Create submenu</source>
         <translation>Utwórz podmenu</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Delete Tool Bar</source>
         <translation>Usuń pasek narzędzi</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_menu.cpp" line="+1196"/>
         <source>Set action text</source>
         <translation>Ustaw tekst akcji</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Insert action</source>
         <translation>Wstaw akcję</translation>
     </message>
     <message>
-        <location line="+89"/>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="+915"/>
         <source>Move action</source>
         <translation>Przenieś akcję</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="-432"/>
         <source>Change Title</source>
         <translation>Zmień tytuł</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Insert Menu</source>
         <translation>Wstaw menu</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/signalslotdialog.cpp" line="+202"/>
         <source>Change signals/slots</source>
         <translation>Zmień sygnały/sloty</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="-867"/>
         <source>Delete Subwindow</source>
         <translation>Usuń podokno</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Insert Subwindow</source>
         <translation>Wstaw podokno</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>subwindow</source>
         <translation>podokno</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Subwindow</source>
         <translation>Podokno</translation>
     </message>
     <message>
-        <location line="-1821"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation>Zmień porządek głębokości (Z-order) dla &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+625"/>
         <source>Simplify Grid Layout</source>
         <translation>Uprość rozmieszczenie w siatce</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="+221"/>
         <source>Create button group</source>
         <translation>Utwórz grupę przycisków</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Break button group</source>
         <translation>Usuń grupę przycisków</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Break button group &apos;%1&apos;</source>
         <translation>Usuń grupę przycisków &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Add buttons to group</source>
         <translation>Dodaj przyciski do grupy</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/formlayoutmenu.cpp" line="+458"/>
-        <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="+8"/>
         <source>Add &apos;%1&apos; to &apos;%2&apos;</source>
         <extracomment>Command description for adding buttons to a QButtonGroup</extracomment>
         <translation>Dodaj &apos;%1&apos; do &apos;%2&apos;</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="+14"/>
         <source>Remove buttons from group</source>
         <translation>Usuń przyciski z grupy</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Remove &apos;%1&apos; from &apos;%2&apos;</source>
         <extracomment>Command description for removing buttons from a QButtonGroup</extracomment>
         <translation>Usuń &apos;%1&apos; z &apos;%2&apos;</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation>Przekształć %1/%2 w %3</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_command2.cpp" line="+154"/>
         <source>Change layout of &apos;%1&apos; from %2 to %3</source>
         <translation>Zmień rozmieszczenie widżetu &apos;%1&apos; z %2 na %3</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/scriptcommand.cpp" line="+55"/>
         <source>Change script</source>
         <translation>Zmień skrypt</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_propertycommand.cpp" line="+1225"/>
         <source>Changed &apos;%1&apos; of &apos;%2&apos;</source>
         <translation>Zmień &apos;%1&apos; w &apos;%2&apos;</translation>
     </message>
     <message numerus="yes">
-        <location line="+3"/>
         <source>Changed &apos;%1&apos; of %n objects</source>
         <translation>
             <numerusform>Zmieniono &apos;%1&apos; w %n obiekcie</numerusform>
@@ -635,12 +503,10 @@
         </translation>
     </message>
     <message>
-        <location line="+84"/>
         <source>Reset &apos;%1&apos; of &apos;%2&apos;</source>
         <translation>Przywróć domyślną wartość &apos;%1&apos; w &apos;%2&apos;</translation>
     </message>
     <message numerus="yes">
-        <location line="+3"/>
         <source>Reset &apos;%1&apos; of %n objects</source>
         <translation>
             <numerusform>Przywrócono domyślną wartość &apos;%1&apos; w &apos;%n&apos; obiekcie</numerusform>
@@ -649,12 +515,10 @@
         </translation>
     </message>
     <message>
-        <location line="+89"/>
         <source>Add dynamic property &apos;%1&apos; to &apos;%2&apos;</source>
         <translation>Dodaj dynamiczną właściwość &apos;%1&apos; do &apos;%2&apos;</translation>
     </message>
     <message numerus="yes">
-        <location line="+3"/>
         <source>Add dynamic property &apos;%1&apos; to %n objects</source>
         <translation>
             <numerusform>Dodaj dynamiczną właściwość &apos;%1&apos; do %n obiektu</numerusform>
@@ -663,12 +527,10 @@
         </translation>
     </message>
     <message>
-        <location line="+86"/>
         <source>Remove dynamic property &apos;%1&apos; from &apos;%2&apos;</source>
         <translation>Usuń dynamiczną właściwość &apos;%1&apos; z &apos;%2&apos;</translation>
     </message>
     <message numerus="yes">
-        <location line="+3"/>
         <source>Remove dynamic property &apos;%1&apos; from %n objects</source>
         <translation>
             <numerusform>Usuń dynamiczną właściwość &apos;%1&apos; z %n obiektu</numerusform>
@@ -680,22 +542,18 @@
 <context>
     <name>ConnectDialog</name>
     <message>
-        <location filename="../tools/designer/src/components/signalsloteditor/connectdialog.ui"/>
         <source>Configure Connection</source>
         <translation>Skonfiguruj połączenie</translation>
     </message>
     <message>
-        <location/>
         <source>GroupBox</source>
         <translation>GroupBox</translation>
     </message>
     <message>
-        <location/>
         <source>Edit...</source>
         <translation>Edycja...</translation>
     </message>
     <message>
-        <location/>
         <source>Show signals and slots inherited from QWidget</source>
         <translation>Pokaż sygnały i sloty klasy QWidget</translation>
     </message>
@@ -703,17 +561,14 @@
 <context>
     <name>ConnectionDelegate</name>
     <message>
-        <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="+645"/>
         <source>&lt;object&gt;</source>
         <translation>&lt;obiekt&gt;</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>&lt;signal&gt;</source>
         <translation>&lt;sygnał&gt;</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&lt;slot&gt;</source>
         <translation>&lt;slot&gt;</translation>
     </message>
@@ -721,19 +576,16 @@
 <context>
     <name>DPI_Chooser</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/dpi_chooser.cpp" line="+69"/>
         <source>Standard (96 x 96)</source>
         <extracomment>Embedded device standard screen resolution</extracomment>
         <translation>Standardowa (96 x 96)</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Greenphone (179 x 185)</source>
         <extracomment>Embedded device screen resolution</extracomment>
         <translation>Greenphone&apos;a (179 x 185)</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>High (192 x 192)</source>
         <extracomment>Embedded device high definition screen resolution</extracomment>
         <translation>Wysoka (192 x 192)</translation>
@@ -742,89 +594,72 @@
 <context>
     <name>Designer</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="+446"/>
         <source>Qt Designer</source>
         <translation>Qt Designer</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qsimpleresource.cpp" line="+339"/>
         <source>Custom Widgets</source>
         <translation>Własne widżety</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Promoted Widgets</source>
         <translation>Zastępcze widżety</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_utils.cpp" line="+682"/>
         <source>Unable to launch %1.</source>
         <translation>Nie można uruchomić %1.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1 timed out.</source>
         <translation>%1 przekroczony czas operacji.</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="+217"/>
         <source>This file cannot be read because it was created using %1.</source>
         <translation>Nie można odczytać pliku ponieważ został utworzony przy użyciu %1.</translation>
     </message>
     <message>
-        <location line="+96"/>
         <source>This file cannot be read because the extra info extension failed to load.</source>
         <translation>Nie można odczytać pliku ponieważ dodatkowe informacje nie mogły zostać załadowane.</translation>
     </message>
     <message>
-        <location line="-52"/>
         <source>The converted file could not be read.</source>
         <translation>Nie można odczytać skonwertowanego pliku.</translation>
     </message>
     <message>
-        <location line="-76"/>
         <source>Invalid UI file: The root element &lt;ui&gt; is missing.</source>
         <translation>Niepoprawny plik UI: brak głównego elementu &lt;ui&gt;.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>An error has occurred while reading the UI file at line %1, column %2: %3</source>
         <translation>Wystąpił błąd podczas czytania zawartości pliku UI, linia %1, kolumna %2: %3</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>This file was created using Designer from Qt-%1 and cannot be read.</source>
         <translation>Ten plik został utworzony za pomocą Qt Designer w wersji %1 i nie można go odczytać.</translation>
     </message>
     <message>
-        <location line="-221"/>
         <source>This file contains top level spacers.&lt;br&gt;They have &lt;b&gt;NOT&lt;/b&gt; been saved into the form.</source>
         <translation>Ten plik zawiera dystansy na najwyższym poziomie.&lt;br&gt;&lt;b&gt;NIE&lt;/b&gt; zostały one jednak zachowane w pliku.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Perhaps you forgot to create a layout?</source>
         <translation>Możliwe że zapomniałeś utworzyć rozmieszczenia?</translation>
     </message>
     <message>
-        <location line="+253"/>
         <source>This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer.</source>
         <translation>Ten plik został utworzony za pomocą Qt Designer w wersji %1 i będzie skonwertowany przez Qt Designer&apos;a do nowego formularza.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The old form has not been touched, but you will have to save the form under a new name.</source>
         <translation>Stary formularz nie był zmieniony, ale nowy będzie musiał być zapisany pod nową nazwą.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>This file was created using Designer from Qt-%1 and could not be read:
 %2</source>
         <translation>Ten plik został utworzony za pomocą Qt Designer w wersji %1 i nie można go odczytać.
 %2</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Please run it through &lt;b&gt;uic3&amp;nbsp;-convert&lt;/b&gt; to convert it to Qt-4&apos;s ui format.</source>
         <translation>Uruchom go przez &lt;b&gt;uic3&amp;nbsp;-convert&lt;/b&gt; aby skonwertować do formatu Qt-4.</translation>
     </message>
@@ -832,12 +667,10 @@
 <context>
     <name>DesignerMetaEnum</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_utils.cpp" line="-513"/>
         <source>%1 is not a valid enumeration value of &apos;%2&apos;.</source>
         <translation>%1 nie jest poprawną wartością typu wyliczeniowego &apos;%2&apos;.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&apos;%1&apos; could not be converted to an enumeration value of type &apos;%2&apos;.</source>
         <translation>Nie można skonwertować &apos;%1&apos; do wartości typu wyliczeniowego &apos;%2&apos;.</translation>
     </message>
@@ -845,7 +678,6 @@
 <context>
     <name>DesignerMetaFlags</name>
     <message>
-        <location line="+78"/>
         <source>&apos;%1&apos; could not be converted to a flag value of type &apos;%2&apos;.</source>
         <translation>Nie można skonwertować &apos;%1&apos; do wartości typu flaga &apos;%2&apos;.</translation>
     </message>
@@ -853,13 +685,11 @@
 <context>
     <name>DeviceProfile</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/deviceprofile.cpp" line="+397"/>
         <source>&apos;%1&apos; is not a number.</source>
         <extracomment>Reading a number for an embedded device profile</extracomment>
         <translation>&apos;%1&apos; nie jest liczbą.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>An invalid tag &lt;%1&gt; was encountered.</source>
         <translation>Napotkano niepoprawny tag &lt;%1&gt;.</translation>
     </message>
@@ -867,27 +697,22 @@
 <context>
     <name>DeviceProfileDialog</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.ui"/>
         <source>&amp;Family</source>
         <translation>&amp;Rodzina</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Point Size</source>
         <translation>&amp;Wielkość punktu</translation>
     </message>
     <message>
-        <location/>
         <source>Style</source>
         <translation>Styl</translation>
     </message>
     <message>
-        <location/>
         <source>Device DPI</source>
         <translation>Rozdzielczość urządzenia</translation>
     </message>
     <message>
-        <location/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
@@ -895,57 +720,46 @@
 <context>
     <name>DeviceSkin</name>
     <message>
-        <location filename="../tools/shared/deviceskin/deviceskin.cpp" line="+79"/>
         <source>The image file &apos;%1&apos; could not be loaded.</source>
         <translation>Nie można wczytać pliku z obrazkiem %1.</translation>
     </message>
     <message>
-        <location line="+64"/>
         <source>The skin directory &apos;%1&apos; does not contain a configuration file.</source>
         <translation>Katalog ze skórkami (skin) &apos;%1&apos; nie zawiera pliku konfiguracyjnego.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>The skin configuration file &apos;%1&apos; could not be opened.</source>
         <translation>Nie można otworzyć pliku z konfiguracją skórki (skin) &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+76"/>
         <source>Syntax error: %1</source>
         <translation>Błąd składni: %1</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>The skin cursor image file &apos;%1&apos; does not exist.</source>
         <translation>Plik z obrazkiem kursora &apos;%1&apos; dla skórki (skin) nie istnieje.</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Syntax error in area definition: %1</source>
         <translation>Błąd składni w definicji obszaru: %1</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Mismatch in number of areas, expected %1, got %2.</source>
         <translation>Niezgodność w ilości obszarów, spodziewano się %1, otrzymano %2.</translation>
     </message>
     <message>
-        <location line="-187"/>
         <source>The skin configuration file &apos;%1&apos; could not be read: %2</source>
         <translation>Nie można odczytać pliku z konfiguracją skórki (skin) &apos;%1&apos;, powód: %2</translation>
     </message>
     <message>
-        <location line="+91"/>
         <source>The skin &quot;up&quot; image file &apos;%1&apos; does not exist.</source>
         <translation>Plik z obrazkiem &quot;do góry&quot; &apos;%1&apos; dla skórki (skin) nie istnieje.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>The skin &quot;down&quot; image file &apos;%1&apos; does not exist.</source>
         <translation>Plik z obrazkiem &quot;w dół&quot; &apos;%1&apos; dla skórki (skin) nie istnieje.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>The skin &quot;closed&quot; image file &apos;%1&apos; does not exist.</source>
         <translation>Plik z obrazkiem &quot;zamknięte&quot; &apos;%1&apos; dla skórki (skin) nie istnieje.</translation>
     </message>
@@ -953,7 +767,6 @@
 <context>
     <name>EmbeddedOptionsControl</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/embeddedoptionspage.cpp" line="+307"/>
         <source>&lt;html&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Font&lt;/b&gt;&lt;/td&gt;&lt;td&gt;%1, %2&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Style&lt;/b&gt;&lt;/td&gt;&lt;td&gt;%3&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Resolution&lt;/b&gt;&lt;/td&gt;&lt;td&gt;%4 x %5&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/html&gt;</source>
         <extracomment>Format embedded device profile description</extracomment>
         <translation>&lt;html&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Font&lt;/b&gt;&lt;/td&gt;&lt;td&gt;%1, %2&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Styl&lt;/b&gt;&lt;/td&gt;&lt;td&gt;%3&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Rozdzielczość&lt;/b&gt;&lt;/td&gt;&lt;td&gt;%4 x %5&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/html&gt;</translation>
@@ -962,13 +775,11 @@
 <context>
     <name>EmbeddedOptionsPage</name>
     <message>
-        <location line="+103"/>
         <source>Embedded Design</source>
         <extracomment>Tab in preferences dialog</extracomment>
         <translation>Projekt dla urządzeń specjalizowanych</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Device Profiles</source>
         <extracomment>EmbeddedOptionsControl group box&quot;</extracomment>
         <translation>Profile urządzeń</translation>
@@ -977,27 +788,22 @@
 <context>
     <name>FontPanel</name>
     <message>
-        <location filename="../tools/shared/fontpanel/fontpanel.cpp" line="+63"/>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>&amp;Writing system</source>
         <translation>Sys&amp;tem pisania</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Family</source>
         <translation>&amp;Rodzina</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Style</source>
         <translation>&amp;Styl</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Point size</source>
         <translation>&amp;Wielkość punktu</translation>
     </message>
@@ -1005,22 +811,18 @@
 <context>
     <name>FontPropertyManager</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/fontpropertymanager.cpp" line="+62"/>
         <source>PreferDefault</source>
         <translation>Preferuj domyślny</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>NoAntialias</source>
         <translation>Brak antyaliasingu</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>PreferAntialias</source>
         <translation>Preferuj antyaliasing</translation>
     </message>
     <message>
-        <location line="+61"/>
         <source>Antialiasing</source>
         <translation>Antyaliasing</translation>
     </message>
@@ -1028,7 +830,6 @@
 <context>
     <name>FormBuilder</name>
     <message>
-        <location filename="../tools/designer/src/lib/uilib/formbuilderextra.cpp" line="+375"/>
         <source>Invalid stretch value for &apos;%1&apos;: &apos;%2&apos;</source>
         <extracomment>Parsing layout stretch values
 ----------
@@ -1038,7 +839,6 @@ Parsing layout stretch values</extracomment>
         <translation>Niepoprawna wartość rozciągniecia dla &apos;%1&apos;: &apos;%2&apos;</translation>
     </message>
     <message>
-        <location line="+62"/>
         <source>Invalid minimum size for &apos;%1&apos;: &apos;%2&apos;</source>
         <extracomment>Parsing grid layout minimum size values
 ----------
@@ -1051,28 +851,23 @@ Parsing grid layout minimum size values</extracomment>
 <context>
     <name>FormEditorOptionsPage</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formeditor_optionspage.cpp" line="+91"/>
         <source>%1 %</source>
         <translation>%1 %</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Preview Zoom</source>
         <translation>Powiększanie podglądu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Default Zoom</source>
         <translation>Domyślne powiększenie</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>Forms</source>
         <extracomment>Tab in preferences dialog</extracomment>
         <translation>Formularze</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Default Grid</source>
         <translation>Domyślna siatka</translation>
     </message>
@@ -1080,37 +875,30 @@ Parsing grid layout minimum size values</extracomment>
 <context>
     <name>FormLayoutRowDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/formlayoutrowdialog.ui"/>
         <source>Add Form Layout Row</source>
         <translation>Dodaj wiersz do formularza</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Label text:</source>
         <translation>Text &amp;etykiety:</translation>
     </message>
     <message>
-        <location/>
         <source>Field &amp;type:</source>
         <translation>&amp;Typ pola:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Field name:</source>
         <translation>Nazwa &amp;pola:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Buddy:</source>
         <translation>Etykieta &amp;skojarzona:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Row:</source>
         <translation>&amp;Wiersz:</translation>
     </message>
     <message>
-        <location/>
         <source>Label &amp;name:</source>
         <translation>&amp;Nazwa etykiety:</translation>
     </message>
@@ -1118,12 +906,10 @@ Parsing grid layout minimum size values</extracomment>
 <context>
     <name>FormWindow</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="+1754"/>
         <source>Unexpected element &lt;%1&gt;</source>
         <translation>Niespodziewany element &lt;%1&gt;</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Error while pasting clipboard contents at line %1, column %2: %3</source>
         <translation>Błąd podczas wklejania zawartości schowka, linia %1, kolumna %2: %3</translation>
     </message>
@@ -1131,62 +917,50 @@ Parsing grid layout minimum size values</extracomment>
 <context>
     <name>FormWindowSettings</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formwindowsettings.ui"/>
         <source>Form Settings</source>
         <translation>Ustawienia formularza</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Pixmap Function</source>
         <translation>Funkcja ustawiania &amp;pixmapy</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Include Hints</source>
         <translation>Dodatkowe pliki &amp;nagłówkowe</translation>
     </message>
     <message>
-        <location/>
         <source>Embedded Design</source>
         <translation>Projekt dla urządzeń specjalizowanych</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Author</source>
         <translation>&amp;Autor</translation>
     </message>
     <message>
-        <location/>
         <source>Layout &amp;Default</source>
         <translation>&amp;Rozmieszczenie domyślne</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Spacing:</source>
         <translation>&amp;Odstępy:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Margin:</source>
         <translation>&amp;Marginesy:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Layout Function</source>
         <translation>Funkcja &amp;rozmieszczania widżetów</translation>
     </message>
     <message>
-        <location/>
         <source>Ma&amp;rgin:</source>
         <translation>Ma&amp;rginesy:</translation>
     </message>
     <message>
-        <location/>
         <source>Spa&amp;cing:</source>
         <translation>Od&amp;stępy:</translation>
     </message>
     <message>
-        <location/>
         <source>Grid</source>
         <translation>Siatka</translation>
     </message>
@@ -1194,7 +968,6 @@ Parsing grid layout minimum size values</extracomment>
 <context>
     <name>IconSelector</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="+352"/>
         <source>All Pixmaps (</source>
         <translation>Wszystkie pixmapy (</translation>
     </message>
@@ -1202,7 +975,6 @@ Parsing grid layout minimum size values</extracomment>
 <context>
     <name>ItemPropertyBrowser</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.cpp" line="+66"/>
         <source>XX Icon Selected off</source>
         <extracomment>Sample string to determinate the width for the first column of the list item property browser</extracomment>
         <translation>XX ikona wybrana wyłączona</translation>
@@ -1211,33 +983,27 @@ Parsing grid layout minimum size values</extracomment>
 <context>
     <name>MainWindowBase</name>
     <message>
-        <location filename="../tools/designer/src/designer/mainwindow.cpp" line="+121"/>
         <source>Main</source>
         <extracomment>Not currently used (main tool bar)</extracomment>
         <translation>Główny</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>File</source>
         <translation>Plik</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Edit</source>
         <translation>Edycja</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Tools</source>
         <translation>Narzędzia</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Form</source>
         <translation>Formularz</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Qt Designer</source>
         <translation>Qt Designer</translation>
     </message>
@@ -1245,52 +1011,42 @@ Parsing grid layout minimum size values</extracomment>
 <context>
     <name>NewForm</name>
     <message>
-        <location filename="../tools/designer/src/designer/newform.cpp" line="+83"/>
         <source>New Form</source>
         <translation>Nowy formularz</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>&amp;Open...</source>
         <translation>&amp;Otwórz...</translation>
     </message>
     <message>
-        <location line="-36"/>
         <source>C&amp;reate</source>
         <translation>&amp;Utwórz</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>&amp;Close</source>
         <translation>Za&amp;mknij</translation>
     </message>
     <message>
-        <location line="-34"/>
         <source>Show this Dialog on Startup</source>
         <translation>Pokazuj to okno przy uruchamianiu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Recent</source>
         <translation>Ostatnie</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>&amp;Recent Forms</source>
         <translation>Os&amp;tatnio edytowane formularze</translation>
     </message>
     <message>
-        <location line="+64"/>
         <source>Read error</source>
         <translation>Błąd odczytu</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>A temporary form file could not be created in %1.</source>
         <translation>Nie można utworzyć pliku z tymczasowym formularzem w %1.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>The temporary form file %1 could not be written.</source>
         <translation>Nie można zapisać pliku z tymczasowym formularzem w %1.</translation>
     </message>
@@ -1298,22 +1054,18 @@ Parsing grid layout minimum size values</extracomment>
 <context>
     <name>ObjectInspectorModel</name>
     <message>
-        <location filename="../tools/designer/src/components/objectinspector/objectinspectormodel.cpp" line="+360"/>
         <source>Object</source>
         <translation>Obiekt</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Class</source>
         <translation>Klasa</translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>separator</source>
         <translation>separator</translation>
     </message>
     <message>
-        <location line="+98"/>
         <source>&lt;noname&gt;</source>
         <translation>&lt;brak_nazwy&gt;</translation>
     </message>
@@ -1321,12 +1073,10 @@ Parsing grid layout minimum size values</extracomment>
 <context>
     <name>ObjectNameDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="+158"/>
         <source>Change Object Name</source>
         <translation>Zmień nazwę obiektu</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Object Name</source>
         <translation>Nazwa obiektu</translation>
     </message>
@@ -1334,12 +1084,10 @@ Parsing grid layout minimum size values</extracomment>
 <context>
     <name>PluginDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/plugindialog.ui"/>
         <source>Plugin Information</source>
         <translation>Informacje o wtyczkach</translation>
     </message>
     <message>
-        <location/>
         <source>1</source>
         <translation>1</translation>
     </message>
@@ -1347,7 +1095,6 @@ Parsing grid layout minimum size values</extracomment>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../tools/designer/src/designer/preferencesdialog.ui"/>
         <source>Preferences</source>
         <translation>Ustawienia</translation>
     </message>
@@ -1355,32 +1102,26 @@ Parsing grid layout minimum size values</extracomment>
 <context>
     <name>PreviewConfigurationWidget</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.ui"/>
         <source>Form</source>
         <translation>Formularz</translation>
     </message>
     <message>
-        <location/>
         <source>Print/Preview Configuration</source>
         <translation>Konfiguracja wydruku/podglądu</translation>
     </message>
     <message>
-        <location/>
         <source>Style</source>
         <translation>Styl</translation>
     </message>
     <message>
-        <location/>
         <source>Style sheet</source>
         <translation>Arkusz stylu</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location/>
         <source>Device skin</source>
         <translation>Skórka (skin) urządzenia</translation>
     </message>
@@ -1388,7 +1129,6 @@ Parsing grid layout minimum size values</extracomment>
 <context>
     <name>PromotionModel</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/promotionmodel.cpp" line="+112"/>
         <source>Not used</source>
         <extracomment>Usage of promoted widgets</extracomment>
         <translation>Nie używana</translation>
@@ -1397,8 +1137,6 @@ Parsing grid layout minimum size values</extracomment>
 <context>
     <name>Q3WizardContainer</name>
     <message>
-        <location filename="../tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.cpp" line="+172"/>
-        <location line="+5"/>
         <source>Page</source>
         <translation>Strona</translation>
     </message>
@@ -1406,59 +1144,48 @@ Parsing grid layout minimum size values</extracomment>
 <context>
     <name>QAbstractFormBuilder</name>
     <message>
-        <location filename="../tools/designer/src/lib/uilib/abstractformbuilder.cpp" line="+206"/>
         <source>Unexpected element &lt;%1&gt;</source>
         <translation>Niespodziewany element &lt;%1&gt;</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>An error has occurred while reading the UI file at line %1, column %2: %3</source>
         <translation>Wystąpił błąd podczas czytania zawartości pliku ui, linia %1, kolumna %2: %3</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Invalid UI file: The root element &lt;ui&gt; is missing.</source>
         <translation>Niepoprawny plik UI: brak głównego elementu &lt;ui&gt;.</translation>
     </message>
     <message>
-        <location line="+104"/>
         <source>The creation of a widget of the class &apos;%1&apos; failed.</source>
         <translation>Utworzenie widżetu klasy &apos;%1&apos; nie powiodło się.</translation>
     </message>
     <message>
-        <location line="+296"/>
         <source>Attempt to add child that is not of class QWizardPage to QWizard.</source>
         <translation>Próba dodania potomka który nie jest klasy QWizardPage do QWizard.</translation>
     </message>
     <message>
-        <location line="+86"/>
         <source>Attempt to add a layout to a widget &apos;%1&apos; (%2) which already has a layout of non-box type %3.
 This indicates an inconsistency in the ui-file.</source>
         <translation>Próba dodania rozmieszczenia do widżetu &apos;%1&apos; (%2) który posiada już niezarządzane rozmieszczenie typu %3.
 To wskazuje na niespójność w pliku ui.</translation>
     </message>
     <message>
-        <location line="+144"/>
         <source>Empty widget item in %1 &apos;%2&apos;.</source>
         <translation>Pusty element w %1 &apos;%2&apos;.</translation>
     </message>
     <message>
-        <location line="+680"/>
         <source>Flags property are not supported yet.</source>
         <translation>Właściwości typu flaga nie są jeszcze obsługiwane.</translation>
     </message>
     <message>
-        <location line="+81"/>
         <source>While applying tab stops: The widget &apos;%1&apos; could not be found.</source>
         <translation>Podczas przypisywania kolejności tabulacji: widżet &apos;%1&apos; nie został znaleziony.</translation>
     </message>
     <message>
-        <location line="+923"/>
         <source>Invalid QButtonGroup reference &apos;%1&apos; referenced by &apos;%2&apos;.</source>
         <translation>Niepoprawny odnośnik QButtonGroup &apos;%1&apos;, użyty w &apos;%2&apos;.</translation>
     </message>
     <message>
-        <location line="+511"/>
         <source>This version of the uitools library is linked without script support.</source>
         <translation>Ta wersja biblioteki uitools nie zawiera obsługi skryptów.</translation>
     </message>
@@ -1466,12 +1193,10 @@ To wskazuje na niespójność w pliku ui.</translation>
 <context>
     <name>QAxWidgetPlugin</name>
     <message>
-        <location filename="../tools/designer/src/plugins/activeqt/qaxwidgetplugin.cpp" line="+75"/>
         <source>ActiveX control</source>
         <translation>Kontrolka ActiveX</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>ActiveX control widget</source>
         <translation>Widżet z kontrolką ActiveX</translation>
     </message>
@@ -1479,22 +1204,18 @@ To wskazuje na niespójność w pliku ui.</translation>
 <context>
     <name>QAxWidgetTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp" line="+119"/>
         <source>Set Control</source>
         <translation>Ustaw kontrolkę</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reset Control</source>
         <translation>Przywróć pustą zawartość kontrolce</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Licensed Control</source>
         <translation>Kontrolka licencjonowana</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The control requires a design-time license</source>
         <translation>Kontrolka wymaga licencji podczas projektowania</translation>
     </message>
@@ -1502,67 +1223,54 @@ To wskazuje na niespójność w pliku ui.</translation>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_promotion.cpp" line="+83"/>
         <source>%1 is not a promoted class.</source>
         <translation>%1 nie jest klasą zastępczą.</translation>
     </message>
     <message>
-        <location line="+65"/>
         <source>The base class %1 is invalid.</source>
         <translation>Klasa podstawowa %1 jest niewłaściwa.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>The class %1 already exists.</source>
         <translation>Klasa %1 już istnieje.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Promoted Widgets</source>
         <translation>Zastępcze widżety</translation>
     </message>
     <message>
-        <location line="+126"/>
         <source>The class %1 cannot be removed</source>
         <translation>Nie można usunąć klasy %1</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>The class %1 cannot be removed because it is still referenced.</source>
         <translation>Nie można usunąć klasy %1 ponieważ w dalszym ciągu są do niej odwołania.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>The class %1 cannot be renamed</source>
         <translation>Nie można zmienić nazwy klasy %1</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>The class %1 cannot be renamed to an empty name.</source>
         <translation>Nie można zmienić nazwy klasy %1 na pustą nazwę.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>There is already a class named %1.</source>
         <translation>Istnieje już klasa o nazwie %1.</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>Cannot set an empty include file.</source>
         <translation>Nie można ustawić pustego pliku nagłówkowego.</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/uilib/formscriptrunner.cpp" line="+88"/>
         <source>Exception at line %1: %2</source>
         <translation>Wyjątek w linii %1: %2</translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>Unknown error</source>
         <translation>Nieznany błąd</translation>
     </message>
     <message>
-        <location line="+50"/>
         <source>An error occurred while running the script for %1: %2
 Script: %3</source>
         <translation>Wystąpił błąd podczas uruchamiana skryptu dla %1: %2
@@ -1572,17 +1280,14 @@ Skrypt: %3</translation>
 <context>
     <name>QDesigner</name>
     <message>
-        <location filename="../tools/designer/src/designer/qdesigner.cpp" line="+141"/>
         <source>%1 - warning</source>
         <translation>%1 - ostrzeżenie</translation>
     </message>
     <message>
-        <location line="+96"/>
         <source>Qt Designer</source>
         <translation>Qt Designer</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>This application cannot be used for the Console edition of Qt</source>
         <translation>Nie można użyć tej aplikacji w wydaniu Qt Console</translation>
     </message>
@@ -1590,105 +1295,82 @@ Skrypt: %3</translation>
 <context>
     <name>QDesignerActions</name>
     <message>
-        <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="+519"/>
         <source>Clear &amp;Menu</source>
         <translation>Wyczyść &amp;menu</translation>
     </message>
     <message>
-        <location line="-329"/>
         <source>&amp;Quit</source>
         <translation>Za&amp;kończ</translation>
     </message>
     <message>
-        <location line="-10"/>
         <source>Edit Widgets</source>
         <translation>Modyfikuj widżety</translation>
     </message>
     <message>
-        <location line="+219"/>
         <source>CTRL+R</source>
         <translation>CTRL+R</translation>
     </message>
     <message>
-        <location line="-206"/>
         <source>&amp;Minimize</source>
         <translation>&amp;Zminimalizuj</translation>
     </message>
     <message>
-        <location line="+224"/>
         <source>CTRL+M</source>
         <translation>CTRL+M</translation>
     </message>
     <message>
-        <location line="-222"/>
         <source>Bring All to Front</source>
         <translation>Wszystkie na wierzch</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Additional Fonts...</source>
         <translation>Dodatkowe czcionki...</translation>
     </message>
     <message>
-        <location line="+250"/>
         <source>Qt Designer &amp;Help</source>
         <translation>Pomo&amp;c Qt Designer</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Current Widget Help</source>
         <translation>Pomoc dla bieżącego widżetu</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>What&apos;s New in Qt Designer?</source>
         <translation>Co nowego w Qt Designer?</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>About Plugins</source>
         <translation>Informacje o wtyczkach</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+601"/>
         <source>About Qt Designer</source>
         <translation>Informacje o Qt Designer</translation>
     </message>
     <message>
-        <location line="-595"/>
         <source>About Qt</source>
         <translation>Informacje o Qt</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>&amp;Recent Forms</source>
         <translation>Os&amp;tatnio edytowane formularze</translation>
     </message>
     <message>
-        <location line="+77"/>
-        <location line="+197"/>
         <source>Open Form</source>
         <translation>Otwórz formularz</translation>
     </message>
     <message>
-        <location line="-72"/>
         <source>Designer</source>
         <translation>Projektant</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Feature not implemented yet!</source>
         <translation>Cecha nie zaimplementowana!</translation>
     </message>
     <message>
-        <location line="+141"/>
-        <location line="+40"/>
         <source>Save Form?</source>
         <translation>Zachować formularz?</translation>
     </message>
     <message>
-        <location line="-35"/>
         <source>The file %1 could not be opened.
 Reason: %2
 Would you like to retry or select a different file?</source>
@@ -1697,145 +1379,114 @@ Powód: %2
 Czy chcesz spróbować ponownie lub zmienić nazwę pliku?</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Select New File</source>
         <translation>Wybierz nowy plik</translation>
     </message>
     <message>
-        <location line="-723"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation>%1 już istnieje.
 Czy chcesz go zastąpić?</translation>
     </message>
     <message>
-        <location line="+954"/>
         <source>&amp;Close Preview</source>
         <translation>Za&amp;mknij podgląd</translation>
     </message>
     <message>
-        <location line="-913"/>
         <source>Preferences...</source>
         <translation>Ustawienia...</translation>
     </message>
     <message>
-        <location line="+75"/>
         <source>CTRL+SHIFT+S</source>
         <translation>CTRL+SHIFT+S</translation>
     </message>
     <message>
-        <location line="+331"/>
-        <location line="+37"/>
-        <location line="+160"/>
         <source>Designer UI files (*.%1);;All Files (*)</source>
         <translation>Pliki Designer UI (*.%1);;Wszystkie pliki (*)</translation>
     </message>
     <message>
-        <location line="-670"/>
         <source>Saved %1.</source>
         <translation>Formularz %1 zachowany pomyślnie.</translation>
     </message>
     <message>
-        <location line="+656"/>
         <source>Read error</source>
         <translation>Błąd odczytu</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>%1
 Do you want to update the file location or generate a new form?</source>
         <translation>%1
 Czy chcesz zaktualizować położenie pliku lub wygenerować nowy formularz?</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Update</source>
         <translation>&amp;Uaktualnij</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;New Form</source>
         <translation>Nowy &amp;formularz</translation>
     </message>
     <message>
-        <location line="+78"/>
         <source>Could not open file</source>
         <translation>Nie można otworzyć pliku</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>Could not write file</source>
         <translation>Nie można zapisać pliku</translation>
     </message>
     <message>
-        <location line="-728"/>
         <source>&amp;New...</source>
         <translation>&amp;Nowy...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Open...</source>
         <translation>&amp;Otwórz...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Save</source>
         <translation>&amp;Zachowaj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Save &amp;As...</source>
         <translation>Zachowaj j&amp;ako...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Save A&amp;ll</source>
         <translation>Zachowaj &amp;wszystko</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Save As &amp;Template...</source>
         <translation>Zachowaj jako &amp;szablon...</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+925"/>
         <source>&amp;Close</source>
         <translation>Za&amp;mknij</translation>
     </message>
     <message>
-        <location line="-924"/>
         <source>Save &amp;Image...</source>
         <translation>Zachowaj o&amp;brazek...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Print...</source>
         <translation>&amp;Drukuj...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>View &amp;Code...</source>
         <translation>Pokaż &amp;kod...</translation>
     </message>
     <message>
-        <location line="+448"/>
-        <location line="+248"/>
         <source>Save Form As</source>
         <translation>Zachowaj formularz jako</translation>
     </message>
     <message>
-        <location line="+429"/>
         <source>Preview failed</source>
         <translation>Nie można utworzyć podglądu</translation>
     </message>
     <message>
-        <location line="-575"/>
         <source>Code generation failed</source>
         <translation>Nie można wygenerować kodu</translation>
     </message>
     <message>
-        <location line="+170"/>
         <source>It was not possible to write the entire file %1 to disk.
 Reason:%2
 Would you like to retry?</source>
@@ -1844,60 +1495,46 @@ Powód:%2
 Czy chcesz spróbować ponownie?</translation>
     </message>
     <message>
-        <location line="+239"/>
-        <location line="+23"/>
         <source>The backup file %1 could not be written.</source>
         <translation>Nie można zapisać pliku zapasowego %1.</translation>
     </message>
     <message>
-        <location line="+107"/>
         <source>The backup directory %1 could not be created.</source>
         <translation>Nie można utworzyć katalogu %1 na pliki zapasowe.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>The temporary backup directory %1 could not be created.</source>
         <translation>Nie można utworzyć tymczasowego katalogu %1 na pliki zapasowe.</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>Image files (*.%1)</source>
         <translation>Pliki z obrazkami (*.%1)</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location line="+17"/>
         <source>Save Image</source>
         <translation>Zachowaj obrazek</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The file %1 could not be written.</source>
         <translation>Nie można zapisać pliku %1.</translation>
     </message>
     <message>
-        <location line="-298"/>
-        <location line="+34"/>
         <source>Assistant</source>
         <translation>Assistant</translation>
     </message>
     <message>
-        <location line="+259"/>
         <source>Saved image %1.</source>
         <translation>Zachowano obrazek %1.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Please close all forms to enable the loading of additional fonts.</source>
         <translation>Zamknij wszystkie formularze aby umożliwić wczytanie dodatkowych czcionek.</translation>
     </message>
     <message>
-        <location line="+52"/>
         <source>Printed %1.</source>
         <translation>Wydrukowano %1.</translation>
     </message>
     <message>
-        <location line="-1163"/>
         <source>ALT+CTRL+S</source>
         <translation>ALT+CTRL+S</translation>
     </message>
@@ -1905,7 +1542,6 @@ Czy chcesz spróbować ponownie?</translation>
 <context>
     <name>QDesignerAppearanceOptionsPage</name>
     <message>
-        <location filename="../tools/designer/src/designer/qdesigner_appearanceoptions.cpp" line="+138"/>
         <source>Appearance</source>
         <extracomment>Tab in preferences dialog</extracomment>
         <translation>Wygląd</translation>
@@ -1914,17 +1550,14 @@ Czy chcesz spróbować ponownie?</translation>
 <context>
     <name>QDesignerAppearanceOptionsWidget</name>
     <message>
-        <location line="-53"/>
         <source>Docked Window</source>
         <translation>Okna dokowalne</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Multiple Top-Level Windows</source>
         <translation>Wiele okien głównych</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Toolwindow Font</source>
         <translation>Czcionka okna narzędzi</translation>
     </message>
@@ -1932,22 +1565,18 @@ Czy chcesz spróbować ponownie?</translation>
 <context>
     <name>QDesignerAxWidget</name>
     <message>
-        <location filename="../tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp" line="-71"/>
         <source>Reset control</source>
         <translation>Przywróć pustą zawartość kontrolce</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Set control</source>
         <translation>Ustaw kontrolkę</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/plugins/activeqt/qdesigneraxwidget.cpp" line="+179"/>
         <source>Control loaded</source>
         <translation>Kontrolka wczytana</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>A COM exception occurred when executing a meta call of type %1, index %2 of &quot;%3&quot;.</source>
         <translation>Wystąpił wyjątek COM podczas wykonywania metody typu %1 o indeksie %2 w &quot;%3&quot;.</translation>
     </message>
@@ -1955,17 +1584,14 @@ Czy chcesz spróbować ponownie?</translation>
 <context>
     <name>QDesignerFormBuilder</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_formbuilder.cpp" line="+89"/>
         <source>Script errors occurred:</source>
         <translation>Wystąpiły błędy w skrypcie:</translation>
     </message>
     <message>
-        <location line="+307"/>
         <source>The preview failed to build.</source>
         <translation>Nie można utworzyć podglądu.</translation>
     </message>
     <message>
-        <location line="+65"/>
         <source>Designer</source>
         <translation>Projektant</translation>
     </message>
@@ -1973,22 +1599,18 @@ Czy chcesz spróbować ponownie?</translation>
 <context>
     <name>QDesignerFormWindow</name>
     <message>
-        <location filename="../tools/designer/src/designer/qdesigner_formwindow.cpp" line="+217"/>
         <source>%1 - %2[*]</source>
         <translation>%1 - %2[*]</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Save Form?</source>
         <translation>Zachować formularz?</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Do you want to save the changes to this document before closing?</source>
         <translation>Czy chcesz zachować zmiany w tym dokumencie przed zamknięciem?</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>If you don&apos;t save, your changes will be lost.</source>
         <translation>Jeśli ich nie zachowasz, zostaną utracone.</translation>
     </message>
@@ -1996,38 +1618,30 @@ Czy chcesz spróbować ponownie?</translation>
 <context>
     <name>QDesignerMenu</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_menu.cpp" line="-1180"/>
         <source>Type Here</source>
         <translation>Wpisz tutaj</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Add Separator</source>
         <translation>Dodaj separator</translation>
     </message>
     <message>
-        <location line="+378"/>
         <source>Remove action &apos;%1&apos;</source>
         <translation>Usuń akcję &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+325"/>
         <source>Insert action</source>
         <translation>Wstaw akcję</translation>
     </message>
     <message>
-        <location line="-300"/>
-        <location line="+649"/>
         <source>Add separator</source>
         <translation>Dodaj separator</translation>
     </message>
     <message>
-        <location line="-681"/>
         <source>Insert separator</source>
         <translation>Wstaw separator</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Remove separator</source>
         <translation>Usuń separator</translation>
     </message>
@@ -2035,22 +1649,18 @@ Czy chcesz spróbować ponownie?</translation>
 <context>
     <name>QDesignerMenuBar</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="-375"/>
         <source>Type Here</source>
         <translation>Wpisz tutaj</translation>
     </message>
     <message>
-        <location line="+298"/>
         <source>Remove Menu &apos;%1&apos;</source>
         <translation>Usuń menu &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Remove Menu Bar</source>
         <translation>Usuń pasek menu</translation>
     </message>
     <message>
-        <location line="+70"/>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
@@ -2058,37 +1668,30 @@ Czy chcesz spróbować ponownie?</translation>
 <context>
     <name>QDesignerPluginManager</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/pluginmanager.cpp" line="+271"/>
         <source>An XML error was encountered when parsing the XML of the custom widget %1: %2</source>
         <translation>Wystąpił błąd XML podczas przetwarzania kodu XML dla własnego widżetu %1: %2</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>A required attribute (&apos;%1&apos;) is missing.</source>
         <translation>Brak wymaganego atrybutu &quot;%1&quot;.</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>An invalid property specification (&apos;%1&apos;) was encountered. Supported types: %2</source>
         <translation>Wystąpiła błędna specyfikacja właściwości &quot;%1&quot;. Obsługiwane typy: %2</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>&apos;%1&apos; is not a valid string property specification.</source>
         <translation>&quot;%1&quot; nie jest poprawną specyfikacją właściwości typu ciąg.</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>The XML of the custom widget %1 does not contain any of the elements &lt;widget&gt; or &lt;ui&gt;.</source>
         <translation>Kod XML własnego widżetu %1 nie zawiera żadnego elementu &lt;widget&gt; ani &lt;ui&gt;.</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>The class attribute for the class %1 is missing.</source>
         <translation>Atrybut &quot;class&quot; dla klasy %1 nie istnieje.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>The class attribute for the class %1 does not match the class name %2.</source>
         <translation>Atrybut &quot;class&quot; dla klasy %1 nie odpowiada nazwie klasy %2.</translation>
     </message>
@@ -2096,7 +1699,6 @@ Czy chcesz spróbować ponownie?</translation>
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_propertysheet.cpp" line="+762"/>
         <source>Dynamic Properties</source>
         <translation>Dynamiczne właściwości</translation>
     </message>
@@ -2104,31 +1706,26 @@ Czy chcesz spróbować ponownie?</translation>
 <context>
     <name>QDesignerResource</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="+492"/>
         <source>The layout type &apos;%1&apos; is not supported, defaulting to grid.</source>
         <translation>Rozmieszczenie typu &apos;%1&apos; nie jest obsługiwane. Będzie ono zastąpione siatką.</translation>
     </message>
     <message>
-        <location line="+239"/>
         <source>The container extension of the widget &apos;%1&apos; (%2) returned a widget not managed by Designer &apos;%3&apos; (%4) when queried for page #%5.
 Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget.</source>
         <translation>Rozszerzenie pojemnikowe widżetu &quot;%1&quot; (%2) zwróciło widżet który nie jest zarządzany przez Designera &quot;%3&quot; (%4) podczas pytania o stronę #%5.
 Strony pojemników powinny być dodawane jedynie poprzez wyspecyfikowanie ich w XML zwróconym przez metodę domXml() w widżecie użytkownika.</translation>
     </message>
     <message>
-        <location line="+545"/>
         <source>Unexpected element &lt;%1&gt;</source>
         <extracomment>Parsing clipboard contents</extracomment>
         <translation>Niespodziewany element &lt;%1&gt;</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Error while pasting clipboard contents at line %1, column %2: %3</source>
         <extracomment>Parsing clipboard contents</extracomment>
         <translation>Błąd podczas wklejania zawartości schowka, linia %1, kolumna %2: %3</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Error while pasting clipboard contents: The root element &lt;ui&gt; is missing.</source>
         <extracomment>Parsing clipboard contents</extracomment>
         <translation>Błąd podczas wklejania zawartości schowka: Brak głównego elementu &lt;ui&gt;.</translation>
@@ -2137,12 +1734,10 @@ Strony pojemników powinny być dodawane jedynie poprzez wyspecyfikowanie ich w
 <context>
     <name>QDesignerSharedSettings</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/shared_settings.cpp" line="+83"/>
         <source>The template path %1 could not be created.</source>
         <translation>Nie można utworzyć ścieżki %1 dla szablonów.</translation>
     </message>
     <message>
-        <location line="+184"/>
         <source>An error has been encountered while parsing device profile XML: %1</source>
         <translation>Wystąpił błąd podczas przetwarzania kodu XML dla profilu urządzenia: %1</translation>
     </message>
@@ -2150,32 +1745,26 @@ Strony pojemników powinny być dodawane jedynie poprzez wyspecyfikowanie ich w
 <context>
     <name>QDesignerToolWindow</name>
     <message>
-        <location filename="../tools/designer/src/designer/qdesigner_toolwindow.cpp" line="+190"/>
         <source>Property Editor</source>
         <translation>Edytor właściwości</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>Action Editor</source>
         <translation>Edytor akcji</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>Object Inspector</source>
         <translation>Hierarchia obiektów</translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>Resource Browser</source>
         <translation>Przeglądarka zasobów</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>Signal/Slot Editor</source>
         <translation>Edytor sygnałów/slotów</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Widget Box</source>
         <translation>Panel widżetów</translation>
     </message>
@@ -2183,97 +1772,78 @@ Strony pojemników powinny być dodawane jedynie poprzez wyspecyfikowanie ich w
 <context>
     <name>QDesignerWorkbench</name>
     <message>
-        <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="+199"/>
         <source>&amp;File</source>
         <translation>&amp;Plik</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>F&amp;orm</source>
         <translation>&amp;Formularz</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Preview in</source>
         <translation>Podgląd w stylu</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;View</source>
         <translation>&amp;Widok</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Settings</source>
         <translation>U&amp;stawienia</translation>
     </message>
     <message>
-        <location line="+204"/>
         <source>Widget Box</source>
         <translation>Panel widżetów</translation>
     </message>
     <message>
-        <location line="+392"/>
         <source>The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them?</source>
         <translation>Designer nie został poprawnie zamknięty w trakcie ostatniej sesji. Istnieją pliki zapasowe, czy chcesz je otworzyć?</translation>
     </message>
     <message>
-        <location line="+157"/>
         <source>The file &lt;b&gt;%1&lt;/b&gt; is not a valid Designer UI file.</source>
         <translation>Plik &lt;b&gt;%1&lt;/b&gt; nie jest poprawnym plikiem UI Designera.</translation>
     </message>
     <message>
-        <location line="-751"/>
         <source>&amp;Window</source>
         <translation>&amp;Okno</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Help</source>
         <translation>Pomo&amp;c</translation>
     </message>
     <message>
-        <location line="-15"/>
         <source>Edit</source>
         <translation>Edycja</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Toolbars</source>
         <translation>Paski narzędzi</translation>
     </message>
     <message>
-        <location line="+466"/>
         <source>Save Forms?</source>
         <translation>Zachować formularze?</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>If you do not review your documents, all your changes will be lost.</source>
         <translation>Jeśli nie przejrzysz dokumentów, wszystkie zmiany zostaną utracone.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Review Changes</source>
         <translation>Przeglądnij zmiany</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>Discard Changes</source>
         <translation>Odrzuć zmiany</translation>
     </message>
     <message>
-        <location line="+97"/>
         <source>Backup Information</source>
         <translation>Informacja o kopiach zapasowych</translation>
     </message>
     <message>
-        <location line="+112"/>
         <source>The file &lt;b&gt;%1&lt;/b&gt; could not be opened.</source>
         <translation>Nie można otworzyć pliku &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message numerus="yes">
-        <location line="-213"/>
         <source>There are %n forms with unsaved changes. Do you want to review these changes before quitting?</source>
         <translation>
             <numerusform>Jest %n formularz z niezachowanymi zmianami. Czy chcesz przejrzeć zmiany przed wyjściem z programu?</numerusform>
@@ -2285,7 +1855,6 @@ Strony pojemników powinny być dodawane jedynie poprzez wyspecyfikowanie ich w
 <context>
     <name>QFormBuilder</name>
     <message>
-        <location filename="../tools/designer/src/lib/uilib/formbuilder.cpp" line="+168"/>
         <source>An empty class name was passed on to %1 (object name: &apos;%2&apos;).</source>
         <extracomment>Empty class name passed to widget factory method
 ----------
@@ -2295,47 +1864,38 @@ Empty class name passed to widget factory method</extracomment>
         <translation>Pusta nazwa klasy została przekazana do %1 (nazwa obiektu: &apos;%2&apos;).</translation>
     </message>
     <message>
-        <location line="+56"/>
         <source>QFormBuilder was unable to create a custom widget of the class &apos;%1&apos;; defaulting to base class &apos;%2&apos;.</source>
         <translation>QFormBuilder nie mógł utworzyć własnego widżetu klasy &apos;%1&apos;. Będzie on zastąpiony klasą bazową &apos;%2&apos;.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>QFormBuilder was unable to create a widget of the class &apos;%1&apos;.</source>
         <translation>QFormBuilder nie mógł utworzyć widżetu klasy &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+61"/>
         <source>The layout type `%1&apos; is not supported.</source>
         <translation>Typ rozmieszczenia &apos;%1&apos; nie jest obsługiwany.</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/uilib/properties.cpp" line="+106"/>
         <source>The set-type property %1 could not be read.</source>
         <translation>Nie można odczytać właściwości %1 typu zbiór.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>The enumeration-type property %1 could not be read.</source>
         <translation>Nie można odczytać właściwości %1 typu wyliczeniowego.</translation>
     </message>
     <message>
-        <location line="+190"/>
         <source>Reading properties of the type %1 is not supported yet.</source>
         <translation>Odczytywanie właściwości typu %1 nie jest jeszcze obsługiwane.</translation>
     </message>
     <message>
-        <location line="+266"/>
         <source>The property %1 could not be written. The type %2 is not supported yet.</source>
         <translation>Nie można zapisać właściwości %1. Typ %2 nie jest jeszcze obsługiwany.</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/uilib/properties_p.h" line="+132"/>
         <source>The enumeration-value &apos;%1&apos; is invalid. The default value &apos;%2&apos; will be used instead.</source>
         <translation>Wartość &quot;%1&quot; typu wyliczeniowego jest niepoprawna. Użyta zostanie domyślna wartość &quot;%2&quot;.</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>The flag-value &apos;%1&apos; is invalid. Zero will be used instead.</source>
         <translation>Wartość &quot;%1&quot; flagi jest niepoprawna. Użyta zostanie wartość zerowa.</translation>
     </message>
@@ -2343,48 +1903,38 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QStackedWidgetEventFilter</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_stackedbox.cpp" line="+194"/>
         <source>Previous Page</source>
         <translation>Poprzednia strona</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Next Page</source>
         <translation>Następna strona</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Before Current Page</source>
         <translation>Przed bieżącą stroną</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>After Current Page</source>
         <translation>Za bieżącą stroną</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change Page Order...</source>
         <translation>Zmień porządek stron...</translation>
     </message>
     <message>
-        <location line="+72"/>
         <source>Change Page Order</source>
         <translation>Zmień porządek stron</translation>
     </message>
     <message>
-        <location line="+49"/>
         <source>Page %1 of %2</source>
         <translation>Strona %1 z %2</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+4"/>
         <source>Insert Page</source>
         <translation>Wstaw stronę</translation>
     </message>
@@ -2392,12 +1942,10 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QStackedWidgetPreviewEventFilter</name>
     <message>
-        <location line="-153"/>
         <source>Go to previous page of %1 &apos;%2&apos; (%3/%4).</source>
         <translation>Przejdź do poprzedniej strony %1 &apos;%2&apos; (%3/%4).</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Go to next page of %1 &apos;%2&apos; (%3/%4).</source>
         <translation>Przejdź do następnej strony %1 &apos;%2&apos; (%3/%4).</translation>
     </message>
@@ -2405,28 +1953,22 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QTabWidgetEventFilter</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_tabwidget.cpp" line="+89"/>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Before Current Page</source>
         <translation>Przed bieżącą stroną</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>After Current Page</source>
         <translation>Za bieżącą stroną</translation>
     </message>
     <message>
-        <location line="+283"/>
         <source>Page %1 of %2</source>
         <translation>Strona %1 z %2</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+4"/>
         <source>Insert Page</source>
         <translation>Wstaw stronę</translation>
     </message>
@@ -2434,37 +1976,30 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QToolBoxHelper</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_toolbox.cpp" line="+64"/>
         <source>Delete Page</source>
         <translation>Usuń stronę</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Before Current Page</source>
         <translation>Przed bieżącą stroną</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>After Current Page</source>
         <translation>Za bieżącą stroną</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change Page Order...</source>
         <translation>Zmień porządek stron...</translation>
     </message>
     <message>
-        <location line="+116"/>
         <source>Change Page Order</source>
         <translation>Zmień porządek stron</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Page %1 of %2</source>
         <translation>Strona %1 z %2</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Insert Page</source>
         <translation>Wstaw stronę</translation>
     </message>
@@ -2472,15 +2007,10 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtBoolEdit</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="+255"/>
-        <location line="+10"/>
-        <location line="+25"/>
         <source>True</source>
         <translation>Prawda</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+25"/>
         <source>False</source>
         <translation>Fałsz</translation>
     </message>
@@ -2488,12 +2018,10 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtBoolPropertyManager</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="+1507"/>
         <source>True</source>
         <translation>Prawda</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>False</source>
         <translation>Fałsz</translation>
     </message>
@@ -2501,7 +2029,6 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtCharEdit</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qteditorfactory.cpp" line="+1584"/>
         <source>Clear Char</source>
         <translation>Wyczyść znak</translation>
     </message>
@@ -2509,7 +2036,6 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtColorEditWidget</name>
     <message>
-        <location line="+605"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -2517,22 +2043,18 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtColorPropertyManager</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="+4718"/>
         <source>Red</source>
         <translation>Czerwień</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Green</source>
         <translation>Zieleń</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Blue</source>
         <translation>Błękit</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Alpha</source>
         <translation>Kanał alfa</translation>
     </message>
@@ -2540,97 +2062,78 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtCursorDatabase</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="-230"/>
         <source>Cross</source>
         <translation>Krzyż</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>Arrow</source>
         <translation>Strzałka</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Up Arrow</source>
         <translation>Strzałka do góry</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Wait</source>
         <translation>Oczekiwanie</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>IBeam</source>
         <translation>Kursor tekstowy</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Size Vertical</source>
         <translation>Rozmiar N-S</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Size Horizontal</source>
         <translation>Rozmiar W-E</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Size Backslash</source>
         <translation>Rozmiar NW-SE</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Size Slash</source>
         <translation>Rozmiar NE-SW</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Size All</source>
         <translation>Rozmiar N-E-S-W</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Blank</source>
         <translation>Pusty</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Split Vertical</source>
         <translation>Podzielony pionowo</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Split Horizontal</source>
         <translation>Podzielony poziomo</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Pointing Hand</source>
         <translation>Rączka wskazująca</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Forbidden</source>
         <translation>Zabroniony</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Open Hand</source>
         <translation>Rączka otwarta</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Closed Hand</source>
         <translation>Rączka zamknięta</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>What&apos;s This</source>
         <translation>Co to jest</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Busy</source>
         <translation>Zajęty</translation>
     </message>
@@ -2638,12 +2141,10 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtFontEditWidget</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qteditorfactory.cpp" line="+198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Select Font</source>
         <translation>Wybierz czcionkę</translation>
     </message>
@@ -2651,37 +2152,30 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtFontPropertyManager</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="-330"/>
         <source>Bold</source>
         <translation>Pogrubiony</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Italic</source>
         <translation>Kursywa</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Underline</source>
         <translation>Podkreślony</translation>
     </message>
     <message>
-        <location line="-35"/>
         <source>Family</source>
         <translation>Rodzina</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Point Size</source>
         <translation>Wielkość punktu</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>Strikeout</source>
         <translation>Przekreślony</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Kerning</source>
         <translation>Kerning</translation>
     </message>
@@ -2689,7 +2183,6 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtGradientDialog</name>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientdialog.ui"/>
         <source>Edit Gradient</source>
         <translation>Modyfikuj gradient</translation>
     </message>
@@ -2697,304 +2190,242 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtGradientEditor</name>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="+431"/>
         <source>Start X</source>
         <translation>Początek X</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Start Y</source>
         <translation>Początek Y</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Final X</source>
         <translation>Koniec X</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Final Y</source>
         <translation>Koniec Y</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location line="+24"/>
         <source>Central X</source>
         <translation>Środek X</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+24"/>
         <source>Central Y</source>
         <translation>Środek Y</translation>
     </message>
     <message>
-        <location line="-20"/>
         <source>Focal X</source>
         <translation>Ogniskowa X</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Focal Y</source>
         <translation>Ogniskowa Y</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Radius</source>
         <translation>Promień</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Angle</source>
         <translation>Kąt</translation>
     </message>
     <message>
-        <location line="+288"/>
         <source>Linear</source>
         <translation>Liniowy</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Radial</source>
         <translation>Radialny</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Conical</source>
         <translation>Stożkowy</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Pad</source>
         <translation>Brak</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Repeat</source>
         <translation>Powtórzone</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reflect</source>
         <translation>Odbite</translation>
     </message>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui"/>
         <source>Form</source>
         <translation>Formularz</translation>
     </message>
     <message>
-        <location/>
         <source>Gradient Editor</source>
         <translation>Edytor gradientu</translation>
     </message>
     <message>
-        <location/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location/>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
-        <location/>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
-        <location/>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
-        <location/>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
-        <location/>
         <source>Gradient Stops Editor</source>
         <translation>Edytor punktów gradientu</translation>
     </message>
     <message>
-        <location/>
         <source>This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag &amp; drop the handle to reposition it. Use right mouse button to popup context menu with extra actions.</source>
         <translation>Ten obszar pozwala na edycję punktów gradientu. Aby skopiować istniejący punkt kliknij dwukrotnie na jego uchwyt. W celu stworzenia nowego punktu kliknij dwukrotnie poza istniejącymi uchwytami punków. Przeciągnij i upuść uchwyt aby go przesunąć. Naciśnij prawy przycisk myszy aby pokazać menu z dodatkowymi akcjami.</translation>
     </message>
     <message>
-        <location/>
         <source>Zoom</source>
         <translation>Powiększenie</translation>
     </message>
     <message>
-        <location/>
         <source>Position</source>
         <translation>Pozycja</translation>
     </message>
     <message>
-        <location/>
         <source>Hue</source>
         <translation>Barwa</translation>
     </message>
     <message>
-        <location/>
         <source>H</source>
         <translation>H</translation>
     </message>
     <message>
-        <location/>
         <source>Saturation</source>
         <translation>Nasycenie</translation>
     </message>
     <message>
-        <location/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location/>
         <source>Sat</source>
         <translation>Nasycenie</translation>
     </message>
     <message>
-        <location/>
         <source>Value</source>
         <translation>Wartość</translation>
     </message>
     <message>
-        <location/>
         <source>V</source>
         <translation>V</translation>
     </message>
     <message>
-        <location/>
         <source>Val</source>
         <translation>Wartość</translation>
     </message>
     <message>
-        <location/>
         <source>Alpha</source>
         <translation>Kanał alfa</translation>
     </message>
     <message>
-        <location/>
         <source>A</source>
         <translation>A</translation>
     </message>
     <message>
-        <location/>
         <source>Type</source>
         <translation>Rodzaj</translation>
     </message>
     <message>
-        <location/>
         <source>Spread</source>
         <translation>Rozciąganie</translation>
     </message>
     <message>
-        <location/>
         <source>Color</source>
         <translation>Kolor</translation>
     </message>
     <message>
-        <location/>
         <source>Current stop&apos;s color</source>
         <translation>Kolor bieżącego punktu</translation>
     </message>
     <message>
-        <location/>
         <source>HSV</source>
         <translation>HSV</translation>
     </message>
     <message>
-        <location/>
         <source>RGB</source>
         <translation>RGB</translation>
     </message>
     <message>
-        <location/>
         <source>Current stop&apos;s position</source>
         <translation>Pozycja bieżącego punktu</translation>
     </message>
     <message>
-        <location/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location/>
         <source>Zoom In</source>
         <translation>Powiększ</translation>
     </message>
     <message>
-        <location/>
         <source>Zoom Out</source>
         <translation>Pomniejsz</translation>
     </message>
     <message>
-        <location/>
         <source>Toggle details extension</source>
         <translation>Przełącz rozszerzenie ze szczegółami</translation>
     </message>
     <message>
-        <location/>
         <source>&gt;</source>
         <translation>&gt;</translation>
     </message>
     <message>
-        <location/>
         <source>Linear Type</source>
         <translation>Typ liniowy</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location/>
         <source>Radial Type</source>
         <translation>Typ radialny</translation>
     </message>
     <message>
-        <location/>
         <source>Conical Type</source>
         <translation>Typ stożkowy</translation>
     </message>
     <message>
-        <location/>
         <source>Pad Spread</source>
         <translation>Powtarzaj punkt brzegowy</translation>
     </message>
     <message>
-        <location/>
         <source>Repeat Spread</source>
         <translation>Powtarzaj cały zakres</translation>
     </message>
     <message>
-        <location/>
         <source>Reflect Spread</source>
         <translation>Powtarzaj z odbiciami</translation>
     </message>
     <message>
-        <location/>
         <source>This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient&apos;s type such as start and final point, radius, etc. by drag &amp; drop.</source>
         <translation>Ten obszar pokazuje podgląd edytowanego gradientu. Możesz tutaj również zmieniać parametry specyficzne dla typu gradientu, takie jak: punkt początkowy i końcowy, promień, itp... poprzez przeciągnięcie i upuszczenie uchwytu.</translation>
     </message>
     <message>
-        <location/>
         <source>Show HSV specification</source>
         <translation>Pokaż specyfikację HSV</translation>
     </message>
     <message>
-        <location/>
         <source>Show RGB specification</source>
         <translation>Pokaż specyfikację RGB</translation>
     </message>
     <message>
-        <location/>
         <source>Reset Zoom</source>
         <translation>Normalny rozmiar</translation>
     </message>
@@ -3002,37 +2433,30 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtGradientStopsWidget</name>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientstopswidget.cpp" line="+947"/>
         <source>New Stop</source>
         <translation>Nowy punkt</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Flip All</source>
         <translation>Odwróć wszystko</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Select All</source>
         <translation>Zaznacz wszystko</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zoom In</source>
         <translation>Powiększ</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zoom Out</source>
         <translation>Pomniejsz</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reset Zoom</source>
         <translation>Normalny rozmiar</translation>
     </message>
@@ -3040,46 +2464,34 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtGradientView</name>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="+107"/>
         <source>Grad</source>
         <translation>Grad</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Remove Gradient</source>
         <translation>Usuń gradient</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Are you sure you want to remove the selected gradient?</source>
         <translation>Czy na pewno chcesz usunąć zaznaczony gradient?</translation>
     </message>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientview.ui"/>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="+74"/>
         <source>New...</source>
         <translation>Nowy...</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="+1"/>
         <source>Edit...</source>
         <translation>Modyfikuj...</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="+1"/>
         <source>Rename</source>
         <translation>Zmień nazwę</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="+1"/>
         <source>Remove</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location/>
         <source>Gradient View</source>
         <translation>Widok gradientów</translation>
     </message>
@@ -3087,8 +2499,6 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtGradientViewDialog</name>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientviewdialog.ui"/>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientviewdialog.h" line="+62"/>
         <source>Select Gradient</source>
         <translation>Wybierz gradient</translation>
     </message>
@@ -3096,7 +2506,6 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtKeySequenceEdit</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="+249"/>
         <source>Clear Shortcut</source>
         <translation>Wyczyść skrót</translation>
     </message>
@@ -3104,17 +2513,14 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtLocalePropertyManager</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="-3541"/>
         <source>%1, %2</source>
         <translation>%1, %2</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>Language</source>
         <translation>Język</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Country</source>
         <translation>Kraj</translation>
     </message>
@@ -3122,17 +2528,14 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtPointFPropertyManager</name>
     <message>
-        <location line="+411"/>
         <source>(%1, %2)</source>
         <translation>(%1, %2)</translation>
     </message>
     <message>
-        <location line="+71"/>
         <source>X</source>
         <translation>X</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Y</source>
         <translation>Y</translation>
     </message>
@@ -3140,17 +2543,14 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtPointPropertyManager</name>
     <message>
-        <location line="-320"/>
         <source>(%1, %2)</source>
         <translation>(%1, %2)</translation>
     </message>
     <message>
-        <location line="+37"/>
         <source>X</source>
         <translation>X</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Y</source>
         <translation>Y</translation>
     </message>
@@ -3158,12 +2558,10 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtPropertyBrowserUtils</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="-156"/>
         <source>[%1, %2, %3] (%4)</source>
         <translation>[%1, %2, %3] (%4)</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>[%1, %2]</source>
         <translation>[%1, %2]</translation>
     </message>
@@ -3171,27 +2569,22 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtRectFPropertyManager</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="+1706"/>
         <source>[(%1, %2), %3 x %4]</source>
         <translation>[(%1, %2), %3 x %4]</translation>
     </message>
     <message>
-        <location line="+156"/>
         <source>X</source>
         <translation>X</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Y</source>
         <translation>Y</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Width</source>
         <translation>Szerokość</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Height</source>
         <translation>Wysokość</translation>
     </message>
@@ -3199,27 +2592,22 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtRectPropertyManager</name>
     <message>
-        <location line="-612"/>
         <source>[(%1, %2), %3 x %4]</source>
         <translation>[(%1, %2), %3 x %4]</translation>
     </message>
     <message>
-        <location line="+120"/>
         <source>X</source>
         <translation>X</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Y</source>
         <translation>Y</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Width</source>
         <translation>Szerokość</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Height</source>
         <translation>Wysokość</translation>
     </message>
@@ -3227,128 +2615,98 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtResourceEditorDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="+76"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation>%1 już istnieje.
 Czy chcesz go zastąpić?</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>The file does not appear to be a resource file; element &apos;%1&apos; was found where &apos;%2&apos; was expected.</source>
         <translation>Plik nie wygląda na plik z zasobami; znaleziono element &apos;%1&apos; podczas gdy oczekiwano elementu &apos;%2&apos;.</translation>
     </message>
     <message>
-        <location line="+902"/>
         <source>%1 [read-only]</source>
         <translation>%1 - [tylko do odczytu]</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+198"/>
         <source>%1 [missing]</source>
         <translation>%1 - [brak pliku]</translation>
     </message>
     <message>
-        <location line="-72"/>
         <source>&lt;no prefix&gt;</source>
         <translation>&lt;brak przedrostka&gt;</translation>
     </message>
     <message>
-        <location line="+320"/>
-        <location line="+566"/>
         <source>New Resource File</source>
         <translation>Nowy plik z zasobami</translation>
     </message>
     <message>
-        <location line="-564"/>
-        <location line="+25"/>
         <source>Resource files (*.qrc)</source>
         <translation>Pliki z zasobami (*.qrc)</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>Import Resource File</source>
         <translation>Zaimportuj plik z zasobami</translation>
     </message>
     <message>
-        <location line="+112"/>
         <source>newPrefix</source>
         <translation>nowyPrzedrostek</translation>
     </message>
     <message>
-        <location line="+49"/>
         <source>Add Files</source>
         <translation>Dodaj pliki</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Incorrect Path</source>
         <translation>Niepoprawna ścieżka</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+19"/>
-        <location line="+212"/>
-        <location line="+7"/>
         <source>Copy</source>
         <translation>Skopiuj</translation>
     </message>
     <message>
-        <location line="-236"/>
         <source>Copy As...</source>
         <translation>Skopiuj jako...</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Keep</source>
         <translation>Pozostaw</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Skip</source>
         <translation>Opuść</translation>
     </message>
     <message>
-        <location line="+87"/>
         <source>Clone Prefix</source>
         <translation>Sklonuj przedrostek</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Enter the suffix which you want to add to the names of the cloned files.
 This could for example be a language extension like &quot;_de&quot;.</source>
         <translation>Wprowadź przyrostek jaki ma być dodany do sklonowanych plików.
 To może być np. rozszerzenie określające język: &quot;_de&quot;.</translation>
     </message>
     <message>
-        <location line="+113"/>
-        <location line="+4"/>
         <source>Copy As</source>
         <translation>Skopiuj jako</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt;p&gt;The selected file:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;is outside of the current resource file&apos;s directory:&lt;/p&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Please select another path within this directory.&lt;p&gt;</source>
         <translation>&lt;p&gt;Zaznaczony plik:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;jest umiejscowiony na zewnątrz katalogu z bieżącym plikiem z zasobami:&lt;/p&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Zaznacz inną ścieżkę w tym katalogu.&lt;p&gt;</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Could not overwrite %1.</source>
         <translation>Nie można nadpisać %1.</translation>
     </message>
     <message>
-        <location line="-289"/>
         <source>&lt;p&gt;&lt;b&gt;Warning:&lt;/b&gt; The file&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;is outside of the current resource file&apos;s parent directory.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;Ostrzeżenie:&lt;/b&gt; Plik&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;jest na zewnątrz katalogu w którym jest bieżący plik z zasobami.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&lt;p&gt;To resolve the issue, press:&lt;/p&gt;&lt;table&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Copy&lt;/th&gt;&lt;td&gt;to copy the file to the resource file&apos;s parent directory.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Copy As...&lt;/th&gt;&lt;td&gt;to copy the file into a subdirectory of the resource file&apos;s parent directory.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Keep&lt;/th&gt;&lt;td&gt;to use its current location.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation>&lt;p&gt;Aby rozwiązać problem, naciśnij:&lt;/p&gt;&lt;table&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Skopiuj&lt;/th&gt;&lt;td&gt;żeby skopiować plik do katalogu w którym jest plik z zasobami.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Skopiuj jako...&lt;/th&gt;&lt;td&gt;żeby skopiować plik do poddrzewa katalogu w którym jest plik z zasobami.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Zatrzymaj&lt;/th&gt;&lt;td&gt;żeby użyć jego bieżącą ścieżkę.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
     </message>
     <message>
-        <location line="+288"/>
         <source>Could not copy
 %1
 to
@@ -3359,153 +2717,120 @@ jako:
 %2</translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>A parse error occurred at line %1, column %2 of %3:
 %4</source>
         <translation>Wystąpił błąd przetwarzania w linii %1, kolumnie %2 w %3:
 %4</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Save Resource File</source>
         <translation>Zachowaj plik z zasobami</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>Edit Resources</source>
         <translation>Edytor zasobów</translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>New...</source>
         <translation>Nowy...</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Open...</source>
         <translation>Otwórz...</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+11"/>
         <source>Remove</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+11"/>
         <source>Move Up</source>
         <translation>Przenieś do góry</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+11"/>
         <source>Move Down</source>
         <translation>Przenieś w dół</translation>
     </message>
     <message>
-        <location line="-9"/>
-        <location line="+1"/>
         <source>Add Prefix</source>
         <translation>Dodaj przedrostek</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Add Files...</source>
         <translation>Dodaj pliki...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change Prefix</source>
         <translation>Zmień przedrostek</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change Language</source>
         <translation>Zmień język</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change Alias</source>
         <translation>Zmień alias</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Clone Prefix...</source>
         <translation>Sklonuj przedrostek...</translation>
     </message>
     <message>
-        <location line="+37"/>
         <source>Prefix / Path</source>
         <translation>Przedrostek / Ścieżka</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Language / Alias</source>
         <translation>Język / Alias</translation>
     </message>
     <message>
-        <location line="+117"/>
         <source>&lt;html&gt;&lt;p&gt;&lt;b&gt;Warning:&lt;/b&gt; There have been problems while reloading the resources:&lt;/p&gt;&lt;pre&gt;%1&lt;/pre&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;p&gt;&lt;b&gt;Ostrzeżenie:&lt;/b&gt; Natrafiono na problemy podczas przeładowania zasobów:&lt;/p&gt;&lt;pre&gt;%1&lt;/pre&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Resource Warning</source>
         <translation>Ostrzeżenie z systemu zasobów</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.ui"/>
         <source>Dialog</source>
         <translation>Okno dialogowe</translation>
     </message>
     <message>
-        <location/>
         <source>New File</source>
         <translation>Nowy plik</translation>
     </message>
     <message>
-        <location/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location/>
         <source>Remove File</source>
         <translation>Usuń plik</translation>
     </message>
     <message>
-        <location/>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
-        <location/>
         <source>I</source>
         <translation>I</translation>
     </message>
     <message>
-        <location/>
         <source>New Resource</source>
         <translation>Nowy zasób</translation>
     </message>
     <message>
-        <location/>
         <source>A</source>
         <translation>A</translation>
     </message>
     <message>
-        <location/>
         <source>Remove Resource or File</source>
         <translation>Usuń zasób lub plik</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="-239"/>
         <source>Could not write %1: %2</source>
         <translation>Nie można zapisać &quot;%1&quot;, %2</translation>
     </message>
     <message>
-        <location line="+71"/>
         <source>Open Resource File</source>
         <translation>Otwórz plik z zasobami</translation>
     </message>
@@ -3513,24 +2838,20 @@ jako:
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qtresourceview.cpp" line="+567"/>
         <source>Size: %1 x %2
 %3</source>
         <translation>Rozmiar: %1 x %2
 %3</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Edit Resources...</source>
         <translation>Modyfikuj zasoby...</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Reload</source>
         <translation>Przeładuj</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Copy Path</source>
         <translation>Skopiuj ścieżkę</translation>
     </message>
@@ -3538,7 +2859,6 @@ jako:
 <context>
     <name>QtResourceViewDialog</name>
     <message>
-        <location line="+252"/>
         <source>Select Resource</source>
         <translation>Wybierz zasób</translation>
     </message>
@@ -3546,17 +2866,14 @@ jako:
 <context>
     <name>QtSizeFPropertyManager</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="-535"/>
         <source>%1 x %2</source>
         <translation>%1 x %2</translation>
     </message>
     <message>
-        <location line="+130"/>
         <source>Width</source>
         <translation>Szerokość</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Height</source>
         <translation>Wysokość</translation>
     </message>
@@ -3564,33 +2881,26 @@ jako:
 <context>
     <name>QtSizePolicyPropertyManager</name>
     <message>
-        <location line="+1709"/>
-        <location line="+1"/>
         <source>&lt;Invalid&gt;</source>
         <translation>&lt;Niepoprawna&gt;</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>[%1, %2, %3, %4]</source>
         <translation>[%1, %2, %3, %4]</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Horizontal Policy</source>
         <translation>Strategia pozioma</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Vertical Policy</source>
         <translation>Strategia pionowa</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Horizontal Stretch</source>
         <translation>Rozciąganie w poziomie</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Vertical Stretch</source>
         <translation>Rozciąganie w pionie</translation>
     </message>
@@ -3598,17 +2908,14 @@ jako:
 <context>
     <name>QtSizePropertyManager</name>
     <message>
-        <location line="-2286"/>
         <source>%1 x %2</source>
         <translation>%1 x %2</translation>
     </message>
     <message>
-        <location line="+96"/>
         <source>Width</source>
         <translation>Szerokość</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Height</source>
         <translation>Wysokość</translation>
     </message>
@@ -3616,107 +2923,86 @@ jako:
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.cpp" line="+1784"/>
         <source>&lt; S E P A R A T O R &gt;</source>
         <translation>&lt; S E P A R A T O R &gt;</translation>
     </message>
     <message>
-        <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui"/>
         <source>Customize Toolbars</source>
         <translation>Dostosuj paski narzędzi</translation>
     </message>
     <message>
-        <location/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location/>
         <source>Actions</source>
         <translation>Akcje</translation>
     </message>
     <message>
-        <location/>
         <source>Toolbars</source>
         <translation>Paski narzędzi</translation>
     </message>
     <message>
-        <location/>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
-        <location/>
         <source>Remove</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location/>
         <source>Rename</source>
         <translation>Zmień nazwę</translation>
     </message>
     <message>
-        <location/>
         <source>Up</source>
         <translation>Do góry</translation>
     </message>
     <message>
-        <location/>
         <source>&lt;-</source>
         <translation>&lt;-</translation>
     </message>
     <message>
-        <location/>
         <source>-&gt;</source>
         <translation>-&gt;</translation>
     </message>
     <message>
-        <location/>
         <source>Down</source>
         <translation>W dół</translation>
     </message>
     <message>
-        <location/>
         <source>Current Toolbar Actions</source>
         <translation>Akcje bieżącego paska narzędzi</translation>
     </message>
     <message>
-        <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.cpp" line="-544"/>
         <source>Custom Toolbar</source>
         <translation>Własne paski narzędzi</translation>
     </message>
     <message>
-        <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui"/>
         <source>Add new toolbar</source>
         <translation>Dodaj nowy pasek narzędzi</translation>
     </message>
     <message>
-        <location/>
         <source>Remove selected toolbar</source>
         <translation>Usuń wybrany pasek narzędzi</translation>
     </message>
     <message>
-        <location/>
         <source>Rename toolbar</source>
         <translation>Zmień nazwę paska narzędzi</translation>
     </message>
     <message>
-        <location/>
         <source>Move action up</source>
         <translation>Przenieś akcję w górę</translation>
     </message>
     <message>
-        <location/>
         <source>Remove action from toolbar</source>
         <translation>Usuń akcję z paska narzędzi</translation>
     </message>
     <message>
-        <location/>
         <source>Add action to toolbar</source>
         <translation>Dodaj akcję do paska narzędzi</translation>
     </message>
     <message>
-        <location/>
         <source>Move action down</source>
         <translation>Przenieś akcję w dół</translation>
     </message>
@@ -3724,12 +3010,10 @@ jako:
 <context>
     <name>QtTreePropertyBrowser</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp" line="+442"/>
         <source>Property</source>
         <translation>Właściwość</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Value</source>
         <translation>Wartość</translation>
     </message>
@@ -3737,64 +3021,52 @@ jako:
 <context>
     <name>SaveFormAsTemplate</name>
     <message>
-        <location filename="../tools/designer/src/designer/saveformastemplate.cpp" line="+72"/>
         <source>Add path...</source>
         <translation>Dodaj ścieżkę...</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Template Exists</source>
         <translation>Szablon istnieje</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Overwrite Template</source>
         <translation>Nadpisz szablon</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Open Error</source>
         <translation>Błąd otwarcia</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>There was an error opening template %1 for writing. Reason: %2</source>
         <translation>Wystąpił błąd podczas otwierania szablonu %1 do zapisu. Powód: %2</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Write Error</source>
         <translation>Błąd zapisu</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>There was an error writing the template %1 to disk. Reason: %2</source>
         <translation>Wystąpił błąd podczas zapisywania szablonu %1 na dysk. Powód: %2</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Pick a directory to save templates in</source>
         <translation>Wybierz katalog do zachowywania szablonów</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/designer/saveformastemplate.ui"/>
         <source>&amp;Category:</source>
         <translation>&amp;Kategoria:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Name:</source>
         <translation>&amp;Nazwa:</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/designer/saveformastemplate.cpp" line="-52"/>
         <source>A template with the name %1 already exists.
 Do you want overwrite the template?</source>
         <translation>Szablon o nazwie %1 już istnieje.
 Czy chcesz nadpisać szablon?</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/designer/saveformastemplate.ui"/>
         <source>Save Form As Template</source>
         <translation>Zachowaj formularz jako szablon</translation>
     </message>
@@ -3802,7 +3074,6 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>ScriptErrorDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/scripterrordialog.cpp" line="+59"/>
         <source>An error occurred while running the scripts for &quot;%1&quot;:
 </source>
         <translation>Wystąpił błąd podczas uruchamiana skryptu dla &quot;%1&quot;:
@@ -3812,22 +3083,18 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>SelectSignalDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/selectsignaldialog.ui"/>
         <source>Go to slot</source>
         <translation>Przejdź do slotu</translation>
     </message>
     <message>
-        <location/>
         <source>Select signal</source>
         <translation>Wybierz sygnał</translation>
     </message>
     <message>
-        <location/>
         <source>signal</source>
         <translation>sygnał</translation>
     </message>
     <message>
-        <location/>
         <source>class</source>
         <translation>klasa</translation>
     </message>
@@ -3835,7 +3102,6 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>SignalSlotConnection</name>
     <message>
-        <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor.cpp" line="-358"/>
         <source>SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4)</source>
         <translation>NADAJNIK(%1), SYGNAŁ(%2), ODBIORNIK(%3), SLOT(%4)</translation>
     </message>
@@ -3843,32 +3109,26 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>SignalSlotDialogClass</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/signalslotdialog.ui"/>
         <source>Signals and slots</source>
         <translation>Sygnały i sloty</translation>
     </message>
     <message>
-        <location/>
         <source>Slots</source>
         <translation>Sloty</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location/>
         <source>Signals</source>
         <translation>Sygnały</translation>
     </message>
     <message>
-        <location/>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
-        <location/>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
@@ -3876,12 +3136,10 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>Spacer</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/spacer_widget.cpp" line="+275"/>
         <source>Horizontal Spacer &apos;%1&apos;, %2 x %3</source>
         <translation>Poziomy dystans &apos;%1&apos;, %2 x %3</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Vertical Spacer &apos;%1&apos;, %2 x %3</source>
         <translation>Pionowy dystans &apos;%1&apos;, %2 x %3</translation>
     </message>
@@ -3889,7 +3147,6 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>TemplateOptionsPage</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/templateoptionspage.cpp" line="+156"/>
         <source>Template Paths</source>
         <extracomment>Tab in preferences dialog</extracomment>
         <translation>Ścieżki z szablonami</translation>
@@ -3898,52 +3155,42 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>ToolBarManager</name>
     <message>
-        <location filename="../tools/designer/src/designer/mainwindow.cpp" line="+89"/>
         <source>Configure Toolbars...</source>
         <translation>Skonfiguruj paski narzędzi...</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Window</source>
         <translation>Okno</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Help</source>
         <translation>Pomoc</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Style</source>
         <translation>Styl</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Dock views</source>
         <translation>Dokowalne widoki</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>File</source>
         <translation>Plik</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Edit</source>
         <translation>Edycja</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Tools</source>
         <translation>Narzędzia</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Form</source>
         <translation>Formularz</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Toolbars</source>
         <translation>Paski narzędzi</translation>
     </message>
@@ -3951,22 +3198,18 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>VersionDialog</name>
     <message>
-        <location filename="../tools/designer/src/designer/versiondialog.cpp" line="+171"/>
         <source>Qt Designer</source>
         <translation>Qt Designer</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>%1&lt;br/&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>&lt;h3&gt;%1&lt;/h3&gt;&lt;br/&gt;&lt;br/&gt;Version %2</source>
         <translation>&lt;h3&gt;%1&lt;/h3&gt;&lt;br/&gt;&lt;br/&gt;Wersja %2</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&lt;br/&gt;Qt Designer is a graphical user interface designer for Qt applications.&lt;br/&gt;</source>
         <translation>&lt;br/&gt;Qt Designer jest aplikacją umożliwiającą projektowanie interfejsów graficznych użytkownika w aplikacjach korzystających z Qt.&lt;br/&gt;</translation>
     </message>
@@ -3974,47 +3217,38 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>VideoPlayerTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.cpp" line="+79"/>
         <source>Available Mime Types</source>
         <translation>Dostępne typy mime</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Display supported mime types...</source>
         <translation>Pokaż dostępne typy mime...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Load...</source>
         <translation>Załaduj...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Play</source>
         <translation>Odtwórz</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Pause</source>
         <translation>Pauza</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Stop</source>
         <translation>Zatrzymaj</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Choose Video Player Media Source</source>
         <translation>Wybierz źródło odtwarzacza wideo</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>An error has occurred in &apos;%1&apos;: %2</source>
         <translation>Wystąpił błąd w &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Video Player Error</source>
         <translation>Błąd odtwarzacza wideo</translation>
     </message>
@@ -4022,7 +3256,6 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/widgetdatabase.cpp" line="+814"/>
         <source>The file contains a custom widget &apos;%1&apos; whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged.</source>
         <translation>Plik zawiera własny widżet &apos;%1&apos; którego klasa bazowa (%2) różni się od bieżącego elementu w bazie danych z widżetami (%3). Baza danych z widżetami została niezmieniona.</translation>
     </message>
@@ -4030,87 +3263,70 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="+139"/>
         <source>Actions</source>
         <translation>Akcje</translation>
     </message>
     <message>
-        <location line="-16"/>
         <source>New...</source>
         <translation>Nowa...</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location line="+313"/>
         <source>New action</source>
         <translation>Nowa akcja</translation>
     </message>
     <message>
-        <location line="+98"/>
         <source>Edit action</source>
         <translation>Modyfikuj akcję</translation>
     </message>
     <message>
-        <location line="-417"/>
         <source>Edit...</source>
         <translation>Modyfikuj...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Go to slot...</source>
         <translation>Przejdź do slotu...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Copy</source>
         <translation>Skopiuj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Cut</source>
         <translation>Wytnij</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Paste</source>
         <translation>Wklej</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Select all</source>
         <translation>Zaznacz wszystko</translation>
     </message>
     <message>
-        <location line="+59"/>
         <source>Configure Action Editor</source>
         <translation>Skonfiguruj edytor akcji</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Icon View</source>
         <translation>Widok z ikonkami</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Detailed View</source>
         <translation>Szczegółowy widok</translation>
     </message>
     <message>
-        <location line="+413"/>
         <source>Remove actions</source>
         <translation>Usuń akcje</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Remove action &apos;%1&apos;</source>
         <translation>Usuń akcję &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+186"/>
         <source>Used In</source>
         <translation>Użyta w</translation>
     </message>
@@ -4118,32 +3334,26 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/actionrepository.cpp" line="+89"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Used</source>
         <translation>Użyta</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Shortcut</source>
         <translation>Skrót</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Checkable</source>
         <translation>Przełączalny</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>ToolTip</source>
         <translation>Podpowiedź</translation>
     </message>
@@ -4151,27 +3361,22 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::BrushManagerProxy</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/brushmanagerproxy.cpp" line="+219"/>
         <source>The element &apos;%1&apos; is missing the required attribute &apos;%2&apos;.</source>
         <translation>Brak wymaganego atrybutu &apos;%2&apos; w elemencie &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Empty brush name encountered.</source>
         <translation>Wystąpiła pusta nazwa szczotki.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>An unexpected element &apos;%1&apos; was encountered.</source>
         <translation>Wystąpił niespodziewany element &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>An error occurred when reading the brush definition file &apos;%1&apos; at line line %2, column %3: %4</source>
         <translation>Wystąpił błąd podczas czytania pliku z definicją szczotki &apos;%1&apos; w linii %2, w kolumnie %3: %4</translation>
     </message>
     <message>
-        <location line="+43"/>
         <source>An error occurred when reading the resource file &apos;%1&apos; at line %2, column %3: %4</source>
         <translation>Wystąpił błąd podczas czytania pliku z zasobami &apos;%1&apos; w linii %2, w kolumnie %3: %4</translation>
     </message>
@@ -4179,17 +3384,14 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::BuddyEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/buddyeditor/buddyeditor.cpp" line="+261"/>
         <source>Add buddy</source>
         <translation>Dodaj skojarzoną etykietę</translation>
     </message>
     <message>
-        <location line="+52"/>
         <source>Remove buddies</source>
         <translation>Usuń skojarzoną etykietę</translation>
     </message>
     <message numerus="yes">
-        <location line="+24"/>
         <source>Remove %n buddies</source>
         <translation>
             <numerusform>Usuń %n skojarzoną etykietę</numerusform>
@@ -4198,7 +3400,6 @@ Czy chcesz nadpisać szablon?</translation>
         </translation>
     </message>
     <message numerus="yes">
-        <location line="+51"/>
         <source>Add %n buddies</source>
         <translation>
             <numerusform>Dodaj %n skojarzoną etykietę</numerusform>
@@ -4207,7 +3408,6 @@ Czy chcesz nadpisać szablon?</translation>
         </translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>Set automatically</source>
         <translation>Ustaw automatycznie</translation>
     </message>
@@ -4215,7 +3415,6 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::BuddyEditorPlugin</name>
     <message>
-        <location filename="../tools/designer/src/components/buddyeditor/buddyeditor_plugin.cpp" line="+73"/>
         <source>Edit Buddies</source>
         <translation>Modyfikuj skojarzone etykiety</translation>
     </message>
@@ -4223,7 +3422,6 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::BuddyEditorTool</name>
     <message>
-        <location filename="../tools/designer/src/components/buddyeditor/buddyeditor_tool.cpp" line="+56"/>
         <source>Edit Buddies</source>
         <translation>Modyfikuj skojarzone etykiety</translation>
     </message>
@@ -4231,12 +3429,10 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::ButtonGroupMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="+7"/>
         <source>Select members</source>
         <translation>Zaznacz składniki grupy</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Break</source>
         <translation>Usuń grupę</translation>
     </message>
@@ -4244,32 +3440,26 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::ButtonTaskMenu</name>
     <message>
-        <location line="+121"/>
         <source>Assign to button group</source>
         <translation>Przypisz do grupy przycisków</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Button group</source>
         <translation>Grupa przycisków</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>New button group</source>
         <translation>Nowej</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change text...</source>
         <translation>Zmień tekst...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>None</source>
         <translation>Żadnej</translation>
     </message>
     <message>
-        <location line="+101"/>
         <source>Button group &apos;%1&apos;</source>
         <translation>Grupa przycisków &apos;%1&apos;</translation>
     </message>
@@ -4277,57 +3467,46 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::CodeDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/codedialog.cpp" line="+95"/>
         <source>Save...</source>
         <translation>Zachowaj...</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Copy All</source>
         <translation>Skopiuj wszystko</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Find in Text...</source>
         <translation>Z&amp;najdź w tekście...</translation>
     </message>
     <message>
-        <location line="+75"/>
         <source>A temporary form file could not be created in %1.</source>
         <translation>Nie można utworzyć pliku z tymczasowym formularzem w %1.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>The temporary form file %1 could not be written.</source>
         <translation>Nie można zapisać pliku z tymczasowym formularzem w %1.</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>%1 - [Code]</source>
         <translation>%1 - [Kod]</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Save Code</source>
         <translation>Zachowaj kod</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Header Files (*.%1)</source>
         <translation>Pliki nagłówkowe (*.%1)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>The file %1 could not be opened: %2</source>
         <translation>Nie można otworzyć pliku &quot;%1&quot;, %2</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>The file %1 could not be written: %2</source>
         <translation>Nie można zapisać pliku &quot;%1&quot;, %2</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>%1 - Error</source>
         <translation>%1 - Błąd</translation>
     </message>
@@ -4335,7 +3514,6 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::ColorAction</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="+246"/>
         <source>Text Color</source>
         <translation>Color tekstu</translation>
     </message>
@@ -4343,12 +3521,10 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::ComboBoxTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/combobox_taskmenu.cpp" line="+68"/>
         <source>Edit Items...</source>
         <translation>Modyfikuj elementy...</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Change Combobox Contents</source>
         <translation>Zmień zawartość combobox&apos;a</translation>
     </message>
@@ -4356,7 +3532,6 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::CommandLinkButtonTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="+156"/>
         <source>Change description...</source>
         <translation>Zmień opis...</translation>
     </message>
@@ -4364,17 +3539,14 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::ConnectionEdit</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/connectionedit.cpp" line="+1313"/>
         <source>Select All</source>
         <translation>Zaznacz wszystko</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>Deselect All</source>
         <translation>Odznacz wszystko</translation>
     </message>
@@ -4382,52 +3554,42 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::ConnectionModel</name>
     <message>
-        <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="-465"/>
         <source>Sender</source>
         <translation>Nadajnik</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Signal</source>
         <translation>Sygnał</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Receiver</source>
         <translation>Odbiornik</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Slot</source>
         <translation>Slot</translation>
     </message>
     <message>
-        <location line="+90"/>
         <source>&lt;sender&gt;</source>
         <translation>&lt;nadajnik&gt;</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt;signal&gt;</source>
         <translation>&lt;sygnał&gt;</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt;receiver&gt;</source>
         <translation>&lt;odbiornik&gt;</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt;slot&gt;</source>
         <translation>&lt;slot&gt;</translation>
     </message>
     <message>
-        <location line="+110"/>
         <source>Signal and Slot Editor</source>
         <translation>Edytor sygnałów i slotów</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>The connection already exists!&lt;br&gt;%1</source>
         <translation>Połączenie już istnieje!&lt;br&gt;%1</translation>
     </message>
@@ -4435,42 +3597,34 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::ContainerWidgetTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="+107"/>
         <source>Insert Page Before Current Page</source>
         <translation>Wstaw stronę przed bieżącą stroną</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Insert Page After Current Page</source>
         <translation>Wstaw stronę za bieżącą stroną</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Add Subwindow</source>
         <translation>Dodaj podokno</translation>
     </message>
     <message>
-        <location line="-40"/>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Insert</source>
         <translation>Wstaw</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>Subwindow</source>
         <translation>Podokno</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Page</source>
         <translation>Strona</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page %1 of %2</source>
         <translation>Strona %1 z %2</translation>
     </message>
@@ -4478,18 +3632,15 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::DPI_Chooser</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/dpi_chooser.cpp" line="+27"/>
         <source>System (%1 x %2)</source>
         <extracomment>System resolution</extracomment>
         <translation>Systemowa (%1 x %2)</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>User defined</source>
         <translation>Zdefiniowana przez użytkownika</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source> x </source>
         <extracomment>DPI X/Y separator</extracomment>
         <translation> x </translation>
@@ -4498,49 +3649,38 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::DesignerPropertyManager</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="+647"/>
-        <location line="+6"/>
         <source>AlignLeft</source>
         <translation>Wyrównanie do lewej</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>AlignHCenter</source>
         <translation>Wyrównanie w poziomie do środka</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>AlignRight</source>
         <translation>Wyrównanie do prawej</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>AlignJustify</source>
         <translation>Wyjustowanie</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>AlignTop</source>
         <translation>Wyrównanie do góry</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+4"/>
         <source>AlignVCenter</source>
         <translation>Wyrównanie w pionie do środka</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>AlignBottom</source>
         <translation>Wyrównanie do dołu</translation>
     </message>
     <message>
-        <location line="+565"/>
         <source>%1, %2</source>
         <translation>%1, %2</translation>
     </message>
     <message numerus="yes">
-        <location line="+6"/>
         <source>Customized (%n roles)</source>
         <translation>
             <numerusform>Dostosowana (%n rola)</numerusform>
@@ -4549,75 +3689,58 @@ Czy chcesz nadpisać szablon?</translation>
         </translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Inherited</source>
         <translation>Odziedziczony</translation>
     </message>
     <message>
-        <location line="+566"/>
         <source>Horizontal</source>
         <translation>Poziomo</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Vertical</source>
         <translation>Pionowo</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Normal Off</source>
         <translation>Normalny wyciśnięty</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Normal On</source>
         <translation>Normalny wciśnięty</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Disabled Off</source>
         <translation>Wyłączony wyciśnięty</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Disabled On</source>
         <translation>Wyłączony wciśnięty</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Active Off</source>
         <translation>Aktywny wyciśnięty</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Active On</source>
         <translation>Aktywny wciśnięty</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Selected Off</source>
         <translation>Zaznaczony wyciśnięty</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Selected On</source>
         <translation>Zaznaczony wciśnięty</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location line="+21"/>
         <source>translatable</source>
         <translation>przetłumaczalny</translation>
     </message>
     <message>
-        <location line="-15"/>
-        <location line="+21"/>
         <source>disambiguation</source>
         <translation>ujednoznacznienie</translation>
     </message>
     <message>
-        <location line="-15"/>
-        <location line="+21"/>
         <source>comment</source>
         <translation>komentarz</translation>
     </message>
@@ -4625,48 +3748,38 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::DeviceProfileDialog</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.cpp" line="+63"/>
         <source>Device Profiles (*.%1)</source>
         <translation>Profile urządzeń (*.%1)</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Default</source>
         <translation>Domyślny</translation>
     </message>
     <message>
-        <location line="+67"/>
         <source>Save Profile</source>
         <translation>Zachowaj profil</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Save Profile - Error</source>
         <translation>Błąd podczas zachowywania profilu</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Unable to open the file &apos;%1&apos; for writing: %2</source>
         <translation>Nie można otworzyć pliku &apos;%1&apos; do zapisu: %2</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Open profile</source>
         <translation>Otwórz profil</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+6"/>
         <source>Open Profile - Error</source>
         <translation>Błąd podczas otwierania profilu</translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>Unable to open the file &apos;%1&apos; for reading: %2</source>
         <translation>Nie można otworzyć pliku &apos;%1&apos; do odczytu: %2</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&apos;%1&apos; is not a valid profile: %2</source>
         <translation>&apos;%1&apos; nie jest poprawnym profilem: %2</translation>
     </message>
@@ -4674,57 +3787,46 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::Dialog</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/stringlisteditor.ui"/>
         <source>Dialog</source>
         <translation>Okno dialogowe</translation>
     </message>
     <message>
-        <location/>
         <source>StringList</source>
         <translation>Lista napisów</translation>
     </message>
     <message>
-        <location/>
         <source>New String</source>
         <translation>Nowy napis</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;New</source>
         <translation>&amp;Nowy</translation>
     </message>
     <message>
-        <location/>
         <source>Delete String</source>
         <translation>Usuń napis</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Delete</source>
         <translation>&amp;Usuń</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Value:</source>
         <translation>&amp;Wartość:</translation>
     </message>
     <message>
-        <location/>
         <source>Move String Up</source>
         <translation>Przenieś w górę</translation>
     </message>
     <message>
-        <location/>
         <source>Up</source>
         <translation>Do góry</translation>
     </message>
     <message>
-        <location/>
         <source>Move String Down</source>
         <translation>Przenieś w dół</translation>
     </message>
     <message>
-        <location/>
         <source>Down</source>
         <translation>W dół</translation>
     </message>
@@ -4732,52 +3834,42 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::EmbeddedOptionsControl</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/embeddedoptionspage.cpp" line="-260"/>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Add a profile</source>
         <translation>Dodaj profil</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Edit the selected profile</source>
         <translation>Modyfikuj zaznaczony profil</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Delete the selected profile</source>
         <translation>Usuń zaznaczony profil</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>Add Profile</source>
         <translation>Dodaj profil</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>New profile</source>
         <translation>Nowy profil</translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>Edit Profile</source>
         <translation>Modyfikuj profil</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Delete Profile</source>
         <translation>Usuń profil</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Would you like to delete the profile &apos;%1&apos;?</source>
         <translation>Czy chcesz usunąć profil &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location line="+55"/>
         <source>Default</source>
         <translation>Domyślny</translation>
     </message>
@@ -4785,12 +3877,10 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::FilterWidget</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/filterwidget.cpp" line="+163"/>
         <source>Filter</source>
         <translation>Filtr</translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>Clear text</source>
         <translation>Wyczyść tekst</translation>
     </message>
@@ -4798,12 +3888,10 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::FormEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formeditor.cpp" line="+190"/>
         <source>Resource File Changed</source>
         <translation>Zmieniony plik z zasobami</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The file &quot;%1&quot; has changed outside Designer. Do you want to reload it?</source>
         <translation>Plik &quot;%1&quot; zmienił się na zewnątrz Designera. Czy chcesz go ponownie załadować?</translation>
     </message>
@@ -4811,7 +3899,6 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::FormLayoutMenu</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/formlayoutmenu.cpp" line="+24"/>
         <source>Add form layout row...</source>
         <translation>Dodaj wiersz do formularza...</translation>
     </message>
@@ -4819,58 +3906,46 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::FormWindow</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="-1322"/>
         <source>Edit contents</source>
         <translation>Modyfikuj zawartość</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location line="+840"/>
         <source>Resize</source>
         <translation>Zmień rozmiar</translation>
     </message>
     <message>
-        <location line="+248"/>
         <source>Key Move</source>
         <translation>Przeniesienie</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Key Resize</source>
         <translation>Zmiana rozmiaru</translation>
     </message>
     <message>
-        <location line="+311"/>
         <source>Cannot paste widgets. Designer could not find a container without a layout to paste into.</source>
         <translation>Nie można wkleić widżetów. Nie można było odnaleźć pojemnika bez rozmieszczenia do którego można by wkleić widżety.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Break the layout of the container you want to paste into, select this container and then paste again.</source>
         <translation>Usuń rozmieszczenie w pojemniku do którego chcesz wkleić, zaznacz ten pojemnik i ponownie wklej.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Paste error</source>
         <translation>Błąd wklejania</translation>
     </message>
     <message>
-        <location line="+448"/>
         <source>Lay out</source>
         <translation>Rozmieść</translation>
     </message>
     <message>
-        <location line="+485"/>
-        <location line="+55"/>
         <source>Drop widget</source>
         <translation>Upuść widżet</translation>
     </message>
     <message numerus="yes">
-        <location line="-1053"/>
         <source>Paste %n action(s)</source>
         <translation>
             <numerusform>Wklej %n akcję</numerusform>
@@ -4879,12 +3954,10 @@ Czy chcesz nadpisać szablon?</translation>
         </translation>
     </message>
     <message>
-        <location line="-565"/>
         <source>Insert widget &apos;%1&apos;</source>
         <translation>Wstaw widżet &apos;%1</translation>
     </message>
     <message numerus="yes">
-        <location line="+567"/>
         <source>Paste %n widget(s)</source>
         <translation>
             <numerusform>Wklej %n widżet</numerusform>
@@ -4893,27 +3966,22 @@ Czy chcesz nadpisać szablon?</translation>
         </translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Paste (%1 widgets, %2 actions)</source>
         <translation>Wklej (%1 widżetów, %2 akcji)</translation>
     </message>
     <message>
-        <location line="+464"/>
         <source>Select Ancestor</source>
         <translation>Wybierz przodka</translation>
     </message>
     <message>
-        <location line="+573"/>
         <source>A QMainWindow-based form does not contain a central widget.</source>
         <translation>Formularz bazujący na QMainWindow nie zawiera centralnego widżetu.</translation>
     </message>
     <message>
-        <location line="-794"/>
         <source>Raise widgets</source>
         <translation>Przenieś widżety na wierzch</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Lower widgets</source>
         <translation>Przenieś widżety na spód</translation>
     </message>
@@ -4921,12 +3989,10 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/formwindowbase.cpp" line="+404"/>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Delete &apos;%1&apos;</source>
         <translation>Usuń &apos;%1&apos;</translation>
     </message>
@@ -4934,200 +4000,159 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::FormWindowManager</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="+365"/>
         <source>Cu&amp;t</source>
         <translation>Wy&amp;tnij</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cuts the selected widgets and puts them on the clipboard</source>
         <translation>Wycina zaznaczone widżety i umieszcza je w schowku</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Copy</source>
         <translation>S&amp;kopiuj</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Copies the selected widgets to the clipboard</source>
         <translation>Kopiuje zaznaczone widżety do schowka</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Paste</source>
         <translation>Wk&amp;lej</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Pastes the clipboard&apos;s contents</source>
         <translation>Wkleja zawartość schowka</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Delete</source>
         <translation>&amp;Usuń</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Deletes the selected widgets</source>
         <translation>Usuwa zaznaczone widżety</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Select &amp;All</source>
         <translation>Zaznacz &amp;wszystko</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Selects all widgets</source>
         <translation>Wybiera wszystkie widżety</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Bring to &amp;Front</source>
         <translation>Przenieś na w&amp;ierzch</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+1"/>
         <source>Raises the selected widgets</source>
         <translation>Przenosi zaznaczone widżety na wierzch</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Send to &amp;Back</source>
         <translation>Przenieś na &amp;spód</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+1"/>
         <source>Lowers the selected widgets</source>
         <translation>Przenosi zaznaczone widżety na spód</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Adjust &amp;Size</source>
         <translation>Dopasuj &amp;wielkość</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Adjusts the size of the selected widget</source>
         <translation>Dopasuj wielkość zaznaczonego widżetu</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Lay Out &amp;Horizontally</source>
         <translation>Rozmieść w po&amp;ziomie</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lays out the selected widgets horizontally</source>
         <translation>Rozmieszcza zaznaczone widżety w poziomie</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Lay Out &amp;Vertically</source>
         <translation>Rozmieść w pio&amp;nie</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lays out the selected widgets vertically</source>
         <translation>Rozmieszcza zaznaczone widżety w pionie</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Lay Out in a &amp;Grid</source>
         <translation>Rozmieść w &amp;siatce</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lays out the selected widgets in a grid</source>
         <translation>Rozmieszcza zaznaczone widżety w siatce</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Lay Out Horizontally in S&amp;plitter</source>
         <translation>Rozmieść poziomo w s&amp;plitterze</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lays out the selected widgets horizontally in a splitter</source>
         <translation>Rozmieszcza zaznaczone widżety poziomo w splitterze</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Lay Out Vertically in Sp&amp;litter</source>
         <translation>Rozmieść pionowo w sp&amp;litterze</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lays out the selected widgets vertically in a splitter</source>
         <translation>Rozmieszcza zaznaczone widżety pionowo w splitterze</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>&amp;Break Layout</source>
         <translation>&amp;Usuń rozmieszczenie</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Breaks the selected layout</source>
         <translation>Usuwa zaznaczone rozmieszczenie</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>&amp;Preview...</source>
         <translation>Pod&amp;gląd...</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Preview current form</source>
         <translation>Podgląd bierzącego formularza</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Form &amp;Settings...</source>
         <translation>Us&amp;tawienia formularza...</translation>
     </message>
     <message>
-        <location line="+94"/>
         <source>Break Layout</source>
         <translation>Usuń rozmieszczenie</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Adjust Size</source>
         <translation>Dopasuj wielkość</translation>
     </message>
     <message>
-        <location line="+43"/>
         <source>Could not create form preview</source>
         <comment>Title of warning message box</comment>
         <translation>Nie można utworzyć podglądu formularza</translation>
     </message>
     <message>
-        <location line="+341"/>
         <source>Form Settings - %1</source>
         <translation>Ustawienia formularza - %1</translation>
     </message>
     <message>
-        <location line="-527"/>
         <source>Removes empty columns and rows</source>
         <translation>Usuń puste kolumny i wiersze</translation>
     </message>
     <message>
-        <location line="-50"/>
         <source>Lay Out in a &amp;Form Layout</source>
         <translation>Rozmieść w &amp;formularzu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lays out the selected widgets in a form layout</source>
         <translation>Rozmieszcza zaznaczone widżety w formularzu</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Si&amp;mplify Grid Layout</source>
         <translation>Up&amp;rość rozmieszczenie w siatce</translation>
     </message>
@@ -5135,12 +4160,10 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::FormWindowSettings</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formwindowsettings.cpp" line="+193"/>
         <source>None</source>
         <translation>Żaden</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Device Profile: %1</source>
         <translation>Profil urządzenia: %1</translation>
     </message>
@@ -5148,37 +4171,30 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::GridPanel</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/gridpanel.ui"/>
         <source>Visible</source>
         <translation>Widoczna</translation>
     </message>
     <message>
-        <location/>
         <source>Snap</source>
         <translation>Przyciągaj</translation>
     </message>
     <message>
-        <location/>
         <source>Reset</source>
         <translation>Przywróć ustawienia</translation>
     </message>
     <message>
-        <location/>
         <source>Form</source>
         <translation>Formularz</translation>
     </message>
     <message>
-        <location/>
         <source>Grid</source>
         <translation>Siatka</translation>
     </message>
     <message>
-        <location/>
         <source>Grid &amp;X</source>
         <translation>Siatka &amp;X</translation>
     </message>
     <message>
-        <location/>
         <source>Grid &amp;Y</source>
         <translation>Siatka &amp;Y</translation>
     </message>
@@ -5186,7 +4202,6 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::GroupBoxTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp" line="+82"/>
         <source>Change title...</source>
         <translation>Zmień tytuł...</translation>
     </message>
@@ -5194,7 +4209,6 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::HtmlTextEdit</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="-58"/>
         <source>Insert HTML entity</source>
         <translation>Wstaw jednostkę HTML</translation>
     </message>
@@ -5202,92 +4216,74 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::IconSelector</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="-24"/>
         <source>The pixmap file &apos;%1&apos; cannot be read.</source>
         <translation>Nie można odczytać pliku z pixmapą %1.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>The file &apos;%1&apos; does not appear to be a valid pixmap file: %2</source>
         <translation>Plik &apos;%1&apos; nie wygląda na poprawny plik z pixmapą: %2</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>The file &apos;%1&apos; could not be read: %2</source>
         <translation>Nie można odczytać pliku &quot;%1&quot;, %2</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>Pixmap Read Error</source>
         <translation>Błąd przy odczycie pixmapy</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Normal Off</source>
         <translation>Normalny wyciśnięty</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Normal On</source>
         <translation>Normalny wciśnięty</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Disabled Off</source>
         <translation>Wyłączony wyciśnięty</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Disabled On</source>
         <translation>Wyłączony wciśnięty</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Active Off</source>
         <translation>Aktywny wyciśnięty</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Active On</source>
         <translation>Aktywny wciśnięty</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Selected Off</source>
         <translation>Zaznaczony wyciśnięty</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Selected On</source>
         <translation>Zaznaczony wciśnięty</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Choose Resource...</source>
         <translation>Wybierz zasób...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Choose File...</source>
         <translation>Wybierz plik...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reset</source>
         <translation>Przywróć</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reset All</source>
         <translation>Przywróć wszystkie</translation>
     </message>
     <message>
-        <location line="-85"/>
         <source>Choose a Pixmap</source>
         <translation>Wybierz pixmapę</translation>
     </message>
@@ -5295,58 +4291,46 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::ItemListEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.cpp" line="+358"/>
         <source>Properties &amp;&lt;&lt;</source>
         <translation>Własciwości &amp;&lt;&lt;</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.ui"/>
-        <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.cpp" line="+2"/>
         <source>Properties &amp;&gt;&gt;</source>
         <translation>Własciwości &amp;&gt;&gt;</translation>
     </message>
     <message>
-        <location/>
         <source>Items List</source>
         <translation>Lista elementów</translation>
     </message>
     <message>
-        <location/>
         <source>New Item</source>
         <translation>Nowy element</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;New</source>
         <translation>&amp;Nowy</translation>
     </message>
     <message>
-        <location/>
         <source>Delete Item</source>
         <translation>Usuń element</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Delete</source>
         <translation>&amp;Usuń</translation>
     </message>
     <message>
-        <location/>
         <source>Move Item Up</source>
         <translation>Przenieś element do góry</translation>
     </message>
     <message>
-        <location/>
         <source>U</source>
         <translation>U</translation>
     </message>
     <message>
-        <location/>
         <source>Move Item Down</source>
         <translation>Przenieś element w dół</translation>
     </message>
     <message>
-        <location/>
         <source>D</source>
         <translation>D</translation>
     </message>
@@ -5354,12 +4338,10 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::LabelTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/label_taskmenu.cpp" line="+85"/>
         <source>Change rich text...</source>
         <translation>Zmień tekst sformatowany...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change plain text...</source>
         <translation>Zmień zwykły tekst...</translation>
     </message>
@@ -5367,7 +4349,6 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::LanguageResourceDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="-258"/>
         <source>Choose Resource</source>
         <translation>Wybierz zasób</translation>
     </message>
@@ -5375,7 +4356,6 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::LineEditTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp" line="+80"/>
         <source>Change text...</source>
         <translation>Zmień tekst...</translation>
     </message>
@@ -5383,17 +4363,14 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::ListWidgetEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/listwidgeteditor.cpp" line="+69"/>
         <source>New Item</source>
         <translation>Nowy element</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Edit List Widget</source>
         <translation>Modyfikuj listę</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Edit Combobox</source>
         <translation>Modyfikuj combobox</translation>
     </message>
@@ -5401,12 +4378,10 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::ListWidgetTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp" line="+67"/>
         <source>Edit Items...</source>
         <translation>Modyfikuj elementy...</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Change List Contents</source>
         <translation>Zmień zawartość listy</translation>
     </message>
@@ -5414,22 +4389,18 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::MdiContainerWidgetTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="+118"/>
         <source>Next Subwindow</source>
         <translation>Następne podokno</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Previous Subwindow</source>
         <translation>Poprzednie podokno</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Tile</source>
         <translation>Obok siebie</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Cascade</source>
         <translation>Kaskadowo</translation>
     </message>
@@ -5437,7 +4408,6 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::MenuTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/menutaskmenu.cpp" line="+56"/>
         <source>Remove</source>
         <translation>Usuń</translation>
     </message>
@@ -5445,7 +4415,6 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::MorphMenu</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/morphmenu.cpp" line="+264"/>
         <source>Morph into</source>
         <translation>Przekształć w</translation>
     </message>
@@ -5453,42 +4422,34 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::NewActionDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/newactiondialog.ui"/>
         <source>New Action...</source>
         <translation>Nowa akcja...</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Text:</source>
         <translation>&amp;Tekst:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Icon:</source>
         <translation>&amp;Ikonka:</translation>
     </message>
     <message>
-        <location/>
         <source>Shortcut:</source>
         <translation>Skrót:</translation>
     </message>
     <message>
-        <location/>
         <source>Checkable:</source>
         <translation>Przełączalny:</translation>
     </message>
     <message>
-        <location/>
         <source>ToolTip:</source>
         <translation>Podpowiedź:</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location/>
         <source>Object &amp;name:</source>
         <translation>&amp;Nazwa obiektu:</translation>
     </message>
@@ -5496,41 +4457,34 @@ Czy chcesz nadpisać szablon?</translation>
 <context>
     <name>qdesigner_internal::NewDynamicPropertyDialog</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp" line="+134"/>
         <source>Set Property Name</source>
         <translation>Ustaw nazwę właściwości</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>The current object already has a property named &apos;%1&apos;.
 Please select another, unique one.</source>
         <translation>Bieżący obiekt posiada już właściwość o nazwie &apos;%1&apos;.
 Wybierz inną, unikalną nazwę.</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/newdynamicpropertydialog.ui"/>
         <source>Create Dynamic Property</source>
         <translation>Utwórz dynamiczną właściwość</translation>
     </message>
     <message>
-        <location/>
         <source>Property Name</source>
         <translation>Nazwa właściwości</translation>
     </message>
     <message>
-        <location/>
         <source>Property Type</source>
         <translation>Typ właściwości</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp" line="+4"/>
         <source>The &apos;_q_&apos; prefix is reserved for the Qt library.
 Please select another name.</source>
         <translation>Przedrostek &apos;_q_&apos; jest zarezerwowany dla biblioteki Qt.
 Wybierz inną nazwę.</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/newdynamicpropertydialog.ui"/>
         <source>horizontalSpacer</source>
         <translation>poziomy dystans</translation>
     </message>
@@ -5538,83 +4492,67 @@ Wybierz inną nazwę.</translation>
 <context>
     <name>qdesigner_internal::NewFormWidget</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/newformwidget.cpp" line="+104"/>
         <source>Default size</source>
         <translation>Domyślny rozmiar</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>QVGA portrait (240x320)</source>
         <translation>QVGA portret (240x320)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>QVGA landscape (320x240)</source>
         <translation>QVGA pejzaż (320x240)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>VGA portrait (480x640)</source>
         <translation>VGA portret (480x640)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>VGA landscape (640x480)</source>
         <translation>VGA pejzaż (640x480)</translation>
     </message>
     <message>
-        <location line="+66"/>
         <source>Widgets</source>
         <extracomment>New Form Dialog Categories</extracomment>
         <translation>Widżety</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Custom Widgets</source>
         <translation>Własne widżety</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>None</source>
         <translation>Żadne</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>Error loading form</source>
         <translation>Błąd podczas ładowania formularza</translation>
     </message>
     <message>
-        <location line="+244"/>
         <source>Unable to open the form template file &apos;%1&apos;: %2</source>
         <translation>Nie można otworzyć pliku &apos;%1&apos; z szablonem formularza: %2</translation>
     </message>
     <message>
-        <location line="+67"/>
         <source>Internal error: No template selected.</source>
         <translation>Błąd wewnętrzny: Nie zaznaczono szablonu.</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/newformwidget.ui"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location/>
         <source>Choose a template for a preview</source>
         <translation>Wybierz szablon do podglądu</translation>
     </message>
     <message>
-        <location/>
         <source>Embedded Design</source>
         <translation>Projekt dla urządzeń specjalizowanych</translation>
     </message>
     <message>
-        <location/>
         <source>Device:</source>
         <translation>Urządzenie:</translation>
     </message>
     <message>
-        <location/>
         <source>Screen Size:</source>
         <translation>Rozmiar ekranu:</translation>
     </message>
@@ -5622,37 +4560,30 @@ Wybierz inną nazwę.</translation>
 <context>
     <name>qdesigner_internal::NewPromotedClassPanel</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp" line="+92"/>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>New Promoted Class</source>
         <translation>Nowa klasa zastępcza</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Base class name:</source>
         <translation>Nazwa bazowej klasy:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Promoted class name:</source>
         <translation>Nazwa zastępczej klasy:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Header file:</source>
         <translation>Plik nagłówkowy:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Global include</source>
         <translation>Nagłówek globalny</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Reset</source>
         <translation>Przywróć ustawienia</translation>
     </message>
@@ -5660,12 +4591,10 @@ Wybierz inną nazwę.</translation>
 <context>
     <name>qdesigner_internal::ObjectInspector</name>
     <message>
-        <location filename="../tools/designer/src/components/objectinspector/objectinspector.cpp" line="+316"/>
         <source>Change Current Page</source>
         <translation>Zmień bieżącą stronę</translation>
     </message>
     <message>
-        <location line="+438"/>
         <source>&amp;Find in Text...</source>
         <translation>Z&amp;najdź w tekście...</translation>
     </message>
@@ -5673,32 +4602,26 @@ Wybierz inną nazwę.</translation>
 <context>
     <name>qdesigner_internal::OrderDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/orderdialog.cpp" line="+109"/>
         <source>Index %1 (%2)</source>
         <translation>Indeks %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/orderdialog.ui"/>
         <source>Change Page Order</source>
         <translation>Zmień porządek stron</translation>
     </message>
     <message>
-        <location/>
         <source>Page Order</source>
         <translation>Porządek stron</translation>
     </message>
     <message>
-        <location/>
         <source>Move page up</source>
         <translation>Przenieś stronę do góry</translation>
     </message>
     <message>
-        <location/>
         <source>Move page down</source>
         <translation>Przenieś stronę w dół</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/orderdialog.cpp" line="+3"/>
         <source>%1 %2</source>
         <translation>%1 %2</translation>
     </message>
@@ -5706,47 +4629,38 @@ Wybierz inną nazwę.</translation>
 <context>
     <name>qdesigner_internal::PaletteEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.ui"/>
         <source>Edit Palette</source>
         <translation>Modyfikuj paletę</translation>
     </message>
     <message>
-        <location/>
         <source>Tune Palette</source>
         <translation>Dopasuj paletę</translation>
     </message>
     <message>
-        <location/>
         <source>Show Details</source>
         <translation>Pokazuj szczegóły</translation>
     </message>
     <message>
-        <location/>
         <source>Compute Details</source>
         <translation>Obliczaj szczegóły</translation>
     </message>
     <message>
-        <location/>
         <source>Quick</source>
         <translation>Szybko</translation>
     </message>
     <message>
-        <location/>
         <source>Preview</source>
         <translation>Podgląd</translation>
     </message>
     <message>
-        <location/>
         <source>Disabled</source>
         <translation>Wyszarzony</translation>
     </message>
     <message>
-        <location/>
         <source>Inactive</source>
         <translation>Nieaktywny</translation>
     </message>
     <message>
-        <location/>
         <source>Active</source>
         <translation>Aktywny</translation>
     </message>
@@ -5754,7 +4668,6 @@ Wybierz inną nazwę.</translation>
 <context>
     <name>qdesigner_internal::PaletteEditorButton</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/paletteeditorbutton.cpp" line="+57"/>
         <source>Change Palette</source>
         <translation>Zmień paletę</translation>
     </message>
@@ -5762,22 +4675,18 @@ Wybierz inną nazwę.</translation>
 <context>
     <name>qdesigner_internal::PaletteModel</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.cpp" line="+374"/>
         <source>Color Role</source>
         <translation>Rola koloru</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Active</source>
         <translation>Aktywna</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Inactive</source>
         <translation>Nieaktywna</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Disabled</source>
         <translation>Wyszarzona</translation>
     </message>
@@ -5785,28 +4694,22 @@ Wybierz inną nazwę.</translation>
 <context>
     <name>qdesigner_internal::PixmapEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="-1539"/>
         <source>Copy Path</source>
         <translation>Skopiuj ścieżkę</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Paste Path</source>
         <translation>Wklej ścieżkę</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>Choose Resource...</source>
         <translation>Wybierz zasób...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Choose File...</source>
         <translation>Wybierz plik...</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+16"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -5814,7 +4717,6 @@ Wybierz inną nazwę.</translation>
 <context>
     <name>qdesigner_internal::PlainTextEditorDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/plaintexteditor.cpp" line="+65"/>
         <source>Edit text</source>
         <translation>Modyfikuj tekst</translation>
     </message>
@@ -5822,37 +4724,30 @@ Wybierz inną nazwę.</translation>
 <context>
     <name>qdesigner_internal::PluginDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/plugindialog.cpp" line="+72"/>
         <source>Components</source>
         <translation>Komponenty</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Plugin Information</source>
         <translation>Informacje o wtyczkach</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>Qt Designer couldn&apos;t find any plugins</source>
         <translation>Qt Designer nie mógł znaleźć żadnej wtyczki</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Qt Designer found the following plugins</source>
         <translation>Qt Designer znalazł następujące wtyczki:</translation>
     </message>
     <message>
-        <location line="-52"/>
         <source>Refresh</source>
         <translation>Odśwież</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Scan for newly installed custom widget plugins.</source>
         <translation>Szukaj nowo zainstalowanych wtyczek z widżetami.</translation>
     </message>
     <message>
-        <location line="+106"/>
         <source>New custom widget plugins have been found.</source>
         <translation>Znaleziono nową wtyczkę z widżetami.</translation>
     </message>
@@ -5860,7 +4755,6 @@ Wybierz inną nazwę.</translation>
 <context>
     <name>qdesigner_internal::PreviewActionGroup</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/previewactiongroup.cpp" line="+95"/>
         <source>%1 Style</source>
         <translation>Styl %1</translation>
     </message>
@@ -5868,47 +4762,38 @@ Wybierz inną nazwę.</translation>
 <context>
     <name>qdesigner_internal::PreviewConfigurationWidget</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.cpp" line="+139"/>
         <source>Default</source>
         <translation>Domyślny</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>None</source>
         <translation>Żadna</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Browse...</source>
         <translation>Przeglądaj...</translation>
     </message>
     <message>
-        <location line="+118"/>
         <source>Load Custom Device Skin</source>
         <translation>Załaduj dostosowaną skórkę (skin) urządzenia</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>All QVFB Skins (*.%1)</source>
         <translation>Wszystkie skórki (skin) QVFB (*.%1)</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>%1 - Duplicate Skin</source>
         <translation>%1 - zduplikowana skórka (skin)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The skin &apos;%1&apos; already exists.</source>
         <translation>Skórka (skin) &apos;%1&apos; już istnieje.</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>%1 - Error</source>
         <translation>%1 - Błąd</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>%1 is not a valid skin directory:
 %2</source>
         <translation>%1 nie jest poprawnym katalogiem ze skórką (skin)
@@ -5918,24 +4803,20 @@ Wybierz inną nazwę.</translation>
 <context>
     <name>qdesigner_internal::PreviewDeviceSkin</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/previewmanager.cpp" line="+259"/>
         <source>&amp;Portrait</source>
         <translation>P&amp;ortret</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Landscape (&amp;CCW)</source>
         <extracomment>Rotate form preview counter-clockwise</extracomment>
         <translation>Pejzaż (&amp;CCW)</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Landscape (CW)</source>
         <extracomment>Rotate form preview clockwise</extracomment>
         <translation>P&amp;ejzaż (CW)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Close</source>
         <translation>Za&amp;mknij</translation>
     </message>
@@ -5943,7 +4824,6 @@ Wybierz inną nazwę.</translation>
 <context>
     <name>qdesigner_internal::PreviewManager</name>
     <message>
-        <location line="+426"/>
         <source>%1 - [Preview]</source>
         <translation>%1 - [Podgląd]</translation>
     </message>
@@ -5951,7 +4831,6 @@ Wybierz inną nazwę.</translation>
 <context>
     <name>qdesigner_internal::PreviewMdiArea</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/previewframe.cpp" line="+72"/>
         <source>The moose in the noose
 ate the goose who was loose.</source>
         <extracomment>Palette editor background</extracomment>
@@ -5962,57 +4841,46 @@ chrząszcz brzmi w trzcinie.</translation>
 <context>
     <name>qdesigner_internal::PreviewWidget</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/previewwidget.ui"/>
         <source>Preview Window</source>
         <translation>Podgląd okna</translation>
     </message>
     <message>
-        <location/>
         <source>LineEdit</source>
         <translation>LineEdit</translation>
     </message>
     <message>
-        <location/>
         <source>ComboBox</source>
         <translation>Combobox</translation>
     </message>
     <message>
-        <location/>
         <source>PushButton</source>
         <translation>PushButton</translation>
     </message>
     <message>
-        <location/>
         <source>ButtonGroup2</source>
         <translation>ButtonGroup2</translation>
     </message>
     <message>
-        <location/>
         <source>CheckBox1</source>
         <translation>Checkbox1</translation>
     </message>
     <message>
-        <location/>
         <source>CheckBox2</source>
         <translation>CheckBox2</translation>
     </message>
     <message>
-        <location/>
         <source>ButtonGroup</source>
         <translation>ButtonGroup</translation>
     </message>
     <message>
-        <location/>
         <source>RadioButton1</source>
         <translation>RadioButton1</translation>
     </message>
     <message>
-        <location/>
         <source>RadioButton2</source>
         <translation>RadioButton2</translation>
     </message>
     <message>
-        <location/>
         <source>RadioButton3</source>
         <translation>RadioBUtton3</translation>
     </message>
@@ -6020,22 +4888,18 @@ chrząszcz brzmi w trzcinie.</translation>
 <context>
     <name>qdesigner_internal::PromotionModel</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/promotionmodel.cpp" line="+17"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Header file</source>
         <translation>Plik nagłówkowy</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Global include</source>
         <translation>Nagłówek globalny</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Usage</source>
         <translation>Użycie</translation>
     </message>
@@ -6043,27 +4907,22 @@ chrząszcz brzmi w trzcinie.</translation>
 <context>
     <name>qdesigner_internal::PromotionTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/promotiontaskmenu.cpp" line="+85"/>
         <source>Promoted widgets...</source>
         <translation>Zastępcze widżety...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Promote to ...</source>
         <translation>Zastąp...</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Promote to</source>
         <translation>Zastąp</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Demote to %1</source>
         <translation>Przywróć do %1</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>Change signals/slots...</source>
         <translation>Zmień sygnały/sloty...</translation>
     </message>
@@ -6071,59 +4930,48 @@ chrząszcz brzmi w trzcinie.</translation>
 <context>
     <name>qdesigner_internal::PropertyEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/propertyeditor.cpp" line="+231"/>
         <source>Add Dynamic Property...</source>
         <translation>Dodaj dynamiczną właściwość ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Remove Dynamic Property</source>
         <translation>Usuń dynamiczną właściwość</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Sorting</source>
         <translation>Sortowanie</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Color Groups</source>
         <translation>Kolorowanie grup</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Tree View</source>
         <translation>Widok drzewiasty</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Drop Down Button View</source>
         <translation>Widok z rozszerzalnymi przyciskami</translation>
     </message>
     <message>
-        <location line="+59"/>
         <source>Configure Property Editor</source>
         <translation>Skonfiguruj edytor właściwości</translation>
     </message>
     <message>
-        <location line="+539"/>
         <source>Object: %1
 Class: %2</source>
         <translation>Obiekt: %1
 Klasa: %2</translation>
     </message>
     <message>
-        <location line="-553"/>
         <source>String...</source>
         <translation>String...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Bool...</source>
         <translation>Bool...</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Other...</source>
         <translation>Inne...</translation>
     </message>
@@ -6131,7 +4979,6 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::PropertyLineEdit</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/propertylineedit.cpp" line="+88"/>
         <source>Insert line break</source>
         <translation>Wstaw znak końca linii</translation>
     </message>
@@ -6139,27 +4986,22 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::QDesignerPromotionDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp" line="+85"/>
         <source>Promoted Widgets</source>
         <translation>Zastępcze widżety</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Promoted Classes</source>
         <translation>Zastępcze klasy</translation>
     </message>
     <message>
-        <location line="+60"/>
         <source>Promote</source>
         <translation>Zastąp</translation>
     </message>
     <message>
-        <location line="+169"/>
         <source>%1 - Error</source>
         <translation>%1 - Błąd</translation>
     </message>
     <message>
-        <location line="-17"/>
         <source>Change signals/slots...</source>
         <translation>Zmień sygnały/sloty...</translation>
     </message>
@@ -6167,22 +5009,18 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::QDesignerResource</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="+277"/>
         <source>Loading qrc file</source>
         <translation>ładowanie pliku qrc</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The specified qrc file &lt;p&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;could not be found. Do you want to update the file location?&lt;/p&gt;</source>
         <translation>Plik qrc &lt;p&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;&lt;p&gt; nie został znaleziony. Czy chcesz uaktualnić ścieżkę do pliku?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>New location for %1</source>
         <translation>Nowe położenie dla %1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Resource files (*.qrc)</source>
         <translation>Pliki z zasobami (*.qrc)</translation>
     </message>
@@ -6190,57 +5028,46 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::QDesignerTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="+68"/>
         <source>Change objectName...</source>
         <translation>Zmień nazwę obiektu...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change toolTip...</source>
         <translation>Zmień podpowiedź...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change whatsThis...</source>
         <translation>Zmień &quot;co to jest&quot;...</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Create Menu Bar</source>
         <translation>Utwórz pasek menu</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Add Tool Bar</source>
         <translation>Dodaj pasek narzędzi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Create Status Bar</source>
         <translation>Utwórz pasek stanu</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>Change styleSheet...</source>
         <translation>Zmień arkusz stylu...</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Remove Status Bar</source>
         <translation>Usuń pasek stanu</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change script...</source>
         <translation>Zmień skrypt...</translation>
     </message>
     <message>
-        <location line="+415"/>
         <source>no signals available</source>
         <translation>brak dostępnych sygnałów</translation>
     </message>
     <message numerus="yes">
-        <location line="+67"/>
         <source>Set size constraint on %n widget(s)</source>
         <translation>
             <numerusform>Ustaw ograniczenie rozmiaru w %n obiekcie</numerusform>
@@ -6249,57 +5076,46 @@ Klasa: %2</translation>
         </translation>
     </message>
     <message>
-        <location line="-481"/>
         <source>Change signals/slots...</source>
         <translation>Zmień sygnały/sloty...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Go to slot...</source>
         <translation>Przejdź do slotu...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Size Constraints</source>
         <translation>Ograniczenia rozmiaru</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Set Minimum Width</source>
         <translation>Ustaw minimalną szerokość</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Set Minimum Height</source>
         <translation>Ustaw minimalną wysokość</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Set Minimum Size</source>
         <translation>Ustaw minimalny rozmiar</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Set Maximum Width</source>
         <translation>Ustaw maksymalną szerokość</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Set Maximum Height</source>
         <translation>Ustaw maksymalną wysokość</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Set Maximum Size</source>
         <translation>Ustaw maksymalny rozmiar</translation>
     </message>
     <message>
-        <location line="+235"/>
         <source>Edit ToolTip</source>
         <translation>Modyfikuj podpowiedź</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Edit WhatsThis</source>
         <translation>Modyfikuj &quot;Co to jest&quot;</translation>
     </message>
@@ -6307,42 +5123,34 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::QDesignerWidgetBox</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_widgetbox.cpp" line="+123"/>
-        <location line="+13"/>
         <source>Unexpected element &lt;%1&gt;</source>
         <translation>Niespodziewany element &lt;%1&gt;</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4
 %5</source>
         <translation>Wystąpił błąd przetwarzania w linii %1, kolumnie %2 kodu XML określonego dla widżetu %3: %4
 %5</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>The XML code specified for the widget %1 does not contain any widget elements.
 %2</source>
         <translation>Kod XML określony dla widżetu %1 nie zawiera żadnego elementu typu widżet.
 %2</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation>Wystąpił błąd w linii %1 w %2: %3</translation>
     </message>
     <message>
-        <location line="+139"/>
         <source>Unexpected element &lt;%1&gt; encountered when parsing for &lt;widget&gt; or &lt;ui&gt;</source>
         <translation>Wystąpił niespodziewany element &lt;%1&gt; podczas przetwarzania elementu &lt;widget&gt; lub &lt;ui&gt;</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unexpected end of file encountered when parsing widgets.</source>
         <translation>Wystąpił niespodziewany koniec pliku podczas przetwarzania widżetów.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>A widget element could not be found.</source>
         <translation>Nie można odnależć elementu &lt;widget&gt;.</translation>
     </message>
@@ -6350,73 +5158,58 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::QtGradientStopsController</name>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp" line="+173"/>
         <source>H</source>
         <translation>H</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>V</source>
         <translation>V</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+4"/>
         <source>Hue</source>
         <translation>Barwa</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>Sat</source>
         <translation>Nas.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Val</source>
         <translation>Wart.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Saturation</source>
         <translation>Nasycenie</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Value</source>
         <translation>Wartość</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>G</source>
         <translation>G</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B</source>
         <translation>B</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Red</source>
         <translation>Czerwień</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Green</source>
         <translation>Zieleń</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Blue</source>
         <translation>Błękit</translation>
     </message>
@@ -6424,27 +5217,22 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::RichTextEditorDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="+436"/>
         <source>Edit text</source>
         <translation>Modyfikuj tekst</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Anuluj</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location line="-7"/>
         <source>Rich Text</source>
         <translation>Rich Text</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Source</source>
         <translation>Źródło</translation>
     </message>
@@ -6452,72 +5240,58 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::RichTextEditorToolBar</name>
     <message>
-        <location line="-294"/>
         <source>Bold</source>
         <translation>Pogrubienie</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Italic</source>
         <translation>Kursywa</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CTRL+I</source>
         <translation>CTRL+I</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Underline</source>
         <translation>Podkreślenie</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CTRL+U</source>
         <translation>CTRL+U</translation>
     </message>
     <message>
-        <location line="-12"/>
         <source>CTRL+B</source>
         <translation>CTRL+B</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Left Align</source>
         <translation>Wyrównanie do lewej</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Center</source>
         <translation>Wyrównanie do środka</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Right Align</source>
         <translation>Wyrównanie do prawej</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Justify</source>
         <translation>Wyjustuj</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Superscript</source>
         <translation>Indeks górny</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Subscript</source>
         <translation>Indeks dolny</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Insert &amp;Link</source>
         <translation>Wstaw &amp;Odsyłacz</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Insert &amp;Image</source>
         <translation>Wstaw &amp;obrazek</translation>
     </message>
@@ -6525,17 +5299,14 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::ScriptDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/scriptdialog.cpp" line="+66"/>
         <source>Edit script</source>
         <translation>Modyfikuj skrypt</translation>
     </message>
     <message>
-        <location line="+56"/>
         <source>Syntax error</source>
         <translation>Błąd składni</translation>
     </message>
     <message>
-        <location line="-51"/>
         <source>&lt;html&gt;Enter a Qt Script snippet to be executed while loading the form.&lt;br&gt;The widget and its children are accessible via the variables &lt;i&gt;widget&lt;/i&gt; and &lt;i&gt;childWidgets&lt;/i&gt;, respectively.</source>
         <translation>&lt;html&gt;Wprowadź skrypt Qt który będzie wykonany podczas ładowania formularza.&lt;br&gt;Widżet i jego dzieci są dostępne przez zmienne &lt;i&gt;widget&lt;/i&gt; i &lt;i&gt;childWidgets&lt;/i&gt;, odpowiednio.</translation>
     </message>
@@ -6543,7 +5314,6 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::ScriptErrorDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/scripterrordialog.cpp" line="+27"/>
         <source>Script errors</source>
         <translation>Błędy skryptu</translation>
     </message>
@@ -6551,23 +5321,18 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::SignalSlotDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/signalslotdialog.cpp" line="+199"/>
         <source>There is already a slot with the signature &apos;%1&apos;.</source>
         <translation>Slot &apos;%1&apos; już istnieje.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>There is already a signal with the signature &apos;%1&apos;.</source>
         <translation>Sygnał &apos;%1&apos; już istnieje.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>%1 - Duplicate Signature</source>
         <translation>%1 - zduplikowany zapis</translation>
     </message>
     <message>
-        <location line="+21"/>
-        <location line="+76"/>
         <source>Signals/Slots of %1</source>
         <translation>Sygnały/sloty obiektu %1</translation>
     </message>
@@ -6575,12 +5340,10 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::SignalSlotEditorPlugin</name>
     <message>
-        <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp" line="+72"/>
         <source>Edit Signals/Slots</source>
         <translation>Modyfikuj sygnały/sloty</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
@@ -6588,7 +5351,6 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::SignalSlotEditorTool</name>
     <message>
-        <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp" line="+58"/>
         <source>Edit Signals/Slots</source>
         <translation>Modyfikuj sygnały/sloty</translation>
     </message>
@@ -6596,7 +5358,6 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::StatusBarTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp" line="+81"/>
         <source>Remove</source>
         <translation>Usuń</translation>
     </message>
@@ -6604,7 +5365,6 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::StringListEditorButton</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/stringlisteditorbutton.cpp" line="+56"/>
         <source>Change String List</source>
         <translation>Zmień listę tekstów</translation>
     </message>
@@ -6612,38 +5372,30 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::StyleSheetEditorDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/stylesheeteditor.cpp" line="+97"/>
         <source>Edit Style Sheet</source>
         <translation>Modyfikuj arkusz stylu</translation>
     </message>
     <message>
-        <location line="-7"/>
-        <location line="+280"/>
         <source>Valid Style Sheet</source>
         <translation>Poprawny arkusz stylu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Invalid Style Sheet</source>
         <translation>Niepoprawny arkusz stylu</translation>
     </message>
     <message>
-        <location line="-281"/>
         <source>Add Resource...</source>
         <translation>Dodaj zasób...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Add Gradient...</source>
         <translation>Dodaj gradient...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Add Color...</source>
         <translation>Dodaj kolor...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Add Font...</source>
         <translation>Dodaj czcionkę...</translation>
     </message>
@@ -6651,27 +5403,22 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/tabordereditor/tabordereditor.cpp" line="+363"/>
         <source>Start from Here</source>
         <translation>Rozpocznij stąd</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Restart</source>
         <translation>Rozpocznij od nowa</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Tab Order List...</source>
         <translation>Lista kolejności tabulacji...</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Tab Order List</source>
         <translation>Lista kolejności tabulacji</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Tab Order</source>
         <translation>Kolejność tabulacji</translation>
     </message>
@@ -6679,7 +5426,6 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::TabOrderEditorPlugin</name>
     <message>
-        <location filename="../tools/designer/src/components/tabordereditor/tabordereditor_plugin.cpp" line="+73"/>
         <source>Edit Tab Order</source>
         <translation>Modyfikuj kolejność tabulacji</translation>
     </message>
@@ -6687,7 +5433,6 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::TabOrderEditorTool</name>
     <message>
-        <location filename="../tools/designer/src/components/tabordereditor/tabordereditor_tool.cpp" line="+57"/>
         <source>Edit Tab Order</source>
         <translation>Modyfikuj kolejność tabulacji</translation>
     </message>
@@ -6695,48 +5440,38 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::TableWidgetEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.ui"/>
         <source>Edit Table Widget</source>
         <translation>Modyfikuj tablę</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Items</source>
         <translation>&amp;Elementy</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.cpp" line="+70"/>
         <source>New Row</source>
         <translation>Nowy wiersz</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;Columns</source>
         <translation>&amp;Kolumny</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Rows</source>
         <translation>&amp;Wiersze</translation>
     </message>
     <message>
-        <location line="+137"/>
         <source>Properties &amp;&lt;&lt;</source>
         <translation>Własciwości &amp;&lt;&lt;</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.ui"/>
-        <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.cpp" line="+2"/>
         <source>Properties &amp;&gt;&gt;</source>
         <translation>Własciwości &amp;&gt;&gt;</translation>
     </message>
     <message>
-        <location/>
         <source>Table Items</source>
         <translation>Elementy tabeli</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.cpp" line="-151"/>
         <source>New Column</source>
         <translation>Nowa kolumna</translation>
     </message>
@@ -6744,7 +5479,6 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::TableWidgetTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp" line="+64"/>
         <source>Edit Items...</source>
         <translation>Modyfikuj elementy...</translation>
     </message>
@@ -6752,22 +5486,18 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::TemplateOptionsWidget</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/templateoptionspage.cpp" line="-18"/>
         <source>Pick a directory to save templates in</source>
         <translation>Wybierz katalog do zachowywania szablonów</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/templateoptionspage.ui"/>
         <source>Form</source>
         <translation>Formularz</translation>
     </message>
     <message>
-        <location/>
         <source>Additional Template Paths</source>
         <translation>Dodatkowe ścieżki z szablonami</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -6775,22 +5505,18 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::TextEditTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/textedit_taskmenu.cpp" line="+59"/>
         <source>Change HTML...</source>
         <translation>Zmień HTML...</translation>
     </message>
     <message>
-        <location line="-1"/>
         <source>Edit HTML</source>
         <translation>Modyfikuj HTML</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Edit Text</source>
         <translation>Modyfikuj tekst</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change Plain Text...</source>
         <translation>Zmień zwykły tekst...</translation>
     </message>
@@ -6798,22 +5524,18 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::TextEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="-204"/>
         <source>Choose Resource...</source>
         <translation>Wybierz zasób...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Choose File...</source>
         <translation>Wybierz plik...</translation>
     </message>
     <message>
-        <location line="+123"/>
         <source>Choose a File</source>
         <translation>Wybierz plik</translation>
     </message>
     <message>
-        <location line="-118"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -6821,27 +5543,22 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_toolbar.cpp" line="+234"/>
         <source>Insert Separator</source>
         <translation>Wstaw separator</translation>
     </message>
     <message>
-        <location line="-65"/>
         <source>Remove action &apos;%1&apos;</source>
         <translation>Usuń akcję &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Remove Toolbar &apos;%1&apos;</source>
         <translation>Usuń pasek narzędzi &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="-28"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation>Wstaw separator przed &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Append Separator</source>
         <translation>Dodaj separator</translation>
     </message>
@@ -6849,125 +5566,98 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::TreeWidgetEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui"/>
         <source>Edit Tree Widget</source>
         <translation>Modyfikuj drzewo</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Items</source>
         <translation>&amp;Elementy</translation>
     </message>
     <message>
-        <location/>
         <source>Tree Items</source>
         <translation>Drzewo elementów</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="+76"/>
         <source>&amp;Columns</source>
         <translation>&amp;Kolumny</translation>
     </message>
     <message>
-        <location line="+69"/>
         <source>Per column properties</source>
         <translation>Właściowści dla kolumny</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Common properties</source>
         <translation>Wspólne właściwości</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui"/>
-        <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="+53"/>
         <source>New Item</source>
         <translation>Nowy element</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="+19"/>
         <source>New Subitem</source>
         <translation>Nowy podelement</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="+175"/>
         <source>Properties &amp;&lt;&lt;</source>
         <translation>Własciwości &amp;&lt;&lt;</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui"/>
-        <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="+2"/>
         <source>Properties &amp;&gt;&gt;</source>
         <translation>Własciwości &amp;&gt;&gt;</translation>
     </message>
     <message>
-        <location/>
         <source>New &amp;Subitem</source>
         <translation>Nowy &amp;podelement</translation>
     </message>
     <message>
-        <location/>
         <source>Delete Item</source>
         <translation>Usuń element</translation>
     </message>
     <message>
-        <location/>
         <source>Move Item Left (before Parent Item)</source>
         <translation>Przenieś element w lewo (przed element nadrzędny)</translation>
     </message>
     <message>
-        <location/>
         <source>L</source>
         <translation>L</translation>
     </message>
     <message>
-        <location/>
         <source>Move Item Right (as a First Subitem of the Next Sibling Item)</source>
         <translation>Przenieś element w prawo (jako pierwszy podelement kolejnego elementu)</translation>
     </message>
     <message>
-        <location/>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
-        <location/>
         <source>Move Item Up</source>
         <translation>Przenieś element do góry</translation>
     </message>
     <message>
-        <location/>
         <source>U</source>
         <translation>U</translation>
     </message>
     <message>
-        <location/>
         <source>Move Item Down</source>
         <translation>Przenieś element w dół</translation>
     </message>
     <message>
-        <location/>
         <source>D</source>
         <translation>D</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="-327"/>
         <source>New Column</source>
         <translation>Nowa kolumna</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;New</source>
         <translation>&amp;Nowy</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Delete</source>
         <translation>&amp;Usuń</translation>
     </message>
@@ -6975,7 +5665,6 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::TreeWidgetTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp" line="+63"/>
         <source>Edit Items...</source>
         <translation>Modyfikujj elementy...</translation>
     </message>
@@ -6983,7 +5672,6 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::WidgetBox</name>
     <message>
-        <location filename="../tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp" line="+115"/>
         <source>Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML.</source>
         <translation>Ostrzeżenie: Błąd tworzenia widżetu w panelu widżetów. Mogło to być spowodowane niepoprawnym kodem XML widżetu.</translation>
     </message>
@@ -6991,42 +5679,34 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::WidgetBoxTreeWidget</name>
     <message>
-        <location filename="../tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp" line="-268"/>
         <source>Scratchpad</source>
         <translation>Notatnik</translation>
     </message>
     <message>
-        <location line="+370"/>
         <source>Custom Widgets</source>
         <translation>Własne widżety</translation>
     </message>
     <message>
-        <location line="+263"/>
         <source>Expand all</source>
         <translation>Rozwiń wszystkie</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Collapse all</source>
         <translation>Zwiń wszystkie</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>List View</source>
         <translation>Widok w formie listy</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Icon View</source>
         <translation>Widok z ikonkami</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Remove</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Edit name</source>
         <translation>Modyfikuj nazwę</translation>
     </message>
@@ -7034,7 +5714,6 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/widgetdatabase.cpp" line="-411"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation>Została znaleziona wtyczka widżetu, w której nazwa klasy (%1) odpowiada istniejącej już klasie.</translation>
     </message>
@@ -7042,7 +5721,6 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::WidgetEditorTool</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/tool_widgeteditor.cpp" line="+67"/>
         <source>Edit Widgets</source>
         <translation>Modyfikuj widżety</translation>
     </message>
@@ -7050,34 +5728,28 @@ Klasa: %2</translation>
 <context>
     <name>qdesigner_internal::WidgetFactory</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/widgetfactory.cpp" line="+263"/>
         <source>The custom widget factory registered for widgets of class %1 returned 0.</source>
         <translation>Fabryka widżetów użytkownika zarejestrowana dla widżetów klasy %1 zwróciła 0.</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2.</source>
         <translation>Wystąpiła niezgodność nazwy klasy podczas tworzenia widżetu przy pomocy fabryki widżetów użytkownika zarejestrowanej dla klasy %1. Zwrócony został widżet klasy %2.</translation>
     </message>
     <message>
-        <location line="+99"/>
         <source>%1 Widget</source>
         <translation>Widżet %1</translation>
     </message>
     <message>
-        <location line="+90"/>
         <source>The current page of the container &apos;%1&apos; (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget.</source>
         <translation>Podczas tworzenia rozmieszczenia nie można było określić bieżącej strony (%2) pojemnika &apos;%1&apos;. Wskazuje to na niespójność pliku ui, prawdopodobnie utworzone zostało zbędne rozmieszczenie dla tego pojemnika.</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>Attempt to add a layout to a widget &apos;%1&apos; (%2) which already has an unmanaged layout of type %3.
 This indicates an inconsistency in the ui-file.</source>
         <translation>Próba dodania rozmieszczenia do widżetu &apos;%1&apos; (%2) który posiada już niezarządzane rozmieszczenie typu %3.
 To wskazuje na niespójność w pliku &quot;ui&quot;.</translation>
     </message>
     <message>
-        <location line="+211"/>
         <source>Cannot create style &apos;%1&apos;.</source>
         <translation>Nie można utworzyć stylu &apos;%1&apos;.</translation>
     </message>
@@ -7085,12 +5757,10 @@ To wskazuje na niespójność w pliku &quot;ui&quot;.</translation>
 <context>
     <name>qdesigner_internal::WizardContainerWidgetTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="-49"/>
         <source>Next</source>
         <translation>Dalej</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Back</source>
         <translation>Wstecz</translation>
     </message>
@@ -7098,7 +5768,6 @@ To wskazuje na niespójność w pliku &quot;ui&quot;.</translation>
 <context>
     <name>qdesigner_internal::ZoomMenu</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/zoomwidget.cpp" line="+84"/>
         <source>%1 %</source>
         <extracomment>Zoom factor</extracomment>
         <translation>%1 %</translation>
@@ -7107,7 +5776,6 @@ To wskazuje na niespójność w pliku &quot;ui&quot;.</translation>
 <context>
     <name>qdesigner_internal::ZoomablePreviewDeviceSkin</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/previewmanager.cpp" line="-270"/>
         <source>&amp;Zoom</source>
         <translation>&amp;Powiększenie</translation>
     </message>
diff --git a/translations/qt_pl.ts b/translations/qt_pl.ts
index 53549da..f0b144e 100644
--- a/translations/qt_pl.ts
+++ b/translations/qt_pl.ts
@@ -4,7 +4,6 @@
 <context>
     <name>CloseButton</name>
     <message>
-        <location filename="../src/gui/widgets/qtabbar.cpp" line="+2319"/>
         <source>Close Tab</source>
         <translation>Zamknij kartę</translation>
     </message>
@@ -12,12 +11,10 @@
 <context>
     <name>FakeReply</name>
     <message>
-        <location filename="../src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp" line="+2278"/>
         <source>Fake error !</source>
         <translation>Fałszywy błąd!</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Invalid URL</source>
         <translation>Niepoprawny URL</translation>
     </message>
@@ -25,37 +22,30 @@
 <context>
     <name>MAC_APPLICATION_MENU</name>
     <message>
-        <location filename="../src/gui/kernel/qapplication.cpp" line="+2351"/>
         <source>Services</source>
         <translation>Usługi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hide %1</source>
         <translation>Ukryj %1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hide Others</source>
         <translation>Ukryj pozostałe</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Show All</source>
         <translation>Pokaż wszystko</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Preferences...</source>
         <translation>Preferencje…</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Quit %1</source>
         <translation>Zakończ %1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>About %1</source>
         <translation>%1…</translation>
     </message>
@@ -63,32 +53,26 @@
 <context>
     <name>Phonon::</name>
     <message>
-        <location filename="../src/3rdparty/phonon/phonon/phononnamespace.cpp" line="+55"/>
         <source>Notifications</source>
         <translation>Powiadomienia</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Music</source>
         <translation>Muzyka</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Video</source>
         <translation>Wideo</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Communication</source>
         <translation>Komunikacja</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Games</source>
         <translation>Gry</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Accessibility</source>
         <translation>Dostępność</translation>
     </message>
@@ -96,24 +80,18 @@
 <context>
     <name>Phonon::AudioOutput</name>
     <message>
-        <location filename="../src/3rdparty/phonon/phonon/audiooutput.cpp" line="+444"/>
-        <location line="+34"/>
         <source>&lt;html&gt;The audio playback device &lt;b&gt;%1&lt;/b&gt; does not work.&lt;br/&gt;Falling back to &lt;b&gt;%2&lt;/b&gt;.&lt;/html&gt;</source>
         <translation>&lt;html&gt;Urządzenie dźwiękowe &lt;b&gt;%1&lt;/b&gt; nie działa.&lt;br/&gt;Przywracanie do &lt;b&gt;%2&lt;/b&gt;.&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-21"/>
         <source>&lt;html&gt;Switching to the audio playback device &lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;which just became available and has higher preference.&lt;/html&gt;</source>
         <translation>&lt;html&gt;Przełączanie na urządzenie dźwiękowe &lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;które właśnie stało się dostępne i ma wyższy priorytet.&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+14"/>
         <source>Revert back to device &apos;%1&apos;</source>
         <translation>Przywróć do urządzenia &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>&lt;html&gt;Switching to the audio playback device &lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;which has higher preference or is specifically configured for this stream.&lt;/html&gt;</source>
         <translation>&lt;html&gt;Przełączanie na urządzenie dźwiękowe &lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;które ma wyższy priorytet lub jest specjalnie skonfigurowane dla tego strumienia.&lt;/html&gt;</translation>
     </message>
@@ -121,14 +99,12 @@
 <context>
     <name>Phonon::Gstreamer::Backend</name>
     <message>
-        <location filename="../src/3rdparty/phonon/gstreamer/backend.cpp" line="+188"/>
         <source>Warning: You do not seem to have the package gstreamer0.10-plugins-good installed.
           Some video features have been disabled.</source>
         <translation>Ostrzeżenie: Wygląda na to, że pakiet gstreamer0.10-plugins-good nie jest zainstalowany w tym systemie.
 Niektóre możliwości wideo zostały wyłączone.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Warning: You do not seem to have the base GStreamer plugins installed.
           All audio and video support has been disabled</source>
         <translation>Ostrzeżenie: Wygląda na to, że podstawowe wtyczki GStreamer nie są zainstalowane w tym systemie.
@@ -138,7 +114,6 @@ Obsługa dźwięku i wideo została wyłączona</translation>
 <context>
     <name>Phonon::Gstreamer::MediaObject</name>
     <message>
-        <location filename="../src/3rdparty/phonon/gstreamer/mediaobject.cpp" line="+93"/>
         <source>Cannot start playback. 
 
 Check your GStreamer installation and make sure you 
@@ -149,49 +124,34 @@ Sprawdź instalację Gstreamer i upewnij się że
 zainstalowałeś libgstreamer-plugins-base.</translation>
     </message>
     <message>
-        <location line="+129"/>
         <source>Missing codec helper script assistant.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Plugin codec installation failed for codec: %0</source>
         <translation>Błąd podczas instalacji wtyczki dla kodeka: %0</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>A required codec is missing. You need to install the following codec(s) to play this content: %0</source>
         <translation>Brak wymaganego kodeka. Aby odtworzyć zawartość musisz zainstalować poniższy kodek: %0</translation>
     </message>
     <message>
-        <location line="+730"/>
-        <location line="+6"/>
-        <location line="+13"/>
-        <location line="+24"/>
-        <location line="+6"/>
-        <location line="+18"/>
-        <location line="+434"/>
-        <location line="+24"/>
         <source>Could not open media source.</source>
         <translation>Nie można otworzyć źródła mediów.</translation>
     </message>
     <message>
-        <location line="-514"/>
         <source>Invalid source type.</source>
         <translation>Niepoprawny typ źródła.</translation>
     </message>
     <message>
-        <location line="+488"/>
         <source>Could not locate media source.</source>
         <translation>Nie można znaleźć źródła mediów.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Could not open audio device. The device is already in use.</source>
         <translation>Nie można otworzyć urządzenia dźwiękowego. Urządzenie jest już używane.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Could not decode media source.</source>
         <translation>Nie można zdekodować źródła mediów.</translation>
     </message>
@@ -199,162 +159,130 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
 <context>
     <name>Phonon::MMF</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/audiooutput.cpp" line="+106"/>
         <source>Audio Output</source>
         <translation>Wyjście dźwięku</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The audio output device</source>
         <translation>Wyjściowe urządzenie dźwiękowe</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/utils.cpp" line="+89"/>
         <source>No error</source>
         <translation>Brak błędu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Not found</source>
         <translation>Nie znaleziono</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Out of memory</source>
         <translation>Brak pamięci</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Not supported</source>
         <translation>Nieobsługiwane</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Overflow</source>
         <translation>Przepełnienie</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Underflow</source>
         <translation>Niedopełnienie</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Already exists</source>
         <translation>Już istnieje</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Path not found</source>
         <translation>Nie znaleziono ścieżki</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>In use</source>
         <translation>W użyciu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Not ready</source>
         <translation>Brak gotowości</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Access denied</source>
         <translation>Odmowa dostępu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Could not connect</source>
         <translation>Nie można połączyć</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Disconnected</source>
         <translation>Rozłączono</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Permission denied</source>
         <translation>Brak uprawnień</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Insufficient bandwidth</source>
         <translation>Niewystarczająca szerokość pasma</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Network unavailable</source>
         <translation>Sieć niedostępna</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Network communication error</source>
         <translation>Błąd komunikacji sieciowej</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Streaming not supported</source>
         <translation>Transmisje strumieniowe nie są obsługiwane</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Server alert</source>
         <translation>Ostrzeżenie serwera</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Invalid protocol</source>
         <translation>Nieprawidłowy protokół</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Invalid URL</source>
         <translation>Nieprawidłowy adres URL</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Multicast error</source>
         <translation>Błąd multiemisji</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Proxy server error</source>
         <translation>Błąd serwera pośredniczącego</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Proxy server not supported</source>
         <translation>Nieobsługiwany serwer pośredniczący</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Audio output error</source>
         <translation>Błąd wyjściowego sygnału dźwiękowego</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Video output error</source>
         <translation>Błąd wyjściowego sygnału wideo</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Decoder error</source>
         <translation>Błąd dekodera</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Audio or video components could not be played</source>
         <translation>Nie można odtworzyć dźwięku lub wideo</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>DRM error</source>
         <translation>Błąd DRM</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unknown error (%1)</source>
         <translation>Nieznany błąd (%1)</translation>
     </message>
@@ -362,33 +290,34 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
 <context>
     <name>Phonon::MMF::AbstractMediaPlayer</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/abstractmediaplayer.cpp" line="+73"/>
         <source>Not ready to play</source>
         <translation>Brak gotowości odtwarzania</translation>
     </message>
     <message>
-        <location line="+161"/>
-        <location line="+10"/>
         <source>Error opening file</source>
         <translation>Błąd otwierania pliku</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Error opening URL</source>
         <translation>Błąd otwierania adresu URL</translation>
     </message>
     <message>
-        <location line="+83"/>
+        <source>Error opening resource</source>
+        <translation>Błąd otwierania zasobu</translation>
+    </message>
+    <message>
+        <source>Error opening source: resource not opened</source>
+        <translation>Błąd otwierania źródła: zasób nie został otwarty</translation>
+    </message>
+    <message>
         <source>Setting volume failed</source>
         <translation>Ustawienie głośności zakończone błędem</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Loading clip failed</source>
         <translation>Załadowanie klipu zakończone błędem</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Playback complete</source>
         <translation>Zakończono odtwarzanie</translation>
     </message>
@@ -396,22 +325,18 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
 <context>
     <name>Phonon::MMF::AbstractVideoPlayer</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/abstractvideoplayer.cpp" line="+110"/>
         <source>Pause failed</source>
         <translation>Zatrzymanie zakończone błędem</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Seek failed</source>
         <translation>Wyszukiwanie zakończone błędem</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>Getting position failed</source>
         <translation>Ustalanie pozycji zakończone błędem</translation>
     </message>
     <message>
-        <location line="+68"/>
         <source>Opening clip failed</source>
         <translation>Otwieranie klipu zakończone błędem</translation>
     </message>
@@ -419,7 +344,6 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
 <context>
     <name>Phonon::MMF::AudioEqualizer</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/audioequalizer.cpp" line="+92"/>
         <source>%1 Hz</source>
         <translation>%1 Hz</translation>
     </message>
@@ -427,7 +351,6 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
 <context>
     <name>Phonon::MMF::AudioPlayer</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/audioplayer.cpp" line="+173"/>
         <source>Getting position failed</source>
         <translation>Ustalanie pozycji zakończone błędem</translation>
     </message>
@@ -435,11 +358,6 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
 <context>
     <name>Phonon::MMF::DsaVideoPlayer</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/videoplayer_dsa.cpp" line="+241"/>
-        <location line="+15"/>
-        <location line="+8"/>
-        <location line="+22"/>
-        <location line="+22"/>
         <source>Video display error</source>
         <translation>Błąd wyświetlacza wideo</translation>
     </message>
@@ -447,7 +365,6 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
 <context>
     <name>Phonon::MMF::EffectFactory</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/effectfactory.cpp" line="+181"/>
         <source>Enabled</source>
         <translation>Włączono</translation>
     </message>
@@ -455,61 +372,51 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
 <context>
     <name>Phonon::MMF::EnvironmentalReverb</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/environmentalreverb.cpp" line="+146"/>
         <source>Decay HF ratio (%)</source>
         <extracomment>DecayHFRatio: Ratio of high-frequency decay time to the value specified by DecayTime.</extracomment>
         <translation>Współczynnik zanikania HF (%)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Decay time (ms)</source>
         <extracomment>DecayTime: Time over which reverberation is diminished.</extracomment>
         <translation>Czas zanikania (ms)</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Density (%)</source>
         <extracomment>Density Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Diffusion value.</extracomment>
         <translation>Gęstość (%)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Diffusion (%)</source>
         <extracomment>Diffusion: Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Density value.</extracomment>
         <translation>Rozpraszanie (%)</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Reflections delay (ms)</source>
         <extracomment>ReflectionsDelay: Amount of delay between the arrival the direct path from the source and the arrival of the first reflection.</extracomment>
         <translation>Opóźnienie odbić (ms)</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Reflections level (mB)</source>
         <extracomment>ReflectionsLevel: Amplitude of reflections. This value is corrected by the RoomLevel to give the final reflection amplitude.</extracomment>
         <translation>Poziom odbić (mB)</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Reverb delay (ms)</source>
         <extracomment>ReverbDelay: Amount of time between arrival of the first reflection and start of the late reverberation.</extracomment>
         <translation>Opóźnienie pogłosu (ms)</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Reverb level (mB)</source>
         <extracomment>ReverbLevel Amplitude of reverberations. This value is corrected by the RoomLevel to give the final reverberation amplitude.</extracomment>
         <translation>Poziom pogłosu (mB)</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Room HF level</source>
         <extracomment>RoomHFLevel: Amplitude of low-pass filter used to attenuate the high frequency component of reflected sound.</extracomment>
         <translation>Poziom HF pomieszczenia</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Room level (mB)</source>
         <extracomment>RoomLevel: Master volume control for all reflected sound.</extracomment>
         <translation>Poziom pomieszczenia (mB)</translation>
@@ -518,12 +425,18 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
 <context>
     <name>Phonon::MMF::MediaObject</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/mediaobject.cpp" line="+276"/>
         <source>Error opening source: type not supported</source>
         <translation>Błąd otwierania źródła: typ źródła nie jest obsługiwany</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <source>Error opening source: resource is compressed</source>
+        <translation>Błąd otwierania źródła: zasób jest skompresowany</translation>
+    </message>
+    <message>
+        <source>Error opening source: resource not valid</source>
+        <translation>Błąd otwierania źródła: niepoprawny zasób</translation>
+    </message>
+    <message>
         <source>Error opening source: media type could not be determined</source>
         <translation>Błąd otwierania źródła: nie można określić typu multimediów</translation>
     </message>
@@ -531,7 +444,6 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
 <context>
     <name>Phonon::MMF::StereoWidening</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/stereowidening.cpp" line="+79"/>
         <source>Level (%)</source>
         <translation>Poziom (%)</translation>
     </message>
@@ -539,8 +451,6 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
 <context>
     <name>Phonon::MMF::SurfaceVideoPlayer</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/videoplayer_surface.cpp" line="+139"/>
-        <location line="+26"/>
         <source>Video display error</source>
         <translation>Błąd wyświetlacza wideo</translation>
     </message>
@@ -548,22 +458,14 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
 <context>
     <name>Phonon::VolumeSlider</name>
     <message>
-        <location filename="../src/3rdparty/phonon/phonon/volumeslider.cpp" line="+42"/>
-        <location line="+18"/>
-        <location line="+129"/>
-        <location line="+15"/>
         <source>Volume: %1%</source>
         <translation>Głośność: %1%</translation>
     </message>
     <message>
-        <location line="-159"/>
-        <location line="+18"/>
-        <location line="+54"/>
         <source>Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1%</source>
         <translation>Użyj tego suwaka aby zmienić głośność. Skrajnie lewa pozycja to 0%, skrajnie prawa to %1%</translation>
     </message>
     <message>
-        <location line="+67"/>
         <source>Muted</source>
         <translation>Wyciszony</translation>
     </message>
@@ -571,12 +473,10 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
 <context>
     <name>Q3Accel</name>
     <message>
-        <location filename="../src/qt3support/other/q3accel.cpp" line="+481"/>
         <source>%1, %2 not defined</source>
         <translation>%1, %2 nie określone</translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>Ambiguous %1 not handled</source>
         <translation>Niejednoznaczne %1, nie obsłużone</translation>
     </message>
@@ -584,27 +484,22 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
 <context>
     <name>Q3DataTable</name>
     <message>
-        <location filename="../src/qt3support/sql/q3datatable.cpp" line="+793"/>
         <source>Delete</source>
         <translation>Skasuj</translation>
     </message>
     <message>
-        <location line="-507"/>
         <source>False</source>
         <translation>Fałsz</translation>
     </message>
     <message>
-        <location line="+505"/>
         <source>Insert</source>
         <translation>Wstaw</translation>
     </message>
     <message>
-        <location line="-506"/>
         <source>True</source>
         <translation>Prawda</translation>
     </message>
     <message>
-        <location line="+507"/>
         <source>Update</source>
         <translation>Uaktualnij</translation>
     </message>
@@ -612,7 +507,6 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
 <context>
     <name>Q3FileDialog</name>
     <message>
-        <location filename="../src/qt3support/dialogs/q3filedialog.cpp" line="+4501"/>
         <source>%1
 File not found.
 Check path and filename.</source>
@@ -621,323 +515,246 @@ Plik nie znaleziony.
 Sprawdź ścieżkę i nazwę pliku.</translation>
     </message>
     <message>
-        <location line="-298"/>
         <source>&lt;qt&gt;Are you sure you wish to delete %1 &quot;%2&quot;?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Na pewno chcesz skasować %1 &quot;%2&quot;?&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location line="-1924"/>
-        <location line="+49"/>
-        <location line="+2149"/>
-        <location filename="../src/qt3support/dialogs/q3filedialog_mac.cpp" line="+133"/>
         <source>All Files (*)</source>
         <translation>Wszystkie pliki (*)</translation>
     </message>
     <message>
-        <location line="-2080"/>
         <source>Attributes</source>
         <translation>Atrybuty</translation>
     </message>
     <message>
-        <location line="+84"/>
         <source>Back</source>
         <translation>Powrót</translation>
     </message>
     <message>
-        <location line="-1624"/>
-        <location line="+1579"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location line="-1601"/>
         <source>Copy or Move a File</source>
         <translation>Skopiuj lub przenieś plik</translation>
     </message>
     <message>
-        <location line="+1662"/>
         <source>Create New Folder</source>
         <translation>Utwórz nowy katalog</translation>
     </message>
     <message>
-        <location line="-101"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location line="+1720"/>
         <source>&amp;Delete</source>
         <translation>&amp;Skasuj</translation>
     </message>
     <message>
-        <location line="+86"/>
         <source>Delete %1</source>
         <translation>Skasuj %1</translation>
     </message>
     <message>
-        <location line="-1679"/>
         <source>Detail View</source>
         <translation>Szczegóły</translation>
     </message>
     <message>
-        <location line="+125"/>
         <source>Dir</source>
         <translation>Katalog</translation>
     </message>
     <message>
-        <location line="+1706"/>
-        <location line="+108"/>
         <source>Directories</source>
         <translation>Katalogi</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>Directory:</source>
         <translation>Katalog:</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+1009"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location line="-2862"/>
         <source>File</source>
         <translation>Plik</translation>
     </message>
     <message>
-        <location line="-174"/>
-        <location line="+1977"/>
-        <location line="+16"/>
         <source>File &amp;name:</source>
         <translation>Nazwa &amp;pliku:</translation>
     </message>
     <message>
-        <location line="-1992"/>
         <source>File &amp;type:</source>
         <translation>&amp;Rodzaj pliku:</translation>
     </message>
     <message>
-        <location line="+1875"/>
         <source>Find Directory</source>
         <translation>Znajdź katalog</translation>
     </message>
     <message>
-        <location line="-1707"/>
         <source>Inaccessible</source>
         <translation>Niedostępny</translation>
     </message>
     <message>
-        <location line="-127"/>
         <source>List View</source>
         <translation>Lista</translation>
     </message>
     <message>
-        <location line="-43"/>
         <source>Look &amp;in:</source>
         <translation>Sprawdź &amp;w:</translation>
     </message>
     <message>
-        <location line="-80"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location line="+1854"/>
         <source>New Folder</source>
         <translation>Nowy katalog</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>New Folder %1</source>
         <translation>Nowy katalog %1</translation>
     </message>
     <message>
-        <location line="-10"/>
         <source>New Folder 1</source>
         <translation>Nowy katalog 1</translation>
     </message>
     <message>
-        <location line="-36"/>
         <source>&amp;No</source>
         <translation>&amp;Nie</translation>
     </message>
     <message>
-        <location line="-1773"/>
-        <location line="+2027"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location line="-1971"/>
         <source>One directory up</source>
         <translation>Katalog wyżej</translation>
     </message>
     <message>
-        <location line="+1617"/>
-        <location line="+5"/>
-        <location line="+355"/>
         <source>&amp;Open</source>
         <translation>&amp;Otwórz</translation>
     </message>
     <message>
-        <location line="-1112"/>
-        <location line="+1999"/>
-        <location filename="../src/qt3support/dialogs/q3filedialog_win.cpp" line="+209"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
     <message>
-        <location line="-2801"/>
         <source>Preview File Contents</source>
         <translation>Podgląd zawartości pliku</translation>
     </message>
     <message>
-        <location line="-19"/>
         <source>Preview File Info</source>
         <translation>Podgląd informacji o pliku</translation>
     </message>
     <message>
-        <location line="-1689"/>
         <source>Read: %1</source>
         <translation>Czytaj: %1</translation>
     </message>
     <message>
-        <location line="+1797"/>
         <source>Read-only</source>
         <translation>Tylko do odczytu</translation>
     </message>
     <message>
-        <location line="-1"/>
         <source>Read-write</source>
         <translation>Do zapisu i odczytu</translation>
     </message>
     <message>
-        <location line="+1497"/>
         <source>R&amp;eload</source>
         <translation>&amp;Odśwież</translation>
     </message>
     <message>
-        <location line="-21"/>
         <source>&amp;Rename</source>
         <translation>&amp;Zmień nazwę</translation>
     </message>
     <message>
-        <location line="-7"/>
-        <location line="+341"/>
         <source>&amp;Save</source>
         <translation>&amp;Zachowaj</translation>
     </message>
     <message>
-        <location line="-986"/>
-        <location filename="../src/qt3support/dialogs/q3filedialog_win.cpp" line="+71"/>
         <source>Save As</source>
         <translation>Zachowaj jako</translation>
     </message>
     <message>
-        <location line="+701"/>
         <source>Show &amp;hidden files</source>
         <translation>Pokaż &amp;ukryte pliki</translation>
     </message>
     <message>
-        <location line="-1771"/>
         <source>Size</source>
         <translation>Rozmiar</translation>
     </message>
     <message>
-        <location line="+1767"/>
         <source>Sort</source>
         <translation>Sortuj</translation>
     </message>
     <message>
-        <location line="-17"/>
         <source>Sort by &amp;Date</source>
         <translation>Sortuj po &amp;dacie</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>Sort by &amp;Name</source>
         <translation>Sortuj &amp;po nazwie</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Sort by &amp;Size</source>
         <translation>Sortuj po &amp;rozmiarze</translation>
     </message>
     <message>
-        <location line="-1493"/>
         <source>Special</source>
         <translation>Specjalny </translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>Symlink to Directory</source>
         <translation>Dowiązanie symboliczne do katalogu</translation>
     </message>
     <message>
-        <location line="-1"/>
         <source>Symlink to File</source>
         <translation>Dowiązanie symboliczne do pliku</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Symlink to Special</source>
         <translation>Dowiązanie symboliczne do pliku specjalnego</translation>
     </message>
     <message>
-        <location line="+1551"/>
         <source>the directory</source>
         <translation>katalog</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>the file</source>
         <translation>plik</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>the symlink</source>
         <translation>dowiązanie symboliczne</translation>
     </message>
     <message>
-        <location line="-1804"/>
         <source>Type</source>
         <translation>Rodzaj</translation>
     </message>
     <message>
-        <location line="+1750"/>
         <source>&amp;Unsorted</source>
         <translation>&amp;Bez sortowania</translation>
     </message>
     <message>
-        <location line="-3296"/>
-        <location line="+30"/>
         <source>Write: %1</source>
         <translation>Pisz: %1</translation>
     </message>
     <message>
-        <location line="+1762"/>
         <source>Write-only</source>
         <translation>Tylko do zapisu</translation>
     </message>
     <message>
-        <location line="+1564"/>
         <source>&amp;Yes</source>
         <translation>&amp;Tak</translation>
     </message>
     <message>
-        <location filename="../src/qt3support/dialogs/q3filedialog_win.cpp" line="-191"/>
         <source>All Files (*.*)</source>
         <translation>Wszystkie pliki (*.*)</translation>
     </message>
     <message>
-        <location line="+264"/>
         <source>Open </source>
         <translation>Otwórz </translation>
     </message>
     <message>
-        <location line="+107"/>
         <source>Select a Directory</source>
         <translation>Wybierz katalog</translation>
     </message>
@@ -945,36 +762,30 @@ Sprawdź ścieżkę i nazwę pliku.</translation>
 <context>
     <name>Q3LocalFs</name>
     <message>
-        <location filename="../src/qt3support/network/q3localfs.cpp" line="+185"/>
         <source>Could not create directory
 %1</source>
         <translation>Nie można utworzyć katalogu
 %1</translation>
     </message>
     <message>
-        <location line="+86"/>
         <source>Could not open
 %1</source>
         <translation>Nie można otworzyć
 %1</translation>
     </message>
     <message>
-        <location line="-141"/>
-        <location line="+10"/>
         <source>Could not read directory
 %1</source>
         <translation>Nie można czytać katalogu
 %1</translation>
     </message>
     <message>
-        <location line="+79"/>
         <source>Could not remove file or directory
 %1</source>
         <translation>Nie można usunąć pliku lub katalogu
 %1</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Could not rename
 %1
 to
@@ -985,7 +796,6 @@ na
 %2</translation>
     </message>
     <message>
-        <location line="+93"/>
         <source>Could not write
 %1</source>
         <translation>Nie można zapisać
@@ -995,12 +805,10 @@ na
 <context>
     <name>Q3MainWindow</name>
     <message>
-        <location filename="../src/qt3support/widgets/q3mainwindow.cpp" line="+2053"/>
         <source>Customize...</source>
         <translation>Ustawienia użytkownika...</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>Line up</source>
         <translation>Wyrównaj położenie</translation>
     </message>
@@ -1008,7 +816,6 @@ na
 <context>
     <name>Q3NetworkProtocol</name>
     <message>
-        <location filename="../src/qt3support/network/q3networkprotocol.cpp" line="+854"/>
         <source>Operation stopped by the user</source>
         <translation>Operacja zatrzymana przez użytkownika</translation>
     </message>
@@ -1016,8 +823,6 @@ na
 <context>
     <name>Q3ProgressDialog</name>
     <message>
-        <location filename="../src/qt3support/dialogs/q3progressdialog.cpp" line="+224"/>
-        <location line="+61"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
@@ -1025,28 +830,22 @@ na
 <context>
     <name>Q3TabDialog</name>
     <message>
-        <location filename="../src/qt3support/dialogs/q3tabdialog.cpp" line="+648"/>
         <source>Apply</source>
         <translation>Zatwierdź</translation>
     </message>
     <message>
-        <location line="+138"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location line="-50"/>
         <source>Defaults</source>
         <translation>Domyślne</translation>
     </message>
     <message>
-        <location line="-45"/>
         <source>Help</source>
         <translation>Pomoc</translation>
     </message>
     <message>
-        <location line="-501"/>
-        <location line="+824"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -1054,38 +853,30 @@ na
 <context>
     <name>Q3TextEdit</name>
     <message>
-        <location filename="../src/qt3support/text/q3textedit.cpp" line="+5441"/>
         <source>Clear</source>
         <translation>Wyczyść</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>&amp;Copy</source>
         <translation>S&amp;kopiuj</translation>
     </message>
     <message>
-        <location line="-1"/>
         <source>Cu&amp;t</source>
         <translation>W&amp;ytnij</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Paste</source>
         <translation>&amp;Wklej</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>&amp;Redo</source>
         <translation>&amp;Przywróć</translation>
     </message>
     <message>
-        <location line="+15"/>
-        <location line="+2"/>
         <source>Select All</source>
         <translation>Zaznacz wszystko</translation>
     </message>
     <message>
-        <location line="-18"/>
         <source>&amp;Undo</source>
         <translation>&amp;Cofnij</translation>
     </message>
@@ -1093,67 +884,54 @@ na
 <context>
     <name>Q3TitleBar</name>
     <message>
-        <location filename="../src/plugins/accessible/compat/q3complexwidgets.cpp" line="+256"/>
         <source>Close</source>
         <translation>Zamknij okno</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Closes the window</source>
         <translation>Zamyka okno</translation>
     </message>
     <message>
-        <location line="-10"/>
         <source>Contains commands to manipulate the window</source>
         <translation>Zawiera polecenia zarządzające oknem</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Displays the name of the window and contains controls to manipulate it</source>
         <translation>Wyświetla nazwę okna i zawiera elementy do zarządzania nim</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>Makes the window full screen</source>
         <translation>Powiększa maksymalnie okno</translation>
     </message>
     <message>
-        <location line="-28"/>
         <source>Maximize</source>
         <translation>Zmaksymalizuj</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>Minimize</source>
         <translation>Zminimalizuj</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Puts a minimized window back to normal</source>
         <translation>Przywraca normalny rozmiar uprzednio zminimalizowanego okna</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Moves the window out of the way</source>
         <translation>Przenosi okno w inne położenie</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Puts a maximized window back to normal</source>
         <translation>Przywraca normalny rozmiar uprzednio zmaksymalizowanego okna</translation>
     </message>
     <message>
-        <location line="-28"/>
         <source>Restore down</source>
         <translation>Przywróć pod spód</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>Restore up</source>
         <translation>Przywróć na wierzch</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>System</source>
         <translation>System</translation>
     </message>
@@ -1161,7 +939,6 @@ na
 <context>
     <name>Q3ToolBar</name>
     <message>
-        <location filename="../src/qt3support/widgets/q3toolbar.cpp" line="+692"/>
         <source>More...</source>
         <translation>Więcej...</translation>
     </message>
@@ -1169,51 +946,38 @@ na
 <context>
     <name>Q3UrlOperator</name>
     <message>
-        <location filename="../src/qt3support/network/q3urloperator.cpp" line="+889"/>
-        <location line="+1"/>
         <source>(unknown)</source>
         <translation>(nieznany)</translation>
     </message>
     <message>
-        <location line="-242"/>
-        <location line="+4"/>
         <source>The protocol `%1&apos; does not support copying or moving files or directories</source>
         <translation>Protokół &apos;%1&apos; nie obsługuje kopiowania lub przenoszenia plików lub katalogów</translation>
     </message>
     <message>
-        <location line="-259"/>
         <source>The protocol `%1&apos; does not support creating new directories</source>
         <translation>Protokół &apos;%1&apos; nie obsługuje tworzenia nowych katalogów</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>The protocol `%1&apos; does not support getting files</source>
         <translation>Protokół &apos;%1&apos; nie obsługuje pobierania plików</translation>
     </message>
     <message>
-        <location line="-12"/>
         <source>The protocol `%1&apos; does not support listing directories</source>
         <translation>Protokół &apos;%1&apos; nie obsługuje pokazywania katalogów</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>The protocol `%1&apos; does not support putting files</source>
         <translation>Protokół &apos;%1&apos; nie obsługuje wysyłania plików</translation>
     </message>
     <message>
-        <location line="-9"/>
         <source>The protocol `%1&apos; does not support removing files or directories</source>
         <translation>Protokół &apos;%1&apos; nie obsługuje usuwania plików lub katalogów</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The protocol `%1&apos; does not support renaming files or directories</source>
         <translation>Protokół &apos;%1&apos; nie obsługuje zmiany nazwy plików lub katalogów</translation>
     </message>
     <message>
-        <location line="-13"/>
-        <location line="+260"/>
-        <location line="+4"/>
         <source>The protocol `%1&apos; is not supported</source>
         <translation>Protokół &apos;%1&apos; nie jest obsługiwany</translation>
     </message>
@@ -1221,27 +985,22 @@ na
 <context>
     <name>Q3Wizard</name>
     <message>
-        <location filename="../src/qt3support/dialogs/q3wizard.cpp" line="+178"/>
         <source>&lt; &amp;Back</source>
         <translation>&lt; &amp;Wstecz</translation>
     </message>
     <message>
-        <location line="-1"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Anuluj</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Finish</source>
         <translation>&amp;Zakończ</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Help</source>
         <translation>&amp;Pomoc</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>&amp;Next &gt;</source>
         <translation>&amp;Dalej &gt;</translation>
     </message>
@@ -1249,45 +1008,30 @@ na
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+966"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+632"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+691"/>
         <source>Connection refused</source>
         <translation>Połączenie odrzucone</translation>
     </message>
     <message>
-        <location line="-50"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="-3"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="-30"/>
-        <location line="+26"/>
         <source>Host not found</source>
         <translation>Host nie znaleziony</translation>
     </message>
     <message>
-        <location line="+192"/>
         <source>Connection timed out</source>
         <translation>Przekroczony czas połączenia</translation>
     </message>
     <message>
-        <location line="-559"/>
-        <location line="+809"/>
-        <location line="+220"/>
         <source>Operation on socket is not supported</source>
         <translation>Operacja na gnieździe nie jest obsługiwana</translation>
     </message>
     <message>
-        <location line="+583"/>
         <source>Socket is not connected</source>
         <translation>Gniazdo nie jest podłączone</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+620"/>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="-380"/>
         <source>Socket operation timed out</source>
         <translation>Przekroczony czas operacji gniazda</translation>
     </message>
     <message>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="-4"/>
         <source>Network unreachable</source>
         <translation>Sieć niedostępna</translation>
     </message>
@@ -1295,17 +1039,14 @@ na
 <context>
     <name>QAbstractSpinBox</name>
     <message>
-        <location filename="../src/gui/widgets/qabstractspinbox.cpp" line="+1265"/>
         <source>Step &amp;down</source>
         <translation>Krok w &amp;dół</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>&amp;Step up</source>
         <translation>Krok do &amp;góry</translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>&amp;Select All</source>
         <translation>&amp;Zaznacz wszystko</translation>
     </message>
@@ -1313,7 +1054,6 @@ na
 <context>
     <name>QAccessibleButton</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/simplewidgets.cpp" line="+250"/>
         <source>Press</source>
         <translation>Wciśnij</translation>
     </message>
@@ -1321,27 +1061,22 @@ na
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/gui/accessible/qaccessibleobject.cpp" line="+376"/>
         <source>Activate</source>
         <translation>Uaktywnij</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Activates the program&apos;s main window</source>
         <translation>Uaktywnia główne okno programu</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qmessagebox.h" line="+354"/>
         <source>Executable &apos;%1&apos; requires Qt %2, found Qt %3.</source>
         <translation>Program &apos;%1&apos; wymaga do uruchomienia Qt %2, znaleziono Qt %3.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Incompatible Qt Library Error</source>
         <translation>Niekompatybilność biblioteki Qt</translation>
     </message>
     <message>
-        <location filename="../src/gui/kernel/qapplication.cpp" line="-13"/>
         <source>QT_LAYOUT_DIRECTION</source>
         <comment>Translate this string to the string &apos;LTR&apos; in left-to-right languages or to &apos;RTL&apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment>
         <translation>LTR</translation>
@@ -1350,22 +1085,18 @@ na
 <context>
     <name>QAxSelect</name>
     <message>
-        <location filename="../src/activeqt/container/qaxselect.ui"/>
         <source>Select ActiveX Control</source>
         <translation>Wybierz kontrolkę ActiveX</translation>
     </message>
     <message>
-        <location/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Cancel</source>
         <translation>&amp;Anuluj</translation>
     </message>
     <message>
-        <location/>
         <source>COM &amp;Object:</source>
         <translation>&amp;Obiekt COM:</translation>
     </message>
@@ -1373,17 +1104,14 @@ na
 <context>
     <name>QCheckBox</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/simplewidgets.cpp" line="-133"/>
         <source>Check</source>
         <translation>Zaznacz</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Toggle</source>
         <translation>Przełącz</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>Uncheck</source>
         <translation>Odznacz</translation>
     </message>
@@ -1391,57 +1119,46 @@ na
 <context>
     <name>QColorDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qcolordialog.cpp" line="+1670"/>
         <source>&amp;Add to Custom Colors</source>
         <translation>&amp;Dodaj do własnych kolorów</translation>
     </message>
     <message>
-        <location line="-286"/>
         <source>A&amp;lpha channel:</source>
         <translation>Kanał &amp;alfa:</translation>
     </message>
     <message>
-        <location line="+101"/>
         <source>Select Color</source>
         <translation>Wybierz kolor</translation>
     </message>
     <message>
-        <location line="+183"/>
         <source>&amp;Basic colors</source>
         <translation>&amp;Kolory podstawowe</translation>
     </message>
     <message>
-        <location line="-285"/>
         <source>Bl&amp;ue:</source>
         <translation>Błęki&amp;t:</translation>
     </message>
     <message>
-        <location line="+286"/>
         <source>&amp;Custom colors</source>
         <translation>Wła&amp;sne kolory</translation>
     </message>
     <message>
-        <location line="-287"/>
         <source>&amp;Green:</source>
         <translation>&amp;Zieleń:</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>Hu&amp;e:</source>
         <translation>&amp;Barwa:</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Red:</source>
         <translation>&amp;Czerwień:</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>&amp;Sat:</source>
         <translation>&amp;Nasycenie:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Val:</source>
         <translation>&amp;Wartość:</translation>
     </message>
@@ -1449,23 +1166,18 @@ na
 <context>
     <name>QComboBox</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/complexwidgets.cpp" line="+1776"/>
-        <location line="+65"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
     <message>
-        <location filename="../src/gui/itemviews/qitemeditorfactory.cpp" line="+556"/>
         <source>False</source>
         <translation>Fałsz</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>True</source>
         <translation>Prawda</translation>
     </message>
     <message>
-        <location filename="../src/plugins/accessible/widgets/complexwidgets.cpp" line="+0"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
@@ -1473,43 +1185,36 @@ na
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../src/corelib/kernel/qsystemsemaphore_symbian.cpp" line="+65"/>
         <source>%1: already exists</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: już istnieje</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1: does not exist</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: nie istnieje</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>%1: out of resources</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: zasoby wyczerpane</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1: unknown error %2</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: nieznany błąd %2</translation>
     </message>
     <message>
-        <location filename="../src/corelib/kernel/qsystemsemaphore_unix.cpp" line="+119"/>
         <source>%1: key is empty</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: klucz jest pusty</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>%1: unable to make key</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: nie można utworzyć klucza</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>%1: ftok failed</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: wystąpił błąd w funkcji ftok()</translation>
@@ -1518,22 +1223,18 @@ na
 <context>
     <name>QDB2Driver</name>
     <message>
-        <location filename="../src/sql/drivers/db2/qsql_db2.cpp" line="+1253"/>
         <source>Unable to connect</source>
         <translation>Nie można nawiązać połączenia</translation>
     </message>
     <message>
-        <location line="+298"/>
         <source>Unable to commit transaction</source>
         <translation>Nie można dokonać transakcji</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to rollback transaction</source>
         <translation>Nie można wycofać transakcji</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to set autocommit</source>
         <translation>Nie można ustawić trybu automatycznego dokonywania transakcji</translation>
     </message>
@@ -1541,33 +1242,26 @@ na
 <context>
     <name>QDB2Result</name>
     <message>
-        <location line="-1030"/>
-        <location line="+240"/>
         <source>Unable to execute statement</source>
         <translation>Nie można wykonać polecenia</translation>
     </message>
     <message>
-        <location line="-203"/>
         <source>Unable to prepare statement</source>
         <translation>Nie można przygotować polecenia</translation>
     </message>
     <message>
-        <location line="+193"/>
         <source>Unable to bind variable</source>
         <translation>Nie można powiązać zmiennej</translation>
     </message>
     <message>
-        <location line="+89"/>
         <source>Unable to fetch record %1</source>
         <translation>Nie można pobrać rekordu %1</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to fetch next</source>
         <translation>Nie można pobrać kolejnego wiersza danych</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Unable to fetch first</source>
         <translation>Nie można pobrać pierwszego wiersza danych</translation>
     </message>
@@ -1575,22 +1269,18 @@ na
 <context>
     <name>QDateTimeEdit</name>
     <message>
-        <location filename="../src/gui/widgets/qdatetimeedit.cpp" line="+2287"/>
         <source>am</source>
         <translation>am</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>pm</source>
         <translation>pm</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>PM</source>
         <translation>PM</translation>
     </message>
@@ -1598,17 +1288,14 @@ na
 <context>
     <name>QDeclarativeAbstractAnimation</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeanimation.cpp" line="+176"/>
         <source>Cannot animate non-existent property &quot;%1&quot;</source>
         <translation>Nie można animować nieistniejącej właściwości &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cannot animate read-only property &quot;%1&quot;</source>
         <translation>Nie można animować właściwości (tylko do odczytu): &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+120"/>
         <source>Animation is an abstract class</source>
         <translation>&quot;Animation&quot; jest klasą abstrakcyjną</translation>
     </message>
@@ -1616,7 +1303,6 @@ na
 <context>
     <name>QDeclarativeAnchorAnimation</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeanimation.cpp" line="+2616"/>
         <source>Cannot set a duration of &lt; 0</source>
         <translation>Nie można ustawić ujemnego czasu trwania</translation>
     </message>
@@ -1624,67 +1310,50 @@ na
 <context>
     <name>QDeclarativeAnchors</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeanchors.cpp" line="+204"/>
         <source>Possible anchor loop detected on fill.</source>
         <translation>Wykryto możliwe zapętlenie dla kotwicy &quot;fill&quot;.</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Possible anchor loop detected on centerIn.</source>
         <translation>Wykryto możliwe zapętlenie dla kotwicy &quot;centerIn&quot;.</translation>
     </message>
     <message>
-        <location line="+201"/>
-        <location line="+34"/>
-        <location line="+610"/>
-        <location line="+37"/>
         <source>Cannot anchor to an item that isn&apos;t a parent or sibling.</source>
         <translation>Nie można doczepić kotwicy do elementu który nie jest rodzicem ani rodzeństwem.</translation>
     </message>
     <message>
-        <location line="-534"/>
         <source>Possible anchor loop detected on vertical anchor.</source>
         <translation>Wykryto możliwe zapętlenie dla pionowej kotwicy.</translation>
     </message>
     <message>
-        <location line="+59"/>
         <source>Possible anchor loop detected on horizontal anchor.</source>
         <translation>Wykryto możliwe zapętlenie dla poziomej kotwicy.</translation>
     </message>
     <message>
-        <location line="+422"/>
         <source>Cannot specify left, right, and hcenter anchors.</source>
         <translation>Nie można jednocześnie podać lewej, prawej i centralnej poziomej kotwicy.</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+37"/>
         <source>Cannot anchor to a null item.</source>
         <translation>Nie można doczepić kotwicy do zerowego elementu.</translation>
     </message>
     <message>
-        <location line="-34"/>
         <source>Cannot anchor a horizontal edge to a vertical edge.</source>
         <translation>Nie można doczepić poziomej krawędzi do pionowej.</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+37"/>
         <source>Cannot anchor item to self.</source>
         <translation>Nie można doczepić kotwicy do tego samego elementu.</translation>
     </message>
     <message>
-        <location line="-25"/>
         <source>Cannot specify top, bottom, and vcenter anchors.</source>
         <translation>Nie można jednocześnie podać górnej, dolnej i centralnej pionowej kotwicy.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors.</source>
         <translation>Bazowa kotwica nie może być użyta w połączeniu z górną, dolną lub centralną pionową kotwicą.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Cannot anchor a vertical edge to a horizontal edge.</source>
         <translation>Nie można doczepić pionowej krawędzi do poziomej.</translation>
     </message>
@@ -1692,7 +1361,6 @@ na
 <context>
     <name>QDeclarativeAnimatedImage</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
         <source>Qt was built without support for QMovie</source>
         <translation>Qt zostało zbudowane bez obsługi QMovie</translation>
     </message>
@@ -1700,7 +1368,6 @@ na
 <context>
     <name>QDeclarativeBehavior</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativebehavior.cpp" line="+129"/>
         <source>Cannot change the animation assigned to a Behavior.</source>
         <translation>Nie można zmienić animacji przypisanej do &quot;Zachowania&quot;.</translation>
     </message>
@@ -1708,7 +1375,6 @@ na
 <context>
     <name>QDeclarativeBinding</name>
     <message>
-        <location filename="../src/declarative/qml/qdeclarativebinding.cpp" line="+241"/>
         <source>Binding loop detected for property &quot;%1&quot;</source>
         <translation>Zapętlenie powiązania dla właściwości &quot;%1&quot;</translation>
     </message>
@@ -1716,7 +1382,6 @@ na
 <context>
     <name>QDeclarativeCompiledBindings</name>
     <message>
-        <location filename="../src/declarative/qml/qdeclarativecompiledbindings.cpp" line="+372"/>
         <source>Binding loop detected for property &quot;%1&quot;</source>
         <translation>Zapętlenie powiązania dla właściwości &quot;%1&quot;</translation>
     </message>
@@ -1724,37 +1389,26 @@ na
 <context>
     <name>QDeclarativeCompiler</name>
     <message>
-        <location filename="../src/declarative/qml/qdeclarativecompiler.cpp" line="+186"/>
-        <location line="+1601"/>
-        <location line="+186"/>
-        <location line="+81"/>
-        <location line="+75"/>
-        <location line="+507"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation>Niepoprawne przypisanie wartości: &quot;%1&quot; jest właściwością tylko do odczytu</translation>
     </message>
     <message>
-        <location line="-2441"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation>Niepoprawne przypisanie wartości: nieznana wartość wyliczeniowa</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Invalid property assignment: string expected</source>
         <translation>Niepoprawne przypisanie wartości: oczekiwano ciągu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Invalid property assignment: url expected</source>
         <translation>Niepoprawne przypisanie wartości: oczekiwano url</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Invalid property assignment: unsigned int expected</source>
         <translation>Niepoprawne przypisanie wartości: oczekiwano liczby naturalnej</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Invalid property assignment: int expected</source>
         <translation>Niepoprawne przypisanie wartości: oczekiwano liczby całkowitej</translation>
     </message>
@@ -1767,356 +1421,278 @@ na
         <translation type="obsolete">Niepoprawne przypisanie wartości: oczekiwano liczby zmiennoprzecinkowej podwójnej precyzji</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
         <source>Invalid property assignment: number expected</source>
         <translation>Niepoprawne przypisanie wartości: oczekiwano liczby</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Invalid property assignment: color expected</source>
         <translation>Niepoprawne przypisanie wartości: oczekiwano koloru</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Invalid property assignment: date expected</source>
         <translation>Niepoprawne przypisanie wartości: oczekiwano daty</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Invalid property assignment: time expected</source>
         <translation>Niepoprawne przypisanie wartości: oczekiwano czasu</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Invalid property assignment: datetime expected</source>
         <translation>Niepoprawne przypisanie wartości: oczekiwano daty i czasu</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Invalid property assignment: point expected</source>
         <translation>Niepoprawne przypisanie wartości: oczekiwano punktu</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Invalid property assignment: size expected</source>
         <translation>Niepoprawne przypisanie wartości: oczekiwano rozmiaru</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Invalid property assignment: rect expected</source>
         <translation>Niepoprawne przypisanie wartości: oczekiwano prostokąta</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Invalid property assignment: boolean expected</source>
         <translation>Niepoprawne przypisanie wartości: oczekiwano wartości boolowskiej</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Invalid property assignment: 3D vector expected</source>
-        <translation>Niepoprawne przypisanie wartości: oczekiwano wektoru 3D</translation>
+        <translation>Niepoprawne przypisanie wartości: oczekiwano wektora 3D</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Invalid property assignment: unsupported type &quot;%1&quot;</source>
         <translation>Niepoprawne przypisanie wartości: nieobsługiwany typ &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+277"/>
         <source>Element is not creatable.</source>
         <translation>Nie można utworzyć elementu (&quot;creatable&quot; wyłączone).</translation>
     </message>
     <message>
-        <location line="+623"/>
         <source>Component elements may not contain properties other than id</source>
         <translation>Elementy komponentu nie mogą posiadać właściwości innych niż &quot;id&quot;</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Invalid component id specification</source>
         <translation>Niepoprawna specyfikacja &quot;id&quot; komponentu</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+478"/>
         <source>id is not unique</source>
         <translation>Wartość &quot;id&quot; nie jest unikatowa</translation>
     </message>
     <message>
-        <location line="-468"/>
         <source>Invalid component body specification</source>
         <translation>Niepoprawna specyfikacja &quot;body&quot; komponentu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Component objects cannot declare new properties.</source>
         <translation>Instancje komponentu nie mogą deklarować nowych właściwości.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Component objects cannot declare new signals.</source>
         <translation>Instancje komponentu nie mogą deklarować nowych sygnałów.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Component objects cannot declare new functions.</source>
         <translation>Instancje komponentu nie mogą deklarować nowych funkcji.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Cannot create empty component specification</source>
         <translation>Nie można utworzyć pustej specyfikacji komponentu</translation>
     </message>
     <message>
-        <location line="+89"/>
         <source>Incorrectly specified signal assignment</source>
         <translation>Przypisanie sygnału błędnie podane</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Cannot assign a value to a signal (expecting a script to be run)</source>
         <translation>Nie można przypisać wartości do sygnału (oczekiwano uruchomienia skryptu)</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Empty signal assignment</source>
         <translation>Przypisanie pustego sygnału</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Empty property assignment</source>
         <translation>Przypisanie pustej właściwości</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Attached properties cannot be used here</source>
         <translation>Dołączone właściwości nie mogą być tutaj użyte</translation>
     </message>
     <message>
-        <location line="+15"/>
-        <location line="+102"/>
         <source>Non-existent attached object</source>
         <translation>Nieistniejący dołączony obiekt</translation>
     </message>
     <message>
-        <location line="-98"/>
-        <location line="+101"/>
         <source>Invalid attached object assignment</source>
         <translation>Niepoprawne przypisanie dołączonego obiektu</translation>
     </message>
     <message>
-        <location line="-48"/>
         <source>Cannot assign to non-existent default property</source>
         <translation>Nie można przypisać wartości do nieistniejącej domyślnej właściwości</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+352"/>
         <source>Cannot assign to non-existent property &quot;%1&quot;</source>
         <translation>Nie można przypisać wartości do nieistniejącej właściwości &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="-322"/>
         <source>Invalid use of namespace</source>
         <translation>Niepoprawne użycie przestrzeni nazw</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Not an attached property name</source>
         <translation>Nie jest to nazwa dołączonej właściwości</translation>
     </message>
     <message>
-        <location line="+182"/>
         <source>Invalid use of id property</source>
         <translation>Niepoprawne użycie właściwości &quot;id&quot;</translation>
     </message>
     <message>
-        <location line="+89"/>
-        <location line="+2"/>
         <source>Property has already been assigned a value</source>
         <translation>Wartość została już przypisana do właściwości</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+7"/>
         <source>Invalid grouped property access</source>
         <translation>Błędny dostęp do zgrupowanej właściwości</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cannot assign a value directly to a grouped property</source>
         <translation>Nie można bezpośrednio przypisać wartości do zgrupowanej właściwości</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Invalid property use</source>
         <translation>Niepoprawne użycie właściwości</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Property assignment expected</source>
         <translation>Oczekiwano przypisania wartości</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Single property assignment expected</source>
         <translation>Oczekiwano przypisania pojedynczej wartości</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Unexpected object assignment</source>
         <translation>Nieoczekiwane przypisanie obiektu</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>Cannot assign object to list</source>
         <translation>Nie można przypisać obiektu do listy</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Can only assign one binding to lists</source>
         <translation>Tylko jedno powiązanie może być przypisane do listy</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Cannot assign primitives to lists</source>
         <translation>Nie można przypisać elementu do listy</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Cannot assign multiple values to a script property</source>
         <translation>Nie można przypisać wielu wartości do skryptowej właściwości</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Invalid property assignment: script expected</source>
         <translation>Niepoprawne przypisanie wartości: oczekiwano skryptu</translation>
     </message>
     <message>
-        <location line="+105"/>
         <source>Cannot assign object to property</source>
         <translation>Nie można przypisać obiektu dla właściwości</translation>
     </message>
     <message>
-        <location line="+50"/>
         <source>&quot;%1&quot; cannot operate on &quot;%2&quot;</source>
         <translation>&quot;%1&quot; nie może operować na &quot;%2&quot;</translation>
     </message>
     <message>
-        <location line="+129"/>
         <source>Duplicate default property</source>
         <translation>Powielona domyślna właściwość</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Duplicate property name</source>
         <translation>Powielona nazwa właściwości</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Property names cannot begin with an upper case letter</source>
         <translation>Nazwy właściwości nie mogą rozpoczynać się wielką literą</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Illegal property name</source>
         <translation>Niepoprawna nazwa właściwości</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Duplicate signal name</source>
         <translation>Powielona nazwa sygnału</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Signal names cannot begin with an upper case letter</source>
         <translation>Nazwy sygnałów nie mogą rozpoczynać się wielką literą</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Illegal signal name</source>
         <translation>Niepoprawna nazwa sygnału</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Duplicate method name</source>
-        <translation>Powielona nazwa medoty</translation>
+        <translation>Powielona nazwa metody</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Method names cannot begin with an upper case letter</source>
         <translation>Nazwy metod nie mogą rozpoczynać się wielką literą</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Illegal method name</source>
         <translation>Niepoprawna nazwa metody</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Property value set multiple times</source>
         <translation>Wartość właściwości ustawiona wielokrotnie</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Invalid property nesting</source>
         <translation>Niepoprawne zagnieżdżenie właściwości</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>Cannot override FINAL property</source>
         <translation>Nie można nadpisać właściwości &quot;FINAL&quot;</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Invalid property type</source>
         <translation>Niepoprawny typ właściwości</translation>
     </message>
     <message>
-        <location line="+159"/>
         <source>Invalid empty ID</source>
         <translation>Niepoprawny pusty identyfikator</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>IDs cannot start with an uppercase letter</source>
         <translation>Identyfikatory nie mogą rozpoczynać się wielką literą</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>IDs must start with a letter or underscore</source>
         <translation>Identyfikatory muszą rozpoczynać się literą lub znakiem podkreślenia</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>IDs must contain only letters, numbers, and underscores</source>
         <translation>Identyfikatory mogą zawierać jedynie litery, cyfry i znaki podkreślenia</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>ID illegally masks global JavaScript property</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+9"/>
         <source>No property alias location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
-        <location line="+25"/>
         <source>Invalid alias location</source>
         <translation>Niepoprawne położenie aliasu</translation>
     </message>
     <message>
-        <location line="-16"/>
         <source>Invalid alias reference. An alias reference must be specified as &lt;id&gt; or &lt;id&gt;.&lt;property&gt;</source>
         <translation>Niepoprawna referencja aliasu. Referencja aliasu musi być podana jako &lt;id&gt; lub &lt;id&gt; &lt;property&gt;</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Invalid alias reference. Unable to find id &quot;%1&quot;</source>
         <translation>Niepoprawna referencja aliasu. Nie można odnaleźć identyfikatora &quot;%1&quot;</translation>
     </message>
@@ -2124,7 +1700,6 @@ na
 <context>
     <name>QDeclarativeComponent</name>
     <message>
-        <location filename="../src/declarative/qml/qdeclarativecomponent.cpp" line="+507"/>
         <source>Invalid empty URL</source>
         <translation>Niepoprawny pusty URL</translation>
     </message>
@@ -2132,23 +1707,18 @@ na
 <context>
     <name>QDeclarativeCompositeTypeManager</name>
     <message>
-        <location filename="../src/declarative/qml/qdeclarativecompositetypemanager.cpp" line="+475"/>
-        <location line="+266"/>
         <source>Resource %1 unavailable</source>
         <translation>Zasób %1 nie jest dostępny</translation>
     </message>
     <message>
-        <location line="-122"/>
         <source>Namespace %1 cannot be used as a type</source>
         <translation>Przestrzeń nazw %1 nie może być użyta jako typ</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>%1 %2</source>
         <translation>%1 %2</translation>
     </message>
     <message>
-        <location line="+47"/>
         <source>Type %1 unavailable</source>
         <translation>Typ %1 nie jest dostępny</translation>
     </message>
@@ -2156,23 +1726,18 @@ na
 <context>
     <name>QDeclarativeConnections</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeconnections.cpp" line="+210"/>
-        <location line="+60"/>
         <source>Cannot assign to non-existent property &quot;%1&quot;</source>
         <translation>Nie można przypisać wartości do nieistniejącej właściwości &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="-50"/>
         <source>Connections: nested objects not allowed</source>
         <translation>Połączenia: zagnieżdżone obiekty nie są dozwolone</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Connections: syntax error</source>
         <translation>Połączenia: błąd składni</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Connections: script expected</source>
         <translation>Połączenia: oczekiwano skryptu</translation>
     </message>
@@ -2180,33 +1745,26 @@ na
 <context>
     <name>QDeclarativeEngine</name>
     <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+204"/>
         <source>executeSql called outside transaction()</source>
         <translation>&quot;executeSql&quot; zawołane na zewnątrz &quot;transation()&quot;</translation>
     </message>
     <message>
-        <location line="+58"/>
         <source>Read-only Transaction</source>
         <translation>Transakcja tylko do odczytu</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Version mismatch: expected %1, found %2</source>
         <translation>Niezgodność wersji: oczekiwano %1, znaleziono %2</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>SQL transaction failed</source>
         <translation>Transakcja SQL zakończona błędem</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>transaction: missing callback</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+16"/>
         <source>SQL: database version mismatch</source>
         <translation>SQL: niezgodność wersji bazy danych</translation>
     </message>
@@ -2214,12 +1772,10 @@ na
 <context>
     <name>QDeclarativeFlipable</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+129"/>
         <source>front is a write-once property</source>
         <translation>&quot;front&quot; jest właściwością tylko do odczytu</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>back is a write-once property</source>
         <translation>&quot;back&quot; jest właściwością tylko do odczytu</translation>
     </message>
@@ -2227,75 +1783,58 @@ na
 <context>
     <name>QDeclarativeImportDatabase</name>
     <message>
-        <location filename="../src/declarative/qml/qdeclarativeimport.cpp" line="+294"/>
         <source>module &quot;%1&quot; definition &quot;%2&quot; not readable</source>
         <translation>definicja &quot;%2&quot; modułu &quot;%1&quot; nie może zostać odczytana</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>plugin cannot be loaded for module &quot;%1&quot;: %2</source>
         <translation>wtyczka nie może zostać załadowana dla modułu &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>module &quot;%1&quot; plugin &quot;%2&quot; not found</source>
         <translation>wtyczka &quot;%2&quot; modułu &quot;%1&quot; nie została odnaleziona</translation>
     </message>
     <message>
-        <location line="+79"/>
-        <location line="+69"/>
         <source>module &quot;%1&quot; version %2.%3 is not installed</source>
         <translation>wersja %2.%3 modułu %1 nie jest zainstalowana</translation>
     </message>
     <message>
-        <location line="-67"/>
         <source>module &quot;%1&quot; is not installed</source>
         <translation>moduł &quot;%1&quot; nie jest zainstalowany</translation>
     </message>
     <message>
-        <location line="+15"/>
-        <location line="+20"/>
         <source>&quot;%1&quot;: no such directory</source>
         <translation>&quot;%1&quot;: brak katalogu</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>import &quot;%1&quot; has no qmldir and no namespace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
         <source>- %1 is not a namespace</source>
         <translation>- %1 nie jest przestrzenią nazw</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>- nested namespaces not allowed</source>
         <translation>- zagnieżdżone przestrzenie nazw nie są dozwolone</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <location line="+4"/>
         <source>local directory</source>
         <translation>lokalny katalog</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>is ambiguous. Found in %1 and in %2</source>
         <translation>jest niejednoznaczny. Znaleziono w %1 i w %2</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>is ambiguous. Found in %1 in version %2.%3 and %4.%5</source>
         <translation>jest niejednoznaczny. Znaleziono w %1 w wersji %2.%3 i %4.%5</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>is instantiated recursively</source>
         <translation>jest zinstancjonowany rekurencyjnie</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>is not a type</source>
         <translation>nie jest typem</translation>
     </message>
@@ -2303,7 +1842,6 @@ na
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+70"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation>&quot;KeyNavigation&quot; jest dostępny jedynie poprzez dołączone właściwości</translation>
     </message>
@@ -2311,7 +1849,6 @@ na
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation>&quot;Keys&quot; jest dostępny jedynie poprzez dołączone właściwości</translation>
     </message>
@@ -2319,59 +1856,46 @@ na
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+315"/>
         <source>remove: index %1 out of range</source>
         <translation>remove: indeks %1 poza zakresem</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>insert: value is not an object</source>
         <translation>insert: wartość nie jest obiektem</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>insert: index %1 out of range</source>
         <translation>insert: indeks %1 poza zakresem</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>move: out of range</source>
         <translation>move: poza zakresem</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>append: value is not an object</source>
         <translation>append: wartość nie jest obiektem</translation>
     </message>
     <message>
-        <location line="+55"/>
         <source>set: value is not an object</source>
         <translation>set: wartość nie jest obiektem</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+34"/>
         <source>set: index %1 out of range</source>
         <translation>set: indeks %1 poza zakresem</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <location line="+17"/>
         <source>ListElement: cannot contain nested elements</source>
         <translation>ListElement: nie może zawierać zagnieżdżonych elementów</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>ListElement: cannot use reserved &quot;id&quot; property</source>
         <translation>ListElement: nie można używać zarezerwowanej właściwości &quot;id&quot;</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>ListElement: cannot use script for property value</source>
         <translation>ListElement: nie można używać skryptu jako wartości właściwości</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>ListModel: undefined property &apos;%1&apos;</source>
         <translation>ListModel: niezdefiniowana właściwość &quot;%1&quot;</translation>
     </message>
@@ -2379,7 +1903,6 @@ na
 <context>
     <name>QDeclarativeLoader</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeloader.cpp" line="+340"/>
         <source>Loader does not support loading non-visual elements.</source>
         <translation>Ładowanie elementów niewizualnych nie jest obsługiwane.</translation>
     </message>
@@ -2387,18 +1910,14 @@ na
 <context>
     <name>QDeclarativeParentAnimation</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeanimation.cpp" line="-169"/>
         <source>Unable to preserve appearance under complex transform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+7"/>
         <source>Unable to preserve appearance under non-uniform scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Unable to preserve appearance under scale of 0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2406,18 +1925,14 @@ na
 <context>
     <name>QDeclarativeParentChange</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativestateoperations.cpp" line="+95"/>
         <source>Unable to preserve appearance under complex transform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+7"/>
         <source>Unable to preserve appearance under non-uniform scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Unable to preserve appearance under scale of 0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2425,144 +1940,110 @@ na
 <context>
     <name>QDeclarativeParser</name>
     <message>
-        <location filename="../src/declarative/qml/parser/qdeclarativejslexer.cpp" line="+542"/>
-        <location line="+123"/>
-        <location line="+54"/>
         <source>Illegal unicode escape sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-140"/>
         <source>Illegal character</source>
         <translation>Niepoprawny znak</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Unclosed string at end of line</source>
         <translation>Niedomknięty ciąg na końcu linii</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Illegal escape squence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
         <source>Unclosed comment at end of file</source>
         <translation>Niedomknięty komentarz na końcu linii</translation>
     </message>
     <message>
-        <location line="+102"/>
         <source>Illegal syntax for exponential number</source>
         <translation>Niepoprawna składnia liczby o postaci wykładniczej</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Identifier cannot start with numeric literal</source>
         <translation>Identyfikator nie może rozpoczynać się stałą liczbową</translation>
     </message>
     <message>
-        <location line="+338"/>
         <source>Unterminated regular expression literal</source>
         <translation>Niedokończone wyrażenie regularne</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Invalid regular expression flag &apos;%0&apos;</source>
         <translation>Niepoprawna flaga &quot;%0&quot; w wyrażeniu regularnym</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+22"/>
         <source>Unterminated regular expression backslash sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Unterminated regular expression class</source>
         <translation>Niedokończona klasa wyrażenia regularnego</translation>
     </message>
     <message>
-        <location filename="../src/declarative/qml/parser/qdeclarativejsparser.cpp" line="+1828"/>
-        <location line="+67"/>
         <source>Syntax error</source>
         <translation>Błąd składni</translation>
     </message>
     <message>
-        <location line="-65"/>
         <source>Unexpected token `%1&apos;</source>
         <translation>Nieoczekiwany znak &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+24"/>
         <source>Expected token `%1&apos;</source>
         <translation>Oczekiwany znak &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../src/declarative/qml/qdeclarativescriptparser.cpp" line="+260"/>
-        <location line="+431"/>
-        <location line="+59"/>
         <source>Property value set multiple times</source>
         <translation>Wartość właściwości ustawiona wielokrotnie</translation>
     </message>
     <message>
-        <location line="-479"/>
         <source>Expected type name</source>
         <translation>Oczekiwana nazwa typu</translation>
     </message>
     <message>
-        <location line="+136"/>
         <source>Invalid import qualifier ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Reserved name &quot;Qt&quot; cannot be used as an qualifier</source>
         <translation>&quot;Qt&quot; jest nazwą zarezerwowaną i nie może być użyta jako kwalifikator</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Script import qualifiers must be unique.</source>
         <translation>Kwalifikator importu skryptu musi być unikatowy.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Script import requires a qualifier</source>
         <translation>Import skryptu wymaga użycia kwalifikatora</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Library import requires a version</source>
         <translation>Import biblioteki wymaga podania wersji</translation>
     </message>
     <message>
-        <location line="+59"/>
         <source>Expected parameter type</source>
         <translation>Oczekiwany typ parametru</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>Invalid property type modifier</source>
         <translation>Niepoprawny modyfikator typu właściwości</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Unexpected property type modifier</source>
         <translation>Nieoczekiwany modyfikator typu właściwości</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Expected property type</source>
         <translation>Oczekiwany typ właściwości</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Readonly not yet supported</source>
         <translation>&quot;Tylko do odczytu&quot; nie jest jeszcze obsługiwane</translation>
     </message>
     <message>
-        <location line="+215"/>
         <source>JavaScript declaration outside Script element</source>
         <translation>Deklaracja &quot;JavaScript&quot; na zewnątrz elementu &quot;Script&quot;</translation>
     </message>
@@ -2570,7 +2051,6 @@ na
 <context>
     <name>QDeclarativePauseAnimation</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeanimation.cpp" line="-2036"/>
         <source>Cannot set a duration of &lt; 0</source>
         <translation>Nie można ustawić ujemnego czasu trwania</translation>
     </message>
@@ -2578,19 +2058,14 @@ na
 <context>
     <name>QDeclarativePixmap</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativepixmapcache.cpp" line="+295"/>
         <source>Error decoding: %1: %2</source>
         <translation>Błąd dekodowania: %1: %2</translation>
     </message>
     <message>
-        <location line="+145"/>
-        <location line="+333"/>
         <source>Failed to get image from provider: %1</source>
         <translation>Pobieranie obrazka od dostawcy zakończone błędem: %1</translation>
     </message>
     <message>
-        <location line="-314"/>
-        <location line="+332"/>
         <source>Cannot open: %1</source>
         <translation>Nie można otworzyć: %1</translation>
     </message>
@@ -2617,7 +2092,6 @@ na
 <context>
     <name>QDeclarativePropertyAnimation</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeanimation.cpp" line="+1171"/>
         <source>Cannot set a duration of &lt; 0</source>
         <translation>Nie można ustawić ujemnego czasu trwania</translation>
     </message>
@@ -2625,17 +2099,14 @@ na
 <context>
     <name>QDeclarativePropertyChanges</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativepropertychanges.cpp" line="+267"/>
         <source>PropertyChanges does not support creating state-specific objects.</source>
         <translation>&quot;PropertyChanges&quot; nie obsługuje tworzenia obiektów charakterystycznych dla stanów.</translation>
     </message>
     <message>
-        <location line="+157"/>
         <source>Cannot assign to non-existent property &quot;%1&quot;</source>
         <translation>Nie można przypisać wartości do nieistniejącej właściwości &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cannot assign to read-only property &quot;%1&quot;</source>
         <translation>Nie można przypisać wartości do właściwości (tylko do odczytu): &quot;%1&quot;</translation>
     </message>
@@ -2643,13 +2114,10 @@ na
 <context>
     <name>QDeclarativeTextInput</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativetextinput.cpp" line="+805"/>
-        <location line="+8"/>
         <source>Could not load cursor delegate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Could not instantiate cursor delegate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2657,47 +2125,38 @@ na
 <context>
     <name>QDeclarativeVME</name>
     <message>
-        <location filename="../src/declarative/qml/qdeclarativevme.cpp" line="+194"/>
         <source>Unable to create object of type %1</source>
         <translation>Nie można utworzyć obiektu typu %1</translation>
     </message>
     <message>
-        <location line="+390"/>
         <source>Cannot assign value %1 to property %2</source>
         <translation>Nie można przypisać wartości %1 do właściwości %2</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>Cannot assign object type %1 with no default method</source>
         <translation>Nie można przypisać obiektu typu %1 który nie posiada domyślnej metody</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cannot connect mismatched signal/slot %1 %vs. %2</source>
         <translation>Nie można podłączyć niezgodnych sygnałów / slotów (%1 i %2)</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cannot assign an object to signal property %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
         <source>Cannot assign object to list</source>
         <translation>Nie można przypisać obiektu do listy</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Cannot assign object to interface property</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Unable to create attached object</source>
         <translation>Nie można utworzyć dołączonego obiektu</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Cannot set properties on %1 as it is null</source>
         <translation>Nie można ustawić właściwości dla %1 ponieważ jest on zerowy</translation>
     </message>
@@ -2705,7 +2164,6 @@ na
 <context>
     <name>QDeclarativeVisualDataModel</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp" line="+1058"/>
         <source>Delegate component must be Item type.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2713,8 +2171,6 @@ na
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-12"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt zostało zbudowane bez obsługi xmlpatterns</translation>
     </message>
@@ -2722,7 +2178,6 @@ na
 <context>
     <name>QDeclarativeXmlListModelRole</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+174"/>
         <source>An XmlRole query must not start with &apos;/&apos;</source>
         <translation>Zapytanie XmlRole nie może rozpoczynać się od &quot;/&quot;</translation>
     </message>
@@ -2730,7 +2185,6 @@ na
 <context>
     <name>QDeclarativeXmlRoleList</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+735"/>
         <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
         <translation>Zapytanie XmlListModel nie może rozpoczynać się od &quot;/&quot; ani od &quot;//&quot;</translation>
     </message>
@@ -2738,17 +2192,14 @@ na
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+951"/>
         <source>QDial</source>
         <translation>QDial</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>SpeedoMeter</source>
         <translation>Miernik prędkości</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>SliderHandle</source>
         <translation>Uchwyt suwaka</translation>
     </message>
@@ -2756,12 +2207,10 @@ na
 <context>
     <name>QDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qdialog.cpp" line="+651"/>
         <source>What&apos;s This?</source>
         <translation>Co to jest?</translation>
     </message>
     <message>
-        <location line="-127"/>
         <source>Done</source>
         <translation>Zrobione</translation>
     </message>
@@ -2769,124 +2218,98 @@ na
 <context>
     <name>QDialogButtonBox</name>
     <message>
-        <location filename="../src/gui/widgets/qdialogbuttonbox.cpp" line="+696"/>
         <source>Abort</source>
         <translation>Przerwij</translation>
     </message>
     <message>
-        <location line="-32"/>
         <source>Apply</source>
         <translation>Zastosuj</translation>
     </message>
     <message>
-        <location line="-12"/>
         <source>&amp;Save</source>
         <translation>&amp;Zachowaj</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Anuluj</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;Close</source>
         <translation>&amp;Zamknij</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Close without Saving</source>
         <translation>Zamknij bez zapisywania</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Discard</source>
         <translation>Odrzuć</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>Don&apos;t Save</source>
         <translation>Nie zachowuj</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>Help</source>
         <translation>Pomoc</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Ignore</source>
         <translation>Zignoruj</translation>
     </message>
     <message>
-        <location line="-15"/>
         <source>&amp;No</source>
         <translation>&amp;Nie</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>N&amp;o to All</source>
         <translation>Ni&amp;e dla wszystkich</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qmessagebox.cpp" line="+1920"/>
-        <location line="+464"/>
-        <location filename="../src/gui/widgets/qdialogbuttonbox.cpp" line="-41"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../src/gui/widgets/qdialogbuttonbox.cpp" line="+6"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Reset</source>
         <translation>Resetuj</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Restore Defaults</source>
         <translation>Przywróć ustawienia</translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>Retry</source>
         <translation>Ponów</translation>
     </message>
     <message>
-        <location line="-47"/>
         <source>Save</source>
         <translation>Zachowaj</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Save All</source>
         <translation>Zachowaj wszystko</translation>
     </message>
     <message>
-        <location line="-12"/>
         <source>&amp;Yes</source>
         <translation>&amp;Tak</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Yes to &amp;All</source>
         <translation>Ta&amp;k dla wszystkich</translation>
     </message>
     <message>
-        <location line="-35"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
@@ -2894,28 +2317,23 @@ na
 <context>
     <name>QDirModel</name>
     <message>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+469"/>
         <source>Date Modified</source>
         <translation>Data modyfikacji</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>Kind</source>
         <comment>Match OS X Finder</comment>
         <translation>Typ</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Size</source>
         <translation>Rozmiar</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Type</source>
         <comment>All other platforms</comment>
         <translation>Rodzaj</translation>
@@ -2924,17 +2342,14 @@ na
 <context>
     <name>QDockWidget</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/qaccessiblewidgets.cpp" line="+1239"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Dock</source>
         <translation>Zadokuj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Float</source>
         <translation>Uwolnij</translation>
     </message>
@@ -2942,12 +2357,10 @@ na
 <context>
     <name>QDoubleSpinBox</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="-537"/>
         <source>More</source>
         <translation>Więcej</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Less</source>
         <translation>Mniej</translation>
     </message>
@@ -2955,27 +2368,22 @@ na
 <context>
     <name>QErrorMessage</name>
     <message>
-        <location filename="../src/gui/dialogs/qerrormessage.cpp" line="+208"/>
         <source>Debug Message:</source>
         <translation>Komunikat dla programisty:</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Fatal Error:</source>
         <translation>Błąd krytyczny:</translation>
     </message>
     <message>
-        <location line="+201"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location line="-1"/>
         <source>&amp;Show this message again</source>
         <translation>&amp;Pokaż ten komunikat ponownie</translation>
     </message>
     <message>
-        <location line="-203"/>
         <source>Warning:</source>
         <translation>Ostrzeżenie:</translation>
     </message>
@@ -2983,38 +2391,30 @@ na
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/corelib/io/qfile.cpp" line="+703"/>
-        <location line="+155"/>
         <source>Destination file exists</source>
         <translation>Plik wyjściowy już istnieje</translation>
     </message>
     <message>
-        <location line="-140"/>
         <source>Will not rename sequential file using block copy</source>
         <translation>Nie można zmienić nazwy pliku sekwencyjnego używając kopiowania blokowego</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Cannot remove source file</source>
         <translation>Nie można usunąć oryginalnego pliku</translation>
     </message>
     <message>
-        <location line="+130"/>
         <source>Cannot open %1 for input</source>
         <translation>Nie można otworzyć pliku wejściowego %1</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Cannot open for output</source>
         <translation>Nie można otworzyć pliku wyjściowego</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Failure to write block</source>
         <translation>Nie można zapisać bloku</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Cannot create %1 for output</source>
         <translation>Nie można utworzyć pliku wyjściowego %1</translation>
     </message>
@@ -3022,22 +2422,18 @@ na
 <context>
     <name>QFileDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="+2078"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation>%1 już istnieje.
 Czy chcesz zamienić?</translation>
     </message>
     <message>
-        <location line="+610"/>
         <source>&apos;%1&apos; is write protected.
 Do you want to delete it anyway?</source>
         <translation>&apos;%1&apos; jest zabezpieczony przed zapisem.
 Czy na pewno chcesz go skasować?</translation>
     </message>
     <message>
-        <location line="-644"/>
-        <location line="+862"/>
         <source>%1
 Directory not found.
 Please verify the correct directory name was given.</source>
@@ -3046,7 +2442,6 @@ Katalog nie znaleziony.
 Sprawdź podaną nazwę katalogu.</translation>
     </message>
     <message>
-        <location line="-808"/>
         <source>%1
 File not found.
 Please verify the correct file name was given.</source>
@@ -3055,237 +2450,178 @@ Plik nie znaleziony.
 Proszę o sprawdzenie podanej nazwy pliku.</translation>
     </message>
     <message>
-        <location line="+595"/>
         <source>Are sure you want to delete &apos;%1&apos;?</source>
         <translation>Czy na pewno chcesz skasować &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location line="+419"/>
         <source>Recent Places</source>
         <translation>Ostatnie miejsca</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.ui"/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Back</source>
         <translation>Powrót</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-404"/>
         <source>Could not delete directory.</source>
         <translation>Nie można skasować katalogu.</translation>
     </message>
     <message>
-        <location line="-2135"/>
         <source>&amp;Delete</source>
         <translation>&amp;Skasuj</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.ui"/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Detail View</source>
         <translation>Szczegóły</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="+682"/>
         <source>Directories</source>
         <translation>Katalogi</translation>
     </message>
     <message>
-        <location line="-675"/>
-        <location line="+679"/>
         <source>Directory:</source>
         <translation>Katalog:</translation>
     </message>
     <message>
-        <location filename="../src/gui/itemviews/qfileiconprovider.cpp" line="+475"/>
         <source>Drive</source>
         <translation>Urządzenie</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+1"/>
         <source>File</source>
         <translation>Plik</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>File Folder</source>
         <comment>Match Windows Explorer</comment>
         <translation>Katalog</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Folder</source>
         <comment>All other platforms</comment>
         <translation>Katalog</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Alias</source>
         <comment>Mac OS X Finder</comment>
         <translation>Alias</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Shortcut</source>
         <comment>All other platforms</comment>
         <translation>Skrót</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.ui"/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Files of type:</source>
         <translation>Pliki rodzaju:</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>List View</source>
         <translation>Lista</translation>
     </message>
     <message>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+408"/>
         <source>My Computer</source>
         <translation>Mój komputer</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-7"/>
-        <location line="+55"/>
-        <location line="+1532"/>
         <source>&amp;Open</source>
         <translation>&amp;Otwórz</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.ui"/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Parent Directory</source>
         <translation>Katalog wyżej</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-2267"/>
         <source>&amp;Rename</source>
         <translation>&amp;Zmień nazwę</translation>
     </message>
     <message>
-        <location line="+680"/>
-        <location line="+55"/>
         <source>&amp;Save</source>
         <translation>&amp;Zachowaj</translation>
     </message>
     <message>
-        <location line="-733"/>
         <source>Show &amp;hidden files</source>
         <translation>Pokaż &amp;ukryte pliki</translation>
     </message>
     <message>
-        <location filename="../src/gui/itemviews/qfileiconprovider.cpp" line="+7"/>
         <source>Unknown</source>
         <translation>Nieznany</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-33"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Save As</source>
         <translation>Zachowaj jako</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>Find Directory</source>
         <translation>Znajdź katalog</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog_win.cpp" line="+148"/>
         <source>All Files (*.*)</source>
         <translation>Wszystkie pliki (*.*)</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="+29"/>
         <source>Show </source>
         <translation>Pokaż </translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.ui"/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Forward</source>
         <translation>Do przodu</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="+1992"/>
         <source>New Folder</source>
         <translation>Nowy katalog</translation>
     </message>
     <message>
-        <location line="-1985"/>
         <source>&amp;New Folder</source>
         <translation>&amp;Nowy katalog</translation>
     </message>
     <message>
-        <location line="+687"/>
-        <location line="+43"/>
         <source>&amp;Choose</source>
         <translation>&amp;Wybierz</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qsidebar.cpp" line="+442"/>
         <source>Remove</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-747"/>
-        <location line="+481"/>
         <source>All Files (*)</source>
         <translation>Wszystkie pliki (*)</translation>
     </message>
     <message>
-        <location line="-457"/>
-        <location line="+683"/>
         <source>File &amp;name:</source>
         <translation>Nazwa &amp;pliku:</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.ui"/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Look in:</source>
         <translation>Szukaj w:</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Create New Folder</source>
         <translation>Utwórz nowy katalog</translation>
     </message>
     <message>
-        <location/>
         <source>Go back</source>
         <translation>Wróć</translation>
     </message>
     <message>
-        <location/>
         <source>Go forward</source>
         <translation>Przejdź dalej</translation>
     </message>
     <message>
-        <location/>
         <source>Go to the parent directory</source>
         <translation>Przejdź do katalogu wyżej</translation>
     </message>
     <message>
-        <location/>
         <source>Create a New Folder</source>
         <translation>Utwórz nowy katalog</translation>
     </message>
     <message>
-        <location/>
         <source>Change to list view mode</source>
         <translation>Pokaż listę</translation>
     </message>
     <message>
-        <location/>
         <source>Change to detail view mode</source>
         <translation>Pokaż szczegóły</translation>
     </message>
@@ -3293,83 +2629,64 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QFileSystemModel</name>
     <message>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+740"/>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+482"/>
         <source>%1 TB</source>
         <translation>%1 TB</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+2"/>
         <source>%1 GB</source>
         <translation>%1 GB</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+2"/>
         <source>%1 MB</source>
         <translation>%1 MB</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+2"/>
         <source>%1 KB</source>
         <translation>%1 KB</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>%1 bytes</source>
         <translation>%1 bajtów</translation>
     </message>
     <message>
-        <location line="+89"/>
         <source>Invalid filename</source>
         <translation>Niepoprawna nazwa pliku</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt;b&gt;The name &quot;%1&quot; can not be used.&lt;/b&gt;&lt;p&gt;Try using another name, with fewer characters or no punctuations marks.</source>
         <translation>&lt;b&gt;Nazwa &quot;%1&quot; nie może zostać użyta.&lt;/b&gt;&lt;p&gt;Spróbuj użyć nowej nazwy z mniejszą liczbą znaków lub bez znaków przystankowych.</translation>
     </message>
     <message>
-        <location line="+64"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Size</source>
         <translation>Rozmiar</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Kind</source>
         <comment>Match OS X Finder</comment>
         <translation>Typ</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Type</source>
         <comment>All other platforms</comment>
         <translation>Rodzaj</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Date Modified</source>
         <translation>Data modyfikacji</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfilesystemmodel_p.h" line="+261"/>
         <source>My Computer</source>
         <translation>Mój komputer</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Computer</source>
         <translation>Komputer</translation>
     </message>
     <message>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+1"/>
         <source>%1 byte(s)</source>
         <translation>%1 bajt(ów)</translation>
     </message>
@@ -3377,223 +2694,172 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QFontDatabase</name>
     <message>
-        <location filename="../src/gui/text/qfontdatabase.cpp" line="+102"/>
-        <location line="+1347"/>
         <source>Normal</source>
         <translation>Normalny</translation>
     </message>
     <message>
-        <location line="-1344"/>
-        <location line="+12"/>
-        <location line="+1320"/>
         <source>Bold</source>
         <translation>Pogrubiony</translation>
     </message>
     <message>
-        <location line="-1329"/>
-        <location line="+1331"/>
         <source>Demi Bold</source>
         <translation>Na wpół pogrubiony</translation>
     </message>
     <message>
-        <location line="-1328"/>
-        <location line="+18"/>
-        <location line="+1306"/>
         <source>Black</source>
         <translatorcomment>it&apos;s about font weight</translatorcomment>
         <translation>Bardzo gruby</translation>
     </message>
     <message>
-        <location line="-1316"/>
         <source>Demi</source>
         <translation>Na wpół</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+1316"/>
         <source>Light</source>
         <translatorcomment>it&apos;s about font weight</translatorcomment>
         <translation>Cienki</translation>
     </message>
     <message>
-        <location line="-1170"/>
-        <location line="+1173"/>
         <source>Italic</source>
         <translation>Kursywa</translation>
     </message>
     <message>
-        <location line="-1170"/>
-        <location line="+1172"/>
         <source>Oblique</source>
         <translation>Pochyły</translation>
     </message>
     <message>
-        <location line="+704"/>
         <source>Any</source>
         <translation>Każdy</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Latin</source>
         <translation>Łaciński</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Greek</source>
         <translation>Grecki</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cyrillic</source>
         <translation>Cyrylica</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Armenian</source>
         <translation>Ormiański</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Hebrew</source>
         <translation>Hebrajski</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Arabic</source>
         <translation>Arabski</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Syriac</source>
         <translation>Syryjski</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Thaana</source>
         <translation>Thaana</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Devanagari</source>
         <translation>Devanagari</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Bengali</source>
         <translation>Bengalski</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Gurmukhi</source>
         <translation>Gurmukhi</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Gujarati</source>
         <translation>Gudżaracki</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Oriya</source>
         <translation>Orija</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Tamil</source>
         <translation>Tamilski</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Telugu</source>
         <translation>Telugu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Kannada</source>
         <translation>Kannada</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Malayalam</source>
         <translation>Malajalam</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Sinhala</source>
         <translation>Syngaleski</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Thai</source>
         <translation>Tajski</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lao</source>
         <translation>Laotański</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Tibetan</source>
         <translation>Tybetański</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Myanmar</source>
         <translation>Birmański</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Georgian</source>
         <translation>Gruziński</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Khmer</source>
         <translation>Khmerski</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Simplified Chinese</source>
         <translation>Uproszczony chiński</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Traditional Chinese</source>
         <translation>Tradycyjny chiński</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Japanese</source>
         <translation>Japoński</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Korean</source>
         <translation>Koreański</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Vietnamese</source>
         <translation>Wietnamski</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Symbol</source>
         <translation>Symboliczny</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Ogham</source>
         <translation>Ogamiczny</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Runic</source>
         <translation>Runiczny</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>N&apos;Ko</source>
         <translation>N&apos;Ko</translation>
     </message>
@@ -3601,47 +2867,38 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QFontDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qfontdialog.cpp" line="+774"/>
         <source>Effects</source>
         <translation>Efekty</translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>&amp;Font</source>
         <translation>&amp;Czcionka</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Font st&amp;yle</source>
         <translation>St&amp;yl czcionki</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Sample</source>
         <translation>Przykład</translation>
     </message>
     <message>
-        <location line="-595"/>
         <source>Select Font</source>
         <translation>Wybierz czcionkę</translation>
     </message>
     <message>
-        <location line="+587"/>
         <source>&amp;Size</source>
         <translation>&amp;Rozmiar</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Stri&amp;keout</source>
         <translation>Pr&amp;zekreślenie</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Underline</source>
         <translation>&amp;Podkreślenie</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Wr&amp;iting System</source>
         <translation>Sys&amp;tem pisania</translation>
     </message>
@@ -3649,143 +2906,102 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QFtp</name>
     <message>
-        <location filename="../src/network/access/qftp.cpp" line="+2343"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+2024"/>
         <source>Changing directory failed:
 %1</source>
         <translation>Zmiana katalogu zakończona błędem:
 %1</translation>
     </message>
     <message>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+288"/>
         <source>Connected to host</source>
         <translation>Podłączony do hosta</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qftp.cpp" line="-1335"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-1458"/>
-        <location line="+1451"/>
         <source>Connected to host %1</source>
         <translation>Podłączony do hosta %1</translation>
     </message>
     <message>
-        <location line="+1323"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-290"/>
         <source>Connecting to host failed:
 %1</source>
         <translation>Podłączanie do hosta zakończone błędem:
 %1</translation>
     </message>
     <message>
-        <location line="+60"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+49"/>
-        <location line="+250"/>
         <source>Connection closed</source>
         <translation>Połączenie zamknięte</translation>
     </message>
     <message>
-        <location line="-1164"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-1299"/>
         <source>Connection refused for data connection</source>
         <translation>Połączenie do przesyłu danych odrzucone</translation>
     </message>
     <message>
-        <location line="-327"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-263"/>
         <source>Connection refused to host %1</source>
         <translation>Połączenie do hosta %1 odrzucone</translation>
     </message>
     <message>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+1555"/>
         <source>Connection to %1 closed</source>
         <translation>Połączenie do %1 zakończone</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qftp.cpp" line="+1459"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-271"/>
         <source>Creating directory failed:
 %1</source>
         <translation>Tworzenie katalogu zakończone błędem:
 %1</translation>
     </message>
     <message>
-        <location line="-12"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-9"/>
         <source>Downloading file failed:
 %1</source>
         <translation>Pobieranie pliku zakończone błędem:
 %1</translation>
     </message>
     <message>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+276"/>
         <source>Host %1 found</source>
         <translation>Host %1 znaleziony</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qftp.cpp" line="-1451"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-1555"/>
         <source>Host %1 not found</source>
         <translation>Host %1 nie znaleziony</translation>
     </message>
     <message>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+1562"/>
         <source>Host found</source>
         <translation>Host znaleziony</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qftp.cpp" line="+1443"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-289"/>
         <source>Listing directory failed:
 %1</source>
         <translation>Listowanie katalogu zakończone błędem:
 %1</translation>
     </message>
     <message>
-        <location line="-4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-3"/>
         <source>Login failed:
 %1</source>
         <translation>Logowanie zakończone błędem:
 %1</translation>
     </message>
     <message>
-        <location line="-1507"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-1335"/>
         <source>Not connected</source>
         <translation>Nie podłączony</translation>
     </message>
     <message>
-        <location line="+76"/>
         <source>Connection timed out to host %1</source>
         <translation>Przekroczony czas połączenia do hosta %1</translation>
     </message>
     <message>
-        <location line="+1459"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+1356"/>
         <source>Removing directory failed:
 %1</source>
         <translation>Usuwanie katalogu zakończone błędem:
 %1</translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-6"/>
         <source>Removing file failed:
 %1</source>
         <translation>Usuwanie pliku zakończone błędem:
 %1</translation>
     </message>
     <message>
-        <location line="-950"/>
-        <location line="+29"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-823"/>
-        <location line="+728"/>
         <source>Unknown error</source>
         <translation>Nieznany błąd</translation>
     </message>
     <message>
-        <location line="+917"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+92"/>
         <source>Uploading file failed:
 %1</source>
         <translation>Wysyłanie pliku zakończone błędem:
@@ -3795,12 +3011,10 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QHostInfo</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_p.h" line="+103"/>
         <source>Unknown error</source>
         <translation>Nieznany błąd</translation>
     </message>
     <message>
-        <location filename="../src/network/kernel/qhostinfo.cpp" line="+171"/>
         <source>No host name given</source>
         <translation>Nie podano nazwy hosta</translation>
     </message>
@@ -3808,37 +3022,22 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+274"/>
-        <location line="+32"/>
-        <location filename="../src/network/kernel/qhostinfo_win.cpp" line="+215"/>
-        <location line="+27"/>
         <source>Host not found</source>
         <translation>Host nie znaleziony</translation>
     </message>
     <message>
-        <location line="-45"/>
-        <location line="+39"/>
-        <location filename="../src/network/kernel/qhostinfo_win.cpp" line="-34"/>
-        <location line="+29"/>
         <source>Unknown address type</source>
         <translation>Nieznany typ adresu</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../src/network/kernel/qhostinfo_win.cpp" line="-19"/>
-        <location line="+27"/>
         <source>Unknown error</source>
         <translation>Nieznany błąd</translation>
     </message>
     <message>
-        <location line="-112"/>
-        <location filename="../src/network/kernel/qhostinfo_win.cpp" line="-67"/>
         <source>No host name given</source>
         <translation>Nie podano nazwy hosta</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location filename="../src/network/kernel/qhostinfo_win.cpp" line="+0"/>
         <source>Invalid hostname</source>
         <translation>Niepoprawna nazwa hosta</translation>
     </message>
@@ -3846,153 +3045,110 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QHttp</name>
     <message>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+2308"/>
         <source>Connected to host</source>
         <translation>Podłączony do hosta</translation>
     </message>
     <message>
-        <location line="-14"/>
         <source>Connected to host %1</source>
         <translation>Podłączony do hosta %1</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="-3"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+17"/>
         <source>Connection closed</source>
         <translation>Połączenie zakończone</translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="-476"/>
         <source>Connection refused</source>
         <translation>Połączenie odrzucone</translation>
     </message>
     <message>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+462"/>
         <source>Connection to %1 closed</source>
         <translation>Połączenie do %1 zamknięte</translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>Host %1 found</source>
         <translation>Host %1 znaleziony</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttp.cpp" line="+2639"/>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="-4"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="-453"/>
         <source>Host %1 not found</source>
         <translation>Host %1 nie znaleziony</translation>
     </message>
     <message>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+467"/>
         <source>Host found</source>
         <translation>Host znaleziony</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttp.cpp" line="+20"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="-464"/>
         <source>HTTP request failed</source>
         <translation>Komenda HTTP zakończona błędem</translation>
     </message>
     <message>
-        <location line="+219"/>
-        <location line="+48"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+109"/>
-        <location line="+47"/>
         <source>Invalid HTTP chunked body</source>
         <translation>Niepoprawne ciało HTTP</translation>
     </message>
     <message>
-        <location line="-173"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="-87"/>
         <source>Invalid HTTP response header</source>
         <translation>Niepoprawny nagłówek odpowiedzi HTTP</translation>
     </message>
     <message>
-        <location line="-340"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="-173"/>
         <source>No server set to connect to</source>
         <translation>Brak serwera do podłączenia</translation>
     </message>
     <message>
-        <location line="-579"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="-381"/>
         <source>Request aborted</source>
         <translation>Komenda przerwana</translation>
     </message>
     <message>
-        <location line="+747"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+441"/>
         <source>Server closed connection unexpectedly</source>
         <translation>Serwer nieoczekiwanie zakończył połączenie</translation>
     </message>
     <message>
-        <location line="-999"/>
-        <location line="+820"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="-638"/>
-        <location line="+567"/>
         <source>Unknown error</source>
         <translation>Nieznany błąd</translation>
     </message>
     <message>
-        <location line="-2032"/>
         <source>HTTPS connection requested but SSL support not compiled in</source>
         <translation>Zażądano połączenia HTTPS lecz obsługa SSL nie jest wkompilowana</translation>
     </message>
     <message>
-        <location line="+2207"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+67"/>
         <source>Wrong content length</source>
         <translation>Błędna długość zawartości</translation>
     </message>
     <message>
-        <location line="+204"/>
         <source>Unknown authentication method</source>
         <translation>Nieznana metoda autoryzacji</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Proxy authentication required</source>
         <translation>Wymagana autoryzacja pośrednika</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Authentication required</source>
         <translation>Wymagana autoryzacja</translation>
     </message>
     <message>
-        <location line="+169"/>
         <source>Error writing response to device</source>
         <translation>Błąd zapisywania odpowiedzi do urządzenia</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+13"/>
         <source>Proxy requires authentication</source>
         <translation>Pośrednik wymaga autoryzacji</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Host requires authentication</source>
         <translation>Host wymaga autoryzacji</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Data corrupted</source>
         <translation>Dane uszkodzone</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Unknown protocol specified</source>
         <translation>Podano nieznany protokół</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>SSL handshake failed</source>
         <translation>Nawiązanie sesji SSL zakończone błędem</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttp.cpp" line="-328"/>
         <source>Connection refused (or timed out)</source>
         <translation>Połączenie odrzucone (przekroczony czas połączenia)</translation>
     </message>
@@ -4000,47 +3156,38 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QHttpSocketEngine</name>
     <message>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="-86"/>
         <source>Did not receive HTTP response from proxy</source>
         <translation>Nie odebrano odpowiedzi HTTP od pośrednika</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Error parsing authentication request from proxy</source>
         <translation>Błąd parsowania żądania autoryzacji od pośrednika</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Authentication required</source>
         <translation>Wymagana autoryzacja</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Proxy denied connection</source>
         <translation>Pośrednik odmówił połączenia</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Error communicating with HTTP proxy</source>
         <translation>Błąd podczas komunikacji z pośrednikiem HTTP</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Proxy server not found</source>
         <translation>Nie znaleziono serwera pośredniczącego</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Proxy connection refused</source>
         <translation>Odmowa połączenia z pośrednikiem</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Proxy server connection timed out</source>
         <translation>Przekroczony czas połączenia do serwera pośredniczącego</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Proxy connection closed prematurely</source>
         <translation>Przedwczesne zakończenie połączenia z pośrednikiem</translation>
     </message>
@@ -4048,22 +3195,18 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QIBaseDriver</name>
     <message>
-        <location filename="../src/sql/drivers/ibase/qsql_ibase.cpp" line="+1545"/>
         <source>Could not start transaction</source>
         <translation>Nie można rozpocząć transakcji</translation>
     </message>
     <message>
-        <location line="-54"/>
         <source>Error opening database</source>
         <translation>Błąd otwierania bazy danych</translation>
     </message>
     <message>
-        <location line="+67"/>
         <source>Unable to commit transaction</source>
         <translation>Nie można dokonać transakcji</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Unable to rollback transaction</source>
         <translation>Nie można wycofać transakcji</translation>
     </message>
@@ -4071,89 +3214,70 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QIBaseResult</name>
     <message>
-        <location line="-665"/>
         <source>Could not allocate statement</source>
         <translation>Nie można zaallokować polecenia</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+11"/>
         <source>Could not describe input statement</source>
         <translation>Nie można opisać polecenia wejściowego</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Could not describe statement</source>
         <translation>Nie można opisać polecenia</translation>
     </message>
     <message>
-        <location line="+169"/>
         <source>Could not fetch next item</source>
         <translation>Nie można pobrać kolejnego elementu</translation>
     </message>
     <message>
-        <location line="-527"/>
-        <location line="+187"/>
         <source>Could not find array</source>
         <translation>Nie można odnaleźć tablicy</translation>
     </message>
     <message>
-        <location line="-155"/>
         <source>Could not get array data</source>
         <translation>Nie można pobrać danych z tablicy</translation>
     </message>
     <message>
-        <location line="+210"/>
         <source>Could not get query info</source>
         <translation>Nie można pobrać informacji o zapytaniu</translation>
     </message>
     <message>
-        <location line="+482"/>
         <source>Could not get statement info</source>
         <translation>Nie można pobrać informacji o poleceniu</translation>
     </message>
     <message>
-        <location line="-396"/>
         <source>Could not prepare statement</source>
         <translation>Nie można przygotować polecenia</translation>
     </message>
     <message>
-        <location line="-66"/>
         <source>Could not start transaction</source>
         <translation>Nie można rozpocząć transakcji</translation>
     </message>
     <message>
-        <location line="+211"/>
         <source>Unable to close statement</source>
         <translation>Nie można zamknąć polecenia</translation>
     </message>
     <message>
-        <location line="-192"/>
         <source>Unable to commit transaction</source>
         <translation>Nie można dokonać transakcji</translation>
     </message>
     <message>
-        <location line="-442"/>
         <source>Unable to create BLOB</source>
         <translation>Nie można utworzyć obiektu typu BLOB</translation>
     </message>
     <message>
-        <location line="+642"/>
         <source>Unable to execute query</source>
         <translation>Nie można wykonać zapytania</translation>
     </message>
     <message>
-        <location line="-622"/>
         <source>Unable to open BLOB</source>
         <translation>Nie można otworzyć obiektu typu BLOB</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Unable to read BLOB</source>
         <translation>Nie można odczytać obiektu typu BLOB</translation>
     </message>
     <message>
-        <location line="-30"/>
         <source>Unable to write BLOB</source>
         <translation>Nie można zapisać obiektu typu BLOB</translation>
     </message>
@@ -4161,27 +3285,22 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/corelib/global/qglobal.cpp" line="+2117"/>
         <source>No space left on device</source>
         <translation>Brak wolnego miejsca na urządzeniu</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>No such file or directory</source>
         <translation>Brak pliku lub katalogu</translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>Permission denied</source>
         <translation>Brak uprawnień</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Too many open files</source>
         <translation>Zbyt wiele otwartych plików</translation>
     </message>
     <message>
-        <location filename="../src/corelib/io/qiodevice.cpp" line="+1618"/>
         <source>Unknown error</source>
         <translation>Nieznany błąd</translation>
     </message>
@@ -4189,32 +3308,26 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QInputContext</name>
     <message>
-        <location filename="../src/gui/inputmethod/qinputcontextfactory.cpp" line="+336"/>
         <source>Mac OS X input method</source>
         <translation>Metoda wprowadzania Mac OS X</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>Windows input method</source>
         <translation>Metoda wprowadzania Windows</translation>
     </message>
     <message>
-        <location line="-31"/>
         <source>XIM</source>
         <translation>XIM</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>FEP</source>
         <translation>FEP</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>XIM input method</source>
         <translation>Metoda wprowadzania XIM</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>S60 FEP input method</source>
         <translation>Metoda wprowadzania S60 FEP</translation>
     </message>
@@ -4222,7 +3335,6 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QInputDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qinputdialog.cpp" line="+223"/>
         <source>Enter a value:</source>
         <translation>Podaj wartość:</translation>
     </message>
@@ -4230,67 +3342,50 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QLibrary</name>
     <message>
-        <location filename="../src/corelib/plugin/qlibrary.cpp" line="+383"/>
         <source>Could not mmap &apos;%1&apos;: %2</source>
         <translation>Nie można wykonać przypisania &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Could not unmap &apos;%1&apos;: %2</source>
         <translation>Nie można usunąć przypisania &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>Plugin verification data mismatch in &apos;%1&apos;</source>
         <translation>Niezgodność podczas weryfikacji danych we wtyczce &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+381"/>
         <source>The plugin &apos;%1&apos; uses incompatible Qt library. (%2.%3.%4) [%5]</source>
         <translation>Wtyczka &apos;%1&apos; używa niepoprawnej wersji biblioteki QT. (%2.%3.%4) [%5]</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>The plugin &apos;%1&apos; uses incompatible Qt library. Expected build key &quot;%2&quot;, got &quot;%3&quot;</source>
         <translation>Wtyczka &apos;%1&apos; używa niepoprawnej wersji biblioteki QT. Oczekiwano klucza &quot;%2&quot;, uzyskano &quot;%3&quot;</translation>
     </message>
     <message>
-        <location line="+365"/>
         <source>Unknown error</source>
         <translation>Nieznany błąd</translation>
     </message>
     <message>
-        <location line="-540"/>
-        <location line="+138"/>
-        <location filename="../src/corelib/plugin/qpluginloader.cpp" line="+343"/>
         <source>The shared library was not found.</source>
         <translation>Biblioteka współdzielona niedostępna.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>The file &apos;%1&apos; is not a valid Qt plugin.</source>
         <translation>Plik &quot;%1&quot; nie jest poprawną wtyczką Qt.</translation>
     </message>
     <message>
-        <location line="+43"/>
         <source>The plugin &apos;%1&apos; uses incompatible Qt library. (Cannot mix debug and release libraries.)</source>
         <translation>Wtyczka &quot;%1&quot; używa innej wersji biblioteki Qt. (Nie można łączyć bibliotek zwykłych i debugowych.)</translation>
     </message>
     <message>
-        <location filename="../src/corelib/plugin/qlibrary_unix.cpp" line="+236"/>
-        <location filename="../src/corelib/plugin/qlibrary_win.cpp" line="+87"/>
         <source>Cannot load library %1: %2</source>
         <translation>Nie można załadować biblioteki %1: %2</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location filename="../src/corelib/plugin/qlibrary_win.cpp" line="+22"/>
         <source>Cannot unload library %1: %2</source>
         <translation>Nie można zwolnić biblioteki %1: %2</translation>
     </message>
     <message>
-        <location line="+34"/>
-        <location filename="../src/corelib/plugin/qlibrary_win.cpp" line="+15"/>
         <source>Cannot resolve symbol &quot;%1&quot; in %2: %3</source>
         <translation>Nie można zidentyfikować symbolu &quot;%1&quot; w %2: %3</translation>
     </message>
@@ -4298,37 +3393,30 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QLineEdit</name>
     <message>
-        <location filename="../src/gui/widgets/qlineedit.cpp" line="+2098"/>
         <source>&amp;Copy</source>
         <translation>S&amp;kopiuj</translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>Cu&amp;t</source>
         <translation>W&amp;ytnij</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Delete</source>
         <translation>Skasuj</translation>
     </message>
     <message>
-        <location line="-7"/>
         <source>&amp;Paste</source>
         <translation>&amp;Wklej</translation>
     </message>
     <message>
-        <location line="-21"/>
         <source>&amp;Redo</source>
         <translation>&amp;Przywróć</translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>Select All</source>
         <translation>Zaznacz wszystko</translation>
     </message>
     <message>
-        <location line="-40"/>
         <source>&amp;Undo</source>
         <translation>&amp;Cofnij</translation>
     </message>
@@ -4336,23 +3424,18 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QLocalServer</name>
     <message>
-        <location filename="../src/network/socket/qlocalserver.cpp" line="+224"/>
-        <location filename="../src/network/socket/qlocalserver_unix.cpp" line="+246"/>
         <source>%1: Name error</source>
         <translation>%1: Błąd nazwy</translation>
     </message>
     <message>
-        <location filename="../src/network/socket/qlocalserver_unix.cpp" line="-8"/>
         <source>%1: Permission denied</source>
         <translation>%1: Brak uprawnień</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>%1: Address in use</source>
         <translation>%1: Adres użyty</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>%1: Unknown error %2</source>
         <translation>%1: Nieznany błąd %2</translation>
     </message>
@@ -4360,70 +3443,46 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QLocalSocket</name>
     <message>
-        <location filename="../src/network/socket/qlocalsocket_tcp.cpp" line="+132"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+139"/>
         <source>%1: Connection refused</source>
         <translation>%1: Odmowa połączenia</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
         <source>%1: Remote closed</source>
         <translation>%1: Drugi koniec odłączony</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_win.cpp" line="+79"/>
-        <location line="+59"/>
         <source>%1: Invalid name</source>
         <translation>%1: Niepoprawna nazwa</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
         <source>%1: Socket access error</source>
         <translation>%1: Błąd dostępu do gniazda</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
         <source>%1: Socket resource error</source>
         <translation>%1: Błąd zasobów gniazda</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
         <source>%1: Socket operation timed out</source>
         <translation>%1: Przekroczony czas operacji gniazda</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
         <source>%1: Datagram too large</source>
         <translation>%1: Za duży datagram</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_win.cpp" line="-64"/>
         <source>%1: Connection error</source>
         <translation>%1: Błąd połączenia</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
         <source>%1: The socket operation is not supported</source>
         <translation>%1: Operacja nie jest obsługiwana przez gniazdo</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1: Unknown error</source>
         <translation>%1: Nieznany błąd</translation>
     </message>
     <message>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+4"/>
-        <location filename="../src/network/socket/qlocalsocket_win.cpp" line="+10"/>
         <source>%1: Unknown error %2</source>
         <translation>%1: Nieznany błąd %2</translation>
     </message>
@@ -4431,27 +3490,22 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QMYSQLDriver</name>
     <message>
-        <location filename="../src/sql/drivers/mysql/qsql_mysql.cpp" line="+1448"/>
         <source>Unable to begin transaction</source>
         <translation>Nie można rozpocząć transakcji</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to commit transaction</source>
         <translation>Nie można potwierdzić transakcji</translation>
     </message>
     <message>
-        <location line="-167"/>
         <source>Unable to connect</source>
         <translation>Nie można nawiązać połączenia</translation>
     </message>
     <message>
-        <location line="-11"/>
         <source>Unable to open database &apos;</source>
         <translation>Nie można otworzyć bazy danych &apos;</translation>
     </message>
     <message>
-        <location line="+195"/>
         <source>Unable to rollback transaction</source>
         <translation>Nie można wycofać transakcji</translation>
     </message>
@@ -4459,60 +3513,46 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QMYSQLResult</name>
     <message>
-        <location line="-432"/>
-        <location line="+21"/>
         <source>Unable to bind outvalues</source>
         <translation>Nie można powiązać wartości zewnętrznych</translation>
     </message>
     <message>
-        <location line="-46"/>
         <source>Unable to bind value</source>
         <translation>Nie można powiązać wartości</translation>
     </message>
     <message>
-        <location line="-328"/>
         <source>Unable to execute query</source>
         <translation>Nie można wykonać zapytania</translation>
     </message>
     <message>
-        <location line="+339"/>
         <source>Unable to execute statement</source>
         <translation>Nie można wykonać polecenia</translation>
     </message>
     <message>
-        <location line="-531"/>
-        <location line="+31"/>
         <source>Unable to fetch data</source>
         <translation>Nie można pobrać danych</translation>
     </message>
     <message>
-        <location line="+358"/>
-        <location line="+8"/>
         <source>Unable to prepare statement</source>
         <translation>Nie można przygotować polecenia</translation>
     </message>
     <message>
-        <location line="+37"/>
         <source>Unable to reset statement</source>
         <translation>Nie można skasować polecenia</translation>
     </message>
     <message>
-        <location line="-236"/>
         <source>Unable to store result</source>
         <translation>Nie można zachować wyników</translation>
     </message>
     <message>
-        <location line="+356"/>
         <source>Unable to store statement results</source>
         <translation>Nie można zachować wyników polecenia</translation>
     </message>
     <message>
-        <location line="-253"/>
         <source>Unable to execute next query</source>
         <translation>Nie można wykonać następnego zapytania</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Unable to store next result</source>
         <translation>Nie można zachować następnego wyniku</translation>
     </message>
@@ -4520,7 +3560,6 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QMdiArea</name>
     <message>
-        <location filename="../src/gui/widgets/qmdiarea.cpp" line="+290"/>
         <source>(Untitled)</source>
         <translation>(Nienazwany)</translation>
     </message>
@@ -4528,92 +3567,74 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+280"/>
         <source>%1 - [%2]</source>
         <translation>%1 - [%2]</translation>
     </message>
     <message>
-        <location line="+72"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location line="-18"/>
         <source>Minimize</source>
         <translation>Zminimalizuj</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Restore Down</source>
         <translation>Przywróć pod spód</translation>
     </message>
     <message>
-        <location line="+707"/>
         <source>&amp;Restore</source>
         <translation>&amp;Przywróć</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Move</source>
         <translation>Prze&amp;nieś</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Size</source>
         <translation>&amp;Rozmiar</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Mi&amp;nimize</source>
         <translation>Zmi&amp;nimalizuj</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Ma&amp;ximize</source>
         <translation>Zma&amp;ksymalizuj</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Stay on &amp;Top</source>
         <translation>Pozostaw na &amp;wierzchu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Close</source>
         <translation>&amp;Zamknij</translation>
     </message>
     <message>
-        <location line="-729"/>
         <source>Maximize</source>
         <translation>Zmaksymalizuj</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Unshade</source>
         <translation>Rozwiń</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Shade</source>
         <translation>Zwiń</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Restore</source>
         <translation>Przywróć</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Help</source>
         <translation>Pomoc</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
-        <location line="-79"/>
         <source>- [%1]</source>
         <translation>- [%1]</translation>
     </message>
@@ -4621,21 +3642,14 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QMenu</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/qaccessiblemenu.cpp" line="+157"/>
-        <location line="+225"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location line="-222"/>
-        <location line="+225"/>
-        <location line="+51"/>
         <source>Execute</source>
         <translation>Wykonaj</translation>
     </message>
     <message>
-        <location line="-278"/>
-        <location line="+225"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
@@ -4643,7 +3657,6 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="../src/gui/widgets/qmenu_symbian.cpp" line="+456"/>
         <source>Actions</source>
         <translation>Akcje</translation>
     </message>
@@ -4651,40 +3664,30 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QMessageBox</name>
     <message>
-        <location filename="../src/gui/dialogs/qmessagebox.cpp" line="-604"/>
         <source>About Qt</source>
         <translation>Informacje o Qt</translation>
     </message>
     <message>
-        <location line="-512"/>
         <source>Help</source>
         <translation>Pomoc</translation>
     </message>
     <message>
-        <location line="-1129"/>
         <source>Hide Details...</source>
         <translation>Ukryj szczegóły...</translation>
     </message>
     <message>
-        <location line="+281"/>
-        <location line="+847"/>
-        <location filename="../src/gui/dialogs/qmessagebox.h" line="-52"/>
-        <location line="+8"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location line="+477"/>
         <source>&lt;h3&gt;About Qt&lt;/h3&gt;&lt;p&gt;This program uses Qt version %1.&lt;/p&gt;</source>
         <translation>&lt;h3&gt;Informacje o Qt&lt;/h3&gt;&lt;p&gt; Ten program używa Qt w wersji %1.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.&lt;/p&gt;&lt;p&gt;Qt is available under three different licensing options designed to accommodate the needs of our various users.&lt;/p&gt;&lt;p&gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.&lt;/p&gt;&lt;p&gt;Please see &lt;a href=&quot;http://qt.nokia.com/products/licensing&quot;&gt;qt.nokia.com/products/licensing&lt;/a&gt; for an overview of Qt licensing.&lt;/p&gt;&lt;p&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).&lt;/p&gt;&lt;p&gt;Qt is a Nokia product. See &lt;a href=&quot;http://qt.nokia.com/&quot;&gt;qt.nokia.com&lt;/a&gt; for more information.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Qt jest zestawem narzędzi programistycznych dedykowanym dla języka C++. Służy on do opracowywania aplikacji międzyplatformowych.&lt;/p&gt;&lt;p&gt;Qt umożliwia jednoźródłowe przenoszenie między systemami MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;nbsp;X, Linux i wszystkimi głównymi wersjami komercyjnymi systemu Unix. Środowisko Qt jest dostępne dla urządzeń wbudowanych opartych na systemie Linux ( Qt dla wbudowanego systemu Linux) oraz Windows CE.&lt;/p&gt;&lt;p&gt;Zestaw Qt jest dostępny w trzech różnych opcjach licencjonowania stworzonych w celu zadowolenia naszych różnych użytkowników.&lt;/p&gt;&lt;p&gt;Qt podlegający licencji zgodnie z naszą komercyjną umową licencyjną jest odpowiedni do opracowywania oprogramowań własnościowych/komercyjnych, dzięki czemu kod źródłowy nie jest udostępniany osobom trzecim. W przeciwnym razie zestaw Qt jest niezgodny z warunkami licencji GNU LGPL w wersji 2.1 lub GNU GPL w wersji 3.0.&lt;/p&gt;&lt;p&gt;Środowisko Qt objęte licencją GNU LGPL w wersji 2.1 nadaje się do tworzenia aplikacji Qt (własnościowych lub oprogramowań otwartych) tylko wtedy, gdy przestrzegane są warunki licencji GNU LGPL w wersji 2.1.&lt;/p&gt;&lt;p&gt;Qt objęty Powszechną Licencją Publiczną GNU w wersji 3.0 jest odpowiedni do opracowywania aplikacji QT, aby móc korzystać z aplikacji w połączeniu z oprogramowaniem podlegającym warunkom licencji GNU GPL w wersji 3.0 lub aby przestrzegać warunków licencji GNU GPL w wersji 3.0.&lt;/p&gt;&lt;p&gt;Więcej informacji na temat licencji Qt można znaleźć na stronie &lt;a href=&quot;http://qt.nokia.com/products/licensing&quot;&gt;qt.nokia.com/products/licensing&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Copyright (C) 2010 Nokia Corporation i/lub oddziały firmy.&lt;/p&gt;&lt;p&gt;Qt jest produktem firmy Nokia. Dodatkowe informacje znajdują się na stronie &lt;a href=&quot;http://qt.nokia.com/&quot;&gt;qt.nokia.com&lt;/a&gt; &lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="-1610"/>
         <source>Show Details...</source>
         <translation>Pokaż szczegóły...</translation>
     </message>
@@ -4692,7 +3695,6 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QMultiInputContext</name>
     <message>
-        <location filename="../src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp" line="+88"/>
         <source>Select IM</source>
         <translation>Wybierz metodę wprowadzania</translation>
     </message>
@@ -4700,12 +3702,10 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QMultiInputContextPlugin</name>
     <message>
-        <location filename="../src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp" line="+95"/>
         <source>Multiple input method switcher</source>
         <translation>Przełącznik metody wprowadzania</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Multiple input method switcher that uses the context menu of the text widgets</source>
         <translation>Przełącznik metody wprowadzania, który w widżetach tekstowych używa podręcznego menu</translation>
     </message>
@@ -4713,132 +3713,106 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QNativeSocketEngine</name>
     <message>
-        <location filename="../src/network/socket/qnativesocketengine.cpp" line="+266"/>
         <source>Another socket is already listening on the same port</source>
         <translation>Inne gniazdo nasłuchuje już na tym porcie</translation>
     </message>
     <message>
-        <location line="-60"/>
         <source>Attempt to use IPv6 socket on a platform with no IPv6 support</source>
         <translation>Próba użycia IPv6 na platformie bez obsługi IPv6</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Connection refused</source>
         <translation>Połączenie odrzucone</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>Connection timed out</source>
         <translation>Przekroczony czas połączenia</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Datagram was too large to send</source>
         <translation>Datagram za długi do wysłania</translation>
     </message>
     <message>
-        <location line="-24"/>
         <source>Host unreachable</source>
         <translation>Komputer niedostępny</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>Invalid socket descriptor</source>
         <translation>Niepoprawny opis gniazda</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>Network error</source>
         <translation>Błąd sieci</translation>
     </message>
     <message>
-        <location line="-51"/>
         <source>Network operation timed out</source>
         <translation>Przekroczony czas operacji sieciowej</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Network unreachable</source>
         <translation>Sieć niedostępna</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>Operation on non-socket</source>
         <translation>Nieprawidłowa operacja na gnieździe</translation>
     </message>
     <message>
-        <location line="-54"/>
         <source>Out of resources</source>
         <translation>Zasoby wyczerpane</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Permission denied</source>
         <translation>Brak uprawnień</translation>
     </message>
     <message>
-        <location line="-12"/>
         <source>Protocol type not supported</source>
         <translation>Nieobsługiwany typ protokołu</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>The address is not available</source>
         <translation>Adres nie jest dostępny</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The address is protected</source>
         <translation>Adres jest zabezpieczony</translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>The bound address is already in use</source>
         <translation>Adres jest aktualnie w użyciu</translation>
     </message>
     <message>
-        <location line="-33"/>
         <source>The remote host closed the connection</source>
         <translation>Zdalny host zakończył połączenie</translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>Unable to initialize broadcast socket</source>
         <translation>Nie można uruchomić gniazda rozsyłającego</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>Unable to initialize non-blocking socket</source>
         <translation>Nie można uruchomić gniazda w nieblokującym trybie</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>Unable to receive a message</source>
         <translation>Nie można odebrać wiadomości</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>Unable to send a message</source>
         <translation>Nie można wysłać wiadomości</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Unable to write</source>
         <translation>Nie można zapisać</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unknown error</source>
         <translation>Nieznany błąd</translation>
     </message>
     <message>
-        <location line="-57"/>
         <source>Unsupported socket operation</source>
         <translation>Nieobsługiwana operacja gniazda</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>The proxy type is invalid for this operation</source>
         <translation>Typ pośrednika nie jest poprawny dla tej operacji</translation>
     </message>
@@ -4846,7 +3820,6 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QNetworkAccessCacheBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesscachebackend.cpp" line="+66"/>
         <source>Error opening %1</source>
         <translation>Błąd otwierania %1</translation>
     </message>
@@ -4854,12 +3827,10 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QNetworkAccessDataBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdatabackend.cpp" line="+76"/>
         <source>Operation not supported on %1</source>
         <translation>Operacja nieobsługiwana na %1</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Invalid URI: %1</source>
         <translation>Niepoprawny URI: %1</translation>
     </message>
@@ -4867,17 +3838,14 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+195"/>
         <source>Write error writing to %1: %2</source>
         <translation>Błąd w trakcie zapisywania do %1: %2</translation>
     </message>
     <message>
-        <location line="+60"/>
         <source>Socket error on %1: %2</source>
         <translation>Błąd gniazda na %1: %2</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Remote host closed the connection prematurely on %1</source>
         <translation>Zdalny host przedwcześnie zakończył połączenie na %1</translation>
     </message>
@@ -4885,30 +3853,22 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QNetworkAccessFileBackend</name>
     <message>
-        <location filename="../src/network/access/qfilenetworkreply.cpp" line="+85"/>
-        <location filename="../src/network/access/qnetworkaccessfilebackend.cpp" line="+100"/>
         <source>Request for opening non-local file %1</source>
         <translation>Żądanie otwarcia zdalnego pliku %1</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <location filename="../src/network/access/qnetworkaccessfilebackend.cpp" line="+45"/>
         <source>Error opening %1: %2</source>
         <translation>Błąd otwierania %1: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkaccessfilebackend.cpp" line="+38"/>
         <source>Write error writing to %1: %2</source>
         <translation>Błąd w trakcie zapisywania do %1: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qfilenetworkreply.cpp" line="-13"/>
-        <location filename="../src/network/access/qnetworkaccessfilebackend.cpp" line="+48"/>
         <source>Cannot open %1: Path is a directory</source>
         <translation>Nie można otworzyć %1: Ścieżka jest katalogiem</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkaccessfilebackend.cpp" line="+21"/>
         <source>Read error reading from %1: %2</source>
         <translation>Błąd w trakcie czytania z %1: %2</translation>
     </message>
@@ -4916,27 +3876,22 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QNetworkAccessFtpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessftpbackend.cpp" line="+131"/>
         <source>No suitable proxy found</source>
         <translation>Nie odnaleziono odpowiedniego pośrednika</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Cannot open %1: is a directory</source>
         <translation>Nie można otworzyć %1: jest to katalog</translation>
     </message>
     <message>
-        <location line="+112"/>
         <source>Logging in to %1 failed: authentication required</source>
         <translation>Błąd podczas logowania do %1: wymagana autoryzacja</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>Error while downloading %1: %2</source>
         <translation>Błąd podczas pobierania %1: %2</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Error while uploading %1: %2</source>
         <translation>Błąd podczas wysyłania %1: %2</translation>
     </message>
@@ -4944,7 +3899,6 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+652"/>
         <source>No suitable proxy found</source>
         <translation>Nie odnaleziono odpowiedniego pośrednika</translation>
     </message>
@@ -4952,7 +3906,6 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+942"/>
         <source>Network access is disabled.</source>
         <translation>Dostęp do sieci wyłączony.</translation>
     </message>
@@ -4960,22 +3913,18 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+100"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>Błąd podczas pobierania %1 - odpowiedź serwera: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-860"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>Protokół &quot;%1&quot; nie jest znany</translation>
     </message>
     <message>
-        <location line="+192"/>
         <source>Network session error.</source>
         <translation>Błąd sesji sieciowej.</translation>
     </message>
     <message>
-        <location line="+352"/>
         <source>Temporary network failure.</source>
         <translation>Chwilowy błąd w sieci.</translation>
     </message>
@@ -4983,8 +3932,6 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QNetworkReplyImpl</name>
     <message>
-        <location line="+120"/>
-        <location line="+28"/>
         <source>Operation canceled</source>
         <translation>Operacja anulowana</translation>
     </message>
@@ -4992,7 +3939,6 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+449"/>
         <source>Invalid configuration.</source>
         <translation>Niepoprawna konfiguracja.</translation>
     </message>
@@ -5000,47 +3946,34 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QNetworkSessionPrivateImpl</name>
     <message>
-        <location filename="../src/plugins/bearer/icd/qnetworksession_impl.cpp" line="+1019"/>
         <source>Roaming error</source>
         <translation>Błąd roamingu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Session aborted by user or system</source>
         <translation>Sesja przerwana przez użytkownika lub system</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Unidentified Error</source>
         <translation>Niezidentyfikowany błąd</translation>
     </message>
     <message>
-        <location filename="../src/plugins/bearer/qnetworksession_impl.cpp" line="+272"/>
-        <location filename="../src/plugins/bearer/symbian/qnetworksession_impl.cpp" line="+291"/>
         <source>Unknown session error.</source>
         <translation>Nieznany błąd sesji.</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../src/plugins/bearer/symbian/qnetworksession_impl.cpp" line="+2"/>
         <source>The session was aborted by the user or system.</source>
         <translation>Sesja została przerwana przez użytkownika lub system.</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../src/plugins/bearer/symbian/qnetworksession_impl.cpp" line="+2"/>
         <source>The requested operation is not supported by the system.</source>
         <translation>Zażądana operacja nie jest obsługiwana przez system.</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../src/plugins/bearer/symbian/qnetworksession_impl.cpp" line="+2"/>
         <source>The specified configuration cannot be used.</source>
         <translation>Podana konfiguracja nie może być użyta.</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../src/plugins/bearer/symbian/qnetworksession_impl.cpp" line="+2"/>
         <source>Roaming was aborted or is not possible.</source>
         <translation>Roaming przerwany albo niemożliwy.</translation>
     </message>
@@ -5048,28 +3981,23 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QOCIDriver</name>
     <message>
-        <location filename="../src/sql/drivers/oci/qsql_oci.cpp" line="+1976"/>
         <source>Unable to initialize</source>
         <comment>QOCIDriver</comment>
         <translation>Nie można dokonać inicjalizacji</translation>
     </message>
     <message>
-        <location line="+144"/>
         <source>Unable to logon</source>
         <translation>Nie można się zalogować</translation>
     </message>
     <message>
-        <location line="+71"/>
         <source>Unable to begin transaction</source>
         <translation>Nie można rozpocząć transakcji</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to commit transaction</source>
         <translation>Nie można dokonać transakcji</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to rollback transaction</source>
         <translation>Nie można wycofać transakcji</translation>
     </message>
@@ -5077,44 +4005,34 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QOCIResult</name>
     <message>
-        <location line="-979"/>
-        <location line="+168"/>
-        <location line="+15"/>
         <source>Unable to bind column for batch execute</source>
         <translation>Nie można powiązać kolumny dla wykonania zestawu poleceń</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to execute batch statement</source>
         <translation>Nie można wykonać polecenia wsadowego</translation>
     </message>
     <message>
-        <location line="+304"/>
         <source>Unable to goto next</source>
         <translation>Nie można przejść do kolejnego wiersza danych</translation>
     </message>
     <message>
-        <location line="+59"/>
         <source>Unable to alloc statement</source>
         <translation>Nie można przydzielić miejsca na polecenie</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to prepare statement</source>
         <translation>Nie można przygotować polecenia</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Unable to get statement type</source>
         <translation>Nie można pobrać typu polecenia</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Unable to bind value</source>
         <translation>Nie można powiązać wartości</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to execute statement</source>
         <translation>Nie można wykonać polecenia</translation>
     </message>
@@ -5122,32 +4040,26 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QODBCDriver</name>
     <message>
-        <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="+2174"/>
         <source>Unable to commit transaction</source>
         <translation>Nie można potwierdzić transakcji</translation>
     </message>
     <message>
-        <location line="-286"/>
         <source>Unable to connect</source>
         <translation>Nie można nawiązać połączenia</translation>
     </message>
     <message>
-        <location line="+269"/>
         <source>Unable to disable autocommit</source>
         <translation>Nie można wyłączyć trybu automatycznego dokonywania transakcji</translation>
     </message>
     <message>
-        <location line="+49"/>
         <source>Unable to enable autocommit</source>
         <translation>Nie można włączyć trybu automatycznego dokonywania transakcji</translation>
     </message>
     <message>
-        <location line="-15"/>
         <source>Unable to rollback transaction</source>
         <translation>Nie można wycofać transakcji</translation>
     </message>
     <message>
-        <location line="-297"/>
         <source>Unable to connect - Driver doesn&apos;t support all functionality required</source>
         <translation>Nie można nawiązać połączenia - sterownik nie obsługuje całej potrzebnej funkcjonalności</translation>
     </message>
@@ -5155,51 +4067,38 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QODBCResult</name>
     <message>
-        <location line="-941"/>
-        <location line="+351"/>
         <source>QODBCResult::reset: Unable to set &apos;SQL_CURSOR_STATIC&apos; as statement attribute. Please check your ODBC driver configuration</source>
         <translation>QODBCResult::reset: Nie można ustawić &apos;SQL_CURSOR_STATIC&apos; jako atrybutu polecenia. Proszę sprawdzić konfiguracje sterownika ODBC</translation>
     </message>
     <message>
-        <location line="+285"/>
         <source>Unable to bind variable</source>
         <translation>Nie można powiązać zmiennej</translation>
     </message>
     <message>
-        <location line="-619"/>
-        <location line="+627"/>
         <source>Unable to execute statement</source>
         <translation>Nie można wykonać polecenia</translation>
     </message>
     <message>
-        <location line="-546"/>
         <source>Unable to fetch next</source>
         <translation>Nie można pobrać kolejnych danych</translation>
     </message>
     <message>
-        <location line="+271"/>
         <source>Unable to prepare statement</source>
         <translation>Nie można przygotować polecenia</translation>
     </message>
     <message>
-        <location filename="../src/sql/drivers/db2/qsql_db2.cpp" line="+189"/>
-        <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="-199"/>
-        <location line="+578"/>
         <source>Unable to fetch last</source>
         <translation>Nie można pobrać ostatnich danych</translation>
     </message>
     <message>
-        <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="-672"/>
         <source>Unable to fetch</source>
         <translation>Nie można pobrać</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Unable to fetch first</source>
         <translation>Nie można pobrać pierwszych danych</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to fetch previous</source>
         <translation>Nie można pobrać poprzednich danych</translation>
     </message>
@@ -5207,19 +4106,14 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/3rdparty/phonon/phonon/pulsesupport.cpp" line="+162"/>
-        <location line="+11"/>
         <source>PulseAudio Sound Server</source>
         <translation>Serwer dźwięku PulseAudio</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-253"/>
         <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+528"/>
-        <location line="+4"/>
         <source>invalid query: &quot;%1&quot;</source>
         <translation>Niepoprawne zapytanie: &quot;%1&quot;</translation>
     </message>
@@ -5227,12 +4121,10 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QPPDOptionsModel</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="+1238"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Value</source>
         <translation>Wartość</translation>
     </message>
@@ -5240,32 +4132,26 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QPSQLDriver</name>
     <message>
-        <location filename="../src/sql/drivers/psql/qsql_psql.cpp" line="+831"/>
         <source>Could not begin transaction</source>
         <translation>Nie można rozpocząć transakcji</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>Could not commit transaction</source>
         <translation>Nie można potwierdzić transakcji</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Could not rollback transaction</source>
         <translation>Nie można wycofać transakcji</translation>
     </message>
     <message>
-        <location line="-95"/>
         <source>Unable to connect</source>
         <translation>Nie można nawiązać połączenia</translation>
     </message>
     <message>
-        <location line="+469"/>
         <source>Unable to subscribe</source>
         <translation>Nie można wykonać subskrypcji</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Unable to unsubscribe</source>
         <translation>Nie można zrezygnować z subskrypcji</translation>
     </message>
@@ -5273,12 +4159,10 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QPSQLResult</name>
     <message>
-        <location line="-1085"/>
         <source>Unable to create query</source>
         <translation>Nie można utworzyć zapytania</translation>
     </message>
     <message>
-        <location line="+372"/>
         <source>Unable to prepare statement</source>
         <translation>Nie można przygotować polecenia</translation>
     </message>
@@ -5286,102 +4170,82 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QPageSetupWidget</name>
     <message>
-        <location filename="../src/gui/dialogs/qpagesetupdialog_unix.cpp" line="+304"/>
         <source>Centimeters (cm)</source>
         <translation>Centymetry (cm)</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Millimeters (mm)</source>
         <translation>Milimetry (mm)</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Inches (in)</source>
         <translation>Cale (in)</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Points (pt)</source>
         <translation>Punkty (pt)</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qpagesetupwidget.ui"/>
         <source>Form</source>
         <translation>Formularz</translation>
     </message>
     <message>
-        <location/>
         <source>Paper</source>
         <translation>Papier</translation>
     </message>
     <message>
-        <location/>
         <source>Page size:</source>
         <translation>Rozmiar strony:</translation>
     </message>
     <message>
-        <location/>
         <source>Width:</source>
         <translation>Szerokość:</translation>
     </message>
     <message>
-        <location/>
         <source>Height:</source>
         <translation>Wysokość:</translation>
     </message>
     <message>
-        <location/>
         <source>Paper source:</source>
         <translation>Źródło papieru:</translation>
     </message>
     <message>
-        <location/>
         <source>Orientation</source>
         <translation>Położenie</translation>
     </message>
     <message>
-        <location/>
         <source>Portrait</source>
         <translation>Portret</translation>
     </message>
     <message>
-        <location/>
         <source>Landscape</source>
         <translation>Pejzaż</translation>
     </message>
     <message>
-        <location/>
         <source>Reverse landscape</source>
         <translation>Odwrócony pejzaż</translation>
     </message>
     <message>
-        <location/>
         <source>Reverse portrait</source>
         <translation>Odwrócony portret</translation>
     </message>
     <message>
-        <location/>
         <source>Margins</source>
         <translation>Marginesy</translation>
     </message>
     <message>
-        <location/>
         <source>top margin</source>
         <translation>Górny margines</translation>
     </message>
     <message>
-        <location/>
         <source>left margin</source>
         <translation>Lewy margines</translation>
     </message>
     <message>
-        <location/>
         <source>right margin</source>
         <translation>Prawy margines</translation>
     </message>
     <message>
-        <location/>
         <source>bottom margin</source>
         <translation>Dolny margines</translation>
     </message>
@@ -5389,12 +4253,10 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QPluginLoader</name>
     <message>
-        <location filename="../src/corelib/plugin/qpluginloader.cpp" line="+24"/>
         <source>Unknown error</source>
         <translation>Nieznany błąd</translation>
     </message>
     <message>
-        <location line="-113"/>
         <source>The plugin was not loaded.</source>
         <translation>Wtyczka nie została załadowana.</translation>
     </message>
@@ -5402,433 +4264,344 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QPrintDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_qws.cpp" line="+333"/>
         <source>A0 (841 x 1189 mm)</source>
         <translation>A0 (841 x 1189 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A1 (594 x 841 mm)</source>
         <translation>A1 (594 x 841 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A2 (420 x 594 mm)</source>
         <translation>A2 (420 x 594 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A3 (297 x 420 mm)</source>
         <translation>A3 (297 x 420 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A4 (210 x 297 mm, 8.26 x 11.7 inches)</source>
         <translation>A4 (210 x 297 mm, 8.26 x 11.7 cali)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A5 (148 x 210 mm)</source>
         <translation>A5 (148 x 210 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A6 (105 x 148 mm)</source>
         <translation>A6 (105 x 148 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A7 (74 x 105 mm)</source>
         <translation>A7 (74 x 105 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A8 (52 x 74 mm)</source>
         <translation>A8 (52 x 74 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A9 (37 x 52 mm)</source>
         <translation>A9 (37 x 52 mm)</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>Print current page</source>
         <translation>Wydrukuj bieżącą stronę</translation>
     </message>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+133"/>
-        <location line="+225"/>
         <source>Aliases: %1</source>
         <translation>Aliasy: %1</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_qws.cpp" line="-39"/>
         <source>B0 (1000 x 1414 mm)</source>
         <translation>B0 (1000 x 1414 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B1 (707 x 1000 mm)</source>
         <translation>B1 (707 x 1000 mm)</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>B10 (31 x 44 mm)</source>
         <translation>B10 (31 x 44 mm)</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>B2 (500 x 707 mm)</source>
         <translation>B2 (500 x 707 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B3 (353 x 500 mm)</source>
         <translation>B3 (353 x 500 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B4 (250 x 353 mm)</source>
         <translation>B4 (250 x 353 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B5 (176 x 250 mm, 6.93 x 9.84 inches)</source>
         <translation>B5 (176 x 250 mm, 6.93 x 9.84 cali)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B6 (125 x 176 mm)</source>
         <translation>B6 (125 x 176 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B7 (88 x 125 mm)</source>
         <translation>B7 (88 x 125 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B8 (62 x 88 mm)</source>
         <translation>B8 (62 x 88 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B9 (44 x 62 mm)</source>
         <translation>B9 (44 x 62 mm)</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>C5E (163 x 229 mm)</source>
         <translation>C5E (163 x 229 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>DLE (110 x 220 mm)</source>
         <translation>DLE (110 x 220 mm)</translation>
     </message>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="-248"/>
         <source>locally connected</source>
         <translation>podłączony lokalnie</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_win.cpp" line="+272"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_qws.cpp" line="+24"/>
         <source>Print all</source>
         <translation>Drukuj wszystko</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Print range</source>
         <translation>Drukuj zakres</translation>
     </message>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+473"/>
-        <location line="+199"/>
         <source>unknown</source>
         <translation>nieznany</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_qws.cpp" line="-25"/>
         <source>Executive (7.5 x 10 inches, 191 x 254 mm)</source>
         <translation>Executive (7.5 x 10 cali, 191 x 254 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Folio (210 x 330 mm)</source>
         <translation>Folio (210 x 330 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ledger (432 x 279 mm)</source>
         <translation>Ledger (432 x 279 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Legal (8.5 x 14 inches, 216 x 356 mm)</source>
         <translation>Legal (8.5 x 14 cali, 216 x 356 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Letter (8.5 x 11 inches, 216 x 279 mm)</source>
         <translation>Letter (8.5 x 11 cali, 216 x 279 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Tabloid (279 x 432 mm)</source>
         <translation>Tabloid (279 x 432 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>US Common #10 Envelope (105 x 241 mm)</source>
         <translation>US Common #10 Envelope (105 x 241 mm)</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qabstractprintdialog.cpp" line="+113"/>
-        <location line="+13"/>
-        <location filename="../src/gui/dialogs/qprintdialog_win.cpp" line="-2"/>
         <source>Print</source>
         <translation>Drukowanie</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="-392"/>
         <source>Print To File ...</source>
         <translation>Drukuj do pliku ...</translation>
     </message>
     <message>
-        <location line="+82"/>
         <source>File %1 is not writable.
 Please choose a different file name.</source>
         <translation>Plik %1 jest plikiem tylko do odczytu.
 Proszę wybrać inną nazwę pliku.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1 already exists.
 Do you want to overwrite it?</source>
         <translation>%1 już istnieje.
 Czy chcesz nadpisać?</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>%1 is a directory.
 Please choose a different file name.</source>
         <translation>%1 jest katalogiem.
 Proszę wybrać inną nazwę pliku.</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_qws.cpp" line="-214"/>
         <source>File exists</source>
         <translation>Plik istnieje</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt;qt&gt;Do you want to overwrite it?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Czy chcesz nadpisać?&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location line="+231"/>
         <source>Print selection</source>
         <translation>Drukuj zaznaczone</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qpagesetupdialog_unix.cpp" line="-232"/>
         <source>A0</source>
         <translation>A0</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A1</source>
         <translation>A1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A2</source>
         <translation>A2</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A3</source>
         <translation>A3</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A4</source>
         <translation>A4</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A5</source>
         <translation>A5</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A6</source>
         <translation>A6</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A7</source>
         <translation>A7</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A8</source>
         <translation>A8</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A9</source>
         <translation>A9</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B0</source>
         <translation>B0</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B1</source>
         <translation>B1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B2</source>
         <translation>B2</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B3</source>
         <translation>B3</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B4</source>
         <translation>B4</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B5</source>
         <translation>B5</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B6</source>
         <translation>B6</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B7</source>
         <translation>B7</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B8</source>
         <translation>B8</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B9</source>
         <translation>B9</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B10</source>
         <translation>B10</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>C5E</source>
         <translation>C5E</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>DLE</source>
         <translation>DLE</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Executive</source>
         <translation>Executive</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Folio</source>
         <translation>Folio</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ledger</source>
         <translation>Ledger</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Legal</source>
         <translation>Legal</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Letter</source>
         <translation>Letter</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Tabloid</source>
         <translation>Tabloid</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>US Common #10 Envelope</source>
         <translation>US Common #10 Envelope</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Custom</source>
         <translation>Niestandardowy</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="-530"/>
-        <location line="+68"/>
         <source>&amp;Options &gt;&gt;</source>
         <translation>&amp;Opcje &gt;&gt;</translation>
     </message>
     <message>
-        <location line="-63"/>
         <source>&amp;Print</source>
         <translation>Wy&amp;drukuj</translation>
     </message>
     <message>
-        <location line="+67"/>
         <source>&amp;Options &lt;&lt;</source>
         <translation>&amp;Opcje &lt;&lt;</translation>
     </message>
     <message>
-        <location line="+260"/>
         <source>Print to File (PDF)</source>
         <translation>Drukuj do pliku (PDF)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Print to File (Postscript)</source>
         <translation>Drukuj do pliku (Postscript)</translation>
     </message>
     <message>
-        <location line="+47"/>
         <source>Local file</source>
         <translation>Plik lokalny</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Write %1 file</source>
         <translation>Zapisz %1 plik</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_win.cpp" line="+1"/>
         <source>The &apos;From&apos; value cannot be greater than the &apos;To&apos; value.</source>
         <translation>Wartość &quot;od&quot; nie może być większa od wartości &quot;do&quot;.</translation>
     </message>
@@ -5836,108 +4609,86 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QPrintPreviewDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintpreviewdialog.cpp" line="+249"/>
         <source>%1%</source>
         <translation>%1%</translation>
     </message>
     <message>
-        <location line="+84"/>
         <source>Print Preview</source>
         <translation>Podgląd wydruku</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>Next page</source>
         <translation>Następna strona</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Previous page</source>
         <translation>Poprzednia strona</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>First page</source>
         <translation>Pierwsza strona</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Last page</source>
         <translation>Ostatnia strona</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Fit width</source>
         <translation>Dopasuj szerokość</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Fit page</source>
         <translation>Dopasuj stronę</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Zoom in</source>
         <translation>Powiększ</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zoom out</source>
         <translation>Pomniejsz</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Portrait</source>
         <translation>Portret</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Landscape</source>
         <translation>Pejzaż</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Show single page</source>
         <translation>Pokaż pojedynczą stronę</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Show facing pages</source>
         <translation>Pokaż sąsiednie strony</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Show overview of all pages</source>
         <translation>Pokaż wszystkie strony</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Print</source>
         <translation>Wydrukuj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page setup</source>
         <translation>Ustawienia strony</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location line="+148"/>
         <source>Export to PDF</source>
         <translation>Wyeksportuj do PDF</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Export to PostScript</source>
         <translation>Wyeksportuj do PostScript</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qabstractpagesetupdialog.cpp" line="+68"/>
-        <location line="+12"/>
         <source>Page Setup</source>
         <translation>Ustawienia strony</translation>
     </message>
@@ -5945,17 +4696,14 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QPrintPropertiesWidget</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintpropertieswidget.ui"/>
         <source>Form</source>
         <translation>Forma</translation>
     </message>
     <message>
-        <location/>
         <source>Page</source>
         <translation>Strona</translation>
     </message>
     <message>
-        <location/>
         <source>Advanced</source>
         <translation>Zaawansowane</translation>
     </message>
@@ -5963,102 +4711,82 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QPrintSettingsOutput</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintsettingsoutput.ui"/>
         <source>Form</source>
         <translation>Forma</translation>
     </message>
     <message>
-        <location/>
         <source>Copies</source>
         <translation>Liczba kopii</translation>
     </message>
     <message>
-        <location/>
         <source>Print range</source>
         <translation>Zakres wydruku</translation>
     </message>
     <message>
-        <location/>
         <source>Print all</source>
         <translation>Drukuj wszystko</translation>
     </message>
     <message>
-        <location/>
         <source>Pages from</source>
         <translation>Strony od</translation>
     </message>
     <message>
-        <location/>
         <source>to</source>
         <translation>do</translation>
     </message>
     <message>
-        <location/>
         <source>Selection</source>
         <translation>Wybrane strony</translation>
     </message>
     <message>
-        <location/>
         <source>Output Settings</source>
         <translation>Ustawienia wyjściowe</translation>
     </message>
     <message>
-        <location/>
         <source>Copies:</source>
         <translation>Kopie:</translation>
     </message>
     <message>
-        <location/>
         <source>Collate</source>
         <translation>Parami</translation>
     </message>
     <message>
-        <location/>
         <source>Reverse</source>
         <translation>Odwróć</translation>
     </message>
     <message>
-        <location/>
         <source>Options</source>
         <translation>Opcje</translation>
     </message>
     <message>
-        <location/>
         <source>Color Mode</source>
         <translation>Tryb koloru</translation>
     </message>
     <message>
-        <location/>
         <source>Color</source>
         <translation>Kolor</translation>
     </message>
     <message>
-        <location/>
         <source>Grayscale</source>
         <translation>Skala szarości</translation>
     </message>
     <message>
-        <location/>
         <source>Duplex Printing</source>
         <translation>Drukowanie dupleksowe</translation>
     </message>
     <message>
-        <location/>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
-        <location/>
         <source>Long side</source>
         <translation>Długa strona</translation>
     </message>
     <message>
-        <location/>
         <source>Short side</source>
         <translation>Krótka strona</translation>
     </message>
     <message>
-        <location/>
         <source>Current Page</source>
         <translation>Bieżąca strona</translation>
     </message>
@@ -6066,47 +4794,38 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QPrintWidget</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintwidget.ui"/>
         <source>Form</source>
         <translation>Forma</translation>
     </message>
     <message>
-        <location/>
         <source>Printer</source>
         <translation>Drukarka</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Name:</source>
         <translation>&amp;Nazwa:</translation>
     </message>
     <message>
-        <location/>
         <source>P&amp;roperties</source>
         <translation>&amp;Właściwości</translation>
     </message>
     <message>
-        <location/>
         <source>Location:</source>
         <translation>Położenie:</translation>
     </message>
     <message>
-        <location/>
         <source>Preview</source>
         <translation>Podgląd</translation>
     </message>
     <message>
-        <location/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location/>
         <source>Output &amp;file:</source>
         <translation>&amp;Plik wyjściowy:</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -6114,62 +4833,38 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QProcess</name>
     <message>
-        <location filename="../src/corelib/io/qprocess_unix.cpp" line="+406"/>
-        <location filename="../src/corelib/io/qprocess_win.cpp" line="+137"/>
         <source>Could not open input redirection for reading</source>
         <translation>Nie można otworzyć wejściowego przekierowania do odczytu</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location filename="../src/corelib/io/qprocess_win.cpp" line="+20"/>
         <source>Could not open output redirection for writing</source>
         <translation>Nie można otworzyć wyjściowego przekierowania do zapisu</translation>
     </message>
     <message>
-        <location line="+239"/>
         <source>Resource error (fork failure): %1</source>
         <translation>Błąd zasobów (błąd forkowania): %1</translation>
     </message>
     <message>
-        <location line="+258"/>
-        <location line="+52"/>
-        <location line="+74"/>
-        <location line="+66"/>
-        <location filename="../src/corelib/io/qprocess_win.cpp" line="+411"/>
-        <location line="+50"/>
-        <location line="+75"/>
-        <location line="+42"/>
-        <location line="+54"/>
         <source>Process operation timed out</source>
         <translation>Przekroczony czas operacji procesu</translation>
     </message>
     <message>
-        <location filename="../src/corelib/io/qprocess.cpp" line="+866"/>
-        <location line="+52"/>
-        <location filename="../src/corelib/io/qprocess_win.cpp" line="-211"/>
-        <location line="+50"/>
         <source>Error reading from process</source>
         <translation>Błąd odczytywania z procesu</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <location line="+870"/>
-        <location filename="../src/corelib/io/qprocess_win.cpp" line="+140"/>
         <source>Error writing to process</source>
         <translation>Błąd zapisywania do procesu</translation>
     </message>
     <message>
-        <location line="-800"/>
         <source>Process crashed</source>
         <translation>Wystąpił błąd w procesie - proces zakończony</translation>
     </message>
     <message>
-        <location line="+1002"/>
         <source>No program defined</source>
         <translation>Nie zdefiniowano programu</translation>
     </message>
     <message>
-        <location filename="../src/corelib/io/qprocess_win.cpp" line="-360"/>
         <source>Process failed to start: %1</source>
         <translation>Nie można rozpocząć procesu: %1</translation>
     </message>
@@ -6177,7 +4872,6 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QProgressDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qprogressdialog.cpp" line="+203"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
@@ -6185,7 +4879,6 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QPushButton</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/simplewidgets.cpp" line="-4"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
@@ -6193,7 +4886,6 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QRadioButton</name>
     <message>
-        <location line="+12"/>
         <source>Check</source>
         <translation>Zaznacz</translation>
     </message>
@@ -6201,57 +4893,46 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QRegExp</name>
     <message>
-        <location filename="../src/corelib/tools/qregexp.cpp" line="+67"/>
         <source>bad char class syntax</source>
         <translation>niepoprawna składnia klasy znakowej</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>bad lookahead syntax</source>
         <translation>niepoprawna składnia &quot;lookahead&quot;</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>bad repetition syntax</source>
         <translation>niepoprawna składnia powtórzenia</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>invalid interval</source>
         <translation>Niepoprawny interwał</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>invalid category</source>
         <translation>Niepoprawna kategoria</translation>
     </message>
     <message>
-        <location line="-9"/>
         <source>disabled feature used</source>
         <translation>użyta funkcja została wyłączona</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>invalid octal value</source>
         <translation>niepoprawna wartość ósemkowa</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>met internal limit</source>
         <translation>napotkano wewnętrzne ograniczenie</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>missing left delim</source>
         <translation>brakujący lewy separator</translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>no error occurred</source>
         <translation>nie pojawił się żaden błąd</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>unexpected end</source>
         <translation>nieoczekiwany koniec</translation>
     </message>
@@ -6259,22 +4940,18 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QSQLite2Driver</name>
     <message>
-        <location filename="../src/sql/drivers/sqlite2/qsql_sqlite2.cpp" line="+399"/>
         <source>Error opening database</source>
         <translation>Błąd otwierania bazy danych</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Unable to begin transaction</source>
         <translation>Nie można rozpocząć transakcji</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to commit transaction</source>
         <translation>Nie można dokonać transakcji</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to rollback transaction</source>
         <translation>Nie można wycofać transakcji</translation>
     </message>
@@ -6282,12 +4959,10 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QSQLite2Result</name>
     <message>
-        <location line="-176"/>
         <source>Unable to execute statement</source>
         <translation>Nie można wykonać polecenia</translation>
     </message>
     <message>
-        <location line="-150"/>
         <source>Unable to fetch results</source>
         <translation>Nie można pobrać wyników</translation>
     </message>
@@ -6295,27 +4970,22 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QSQLiteDriver</name>
     <message>
-        <location filename="../src/sql/drivers/sqlite/qsql_sqlite.cpp" line="+550"/>
         <source>Error closing database</source>
         <translation>Błąd zamykania bazy danych</translation>
     </message>
     <message>
-        <location line="-11"/>
         <source>Error opening database</source>
         <translation>Błąd otwierania bazy danych</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Unable to begin transaction</source>
         <translation>Nie można rozpocząć transakcji</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to commit transaction</source>
         <translation>Nie można dokonać transakcji</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to rollback transaction</source>
         <translation>Nie można wycofać transakcji</translation>
     </message>
@@ -6323,34 +4993,26 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QSQLiteResult</name>
     <message>
-        <location line="-194"/>
         <source>Parameter count mismatch</source>
         <translation>Niezgodna liczba parametrów</translation>
     </message>
     <message>
-        <location line="-7"/>
         <source>Unable to bind parameters</source>
         <translation>Nie można powiązać parametrów</translation>
     </message>
     <message>
-        <location line="-65"/>
         <source>Unable to execute statement</source>
         <translation>Nie można wykonać polecenia</translation>
     </message>
     <message>
-        <location line="-130"/>
-        <location line="+63"/>
-        <location line="+8"/>
         <source>Unable to fetch row</source>
         <translation>Nie można pobrać wiersza danych</translation>
     </message>
     <message>
-        <location line="+79"/>
         <source>Unable to reset statement</source>
         <translation>Nie można skasować polecenia</translation>
     </message>
     <message>
-        <location line="-149"/>
         <source>No query</source>
         <translation>Brak zapytania</translation>
     </message>
@@ -6358,32 +5020,26 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QScriptBreakpointsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptbreakpointsmodel.cpp" line="+455"/>
         <source>ID</source>
         <translation>Identyfikator</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Location</source>
         <translation>Położenie</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Condition</source>
         <translation>Warunek</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Ignore-count</source>
         <translation>Licznik pominięć</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Single-shot</source>
-        <translation type="unfinished"></translation>
+        <translation>Pojedyncze trafienie</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Hit-count</source>
         <translation>Licznik trafień</translation>
     </message>
@@ -6391,12 +5047,10 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QScriptBreakpointsWidget</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptbreakpointswidget.cpp" line="+298"/>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Delete</source>
         <translation>Skasuj</translation>
     </message>
@@ -6404,143 +5058,114 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+885"/>
-        <location line="+1013"/>
         <source>Go to Line</source>
         <translation>Przejdź do linii</translation>
     </message>
     <message>
-        <location line="-1012"/>
         <source>Line:</source>
         <translation>Linia:</translation>
     </message>
     <message>
-        <location line="+791"/>
         <source>Interrupt</source>
         <translation>Przerwij</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Shift+F5</source>
         <translation>Shift+F5</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Continue</source>
         <translation>Kontynuuj</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>F5</source>
         <translation>F5</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Step Into</source>
         <translation>Wskocz do wnętrza</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Step Over</source>
         <translation>Przeskocz</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>F10</source>
         <translation>F10</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Step Out</source>
         <translation>Wyskocz na zewnątrz</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Shift+F11</source>
         <translation>Shift+F11</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Run to Cursor</source>
         <translation>Uruchom do kursora</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Ctrl+F10</source>
         <translation>Ctrl+F10</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Run to New Script</source>
         <translation>Uruchom do nowego skryptu</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Toggle Breakpoint</source>
         <translation>Przełącz ustawienie pułapki</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>F9</source>
         <translation>F9</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Clear Debug Output</source>
         <translation>Wyczyść wyjście debuggera</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Clear Error Log</source>
         <translation>Wyczyść log z błędami</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Clear Console</source>
         <translation>Wyczyść konsolę</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>&amp;Find in Script...</source>
         <translation>&amp;Znajdź w skrypcie...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Find &amp;Next</source>
         <translation>Znajdź &amp;następne</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Find &amp;Previous</source>
         <translation>Znajdź &amp;poprzednie</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Shift+F3</source>
         <translation>Shift+F3</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Debug</source>
         <translation>Debuguj</translation>
     </message>
@@ -6548,32 +5173,26 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QScriptDebuggerCodeFinderWidget</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp" line="+141"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Previous</source>
         <translation>Poprzednie</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Next</source>
         <translation>Następne</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Case Sensitive</source>
         <translation>Uwzględniaj wielkość liter</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Whole words</source>
         <translation>Całe słowa</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>&lt;img src=&quot;:/qt/scripttools/debugging/images/wrap.png&quot;&gt;&amp;nbsp;Search wrapped</source>
         <translation>&lt;img src=&quot;:/qt/scripttools/debugging/images/wrap.png&quot;&gt;&amp;nbsp;Przeszukano od początku</translation>
     </message>
@@ -6581,12 +5200,10 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Value</source>
         <translation>Wartość</translation>
     </message>
@@ -6594,17 +5211,14 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QScriptDebuggerStackModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerstackmodel.cpp" line="+161"/>
         <source>Level</source>
         <translation>Poziom</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Location</source>
         <translation>Położenie</translation>
     </message>
@@ -6612,22 +5226,18 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QScriptEdit</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptedit.cpp" line="+411"/>
         <source>Toggle Breakpoint</source>
         <translation>Przełącz ustawienie pułapki</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Disable Breakpoint</source>
         <translation>Wyłącz pułapkę</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Enable Breakpoint</source>
         <translation>Włącz pułapkę</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Breakpoint Condition:</source>
         <translation>Warunek dla pułapki:</translation>
     </message>
@@ -6635,52 +5245,42 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QScriptEngineDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptenginedebugger.cpp" line="+523"/>
         <source>Loaded Scripts</source>
         <translation>Załadowane skrypty</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Breakpoints</source>
         <translation>Pułapki</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Stack</source>
         <translation>Stos</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Locals</source>
         <translation>Zmienne lokalne</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Console</source>
         <translation>Konsola</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Debug Output</source>
         <translation>Wyjście debuggera</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Error Log</source>
         <translation>Log z błędami</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Search</source>
         <translation>Szukaj</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>View</source>
         <translation>Widok</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Qt Script Debugger</source>
         <translation>Debugger Qt Script</translation>
     </message>
@@ -6688,7 +5288,6 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QScriptNewBreakpointWidget</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptbreakpointswidget.cpp" line="-223"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
@@ -6696,84 +5295,66 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QScrollBar</name>
     <message>
-        <location filename="../src/gui/widgets/qscrollbar.cpp" line="+457"/>
         <source>Bottom</source>
         <translation>W dół</translation>
     </message>
     <message>
-        <location line="-1"/>
         <source>Left edge</source>
         <translation>Lewa krawędź</translation>
     </message>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+149"/>
         <source>Line down</source>
         <translation>Linia w dół</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>Line up</source>
         <translation>Linia w górę</translation>
     </message>
     <message>
-        <location filename="../src/gui/widgets/qscrollbar.cpp" line="+4"/>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+6"/>
         <source>Page down</source>
         <translation>Strona w dół</translation>
     </message>
     <message>
-        <location line="-1"/>
         <source>Page left</source>
         <translation>Strona w lewo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page right</source>
         <translation>Strona w prawo</translation>
     </message>
     <message>
-        <location line="-1"/>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="-4"/>
         <source>Page up</source>
         <translation>Strona do góry</translation>
     </message>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+2"/>
         <source>Position</source>
         <translation>Pozycja</translation>
     </message>
     <message>
-        <location filename="../src/gui/widgets/qscrollbar.cpp" line="-2"/>
         <source>Right edge</source>
         <translation>Prawa krawędź</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Scroll down</source>
         <translation>Przewiń w dół</translation>
     </message>
     <message>
-        <location line="-9"/>
         <source>Scroll here</source>
         <translation>Przewiń tutaj</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Scroll left</source>
         <translation>Przewiń w lewo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Scroll right</source>
         <translation>Przewiń w prawo</translation>
     </message>
     <message>
-        <location line="-1"/>
         <source>Scroll up</source>
         <translation>Przewiń do góry</translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>Top</source>
         <translation>Do góry</translation>
     </message>
@@ -6781,111 +5362,78 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QSharedMemory</name>
     <message>
-        <location filename="../src/corelib/kernel/qsharedmemory.cpp" line="+304"/>
         <source>%1: create size is less then 0</source>
         <translation>%1: rozmiar przy tworzeniu mniejszy od 0</translation>
     </message>
     <message>
-        <location line="+168"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_p.h" line="+155"/>
         <source>%1: unable to lock</source>
         <translation>%1: nie można zablokować</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>%1: unable to unlock</source>
         <translation>%1: nie można odblokować</translation>
     </message>
     <message>
-        <location filename="../src/corelib/kernel/qsharedmemory_symbian.cpp" line="+83"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_unix.cpp" line="+81"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+87"/>
         <source>%1: permission denied</source>
         <translation>%1: brak uprawnień</translation>
     </message>
     <message>
-        <location line="-16"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_unix.cpp" line="+4"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="-22"/>
         <source>%1: already exists</source>
         <translation>%1: już istnieje</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1: doesn&apos;t exists</source>
         <translation>%1: nie istnieje</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_unix.cpp" line="+10"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+18"/>
         <source>%1: out of resources</source>
         <translation>%1: zasoby wyczerpane</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_unix.cpp" line="+4"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+7"/>
         <source>%1: unknown error %2</source>
         <translation>%1: nieznany błąd %2</translation>
     </message>
     <message>
-        <location filename="../src/corelib/kernel/qsharedmemory_unix.cpp" line="+21"/>
         <source>%1: key is empty</source>
         <translation>%1: klucz jest pusty</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>%1: ftok failed</source>
         <translation>%1: wystąpił błąd w funkcji ftok()</translation>
     </message>
     <message>
-        <location filename="../src/corelib/kernel/qsharedmemory_symbian.cpp" line="+56"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_unix.cpp" line="+51"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+15"/>
         <source>%1: unable to make key</source>
         <translation>%1: nie można utworzyć klucza</translation>
     </message>
     <message>
-        <location filename="../src/corelib/kernel/qsharedmemory_unix.cpp" line="-97"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="-31"/>
         <source>%1: doesn&apos;t exist</source>
         <translation>%1: nie istnieje</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>%1: UNIX key file doesn&apos;t exist</source>
         <translation>%1: unixowy plik z kluczem nie istnieje</translation>
     </message>
     <message>
-        <location line="+78"/>
         <source>%1: system-imposed size restrictions</source>
         <translation>%1: ograniczenia rozmiarów narzucone przez system</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>%1: not attached</source>
         <translation>%1: niedołączony</translation>
     </message>
     <message>
-        <location filename="../src/corelib/kernel/qsharedmemory_symbian.cpp" line="-67"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+4"/>
         <source>%1: invalid size</source>
         <translation>%1: niepoprawny rozmiar</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+63"/>
         <source>%1: key error</source>
         <translation>%1: błąd klucza</translation>
     </message>
     <message>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+32"/>
         <source>%1: size query failed</source>
         <translation>%1: zapytanie o rozmiar zakończone błędem</translation>
     </message>
     <message>
-        <location filename="../src/corelib/kernel/qsharedmemory.cpp" line="-271"/>
         <source>%1: unable to set key on lock</source>
         <translation>%1: nie można ustawić klucza na zablokowanym segmencie pamięci współdzielonej</translation>
     </message>
@@ -6893,1107 +5441,884 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QShortcut</name>
     <message>
-        <location filename="../src/gui/kernel/qkeysequence.cpp" line="+1331"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location line="-91"/>
-        <location line="+135"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location line="-950"/>
         <source>Back</source>
         <translation>Back</translation>
     </message>
     <message>
-        <location line="-25"/>
         <source>Backspace</source>
         <translation>Backspace</translation>
     </message>
     <message>
-        <location line="-1"/>
         <source>Backtab</source>
         <translation>Backtab</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Bass Boost</source>
         <translation>Wzmocnienie basów</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Bass Down</source>
         <translation>Basy w dół</translation>
     </message>
     <message>
-        <location line="-1"/>
         <source>Bass Up</source>
         <translation>Basy w górę</translation>
     </message>
     <message>
-        <location line="+154"/>
         <source>Call</source>
         <extracomment>Button to start a call (note: a separate button is used to end the call)</extracomment>
         <translation>Wywołaj</translation>
     </message>
     <message>
-        <location line="-22"/>
         <source>Caps Lock</source>
         <translation>Caps Lock</translation>
     </message>
     <message>
-        <location line="-149"/>
         <source>CapsLock</source>
         <translation>CapsLock</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Media Pause</source>
         <extracomment>Media player pause button</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Toggle Media Play/Pause</source>
         <extracomment>Media player button to toggle between playing and paused</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Monitor Brightness Up</source>
         <translation>Zwiększ jasność monitora</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Monitor Brightness Down</source>
         <translation>Zmniejsz jasność monitora</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Keyboard Light On/Off</source>
         <translation>Włącz/wyłącz podświetlenie klawiatury</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Keyboard Brightness Up</source>
         <translation>Zwiększ jasność klawiatury</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Keyboard Brightness Down</source>
         <translation>Zmniejsz jasność klawiatury</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Power Off</source>
         <translation>Wyłącz zasilanie</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Wake Up</source>
         <translation>Przebudzenie</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Eject</source>
         <translation>Wysuń</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Screensaver</source>
         <translation>Wygaszacz ekranu</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>WWW</source>
         <translation>WWW</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Sleep</source>
         <translation>Uśpienie</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LightBulb</source>
         <translation>Żarówka</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Shop</source>
         <translation>Sklep</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>History</source>
         <translation>Historia</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Add Favorite</source>
         <translation>Dodaj do ulubionych</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hot Links</source>
         <translation>Popularne łącza</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Adjust Brightness</source>
         <translation>Ustaw jasność</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Finance</source>
         <translation>Finanse</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Community</source>
         <translation>Społeczność</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Audio Rewind</source>
         <translation>Przewijanie do tyłu</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Back Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Application Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Application Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Book</source>
         <translation>Książka</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CD</source>
         <translation>CD</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Calculator</source>
         <translation>Kalkulator</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Clear</source>
         <translation>Wyczyść</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Clear Grab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Copy</source>
         <translation>Skopiuj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Cut</source>
         <translation>Wytnij</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Display</source>
         <translation>Wyświetlacz</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>DOS</source>
         <translation>DOS</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Documents</source>
         <translation>Dokumenty</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Spreadsheet</source>
         <translation>Arkusz kalkulacyjny</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Browser</source>
         <translation>Przeglądarka</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Game</source>
         <translation>Gra</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Go</source>
         <translation>Przejdź</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>iTouch</source>
         <translation>iTouch</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Logoff</source>
         <translation>Wyloguj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Market</source>
         <translation>Rynek</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Meeting</source>
         <translation>Spotkanie</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Keyboard Menu</source>
         <translation>Menu klawiatury</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Menu PB</source>
         <translation>Menu PB</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>My Sites</source>
         <translation>Moje strony</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>News</source>
         <translation>Wiadomości</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Home Office</source>
         <translation>Biuro domowe</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Option</source>
         <translation>Opcje</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Paste</source>
         <translation>Wklej</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Phone</source>
         <translation>Telefon</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reply</source>
         <translation>Odpowiedz</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reload</source>
         <translation>Przeładuj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Rotate Windows</source>
         <translation>Obróć okna</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Rotation PB</source>
         <translation>Obrót PB</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Rotation KB</source>
         <translation>Obrót KB</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Save</source>
         <translation>Zachowaj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Send</source>
         <translation>Wyślij</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Spellchecker</source>
         <translation>Sprawdzanie pisowni</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Split Screen</source>
         <translation>Podziel ekran</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Support</source>
         <translation>Pomoc techniczna</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Task Panel</source>
         <translation>Panel zadań</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Tools</source>
         <translation>Narzędzia</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Travel</source>
         <translation>Podróże</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Video</source>
         <translation>Wideo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Word Processor</source>
         <translation>Procesor tekstu</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>XFer</source>
         <translation>XFer</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zoom In</source>
         <translation>Powiększ</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zoom Out</source>
         <translation>Pomniejsz</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Away</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Messenger</source>
         <translation>Komunikator</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>WebCam</source>
         <translation>WebCam</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Mail Forward</source>
         <translation>Przekazanie poczty</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Pictures</source>
         <translation>Zdjęcia</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Music</source>
         <translation>Muzyka</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Battery</source>
         <translation>Bateria</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bluetooth</source>
         <translation>Bluetooth</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Wireless</source>
         <translation>Bezprzewodowy</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ultra Wide Band</source>
         <translation>Ultraszerokie pasmo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Audio Forward</source>
         <translation>Przewijanie do przodu</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Audio Repeat</source>
         <translation>Powtarzanie</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Audio Random Play</source>
         <translation>Odtwarzanie losowe</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Subtitle</source>
         <translation>Napisy</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Audio Cycle Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>View</source>
         <translation>Widok</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Top Menu</source>
         <translation>Menu główne</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Suspend</source>
         <translation>Wstrzymanie</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hibernate</source>
         <translation>Hibernacja</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Context1</source>
         <translation>Kontekst1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Context2</source>
         <translation>Kontekst2</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Context3</source>
         <translation>Kontekst3</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Context4</source>
         <translation>Kontekst4</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Toggle Call/Hangup</source>
         <extracomment>Button that will hang up if we&apos;re in call, or make a call if we&apos;re not.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Voice Dial</source>
         <extracomment>Button to trigger voice dialling</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Last Number Redial</source>
         <extracomment>Button to redial the last number called</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Camera Shutter</source>
         <extracomment>Button to trigger the camera shutter (take a picture)</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Camera Focus</source>
         <extracomment>Button to focus the camera</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Kanji</source>
         <translation>Kanji</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Muhenkan</source>
         <translation>Muhenkan</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Henkan</source>
         <translation>Henkan</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Romaji</source>
         <translation>Romaji</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hiragana</source>
         <translation>Hiragana</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Katakana</source>
         <translation>Katakana</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hiragana Katakana</source>
         <translation>Hiragana Katakana</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zenkaku</source>
         <translation>Zenkaku</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hankaku</source>
         <translation>Hankaku</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zenkaku Hankaku</source>
         <translation>Zenkaku Hankaku</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Touroku</source>
         <translation>Touroku</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Massyo</source>
         <translation>Massyo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Kana Lock</source>
         <translation>Kana Lock</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Kana Shift</source>
         <translation>Kana Shift</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Eisu Shift</source>
         <translation>Eisu Shift</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Eisu toggle</source>
         <translation>Eisu toggle</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Code input</source>
         <translation>Wprowadzanie kodu</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Multiple Candidate</source>
         <translation>Kandydat wielokrotny</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Previous Candidate</source>
         <translation>Poprzedni kandydat</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Hangul</source>
         <translation>Hangul</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangul Start</source>
         <translation>Hangul Start</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangul End</source>
         <translation>Hangul End</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangul Hanja</source>
         <translation>Hangul Hanja</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangul Jamo</source>
         <translation>Hangul Jamo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangul Romaja</source>
         <translation>Hangul Romaja</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangul Jeonja</source>
         <translation>Hangul Jeonja</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangul Banja</source>
         <translation>Hangul Banja</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangul PreHanja</source>
         <translation>Hangul PreHanja</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangul PostHanja</source>
         <translation>Hangul PostHanja</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangul Special</source>
         <translation>Hangul Special</translation>
     </message>
     <message>
-        <location line="+602"/>
-        <location line="+135"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location line="-969"/>
         <source>Del</source>
         <translation>Del</translation>
     </message>
     <message>
-        <location line="+166"/>
         <source>Delete</source>
         <translation>Delete</translation>
     </message>
     <message>
-        <location line="-157"/>
         <source>Down</source>
         <translation>Dół</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>End</source>
         <translation>End</translation>
     </message>
     <message>
-        <location line="-7"/>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location line="+174"/>
         <source>Escape</source>
         <translation>Escape</translation>
     </message>
     <message>
-        <location line="+821"/>
         <source>F%1</source>
         <translation>F%1</translation>
     </message>
     <message>
-        <location line="-945"/>
         <source>Favorites</source>
         <translation>Ulubione</translation>
     </message>
     <message>
-        <location line="+145"/>
         <source>Flip</source>
         <translation>Odwróć</translation>
     </message>
     <message>
-        <location line="-166"/>
         <source>Forward</source>
         <translation>Do przodu</translation>
     </message>
     <message>
-        <location line="+163"/>
         <source>Hangup</source>
         <extracomment>Button to end a call (note: a separate button is used to start the call)</extracomment>
         <translation>Zawieś</translation>
     </message>
     <message>
-        <location line="-169"/>
         <source>Help</source>
         <translation>Pomoc</translation>
     </message>
     <message>
-        <location line="-12"/>
         <source>Home</source>
         <translation>Home</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Home Page</source>
         <translation>Strona startowa</translation>
     </message>
     <message>
-        <location line="-43"/>
         <source>Ins</source>
         <translation>Ins</translation>
     </message>
     <message>
-        <location line="+166"/>
         <source>Insert</source>
         <translation>Insert</translation>
     </message>
     <message>
-        <location line="-116"/>
         <source>Launch (0)</source>
         <translation>Uruchom (0)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (1)</source>
         <translation>Uruchom (1)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (2)</source>
         <translation>Uruchom (2)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (3)</source>
         <translation>Uruchom (3)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (4)</source>
         <translation>Uruchom (4)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (5)</source>
         <translation>Uruchom (5)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (6)</source>
         <translation>Uruchom (6)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (7)</source>
         <translation>Uruchom (7)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (8)</source>
         <translation>Uruchom (8)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (9)</source>
         <translation>Uruchom (9)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (A)</source>
         <translation>Uruchom (A)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (B)</source>
         <translation>Uruchom (B)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (C)</source>
         <translation>Uruchom (C)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (D)</source>
         <translation>Uruchom (D)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (E)</source>
         <translation>Uruchom (E)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (F)</source>
         <translation>Uruchom (F)</translation>
     </message>
     <message>
-        <location line="-17"/>
         <source>Launch Mail</source>
         <translation>Uruchom program pocztowy</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch Media</source>
         <translation>Uruchom przeglądarkę mediów</translation>
     </message>
     <message>
-        <location line="-42"/>
         <source>Left</source>
         <translation>Lewo</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>Media Next</source>
         <translation>Następna ścieżka</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>Media Play</source>
         <translation>Odtwarzaj</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Media Previous</source>
         <translation>Poprzednia ścieżka</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Media Record</source>
         <translation>Nagrywaj</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>Media Stop</source>
         <translation>Zatrzymaj</translation>
     </message>
     <message>
-        <location line="-19"/>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
-        <location line="+822"/>
-        <location line="+130"/>
         <source>Meta</source>
         <translation>Meta</translation>
     </message>
     <message>
-        <location line="-793"/>
         <source>No</source>
         <translation>Nie</translation>
     </message>
     <message>
-        <location line="-12"/>
         <source>Num Lock</source>
         <translation>Num Lock</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Number Lock</source>
         <translation>Number Lock</translation>
     </message>
     <message>
-        <location line="-150"/>
         <source>NumLock</source>
         <translation>NumLock</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Open URL</source>
         <translation>Otwórz adres</translation>
     </message>
     <message>
-        <location line="+114"/>
         <source>Page Down</source>
         <translation>Strona do góry</translation>
     </message>
     <message>
-        <location line="-1"/>
         <source>Page Up</source>
         <translation>Strona w dół</translation>
     </message>
     <message>
-        <location line="-158"/>
         <source>Pause</source>
         <translation>Pauza</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>PgDown</source>
         <translation>PgDown</translation>
     </message>
     <message>
-        <location line="-1"/>
         <source>PgUp</source>
         <translation>PgUp</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>Print</source>
         <translation>Wydrukuj</translation>
     </message>
     <message>
-        <location line="+156"/>
         <source>Print Screen</source>
         <translation>Wydrukuj zawartość ekranu</translation>
     </message>
     <message>
-        <location line="-134"/>
         <source>Refresh</source>
         <translation>Odśwież</translation>
     </message>
     <message>
-        <location line="-27"/>
         <source>Return</source>
         <translation>Powrót</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Right</source>
         <translation>Prawo</translation>
     </message>
     <message>
-        <location line="+156"/>
         <source>Scroll Lock</source>
         <translation>Scroll Lock</translation>
     </message>
     <message>
-        <location line="-150"/>
         <source>ScrollLock</source>
         <translation>ScrollLock</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>Search</source>
         <translation>Szukaj</translation>
     </message>
     <message>
-        <location line="+106"/>
-        <location line="+22"/>
         <source>Select</source>
         <translation>Wybierz</translation>
     </message>
     <message>
-        <location line="+663"/>
-        <location line="+138"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location line="-981"/>
         <source>Space</source>
         <extracomment>This and all following &quot;incomprehensible&quot; strings in QShortcut context are key names. Please use the localized names appearing on actual keyboards or whatever is commonly used.</extracomment>
         <translation>Spacja</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>Standby</source>
         <translation>Tryb oczekiwania</translation>
     </message>
     <message>
-        <location line="-22"/>
         <source>Stop</source>
         <translation>Zatrzymaj</translation>
     </message>
     <message>
-        <location line="-20"/>
         <source>SysReq</source>
         <translation>SysReq</translation>
     </message>
     <message>
-        <location line="+165"/>
         <source>System Request</source>
         <translation>Żądanie systemu</translation>
     </message>
     <message>
-        <location line="-174"/>
         <source>Tab</source>
         <translation>Tabulator</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Treble Down</source>
         <translation>Soprany w dół</translation>
     </message>
     <message>
-        <location line="-1"/>
         <source>Treble Up</source>
         <translation>Soprany w górę</translation>
     </message>
     <message>
-        <location line="-24"/>
         <source>Up</source>
         <translation>Góra</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Volume Down</source>
         <translation>Przycisz</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Volume Mute</source>
         <translation>Wycisz</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Volume Up</source>
         <translation>Zrób głośniej</translation>
     </message>
     <message>
-        <location line="+146"/>
         <source>Yes</source>
         <translation>Tak</translation>
     </message>
@@ -8001,27 +6326,22 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QSlider</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+160"/>
         <source>Page down</source>
         <translation>Strona w dół</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>Page left</source>
         <translation>Strona w lewo</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Page right</source>
         <translation>Strona w prawo</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>Page up</source>
         <translation>Strona do góry</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Position</source>
         <translation>Położenie</translation>
     </message>
@@ -8029,72 +6349,58 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QSocks5SocketEngine</name>
     <message>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="-67"/>
         <source>Connection to proxy refused</source>
         <translation>Odmowa połączenia z pośrednikiem</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Connection to proxy closed prematurely</source>
         <translation>Przedwczesne zakończenie połączenia z pośrednikiem</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Proxy host not found</source>
         <translation>Nie odnaleziono hosta pośredniczącego</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Connection to proxy timed out</source>
         <translation>Przekroczony czas połączenia do pośrednika</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Proxy authentication failed</source>
         <translation>Autoryzacja pośrednika zakończona błędem</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Proxy authentication failed: %1</source>
         <translation>Autoryzacja pośrednika zakończona błędem: %1</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>SOCKS version 5 protocol error</source>
         <translation>Błąd protokołu SOCKS wersji 5</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>General SOCKSv5 server failure</source>
         <translation>Generalny błąd serwera SOCKS wersji 5</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Connection not allowed by SOCKSv5 server</source>
         <translation>Połączenie niedozwolone przez serwer SOCKS wersji 5</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>TTL expired</source>
         <translation>TTL stracił ważność</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>SOCKSv5 command not supported</source>
         <translation>Nieobsługiwana komenda SOCKS wersji 5</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Address type not supported</source>
         <translation>Nieobsługiwany typ adresu</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Unknown SOCKSv5 proxy error code 0x%1</source>
         <translation>Nieznany kod błędu (0x%1) pośrednika SOCKS wersji 5</translation>
     </message>
     <message>
-        <location line="+689"/>
         <source>Network operation timed out</source>
         <translation>Przekroczony czas operacji sieciowej</translation>
     </message>
@@ -8102,32 +6408,26 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QSoftKeyManager</name>
     <message>
-        <location filename="../src/gui/kernel/qsoftkeymanager.cpp" line="+63"/>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select</source>
         <translation>Wybierz</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Done</source>
         <translation>Zrobione</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Options</source>
         <translation>Opcje</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../src/gui/kernel/qsoftkeymanager_s60.cpp" line="+321"/>
         <source>Exit</source>
         <translation>Wyjście</translation>
     </message>
@@ -8135,12 +6435,10 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QSpinBox</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="-569"/>
         <source>Less</source>
         <translation>Mniej</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>More</source>
         <translation>Więcej</translation>
     </message>
@@ -8148,56 +6446,42 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QSql</name>
     <message>
-        <location filename="../src/qt3support/sql/q3sqlmanager_p.cpp" line="+910"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Cancel your edits?</source>
         <translation>Anulować zmiany?</translation>
     </message>
     <message>
-        <location line="-1"/>
         <source>Confirm</source>
         <translation>Potwierdź</translation>
     </message>
     <message>
-        <location line="-52"/>
         <source>Delete</source>
         <translation>Skasuj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete this record?</source>
         <translation>Skasować ten rekord?</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Insert</source>
         <translation>Wstaw</translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+16"/>
-        <location line="+36"/>
         <source>No</source>
         <translation>Nie</translation>
     </message>
     <message>
-        <location line="-38"/>
         <source>Save edits?</source>
         <translation>Zachować zmiany?</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>Update</source>
         <translation>Uaktualnij</translation>
     </message>
     <message>
-        <location line="-11"/>
-        <location line="+16"/>
-        <location line="+36"/>
         <source>Yes</source>
         <translation>Tak</translation>
     </message>
@@ -8205,178 +6489,142 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QSslSocket</name>
     <message>
-        <location filename="../src/network/ssl/qsslsocket_openssl.cpp" line="+837"/>
         <source>Unable to write data: %1</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+63"/>
         <source>Unable to decrypt data: %1</source>
         <translation>Nie można odszyfrować danych: %1</translation>
     </message>
     <message>
-        <location line="+78"/>
-        <location line="+10"/>
         <source>Error while reading: %1</source>
         <translation>Błąd podczas czytania: %1</translation>
     </message>
     <message>
-        <location line="+96"/>
         <source>Error during SSL handshake: %1</source>
         <translation>Błąd podczas nawiązania sesji SSL: %1</translation>
     </message>
     <message>
-        <location line="-812"/>
         <source>Error creating SSL context (%1)</source>
         <translation>Błąd tworzenia kontekstu (%1)</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Invalid or empty cipher list (%1)</source>
         <translation>Niepoprawna lub pusta lista szyfrów (%1)</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>Private key does not certify public key, %1</source>
         <translation>Prywatny klucz nie uwiarygodnia publicznego, %1</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Error creating SSL session, %1</source>
         <translation>Błąd tworzenia sesji SSL, %1</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Error creating SSL session: %1</source>
         <translation>Błąd tworzenia sesji SSL: %1</translation>
     </message>
     <message>
-        <location line="-64"/>
         <source>Cannot provide a certificate with no key, %1</source>
         <translation>Nie można dostarczyć certyfikatu bez klucza, %1</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Error loading local certificate, %1</source>
         <translation>Błąd ładowania lokalnego certyfikatu, %1</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Error loading private key, %1</source>
         <translation>Błąd ładowania prywatnego klucza, %1</translation>
     </message>
     <message>
-        <location filename="../src/network/ssl/qsslerror.cpp" line="+213"/>
         <source>No error</source>
         <translation>Brak błędu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The issuer certificate could not be found</source>
         <translation>Nie można odnaleźć wydawcy certyfikatu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The certificate signature could not be decrypted</source>
         <translation>Nie można odszyfrować podpisu certyfikatu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The public key in the certificate could not be read</source>
         <translation>Nie można odczytać publicznego klucza w certyfikacie</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The signature of the certificate is invalid</source>
         <translation>Niepoprawny podpis certyfikatu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The certificate is not yet valid</source>
         <translation>Certyfikat nie jest jeszcze ważny</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The certificate has expired</source>
         <translation>Certyfikat utracił ważność</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The certificate&apos;s notBefore field contains an invalid time</source>
         <translation>Pole &quot;notBefore&quot; certyfikatu zawiera niepoprawną datę</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The certificate&apos;s notAfter field contains an invalid time</source>
         <translation>Pole &quot;notAfter&quot; certyfikatu zawiera niepoprawną datę</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The certificate is self-signed, and untrusted</source>
         <translation>Niewiarygodny certyfikat z podpisem własnym</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The root certificate of the certificate chain is self-signed, and untrusted</source>
         <translation>Główny certyfikat łańcucha zaufania ma własny podpis i jest niewiarygodny</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The issuer certificate of a locally looked up certificate could not be found</source>
         <translation>Nie można odnaleźć certyfikatu wydawcy wyszukanego lokalnie certyfikatu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>No certificates could be verified</source>
         <translation>Nie można zweryfikować żadnych certyfikatów</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>One of the CA certificates is invalid</source>
         <translation>Jeden z certyfikatów urzędu certyfikacji jest nieprawidłowy</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The basicConstraints path length parameter has been exceeded</source>
         <translation>Długość ścieżki określona w podstawowych warunkach ograniczających została przekroczona</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The supplied certificate is unsuitable for this purpose</source>
         <translation>Dostarczony certyfikat jest nieodpowiedni dla tego przeznaczenia</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The root CA certificate is not trusted for this purpose</source>
         <translation>Główny certyfikat urzędu certyfikacji nie jest wiarygodny dla tego przeznaczenia</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The root CA certificate is marked to reject the specified purpose</source>
         <translation>Główny certyfikat urzędu certyfikacji jest wyznaczony do odrzucania podanego przeznaczenia</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate</source>
         <translation>Certyfikat wydawcy obecnego kandydata został odrzucony, ponieważ nazwa podmiotu nie odpowiadała nazwie wydawcy obecnego certyfikatu</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate</source>
         <translation>Certyfikat wydawcy obecnego kandydata został odrzucony, ponieważ nazwa wydawcy i przedstawiony numer seryjny nie odpowiadały identyfikatorowi klucza urzędu certyfikacji obecnego certyfikatu</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>The peer did not present any certificate</source>
         <translation>Element równorzędny nie przedstawił żadnego certyfikatu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The host name did not match any of the valid hosts for this certificate</source>
         <translation>Nazwa hosta nie odpowiadała żadnemu z poprawnych hostów dla tego certyfikatu</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Unknown error</source>
         <translation>Nieznany błąd</translation>
     </message>
@@ -8384,22 +6632,18 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QStateMachine</name>
     <message>
-        <location filename="../src/corelib/statemachine/qstatemachine.cpp" line="+1028"/>
         <source>Missing initial state in compound state &apos;%1&apos;</source>
         <translation>Brak stanu początkowego w stanie złożonym &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Missing default state in history state &apos;%1&apos;</source>
         <translation>Brak domyślnego stanu w historycznym stanie &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>No common ancestor for targets and source of transition from state &apos;%1&apos;</source>
         <translation>Brak wspólnego przodka dla stanów docelowych i stanu źródłowego w przejściu ze stanu &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Unknown error</source>
         <translation>Nieznany błąd</translation>
     </message>
@@ -8407,30 +6651,22 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QSystemSemaphore</name>
     <message>
-        <location filename="../src/corelib/kernel/qsystemsemaphore_unix.cpp" line="-41"/>
-        <location filename="../src/corelib/kernel/qsystemsemaphore_win.cpp" line="+66"/>
         <source>%1: out of resources</source>
         <translation>%1: zasoby wyczerpane</translation>
     </message>
     <message>
-        <location line="-13"/>
-        <location filename="../src/corelib/kernel/qsystemsemaphore_win.cpp" line="+4"/>
         <source>%1: permission denied</source>
         <translation>%1: brak uprawnień</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1: already exists</source>
         <translation>%1: już istnieje</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1: does not exist</source>
         <translation>%1: nie istnieje</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location filename="../src/corelib/kernel/qsystemsemaphore_win.cpp" line="+3"/>
         <source>%1: unknown error %2</source>
         <translation>%1: nieznany błąd %2</translation>
     </message>
@@ -8438,12 +6674,10 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QTDSDriver</name>
     <message>
-        <location filename="../src/sql/drivers/tds/qsql_tds.cpp" line="+595"/>
         <source>Unable to open connection</source>
         <translation>Nie można otworzyć połączenia</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Unable to use database</source>
         <translation>Nie można użyć bazy danych</translation>
     </message>
@@ -8451,12 +6685,10 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QTabBar</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/complexwidgets.cpp" line="-330"/>
         <source>Scroll Left</source>
         <translation>Przewiń w lewo</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Scroll Right</source>
         <translation>Przewiń w prawo</translation>
     </message>
@@ -8464,7 +6696,6 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QTcpServer</name>
     <message>
-        <location filename="../src/network/socket/qtcpserver.cpp" line="+292"/>
         <source>Operation on socket is not supported</source>
         <translation>Operacja na gnieździe nieobsługiwana</translation>
     </message>
@@ -8472,42 +6703,34 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QTextControl</name>
     <message>
-        <location filename="../src/gui/text/qtextcontrol.cpp" line="+2057"/>
         <source>&amp;Copy</source>
         <translation>S&amp;kopiuj</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Copy &amp;Link Location</source>
         <translation>Skopiuj &amp;adres odsyłacza</translation>
     </message>
     <message>
-        <location line="-12"/>
         <source>Cu&amp;t</source>
         <translation>W&amp;ytnij</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Delete</source>
         <translation>Skasuj</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>&amp;Paste</source>
         <translation>&amp;Wklej</translation>
     </message>
     <message>
-        <location line="-22"/>
         <source>&amp;Redo</source>
         <translation>&amp;Przywróć</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Select All</source>
         <translation>Zaznacz wszystko</translation>
     </message>
     <message>
-        <location line="-34"/>
         <source>&amp;Undo</source>
         <translation>&amp;Cofnij</translation>
     </message>
@@ -8515,14 +6738,10 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QToolButton</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/simplewidgets.cpp" line="+312"/>
-        <location line="+8"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+6"/>
         <source>Press</source>
         <translation>Wciśnij</translation>
     </message>
@@ -8530,7 +6749,6 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QUdpSocket</name>
     <message>
-        <location filename="../src/network/socket/qudpsocket.cpp" line="+189"/>
         <source>This platform does not support IPv6</source>
         <translation>Ta platforma nie obsługuje IPv6</translation>
     </message>
@@ -8538,12 +6756,10 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QUndoGroup</name>
     <message>
-        <location filename="../src/gui/util/qundogroup.cpp" line="+413"/>
         <source>Redo</source>
         <translation>Przywróć</translation>
     </message>
     <message>
-        <location line="-28"/>
         <source>Undo</source>
         <translation>Cofnij</translation>
     </message>
@@ -8551,7 +6767,6 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QUndoModel</name>
     <message>
-        <location filename="../src/gui/util/qundoview.cpp" line="+101"/>
         <source>&lt;empty&gt;</source>
         <translation>&lt;pusty&gt;</translation>
     </message>
@@ -8559,12 +6774,10 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QUndoStack</name>
     <message>
-        <location filename="../src/gui/util/qundostack.cpp" line="+859"/>
         <source>Redo</source>
         <translation>Przywróć</translation>
     </message>
     <message>
-        <location line="-27"/>
         <source>Undo</source>
         <translation>Cofnij</translation>
     </message>
@@ -8572,57 +6785,46 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QUnicodeControlCharacterMenu</name>
     <message>
-        <location filename="../src/gui/text/qtextcontrol.cpp" line="+948"/>
         <source>Insert Unicode control character</source>
         <translation>Wstaw znak kontroli Unicode</translation>
     </message>
     <message>
-        <location line="-10"/>
         <source>LRE Start of left-to-right embedding</source>
         <translation>LRE Początek osadzania od lewej do prawej</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>LRM Left-to-right mark</source>
         <translation>LRM znacznik od prawej do lewej </translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>LRO Start of left-to-right override</source>
         <translation>LRO Początek nadpisania od lewej do prawej</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>PDF Pop directional formatting</source>
         <translation>PDF Formatowanie kierunkowe pop</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>RLE Start of right-to-left embedding</source>
         <translation>RLE Początek osadzania od prawej do lewej</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>RLM Right-to-left mark</source>
         <translation>RLM Znacznik od prawej do lewej</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>RLO Start of right-to-left override</source>
         <translation>RLO Początek nadpisania od prawej do lewej</translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>ZWJ Zero width joiner</source>
         <translation>ZWJ Łącznik zerowej długości</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>ZWNJ Zero width non-joiner</source>
         <translation>ZWNJ Rozdzielnik zerowej długości</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>ZWSP Zero width space</source>
         <translation>ZWSP Przerwa zerowej długości</translation>
     </message>
@@ -8630,32 +6832,26 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QWebFrame</name>
     <message>
-        <location filename="../src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp" line="+753"/>
         <source>Request cancelled</source>
         <translation>Prośba anulowana</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Request blocked</source>
         <translation>Prośba zablokowana</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Cannot show URL</source>
         <translation>Nie można pokazać URL</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Frame load interrupted by policy change</source>
         <translation>Ładowanie ramki przerwane przez zmianę strategii</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Cannot show mimetype</source>
         <translation>Nie można pokazać typu MIME</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>File does not exist</source>
         <translation>Plik nie istnieje</translation>
     </message>
@@ -8663,621 +6859,515 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QWebPage</name>
     <message>
-        <location filename="../src/3rdparty/webkit/WebCore/platform/qt/Localizations.cpp" line="+44"/>
         <source>Submit</source>
         <comment>default label for Submit buttons in forms on web pages</comment>
         <translation>Wyślij</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Submit</source>
         <comment>Submit (input element) alt text for &lt;input&gt; elements with no alt, title, or value</comment>
         <translation>Wyślij</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Reset</source>
         <comment>default label for Reset buttons in forms on web pages</comment>
         <translation>Wyczyść</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Choose File</source>
         <comment>title for file button used in HTML forms</comment>
         <translation>Wybierz plik</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>No file selected</source>
         <comment>text to display in file button used in HTML forms when no file is selected</comment>
         <translation>Nie zaznaczono pliku</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Open in New Window</source>
         <comment>Open in New Window context menu item</comment>
         <translation>Otwórz w nowym oknie</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Save Link...</source>
         <comment>Download Linked File context menu item</comment>
         <translation>Zachowaj odsyłacz...</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Copy Link</source>
         <comment>Copy Link context menu item</comment>
         <translation>Skopiuj odsyłacz</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Open Image</source>
         <comment>Open Image in New Window context menu item</comment>
         <translation>Otwórz obrazek</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Save Image</source>
         <comment>Download Image context menu item</comment>
         <translation>Zachowaj obrazek</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Copy Image</source>
         <comment>Copy Link context menu item</comment>
         <translation>Skopiuj obrazek</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Open Frame</source>
         <comment>Open Frame in New Window context menu item</comment>
         <translation>Otwórz ramkę</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Copy</source>
         <comment>Copy context menu item</comment>
         <translation>Skopiuj</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Go Back</source>
         <comment>Back context menu item</comment>
         <translation>Wróć</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Go Forward</source>
         <comment>Forward context menu item</comment>
         <translation>Przejdź dalej</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Stop</source>
         <comment>Stop context menu item</comment>
         <translation>Zatrzymaj</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Reload</source>
         <comment>Reload context menu item</comment>
         <translation>Przeładuj</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cut</source>
         <comment>Cut context menu item</comment>
         <translation>Wytnij</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Paste</source>
         <comment>Paste context menu item</comment>
         <translation>Wklej</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>No Guesses Found</source>
         <comment>No Guesses Found context menu item</comment>
         <translation>Nie odnaleziono podpowiedzi</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Ignore</source>
         <comment>Ignore Spelling context menu item</comment>
         <translation>Zignoruj</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Add To Dictionary</source>
         <comment>Learn Spelling context menu item</comment>
         <translation>Dodaj do słownika</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Search The Web</source>
         <comment>Search The Web context menu item</comment>
         <translation>Wyszukaj w sieci</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Look Up In Dictionary</source>
         <comment>Look Up in Dictionary context menu item</comment>
         <translation>Poszukaj w słowniku</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Open Link</source>
         <comment>Open Link context menu item</comment>
         <translation>Otwórz odsyłacz</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Ignore</source>
         <comment>Ignore Grammar context menu item</comment>
         <translation>Zignoruj</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Spelling</source>
         <comment>Spelling and Grammar context sub-menu item</comment>
         <translation>Pisownia</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Show Spelling and Grammar</source>
         <comment>menu item title</comment>
         <translation>Pokaż pisownię i gramatykę</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hide Spelling and Grammar</source>
         <comment>menu item title</comment>
         <translation>Schowaj pisownię i gramatykę</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Check Spelling</source>
         <comment>Check spelling context menu item</comment>
         <translation>Sprawdź pisownię</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Check Spelling While Typing</source>
         <comment>Check spelling while typing context menu item</comment>
         <translation>Sprawdzaj pisownię podczas pisania</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Check Grammar With Spelling</source>
         <comment>Check grammar with spelling context menu item</comment>
         <translation>Sprawdzaj gramatykę wraz z pisownią</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Fonts</source>
         <comment>Font context sub-menu item</comment>
         <translation>Czcionki</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Bold</source>
         <comment>Bold context menu item</comment>
         <translation>Pogrubiony</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Italic</source>
         <comment>Italic context menu item</comment>
         <translation>Kursywa</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Underline</source>
         <comment>Underline context menu item</comment>
         <translation>Podkreślenie</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Outline</source>
         <comment>Outline context menu item</comment>
         <translation>Kontur</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Direction</source>
         <comment>Writing direction context sub-menu item</comment>
         <translation>Kierunek</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Text Direction</source>
         <comment>Text direction context sub-menu item</comment>
         <translation>Kierunek tekstu</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Default</source>
         <comment>Default writing direction context menu item</comment>
         <translation>Domyślny</translation>
     </message>
     <message>
-        <location line="+110"/>
         <source>Missing Plug-in</source>
         <comment>Label text to be used when a plug-in is missing</comment>
         <translation>Brakująca wtyczka</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Loading...</source>
         <comment>Media controller status message when the media is loading</comment>
         <translation>Ładowanie...</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Live Broadcast</source>
         <comment>Media controller status message when watching a live broadcast</comment>
         <translation>Transmisja na żywo</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Audio Element</source>
         <comment>Media controller element</comment>
         <translation>Element dźwiękowy</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Video Element</source>
         <comment>Media controller element</comment>
         <translation>Element wideo</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Mute Button</source>
         <comment>Media controller element</comment>
         <translation>Przycisk wyłączania głosu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Unmute Button</source>
         <comment>Media controller element</comment>
         <translation>Przycisk włączania głosu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Play Button</source>
         <comment>Media controller element</comment>
         <translation>Przycisk odtwarzania</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Pause Button</source>
         <comment>Media controller element</comment>
         <translation>Przycisk pauzy</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Slider</source>
         <comment>Media controller element</comment>
         <translation>Suwak</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Slider Thumb</source>
         <comment>Media controller element</comment>
         <translation>Uchwyt suwaka</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Rewind Button</source>
         <comment>Media controller element</comment>
         <translation>Przycisk przewijania</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Return to Real-time Button</source>
         <comment>Media controller element</comment>
         <translation>Przycisk powrotu do czasu rzeczywistego</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Elapsed Time</source>
         <comment>Media controller element</comment>
         <translation>Czas który upłynął</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Remaining Time</source>
         <comment>Media controller element</comment>
         <translation>Czas który pozostał</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Status Display</source>
         <comment>Media controller element</comment>
         <translation>Wyświetlacz stanu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Fullscreen Button</source>
         <comment>Media controller element</comment>
         <translation>Przycisk trybu pełnoekranowego</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Seek Forward Button</source>
         <comment>Media controller element</comment>
         <translation>Przycisk przeszukiwania do przodu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Seek Back Button</source>
         <comment>Media controller element</comment>
         <translation>Przycisk przeszukiwania do tyłu</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Audio element playback controls and status display</source>
         <comment>Media controller element</comment>
         <translation>Kontrolki odtwarzania dźwięku i wyświetlacz stanu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Video element playback controls and status display</source>
         <comment>Media controller element</comment>
         <translation>Kontrolki odtwarzania wideo i wyświetlacz stanu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Mute audio tracks</source>
         <comment>Media controller element</comment>
         <translation>Wyłącz ścieżkę dźwiękową</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Unmute audio tracks</source>
         <comment>Media controller element</comment>
         <translation>Włącz ścieżkę dźwiękową</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Begin playback</source>
         <comment>Media controller element</comment>
         <translation>Rozpocznij odtwarzanie</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Pause playback</source>
         <comment>Media controller element</comment>
         <translation>Zatrzymaj odtwarzanie</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Movie time scrubber</source>
         <comment>Media controller element</comment>
         <translation>Suwak czasu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Movie time scrubber thumb</source>
         <comment>Media controller element</comment>
         <translation>Uchwyt suwaka czasu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Rewind movie</source>
         <comment>Media controller element</comment>
         <translation>Przewiń film</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Return streaming movie to real-time</source>
         <comment>Media controller element</comment>
         <translation>Przywróć przesyłanie filmu do czasu rzeczywistego</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Current movie time</source>
         <comment>Media controller element</comment>
         <translation>Czas bieżącego filmu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Remaining movie time</source>
         <comment>Media controller element</comment>
         <translation>Czas do końca filmu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Current movie status</source>
         <comment>Media controller element</comment>
         <translation>Stan bieżącego filmu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Play movie in full-screen mode</source>
         <comment>Media controller element</comment>
         <translation>Odtwarzaj film w trybie pełnoekranowym</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Seek quickly back</source>
         <comment>Media controller element</comment>
         <translation>Przeszukaj szybko do tyłu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Seek quickly forward</source>
         <comment>Media controller element</comment>
         <translation>Przeszukaj szybko do przodu</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Indefinite time</source>
         <comment>Media time description</comment>
         <translation>Nieokreślony czas</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>%1 days %2 hours %3 minutes %4 seconds</source>
         <comment>Media time description</comment>
         <translation>%1 dni %2 godzin %3 minut %4 sekund</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1 hours %2 minutes %3 seconds</source>
         <comment>Media time description</comment>
         <translation>%1 godzin %2 minut %3 sekund</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1 minutes %2 seconds</source>
         <comment>Media time description</comment>
         <translation>%1 minut %2 sekund</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>%1 seconds</source>
         <comment>Media time description</comment>
         <translation>%1 sekund</translation>
     </message>
     <message>
-        <location line="-225"/>
         <source>Inspect</source>
         <comment>Inspect Element context menu item</comment>
         <translation>Zwiedzaj</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>No recent searches</source>
         <comment>Label for only item in menu that appears when clicking on the search field image, when no searches have been performed</comment>
         <translation>Brak ostatnich wyszukiwań</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Recent searches</source>
         <comment>label for first item in the menu that appears when clicking on the search field image, used as embedded menu title</comment>
         <translation>Ostatnie wyszukiwania</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Clear recent searches</source>
         <comment>menu item in Recent Searches menu that empties menu&apos;s contents</comment>
         <translation>Wyczyść ostatnie wyszukiwania</translation>
     </message>
     <message>
-        <location line="+90"/>
         <source>Unknown</source>
         <comment>Unknown filesize FTP directory listing item</comment>
         <translation>Nieznany</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp" line="+256"/>
         <source>Web Inspector - %2</source>
         <translation>Wizytator sieciowy - %2</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp" line="+355"/>
         <source>Redirection limit reached</source>
         <translation>Osiągnięto limit przekierowań</translation>
     </message>
     <message>
-        <location line="+121"/>
         <source>Bad HTTP request</source>
         <translation>Niepoprawna komenda HTTP</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebCore/platform/qt/Localizations.cpp" line="-301"/>
         <source>This is a searchable index. Enter search keywords: </source>
         <comment>text that appears at the start of nearly-obsolete web pages in the form of a &apos;searchable index&apos;</comment>
         <translation>To jest indeks wyszukiwawczy. Podaj słowa do wyszukania:</translation>
     </message>
     <message>
-        <location line="+186"/>
         <source>Left to Right</source>
         <comment>Left to Right context menu item</comment>
         <translation>Z lewej na prawą</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Right to Left</source>
         <comment>Right to Left context menu item</comment>
         <translation>Z prawej na lewą</translation>
     </message>
     <message>
-        <location line="+115"/>
         <source>%1 (%2x%3 pixels)</source>
         <comment>Title string for images</comment>
         <translation>%1 (%2x%3 piksli)</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebCore/platform/qt/ScrollbarQt.cpp" line="+58"/>
         <source>Scroll here</source>
         <translation>Przewiń tutaj</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Left edge</source>
         <translation>Lewa krawędź</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Top</source>
         <translation>Do góry</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Right edge</source>
         <translation>Prawa krawędź</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Bottom</source>
         <translation>W dół</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Page left</source>
         <translation>Strona w lewo</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Page up</source>
         <translation>Strona do góry</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page right</source>
         <translation>Strona w prawo</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Page down</source>
         <translation>Strona w dół</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Scroll left</source>
         <translation>Przewiń w lewo</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Scroll up</source>
         <translation>Przewiń do góry</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Scroll right</source>
         <translation>Przewiń w prawo</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Scroll down</source>
         <translation>Przewiń w dół</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/3rdparty/webkit/WebCore/platform/qt/FileChooserQt.cpp" line="+45"/>
         <source>%n file(s)</source>
         <comment>number of chosen file</comment>
         <translation>
@@ -9287,237 +7377,190 @@ Proszę wybrać inną nazwę pliku.</translation>
         </translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp" line="+2083"/>
         <source>JavaScript Alert - %1</source>
         <translation>Ostrzeżenie JavaScript - %1</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>JavaScript Confirm - %1</source>
         <translation>Potwierdzenie JavaScript - %1</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>JavaScript Prompt - %1</source>
         <translation>Zachęta JavaScript - %1</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>JavaScript Problem - %1</source>
         <translation>Problem JavaScript - %1</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>The script on this page appears to have a problem. Do you want to stop the script?</source>
         <translation>Skrypt na tej stronie nie działa poprawnie. Czy chcesz przerwać ten skrypt?</translation>
     </message>
     <message>
-        <location line="+395"/>
         <source>Move the cursor to the next character</source>
         <translation>Przesuń kursor do następnego znaku</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the previous character</source>
         <translation>Przesuń kursor do poprzedniego znaku</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the next word</source>
         <translation>Przesuń kursor do następnego słowa</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the previous word</source>
         <translation>Przesuń kursor do poprzedniego słowa</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the next line</source>
         <translation>Przesuń kursor do następnej linii</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the previous line</source>
         <translation>Przesuń kursor do poprzedniej linii</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the start of the line</source>
         <translation>Przesuń kursor do początku linii</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the end of the line</source>
         <translation>Przesuń kursor do końca linii</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the start of the block</source>
         <translation>Przesuń kursor do początku bloku</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the end of the block</source>
         <translation>Przesuń kursor do końca bloku</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the start of the document</source>
         <translation>Przesuń kursor do początku dokumentu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the end of the document</source>
         <translation>Przesuń kursor do końca dokumentu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select all</source>
         <translation>Zaznacz wszystko</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the next character</source>
         <translation>Zaznacz do następnego znaku</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the previous character</source>
         <translation>Zaznacz do poprzedniego znaku</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the next word</source>
         <translation>Zaznacz do następnego słowa</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the previous word</source>
         <translation>Zaznacz do poprzedniego słowa</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the next line</source>
         <translation>Zaznacz do następnej linii</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the previous line</source>
         <translation>Zaznacz do poprzedniej linii</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the start of the line</source>
         <translation>Zaznacz do początku linii</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the end of the line</source>
         <translation>Zaznacz do końca linii</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the start of the block</source>
         <translation>Zaznacz do początku bloku</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the end of the block</source>
         <translation>Zaznacz do końca bloku</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the start of the document</source>
         <translation>Zaznacz do początku dokumentu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the end of the document</source>
         <translation>Zaznacz do końca dokumentu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Delete to the start of the word</source>
         <translation>Skasuj do początku słowa</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Delete to the end of the word</source>
         <translation>Skasuj do końca słowa</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Insert a new paragraph</source>
         <translation>Wstaw nowy paragraf</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Insert a new line</source>
         <translation>Wstaw nową linię</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Paste and Match Style</source>
         <translation>Wklej i dopasuj styl</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Remove formatting</source>
         <translation>Usuń formatowanie</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Strikethrough</source>
         <translation>Przekreślenie</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Subscript</source>
         <translation>Indeks dolny</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Superscript</source>
         <translation>Indeks górny</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Insert Bulleted List</source>
         <translation>Wstaw listę wypunktowaną</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Insert Numbered List</source>
         <translation>Wstaw listę ponumerowaną</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Indent</source>
         <translation>Zwiększ wcięcie</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Outdent</source>
         <translation>Zmniejsz wcięcie</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Center</source>
         <translation>Wyśrodkuj</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Justify</source>
         <translation>Wyjustuj</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Align Left</source>
         <translation>Wyrównaj do lewej</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Align Right</source>
         <translation>Wyrównaj do prawej</translation>
     </message>
@@ -9525,7 +7568,6 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QWhatsThisAction</name>
     <message>
-        <location filename="../src/gui/kernel/qwhatsthis.cpp" line="+527"/>
         <source>What&apos;s This?</source>
         <translation>Co to jest?</translation>
     </message>
@@ -9533,7 +7575,6 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QWidget</name>
     <message>
-        <location filename="../src/gui/kernel/qwidget.cpp" line="+5856"/>
         <source>*</source>
         <translation>*</translation>
     </message>
@@ -9541,57 +7582,46 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QWizard</name>
     <message>
-        <location filename="../src/gui/dialogs/qwizard.cpp" line="+689"/>
         <source>Go Back</source>
         <translation>Wróć</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Continue</source>
         <translation>Kontynuuj</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Commit</source>
         <translation>Dokonaj</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Done</source>
         <translation>Zrobione</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Help</source>
         <translation>Pomoc</translation>
     </message>
     <message>
-        <location line="-14"/>
         <source>&lt; &amp;Back</source>
         <translation>&lt; &amp;Wstecz</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>&amp;Finish</source>
         <translation>&amp;Zakończ</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Help</source>
         <translation>&amp;Pomoc</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>&amp;Next</source>
         <translation>&amp;Dalej</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;Next &gt;</source>
         <translation>&amp;Dalej &gt;</translation>
     </message>
@@ -9599,69 +7629,54 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QWorkspace</name>
     <message>
-        <location filename="../src/gui/widgets/qworkspace.cpp" line="+1887"/>
-        <location line="+60"/>
         <source>%1 - [%2]</source>
         <translation>%1 - [%2]</translation>
     </message>
     <message>
-        <location line="-1834"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location line="+984"/>
         <source>&amp;Close</source>
         <translation>&amp;Zamknij</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>Ma&amp;ximize</source>
         <translation>Zma&amp;ksymalizuj</translation>
     </message>
     <message>
-        <location line="-980"/>
         <source>Minimize</source>
         <translation>Zminimalizuj</translation>
     </message>
     <message>
-        <location line="+978"/>
         <source>Mi&amp;nimize</source>
         <translation>Zmi&amp;nimalizuj</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>&amp;Move</source>
         <translation>&amp;Przenieś</translation>
     </message>
     <message>
-        <location line="-1"/>
         <source>&amp;Restore</source>
         <translation>&amp;Przywróć</translation>
     </message>
     <message>
-        <location line="-972"/>
         <source>Restore Down</source>
         <translation>Przywróć pod spód</translation>
     </message>
     <message>
-        <location line="+989"/>
-        <location line="+1059"/>
         <source>Sh&amp;ade</source>
         <translation>&amp;Zwiń</translation>
     </message>
     <message>
-        <location line="-1074"/>
         <source>&amp;Size</source>
         <translation>&amp;Rozmiar</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Stay on &amp;Top</source>
         <translation>Pozostaw na &amp;wierzchu</translation>
     </message>
     <message>
-        <location line="+1058"/>
         <source>&amp;Unshade</source>
         <translation>R&amp;ozwiń</translation>
     </message>
@@ -9669,117 +7684,94 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QXml</name>
     <message>
-        <location filename="../src/xml/sax/qxml.cpp" line="+69"/>
         <source>encoding declaration or standalone declaration expected while reading the XML declaration</source>
         <translation>oczekiwano deklaracji &quot;encoding&quot; lub &quot;standalone&quot; podczas odczytywania deklaracji XML</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>error in the text declaration of an external entity</source>
         <translation>błąd w deklaracji &quot;text&quot; zewnętrznej jednostki</translation>
     </message>
     <message>
-        <location line="-7"/>
         <source>error occurred while parsing comment</source>
         <translation>wystąpił błąd podczas parsowania komentarza</translation>
     </message>
     <message>
-        <location line="-9"/>
         <source>error occurred while parsing content</source>
         <translation>wystąpił błąd podczas parsowania zawartości</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>error occurred while parsing document type definition</source>
         <translation>wystąpił błąd podczas parsowania typu definicji dokumentu</translation>
     </message>
     <message>
-        <location line="-9"/>
         <source>error occurred while parsing element</source>
         <translation>wystąpił błąd podczas parsowania elementu</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>error occurred while parsing reference</source>
         <translation>wystąpił błąd podczas parsowania odwołania</translation>
     </message>
     <message>
-        <location line="-15"/>
         <source>error triggered by consumer</source>
         <translation>błąd wywołany przez konsumenta</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>external parsed general entity reference not allowed in attribute value</source>
         <translation>odwołanie do jednostki ogólnej zewnętrznie przetworzonej nie dozwolone dla wartości atrybutu </translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>external parsed general entity reference not allowed in DTD</source>
         <translation>odwołanie do jednostki ogólnej zewnętrznie przetworzonej nie dozwolone w DTD</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>internal general entity reference not allowed in DTD</source>
         <translation>odwołanie do jednostki ogólnej wewnętrznej nie dozwolone w DTD</translation>
     </message>
     <message>
-        <location line="-9"/>
         <source>invalid name for processing instruction</source>
         <translation>niepoprawna nazwa dla instrukcji przetwarzającej</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>letter is expected</source>
         <translation>oczekiwana jest litera</translation>
     </message>
     <message>
-        <location line="-11"/>
         <source>more than one document type definition</source>
         <translation>więcej niż jedna definicja typu dokumentu</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>no error occurred</source>
         <translation>nie pojawił się żaden błąd</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>recursive entities</source>
         <translation>jednostki rekurencyjne</translation>
     </message>
     <message>
-        <location line="-9"/>
         <source>standalone declaration expected while reading the XML declaration</source>
         <translation>deklaracja &quot;standalone&quot; oczekiwana podczas czytania deklaracji XML</translation>
     </message>
     <message>
-        <location line="-7"/>
         <source>tag mismatch</source>
         <translation>niezgodny tag</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>unexpected character</source>
         <translation>nieoczekiwany znak</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>unexpected end of file</source>
         <translation>nieoczekiwany koniec pliku</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>unparsed entity reference in wrong context</source>
         <translation>odwołanie do jednostki nieprzetworzonej w złym kontekście</translation>
     </message>
     <message>
-        <location line="-11"/>
         <source>version expected while reading the XML declaration</source>
         <translation>oczekiwano wersji podczas czytania deklaracji XML</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>wrong value for standalone declaration</source>
         <translation>błędna wartość dla deklaracji &quot;standalone&quot;</translation>
     </message>
@@ -9787,27 +7779,22 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QXmlPatternistCLI</name>
     <message>
-        <location filename="../src/xmlpatterns/api/qcoloringmessagehandler.cpp" line="+87"/>
         <source>Warning in %1, at line %2, column %3: %4</source>
         <translation>Ostrzeżenie w %1, wiersz %2, kolumna %3: %4</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Warning in %1: %2</source>
         <translation>Ostrzeżenie w %1: %2</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Unknown location</source>
         <translation>Nieznane położenie</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Error %1 in %2, at line %3, column %4: %5</source>
         <translation>Błąd %1 w %2, wiersz %3, kolumna %4: %5</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Error %1 in %2: %3</source>
         <translation>Błąd %1 w %2: %3</translation>
     </message>
@@ -9815,184 +7802,142 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QXmlStream</name>
     <message>
-        <location filename="../src/corelib/xml/qxmlstream.cpp" line="+611"/>
-        <location filename="../src/corelib/xml/qxmlstream_p.h" line="+1770"/>
         <source>Extra content at end of document.</source>
         <translation>Dodatkowa treść na końcu dokumentu.</translation>
     </message>
     <message>
-        <location line="+271"/>
         <source>Invalid entity value.</source>
         <translation>Niepoprawna wartość jednostki.</translation>
     </message>
     <message>
-        <location line="+109"/>
         <source>Invalid XML character.</source>
         <translation>Niepoprawny znak XML.</translation>
     </message>
     <message>
-        <location line="+259"/>
         <source>Sequence &apos;]]&gt;&apos; not allowed in content.</source>
         <translation>Ciąg &apos;]]&gt;&apos; niedozwolony w treści.</translation>
     </message>
     <message>
-        <location line="+309"/>
         <source>Namespace prefix &apos;%1&apos; not declared</source>
         <translation>Przedrostek przestrzeni nazw &apos;%1&apos; nie został zadeklarowany</translation>
     </message>
     <message>
-        <location line="+78"/>
         <source>Attribute redefined.</source>
         <translation>Atrybut zdefiniowany wielokrotnie.</translation>
     </message>
     <message>
-        <location line="+115"/>
         <source>Unexpected character &apos;%1&apos; in public id literal.</source>
         <translation>Nieoczekiwany znak &apos;%1&apos; w publicznej stałej znakowej.</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Invalid XML version string.</source>
         <translation>Niepoprawna wersja XML.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Unsupported XML version.</source>
         <translation>Nieobsługiwana wersja XML.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>%1 is an invalid encoding name.</source>
         <translation>%1 jest niepoprawną nazwą kodowania.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Encoding %1 is unsupported</source>
         <translation>Kodowanie %1 jest nieobsługiwane</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Standalone accepts only yes or no.</source>
         <translation>Tylko wartości &quot;tak&quot; lub &quot;nie&quot; są akceptowane przez &quot;standalone&quot;.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Invalid attribute in XML declaration.</source>
         <translation>Niepoprawny atrybut w deklaracji XML.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Premature end of document.</source>
         <translation>Przedwczesne zakończenie dokumentu.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Invalid document.</source>
         <translation>Niepoprawny dokument.</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>Expected </source>
         <translation>Oczekiwano </translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>, but got &apos;</source>
         <translation>, ale otrzymano &apos;</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Unexpected &apos;</source>
         <translation>Nieoczekiwany &apos;</translation>
     </message>
     <message>
-        <location line="+225"/>
         <source>Expected character data.</source>
         <translation>Oczekiwana dana znakowa.</translation>
     </message>
     <message>
-        <location filename="../src/corelib/xml/qxmlstream_p.h" line="-995"/>
         <source>Recursive entity detected.</source>
         <translation>Wykryto jednostkę rekurencyjną.</translation>
     </message>
     <message>
-        <location line="+516"/>
         <source>Start tag expected.</source>
         <translation>Oczekiwano rozpoczęcia tagu.</translation>
     </message>
     <message>
-        <location line="+222"/>
         <source>XML declaration not at start of document.</source>
         <translation>Deklaracja XML nie jest na początku dokumentu.</translation>
     </message>
     <message>
-        <location line="-31"/>
         <source>NDATA in parameter entity declaration.</source>
         <translation>NDATA w deklaracji parametru obiektu.</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>%1 is an invalid processing instruction name.</source>
         <translation>%1 jest niepoprawną nazwą instrukcji przetwarzającej.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Invalid processing instruction name.</source>
         <translation>Niepoprawna nazwa instrukcji przetwarzającej.</translation>
     </message>
     <message>
-        <location filename="../src/corelib/xml/qxmlstream.cpp" line="-536"/>
-        <location line="+12"/>
-        <location filename="../src/corelib/xml/qxmlstream_p.h" line="+164"/>
-        <location line="+53"/>
         <source>Illegal namespace declaration.</source>
         <translation>Niepoprawna deklaracja przestrzeni nazw.</translation>
     </message>
     <message>
-        <location filename="../src/corelib/xml/qxmlstream_p.h" line="+15"/>
         <source>Invalid XML name.</source>
         <translation>Niepoprawna nazwa XML.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Opening and ending tag mismatch.</source>
         <translation>Niezgodne tagi początku i końca.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Reference to unparsed entity &apos;%1&apos;.</source>
         <translation>Odwołanie do nieprzetworzonej jednostki &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="-13"/>
-        <location line="+61"/>
-        <location line="+40"/>
         <source>Entity &apos;%1&apos; not declared.</source>
         <translation>Jednostka &apos;%1&apos; nie zadeklarowana.</translation>
     </message>
     <message>
-        <location line="-26"/>
         <source>Reference to external entity &apos;%1&apos; in attribute value.</source>
         <translation>Odwołanie do zewnętrznej jednostki &apos;%1&apos; jako wartość atrybutu.</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>Invalid character reference.</source>
         <translation>Niepoprawny znak odwołania.</translation>
     </message>
     <message>
-        <location filename="../src/corelib/xml/qxmlstream.cpp" line="-75"/>
-        <location filename="../src/corelib/xml/qxmlstream_p.h" line="-823"/>
         <source>Encountered incorrectly encoded content.</source>
         <translation>Natrafiono na niepoprawnie zakodowaną treść.</translation>
     </message>
     <message>
-        <location line="+274"/>
         <source>The standalone pseudo attribute must appear after the encoding.</source>
         <translation>Pseudo atrybut &quot;standalone&quot; musi pojawić się po &quot;encoding&quot;.</translation>
     </message>
     <message>
-        <location filename="../src/corelib/xml/qxmlstream_p.h" line="+562"/>
         <source>%1 is an invalid PUBLIC identifier.</source>
         <translation>%1 jest niepoprawnym publicznym identyfikatorem.</translation>
     </message>
@@ -10000,707 +7945,562 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QtXmlPatterns</name>
     <message>
-        <location filename="../src/xmlpatterns/api/qiodevicedelegate.cpp" line="+84"/>
         <source>Network timeout.</source>
         <translation>Przekroczony czas połączenia.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/api/qxmlserializer.cpp" line="+320"/>
         <source>Element %1 can&apos;t be serialized because it appears outside the document element.</source>
         <translation>Element %1 nie może być zserializowany ponieważ pojawił się poza elementem &quot;document&quot;.</translation>
     </message>
     <message>
-        <location line="+60"/>
         <source>Attribute %1 can&apos;t be serialized because it appears at the top level.</source>
         <translation>Atrybut %1 nie może być zserializowany ponieważ pojawił się na najwyższym poziomie.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qabstractdatetime.cpp" line="+80"/>
         <source>Year %1 is invalid because it begins with %2.</source>
         <translation>Rok %1 jest niepoprawny ponieważ rozpoczyna się: %2.</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Day %1 is outside the range %2..%3.</source>
         <translation>Dzień %1 jest poza zakresem %2..%3.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Month %1 is outside the range %2..%3.</source>
         <translation>Miesiąc %1 jest poza zakresem %2..%3.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Overflow: Can&apos;t represent date %1.</source>
         <translation>Przepełnienie: Nie można wyrazić daty %1.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Day %1 is invalid for month %2.</source>
         <translation>Dzień %1 jest niepoprawny dla miesiąca %2.</translation>
     </message>
     <message>
-        <location line="+49"/>
         <source>Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; </source>
         <translation>Czas 24:%1:%2:%3 jest niepoprawny. Godzina jest 24, ale minuty, sekundy i milisekundy nie są równocześnie zerami;</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Time %1:%2:%3.%4 is invalid.</source>
         <translation>Czas %1:%2:%3.%4 jest niepoprawny.</translation>
     </message>
     <message>
-        <location line="+115"/>
         <source>Overflow: Date can&apos;t be represented.</source>
         <translation>Przepełnienie: Data nie może być wyrażona.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qabstractduration.cpp" line="+99"/>
-        <location line="+15"/>
         <source>At least one component must be present.</source>
         <translation>Przynajmniej jeden komponent musi być obecny.</translation>
     </message>
     <message>
-        <location line="-7"/>
         <source>At least one time component must appear after the %1-delimiter.</source>
         <translation>Przynajmniej jeden komponent musi wystąpić po nawiasie %1.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qanyuri_p.h" line="+132"/>
         <source>%1 is not a valid value of type %2.</source>
         <translation>%1 nie jest poprawną wartością dla typu %2.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qatomiccasters_p.h" line="+223"/>
         <source>When casting to %1 from %2, the source value cannot be %3.</source>
         <translation>W rzutowaniu %1 na %2 wartość źródłowa nie może być %3.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qatomicmathematicians.cpp" line="+201"/>
-        <location line="+32"/>
         <source>Dividing a value of type %1 by %2 (not-a-number) is not allowed.</source>
         <translation>Dzielenie wartości typu %1 przez %2 (typ nienumeryczny) jest niedozwolone.</translation>
     </message>
     <message>
-        <location line="-20"/>
         <source>Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed.</source>
         <translation>Dzielenie wartości typu %1 przez %2 lub %3 (plus lub minus zero) jest niedozwolone.</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed.</source>
         <translation>Mnożenie wartości typu %1 przez %2 lub %3 (plus lub minus nieskończoność) jest niedozwolone.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qatomicvalue.cpp" line="+79"/>
         <source>A value of type %1 cannot have an Effective Boolean Value.</source>
         <translation>Wartość typu %1 nie może posiadać efektywnej wartości boolowskiej (EBV).</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qboolean.cpp" line="+78"/>
         <source>Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values.</source>
         <translation>Efektywna wartość boolowska (EBV) nie może być obliczona dla sekwencji zawierającej dwie lub więcej wartości atomowe.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qderivedinteger_p.h" line="+402"/>
         <source>Value %1 of type %2 exceeds maximum (%3).</source>
         <translation>Wartość %1 typu %2 przekracza maksimum (%3).</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Value %1 of type %2 is below minimum (%3).</source>
         <translation>Wartość %1 typu %2 jest poniżej minimum (%3).</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qhexbinary.cpp" line="+91"/>
         <source>A value of type %1 must contain an even number of digits. The value %2 does not.</source>
         <translation>Wartość typu %1 musi zawierać parzystą liczbę cyfr. Wartość %2 nie zawiera.</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>%1 is not valid as a value of type %2.</source>
         <translation>Wartość %1 nie jest poprawna jako wartość typu %2.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qarithmeticexpression.cpp" line="+207"/>
         <source>Operator %1 cannot be used on type %2.</source>
         <translation>Operator %1 nie może być użyty dla typu %2.</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Operator %1 cannot be used on atomic values of type %2 and %3.</source>
         <translation>Operator %1 nie może być użyty dla atomowych wartości typu %2 i %3.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qattributenamevalidator.cpp" line="+66"/>
         <source>The namespace URI in the name for a computed attribute cannot be %1.</source>
         <translation>Przestrzeń nazw URI nie może być %1 w nazwie dla obliczonego atrybutu.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>The name for a computed attribute cannot have the namespace URI %1 with the local name %2.</source>
         <translation>Nazwa dla wyliczonego atrybutu nie może zawierać przestrzeni nazw URI %1 z lokalną nazwą %2.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qcastas.cpp" line="+88"/>
         <source>Type error in cast, expected %1, received %2.</source>
         <translation>Błąd typów w rzutowaniu: oczekiwano %1, otrzymano %2.</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed.</source>
         <translation>Podczas rzutowania na %1 lub na typ pochodny, wartość źródłowa musi być tego samego typu lub musi być stałą znakową. Typ %2 nie jest dozwolony.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qcommentconstructor.cpp" line="+67"/>
         <source>A comment cannot contain %1</source>
         <translation>Komentarz nie może zawierać %1</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>A comment cannot end with a %1.</source>
         <translation>Komentarz nie może kończyć się: %1.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qdocumentcontentvalidator.cpp" line="+86"/>
         <source>An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place.</source>
         <translation>Węzeł &quot;attribute&quot; nie może być podelementem węzła &quot;document&quot;. Dlatego atrybut %1 jest w złym miejscu.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qexpressionfactory.cpp" line="+162"/>
         <source>A library module cannot be evaluated directly. It must be imported from a main module.</source>
         <translation>Moduł biblioteki nie może być bezpośrednio oceniony. On musi być zaimportowany z głównego modułu.</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>No template by name %1 exists.</source>
         <translation>Szablon o nazwie %1 nie istnieje.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qgenericpredicate.cpp" line="+106"/>
         <source>A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type.</source>
         <translation>Wartość typu %1 nie może być predykatem. Predykat musi być typu liczbowego lub Efektywną Wartość Logiczną.</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>A positional predicate must evaluate to a single numeric value.</source>
         <translation>Wynikiem predykatu pozycyjnego musi być pojedyncza wartość liczbowa.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qncnameconstructor_p.h" line="+113"/>
         <source>The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, %2 is invalid.</source>
         <translation>Docelowa nazwa w instrukcji przetwarzania nie może być %1 w żadnej kombinacji wielkich i małych liter. Dlatego nazwa %2 jest niepoprawna.</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>%1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3.</source>
         <translation>%1 nie jest poprawną nazwą docelową w instrukcji przetwarzania. Nazwa musi być wartością %2, np. %3.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qpath.cpp" line="+109"/>
         <source>The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two.</source>
         <translation>Ostatni krok w ścieżce musi zawierać albo węzły albo wartości atomowe. Nie może zawierać obu jednocześnie.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp" line="+84"/>
         <source>The data of a processing instruction cannot contain the string %1</source>
         <translation>Dane instrukcji przetwarzania nie mogą zawierać ciągu %1</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qqnameconstructor.cpp" line="+82"/>
         <source>No namespace binding exists for the prefix %1</source>
         <translation>Żadna przestrzeń nazw nie jest powiązana z przedrostkiem %1</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qqnameconstructor_p.h" line="+156"/>
         <source>No namespace binding exists for the prefix %1 in %2</source>
         <translation>Żadna przestrzeń nazw nie jest powiązana z przedrostkiem %1 w %2</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location filename="../src/xmlpatterns/functions/qqnamefns.cpp" line="+69"/>
         <source>%1 is an invalid %2</source>
         <translation>%1 jest niepoprawnym %2</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qaggregatefns.cpp" line="+120"/>
         <source>The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration.</source>
         <translation>Pierwszy argument w %1 nie może być typu %2. Musi on być typu liczbowego: xs:yearMonthDuration lub xs:dayTimeDuration.</translation>
     </message>
     <message>
-        <location line="+74"/>
         <source>The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5.</source>
         <translation>Pierwszy argument w %1 nie może być typu %2. Musi on być typu: %3, %4 lub %5.</translation>
     </message>
     <message>
-        <location line="+91"/>
         <source>The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5.</source>
         <translation>Drugi argument w %1 nie może być typu %2. Musi on być typu: %3, %4 lub %5.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qassemblestringfns.cpp" line="+88"/>
         <source>%1 is not a valid XML 1.0 character.</source>
         <translation>%1 nie jest poprawnym znakiem XML 1.0.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qdatetimefn.cpp" line="+86"/>
         <source>If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same.</source>
         <translation>Jeśli oba argumenty mają przesunięcia strefowe, muszą one być takie same. %1 i %2 nie są takie same.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qerrorfn.cpp" line="+61"/>
         <source>%1 was called.</source>
         <translation>Wywołano %1.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qpatternmatchingfns.cpp" line="+94"/>
         <source>%1 must be followed by %2 or %3, not at the end of the replacement string.</source>
         <translation>Po %1 musi następować %2 lub %3, lecz nie na końcu zastępczego ciągu.</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>In the replacement string, %1 must be followed by at least one digit when not escaped.</source>
         <translation type="unfinished">W ciągu zastępczym, po %1 musi następować przynajmniej jedna cyfra</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>In the replacement string, %1 can only be used to escape itself or %2, not %3</source>
         <translation type="unfinished">W ciągu zastępczym, %1 może być użyte tylko do zabezpieczenia samej siebie lub %2, nigdy %3</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qpatternplatform.cpp" line="+92"/>
         <source>%1 matches newline characters</source>
         <translation>%1 dopasowało znak nowej linii</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1 and %2 match the start and end of a line.</source>
         <translation>%1 i %2 dopasowały początek i koniec linii.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Matches are case insensitive</source>
         <translation>Dopasowania uwzględniają wielkość liter</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Whitespace characters are removed, except when they appear in character classes</source>
         <translation>Spacje są usuwane z wyjątkiem kiedy pojawią się w klasach znakowych</translation>
     </message>
     <message>
-        <location line="+100"/>
         <source>%1 is an invalid regular expression pattern: %2</source>
         <translation>%1 jest niepoprawnym wzorcem wyrażenia regularnego: %2</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>%1 is an invalid flag for regular expressions. Valid flags are:</source>
         <translation>%1 jest niepoprawną flagą dla wyrażeń regularnych. Poprawnymi flagami są:</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qqnamefns.cpp" line="+17"/>
         <source>If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified.</source>
         <translation>Jeśli pierwszy argument jest pustą sekwencją lub zerowej długości ciągiem (przy braku przestrzeni nazw), przedrostek nie może wystąpić. Podano przedrostek %1.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qsequencefns.cpp" line="+346"/>
         <source>It will not be possible to retrieve %1.</source>
         <translation>Nie będzie można odzyskać %1.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qsequencegeneratingfns.cpp" line="+266"/>
         <source>The default collection is undefined</source>
         <translation>Domyślna kolekcja jest niezdefiniowana</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>%1 cannot be retrieved</source>
         <translation>%1 nie może być odzyskane</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qstringvaluefns.cpp" line="+252"/>
         <source>The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization).</source>
         <translation>Znormalizowana forma %1 nie jest obsługiwana. Obsługiwanymi formami są: %2, %3, %4 i %5 oraz pusta forma (brak normalizacji).</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qtimezonefns.cpp" line="+87"/>
         <source>A zone offset must be in the range %1..%2 inclusive. %3 is out of range.</source>
         <translation>Przesunięcie strefowe musi być w zakresie %1..%2 włącznie. %3 jest poza tym zakresem.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/janitors/qcardinalityverifier.cpp" line="+58"/>
         <source>Required cardinality is %1; got cardinality %2.</source>
         <translation>Wymagana liczność wynosi %1; otrzymano %2.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/janitors/qitemverifier.cpp" line="+67"/>
         <source>The item %1 did not match the required type %2.</source>
         <translation>Element %1 nie został dopasowany do wymaganego typu %2.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/parser/qquerytransformparser.cpp" line="+352"/>
-        <location line="+7323"/>
         <source>%1 is an unknown schema type.</source>
         <translation>%1 jest nieznanym typem schematu.</translation>
     </message>
     <message>
-        <location line="-7254"/>
         <source>A template with name %1 has already been declared.</source>
         <translation>Szablon o nazwie %1 został już zadeklarowany.</translation>
     </message>
     <message>
-        <location line="+213"/>
         <source>Only one %1 declaration can occur in the query prolog.</source>
         <translation>Tylko jedna deklaracja %1 może się pojawić w prologu zapytania.</translation>
     </message>
     <message>
-        <location line="+188"/>
         <source>The initialization of variable %1 depends on itself</source>
         <translation>Inicjalizacja zmiennej %1 zależy od niej samej</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/parser/qparsercontext.cpp" line="+93"/>
         <source>The variable %1 is unused</source>
         <translation>Zmienna %1 jest nieużywana</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/parser/qquerytransformparser.cpp" line="+2904"/>
         <source>Version %1 is not supported. The supported XQuery version is 1.0.</source>
         <translation>Wersja %1 nie jest obsługiwana. Obsługiwaną wersją XQuery jest wersja 1.0.</translation>
     </message>
     <message>
-        <location line="+71"/>
         <source>No function with signature %1 is available</source>
         <translation>Żadna funkcja w postaci %1 nie jest dostępna</translation>
     </message>
     <message>
-        <location line="+303"/>
         <source>It is not possible to redeclare prefix %1.</source>
         <translation>Nie jest możliwe ponowne zadeklarowanie przedrostka %1.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Prefix %1 is already declared in the prolog.</source>
         <translation>Przedrostek %1 jest już zadeklarowany w prologu.</translation>
     </message>
     <message>
-        <location line="+95"/>
         <source>The name of an option must have a prefix. There is no default namespace for options.</source>
         <translation>Nazwa opcji musi posiadać przedrostek. Nie istnieje domyślna przestrzeń nazw dla opcji.</translation>
     </message>
     <message>
-        <location line="+171"/>
         <source>The Schema Import feature is not supported, and therefore %1 declarations cannot occur.</source>
         <translation>Cecha &quot;Import schematu&quot; nie jest obsługiwana, dlatego deklaracje %1 nie mogą pojawić.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>The target namespace of a %1 cannot be empty.</source>
         <translation>Docelowa przestrzeń nazw dla %1 nie może być pusta.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>The module import feature is not supported</source>
         <translation>Cecha &quot;Import modułu&quot; nie jest obsługiwana</translation>
     </message>
     <message>
-        <location line="+166"/>
         <source>The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases.</source>
         <translation>Przestrzeń nazw %1 jest zarezerwowana, dlatego funkcje zdefiniowane przez użytkownika nie mogą jej użyć. Spróbuj predefiniowany przedrostek %2, który istnieje w takich przypadkach.</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2</source>
         <translation>Przestrzeń nazw dla funkcji zdefiniowanej przez użytkownika w module bibliotecznym musi odpowiadać przestrzeni nazw modułu. Powinna to być %1 zamiast %2</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>A function already exists with the signature %1.</source>
         <translation>Funkcja w postaci %1 już istnieje.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>No external functions are supported. All supported functions can be used directly, without first declaring them as external</source>
         <translation>Zewnętrzne funkcje nie są obsługiwane. Wszystkie obsługiwane funkcje mogą być używane bezpośrednio, bez ich uprzedniego deklarowania jako zewnętrzne</translation>
     </message>
     <message>
-        <location line="+493"/>
         <source>The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide.</source>
         <translation>Nazwa zmiennej powiązanej w wyrażeniu &quot;for&quot; musi być inna od zmiennej pozycjonującej. W związku z tym dwie zmienne o nazwie %1 kolidują ze sobą.</translation>
     </message>
     <message>
-        <location line="+778"/>
         <source>The Schema Validation Feature is not supported. Hence, %1-expressions may not be used.</source>
         <translation>Cecha &quot;Walidacja schematu&quot; nie jest obsługiwana. Dlatego też wyrażenia %1 nie mogą być użyte.</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>None of the pragma expressions are supported. Therefore, a fallback expression must be present</source>
         <translation>Wyrażenia &quot;pragma&quot; nie są obsługiwane. Dlatego musi wystąpić wyrażenie zastępcze</translation>
     </message>
     <message>
-        <location line="+398"/>
         <source>The %1-axis is unsupported in XQuery</source>
         <translation>Oś %1 nie jest obsługiwana w XQuery</translation>
     </message>
     <message>
-        <location line="-5902"/>
         <source>%1 is not a valid numeric literal.</source>
         <translation>%1 nie jest poprawną stałą liczbową.</translation>
     </message>
     <message>
-        <location line="-152"/>
         <source>W3C XML Schema identity constraint selector</source>
         <translation>Selektor narzucenia niepowtarzalności W3C XML Schema</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>W3C XML Schema identity constraint field</source>
         <translation>Pole narzucenia niepowtarzalności W3C XML Schema</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>A construct was encountered which is disallowed in the current language(%1).</source>
         <translation>Wystąpiła konstrukcja która jest niedozwolona w bieżącym języku (%1).</translation>
     </message>
     <message>
-        <location line="+3700"/>
         <source>The keyword %1 cannot occur with any other mode name.</source>
         <translation>Słowo kluczowe %1 nie może wystąpić z inną nazwą trybu.</translation>
     </message>
     <message>
-        <location line="-3117"/>
         <source>No variable with name %1 exists</source>
         <translation>Zmienna o nazwie %1 nie istnieje</translation>
     </message>
     <message>
-        <location line="+3146"/>
         <source>The value of attribute %1 must be of type %2, which %3 isn&apos;t.</source>
         <translation>Wartość atrybutu %1 musi być typu %2, którym nie jest %3.</translation>
     </message>
     <message>
-        <location line="+75"/>
         <source>The prefix %1 cannot be bound. By default, it is already bound to the namespace %2.</source>
         <translation>Przedrostek %1 nie może być powiązany. Jest on domyślnie powiązany z przestrzenią nazw %2.</translation>
     </message>
     <message>
-        <location line="+312"/>
         <source>A variable with name %1 has already been declared.</source>
         <translation>Zmienna o nazwie %1 została już zadeklarowana.</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>No value is available for the external variable with name %1.</source>
         <translation>Brak wartości dla zewnętrznej zmiennej o nazwie %1.</translation>
     </message>
     <message>
-        <location line="+96"/>
         <source>A stylesheet function must have a prefixed name.</source>
         <translation>Funkcja arkusza stylu musi zawierać nazwę z przedrostkiem.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this)</source>
         <translation>Przestrzeń nazw dla funkcji zdefiniowanej przez użytkownika nie może być pusta (spróbuj predefiniowany przedrostek %1, który stworzono specjalnie do takich sytuacji)</translation>
     </message>
     <message>
-        <location line="+115"/>
         <source>An argument with name %1 has already been declared. Every argument name must be unique.</source>
         <translation>Argument o nazwie %1 został już zadeklarowany. Każda nazwa argumentu musi być unikatowa.</translation>
     </message>
     <message>
-        <location line="+179"/>
         <source>When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal.</source>
         <translation>Gdy funkcja %1 jest wykorzystana do dopasowania wewnątrz wzorca, jej argument musi być referencją do zmiennej lub stałą znakową.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching.</source>
         <translation>We wzorze XSL-T pierwszy argument w funkcji %1 musi być stałą znakową podczas dopasowywania.</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching.</source>
         <translation>We wzorze XSL-T pierwszy argument w funkcji %1 musi być stałą znakową lub nazwą zmiennej podczas dopasowywania.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>In an XSL-T pattern, function %1 cannot have a third argument.</source>
         <translation>We wzorze XSL-T funkcja %1 nie może zawierać trzeciego argumentu.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching.</source>
         <translation>We wzorze XSL-T tylko funkcje %1 i %2 mogą być użyte do dopasowania, zaś funkcja %3 nie.</translation>
     </message>
     <message>
-        <location line="+63"/>
         <source>In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can.</source>
         <translation>We wzorze XSL-T tylko osie %2 i %3 mogą być użyte, zaś oś %1 nie.</translation>
     </message>
     <message>
-        <location line="+126"/>
         <source>%1 is an invalid template mode name.</source>
         <translation>%1 nie jest poprawną nazwa trybu szablonu.</translation>
     </message>
     <message>
-        <location line="+1131"/>
         <source>Each name of a template parameter must be unique; %1 is duplicated.</source>
         <translation>Każda nazwa parametru szablonu musi być unikatowa; %1 się powtarza.</translation>
     </message>
     <message>
-        <location line="+462"/>
         <source>No function with name %1 is available.</source>
         <translation>Żadna funkcja o nazwie %1 nie jest dostępna.</translation>
     </message>
     <message>
-        <location line="+250"/>
         <source>An attribute with name %1 has already appeared on this element.</source>
         <translation>Atrybut o nazwie %1 już się pojawił w tym elemencie.</translation>
     </message>
     <message>
-        <location line="-148"/>
         <source>The namespace URI cannot be the empty string when binding to a prefix, %1.</source>
         <translation>Przestrzeń nazw URI nie może być pustym ciągiem w powiązaniu z przedrostkiem, %1.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>%1 is an invalid namespace URI.</source>
         <translation>%1 jest niepoprawną przestrzenią nazw URI.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>It is not possible to bind to the prefix %1</source>
         <translation>Nie jest możliwe powiązanie z przedrostkiem %1</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared).</source>
         <translation>Przestrzeń nazw %1 może być jedynie powiązana z %2 (w przeciwnym wypadku jest ona domyślnie zadeklarowana).</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared).</source>
         <translation>Przedrostek %1 może być jedynie powiązany z %2 (w przeciwnym wypadku jest on domyślnie zadeklarowany).</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Two namespace declaration attributes have the same name: %1.</source>
         <translation>Atrybuty deklaracji przestrzeni nazw mają tą samą nazwę: %1.</translation>
     </message>
     <message>
-        <location line="+89"/>
         <source>The namespace URI must be a constant and cannot use enclosed expressions.</source>
         <translation>Przestrzeń nazw URI nie może być stałą i nie może używać zawartych w niej wyrażeń.</translation>
     </message>
     <message>
-        <location line="+77"/>
         <source>A direct element constructor is not well-formed. %1 is ended with %2.</source>
         <translation>Konstruktor elementu bezpośredniego nie jest dobrze sformatowany. %1 jest zakończony %2.</translation>
     </message>
     <message>
-        <location line="+458"/>
         <source>The name %1 does not refer to any schema type.</source>
         <translation>Nazwa %1 nie odpowiada żadnemu typowi schematu.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>%1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works.</source>
         <translation>%1 jest typem złożonym. Rzutowanie na typy złożone nie jest możliwe. Jednakże rzutowanie na typy atomowe np.: %2 jest dozwolone.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>%1 is not an atomic type. Casting is only possible to atomic types.</source>
         <translation>%1 nie jest typem atomowym. Możliwe jest rzutowanie tylko na typy atomowe.</translation>
     </message>
     <message>
-        <location line="+76"/>
         <source>%1 is not a valid name for a processing-instruction.</source>
         <translation>%1 nie jest poprawną nazwą dla instrukcji przetwarzającej.</translation>
     </message>
     <message>
-        <location line="+69"/>
-        <location line="+71"/>
         <source>%1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported.</source>
         <translation>%1 nie jest wewnątrz zakresu deklaracji atrybutów. Zwróć uwagę że importowanie schematów nie jest obsługiwane.</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>The name of an extension expression must be in a namespace.</source>
         <translation>Nazwa dodatkowego wyrażenia musi znajdować sie w przestrzeni nazw.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/type/qcardinality.cpp" line="+55"/>
         <source>empty</source>
         <translation>pusty</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>zero or one</source>
         <translation>zero lub jeden</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>exactly one</source>
         <translation>dokładnie jeden</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>one or more</source>
         <translation>jeden lub więcej</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>zero or more</source>
         <translation>zero lub więcej</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/type/qtypechecker.cpp" line="+63"/>
         <source>Required type is %1, but %2 was found.</source>
         <translation>Odnaleziono typ %2, lecz wymaganym typem jest %1.</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Promoting %1 to %2 may cause loss of precision.</source>
         <translation>Przekształcenie %1 do %2 może spowodować utratę precyzji.</translation>
     </message>
     <message>
-        <location line="+49"/>
         <source>The focus is undefined.</source>
         <translation>Fokus jest niezdefiniowany.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/utils/qoutputvalidator.cpp" line="+86"/>
         <source>It&apos;s not possible to add attributes after any other kind of node.</source>
         <translation>Dodanie atrybutu poza węzłami nie jest możliwe.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>An attribute by name %1 has already been created.</source>
         <translation>Atrybut o nazwie %1 został już utworzony.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/utils/qxpathhelper_p.h" line="+120"/>
         <source>Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported.</source>
         <translation>Obsługiwane jest jedynie &quot;Unicode Codepoint Collation&quot; (%1), %2 nie jest obsługiwane.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qatomicmathematicians.cpp" line="-180"/>
         <source>Integer division (%1) by zero (%2) is undefined.</source>
         <translation>Dzielenie w dziedzinie liczb całkowitych (%1) przez zero (%2) jest niezdefiniowane.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Division (%1) by zero (%2) is undefined.</source>
         <translation>Dzielenie (%1) przez zero (%2) jest niezdefiniowane.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Modulus division (%1) by zero (%2) is undefined.</source>
         <translation>Dzielenie modulo (%1) przez zero (%2) jest niezdefiniowane.</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/xmlpatterns/functions/qabstractfunctionfactory.cpp" line="+77"/>
         <source>%1 takes at most %n argument(s). %2 is therefore invalid.</source>
         <translation>
             <numerusform>%1 przyjmuje co najwyżej %n argument. %2 jest dlatego niepoprawne.</numerusform>
@@ -10709,7 +8509,6 @@ Proszę wybrać inną nazwę pliku.</translation>
         </translation>
     </message>
     <message numerus="yes">
-        <location line="+11"/>
         <source>%1 requires at least %n argument(s). %2 is therefore invalid.</source>
         <translation>
             <numerusform>%1 wymaga przynajmniej %n argumentu. %2 jest dlatego niepoprawne.</numerusform>
@@ -10718,1651 +8517,1255 @@ Proszę wybrać inną nazwę pliku.</translation>
         </translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qcontextnodechecker.cpp" line="+54"/>
         <source>The root node of the second argument to function %1 must be a document node. %2 is not a document node.</source>
         <translation>Głównym węzłem drugiego argumentu w funkcji %1 musi być węzeł &quot;document&quot;. %2 nie jest węzłem &quot;document&quot;.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qtimezonefns.cpp" line="+12"/>
         <source>%1 is not a whole number of minutes.</source>
         <translation>%1 nie jest całkowitą liczbą minut.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/parser/qquerytransformparser.cpp" line="-3992"/>
         <source>The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2.</source>
         <translation>Enkodowanie %1 jest niepoprawne. Może ono zawierać jedynie znaki alfabetu łacińskiego, nie może zawierać spacji i musi być dopasowane do wyrażenia regularnego %2.</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+10"/>
         <source>A default namespace declaration must occur before function, variable, and option declarations.</source>
         <translation>Domyślna deklaracja przestrzeni nazw musi pojawić się przed deklaracjami funkcji, zmiennych i opcji.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Namespace declarations must occur before function, variable, and option declarations.</source>
         <translation>Deklaracje przestrzeni nazw muszą pojawić się przed deklaracjami funkcji, zmiennych i opcji.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Module imports must occur before function, variable, and option declarations.</source>
         <translation>Importy modułów muszą pojawić się przed deklaracjami funkcji, zmiennych i opcji.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp" line="+344"/>
         <source>%1 is an unsupported encoding.</source>
         <translation>Nieobsługiwane kodowanie %1.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>%1 contains octets which are disallowed in the requested encoding %2.</source>
         <translation>%1 zawiera bity które są niedozwolone w zażądanym kodowaniu %2.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character.</source>
         <translation>Kod %1 który pojawił się w %2 i który używa kodowania %3 jest niepoprawnym znakiem XML.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qapplytemplate.cpp" line="+119"/>
         <source>Ambiguous rule match.</source>
         <translation>Dopasowano niejednoznaczną regułę.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp" line="+69"/>
         <source>In a namespace constructor, the value for a namespace cannot be an empty string.</source>
         <translation>W konstruktorze przestrzeni nazw wartość przestrzeni nazw nie może być pustym ciągiem.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>The prefix must be a valid %1, which %2 is not.</source>
         <translation>Przedrostek musi być poprawnym %1, którym %2 nie jest.</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>The prefix %1 cannot be bound.</source>
         <translation>Przedrostek %1 nie może być powiązany.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Only the prefix %1 can be bound to %2 and vice versa.</source>
         <translation>Tylko przedrostek %1 może być powiązany z %2 i vice versa.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qtemplate.cpp" line="+145"/>
         <source>The parameter %1 is required, but no corresponding %2 is supplied.</source>
         <translation>Wymagany jest parametr %1 lecz żaden odpowiadający mu  %2 nie został dostarczony.</translation>
     </message>
     <message>
-        <location line="-71"/>
         <source>The parameter %1 is passed, but no corresponding %2 exists.</source>
         <translation>Przekazany jest parametr %1 lecz żaden odpowiadający mu %2 nie istnieje.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qunparsedtextfn.cpp" line="+65"/>
         <source>The URI cannot have a fragment</source>
         <translation>URI nie może posiadać fragmentu</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/parser/qxslttokenizer.cpp" line="+519"/>
         <source>Element %1 is not allowed at this location.</source>
         <translation>Element %1 jest niedozwolony w tym miejscu.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Text nodes are not allowed at this location.</source>
         <translation>Węzły tekstowe są niedozwolone w tym miejscu.</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Parse error: %1</source>
         <translation>Błąd parsowania: %1</translation>
     </message>
     <message>
-        <location line="+62"/>
         <source>The value of the XSL-T version attribute must be a value of type %1, which %2 isn&apos;t.</source>
         <translation>Wartość atrybutu wersji XSL-T musi być typu %1, którym %2 nie jest.</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Running an XSL-T 1.0 stylesheet with a 2.0 processor.</source>
         <translation>Przetwarzanie arkusza XSL-T w wersji 1.0 przez procesor w wersji 2.0.</translation>
     </message>
     <message>
-        <location line="+108"/>
         <source>Unknown XSL-T attribute %1.</source>
         <translation>Nieznany atrybut %1 XSL-T.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Attribute %1 and %2 are mutually exclusive.</source>
         <translation>Atrybuty %1 i %2 wzajemnie się wykluczającą.</translation>
     </message>
     <message>
-        <location line="+166"/>
         <source>In a simplified stylesheet module, attribute %1 must be present.</source>
         <translation>W uproszczonym module arkuszu stylu musi wystąpić atrybut %1.</translation>
     </message>
     <message>
-        <location line="+72"/>
         <source>If element %1 has no attribute %2, it cannot have attribute %3 or %4.</source>
         <translation>Jeśli element %1 nie posiada atrybutu %2, nie może on również posiadać atrybutu %3 ani %4.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Element %1 must have at least one of the attributes %2 or %3.</source>
         <translation>Element %1 musi posiadać przynajmniej jeden z atrybutów: %2 lub %3.</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>At least one mode must be specified in the %1-attribute on element %2.</source>
         <translation>Przynajmniej jeden tryb musi być podany w atrybucie %1 elementu %2.</translation>
     </message>
     <message>
-        <location line="+123"/>
         <source>Element %1 must come last.</source>
         <translation>Element %1 musi wystąpić jako ostatni.</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>At least one %1-element must occur before %2.</source>
         <translation>Przynajmniej jeden element %1 musi wystąpić przed %2.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Only one %1-element can appear.</source>
         <translation>Może wystąpić tylko jeden element %1.</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>At least one %1-element must occur inside %2.</source>
         <translation>Przynajmniej jeden element %1 musi wystąpić wewnątrz %2.</translation>
     </message>
     <message>
-        <location line="+58"/>
         <source>When attribute %1 is present on %2, a sequence constructor cannot be used.</source>
         <translation>Kiedy atrybut %1 występuje w %2 konstruktor sekwencyjny nie może być użyty.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Element %1 must have either a %2-attribute or a sequence constructor.</source>
         <translation>Element %1 musi posiadać albo atrybut %2 albo sekwencyjny konstruktor.</translation>
     </message>
     <message>
-        <location line="+125"/>
         <source>When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor.</source>
         <translation>Kiedy wymagany jest parametr, domyślna wartość nie może być dostarczona przez atrybut %1 ani przez sekwencyjny konstruktor.</translation>
     </message>
     <message>
-        <location line="+270"/>
         <source>Element %1 cannot have children.</source>
         <translation>Element %1 nie może posiadać potomków.</translation>
     </message>
     <message>
-        <location line="+434"/>
         <source>Element %1 cannot have a sequence constructor.</source>
         <translation>Element %1 nie może posiadać sekwencyjnego konstruktora.</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location line="+9"/>
         <source>The attribute %1 cannot appear on %2, when it is a child of %3.</source>
         <translation>Atrybut %1 nie może wystąpić w %2 kiedy jest on potomkiem %3.</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>A parameter in a function cannot be declared to be a tunnel.</source>
         <translation>Parametr funkcji nie może być zadeklarowany jako tunelowy.</translation>
     </message>
     <message>
-        <location line="+149"/>
         <source>This processor is not Schema-aware and therefore %1 cannot be used.</source>
         <translation>Procesor nie obsługuje schematów, więc %1 nie może zostać użyte.</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>Top level stylesheet elements must be in a non-null namespace, which %1 isn&apos;t.</source>
         <translation>Elementy arkusza stylu najwyższego poziomu muszą być w niezerowej przestrzeni nazw, którą %1 nie jest.</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>The value for attribute %1 on element %2 must either be %3 or %4, not %5.</source>
         <translation>Wartością atrybutu %1 w elemencie %2 musi być %3 albo %4, lecz nie %5.</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Attribute %1 cannot have the value %2.</source>
         <translation>Atrybut %1 nie może posiadać wartości %2.</translation>
     </message>
     <message>
-        <location line="+58"/>
         <source>The attribute %1 can only appear on the first %2 element.</source>
         <translation>Atrybut %1 może wystąpić jedynie w pierwszym elemencie %2.</translation>
     </message>
     <message>
-        <location line="+99"/>
         <source>At least one %1 element must appear as child of %2.</source>
         <translation>Przynajmniej jeden element %1 musi wystąpić jako potomek %2.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/schema/qxsdschemachecker.cpp" line="+227"/>
         <source>%1 has inheritance loop in its base type %2.</source>
         <translation>%1 ma pętlę w dziedziczeniu w jego podstawowym typie %2.</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+24"/>
         <source>Circular inheritance of base type %1.</source>
         <translation>Cykliczne dziedziczenie podstawowego typu %1.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Circular inheritance of union %1.</source>
         <translation>Cykliczne dziedziczenie unii %1.</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>%1 is not allowed to derive from %2 by restriction as the latter defines it as final.</source>
         <translation>Nie można wywieść %1 z %2 ograniczając go ponieważ jest on zdefiniowany jako końcowy.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>%1 is not allowed to derive from %2 by extension as the latter defines it as final.</source>
         <translation>Nie można wywieść %1 z %2 rozszerzając go ponieważ jest on zdefiniowany jako końcowy.</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Base type of simple type %1 cannot be complex type %2.</source>
         <translation>Typ podstawowy dla typu prostego %1 nie może być typem złożonym %2.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Simple type %1 cannot have direct base type %2.</source>
         <translation>Typ prosty %1 nie może mieć bezpośredniego typu podstawowego %2.</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <location line="+9"/>
         <source>Simple type %1 is not allowed to have base type %2.</source>
         <translation>Typ prosty %1 nie może mieć typu podstawowego %2.</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Simple type %1 can only have simple atomic type as base type.</source>
         <translation>Typem podstawowym typu prostego %1 może być tylko typ atomowy.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Simple type %1 cannot derive from %2 as the latter defines restriction as final.</source>
         <translation>Typ prosty %1 nie może wywodzić się z %2 ponieważ ten ostatni jest zdefiniowany jako końcowy.</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+484"/>
         <source>Variety of item type of %1 must be either atomic or union.</source>
         <translation>Typem elementów listy %1 musi być albo typ atomowy albo unia.</translation>
     </message>
     <message>
-        <location line="-474"/>
-        <location line="+483"/>
         <source>Variety of member types of %1 must be atomic.</source>
         <translation>Typy składników %1 muszą być atomowe.</translation>
     </message>
     <message>
-        <location line="-470"/>
-        <location line="+451"/>
         <source>%1 is not allowed to derive from %2 by list as the latter defines it as final.</source>
         <translation>Nie można wywieść %1 z %2 poprzez listę ponieważ jest to zdefiniowane ostatecznie w typie podstawowym.</translation>
     </message>
     <message>
-        <location line="-431"/>
         <source>Simple type %1 is only allowed to have %2 facet.</source>
         <translation>Typ prosty %1 może jedynie posiadać aspekt %2.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Base type of simple type %1 must have variety of type list.</source>
         <translation>Typ podstawowy dla typu prostego %1 musi być listą typów.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Base type of simple type %1 has defined derivation by restriction as final.</source>
         <translation>Typ podstawowy dla typu prostego %1 ma zdefiniowane wywodzenie poprzez ograniczenie jako końcowe.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Item type of base type does not match item type of %1.</source>
         <translation>Typ elementów listy typu podstawowego nie pasuje do typu elementów listy %1.</translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+93"/>
         <source>Simple type %1 contains not allowed facet type %2.</source>
         <translation>Typ prosty %1 posiada niedozwolony aspekt %2.</translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+413"/>
         <source>%1 is not allowed to derive from %2 by union as the latter defines it as final.</source>
         <translation>Nie można wywieść %1 z %2 poprzez unię ponieważ jest to zdefiniowane ostatecznie w typie podstawowym.</translation>
     </message>
     <message>
-        <location line="-404"/>
         <source>%1 is not allowed to have any facets.</source>
         <translation>%1 nie może posiadać żadnych aspektów.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Base type %1 of simple type %2 must have variety of union.</source>
         <translation>Typ podstawowy %1 dla typu prostego %2 musi być unią.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute.</source>
         <translation>Typ podstawowy %1 dla typu prostego %2 nie może posiadać ograniczenia dla atrybutu %3.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Member type %1 cannot be derived from member type %2 of %3&apos;s base type %4.</source>
         <translation>Typ %1 składnika nie może być wywiedziony z typu %2 który jest typem składnika %3 typu podstawowego %4.</translation>
     </message>
     <message>
-        <location line="+65"/>
         <source>Derivation method of %1 must be extension because the base type %2 is a simple type.</source>
         <translation>Metodą wywodzenia z %1 musi być rozszerzenie ponieważ typ podstawowy %2 jest typem prostym.</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>Complex type %1 has duplicated element %2 in its content model.</source>
         <translation>Typ złożony %1 posiada powielony element %2 w jego modelu zawartości.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Complex type %1 has non-deterministic content.</source>
         <translation>Typ złożony %1 posiada nieokreśloną zawartość.</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3.</source>
         <translation>Atrybuty typu złożonego %1 nie są poprawnym rozszerzeniem atrybutów typu podstawowego %2: %3.</translation>
     </message>
     <message>
-        <location line="+37"/>
         <source>Content model of complex type %1 is not a valid extension of content model of %2.</source>
         <translation>Model zawartości typu złożonego %1 nie jest poprawnym rozszerzeniem modelu zawartości %2.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Complex type %1 must have simple content.</source>
         <translation>Typ złożony %1 musi mieć prostą zawartość.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Complex type %1 must have the same simple type as its base class %2.</source>
         <translation>Typ złożony %1 musi posiadać ten sam prosty typ jaki posiada jego klasa podstawowa %2.</translation>
     </message>
     <message>
-        <location line="+67"/>
         <source>Complex type %1 cannot be derived from base type %2%3.</source>
         <translation>Typ złożony %1 nie może być wywiedziony z typu %2%3.</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3.</source>
         <translation>Atrybuty typu złożonego %1 nie są poprawnym ograniczeniem atrybutów typu podstawowego %2: %3.</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Complex type %1 with simple content cannot be derived from complex base type %2.</source>
         <translation>Typ złożony %1 z prostą zawartością nie może być wywiedziony z podstawowego typu złożonego %2.</translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>Item type of simple type %1 cannot be a complex type.</source>
         <translation>Typ elementów listy w prostym typie %1 nie może być typem złożonym.</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Member type of simple type %1 cannot be a complex type.</source>
         <translation>Typ składnika typu prostego %1 nie może być typem złożonym.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>%1 is not allowed to have a member type with the same name as itself.</source>
         <translation>%1 nie może posiadać typu składnika o tej samej nazwie jaką on sam posiada.</translation>
     </message>
     <message>
-        <location line="+83"/>
-        <location line="+29"/>
-        <location line="+34"/>
         <source>%1 facet collides with %2 facet.</source>
         <translation>Aspekt %1 koliduje z aspektem %2.</translation>
     </message>
     <message>
-        <location line="-20"/>
         <source>%1 facet must have the same value as %2 facet of base type.</source>
         <translation>Aspekt %1 musi mieć tą samą wartość jaką ma aspekt %2 typu podstawowego.</translation>
     </message>
     <message>
-        <location line="+37"/>
         <source>%1 facet must be equal or greater than %2 facet of base type.</source>
         <translation>Wartość aspektu %1 musi większa od lub równa wartości aspektu %2 typu podstawowego.</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <location line="+125"/>
-        <location line="+55"/>
-        <location line="+12"/>
-        <location line="+91"/>
-        <location line="+58"/>
-        <location line="+34"/>
-        <location line="+35"/>
         <source>%1 facet must be less than or equal to %2 facet of base type.</source>
         <translation>Wartość aspektu %1 musi być mniejsza od lub równa wartości aspektu %2 typu podstawowego.</translation>
     </message>
     <message>
-        <location line="-389"/>
         <source>%1 facet contains invalid regular expression</source>
         <translation>Aspekt %1 zawiera niepoprawne wyrażenie regularne</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unknown notation %1 used in %2 facet.</source>
         <translation>Nieznany zapis %1 użyty w aspekcie %2.</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>%1 facet contains invalid value %2: %3.</source>
         <translation>Aspekt %1 zawiera niepoprawną wartość %2: %3.</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>%1 facet cannot be %2 or %3 if %4 facet of base type is %5.</source>
         <translation>Aspektem %1 nie może być %2 ani %3 jeśli aspektem %4 typu podstawowego jest %5.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>%1 facet cannot be %2 if %3 facet of base type is %4.</source>
         <translation>Aspektem %1 nie może być %2 jeśli aspektem %3 typu podstawowego jest %4.</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+55"/>
-        <location line="+230"/>
         <source>%1 facet must be less than or equal to %2 facet.</source>
         <translation>Wartość aspektu %1 musi być mniejsza od lub równa wartości aspektu %2.</translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+134"/>
-        <location line="+82"/>
         <source>%1 facet must be less than %2 facet of base type.</source>
         <translation>Wartość aspektu %1 musi być mniejsza od wartości aspektu %2 typu podstawowego.</translation>
     </message>
     <message>
-        <location line="-201"/>
-        <location line="+79"/>
         <source>%1 facet and %2 facet cannot appear together.</source>
         <translation>Aspekty %1 i %2 nie mogą wystąpić jednocześnie.</translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+12"/>
-        <location line="+113"/>
         <source>%1 facet must be greater than %2 facet of base type.</source>
         <translation>Wartość aspektu %1 musi być większa od wartości aspektu %2 typu podstawowego.</translation>
     </message>
     <message>
-        <location line="-86"/>
-        <location line="+58"/>
         <source>%1 facet must be less than %2 facet.</source>
         <translation>Wartość aspektu %1 musi być mniejsza od wartości aspektu %2.</translation>
     </message>
     <message>
-        <location line="-42"/>
-        <location line="+58"/>
         <source>%1 facet must be greater than or equal to %2 facet of base type.</source>
         <translation>Wartość aspektu %1 musi być większa od lub równa wartości aspektu %2 typu podstawowego.</translation>
     </message>
     <message>
-        <location line="+113"/>
         <source>Simple type contains not allowed facet %1.</source>
         <translation>Typ prosty zawiera niedozwolony aspekt %1.</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>%1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list.</source>
         <translation>Aspekty %1, %2, %3, %4, %5 i %6 nie są dozwolone podczas wywodzenia z listy.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Only %1 and %2 facets are allowed when derived by union.</source>
         <translation>Dozwolone są jedynie aspekty %1 i %2 podczas wywodzenia z unii.</translation>
     </message>
     <message>
-        <location line="+23"/>
-        <location line="+16"/>
         <source>%1 contains %2 facet with invalid data: %3.</source>
         <translation>%1 zawiera aspekt %2 z niepoprawnymi danymi: %3.</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Attribute group %1 contains attribute %2 twice.</source>
         <translation>Grupa atrybutów %1 zawiera dwukrotnie atrybut %2.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Attribute group %1 contains two different attributes that both have types derived from %2.</source>
         <translation>Grupa atrybutów %1 zawiera dwa różne atrybuty których typy są wywiedzione z %2.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3.</source>
         <translation>Grupa atrybutów %1 zawiera atrybut %2 który ma ograniczenie wartości ale typ wywodzi się z %3.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Complex type %1 contains attribute %2 twice.</source>
         <translation>Typ złożony %1 zawiera atrybut %2 dwukrotnie.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Complex type %1 contains two different attributes that both have types derived from %2.</source>
         <translation>Typ złożony %1 zawiera dwa różne atrybuty których typy są wywiedzione z %2.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3.</source>
         <translation>Typ złożony %1 zawiera atrybut %2 który ma ograniczenie wartości ale typ wywodzi się z %3.</translation>
     </message>
     <message>
-        <location line="+43"/>
         <source>Element %1 is not allowed to have a value constraint if its base type is complex.</source>
         <translation>Element %1 nie może zawierać ograniczenia wartości gdy jego typ podstawowy jest złożony.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Element %1 is not allowed to have a value constraint if its type is derived from %2.</source>
         <translation>Element %1 nie może zawierać ograniczenia wartości gdy jego typ jest wywiedziony z %2.</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+11"/>
         <source>Value constraint of element %1 is not of elements type: %2.</source>
         <translation>Ograniczenie wartości elementu %1 nie jest typu: %2.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Element %1 is not allowed to have substitution group affiliation as it is no global element.</source>
         <translation>Element %1 nie może przynależeć do grupy zastępującej ponieważ nie jest on elementem globalnym.</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Type of element %1 cannot be derived from type of substitution group affiliation.</source>
         <translation>Typ elementu %1 nie może być wywiedziony z typu przynależnego do grupy zastępującej.</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Value constraint of attribute %1 is not of attributes type: %2.</source>
         <translation>Ograniczenie wartości atrybutu %1 nie jest typu: %2.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Attribute %1 has value constraint but has type derived from %2.</source>
         <translation>Atrybut %1 posiada ograniczenie wartości lecz jego typ wywodzi się z %2.</translation>
     </message>
     <message>
-        <location line="+56"/>
         <source>%1 attribute in derived complex type must be %2 like in base type.</source>
         <translation>Atrybut %1 w wywiedzionym typie złożonym musi być %2 jak w typie podstawowym.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Attribute %1 in derived complex type must have %2 value constraint like in base type.</source>
         <translation>Atrybut %1 w wywiedzionym typie złożonym musi zawierać ograniczenie wartości %2 jak w typie podstawowym.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Attribute %1 in derived complex type must have the same %2 value constraint like in base type.</source>
         <translation>Atrybut %1 w wywiedzionym typie złożonym musi zawierać te same ograniczenie wartości %2 jak w typie podstawowym.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Attribute %1 in derived complex type must have %2 value constraint.</source>
         <translation>Atrybut %1 w wywiedzionym typie złożonym musi zawierać ograniczenie wartości %2.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>processContent of base wildcard must be weaker than derived wildcard.</source>
         <translation>&quot;processContent&quot; podstawowego dżokera musi być słabszy od wywiedzionego dżokera.</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+15"/>
         <source>Element %1 exists twice with different types.</source>
         <translation>Istnieją dwa elementy %1 o różnych typach.</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Particle contains non-deterministic wildcards.</source>
         <translation>Element zawiera nieokreślone dżokery.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/schema/qxsdschemahelper.cpp" line="+691"/>
-        <location line="+63"/>
         <source>Base attribute %1 is required but derived attribute is not.</source>
         <translation>Wymagany jest bazowy atrybut %1, wywiedziony zaś nie.</translation>
     </message>
     <message>
-        <location line="-57"/>
         <source>Type of derived attribute %1 cannot be validly derived from type of base attribute.</source>
         <translation>Typ wywiedzionego atrybutu %1 nie może być poprawnie wywiedziony z typu podstawowego atrybutu.</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Value constraint of derived attribute %1 does not match value constraint of base attribute.</source>
         <translation>Ograniczenie wartości wywiedzionego atrybutu %1 nie pasuje do ograniczenia wartości podstawowego atrybutu.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Derived attribute %1 does not exist in the base definition.</source>
         <translation>Wywiedziony atrybut %1 nie istnieje w podstawowej definicji.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Derived attribute %1 does not match the wildcard in the base definition.</source>
         <translation>Wywiedziony atrybut %1 nie pasuje do dżokera w podstawowej definicji.</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Base attribute %1 is required but missing in derived definition.</source>
         <translation>Brak wymaganego bazowego atrybutu %1 w wywiedzionej definicji.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Derived definition contains an %1 element that does not exists in the base definition</source>
         <translation>Wywiedziona definicja zawiera element %1 który nie istnieje w definicji podstawowej</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Derived wildcard is not a subset of the base wildcard.</source>
         <translation>Wywiedziony dżoker nie jest podzbiorem podstawowego dżokera.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>%1 of derived wildcard is not a valid restriction of %2 of base wildcard</source>
         <translation>%1 wywiedzionego dżokera nie jest poprawnym ograniczeniem %2 podstawowego dżokera</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Attribute %1 from base type is missing in derived type.</source>
         <translation>Brak atrybutu %1 typu bazowego w wywiedzionej definicji.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Type of derived attribute %1 differs from type of base attribute.</source>
         <translation>Typ wywiedzionego atrybutu %1 różni się od typu podstawowego atrybutu.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Base definition contains an %1 element that is missing in the derived definition</source>
         <translation>Podstawowa definicja zawiera element %1 którego brakuje w wywiedzionej definicji</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/schema/qxsdschemaresolver.cpp" line="+354"/>
         <source>%1 references unknown %2 or %3 element %4.</source>
         <translation>%1 odwołuje się do nieznanego elementu %2 lub %3: %4.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>%1 references identity constraint %2 that is no %3 or %4 element.</source>
         <translation>%1 odwołuje się do narzucenia niepowtarzalności %2 które nie jest elementem %3 ani %4.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>%1 has a different number of fields from the identity constraint %2 that it references.</source>
         <translation>%1 posiada inna liczbę pól od narzucenia niepowtarzalności %2 które się do niego odwołuje.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Base type %1 of %2 element cannot be resolved.</source>
         <translation>Nie można rozwiązać typu podstawowego %1 elementu %2.</translation>
     </message>
     <message>
-        <location line="+84"/>
         <source>Item type %1 of %2 element cannot be resolved.</source>
         <translation>Nie można rozwiązać typu elementów listy %1 w elemencie %2.</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Member type %1 of %2 element cannot be resolved.</source>
         <translation>Nie można rozwiązać typu %1 składnika elementu %2.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+415"/>
-        <location line="+30"/>
         <source>Type %1 of %2 element cannot be resolved.</source>
         <translation>Nie można rozwiązać typu %1 elementu %2.</translation>
     </message>
     <message>
-        <location line="-423"/>
         <source>Base type %1 of complex type cannot be resolved.</source>
         <translation>Nie można rozwiązać typu podstawowego %1 dla typu złożonego.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>%1 cannot have complex base type that has a %2.</source>
         <translation>%1 nie może mieć złożonego typu podstawowego który ma %2.</translation>
     </message>
     <message>
-        <location line="+286"/>
         <source>Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type.</source>
         <translation>Model zawartości typu złożonego %1 posiada element %2 więc nie może być on wywiedziony poprzez rozszerzenie niepustego typu.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model.</source>
         <translation>Typ złożony %1 nie może być wywiedziony z %2 poprzez rozszerzenie ponieważ ten ostatni zawiera element %3 w jego modelu zawartości.</translation>
     </message>
     <message>
-        <location line="+101"/>
         <source>Type of %1 element must be a simple type, %2 is not.</source>
         <translation>Typem elementu %1 musi być typ prosty, %2 nim nie jest.</translation>
     </message>
     <message>
-        <location line="+62"/>
         <source>Substitution group %1 of %2 element cannot be resolved.</source>
         <translation>Nie można rozwiązać grupy zastępującej %1 elementu %2.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Substitution group %1 has circular definition.</source>
         <translation>Grupa zastępująca %1 posiada cykliczną definicję.</translation>
     </message>
     <message>
-        <location line="+120"/>
-        <location line="+7"/>
         <source>Duplicated element names %1 in %2 element.</source>
         <translation>Powielona nazwa elementu %1 w elemencie %2.</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location line="+52"/>
-        <location line="+71"/>
-        <location line="+28"/>
         <source>Reference %1 of %2 element cannot be resolved.</source>
         <translation>Nie można rozwiązać odwołania %1 do elementu %2.</translation>
     </message>
     <message>
-        <location line="-138"/>
         <source>Circular group reference for %1.</source>
         <translation>Cykliczne odwołanie do grupy dla %1.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>%1 element is not allowed in this scope</source>
         <translation>Element %1 nie jest dozwolony w tym zakresie</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>%1 element cannot have %2 attribute with value other than %3.</source>
         <translation>Element %1 nie może mieć atrybutu %2 z wartością inną niż %3.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>%1 element cannot have %2 attribute with value other than %3 or %4.</source>
         <translation>Element %1 nie może mieć atrybutu %2 z wartością inną niż %3 lub %4.</translation>
     </message>
     <message>
-        <location line="+91"/>
         <source>%1 or %2 attribute of reference %3 does not match with the attribute declaration %4.</source>
         <translation>Atrybut %1 lub %2 odwołania %3 nie pasuje do deklaracji atrybutu %4.</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Attribute group %1 has circular reference.</source>
         <translation>Grupa atrybutów %1 posiada cykliczne odwołanie.</translation>
     </message>
     <message>
-        <location line="+131"/>
         <source>%1 attribute in %2 must have %3 use like in base type %4.</source>
         <translation>Atrybut %1 w %2 powinien używać %3 jak w typie podstawowym %4.</translation>
     </message>
     <message>
-        <location line="+52"/>
         <source>Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2.</source>
         <translation>Atrybut dżokera %1 nie jest poprawnym ograniczeniem atrybutu dżokera typu podstawowego %2.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>%1 has attribute wildcard but its base type %2 has not.</source>
         <translation>%1 posiada atrybut dżokera lecz jego typ podstawowy %2 go nie posiada.</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible.</source>
         <translation>Nie można wyrazić unii atrybutu dżokera typu %1 i atrybutu dżokera jego typu podstawowego %2.</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>Enumeration facet contains invalid content: {%1} is not a value of type %2.</source>
         <translation>Aspekt &quot;enumeration&quot; posiada niepoprawną zawartość: {%1} nie jest wartością typu %2.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Namespace prefix of qualified name %1 is not defined.</source>
         <translation>Przedrostek przestrzeni nazw występujący w pełnej nazwie %1 nie jest zdefiniowany.</translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+18"/>
         <source>%1 element %2 is not a valid restriction of the %3 element it redefines: %4.</source>
         <translation>Element %1 (%2) nie jest poprawnym ograniczeniem elementu %3 który redefiniuje: %4.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/schema/qxsdparticlechecker.cpp" line="+165"/>
         <source>Empty particle cannot be derived from non-empty particle.</source>
         <translation>Pusty element nie może być wywiedziony z niepustego elementu.</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Derived particle is missing element %1.</source>
         <translation>Brak elementu %1 w wywiedzionym elemencie.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Derived element %1 is missing value constraint as defined in base particle.</source>
         <translation>Brak ograniczenia wartości w wywiedzionym elemencie %1 takiego jak w podstawowym elemencie.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Derived element %1 has weaker value constraint than base particle.</source>
         <translation>Wywiedziony element %1 posiada słabsze ograniczenie wartości niż element podstawowy.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Fixed value constraint of element %1 differs from value constraint in base particle.</source>
         <translation>Ograniczenie stałej wartości elementu %1 różni się od ograniczenia wartości w podstawowym elemencie.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Derived element %1 cannot be nillable as base element is not nillable.</source>
         <translation>Wywiedziony element %1 może być zerowalny ponieważ element podstawowy nie jest zerowalny.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Block constraints of derived element %1 must not be more weaker than in the base element.</source>
         <translation>Ograniczenia blokujące dla wywiedzionego elementu %1 nie mogą być słabsze od ograniczeń w elemencie podstawowym.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Simple type of derived element %1 cannot be validly derived from base element.</source>
         <translation>Typ prosty w elemencie wywiedzionym %1 nie może być poprawnie wywiedziony z elementu podstawowego.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Complex type of derived element %1 cannot be validly derived from base element.</source>
         <translation>Typ złożony w elemencie wywiedzionym %1 nie może być poprawnie wywiedziony z elementu podstawowego.</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Element %1 is missing in derived particle.</source>
         <translation>Brak elementu %1 w wywiedzionym elemencie.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Element %1 does not match namespace constraint of wildcard in base particle.</source>
         <translation>Element %1 nie pasuje do ograniczenia przestrzeni nazw dżokera w elemencie podstawowym.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Wildcard in derived particle is not a valid subset of wildcard in base particle.</source>
         <translation>Dżoker w wywiedzionym elemencie nie jest poprawnym podzbiorem dżokera w elemencie podstawowym.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>processContent of wildcard in derived particle is weaker than wildcard in base particle.</source>
         <translation>&quot;processContent&quot; dżokera w wywiedzionym elemencie jest słabszy od dżokera w podstawowym elemencie.</translation>
     </message>
     <message>
-        <location line="+270"/>
         <source>Derived particle allows content that is not allowed in the base particle.</source>
         <translation>Wywiedziony element pozwala na zawartość która jest niedozwolona w podstawowym elemencie.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/schema/qxsdschemaparser.cpp" line="+170"/>
         <source>Can not process unknown element %1, expected elements are: %2.</source>
         <translation>Nie można przetworzyć nieznanego elementu %1, oczekiwanymi elementami są: %2.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Element %1 is not allowed in this scope, possible elements are: %2.</source>
         <translation>Element %1 jest niedozwolony w tym zakresie, możliwymi elementami są: %2.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Child element is missing in that scope, possible child elements are: %1.</source>
         <translation>Brak podelementu w tym zakresie, możliwymi podelementami są: %1.</translation>
     </message>
     <message>
-        <location line="+143"/>
         <source>Document is not a XML schema.</source>
         <translation>Dokument nie jest schematem XML.</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>%1 attribute of %2 element contains invalid content: {%3} is not a value of type %4.</source>
         <translation>Atrybut %1 elementu %2 posiada niepoprawną zawartość: {%3} nie jest wartością typu %4.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>%1 attribute of %2 element contains invalid content: {%3}.</source>
         <translation>Atrybut %1 elementu %2 posiada niepoprawną zawartość: {%3}.</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema.</source>
         <translation>Docelowa przestrzeń nazw %1 załączonego schematu jest różna od docelowej przestrzeni nazw %2 która jest zdefiniowana w schemacie załączającym.</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+11"/>
         <source>Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema.</source>
         <translation>Docelowa przestrzeń nazw %1 zaimportowanego schematu jest różna od docelowej przestrzeni nazw %2 która jest zdefiniowana w schemacie importującym.</translation>
     </message>
     <message>
-        <location line="+243"/>
         <source>%1 element is not allowed to have the same %2 attribute value as the target namespace %3.</source>
         <translation>Element %1 nie może zawierać tej samej wartości atrybutu %2 co docelowa przestrzeń nazw %3.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>%1 element without %2 attribute is not allowed inside schema without target namespace.</source>
         <translation>Element %1 bez atrybutu %2 jest niedozwolony wewnątrz schematu bez docelowej przestrzeni nazw.</translation>
     </message>
     <message>
-        <location line="+851"/>
-        <location line="+158"/>
         <source>%1 element is not allowed inside %2 element if %3 attribute is present.</source>
         <translation>Element %1 jest niedozwolony wewnątrz elementu %2 jeśli jest obecny atrybut %3.</translation>
     </message>
     <message>
-        <location line="-97"/>
-        <location line="+119"/>
-        <location line="+92"/>
         <source>%1 element has neither %2 attribute nor %3 child element.</source>
         <translation>Element %1 nie posiada ani atrybutu %2 ani podelementu %3.</translation>
     </message>
     <message>
-        <location line="+835"/>
-        <location line="+1474"/>
-        <location line="+232"/>
-        <location line="+7"/>
-        <location line="+260"/>
-        <location line="+17"/>
-        <location line="+258"/>
-        <location line="+6"/>
-        <location line="+17"/>
-        <location line="+6"/>
-        <location line="+17"/>
-        <location line="+11"/>
-        <location line="+11"/>
-        <location line="+11"/>
         <source>%1 element with %2 child element must not have a %3 attribute.</source>
         <translation>Element %1 z podelementem %2 nie może mieć atrybutu %3.</translation>
     </message>
     <message>
-        <location line="-1325"/>
         <source>%1 attribute of %2 element must be %3 or %4.</source>
         <translation>Atrybutem %1 elementu %2 musi być %3 lub %4.</translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>%1 attribute of %2 element must have a value of %3.</source>
         <translation>Atrybut %1 elementu %2 musi posiadać wartość %3.</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location line="+34"/>
         <source>%1 attribute of %2 element must have a value of %3 or %4.</source>
         <translation>Atrybut %1 elementu %2 musi posiadać wartość %3 lub %4.</translation>
     </message>
     <message>
-        <location line="+319"/>
-        <location line="+129"/>
-        <location line="+9"/>
-        <location line="+7"/>
-        <location line="+7"/>
-        <location line="+327"/>
-        <location line="+203"/>
-        <location line="+6"/>
-        <location line="+6"/>
-        <location line="+6"/>
-        <location line="+6"/>
-        <location line="+6"/>
-        <location line="+6"/>
-        <location line="+77"/>
         <source>%1 element must not have %2 and %3 attribute together.</source>
         <translation>Element %1 nie może posiadać jednocześnie atrybutów %2 i %3.</translation>
     </message>
     <message>
-        <location line="-768"/>
-        <location line="+222"/>
         <source>Content of %1 attribute of %2 element must not be from namespace %3.</source>
         <translation>Zawartość atrybutu %1 elementu %2 nie może pochodzić z przestrzeni nazw %3.</translation>
     </message>
     <message>
-        <location line="-215"/>
-        <location line="+222"/>
         <source>%1 attribute of %2 element must not be %3.</source>
         <translation>Atrybut %1 elementu %2 nie może być %3.</translation>
     </message>
     <message>
-        <location line="-64"/>
         <source>%1 attribute of %2 element must have the value %3 because the %4 attribute is set.</source>
         <translation>Atrybut %1 elementu %2 musi zawierać wartość %3 ponieważ atrybut %4 jest ustawiony.</translation>
     </message>
     <message>
-        <location line="+187"/>
         <source>Specifying use=&apos;prohibited&apos; inside an attribute group has no effect.</source>
         <translation>Podawanie: use=&apos;prohibited&apos; wewnątrz grupy atrybutów nie przynosi żadnego efektu.</translation>
     </message>
     <message>
-        <location line="+353"/>
         <source>%1 element must have either %2 or %3 attribute.</source>
         <translation>Element %1 musi zawierać atrybut %2 albo %3.</translation>
     </message>
     <message>
-        <location line="+554"/>
         <source>%1 element must have either %2 attribute or %3 or %4 as child element.</source>
         <translation>Element %1 musi zawierać albo atrybut %2 albo %3 lub %4 jako podelement.</translation>
     </message>
     <message>
-        <location line="+55"/>
         <source>%1 element requires either %2 or %3 attribute.</source>
         <translation>Element %1 wymaga atrybutu %2 albo %3.</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Text or entity references not allowed inside %1 element</source>
         <translation>Tekst ani odwołanie nie są dozwolone wewnątrz elementu %1</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <location line="+112"/>
         <source>%1 attribute of %2 element must contain %3, %4 or a list of URIs.</source>
         <translation>Atrybut %1 elementu %2 musi zawierać %3, %4 lub listę URI.</translation>
     </message>
     <message>
-        <location line="+126"/>
         <source>%1 element is not allowed in this context.</source>
         <translation>Element %1 jest niedozwolony w tym kontekście.</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>%1 attribute of %2 element has larger value than %3 attribute.</source>
         <translation>Atrybut %1 elementu %2 posiada większą wartość niż atrybut %3.</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Prefix of qualified name %1 is not defined.</source>
         <translation>Przedrostek w pełnej nazwie %1 nie jest zdefiniowany.</translation>
     </message>
     <message>
-        <location line="+65"/>
-        <location line="+61"/>
         <source>%1 attribute of %2 element must either contain %3 or the other values.</source>
         <translation>Atrybut %1 elementu %2 musi zawierać albo %3 albo inne wartości.</translation>
     </message>
     <message>
-        <location line="+131"/>
         <source>Component with ID %1 has been defined previously.</source>
         <translation>Komponent o identyfikatorze %1 został uprzednio zdefiniowany.</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Element %1 already defined.</source>
         <translation>Element %1 jest już zdefiniowany.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Attribute %1 already defined.</source>
         <translation>Atrybut %1 jest już zdefiniowany.</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Type %1 already defined.</source>
         <translation>Typ %1 jest już zdefiniowany.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Attribute group %1 already defined.</source>
         <translation>Grupa atrybutów %1 jest już zdefiniowana.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Element group %1 already defined.</source>
         <translation>Grupa elementów %1 jest już zdefiniowana.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Notation %1 already defined.</source>
         <translation>Zapis %1 jest już zdefiniowany.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Identity constraint %1 already defined.</source>
         <translation>Narzucenie niepowtarzalności %1 jest już zdefiniowane.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Duplicated facets in simple type %1.</source>
         <translation>Powielone aspekty w prostym typie %1.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/schema/qxsdtypechecker.cpp" line="+233"/>
-        <location line="+7"/>
-        <location line="+21"/>
         <source>%1 is not valid according to %2.</source>
         <translatorcomment>Ponieważ nie wiadomo co jest podmiotem nie można stwierdzić czy to ma być &quot;poprawnym&quot;, &quot;poprawną&quot; czy &quot;poprawne&quot;</translatorcomment>
         <translation>%1 nie jest poprawne według %2.</translation>
     </message>
     <message>
-        <location line="+167"/>
         <source>String content does not match the length facet.</source>
         <translation>Wartość ciągu koliduje z aspektem &quot;length&quot;.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>String content does not match the minLength facet.</source>
         <translation>Wartość ciągu koliduje z aspektem &quot;minLength&quot;.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>String content does not match the maxLength facet.</source>
         <translation>Wartość ciągu koliduje z aspektem &quot;maxLength&quot;.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>String content does not match pattern facet.</source>
         <translation>Wartość ciągu koliduje z aspektem &quot;pattern&quot;.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>String content is not listed in the enumeration facet.</source>
         <translation>Wartość ciągu nie widnieje na liście aspektu &quot;enumeration&quot;.</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Signed integer content does not match the maxInclusive facet.</source>
         <translation>Wartość liczby całkowitej koliduje z aspektem &quot;maxInclusive&quot;.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Signed integer content does not match the maxExclusive facet.</source>
         <translation>Wartość liczby całkowitej koliduje z aspektem &quot;maxExclusive&quot;.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Signed integer content does not match the minInclusive facet.</source>
         <translation>Wartość liczby całkowitej koliduje z aspektem &quot;minInclusive&quot;.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Signed integer content does not match the minExclusive facet.</source>
         <translation>Wartość liczby całkowitej koliduje z aspektem &quot;minExclusive&quot;.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Signed integer content is not listed in the enumeration facet.</source>
         <translation>Wartość liczby całkowitej nie widnieje na liście aspektu &quot;enumeration&quot;.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Signed integer content does not match pattern facet.</source>
         <translation>Wartość liczby całkowitej koliduje z aspektem &quot;pattern&quot;.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Signed integer content does not match in the totalDigits facet.</source>
         <translation>Wartość liczby całkowitej koliduje z aspektem &quot;totalDigits&quot;.</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unsigned integer content does not match the maxInclusive facet.</source>
         <translation>Wartość liczby naturalnej koliduje z aspektem &quot;maxInclusive&quot;.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Unsigned integer content does not match the maxExclusive facet.</source>
         <translation>Wartość liczby naturalnej koliduje z aspektem &quot;maxExclusive&quot;.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Unsigned integer content does not match the minInclusive facet.</source>
         <translation>Wartość liczby naturalnej koliduje z aspektem &quot;minInclusive&quot;.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Unsigned integer content does not match the minExclusive facet.</source>
         <translation>Wartość liczby naturalnej koliduje z aspektem &quot;minExclusive&quot;.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Unsigned integer content is not listed in the enumeration facet.</source>
         <translation>Wartość liczby naturalnej nie widnieje na liście aspektu &quot;enumeration&quot;.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Unsigned integer content does not match pattern facet.</source>
         <translation>Wartość liczby naturalnej koliduje z aspektem &quot;pattern&quot;.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Unsigned integer content does not match in the totalDigits facet.</source>
         <translation>Wartość liczby naturalnej koliduje z aspektem &quot;totalDigits&quot;.</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Double content does not match the maxInclusive facet.</source>
         <translation>Wartość liczby rzeczywistej koliduje z aspektem &quot;maxInclusive&quot;.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Double content does not match the maxExclusive facet.</source>
         <translation>Wartość liczby rzeczywistej koliduje z aspektem &quot;maxExclusive&quot;.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Double content does not match the minInclusive facet.</source>
         <translation>Wartość liczby rzeczywistej koliduje z aspektem &quot;minInclusive&quot;.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Double content does not match the minExclusive facet.</source>
         <translation>Wartość liczby rzeczywistej koliduje z aspektem &quot;minExclusive&quot;.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Double content is not listed in the enumeration facet.</source>
         <translation>Wartość liczby rzeczywistej nie widnieje na liście aspektu &quot;enumeration&quot;.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Double content does not match pattern facet.</source>
         <translation>Wartość liczby rzeczywistej koliduje z aspektem &quot;pattern&quot;.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Decimal content does not match in the fractionDigits facet.</source>
         <translation>Wartość liczby rzeczywistej koliduje z aspektem &quot;fractionDigits&quot;.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Decimal content does not match in the totalDigits facet.</source>
         <translation>Wartość liczby rzeczywistej koliduje z aspektem &quot;totalDigits&quot;.</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Date time content does not match the maxInclusive facet.</source>
         <translation>Zawartość daty i czasu koliduje z aspektem &quot;maxInclusive&quot;.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Date time content does not match the maxExclusive facet.</source>
         <translation>Zawartość daty i czasu koliduje z aspektem &quot;maxExclusive&quot;.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Date time content does not match the minInclusive facet.</source>
         <translation>Zawartość daty i czasu koliduje z aspektem &quot;minInclusive&quot;.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Date time content does not match the minExclusive facet.</source>
         <translation>Zawartość daty i czasu koliduje z aspektem &quot;minExclusive&quot;.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Date time content is not listed in the enumeration facet.</source>
         <translation>Zawartość daty i czasu nie widnieje na liście aspektu &quot;enumeration&quot;.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Date time content does not match pattern facet.</source>
         <translation>Zawartość daty i czasu koliduje z aspektem &quot;pattern&quot;.</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Duration content does not match the maxInclusive facet.</source>
         <translation>Wartość czasu trwania koliduje z aspektem &quot;maxInclusive&quot;.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Duration content does not match the maxExclusive facet.</source>
         <translation>Wartość czasu trwania koliduje z aspektem &quot;maxExclusive&quot;.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Duration content does not match the minInclusive facet.</source>
         <translation>Wartość czasu trwania koliduje z aspektem &quot;minInclusive&quot;.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Duration content does not match the minExclusive facet.</source>
         <translation>Wartość czasu trwania koliduje z aspektem &quot;minExclusive&quot;.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Duration content is not listed in the enumeration facet.</source>
         <translation>Wartość czasu trwania nie widnieje na liście aspektu &quot;enumeration&quot;.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Duration content does not match pattern facet.</source>
         <translation>Wartość czasu trwania koliduje z aspektem &quot;pattern&quot;.</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Boolean content does not match pattern facet.</source>
         <translation>Wartość boolowska koliduje z aspektem &quot;pattern&quot;.</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Binary content does not match the length facet.</source>
         <translation>Wartość binarna koliduje z aspektem &quot;length&quot;.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Binary content does not match the minLength facet.</source>
         <translation>Wartość binarna koliduje z aspektem &quot;minLength&quot;.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Binary content does not match the maxLength facet.</source>
         <translation>Wartość binarna koliduje z aspektem &quot;maxLength&quot;.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Binary content is not listed in the enumeration facet.</source>
         <translation>Wartość binarna nie widnieje na liście aspektu &quot;enumeration&quot;.</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Invalid QName content: %1.</source>
         <translation>Niepoprawna zawartość QName: %1.</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>QName content is not listed in the enumeration facet.</source>
         <translation>Zawartość QName nie widnieje na liście aspektu &quot;enumeration&quot;.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>QName content does not match pattern facet.</source>
         <translation>Zawartość QName koliduje z aspektem &quot;pattern&quot;.</translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>Notation content is not listed in the enumeration facet.</source>
         <translation>Zapis zawartości nie widnieje na liście aspektu &quot;enumeration&quot;.</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>List content does not match length facet.</source>
         <translation>Zawartość listy koliduje z aspektem &quot;length&quot;.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>List content does not match minLength facet.</source>
         <translation>Zawartość listy koliduje z aspektem &quot;minLength&quot;.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>List content does not match maxLength facet.</source>
         <translation>Zawartość listy koliduje z aspektem &quot;maxLength&quot;.</translation>
     </message>
     <message>
-        <location line="+90"/>
         <source>List content is not listed in the enumeration facet.</source>
         <translation>Zawartość listy nie widnieje na liście aspektu &quot;enumeration&quot;.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>List content does not match pattern facet.</source>
         <translation>Zawartość listy koliduje z aspektem &quot;pattern&quot;.</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>Union content is not listed in the enumeration facet.</source>
         <translation>Zawartość unii nie widnieje na liście aspektu &quot;enumeration&quot;.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Union content does not match pattern facet.</source>
         <translation>Zawartość unii koliduje z aspektem &quot;pattern&quot;.</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Data of type %1 are not allowed to be empty.</source>
         <translation>Dane typu %1 nie mogą być puste.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp" line="+160"/>
         <source>Element %1 is missing child element.</source>
         <translation>Brak wymaganego podelementu w elemencie %1.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>There is one IDREF value with no corresponding ID: %1.</source>
         <translation>Istnieje wartość IDREF bez odpowiadającej jej wartości ID: %1.</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Loaded schema file is invalid.</source>
         <translation>Załadowany plik nie jest poprawnym plikiem ze schematem.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>%1 contains invalid data.</source>
         <translation>%1 zawiera niepoprawne dane.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>xsi:schemaLocation namespace %1 has already appeared earlier in the instance document.</source>
         <translation>Przestrzeń nazw &quot;xsi:schemaLocation&quot; %1 wystąpiła już wcześniej w dokumencie.</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute.</source>
         <translation>&quot;xsi:noNamespaceSchemaLocation&quot; nie może wystąpić po pierwszym elemencie lub atrybucie który nie jest przestrzenią nazw.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>No schema defined for validation.</source>
         <translation>Brak zdefiniowanego schematu dla walidacji.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>No definition for element %1 available.</source>
         <translation>Brak dostępnej definicji dla elementu %1.</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+49"/>
-        <location line="+142"/>
         <source>Specified type %1 is not known to the schema.</source>
         <translation>Podany typ %1 nie jest schematowi znany.</translation>
     </message>
     <message>
-        <location line="-176"/>
         <source>Element %1 is not defined in this scope.</source>
         <translation>Element %1 nie jest zdefiniowany w tym zakresie.</translation>
     </message>
     <message>
-        <location line="+43"/>
         <source>Declaration for element %1 does not exist.</source>
         <translation>Brak deklaracji dla elementu %1.</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Element %1 contains invalid content.</source>
         <translation>Element %1 posiada niepoprawną zawartość.</translation>
     </message>
     <message>
-        <location line="+73"/>
         <source>Element %1 is declared as abstract.</source>
         <translation>Element %1 jest zadeklarowany jako abstrakcyjny.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Element %1 is not nillable.</source>
         <translation>Element %1 nie jest zerowalny.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Attribute %1 contains invalid data: %2</source>
         <translation>Atrybut %1 zawiera niepoprawne dane: %2</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Element contains content although it is nillable.</source>
         <translation>Element posiada zawartość chociaż jest zerowalny.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Fixed value constraint not allowed if element is nillable.</source>
         <translation>Ograniczenie stałej wartości jest niedozwolone gdy element jest zerowalny.</translation>
     </message>
     <message>
-        <location line="+230"/>
         <source>Element %1 cannot contain other elements, as it has a fixed content.</source>
         <translation>Element %1 nie może zawierać innych elementów ponieważ posiada on stałą zawartość.</translation>
     </message>
     <message>
-        <location line="-198"/>
         <source>Specified type %1 is not validly substitutable with element type %2.</source>
         <translation>Podany typ %1 nie jest poprawnie zastępowalny typem elementu %2.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Complex type %1 is not allowed to be abstract.</source>
         <translation>Typ złożony %1 nie może być abstrakcyjny.</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Element %1 contains not allowed attributes.</source>
         <translation>Element %1 zawiera niedozwolone atrybuty.</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+97"/>
         <source>Element %1 contains not allowed child element.</source>
         <translation>Element %1 zawiera niedozwolony podelement.</translation>
     </message>
     <message>
-        <location line="-76"/>
-        <location line="+93"/>
         <source>Content of element %1 does not match its type definition: %2.</source>
         <translation>Zawartość elementu %1 nie pasuje do jego definicji typu: %2.</translation>
     </message>
     <message>
-        <location line="-85"/>
-        <location line="+92"/>
-        <location line="+41"/>
         <source>Content of element %1 does not match defined value constraint.</source>
         <translation>Zawartość elementu %1 nie pasuje do zdefiniowanego ograniczenia wartości.</translation>
     </message>
     <message>
-        <location line="-73"/>
         <source>Element %1 contains not allowed child content.</source>
         <translation>Element %1 zawiera niedozwolony podelement.</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Element %1 contains not allowed text content.</source>
         <translation>Element %1 zawiera niedozwolony text.</translation>
     </message>
     <message>
-        <location line="+61"/>
         <source>Element %1 is missing required attribute %2.</source>
         <translation>Brak wymaganego atrybutu %2 w elemencie %1.</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>Attribute %1 does not match the attribute wildcard.</source>
         <translation>Atrybut %1 nie pasuje do atrybutu dżokera.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Declaration for attribute %1 does not exist.</source>
         <translation>Brak deklaracji atrybutu %1.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Element %1 contains two attributes of type %2.</source>
         <translation>Element %1 posiada dwa atrybuty typu %2.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Attribute %1 contains invalid content.</source>
         <translation>Atrybut %1 posiada niepoprawną zawartość.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Element %1 contains unknown attribute %2.</source>
         <translation>Element %1 posiada nieznany atrybut %2.</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+46"/>
         <source>Content of attribute %1 does not match its type definition: %2.</source>
         <translation>Zawartość atrybutu %1 nie pasuje do jego definicji typu: %2.</translation>
     </message>
     <message>
-        <location line="-38"/>
-        <location line="+46"/>
         <source>Content of attribute %1 does not match defined value constraint.</source>
         <translation>Zawartość elementu %1 nie pasuje do zdefiniowanego ograniczenia wartości.</translation>
     </message>
     <message>
-        <location line="+88"/>
         <source>Non-unique value found for constraint %1.</source>
         <translation>Znaleziono nieunikatową wartość dla ograniczenia %1.</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Key constraint %1 contains absent fields.</source>
         <translation>Ograniczenie klucza %1 zawiera nieobecne pola.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Key constraint %1 contains references nillable element %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>No referenced value found for key reference %1.</source>
         <translation>Brak wartości do której odwołuje się klucz %1.</translation>
     </message>
     <message>
-        <location line="+64"/>
         <source>More than one value found for field %1.</source>
         <translation>Znaleziono więcej niż jedną wartość dla pola %1.</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Field %1 has no simple type.</source>
         <translation>Pole %1 nie posiada prostego typu.</translation>
     </message>
     <message>
-        <location line="+73"/>
         <source>ID value &apos;%1&apos; is not unique.</source>
         <translation>Wartość ID &quot;%1&quot; nie jest unikatowa.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>&apos;%1&apos; attribute contains invalid QName content: %2.</source>
         <translation>Atrybut &quot;%1&quot; zawiera niepoprawną zawartość QName: %2.</translation>
     </message>